diff --git a/.codex/config.toml b/.codex/config.toml
new file mode 100644
index 0000000000..39d0e4accc
--- /dev/null
+++ b/.codex/config.toml
@@ -0,0 +1 @@
+notify = [ "bash", "-c", "curl -sf -X POST -H 'Content-Type: application/json' -H \"X-Emdash-Token: $EMDASH_HOOK_TOKEN\" -H \"X-Emdash-Pty-Id: $EMDASH_PTY_ID\" -H \"X-Emdash-Event-Type: notification\" -d \"$1\" \"http://127.0.0.1:$EMDASH_HOOK_PORT/hook\" || true", "_" ]
diff --git a/.eslintrc.json b/.eslintrc.json
index 634d89c2b0..13ec039a5e 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -11,23 +11,18 @@
       }
     ],
     "@typescript-eslint/no-explicit-any": "warn",
+
     "@typescript-eslint/explicit-function-return-type": "off",
     "@typescript-eslint/explicit-module-boundary-types": "off",
     "@typescript-eslint/no-empty-function": "off",
     "prefer-const": "warn",
     "react-hooks/set-state-in-effect": "warn"
   },
-  "overrides": [
-    {
-      "files": ["src/main/**/*.ts", "src/main/**/*.tsx"],
-      "rules": {
-        "@typescript-eslint/no-var-requires": "off"
-      }
-    }
-  ],
+  "overrides": [],
   "env": {
     "browser": true,
     "es2020": true,
     "node": true
-  }
+  },
+  "ignorePatterns": ["**/_*/**"]
 }
diff --git a/.github/workflows/code-consistency-check.yml b/.github/workflows/code-consistency-check.yml
index e514214cf5..8126031c53 100644
--- a/.github/workflows/code-consistency-check.yml
+++ b/.github/workflows/code-consistency-check.yml
@@ -23,7 +23,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: '22.20.0'
+          node-version: '24'
           cache: 'pnpm'
 
       - name: Install dependencies
@@ -48,7 +48,7 @@ jobs:
       #   run: pnpm run lint
 
       - name: Type check
-        run: pnpm run type-check
+        run: pnpm run typecheck
 
   vitest:
     runs-on: ubuntu-latest
@@ -65,7 +65,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: '22.20.0'
+          node-version: '24'
           cache: 'pnpm'
 
       - name: Install Linux native deps
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 385da7f123..da99edbd03 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -3,7 +3,7 @@ name: Release
 on:
   push:
     tags:
-      - 'v*'
+      - 'v1.*'
   workflow_dispatch:
     inputs:
       arch:
@@ -11,9 +11,9 @@ on:
         required: false
         default: 'both'
       dry_run:
-        description: 'Build signed+stapled but DO NOT publish a GitHub Release (artifacts only)'
+        description: 'Build signed+stapled but DO NOT publish (artifacts only)'
         required: false
-        default: 'false'
+        default: 'true'
 
 permissions:
   contents: read
@@ -26,7 +26,6 @@ jobs:
         id: init
         run: |
           set -euo pipefail
-          # Normalize dry_run from workflow_dispatch inputs (string: true/false)
           DRY=${{ inputs.dry_run || '' }}
           if [ -z "$DRY" ]; then DRY=${{ github.event.inputs.dry_run || '' }}; fi
           DRY=$(printf "%s" "$DRY" | tr '[:upper:]' '[:lower:]')
@@ -35,240 +34,92 @@ jobs:
             *) DRY=false ;;
           esac
           echo "dry_run=$DRY" >> "$GITHUB_OUTPUT"
-      - name: Checkout
-        uses: actions/checkout@v4
 
-      - name: Setup pnpm
-        uses: pnpm/action-setup@v4
+      - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v4
         with:
           version: 10.28.2
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: '22'
+          node-version: '24'
           cache: 'pnpm'
-
-      - name: Setup Python 3.11 for node-gyp
-        uses: actions/setup-python@v5
+      - uses: actions/setup-python@v5
         with:
           python-version: '3.11'
 
-      - name: Install Python build deps (setuptools shim for distutils)
-        run: |
-          python -m pip install --upgrade pip setuptools wheel
-          echo "python=$(which python3)" >> $GITHUB_ENV
-
-      - name: Install dependencies (strict lockfile)
-        env:
-          npm_config_python: ${{ env.python }}
-        run: pnpm install --frozen-lockfile
+      - run: python -m pip install --upgrade pip setuptools wheel
+      - run: pnpm install --frozen-lockfile
+      - run: pnpm run build
 
-      - name: Build app (ts + vite)
-        run: pnpm run build
+      - run: echo "NODE_OPTIONS=${NODE_OPTIONS:-not set}" && node --version
 
-      - name: Inject PostHog config (dev build job)
+      - name: Inject telemetry
         env:
           PH_KEY: ${{ secrets.POSTHOG_PROJECT_API_KEY }}
           PH_HOST: ${{ secrets.POSTHOG_HOST }}
-        run: |
-          set -euo pipefail
-          if [ -z "${PH_KEY:-}" ] || [ -z "${PH_HOST:-}" ]; then
-            echo "PostHog secrets not set; skipping telemetry injection (DMG will have telemetry disabled)."
-            exit 0
-          fi
-          mkdir -p dist/main
-          cat > dist/main/appConfig.json <<'JSON'
-          {
-            "posthogHost": "__PH_HOST__",
-            "posthogKey": "__PH_KEY__"
-          }
-          JSON
-          sed -i '' "s#__PH_HOST__#${PH_HOST}#g" dist/main/appConfig.json
-          sed -i '' "s#__PH_KEY__#${PH_KEY}#g" dist/main/appConfig.json
-          echo "Wrote dist/main/appConfig.json"
-
-      - name: Build DMG(s) (no publish)
+        run: node --experimental-strip-types scripts/release/inject-telemetry.ts
+
+      - name: Build unsigned DMGs
         env:
           CSC_IDENTITY_AUTO_DISCOVERY: 'false'
-        run: |
-          set -euo pipefail
-          ARCH_INPUT="${{ github.event.inputs.arch }}"
-          if [ -z "$ARCH_INPUT" ] || [ "$ARCH_INPUT" = "both" ]; then
-            ARCHS=(x64 arm64)
-          elif [ "$ARCH_INPUT" = "arm64" ]; then
-            ARCHS=(arm64)
-          elif [ "$ARCH_INPUT" = "x64" ]; then
-            ARCHS=(x64)
-          else
-            echo "Unknown arch input: $ARCH_INPUT" && exit 1
-          fi
-          ELECTRON_VERSION=$(node -p "require('electron/package.json').version")
-          # Build each architecture separately to ensure native modules match.
-          # Building both at once with --x64 --arm64 would use the same node_modules/
-          # for both, causing architecture mismatches (issue #706).
-          for A in "${ARCHS[@]}"; do
-            echo "=== Building for $A ==="
-            echo "Rebuilding native modules for $A (Electron $ELECTRON_VERSION)"
-            npm_config_build_from_source=true pnpm exec electron-rebuild -f -a "$A" -v "$ELECTRON_VERSION" -o sqlite3,node-pty,keytar
-            echo "Packaging $A DMG"
-            pnpm exec electron-builder --mac dmg --$A --publish never --config.npmRebuild=false
-          done
-
-      - name: Verify native module architectures match Electron
-        run: |
-          set -euo pipefail
-          # Verify that each build has native modules matching its Electron binary architecture.
-          # This catches issues like #706 where x64 builds had arm64 native modules.
-          VERIFIED_COUNT=0
-          for APP_DIR in release/mac-*/emdash.app; do
-            [ -d "$APP_DIR" ] || continue
-            ARCH_DIR=$(basename "$(dirname "$APP_DIR")")
-            case "$ARCH_DIR" in
-              mac-arm64) EXPECTED_ARCH="arm64" ;;
-              mac-x64|mac)  EXPECTED_ARCH="x86_64" ;;
-              *) echo "Unknown arch dir: $ARCH_DIR"; continue ;;
-            esac
-            echo "=== Checking $APP_DIR (expected: $EXPECTED_ARCH) ==="
-            ELECTRON_BIN="$APP_DIR/Contents/MacOS/emdash"
-            SQLITE_NODE="$APP_DIR/Contents/Resources/app.asar.unpacked/node_modules/sqlite3/build/Release/node_sqlite3.node"
-            # Check Electron binary architecture
-            ELECTRON_ARCH=$(file "$ELECTRON_BIN" | grep -o 'arm64\|x86_64' | head -1)
-            echo "Electron binary: $ELECTRON_ARCH"
-            if [ "$ELECTRON_ARCH" != "$EXPECTED_ARCH" ]; then
-              echo "::error::Electron arch mismatch: got $ELECTRON_ARCH, expected $EXPECTED_ARCH"
-              exit 1
-            fi
-            # Check sqlite3 native module architecture
-            if [ -f "$SQLITE_NODE" ]; then
-              SQLITE_ARCH=$(file "$SQLITE_NODE" | grep -o 'arm64\|x86_64' | head -1)
-              echo "sqlite3 native module: $SQLITE_ARCH"
-              if [ "$SQLITE_ARCH" != "$EXPECTED_ARCH" ]; then
-                echo "::error::sqlite3 arch mismatch: got $SQLITE_ARCH, expected $EXPECTED_ARCH"
-                exit 1
-              fi
-            else
-              echo "::warning::sqlite3 native module not found at $SQLITE_NODE"
-            fi
-            VERIFIED_COUNT=$((VERIFIED_COUNT + 1))
-          done
-          if [ "$VERIFIED_COUNT" -eq 0 ]; then
-            echo "::error::No app bundles found to verify"
-            exit 1
-          fi
-          echo "Verified $VERIFIED_COUNT app bundle(s)"
+        run: >
+          node --experimental-strip-types scripts/release/build.ts
+          --platform mac --arch ${{ github.event.inputs.arch || 'both' }} --targets dmg
 
-      - name: Smoke test sqlite3 in packaged app (arm64)
-        if: ${{ github.event.inputs.arch == '' || github.event.inputs.arch == 'arm64' || github.event.inputs.arch == 'both' }}
-        run: |
-          set -euo pipefail
-          APP="release/mac-arm64/emdash.app"
-          if [ -d "$APP" ]; then
-            echo "Requiring sqlite3 using packaged Electron (arm64)…"
-            NODE_PATH="$APP/Contents/Resources/app.asar.unpacked/node_modules" \
-            ELECTRON_RUN_AS_NODE=1 "$APP/Contents/MacOS/emdash" -e "require('sqlite3'); console.log('sqlite3 OK')"
-          else
-            echo "Arm64 app not found at $APP" && exit 1
-          fi
+      - name: Verify macOS bundle
+        run: node --experimental-strip-types scripts/release/verify-mac.ts
 
   release-linux:
     if: startsWith(github.ref, 'refs/tags/') || github.event_name == 'workflow_dispatch'
     runs-on: ubuntu-latest
     permissions:
-      contents: write
+      contents: read
     environment: release
     steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Setup pnpm
-        uses: pnpm/action-setup@v4
+      - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v4
         with:
           version: 10.28.2
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: '22'
+          node-version: '24'
           cache: 'pnpm'
-
-      - name: Setup Python 3.11 for node-gyp
-        uses: actions/setup-python@v5
+      - uses: actions/setup-python@v5
         with:
           python-version: '3.11'
 
-      - name: Install Python build deps (setuptools)
-        run: |
-          python -m pip install --upgrade pip setuptools wheel
-          echo "python=$(which python3)" >> $GITHUB_ENV
-
+      - run: python -m pip install --upgrade pip setuptools wheel
       - name: Install system build dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y build-essential pkg-config libsecret-1-dev rpm
-
-      - name: Install dependencies (allow platform optional deps)
-        env:
-          npm_config_python: ${{ env.python }}
-        run: |
-          # pnpm lockfiles are cross-platform; keep lockfile strict for reproducible builds
-          pnpm install --frozen-lockfile
+        run: sudo apt-get update && sudo apt-get install -y build-essential pkg-config libsecret-1-dev rpm
+      - run: pnpm install --frozen-lockfile
+      - run: pnpm run build
 
-      - name: Build app (ts + vite)
-        run: pnpm run build
+      - run: echo "NODE_OPTIONS=${NODE_OPTIONS:-not set}" && node --version
 
-      - name: Inject PostHog config
+      - name: Inject telemetry
         env:
           PH_KEY: ${{ secrets.POSTHOG_PROJECT_API_KEY }}
           PH_HOST: ${{ secrets.POSTHOG_HOST }}
-        run: |
-          set -euo pipefail
-          if [ -z "${PH_KEY:-}" ] || [ -z "${PH_HOST:-}" ]; then
-            echo "PostHog secrets not set; skipping telemetry injection (app will have telemetry disabled)."
-            exit 0
-          fi
-          mkdir -p dist/main
-          cat > dist/main/appConfig.json <<'JSON'
-          {
-            "posthogHost": "__PH_HOST__",
-            "posthogKey": "__PH_KEY__"
-          }
-          JSON
-          sed -i "s#__PH_HOST__#${PH_HOST}#g" dist/main/appConfig.json
-          sed -i "s#__PH_KEY__#${PH_KEY}#g" dist/main/appConfig.json
-          echo "Wrote dist/main/appConfig.json"
-
-      - name: Rebuild native modules for Electron (x64)
-        run: |
-          set -euo pipefail
-          ELECTRON_VERSION=$(node -p "require('electron/package.json').version")
-          npm_config_build_from_source=true pnpm exec electron-rebuild -f -a x64 -v "$ELECTRON_VERSION" -o sqlite3,node-pty,keytar
+        run: node --experimental-strip-types scripts/release/inject-telemetry.ts
 
-      - name: Build Linux packages (AppImage, .deb and .rpm)
-        run: pnpm run package:linux
+      - name: Build Linux packages
+        run: >
+          node --experimental-strip-types scripts/release/build.ts
+          --platform linux --arch x64
 
-      - name: Upload Linux packages to GitHub Release
+      - name: Upload to R2
         env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          set -euo pipefail
-          TAG="${GITHUB_REF_NAME}"
-          # Create if missing, or publish if draft
-          if gh release view "$TAG" >/dev/null 2>&1; then
-            gh release edit "$TAG" --draft=false --prerelease=false
-          else
-            gh release create "$TAG" --title "$TAG" --generate-notes --latest || gh release edit "$TAG" --draft=false --prerelease=false
-          fi
-          # Upload Linux packages and metadata
-          FILES=(release/emdash-*.AppImage release/emdash-*.deb release/emdash-*.rpm)
-          if [ -f release/latest-linux.yml ]; then FILES+=(release/latest-linux.yml); fi
-          gh release upload "$TAG" "${FILES[@]}" --clobber
+          R2_ACCOUNT_ID: ${{ secrets.R2_ACCOUNT_ID }}
+          R2_ACCESS_KEY_ID: ${{ secrets.R2_ACCESS_KEY_ID }}
+          R2_SECRET_ACCESS_KEY: ${{ secrets.R2_SECRET_ACCESS_KEY }}
+          R2_BUCKET: ${{ secrets.R2_BUCKET }}
+        run: node --experimental-strip-types scripts/release/upload-r2.ts
 
   release-win:
     if: startsWith(github.ref, 'refs/tags/') || github.event_name == 'workflow_dispatch'
     runs-on: windows-2022
     permissions:
-      contents: write
+      contents: read
     environment: release
     steps:
       - name: Init flags
@@ -278,7 +129,6 @@ jobs:
           set -euo pipefail
           DRY=${{ inputs.dry_run || '' }}
           if [ -z "$DRY" ]; then DRY=${{ github.event.inputs.dry_run || '' }}; fi
-          # For branch pushes, always do a dry run to avoid creating "releases" for branch names.
           if [ "${GITHUB_EVENT_NAME:-}" = "push" ] && [ "${GITHUB_REF_TYPE:-}" = "branch" ]; then
             DRY=true
           fi
@@ -289,34 +139,25 @@ jobs:
           esac
           echo "dry_run=$DRY" >> "$GITHUB_OUTPUT"
 
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Setup pnpm
-        uses: pnpm/action-setup@v4
+      - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v4
         with:
           version: 10.28.2
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
+      - uses: actions/setup-node@v4
         with:
-          # Node 22 can trigger native module source builds that are flakier on Windows.
-          # Node 20 is within engines range and closer to Electron's Node baseline.
-          node-version: '20'
+          node-version: '24'
           cache: 'pnpm'
-
-      - name: Setup Python 3.11 for node-gyp
-        uses: actions/setup-python@v5
+      - uses: actions/setup-python@v5
         with:
           python-version: '3.11'
 
-      - name: Install Python build deps (setuptools shim for distutils)
+      - name: Install Python build deps
         shell: bash
         run: |
           python -m pip install --upgrade pip setuptools wheel
           echo "python=$(which python)" >> "$GITHUB_ENV"
 
-      - name: Install dependencies (strict lockfile)
+      - name: Install dependencies
         shell: bash
         env:
           npm_config_python: ${{ env.python }}
@@ -324,30 +165,19 @@ jobs:
           GYP_MSVS_VERSION: 2022
         run: pnpm install --frozen-lockfile
 
-      - name: Build app (ts + vite)
+      - name: Build app
         shell: bash
         run: pnpm run build
 
-      - name: Inject PostHog config
+      - shell: bash
+        run: echo "NODE_OPTIONS=${NODE_OPTIONS:-not set}" && node --version
+
+      - name: Inject telemetry
         shell: bash
         env:
           PH_KEY: ${{ secrets.POSTHOG_PROJECT_API_KEY }}
           PH_HOST: ${{ secrets.POSTHOG_HOST }}
-        run: |
-          set -euo pipefail
-          if [ -z "${PH_KEY:-}" ] || [ -z "${PH_HOST:-}" ]; then
-            echo "PostHog secrets not set; skipping telemetry injection (app will have telemetry disabled)."
-            exit 0
-          fi
-          node - <<'NODE'
-          const fs = require('node:fs');
-          fs.mkdirSync('dist/main', { recursive: true });
-          fs.writeFileSync(
-            'dist/main/appConfig.json',
-            JSON.stringify({ posthogHost: process.env.PH_HOST, posthogKey: process.env.PH_KEY }, null, 2)
-          );
-          console.log('Wrote dist/main/appConfig.json');
-          NODE
+        run: node --experimental-strip-types scripts/release/inject-telemetry.ts
 
       - name: Check Azure Trusted Signing secrets
         id: signing
@@ -359,80 +189,37 @@ jobs:
         run: |
           if [ -n "$AZ_TENANT" ] && [ -n "$AZ_CLIENT" ] && [ -n "$AZ_SECRET" ]; then
             echo "has_signing=true" >> "$GITHUB_OUTPUT"
-            echo "Azure Trusted Signing secrets are configured."
           else
             echo "has_signing=false" >> "$GITHUB_OUTPUT"
             echo "::warning::Azure Trusted Signing secrets not configured. Windows build will be unsigned."
           fi
 
-      - name: Rebuild native modules (x64)
-        shell: bash
-        run: |
-          set -euo pipefail
-          ELECTRON_VERSION=$(node -p "require('electron/package.json').version")
-          npm_config_build_from_source=true pnpm exec electron-rebuild -f -a x64 -v "$ELECTRON_VERSION" -o sqlite3,node-pty,keytar
-
-      - name: Build Windows packages (NSIS + MSI) (no publish)
+      - name: Build Windows packages
         shell: bash
         env:
           AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
           AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
           AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }}
-        run: |
-          set -euo pipefail
-          pnpm exec electron-builder --win nsis msi --x64 --publish never --config.npmRebuild=false
-          ls -lah release || true
+        run: >
+          node --experimental-strip-types scripts/release/build.ts
+          --platform win --arch x64
 
       - name: Verify Windows code signature
         if: ${{ steps.signing.outputs.has_signing == 'true' }}
-        shell: pwsh
-        run: |
-          $ErrorActionPreference = 'Stop'
-          $files = @()
-          $files += Get-ChildItem -Path release -Filter 'emdash-*.exe' -ErrorAction SilentlyContinue
-          $files += Get-ChildItem -Path release -Filter 'emdash-*.msi' -ErrorAction SilentlyContinue
-          if ($files.Count -eq 0) {
-            Write-Host "::error::No .exe or .msi files found in release/ to verify"
-            exit 1
-          }
-          $failed = $false
-          foreach ($f in $files) {
-            Write-Host "Verifying signature on $($f.Name)..."
-            $sig = Get-AuthenticodeSignature -FilePath $f.FullName
-            if ($sig.Status -ne 'Valid') {
-              Write-Host "::error::Signature invalid on $($f.Name): $($sig.Status) - $($sig.StatusMessage)"
-              $failed = $true
-            } else {
-              Write-Host "  Status: $($sig.Status)"
-              Write-Host "  Subject: $($sig.SignerCertificate.Subject)"
-              Write-Host "  Issuer: $($sig.SignerCertificate.Issuer)"
-              Write-Host "  Thumbprint: $($sig.SignerCertificate.Thumbprint)"
-            }
-          }
-          if ($failed) { exit 1 }
-          Write-Host "All Windows installers are properly signed."
-
-      - name: Publish GitHub Release and upload Windows artifacts
+        shell: bash
+        run: node --experimental-strip-types scripts/release/verify-win.ts
+
+      - name: Upload to R2
         if: ${{ steps.init.outputs.dry_run != 'true' }}
         shell: bash
         env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          set -euo pipefail
-          TAG="${GITHUB_REF_NAME}"
-          # Create if missing, or publish if draft
-          if gh release view "$TAG" >/dev/null 2>&1; then
-            gh release edit "$TAG" --draft=false --prerelease=false
-          else
-            gh release create "$TAG" --title "$TAG" --generate-notes --latest || gh release edit "$TAG" --draft=false --prerelease=false
-          fi
-          FILES=(release/emdash-*.exe release/emdash-*.msi)
-          if ls release/*.blockmap >/dev/null 2>&1; then FILES+=(release/*.blockmap); fi
-          if [ -f release/latest.yml ]; then FILES+=(release/latest.yml); fi
-          if [ -f release/latest-win.yml ]; then FILES+=(release/latest-win.yml); fi
-          gh release upload "$TAG" "${FILES[@]}" --clobber
+          R2_ACCOUNT_ID: ${{ secrets.R2_ACCOUNT_ID }}
+          R2_ACCESS_KEY_ID: ${{ secrets.R2_ACCESS_KEY_ID }}
+          R2_SECRET_ACCESS_KEY: ${{ secrets.R2_SECRET_ACCESS_KEY }}
+          R2_BUCKET: ${{ secrets.R2_BUCKET }}
+        run: node --experimental-strip-types scripts/release/upload-r2.ts
 
-      - name: Upload Windows artifacts (dry-run)
+      - name: Upload artifacts (dry-run)
         if: ${{ steps.init.outputs.dry_run == 'true' }}
         uses: actions/upload-artifact@v4
         with:
@@ -441,22 +228,20 @@ jobs:
             release/emdash-*.exe
             release/emdash-*.msi
             release/*.blockmap
-            release/latest*.yml
+            release/v1-stable*.yml
           if-no-files-found: error
 
   release-mac:
-    # Run for tagged pushes (normal release) and for manual runs (dry run or ad-hoc release)
     if: startsWith(github.ref, 'refs/tags/') || github.event_name == 'workflow_dispatch'
     runs-on: macos-latest
     permissions:
-      contents: write
+      contents: read
     environment: release
     steps:
       - name: Init flags
         id: init
         run: |
           set -euo pipefail
-          # Normalize dry_run from workflow_dispatch inputs (string: true/false)
           DRY=${{ inputs.dry_run || '' }}
           if [ -z "$DRY" ]; then DRY=${{ github.event.inputs.dry_run || '' }}; fi
           DRY=$(printf "%s" "$DRY" | tr '[:upper:]' '[:lower:]')
@@ -465,34 +250,23 @@ jobs:
             *) DRY=false ;;
           esac
           echo "dry_run=$DRY" >> "$GITHUB_OUTPUT"
-      - name: Checkout
-        uses: actions/checkout@v4
 
-      - name: Setup pnpm
-        uses: pnpm/action-setup@v4
+      - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v4
         with:
           version: 10.28.2
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: '22'
+          node-version: '24'
           cache: 'pnpm'
-
-      - name: Setup Python 3.11 for node-gyp
-        uses: actions/setup-python@v5
+      - uses: actions/setup-python@v5
         with:
           python-version: '3.11'
 
-      - name: Install Python build deps (setuptools shim for distutils)
-        run: |
+      - run: |
           python -m pip install --upgrade pip setuptools wheel
           echo "python=$(which python3)" >> $GITHUB_ENV
-
-      - name: Install dependencies (strict lockfile)
-        env:
-          npm_config_python: ${{ env.python }}
-        run: pnpm install --frozen-lockfile
+      - run: pnpm install --frozen-lockfile
 
       - name: Import Apple signing certificate
         uses: apple-actions/import-codesign-certs@v2
@@ -500,299 +274,56 @@ jobs:
           p12-file-base64: ${{ secrets.CERTIFICATE_P12 }}
           p12-password: ${{ secrets.CERTIFICATE_PASSWORD }}
 
-      - name: Build app (ts + vite)
-        run: pnpm run build
+      - run: pnpm run build
+
+      - run: echo "NODE_OPTIONS=${NODE_OPTIONS:-not set}" && node --version
 
-      - name: Inject PostHog config (release job)
+      - name: Inject telemetry
         env:
           PH_KEY: ${{ secrets.POSTHOG_PROJECT_API_KEY }}
           PH_HOST: ${{ secrets.POSTHOG_HOST }}
-        run: |
-          set -euo pipefail
-          if [ -z "${PH_KEY:-}" ] || [ -z "${PH_HOST:-}" ]; then
-            echo "::warning::PostHog secrets not set; telemetry will be disabled in this build."
-            exit 0
-          fi
-          mkdir -p dist/main
-          cat > dist/main/appConfig.json <<'JSON'
-          {
-            "posthogHost": "__PH_HOST__",
-            "posthogKey": "__PH_KEY__"
-          }
-          JSON
-          sed -i '' "s#__PH_HOST__#${PH_HOST}#g" dist/main/appConfig.json
-          sed -i '' "s#__PH_KEY__#${PH_KEY}#g" dist/main/appConfig.json
-          echo "Wrote dist/main/appConfig.json"
-
-      - name: Check notarization secrets
-        id: flags
-        env:
-          K: ${{ secrets.APPLE_API_KEY }}
-          KID: ${{ secrets.APPLE_API_KEY_ID }}
-          ISS: ${{ secrets.APPLE_API_ISSUER }}
-        run: |
-          if [ -n "$K" ] && [ -n "$KID" ] && [ -n "$ISS" ]; then
-            echo "has_apple_api=true" >> $GITHUB_OUTPUT
-          else
-            echo "has_apple_api=false" >> $GITHUB_OUTPUT
-          fi
-
-      - name: Prepare Apple API key (if provided)
-        if: ${{ steps.flags.outputs.has_apple_api == 'true' }}
-        run: |
-          echo "${{ secrets.APPLE_API_KEY }}" > ./apple_api_key.p8
-          echo "APPLE_API_KEY=$(pwd)/apple_api_key.p8" >> $GITHUB_ENV
-          echo "APPLE_API_KEY_ID=${{ secrets.APPLE_API_KEY_ID }}" >> $GITHUB_ENV
-          echo "APPLE_API_ISSUER=${{ secrets.APPLE_API_ISSUER }}" >> $GITHUB_ENV
+        run: node --experimental-strip-types scripts/release/inject-telemetry.ts
 
-      - name: Build signed DMG(s) (do not publish yet)
+      - name: Build signed DMGs + ZIPs
         env:
           CSC_IDENTITY_AUTO_DISCOVERY: 'true'
           APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
           APPLE_ID: ${{ secrets.APPLE_ID }}
           APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_APP_SPECIFIC_PASSWORD }}
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          set -euo pipefail
-          # Guard against legacy env vars overriding cert-import flow
-          unset CSC_LINK CSC_KEY_PASSWORD CSC_NAME
-          # Force Apple ID notarization for the app build to avoid bad APPLE_API_KEY paths
-          unset APPLE_API_KEY APPLE_API_KEY_ID APPLE_API_ISSUER
-          export TEAM_ID="${APPLE_TEAM_ID}"
-          export NOTARIZE_TEAM_ID="${APPLE_TEAM_ID}"
-          echo "App notarization method: Apple ID (TEAM_ID=$TEAM_ID)"
-          ARCH_INPUT="${{ github.event.inputs.arch }}"
-          if [ -z "$ARCH_INPUT" ] || [ "$ARCH_INPUT" = "both" ]; then
-            ARCHS=(x64 arm64)
-          elif [ "$ARCH_INPUT" = "arm64" ]; then
-            ARCHS=(arm64)
-          elif [ "$ARCH_INPUT" = "x64" ]; then
-            ARCHS=(x64)
-          else
-            echo "Unknown arch input: $ARCH_INPUT" && exit 1
-          fi
-          ELECTRON_VERSION=$(node -p "require('electron/package.json').version")
-          # Build each architecture separately to ensure native modules match.
-          # Building both at once with --x64 --arm64 would use the same node_modules/
-          # for both, causing architecture mismatches (issue #706).
-          for A in "${ARCHS[@]}"; do
-            echo "=== Building for $A ==="
-            echo "Rebuilding native modules for $A (Electron $ELECTRON_VERSION)"
-            npm_config_build_from_source=true pnpm exec electron-rebuild -f -a "$A" -v "$ELECTRON_VERSION" -o sqlite3,node-pty,keytar
-            echo "Packaging $A DMG and ZIP"
-            pnpm exec electron-builder --mac dmg zip --$A --publish never --config.npmRebuild=false
-          done
-
-      - name: Verify native module architectures match Electron
-        run: |
-          set -euo pipefail
-          # Verify that each build has native modules matching its Electron binary architecture.
-          # This catches issues like #706 where x64 builds had arm64 native modules.
-          VERIFIED_COUNT=0
-          for APP_DIR in release/mac-*/emdash.app; do
-            [ -d "$APP_DIR" ] || continue
-            ARCH_DIR=$(basename "$(dirname "$APP_DIR")")
-            case "$ARCH_DIR" in
-              mac-arm64) EXPECTED_ARCH="arm64" ;;
-              mac-x64|mac)  EXPECTED_ARCH="x86_64" ;;
-              *) echo "Unknown arch dir: $ARCH_DIR"; continue ;;
-            esac
-            echo "=== Checking $APP_DIR (expected: $EXPECTED_ARCH) ==="
-            ELECTRON_BIN="$APP_DIR/Contents/MacOS/emdash"
-            SQLITE_NODE="$APP_DIR/Contents/Resources/app.asar.unpacked/node_modules/sqlite3/build/Release/node_sqlite3.node"
-            # Check Electron binary architecture
-            ELECTRON_ARCH=$(file "$ELECTRON_BIN" | grep -o 'arm64\|x86_64' | head -1)
-            echo "Electron binary: $ELECTRON_ARCH"
-            if [ "$ELECTRON_ARCH" != "$EXPECTED_ARCH" ]; then
-              echo "::error::Electron arch mismatch: got $ELECTRON_ARCH, expected $EXPECTED_ARCH"
-              exit 1
-            fi
-            # Check sqlite3 native module architecture
-            if [ -f "$SQLITE_NODE" ]; then
-              SQLITE_ARCH=$(file "$SQLITE_NODE" | grep -o 'arm64\|x86_64' | head -1)
-              echo "sqlite3 native module: $SQLITE_ARCH"
-              if [ "$SQLITE_ARCH" != "$EXPECTED_ARCH" ]; then
-                echo "::error::sqlite3 arch mismatch: got $SQLITE_ARCH, expected $EXPECTED_ARCH"
-                exit 1
-              fi
-            else
-              echo "::warning::sqlite3 native module not found at $SQLITE_NODE"
-            fi
-            VERIFIED_COUNT=$((VERIFIED_COUNT + 1))
-          done
-          if [ "$VERIFIED_COUNT" -eq 0 ]; then
-            echo "::error::No app bundles found to verify"
-            exit 1
-          fi
-          echo "Verified $VERIFIED_COUNT app bundle(s)"
+        run: >
+          node --experimental-strip-types scripts/release/build.ts
+          --platform mac --arch ${{ github.event.inputs.arch || 'both' }} --targets dmg,zip
 
-      - name: Smoke test sqlite3 in packaged app (arm64, signed)
-        if: ${{ github.event.inputs.arch == '' || github.event.inputs.arch == 'arm64' || github.event.inputs.arch == 'both' }}
-        run: |
-          set -euo pipefail
-          APP="release/mac-arm64/emdash.app"
-          if [ -d "$APP" ]; then
-            echo "Requiring sqlite3 using packaged Electron (arm64, signed)…"
-            NODE_PATH="$APP/Contents/Resources/app.asar.unpacked/node_modules" \
-            ELECTRON_RUN_AS_NODE=1 "$APP/Contents/MacOS/emdash" -e "require('sqlite3'); console.log('sqlite3 OK')"
-          else
-            echo "Arm64 app not found at $APP" && exit 1
-          fi
+      - name: Verify macOS bundle
+        run: >
+          node --experimental-strip-types scripts/release/verify-mac.ts
+          --expected-team-id ${{ secrets.APPLE_TEAM_ID }}
 
-      - name: Verify Developer ID signing
-        env:
-          EXPECT_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
-        run: |
-          set -euo pipefail
-          FAILED=0
-          for APP in release/mac*/emdash.app; do
-            if [ -d "$APP" ]; then
-              echo "Checking codesign for $APP"
-              META=$(codesign -dv --verbose=4 "$APP" 2>&1)
-              echo "$META" | grep -q "Authority=Developer ID Application" || { echo "::error::Not Developer ID Application signed"; FAILED=1; }
-              if [ -n "${EXPECT_TEAM_ID:-}" ]; then
-                TID=$(printf "%s\n" "$META" | awk -F= '/TeamIdentifier=/{print $2; exit}')
-                if [ "$TID" != "$EXPECT_TEAM_ID" ]; then
-                  echo "::error::TeamIdentifier mismatch (got '$TID', expected '$EXPECT_TEAM_ID')"; FAILED=1
-                fi
-              fi
-            fi
-          done
-          [ "$FAILED" -eq 0 ] || exit 1
-
-      - name: Verify bundle metadata and integrity (no app notarization required)
-        run: |
-          set -euo pipefail
-          for APP in release/mac*/emdash.app; do
-            if [ -d "$APP" ]; then
-              echo "Asserting bundle ID and resources for $APP"
-              PLIST="$APP/Contents/Info.plist"
-              if [ ! -f "$PLIST" ]; then
-                echo "::error::Missing Info.plist at $PLIST"; exit 1
-              fi
-              # Read CFBundleIdentifier robustly (defaults can be flaky on raw files)
-              BID=$(/usr/libexec/PlistBuddy -c 'Print :CFBundleIdentifier' "$PLIST" 2>/dev/null || true)
-              if [ -z "$BID" ]; then
-                BID=$(plutil -extract CFBundleIdentifier xml1 -o - "$PLIST" 2>/dev/null | sed -n 's/.*<string>\(.*\)<\/string>.*/\1/p' | head -n1)
-              fi
-              if [ "$BID" != "com.emdash" ]; then
-                echo "::error::CFBundleIdentifier mismatch (got '$BID', expected 'com.emdash')"; exit 1
-              fi
-              # Ensure packaged resources exist (prevents white-screen adhoc shells)
-              if [ ! -f "$APP/Contents/Resources/app.asar" ] && [ ! -d "$APP/Contents/Resources/app" ]; then
-                echo "::error::Missing packaged renderer resources (app.asar or Resources/app)"; exit 1
-              fi
-              echo "codesign --verify --deep --strict"
-              codesign --verify --deep --strict --verbose=2 "$APP"
-              echo "Skip spctl on raw app (validated later via DMG end-to-end check)"
-            fi
-          done
-
-      - name: Staple and validate artifacts (best-effort for app)
-        run: |
-          set -euo pipefail
-          # Staple apps
-          for APP in release/mac*/emdash.app; do
-            if [ -d "$APP" ]; then
-              echo "Attempt staple $APP (may be not notarized)"; xcrun stapler staple "$APP" || echo "App staple skipped"
-              echo "Validate $APP (best-effort)"; xcrun stapler validate "$APP" || echo "App validate skipped"
-            fi
-          done
-          # Staple DMGs
-          for DMG in release/*.dmg; do
-            if [ -f "$DMG" ]; then
-              echo "Stapling $DMG (best-effort; only app must be stapled)"
-              if ! xcrun stapler staple "$DMG"; then
-                echo "Warning: DMG notarization ticket not found (expected if only app was notarized). Skipping."
-              else
-                xcrun stapler validate "$DMG" || echo "Warning: DMG validate failed; app is stapled and validated."
-              fi
-            fi
-          done
-
-      - name: Notarize and staple DMGs (ensures user-downloadable DMG works)
-        if: ${{ steps.flags.outputs.has_apple_api == 'true' }}
-        env:
-          APPLE_API_KEY: ${{ env.APPLE_API_KEY }}
-          APPLE_API_KEY_ID: ${{ env.APPLE_API_KEY_ID }}
-          APPLE_API_ISSUER: ${{ env.APPLE_API_ISSUER }}
-        run: |
-          set -euo pipefail
-          for DMG in release/*.dmg; do
-            [ -f "$DMG" ] || continue
-            echo "Submitting $DMG to Apple Notary (notarytool)..."
-            xcrun notarytool submit "$DMG" \
-              --key "$APPLE_API_KEY" \
-              --key-id "$APPLE_API_KEY_ID" \
-              --issuer "$APPLE_API_ISSUER" \
-              --wait
-            echo "Stapling $DMG after notarization"
-            xcrun stapler staple -v "$DMG"
-            xcrun stapler validate "$DMG"
-          done
-
-      - name: 'End-to-end check: app inside DMG passes Gatekeeper'
-        run: |
-          set -euo pipefail
-          for DMG in release/*.dmg; do
-            [ -f "$DMG" ] || continue
-            MNT=$(mktemp -d)
-            echo "Mounting $DMG at $MNT"; hdiutil attach "$DMG" -mountpoint "$MNT" -nobrowse -quiet
-            APP="$MNT/emdash.app"
-            if [ ! -d "$APP" ]; then
-              echo "::error::No emdash.app found inside $DMG"; hdiutil detach "$MNT" -quiet || true; rm -rf "$MNT"; exit 1
-            fi
-            echo "codesign info for app inside DMG:"; codesign -dv --verbose=4 "$APP" 2>&1 | sed -n '1,60p'
-            echo "Gatekeeper assessment (should be accepted):"; spctl -a -vv --type execute "$APP"
-            hdiutil detach "$MNT" -quiet || true; rm -rf "$MNT"
-          done
-
-      - name: Publish GitHub Release and upload artifacts
+      - name: Notarize and staple
         if: ${{ steps.init.outputs.dry_run != 'true' }}
         env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          set -euo pipefail
-          TAG="${GITHUB_REF_NAME}"
-          # Create if missing, or publish if draft
-          if gh release view "$TAG" >/dev/null 2>&1; then
-            gh release edit "$TAG" --draft=false --prerelease=false
-          else
-            gh release create "$TAG" --title "$TAG" --generate-notes --latest || gh release edit "$TAG" --draft=false --prerelease=false
-          fi
-          # Upload stapled DMGs, ZIPs (for auto-update), and update files
-          FILES=(release/emdash-*.dmg release/emdash-*.zip)
-          if ls release/*.blockmap >/dev/null 2>&1; then FILES+=(release/*.blockmap); fi
-          if [ -f release/latest-mac.yml ]; then FILES+=(release/latest-mac.yml); fi
-          gh release upload "$TAG" "${FILES[@]}" --clobber
+          APPLE_API_KEY_CONTENT: ${{ secrets.APPLE_API_KEY }}
+          APPLE_API_KEY_ID: ${{ secrets.APPLE_API_KEY_ID }}
+          APPLE_API_ISSUER: ${{ secrets.APPLE_API_ISSUER }}
+        run: node --experimental-strip-types scripts/release/notarize-mac.ts
 
-      - name: Inspect built artifacts (dry-run)
-        if: ${{ steps.init.outputs.dry_run == 'true' }}
-        run: |
-          set -euo pipefail
-          echo "Contents of release/:"
-          ls -lah release || true
-          echo "Find DMGs:"
-          find release -maxdepth 1 -type f -name 'emdash-*.dmg' -print
-          DMG_COUNT=$(find release -maxdepth 1 -type f -name 'emdash-*.dmg' | wc -l | tr -d ' ')
-          if [ "$DMG_COUNT" -eq 0 ]; then
-            echo "::error::No DMG files found in release/."; exit 1
-          fi
+      - name: Upload to R2
+        if: ${{ steps.init.outputs.dry_run != 'true' }}
+        env:
+          R2_ACCOUNT_ID: ${{ secrets.R2_ACCOUNT_ID }}
+          R2_ACCESS_KEY_ID: ${{ secrets.R2_ACCESS_KEY_ID }}
+          R2_SECRET_ACCESS_KEY: ${{ secrets.R2_SECRET_ACCESS_KEY }}
+          R2_BUCKET: ${{ secrets.R2_BUCKET }}
+        run: node --experimental-strip-types scripts/release/upload-r2.ts
 
-      - name: Upload signed DMGs (dry-run)
+      - name: Upload artifacts (dry-run)
         if: ${{ steps.init.outputs.dry_run == 'true' }}
         uses: actions/upload-artifact@v4
         with:
           name: SIGNED-STAPLED-DMGS
-          path: release/emdash-*.dmg
-          if-no-files-found: error
-
-      - name: Upload supplemental files (blockmaps/yml) (dry-run)
-        if: ${{ steps.init.outputs.dry_run == 'true' }}
-        uses: actions/upload-artifact@v4
-        with:
-          name: SIGNED-STAPLED-DMGS-extras
           path: |
+            release/emdash-*.dmg
+            release/emdash-*.zip
             release/*.blockmap
-            release/latest-mac.yml
-          if-no-files-found: ignore
+            release/v1-stable*.yml
+          if-no-files-found: error
diff --git a/.github/workflows/windows-beta-build.yml b/.github/workflows/windows-beta-build.yml
index a6aeb8d12b..fcd374c852 100644
--- a/.github/workflows/windows-beta-build.yml
+++ b/.github/workflows/windows-beta-build.yml
@@ -48,9 +48,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          # Node 22 can trigger native module source builds that are flakier on Windows.
-          # Node 20 is within engines range and closer to Electron's Node baseline.
-          node-version: '20'
+          node-version: '24'
           cache: 'pnpm'
 
       - name: Setup Python 3.11 for node-gyp
@@ -81,7 +79,7 @@ jobs:
         run: |
           set -euo pipefail
           ELECTRON_VERSION=$(node -p "require('electron/package.json').version")
-          npm_config_build_from_source=true pnpm exec electron-rebuild -f -a x64 -v "$ELECTRON_VERSION" -o sqlite3,node-pty,keytar
+          npm_config_build_from_source=true pnpm exec electron-rebuild -f -a x64 -v "$ELECTRON_VERSION" -o sqlite3,node-pty
 
       - name: Package Windows (NSIS + MSI) (no publish)
         shell: bash
diff --git a/.gitignore b/.gitignore
index 8d9e1a2ad5..ff7dafab98 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,8 @@
 # Dependencies
 node_modules/
 dist/
-release/
+out/
+/release/
 
 # Logs
 *.log
@@ -59,9 +60,6 @@ Thumbs.db
 .notes
 .claude/
 
-# Local generated worktrees for perf experiments
-worktrees/
-
 # Checkouts directory
 .checkouts/
 
@@ -69,3 +67,6 @@ worktrees/
 
 .env
 .cursor
+.codex/config.toml
+
+src/main/appConfig.json
\ No newline at end of file
diff --git a/.nvmrc b/.nvmrc
index 442c7587a9..d845d9d88d 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-22.20.0
+24.14.0
diff --git a/.prettierignore b/.prettierignore
index 227943b019..09dada1cb4 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -7,6 +7,7 @@
 **/.next
 **/build
 **/.turbo
+**/out
 
 # ignore config files that shouldn't be formatted
 **/.env*
diff --git a/.prettierrc b/.prettierrc
index cb35617fac..3453c182a0 100644
--- a/.prettierrc
+++ b/.prettierrc
@@ -6,5 +6,15 @@
   "tabWidth": 2,
   "bracketSpacing": true,
   "bracketSameLine": false,
-  "plugins": ["prettier-plugin-tailwindcss"]
+  "plugins": ["prettier-plugin-tailwindcss", "@ianvs/prettier-plugin-sort-imports"],
+  "tailwindStylesheet": "./src/renderer/index.css",
+  "importOrder": [
+    "^@/(.*)$",
+    "^@root/(.*)$",
+    "^@shared/(.*)$",
+    "^@main/(.*)$",
+    "^@renderer/(.*)$",
+    "^[./]"
+  ],
+  "importOrderTypeScriptVersion": "5.0.0"
 }
diff --git a/AGENTS.md b/AGENTS.md
index 4a99a3a78f..5fd350c342 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -1,15 +1,16 @@
+
 ---
 default_branch: main
 package_manager: pnpm
-node_version: "22.20.0"
+node_version: "24.x.x"
 start_command: "pnpm run d"
 dev_command: "pnpm run dev"
 build_command: "pnpm run build"
 test_commands:
   - "pnpm run format"
   - "pnpm run lint"
-  - "pnpm run type-check"
-  - "pnpm exec vitest run"
+  - "pnpm run typecheck"
+  - "pnpm run test"
 ports:
   dev: 3000
 required_env: []
@@ -23,329 +24,74 @@ optional_env:
   - CODEX_APPROVAL_POLICY
 ---
 
-# Emdash
-
-Cross-platform Electron app that orchestrates multiple CLI coding agents (Claude Code, Codex, Qwen Code, Amp, etc.) in parallel. Each agent runs in its own Git worktree for isolation. Also supports remote development over SSH.
-
-### Tech Stack
-
-- **Runtime**: Electron 30.5.1, Node.js >=20.0.0 <23.0.0 (recommended: 22.20.0 via `.nvmrc`)
-- **Frontend**: React 18, TypeScript 5.3, Vite 5, Tailwind CSS 3
-- **Backend**: Node.js, TypeScript, Drizzle ORM 0.32, SQLite3 5.1
-- **Editor**: Monaco Editor 0.55, **Terminal**: @xterm/xterm 6.0 + node-pty 1.0
-- **Native Modules**: node-pty, sqlite3, keytar 7.9 (require `pnpm run rebuild` after updates)
-- **SSH**: ssh2 1.17
-- **UI**: Radix UI primitives, lucide-react icons, framer-motion
-
-## Quickstart
-
-1. `nvm use` (installs Node 22.20.0 if missing) or install Node 22.x manually.
-2. `pnpm run d` to install dependencies and launch Electron + Vite.
-3. If `pnpm run d` fails mid-stream, rerun `pnpm install`, then `pnpm run dev` (main + renderer).
-
-## Development Commands
-
-```bash
-# Quick start (installs deps, starts dev)
-pnpm run d
-
-# Development (runs main + renderer concurrently)
-pnpm run dev
-pnpm run dev:main     # Electron main process only (tsc + electron)
-pnpm run dev:renderer # Vite dev server only (port 3000)
-
-# Quality checks (ALWAYS run before committing)
-pnpm run format       # Format with Prettier
-pnpm run lint         # ESLint
-pnpm run type-check   # TypeScript type checking (uses tsconfig.json — renderer/shared/types)
-pnpm exec vitest run  # Run all tests
-
-# Run a specific test
-pnpm exec vitest run src/test/main/WorktreeService.test.ts
-
-# Native modules
-pnpm run rebuild      # Rebuild native modules for Electron
-pnpm run reset        # Clean install (removes node_modules, reinstalls)
-
-# Building & Packaging
-pnpm run build        # Build main + renderer
-pnpm run package:mac  # macOS .dmg (arm64)
-pnpm run package:linux # Linux AppImage/deb (x64)
-pnpm run package:win  # Windows nsis/portable (x64)
-```
-
-## Testing
-
-Tests use `vi.mock()` to stub `electron`, `DatabaseService`, `logger`, etc. Integration tests create real git repos in `os.tmpdir()`. No shared test setup file — mocks are per-file.
-
-- **Framework**: Vitest (configured in `vite.config.ts`, `environment: 'node'`)
-- **Test locations**: `src/test/main/` (15 service tests), `src/test/renderer/` (3 UI tests), `src/main/utils/__tests__/` (2 utility tests)
-
-## Guardrails
-
-- **ALWAYS** run `pnpm run format`, `pnpm run lint`, `pnpm run type-check`, and `pnpm exec vitest run` before committing.
-- **NEVER** modify `drizzle/meta/` or numbered migration files — always use `drizzle-kit generate`.
-- **NEVER** modify `build/` entitlements or updater config without review.
-- **ALWAYS** use feature branches or worktrees; never commit directly to `main`.
-- Do limit edits to `src/**`, `docs/**`, or config files you fully understand; keep `dist/`, `release/`, and `build/` untouched.
-- Don't modify telemetry defaults or updater logic unless intentional and reviewed.
-- Don't run commands that mutate global environments (global package installs, git pushes) from agent scripts.
-- Put temporary notes or scratch content in `.notes/` (gitignored).
-
-## Architecture
-
-### Process Model
-
-- **Main process** (`src/main/`): Electron main — IPC handlers, services, database, PTY management
-- **Renderer process** (`src/renderer/`): React UI built with Vite — components, hooks, terminal panes
-- **Shared** (`src/shared/`): Provider registry (21 agent definitions), PTY ID helpers, shared utilities
-
-### Boot Sequence
-
-`entry.ts` → `main.ts` → IPC registration → window creation
-
-- `entry.ts` — Sets app name (must happen before `app.getPath('userData')`, or Electron defaults to `~/Library/Application Support/Electron`). Monkey-patches `Module._resolveFilename` to resolve `@shared/*` and `@/*` path aliases at runtime in compiled JS.
-- `main.ts` — Loads `.env`, fixes PATH for CLI discovery on macOS/Linux/Windows (adds Homebrew, npm global, nvm paths so agents like `gh`, `codex`, `claude` are found when launched from Finder), detects `SSH_AUTH_SOCK` from user's login shell, then initializes Electron windows and registers all IPC handlers.
-- `preload.ts` — Exposes secure `electronAPI` to renderer via `contextBridge`.
-
-### Main Process (`src/main/`)
-
-**Key services** (`src/main/services/`):
-- `WorktreeService.ts` — Git worktree lifecycle, file preservation patterns
-- `WorktreePoolService.ts` — Worktree pooling/reuse for instant task starts
-- `DatabaseService.ts` — All SQLite CRUD operations
-- `ptyManager.ts` — PTY (pseudo-terminal) lifecycle, session isolation, agent spawning
-- `SkillsService.ts` — Cross-agent skill installation and catalog management
-- `GitHubService.ts` / `GitService.ts` — Git and GitHub operations via `gh` CLI
-- `PrGenerationService.ts` — Automated PR generation
-- `TaskLifecycleService.ts` — Task lifecycle orchestration
-- `TerminalSnapshotService.ts` — Terminal state snapshots
-- `TerminalConfigParser.ts` — Terminal configuration parsing
-- `RepositoryManager.ts` — Repository management
-- `RemotePtyService.ts` / `RemoteGitService.ts` — Remote development over SSH
-- `ssh/` — SSH connection management, credentials (via keytar), host key verification
-
-Note: Some IPC handler files are colocated in `services/` (e.g., `worktreeIpc.ts`, `ptyIpc.ts`, `updateIpc.ts`, `lifecycleIpc.ts`, `planLockIpc.ts`, `fsIpc.ts`).
-
-**IPC Handlers** (`src/main/ipc/`):
-- 25+ handler files total (19 in `ipc/` + 6 colocated in `services/`) covering app, db, git, github, browser, connections, project, settings, telemetry, SSH, Linear, Jira, skills, and more
-- All return `{ success: boolean, data?: any, error?: string }` format
-- Types defined in `src/renderer/types/electron-api.d.ts` (~1,870 lines)
-
-**Database** (`src/main/db/`):
-- Schema: `schema.ts` — Migrations: `drizzle/` (auto-generated)
-- Locations: macOS `~/Library/Application Support/emdash/emdash.db`, Linux `~/.config/emdash/emdash.db`, Windows `%APPDATA%\emdash\emdash.db`
-- Override with `EMDASH_DB_FILE` env var
-
-### Renderer Process (`src/renderer/`)
-
-**Key components** (`components/`):
-- `App.tsx` — Root orchestration (~790 lines), located at `src/renderer/App.tsx`
-- `EditorMode.tsx` — Monaco code editor
-- `ChatInterface.tsx` — Conversation UI
-- `FileChangesPanel.tsx` / `ChangesDiffModal.tsx` — Diff visualization and review
-- `CommandPalette.tsx` — Command/action palette
-- `FileExplorer/` — File tree navigation
-- `BrowserPane.tsx` — Webview preview
-- `skills/` — Skills catalog and management UI
-- `ssh/` — SSH connection UI components
-
-**Key hooks** (`hooks/`, 42 total):
-- `useAppInitialization` — Two-round project/task loading (fast skeleton then full), restores last active project/task from localStorage
-- `useTaskManagement` — Full task lifecycle (~864 lines): create, delete, rename, archive, restore. Handles optimistic UI removal with rollback, lifecycle teardown, PTY cleanup
-- `useCliAgentDetection` — Detects which CLI agents are installed on the system
-- `useInitialPromptInjection` / `usePendingInjection` — Manages initial prompt sent to agents on task start
-
-### Path Aliases
-
-**Important**: `@/*` resolves differently in main vs renderer:
-
-| Alias | tsconfig.json (renderer) | tsconfig.main.json (main) |
-|-------|-------------------------|--------------------------|
-| `@/*` | `src/renderer/*` | `src/*` |
-| `@shared/*` | `src/shared/*` | `src/shared/*` |
-| `#types/*` | `src/types/*` | _(not available)_ |
-| `#types` | `src/types/index.ts` | _(not available)_ |
-
-At runtime in compiled main process, `entry.ts` monkey-patches `Module._resolveFilename` to map `@shared/*` → `dist/main/shared/*` and `@/*` → `dist/main/main/*`.
-
-Main uses `module: "CommonJS"` (required by Electron), renderer uses `module: "ESNext"` (Vite handles compilation).
-
-### IPC Pattern
-
-```typescript
-// Main (src/main/ipc/exampleIpc.ts)
-ipcMain.handle('example:action', async (_event, args) => {
-  try {
-    return { success: true, data: await service.doSomething(args) };
-  } catch (error) {
-    return { success: false, error: error.message };
-  }
-});
-
-// Renderer — call via window.electronAPI
-const result = await window.electronAPI.exampleAction({ id: '123' });
-```
-
-All new IPC methods must be declared in `src/renderer/types/electron-api.d.ts`.
-
-### Services
-
-Singleton classes with module-level export:
-```typescript
-export class ExampleService { /* ... */ }
-export const exampleService = new ExampleService();
-```
-
-## Provider Registry (`src/shared/providers/registry.ts`)
-
-All 21 CLI agents are defined as `ProviderDefinition` objects. Key fields:
-
-- `cli` — binary name, `commands` — detection commands (may differ from cli)
-- `autoApproveFlag` — e.g. `--dangerously-skip-permissions` for Claude
-- `initialPromptFlag` — how to pass the initial prompt (`-i`, positional, etc.)
-- `useKeystrokeInjection` — `true` for agents with no CLI prompt flag (Amp, OpenCode); Emdash types the prompt into the TUI after startup
-- `sessionIdFlag` — only Claude; enables multi-chat session isolation via `--session-id`
-- `resumeFlag` — e.g. `-c -r` for Claude, `--continue` for Kilocode
-
-To add a new provider: add a definition here AND add any API key to the `AGENT_ENV_VARS` list in `ptyManager.ts`.
-
-## PTY Management (`src/main/services/ptyManager.ts`)
-
-Three spawn modes:
-1. **`startPty()`** — Shell-based: `{cli} {args}; exec {shell} -il` (user gets a shell after agent exits)
-2. **`startDirectPty()`** — Direct spawn without shell wrapper using cached CLI path. Faster. Falls back to `startPty` when CLI path isn't cached or `shellSetup` is configured.
-3. **`startSshPty()`** — Wraps `ssh -tt {target}` for remote development.
-
-**Session isolation**: For Claude, generates a deterministic UUID from task/conversation ID for `--session-id`/`--resume`. Session map persisted to `{userData}/pty-session-map.json`.
-
-**PTY ID format** (`src/shared/ptyId.ts`): `{providerId}-main-{taskId}` or `{providerId}-chat-{conversationId}`.
-
-**Environment**: PTYs use a minimal env (not `process.env`). The `AGENT_ENV_VARS` list in `ptyManager.ts` is the definitive passthrough list for API keys. Data is flushed over IPC every 16ms.
-
-## Worktree System
-
-**WorktreeService** (`src/main/services/WorktreeService.ts`):
-- Creates worktrees at `../worktrees/{slugged-name}-{3-char-hash}` on branch `{prefix}/{slugged-name}-{hash}`
-- Branch prefix defaults to `emdash`, configurable in settings
-- Preserves gitignored files (`.env`, `.envrc`, etc.) from main repo to worktree
-- Custom preserve patterns via `.emdash.json` at project root: `{ "preservePatterns": [".claude/**"] }`
-
-**WorktreePoolService** (`src/main/services/WorktreePoolService.ts`):
-Eliminates 3-7s worktree creation delay:
-1. Pre-creates a `_reserve/{hash}` worktree in the background on project open
-2. On task creation, instant `git worktree move` + `git branch -m` rename
-3. Replenishes reserve in background after claiming
-4. Reserves expire after 30 minutes; orphaned reserves cleaned on startup
-
-## Multi-Chat Conversations
-
-Tasks can have multiple conversation tabs, each with their own provider and PTY. Database `conversations` table tracks `isMain`, `provider`, `displayOrder`. For Claude, each conversation gets its own session UUID.
-
-## Skills System
-
-Implements the [Agent Skills](https://agentskills.io) standard — cross-agent reusable skill packages (`SKILL.md` with YAML frontmatter).
-
-- **Central storage**: `~/.agentskills/{skill-name}/`, metadata in `~/.agentskills/.emdash/`
-- **Agent sync**: Symlinks from central storage into each agent's native directory (`~/.claude/commands/`, `~/.codex/skills/`, etc.)
-- **Aggregated catalog**: Merges from OpenAI repo, Anthropic repo, and local user-created skills
-- **Key files**: `src/shared/skills/` (types, validation, agent targets), `src/main/services/SkillsService.ts` (core logic), `src/main/ipc/skillsIpc.ts`, `src/renderer/components/skills/`, `src/main/services/skills/bundled-catalog.json` (offline fallback)
-
-## SSH Remote Development
-
-Orchestrates agents on remote machines over SSH.
-
-- **Connections**: Password, key, or agent auth. Credentials stored via `keytar` in OS keychain.
-- **Remote worktrees**: Created at `<project>/.emdash/worktrees/<task-slug>/` on the server
-- **Remote PTY**: Agent shells via `ssh2`'s shell API, streaming to UI in real-time
-- **Key files**: `src/main/services/ssh/` (SshService, SshCredentialService, SshHostKeyService), `src/main/services/RemotePtyService.ts`, `src/main/services/RemoteGitService.ts`, `src/main/utils/shellEscape.ts`
-
-**Local-only (not yet remote)**: file diffs, file watching, branch push, worktree pooling, GitHub/PR features.
-
-**Security**: Shell args escaped via `quoteShellArg()` from `src/main/utils/shellEscape.ts`. Env var keys validated against `^[A-Za-z_][A-Za-z0-9_]*$`. Remote PTY restricted to allowlisted shell binaries. File access gated by `isPathSafe()`.
-
-## Database & Migrations
-
-- Schema in `src/main/db/schema.ts` → `pnpm exec drizzle-kit generate` to create migrations
-- Browse: `pnpm exec drizzle-kit studio`
-- Locations: macOS `~/Library/Application Support/emdash/emdash.db`, Linux `~/.config/emdash/emdash.db`, Windows `%APPDATA%\emdash\emdash.db`
-- **NEVER** manually edit files in `drizzle/meta/` or numbered SQL migrations
-
-## Code Style
-
-- **TypeScript**: Strict mode enabled in both tsconfigs. Prefer explicit types over `any`. Type imports: `import type { Foo } from './bar'`
-- **React**: Functional components with hooks. Both named and default exports are used.
-- **File naming**: Components PascalCase (`FileExplorer.tsx`), hooks/utilities camelCase with `use` prefix (`useTaskManagement.ts`) or kebab-case (`use-toast.ts`). Tests: `*.test.ts`
-- **Error handling**: Main → `log.error()` from `../lib/logger`, Renderer → `console.error()` or toast, IPC → `{ success: false, error }`
-- **Styling**: Tailwind CSS classes
-
-## Project Configuration
-
-- **`.emdash.json`** at project root: `{ "preservePatterns": [".claude/**"] }` — controls which gitignored files are copied to worktrees. Also supports `shellSetup` for lifecycle scripts.
-- **Branch prefix**: Configurable via app settings (`repository.branchPrefix`), defaults to `emdash`
-
-## Environment Variables
-
-All optional:
-- `EMDASH_DB_FILE` — Override database file path
-- `EMDASH_DISABLE_NATIVE_DB` — Disable native SQLite driver
-- `EMDASH_DISABLE_CLONE_CACHE` — Disable clone caching
-- `EMDASH_DISABLE_PTY` — Disable PTY support (used in tests)
-- `TELEMETRY_ENABLED` — Toggle anonymous telemetry (PostHog)
-- `CODEX_SANDBOX_MODE` / `CODEX_APPROVAL_POLICY` — Codex agent configuration
-
-## Hot Reload
-
-- **Renderer changes**: Hot-reload via Vite
-- **Main process changes**: Require Electron restart (Ctrl+C → `pnpm run dev`)
-- **Native modules**: Require `pnpm run rebuild`
-
-## CI/CD
-
-- **`code-consistency-check.yml`** (every PR): format check, type check, vitest (workflow name: "CI Check")
-- **`release.yml`** (on `v*` tags): per-platform builds. Mac builds each arch separately to prevent native module architecture mismatches. Mac release includes signing + notarization.
-
-## Common Pitfalls
-
-1. **PTY resize after exit**: PTYs must be cleaned up on exit. Use `removePty()` in exit handlers.
-2. **Worktree path resolution**: Always resolve paths from `WorktreeService`, not manually.
-3. **IPC type safety**: Define all new IPC methods in `electron-api.d.ts`.
-4. **Native module issues**: After updating node-pty/sqlite3/keytar, run `pnpm run rebuild`. Last resort: `pnpm run reset`.
-5. **Monaco disposal**: Editor instances must be disposed to prevent memory leaks.
-6. **CLI not found in agent**: If agents can't find `gh`, `codex`, etc., the PATH setup in `main.ts` may need updating for the platform.
-7. **New provider integration**: Must add to registry in `src/shared/providers/registry.ts` AND add any API key to `AGENT_ENV_VARS` in `ptyManager.ts`.
-8. **SSH shell injection**: All remote shell arguments must use `quoteShellArg()` from `src/main/utils/shellEscape.ts`.
-
-## Risky Areas
-
-- `src/main/db/**` + `drizzle/` — Schema migrations; mismatches can corrupt user data.
-- `build/` entitlements and updater config — Incorrect changes break signing/auto-update.
-- Native dependencies (`sqlite3`, `node-pty`, `keytar`) — Rebuilding is slow; avoid upgrading casually.
-- PTY/terminal management — Race conditions or unhandled exits can kill agent runs.
-- SSH services (`src/main/services/ssh/**`, `src/main/utils/shellEscape.ts`) — Security-critical: remote connections, credentials, shell command construction.
-
-## Git Workflow
-
-- Worktrees: `../worktrees/{workspace-name}-{hash}`, agents run there
-- Conventional commits: `feat:`, `fix:`, `refactor:`, `docs:`, `chore:`, `test:`
-- Example: `fix(agent): resolve worktree path issue (#123)`
-
-## Key Configuration Files
-
-- `vite.config.ts` — Renderer build + Vitest test config
-- `drizzle.config.ts` — Database migration config (supports `EMDASH_DB_FILE` override)
-- `tsconfig.json` — Renderer/shared TypeScript config (`module: ESNext`, `noEmit: true` — Vite does compilation)
-- `tsconfig.main.json` — Main process TypeScript config (`module: CommonJS` — required by Electron main)
-- `tailwind.config.js` — Tailwind configuration
-- `.nvmrc` — Node version (22.20.0)
-- Electron Builder config is in `package.json` under `"build"` key
-
-## Pre-PR Checklist
-
-- [ ] Dev server runs: `pnpm run d` (or `pnpm run dev`) starts cleanly.
-- [ ] Code is formatted: `pnpm run format`.
-- [ ] Lint passes: `pnpm run lint`.
-- [ ] Types check: `pnpm run type-check`.
-- [ ] Tests pass: `pnpm exec vitest run`.
-- [ ] No stray build artifacts or secrets committed.
-- [ ] Documented any schema or config changes impacting users.
+# Emdash Agent Guide
+
+Start here. Load only the linked `agents/` docs that are relevant to the task.
+
+## Start Here
+
+- Repo map: `agents/README.md`
+- Setup and commands: `agents/quickstart.md`
+- System overview: `agents/architecture/overview.md`
+- Validation flow: `agents/workflows/testing.md`
+
+## Read By Task
+
+- Main-process changes: `agents/architecture/main-process.md`
+- Renderer/UI changes: `agents/architecture/renderer.md`
+- Shared types or provider metadata: `agents/architecture/shared.md`
+- Worktree behavior or `.emdash.json`: `agents/workflows/worktrees.md`
+- SSH or remote project work: `agents/workflows/remote-development.md`
+- Provider integration or CLI behavior: `agents/integrations/providers.md`
+- MCP changes: `agents/integrations/mcp.md`
+
+## High-Risk Areas
+
+- Database and migrations: `agents/risky-areas/database.md`
+- PTY/session orchestration: `agents/risky-areas/pty.md`
+- SSH and shell escaping: `agents/risky-areas/ssh.md`
+- Auto-update and packaging: `agents/risky-areas/updater.md`
+
+## Conventions
+
+- IPC contract and typing: `agents/conventions/ipc.md`
+- Main process patterns (controllers, services, Result type, events): `agents/conventions/main-patterns.md`
+- Renderer patterns (modals, views, PTY frontend, React Query contexts): `agents/conventions/renderer-patterns.md`
+- TypeScript and React norms: `agents/conventions/typescript.md`
+- Config files and repo rules: `agents/conventions/config-files.md`
+- Never do re exports always import from the original source
+
+### State Guard Conventions (renderer stores)
+
+`ProjectStore` and `TaskStore` are mutable MobX class instances that transition through states. Use the following layers — do not mix them:
+
+**Selectors** (`task-selectors.ts`, `project-selectors.ts`) — pure functions, safe in observer components, effects, and event handlers:
+- `getTaskStore(projectId, taskId)` → `TaskStore | undefined`
+- `asProvisioned(store)` → `ProvisionedTask | undefined` (use with explicit null check, never `!`)
+- `taskViewKind(store, projectId)` → `TaskViewKind`
+- `getTaskManagerStore(projectId)` → `TaskManagerStore | undefined` (use this instead of reaching through project store)
+- `getProjectStore(projectId)` → `ProjectStore | undefined`
+- `asMounted(store)` → `MountedProject | undefined` (use with explicit null check, never `!`)
+
+**Hooks** (`task-view-context.tsx`) — for `observer` components inside the task view tree:
+- `useTaskViewKind()` — routing/state-gating
+- `useProvisionedTask()` → `ProvisionedTask | null` — when the component handles a non-provisioned state
+- `useRequireProvisionedTask()` → `ProvisionedTask` — when the component must only render when provisioned (throws with a descriptive error if the invariant is violated)
+
+**Rules:**
+- Never `asProvisioned(...)!` or `asMounted(...)!` — use the hook or an explicit null check
+- State guards must use `kind !== 'ready'`, never enumerate non-ready states (new states would silently fall through)
+- Access task manager via `getTaskManagerStore(projectId)`, not through `project.taskManager`
+- Access mounted project via `asMounted(getProjectStore(id))`, not via inline `isMountedProject` guards
+
+## Non-Negotiables
+
+- Run `pnpm run format`, `pnpm run lint`, `pnpm run typecheck`, and `pnpm test` before merging.
+- Do not hand-edit numbered Drizzle migrations or `drizzle/meta/`.
+- New RPC methods go in the appropriate `src/main/core/*/controller.ts` and are auto-registered via `src/main/rpc.ts`.
+- Only use manual IPC in `electron-api.d.ts` for methods requiring `event.sender`.
+- New modals must be registered in `src/renderer/core/modal/registry.ts`.
+- New views must be registered in `src/renderer/core/view/registry.ts`.
+- Treat `src/main/core/pty/`, `src/main/core/ssh/`, `src/main/db/`, and updater code as high risk.
+- Avoid editing `dist/`, `release/`, and `build/` unless the task is explicitly about packaging or updater/signing behavior.
+- The docs app in `docs/` is separate from the Electron renderer and also defaults to port `3000`.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 30bd3d68f1..96e9dae4af 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -6,7 +6,7 @@ Thanks for your interest in contributing! We favor small, focused PRs and clear
 
 Prerequisites
 
-- **Node.js 20.0.0+ (recommended: 22.20.0)** and Git
+- **Node.js 24.0.0+ (recommended: 24.14.0)** and Git
 - Optional (recommended for end‑to‑end testing):
   - GitHub CLI (`brew install gh`; then `gh auth login`)
   - At least one supported coding agent CLI (see docs for list)
@@ -29,7 +29,7 @@ pnpm install
 pnpm run dev
 
 # Type checking, lint, build
- pnpm run type-check
+ pnpm run typecheck
  pnpm run lint
  pnpm run build
 ```
@@ -62,7 +62,7 @@ Tip: During development, the renderer hot‑reloads. Changes to the Electron mai
 
 ```
 pnpm run format      # Format code with Prettier (required)
-pnpm run type-check  # TypeScript type checking
+pnpm run typecheck  # TypeScript type checking
 pnpm run lint        # ESLint
 pnpm run build       # Build both main and renderer
 ```
@@ -98,7 +98,7 @@ TypeScript + ESLint + Prettier
 Pre-commit hooks handle formatting and linting automatically on staged files. For full-project checks you can run them manually:
 
 - `pnpm run format` -- format all files with Prettier
-- `pnpm run type-check` -- TypeScript type checking (whole project)
+- `pnpm run typecheck` -- TypeScript type checking (whole project)
 - `pnpm run lint` -- ESLint across all files
 - `pnpm exec vitest run` -- run the test suite
 
diff --git a/README.md b/README.md
index 94bf85887a..c19c640a4a 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
   
 <br />
 
-[![MIT License](https://img.shields.io/badge/License-MIT-555555.svg?labelColor=333333&color=666666)](./LICENSE.md)
+[![Apache 2.0 License](https://img.shields.io/badge/License-Apache_2.0-555555.svg?labelColor=333333&color=666666)](./LICENSE.md)
 [![Downloads](https://img.shields.io/github/downloads/generalaction/emdash/total?labelColor=333333&color=666666)](https://github.com/generalaction/emdash/releases)
 [![GitHub Stars](https://img.shields.io/github/stars/generalaction/emdash?labelColor=333333&color=666666)](https://github.com/generalaction/emdash)
 [![Last Commit](https://img.shields.io/github/last-commit/generalaction/emdash?labelColor=333333&color=666666)](https://github.com/generalaction/emdash/commits/main)
@@ -17,23 +17,31 @@
 
 <br />
 
-  <a href="https://github.com/generalaction/emdash/releases" style="display:inline-block; margin-right:8px; text-decoration:none; outline:none; border:none;">
-    <img src="./docs/public/media/downloadforwindows.png" alt="Download for Windows" height="40">
+  <a href="https://emdash.sh/download" style="display:inline-block; margin-right:8px; text-decoration:none; outline:none; border:none;">
+    <img src="https://emdash.sh/media/readme/downloadforwindows.png" alt="Download for Windows" height="40">
   </a>
-  <a href="https://github.com/generalaction/emdash/releases" style="display:inline-block; margin-right:8px; text-decoration:none; outline:none; border:none;">
-    <img src="./docs/public/media/downloadformacos.png" alt="Download for macOS" height="40">
+  <a href="https://emdash.sh/download" style="display:inline-block; margin-right:8px; text-decoration:none; outline:none; border:none;">
+    <img src="https://emdash.sh/media/readme/downloadformacos.png" alt="Download for macOS" height="40">
   </a>
-  <a href="https://github.com/generalaction/emdash/releases" style="display:inline-block; text-decoration:none; outline:none; border:none;">
-    <img src="./docs/public/media/downloadforlinux.png" alt="Download for Linux" height="40">
+  <a href="https://emdash.sh/download" style="display:inline-block; text-decoration:none; outline:none; border:none;">
+    <img src="https://emdash.sh/media/readme/downloadforlinux.png" alt="Download for Linux" height="40">
   </a>
 
+  <h3>
+    <a href="https://emdash.sh/download">Download Emdash v1</a>
+  </h3>
+  <p>
+    Stable v1 is now available for macOS, Windows, and Linux ·
+    <a href="https://emdash.sh/blog/emdash-v1-stable">Read the launch post</a>
+  </p>
+
 </div>
 
 <br />
 
 Emdash is a provider-agnostic desktop app that lets you run multiple coding agents in parallel, each isolated in its own git worktree, either locally or over SSH on a remote machine. We call it an Agentic Development Environment (ADE).
 
-Emdash supports 22 (and growing) CLI agents, such as Claude Code, Qwen Code, Amp, and Codex. Users can directly pass Linear, GitHub, or Jira tickets to an agent, review diffs, test changes, create PRs, see CI/CD checks, and merge. 
+Emdash supports 23 CLI agents, including Claude Code, Qwen Code, Hermes Agent, Amp, and Codex. Users can directly pass Linear, GitHub, or Jira tickets to an agent, review diffs, test changes, create PRs, see CI/CD checks, and merge. 
 
 **Develop on remote servers via SSH**
 
@@ -45,7 +53,7 @@ Connect to remote machines via SSH/SFTP to work with remote codebases. Emdash su
 
 </div>
 
-<img alt="Emdash product" src="./docs/public/media/product.jpeg" />
+<img alt="Emdash product" src="https://emdash.sh/media/blog/public-v1-beta/v1beta.jpg" />
 
 # Installation
 
@@ -53,9 +61,6 @@ Connect to remote machines via SSH/SFTP to work with remote codebases. Emdash su
 - Apple Silicon: https://github.com/generalaction/emdash/releases/latest/download/emdash-arm64.dmg
 - Intel x64: https://github.com/generalaction/emdash/releases/latest/download/emdash-x64.dmg
 
-[![Homebrew](https://img.shields.io/badge/-Homebrew-000000?style=for-the-badge&logo=homebrew&logoColor=FBB040)](https://formulae.brew.sh/cask/emdash)
-> macOS users can also: `brew install --cask emdash`
-
 ### Windows
 - Installer (x64): https://github.com/generalaction/emdash/releases/latest/download/emdash-x64.msi
 - Portable (x64): https://github.com/generalaction/emdash/releases/latest/download/emdash-x64.exe
@@ -74,29 +79,30 @@ Connect to remote machines via SSH/SFTP to work with remote codebases. Emdash su
 
 ### Supported CLI Providers
 
-Emdash currently supports twenty-two CLI providers and we are adding new providers regularly. If you miss one, let us know or create a PR.
+Emdash currently supports 23 CLI providers, and we are adding new ones regularly. If you miss one, let us know or create a PR.
 
 | CLI Provider | Status | Install |
 | ----------- | ------ | ----------- |
-| [Amp](https://ampcode.com/manual) | ✅ Supported | <code>npm install -g @sourcegraph/amp@latest</code> |
+| [Amp](https://ampcode.com/manual#install) | ✅ Supported | <code>npm install -g @sourcegraph/amp@latest</code> |
 | [Auggie](https://docs.augmentcode.com/cli/overview) | ✅ Supported | <code>npm install -g @augmentcode/auggie</code> |
 | [Autohand Code](https://autohand.ai/code/) | ✅ Supported | <code>npm install -g autohand-cli</code> |
 | [Charm](https://github.com/charmbracelet/crush) | ✅ Supported | <code>npm install -g @charmland/crush</code> |
 | [Claude Code](https://docs.anthropic.com/claude/docs/claude-code) | ✅ Supported | <code>curl -fsSL https://claude.ai/install.sh &#124; bash</code> |
 | [Cline](https://docs.cline.bot/cline-cli/overview) | ✅ Supported | <code>npm install -g cline</code> |
 | [Codebuff](https://www.codebuff.com/docs/help/quick-start) | ✅ Supported | <code>npm install -g codebuff</code> |
-| [Codex](https://developers.openai.com/codex/cli/) | ✅ Supported | <code>npm install -g @openai/codex</code> |
+| [Codex](https://github.com/openai/codex) | ✅ Supported | <code>npm install -g @openai/codex</code> |
 | [Continue](https://docs.continue.dev/guides/cli) | ✅ Supported | <code>npm i -g @continuedev/cli</code> |
 | [Cursor](https://cursor.com/cli) | ✅ Supported | <code>curl https://cursor.com/install -fsS &#124; bash</code> |
 | [Droid](https://docs.factory.ai/cli/getting-started/quickstart) | ✅ Supported | <code>curl -fsSL https://app.factory.ai/cli &#124; sh</code> |
 | [Gemini](https://github.com/google-gemini/gemini-cli) | ✅ Supported | <code>npm install -g @google/gemini-cli</code> |
-| [GitHub Copilot](https://docs.github.com/en/copilot/how-tos/set-up/installing-github-copilot-in-the-cli) | ✅ Supported | <code>npm install -g @github/copilot</code> |
-| [Goose](https://github.com/block/goose) | ✅ Supported | <code>curl -fsSL https://github.com/block/goose/releases/download/stable/download_cli.sh &#124; bash</code> |
+| [GitHub Copilot](https://docs.github.com/en/copilot/how-tos/set-up/install-copilot-cli) | ✅ Supported | <code>npm install -g @github/copilot</code> |
+| [Goose](https://block.github.io/goose/docs/quickstart/) | ✅ Supported | <code>curl -fsSL https://github.com/block/goose/releases/download/stable/download_cli.sh &#124; bash</code> |
+| [Hermes Agent](https://hermes-agent.nousresearch.com/docs/) | ✅ Supported | <code>curl -fsSL https://raw.githubusercontent.com/NousResearch/hermes-agent/main/scripts/install.sh &#124; bash</code> |
 | [Kilocode](https://kilo.ai/docs/cli) | ✅ Supported | <code>npm install -g @kilocode/cli</code> |
-| [Kimi](https://www.kimi.com/code/docs/en/kimi-cli/guides/getting-started.html) | ✅ Supported | <code>uv tool install --python 3.13 kimi-cli</code> |
-| [Kiro](https://kiro.dev/docs/cli/) | ✅ Supported | <code>curl -fsSL https://cli.kiro.dev/install &#124; bash</code> |
+| [Kimi](https://www.kimi.com/code/docs/en/kimi-cli/guides/getting-started.html) | ✅ Supported | <code>uv tool install kimi-cli</code> |
+| [Kiro (AWS)](https://kiro.dev/docs/cli/) | ✅ Supported | <code>curl -fsSL https://cli.kiro.dev/install &#124; bash</code> |
 | [Mistral Vibe](https://github.com/mistralai/mistral-vibe) | ✅ Supported | <code>curl -LsSf https://mistral.ai/vibe/install.sh &#124; bash</code> |
-| [OpenCode](https://opencode.ai/docs/) | ✅ Supported | <code>npm install -g opencode-ai</code> |
+| [OpenCode](https://opencode.ai/docs/cli/) | ✅ Supported | <code>npm install -g opencode-ai</code> |
 | [Pi](https://github.com/badlogic/pi-mono/tree/main/packages/coding-agent) | ✅ Supported | <code>npm install -g @mariozechner/pi-coding-agent</code> |
 | [Qwen Code](https://github.com/QwenLM/qwen-code) | ✅ Supported | <code>npm install -g @qwen-code/qwen-code</code> |
 | [Rovo Dev](https://support.atlassian.com/rovo/docs/install-and-run-rovo-dev-cli-on-your-device/) | ✅ Supported | <code>acli rovodev auth login</code> |
@@ -132,7 +138,7 @@ Contributions welcome! See the [Contributing Guide](CONTRIBUTING.md) to get star
 > TELEMETRY_ENABLED=false
 > ```
 >
-> Full details: see `docs/telemetry.md`.
+> Full details: see [Telemetry](https://emdash.sh/docs/telemetry).
 </details>
 
 <details>
@@ -151,19 +157,6 @@ Contributions welcome! See the [Contributing Guide](CONTRIBUTING.md) to get star
 > You can reset the local DB by deleting it (quit the app first). The file is recreated on next launch.
 </details>
 
-<details>
-<summary><b>Do I need GitHub CLI?</b></summary>
-
-> **Only if you want GitHub features** (open PRs from Emdash, fetch repo info, GitHub Issues integration).  
-> Install & sign in:
->
-> ```bash
-> gh auth login
-> ```
->
-> If you don’t use GitHub features, you can skip installing `gh`.
-</details>
-
 <details>
 <summary><b>How do I add a new provider?</b></summary>
 
@@ -171,31 +164,11 @@ Contributions welcome! See the [Contributing Guide](CONTRIBUTING.md) to get star
 >
 > - Open a PR following the **Contributing Guide** (`CONTRIBUTING.md`).
 > - Include: provider name, how it’s invoked (CLI command), auth notes, and minimal setup steps.
-> - We’ll add it to the **Integrations** matrix and wire up provider selection in the UI.
+> - We’ll add it to the **Providers table** and wire up provider selection in the UI.
 >
 > If you’re unsure where to start, open an issue with the CLI’s link and typical commands.
 </details>
 
-<details>
-<summary><b>I hit a native‑module crash (sqlite3 / node‑pty / keytar). What’s the fast fix?</b></summary>
-
-> This usually happens after switching Node/Electron versions.
->
-> 1) Rebuild native modules:
->
-> ```bash
-> npm run rebuild
-> ```
->
-> 2) If that fails, clean and reinstall:
->
-> ```bash
-> npm run reset
-> ```
->
-> (Resets `node_modules`, reinstalls, and re‑builds Electron native deps.)
-</details>
-
 <details>
 <summary><b>What permissions does Emdash need?</b></summary>
 
@@ -222,7 +195,7 @@ Contributions welcome! See the [Contributing Guide](CONTRIBUTING.md) to get star
 > - Git installed on the remote server
 > - For agent auth: SSH agent running with your key loaded (`ssh-add -l`)
 >
-> See [docs/ssh-setup.md](./docs/ssh-setup.md) for detailed setup instructions and [docs/ssh-architecture.md](./docs/ssh-architecture.md) for technical details.
+> See [Remote Projects](https://emdash.sh/docs/remote-projects) for detailed setup instructions and [Bring Your Own Infrastructure](https://emdash.sh/docs/bring-your-own-infrastructure) for technical details.
 </details>
 
 [![Follow @emdashsh](https://img.shields.io/twitter/follow/emdashsh?style=social&label=Follow%20%40emdashsh)](https://x.com/emdashsh)
diff --git a/agents/README.md b/agents/README.md
new file mode 100644
index 0000000000..ea886141c6
--- /dev/null
+++ b/agents/README.md
@@ -0,0 +1,29 @@
+# Agent Docs
+
+This directory is the system of record for agent-facing repo guidance. Keep topic pages small, specific, and mechanically checkable where possible.
+
+## Recommended Reading Order
+
+1. `quickstart.md`
+2. `architecture/overview.md`
+3. the task-specific page for the area you are changing
+
+## Directory Layout
+
+- `architecture/`
+  - system structure and major code ownership boundaries
+- `workflows/`
+  - task-oriented procedures like testing, worktrees, and remote development
+- `integrations/`
+  - provider, MCP, and external service guidance
+- `risky-areas/`
+  - places where incorrect changes are expensive
+- `conventions/`
+  - coding contracts and repo rules
+
+## Maintenance Rules
+
+- Prefer one page per concrete topic.
+- Avoid volatile counts unless you can verify them cheaply.
+- Link to the source-of-truth file paths.
+- Update the smallest relevant page instead of expanding `AGENTS.md`.
diff --git a/agents/architecture/main-process.md b/agents/architecture/main-process.md
new file mode 100644
index 0000000000..b8e4f0d432
--- /dev/null
+++ b/agents/architecture/main-process.md
@@ -0,0 +1,52 @@
+# Main Process
+
+## Structure
+
+The main process is organized into domain modules under `src/main/core/`. Each domain typically has a `controller.ts` (RPC handlers) and service/implementation files.
+
+## Domain Modules (`src/main/core/`)
+
+- **account** — Emdash account service, credential store, provider token registry
+- **agent-hooks** — HTTP hook server for agent callbacks, event enrichment, OS notifications, hook config writer (Claude/Codex)
+- **app** — App lifecycle service and controller
+- **conversations** — Conversation CRUD, session start, agent event classifiers (per-provider terminal output parsers)
+- **dependencies** — CLI agent detection, probing, dependency management
+- **editor** — Editor buffer service for Monaco integration
+- **fs** — Filesystem operations with provider pattern (`local-fs.ts`, `ssh-fs.ts`)
+- **git** — Git operations (`git-service.ts`, `git-repo-utils.ts`, `detectGitInfo.ts`)
+- **github** — GitHub auth, PRs, issues, repos (via `gh` CLI)
+- **jira** — Jira integration
+- **linear** — Linear integration
+- **mcp** — MCP service, adapters, config IO, catalog
+- **projects** — Project management with provider pattern (`local-project-provider.ts`), worktree service, project settings, CRUD operations
+- **pty** — PTY lifecycle (`local-pty.ts`, `ssh2-pty.ts`), session registry, env setup, spawn utilities
+- **repository** — Repository controller
+- **settings** — App settings service and schema, provider settings (separate controller)
+- **shared** — Shared utilities (OAuth flow)
+- **skills** — Skills service and controller
+- **ssh** — SSH connection management, credentials, config parsing, client proxy
+- **tasks** — Task CRUD (create, delete, archive, restore, provision)
+- **terminals** — Terminal lifecycle with provider pattern (`local-terminal-provider.ts`, `ssh-terminal-provider.ts`), lifecycle scripts
+- **updates** — Auto-update service
+
+## Other Main Process Areas
+
+- `src/main/app/` — Menu, protocol handler, window creation
+- `src/main/lib/` — Logger, telemetry, events, result type, updater error
+- `src/main/db/` — Database schema and initialization
+- `src/main/utils/` — Shell environment, shell escaping, child process env, external links
+- `src/main/core/agent-hooks/` — Hook server, event enrichment, OS notifications, hook config writer for Claude/Codex
+
+## IPC / RPC Structure
+
+- All domain controllers are assembled into a typed RPC router in `src/main/rpc.ts`.
+- RPC primitives live in `src/shared/ipc/rpc.ts` (`createRPCRouter`, `createRPCController`, `createRPCClient`).
+- Event primitives live in `src/shared/ipc/events.ts`.
+- A small number of manual IPC handlers remain in `electron-api.d.ts` for methods requiring `event.sender` (PTY start/input/resize/kill, fsList, openIn).
+
+## When Editing Here
+
+- Check `agents/conventions/main-patterns.md` for controller, service, Result type, and event patterns.
+- Check `agents/conventions/ipc.md` for the RPC controller pattern and typing rules.
+- Check `agents/risky-areas/pty.md` before touching PTY or provider spawn behavior.
+- Check `agents/risky-areas/database.md` before changing persistence or migrations.
diff --git a/agents/architecture/overview.md b/agents/architecture/overview.md
new file mode 100644
index 0000000000..c4562db13d
--- /dev/null
+++ b/agents/architecture/overview.md
@@ -0,0 +1,30 @@
+# Architecture Overview
+
+## Process Model
+
+- `src/main/`: Electron main process — app lifecycle, RPC controllers, domain services, database, PTY orchestration, updater, SSH
+- `src/preload/`: Electron preload bridge — exposes typed `invoke`, `eventSend`, `eventOn` to renderer
+- `src/renderer/`: React UI — views, components, hooks, contexts, typed RPC client
+- `src/shared/`: Provider registry, IPC primitives (RPC + events), MCP types, skills types, shared domain types
+- `docs/`: Separate Next.js + Fumadocs site
+
+## Boot Sequence
+
+`src/main/index.ts` → app lifecycle → IPC/RPC registration → window creation → renderer
+
+- `index.ts` — Loads `.env`, normalizes PATH, initializes database, registers all RPC controllers via `src/main/rpc.ts`, creates the main window.
+- `src/main/rpc.ts` — Assembles the typed RPC router from domain controllers (`src/main/core/*/controller.ts`).
+- `src/preload/index.ts` — Exposes `window.electronAPI` (`invoke`, `eventSend`, `eventOn`) via `contextBridge`.
+- `src/renderer/core/ipc.ts` — Creates the typed RPC client and event emitter used throughout the renderer.
+
+## Build Tooling
+
+- `electron.vite.config.ts` — electron-vite config for main, preload, and renderer builds.
+- `vitest.config.ts` — Vitest config with two test projects: `node` (main + renderer unit tests) and `browser` (Playwright-backed renderer tests).
+- Single `tsconfig.json` for all targets.
+
+## Read Next
+
+- Main process details: `main-process.md`
+- Renderer details: `renderer.md`
+- Shared modules and provider registry: `shared.md`
diff --git a/agents/architecture/renderer.md b/agents/architecture/renderer.md
new file mode 100644
index 0000000000..32a0101db8
--- /dev/null
+++ b/agents/architecture/renderer.md
@@ -0,0 +1,50 @@
+# Renderer
+
+## Main Entry Points
+
+- `src/renderer/App.tsx`: top-level provider composition
+- `src/renderer/views/Workspace.tsx`: main post-onboarding shell
+- `src/renderer/components/MainContent.tsx`: switches between views (projects, tasks, settings, skills, MCP, home)
+- `src/renderer/core/ipc.ts`: typed RPC client (`rpc`) and event emitter (`events`) used throughout renderer
+
+## View Areas (`src/renderer/views/`)
+
+- `projects/` — project management: active project, pending project, create task modal, settings panel, task panel, branch selector, titlebar
+- `tasks/` — task experience:
+  - `conversations/` — conversation panel and tabs
+  - `diff-viewer/` — file changes panel, diff views (file, stacked), PR section, git state providers
+  - `editor/` — Monaco code editor, file tree, editor providers, conflict dialog
+  - `terminals/` — terminal panel and tabs
+  - `hooks/` — task-scoped hooks (use-task, use-conversations, use-terminals, use-task-view-navigation)
+- `settings/` — settings view
+- `home-view.tsx`, `mcp-view.tsx`, `skills-view.tsx`, `Welcome.tsx`
+
+## Component Areas (`src/renderer/components/`)
+
+- `sidebar/` — app sidebar
+- `diff/` — diff-related components
+- `skills/` — skills catalog and management
+- `mcp/` — MCP server management
+- `kanban/` — kanban board
+- `integrations/` — integration management
+- `ssh/` — SSH connection UI
+- `FileExplorer/` — file tree navigation
+- `settings/` — settings components
+- `projects/` — project-related components
+- `ui/` — shared UI primitives
+
+## Supporting Structure
+
+- Context providers: `src/renderer/contexts/`
+- Hooks: `src/renderer/hooks/`
+- Client-side state helpers, stores, and utilities: `src/renderer/lib/`
+- Core infrastructure: `src/renderer/core/` (IPC client, modals, project state, PTY helpers, view management)
+
+## When Editing Here
+
+- Check `agents/conventions/renderer-patterns.md` for modal, view, PTY frontend, and context patterns.
+- Call RPC methods via the typed `rpc` client from `src/renderer/core/ipc.ts` (e.g., `rpc.tasks.create(...)`).
+- New modals must be registered in `src/renderer/core/modal/registry.ts`.
+- New views must be registered in `src/renderer/core/view/registry.ts`.
+- Only methods in `src/renderer/types/electron-api.d.ts` use direct `window.electronAPI` calls (PTY ops, fsList, openIn).
+- If you change user-visible workflows, update the matching page in `docs/` when appropriate.
diff --git a/agents/architecture/shared.md b/agents/architecture/shared.md
new file mode 100644
index 0000000000..4affe2cc5d
--- /dev/null
+++ b/agents/architecture/shared.md
@@ -0,0 +1,45 @@
+# Shared Modules
+
+## Main Shared Areas
+
+- Provider registry:
+  - `src/shared/agent-provider-registry.ts`
+- IPC primitives:
+  - `src/shared/ipc/rpc.ts` — typed RPC router, controller, and client
+  - `src/shared/ipc/events.ts` — typed event emitter
+- Typed event definitions:
+  - `src/shared/events/` — `agentEvents.ts`, `appEvents.ts`, `editorEvents.ts`, `fsEvents.ts`, `githubEvents.ts`, `hostPreviewEvents.ts`, `lifecycleEvents.ts`, `ptyEvents.ts`, `sshEvents.ts`
+- MCP types:
+  - `src/shared/mcp/`
+- Skills types and validation:
+  - `src/shared/skills/`
+- Domain type modules (flat files):
+  - `conversations.ts`, `fs.ts`, `git.ts`, `github.ts`, `hostPreview.ts`, `lifecycle.ts`, `projects.ts`, `pull-requests.ts`, `ssh.ts`, `tasks.ts`, `terminals.ts`, `urls.ts`, `utils.ts`
+- PTY helpers:
+  - `ptyId.ts`, `ptySessionId.ts`
+- App settings types:
+  - `app-settings.ts`
+
+## Path Aliases
+
+All aliases are defined in a single `tsconfig.json` and mirrored in `electron.vite.config.ts`:
+
+| Alias | Resolves to |
+| --- | --- |
+| `@/*` | `src/*` |
+| `@renderer/*` | `src/renderer/*` |
+| `@main/*` | `src/main/*` |
+| `@shared/*` | `src/shared/*` |
+| `@root/*` | `./*` |
+
+Aliases are resolved at build time by electron-vite. No runtime monkey-patching is needed.
+
+## Provider Registry Rules
+
+When adding a provider:
+
+1. update `src/shared/agent-provider-registry.ts`
+2. add any required env passthrough in `src/main/core/pty/pty-env.ts`
+3. add an agent event classifier in `src/main/core/conversations/impl/agent-event-classifiers/`
+4. update renderer surfaces that assume provider metadata
+5. add tests for non-standard spawn or detection behavior
diff --git a/agents/conventions/config-files.md b/agents/conventions/config-files.md
new file mode 100644
index 0000000000..6a5632af54
--- /dev/null
+++ b/agents/conventions/config-files.md
@@ -0,0 +1,20 @@
+# Config Files And Repo Rules
+
+## Key Files
+
+- `package.json`
+- `electron.vite.config.ts`
+- `vitest.config.ts`
+- `tsconfig.json`
+- `drizzle.config.ts`
+- `.emdash.json`
+- `.nvmrc`
+- `.husky/`
+- `.github/workflows/`
+- `flake.nix`
+
+## Repo Rules
+
+- avoid editing `dist/`, `release/`, and `build/` unless the task is explicitly about packaging or signing
+- the docs app in `docs/` is separate from the Electron renderer
+- update the narrowest relevant page in `agents/` instead of growing `AGENTS.md`
diff --git a/agents/conventions/ipc.md b/agents/conventions/ipc.md
new file mode 100644
index 0000000000..aadfadb560
--- /dev/null
+++ b/agents/conventions/ipc.md
@@ -0,0 +1,45 @@
+# IPC Conventions
+
+## RPC Pattern
+
+The primary IPC mechanism is a typed RPC system:
+
+- **Controllers**: `src/main/core/*/controller.ts` — define handler functions using `createRPCController`.
+- **Router**: `src/main/rpc.ts` — assembles all controllers into a typed router using `createRPCRouter`.
+- **Registration**: `registerRPCRouter(router, ipcMain)` in `src/main/index.ts` — auto-registers `namespace.method` channels.
+- **Client**: `src/renderer/core/ipc.ts` — creates a proxy-based typed client using `createRPCClient<RpcRouter>`.
+
+```ts
+// Main — src/main/core/example/controller.ts
+import { createRPCController } from '@shared/ipc/rpc';
+export const exampleController = createRPCController({
+  async doSomething(id: string) {
+    return await service.doSomething(id);
+  },
+});
+
+// Renderer — call via typed client
+import { rpc } from '@renderer/core/ipc';
+const result = await rpc.example.doSomething('123');
+```
+
+## Manual IPC (electron-api.d.ts)
+
+A small set of IPC methods that depend on `event.sender` remain as manual handlers declared in `src/renderer/types/electron-api.d.ts` (~92 lines):
+
+- PTY operations: `ptyStart`, `ptyStartDirect`, `ptyInput`, `ptyResize`, `ptyKill`
+- Filesystem listing: `fsList`
+- Open in external app: `openIn`
+- Update events: `onUpdateEvent`
+
+## Event System
+
+Typed events use `createEventEmitter` from `src/shared/ipc/events.ts`. Event type definitions live in `src/shared/events/`.
+
+## Rules
+
+- Prefer the RPC pattern for new IPC methods — add a handler to the appropriate controller.
+- Only use manual IPC when `event.sender` is required.
+- Keep the RPC router type (`RpcRouter`) importable by the renderer for type inference.
+- Prefer existing service boundaries over adding logic directly inside controllers.
+- Update tests when controller shape or IPC wiring changes.
diff --git a/agents/conventions/main-patterns.md b/agents/conventions/main-patterns.md
new file mode 100644
index 0000000000..86193b912a
--- /dev/null
+++ b/agents/conventions/main-patterns.md
@@ -0,0 +1,105 @@
+# Main Process Patterns
+
+## Controller Pattern
+
+Each domain in `src/main/core/` exposes a `controller.ts` that defines RPC handlers:
+
+```ts
+// src/main/core/tasks/controller.ts
+import { createRPCController } from '@shared/ipc/rpc';
+import { createTask } from './createTask';
+import { getTasks } from './getTasks';
+
+export const taskController = createRPCController({
+  createTask,
+  getTasks,
+  deleteTask,
+  // ...
+});
+```
+
+Controllers are assembled into the router in `src/main/rpc.ts`:
+
+```ts
+export const rpcRouter = createRPCRouter({
+  tasks: taskController,
+  projects: projectController,
+  // ...
+});
+```
+
+**Rules:**
+- Controller handlers are imported functions — keep logic in separate operation files, not inline
+- Each controller becomes an RPC namespace (e.g., `rpc.tasks.createTask(...)` on the renderer)
+- New domains need their controller added to `src/main/rpc.ts`
+
+
+## Service Pattern
+
+For stateful concerns, use singleton classes:
+
+```ts
+export class AppService {
+  private cache = new Map();
+
+  async initialize() { /* ... */ }
+  async doSomething(id: string) { /* ... */ }
+}
+
+export const appService = new AppService();
+```
+
+**Rules:**
+- Module-level singleton export
+- Initialization method called from `src/main/index.ts`
+- Services hold long-lived state (caches, subscriptions, connections)
+
+## Provider Pattern
+
+For domain logic with multiple backends (local vs SSH):
+
+```
+src/main/core/projects/
+├── project-provider.ts          # Interface
+├── impl/
+│   ├── local-project-provider.ts
+│   └── _ssh-project-provider.ts  # Prefixed with _ = not yet implemented
+└── project-manager.ts           # Orchestrates providers
+```
+
+Used in: projects, filesystem (`local-fs.ts` / `ssh-fs.ts`), terminals (`local-terminal-provider.ts` / `ssh-terminal-provider.ts`)
+
+## Result Type (`src/main/lib/result.ts`)
+
+Explicit error handling via discriminated union:
+
+```ts
+import { ok, err, type Result } from '../lib/result';
+
+async function doSomething(): Promise<Result<Data, SomeError>> {
+  if (problem) return err({ type: 'not_found' as const });
+  return ok(data);
+}
+```
+
+**Rules:**
+- Prefer `Result<T, E>` over thrown exceptions for expected failure modes
+- Controllers convert Result types to IPC-compatible responses
+
+## Event System (`src/main/lib/events.ts`)
+
+Topic-based event emitter for main ↔ renderer communication:
+
+```ts
+import { events } from '../lib/events';
+
+// Emit to a specific topic (e.g., session ID)
+events.emit(ptyDataChannel, buffer, sessionId);
+
+// Listen on a specific topic
+const unsub = events.on(ptyDataChannel, (data) => {...}, sessionId);
+```
+
+Channel naming: without topic → `eventName`, with topic → `eventName.{topic}`
+
+Event type definitions live in `src/shared/events/`.
diff --git a/agents/conventions/renderer-patterns.md b/agents/conventions/renderer-patterns.md
new file mode 100644
index 0000000000..96976cf1e6
--- /dev/null
+++ b/agents/conventions/renderer-patterns.md
@@ -0,0 +1,93 @@
+# Renderer Patterns
+
+## Modal System (`src/renderer/core/modal/`)
+
+All modals use a registry-based system. Only one modal can be active at a time.
+
+- `registry.ts` — central registry mapping modal IDs to components
+- `modal-provider.tsx` — React context managing active modal state
+- `modal-renderer.tsx` — renders the currently active modal
+
+**Adding a modal:**
+1. Create the component accepting `BaseModalProps<TResult>` (provides `onSuccess` and `onClose` callbacks)
+2. Register it in `registry.ts`
+3. Open it via the hook:
+
+```tsx
+const { showModal } = useModalContext();
+showModal('myModal', { projectId: '123', onSuccess: (result) => {...} });
+```
+
+**Rules:**
+- All modals must be registered in `registry.ts`
+- `showModal` is type-safe — TypeScript infers required args from the registry
+- `hasActiveCloseGuard` prevents dismissal during critical operations
+
+## View System (`src/renderer/core/view/`)
+
+Views use a registry + parameterized navigation pattern.
+
+- `registry.ts` — view definitions with optional `WrapView`, `TitlebarSlot`, `MainPanel`, `RightPanel`
+- `provider.tsx` — state management, navigation, param persistence
+- `layout-provider.tsx` — panel collapse/expand/drag state
+
+**Key behaviors:**
+- `navigate(viewId, params?)` is type-safe; params are optional when all fields are optional
+- Params persist per-view (navigating away and back preserves params)
+- Modal automatically closes on navigation
+- `updateViewParams(viewId, partial)` updates params without re-navigating
+
+**Rules:**
+- Views are singletons — one per ViewId
+- MainPanel is required; RightPanel and WrapView are optional
+- Add new views to `registry.ts`
+
+## PTY Frontend (`src/renderer/core/pty/`)
+
+Terminal sessions use a registry + pool pattern.
+
+- `pty.ts` — `FrontendPty` class with `FrontendPtyRegistry` (module-level singleton, survives React unmounts)
+- `pty-pool.ts` — `TerminalPool` managing up to 16 reusable xterm.js instances
+- `use-pty.ts` — React hook integrating FrontendPty + TerminalPool
+- `pty-session-context.tsx` — context for session registration
+- `pty-pane.tsx` — terminal component (forwardRef)
+
+**Lifecycle:** register → attach → detach → unregister
+
+**Rules:**
+- `registerSession()` must happen BEFORE RPC starts the PTY to avoid missing output
+- `FrontendPty` buffers output (max 1 MB) when no xterm is attached, drains on `attach()`
+- Terminal instances are never disposed — they're parked off-screen and reused from the pool
+- `sessionId` format: `makePtySessionId(projectId, taskId, conversationId)` — deterministic
+- Panel drag pauses resizing to avoid jank (`panelDragStore`)
+
+## React Query Context Pattern
+
+Context providers use React Query for data fetching with optimistic updates:
+
+```tsx
+// Pattern used in AppSettingsProvider, ProjectProvider, etc.
+const { data } = useQuery({ queryKey: ['resource'], queryFn: () => rpc.ns.get() });
+const mutation = useMutation({
+  mutationFn: (args) => rpc.ns.update(args),
+  onMutate: async (args) => {
+    // optimistic update via queryClient.setQueryData
+  },
+  onError: () => {
+    // rollback via queryClient.setQueryData with previous snapshot
+  },
+});
+```
+
+**Rules:**
+- Contexts combine React Query + local state, not standalone useState
+- Use `useAppSettingsKey(key)` for fine-grained per-setting hooks
+- Optimistic updates must include rollback on error
+
+## State Outside React
+
+For state that must survive React unmounts or be shared across unrelated components:
+
+- **`useSyncExternalStore`-compatible stores** — e.g., `panelDragStore` in `src/renderer/lib/`
+- **Module-level singletons** — e.g., `FrontendPtyRegistry`, `TerminalPool`
+- **Manager classes** — e.g., `PendingInjectionManager`, `TaskTerminalsStore`
diff --git a/agents/conventions/typescript.md b/agents/conventions/typescript.md
new file mode 100644
index 0000000000..28b5eaa02b
--- /dev/null
+++ b/agents/conventions/typescript.md
@@ -0,0 +1,23 @@
+# TypeScript And React Conventions
+
+## TypeScript
+
+- strict mode is enabled in `tsconfig.json`
+- always use explicit types, do not use `any`
+- prefer module imports at the top of the file, never use require() 
+- single `tsconfig.json` for all targets (main, preload, renderer, shared)
+
+## Renderer
+
+- functional React components and hooks
+- context providers under `src/renderer/contexts/`
+- hooks under `src/renderer/hooks/`
+- client-side stores and helpers under `src/renderer/lib/`
+- core infrastructure under `src/renderer/core/` (IPC client, modal management, view state)
+- view-level components under `src/renderer/views/`
+
+## Naming
+
+- components: PascalCase
+- hooks: `useX` camelCase or existing patterns like `use-toast.ts`
+- tests: `*.test.ts`
diff --git a/agents/integrations/mcp.md b/agents/integrations/mcp.md
new file mode 100644
index 0000000000..04834e5c89
--- /dev/null
+++ b/agents/integrations/mcp.md
@@ -0,0 +1,26 @@
+# MCP
+
+## Main Files
+
+- `src/main/core/mcp/services/McpService.ts`
+- `src/main/core/mcp/utils/` — adapters, catalog, config IO, config paths, conversion
+- `src/main/core/mcp/controller.ts`
+- `src/shared/mcp/`
+- `src/renderer/components/mcp/`
+- `src/renderer/views/mcp-view.tsx`
+
+## Current Behavior
+
+- MCP server configs are read, adapted, merged, and written across supported agent ecosystems
+- provider-specific config formats are handled through adapters in `src/main/core/mcp/utils/`
+- the renderer MCP UI manages installed servers and catalog entries
+
+## Important Constraint
+
+- Codex currently supports stdio MCP servers only
+
+## Rules
+
+- do not assume all providers support the same MCP transport types
+- keep canonical MCP data in shared types and adapt at the edges
+- if you add provider-specific MCP behavior, update both service and UI compatibility handling
diff --git a/agents/integrations/providers.md b/agents/integrations/providers.md
new file mode 100644
index 0000000000..eabd67a7d9
--- /dev/null
+++ b/agents/integrations/providers.md
@@ -0,0 +1,40 @@
+# Providers
+
+## Source Of Truth
+
+- `src/shared/agent-provider-registry.ts`
+- `src/main/core/dependencies/dependency-manager.ts`
+- `src/main/core/pty/`
+
+## Current Providers (22)
+
+codex, claude, qwen, droid, gemini, cursor, copilot, amp, opencode, charm, auggie, goose, kimi, kilocode, kiro, rovo, cline, continue, codebuff, mistral, pi, autohand
+
+## Provider Metadata Includes
+
+- CLI and detection commands
+- version args
+- install command and docs URL
+- auto-approve flags
+- initial prompt handling
+- keystroke injection behavior
+- resume and session flags
+- optional plan activation and auto-start commands
+
+## Agent Event Classifiers
+
+Each provider has a terminal output classifier in `src/main/core/conversations/impl/agent-event-classifiers/`. These parse agent terminal output to detect events (task completion, errors, etc.) and forward them to the renderer via the agent hooks module (`src/main/core/agent-hooks/`).
+
+## Provider Runtime Notes
+
+- Claude uses deterministic `--session-id` values for conversation isolation.
+- Agents with no CLI prompt flag (e.g., Amp, OpenCode) use keystroke injection — Emdash types the prompt into the TUI after startup.
+- `src/main/core/agent-hooks/service.ts` forwards hook events to renderer windows and can show OS notifications. Also writes hook config files (`.claude/settings.local.json`, `.codex/config.toml`) into worktrees.
+
+## Adding Or Changing A Provider
+
+1. update `src/shared/agent-provider-registry.ts`
+2. update allowlisted agent env vars in `src/main/core/pty/pty-env.ts` if needed
+3. add an agent event classifier in `src/main/core/conversations/impl/agent-event-classifiers/`
+4. validate detection behavior in `src/main/core/dependencies/`
+5. add or update tests for any non-standard behavior
diff --git a/agents/quickstart.md b/agents/quickstart.md
new file mode 100644
index 0000000000..22643e52f9
--- /dev/null
+++ b/agents/quickstart.md
@@ -0,0 +1,41 @@
+# Quickstart
+
+## Toolchain
+
+- Node: `24.14.0` from `.nvmrc`
+- Package manager: `pnpm@10.28.2`
+- Electron app root: this repo
+- Docs app: `docs/`
+
+## Core Commands
+
+```bash
+pnpm run d
+pnpm run dev
+pnpm run dev:main
+pnpm run dev:renderer
+pnpm run build
+pnpm run rebuild
+pnpm run reset
+```
+
+## Validation Commands
+
+```bash
+pnpm run format
+pnpm run lint
+pnpm run typecheck
+pnpm test run
+```
+
+## Docs Commands
+
+```bash
+pnpm run docs:build
+```
+
+## Important Notes
+
+- The docs app and the Electron renderer both default to port `3000`.
+- After native dependency changes (`sqlite3`, `node-pty`), run `pnpm run rebuild`.
+- Husky and lint-staged run formatting and linting on staged files during commit.
diff --git a/agents/risky-areas/database.md b/agents/risky-areas/database.md
new file mode 100644
index 0000000000..738ee8b9f0
--- /dev/null
+++ b/agents/risky-areas/database.md
@@ -0,0 +1,20 @@
+# Risky Area: Database
+
+## Main Files
+
+- `src/main/db/schema.ts`
+- `src/main/db/initialize.ts`
+- `drizzle/`
+
+## Rules
+
+- never hand-edit numbered migrations
+- never hand-edit `drizzle/meta/`
+- use `pnpm exec drizzle-kit generate` for new migrations
+- treat schema invariants and data migrations as high risk
+
+## Current Behavior
+
+- database path is resolved by main-process db path helpers
+- `EMDASH_DB_FILE` overrides the default location
+- database initialization happens in `src/main/db/initialize.ts`
diff --git a/agents/risky-areas/pty.md b/agents/risky-areas/pty.md
new file mode 100644
index 0000000000..fe1e344d9b
--- /dev/null
+++ b/agents/risky-areas/pty.md
@@ -0,0 +1,24 @@
+# Risky Area: PTY And Sessions
+
+## Main Files
+
+- `src/main/core/pty/` — `local-pty.ts`, `ssh2-pty.ts`, `pty.ts`, `pty-env.ts`, `pty-session-registry.ts`, `spawn-utils.ts`, `exit-signals.ts`, `controller.ts`
+- `src/main/core/terminals/` — terminal lifecycle, local and SSH terminal providers
+- `src/main/core/conversations/impl/agent-event-classifiers/` — per-provider terminal output parsers
+- `src/main/core/agent-hooks/` — hook server, event enrichment, OS notifications, hook config writer
+
+## Core Risks
+
+- PTY cleanup and exit handling
+- resize behavior
+- shell quoting and Windows command wrapping
+- tmux lifecycle
+- provider-specific resume/session behavior
+- env passthrough safety
+
+## Rules
+
+- use the allowlisted env passthrough model in `src/main/core/pty/pty-env.ts`
+- do not weaken quoting or spawn behavior casually
+- validate both direct spawn and shell-wrapped spawn cases when changing PTY startup logic
+- confirm renderer event flow if hook payload or notification behavior changes
diff --git a/agents/risky-areas/ssh.md b/agents/risky-areas/ssh.md
new file mode 100644
index 0000000000..3fb8293b0d
--- /dev/null
+++ b/agents/risky-areas/ssh.md
@@ -0,0 +1,16 @@
+# Risky Area: SSH And Shell Escaping
+
+## Main Files
+
+- `src/main/core/ssh/` — `ssh-connection-manager.ts`, `ssh-credential-service.ts`, `ssh-client-proxy.ts`, `sshConfigParser.ts`, `build-connect-config.ts`, `controller.ts`
+- `src/main/core/fs/impl/ssh-fs.ts`
+- `src/main/core/pty/ssh2-pty.ts`
+- `src/main/core/terminals/impl/ssh-terminal-provider.ts`
+- `src/main/utils/shellEscape.ts`
+
+## Rules
+
+- treat remote shell construction as security-sensitive
+- use shared escaping and validation helpers
+- do not bypass path-safety or shell validation helpers
+- verify how a change affects both connection setup and command execution
diff --git a/agents/risky-areas/updater.md b/agents/risky-areas/updater.md
new file mode 100644
index 0000000000..7830a7f268
--- /dev/null
+++ b/agents/risky-areas/updater.md
@@ -0,0 +1,23 @@
+# Risky Area: Updater And Packaging
+
+## Main Files
+
+- `src/main/core/updates/AutoUpdateService.ts`
+- `src/main/core/updates/controller.ts`
+- `build/`
+- `package.json`
+- `.github/workflows/release.yml`
+- `.github/workflows/windows-beta-build.yml`
+- `.github/workflows/nix-build.yml`
+
+## Rules
+
+- avoid changing updater defaults casually
+- treat signing, notarization, packaging targets, and native rebuild flow as release-critical
+- keep build output directories and packaging config stable unless the task is explicitly about release behavior
+
+## Current Notes
+
+- macOS and Linux release jobs rebuild native modules for the target Electron version
+- Windows beta builds intentionally use Node 20 in CI for native module stability
+- changelog and auto-update behavior are separate but related surfaces in the app
diff --git a/agents/workflows/remote-development.md b/agents/workflows/remote-development.md
new file mode 100644
index 0000000000..4ac29de06d
--- /dev/null
+++ b/agents/workflows/remote-development.md
@@ -0,0 +1,26 @@
+# Remote Development
+
+## Main Files
+
+- `src/main/core/ssh/` — connection management, credentials, config parsing
+- `src/main/core/pty/ssh2-pty.ts`
+- `src/main/core/fs/impl/ssh-fs.ts`
+- `src/main/core/terminals/impl/ssh-terminal-provider.ts`
+- `src/main/utils/shellEscape.ts`
+
+## Current Model
+
+- remote projects are backed by SSH connections
+- remote worktrees live under `<project>/.emdash/worktrees/<task-slug>/`
+- remote PTYs stream agent shells back to the renderer
+
+## Authentication And Storage
+
+- SSH credentials are managed through the SSH services and OS-backed secret storage
+- host key handling is implemented under `src/main/core/ssh/`
+
+## Rules
+
+- treat all shell construction as security-sensitive
+- use shared SSH and shell-escaping helpers instead of ad hoc quoting
+- confirm whether a feature is local-only before assuming parity on remote projects
diff --git a/agents/workflows/testing.md b/agents/workflows/testing.md
new file mode 100644
index 0000000000..39b7c270f5
--- /dev/null
+++ b/agents/workflows/testing.md
@@ -0,0 +1,41 @@
+# Testing And Validation
+
+## Core Local Gate
+
+Run these before merging:
+
+```bash
+pnpm run format
+pnpm run lint
+pnpm run typecheck
+pnpm run test
+```
+
+## Test Layout
+
+- main-process tests: colocated in `src/main/core/**/*.test.ts`
+- renderer unit tests: `src/renderer/tests/`
+- renderer browser tests: `src/renderer/tests/browser/` (run via Playwright)
+
+## Current Setup
+
+- Vitest config is in `vitest.config.ts` (separate from the build config in `electron.vite.config.ts`).
+- Two test projects:
+  - `node` — all `src/**/*.test.ts` files excluding `_*` dirs and browser tests
+  - `browser` — `src/renderer/tests/browser/**/*.test.{ts,tsx}` via `@vitest/browser-playwright`
+- Tests use per-file `vi.mock()` setup.
+- Integration-style tests create temporary repos and worktrees in `os.tmpdir()`.
+
+## CI Notes
+
+- `.github/workflows/code-consistency-check.yml` currently enforces:
+  - `pnpm run format:check`
+  - `pnpm run typecheck`
+  - `pnpm exec vitest run`
+- Lint is still expected locally even though it is not enabled in that workflow yet.
+
+## Focused Validation
+
+- after IPC/RPC changes: rerun the affected Vitest file and confirm the controller is wired in `src/main/rpc.ts`
+- after worktree or PTY changes: rerun the closest `src/main/core/` test files
+- after docs changes: run `pnpm run docs:build`
diff --git a/agents/workflows/worktrees.md b/agents/workflows/worktrees.md
new file mode 100644
index 0000000000..e800eb2297
--- /dev/null
+++ b/agents/workflows/worktrees.md
@@ -0,0 +1,33 @@
+# Worktrees
+
+## Main Files
+
+- `src/main/core/projects/worktrees/worktree-service.ts`
+- `src/main/core/projects/project-manager.ts`
+- `src/main/core/terminals/runLifecycleScript.ts`
+- `.emdash.json`
+
+## Current Behavior
+
+- task worktrees are created under `../worktrees/`
+- branch prefix defaults to `emdash` and is configurable in app settings
+- selected gitignored files are preserved into worktrees
+- worktree creation is managed by the project provider pattern
+
+## `.emdash.json`
+
+Current supported keys:
+
+- `preservePatterns`
+- `scripts.setup`
+- `scripts.run`
+- `scripts.teardown`
+- `shellSetup`
+- `tmux`
+
+## Rules
+
+- do not hardcode worktree paths; use service helpers
+- use lifecycle config for repo-specific bootstrap and teardown behavior
+- `shellSetup` runs inside each PTY before the interactive shell starts
+- tmux wrapping is project-configurable and affects PTY lifecycle behavior
diff --git a/components.json b/components.json
index 0d76b71de4..b0732a2d7e 100644
--- a/components.json
+++ b/components.json
@@ -1,10 +1,10 @@
 {
   "$schema": "https://ui.shadcn.com/schema.json",
-  "style": "new-york",
+  "style": "base-vega",
   "rsc": false,
   "tsx": true,
   "tailwind": {
-    "config": "tailwind.config.js",
+    "config": "",
     "css": "src/renderer/index.css",
     "baseColor": "neutral",
     "cssVariables": true,
@@ -12,11 +12,11 @@
   },
   "iconLibrary": "lucide",
   "aliases": {
-    "components": "@/components",
-    "utils": "@/lib/utils",
-    "ui": "@/components/ui",
-    "lib": "@/lib",
-    "hooks": "@/hooks"
+    "components": "@renderer/components",
+    "utils": "@renderer/lib/utils",
+    "ui": "@renderer/components/ui",
+    "lib": "@renderer/lib",
+    "hooks": "@renderer/hooks"
   },
   "registries": {
     "@ai-elements": "https://registry.ai-sdk.dev/{name}.json"
diff --git a/dev-app-update.yml b/dev-app-update.yml
new file mode 100644
index 0000000000..48898d1823
--- /dev/null
+++ b/dev-app-update.yml
@@ -0,0 +1,3 @@
+provider: generic
+url: https://releases.emdash.sh
+channel: v1-stable
diff --git a/docker-compose.yaml b/docker-compose.yaml
new file mode 100644
index 0000000000..a16ff31cee
--- /dev/null
+++ b/docker-compose.yaml
@@ -0,0 +1,50 @@
+# ──────────────────────────────────────────────────────────────────────────────
+# Emdash SSH Dev Container — docker-compose
+#
+# Usage:
+#   cp .env.example .env       # fill in your API keys
+#   docker compose up --build -d
+#
+# Connect from emdash:
+#   host: localhost  port: 2222  user: devuser  auth: password  pass: devpass
+# ──────────────────────────────────────────────────────────────────────────────
+services:
+  ssh-dev:
+    build:
+      context: ./docker-ssh
+      dockerfile: dockerfile
+    container_name: emdash-ssh-dev
+    ports:
+      - "2222:22"
+    environment:
+      # API keys forwarded into SSH sessions via ~/.ssh/environment.
+      # Define these in a .env file next to this compose file (gitignored).
+      - ANTHROPIC_API_KEY=${ANTHROPIC_API_KEY:-}
+      - OPENAI_API_KEY=${OPENAI_API_KEY:-}
+      - GH_TOKEN=${GH_TOKEN:-}
+      - GITHUB_TOKEN=${GITHUB_TOKEN:-}
+      - GEMINI_API_KEY=${GEMINI_API_KEY:-}
+      - GOOGLE_API_KEY=${GOOGLE_API_KEY:-}
+      - AMP_API_KEY=${AMP_API_KEY:-}
+      - DASHSCOPE_API_KEY=${DASHSCOPE_API_KEY:-}
+      - KIMI_API_KEY=${KIMI_API_KEY:-}
+      - MISTRAL_API_KEY=${MISTRAL_API_KEY:-}
+      - CODEBUFF_API_KEY=${CODEBUFF_API_KEY:-}
+      - FACTORY_API_KEY=${FACTORY_API_KEY:-}
+      - CURSOR_API_KEY=${CURSOR_API_KEY:-}
+    volumes:
+      # ── Project mounts ───────────────────────────────────────────────────
+      # Option A: mount a real local git repo from your Mac (recommended):
+      #   - /Users/yourname/code/myrepo:/home/devuser/projects/myrepo
+      #
+      # Option B: use a named volume for a self-contained sandbox:
+      - projects:/home/devuser/projects
+    restart: unless-stopped
+    # Needed for tmux PTY allocation over SSH
+    tty: true
+    stdin_open: true
+    shm_size: '256mb'
+
+volumes:
+  projects:
+    driver: local
\ No newline at end of file
diff --git a/docker-ssh/dockerfile b/docker-ssh/dockerfile
new file mode 100644
index 0000000000..05e8fa9f79
--- /dev/null
+++ b/docker-ssh/dockerfile
@@ -0,0 +1,128 @@
+# ──────────────────────────────────────────────────────────────────────────────
+# Emdash SSH Dev Container
+#
+# A self-contained Linux environment you can SSH into from emdash's SSH remote
+# development feature. Includes git, gh, tmux, Node.js, and Claude Code out
+# of the box. Other agents (codex, gemini, etc.) can be installed on top.
+#
+# Usage:
+#   docker compose up --build -d
+#   Then add an SSH connection in emdash:
+#     host: localhost  port: 2222  user: devuser  auth: password  pass: devpass
+# ──────────────────────────────────────────────────────────────────────────────
+FROM ubuntu:24.04
+
+# Avoid interactive prompts during package install
+ENV DEBIAN_FRONTEND=noninteractive
+
+# ── System packages ─────────────────────────────────────────────────────────
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    # SSH server
+    openssh-server \
+    # Core tools
+    git \
+    curl \
+    wget \
+    tmux \
+    sudo \
+    ca-certificates \
+    gnupg \
+    # Shell utilities
+    bash \
+    zsh \
+    vim \
+    nano \
+    less \
+    # Build tools (needed by some npm native modules)
+    build-essential \
+    python3 \
+    # Process utilities
+    procps \
+    && rm -rf /var/lib/apt/lists/*
+
+# ── GitHub CLI (gh) ─────────────────────────────────────────────────────────
+RUN curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg \
+      | gpg --dearmor -o /usr/share/keyrings/githubcli-archive-keyring.gpg \
+    && chmod go+r /usr/share/keyrings/githubcli-archive-keyring.gpg \
+    && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" \
+      > /etc/apt/sources.list.d/github-cli.list \
+    && apt-get update \
+    && apt-get install -y gh \
+    && rm -rf /var/lib/apt/lists/*
+
+# ── Node.js 22 LTS (via NodeSource) ─────────────────────────────────────────
+RUN curl -fsSL https://deb.nodesource.com/setup_22.x | bash - \
+    && apt-get install -y nodejs \
+    && rm -rf /var/lib/apt/lists/*
+
+# ── Global npm config: faster installs, no fund/audit noise ─────────────────
+RUN npm config set fund false && npm config set audit false
+
+# ── Claude Code ─────────────────────────────────────────────────────────────
+# Primary agent. Installed globally so it's on PATH for all users.
+RUN npm install -g @anthropic-ai/claude-code
+
+# ── Optional: additional agents (uncomment as needed) ───────────────────────
+# RUN npm install -g @openai/codex          # OpenAI Codex CLI
+# RUN npm install -g @google/gemini-cli     # Gemini CLI
+# RUN npm install -g opencode               # OpenCode
+
+# ── Dev user ─────────────────────────────────────────────────────────────────
+# 'devuser' is the account emdash will SSH into.
+# Password is 'devpass' — change or replace with key auth for security.
+RUN useradd -m -s /bin/bash devuser \
+    && echo 'devuser:devpass' | chpasswd \
+    && usermod -aG sudo devuser \
+    && echo 'devuser ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers.d/devuser
+
+# ── SSH server config ────────────────────────────────────────────────────────
+# Generate host keys and configure sshd for interactive use.
+RUN mkdir -p /var/run/sshd \
+    && ssh-keygen -A
+
+# Allow password auth and keep SSH sessions alive.
+# PermitUserEnvironment lets ~/.ssh/environment set API keys on login.
+RUN sed -i 's/#PasswordAuthentication yes/PasswordAuthentication yes/' /etc/ssh/sshd_config \
+    && sed -i 's/PasswordAuthentication no/PasswordAuthentication yes/' /etc/ssh/sshd_config \
+    && echo 'PermitUserEnvironment yes' >> /etc/ssh/sshd_config \
+    && echo 'ClientAliveInterval 60' >> /etc/ssh/sshd_config \
+    && echo 'ClientAliveCountMax 10' >> /etc/ssh/sshd_config \
+    && echo 'X11Forwarding no' >> /etc/ssh/sshd_config
+
+# ── Git global defaults for devuser ─────────────────────────────────────────
+USER devuser
+WORKDIR /home/devuser
+
+RUN git config --global user.email "devuser@emdash-dev" \
+    && git config --global user.name "Emdash Dev" \
+    && git config --global init.defaultBranch main \
+    # Required: allow git operations in worktrees under /home/devuser
+    && git config --global safe.directory '*'
+
+# ── Projects directory ───────────────────────────────────────────────────────
+# Mount your git repos here, e.g.:
+#   volumes:
+#     - /path/to/my/project:/home/devuser/projects/myproject
+RUN mkdir -p /home/devuser/projects
+
+# ── tmux default config: no status bar clutter ──────────────────────────────
+RUN echo 'set -g default-terminal "xterm-256color"' > /home/devuser/.tmux.conf \
+    && echo 'set -g history-limit 50000' >> /home/devuser/.tmux.conf \
+    && echo 'set-option -g allow-rename on' >> /home/devuser/.tmux.conf
+
+# ── Optional: SSH authorized_keys ───────────────────────────────────────────
+# Uncomment and mount your public key for key-based auth:
+# COPY --chown=devuser:devuser authorized_keys /home/devuser/.ssh/authorized_keys
+# RUN chmod 700 /home/devuser/.ssh && chmod 600 /home/devuser/.ssh/authorized_keys
+RUN mkdir -p /home/devuser/.ssh && chmod 700 /home/devuser/.ssh
+
+# ── Startup ──────────────────────────────────────────────────────────────────
+# sshd must run as root; use an entrypoint script to inject env vars
+# from docker-compose into the user's environment file, then start sshd.
+USER root
+
+COPY --chmod=755 entrypoint.sh /entrypoint.sh
+
+EXPOSE 22
+
+ENTRYPOINT ["/entrypoint.sh"]
\ No newline at end of file
diff --git a/docker-ssh/entrypoint.sh b/docker-ssh/entrypoint.sh
new file mode 100755
index 0000000000..a5a53c665d
--- /dev/null
+++ b/docker-ssh/entrypoint.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+set -e
+
+# Write any ANTHROPIC_API_KEY / GH_TOKEN / etc. passed as container env vars
+# into devuser's ~/.ssh/environment so they're available in SSH sessions
+# (requires PermitUserEnvironment yes in sshd_config).
+ENV_FILE=/home/devuser/.ssh/environment
+: > "$ENV_FILE"
+chown devuser:devuser "$ENV_FILE"
+chmod 600 "$ENV_FILE"
+
+AGENT_VARS=(
+  ANTHROPIC_API_KEY
+  OPENAI_API_KEY
+  GH_TOKEN
+  GITHUB_TOKEN
+  GEMINI_API_KEY
+  GOOGLE_API_KEY
+  AMP_API_KEY
+  DASHSCOPE_API_KEY
+  KIMI_API_KEY
+  MISTRAL_API_KEY
+  CODEBUFF_API_KEY
+  FACTORY_API_KEY
+  CURSOR_API_KEY
+)
+
+for var in "${AGENT_VARS[@]}"; do
+  val="${!var:-}"
+  if [ -n "$val" ]; then
+    echo "${var}=${val}" >> "$ENV_FILE"
+  fi
+done
+
+exec /usr/sbin/sshd -D -e
\ No newline at end of file
diff --git a/docs/.gitignore b/docs/.gitignore
deleted file mode 100644
index 906741640e..0000000000
--- a/docs/.gitignore
+++ /dev/null
@@ -1,22 +0,0 @@
-node_modules
-
-.DS_Store
-.cache
-.vercel
-.output
-.nitro
-.next
-/build/
-/api/
-/server/build
-/public/build
-/test-results/
-/playwright-report/
-/blob-report/
-/playwright/.cache/
-.tanstack
-
-src/routeTree.gen.ts
-.source/
-next-env.d.ts
-public/md-src/
diff --git a/docs/README.md b/docs/README.md
deleted file mode 100644
index d219822c4d..0000000000
--- a/docs/README.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Emdash
-
-This is a Tanstack Start application generated with
-[Create Fumadocs](https://github.com/fuma-nama/fumadocs).
-
-Run development server:
-
-```bash
-pnpm run dev
-# or
-pnpm dev
-# or
-yarn dev
-```
diff --git a/docs/app/[[...slug]]/layout.tsx b/docs/app/[[...slug]]/layout.tsx
deleted file mode 100644
index b70a3b4560..0000000000
--- a/docs/app/[[...slug]]/layout.tsx
+++ /dev/null
@@ -1,12 +0,0 @@
-import { source } from '@/lib/source';
-import { DocsLayout } from 'fumadocs-ui/layouts/docs';
-import type { ReactNode } from 'react';
-import { baseOptions } from '@/lib/layout.shared';
-
-export default function Layout({ children }: { children: ReactNode }) {
-  return (
-    <DocsLayout tree={source.pageTree} {...baseOptions()}>
-      {children}
-    </DocsLayout>
-  );
-}
diff --git a/docs/app/[[...slug]]/page.tsx b/docs/app/[[...slug]]/page.tsx
deleted file mode 100644
index fea5b88f57..0000000000
--- a/docs/app/[[...slug]]/page.tsx
+++ /dev/null
@@ -1,87 +0,0 @@
-import { source } from '@/lib/source';
-import { DocsPage, DocsBody, DocsDescription, DocsTitle } from 'fumadocs-ui/page';
-import { notFound } from 'next/navigation';
-import defaultMdxComponents from 'fumadocs-ui/mdx';
-import type { Metadata } from 'next';
-import { CopyMarkdownButton } from '@/components/CopyMarkdownButton';
-import { LastUpdated } from '@/components/LastUpdated';
-import { getGithubLastEdit } from 'fumadocs-core/content/github';
-
-async function getLastModifiedFromGitHub(filePath: string): Promise<Date | null> {
-  if (process.env.NODE_ENV === 'development') {
-    return null;
-  }
-
-  try {
-    const time = await getGithubLastEdit({
-      owner: 'generalaction',
-      repo: 'emdash',
-      path: `docs/content/docs/${filePath}.mdx`,
-      token: process.env.GIT_TOKEN ? `Bearer ${process.env.GIT_TOKEN}` : undefined,
-    });
-    return time ? new Date(time) : null;
-  } catch {
-    return null;
-  }
-}
-
-export default async function Page({ params }: { params: Promise<{ slug?: string[] }> }) {
-  const { slug } = await params;
-  const page = source.getPage(slug);
-
-  if (!page) {
-    notFound();
-  }
-
-  const MDX = page.data.body;
-
-  // Prefer plugin-derived lastModified, fallback to GitHub API
-  let lastModified: Date | undefined = page.data.lastModified;
-  if (!lastModified) {
-    const filePath = slug?.join('/') || 'index';
-    lastModified = (await getLastModifiedFromGitHub(filePath)) ?? undefined;
-  }
-
-  return (
-    <DocsPage
-      toc={page.data.toc}
-      full={page.data.full}
-      breadcrumb={{
-        enabled: true,
-        includeRoot: { url: '/' },
-        includePage: true,
-      }}
-      tableOfContent={{
-        style: 'clerk',
-      }}
-    >
-      <DocsTitle>{page.data.title}</DocsTitle>
-      <DocsDescription className="mb-0">{page.data.description}</DocsDescription>
-      <div className="border-fd-border flex items-center gap-2 border-b pb-4 pt-2">
-        <CopyMarkdownButton markdownUrl={page.url === '/' ? '/index.md' : `${page.url}.md`} />
-      </div>
-      <DocsBody>
-        <MDX components={{ ...defaultMdxComponents }} />
-      </DocsBody>
-      {lastModified && <LastUpdated date={lastModified} />}
-    </DocsPage>
-  );
-}
-
-export async function generateStaticParams() {
-  return source.generateParams();
-}
-
-export async function generateMetadata(props: {
-  params: Promise<{ slug?: string[] }>;
-}): Promise<Metadata> {
-  const params = await props.params;
-  const page = source.getPage(params.slug);
-
-  if (!page) notFound();
-
-  return {
-    title: page.data.title,
-    description: page.data.description,
-  };
-}
diff --git a/docs/app/api/search/route.ts b/docs/app/api/search/route.ts
deleted file mode 100644
index b02d7cd3a7..0000000000
--- a/docs/app/api/search/route.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { source } from '@/lib/source';
-import { createFromSource } from 'fumadocs-core/search/server';
-
-export const { GET } = createFromSource(source, {
-  language: 'english',
-});
diff --git a/docs/app/global.css b/docs/app/global.css
deleted file mode 100644
index b17f8a2e97..0000000000
--- a/docs/app/global.css
+++ /dev/null
@@ -1,18 +0,0 @@
-@import 'tailwindcss';
-@import 'fumadocs-ui/css/neutral.css';
-@import 'fumadocs-ui/css/preset.css';
-
-/* Custom colors from Emdash palette */
-:root {
-  --color-fd-primary: #c26157;
-  --color-fd-primary-foreground: #f7fbfc;
-  --color-fd-accent: #e8ebee;
-  --color-fd-accent-foreground: #1f2931;
-}
-
-.dark {
-  --color-fd-primary: #c26157;
-  --color-fd-primary-foreground: #eef0f2;
-  --color-fd-accent: #212a2d;
-  --color-fd-accent-foreground: #eef0f2;
-}
diff --git a/docs/app/layout.tsx b/docs/app/layout.tsx
deleted file mode 100644
index 59df42f33f..0000000000
--- a/docs/app/layout.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import './global.css';
-import { RootProvider } from 'fumadocs-ui/provider/next';
-import type { ReactNode } from 'react';
-
-export default function RootLayout({ children }: { children: ReactNode }) {
-  return (
-    <html lang="en" suppressHydrationWarning>
-      <body className="flex min-h-screen flex-col">
-        <RootProvider>{children}</RootProvider>
-      </body>
-    </html>
-  );
-}
-
-export const metadata = {
-  title: 'Emdash - Docs',
-  description: 'Open source Agentic Development Environment',
-  icons: {
-    icon: '/brand/favicon.ico',
-  },
-};
diff --git a/docs/components/Changelog.tsx b/docs/components/Changelog.tsx
deleted file mode 100644
index 8d8ff65487..0000000000
--- a/docs/components/Changelog.tsx
+++ /dev/null
@@ -1,284 +0,0 @@
-import React from 'react';
-
-interface GitHubRelease {
-  id: number;
-  tag_name: string;
-  name: string;
-  body: string | null;
-  published_at: string;
-  html_url: string;
-  draft: boolean;
-  prerelease: boolean;
-}
-
-async function getGithubReleases(): Promise<GitHubRelease[]> {
-  try {
-    const response = await fetch('https://api.github.com/repos/generalaction/emdash/releases', {
-      headers: {
-        Accept: 'application/vnd.github.v3+json',
-        ...(process.env.GITHUB_TOKEN && {
-          Authorization: `token ${process.env.GITHUB_TOKEN}`,
-        }),
-      },
-      next: { revalidate: 3600 }, // Cache for 1 hour
-    });
-
-    if (!response.ok) {
-      console.error('GitHub API error:', response.status);
-      return [];
-    }
-
-    const releases = await response.json();
-    return releases.filter((r: GitHubRelease) => !r.draft);
-  } catch (error) {
-    console.error('Failed to fetch releases:', error);
-    return [];
-  }
-}
-
-function formatDate(dateString: string): string {
-  const date = new Date(dateString);
-  return date.toLocaleDateString('en-US', {
-    year: 'numeric',
-    month: 'long',
-    day: 'numeric',
-  });
-}
-
-function formatVersion(tagName: string): string {
-  return tagName.startsWith('v') ? tagName.substring(1) : tagName;
-}
-
-export async function Changelog() {
-  const releases = await getGithubReleases();
-
-  if (releases.length === 0) {
-    return (
-      <div className="text-muted-foreground">
-        <p>
-          No releases found. Check the{' '}
-          <a
-            href="https://github.com/generalaction/emdash/releases"
-            target="_blank"
-            rel="noopener noreferrer"
-            className="underline"
-          >
-            GitHub Releases
-          </a>{' '}
-          page.
-        </p>
-      </div>
-    );
-  }
-
-  return (
-    <div className="space-y-12">
-      {releases.slice(0, 20).map((release) => (
-        <div key={release.id} className="border-b border-border pb-8 last:border-0">
-          <div className="mb-4 flex flex-wrap items-baseline justify-between gap-2">
-            <h2 className="text-2xl font-bold">
-              <a
-                href={release.html_url}
-                target="_blank"
-                rel="noopener noreferrer"
-                className="hover:underline"
-              >
-                v{formatVersion(release.tag_name)}
-              </a>
-            </h2>
-            <time className="text-sm text-muted-foreground">
-              {formatDate(release.published_at)}
-            </time>
-          </div>
-
-          {release.body ? (
-            <div className="prose prose-sm dark:prose-invert max-w-none">
-              <ReleaseNotes content={release.body} />
-            </div>
-          ) : (
-            <p className="italic text-muted-foreground">No release notes available.</p>
-          )}
-        </div>
-      ))}
-    </div>
-  );
-}
-
-function ReleaseNotes({ content }: { content: string }) {
-  // Process content line by line, handling both markdown and HTML
-  const lines = content.split('\n');
-  const elements: React.ReactNode[] = [];
-  let currentListItems: React.ReactNode[] = [];
-  let inCodeBlock = false;
-  let codeBlockContent: string[] = [];
-  let codeBlockStartIndex = 0;
-
-  // Helper function to flush list items
-  const flushListItems = () => {
-    if (currentListItems.length > 0) {
-      elements.push(
-        <ul key={`list-${elements.length}`} className="my-2 ml-4 list-disc space-y-1">
-          {currentListItems}
-        </ul>
-      );
-      currentListItems = [];
-    }
-  };
-
-  // Helper function to process links in text
-  const processLinks = (text: string): string => {
-    return (
-      text
-        // Handle GitHub URLs, but not if they're followed by punctuation
-        .replace(
-          /https:\/\/github\.com\/[^\s\)\]]+/g,
-          (url) =>
-            `<a href="${url.replace(/[.,;!?]+$/, '')}" target="_blank" rel="noopener noreferrer" class="underline">${url.replace(/[.,;!?]+$/, '')}</a>`
-        )
-        // Handle @mentions, but avoid matching email addresses
-        // Look for @mentions that are preceded by whitespace or start of string
-        .replace(
-          /(^|[\s\(])@(\w+)(?=\s|$|[^\w@])/g,
-          (match, prefix, username) =>
-            `${prefix}<a href="https://github.com/${username}" target="_blank" rel="noopener noreferrer" class="font-medium">@${username}</a>`
-        )
-    );
-  };
-
-  for (let i = 0; i < lines.length; i++) {
-    const line = lines[i];
-
-    // Check for code block start/end
-    if (line.startsWith('```')) {
-      if (inCodeBlock) {
-        // End code block
-        elements.push(
-          <pre
-            key={codeBlockStartIndex}
-            className="my-3 overflow-x-auto rounded bg-gray-100 p-3 text-sm dark:bg-gray-800"
-          >
-            <code>{codeBlockContent.join('\n')}</code>
-          </pre>
-        );
-        codeBlockContent = [];
-        inCodeBlock = false;
-      } else {
-        // Start code block
-        flushListItems(); // Flush any pending list items
-        inCodeBlock = true;
-        codeBlockStartIndex = i;
-      }
-      continue;
-    }
-
-    // If we're in a code block, just collect the content
-    if (inCodeBlock) {
-      codeBlockContent.push(line);
-      continue;
-    }
-
-    // Handle HTML img tags
-    if (line.includes('<img')) {
-      flushListItems(); // Flush any pending list items
-      const imgMatch = line.match(/<img[^>]+>/);
-      if (imgMatch) {
-        const srcMatch = imgMatch[0].match(/src="([^"]+)"/);
-        const altMatch = imgMatch[0].match(/alt="([^"]+)"/);
-        const widthMatch = imgMatch[0].match(/width="([^"]+)"/);
-        const heightMatch = imgMatch[0].match(/height="([^"]+)"/);
-
-        if (srcMatch) {
-          elements.push(
-            <div key={i} className="my-4">
-              <img
-                src={srcMatch[1]}
-                alt={altMatch ? altMatch[1] : 'Release image'}
-                width={widthMatch ? widthMatch[1] : undefined}
-                height={heightMatch ? heightMatch[1] : undefined}
-                className="h-auto max-w-full rounded-lg border border-border"
-              />
-            </div>
-          );
-          continue;
-        }
-      }
-    }
-
-    // Headers
-    if (line.startsWith('## ')) {
-      flushListItems(); // Flush any pending list items
-      elements.push(
-        <h3 key={i} className="mb-2 mt-4 text-lg font-semibold">
-          {line.substring(3)}
-        </h3>
-      );
-      continue;
-    }
-    if (line.startsWith('### ')) {
-      flushListItems(); // Flush any pending list items
-      elements.push(
-        <h4 key={i} className="mb-1 mt-3 font-semibold">
-          {line.substring(4)}
-        </h4>
-      );
-      continue;
-    }
-
-    // List items (support both * and - prefixes)
-    if (line.startsWith('* ') || line.startsWith('- ')) {
-      const item = line.substring(2);
-      const withLinks = processLinks(item);
-      currentListItems.push(<li key={i} dangerouslySetInnerHTML={{ __html: withLinks }} />);
-      continue;
-    }
-
-    // If we hit a non-list item, flush any pending list items
-    if (currentListItems.length > 0 && !line.startsWith('  ')) {
-      flushListItems();
-    }
-
-    // Bold text (like **New Contributors**)
-    if (line.includes('**')) {
-      flushListItems(); // Flush any pending list items
-      const formatted = line.replace(/\*\*(.*?)\*\*/g, '<strong>$1</strong>');
-      const withLinks = processLinks(formatted);
-      elements.push(
-        <p key={i} className="mt-4 font-semibold" dangerouslySetInnerHTML={{ __html: withLinks }} />
-      );
-      continue;
-    }
-
-    // Full Changelog link
-    if (line.includes('Full Changelog:')) {
-      flushListItems(); // Flush any pending list items
-      const match = line.match(/https:\/\/github\.com\/[^\s\)\]]+/);
-      if (match) {
-        elements.push(
-          <p key={i} className="mt-4">
-            <strong>Full Changelog:</strong>{' '}
-            <a href={match[0]} target="_blank" rel="noopener noreferrer" className="underline">
-              View diff
-            </a>
-          </p>
-        );
-        continue;
-      }
-    }
-
-    // Empty lines
-    if (line.trim() === '') {
-      flushListItems(); // Flush any pending list items
-      continue;
-    }
-
-    // Regular text with link processing
-    flushListItems(); // Flush any pending list items
-    const withLinks = processLinks(line);
-    elements.push(<p key={i} className="my-2" dangerouslySetInnerHTML={{ __html: withLinks }} />);
-  }
-
-  // Flush any remaining list items
-  flushListItems();
-
-  return <>{elements}</>;
-}
diff --git a/docs/components/CopyMarkdownButton.tsx b/docs/components/CopyMarkdownButton.tsx
deleted file mode 100644
index f6d8fc0e26..0000000000
--- a/docs/components/CopyMarkdownButton.tsx
+++ /dev/null
@@ -1,31 +0,0 @@
-'use client';
-
-import * as React from 'react';
-
-export function CopyMarkdownButton({ markdownUrl }: { markdownUrl: string }) {
-  const [state, setState] = React.useState<'idle' | 'copied' | 'error'>('idle');
-
-  async function onCopy() {
-    try {
-      setState('idle');
-      const res = await fetch(markdownUrl, { cache: 'no-store' });
-      if (!res.ok) throw new Error(`Failed to fetch markdown: ${res.status}`);
-      const md = await res.text();
-      await navigator.clipboard.writeText(md);
-      setState('copied');
-      window.setTimeout(() => setState('idle'), 1200);
-    } catch {
-      setState('error');
-      window.setTimeout(() => setState('idle'), 1500);
-    }
-  }
-
-  return (
-    <button
-      onClick={onCopy}
-      className="border-fd-border bg-fd-secondary text-fd-secondary-foreground hover:bg-fd-accent hover:text-fd-accent-foreground inline-flex items-center gap-1.5 rounded-md border px-2.5 py-1 text-xs font-medium transition-colors"
-    >
-      {state === 'copied' ? 'Copied' : state === 'error' ? 'Error' : 'Copy Markdown'}
-    </button>
-  );
-}
diff --git a/docs/components/LastUpdated.tsx b/docs/components/LastUpdated.tsx
deleted file mode 100644
index b0670491ad..0000000000
--- a/docs/components/LastUpdated.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-export function LastUpdated({ date }: { date: Date }) {
-  if (!date || isNaN(date.getTime())) {
-    return null;
-  }
-
-  const formatted = new Intl.DateTimeFormat(undefined, {
-    year: 'numeric',
-    month: 'long',
-    day: 'numeric',
-  }).format(date);
-
-  return (
-    <div className="border-fd-border mt-10 border-b pb-4">
-      <div className="text-fd-muted-foreground flex justify-end text-xs">
-        Last updated on {formatted}
-      </div>
-    </div>
-  );
-}
diff --git a/docs/content/docs/best-of-n.mdx b/docs/content/docs/best-of-n.mdx
deleted file mode 100644
index 5c730617f8..0000000000
--- a/docs/content/docs/best-of-n.mdx
+++ /dev/null
@@ -1,66 +0,0 @@
----
-title: Best of N
-description: Run multiple agents in parallel and pick the best result
----
-
-Run multiple agents on the same task, let them work in parallel, then pick the best output. Each agent gets its own worktree so they don't interfere with each other.
-
-<img
-  src="/media/bestofn.png"
-  alt="Running multiple agents in parallel"
-  style={{
-    width: '100%',
-    maxWidth: '700px',
-    margin: '20px auto',
-    display: 'block',
-    borderRadius: '8px',
-    boxShadow: '0 4px 6px rgba(0, 0, 0, 0.1)',
-  }}
-/>
-
-## Why Use It
-
-Different agents have different strengths. Running them in parallel lets you:
-
-- Compare solutions from different providers (Claude vs Codex vs Gemini)
-- Get multiple attempts at a tricky problem
-- Race agents to see which finishes first
-
-## How to Start
-
-When creating a task:
-
-1. Click the provider dropdown
-2. Select multiple providers, or increase the count for a single provider (e.g., 3× Claude Code)
-3. Click Create
-
-Emdash creates a separate git branch and worktree for each agent. They all start from the same base commit but work independently.
-
-<img
-  src="/media/bestofn2.png"
-  alt="Multiple agents working in separate worktrees"
-  style={{
-    width: '100%',
-    maxWidth: '700px',
-    margin: '20px auto',
-    display: 'block',
-    borderRadius: '8px',
-    boxShadow: '0 4px 6px rgba(0, 0, 0, 0.1)',
-  }}
-/>
-
-## Working with Multiple Agents
-
-Each agent spawns in its own terminal tab. Switch between tabs to watch them work, or use the shared input bar to send the same message to all of them.
-
-## Comparing Results
-
-After agents finish, review their changes in the [diff view](/diff-view). Each agent's worktree has its own set of changes. Check the diff stats (files changed, lines added/removed) for a quick sense of each approach.
-
-Pick the best solution and merge that branch. Discard the rest.
-
-## Tips
-
-- Start with 2-3 agents. More than that gets hard to compare.
-- Use the same initial prompt for fair comparison.
-- Complex tasks benefit most from multiple perspectives.
diff --git a/docs/content/docs/changelog.mdx b/docs/content/docs/changelog.mdx
deleted file mode 100644
index 1a0eec111a..0000000000
--- a/docs/content/docs/changelog.mdx
+++ /dev/null
@@ -1,22 +0,0 @@
----
-title: Changelog
-description: Version history and release notes for Emdash
----
-
-import { Changelog } from '../../components/Changelog';
-
-<Changelog />
-
----
-
-## Release Process
-
-Emdash follows [Semantic Versioning](https://semver.org/):
-
-- **Patch versions** (0.0.x): Bug fixes and minor improvements
-- **Minor versions** (0.x.0): New features and capabilities
-- **Major versions** (x.0.0): Breaking changes
-
-## Contributing
-
-See our [Contributing Guide](/contributing) to learn how you can help improve Emdash.
diff --git a/docs/content/docs/ci-checks.mdx b/docs/content/docs/ci-checks.mdx
deleted file mode 100644
index ad892b4389..0000000000
--- a/docs/content/docs/ci-checks.mdx
+++ /dev/null
@@ -1,57 +0,0 @@
----
-title: CI/CD Checks
-description: Monitor GitHub Actions check runs directly in Emdash
----
-
-Emdash surfaces your GitHub Actions CI/CD status inside the app so you can monitor check runs without switching to a browser.
-
-<img
-  src="/media/cicd.png"
-  alt="CI/CD checks panel in Emdash"
-  style={{
-    width: '100%',
-    maxWidth: '700px',
-    margin: '20px auto',
-    display: 'block',
-    borderRadius: '8px',
-    boxShadow: '0 4px 6px rgba(0, 0, 0, 0.1)',
-  }}
-/>
-
-## Viewing Checks
-
-Once a task has a Pull Request, a **Checks** tab appears in the file changes panel. Click it to see all check runs for that PR's branch.
-
-Each check shows:
-
-- **Status**: Green checkmark (pass), red X (fail), amber spinner (pending), or grey dash (skipped/cancelled)
-- **Name and workflow**: Which check ran and from which workflow
-- **Duration**: How long the check took
-- **External link**: Click to open the full check run on GitHub
-
-A summary at the top shows the total count of passed, failed, and pending checks.
-
-## Auto-Refresh
-
-Emdash automatically polls for check updates:
-
-- **Every 10 seconds** while checks are still running
-- **Every 60 seconds** once all checks complete
-- **On window focus** — checks refresh when you switch back to Emdash
-
-Polling pauses when the app is in the background to save resources.
-
-## Requirements
-
-- The [GitHub CLI](https://cli.github.com/) (`gh`) must be installed and authenticated
-- The task's branch must have an open Pull Request on GitHub
-- Your repository must have GitHub Actions workflows configured
-
-If the Checks tab is disabled, it means no PR exists for the current task yet. Push a branch and open a PR to start seeing checks.
-
-## Tips
-
-- The Checks tab automatically activates when a PR exists but there are no local uncommitted changes.
-- Failed checks show a red dot on the tab badge so you can spot failures at a glance.
-- A spinning indicator on the tab badge means checks are still in progress.
-- Click the external link icon on any check to jump straight to the run details on GitHub.
diff --git a/docs/content/docs/contributing.mdx b/docs/content/docs/contributing.mdx
deleted file mode 100644
index ecaab77fed..0000000000
--- a/docs/content/docs/contributing.mdx
+++ /dev/null
@@ -1,189 +0,0 @@
----
-title: Contributing
-description: Help improve Emdash - contribution guidelines and development setup
----
-
-Thanks for your interest in contributing! We favor small, focused PRs and clear intent over big bangs. This guide explains how to get set up, the workflow we use, and a few project‑specific conventions.
-
-## Quick Start
-
-### Prerequisites
-
-- **Node.js 20.0.0+ (recommended: 22.20.0)** and Git
-- Optional (recommended for end‑to‑end testing):
-  - GitHub CLI (`brew install gh`; then `gh auth login`)
-  - At least one supported coding agent CLI (see [Providers](/providers))
-
-### Setup
-
-```bash
-# Fork this repo, then clone your fork
-git clone https://github.com/<you>/emdash.git
-cd emdash
-
-# Use the correct Node.js version (if using nvm)
-nvm use
-
-# Quick start: install dependencies and run dev server
-pnpm run d
-
-# Or run separately:
-pnpm install
-pnpm run dev
-
-# Type checking, lint, build
-pnpm run type-check
-pnpm run lint
-pnpm run build
-```
-
-**Tip:** During development, the renderer hot‑reloads. Changes to the Electron main process (files in `src/main`) require a restart of the dev app.
-
-## Project Overview
-
-- `src/main/` – Electron main process, IPC handlers, services (Git, worktrees, PTY manager, DB, etc.)
-- `src/renderer/` – React UI (Vite), hooks, components
-- Local database – SQLite file created under the OS userData folder (see "Local DB" below)
-- Worktrees – Git worktrees are created outside your repo root in a sibling `worktrees/` folder
-- Logs – Agent terminal output and app logs are written to the OS userData folder (not inside repos)
-
-## Development Workflow
-
-### 1. Create a feature branch
-
-```bash
-git checkout -b feat/<short-slug>
-```
-
-### 2. Make changes and keep PRs small and focused
-
-- Prefer a series of small PRs over one large one.
-- Include UI screenshots/GIFs when modifying the interface.
-- Update docs (README or inline help) when behavior changes.
-
-### 3. Run checks locally
-
-```bash
-pnpm run format      # Format code with Prettier (required)
-pnpm run type-check  # TypeScript type checking
-pnpm run lint        # ESLint
-pnpm run build       # Build both main and renderer
-```
-
-Pre-commit hooks run automatically via Husky + lint-staged. On each commit, staged files are auto-formatted with Prettier and linted with ESLint. You don't need to remember to run these manually. Type checking and tests run in CI only since they need the full project context and are slower to execute.
-
-If you need to skip the hook for a work-in-progress commit, use `git commit --no-verify`. The checks will still run in CI when you open a PR.
-
-### 4. Commit using Conventional Commits
-
-- `feat:` – new user‑facing capability
-- `fix:` – bug fix
-- `chore:`, `refactor:`, `docs:`, `perf:`, `test:` etc.
-
-**Examples:**
-
-```
-fix(opencode): change initialPromptFlag from -p to --prompt for TUI
-
-feat(docs): add changelog tab with GitHub releases integration
-```
-
-### 5. Open a Pull Request
-
-- Describe the change, rationale, and testing steps.
-- Link related Issues.
-- Keep the PR title in Conventional Commit format if possible.
-
-## Code Style and Patterns
-
-### TypeScript + ESLint + Prettier
-
-Pre-commit hooks handle formatting and linting automatically on staged files. For full-project checks you can run them manually:
-
-- `pnpm run format` -- format all files with Prettier
-- `pnpm run type-check` -- TypeScript type checking (whole project)
-- `pnpm run lint` -- ESLint across all files
-- `pnpm exec vitest run` -- run the test suite
-
-### Electron main (Node side)
-
-- Prefer `execFile` over `exec` to avoid shell quoting issues.
-- Never write logs into Git worktrees. All logs belong in the Electron `userData` folder.
-- Be conservative with console logging; noisy logs reduce signal. Use clear prefixes.
-
-### Git and worktrees
-
-- The app creates worktrees in a sibling `../worktrees/` folder.
-- Do not delete worktree folders from Finder/Explorer; if you need cleanup, use:
-  - `git worktree prune` (from the main repo)
-  - or the in‑app workspace removal
-
-### Documentation
-
-When writing or updating docs, keep the tone clear and conversational. Use complete sentences and natural language rather than long bullet point lists. Avoid em dashes (—); use commas, periods, or rephrase instead.
-
-### Renderer (React)
-
-- Components live under `src/renderer/components`; hooks under `src/renderer/hooks`.
-- Agent CLIs are embedded via terminal emulation (xterm.js) - each agent runs in its own PTY.
-- Use existing UI primitives and Tailwind utility classes for consistency.
-- Aim for accessible elements (labels, `aria-*` where appropriate).
-
-### Local DB (SQLite)
-
-**Location** (Electron `app.getPath('userData')`):
-
-- macOS: `~/Library/Application Support/emdash/emdash.db`
-- Linux: `~/.config/emdash/emdash.db`
-- Windows: `%APPDATA%\emdash\emdash.db`
-
-**Reset:** quit the app, delete the file, relaunch (the schema is recreated).
-
-## Issue Reports and Feature Requests
-
-Use GitHub Issues. Include:
-
-- OS, Node version
-- Steps to reproduce
-- Relevant logs (renderer console, terminal output)
-- Screenshots/GIFs for UI issues
-
-## Release Process (maintainers)
-
-Use pnpm's built-in versioning to ensure consistency:
-
-```bash
-# For bug fixes (0.2.9 → 0.2.10)
-pnpm version patch
-
-# For new features (0.2.9 → 0.3.0)
-pnpm version minor
-
-# For breaking changes (0.2.9 → 1.0.0)
-pnpm version major
-```
-
-This automatically:
-
-1. Updates `package.json` and `pnpm-lock.yaml`
-2. Creates a git commit with the version number (e.g., `"0.2.10"`)
-3. Creates a git tag (e.g., `v0.2.10`)
-
-Then push to trigger the CI/CD pipeline.
-
-### What happens next
-
-Two GitHub Actions workflows trigger on version tags:
-
-**macOS Release** (`.github/workflows/release.yml`):
-
-1. Builds the TypeScript and Vite bundles
-2. Signs the app with Apple Developer ID
-3. Notarizes via Apple's notary service
-4. Creates a GitHub Release with DMG artifacts for arm64 and x64
-
-**Linux/Nix Build** (`.github/workflows/nix-build.yml`):
-
-1. Computes the correct dependency hash from `pnpm-lock.yaml`
-2. Builds the x86_64-linux package via Nix flake
-3. Pushes build artifacts to Cachix
diff --git a/docs/content/docs/diff-view.mdx b/docs/content/docs/diff-view.mdx
deleted file mode 100644
index 8c8ad22d8d..0000000000
--- a/docs/content/docs/diff-view.mdx
+++ /dev/null
@@ -1,51 +0,0 @@
----
-title: Diff View
-description: Review and manage code changes
----
-
-The diff view shows all file changes in a task's worktree. Stage files, review diffs, write commit messages, and create pull requests from one panel.
-
-<img
-  src="/media/diffviewer.png"
-  alt="Diff view interface in Emdash"
-  style={{
-    width: '100%',
-    maxWidth: '700px',
-    margin: '20px auto',
-    display: 'block',
-    borderRadius: '8px',
-    boxShadow: '0 4px 6px rgba(0, 0, 0, 0.1)',
-  }}
-/>
-
-## Where to Find It
-
-The diff view lives in the right sidebar when you have a task open. It updates automatically as the agent makes changes (polls every 5 seconds).
-
-## What You See
-
-For each changed file:
-
-- File path and type icon
-- Lines added (green) and removed (red)
-- Staged or unstaged status
-
-The header shows total files changed, overall additions/deletions, and PR status if a pull request exists.
-
-## Actions
-
-**Stage a file**: Click the + icon to add a file to the staging area.
-
-**Unstage or revert**: Click the undo icon. For staged files, this unstages them. For unstaged files, this discards all changes (resets to last commit).
-
-**View diff**: Click a file to open it in the diff viewer. You can edit the file directly in the diff view and save your changes.
-
-**View all changes**: Click "View All" to see diffs for every changed file in one scrollable view.
-
-**Commit and push**: Type a commit message and press Enter. Emdash commits staged changes and pushes to the branch.
-
-**Create PR**: After pushing, a "Create PR" button appears if your branch is ahead of main.
-
-## Inline Editing
-
-The diff viewer isn't read-only. Edit the modified version directly, then save. This is useful for quick fixes without switching to your editor.
diff --git a/docs/content/docs/file-editor.mdx b/docs/content/docs/file-editor.mdx
deleted file mode 100644
index 3243aa564a..0000000000
--- a/docs/content/docs/file-editor.mdx
+++ /dev/null
@@ -1,55 +0,0 @@
----
-title: File Editor
-description: Edit files directly in Emdash
----
-
-The file editor lets you browse and edit code in a task's worktree without switching to an external editor. Use it to explore the codebase, make edits yourself, or review what an agent has done.
-
-<img
-  src="/media/fileeditor.png"
-  alt="File editor interface in Emdash"
-  style={{
-    width: '100%',
-    maxWidth: '700px',
-    margin: '20px auto',
-    display: 'block',
-    borderRadius: '8px',
-    boxShadow: '0 4px 6px rgba(0, 0, 0, 0.1)',
-  }}
-/>
-
-## Opening the Editor
-
-Click the code icon in the titlebar when viewing a task. The editor opens in a side panel with a file tree on the left and the code editor on the right.
-
-## Navigating Files
-
-The left panel shows your project's file tree. Click a file to open it. Files open in tabs at the top of the editor, so you can switch between multiple files.
-
-Common system directories like `node_modules`, `.git`, and build output are hidden by default. Click the eye icon to show or hide them.
-
-## Editing
-
-The editor is a full-featured code editor with syntax highlighting, find/replace, and the usual keyboard shortcuts. Changes auto-save after 2 seconds of inactivity, or press `⌘S` to save immediately.
-
-Git diff markers appear in the gutter:
-
-- Green dots for added lines
-- Orange dots for modified lines
-- Red markers for deleted lines
-
-These update automatically as you edit, so you can see what's changed compared to the last commit.
-
-## Saving
-
-Files with unsaved changes show a dot in their tab. Use `⌘⇧S` to save all open files at once, or click "Save All" in the header.
-
-After saving, the [diff view](/diff-view) updates to reflect your changes.
-
-## Images
-
-The editor also handles images. Click an image file to preview it instead of showing raw bytes.
-
-## Resizing
-
-Drag the divider between the file tree and editor to adjust panel widths. The layout remembers your preference.
diff --git a/docs/content/docs/index.mdx b/docs/content/docs/index.mdx
deleted file mode 100644
index b1caebf069..0000000000
--- a/docs/content/docs/index.mdx
+++ /dev/null
@@ -1,37 +0,0 @@
----
-title: Emdash Overview
-description: An Open Source Agentic Development Environment (ADE)
----
-
-Emdash is an open source desktop app for running multiple coding agents in parallel. Each agent works in an isolated Git worktree, so they don't interfere with each other.
-
-## Capabilities
-
-- **[Parallel agents](/parallel-agents):** Run multiple agents simultaneously, each in its own worktree
-- **[Provider support](/providers):** Use any of 18+ CLI-based agents: Claude Code, Codex, Gemini, OpenCode, and more
-- **[Best-of-N](/best-of-n):** Run multiple agents on the same task and pick the best result
-- **[Diff view](/diff-view):** Review changes across agents side-by-side
-- **[Kanban view](/kanban-view):** Organize tasks visually across your workflow
-- **[Issue integration](/issues):** Pull tasks from Linear, Jira, or GitHub Issues directly
-
-## How It Works
-
-Click "Add Task" to create one or more worktrees. Each worktree runs its own agent. You can then review the diff when done, iterate if needed, and open a PR inside of Emdash.
-
-## Demo
-
-<iframe
-  width="100%"
-  style={{ aspectRatio: '16/9' }}
-  src="https://www.youtube.com/embed/lCl_rxm4ypc"
-  title="Emdash Demo"
-  frameBorder="0"
-  allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
-  allowFullScreen
-/>
-
-## Get Involved
-
-Emdash is [open source](https://github.com/generalaction/emdash) and part of [Y Combinator W26](https://ycombinator.com). We ship fast and welcome contributions - see the [contributing guide](/contributing).
-
-Available for macOS, Windows, and Linux.
diff --git a/docs/content/docs/installation.mdx b/docs/content/docs/installation.mdx
deleted file mode 100644
index 5a4a0b6a40..0000000000
--- a/docs/content/docs/installation.mdx
+++ /dev/null
@@ -1,59 +0,0 @@
----
-title: Installation
-description: Get started with Emdash
----
-
-## Download Emdash
-
-### macOS
-
-The easiest way to install on macOS is via Homebrew:
-
-```bash
-brew install --cask emdash
-```
-
-Or download directly:
-
-- [Apple Silicon (arm64)](https://github.com/generalaction/emdash/releases/latest/download/emdash-arm64.dmg)
-- [Intel (x64)](https://github.com/generalaction/emdash/releases/latest/download/emdash-x64.dmg)
-
-### Windows
-
-Download the installer or portable version:
-
-- [Installer (x64)](https://github.com/generalaction/emdash/releases/latest/download/emdash-x64-installer.exe)
-- [Portable (x64)](https://github.com/generalaction/emdash/releases/latest/download/emdash-x64.exe)
-
-### Linux
-
-Choose your preferred format:
-
-- [AppImage (x64)](https://github.com/generalaction/emdash/releases/latest/download/emdash-x86_64.AppImage)
-- [Debian package (x64)](https://github.com/generalaction/emdash/releases/latest/download/emdash-amd64.deb)
-
-Or run via Nix:
-
-```bash
-nix run github:generalaction/emdash
-```
-
-## Setup
-
-### 1. Install a CLI provider
-
-Emdash runs coding agents through their CLI. Install at least one [provider](/providers) before getting started:
-
-```bash
-curl -fsSL https://claude.ai/install.sh | bash
-```
-
-### 2. Connect GitHub
-
-To create PRs (and use GitHub Issues), connect your account in **Settings → Integrations**. Emdash works with OAuth or authentication via [GitHub CLI](https://cli.github.com):
-
-```bash
-gh auth login
-```
-
-You're ready to start using Emdash.
diff --git a/docs/content/docs/issues.mdx b/docs/content/docs/issues.mdx
deleted file mode 100644
index 393580aef5..0000000000
--- a/docs/content/docs/issues.mdx
+++ /dev/null
@@ -1,66 +0,0 @@
----
-title: Passing Issues
-description: Pass issues from Linear, Jira, or GitHub directly to agents
----
-
-Emdash connects to Linear, Jira, and GitHub Issues. Pass issues from your tracker directly to agents. The issue title, description, and metadata become part of the agent's prompt.
-
-<img
-  src="/media/passissues.png"
-  alt="Passing issues to agents in Emdash"
-  style={{
-    width: '100%',
-    maxWidth: '700px',
-    margin: '20px auto',
-    display: 'block',
-    borderRadius: '8px',
-    boxShadow: '0 4px 6px rgba(0, 0, 0, 0.1)',
-  }}
-/>
-
-## How It Works
-
-1. Create a new task
-2. Click **Advanced Options**
-3. Select an issue from the dropdown (searchable by ID, title, or assignee)
-4. Start the task
-
-The agent receives the full issue context and begins working immediately.
-
-## Supported Trackers
-
-Emdash supports:
-
-- Linear
-- Jira
-- GitHub Issues
-
-Missing your tracker? [Open an issue](https://github.com/generalaction/emdash/issues) or message us on [Discord](https://discord.gg/f2fv7YxuR2).
-
-## Connecting Your Tracker
-
-Go to **Settings → Connections** to connect.
-
-### Linear
-
-1. Go to [Linear Settings → Security & access → Personal API keys](https://linear.app/settings/api)
-2. Create a new API key
-3. Paste the key in Emdash and click Connect
-
-### Jira
-
-1. Go to [Atlassian Account Settings → Security → API Tokens](https://id.atlassian.com/manage-profile/security/api-tokens)
-2. Create a new API token
-3. In Emdash, enter your site URL (e.g., `https://yourcompany.atlassian.net`), email, and token
-
-### GitHub Issues
-
-GitHub Issues requires the GitHub CLI (`gh`). Emdash auto-installs it if missing.
-
-1. Click **Sign in with GitHub**
-2. Copy the device code shown
-3. Authorize on GitHub when prompted
-
-## Auto-Closing Issues
-
-When you create a PR from a task that has a linked issue, Emdash automatically closes the associated GitHub or Linear issue. This only applies to issues that were passed to the task at creation time.
diff --git a/docs/content/docs/kanban-view.mdx b/docs/content/docs/kanban-view.mdx
deleted file mode 100644
index fa3f6b1e8b..0000000000
--- a/docs/content/docs/kanban-view.mdx
+++ /dev/null
@@ -1,53 +0,0 @@
----
-title: Kanban View
-description: Visualize your tasks on a board
----
-
-The Kanban view displays your tasks as cards on a board with three columns. Drag tasks between columns to track their status.
-
-<img
-  src="/media/kanban.png"
-  alt="Kanban board view in Emdash"
-  style={{
-    width: '100%',
-    maxWidth: '700px',
-    margin: '20px auto',
-    display: 'block',
-    borderRadius: '8px',
-    boxShadow: '0 4px 6px rgba(0, 0, 0, 0.1)',
-  }}
-/>
-
-## Columns
-
-- **To-do**: Tasks not yet started
-- **In-progress**: Tasks currently running
-- **Ready for review**: Completed tasks with changes to review
-
-## Automatic Transitions
-
-Tasks move between columns automatically based on activity:
-
-- When an agent starts working, the task moves to In-progress
-- When an agent finishes (terminal exits, changes detected, or PR created), the task moves to Ready for review
-
-You can also drag cards manually to change their status.
-
-## Card Information
-
-Each card shows:
-
-- Task name
-- Branch name
-- Provider/agent running the task
-- Activity spinner when the agent is busy
-
-Hover over a card to see more details: provider list, and a summary of file changes (files changed, lines added/removed).
-
-## Creating Tasks
-
-Click the + button in the To-do column to create a new task. This opens the same task creation modal as the main "Add Task" button.
-
-## Opening a Task
-
-Click any card to open that task's detail view with the terminal and diff panel.
diff --git a/docs/content/docs/meta.json b/docs/content/docs/meta.json
deleted file mode 100644
index 93a024fcfa..0000000000
--- a/docs/content/docs/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "title": "Docs",
-  "pages": [
-    "index",
-    "installation",
-    "---Using Emdash---",
-    "tasks",
-    "issues",
-    "---Capabilities---",
-    "best-of-n",
-    "providers",
-    "project-config",
-    "diff-view",
-    "file-editor",
-    "kanban-view",
-    "skills",
-    "ci-checks",
-    "remote-projects",
-    "tmux-sessions",
-    "---More---",
-    "contributing",
-    "roadmap",
-    "changelog",
-    "telemetry"
-  ]
-}
diff --git a/docs/content/docs/project-config.mdx b/docs/content/docs/project-config.mdx
deleted file mode 100644
index 8f1767d52e..0000000000
--- a/docs/content/docs/project-config.mdx
+++ /dev/null
@@ -1,137 +0,0 @@
----
-title: Project Configuration
-description: Customize Emdash behavior per project
----
-
-Emdash can be configured per project from the **Project config** modal (`Edit config` on the project page). Use it to control what gets copied to worktrees and what scripts run for each task.
-
-## Copying files to worktrees
-
-When you create a new task, Emdash sets up a Git worktree so the agent can work in isolation. By default, worktrees start fresh from your repository, which means gitignored files like `.env` won't be there.
-
-To solve this, Emdash automatically copies certain gitignored files from your main project into each new worktree. This happens once when the worktree is created, and only for files that don't already exist in the destination.
-
-The default patterns cover common environment files:
-
-```
-.env
-.env.keys
-.env.local
-.env.*.local
-.envrc
-docker-compose.override.yml
-```
-
-These defaults work well for most projects, but you can customize them if needed.
-
-## Custom preserve patterns
-
-In **Preserved patterns**, enter one glob pattern per line.
-
-```text
-.env
-.env.local
-config/local.yml
-secrets/*.json
-```
-
-When you define `preservePatterns`, it replaces the defaults entirely. Include any default patterns you still want alongside your custom ones.
-
-Patterns support basic glob syntax, so `secrets/*.json` will match all JSON files in the secrets directory. Files inside `node_modules`, `.git`, `vendor`, and other common build directories are automatically excluded regardless of your patterns.
-
-## How it works
-
-Emdash looks for gitignored files in your main project that match your preserve patterns. For each match, it copies the file to the same relative path in the new worktree. If a file already exists in the worktree, it's left untouched, so your worktree-specific changes won't be overwritten.
-
-This means you can safely modify environment files in a worktree without worrying about them being reset when you create new tasks.
-
-## Script fields
-
-Project config has three script fields:
-
-- `Setup script`: runs once right after task creation (good for installs/bootstrap)
-- `Run script`: long-running command you start/stop from the task terminal (good for dev servers)
-- `Teardown script`: runs when a task is deleted or archived
-
-The setup script runs as soon as the worktree is ready, in parallel with the agent.
-
-## Task env vars
-
-When a task terminal starts, Emdash injects convenience environment variables you can use inside setup scripts and other terminal commands.
-
-If you run multiple tasks in parallel, do not hardcode `localhost:3000`. Use `EMDASH_PORT` so each task gets its own localhost port automatically.
-
-| Variable                | Purpose                                                          |
-| ----------------------- | ---------------------------------------------------------------- |
-| `EMDASH_TASK_ID`        | Stable unique task id                                            |
-| `EMDASH_TASK_NAME`      | Shell-safe task name slug                                        |
-| `EMDASH_TASK_PATH`      | Absolute task (worktree) path                                    |
-| `EMDASH_ROOT_PATH`      | Absolute project root path                                       |
-| `EMDASH_DEFAULT_BRANCH` | Default branch name (e.g., main)                                 |
-| `EMDASH_PORT`           | Unique localhost base port per task (use for `PORT` or `--port`) |
-
-`EMDASH_PORT` is different for each task. Example: one task might run on `localhost:50120`, another on `localhost:50730`, so they do not collide on `localhost:3000`.
-
-### Avoid localhost port collisions
-
-Use this as your **Run script** value:
-
-```bash
-PORT=$EMDASH_PORT pnpm run dev
-```
-
-If your dev server expects a `--port` flag instead of `PORT`:
-
-```bash
-pnpm run dev -- --port=$EMDASH_PORT
-```
-
-For multiple local services, use `EMDASH_PORT` with small offsets:
-
-```bash
-APP_PORT=$EMDASH_PORT
-DB_PORT=$((EMDASH_PORT + 1))
-REDIS_PORT=$((EMDASH_PORT + 2))
-```
-
-### Example: docker-compose override with task ports
-
-```yaml
-services:
-  db:
-    ports:
-      - '${EMDASH_PORT:-5432}:5432'
-  app:
-    environment:
-      - DATABASE_PORT=${EMDASH_PORT:-5432}
-```
-
-### Examples
-
-Node app (recommended):
-
-`Setup script`:
-
-```bash
-pnpm install
-```
-
-`Run script`:
-
-```bash
-PORT=$EMDASH_PORT pnpm run dev
-```
-
-Python project with virtual environment:
-
-`Setup script`:
-
-```bash
-python -m venv .venv && source .venv/bin/activate && pip install -r requirements.txt
-```
-
-## Editing the config
-
-On the project page, click **Edit config**, fill the fields, then click **Save**. Emdash stores these settings in `.emdash.json`.
-
-![Edit config button on the project page](/media/edit-config.png)
diff --git a/docs/content/docs/providers.mdx b/docs/content/docs/providers.mdx
deleted file mode 100644
index a7c0ac8a1e..0000000000
--- a/docs/content/docs/providers.mdx
+++ /dev/null
@@ -1,66 +0,0 @@
----
-title: Providers
-description: Supported coding agents and CLI providers
----
-
-Emdash supports 22 coding agent CLIs. Install any of them and Emdash detects it automatically.
-
-<img
-  src="/media/providers.png"
-  alt="Available Providers in Emdash"
-  style={{
-    width: '50%',
-    maxWidth: '300px',
-    margin: '20px auto',
-    display: 'block',
-    borderRadius: '8px',
-    boxShadow: '0 4px 6px rgba(0, 0, 0, 0.1)',
-  }}
-/>
-
-## Supported Providers
-
-| Provider       | Install Command                                                                              |
-| -------------- | -------------------------------------------------------------------------------------------- |
-| Claude Code    | `curl -fsSL https://claude.ai/install.sh \| bash`                                            |
-| Codex          | `npm install -g @openai/codex`                                                               |
-| Gemini         | `npm install -g @google/gemini-cli`                                                          |
-| Qwen Code      | `npm install -g @qwen-code/qwen-code`                                                        |
-| Cursor         | `curl https://cursor.com/install -fsS \| bash`                                               |
-| GitHub Copilot | `npm install -g @github/copilot`                                                             |
-| Amp            | `npm install -g @sourcegraph/amp@latest`                                                     |
-| Auggie         | `npm install -g @augmentcode/auggie`                                                         |
-| Autohand Code  | `npm install -g autohand-cli`                                                                |
-| Cline          | `npm install -g cline`                                                                       |
-| Continue       | `npm install -g @continuedev/cli`                                                            |
-| Codebuff       | `npm install -g codebuff`                                                                    |
-| OpenCode       | `npm install -g opencode-ai`                                                                 |
-| Charm          | `npm install -g @charmland/crush`                                                            |
-| Kilocode       | `npm install -g @kilocode/cli`                                                               |
-| Kimi           | `uv tool install kimi-cli`                                                                   |
-| Goose          | `curl -fsSL https://github.com/block/goose/releases/download/stable/download_cli.sh \| bash` |
-| Droid          | `curl -fsSL https://app.factory.ai/cli \| sh`                                                |
-| Kiro           | `curl -fsSL https://cli.kiro.dev/install \| bash`                                            |
-| Rovo Dev       | `acli rovodev auth login`                                                                    |
-| Mistral Vibe   | `curl -LsSf https://mistral.ai/vibe/install.sh \| bash`                                      |
-| Pi             | `npm install -g @mariozechner/pi-coding-agent`                                               |
-
-## Feature Support
-
-Not all providers support the same features. Here's what varies:
-
-**Auto-approve**: Skip permission prompts for file operations. Supported by Autohand Code, Claude Code, Codex, Gemini, Qwen, Cursor, Kilocode, Rovo, and Mistral.
-
-**Resume**: Continue from previous session. Supported by Claude Code, Gemini, Qwen, Kilocode, Continue, and Pi.
-
-**Initial prompt**: Pass instructions when starting the agent. Most providers support this.
-
-## Adding a Provider
-
-Providers are detected automatically when you install them. Open Emdash, go to Settings, and click "Refresh" to scan for newly installed CLIs.
-
-If a provider isn't detected, make sure its CLI is in your PATH.
-
-## Request a Provider
-
-Missing your favorite coding agent? [Open an issue](https://github.com/generalaction/emdash/issues) or message us on Discord.
diff --git a/docs/content/docs/remote-projects.mdx b/docs/content/docs/remote-projects.mdx
deleted file mode 100644
index 1b9fca206d..0000000000
--- a/docs/content/docs/remote-projects.mdx
+++ /dev/null
@@ -1,168 +0,0 @@
----
-title: Remote Projects
-description: Run coding agents on remote machines over SSH
----
-
-Run coding agents on a remote server over SSH. Instead of working only with local repositories, you can connect to any machine and orchestrate agents against codebases hosted there.
-
-<img
-  src="/media/addremoteproject.png"
-  alt="Add Remote Project in Emdash"
-  style={{
-    width: '100%',
-    maxWidth: '700px',
-    margin: '20px auto',
-    display: 'block',
-    borderRadius: '8px',
-    boxShadow: '0 4px 6px rgba(0, 0, 0, 0.1)',
-  }}
-/>
-
-## Adding a Remote Project
-
-1. On the home screen, click **Add Remote Project**
-2. A wizard walks you through four steps:
-
-### Step 1: Connection Details
-
-Enter the SSH connection info:
-
-- **Name** — a label for this connection (e.g., "Dev Server")
-- **Host** — hostname or IP address
-- **Port** — SSH port (default: 22)
-- **Username** — your SSH user
-
-If you have an existing `~/.ssh/config`, Emdash detects it automatically. Select a host from the dropdown to pre-fill the form.
-
-<img
-  src="/media/remoteproj1.png"
-  alt="Remote project connection details step"
-  style={{
-    width: '100%',
-    maxWidth: '700px',
-    margin: '20px auto',
-    display: 'block',
-    borderRadius: '8px',
-    boxShadow: '0 4px 6px rgba(0, 0, 0, 0.1)',
-  }}
-/>
-
-### Step 2: Authentication
-
-Choose an authentication method:
-
-| Method          | Description                                                                                      |
-| --------------- | ------------------------------------------------------------------------------------------------ |
-| **SSH Agent**   | Uses your system SSH agent. No keys stored in Emdash. Recommended.                               |
-| **Private Key** | Point to a key file (e.g., `~/.ssh/id_ed25519`). Passphrase stored securely in your OS keychain. |
-| **Password**    | Direct password auth. Password stored in your OS keychain.                                       |
-
-Click **Test Connection** to verify before proceeding.
-
-If SSH agent auth fails, Emdash suggests falling back to key-based auth and shows common key paths.
-
-<img
-  src="/media/remoteproj2.png"
-  alt="Remote project path selection step"
-  style={{
-    width: '100%',
-    maxWidth: '700px',
-    margin: '20px auto',
-    display: 'block',
-    borderRadius: '8px',
-    boxShadow: '0 4px 6px rgba(0, 0, 0, 0.1)',
-  }}
-/>
-
-### Step 3: Path Selection
-
-Browse the remote filesystem via SFTP and select your project directory. The browser starts at your home directory.
-
-<img
-  src="/media/remoteproj3.png"
-  alt="Remote project confirmation step"
-  style={{
-    width: '100%',
-    maxWidth: '700px',
-    margin: '20px auto',
-    display: 'block',
-    borderRadius: '8px',
-    boxShadow: '0 4px 6px rgba(0, 0, 0, 0.1)',
-  }}
-/>
-
-### Step 4: Confirmation
-
-Review the connection summary and click **Save**. The project appears in your sidebar.
-
-## Connection Status
-
-Remote projects show a connection indicator in the sidebar:
-
-- **Connected** — ready to use
-- **Connecting** — establishing SSH session
-- **Error** — connection failed (click to retry)
-- **Disconnected** — no active session
-
-Emdash auto-connects when you select a remote project and monitors the connection with periodic health checks. If the connection drops, it reconnects automatically with exponential backoff (up to 3 attempts).
-
-## How It Works
-
-When you create a task on a remote project:
-
-1. A git worktree is created on the remote machine
-2. The agent runs in a shell session over SSH
-3. File browsing and git operations happen remotely via SFTP
-4. Terminal output streams back to your local Emdash UI in real time
-
-All shell commands are executed on the remote server. Your local machine only runs the Emdash interface.
-
-## Security
-
-- **Credentials** are stored in your OS keychain (macOS Keychain, Linux Secret Service, Windows Credential Manager) — never in the database
-- **Host keys** are verified against `~/.ssh/known_hosts` to prevent MITM attacks
-- **Shell commands** are escaped using POSIX single-quote wrapping to prevent injection
-- **Path traversal** is blocked — sensitive directories like `/etc`, `/proc`, `/sys`, and `.ssh` are restricted
-
-## Requirements
-
-- SSH access to the remote machine
-- Git installed on the remote server
-- At least one [provider](/providers) CLI installed on the remote machine
-
-## Supported Git Features
-
-Remote projects support the same git workflow as local projects:
-
-- File status watching with automatic change detection
-- File diffs with side-by-side viewer
-- Stage, unstage, and revert individual files or all files
-- Commit and push from the UI
-- Branch status (ahead/behind counts)
-- Branch listing and branch rename
-- PR creation (regular and draft), merge, and status checks
-- PR comments and CI check runs
-
-## Remote Server Prerequisites
-
-Your remote server needs the following for full functionality:
-
-1. **Git** installed and configured with `user.name` and `user.email`
-2. **GitHub CLI (`gh`)** installed and authenticated (required for PR features)
-3. **SSH key for GitHub** configured on the server (required for push/pull)
-
-See the [SSH Setup Guide](https://github.com/generalaction/emdash/blob/main/docs/ssh-setup.md) for detailed server preparation steps.
-
-## Current Limitations
-
-Some features are not yet available for remote projects:
-
-- Worktree pooling (instant task start)
-- Worktree merge via UI
-- Session isolation for multi-chat (--session-id)
-- Plan lock/unlock
-- Remote lifecycle scripts
-
-## Emdash Cloud for Teams
-
-For business and team setups — including managed remote environments, centralized configuration, and admin controls — visit [emdash.sh/cloud](https://emdash.sh/cloud) to learn more.
diff --git a/docs/content/docs/roadmap.mdx b/docs/content/docs/roadmap.mdx
deleted file mode 100644
index 7c3d028194..0000000000
--- a/docs/content/docs/roadmap.mdx
+++ /dev/null
@@ -1,25 +0,0 @@
----
-title: Roadmap
-description: Emdash Product Roadmap
----
-
-Emdash is [open source](https://github.com/generalaction/emdash) and we strive to be fully transparent what we're working on and what's next. This roadmap is a living document and we'll update it as we make progress.
-
-## Join the Discussion
-
-We actively discuss features and the product roadmap with our community:
-
-- **[GitHub Discussions](https://github.com/generalaction/emdash/discussions)** - Share ideas, vote on features, and discuss the roadmap with the community
-- **[Discord Server](https://discord.gg/f2fv7YxuR2)** - Chat with the team and other users about features and development
-
-## Feature Requests
-
-Have an idea for a new feature? We'd love to hear from you!
-
-- **[Submit a feature request](https://github.com/generalaction/emdash/issues/new?labels=enhancement)** - Open a new issue with the enhancement label
-- **[View existing requests](https://github.com/generalaction/emdash/issues?q=is%3Aissue+is%3Aopen+label%3Aenhancement)** - See and vote on community feature requests
-- **[Join the Ideas discussion](https://github.com/generalaction/emdash/discussions/categories/ideas)** - Participate in feature discussions
-
-## Contributing
-
-Want to help build these features? Check out our [Contributing Guide](/contributing) to get started.
diff --git a/docs/content/docs/skills.mdx b/docs/content/docs/skills.mdx
deleted file mode 100644
index c4a928c47d..0000000000
--- a/docs/content/docs/skills.mdx
+++ /dev/null
@@ -1,114 +0,0 @@
----
-title: Skills
-description: Extend your agents with reusable skill modules
----
-
-Skills are reusable capability modules that extend your coding agents with specialized functionality. They follow the open [Agent Skills](https://agentskills.io) standard and work across all supported agents—Claude Code, Codex, OpenCode, Cursor, Gemini, Roo Code, and Mistral Vibe.
-
-<img
-  src="/media/skills.png"
-  alt="Skills catalog in Emdash"
-  style={{
-    width: '100%',
-    maxWidth: '700px',
-    margin: '20px auto',
-    display: 'block',
-    borderRadius: '8px',
-    boxShadow: '0 4px 6px rgba(0, 0, 0, 0.1)',
-  }}
-/>
-
-## Browsing Skills
-
-Open the Skills view by clicking **Skills** (puzzle icon) in the left sidebar. You'll see a catalog of available skills sourced from:
-
-- [OpenAI skill library](https://github.com/openai/skills/)
-- [Anthropic skill library](https://github.com/anthropics/skills/)
-
-Use the search box to filter by name or description. Click **Refresh** to fetch the latest skills from GitHub.
-
-If you want to use skills from another library, feel free to let us know through the feedback modal in the app.
-
-<img
-  src="/media/feedback.png"
-  alt="Feedback modal in Emdash"
-  style={{
-    width: '100%',
-    maxWidth: '700px',
-    margin: '20px auto',
-    display: 'block',
-    borderRadius: '8px',
-    boxShadow: '0 4px 6px rgba(0, 0, 0, 0.1)',
-  }}
-/>
-
-## Installing a Skill
-
-1. Find a skill in the catalog
-2. Click the skill card to view details, example prompts, and documentation
-3. Click **Install**
-
-Emdash downloads the skill to `~/.agentskills/` and automatically syncs it to all installed agents on your machine. The skill is immediately available in your next agent session.
-
-## Uninstalling a Skill
-
-1. Click an installed skill card
-2. Click **Uninstall** in the detail modal
-
-This removes the skill from `~/.agentskills/` and removes the symlinks from all agent directories.
-
-## Creating Custom Skills
-
-1. Click **New Skill** in the Skills view
-2. Enter a name (lowercase, hyphens, 2–64 characters) and description
-3. Click **Create**
-
-Emdash generates a `SKILL.md` file in `~/.agentskills/<your-skill>/` and opens the directory so you can edit it. The file uses YAML frontmatter for metadata:
-
-```yaml
----
-name: 'my-skill'
-description: 'What this skill does'
----
-# My Skill
-
-Instructions and documentation for the agent...
-```
-
-Custom skills sync to all installed agents just like catalog skills.
-
-## How Skills Work
-
-Each skill is a directory containing a `SKILL.md` file. When installed, Emdash creates symlinks in each agent's config directory:
-
-| Agent        | Skill location                       |
-| ------------ | ------------------------------------ |
-| Claude Code  | `~/.claude/commands/<skill>/`        |
-| Codex        | `~/.codex/skills/<skill>/`           |
-| OpenCode     | `~/.config/opencode/skills/<skill>/` |
-| Cursor       | `~/.cursor/skills/<skill>/`          |
-| Gemini       | `~/.gemini/skills/<skill>/`          |
-| Roo Code     | `~/.roo/skills/<skill>/`             |
-| Mistral Vibe | `~/.vibe/skills/<skill>/`            |
-
-This means skills you install through Emdash also work when you run these agents outside of Emdash.
-
-## Example Skills
-
-The catalog includes skills for many common workflows:
-
-- **Deployment**: Cloudflare, Vercel, Netlify deploy
-- **Design**: Figma integration, design implementation
-- **GitHub**: Address PR comments, fix CI failures
-- **Documentation**: Word docs, Jupyter notebooks
-- **Content**: Image generation
-- **Integrations**: Linear, Notion, Stripe, Twilio
-
-Each skill includes an example prompt showing how to invoke it.
-
-## Tips
-
-- Skills persist across Emdash sessions—install once, use everywhere.
-- Click the terminal icon on an installed skill to open its directory and inspect or edit the `SKILL.md` directly.
-- Custom skills appear in the "Installed" section alongside catalog skills.
-- If an agent can't find a skill, make sure the agent is detected by Emdash (check the Skills view footer for detected agents).
diff --git a/docs/content/docs/tasks.mdx b/docs/content/docs/tasks.mdx
deleted file mode 100644
index 106f3a74c2..0000000000
--- a/docs/content/docs/tasks.mdx
+++ /dev/null
@@ -1,65 +0,0 @@
----
-title: Running Tasks
-description: How to run tasks in Emdash
----
-
-A task is a unit of work for an agent. Each task gets its own git branch and worktree, keeping changes isolated until you merge.
-
-## Creating a Task
-
-1. Click **Add Task** or press `⌘N`
-2. Enter a name (or let Emdash auto-generate one)
-3. Select a [provider](/providers) (Claude Code, Codex, Qwen, etc.)
-4. Click **Create**
-
-The agent spawns in a terminal and starts working.
-
-<img
-  src="/media/createtask.png"
-  alt="Creating a task in Emdash"
-  style={{
-    width: '100%',
-    maxWidth: '700px',
-    margin: '20px auto',
-    display: 'block',
-    borderRadius: '8px',
-    boxShadow: '0 4px 6px rgba(0, 0, 0, 0.1)',
-  }}
-/>
-
-## Worktrees
-
-By default, each task creates a git worktree—a separate copy of your codebase on its own branch. This keeps agent changes isolated from your main branch and other tasks.
-
-Worktrees are created in a sibling `worktrees/` directory outside your repo.
-
-You can disable worktrees to work directly on your current branch. A warning appears since changes won't be isolated.
-
-## Multi-Agent Mode
-
-Run [multiple agents in parallel](/best-of-n) on the same problem:
-
-- Select multiple providers (e.g., Claude Code + Codex)
-- Or run the same provider multiple times (e.g., 3× Claude Code)
-
-Each agent gets its own worktree. Compare approaches and pick the best result. See [Best of N](/best-of-n).
-
-If tasks start local servers, use `EMDASH_PORT` in your Project config script fields to avoid port collisions between parallel tasks. See [Project Configuration](/project-config).
-
-## Advanced Options
-
-Click **Advanced Options** when creating a task to access:
-
-- **Auto-approve**: Skip permission prompts for file operations (if provider supports it)
-- **Initial prompt**: Give the agent starting instructions
-- **Link an issue**: Attach a Linear, Jira, or GitHub issue (see [Passing Issues](/issues))
-
-## After Starting
-
-Once a task starts:
-
-1. A new branch is created and pushed to your remote
-2. The agent spawns in the terminal
-3. Chat with the agent or let your initial prompt guide it
-
-Terminal state saves automatically. Close and reopen Emdash, and agents resume where they left off.
diff --git a/docs/content/docs/telemetry.mdx b/docs/content/docs/telemetry.mdx
deleted file mode 100644
index 6bc5291e0b..0000000000
--- a/docs/content/docs/telemetry.mdx
+++ /dev/null
@@ -1,157 +0,0 @@
----
-title: Telemetry
-description: What data Emdash collects, what it doesn't, and how to opt out
----
-
-## Summary
-
-- Anonymous usage telemetry, enabled by default
-- Explicit allowlisted events only (no autocapture or session recording)
-- Sent to [PostHog](https://posthog.com)
-- Easy to disable
-
-## Opt Out
-
-### In-App
-
-Settings → General → Privacy & Telemetry → Toggle off
-
-![Disable Telemetry](/media/disabletelemetry.png)
-
-### Environment Variable
-
-```bash
-TELEMETRY_ENABLED=false
-```
-
-## What We Collect
-
-Anonymous, aggregated usage data only. If you have authenticated with GitHub, your GitHub username may be included with telemetry events to help us understand user engagement patterns.
-
-### App Lifecycle
-
-**`app_started`** / **`app_closed`**
-
-- `app_version`, `electron_version`, `platform`, `arch`, `is_dev`, `install_source`
-- `github_username` (if authenticated with GitHub)
-
-**`app_session`** (on quit)
-
-- `session_duration_ms`
-
-**`daily_active_user`** (once per calendar day)
-
-- `date`, `timezone`
-- `github_username` (if authenticated with GitHub)
-
-### Feature Usage
-
-Events track which features are used, not what you do with them:
-
-- Project management (create, open, delete)
-- Task management (create, delete, switch provider)
-- Terminal (open, execute)
-- Changes (view diff, create PR)
-- Plan mode (enable/disable)
-- Settings (theme, notifications, default provider)
-- Integrations (Linear, Jira, GitHub issues)
-- Skills (view, install, uninstall, create)
-- Remote projects (SSH connection, test)
-- Browser preview (open, close, navigate)
-- UI interactions (toolbar, sidebar, Kanban)
-
-All events include only: event name, anonymized properties (e.g., `provider: "claude"`). No file paths, code, prompts, or identifying information.
-
-<details>
-<summary>**Complete Event List**</summary>
-
-**App Lifecycle:** `app_started`, `app_closed`, `app_window_focused`, `app_session`
-
-**GitHub:** `github_connection_triggered`, `github_connected`
-
-**Projects:** `project_add_clicked`, `project_open_clicked`, `project_create_clicked`, `project_clone_clicked`, `project_create_success`, `project_clone_success`, `project_added_success`, `project_deleted`, `project_view_opened`
-
-**Tasks:** `task_created`, `task_deleted`, `task_provider_switched`, `task_custom_named`, `task_advanced_options_opened`, `task_created_with_issue`
-
-**Terminal:** `terminal_entered`, `terminal_command_executed`, `terminal_new_terminal_created`, `terminal_deleted`
-
-**Changes & PRs:** `changes_viewed`, `pr_created`, `pr_creation_failed`, `pr_viewed`
-
-**Plan Mode:** `plan_mode_enabled`, `plan_mode_disabled`
-
-**Linear:** `linear_connected`, `linear_disconnected`, `linear_issues_searched`, `linear_issue_selected`
-
-**Jira:** `jira_connected`, `jira_disconnected`, `jira_issues_searched`, `jira_issue_selected`
-
-**Container:** `container_connect_clicked`, `container_connect_success`, `container_connect_failed`
-
-**Toolbar:** `toolbar_feedback_clicked`, `toolbar_left_sidebar_clicked`, `toolbar_right_sidebar_clicked`, `toolbar_settings_clicked`, `toolbar_open_in_menu_clicked`, `toolbar_open_in_selected`, `toolbar_kanban_toggled`
-
-**GitHub Issues:** `github_issues_searched`, `github_issue_selected`
-
-**Skills:** `skills_view_opened`, `skill_installed`, `skill_uninstalled`, `skill_created`, `skill_detail_viewed`
-
-**Remote Server / SSH:** `remote_project_modal_opened`, `remote_project_connection_tested`, `remote_project_created`, `ssh_connection_saved`, `ssh_connection_deleted`, `ssh_connect_success`, `ssh_connect_failed`, `ssh_disconnected`, `ssh_reconnect_attempted`, `ssh_settings_opened`
-
-**Browser Preview:** `browser_preview_opened`, `browser_preview_closed`, `browser_preview_url_navigated`
-
-**Settings:** `settings_tab_viewed`, `theme_changed`, `telemetry_toggled`, `notification_settings_changed`, `default_provider_changed`
-
-**Agent:** `agent_run_start`, `agent_run_finish`, `agent_prompt_sent`
-
-**Aggregates:** `task_snapshot`, `daily_active_user`, `db_setup`, `feature_used`, `error`
-
-</details>
-
-### Agent Events
-
-**`agent_run_start`** / **`agent_run_finish`**
-
-- `provider` (e.g., "claude", "codex")
-- `outcome` (`ok` or `error`)
-- `duration_ms`
-
-## What We Don't Collect
-
-- Code or file contents
-- File paths or repository names
-- Prompts or messages sent to agents
-- Environment variables
-- Personally identifiable information (PII) except GitHub username if authenticated
-- User text input or command contents
-- IP-derived location data
-- Session recordings or screen captures
-
-## How It Works
-
-**Anonymous ID:** Random `instanceId` generated on first launch, stored in `${appData}/telemetry.json`. Not linked to any personal information.
-
-**Sanitization:** All data passes through an allowlist. Unexpected or sensitive data is dropped.
-
-**Local development:** `is_dev: true` and `install_source: "dev"` mark development builds.
-
-## For Developers
-
-### Environment Variables
-
-| Variable                  | Default     | Description                     |
-| ------------------------- | ----------- | ------------------------------- |
-| `TELEMETRY_ENABLED`       | `true`      | Set to `false` to disable       |
-| `INSTALL_SOURCE`          | -           | Distribution channel (dmg, dev) |
-| `POSTHOG_PROJECT_API_KEY` | Public key  | Override PostHog API key        |
-| `POSTHOG_HOST`            | Public host | Override PostHog host           |
-
-PostHog credentials are public and committed in `src/main/appConfig.json`. CI can override via GitHub secrets.
-
-### Adding Events
-
-1. Track only coarse, anonymous metrics
-2. Add to allowlist in telemetry service
-3. Document here
-4. No PII or sensitive data
-
-## Questions
-
-- **Code:** `src/main/telemetry.ts`, `src/main/ipc/telemetryIpc.ts`
-- **Issues:** [GitHub Issues](https://github.com/generalaction/emdash/issues)
-- **Discuss:** [GitHub Discussions](https://github.com/generalaction/emdash/discussions)
diff --git a/docs/content/docs/tmux-sessions.mdx b/docs/content/docs/tmux-sessions.mdx
deleted file mode 100644
index 022c03a6c5..0000000000
--- a/docs/content/docs/tmux-sessions.mdx
+++ /dev/null
@@ -1,91 +0,0 @@
----
-title: tmux Sessions
-description: Persistent agent sessions with tmux
----
-
-Optionally wrap agent terminal sessions in [tmux](https://github.com/tmux/tmux) so they survive disconnects and Emdash restarts. When enabled, each chat runs inside a named tmux session that keeps the agent alive in the background even if the connection drops.
-
-## Why use this
-
-Without tmux, if Emdash quits or an SSH connection drops, the agent process dies and the terminal goes blank. You lose any in-progress work the agent was doing.
-
-With tmux enabled, the agent keeps running inside its tmux session. When Emdash reconnects — whether after a restart or an SSH reconnect — it reattaches to the same session and picks up where it left off.
-
-This is especially useful for:
-
-- **Remote projects over SSH** — network interruptions don't kill long-running agent tasks
-- **Long-running agent sessions** — quit Emdash, come back later, the agent is still working
-- **Unreliable connections** — WiFi drops, VPN reconnects, laptop lid closes
-
-## Enabling tmux
-
-Add `"tmux": true` to your project's `.emdash.json`:
-
-```json
-{
-  "tmux": true
-}
-```
-
-You can also set it alongside other config options:
-
-```json
-{
-  "preservePatterns": [".env"],
-  "tmux": true
-}
-```
-
-Edit the file directly or use **Edit config** on the project page.
-
-tmux must be installed on the machine where the agent runs — your local machine for local projects, or the remote host for SSH projects. If tmux isn't found, Emdash falls back to running the agent without it and logs a warning. Nothing breaks.
-
-## How it works
-
-When you create a task or open a chat with tmux enabled:
-
-1. Emdash spawns the agent inside `tmux new-session -As emdash-{id}` instead of a plain shell
-2. Each chat tab gets its own named tmux session (e.g., `emdash-claude-main-abc123`)
-3. If the connection drops, tmux keeps the agent running in the background
-4. When Emdash reconnects, the same `tmux new-session -As` command reattaches to the existing session
-
-The session name is derived deterministically from the task and conversation ID, so Emdash always reconnects to the correct session.
-
-## Mixing tmux and non-tmux chats
-
-tmux is resolved at the moment a terminal session starts, not when the task is created. If you enable tmux on a project that already has running tasks:
-
-- **Existing chats** continue running without tmux — no disruption
-- **New chats** created after the config change will use tmux
-- **After an Emdash restart**, all chats use the current config (tmux-wrapped sessions from before will be reattached; non-tmux sessions start fresh)
-
-There's no conflict between tmux and non-tmux chats in the same project.
-
-## Cleanup
-
-When you **delete a task**, Emdash kills the associated tmux sessions automatically.
-
-When you **quit Emdash**, tmux sessions are left running (that's the point — the agent keeps working). On next launch, Emdash reattaches.
-
-If you need to manually clean up tmux sessions, use the standard tmux commands:
-
-```bash
-# List emdash sessions
-tmux ls | grep emdash
-
-# Kill a specific session
-tmux kill-session -t emdash-claude-main-abc123
-
-# Kill all emdash sessions
-tmux ls | grep emdash | cut -d: -f1 | xargs -I{} tmux kill-session -t {}
-```
-
-## Requirements
-
-- **tmux** installed and on PATH (any recent version)
-- **macOS or Linux** — tmux is not available on Windows
-- For remote projects, tmux must be installed on the remote host
-
-## Terminal snapshots
-
-When tmux is active, Emdash disables its own terminal snapshot system. tmux preserves the terminal state natively, so snapshots are redundant. Scrollback history is managed by tmux rather than xterm.js.
diff --git a/docs/lib/layout.shared.tsx b/docs/lib/layout.shared.tsx
deleted file mode 100644
index 89bcc593d6..0000000000
--- a/docs/lib/layout.shared.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import Image from 'next/image';
-import type { BaseLayoutProps } from 'fumadocs-ui/layouts/shared';
-
-function Logo() {
-  return (
-    <div className="flex items-center gap-2">
-      <Image
-        src="/brand/icon-dark.png"
-        alt="Emdash"
-        width={24}
-        height={24}
-        className="rounded-md dark:hidden"
-      />
-      <Image
-        src="/brand/icon-light.png"
-        alt="Emdash"
-        width={24}
-        height={24}
-        className="hidden rounded-md dark:block"
-      />
-      <span className="font-semibold">Emdash</span>
-    </div>
-  );
-}
-
-export function baseOptions(): BaseLayoutProps {
-  return {
-    nav: {
-      title: <Logo />,
-    },
-  };
-}
diff --git a/docs/lib/source.ts b/docs/lib/source.ts
deleted file mode 100644
index b4d70baec0..0000000000
--- a/docs/lib/source.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { loader } from 'fumadocs-core/source';
-import * as icons from 'lucide-static';
-import { docs } from 'fumadocs-mdx:collections/server';
-
-export const source = loader({
-  source: docs.toFumadocsSource(),
-  baseUrl: '/',
-  icon(icon) {
-    if (!icon) {
-      return;
-    }
-
-    if (icon in icons) return icons[icon as keyof typeof icons];
-  },
-});
diff --git a/docs/next.config.mjs b/docs/next.config.mjs
deleted file mode 100644
index d42131efbc..0000000000
--- a/docs/next.config.mjs
+++ /dev/null
@@ -1,14 +0,0 @@
-import { createMDX } from 'fumadocs-mdx/next';
-
-/** @type {import('next').NextConfig} */
-const config = {
-  reactStrictMode: true,
-  async rewrites() {
-    // Serve *.md URLs from generated markdown in public/md-src
-    return [{ source: '/:path*.md', destination: '/md-src/:path*.md' }];
-  },
-};
-
-const withMDX = createMDX();
-
-export default withMDX(config);
diff --git a/docs/package.json b/docs/package.json
deleted file mode 100644
index b8960129c1..0000000000
--- a/docs/package.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "name": "emdash",
-  "private": true,
-  "type": "module",
-  "packageManager": "pnpm@10.28.2",
-  "scripts": {
-    "dev": "node scripts/copy-md-sources.js && next dev --port 3000",
-    "build": "node scripts/copy-md-sources.js && next build",
-    "start": "next start",
-    "copy-md": "node scripts/copy-md-sources.js",
-    "types:check": "fumadocs-mdx && tsc --noEmit",
-    "postinstall": "fumadocs-mdx"
-  },
-  "dependencies": {
-    "fumadocs-core": "16.1.0",
-    "fumadocs-mdx": "14.0.3",
-    "fumadocs-ui": "16.1.0",
-    "lucide-static": "^0.552.0",
-    "next": "^16.0.8",
-    "react": "^19.2.0",
-    "react-dom": "^19.2.0",
-    "tailwind-merge": "^3.3.1"
-  },
-  "devDependencies": {
-    "@tailwindcss/postcss": "^4.1.17",
-    "@tailwindcss/vite": "^4.1.16",
-    "@types/mdx": "^2.0.13",
-    "@types/node": "^24.10.0",
-    "@types/react": "^19.2.2",
-    "@types/react-dom": "^19.2.2",
-    "tailwindcss": "^4.1.16",
-    "typescript": "^5.9.3"
-  }
-}
diff --git a/docs/pnpm-lock.yaml b/docs/pnpm-lock.yaml
deleted file mode 100644
index 79057fef68..0000000000
--- a/docs/pnpm-lock.yaml
+++ /dev/null
@@ -1,3784 +0,0 @@
-lockfileVersion: '6.0'
-
-settings:
-  autoInstallPeers: true
-  excludeLinksFromLockfile: false
-
-dependencies:
-  fumadocs-core:
-    specifier: 16.1.0
-    version: 16.1.0(@types/react@19.2.14)(next@16.1.6)(react-dom@19.2.4)(react@19.2.4)
-  fumadocs-mdx:
-    specifier: 14.0.3
-    version: 14.0.3(fumadocs-core@16.1.0)(next@16.1.6)(react@19.2.4)(vite@7.3.1)
-  fumadocs-ui:
-    specifier: 16.1.0
-    version: 16.1.0(@types/react-dom@19.2.3)(@types/react@19.2.14)(next@16.1.6)(react-dom@19.2.4)(react@19.2.4)(tailwindcss@4.1.18)
-  lucide-static:
-    specifier: ^0.552.0
-    version: 0.552.0
-  next:
-    specifier: ^16.0.8
-    version: 16.1.6(react-dom@19.2.4)(react@19.2.4)
-  react:
-    specifier: ^19.2.0
-    version: 19.2.4
-  react-dom:
-    specifier: ^19.2.0
-    version: 19.2.4(react@19.2.4)
-  tailwind-merge:
-    specifier: ^3.3.1
-    version: 3.4.0
-
-devDependencies:
-  '@tailwindcss/postcss':
-    specifier: ^4.1.17
-    version: 4.1.18
-  '@tailwindcss/vite':
-    specifier: ^4.1.16
-    version: 4.1.18(vite@7.3.1)
-  '@types/mdx':
-    specifier: ^2.0.13
-    version: 2.0.13
-  '@types/node':
-    specifier: ^24.10.0
-    version: 24.10.13
-  '@types/react':
-    specifier: ^19.2.2
-    version: 19.2.14
-  '@types/react-dom':
-    specifier: ^19.2.2
-    version: 19.2.3(@types/react@19.2.14)
-  tailwindcss:
-    specifier: ^4.1.16
-    version: 4.1.18
-  typescript:
-    specifier: ^5.9.3
-    version: 5.9.3
-
-packages:
-
-  /@alloc/quick-lru@5.2.0:
-    resolution: {integrity: sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw==}
-    engines: {node: '>=10'}
-    dev: true
-
-  /@emnapi/runtime@1.8.1:
-    resolution: {integrity: sha512-mehfKSMWjjNol8659Z8KxEMrdSJDDot5SXMq00dM8BN4o+CLNXQ0xH2V7EchNHV4RmbZLmmPdEaXZc5H2FXmDg==}
-    requiresBuild: true
-    dependencies:
-      tslib: 2.8.1
-    dev: false
-    optional: true
-
-  /@esbuild/aix-ppc64@0.27.3:
-    resolution: {integrity: sha512-9fJMTNFTWZMh5qwrBItuziu834eOCUcEqymSH7pY+zoMVEZg3gcPuBNxH1EvfVYe9h0x/Ptw8KBzv7qxb7l8dg==}
-    engines: {node: '>=18'}
-    cpu: [ppc64]
-    os: [aix]
-    requiresBuild: true
-    optional: true
-
-  /@esbuild/android-arm64@0.27.3:
-    resolution: {integrity: sha512-YdghPYUmj/FX2SYKJ0OZxf+iaKgMsKHVPF1MAq/P8WirnSpCStzKJFjOjzsW0QQ7oIAiccHdcqjbHmJxRb/dmg==}
-    engines: {node: '>=18'}
-    cpu: [arm64]
-    os: [android]
-    requiresBuild: true
-    optional: true
-
-  /@esbuild/android-arm@0.27.3:
-    resolution: {integrity: sha512-i5D1hPY7GIQmXlXhs2w8AWHhenb00+GxjxRncS2ZM7YNVGNfaMxgzSGuO8o8SJzRc/oZwU2bcScvVERk03QhzA==}
-    engines: {node: '>=18'}
-    cpu: [arm]
-    os: [android]
-    requiresBuild: true
-    optional: true
-
-  /@esbuild/android-x64@0.27.3:
-    resolution: {integrity: sha512-IN/0BNTkHtk8lkOM8JWAYFg4ORxBkZQf9zXiEOfERX/CzxW3Vg1ewAhU7QSWQpVIzTW+b8Xy+lGzdYXV6UZObQ==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [android]
-    requiresBuild: true
-    optional: true
-
-  /@esbuild/darwin-arm64@0.27.3:
-    resolution: {integrity: sha512-Re491k7ByTVRy0t3EKWajdLIr0gz2kKKfzafkth4Q8A5n1xTHrkqZgLLjFEHVD+AXdUGgQMq+Godfq45mGpCKg==}
-    engines: {node: '>=18'}
-    cpu: [arm64]
-    os: [darwin]
-    requiresBuild: true
-    optional: true
-
-  /@esbuild/darwin-x64@0.27.3:
-    resolution: {integrity: sha512-vHk/hA7/1AckjGzRqi6wbo+jaShzRowYip6rt6q7VYEDX4LEy1pZfDpdxCBnGtl+A5zq8iXDcyuxwtv3hNtHFg==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [darwin]
-    requiresBuild: true
-    optional: true
-
-  /@esbuild/freebsd-arm64@0.27.3:
-    resolution: {integrity: sha512-ipTYM2fjt3kQAYOvo6vcxJx3nBYAzPjgTCk7QEgZG8AUO3ydUhvelmhrbOheMnGOlaSFUoHXB6un+A7q4ygY9w==}
-    engines: {node: '>=18'}
-    cpu: [arm64]
-    os: [freebsd]
-    requiresBuild: true
-    optional: true
-
-  /@esbuild/freebsd-x64@0.27.3:
-    resolution: {integrity: sha512-dDk0X87T7mI6U3K9VjWtHOXqwAMJBNN2r7bejDsc+j03SEjtD9HrOl8gVFByeM0aJksoUuUVU9TBaZa2rgj0oA==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [freebsd]
-    requiresBuild: true
-    optional: true
-
-  /@esbuild/linux-arm64@0.27.3:
-    resolution: {integrity: sha512-sZOuFz/xWnZ4KH3YfFrKCf1WyPZHakVzTiqji3WDc0BCl2kBwiJLCXpzLzUBLgmp4veFZdvN5ChW4Eq/8Fc2Fg==}
-    engines: {node: '>=18'}
-    cpu: [arm64]
-    os: [linux]
-    requiresBuild: true
-    optional: true
-
-  /@esbuild/linux-arm@0.27.3:
-    resolution: {integrity: sha512-s6nPv2QkSupJwLYyfS+gwdirm0ukyTFNl3KTgZEAiJDd+iHZcbTPPcWCcRYH+WlNbwChgH2QkE9NSlNrMT8Gfw==}
-    engines: {node: '>=18'}
-    cpu: [arm]
-    os: [linux]
-    requiresBuild: true
-    optional: true
-
-  /@esbuild/linux-ia32@0.27.3:
-    resolution: {integrity: sha512-yGlQYjdxtLdh0a3jHjuwOrxQjOZYD/C9PfdbgJJF3TIZWnm/tMd/RcNiLngiu4iwcBAOezdnSLAwQDPqTmtTYg==}
-    engines: {node: '>=18'}
-    cpu: [ia32]
-    os: [linux]
-    requiresBuild: true
-    optional: true
-
-  /@esbuild/linux-loong64@0.27.3:
-    resolution: {integrity: sha512-WO60Sn8ly3gtzhyjATDgieJNet/KqsDlX5nRC5Y3oTFcS1l0KWba+SEa9Ja1GfDqSF1z6hif/SkpQJbL63cgOA==}
-    engines: {node: '>=18'}
-    cpu: [loong64]
-    os: [linux]
-    requiresBuild: true
-    optional: true
-
-  /@esbuild/linux-mips64el@0.27.3:
-    resolution: {integrity: sha512-APsymYA6sGcZ4pD6k+UxbDjOFSvPWyZhjaiPyl/f79xKxwTnrn5QUnXR5prvetuaSMsb4jgeHewIDCIWljrSxw==}
-    engines: {node: '>=18'}
-    cpu: [mips64el]
-    os: [linux]
-    requiresBuild: true
-    optional: true
-
-  /@esbuild/linux-ppc64@0.27.3:
-    resolution: {integrity: sha512-eizBnTeBefojtDb9nSh4vvVQ3V9Qf9Df01PfawPcRzJH4gFSgrObw+LveUyDoKU3kxi5+9RJTCWlj4FjYXVPEA==}
-    engines: {node: '>=18'}
-    cpu: [ppc64]
-    os: [linux]
-    requiresBuild: true
-    optional: true
-
-  /@esbuild/linux-riscv64@0.27.3:
-    resolution: {integrity: sha512-3Emwh0r5wmfm3ssTWRQSyVhbOHvqegUDRd0WhmXKX2mkHJe1SFCMJhagUleMq+Uci34wLSipf8Lagt4LlpRFWQ==}
-    engines: {node: '>=18'}
-    cpu: [riscv64]
-    os: [linux]
-    requiresBuild: true
-    optional: true
-
-  /@esbuild/linux-s390x@0.27.3:
-    resolution: {integrity: sha512-pBHUx9LzXWBc7MFIEEL0yD/ZVtNgLytvx60gES28GcWMqil8ElCYR4kvbV2BDqsHOvVDRrOxGySBM9Fcv744hw==}
-    engines: {node: '>=18'}
-    cpu: [s390x]
-    os: [linux]
-    requiresBuild: true
-    optional: true
-
-  /@esbuild/linux-x64@0.27.3:
-    resolution: {integrity: sha512-Czi8yzXUWIQYAtL/2y6vogER8pvcsOsk5cpwL4Gk5nJqH5UZiVByIY8Eorm5R13gq+DQKYg0+JyQoytLQas4dA==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [linux]
-    requiresBuild: true
-    optional: true
-
-  /@esbuild/netbsd-arm64@0.27.3:
-    resolution: {integrity: sha512-sDpk0RgmTCR/5HguIZa9n9u+HVKf40fbEUt+iTzSnCaGvY9kFP0YKBWZtJaraonFnqef5SlJ8/TiPAxzyS+UoA==}
-    engines: {node: '>=18'}
-    cpu: [arm64]
-    os: [netbsd]
-    requiresBuild: true
-    optional: true
-
-  /@esbuild/netbsd-x64@0.27.3:
-    resolution: {integrity: sha512-P14lFKJl/DdaE00LItAukUdZO5iqNH7+PjoBm+fLQjtxfcfFE20Xf5CrLsmZdq5LFFZzb5JMZ9grUwvtVYzjiA==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [netbsd]
-    requiresBuild: true
-    optional: true
-
-  /@esbuild/openbsd-arm64@0.27.3:
-    resolution: {integrity: sha512-AIcMP77AvirGbRl/UZFTq5hjXK+2wC7qFRGoHSDrZ5v5b8DK/GYpXW3CPRL53NkvDqb9D+alBiC/dV0Fb7eJcw==}
-    engines: {node: '>=18'}
-    cpu: [arm64]
-    os: [openbsd]
-    requiresBuild: true
-    optional: true
-
-  /@esbuild/openbsd-x64@0.27.3:
-    resolution: {integrity: sha512-DnW2sRrBzA+YnE70LKqnM3P+z8vehfJWHXECbwBmH/CU51z6FiqTQTHFenPlHmo3a8UgpLyH3PT+87OViOh1AQ==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [openbsd]
-    requiresBuild: true
-    optional: true
-
-  /@esbuild/openharmony-arm64@0.27.3:
-    resolution: {integrity: sha512-NinAEgr/etERPTsZJ7aEZQvvg/A6IsZG/LgZy+81wON2huV7SrK3e63dU0XhyZP4RKGyTm7aOgmQk0bGp0fy2g==}
-    engines: {node: '>=18'}
-    cpu: [arm64]
-    os: [openharmony]
-    requiresBuild: true
-    optional: true
-
-  /@esbuild/sunos-x64@0.27.3:
-    resolution: {integrity: sha512-PanZ+nEz+eWoBJ8/f8HKxTTD172SKwdXebZ0ndd953gt1HRBbhMsaNqjTyYLGLPdoWHy4zLU7bDVJztF5f3BHA==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [sunos]
-    requiresBuild: true
-    optional: true
-
-  /@esbuild/win32-arm64@0.27.3:
-    resolution: {integrity: sha512-B2t59lWWYrbRDw/tjiWOuzSsFh1Y/E95ofKz7rIVYSQkUYBjfSgf6oeYPNWHToFRr2zx52JKApIcAS/D5TUBnA==}
-    engines: {node: '>=18'}
-    cpu: [arm64]
-    os: [win32]
-    requiresBuild: true
-    optional: true
-
-  /@esbuild/win32-ia32@0.27.3:
-    resolution: {integrity: sha512-QLKSFeXNS8+tHW7tZpMtjlNb7HKau0QDpwm49u0vUp9y1WOF+PEzkU84y9GqYaAVW8aH8f3GcBck26jh54cX4Q==}
-    engines: {node: '>=18'}
-    cpu: [ia32]
-    os: [win32]
-    requiresBuild: true
-    optional: true
-
-  /@esbuild/win32-x64@0.27.3:
-    resolution: {integrity: sha512-4uJGhsxuptu3OcpVAzli+/gWusVGwZZHTlS63hh++ehExkVT8SgiEf7/uC/PclrPPkLhZqGgCTjd0VWLo6xMqA==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [win32]
-    requiresBuild: true
-    optional: true
-
-  /@floating-ui/core@1.7.4:
-    resolution: {integrity: sha512-C3HlIdsBxszvm5McXlB8PeOEWfBhcGBTZGkGlWc2U0KFY5IwG5OQEuQ8rq52DZmcHDlPLd+YFBK+cZcytwIFWg==}
-    dependencies:
-      '@floating-ui/utils': 0.2.10
-    dev: false
-
-  /@floating-ui/dom@1.7.5:
-    resolution: {integrity: sha512-N0bD2kIPInNHUHehXhMke1rBGs1dwqvC9O9KYMyyjK7iXt7GAhnro7UlcuYcGdS/yYOlq0MAVgrow8IbWJwyqg==}
-    dependencies:
-      '@floating-ui/core': 1.7.4
-      '@floating-ui/utils': 0.2.10
-    dev: false
-
-  /@floating-ui/react-dom@2.1.7(react-dom@19.2.4)(react@19.2.4):
-    resolution: {integrity: sha512-0tLRojf/1Go2JgEVm+3Frg9A3IW8bJgKgdO0BN5RkF//ufuz2joZM63Npau2ff3J6lUVYgDSNzNkR+aH3IVfjg==}
-    peerDependencies:
-      react: '>=16.8.0'
-      react-dom: '>=16.8.0'
-    dependencies:
-      '@floating-ui/dom': 1.7.5
-      react: 19.2.4
-      react-dom: 19.2.4(react@19.2.4)
-    dev: false
-
-  /@floating-ui/utils@0.2.10:
-    resolution: {integrity: sha512-aGTxbpbg8/b5JfU1HXSrbH3wXZuLPJcNEcZQFMxLs3oSzgtVu6nFPkbbGGUvBcUjKV2YyB9Wxxabo+HEH9tcRQ==}
-    dev: false
-
-  /@formatjs/intl-localematcher@0.6.2:
-    resolution: {integrity: sha512-XOMO2Hupl0wdd172Y06h6kLpBz6Dv+J4okPLl4LPtzbr8f66WbIoy4ev98EBuZ6ZK4h5ydTN6XneT4QVpD7cdA==}
-    dependencies:
-      tslib: 2.8.1
-    dev: false
-
-  /@img/colour@1.0.0:
-    resolution: {integrity: sha512-A5P/LfWGFSl6nsckYtjw9da+19jB8hkJ6ACTGcDfEJ0aE+l2n2El7dsVM7UVHZQ9s2lmYMWlrS21YLy2IR1LUw==}
-    engines: {node: '>=18'}
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /@img/sharp-darwin-arm64@0.34.5:
-    resolution: {integrity: sha512-imtQ3WMJXbMY4fxb/Ndp6HBTNVtWCUI0WdobyheGf5+ad6xX8VIDO8u2xE4qc/fr08CKG/7dDseFtn6M6g/r3w==}
-    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
-    cpu: [arm64]
-    os: [darwin]
-    requiresBuild: true
-    optionalDependencies:
-      '@img/sharp-libvips-darwin-arm64': 1.2.4
-    dev: false
-    optional: true
-
-  /@img/sharp-darwin-x64@0.34.5:
-    resolution: {integrity: sha512-YNEFAF/4KQ/PeW0N+r+aVVsoIY0/qxxikF2SWdp+NRkmMB7y9LBZAVqQ4yhGCm/H3H270OSykqmQMKLBhBJDEw==}
-    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
-    cpu: [x64]
-    os: [darwin]
-    requiresBuild: true
-    optionalDependencies:
-      '@img/sharp-libvips-darwin-x64': 1.2.4
-    dev: false
-    optional: true
-
-  /@img/sharp-libvips-darwin-arm64@1.2.4:
-    resolution: {integrity: sha512-zqjjo7RatFfFoP0MkQ51jfuFZBnVE2pRiaydKJ1G/rHZvnsrHAOcQALIi9sA5co5xenQdTugCvtb1cuf78Vf4g==}
-    cpu: [arm64]
-    os: [darwin]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /@img/sharp-libvips-darwin-x64@1.2.4:
-    resolution: {integrity: sha512-1IOd5xfVhlGwX+zXv2N93k0yMONvUlANylbJw1eTah8K/Jtpi15KC+WSiaX/nBmbm2HxRM1gZ0nSdjSsrZbGKg==}
-    cpu: [x64]
-    os: [darwin]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /@img/sharp-libvips-linux-arm64@1.2.4:
-    resolution: {integrity: sha512-excjX8DfsIcJ10x1Kzr4RcWe1edC9PquDRRPx3YVCvQv+U5p7Yin2s32ftzikXojb1PIFc/9Mt28/y+iRklkrw==}
-    cpu: [arm64]
-    os: [linux]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /@img/sharp-libvips-linux-arm@1.2.4:
-    resolution: {integrity: sha512-bFI7xcKFELdiNCVov8e44Ia4u2byA+l3XtsAj+Q8tfCwO6BQ8iDojYdvoPMqsKDkuoOo+X6HZA0s0q11ANMQ8A==}
-    cpu: [arm]
-    os: [linux]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /@img/sharp-libvips-linux-ppc64@1.2.4:
-    resolution: {integrity: sha512-FMuvGijLDYG6lW+b/UvyilUWu5Ayu+3r2d1S8notiGCIyYU/76eig1UfMmkZ7vwgOrzKzlQbFSuQfgm7GYUPpA==}
-    cpu: [ppc64]
-    os: [linux]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /@img/sharp-libvips-linux-riscv64@1.2.4:
-    resolution: {integrity: sha512-oVDbcR4zUC0ce82teubSm+x6ETixtKZBh/qbREIOcI3cULzDyb18Sr/Wcyx7NRQeQzOiHTNbZFF1UwPS2scyGA==}
-    cpu: [riscv64]
-    os: [linux]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /@img/sharp-libvips-linux-s390x@1.2.4:
-    resolution: {integrity: sha512-qmp9VrzgPgMoGZyPvrQHqk02uyjA0/QrTO26Tqk6l4ZV0MPWIW6LTkqOIov+J1yEu7MbFQaDpwdwJKhbJvuRxQ==}
-    cpu: [s390x]
-    os: [linux]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /@img/sharp-libvips-linux-x64@1.2.4:
-    resolution: {integrity: sha512-tJxiiLsmHc9Ax1bz3oaOYBURTXGIRDODBqhveVHonrHJ9/+k89qbLl0bcJns+e4t4rvaNBxaEZsFtSfAdquPrw==}
-    cpu: [x64]
-    os: [linux]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /@img/sharp-libvips-linuxmusl-arm64@1.2.4:
-    resolution: {integrity: sha512-FVQHuwx1IIuNow9QAbYUzJ+En8KcVm9Lk5+uGUQJHaZmMECZmOlix9HnH7n1TRkXMS0pGxIJokIVB9SuqZGGXw==}
-    cpu: [arm64]
-    os: [linux]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /@img/sharp-libvips-linuxmusl-x64@1.2.4:
-    resolution: {integrity: sha512-+LpyBk7L44ZIXwz/VYfglaX/okxezESc6UxDSoyo2Ks6Jxc4Y7sGjpgU9s4PMgqgjj1gZCylTieNamqA1MF7Dg==}
-    cpu: [x64]
-    os: [linux]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /@img/sharp-linux-arm64@0.34.5:
-    resolution: {integrity: sha512-bKQzaJRY/bkPOXyKx5EVup7qkaojECG6NLYswgktOZjaXecSAeCWiZwwiFf3/Y+O1HrauiE3FVsGxFg8c24rZg==}
-    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
-    cpu: [arm64]
-    os: [linux]
-    requiresBuild: true
-    optionalDependencies:
-      '@img/sharp-libvips-linux-arm64': 1.2.4
-    dev: false
-    optional: true
-
-  /@img/sharp-linux-arm@0.34.5:
-    resolution: {integrity: sha512-9dLqsvwtg1uuXBGZKsxem9595+ujv0sJ6Vi8wcTANSFpwV/GONat5eCkzQo/1O6zRIkh0m/8+5BjrRr7jDUSZw==}
-    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
-    cpu: [arm]
-    os: [linux]
-    requiresBuild: true
-    optionalDependencies:
-      '@img/sharp-libvips-linux-arm': 1.2.4
-    dev: false
-    optional: true
-
-  /@img/sharp-linux-ppc64@0.34.5:
-    resolution: {integrity: sha512-7zznwNaqW6YtsfrGGDA6BRkISKAAE1Jo0QdpNYXNMHu2+0dTrPflTLNkpc8l7MUP5M16ZJcUvysVWWrMefZquA==}
-    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
-    cpu: [ppc64]
-    os: [linux]
-    requiresBuild: true
-    optionalDependencies:
-      '@img/sharp-libvips-linux-ppc64': 1.2.4
-    dev: false
-    optional: true
-
-  /@img/sharp-linux-riscv64@0.34.5:
-    resolution: {integrity: sha512-51gJuLPTKa7piYPaVs8GmByo7/U7/7TZOq+cnXJIHZKavIRHAP77e3N2HEl3dgiqdD/w0yUfiJnII77PuDDFdw==}
-    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
-    cpu: [riscv64]
-    os: [linux]
-    requiresBuild: true
-    optionalDependencies:
-      '@img/sharp-libvips-linux-riscv64': 1.2.4
-    dev: false
-    optional: true
-
-  /@img/sharp-linux-s390x@0.34.5:
-    resolution: {integrity: sha512-nQtCk0PdKfho3eC5MrbQoigJ2gd1CgddUMkabUj+rBevs8tZ2cULOx46E7oyX+04WGfABgIwmMC0VqieTiR4jg==}
-    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
-    cpu: [s390x]
-    os: [linux]
-    requiresBuild: true
-    optionalDependencies:
-      '@img/sharp-libvips-linux-s390x': 1.2.4
-    dev: false
-    optional: true
-
-  /@img/sharp-linux-x64@0.34.5:
-    resolution: {integrity: sha512-MEzd8HPKxVxVenwAa+JRPwEC7QFjoPWuS5NZnBt6B3pu7EG2Ge0id1oLHZpPJdn3OQK+BQDiw9zStiHBTJQQQQ==}
-    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
-    cpu: [x64]
-    os: [linux]
-    requiresBuild: true
-    optionalDependencies:
-      '@img/sharp-libvips-linux-x64': 1.2.4
-    dev: false
-    optional: true
-
-  /@img/sharp-linuxmusl-arm64@0.34.5:
-    resolution: {integrity: sha512-fprJR6GtRsMt6Kyfq44IsChVZeGN97gTD331weR1ex1c1rypDEABN6Tm2xa1wE6lYb5DdEnk03NZPqA7Id21yg==}
-    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
-    cpu: [arm64]
-    os: [linux]
-    requiresBuild: true
-    optionalDependencies:
-      '@img/sharp-libvips-linuxmusl-arm64': 1.2.4
-    dev: false
-    optional: true
-
-  /@img/sharp-linuxmusl-x64@0.34.5:
-    resolution: {integrity: sha512-Jg8wNT1MUzIvhBFxViqrEhWDGzqymo3sV7z7ZsaWbZNDLXRJZoRGrjulp60YYtV4wfY8VIKcWidjojlLcWrd8Q==}
-    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
-    cpu: [x64]
-    os: [linux]
-    requiresBuild: true
-    optionalDependencies:
-      '@img/sharp-libvips-linuxmusl-x64': 1.2.4
-    dev: false
-    optional: true
-
-  /@img/sharp-wasm32@0.34.5:
-    resolution: {integrity: sha512-OdWTEiVkY2PHwqkbBI8frFxQQFekHaSSkUIJkwzclWZe64O1X4UlUjqqqLaPbUpMOQk6FBu/HtlGXNblIs0huw==}
-    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
-    cpu: [wasm32]
-    requiresBuild: true
-    dependencies:
-      '@emnapi/runtime': 1.8.1
-    dev: false
-    optional: true
-
-  /@img/sharp-win32-arm64@0.34.5:
-    resolution: {integrity: sha512-WQ3AgWCWYSb2yt+IG8mnC6Jdk9Whs7O0gxphblsLvdhSpSTtmu69ZG1Gkb6NuvxsNACwiPV6cNSZNzt0KPsw7g==}
-    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
-    cpu: [arm64]
-    os: [win32]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /@img/sharp-win32-ia32@0.34.5:
-    resolution: {integrity: sha512-FV9m/7NmeCmSHDD5j4+4pNI8Cp3aW+JvLoXcTUo0IqyjSfAZJ8dIUmijx1qaJsIiU+Hosw6xM5KijAWRJCSgNg==}
-    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
-    cpu: [ia32]
-    os: [win32]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /@img/sharp-win32-x64@0.34.5:
-    resolution: {integrity: sha512-+29YMsqY2/9eFEiW93eqWnuLcWcufowXewwSNIT6UwZdUUCrM3oFjMWH/Z6/TMmb4hlFenmfAVbpWeup2jryCw==}
-    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
-    cpu: [x64]
-    os: [win32]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /@jridgewell/gen-mapping@0.3.13:
-    resolution: {integrity: sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==}
-    dependencies:
-      '@jridgewell/sourcemap-codec': 1.5.5
-      '@jridgewell/trace-mapping': 0.3.31
-    dev: true
-
-  /@jridgewell/remapping@2.3.5:
-    resolution: {integrity: sha512-LI9u/+laYG4Ds1TDKSJW2YPrIlcVYOwi2fUC6xB43lueCjgxV4lffOCZCtYFiH6TNOX+tQKXx97T4IKHbhyHEQ==}
-    dependencies:
-      '@jridgewell/gen-mapping': 0.3.13
-      '@jridgewell/trace-mapping': 0.3.31
-    dev: true
-
-  /@jridgewell/resolve-uri@3.1.2:
-    resolution: {integrity: sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==}
-    engines: {node: '>=6.0.0'}
-    dev: true
-
-  /@jridgewell/sourcemap-codec@1.5.5:
-    resolution: {integrity: sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==}
-    dev: true
-
-  /@jridgewell/trace-mapping@0.3.31:
-    resolution: {integrity: sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==}
-    dependencies:
-      '@jridgewell/resolve-uri': 3.1.2
-      '@jridgewell/sourcemap-codec': 1.5.5
-    dev: true
-
-  /@mdx-js/mdx@3.1.1:
-    resolution: {integrity: sha512-f6ZO2ifpwAQIpzGWaBQT2TXxPv6z3RBzQKpVftEWN78Vl/YweF1uwussDx8ECAXVtr3Rs89fKyG9YlzUs9DyGQ==}
-    dependencies:
-      '@types/estree': 1.0.8
-      '@types/estree-jsx': 1.0.5
-      '@types/hast': 3.0.4
-      '@types/mdx': 2.0.13
-      acorn: 8.15.0
-      collapse-white-space: 2.1.0
-      devlop: 1.1.0
-      estree-util-is-identifier-name: 3.0.0
-      estree-util-scope: 1.0.0
-      estree-walker: 3.0.3
-      hast-util-to-jsx-runtime: 2.3.6
-      markdown-extensions: 2.0.0
-      recma-build-jsx: 1.0.0
-      recma-jsx: 1.0.1(acorn@8.15.0)
-      recma-stringify: 1.0.0
-      rehype-recma: 1.0.0
-      remark-mdx: 3.1.1
-      remark-parse: 11.0.0
-      remark-rehype: 11.1.2
-      source-map: 0.7.6
-      unified: 11.0.5
-      unist-util-position-from-estree: 2.0.0
-      unist-util-stringify-position: 4.0.0
-      unist-util-visit: 5.1.0
-      vfile: 6.0.3
-    transitivePeerDependencies:
-      - supports-color
-    dev: false
-
-  /@next/env@16.1.6:
-    resolution: {integrity: sha512-N1ySLuZjnAtN3kFnwhAwPvZah8RJxKasD7x1f8shFqhncnWZn4JMfg37diLNuoHsLAlrDfM3g4mawVdtAG8XLQ==}
-    dev: false
-
-  /@next/swc-darwin-arm64@16.1.6:
-    resolution: {integrity: sha512-wTzYulosJr/6nFnqGW7FrG3jfUUlEf8UjGA0/pyypJl42ExdVgC6xJgcXQ+V8QFn6niSG2Pb8+MIG1mZr2vczw==}
-    engines: {node: '>= 10'}
-    cpu: [arm64]
-    os: [darwin]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /@next/swc-darwin-x64@16.1.6:
-    resolution: {integrity: sha512-BLFPYPDO+MNJsiDWbeVzqvYd4NyuRrEYVB5k2N3JfWncuHAy2IVwMAOlVQDFjj+krkWzhY2apvmekMkfQR0CUQ==}
-    engines: {node: '>= 10'}
-    cpu: [x64]
-    os: [darwin]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /@next/swc-linux-arm64-gnu@16.1.6:
-    resolution: {integrity: sha512-OJYkCd5pj/QloBvoEcJ2XiMnlJkRv9idWA/j0ugSuA34gMT6f5b7vOiCQHVRpvStoZUknhl6/UxOXL4OwtdaBw==}
-    engines: {node: '>= 10'}
-    cpu: [arm64]
-    os: [linux]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /@next/swc-linux-arm64-musl@16.1.6:
-    resolution: {integrity: sha512-S4J2v+8tT3NIO9u2q+S0G5KdvNDjXfAv06OhfOzNDaBn5rw84DGXWndOEB7d5/x852A20sW1M56vhC/tRVbccQ==}
-    engines: {node: '>= 10'}
-    cpu: [arm64]
-    os: [linux]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /@next/swc-linux-x64-gnu@16.1.6:
-    resolution: {integrity: sha512-2eEBDkFlMMNQnkTyPBhQOAyn2qMxyG2eE7GPH2WIDGEpEILcBPI/jdSv4t6xupSP+ot/jkfrCShLAa7+ZUPcJQ==}
-    engines: {node: '>= 10'}
-    cpu: [x64]
-    os: [linux]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /@next/swc-linux-x64-musl@16.1.6:
-    resolution: {integrity: sha512-oicJwRlyOoZXVlxmIMaTq7f8pN9QNbdes0q2FXfRsPhfCi8n8JmOZJm5oo1pwDaFbnnD421rVU409M3evFbIqg==}
-    engines: {node: '>= 10'}
-    cpu: [x64]
-    os: [linux]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /@next/swc-win32-arm64-msvc@16.1.6:
-    resolution: {integrity: sha512-gQmm8izDTPgs+DCWH22kcDmuUp7NyiJgEl18bcr8irXA5N2m2O+JQIr6f3ct42GOs9c0h8QF3L5SzIxcYAAXXw==}
-    engines: {node: '>= 10'}
-    cpu: [arm64]
-    os: [win32]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /@next/swc-win32-x64-msvc@16.1.6:
-    resolution: {integrity: sha512-NRfO39AIrzBnixKbjuo2YiYhB6o9d8v/ymU9m/Xk8cyVk+k7XylniXkHwjs4s70wedVffc6bQNbufk5v0xEm0A==}
-    engines: {node: '>= 10'}
-    cpu: [x64]
-    os: [win32]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /@orama/orama@3.1.18:
-    resolution: {integrity: sha512-a61ljmRVVyG5MC/698C8/FfFDw5a8LOIvyOLW5fztgUXqUpc1jOfQzOitSCbge657OgXXThmY3Tk8fpiDb4UcA==}
-    engines: {node: '>= 20.0.0'}
-    dev: false
-
-  /@radix-ui/number@1.1.1:
-    resolution: {integrity: sha512-MkKCwxlXTgz6CFoJx3pCwn07GKp36+aZyu/u2Ln2VrA5DcdyCZkASEDBTd8x5whTQQL5CiYf4prXKLcgQdv29g==}
-    dev: false
-
-  /@radix-ui/primitive@1.1.3:
-    resolution: {integrity: sha512-JTF99U/6XIjCBo0wqkU5sK10glYe27MRRsfwoiq5zzOEZLHU3A3KCMa5X/azekYRCJ0HlwI0crAXS/5dEHTzDg==}
-    dev: false
-
-  /@radix-ui/react-accordion@1.2.12(@types/react-dom@19.2.3)(@types/react@19.2.14)(react-dom@19.2.4)(react@19.2.4):
-    resolution: {integrity: sha512-T4nygeh9YE9dLRPhAHSeOZi7HBXo+0kYIPJXayZfvWOWA0+n3dESrZbjfDPUABkUNym6Hd+f2IR113To8D2GPA==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
-    dependencies:
-      '@radix-ui/primitive': 1.1.3
-      '@radix-ui/react-collapsible': 1.1.12(@types/react-dom@19.2.3)(@types/react@19.2.14)(react-dom@19.2.4)(react@19.2.4)
-      '@radix-ui/react-collection': 1.1.7(@types/react-dom@19.2.3)(@types/react@19.2.14)(react-dom@19.2.4)(react@19.2.4)
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-context': 1.1.2(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-direction': 1.1.1(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-id': 1.1.1(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3)(@types/react@19.2.14)(react-dom@19.2.4)(react@19.2.4)
-      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.14)(react@19.2.4)
-      '@types/react': 19.2.14
-      '@types/react-dom': 19.2.3(@types/react@19.2.14)
-      react: 19.2.4
-      react-dom: 19.2.4(react@19.2.4)
-    dev: false
-
-  /@radix-ui/react-arrow@1.1.7(@types/react-dom@19.2.3)(@types/react@19.2.14)(react-dom@19.2.4)(react@19.2.4):
-    resolution: {integrity: sha512-F+M1tLhO+mlQaOWspE8Wstg+z6PwxwRd8oQ8IXceWz92kfAmalTRf0EjrouQeo7QssEPfCn05B4Ihs1K9WQ/7w==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
-    dependencies:
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3)(@types/react@19.2.14)(react-dom@19.2.4)(react@19.2.4)
-      '@types/react': 19.2.14
-      '@types/react-dom': 19.2.3(@types/react@19.2.14)
-      react: 19.2.4
-      react-dom: 19.2.4(react@19.2.4)
-    dev: false
-
-  /@radix-ui/react-collapsible@1.1.12(@types/react-dom@19.2.3)(@types/react@19.2.14)(react-dom@19.2.4)(react@19.2.4):
-    resolution: {integrity: sha512-Uu+mSh4agx2ib1uIGPP4/CKNULyajb3p92LsVXmH2EHVMTfZWpll88XJ0j4W0z3f8NK1eYl1+Mf/szHPmcHzyA==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
-    dependencies:
-      '@radix-ui/primitive': 1.1.3
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-context': 1.1.2(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-id': 1.1.1(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-presence': 1.1.5(@types/react-dom@19.2.3)(@types/react@19.2.14)(react-dom@19.2.4)(react@19.2.4)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3)(@types/react@19.2.14)(react-dom@19.2.4)(react@19.2.4)
-      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.14)(react@19.2.4)
-      '@types/react': 19.2.14
-      '@types/react-dom': 19.2.3(@types/react@19.2.14)
-      react: 19.2.4
-      react-dom: 19.2.4(react@19.2.4)
-    dev: false
-
-  /@radix-ui/react-collection@1.1.7(@types/react-dom@19.2.3)(@types/react@19.2.14)(react-dom@19.2.4)(react@19.2.4):
-    resolution: {integrity: sha512-Fh9rGN0MoI4ZFUNyfFVNU4y9LUz93u9/0K+yLgA2bwRojxM8JU1DyvvMBabnZPBgMWREAJvU2jjVzq+LrFUglw==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
-    dependencies:
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-context': 1.1.2(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3)(@types/react@19.2.14)(react-dom@19.2.4)(react@19.2.4)
-      '@radix-ui/react-slot': 1.2.3(@types/react@19.2.14)(react@19.2.4)
-      '@types/react': 19.2.14
-      '@types/react-dom': 19.2.3(@types/react@19.2.14)
-      react: 19.2.4
-      react-dom: 19.2.4(react@19.2.4)
-    dev: false
-
-  /@radix-ui/react-compose-refs@1.1.2(@types/react@19.2.14)(react@19.2.4):
-    resolution: {integrity: sha512-z4eqJvfiNnFMHIIvXP3CY57y2WJs5g2v3X0zm9mEJkrkNv4rDxu+sg9Jh8EkXyeqBkB7SOcboo9dMVqhyrACIg==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-    dependencies:
-      '@types/react': 19.2.14
-      react: 19.2.4
-    dev: false
-
-  /@radix-ui/react-context@1.1.2(@types/react@19.2.14)(react@19.2.4):
-    resolution: {integrity: sha512-jCi/QKUM2r1Ju5a3J64TH2A5SpKAgh0LpknyqdQ4m6DCV0xJ2HG1xARRwNGPQfi1SLdLWZ1OJz6F4OMBBNiGJA==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-    dependencies:
-      '@types/react': 19.2.14
-      react: 19.2.4
-    dev: false
-
-  /@radix-ui/react-dialog@1.1.15(@types/react-dom@19.2.3)(@types/react@19.2.14)(react-dom@19.2.4)(react@19.2.4):
-    resolution: {integrity: sha512-TCglVRtzlffRNxRMEyR36DGBLJpeusFcgMVD9PZEzAKnUs1lKCgX5u9BmC2Yg+LL9MgZDugFFs1Vl+Jp4t/PGw==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
-    dependencies:
-      '@radix-ui/primitive': 1.1.3
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-context': 1.1.2(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-dismissable-layer': 1.1.11(@types/react-dom@19.2.3)(@types/react@19.2.14)(react-dom@19.2.4)(react@19.2.4)
-      '@radix-ui/react-focus-guards': 1.1.3(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-focus-scope': 1.1.7(@types/react-dom@19.2.3)(@types/react@19.2.14)(react-dom@19.2.4)(react@19.2.4)
-      '@radix-ui/react-id': 1.1.1(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-portal': 1.1.9(@types/react-dom@19.2.3)(@types/react@19.2.14)(react-dom@19.2.4)(react@19.2.4)
-      '@radix-ui/react-presence': 1.1.5(@types/react-dom@19.2.3)(@types/react@19.2.14)(react-dom@19.2.4)(react@19.2.4)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3)(@types/react@19.2.14)(react-dom@19.2.4)(react@19.2.4)
-      '@radix-ui/react-slot': 1.2.3(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.14)(react@19.2.4)
-      '@types/react': 19.2.14
-      '@types/react-dom': 19.2.3(@types/react@19.2.14)
-      aria-hidden: 1.2.6
-      react: 19.2.4
-      react-dom: 19.2.4(react@19.2.4)
-      react-remove-scroll: 2.7.2(@types/react@19.2.14)(react@19.2.4)
-    dev: false
-
-  /@radix-ui/react-direction@1.1.1(@types/react@19.2.14)(react@19.2.4):
-    resolution: {integrity: sha512-1UEWRX6jnOA2y4H5WczZ44gOOjTEmlqv1uNW4GAJEO5+bauCBhv8snY65Iw5/VOS/ghKN9gr2KjnLKxrsvoMVw==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-    dependencies:
-      '@types/react': 19.2.14
-      react: 19.2.4
-    dev: false
-
-  /@radix-ui/react-dismissable-layer@1.1.11(@types/react-dom@19.2.3)(@types/react@19.2.14)(react-dom@19.2.4)(react@19.2.4):
-    resolution: {integrity: sha512-Nqcp+t5cTB8BinFkZgXiMJniQH0PsUt2k51FUhbdfeKvc4ACcG2uQniY/8+h1Yv6Kza4Q7lD7PQV0z0oicE0Mg==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
-    dependencies:
-      '@radix-ui/primitive': 1.1.3
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3)(@types/react@19.2.14)(react-dom@19.2.4)(react@19.2.4)
-      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-use-escape-keydown': 1.1.1(@types/react@19.2.14)(react@19.2.4)
-      '@types/react': 19.2.14
-      '@types/react-dom': 19.2.3(@types/react@19.2.14)
-      react: 19.2.4
-      react-dom: 19.2.4(react@19.2.4)
-    dev: false
-
-  /@radix-ui/react-focus-guards@1.1.3(@types/react@19.2.14)(react@19.2.4):
-    resolution: {integrity: sha512-0rFg/Rj2Q62NCm62jZw0QX7a3sz6QCQU0LpZdNrJX8byRGaGVTqbrW9jAoIAHyMQqsNpeZ81YgSizOt5WXq0Pw==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-    dependencies:
-      '@types/react': 19.2.14
-      react: 19.2.4
-    dev: false
-
-  /@radix-ui/react-focus-scope@1.1.7(@types/react-dom@19.2.3)(@types/react@19.2.14)(react-dom@19.2.4)(react@19.2.4):
-    resolution: {integrity: sha512-t2ODlkXBQyn7jkl6TNaw/MtVEVvIGelJDCG41Okq/KwUsJBwQ4XVZsHAVUkK4mBv3ewiAS3PGuUWuY2BoK4ZUw==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
-    dependencies:
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3)(@types/react@19.2.14)(react-dom@19.2.4)(react@19.2.4)
-      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.14)(react@19.2.4)
-      '@types/react': 19.2.14
-      '@types/react-dom': 19.2.3(@types/react@19.2.14)
-      react: 19.2.4
-      react-dom: 19.2.4(react@19.2.4)
-    dev: false
-
-  /@radix-ui/react-id@1.1.1(@types/react@19.2.14)(react@19.2.4):
-    resolution: {integrity: sha512-kGkGegYIdQsOb4XjsfM97rXsiHaBwco+hFI66oO4s9LU+PLAC5oJ7khdOVFxkhsmlbpUqDAvXw11CluXP+jkHg==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-    dependencies:
-      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.14)(react@19.2.4)
-      '@types/react': 19.2.14
-      react: 19.2.4
-    dev: false
-
-  /@radix-ui/react-navigation-menu@1.2.14(@types/react-dom@19.2.3)(@types/react@19.2.14)(react-dom@19.2.4)(react@19.2.4):
-    resolution: {integrity: sha512-YB9mTFQvCOAQMHU+C/jVl96WmuWeltyUEpRJJky51huhds5W2FQr1J8D/16sQlf0ozxkPK8uF3niQMdUwZPv5w==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
-    dependencies:
-      '@radix-ui/primitive': 1.1.3
-      '@radix-ui/react-collection': 1.1.7(@types/react-dom@19.2.3)(@types/react@19.2.14)(react-dom@19.2.4)(react@19.2.4)
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-context': 1.1.2(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-direction': 1.1.1(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-dismissable-layer': 1.1.11(@types/react-dom@19.2.3)(@types/react@19.2.14)(react-dom@19.2.4)(react@19.2.4)
-      '@radix-ui/react-id': 1.1.1(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-presence': 1.1.5(@types/react-dom@19.2.3)(@types/react@19.2.14)(react-dom@19.2.4)(react@19.2.4)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3)(@types/react@19.2.14)(react-dom@19.2.4)(react@19.2.4)
-      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-use-previous': 1.1.1(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-visually-hidden': 1.2.3(@types/react-dom@19.2.3)(@types/react@19.2.14)(react-dom@19.2.4)(react@19.2.4)
-      '@types/react': 19.2.14
-      '@types/react-dom': 19.2.3(@types/react@19.2.14)
-      react: 19.2.4
-      react-dom: 19.2.4(react@19.2.4)
-    dev: false
-
-  /@radix-ui/react-popover@1.1.15(@types/react-dom@19.2.3)(@types/react@19.2.14)(react-dom@19.2.4)(react@19.2.4):
-    resolution: {integrity: sha512-kr0X2+6Yy/vJzLYJUPCZEc8SfQcf+1COFoAqauJm74umQhta9M7lNJHP7QQS3vkvcGLQUbWpMzwrXYwrYztHKA==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
-    dependencies:
-      '@radix-ui/primitive': 1.1.3
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-context': 1.1.2(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-dismissable-layer': 1.1.11(@types/react-dom@19.2.3)(@types/react@19.2.14)(react-dom@19.2.4)(react@19.2.4)
-      '@radix-ui/react-focus-guards': 1.1.3(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-focus-scope': 1.1.7(@types/react-dom@19.2.3)(@types/react@19.2.14)(react-dom@19.2.4)(react@19.2.4)
-      '@radix-ui/react-id': 1.1.1(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-popper': 1.2.8(@types/react-dom@19.2.3)(@types/react@19.2.14)(react-dom@19.2.4)(react@19.2.4)
-      '@radix-ui/react-portal': 1.1.9(@types/react-dom@19.2.3)(@types/react@19.2.14)(react-dom@19.2.4)(react@19.2.4)
-      '@radix-ui/react-presence': 1.1.5(@types/react-dom@19.2.3)(@types/react@19.2.14)(react-dom@19.2.4)(react@19.2.4)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3)(@types/react@19.2.14)(react-dom@19.2.4)(react@19.2.4)
-      '@radix-ui/react-slot': 1.2.3(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.14)(react@19.2.4)
-      '@types/react': 19.2.14
-      '@types/react-dom': 19.2.3(@types/react@19.2.14)
-      aria-hidden: 1.2.6
-      react: 19.2.4
-      react-dom: 19.2.4(react@19.2.4)
-      react-remove-scroll: 2.7.2(@types/react@19.2.14)(react@19.2.4)
-    dev: false
-
-  /@radix-ui/react-popper@1.2.8(@types/react-dom@19.2.3)(@types/react@19.2.14)(react-dom@19.2.4)(react@19.2.4):
-    resolution: {integrity: sha512-0NJQ4LFFUuWkE7Oxf0htBKS6zLkkjBH+hM1uk7Ng705ReR8m/uelduy1DBo0PyBXPKVnBA6YBlU94MBGXrSBCw==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
-    dependencies:
-      '@floating-ui/react-dom': 2.1.7(react-dom@19.2.4)(react@19.2.4)
-      '@radix-ui/react-arrow': 1.1.7(@types/react-dom@19.2.3)(@types/react@19.2.14)(react-dom@19.2.4)(react@19.2.4)
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-context': 1.1.2(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3)(@types/react@19.2.14)(react-dom@19.2.4)(react@19.2.4)
-      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-use-rect': 1.1.1(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-use-size': 1.1.1(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/rect': 1.1.1
-      '@types/react': 19.2.14
-      '@types/react-dom': 19.2.3(@types/react@19.2.14)
-      react: 19.2.4
-      react-dom: 19.2.4(react@19.2.4)
-    dev: false
-
-  /@radix-ui/react-portal@1.1.9(@types/react-dom@19.2.3)(@types/react@19.2.14)(react-dom@19.2.4)(react@19.2.4):
-    resolution: {integrity: sha512-bpIxvq03if6UNwXZ+HTK71JLh4APvnXntDc6XOX8UVq4XQOVl7lwok0AvIl+b8zgCw3fSaVTZMpAPPagXbKmHQ==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
-    dependencies:
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3)(@types/react@19.2.14)(react-dom@19.2.4)(react@19.2.4)
-      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.14)(react@19.2.4)
-      '@types/react': 19.2.14
-      '@types/react-dom': 19.2.3(@types/react@19.2.14)
-      react: 19.2.4
-      react-dom: 19.2.4(react@19.2.4)
-    dev: false
-
-  /@radix-ui/react-presence@1.1.5(@types/react-dom@19.2.3)(@types/react@19.2.14)(react-dom@19.2.4)(react@19.2.4):
-    resolution: {integrity: sha512-/jfEwNDdQVBCNvjkGit4h6pMOzq8bHkopq458dPt2lMjx+eBQUohZNG9A7DtO/O5ukSbxuaNGXMjHicgwy6rQQ==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
-    dependencies:
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.14)(react@19.2.4)
-      '@types/react': 19.2.14
-      '@types/react-dom': 19.2.3(@types/react@19.2.14)
-      react: 19.2.4
-      react-dom: 19.2.4(react@19.2.4)
-    dev: false
-
-  /@radix-ui/react-primitive@2.1.3(@types/react-dom@19.2.3)(@types/react@19.2.14)(react-dom@19.2.4)(react@19.2.4):
-    resolution: {integrity: sha512-m9gTwRkhy2lvCPe6QJp4d3G1TYEUHn/FzJUtq9MjH46an1wJU+GdoGC5VLof8RX8Ft/DlpshApkhswDLZzHIcQ==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
-    dependencies:
-      '@radix-ui/react-slot': 1.2.3(@types/react@19.2.14)(react@19.2.4)
-      '@types/react': 19.2.14
-      '@types/react-dom': 19.2.3(@types/react@19.2.14)
-      react: 19.2.4
-      react-dom: 19.2.4(react@19.2.4)
-    dev: false
-
-  /@radix-ui/react-roving-focus@1.1.11(@types/react-dom@19.2.3)(@types/react@19.2.14)(react-dom@19.2.4)(react@19.2.4):
-    resolution: {integrity: sha512-7A6S9jSgm/S+7MdtNDSb+IU859vQqJ/QAtcYQcfFC6W8RS4IxIZDldLR0xqCFZ6DCyrQLjLPsxtTNch5jVA4lA==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
-    dependencies:
-      '@radix-ui/primitive': 1.1.3
-      '@radix-ui/react-collection': 1.1.7(@types/react-dom@19.2.3)(@types/react@19.2.14)(react-dom@19.2.4)(react@19.2.4)
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-context': 1.1.2(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-direction': 1.1.1(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-id': 1.1.1(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3)(@types/react@19.2.14)(react-dom@19.2.4)(react@19.2.4)
-      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.14)(react@19.2.4)
-      '@types/react': 19.2.14
-      '@types/react-dom': 19.2.3(@types/react@19.2.14)
-      react: 19.2.4
-      react-dom: 19.2.4(react@19.2.4)
-    dev: false
-
-  /@radix-ui/react-scroll-area@1.2.10(@types/react-dom@19.2.3)(@types/react@19.2.14)(react-dom@19.2.4)(react@19.2.4):
-    resolution: {integrity: sha512-tAXIa1g3sM5CGpVT0uIbUx/U3Gs5N8T52IICuCtObaos1S8fzsrPXG5WObkQN3S6NVl6wKgPhAIiBGbWnvc97A==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
-    dependencies:
-      '@radix-ui/number': 1.1.1
-      '@radix-ui/primitive': 1.1.3
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-context': 1.1.2(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-direction': 1.1.1(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-presence': 1.1.5(@types/react-dom@19.2.3)(@types/react@19.2.14)(react-dom@19.2.4)(react@19.2.4)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3)(@types/react@19.2.14)(react-dom@19.2.4)(react@19.2.4)
-      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.14)(react@19.2.4)
-      '@types/react': 19.2.14
-      '@types/react-dom': 19.2.3(@types/react@19.2.14)
-      react: 19.2.4
-      react-dom: 19.2.4(react@19.2.4)
-    dev: false
-
-  /@radix-ui/react-slot@1.2.3(@types/react@19.2.14)(react@19.2.4):
-    resolution: {integrity: sha512-aeNmHnBxbi2St0au6VBVC7JXFlhLlOnvIIlePNniyUNAClzmtAUEY8/pBiK3iHjufOlwA+c20/8jngo7xcrg8A==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-    dependencies:
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.2.4)
-      '@types/react': 19.2.14
-      react: 19.2.4
-    dev: false
-
-  /@radix-ui/react-slot@1.2.4(@types/react@19.2.14)(react@19.2.4):
-    resolution: {integrity: sha512-Jl+bCv8HxKnlTLVrcDE8zTMJ09R9/ukw4qBs/oZClOfoQk/cOTbDn+NceXfV7j09YPVQUryJPHurafcSg6EVKA==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-    dependencies:
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.2.4)
-      '@types/react': 19.2.14
-      react: 19.2.4
-    dev: false
-
-  /@radix-ui/react-tabs@1.1.13(@types/react-dom@19.2.3)(@types/react@19.2.14)(react-dom@19.2.4)(react@19.2.4):
-    resolution: {integrity: sha512-7xdcatg7/U+7+Udyoj2zodtI9H/IIopqo+YOIcZOq1nJwXWBZ9p8xiu5llXlekDbZkca79a/fozEYQXIA4sW6A==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
-    dependencies:
-      '@radix-ui/primitive': 1.1.3
-      '@radix-ui/react-context': 1.1.2(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-direction': 1.1.1(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-id': 1.1.1(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-presence': 1.1.5(@types/react-dom@19.2.3)(@types/react@19.2.14)(react-dom@19.2.4)(react@19.2.4)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3)(@types/react@19.2.14)(react-dom@19.2.4)(react@19.2.4)
-      '@radix-ui/react-roving-focus': 1.1.11(@types/react-dom@19.2.3)(@types/react@19.2.14)(react-dom@19.2.4)(react@19.2.4)
-      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.14)(react@19.2.4)
-      '@types/react': 19.2.14
-      '@types/react-dom': 19.2.3(@types/react@19.2.14)
-      react: 19.2.4
-      react-dom: 19.2.4(react@19.2.4)
-    dev: false
-
-  /@radix-ui/react-use-callback-ref@1.1.1(@types/react@19.2.14)(react@19.2.4):
-    resolution: {integrity: sha512-FkBMwD+qbGQeMu1cOHnuGB6x4yzPjho8ap5WtbEJ26umhgqVXbhekKUQO+hZEL1vU92a3wHwdp0HAcqAUF5iDg==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-    dependencies:
-      '@types/react': 19.2.14
-      react: 19.2.4
-    dev: false
-
-  /@radix-ui/react-use-controllable-state@1.2.2(@types/react@19.2.14)(react@19.2.4):
-    resolution: {integrity: sha512-BjasUjixPFdS+NKkypcyyN5Pmg83Olst0+c6vGov0diwTEo6mgdqVR6hxcEgFuh4QrAs7Rc+9KuGJ9TVCj0Zzg==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-    dependencies:
-      '@radix-ui/react-use-effect-event': 0.0.2(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.14)(react@19.2.4)
-      '@types/react': 19.2.14
-      react: 19.2.4
-    dev: false
-
-  /@radix-ui/react-use-effect-event@0.0.2(@types/react@19.2.14)(react@19.2.4):
-    resolution: {integrity: sha512-Qp8WbZOBe+blgpuUT+lw2xheLP8q0oatc9UpmiemEICxGvFLYmHm9QowVZGHtJlGbS6A6yJ3iViad/2cVjnOiA==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-    dependencies:
-      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.14)(react@19.2.4)
-      '@types/react': 19.2.14
-      react: 19.2.4
-    dev: false
-
-  /@radix-ui/react-use-escape-keydown@1.1.1(@types/react@19.2.14)(react@19.2.4):
-    resolution: {integrity: sha512-Il0+boE7w/XebUHyBjroE+DbByORGR9KKmITzbR7MyQ4akpORYP/ZmbhAr0DG7RmmBqoOnZdy2QlvajJ2QA59g==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-    dependencies:
-      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.14)(react@19.2.4)
-      '@types/react': 19.2.14
-      react: 19.2.4
-    dev: false
-
-  /@radix-ui/react-use-layout-effect@1.1.1(@types/react@19.2.14)(react@19.2.4):
-    resolution: {integrity: sha512-RbJRS4UWQFkzHTTwVymMTUv8EqYhOp8dOOviLj2ugtTiXRaRQS7GLGxZTLL1jWhMeoSCf5zmcZkqTl9IiYfXcQ==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-    dependencies:
-      '@types/react': 19.2.14
-      react: 19.2.4
-    dev: false
-
-  /@radix-ui/react-use-previous@1.1.1(@types/react@19.2.14)(react@19.2.4):
-    resolution: {integrity: sha512-2dHfToCj/pzca2Ck724OZ5L0EVrr3eHRNsG/b3xQJLA2hZpVCS99bLAX+hm1IHXDEnzU6by5z/5MIY794/a8NQ==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-    dependencies:
-      '@types/react': 19.2.14
-      react: 19.2.4
-    dev: false
-
-  /@radix-ui/react-use-rect@1.1.1(@types/react@19.2.14)(react@19.2.4):
-    resolution: {integrity: sha512-QTYuDesS0VtuHNNvMh+CjlKJ4LJickCMUAqjlE3+j8w+RlRpwyX3apEQKGFzbZGdo7XNG1tXa+bQqIE7HIXT2w==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-    dependencies:
-      '@radix-ui/rect': 1.1.1
-      '@types/react': 19.2.14
-      react: 19.2.4
-    dev: false
-
-  /@radix-ui/react-use-size@1.1.1(@types/react@19.2.14)(react@19.2.4):
-    resolution: {integrity: sha512-ewrXRDTAqAXlkl6t/fkXWNAhFX9I+CkKlw6zjEwk86RSPKwZr3xpBRso655aqYafwtnbpHLj6toFzmd6xdVptQ==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-    dependencies:
-      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.14)(react@19.2.4)
-      '@types/react': 19.2.14
-      react: 19.2.4
-    dev: false
-
-  /@radix-ui/react-visually-hidden@1.2.3(@types/react-dom@19.2.3)(@types/react@19.2.14)(react-dom@19.2.4)(react@19.2.4):
-    resolution: {integrity: sha512-pzJq12tEaaIhqjbzpCuv/OypJY/BPavOofm+dbab+MHLajy277+1lLm6JFcGgF5eskJ6mquGirhXY2GD/8u8Ug==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
-    dependencies:
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3)(@types/react@19.2.14)(react-dom@19.2.4)(react@19.2.4)
-      '@types/react': 19.2.14
-      '@types/react-dom': 19.2.3(@types/react@19.2.14)
-      react: 19.2.4
-      react-dom: 19.2.4(react@19.2.4)
-    dev: false
-
-  /@radix-ui/rect@1.1.1:
-    resolution: {integrity: sha512-HPwpGIzkl28mWyZqG52jiqDJ12waP11Pa1lGoiyUkIEuMLBP0oeK/C89esbXrxsky5we7dfd8U58nm0SgAWpVw==}
-    dev: false
-
-  /@rollup/rollup-android-arm-eabi@4.57.1:
-    resolution: {integrity: sha512-A6ehUVSiSaaliTxai040ZpZ2zTevHYbvu/lDoeAteHI8QnaosIzm4qwtezfRg1jOYaUmnzLX1AOD6Z+UJjtifg==}
-    cpu: [arm]
-    os: [android]
-    requiresBuild: true
-    optional: true
-
-  /@rollup/rollup-android-arm64@4.57.1:
-    resolution: {integrity: sha512-dQaAddCY9YgkFHZcFNS/606Exo8vcLHwArFZ7vxXq4rigo2bb494/xKMMwRRQW6ug7Js6yXmBZhSBRuBvCCQ3w==}
-    cpu: [arm64]
-    os: [android]
-    requiresBuild: true
-    optional: true
-
-  /@rollup/rollup-darwin-arm64@4.57.1:
-    resolution: {integrity: sha512-crNPrwJOrRxagUYeMn/DZwqN88SDmwaJ8Cvi/TN1HnWBU7GwknckyosC2gd0IqYRsHDEnXf328o9/HC6OkPgOg==}
-    cpu: [arm64]
-    os: [darwin]
-    requiresBuild: true
-    optional: true
-
-  /@rollup/rollup-darwin-x64@4.57.1:
-    resolution: {integrity: sha512-Ji8g8ChVbKrhFtig5QBV7iMaJrGtpHelkB3lsaKzadFBe58gmjfGXAOfI5FV0lYMH8wiqsxKQ1C9B0YTRXVy4w==}
-    cpu: [x64]
-    os: [darwin]
-    requiresBuild: true
-    optional: true
-
-  /@rollup/rollup-freebsd-arm64@4.57.1:
-    resolution: {integrity: sha512-R+/WwhsjmwodAcz65guCGFRkMb4gKWTcIeLy60JJQbXrJ97BOXHxnkPFrP+YwFlaS0m+uWJTstrUA9o+UchFug==}
-    cpu: [arm64]
-    os: [freebsd]
-    requiresBuild: true
-    optional: true
-
-  /@rollup/rollup-freebsd-x64@4.57.1:
-    resolution: {integrity: sha512-IEQTCHeiTOnAUC3IDQdzRAGj3jOAYNr9kBguI7MQAAZK3caezRrg0GxAb6Hchg4lxdZEI5Oq3iov/w/hnFWY9Q==}
-    cpu: [x64]
-    os: [freebsd]
-    requiresBuild: true
-    optional: true
-
-  /@rollup/rollup-linux-arm-gnueabihf@4.57.1:
-    resolution: {integrity: sha512-F8sWbhZ7tyuEfsmOxwc2giKDQzN3+kuBLPwwZGyVkLlKGdV1nvnNwYD0fKQ8+XS6hp9nY7B+ZeK01EBUE7aHaw==}
-    cpu: [arm]
-    os: [linux]
-    requiresBuild: true
-    optional: true
-
-  /@rollup/rollup-linux-arm-musleabihf@4.57.1:
-    resolution: {integrity: sha512-rGfNUfn0GIeXtBP1wL5MnzSj98+PZe/AXaGBCRmT0ts80lU5CATYGxXukeTX39XBKsxzFpEeK+Mrp9faXOlmrw==}
-    cpu: [arm]
-    os: [linux]
-    requiresBuild: true
-    optional: true
-
-  /@rollup/rollup-linux-arm64-gnu@4.57.1:
-    resolution: {integrity: sha512-MMtej3YHWeg/0klK2Qodf3yrNzz6CGjo2UntLvk2RSPlhzgLvYEB3frRvbEF2wRKh1Z2fDIg9KRPe1fawv7C+g==}
-    cpu: [arm64]
-    os: [linux]
-    requiresBuild: true
-    optional: true
-
-  /@rollup/rollup-linux-arm64-musl@4.57.1:
-    resolution: {integrity: sha512-1a/qhaaOXhqXGpMFMET9VqwZakkljWHLmZOX48R0I/YLbhdxr1m4gtG1Hq7++VhVUmf+L3sTAf9op4JlhQ5u1Q==}
-    cpu: [arm64]
-    os: [linux]
-    requiresBuild: true
-    optional: true
-
-  /@rollup/rollup-linux-loong64-gnu@4.57.1:
-    resolution: {integrity: sha512-QWO6RQTZ/cqYtJMtxhkRkidoNGXc7ERPbZN7dVW5SdURuLeVU7lwKMpo18XdcmpWYd0qsP1bwKPf7DNSUinhvA==}
-    cpu: [loong64]
-    os: [linux]
-    requiresBuild: true
-    optional: true
-
-  /@rollup/rollup-linux-loong64-musl@4.57.1:
-    resolution: {integrity: sha512-xpObYIf+8gprgWaPP32xiN5RVTi/s5FCR+XMXSKmhfoJjrpRAjCuuqQXyxUa/eJTdAE6eJ+KDKaoEqjZQxh3Gw==}
-    cpu: [loong64]
-    os: [linux]
-    requiresBuild: true
-    optional: true
-
-  /@rollup/rollup-linux-ppc64-gnu@4.57.1:
-    resolution: {integrity: sha512-4BrCgrpZo4hvzMDKRqEaW1zeecScDCR+2nZ86ATLhAoJ5FQ+lbHVD3ttKe74/c7tNT9c6F2viwB3ufwp01Oh2w==}
-    cpu: [ppc64]
-    os: [linux]
-    requiresBuild: true
-    optional: true
-
-  /@rollup/rollup-linux-ppc64-musl@4.57.1:
-    resolution: {integrity: sha512-NOlUuzesGauESAyEYFSe3QTUguL+lvrN1HtwEEsU2rOwdUDeTMJdO5dUYl/2hKf9jWydJrO9OL/XSSf65R5+Xw==}
-    cpu: [ppc64]
-    os: [linux]
-    requiresBuild: true
-    optional: true
-
-  /@rollup/rollup-linux-riscv64-gnu@4.57.1:
-    resolution: {integrity: sha512-ptA88htVp0AwUUqhVghwDIKlvJMD/fmL/wrQj99PRHFRAG6Z5nbWoWG4o81Nt9FT+IuqUQi+L31ZKAFeJ5Is+A==}
-    cpu: [riscv64]
-    os: [linux]
-    requiresBuild: true
-    optional: true
-
-  /@rollup/rollup-linux-riscv64-musl@4.57.1:
-    resolution: {integrity: sha512-S51t7aMMTNdmAMPpBg7OOsTdn4tySRQvklmL3RpDRyknk87+Sp3xaumlatU+ppQ+5raY7sSTcC2beGgvhENfuw==}
-    cpu: [riscv64]
-    os: [linux]
-    requiresBuild: true
-    optional: true
-
-  /@rollup/rollup-linux-s390x-gnu@4.57.1:
-    resolution: {integrity: sha512-Bl00OFnVFkL82FHbEqy3k5CUCKH6OEJL54KCyx2oqsmZnFTR8IoNqBF+mjQVcRCT5sB6yOvK8A37LNm/kPJiZg==}
-    cpu: [s390x]
-    os: [linux]
-    requiresBuild: true
-    optional: true
-
-  /@rollup/rollup-linux-x64-gnu@4.57.1:
-    resolution: {integrity: sha512-ABca4ceT4N+Tv/GtotnWAeXZUZuM/9AQyCyKYyKnpk4yoA7QIAuBt6Hkgpw8kActYlew2mvckXkvx0FfoInnLg==}
-    cpu: [x64]
-    os: [linux]
-    requiresBuild: true
-    optional: true
-
-  /@rollup/rollup-linux-x64-musl@4.57.1:
-    resolution: {integrity: sha512-HFps0JeGtuOR2convgRRkHCekD7j+gdAuXM+/i6kGzQtFhlCtQkpwtNzkNj6QhCDp7DRJ7+qC/1Vg2jt5iSOFw==}
-    cpu: [x64]
-    os: [linux]
-    requiresBuild: true
-    optional: true
-
-  /@rollup/rollup-openbsd-x64@4.57.1:
-    resolution: {integrity: sha512-H+hXEv9gdVQuDTgnqD+SQffoWoc0Of59AStSzTEj/feWTBAnSfSD3+Dql1ZruJQxmykT/JVY0dE8Ka7z0DH1hw==}
-    cpu: [x64]
-    os: [openbsd]
-    requiresBuild: true
-    optional: true
-
-  /@rollup/rollup-openharmony-arm64@4.57.1:
-    resolution: {integrity: sha512-4wYoDpNg6o/oPximyc/NG+mYUejZrCU2q+2w6YZqrAs2UcNUChIZXjtafAiiZSUc7On8v5NyNj34Kzj/Ltk6dQ==}
-    cpu: [arm64]
-    os: [openharmony]
-    requiresBuild: true
-    optional: true
-
-  /@rollup/rollup-win32-arm64-msvc@4.57.1:
-    resolution: {integrity: sha512-O54mtsV/6LW3P8qdTcamQmuC990HDfR71lo44oZMZlXU4tzLrbvTii87Ni9opq60ds0YzuAlEr/GNwuNluZyMQ==}
-    cpu: [arm64]
-    os: [win32]
-    requiresBuild: true
-    optional: true
-
-  /@rollup/rollup-win32-ia32-msvc@4.57.1:
-    resolution: {integrity: sha512-P3dLS+IerxCT/7D2q2FYcRdWRl22dNbrbBEtxdWhXrfIMPP9lQhb5h4Du04mdl5Woq05jVCDPCMF7Ub0NAjIew==}
-    cpu: [ia32]
-    os: [win32]
-    requiresBuild: true
-    optional: true
-
-  /@rollup/rollup-win32-x64-gnu@4.57.1:
-    resolution: {integrity: sha512-VMBH2eOOaKGtIJYleXsi2B8CPVADrh+TyNxJ4mWPnKfLB/DBUmzW+5m1xUrcwWoMfSLagIRpjUFeW5CO5hyciQ==}
-    cpu: [x64]
-    os: [win32]
-    requiresBuild: true
-    optional: true
-
-  /@rollup/rollup-win32-x64-msvc@4.57.1:
-    resolution: {integrity: sha512-mxRFDdHIWRxg3UfIIAwCm6NzvxG0jDX/wBN6KsQFTvKFqqg9vTrWUE68qEjHt19A5wwx5X5aUi2zuZT7YR0jrA==}
-    cpu: [x64]
-    os: [win32]
-    requiresBuild: true
-    optional: true
-
-  /@shikijs/core@3.22.0:
-    resolution: {integrity: sha512-iAlTtSDDbJiRpvgL5ugKEATDtHdUVkqgHDm/gbD2ZS9c88mx7G1zSYjjOxp5Qa0eaW0MAQosFRmJSk354PRoQA==}
-    dependencies:
-      '@shikijs/types': 3.22.0
-      '@shikijs/vscode-textmate': 10.0.2
-      '@types/hast': 3.0.4
-      hast-util-to-html: 9.0.5
-    dev: false
-
-  /@shikijs/engine-javascript@3.22.0:
-    resolution: {integrity: sha512-jdKhfgW9CRtj3Tor0L7+yPwdG3CgP7W+ZEqSsojrMzCjD1e0IxIbwUMDDpYlVBlC08TACg4puwFGkZfLS+56Tw==}
-    dependencies:
-      '@shikijs/types': 3.22.0
-      '@shikijs/vscode-textmate': 10.0.2
-      oniguruma-to-es: 4.3.4
-    dev: false
-
-  /@shikijs/engine-oniguruma@3.22.0:
-    resolution: {integrity: sha512-DyXsOG0vGtNtl7ygvabHd7Mt5EY8gCNqR9Y7Lpbbd/PbJvgWrqaKzH1JW6H6qFkuUa8aCxoiYVv8/YfFljiQxA==}
-    dependencies:
-      '@shikijs/types': 3.22.0
-      '@shikijs/vscode-textmate': 10.0.2
-    dev: false
-
-  /@shikijs/langs@3.22.0:
-    resolution: {integrity: sha512-x/42TfhWmp6H00T6uwVrdTJGKgNdFbrEdhaDwSR5fd5zhQ1Q46bHq9EO61SCEWJR0HY7z2HNDMaBZp8JRmKiIA==}
-    dependencies:
-      '@shikijs/types': 3.22.0
-    dev: false
-
-  /@shikijs/rehype@3.22.0:
-    resolution: {integrity: sha512-69b2VPc6XBy/VmAJlpBU5By+bJSBdE2nvgRCZXav7zujbrjXuT0F60DIrjKuutjPqNufuizE+E8tIZr2Yn8Z+g==}
-    dependencies:
-      '@shikijs/types': 3.22.0
-      '@types/hast': 3.0.4
-      hast-util-to-string: 3.0.1
-      shiki: 3.22.0
-      unified: 11.0.5
-      unist-util-visit: 5.1.0
-    dev: false
-
-  /@shikijs/themes@3.22.0:
-    resolution: {integrity: sha512-o+tlOKqsr6FE4+mYJG08tfCFDS+3CG20HbldXeVoyP+cYSUxDhrFf3GPjE60U55iOkkjbpY2uC3It/eeja35/g==}
-    dependencies:
-      '@shikijs/types': 3.22.0
-    dev: false
-
-  /@shikijs/transformers@3.22.0:
-    resolution: {integrity: sha512-E7eRV7mwDBjueLF6852n2oYeJYxBq3NSsDk+uyruYAXONv4U8holGmIrT+mPRJQ1J1SNOH6L8G19KRzmBawrFw==}
-    dependencies:
-      '@shikijs/core': 3.22.0
-      '@shikijs/types': 3.22.0
-    dev: false
-
-  /@shikijs/types@3.22.0:
-    resolution: {integrity: sha512-491iAekgKDBFE67z70Ok5a8KBMsQ2IJwOWw3us/7ffQkIBCyOQfm/aNwVMBUriP02QshIfgHCBSIYAl3u2eWjg==}
-    dependencies:
-      '@shikijs/vscode-textmate': 10.0.2
-      '@types/hast': 3.0.4
-    dev: false
-
-  /@shikijs/vscode-textmate@10.0.2:
-    resolution: {integrity: sha512-83yeghZ2xxin3Nj8z1NMd/NCuca+gsYXswywDy5bHvwlWL8tpTQmzGeUuHd9FC3E/SBEMvzJRwWEOz5gGes9Qg==}
-    dev: false
-
-  /@standard-schema/spec@1.1.0:
-    resolution: {integrity: sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w==}
-    dev: false
-
-  /@swc/helpers@0.5.15:
-    resolution: {integrity: sha512-JQ5TuMi45Owi4/BIMAJBoSQoOJu12oOk/gADqlcUL9JEdHB8vyjUSsxqeNXnmXHjYKMi2WcYtezGEEhqUI/E2g==}
-    dependencies:
-      tslib: 2.8.1
-    dev: false
-
-  /@tailwindcss/node@4.1.18:
-    resolution: {integrity: sha512-DoR7U1P7iYhw16qJ49fgXUlry1t4CpXeErJHnQ44JgTSKMaZUdf17cfn5mHchfJ4KRBZRFA/Coo+MUF5+gOaCQ==}
-    dependencies:
-      '@jridgewell/remapping': 2.3.5
-      enhanced-resolve: 5.19.0
-      jiti: 2.6.1
-      lightningcss: 1.30.2
-      magic-string: 0.30.21
-      source-map-js: 1.2.1
-      tailwindcss: 4.1.18
-    dev: true
-
-  /@tailwindcss/oxide-android-arm64@4.1.18:
-    resolution: {integrity: sha512-dJHz7+Ugr9U/diKJA0W6N/6/cjI+ZTAoxPf9Iz9BFRF2GzEX8IvXxFIi/dZBloVJX/MZGvRuFA9rqwdiIEZQ0Q==}
-    engines: {node: '>= 10'}
-    cpu: [arm64]
-    os: [android]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /@tailwindcss/oxide-darwin-arm64@4.1.18:
-    resolution: {integrity: sha512-Gc2q4Qhs660bhjyBSKgq6BYvwDz4G+BuyJ5H1xfhmDR3D8HnHCmT/BSkvSL0vQLy/nkMLY20PQ2OoYMO15Jd0A==}
-    engines: {node: '>= 10'}
-    cpu: [arm64]
-    os: [darwin]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /@tailwindcss/oxide-darwin-x64@4.1.18:
-    resolution: {integrity: sha512-FL5oxr2xQsFrc3X9o1fjHKBYBMD1QZNyc1Xzw/h5Qu4XnEBi3dZn96HcHm41c/euGV+GRiXFfh2hUCyKi/e+yw==}
-    engines: {node: '>= 10'}
-    cpu: [x64]
-    os: [darwin]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /@tailwindcss/oxide-freebsd-x64@4.1.18:
-    resolution: {integrity: sha512-Fj+RHgu5bDodmV1dM9yAxlfJwkkWvLiRjbhuO2LEtwtlYlBgiAT4x/j5wQr1tC3SANAgD+0YcmWVrj8R9trVMA==}
-    engines: {node: '>= 10'}
-    cpu: [x64]
-    os: [freebsd]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /@tailwindcss/oxide-linux-arm-gnueabihf@4.1.18:
-    resolution: {integrity: sha512-Fp+Wzk/Ws4dZn+LV2Nqx3IilnhH51YZoRaYHQsVq3RQvEl+71VGKFpkfHrLM/Li+kt5c0DJe/bHXK1eHgDmdiA==}
-    engines: {node: '>= 10'}
-    cpu: [arm]
-    os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /@tailwindcss/oxide-linux-arm64-gnu@4.1.18:
-    resolution: {integrity: sha512-S0n3jboLysNbh55Vrt7pk9wgpyTTPD0fdQeh7wQfMqLPM/Hrxi+dVsLsPrycQjGKEQk85Kgbx+6+QnYNiHalnw==}
-    engines: {node: '>= 10'}
-    cpu: [arm64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /@tailwindcss/oxide-linux-arm64-musl@4.1.18:
-    resolution: {integrity: sha512-1px92582HkPQlaaCkdRcio71p8bc8i/ap5807tPRDK/uw953cauQBT8c5tVGkOwrHMfc2Yh6UuxaH4vtTjGvHg==}
-    engines: {node: '>= 10'}
-    cpu: [arm64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /@tailwindcss/oxide-linux-x64-gnu@4.1.18:
-    resolution: {integrity: sha512-v3gyT0ivkfBLoZGF9LyHmts0Isc8jHZyVcbzio6Wpzifg/+5ZJpDiRiUhDLkcr7f/r38SWNe7ucxmGW3j3Kb/g==}
-    engines: {node: '>= 10'}
-    cpu: [x64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /@tailwindcss/oxide-linux-x64-musl@4.1.18:
-    resolution: {integrity: sha512-bhJ2y2OQNlcRwwgOAGMY0xTFStt4/wyU6pvI6LSuZpRgKQwxTec0/3Scu91O8ir7qCR3AuepQKLU/kX99FouqQ==}
-    engines: {node: '>= 10'}
-    cpu: [x64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /@tailwindcss/oxide-wasm32-wasi@4.1.18:
-    resolution: {integrity: sha512-LffYTvPjODiP6PT16oNeUQJzNVyJl1cjIebq/rWWBF+3eDst5JGEFSc5cWxyRCJ0Mxl+KyIkqRxk1XPEs9x8TA==}
-    engines: {node: '>=14.0.0'}
-    cpu: [wasm32]
-    requiresBuild: true
-    dev: true
-    optional: true
-    bundledDependencies:
-      - '@napi-rs/wasm-runtime'
-      - '@emnapi/core'
-      - '@emnapi/runtime'
-      - '@tybys/wasm-util'
-      - '@emnapi/wasi-threads'
-      - tslib
-
-  /@tailwindcss/oxide-win32-arm64-msvc@4.1.18:
-    resolution: {integrity: sha512-HjSA7mr9HmC8fu6bdsZvZ+dhjyGCLdotjVOgLA2vEqxEBZaQo9YTX4kwgEvPCpRh8o4uWc4J/wEoFzhEmjvPbA==}
-    engines: {node: '>= 10'}
-    cpu: [arm64]
-    os: [win32]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /@tailwindcss/oxide-win32-x64-msvc@4.1.18:
-    resolution: {integrity: sha512-bJWbyYpUlqamC8dpR7pfjA0I7vdF6t5VpUGMWRkXVE3AXgIZjYUYAK7II1GNaxR8J1SSrSrppRar8G++JekE3Q==}
-    engines: {node: '>= 10'}
-    cpu: [x64]
-    os: [win32]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /@tailwindcss/oxide@4.1.18:
-    resolution: {integrity: sha512-EgCR5tTS5bUSKQgzeMClT6iCY3ToqE1y+ZB0AKldj809QXk1Y+3jB0upOYZrn9aGIzPtUsP7sX4QQ4XtjBB95A==}
-    engines: {node: '>= 10'}
-    optionalDependencies:
-      '@tailwindcss/oxide-android-arm64': 4.1.18
-      '@tailwindcss/oxide-darwin-arm64': 4.1.18
-      '@tailwindcss/oxide-darwin-x64': 4.1.18
-      '@tailwindcss/oxide-freebsd-x64': 4.1.18
-      '@tailwindcss/oxide-linux-arm-gnueabihf': 4.1.18
-      '@tailwindcss/oxide-linux-arm64-gnu': 4.1.18
-      '@tailwindcss/oxide-linux-arm64-musl': 4.1.18
-      '@tailwindcss/oxide-linux-x64-gnu': 4.1.18
-      '@tailwindcss/oxide-linux-x64-musl': 4.1.18
-      '@tailwindcss/oxide-wasm32-wasi': 4.1.18
-      '@tailwindcss/oxide-win32-arm64-msvc': 4.1.18
-      '@tailwindcss/oxide-win32-x64-msvc': 4.1.18
-    dev: true
-
-  /@tailwindcss/postcss@4.1.18:
-    resolution: {integrity: sha512-Ce0GFnzAOuPyfV5SxjXGn0CubwGcuDB0zcdaPuCSzAa/2vII24JTkH+I6jcbXLb1ctjZMZZI6OjDaLPJQL1S0g==}
-    dependencies:
-      '@alloc/quick-lru': 5.2.0
-      '@tailwindcss/node': 4.1.18
-      '@tailwindcss/oxide': 4.1.18
-      postcss: 8.5.6
-      tailwindcss: 4.1.18
-    dev: true
-
-  /@tailwindcss/vite@4.1.18(vite@7.3.1):
-    resolution: {integrity: sha512-jVA+/UpKL1vRLg6Hkao5jldawNmRo7mQYrZtNHMIVpLfLhDml5nMRUo/8MwoX2vNXvnaXNNMedrMfMugAVX1nA==}
-    peerDependencies:
-      vite: ^5.2.0 || ^6 || ^7
-    dependencies:
-      '@tailwindcss/node': 4.1.18
-      '@tailwindcss/oxide': 4.1.18
-      tailwindcss: 4.1.18
-      vite: 7.3.1(@types/node@24.10.13)
-    dev: true
-
-  /@types/debug@4.1.12:
-    resolution: {integrity: sha512-vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ==}
-    dependencies:
-      '@types/ms': 2.1.0
-    dev: false
-
-  /@types/estree-jsx@1.0.5:
-    resolution: {integrity: sha512-52CcUVNFyfb1A2ALocQw/Dd1BQFNmSdkuC3BkZ6iqhdMfQz7JWOFRuJFloOzjk+6WijU56m9oKXFAXc7o3Towg==}
-    dependencies:
-      '@types/estree': 1.0.8
-    dev: false
-
-  /@types/estree@1.0.8:
-    resolution: {integrity: sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==}
-
-  /@types/hast@3.0.4:
-    resolution: {integrity: sha512-WPs+bbQw5aCj+x6laNGWLH3wviHtoCv/P3+otBhbOhJgG8qtpdAMlTCxLtsTWA7LH1Oh/bFCHsBn0TPS5m30EQ==}
-    dependencies:
-      '@types/unist': 3.0.3
-    dev: false
-
-  /@types/mdast@4.0.4:
-    resolution: {integrity: sha512-kGaNbPh1k7AFzgpud/gMdvIm5xuECykRR+JnWKQno9TAXVa6WIVCGTPvYGekIDL4uwCZQSYbUxNBSb1aUo79oA==}
-    dependencies:
-      '@types/unist': 3.0.3
-    dev: false
-
-  /@types/mdx@2.0.13:
-    resolution: {integrity: sha512-+OWZQfAYyio6YkJb3HLxDrvnx6SWWDbC0zVPfBRzUk0/nqoDyf6dNxQi3eArPe8rJ473nobTMQ/8Zk+LxJ+Yuw==}
-
-  /@types/ms@2.1.0:
-    resolution: {integrity: sha512-GsCCIZDE/p3i96vtEqx+7dBUGXrc7zeSK3wwPHIaRThS+9OhWIXRqzs4d6k1SVU8g91DrNRWxWUGhp5KXQb2VA==}
-    dev: false
-
-  /@types/node@24.10.13:
-    resolution: {integrity: sha512-oH72nZRfDv9lADUBSo104Aq7gPHpQZc4BTx38r9xf9pg5LfP6EzSyH2n7qFmmxRQXh7YlUXODcYsg6PuTDSxGg==}
-    dependencies:
-      undici-types: 7.16.0
-
-  /@types/react-dom@19.2.3(@types/react@19.2.14):
-    resolution: {integrity: sha512-jp2L/eY6fn+KgVVQAOqYItbF0VY/YApe5Mz2F0aykSO8gx31bYCZyvSeYxCHKvzHG5eZjc+zyaS5BrBWya2+kQ==}
-    peerDependencies:
-      '@types/react': ^19.2.0
-    dependencies:
-      '@types/react': 19.2.14
-
-  /@types/react@19.2.14:
-    resolution: {integrity: sha512-ilcTH/UniCkMdtexkoCN0bI7pMcJDvmQFPvuPvmEaYA/NSfFTAgdUSLAoVjaRJm7+6PvcM+q1zYOwS4wTYMF9w==}
-    dependencies:
-      csstype: 3.2.3
-
-  /@types/unist@2.0.11:
-    resolution: {integrity: sha512-CmBKiL6NNo/OqgmMn95Fk9Whlp2mtvIv+KNpQKN2F4SjvrEesubTRWGYSg+BnWZOnlCaSTU1sMpsBOzgbYhnsA==}
-    dev: false
-
-  /@types/unist@3.0.3:
-    resolution: {integrity: sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==}
-    dev: false
-
-  /@ungap/structured-clone@1.3.0:
-    resolution: {integrity: sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==}
-    dev: false
-
-  /acorn-jsx@5.3.2(acorn@8.15.0):
-    resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
-    peerDependencies:
-      acorn: ^6.0.0 || ^7.0.0 || ^8.0.0
-    dependencies:
-      acorn: 8.15.0
-    dev: false
-
-  /acorn@8.15.0:
-    resolution: {integrity: sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==}
-    engines: {node: '>=0.4.0'}
-    hasBin: true
-    dev: false
-
-  /argparse@2.0.1:
-    resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==}
-    dev: false
-
-  /aria-hidden@1.2.6:
-    resolution: {integrity: sha512-ik3ZgC9dY/lYVVM++OISsaYDeg1tb0VtP5uL3ouh1koGOaUMDPpbFIei4JkFimWUFPn90sbMNMXQAIVOlnYKJA==}
-    engines: {node: '>=10'}
-    dependencies:
-      tslib: 2.8.1
-    dev: false
-
-  /astring@1.9.0:
-    resolution: {integrity: sha512-LElXdjswlqjWrPpJFg1Fx4wpkOCxj1TDHlSV4PlaRxHGWko024xICaa97ZkMfs6DRKlCguiAI+rbXv5GWwXIkg==}
-    hasBin: true
-    dev: false
-
-  /bail@2.0.2:
-    resolution: {integrity: sha512-0xO6mYd7JB2YesxDKplafRpsiOzPt9V02ddPCLbY1xYGPOX24NTyN50qnUxgCPcSoYMhKpAuBTjQoRZCAkUDRw==}
-    dev: false
-
-  /baseline-browser-mapping@2.9.19:
-    resolution: {integrity: sha512-ipDqC8FrAl/76p2SSWKSI+H9tFwm7vYqXQrItCuiVPt26Km0jS+NzSsBWAaBusvSbQcfJG+JitdMm+wZAgTYqg==}
-    hasBin: true
-    dev: false
-
-  /caniuse-lite@1.0.30001769:
-    resolution: {integrity: sha512-BCfFL1sHijQlBGWBMuJyhZUhzo7wer5sVj9hqekB/7xn0Ypy+pER/edCYQm4exbXj4WiySGp40P8UuTh6w1srg==}
-    dev: false
-
-  /ccount@2.0.1:
-    resolution: {integrity: sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==}
-    dev: false
-
-  /character-entities-html4@2.1.0:
-    resolution: {integrity: sha512-1v7fgQRj6hnSwFpq1Eu0ynr/CDEw0rXo2B61qXrLNdHZmPKgb7fqS1a2JwF0rISo9q77jDI8VMEHoApn8qDoZA==}
-    dev: false
-
-  /character-entities-legacy@3.0.0:
-    resolution: {integrity: sha512-RpPp0asT/6ufRm//AJVwpViZbGM/MkjQFxJccQRHmISF/22NBtsHqAWmL+/pmkPWoIUJdWyeVleTl1wydHATVQ==}
-    dev: false
-
-  /character-entities@2.0.2:
-    resolution: {integrity: sha512-shx7oQ0Awen/BRIdkjkvz54PnEEI/EjwXDSIZp86/KKdbafHh1Df/RYGBhn4hbe2+uKC9FnT5UCEdyPz3ai9hQ==}
-    dev: false
-
-  /character-reference-invalid@2.0.1:
-    resolution: {integrity: sha512-iBZ4F4wRbyORVsu0jPV7gXkOsGYjGHPmAyv+HiHG8gi5PtC9KI2j1+v8/tlibRvjoWX027ypmG/n0HtO5t7unw==}
-    dev: false
-
-  /chokidar@4.0.3:
-    resolution: {integrity: sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==}
-    engines: {node: '>= 14.16.0'}
-    dependencies:
-      readdirp: 4.1.2
-    dev: false
-
-  /class-variance-authority@0.7.1:
-    resolution: {integrity: sha512-Ka+9Trutv7G8M6WT6SeiRWz792K5qEqIGEGzXKhAE6xOWAY6pPH8U+9IY3oCMv6kqTmLsv7Xh/2w2RigkePMsg==}
-    dependencies:
-      clsx: 2.1.1
-    dev: false
-
-  /client-only@0.0.1:
-    resolution: {integrity: sha512-IV3Ou0jSMzZrd3pZ48nLkT9DA7Ag1pnPzaiQhpW7c3RbcqqzvzzVu+L8gfqMp/8IM2MQtSiqaCxrrcfu8I8rMA==}
-    dev: false
-
-  /clsx@2.1.1:
-    resolution: {integrity: sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==}
-    engines: {node: '>=6'}
-    dev: false
-
-  /collapse-white-space@2.1.0:
-    resolution: {integrity: sha512-loKTxY1zCOuG4j9f6EPnuyyYkf58RnhhWTvRoZEokgB+WbdXehfjFviyOVYkqzEWz1Q5kRiZdBYS5SwxbQYwzw==}
-    dev: false
-
-  /comma-separated-tokens@2.0.3:
-    resolution: {integrity: sha512-Fu4hJdvzeylCfQPp9SGWidpzrMs7tTrlu6Vb8XGaRGck8QSNZJJp538Wrb60Lax4fPwR64ViY468OIUTbRlGZg==}
-    dev: false
-
-  /compute-scroll-into-view@3.1.1:
-    resolution: {integrity: sha512-VRhuHOLoKYOy4UbilLbUzbYg93XLjv2PncJC50EuTWPA3gaja1UjBsUP/D/9/juV3vQFr6XBEzn9KCAHdUvOHw==}
-    dev: false
-
-  /cssesc@3.0.0:
-    resolution: {integrity: sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==}
-    engines: {node: '>=4'}
-    hasBin: true
-    dev: false
-
-  /csstype@3.2.3:
-    resolution: {integrity: sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==}
-
-  /debug@4.4.3:
-    resolution: {integrity: sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==}
-    engines: {node: '>=6.0'}
-    peerDependencies:
-      supports-color: '*'
-    peerDependenciesMeta:
-      supports-color:
-        optional: true
-    dependencies:
-      ms: 2.1.3
-    dev: false
-
-  /decode-named-character-reference@1.3.0:
-    resolution: {integrity: sha512-GtpQYB283KrPp6nRw50q3U9/VfOutZOe103qlN7BPP6Ad27xYnOIWv4lPzo8HCAL+mMZofJ9KEy30fq6MfaK6Q==}
-    dependencies:
-      character-entities: 2.0.2
-    dev: false
-
-  /dequal@2.0.3:
-    resolution: {integrity: sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==}
-    engines: {node: '>=6'}
-    dev: false
-
-  /detect-libc@2.1.2:
-    resolution: {integrity: sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==}
-    engines: {node: '>=8'}
-
-  /detect-node-es@1.1.0:
-    resolution: {integrity: sha512-ypdmJU/TbBby2Dxibuv7ZLW3Bs1QEmM7nHjEANfohJLvE0XVujisn1qPJcZxg+qDucsr+bP6fLD1rPS3AhJ7EQ==}
-    dev: false
-
-  /devlop@1.1.0:
-    resolution: {integrity: sha512-RWmIqhcFf1lRYBvNmr7qTNuyCt/7/ns2jbpp1+PalgE/rDQcBT0fioSMUpJ93irlUhC5hrg4cYqe6U+0ImW0rA==}
-    dependencies:
-      dequal: 2.0.3
-    dev: false
-
-  /enhanced-resolve@5.19.0:
-    resolution: {integrity: sha512-phv3E1Xl4tQOShqSte26C7Fl84EwUdZsyOuSSk9qtAGyyQs2s3jJzComh+Abf4g187lUUAvH+H26omrqia2aGg==}
-    engines: {node: '>=10.13.0'}
-    dependencies:
-      graceful-fs: 4.2.11
-      tapable: 2.3.0
-    dev: true
-
-  /esast-util-from-estree@2.0.0:
-    resolution: {integrity: sha512-4CyanoAudUSBAn5K13H4JhsMH6L9ZP7XbLVe/dKybkxMO7eDyLsT8UHl9TRNrU2Gr9nz+FovfSIjuXWJ81uVwQ==}
-    dependencies:
-      '@types/estree-jsx': 1.0.5
-      devlop: 1.1.0
-      estree-util-visit: 2.0.0
-      unist-util-position-from-estree: 2.0.0
-    dev: false
-
-  /esast-util-from-js@2.0.1:
-    resolution: {integrity: sha512-8Ja+rNJ0Lt56Pcf3TAmpBZjmx8ZcK5Ts4cAzIOjsjevg9oSXJnl6SUQ2EevU8tv3h6ZLWmoKL5H4fgWvdvfETw==}
-    dependencies:
-      '@types/estree-jsx': 1.0.5
-      acorn: 8.15.0
-      esast-util-from-estree: 2.0.0
-      vfile-message: 4.0.3
-    dev: false
-
-  /esbuild@0.27.3:
-    resolution: {integrity: sha512-8VwMnyGCONIs6cWue2IdpHxHnAjzxnw2Zr7MkVxB2vjmQ2ivqGFb4LEG3SMnv0Gb2F/G/2yA8zUaiL1gywDCCg==}
-    engines: {node: '>=18'}
-    hasBin: true
-    requiresBuild: true
-    optionalDependencies:
-      '@esbuild/aix-ppc64': 0.27.3
-      '@esbuild/android-arm': 0.27.3
-      '@esbuild/android-arm64': 0.27.3
-      '@esbuild/android-x64': 0.27.3
-      '@esbuild/darwin-arm64': 0.27.3
-      '@esbuild/darwin-x64': 0.27.3
-      '@esbuild/freebsd-arm64': 0.27.3
-      '@esbuild/freebsd-x64': 0.27.3
-      '@esbuild/linux-arm': 0.27.3
-      '@esbuild/linux-arm64': 0.27.3
-      '@esbuild/linux-ia32': 0.27.3
-      '@esbuild/linux-loong64': 0.27.3
-      '@esbuild/linux-mips64el': 0.27.3
-      '@esbuild/linux-ppc64': 0.27.3
-      '@esbuild/linux-riscv64': 0.27.3
-      '@esbuild/linux-s390x': 0.27.3
-      '@esbuild/linux-x64': 0.27.3
-      '@esbuild/netbsd-arm64': 0.27.3
-      '@esbuild/netbsd-x64': 0.27.3
-      '@esbuild/openbsd-arm64': 0.27.3
-      '@esbuild/openbsd-x64': 0.27.3
-      '@esbuild/openharmony-arm64': 0.27.3
-      '@esbuild/sunos-x64': 0.27.3
-      '@esbuild/win32-arm64': 0.27.3
-      '@esbuild/win32-ia32': 0.27.3
-      '@esbuild/win32-x64': 0.27.3
-
-  /escape-string-regexp@5.0.0:
-    resolution: {integrity: sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==}
-    engines: {node: '>=12'}
-    dev: false
-
-  /estree-util-attach-comments@3.0.0:
-    resolution: {integrity: sha512-cKUwm/HUcTDsYh/9FgnuFqpfquUbwIqwKM26BVCGDPVgvaCl/nDCCjUfiLlx6lsEZ3Z4RFxNbOQ60pkaEwFxGw==}
-    dependencies:
-      '@types/estree': 1.0.8
-    dev: false
-
-  /estree-util-build-jsx@3.0.1:
-    resolution: {integrity: sha512-8U5eiL6BTrPxp/CHbs2yMgP8ftMhR5ww1eIKoWRMlqvltHF8fZn5LRDvTKuxD3DUn+shRbLGqXemcP51oFCsGQ==}
-    dependencies:
-      '@types/estree-jsx': 1.0.5
-      devlop: 1.1.0
-      estree-util-is-identifier-name: 3.0.0
-      estree-walker: 3.0.3
-    dev: false
-
-  /estree-util-is-identifier-name@3.0.0:
-    resolution: {integrity: sha512-hFtqIDZTIUZ9BXLb8y4pYGyk6+wekIivNVTcmvk8NoOh+VeRn5y6cEHzbURrWbfp1fIqdVipilzj+lfaadNZmg==}
-    dev: false
-
-  /estree-util-scope@1.0.0:
-    resolution: {integrity: sha512-2CAASclonf+JFWBNJPndcOpA8EMJwa0Q8LUFJEKqXLW6+qBvbFZuF5gItbQOs/umBUkjviCSDCbBwU2cXbmrhQ==}
-    dependencies:
-      '@types/estree': 1.0.8
-      devlop: 1.1.0
-    dev: false
-
-  /estree-util-to-js@2.0.0:
-    resolution: {integrity: sha512-WDF+xj5rRWmD5tj6bIqRi6CkLIXbbNQUcxQHzGysQzvHmdYG2G7p/Tf0J0gpxGgkeMZNTIjT/AoSvC9Xehcgdg==}
-    dependencies:
-      '@types/estree-jsx': 1.0.5
-      astring: 1.9.0
-      source-map: 0.7.6
-    dev: false
-
-  /estree-util-value-to-estree@3.5.0:
-    resolution: {integrity: sha512-aMV56R27Gv3QmfmF1MY12GWkGzzeAezAX+UplqHVASfjc9wNzI/X6hC0S9oxq61WT4aQesLGslWP9tKk6ghRZQ==}
-    dependencies:
-      '@types/estree': 1.0.8
-    dev: false
-
-  /estree-util-visit@2.0.0:
-    resolution: {integrity: sha512-m5KgiH85xAhhW8Wta0vShLcUvOsh3LLPI2YVwcbio1l7E09NTLL1EyMZFM1OyWowoH0skScNbhOPl4kcBgzTww==}
-    dependencies:
-      '@types/estree-jsx': 1.0.5
-      '@types/unist': 3.0.3
-    dev: false
-
-  /estree-walker@3.0.3:
-    resolution: {integrity: sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==}
-    dependencies:
-      '@types/estree': 1.0.8
-    dev: false
-
-  /extend@3.0.2:
-    resolution: {integrity: sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==}
-    dev: false
-
-  /fdir@6.5.0(picomatch@4.0.3):
-    resolution: {integrity: sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==}
-    engines: {node: '>=12.0.0'}
-    peerDependencies:
-      picomatch: ^3 || ^4
-    peerDependenciesMeta:
-      picomatch:
-        optional: true
-    dependencies:
-      picomatch: 4.0.3
-
-  /fsevents@2.3.3:
-    resolution: {integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==}
-    engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
-    os: [darwin]
-    requiresBuild: true
-    optional: true
-
-  /fumadocs-core@16.1.0(@types/react@19.2.14)(next@16.1.6)(react-dom@19.2.4)(react@19.2.4):
-    resolution: {integrity: sha512-5pbO2bOGc/xlb2yLQSy6Oag8mvD5CNf5HzQIG80HjZzLXYWEOHW8yovRKnWKRF9gAibn6WHnbssj3YPAlitV/A==}
-    peerDependencies:
-      '@mixedbread/sdk': ^0.19.0
-      '@orama/core': 1.x.x
-      '@tanstack/react-router': 1.x.x
-      '@types/react': '*'
-      algoliasearch: 5.x.x
-      lucide-react: '*'
-      next: 16.x.x
-      react: ^19.2.0
-      react-dom: ^19.2.0
-      react-router: 7.x.x
-      waku: ^0.26.0 || ^0.27.0
-    peerDependenciesMeta:
-      '@mixedbread/sdk':
-        optional: true
-      '@orama/core':
-        optional: true
-      '@tanstack/react-router':
-        optional: true
-      '@types/react':
-        optional: true
-      algoliasearch:
-        optional: true
-      lucide-react:
-        optional: true
-      next:
-        optional: true
-      react:
-        optional: true
-      react-dom:
-        optional: true
-      react-router:
-        optional: true
-      waku:
-        optional: true
-    dependencies:
-      '@formatjs/intl-localematcher': 0.6.2
-      '@orama/orama': 3.1.18
-      '@shikijs/rehype': 3.22.0
-      '@shikijs/transformers': 3.22.0
-      '@types/react': 19.2.14
-      estree-util-value-to-estree: 3.5.0
-      github-slugger: 2.0.0
-      hast-util-to-estree: 3.1.3
-      hast-util-to-jsx-runtime: 2.3.6
-      image-size: 2.0.2
-      negotiator: 1.0.0
-      next: 16.1.6(react-dom@19.2.4)(react@19.2.4)
-      npm-to-yarn: 3.0.1
-      path-to-regexp: 8.3.0
-      react: 19.2.4
-      react-dom: 19.2.4(react@19.2.4)
-      remark: 15.0.1
-      remark-gfm: 4.0.1
-      remark-rehype: 11.1.2
-      scroll-into-view-if-needed: 3.1.0
-      shiki: 3.22.0
-      unist-util-visit: 5.1.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: false
-
-  /fumadocs-mdx@14.0.3(fumadocs-core@16.1.0)(next@16.1.6)(react@19.2.4)(vite@7.3.1):
-    resolution: {integrity: sha512-GnRnnkb9QUiur9fbHF5aPsD+IkxLwxJLNC/C1L9W+Ii/o8RseRVIWUJpEZNlG62KPtwsbwkr/0mQ4ToHUzCRng==}
-    hasBin: true
-    peerDependencies:
-      '@fumadocs/mdx-remote': ^1.4.0
-      fumadocs-core: ^15.0.0 || ^16.0.0
-      next: ^15.3.0 || ^16.0.0
-      react: '*'
-      vite: 6.x.x || 7.x.x
-    peerDependenciesMeta:
-      '@fumadocs/mdx-remote':
-        optional: true
-      next:
-        optional: true
-      react:
-        optional: true
-      vite:
-        optional: true
-    dependencies:
-      '@mdx-js/mdx': 3.1.1
-      '@standard-schema/spec': 1.1.0
-      chokidar: 4.0.3
-      esbuild: 0.27.3
-      estree-util-value-to-estree: 3.5.0
-      fumadocs-core: 16.1.0(@types/react@19.2.14)(next@16.1.6)(react-dom@19.2.4)(react@19.2.4)
-      js-yaml: 4.1.1
-      lru-cache: 11.2.6
-      mdast-util-to-markdown: 2.1.2
-      next: 16.1.6(react-dom@19.2.4)(react@19.2.4)
-      picocolors: 1.1.1
-      picomatch: 4.0.3
-      react: 19.2.4
-      remark-mdx: 3.1.1
-      tinyexec: 1.0.2
-      tinyglobby: 0.2.15
-      unified: 11.0.5
-      unist-util-remove-position: 5.0.0
-      unist-util-visit: 5.1.0
-      vfile: 6.0.3
-      vite: 7.3.1(@types/node@24.10.13)
-      zod: 4.3.6
-    transitivePeerDependencies:
-      - supports-color
-    dev: false
-
-  /fumadocs-ui@16.1.0(@types/react-dom@19.2.3)(@types/react@19.2.14)(next@16.1.6)(react-dom@19.2.4)(react@19.2.4)(tailwindcss@4.1.18):
-    resolution: {integrity: sha512-Yty9tINshfQQYHE/K+nH7+7VHTNtWL0hgNvwI7lLd6xcJrbFUgzJQUeS0oGxZx+7rgqGYvNqlByKLRQHqPR9dw==}
-    peerDependencies:
-      '@types/react': '*'
-      next: 16.x.x
-      react: ^19.2.0
-      react-dom: ^19.2.0
-      tailwindcss: ^4.0.0
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      next:
-        optional: true
-      tailwindcss:
-        optional: true
-    dependencies:
-      '@radix-ui/react-accordion': 1.2.12(@types/react-dom@19.2.3)(@types/react@19.2.14)(react-dom@19.2.4)(react@19.2.4)
-      '@radix-ui/react-collapsible': 1.1.12(@types/react-dom@19.2.3)(@types/react@19.2.14)(react-dom@19.2.4)(react@19.2.4)
-      '@radix-ui/react-dialog': 1.1.15(@types/react-dom@19.2.3)(@types/react@19.2.14)(react-dom@19.2.4)(react@19.2.4)
-      '@radix-ui/react-direction': 1.1.1(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-navigation-menu': 1.2.14(@types/react-dom@19.2.3)(@types/react@19.2.14)(react-dom@19.2.4)(react@19.2.4)
-      '@radix-ui/react-popover': 1.1.15(@types/react-dom@19.2.3)(@types/react@19.2.14)(react-dom@19.2.4)(react@19.2.4)
-      '@radix-ui/react-presence': 1.1.5(@types/react-dom@19.2.3)(@types/react@19.2.14)(react-dom@19.2.4)(react@19.2.4)
-      '@radix-ui/react-scroll-area': 1.2.10(@types/react-dom@19.2.3)(@types/react@19.2.14)(react-dom@19.2.4)(react@19.2.4)
-      '@radix-ui/react-slot': 1.2.4(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-tabs': 1.1.13(@types/react-dom@19.2.3)(@types/react@19.2.14)(react-dom@19.2.4)(react@19.2.4)
-      '@types/react': 19.2.14
-      class-variance-authority: 0.7.1
-      fumadocs-core: 16.1.0(@types/react@19.2.14)(next@16.1.6)(react-dom@19.2.4)(react@19.2.4)
-      lodash.merge: 4.6.2
-      next: 16.1.6(react-dom@19.2.4)(react@19.2.4)
-      next-themes: 0.4.6(react-dom@19.2.4)(react@19.2.4)
-      postcss-selector-parser: 7.1.1
-      react: 19.2.4
-      react-dom: 19.2.4(react@19.2.4)
-      react-medium-image-zoom: 5.4.0(react-dom@19.2.4)(react@19.2.4)
-      scroll-into-view-if-needed: 3.1.0
-      tailwind-merge: 3.4.0
-      tailwindcss: 4.1.18
-    transitivePeerDependencies:
-      - '@mixedbread/sdk'
-      - '@orama/core'
-      - '@tanstack/react-router'
-      - '@types/react-dom'
-      - algoliasearch
-      - lucide-react
-      - react-router
-      - supports-color
-      - waku
-    dev: false
-
-  /get-nonce@1.0.1:
-    resolution: {integrity: sha512-FJhYRoDaiatfEkUK8HKlicmu/3SGFD51q3itKDGoSTysQJBnfOcxU5GxnhE1E6soB76MbT0MBtnKJuXyAx+96Q==}
-    engines: {node: '>=6'}
-    dev: false
-
-  /github-slugger@2.0.0:
-    resolution: {integrity: sha512-IaOQ9puYtjrkq7Y0Ygl9KDZnrf/aiUJYUpVf89y8kyaxbRG7Y1SrX/jaumrv81vc61+kiMempujsM3Yw7w5qcw==}
-    dev: false
-
-  /graceful-fs@4.2.11:
-    resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==}
-    dev: true
-
-  /hast-util-to-estree@3.1.3:
-    resolution: {integrity: sha512-48+B/rJWAp0jamNbAAf9M7Uf//UVqAoMmgXhBdxTDJLGKY+LRnZ99qcG+Qjl5HfMpYNzS5v4EAwVEF34LeAj7w==}
-    dependencies:
-      '@types/estree': 1.0.8
-      '@types/estree-jsx': 1.0.5
-      '@types/hast': 3.0.4
-      comma-separated-tokens: 2.0.3
-      devlop: 1.1.0
-      estree-util-attach-comments: 3.0.0
-      estree-util-is-identifier-name: 3.0.0
-      hast-util-whitespace: 3.0.0
-      mdast-util-mdx-expression: 2.0.1
-      mdast-util-mdx-jsx: 3.2.0
-      mdast-util-mdxjs-esm: 2.0.1
-      property-information: 7.1.0
-      space-separated-tokens: 2.0.2
-      style-to-js: 1.1.21
-      unist-util-position: 5.0.0
-      zwitch: 2.0.4
-    transitivePeerDependencies:
-      - supports-color
-    dev: false
-
-  /hast-util-to-html@9.0.5:
-    resolution: {integrity: sha512-OguPdidb+fbHQSU4Q4ZiLKnzWo8Wwsf5bZfbvu7//a9oTYoqD/fWpe96NuHkoS9h0ccGOTe0C4NGXdtS0iObOw==}
-    dependencies:
-      '@types/hast': 3.0.4
-      '@types/unist': 3.0.3
-      ccount: 2.0.1
-      comma-separated-tokens: 2.0.3
-      hast-util-whitespace: 3.0.0
-      html-void-elements: 3.0.0
-      mdast-util-to-hast: 13.2.1
-      property-information: 7.1.0
-      space-separated-tokens: 2.0.2
-      stringify-entities: 4.0.4
-      zwitch: 2.0.4
-    dev: false
-
-  /hast-util-to-jsx-runtime@2.3.6:
-    resolution: {integrity: sha512-zl6s8LwNyo1P9uw+XJGvZtdFF1GdAkOg8ujOw+4Pyb76874fLps4ueHXDhXWdk6YHQ6OgUtinliG7RsYvCbbBg==}
-    dependencies:
-      '@types/estree': 1.0.8
-      '@types/hast': 3.0.4
-      '@types/unist': 3.0.3
-      comma-separated-tokens: 2.0.3
-      devlop: 1.1.0
-      estree-util-is-identifier-name: 3.0.0
-      hast-util-whitespace: 3.0.0
-      mdast-util-mdx-expression: 2.0.1
-      mdast-util-mdx-jsx: 3.2.0
-      mdast-util-mdxjs-esm: 2.0.1
-      property-information: 7.1.0
-      space-separated-tokens: 2.0.2
-      style-to-js: 1.1.21
-      unist-util-position: 5.0.0
-      vfile-message: 4.0.3
-    transitivePeerDependencies:
-      - supports-color
-    dev: false
-
-  /hast-util-to-string@3.0.1:
-    resolution: {integrity: sha512-XelQVTDWvqcl3axRfI0xSeoVKzyIFPwsAGSLIsKdJKQMXDYJS4WYrBNF/8J7RdhIcFI2BOHgAifggsvsxp/3+A==}
-    dependencies:
-      '@types/hast': 3.0.4
-    dev: false
-
-  /hast-util-whitespace@3.0.0:
-    resolution: {integrity: sha512-88JUN06ipLwsnv+dVn+OIYOvAuvBMy/Qoi6O7mQHxdPXpjy+Cd6xRkWwux7DKO+4sYILtLBRIKgsdpS2gQc7qw==}
-    dependencies:
-      '@types/hast': 3.0.4
-    dev: false
-
-  /html-void-elements@3.0.0:
-    resolution: {integrity: sha512-bEqo66MRXsUGxWHV5IP0PUiAWwoEjba4VCzg0LjFJBpchPaTfyfCKTG6bc5F8ucKec3q5y6qOdGyYTSBEvhCrg==}
-    dev: false
-
-  /image-size@2.0.2:
-    resolution: {integrity: sha512-IRqXKlaXwgSMAMtpNzZa1ZAe8m+Sa1770Dhk8VkSsP9LS+iHD62Zd8FQKs8fbPiagBE7BzoFX23cxFnwshpV6w==}
-    engines: {node: '>=16.x'}
-    hasBin: true
-    dev: false
-
-  /inline-style-parser@0.2.7:
-    resolution: {integrity: sha512-Nb2ctOyNR8DqQoR0OwRG95uNWIC0C1lCgf5Naz5H6Ji72KZ8OcFZLz2P5sNgwlyoJ8Yif11oMuYs5pBQa86csA==}
-    dev: false
-
-  /is-alphabetical@2.0.1:
-    resolution: {integrity: sha512-FWyyY60MeTNyeSRpkM2Iry0G9hpr7/9kD40mD/cGQEuilcZYS4okz8SN2Q6rLCJ8gbCt6fN+rC+6tMGS99LaxQ==}
-    dev: false
-
-  /is-alphanumerical@2.0.1:
-    resolution: {integrity: sha512-hmbYhX/9MUMF5uh7tOXyK/n0ZvWpad5caBA17GsC6vyuCqaWliRG5K1qS9inmUhEMaOBIW7/whAnSwveW/LtZw==}
-    dependencies:
-      is-alphabetical: 2.0.1
-      is-decimal: 2.0.1
-    dev: false
-
-  /is-decimal@2.0.1:
-    resolution: {integrity: sha512-AAB9hiomQs5DXWcRB1rqsxGUstbRroFOPPVAomNk/3XHR5JyEZChOyTWe2oayKnsSsr/kcGqF+z6yuH6HHpN0A==}
-    dev: false
-
-  /is-hexadecimal@2.0.1:
-    resolution: {integrity: sha512-DgZQp241c8oO6cA1SbTEWiXeoxV42vlcJxgH+B3hi1AiqqKruZR3ZGF8In3fj4+/y/7rHvlOZLZtgJ/4ttYGZg==}
-    dev: false
-
-  /is-plain-obj@4.1.0:
-    resolution: {integrity: sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg==}
-    engines: {node: '>=12'}
-    dev: false
-
-  /jiti@2.6.1:
-    resolution: {integrity: sha512-ekilCSN1jwRvIbgeg/57YFh8qQDNbwDb9xT/qu2DAHbFFZUicIl4ygVaAvzveMhMVr3LnpSKTNnwt8PoOfmKhQ==}
-    hasBin: true
-    dev: true
-
-  /js-yaml@4.1.1:
-    resolution: {integrity: sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==}
-    hasBin: true
-    dependencies:
-      argparse: 2.0.1
-    dev: false
-
-  /lightningcss-android-arm64@1.30.2:
-    resolution: {integrity: sha512-BH9sEdOCahSgmkVhBLeU7Hc9DWeZ1Eb6wNS6Da8igvUwAe0sqROHddIlvU06q3WyXVEOYDZ6ykBZQnjTbmo4+A==}
-    engines: {node: '>= 12.0.0'}
-    cpu: [arm64]
-    os: [android]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /lightningcss-darwin-arm64@1.30.2:
-    resolution: {integrity: sha512-ylTcDJBN3Hp21TdhRT5zBOIi73P6/W0qwvlFEk22fkdXchtNTOU4Qc37SkzV+EKYxLouZ6M4LG9NfZ1qkhhBWA==}
-    engines: {node: '>= 12.0.0'}
-    cpu: [arm64]
-    os: [darwin]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /lightningcss-darwin-x64@1.30.2:
-    resolution: {integrity: sha512-oBZgKchomuDYxr7ilwLcyms6BCyLn0z8J0+ZZmfpjwg9fRVZIR5/GMXd7r9RH94iDhld3UmSjBM6nXWM2TfZTQ==}
-    engines: {node: '>= 12.0.0'}
-    cpu: [x64]
-    os: [darwin]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /lightningcss-freebsd-x64@1.30.2:
-    resolution: {integrity: sha512-c2bH6xTrf4BDpK8MoGG4Bd6zAMZDAXS569UxCAGcA7IKbHNMlhGQ89eRmvpIUGfKWNVdbhSbkQaWhEoMGmGslA==}
-    engines: {node: '>= 12.0.0'}
-    cpu: [x64]
-    os: [freebsd]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /lightningcss-linux-arm-gnueabihf@1.30.2:
-    resolution: {integrity: sha512-eVdpxh4wYcm0PofJIZVuYuLiqBIakQ9uFZmipf6LF/HRj5Bgm0eb3qL/mr1smyXIS1twwOxNWndd8z0E374hiA==}
-    engines: {node: '>= 12.0.0'}
-    cpu: [arm]
-    os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /lightningcss-linux-arm64-gnu@1.30.2:
-    resolution: {integrity: sha512-UK65WJAbwIJbiBFXpxrbTNArtfuznvxAJw4Q2ZGlU8kPeDIWEX1dg3rn2veBVUylA2Ezg89ktszWbaQnxD/e3A==}
-    engines: {node: '>= 12.0.0'}
-    cpu: [arm64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /lightningcss-linux-arm64-musl@1.30.2:
-    resolution: {integrity: sha512-5Vh9dGeblpTxWHpOx8iauV02popZDsCYMPIgiuw97OJ5uaDsL86cnqSFs5LZkG3ghHoX5isLgWzMs+eD1YzrnA==}
-    engines: {node: '>= 12.0.0'}
-    cpu: [arm64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /lightningcss-linux-x64-gnu@1.30.2:
-    resolution: {integrity: sha512-Cfd46gdmj1vQ+lR6VRTTadNHu6ALuw2pKR9lYq4FnhvgBc4zWY1EtZcAc6EffShbb1MFrIPfLDXD6Xprbnni4w==}
-    engines: {node: '>= 12.0.0'}
-    cpu: [x64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /lightningcss-linux-x64-musl@1.30.2:
-    resolution: {integrity: sha512-XJaLUUFXb6/QG2lGIW6aIk6jKdtjtcffUT0NKvIqhSBY3hh9Ch+1LCeH80dR9q9LBjG3ewbDjnumefsLsP6aiA==}
-    engines: {node: '>= 12.0.0'}
-    cpu: [x64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /lightningcss-win32-arm64-msvc@1.30.2:
-    resolution: {integrity: sha512-FZn+vaj7zLv//D/192WFFVA0RgHawIcHqLX9xuWiQt7P0PtdFEVaxgF9rjM/IRYHQXNnk61/H/gb2Ei+kUQ4xQ==}
-    engines: {node: '>= 12.0.0'}
-    cpu: [arm64]
-    os: [win32]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /lightningcss-win32-x64-msvc@1.30.2:
-    resolution: {integrity: sha512-5g1yc73p+iAkid5phb4oVFMB45417DkRevRbt/El/gKXJk4jid+vPFF/AXbxn05Aky8PapwzZrdJShv5C0avjw==}
-    engines: {node: '>= 12.0.0'}
-    cpu: [x64]
-    os: [win32]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /lightningcss@1.30.2:
-    resolution: {integrity: sha512-utfs7Pr5uJyyvDETitgsaqSyjCb2qNRAtuqUeWIAKztsOYdcACf2KtARYXg2pSvhkt+9NfoaNY7fxjl6nuMjIQ==}
-    engines: {node: '>= 12.0.0'}
-    dependencies:
-      detect-libc: 2.1.2
-    optionalDependencies:
-      lightningcss-android-arm64: 1.30.2
-      lightningcss-darwin-arm64: 1.30.2
-      lightningcss-darwin-x64: 1.30.2
-      lightningcss-freebsd-x64: 1.30.2
-      lightningcss-linux-arm-gnueabihf: 1.30.2
-      lightningcss-linux-arm64-gnu: 1.30.2
-      lightningcss-linux-arm64-musl: 1.30.2
-      lightningcss-linux-x64-gnu: 1.30.2
-      lightningcss-linux-x64-musl: 1.30.2
-      lightningcss-win32-arm64-msvc: 1.30.2
-      lightningcss-win32-x64-msvc: 1.30.2
-    dev: true
-
-  /lodash.merge@4.6.2:
-    resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
-    dev: false
-
-  /longest-streak@3.1.0:
-    resolution: {integrity: sha512-9Ri+o0JYgehTaVBBDoMqIl8GXtbWg711O3srftcHhZ0dqnETqLaoIK0x17fUw9rFSlK/0NlsKe0Ahhyl5pXE2g==}
-    dev: false
-
-  /lru-cache@11.2.6:
-    resolution: {integrity: sha512-ESL2CrkS/2wTPfuend7Zhkzo2u0daGJ/A2VucJOgQ/C48S/zB8MMeMHSGKYpXhIjbPxfuezITkaBH1wqv00DDQ==}
-    engines: {node: 20 || >=22}
-    dev: false
-
-  /lucide-static@0.552.0:
-    resolution: {integrity: sha512-wL+9EAx8k/4i/w9qGuAwHrrV8SryVsJk+Ug9SErtg18Zq95FMwMXlu4Dhl4RS8C2b1oxFu66p7YK96yrNsm6cg==}
-    dev: false
-
-  /magic-string@0.30.21:
-    resolution: {integrity: sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==}
-    dependencies:
-      '@jridgewell/sourcemap-codec': 1.5.5
-    dev: true
-
-  /markdown-extensions@2.0.0:
-    resolution: {integrity: sha512-o5vL7aDWatOTX8LzaS1WMoaoxIiLRQJuIKKe2wAw6IeULDHaqbiqiggmx+pKvZDb1Sj+pE46Sn1T7lCqfFtg1Q==}
-    engines: {node: '>=16'}
-    dev: false
-
-  /markdown-table@3.0.4:
-    resolution: {integrity: sha512-wiYz4+JrLyb/DqW2hkFJxP7Vd7JuTDm77fvbM8VfEQdmSMqcImWeeRbHwZjBjIFki/VaMK2BhFi7oUUZeM5bqw==}
-    dev: false
-
-  /mdast-util-find-and-replace@3.0.2:
-    resolution: {integrity: sha512-Tmd1Vg/m3Xz43afeNxDIhWRtFZgM2VLyaf4vSTYwudTyeuTneoL3qtWMA5jeLyz/O1vDJmmV4QuScFCA2tBPwg==}
-    dependencies:
-      '@types/mdast': 4.0.4
-      escape-string-regexp: 5.0.0
-      unist-util-is: 6.0.1
-      unist-util-visit-parents: 6.0.2
-    dev: false
-
-  /mdast-util-from-markdown@2.0.2:
-    resolution: {integrity: sha512-uZhTV/8NBuw0WHkPTrCqDOl0zVe1BIng5ZtHoDk49ME1qqcjYmmLmOf0gELgcRMxN4w2iuIeVso5/6QymSrgmA==}
-    dependencies:
-      '@types/mdast': 4.0.4
-      '@types/unist': 3.0.3
-      decode-named-character-reference: 1.3.0
-      devlop: 1.1.0
-      mdast-util-to-string: 4.0.0
-      micromark: 4.0.2
-      micromark-util-decode-numeric-character-reference: 2.0.2
-      micromark-util-decode-string: 2.0.1
-      micromark-util-normalize-identifier: 2.0.1
-      micromark-util-symbol: 2.0.1
-      micromark-util-types: 2.0.2
-      unist-util-stringify-position: 4.0.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: false
-
-  /mdast-util-gfm-autolink-literal@2.0.1:
-    resolution: {integrity: sha512-5HVP2MKaP6L+G6YaxPNjuL0BPrq9orG3TsrZ9YXbA3vDw/ACI4MEsnoDpn6ZNm7GnZgtAcONJyPhOP8tNJQavQ==}
-    dependencies:
-      '@types/mdast': 4.0.4
-      ccount: 2.0.1
-      devlop: 1.1.0
-      mdast-util-find-and-replace: 3.0.2
-      micromark-util-character: 2.1.1
-    dev: false
-
-  /mdast-util-gfm-footnote@2.1.0:
-    resolution: {integrity: sha512-sqpDWlsHn7Ac9GNZQMeUzPQSMzR6Wv0WKRNvQRg0KqHh02fpTz69Qc1QSseNX29bhz1ROIyNyxExfawVKTm1GQ==}
-    dependencies:
-      '@types/mdast': 4.0.4
-      devlop: 1.1.0
-      mdast-util-from-markdown: 2.0.2
-      mdast-util-to-markdown: 2.1.2
-      micromark-util-normalize-identifier: 2.0.1
-    transitivePeerDependencies:
-      - supports-color
-    dev: false
-
-  /mdast-util-gfm-strikethrough@2.0.0:
-    resolution: {integrity: sha512-mKKb915TF+OC5ptj5bJ7WFRPdYtuHv0yTRxK2tJvi+BDqbkiG7h7u/9SI89nRAYcmap2xHQL9D+QG/6wSrTtXg==}
-    dependencies:
-      '@types/mdast': 4.0.4
-      mdast-util-from-markdown: 2.0.2
-      mdast-util-to-markdown: 2.1.2
-    transitivePeerDependencies:
-      - supports-color
-    dev: false
-
-  /mdast-util-gfm-table@2.0.0:
-    resolution: {integrity: sha512-78UEvebzz/rJIxLvE7ZtDd/vIQ0RHv+3Mh5DR96p7cS7HsBhYIICDBCu8csTNWNO6tBWfqXPWekRuj2FNOGOZg==}
-    dependencies:
-      '@types/mdast': 4.0.4
-      devlop: 1.1.0
-      markdown-table: 3.0.4
-      mdast-util-from-markdown: 2.0.2
-      mdast-util-to-markdown: 2.1.2
-    transitivePeerDependencies:
-      - supports-color
-    dev: false
-
-  /mdast-util-gfm-task-list-item@2.0.0:
-    resolution: {integrity: sha512-IrtvNvjxC1o06taBAVJznEnkiHxLFTzgonUdy8hzFVeDun0uTjxxrRGVaNFqkU1wJR3RBPEfsxmU6jDWPofrTQ==}
-    dependencies:
-      '@types/mdast': 4.0.4
-      devlop: 1.1.0
-      mdast-util-from-markdown: 2.0.2
-      mdast-util-to-markdown: 2.1.2
-    transitivePeerDependencies:
-      - supports-color
-    dev: false
-
-  /mdast-util-gfm@3.1.0:
-    resolution: {integrity: sha512-0ulfdQOM3ysHhCJ1p06l0b0VKlhU0wuQs3thxZQagjcjPrlFRqY215uZGHHJan9GEAXd9MbfPjFJz+qMkVR6zQ==}
-    dependencies:
-      mdast-util-from-markdown: 2.0.2
-      mdast-util-gfm-autolink-literal: 2.0.1
-      mdast-util-gfm-footnote: 2.1.0
-      mdast-util-gfm-strikethrough: 2.0.0
-      mdast-util-gfm-table: 2.0.0
-      mdast-util-gfm-task-list-item: 2.0.0
-      mdast-util-to-markdown: 2.1.2
-    transitivePeerDependencies:
-      - supports-color
-    dev: false
-
-  /mdast-util-mdx-expression@2.0.1:
-    resolution: {integrity: sha512-J6f+9hUp+ldTZqKRSg7Vw5V6MqjATc+3E4gf3CFNcuZNWD8XdyI6zQ8GqH7f8169MM6P7hMBRDVGnn7oHB9kXQ==}
-    dependencies:
-      '@types/estree-jsx': 1.0.5
-      '@types/hast': 3.0.4
-      '@types/mdast': 4.0.4
-      devlop: 1.1.0
-      mdast-util-from-markdown: 2.0.2
-      mdast-util-to-markdown: 2.1.2
-    transitivePeerDependencies:
-      - supports-color
-    dev: false
-
-  /mdast-util-mdx-jsx@3.2.0:
-    resolution: {integrity: sha512-lj/z8v0r6ZtsN/cGNNtemmmfoLAFZnjMbNyLzBafjzikOM+glrjNHPlf6lQDOTccj9n5b0PPihEBbhneMyGs1Q==}
-    dependencies:
-      '@types/estree-jsx': 1.0.5
-      '@types/hast': 3.0.4
-      '@types/mdast': 4.0.4
-      '@types/unist': 3.0.3
-      ccount: 2.0.1
-      devlop: 1.1.0
-      mdast-util-from-markdown: 2.0.2
-      mdast-util-to-markdown: 2.1.2
-      parse-entities: 4.0.2
-      stringify-entities: 4.0.4
-      unist-util-stringify-position: 4.0.0
-      vfile-message: 4.0.3
-    transitivePeerDependencies:
-      - supports-color
-    dev: false
-
-  /mdast-util-mdx@3.0.0:
-    resolution: {integrity: sha512-JfbYLAW7XnYTTbUsmpu0kdBUVe+yKVJZBItEjwyYJiDJuZ9w4eeaqks4HQO+R7objWgS2ymV60GYpI14Ug554w==}
-    dependencies:
-      mdast-util-from-markdown: 2.0.2
-      mdast-util-mdx-expression: 2.0.1
-      mdast-util-mdx-jsx: 3.2.0
-      mdast-util-mdxjs-esm: 2.0.1
-      mdast-util-to-markdown: 2.1.2
-    transitivePeerDependencies:
-      - supports-color
-    dev: false
-
-  /mdast-util-mdxjs-esm@2.0.1:
-    resolution: {integrity: sha512-EcmOpxsZ96CvlP03NghtH1EsLtr0n9Tm4lPUJUBccV9RwUOneqSycg19n5HGzCf+10LozMRSObtVr3ee1WoHtg==}
-    dependencies:
-      '@types/estree-jsx': 1.0.5
-      '@types/hast': 3.0.4
-      '@types/mdast': 4.0.4
-      devlop: 1.1.0
-      mdast-util-from-markdown: 2.0.2
-      mdast-util-to-markdown: 2.1.2
-    transitivePeerDependencies:
-      - supports-color
-    dev: false
-
-  /mdast-util-phrasing@4.1.0:
-    resolution: {integrity: sha512-TqICwyvJJpBwvGAMZjj4J2n0X8QWp21b9l0o7eXyVJ25YNWYbJDVIyD1bZXE6WtV6RmKJVYmQAKWa0zWOABz2w==}
-    dependencies:
-      '@types/mdast': 4.0.4
-      unist-util-is: 6.0.1
-    dev: false
-
-  /mdast-util-to-hast@13.2.1:
-    resolution: {integrity: sha512-cctsq2wp5vTsLIcaymblUriiTcZd0CwWtCbLvrOzYCDZoWyMNV8sZ7krj09FSnsiJi3WVsHLM4k6Dq/yaPyCXA==}
-    dependencies:
-      '@types/hast': 3.0.4
-      '@types/mdast': 4.0.4
-      '@ungap/structured-clone': 1.3.0
-      devlop: 1.1.0
-      micromark-util-sanitize-uri: 2.0.1
-      trim-lines: 3.0.1
-      unist-util-position: 5.0.0
-      unist-util-visit: 5.1.0
-      vfile: 6.0.3
-    dev: false
-
-  /mdast-util-to-markdown@2.1.2:
-    resolution: {integrity: sha512-xj68wMTvGXVOKonmog6LwyJKrYXZPvlwabaryTjLh9LuvovB/KAH+kvi8Gjj+7rJjsFi23nkUxRQv1KqSroMqA==}
-    dependencies:
-      '@types/mdast': 4.0.4
-      '@types/unist': 3.0.3
-      longest-streak: 3.1.0
-      mdast-util-phrasing: 4.1.0
-      mdast-util-to-string: 4.0.0
-      micromark-util-classify-character: 2.0.1
-      micromark-util-decode-string: 2.0.1
-      unist-util-visit: 5.1.0
-      zwitch: 2.0.4
-    dev: false
-
-  /mdast-util-to-string@4.0.0:
-    resolution: {integrity: sha512-0H44vDimn51F0YwvxSJSm0eCDOJTRlmN0R1yBh4HLj9wiV1Dn0QoXGbvFAWj2hSItVTlCmBF1hqKlIyUBVFLPg==}
-    dependencies:
-      '@types/mdast': 4.0.4
-    dev: false
-
-  /micromark-core-commonmark@2.0.3:
-    resolution: {integrity: sha512-RDBrHEMSxVFLg6xvnXmb1Ayr2WzLAWjeSATAoxwKYJV94TeNavgoIdA0a9ytzDSVzBy2YKFK+emCPOEibLeCrg==}
-    dependencies:
-      decode-named-character-reference: 1.3.0
-      devlop: 1.1.0
-      micromark-factory-destination: 2.0.1
-      micromark-factory-label: 2.0.1
-      micromark-factory-space: 2.0.1
-      micromark-factory-title: 2.0.1
-      micromark-factory-whitespace: 2.0.1
-      micromark-util-character: 2.1.1
-      micromark-util-chunked: 2.0.1
-      micromark-util-classify-character: 2.0.1
-      micromark-util-html-tag-name: 2.0.1
-      micromark-util-normalize-identifier: 2.0.1
-      micromark-util-resolve-all: 2.0.1
-      micromark-util-subtokenize: 2.1.0
-      micromark-util-symbol: 2.0.1
-      micromark-util-types: 2.0.2
-    dev: false
-
-  /micromark-extension-gfm-autolink-literal@2.1.0:
-    resolution: {integrity: sha512-oOg7knzhicgQ3t4QCjCWgTmfNhvQbDDnJeVu9v81r7NltNCVmhPy1fJRX27pISafdjL+SVc4d3l48Gb6pbRypw==}
-    dependencies:
-      micromark-util-character: 2.1.1
-      micromark-util-sanitize-uri: 2.0.1
-      micromark-util-symbol: 2.0.1
-      micromark-util-types: 2.0.2
-    dev: false
-
-  /micromark-extension-gfm-footnote@2.1.0:
-    resolution: {integrity: sha512-/yPhxI1ntnDNsiHtzLKYnE3vf9JZ6cAisqVDauhp4CEHxlb4uoOTxOCJ+9s51bIB8U1N1FJ1RXOKTIlD5B/gqw==}
-    dependencies:
-      devlop: 1.1.0
-      micromark-core-commonmark: 2.0.3
-      micromark-factory-space: 2.0.1
-      micromark-util-character: 2.1.1
-      micromark-util-normalize-identifier: 2.0.1
-      micromark-util-sanitize-uri: 2.0.1
-      micromark-util-symbol: 2.0.1
-      micromark-util-types: 2.0.2
-    dev: false
-
-  /micromark-extension-gfm-strikethrough@2.1.0:
-    resolution: {integrity: sha512-ADVjpOOkjz1hhkZLlBiYA9cR2Anf8F4HqZUO6e5eDcPQd0Txw5fxLzzxnEkSkfnD0wziSGiv7sYhk/ktvbf1uw==}
-    dependencies:
-      devlop: 1.1.0
-      micromark-util-chunked: 2.0.1
-      micromark-util-classify-character: 2.0.1
-      micromark-util-resolve-all: 2.0.1
-      micromark-util-symbol: 2.0.1
-      micromark-util-types: 2.0.2
-    dev: false
-
-  /micromark-extension-gfm-table@2.1.1:
-    resolution: {integrity: sha512-t2OU/dXXioARrC6yWfJ4hqB7rct14e8f7m0cbI5hUmDyyIlwv5vEtooptH8INkbLzOatzKuVbQmAYcbWoyz6Dg==}
-    dependencies:
-      devlop: 1.1.0
-      micromark-factory-space: 2.0.1
-      micromark-util-character: 2.1.1
-      micromark-util-symbol: 2.0.1
-      micromark-util-types: 2.0.2
-    dev: false
-
-  /micromark-extension-gfm-tagfilter@2.0.0:
-    resolution: {integrity: sha512-xHlTOmuCSotIA8TW1mDIM6X2O1SiX5P9IuDtqGonFhEK0qgRI4yeC6vMxEV2dgyr2TiD+2PQ10o+cOhdVAcwfg==}
-    dependencies:
-      micromark-util-types: 2.0.2
-    dev: false
-
-  /micromark-extension-gfm-task-list-item@2.1.0:
-    resolution: {integrity: sha512-qIBZhqxqI6fjLDYFTBIa4eivDMnP+OZqsNwmQ3xNLE4Cxwc+zfQEfbs6tzAo2Hjq+bh6q5F+Z8/cksrLFYWQQw==}
-    dependencies:
-      devlop: 1.1.0
-      micromark-factory-space: 2.0.1
-      micromark-util-character: 2.1.1
-      micromark-util-symbol: 2.0.1
-      micromark-util-types: 2.0.2
-    dev: false
-
-  /micromark-extension-gfm@3.0.0:
-    resolution: {integrity: sha512-vsKArQsicm7t0z2GugkCKtZehqUm31oeGBV/KVSorWSy8ZlNAv7ytjFhvaryUiCUJYqs+NoE6AFhpQvBTM6Q4w==}
-    dependencies:
-      micromark-extension-gfm-autolink-literal: 2.1.0
-      micromark-extension-gfm-footnote: 2.1.0
-      micromark-extension-gfm-strikethrough: 2.1.0
-      micromark-extension-gfm-table: 2.1.1
-      micromark-extension-gfm-tagfilter: 2.0.0
-      micromark-extension-gfm-task-list-item: 2.1.0
-      micromark-util-combine-extensions: 2.0.1
-      micromark-util-types: 2.0.2
-    dev: false
-
-  /micromark-extension-mdx-expression@3.0.1:
-    resolution: {integrity: sha512-dD/ADLJ1AeMvSAKBwO22zG22N4ybhe7kFIZ3LsDI0GlsNr2A3KYxb0LdC1u5rj4Nw+CHKY0RVdnHX8vj8ejm4Q==}
-    dependencies:
-      '@types/estree': 1.0.8
-      devlop: 1.1.0
-      micromark-factory-mdx-expression: 2.0.3
-      micromark-factory-space: 2.0.1
-      micromark-util-character: 2.1.1
-      micromark-util-events-to-acorn: 2.0.3
-      micromark-util-symbol: 2.0.1
-      micromark-util-types: 2.0.2
-    dev: false
-
-  /micromark-extension-mdx-jsx@3.0.2:
-    resolution: {integrity: sha512-e5+q1DjMh62LZAJOnDraSSbDMvGJ8x3cbjygy2qFEi7HCeUT4BDKCvMozPozcD6WmOt6sVvYDNBKhFSz3kjOVQ==}
-    dependencies:
-      '@types/estree': 1.0.8
-      devlop: 1.1.0
-      estree-util-is-identifier-name: 3.0.0
-      micromark-factory-mdx-expression: 2.0.3
-      micromark-factory-space: 2.0.1
-      micromark-util-character: 2.1.1
-      micromark-util-events-to-acorn: 2.0.3
-      micromark-util-symbol: 2.0.1
-      micromark-util-types: 2.0.2
-      vfile-message: 4.0.3
-    dev: false
-
-  /micromark-extension-mdx-md@2.0.0:
-    resolution: {integrity: sha512-EpAiszsB3blw4Rpba7xTOUptcFeBFi+6PY8VnJ2hhimH+vCQDirWgsMpz7w1XcZE7LVrSAUGb9VJpG9ghlYvYQ==}
-    dependencies:
-      micromark-util-types: 2.0.2
-    dev: false
-
-  /micromark-extension-mdxjs-esm@3.0.0:
-    resolution: {integrity: sha512-DJFl4ZqkErRpq/dAPyeWp15tGrcrrJho1hKK5uBS70BCtfrIFg81sqcTVu3Ta+KD1Tk5vAtBNElWxtAa+m8K9A==}
-    dependencies:
-      '@types/estree': 1.0.8
-      devlop: 1.1.0
-      micromark-core-commonmark: 2.0.3
-      micromark-util-character: 2.1.1
-      micromark-util-events-to-acorn: 2.0.3
-      micromark-util-symbol: 2.0.1
-      micromark-util-types: 2.0.2
-      unist-util-position-from-estree: 2.0.0
-      vfile-message: 4.0.3
-    dev: false
-
-  /micromark-extension-mdxjs@3.0.0:
-    resolution: {integrity: sha512-A873fJfhnJ2siZyUrJ31l34Uqwy4xIFmvPY1oj+Ean5PHcPBYzEsvqvWGaWcfEIr11O5Dlw3p2y0tZWpKHDejQ==}
-    dependencies:
-      acorn: 8.15.0
-      acorn-jsx: 5.3.2(acorn@8.15.0)
-      micromark-extension-mdx-expression: 3.0.1
-      micromark-extension-mdx-jsx: 3.0.2
-      micromark-extension-mdx-md: 2.0.0
-      micromark-extension-mdxjs-esm: 3.0.0
-      micromark-util-combine-extensions: 2.0.1
-      micromark-util-types: 2.0.2
-    dev: false
-
-  /micromark-factory-destination@2.0.1:
-    resolution: {integrity: sha512-Xe6rDdJlkmbFRExpTOmRj9N3MaWmbAgdpSrBQvCFqhezUn4AHqJHbaEnfbVYYiexVSs//tqOdY/DxhjdCiJnIA==}
-    dependencies:
-      micromark-util-character: 2.1.1
-      micromark-util-symbol: 2.0.1
-      micromark-util-types: 2.0.2
-    dev: false
-
-  /micromark-factory-label@2.0.1:
-    resolution: {integrity: sha512-VFMekyQExqIW7xIChcXn4ok29YE3rnuyveW3wZQWWqF4Nv9Wk5rgJ99KzPvHjkmPXF93FXIbBp6YdW3t71/7Vg==}
-    dependencies:
-      devlop: 1.1.0
-      micromark-util-character: 2.1.1
-      micromark-util-symbol: 2.0.1
-      micromark-util-types: 2.0.2
-    dev: false
-
-  /micromark-factory-mdx-expression@2.0.3:
-    resolution: {integrity: sha512-kQnEtA3vzucU2BkrIa8/VaSAsP+EJ3CKOvhMuJgOEGg9KDC6OAY6nSnNDVRiVNRqj7Y4SlSzcStaH/5jge8JdQ==}
-    dependencies:
-      '@types/estree': 1.0.8
-      devlop: 1.1.0
-      micromark-factory-space: 2.0.1
-      micromark-util-character: 2.1.1
-      micromark-util-events-to-acorn: 2.0.3
-      micromark-util-symbol: 2.0.1
-      micromark-util-types: 2.0.2
-      unist-util-position-from-estree: 2.0.0
-      vfile-message: 4.0.3
-    dev: false
-
-  /micromark-factory-space@2.0.1:
-    resolution: {integrity: sha512-zRkxjtBxxLd2Sc0d+fbnEunsTj46SWXgXciZmHq0kDYGnck/ZSGj9/wULTV95uoeYiK5hRXP2mJ98Uo4cq/LQg==}
-    dependencies:
-      micromark-util-character: 2.1.1
-      micromark-util-types: 2.0.2
-    dev: false
-
-  /micromark-factory-title@2.0.1:
-    resolution: {integrity: sha512-5bZ+3CjhAd9eChYTHsjy6TGxpOFSKgKKJPJxr293jTbfry2KDoWkhBb6TcPVB4NmzaPhMs1Frm9AZH7OD4Cjzw==}
-    dependencies:
-      micromark-factory-space: 2.0.1
-      micromark-util-character: 2.1.1
-      micromark-util-symbol: 2.0.1
-      micromark-util-types: 2.0.2
-    dev: false
-
-  /micromark-factory-whitespace@2.0.1:
-    resolution: {integrity: sha512-Ob0nuZ3PKt/n0hORHyvoD9uZhr+Za8sFoP+OnMcnWK5lngSzALgQYKMr9RJVOWLqQYuyn6ulqGWSXdwf6F80lQ==}
-    dependencies:
-      micromark-factory-space: 2.0.1
-      micromark-util-character: 2.1.1
-      micromark-util-symbol: 2.0.1
-      micromark-util-types: 2.0.2
-    dev: false
-
-  /micromark-util-character@2.1.1:
-    resolution: {integrity: sha512-wv8tdUTJ3thSFFFJKtpYKOYiGP2+v96Hvk4Tu8KpCAsTMs6yi+nVmGh1syvSCsaxz45J6Jbw+9DD6g97+NV67Q==}
-    dependencies:
-      micromark-util-symbol: 2.0.1
-      micromark-util-types: 2.0.2
-    dev: false
-
-  /micromark-util-chunked@2.0.1:
-    resolution: {integrity: sha512-QUNFEOPELfmvv+4xiNg2sRYeS/P84pTW0TCgP5zc9FpXetHY0ab7SxKyAQCNCc1eK0459uoLI1y5oO5Vc1dbhA==}
-    dependencies:
-      micromark-util-symbol: 2.0.1
-    dev: false
-
-  /micromark-util-classify-character@2.0.1:
-    resolution: {integrity: sha512-K0kHzM6afW/MbeWYWLjoHQv1sgg2Q9EccHEDzSkxiP/EaagNzCm7T/WMKZ3rjMbvIpvBiZgwR3dKMygtA4mG1Q==}
-    dependencies:
-      micromark-util-character: 2.1.1
-      micromark-util-symbol: 2.0.1
-      micromark-util-types: 2.0.2
-    dev: false
-
-  /micromark-util-combine-extensions@2.0.1:
-    resolution: {integrity: sha512-OnAnH8Ujmy59JcyZw8JSbK9cGpdVY44NKgSM7E9Eh7DiLS2E9RNQf0dONaGDzEG9yjEl5hcqeIsj4hfRkLH/Bg==}
-    dependencies:
-      micromark-util-chunked: 2.0.1
-      micromark-util-types: 2.0.2
-    dev: false
-
-  /micromark-util-decode-numeric-character-reference@2.0.2:
-    resolution: {integrity: sha512-ccUbYk6CwVdkmCQMyr64dXz42EfHGkPQlBj5p7YVGzq8I7CtjXZJrubAYezf7Rp+bjPseiROqe7G6foFd+lEuw==}
-    dependencies:
-      micromark-util-symbol: 2.0.1
-    dev: false
-
-  /micromark-util-decode-string@2.0.1:
-    resolution: {integrity: sha512-nDV/77Fj6eH1ynwscYTOsbK7rR//Uj0bZXBwJZRfaLEJ1iGBR6kIfNmlNqaqJf649EP0F3NWNdeJi03elllNUQ==}
-    dependencies:
-      decode-named-character-reference: 1.3.0
-      micromark-util-character: 2.1.1
-      micromark-util-decode-numeric-character-reference: 2.0.2
-      micromark-util-symbol: 2.0.1
-    dev: false
-
-  /micromark-util-encode@2.0.1:
-    resolution: {integrity: sha512-c3cVx2y4KqUnwopcO9b/SCdo2O67LwJJ/UyqGfbigahfegL9myoEFoDYZgkT7f36T0bLrM9hZTAaAyH+PCAXjw==}
-    dev: false
-
-  /micromark-util-events-to-acorn@2.0.3:
-    resolution: {integrity: sha512-jmsiEIiZ1n7X1Rr5k8wVExBQCg5jy4UXVADItHmNk1zkwEVhBuIUKRu3fqv+hs4nxLISi2DQGlqIOGiFxgbfHg==}
-    dependencies:
-      '@types/estree': 1.0.8
-      '@types/unist': 3.0.3
-      devlop: 1.1.0
-      estree-util-visit: 2.0.0
-      micromark-util-symbol: 2.0.1
-      micromark-util-types: 2.0.2
-      vfile-message: 4.0.3
-    dev: false
-
-  /micromark-util-html-tag-name@2.0.1:
-    resolution: {integrity: sha512-2cNEiYDhCWKI+Gs9T0Tiysk136SnR13hhO8yW6BGNyhOC4qYFnwF1nKfD3HFAIXA5c45RrIG1ub11GiXeYd1xA==}
-    dev: false
-
-  /micromark-util-normalize-identifier@2.0.1:
-    resolution: {integrity: sha512-sxPqmo70LyARJs0w2UclACPUUEqltCkJ6PhKdMIDuJ3gSf/Q+/GIe3WKl0Ijb/GyH9lOpUkRAO2wp0GVkLvS9Q==}
-    dependencies:
-      micromark-util-symbol: 2.0.1
-    dev: false
-
-  /micromark-util-resolve-all@2.0.1:
-    resolution: {integrity: sha512-VdQyxFWFT2/FGJgwQnJYbe1jjQoNTS4RjglmSjTUlpUMa95Htx9NHeYW4rGDJzbjvCsl9eLjMQwGeElsqmzcHg==}
-    dependencies:
-      micromark-util-types: 2.0.2
-    dev: false
-
-  /micromark-util-sanitize-uri@2.0.1:
-    resolution: {integrity: sha512-9N9IomZ/YuGGZZmQec1MbgxtlgougxTodVwDzzEouPKo3qFWvymFHWcnDi2vzV1ff6kas9ucW+o3yzJK9YB1AQ==}
-    dependencies:
-      micromark-util-character: 2.1.1
-      micromark-util-encode: 2.0.1
-      micromark-util-symbol: 2.0.1
-    dev: false
-
-  /micromark-util-subtokenize@2.1.0:
-    resolution: {integrity: sha512-XQLu552iSctvnEcgXw6+Sx75GflAPNED1qx7eBJ+wydBb2KCbRZe+NwvIEEMM83uml1+2WSXpBAcp9IUCgCYWA==}
-    dependencies:
-      devlop: 1.1.0
-      micromark-util-chunked: 2.0.1
-      micromark-util-symbol: 2.0.1
-      micromark-util-types: 2.0.2
-    dev: false
-
-  /micromark-util-symbol@2.0.1:
-    resolution: {integrity: sha512-vs5t8Apaud9N28kgCrRUdEed4UJ+wWNvicHLPxCa9ENlYuAY31M0ETy5y1vA33YoNPDFTghEbnh6efaE8h4x0Q==}
-    dev: false
-
-  /micromark-util-types@2.0.2:
-    resolution: {integrity: sha512-Yw0ECSpJoViF1qTU4DC6NwtC4aWGt1EkzaQB8KPPyCRR8z9TWeV0HbEFGTO+ZY1wB22zmxnJqhPyTpOVCpeHTA==}
-    dev: false
-
-  /micromark@4.0.2:
-    resolution: {integrity: sha512-zpe98Q6kvavpCr1NPVSCMebCKfD7CA2NqZ+rykeNhONIJBpc1tFKt9hucLGwha3jNTNI8lHpctWJWoimVF4PfA==}
-    dependencies:
-      '@types/debug': 4.1.12
-      debug: 4.4.3
-      decode-named-character-reference: 1.3.0
-      devlop: 1.1.0
-      micromark-core-commonmark: 2.0.3
-      micromark-factory-space: 2.0.1
-      micromark-util-character: 2.1.1
-      micromark-util-chunked: 2.0.1
-      micromark-util-combine-extensions: 2.0.1
-      micromark-util-decode-numeric-character-reference: 2.0.2
-      micromark-util-encode: 2.0.1
-      micromark-util-normalize-identifier: 2.0.1
-      micromark-util-resolve-all: 2.0.1
-      micromark-util-sanitize-uri: 2.0.1
-      micromark-util-subtokenize: 2.1.0
-      micromark-util-symbol: 2.0.1
-      micromark-util-types: 2.0.2
-    transitivePeerDependencies:
-      - supports-color
-    dev: false
-
-  /ms@2.1.3:
-    resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==}
-    dev: false
-
-  /nanoid@3.3.11:
-    resolution: {integrity: sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==}
-    engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
-    hasBin: true
-
-  /negotiator@1.0.0:
-    resolution: {integrity: sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg==}
-    engines: {node: '>= 0.6'}
-    dev: false
-
-  /next-themes@0.4.6(react-dom@19.2.4)(react@19.2.4):
-    resolution: {integrity: sha512-pZvgD5L0IEvX5/9GWyHMf3m8BKiVQwsCMHfoFosXtXBMnaS0ZnIJ9ST4b4NqLVKDEm8QBxoNNGNaBv2JNF6XNA==}
-    peerDependencies:
-      react: ^16.8 || ^17 || ^18 || ^19 || ^19.0.0-rc
-      react-dom: ^16.8 || ^17 || ^18 || ^19 || ^19.0.0-rc
-    dependencies:
-      react: 19.2.4
-      react-dom: 19.2.4(react@19.2.4)
-    dev: false
-
-  /next@16.1.6(react-dom@19.2.4)(react@19.2.4):
-    resolution: {integrity: sha512-hkyRkcu5x/41KoqnROkfTm2pZVbKxvbZRuNvKXLRXxs3VfyO0WhY50TQS40EuKO9SW3rBj/sF3WbVwDACeMZyw==}
-    engines: {node: '>=20.9.0'}
-    hasBin: true
-    peerDependencies:
-      '@opentelemetry/api': ^1.1.0
-      '@playwright/test': ^1.51.1
-      babel-plugin-react-compiler: '*'
-      react: ^18.2.0 || 19.0.0-rc-de68d2f4-20241204 || ^19.0.0
-      react-dom: ^18.2.0 || 19.0.0-rc-de68d2f4-20241204 || ^19.0.0
-      sass: ^1.3.0
-    peerDependenciesMeta:
-      '@opentelemetry/api':
-        optional: true
-      '@playwright/test':
-        optional: true
-      babel-plugin-react-compiler:
-        optional: true
-      sass:
-        optional: true
-    dependencies:
-      '@next/env': 16.1.6
-      '@swc/helpers': 0.5.15
-      baseline-browser-mapping: 2.9.19
-      caniuse-lite: 1.0.30001769
-      postcss: 8.4.31
-      react: 19.2.4
-      react-dom: 19.2.4(react@19.2.4)
-      styled-jsx: 5.1.6(react@19.2.4)
-    optionalDependencies:
-      '@next/swc-darwin-arm64': 16.1.6
-      '@next/swc-darwin-x64': 16.1.6
-      '@next/swc-linux-arm64-gnu': 16.1.6
-      '@next/swc-linux-arm64-musl': 16.1.6
-      '@next/swc-linux-x64-gnu': 16.1.6
-      '@next/swc-linux-x64-musl': 16.1.6
-      '@next/swc-win32-arm64-msvc': 16.1.6
-      '@next/swc-win32-x64-msvc': 16.1.6
-      sharp: 0.34.5
-    transitivePeerDependencies:
-      - '@babel/core'
-      - babel-plugin-macros
-    dev: false
-
-  /npm-to-yarn@3.0.1:
-    resolution: {integrity: sha512-tt6PvKu4WyzPwWUzy/hvPFqn+uwXO0K1ZHka8az3NnrhWJDmSqI8ncWq0fkL0k/lmmi5tAC11FXwXuh0rFbt1A==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    dev: false
-
-  /oniguruma-parser@0.12.1:
-    resolution: {integrity: sha512-8Unqkvk1RYc6yq2WBYRj4hdnsAxVze8i7iPfQr8e4uSP3tRv0rpZcbGUDvxfQQcdwHt/e9PrMvGCsa8OqG9X3w==}
-    dev: false
-
-  /oniguruma-to-es@4.3.4:
-    resolution: {integrity: sha512-3VhUGN3w2eYxnTzHn+ikMI+fp/96KoRSVK9/kMTcFqj1NRDh2IhQCKvYxDnWePKRXY/AqH+Fuiyb7VHSzBjHfA==}
-    dependencies:
-      oniguruma-parser: 0.12.1
-      regex: 6.1.0
-      regex-recursion: 6.0.2
-    dev: false
-
-  /parse-entities@4.0.2:
-    resolution: {integrity: sha512-GG2AQYWoLgL877gQIKeRPGO1xF9+eG1ujIb5soS5gPvLQ1y2o8FL90w2QWNdf9I361Mpp7726c+lj3U0qK1uGw==}
-    dependencies:
-      '@types/unist': 2.0.11
-      character-entities-legacy: 3.0.0
-      character-reference-invalid: 2.0.1
-      decode-named-character-reference: 1.3.0
-      is-alphanumerical: 2.0.1
-      is-decimal: 2.0.1
-      is-hexadecimal: 2.0.1
-    dev: false
-
-  /path-to-regexp@8.3.0:
-    resolution: {integrity: sha512-7jdwVIRtsP8MYpdXSwOS0YdD0Du+qOoF/AEPIt88PcCFrZCzx41oxku1jD88hZBwbNUIEfpqvuhjFaMAqMTWnA==}
-    dev: false
-
-  /picocolors@1.1.1:
-    resolution: {integrity: sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==}
-
-  /picomatch@4.0.3:
-    resolution: {integrity: sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==}
-    engines: {node: '>=12'}
-
-  /postcss-selector-parser@7.1.1:
-    resolution: {integrity: sha512-orRsuYpJVw8LdAwqqLykBj9ecS5/cRHlI5+nvTo8LcCKmzDmqVORXtOIYEEQuL9D4BxtA1lm5isAqzQZCoQ6Eg==}
-    engines: {node: '>=4'}
-    dependencies:
-      cssesc: 3.0.0
-      util-deprecate: 1.0.2
-    dev: false
-
-  /postcss@8.4.31:
-    resolution: {integrity: sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==}
-    engines: {node: ^10 || ^12 || >=14}
-    dependencies:
-      nanoid: 3.3.11
-      picocolors: 1.1.1
-      source-map-js: 1.2.1
-    dev: false
-
-  /postcss@8.5.6:
-    resolution: {integrity: sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==}
-    engines: {node: ^10 || ^12 || >=14}
-    dependencies:
-      nanoid: 3.3.11
-      picocolors: 1.1.1
-      source-map-js: 1.2.1
-
-  /property-information@7.1.0:
-    resolution: {integrity: sha512-TwEZ+X+yCJmYfL7TPUOcvBZ4QfoT5YenQiJuX//0th53DE6w0xxLEtfK3iyryQFddXuvkIk51EEgrJQ0WJkOmQ==}
-    dev: false
-
-  /react-dom@19.2.4(react@19.2.4):
-    resolution: {integrity: sha512-AXJdLo8kgMbimY95O2aKQqsz2iWi9jMgKJhRBAxECE4IFxfcazB2LmzloIoibJI3C12IlY20+KFaLv+71bUJeQ==}
-    peerDependencies:
-      react: ^19.2.4
-    dependencies:
-      react: 19.2.4
-      scheduler: 0.27.0
-    dev: false
-
-  /react-medium-image-zoom@5.4.0(react-dom@19.2.4)(react@19.2.4):
-    resolution: {integrity: sha512-BsE+EnFVQzFIlyuuQrZ9iTwyKpKkqdFZV1ImEQN573QPqGrIUuNni7aF+sZwDcxlsuOMayCr6oO/PZR/yJnbRg==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
-      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
-    dependencies:
-      react: 19.2.4
-      react-dom: 19.2.4(react@19.2.4)
-    dev: false
-
-  /react-remove-scroll-bar@2.3.8(@types/react@19.2.14)(react@19.2.4):
-    resolution: {integrity: sha512-9r+yi9+mgU33AKcj6IbT9oRCO78WriSj6t/cF8DWBZJ9aOGPOTEDvdUDz1FwKim7QXWwmHqtdHnRJfhAxEG46Q==}
-    engines: {node: '>=10'}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-    dependencies:
-      '@types/react': 19.2.14
-      react: 19.2.4
-      react-style-singleton: 2.2.3(@types/react@19.2.14)(react@19.2.4)
-      tslib: 2.8.1
-    dev: false
-
-  /react-remove-scroll@2.7.2(@types/react@19.2.14)(react@19.2.4):
-    resolution: {integrity: sha512-Iqb9NjCCTt6Hf+vOdNIZGdTiH1QSqr27H/Ek9sv/a97gfueI/5h1s3yRi1nngzMUaOOToin5dI1dXKdXiF+u0Q==}
-    engines: {node: '>=10'}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-    dependencies:
-      '@types/react': 19.2.14
-      react: 19.2.4
-      react-remove-scroll-bar: 2.3.8(@types/react@19.2.14)(react@19.2.4)
-      react-style-singleton: 2.2.3(@types/react@19.2.14)(react@19.2.4)
-      tslib: 2.8.1
-      use-callback-ref: 1.3.3(@types/react@19.2.14)(react@19.2.4)
-      use-sidecar: 1.1.3(@types/react@19.2.14)(react@19.2.4)
-    dev: false
-
-  /react-style-singleton@2.2.3(@types/react@19.2.14)(react@19.2.4):
-    resolution: {integrity: sha512-b6jSvxvVnyptAiLjbkWLE/lOnR4lfTtDAl+eUC7RZy+QQWc6wRzIV2CE6xBuMmDxc2qIihtDCZD5NPOFl7fRBQ==}
-    engines: {node: '>=10'}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-    dependencies:
-      '@types/react': 19.2.14
-      get-nonce: 1.0.1
-      react: 19.2.4
-      tslib: 2.8.1
-    dev: false
-
-  /react@19.2.4:
-    resolution: {integrity: sha512-9nfp2hYpCwOjAN+8TZFGhtWEwgvWHXqESH8qT89AT/lWklpLON22Lc8pEtnpsZz7VmawabSU0gCjnj8aC0euHQ==}
-    engines: {node: '>=0.10.0'}
-    dev: false
-
-  /readdirp@4.1.2:
-    resolution: {integrity: sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==}
-    engines: {node: '>= 14.18.0'}
-    dev: false
-
-  /recma-build-jsx@1.0.0:
-    resolution: {integrity: sha512-8GtdyqaBcDfva+GUKDr3nev3VpKAhup1+RvkMvUxURHpW7QyIvk9F5wz7Vzo06CEMSilw6uArgRqhpiUcWp8ew==}
-    dependencies:
-      '@types/estree': 1.0.8
-      estree-util-build-jsx: 3.0.1
-      vfile: 6.0.3
-    dev: false
-
-  /recma-jsx@1.0.1(acorn@8.15.0):
-    resolution: {integrity: sha512-huSIy7VU2Z5OLv6oFLosQGGDqPqdO1iq6bWNAdhzMxSJP7RAso4fCZ1cKu8j9YHCZf3TPrq4dw3okhrylgcd7w==}
-    peerDependencies:
-      acorn: ^6.0.0 || ^7.0.0 || ^8.0.0
-    dependencies:
-      acorn: 8.15.0
-      acorn-jsx: 5.3.2(acorn@8.15.0)
-      estree-util-to-js: 2.0.0
-      recma-parse: 1.0.0
-      recma-stringify: 1.0.0
-      unified: 11.0.5
-    dev: false
-
-  /recma-parse@1.0.0:
-    resolution: {integrity: sha512-OYLsIGBB5Y5wjnSnQW6t3Xg7q3fQ7FWbw/vcXtORTnyaSFscOtABg+7Pnz6YZ6c27fG1/aN8CjfwoUEUIdwqWQ==}
-    dependencies:
-      '@types/estree': 1.0.8
-      esast-util-from-js: 2.0.1
-      unified: 11.0.5
-      vfile: 6.0.3
-    dev: false
-
-  /recma-stringify@1.0.0:
-    resolution: {integrity: sha512-cjwII1MdIIVloKvC9ErQ+OgAtwHBmcZ0Bg4ciz78FtbT8In39aAYbaA7zvxQ61xVMSPE8WxhLwLbhif4Js2C+g==}
-    dependencies:
-      '@types/estree': 1.0.8
-      estree-util-to-js: 2.0.0
-      unified: 11.0.5
-      vfile: 6.0.3
-    dev: false
-
-  /regex-recursion@6.0.2:
-    resolution: {integrity: sha512-0YCaSCq2VRIebiaUviZNs0cBz1kg5kVS2UKUfNIx8YVs1cN3AV7NTctO5FOKBA+UT2BPJIWZauYHPqJODG50cg==}
-    dependencies:
-      regex-utilities: 2.3.0
-    dev: false
-
-  /regex-utilities@2.3.0:
-    resolution: {integrity: sha512-8VhliFJAWRaUiVvREIiW2NXXTmHs4vMNnSzuJVhscgmGav3g9VDxLrQndI3dZZVVdp0ZO/5v0xmX516/7M9cng==}
-    dev: false
-
-  /regex@6.1.0:
-    resolution: {integrity: sha512-6VwtthbV4o/7+OaAF9I5L5V3llLEsoPyq9P1JVXkedTP33c7MfCG0/5NOPcSJn0TzXcG9YUrR0gQSWioew3LDg==}
-    dependencies:
-      regex-utilities: 2.3.0
-    dev: false
-
-  /rehype-recma@1.0.0:
-    resolution: {integrity: sha512-lqA4rGUf1JmacCNWWZx0Wv1dHqMwxzsDWYMTowuplHF3xH0N/MmrZ/G3BDZnzAkRmxDadujCjaKM2hqYdCBOGw==}
-    dependencies:
-      '@types/estree': 1.0.8
-      '@types/hast': 3.0.4
-      hast-util-to-estree: 3.1.3
-    transitivePeerDependencies:
-      - supports-color
-    dev: false
-
-  /remark-gfm@4.0.1:
-    resolution: {integrity: sha512-1quofZ2RQ9EWdeN34S79+KExV1764+wCUGop5CPL1WGdD0ocPpu91lzPGbwWMECpEpd42kJGQwzRfyov9j4yNg==}
-    dependencies:
-      '@types/mdast': 4.0.4
-      mdast-util-gfm: 3.1.0
-      micromark-extension-gfm: 3.0.0
-      remark-parse: 11.0.0
-      remark-stringify: 11.0.0
-      unified: 11.0.5
-    transitivePeerDependencies:
-      - supports-color
-    dev: false
-
-  /remark-mdx@3.1.1:
-    resolution: {integrity: sha512-Pjj2IYlUY3+D8x00UJsIOg5BEvfMyeI+2uLPn9VO9Wg4MEtN/VTIq2NEJQfde9PnX15KgtHyl9S0BcTnWrIuWg==}
-    dependencies:
-      mdast-util-mdx: 3.0.0
-      micromark-extension-mdxjs: 3.0.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: false
-
-  /remark-parse@11.0.0:
-    resolution: {integrity: sha512-FCxlKLNGknS5ba/1lmpYijMUzX2esxW5xQqjWxw2eHFfS2MSdaHVINFmhjo+qN1WhZhNimq0dZATN9pH0IDrpA==}
-    dependencies:
-      '@types/mdast': 4.0.4
-      mdast-util-from-markdown: 2.0.2
-      micromark-util-types: 2.0.2
-      unified: 11.0.5
-    transitivePeerDependencies:
-      - supports-color
-    dev: false
-
-  /remark-rehype@11.1.2:
-    resolution: {integrity: sha512-Dh7l57ianaEoIpzbp0PC9UKAdCSVklD8E5Rpw7ETfbTl3FqcOOgq5q2LVDhgGCkaBv7p24JXikPdvhhmHvKMsw==}
-    dependencies:
-      '@types/hast': 3.0.4
-      '@types/mdast': 4.0.4
-      mdast-util-to-hast: 13.2.1
-      unified: 11.0.5
-      vfile: 6.0.3
-    dev: false
-
-  /remark-stringify@11.0.0:
-    resolution: {integrity: sha512-1OSmLd3awB/t8qdoEOMazZkNsfVTeY4fTsgzcQFdXNq8ToTN4ZGwrMnlda4K6smTFKD+GRV6O48i6Z4iKgPPpw==}
-    dependencies:
-      '@types/mdast': 4.0.4
-      mdast-util-to-markdown: 2.1.2
-      unified: 11.0.5
-    dev: false
-
-  /remark@15.0.1:
-    resolution: {integrity: sha512-Eht5w30ruCXgFmxVUSlNWQ9iiimq07URKeFS3hNc8cUWy1llX4KDWfyEDZRycMc+znsN9Ux5/tJ/BFdgdOwA3A==}
-    dependencies:
-      '@types/mdast': 4.0.4
-      remark-parse: 11.0.0
-      remark-stringify: 11.0.0
-      unified: 11.0.5
-    transitivePeerDependencies:
-      - supports-color
-    dev: false
-
-  /rollup@4.57.1:
-    resolution: {integrity: sha512-oQL6lgK3e2QZeQ7gcgIkS2YZPg5slw37hYufJ3edKlfQSGGm8ICoxswK15ntSzF/a8+h7ekRy7k7oWc3BQ7y8A==}
-    engines: {node: '>=18.0.0', npm: '>=8.0.0'}
-    hasBin: true
-    dependencies:
-      '@types/estree': 1.0.8
-    optionalDependencies:
-      '@rollup/rollup-android-arm-eabi': 4.57.1
-      '@rollup/rollup-android-arm64': 4.57.1
-      '@rollup/rollup-darwin-arm64': 4.57.1
-      '@rollup/rollup-darwin-x64': 4.57.1
-      '@rollup/rollup-freebsd-arm64': 4.57.1
-      '@rollup/rollup-freebsd-x64': 4.57.1
-      '@rollup/rollup-linux-arm-gnueabihf': 4.57.1
-      '@rollup/rollup-linux-arm-musleabihf': 4.57.1
-      '@rollup/rollup-linux-arm64-gnu': 4.57.1
-      '@rollup/rollup-linux-arm64-musl': 4.57.1
-      '@rollup/rollup-linux-loong64-gnu': 4.57.1
-      '@rollup/rollup-linux-loong64-musl': 4.57.1
-      '@rollup/rollup-linux-ppc64-gnu': 4.57.1
-      '@rollup/rollup-linux-ppc64-musl': 4.57.1
-      '@rollup/rollup-linux-riscv64-gnu': 4.57.1
-      '@rollup/rollup-linux-riscv64-musl': 4.57.1
-      '@rollup/rollup-linux-s390x-gnu': 4.57.1
-      '@rollup/rollup-linux-x64-gnu': 4.57.1
-      '@rollup/rollup-linux-x64-musl': 4.57.1
-      '@rollup/rollup-openbsd-x64': 4.57.1
-      '@rollup/rollup-openharmony-arm64': 4.57.1
-      '@rollup/rollup-win32-arm64-msvc': 4.57.1
-      '@rollup/rollup-win32-ia32-msvc': 4.57.1
-      '@rollup/rollup-win32-x64-gnu': 4.57.1
-      '@rollup/rollup-win32-x64-msvc': 4.57.1
-      fsevents: 2.3.3
-
-  /scheduler@0.27.0:
-    resolution: {integrity: sha512-eNv+WrVbKu1f3vbYJT/xtiF5syA5HPIMtf9IgY/nKg0sWqzAUEvqY/xm7OcZc/qafLx/iO9FgOmeSAp4v5ti/Q==}
-    dev: false
-
-  /scroll-into-view-if-needed@3.1.0:
-    resolution: {integrity: sha512-49oNpRjWRvnU8NyGVmUaYG4jtTkNonFZI86MmGRDqBphEK2EXT9gdEUoQPZhuBM8yWHxCWbobltqYO5M4XrUvQ==}
-    dependencies:
-      compute-scroll-into-view: 3.1.1
-    dev: false
-
-  /semver@7.7.4:
-    resolution: {integrity: sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==}
-    engines: {node: '>=10'}
-    hasBin: true
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /sharp@0.34.5:
-    resolution: {integrity: sha512-Ou9I5Ft9WNcCbXrU9cMgPBcCK8LiwLqcbywW3t4oDV37n1pzpuNLsYiAV8eODnjbtQlSDwZ2cUEeQz4E54Hltg==}
-    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
-    requiresBuild: true
-    dependencies:
-      '@img/colour': 1.0.0
-      detect-libc: 2.1.2
-      semver: 7.7.4
-    optionalDependencies:
-      '@img/sharp-darwin-arm64': 0.34.5
-      '@img/sharp-darwin-x64': 0.34.5
-      '@img/sharp-libvips-darwin-arm64': 1.2.4
-      '@img/sharp-libvips-darwin-x64': 1.2.4
-      '@img/sharp-libvips-linux-arm': 1.2.4
-      '@img/sharp-libvips-linux-arm64': 1.2.4
-      '@img/sharp-libvips-linux-ppc64': 1.2.4
-      '@img/sharp-libvips-linux-riscv64': 1.2.4
-      '@img/sharp-libvips-linux-s390x': 1.2.4
-      '@img/sharp-libvips-linux-x64': 1.2.4
-      '@img/sharp-libvips-linuxmusl-arm64': 1.2.4
-      '@img/sharp-libvips-linuxmusl-x64': 1.2.4
-      '@img/sharp-linux-arm': 0.34.5
-      '@img/sharp-linux-arm64': 0.34.5
-      '@img/sharp-linux-ppc64': 0.34.5
-      '@img/sharp-linux-riscv64': 0.34.5
-      '@img/sharp-linux-s390x': 0.34.5
-      '@img/sharp-linux-x64': 0.34.5
-      '@img/sharp-linuxmusl-arm64': 0.34.5
-      '@img/sharp-linuxmusl-x64': 0.34.5
-      '@img/sharp-wasm32': 0.34.5
-      '@img/sharp-win32-arm64': 0.34.5
-      '@img/sharp-win32-ia32': 0.34.5
-      '@img/sharp-win32-x64': 0.34.5
-    dev: false
-    optional: true
-
-  /shiki@3.22.0:
-    resolution: {integrity: sha512-LBnhsoYEe0Eou4e1VgJACes+O6S6QC0w71fCSp5Oya79inkwkm15gQ1UF6VtQ8j/taMDh79hAB49WUk8ALQW3g==}
-    dependencies:
-      '@shikijs/core': 3.22.0
-      '@shikijs/engine-javascript': 3.22.0
-      '@shikijs/engine-oniguruma': 3.22.0
-      '@shikijs/langs': 3.22.0
-      '@shikijs/themes': 3.22.0
-      '@shikijs/types': 3.22.0
-      '@shikijs/vscode-textmate': 10.0.2
-      '@types/hast': 3.0.4
-    dev: false
-
-  /source-map-js@1.2.1:
-    resolution: {integrity: sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==}
-    engines: {node: '>=0.10.0'}
-
-  /source-map@0.7.6:
-    resolution: {integrity: sha512-i5uvt8C3ikiWeNZSVZNWcfZPItFQOsYTUAOkcUPGd8DqDy1uOUikjt5dG+uRlwyvR108Fb9DOd4GvXfT0N2/uQ==}
-    engines: {node: '>= 12'}
-    dev: false
-
-  /space-separated-tokens@2.0.2:
-    resolution: {integrity: sha512-PEGlAwrG8yXGXRjW32fGbg66JAlOAwbObuqVoJpv/mRgoWDQfgH1wDPvtzWyUSNAXBGSk8h755YDbbcEy3SH2Q==}
-    dev: false
-
-  /stringify-entities@4.0.4:
-    resolution: {integrity: sha512-IwfBptatlO+QCJUo19AqvrPNqlVMpW9YEL2LIVY+Rpv2qsjCGxaDLNRgeGsQWJhfItebuJhsGSLjaBbNSQ+ieg==}
-    dependencies:
-      character-entities-html4: 2.1.0
-      character-entities-legacy: 3.0.0
-    dev: false
-
-  /style-to-js@1.1.21:
-    resolution: {integrity: sha512-RjQetxJrrUJLQPHbLku6U/ocGtzyjbJMP9lCNK7Ag0CNh690nSH8woqWH9u16nMjYBAok+i7JO1NP2pOy8IsPQ==}
-    dependencies:
-      style-to-object: 1.0.14
-    dev: false
-
-  /style-to-object@1.0.14:
-    resolution: {integrity: sha512-LIN7rULI0jBscWQYaSswptyderlarFkjQ+t79nzty8tcIAceVomEVlLzH5VP4Cmsv6MtKhs7qaAiwlcp+Mgaxw==}
-    dependencies:
-      inline-style-parser: 0.2.7
-    dev: false
-
-  /styled-jsx@5.1.6(react@19.2.4):
-    resolution: {integrity: sha512-qSVyDTeMotdvQYoHWLNGwRFJHC+i+ZvdBRYosOFgC+Wg1vx4frN2/RG/NA7SYqqvKNLf39P2LSRA2pu6n0XYZA==}
-    engines: {node: '>= 12.0.0'}
-    peerDependencies:
-      '@babel/core': '*'
-      babel-plugin-macros: '*'
-      react: '>= 16.8.0 || 17.x.x || ^18.0.0-0 || ^19.0.0-0'
-    peerDependenciesMeta:
-      '@babel/core':
-        optional: true
-      babel-plugin-macros:
-        optional: true
-    dependencies:
-      client-only: 0.0.1
-      react: 19.2.4
-    dev: false
-
-  /tailwind-merge@3.4.0:
-    resolution: {integrity: sha512-uSaO4gnW+b3Y2aWoWfFpX62vn2sR3skfhbjsEnaBI81WD1wBLlHZe5sWf0AqjksNdYTbGBEd0UasQMT3SNV15g==}
-    dev: false
-
-  /tailwindcss@4.1.18:
-    resolution: {integrity: sha512-4+Z+0yiYyEtUVCScyfHCxOYP06L5Ne+JiHhY2IjR2KWMIWhJOYZKLSGZaP5HkZ8+bY0cxfzwDE5uOmzFXyIwxw==}
-
-  /tapable@2.3.0:
-    resolution: {integrity: sha512-g9ljZiwki/LfxmQADO3dEY1CbpmXT5Hm2fJ+QaGKwSXUylMybePR7/67YW7jOrrvjEgL1Fmz5kzyAjWVWLlucg==}
-    engines: {node: '>=6'}
-    dev: true
-
-  /tinyexec@1.0.2:
-    resolution: {integrity: sha512-W/KYk+NFhkmsYpuHq5JykngiOCnxeVL8v8dFnqxSD8qEEdRfXk1SDM6JzNqcERbcGYj9tMrDQBYV9cjgnunFIg==}
-    engines: {node: '>=18'}
-    dev: false
-
-  /tinyglobby@0.2.15:
-    resolution: {integrity: sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==}
-    engines: {node: '>=12.0.0'}
-    dependencies:
-      fdir: 6.5.0(picomatch@4.0.3)
-      picomatch: 4.0.3
-
-  /trim-lines@3.0.1:
-    resolution: {integrity: sha512-kRj8B+YHZCc9kQYdWfJB2/oUl9rA99qbowYYBtr4ui4mZyAQ2JpvVBd/6U2YloATfqBhBTSMhTpgBHtU0Mf3Rg==}
-    dev: false
-
-  /trough@2.2.0:
-    resolution: {integrity: sha512-tmMpK00BjZiUyVyvrBK7knerNgmgvcV/KLVyuma/SC+TQN167GrMRciANTz09+k3zW8L8t60jWO1GpfkZdjTaw==}
-    dev: false
-
-  /tslib@2.8.1:
-    resolution: {integrity: sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==}
-    dev: false
-
-  /typescript@5.9.3:
-    resolution: {integrity: sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==}
-    engines: {node: '>=14.17'}
-    hasBin: true
-    dev: true
-
-  /undici-types@7.16.0:
-    resolution: {integrity: sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==}
-
-  /unified@11.0.5:
-    resolution: {integrity: sha512-xKvGhPWw3k84Qjh8bI3ZeJjqnyadK+GEFtazSfZv/rKeTkTjOJho6mFqh2SM96iIcZokxiOpg78GazTSg8+KHA==}
-    dependencies:
-      '@types/unist': 3.0.3
-      bail: 2.0.2
-      devlop: 1.1.0
-      extend: 3.0.2
-      is-plain-obj: 4.1.0
-      trough: 2.2.0
-      vfile: 6.0.3
-    dev: false
-
-  /unist-util-is@6.0.1:
-    resolution: {integrity: sha512-LsiILbtBETkDz8I9p1dQ0uyRUWuaQzd/cuEeS1hoRSyW5E5XGmTzlwY1OrNzzakGowI9Dr/I8HVaw4hTtnxy8g==}
-    dependencies:
-      '@types/unist': 3.0.3
-    dev: false
-
-  /unist-util-position-from-estree@2.0.0:
-    resolution: {integrity: sha512-KaFVRjoqLyF6YXCbVLNad/eS4+OfPQQn2yOd7zF/h5T/CSL2v8NpN6a5TPvtbXthAGw5nG+PuTtq+DdIZr+cRQ==}
-    dependencies:
-      '@types/unist': 3.0.3
-    dev: false
-
-  /unist-util-position@5.0.0:
-    resolution: {integrity: sha512-fucsC7HjXvkB5R3kTCO7kUjRdrS0BJt3M/FPxmHMBOm8JQi2BsHAHFsy27E0EolP8rp0NzXsJ+jNPyDWvOJZPA==}
-    dependencies:
-      '@types/unist': 3.0.3
-    dev: false
-
-  /unist-util-remove-position@5.0.0:
-    resolution: {integrity: sha512-Hp5Kh3wLxv0PHj9m2yZhhLt58KzPtEYKQQ4yxfYFEO7EvHwzyDYnduhHnY1mDxoqr7VUwVuHXk9RXKIiYS1N8Q==}
-    dependencies:
-      '@types/unist': 3.0.3
-      unist-util-visit: 5.1.0
-    dev: false
-
-  /unist-util-stringify-position@4.0.0:
-    resolution: {integrity: sha512-0ASV06AAoKCDkS2+xw5RXJywruurpbC4JZSm7nr7MOt1ojAzvyyaO+UxZf18j8FCF6kmzCZKcAgN/yu2gm2XgQ==}
-    dependencies:
-      '@types/unist': 3.0.3
-    dev: false
-
-  /unist-util-visit-parents@6.0.2:
-    resolution: {integrity: sha512-goh1s1TBrqSqukSc8wrjwWhL0hiJxgA8m4kFxGlQ+8FYQ3C/m11FcTs4YYem7V664AhHVvgoQLk890Ssdsr2IQ==}
-    dependencies:
-      '@types/unist': 3.0.3
-      unist-util-is: 6.0.1
-    dev: false
-
-  /unist-util-visit@5.1.0:
-    resolution: {integrity: sha512-m+vIdyeCOpdr/QeQCu2EzxX/ohgS8KbnPDgFni4dQsfSCtpz8UqDyY5GjRru8PDKuYn7Fq19j1CQ+nJSsGKOzg==}
-    dependencies:
-      '@types/unist': 3.0.3
-      unist-util-is: 6.0.1
-      unist-util-visit-parents: 6.0.2
-    dev: false
-
-  /use-callback-ref@1.3.3(@types/react@19.2.14)(react@19.2.4):
-    resolution: {integrity: sha512-jQL3lRnocaFtu3V00JToYz/4QkNWswxijDaCVNZRiRTO3HQDLsdu1ZtmIUvV4yPp+rvWm5j0y0TG/S61cuijTg==}
-    engines: {node: '>=10'}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-    dependencies:
-      '@types/react': 19.2.14
-      react: 19.2.4
-      tslib: 2.8.1
-    dev: false
-
-  /use-sidecar@1.1.3(@types/react@19.2.14)(react@19.2.4):
-    resolution: {integrity: sha512-Fedw0aZvkhynoPYlA5WXrMCAMm+nSWdZt6lzJQ7Ok8S6Q+VsHmHpRWndVRJ8Be0ZbkfPc5LRYH+5XrzXcEeLRQ==}
-    engines: {node: '>=10'}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-    dependencies:
-      '@types/react': 19.2.14
-      detect-node-es: 1.1.0
-      react: 19.2.4
-      tslib: 2.8.1
-    dev: false
-
-  /util-deprecate@1.0.2:
-    resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==}
-    dev: false
-
-  /vfile-message@4.0.3:
-    resolution: {integrity: sha512-QTHzsGd1EhbZs4AsQ20JX1rC3cOlt/IWJruk893DfLRr57lcnOeMaWG4K0JrRta4mIJZKth2Au3mM3u03/JWKw==}
-    dependencies:
-      '@types/unist': 3.0.3
-      unist-util-stringify-position: 4.0.0
-    dev: false
-
-  /vfile@6.0.3:
-    resolution: {integrity: sha512-KzIbH/9tXat2u30jf+smMwFCsno4wHVdNmzFyL+T/L3UGqqk6JKfVqOFOZEpZSHADH1k40ab6NUIXZq422ov3Q==}
-    dependencies:
-      '@types/unist': 3.0.3
-      vfile-message: 4.0.3
-    dev: false
-
-  /vite@7.3.1(@types/node@24.10.13):
-    resolution: {integrity: sha512-w+N7Hifpc3gRjZ63vYBXA56dvvRlNWRczTdmCBBa+CotUzAPf5b7YMdMR/8CQoeYE5LX3W4wj6RYTgonm1b9DA==}
-    engines: {node: ^20.19.0 || >=22.12.0}
-    hasBin: true
-    peerDependencies:
-      '@types/node': ^20.19.0 || >=22.12.0
-      jiti: '>=1.21.0'
-      less: ^4.0.0
-      lightningcss: ^1.21.0
-      sass: ^1.70.0
-      sass-embedded: ^1.70.0
-      stylus: '>=0.54.8'
-      sugarss: ^5.0.0
-      terser: ^5.16.0
-      tsx: ^4.8.1
-      yaml: ^2.4.2
-    peerDependenciesMeta:
-      '@types/node':
-        optional: true
-      jiti:
-        optional: true
-      less:
-        optional: true
-      lightningcss:
-        optional: true
-      sass:
-        optional: true
-      sass-embedded:
-        optional: true
-      stylus:
-        optional: true
-      sugarss:
-        optional: true
-      terser:
-        optional: true
-      tsx:
-        optional: true
-      yaml:
-        optional: true
-    dependencies:
-      '@types/node': 24.10.13
-      esbuild: 0.27.3
-      fdir: 6.5.0(picomatch@4.0.3)
-      picomatch: 4.0.3
-      postcss: 8.5.6
-      rollup: 4.57.1
-      tinyglobby: 0.2.15
-    optionalDependencies:
-      fsevents: 2.3.3
-
-  /zod@4.3.6:
-    resolution: {integrity: sha512-rftlrkhHZOcjDwkGlnUtZZkvaPHCsDATp4pGpuOOMDaTdDDXF91wuVDJoWoPsKX/3YPQ5fHuF3STjcYyKr+Qhg==}
-    dev: false
-
-  /zwitch@2.0.4:
-    resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==}
-    dev: false
diff --git a/docs/postcss.config.js b/docs/postcss.config.js
deleted file mode 100644
index a34a3d560d..0000000000
--- a/docs/postcss.config.js
+++ /dev/null
@@ -1,5 +0,0 @@
-export default {
-  plugins: {
-    '@tailwindcss/postcss': {},
-  },
-};
diff --git a/docs/public/brand/favicon.ico b/docs/public/brand/favicon.ico
deleted file mode 100644
index 0d997661b0..0000000000
Binary files a/docs/public/brand/favicon.ico and /dev/null differ
diff --git a/docs/public/brand/icon-dark.png b/docs/public/brand/icon-dark.png
deleted file mode 100644
index f52c7621a9..0000000000
Binary files a/docs/public/brand/icon-dark.png and /dev/null differ
diff --git a/docs/public/brand/icon-light.png b/docs/public/brand/icon-light.png
deleted file mode 100644
index 0a71445ccd..0000000000
Binary files a/docs/public/brand/icon-light.png and /dev/null differ
diff --git a/docs/public/media/addremoteproject.png b/docs/public/media/addremoteproject.png
deleted file mode 100644
index 09c51bdbc4..0000000000
Binary files a/docs/public/media/addremoteproject.png and /dev/null differ
diff --git a/docs/public/media/bestofn.png b/docs/public/media/bestofn.png
deleted file mode 100644
index b9c53c47f2..0000000000
Binary files a/docs/public/media/bestofn.png and /dev/null differ
diff --git a/docs/public/media/bestofn2.png b/docs/public/media/bestofn2.png
deleted file mode 100644
index d183a6b25d..0000000000
Binary files a/docs/public/media/bestofn2.png and /dev/null differ
diff --git a/docs/public/media/cicd.png b/docs/public/media/cicd.png
deleted file mode 100644
index c497a5767a..0000000000
Binary files a/docs/public/media/cicd.png and /dev/null differ
diff --git a/docs/public/media/createtask.png b/docs/public/media/createtask.png
deleted file mode 100644
index af3525aa7a..0000000000
Binary files a/docs/public/media/createtask.png and /dev/null differ
diff --git a/docs/public/media/demo.mp4 b/docs/public/media/demo.mp4
deleted file mode 100644
index e0e14d1e7c..0000000000
Binary files a/docs/public/media/demo.mp4 and /dev/null differ
diff --git a/docs/public/media/diffviewer.png b/docs/public/media/diffviewer.png
deleted file mode 100644
index 2fdcca94a5..0000000000
Binary files a/docs/public/media/diffviewer.png and /dev/null differ
diff --git a/docs/public/media/disabletelemetry.png b/docs/public/media/disabletelemetry.png
deleted file mode 100644
index 3286c9fab0..0000000000
Binary files a/docs/public/media/disabletelemetry.png and /dev/null differ
diff --git a/docs/public/media/downloadforlinux.png b/docs/public/media/downloadforlinux.png
deleted file mode 100644
index 5d0ca00a78..0000000000
Binary files a/docs/public/media/downloadforlinux.png and /dev/null differ
diff --git a/docs/public/media/downloadformacos.png b/docs/public/media/downloadformacos.png
deleted file mode 100644
index c76acf8361..0000000000
Binary files a/docs/public/media/downloadformacos.png and /dev/null differ
diff --git a/docs/public/media/downloadforwindows.png b/docs/public/media/downloadforwindows.png
deleted file mode 100644
index 0c9e2b4061..0000000000
Binary files a/docs/public/media/downloadforwindows.png and /dev/null differ
diff --git a/docs/public/media/edit-config.png b/docs/public/media/edit-config.png
deleted file mode 100644
index 472847f7d6..0000000000
Binary files a/docs/public/media/edit-config.png and /dev/null differ
diff --git a/docs/public/media/emdash-screenshot.png b/docs/public/media/emdash-screenshot.png
deleted file mode 100644
index 4a4b24ee51..0000000000
Binary files a/docs/public/media/emdash-screenshot.png and /dev/null differ
diff --git a/docs/public/media/emdash.mp4 b/docs/public/media/emdash.mp4
deleted file mode 100644
index 6236d100cb..0000000000
Binary files a/docs/public/media/emdash.mp4 and /dev/null differ
diff --git a/docs/public/media/feedback.png b/docs/public/media/feedback.png
deleted file mode 100644
index 417388f47e..0000000000
Binary files a/docs/public/media/feedback.png and /dev/null differ
diff --git a/docs/public/media/fileeditor.png b/docs/public/media/fileeditor.png
deleted file mode 100644
index 550b1b4e3b..0000000000
Binary files a/docs/public/media/fileeditor.png and /dev/null differ
diff --git a/docs/public/media/kanban.png b/docs/public/media/kanban.png
deleted file mode 100644
index 3eec805841..0000000000
Binary files a/docs/public/media/kanban.png and /dev/null differ
diff --git a/docs/public/media/modelselector.png b/docs/public/media/modelselector.png
deleted file mode 100644
index c112675aa6..0000000000
Binary files a/docs/public/media/modelselector.png and /dev/null differ
diff --git a/docs/public/media/openpr.mp4 b/docs/public/media/openpr.mp4
deleted file mode 100644
index 0326bad092..0000000000
Binary files a/docs/public/media/openpr.mp4 and /dev/null differ
diff --git a/docs/public/media/parallel.mp4 b/docs/public/media/parallel.mp4
deleted file mode 100644
index cbdb8105d7..0000000000
Binary files a/docs/public/media/parallel.mp4 and /dev/null differ
diff --git a/docs/public/media/passissues.png b/docs/public/media/passissues.png
deleted file mode 100644
index 2f9c445721..0000000000
Binary files a/docs/public/media/passissues.png and /dev/null differ
diff --git a/docs/public/media/product.jpeg b/docs/public/media/product.jpeg
deleted file mode 100644
index 1e6c0ffa4f..0000000000
Binary files a/docs/public/media/product.jpeg and /dev/null differ
diff --git a/docs/public/media/providers.png b/docs/public/media/providers.png
deleted file mode 100644
index fed59e63cb..0000000000
Binary files a/docs/public/media/providers.png and /dev/null differ
diff --git a/docs/public/media/remoteproj1.png b/docs/public/media/remoteproj1.png
deleted file mode 100644
index 09145b2f3b..0000000000
Binary files a/docs/public/media/remoteproj1.png and /dev/null differ
diff --git a/docs/public/media/remoteproj2.png b/docs/public/media/remoteproj2.png
deleted file mode 100644
index 818e6ebe6a..0000000000
Binary files a/docs/public/media/remoteproj2.png and /dev/null differ
diff --git a/docs/public/media/remoteproj3.png b/docs/public/media/remoteproj3.png
deleted file mode 100644
index 07baf92e25..0000000000
Binary files a/docs/public/media/remoteproj3.png and /dev/null differ
diff --git a/docs/public/media/skills.png b/docs/public/media/skills.png
deleted file mode 100644
index e1963d2a4f..0000000000
Binary files a/docs/public/media/skills.png and /dev/null differ
diff --git a/docs/scripts/copy-md-sources.js b/docs/scripts/copy-md-sources.js
deleted file mode 100644
index 28a10d876a..0000000000
--- a/docs/scripts/copy-md-sources.js
+++ /dev/null
@@ -1,122 +0,0 @@
-/**
- * Copies MDX documentation files to public/md-src as .md files
- * for serving via the Copy Markdown feature.
- *
- * Run: node scripts/copy-md-sources.js
- */
-
-import fs from 'fs';
-import path from 'path';
-import { fileURLToPath } from 'url';
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
-
-const SOURCE_DIR = path.join(__dirname, '../content/docs');
-const OUTPUT_DIR = path.join(__dirname, '../public/md-src');
-
-function ensureDir(dir) {
-  if (!fs.existsSync(dir)) {
-    fs.mkdirSync(dir, { recursive: true });
-  }
-}
-
-function cleanDir(dir) {
-  if (fs.existsSync(dir)) {
-    fs.rmSync(dir, { recursive: true });
-  }
-  fs.mkdirSync(dir, { recursive: true });
-}
-
-function getAllMdxFiles(dir, files = [], baseDir = dir) {
-  const entries = fs.readdirSync(dir, { withFileTypes: true });
-
-  for (const entry of entries) {
-    const fullPath = path.join(dir, entry.name);
-
-    if (entry.isDirectory()) {
-      getAllMdxFiles(fullPath, files, baseDir);
-    } else if (entry.name.endsWith('.mdx') || entry.name.endsWith('.md')) {
-      const relativePath = path.relative(baseDir, fullPath);
-      files.push({ fullPath, relativePath });
-    }
-  }
-
-  return files;
-}
-
-function stripFrontmatter(content) {
-  // Remove YAML frontmatter (---...---) but keep the title/description as header
-  const match = content.match(/^---\n([\s\S]*?)\n---\n([\s\S]*)$/);
-  if (!match) return content;
-
-  const frontmatter = match[1];
-  const body = match[2];
-
-  // Extract title and description from frontmatter
-  const titleMatch = frontmatter.match(/^title:\s*(.+)$/m);
-  const descMatch = frontmatter.match(/^description:\s*(.+)$/m);
-
-  const title = titleMatch ? titleMatch[1].replace(/^["']|["']$/g, '') : null;
-  const desc = descMatch ? descMatch[1].replace(/^["']|["']$/g, '') : null;
-
-  // Build header
-  let header = '';
-  if (title) {
-    header += `# ${title}\n\n`;
-  }
-  if (desc) {
-    header += `${desc}\n\n`;
-  }
-
-  return header + body.trim();
-}
-
-function processContent(content) {
-  // Strip frontmatter and convert to clean markdown
-  let processed = stripFrontmatter(content);
-
-  // Remove JSX import statements
-  processed = processed.replace(/^import\s+.*?from\s+['"].*?['"];?\s*$/gm, '');
-
-  // Remove empty lines at the start
-  processed = processed.replace(/^\n+/, '');
-
-  return processed;
-}
-
-function main() {
-  console.log('Copying MDX sources to public/md-src...');
-
-  cleanDir(OUTPUT_DIR);
-
-  const files = getAllMdxFiles(SOURCE_DIR);
-  let count = 0;
-
-  for (const { fullPath, relativePath } of files) {
-    // Convert path: foo/bar.mdx -> foo/bar.md, index.mdx -> index.md
-    let outputRelative = relativePath.replace(/\.mdx$/, '.md');
-
-    // Handle index files: docs/index.md -> docs.md (for cleaner URLs)
-    if (outputRelative.endsWith('/index.md')) {
-      outputRelative = outputRelative.replace('/index.md', '.md');
-    } else if (outputRelative === 'index.md') {
-      // Root index stays as index.md
-      outputRelative = 'index.md';
-    }
-
-    const outputPath = path.join(OUTPUT_DIR, outputRelative);
-
-    ensureDir(path.dirname(outputPath));
-
-    const content = fs.readFileSync(fullPath, 'utf-8');
-    const processed = processContent(content);
-
-    fs.writeFileSync(outputPath, processed);
-    count++;
-  }
-
-  console.log(`Copied ${count} files to public/md-src`);
-}
-
-main();
diff --git a/docs/source.config.ts b/docs/source.config.ts
deleted file mode 100644
index 0b00e442c9..0000000000
--- a/docs/source.config.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { defineConfig, defineDocs } from 'fumadocs-mdx/config';
-import lastModified from 'fumadocs-mdx/plugins/last-modified';
-
-export const docs = defineDocs({
-  dir: 'content/docs',
-});
-
-export default defineConfig({
-  plugins: [lastModified()],
-});
diff --git a/docs/ssh-architecture.md b/docs/ssh-architecture.md
deleted file mode 100644
index 165eb3b2d1..0000000000
--- a/docs/ssh-architecture.md
+++ /dev/null
@@ -1,478 +0,0 @@
-# SSH Architecture Documentation
-
-Technical documentation for Emdash's SSH remote development feature.
-
-## Architecture Overview
-
-The SSH feature enables remote development by connecting to servers via SSH and providing SFTP access for file operations. It consists of multiple services working together across the Electron main and renderer processes.
-
-### High-Level Flow
-
-```
-┌─────────────────┐     ┌──────────────────┐     ┌─────────────────┐
-│   Renderer      │     │   Main Process   │     │   Remote        │
-│   (React UI)    │◄───►│   (Node/Electron)│◄───►│   Server        │
-└────────┬────────┘     └────────┬─────────┘     └─────────────────┘
-         │                       │
-         │   IPC Calls           │   ssh2 Library
-         │   (ssh:* channels)    │   (Client/SFTP)
-         │                       │
-         ▼                       ▼
-┌─────────────────┐     ┌──────────────────┐
-│  React Hooks    │     │  SSH Services    │
-│  - useSsh       │     │  - SshService    │
-│  - useRemoteFS  │     │  - SshHostKey    │
-│                 │     │  - SshCredential │
-└─────────────────┘     └──────────────────┘
-```
-
-## Component Diagram
-
-```
-┌─────────────────────────────────────────────────────────────────────────┐
-│                           RENDERER PROCESS                               │
-├─────────────────────────────────────────────────────────────────────────┤
-│                                                                         │
-│  ┌──────────────────┐  ┌──────────────────┐  ┌──────────────────┐      │
-│  │ SshConnectionForm│  │SshConnectionList │  │SshSettingsCard   │      │
-│  │                  │  │                  │  │                  │      │
-│  │ - Host config    │  │ - List view      │  │ - Settings UI    │      │
-│  │ - Auth type sel  │  │ - Connect/Disco  │  │ - Preferences    │      │
-│  │ - Key file pick  │  │ - Status display │  │                  │      │
-│  └────────┬─────────┘  └────────┬─────────┘  └────────┬─────────┘      │
-│           │                     │                     │                │
-│           └─────────────────────┼─────────────────────┘                │
-│                                 │                                      │
-│                                 ▼                                      │
-│                    ┌──────────────────────┐                           │
-│                    │  useSshConnections   │                           │
-│                    │                      │                           │
-│                    │  - Connection state  │                           │
-│                    │  - CRUD operations   │                           │
-│                    │  - IPC abstraction   │                           │
-│                    └──────────┬───────────┘                           │
-│                               │                                        │
-└───────────────────────────────┼────────────────────────────────────────┘
-                                │ IPC
-                                ▼
-┌─────────────────────────────────────────────────────────────────────────┐
-│                             MAIN PROCESS                                 │
-├─────────────────────────────────────────────────────────────────────────┤
-│                                                                         │
-│  ┌─────────────────────────────────────────────────────────────────┐   │
-│  │                      sshIpc.ts                                   │   │
-│  │  ┌─────────────────────────────────────────────────────────┐    │   │
-│  │  │  IPC Handlers (SSH_IPC_CHANNELS)                        │    │   │
-│  │  │  - TEST_CONNECTION  - SAVE_CONNECTION                   │    │   │
-│  │  │  - GET_CONNECTIONS  - DELETE_CONNECTION                 │    │   │
-│  │  │  - CONNECT          - DISCONNECT                        │    │   │
-│  │  │  - EXECUTE_COMMAND  - LIST_FILES                        │    │   │
-│  │  │  - READ_FILE        - WRITE_FILE                        │    │   │
-│  │  │  - GET_STATE        - ON_STATE_CHANGE                   │    │   │
-│  │  └─────────────────────────────────────────────────────────┘    │   │
-│  └─────────────────────────────┬───────────────────────────────────┘   │
-│                                │                                        │
-│  ┌─────────────────────────────┼───────────────────────────────────┐   │
-│  │                             ▼                                   │   │
-│  │  ┌──────────────────┐  ┌─────────────┐  ┌──────────────────┐   │   │
-│  │  │  SshService      │  │ SshHostKey  │  │ SshCredential    │   │   │
-│  │  │  ─────────────   │  │ ─────────── │  │ ──────────────── │   │   │
-│  │  │  Connection pool │  │ Host key    │  │ Keychain storage │   │   │
-│  │  │  Command exec    │  │ verification│  │ Password mgmt    │   │   │
-│  │  │  SFTP wrapper    │  │ known_hosts │  │ Passphrase mgmt  │   │   │
-│  │  └────────┬─────────┘  └─────────────┘  └──────────────────┘   │   │
-│  │           │                                                    │   │
-│  │           ▼                                                    │   │
-│  │  ┌──────────────────┐  ┌──────────────────┐                   │   │
-│  │  │  RemoteGitService│  │ RemotePtyService │                   │   │
-│  │  │  ─────────────── │  │ ──────────────── │                   │   │
-│  │  │  Git over SSH    │  │ Interactive shell│                   │   │
-│  │  │  Worktree mgmt   │  │ Agent execution  │                   │   │
-│  │  └──────────────────┘  └──────────────────┘                   │   │
-│  │                                                                │   │
-│  └────────────────────────────────────────────────────────────────┘   │
-│                                                                       │
-│  ┌─────────────────────────────────────────────────────────────────┐  │
-│  │  DATABASE (SQLite via Drizzle)                                   │  │
-│  │  - ssh_connections table                                         │  │
-│  │  - projects table (with ssh_connection_id, is_remote)            │  │
-│  └─────────────────────────────────────────────────────────────────┘  │
-│                                                                       │
-└───────────────────────────────────────────────────────────────────────┘
-```
-
-## Security Model
-
-### Threat Model
-
-| Threat | Mitigation |
-|--------|------------|
-| Credential theft | Passwords stored in OS keychain, not database |
-| MITM attacks | Host key verification via known_hosts |
-| Key exfiltration | Private key paths only, never content |
-| Session hijacking | Connection timeouts, keepalive checks |
-| Command injection | Shell argument escaping |
-
-### Authentication Security
-
-```
-┌─────────────────────────────────────────────────────────────────┐
-│                     AUTHENTICATION FLOW                          │
-├─────────────────────────────────────────────────────────────────┤
-│                                                                  │
-│  User Input          Emdash Processing         Storage          │
-│  ──────────          ────────────────         ────────          │
-│                                                                  │
-│  Password ─────────► CredentialService ─────► OS Keychain       │
-│                      (keytar)                                    │
-│                                                                  │
-│  Passphrase ───────► CredentialService ─────► OS Keychain       │
-│                      (keytar)                                    │
-│                                                                  │
-│  Private Key Path ──► Path stored in DB ───► File System        │
-│                       (content never read                        │
-│                        until connection)                         │
-│                                                                  │
-│  SSH Agent ─────────► SSH_AUTH_SOCK env ───► System Agent       │
-│                       var used directly                          │
-│                                                                  │
-└─────────────────────────────────────────────────────────────────┘
-```
-
-### Data Flow Security
-
-1. **Connection Config:** Stored in SQLite (no secrets)
-2. **Credentials:** Stored in OS keychain via `keytar`
-3. **Host Keys:** Stored in `~/.ssh/known_hosts` (shared)
-4. **Session Data:** In-memory only, cleared on disconnect
-
-## Authentication Flow
-
-### Connection Establishment
-
-```mermaid
-sequenceDiagram
-    participant UI as Renderer UI
-    participant IPC as IPC Handler
-    participant SS as SshService
-    participant CS as CredentialService
-    participant HKS as SshHostKeyService
-    participant RS as Remote Server
-
-    UI->>IPC: CONNECT request
-    IPC->>SS: connect(config)
-    
-    alt Auth Type: Password
-        SS->>CS: getPassword(connectionId)
-        CS-->>SS: password
-    else Auth Type: Key
-        SS->>CS: getPassphrase(connectionId)
-        CS-->>SS: passphrase (optional)
-        SS->>FS: readFile(privateKeyPath)
-        FS-->>SS: privateKey
-    else Auth Type: Agent
-        SS->>SS: Read SSH_AUTH_SOCK env
-    end
-    
-    SS->>RS: SSH handshake
-    RS-->>SS: Host key
-    SS->>HKS: verifyHostKey(host, port, key)
-    HKS-->>SS: known/new/changed
-    
-    alt Host key new/changed
-        SS-->>UI: Prompt for verification
-        UI-->>SS: User confirmation
-        SS->>HKS: addKnownHost(host, key)
-    end
-    
-    RS-->>SS: Authentication success
-    SS->>SS: Add to connection pool
-    SS-->>IPC: connectionId
-    IPC-->>UI: Connection established
-```
-
-### Host Key Verification States
-
-```
-┌─────────────────────────────────────────────────────────────────┐
-│                    HOST KEY VERIFICATION                         │
-├─────────────────────────────────────────────────────────────────┤
-│                                                                  │
-│  Server presents key ───┬───► Known? ───Yes───► Valid?          │
-│                         │                      │                 │
-│                         │                      ├──Yes──► ALLOW   │
-│                         │                      │                 │
-│                         │                      └──No────► WARN   │
-│                         │                         (changed key)  │
-│                         │                                        │
-│                         └───► No ───► PROMPT user                │
-│                                          │                       │
-│                                          ├──Accept──► ADD & ALLOW│
-│                                          │                       │
-│                                          └──Reject──► DENY       │
-│                                                                  │
-└─────────────────────────────────────────────────────────────────┘
-```
-
-## File Operations over SFTP
-
-### SFTP Session Management
-
-```typescript
-// SFTP sessions are lazily created and cached
-async getSftp(connectionId: string): Promise<SFTPWrapper> {
-  const connection = this.connections[connectionId];
-  
-  // Return cached SFTP if available
-  if (connection.sftp) {
-    connection.lastActivity = new Date();
-    return connection.sftp;
-  }
-  
-  // Create new SFTP session over existing SSH
-  return new Promise((resolve, reject) => {
-    connection.client.sftp((err, sftp) => {
-      if (err) reject(err);
-      connection.sftp = sftp;  // Cache for reuse
-      resolve(sftp);
-    });
-  });
-}
-```
-
-### File Operation Flow
-
-```
-┌─────────────────────────────────────────────────────────────────┐
-│                     SFTP OPERATIONS                              │
-├─────────────────────────────────────────────────────────────────┤
-│                                                                  │
-│  listFiles(path)        readFile(path)       writeFile(path)    │
-│       │                      │                    │               │
-│       ▼                      ▼                    ▼               │
-│  ┌─────────┐           ┌─────────┐          ┌─────────┐          │
-│  │ Get SFTP│           │ Get SFTP│          │ Get SFTP│          │
-│  │ session │           │ session │          │ session │          │
-│  │ (cached)│           │ (cached)│          │ (cached)│          │
-│  └────┬────┘           └────┬────┘          └────┬────┘          │
-│       │                      │                    │               │
-│       ▼                      ▼                    ▼               │
-│  sftp.readdir()        sftp.readFile()     sftp.writeFile()     │
-│       │                      │                    │               │
-│       ▼                      ▼                    ▼               │
-│  Array<FileEntry>      Buffer/string        Success/Error        │
-│                                                                  │
-└─────────────────────────────────────────────────────────────────┘
-```
-
-### FileEntry Structure
-
-```typescript
-interface FileEntry {
-  path: string;        // Full remote path
-  name: string;        // Filename
-  type: 'file' | 'directory' | 'symlink';
-  size: number;        // Bytes
-  modifiedAt: Date;    // Modification timestamp
-  permissions?: string; // Unix permissions (e.g., '644')
-}
-```
-
-## Git Operations over SSH
-
-### RemoteGitService Architecture
-
-```typescript
-class RemoteGitService {
-  constructor(private sshService: SshService) {}
-  
-  // All Git operations execute commands via SSH
-  async getStatus(connectionId: string, worktreePath: string): Promise<GitStatus> {
-    const result = await this.sshService.executeCommand(
-      connectionId,
-      'git status --porcelain -b',
-      worktreePath
-    );
-    // Parse output and return structured status
-  }
-  
-  async createWorktree(
-    connectionId: string,
-    projectPath: string,
-    taskName: string,
-    baseRef?: string
-  ): Promise<WorktreeInfo> {
-    // Create worktree directory
-    // Run git worktree add command
-    // Return worktree info
-  }
-}
-```
-
-### Git Command Execution Flow
-
-```
-┌─────────────────────────────────────────────────────────────────┐
-│                   GIT OPERATION FLOW                             │
-├─────────────────────────────────────────────────────────────────┤
-│                                                                  │
-│  UI Action                                                        │
-│     │                                                            │
-│     ▼                                                            │
-│  RemoteGitService.method()                                       │
-│     │                                                            │
-│     ├──► Build Git command string                                │
-│     │                                                            │
-│     ├──► Escape shell arguments (security)                       │
-│     │                                                            │
-│     └──► sshService.executeCommand(connectionId, cmd, cwd)       │
-│                   │                                              │
-│                   ▼                                              │
-│            client.exec(command, callback)                        │
-│                   │                                              │
-│                   ▼                                              │
-│            Remote Git process                                    │
-│                   │                                              │
-│                   ▼                                              │
-│            Return ExecResult                                     │
-│            { stdout, stderr, exitCode }                          │
-│                   │                                              │
-│                   ▼                                              │
-│            Parse/Process result                                  │
-│                   │                                              │
-│                   ▼                                              │
-│            Return to UI                                          │
-│                                                                  │
-└─────────────────────────────────────────────────────────────────┘
-```
-
-### Shell Argument Escaping
-
-Security-critical: All user-controlled paths are escaped:
-
-```typescript
-private escapeShellArg(arg: string): string {
-  // Replace single quotes with '"'"' and wrap in single quotes
-  // This prevents shell injection attacks
-  return `'${arg.replace(/'/g, "'\"'\"'")}'`;
-}
-
-// Example:
-// Input:  /path/with'quote
-// Output: '/path/with'"'"'quote'
-```
-
-## Connection Pool Management
-
-```typescript
-interface Connection {
-  id: string;
-  config: SshConfig;
-  client: Client;           // ssh2 Client instance
-  sftp?: SFTPWrapper;       // Optional SFTP session
-  connectedAt: Date;
-  lastActivity: Date;
-}
-
-type ConnectionPool = Record<string, Connection>;
-```
-
-### Connection Lifecycle
-
-1. **Create:** `connect(config)` → Add to pool → Emit 'connected'
-2. **Use:** Get from pool → Update `lastActivity`
-3. **Health Check:** Keepalive pings every 60s
-4. **Disconnect:** `disconnect(id)` → Remove from pool → Emit 'disconnected'
-5. **Cleanup:** On app quit → `disconnectAll()`
-
-### Event-Driven Architecture
-
-```typescript
-export class SshService extends EventEmitter {
-  // Events:
-  // - 'connected': (connectionId) => void
-  // - 'error': (connectionId, Error) => void
-  // - 'disconnected': (connectionId) => void
-}
-```
-
-## Database Schema
-
-### SSH Connections Table
-
-```typescript
-export const sshConnections = sqliteTable('ssh_connections', {
-  id: text('id').primaryKey(),
-  name: text('name').notNull(),
-  host: text('host').notNull(),
-  port: integer('port').notNull().default(22),
-  username: text('username').notNull(),
-  authType: text('auth_type').notNull().default('agent'),
-  privateKeyPath: text('private_key_path'),  // Path only, not content
-  useAgent: integer('use_agent').notNull().default(0),
-  createdAt: text('created_at').notNull(),
-  updatedAt: text('updated_at').notNull(),
-});
-```
-
-### Projects Table (Remote Extensions)
-
-```typescript
-export const projects = sqliteTable('projects', {
-  // ... local project fields ...
-  sshConnectionId: text('ssh_connection_id')
-    .references(() => sshConnections.id, { onDelete: 'set null' }),
-  isRemote: integer('is_remote').notNull().default(0),
-  remotePath: text('remote_path'),  // Path on remote server
-});
-```
-
-## Error Handling
-
-### Connection Errors
-
-| Error | Cause | Resolution |
-|-------|-------|------------|
-| `ECONNREFUSED` | SSH not running | Check server and port |
-| `ETIMEDOUT` | Network issue | Check connectivity, firewall |
-| `Authentication failed` | Wrong credentials | Verify auth method |
-| `Host key verification failed` | Unknown/changed key | Verify and trust key |
-| `No password found` | Missing credential | Re-enter password |
-
-### SFTP Errors
-
-| Error | Cause | Resolution |
-|-------|-------|------------|
-| `No such file` | Path doesn't exist | Check remote path |
-| `Permission denied` | Insufficient rights | Check file permissions |
-| `SFTP session not open` | Connection lost | Reconnect |
-
-## Testing Guidelines
-
-### Unit Tests
-
-Test each service in isolation:
-- `SshCredentialService` - Mock keytar
-- `SshHostKeyService` - Mock filesystem
-- `SshService` - Mock ssh2 Client
-
-### Integration Tests
-
-Test with actual SSH server (Docker container):
-- Connection lifecycle
-- Authentication methods
-- File operations
-- Git operations
-
-### Security Tests
-
-- Host key verification
-- Shell injection attempts
-- Credential storage
-- Connection timeout handling
-
-## References
-
-- [ssh2 library documentation](https://github.com/mscdex/ssh2)
-- [OpenSSH documentation](https://www.openssh.com/manual.html)
-- [SFTP protocol spec](https://datatracker.ietf.org/doc/html/draft-ietf-secsh-filexfer-02)
diff --git a/docs/ssh-setup.md b/docs/ssh-setup.md
deleted file mode 100644
index 99020a15a7..0000000000
--- a/docs/ssh-setup.md
+++ /dev/null
@@ -1,457 +0,0 @@
-# SSH Remote Projects Setup Guide
-
-This guide covers how to use Emdash's SSH feature to work with remote projects on remote servers via SSH/SFTP.
-
-## Overview
-
-Emdash supports remote development by connecting to servers via SSH. This allows you to:
-
-- Run coding agents on remote machines
-- Access and edit files on remote servers through SFTP
-- Execute Git operations on remote repositories
-- Use worktrees for parallel development on remote hosts
-
-### How It Works
-
-When you add a remote project:
-1. Emdash establishes an SSH connection to your server
-2. Files are accessed via SFTP for browsing and editing
-3. Git operations run over SSH commands
-4. Coding agents execute in remote worktrees
-5. All connections use your system's SSH agent or configured keys
-
-## Preparing Your Remote Server
-
-Before adding a remote project in Emdash, set up your server with the required tools.
-
-### 1. Install Git
-
-```bash
-# Ubuntu/Debian
-sudo apt update && sudo apt install -y git
-
-# Configure identity (required for commits)
-git config --global user.name "Your Name"
-git config --global user.email "your@email.com"
-```
-
-### 2. Install GitHub CLI (for PR features)
-
-The `gh` CLI is required for creating PRs, viewing check runs, and other GitHub operations from the Emdash UI.
-
-```bash
-# Ubuntu/Debian
-curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg \
-  | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg
-echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] \
-  https://cli.github.com/packages stable main" \
-  | sudo tee /etc/apt/sources.list.d/github-cli-stable.list > /dev/null
-sudo apt update && sudo apt install -y gh
-
-# Authenticate (choose GitHub.com → HTTPS → Login with web browser)
-gh auth login
-```
-
-### 3. Set Up SSH Key for GitHub (for push/pull)
-
-Git push and pull require SSH authentication to GitHub from the server. Create a dedicated key:
-
-```bash
-# Generate a passphrase-free key for non-interactive use
-ssh-keygen -t ed25519 -C "server-github" -f ~/.ssh/id_github -N ""
-
-# Add the key to your GitHub account
-gh ssh-key add ~/.ssh/id_github.pub --title "My Server"
-
-# Configure git to use this key (use absolute path, not ~)
-HOME_DIR=$(eval echo ~)
-git config --global core.sshCommand "ssh -i ${HOME_DIR}/.ssh/id_github"
-
-# Trust GitHub's host key
-ssh-keyscan -t ed25519 github.com >> ~/.ssh/known_hosts 2>/dev/null
-
-# Verify it works
-ssh -T git@github.com
-```
-
-**Important:** Use the absolute path (e.g., `/home/user/.ssh/id_github`) in `core.sshCommand`, not `~`. Emdash runs commands in a non-interactive shell where tilde expansion may not work.
-
-Alternatively, configure SSH directly in `~/.ssh/config`:
-
-```
-Host github.com
-    IdentityFile /home/user/.ssh/id_github
-    IdentitiesOnly yes
-```
-
-### 4. Clone or Initialize a Repository
-
-```bash
-# Clone an existing repo (use SSH URL for push access)
-git clone git@github.com:your-org/your-repo.git
-
-# Or initialize a new repo
-mkdir ~/my-project && cd ~/my-project && git init
-```
-
-**Note:** If your repo was cloned with HTTPS, switch to SSH for push access:
-
-```bash
-git remote set-url origin git@github.com:your-org/your-repo.git
-```
-
-### 5. Install a Coding Agent
-
-At least one CLI agent must be installed on the server. For example:
-
-```bash
-# Claude Code
-curl -fsSL https://claude.ai/install.sh | bash
-
-# Or install another supported agent
-```
-
-## Adding a Remote Project
-
-### Step 1: Configure SSH Connection
-
-1. Open **Settings → SSH Connections**
-2. Click **"Add Connection"**
-3. Enter connection details:
-
-```
-Name:           My Server
-Host:           server.example.com
-Port:           22
-Username:       your-username
-Auth Type:      [Select method]
-```
-
-### Step 2: Test Connection
-
-Before saving, click **"Test Connection"** to verify:
-- Network connectivity
-- Authentication credentials
-- Host key verification
-
-### Step 3: Add Remote Project
-
-1. Go to **Projects → Add Project**
-2. Select **"Remote Project"** tab
-3. Choose your configured SSH connection
-4. Enter the remote path to your project:
-
-```
-Connection:     My Server
-Project Path:   /home/user/projects/my-app
-```
-
-5. Emdash will validate the path and detect Git configuration
-
-## Connection Configuration Options
-
-### Basic Settings
-
-| Option | Description | Default |
-|--------|-------------|---------|
-| Name | Display name for this connection | Required |
-| Host | Server hostname or IP address | Required |
-| Port | SSH port (usually 22) | 22 |
-| Username | SSH username | Required |
-
-### Connection Timeouts
-
-Emdash uses sensible defaults for connection reliability:
-
-- **Ready Timeout**: 20 seconds (connection establishment)
-- **Keepalive Interval**: 60 seconds (connection health check)
-- **Keepalive Count Max**: 3 retries before disconnect
-
-These settings ensure stable long-running agent sessions.
-
-## Authentication Methods
-
-Emdash supports three authentication methods, listed from most to least secure:
-
-### 1. SSH Agent (Recommended)
-
-Uses your system's SSH agent for key-based authentication without storing private keys in Emdash.
-
-**Requirements:**
-- SSH agent running (`ssh-agent`)
-- Key added to agent (`ssh-add ~/.ssh/id_ed25519`)
-- `SSH_AUTH_SOCK` environment variable set
-
-**Setup:**
-```bash
-# Start SSH agent (if not already running)
-eval "$(ssh-agent -s)"
-
-# Add your key
-ssh-add ~/.ssh/id_ed25519
-
-# Verify
-ssh-add -l
-```
-
-**macOS Note:** macOS automatically manages the SSH agent via Keychain. Your keys are typically available after first use.
-
-### 2. Private Key
-
-Specify a private key file directly. Emdash reads the key file but stores passphrases securely in your system keychain.
-
-**Supported Key Formats:**
-- OpenSSH format (`id_rsa`, `id_ed25519`, `id_ecdsa`)
-- PEM format
-- Keys with or without passphrases
-
-**Configuration:**
-```
-Auth Type:        Private Key
-Private Key Path: /Users/you/.ssh/id_ed25519
-Passphrase:       [if key is encrypted]
-```
-
-**Security:** Passphrases are stored in your OS keychain (macOS Keychain, Windows Credential Manager, Linux Secret Service), not in Emdash's database.
-
-### 3. Password
-
-Direct password authentication. Stored securely in your system keychain.
-
-**When to use:**
-- Servers without key-based auth configured
-- Temporary/testing connections
-- Legacy systems
-
-**Security Note:** Password authentication is less secure than key-based methods. Consider setting up SSH keys for production use.
-
-## Host Key Verification
-
-Emdash verifies server identity using SSH host keys to prevent man-in-the-middle attacks.
-
-### First Connection
-
-When connecting to a new server, you'll see a host key fingerprint:
-
-```
-Host Key Verification
-Server: server.example.com:22
-Fingerprint: SHA256:ABC123xyz...
-Algorithm: ssh-ed25519
-
-[Trust Host] [Cancel]
-```
-
-Verify the fingerprint matches your server's actual key before trusting.
-
-### Managing Known Hosts
-
-Emdash uses your system's `~/.ssh/known_hosts` file for host key storage. This means:
-
-- Host keys trusted in Emdash are also trusted by your CLI SSH
-- Host keys verified via CLI SSH are trusted in Emdash
-- No separate host key management needed
-
-### Host Key Changed Warning
-
-If a server's host key changes (e.g., after rebuild), you'll see:
-
-```
-WARNING: Host key has changed!
-This could indicate a man-in-the-middle attack.
-
-Previous: SHA256:ABC123...
-Current:  SHA256:XYZ789...
-
-[View Details] [Accept New Key] [Cancel]
-```
-
-Only accept the new key if you know why the host key changed (e.g., server was rebuilt).
-
-## Troubleshooting Common Issues
-
-### Connection Timeout
-
-**Symptoms:** "Connection timed out" or long delays
-
-**Solutions:**
-1. Verify host and port are correct
-2. Check firewall rules (port 22 open)
-3. Test with CLI: `ssh -v user@host`
-4. Check if VPN is required
-
-### Authentication Failed
-
-**Symptoms:** "Authentication failed" or "Permission denied"
-
-**For Password Auth:**
-- Verify username and password
-- Check if account is locked or expired
-
-**For Key Auth:**
-- Verify key file exists and is readable
-- Check key permissions (should be 600)
-- Ensure public key is in server's `~/.ssh/authorized_keys`
-
-**For Agent Auth:**
-- Verify `SSH_AUTH_SOCK` is set: `echo $SSH_AUTH_SOCK`
-- Check key is loaded: `ssh-add -l`
-- Reload key if needed: `ssh-add ~/.ssh/id_ed25519`
-
-### Host Key Verification Failed
-
-**Symptoms:** "Host key verification failed"
-
-**Solutions:**
-1. Check if server was recently rebuilt
-2. Verify fingerprint with server admin
-3. Remove old entry: `ssh-keygen -R hostname`
-4. Reconnect and accept new key
-
-### SFTP Operations Fail
-
-**Symptoms:** Can connect but file operations fail
-
-**Solutions:**
-1. Verify SFTP is enabled on server (`Subsystem sftp` in sshd_config)
-2. Check disk space on remote server
-3. Verify permissions on project directory
-4. Try manual SFTP: `sftp user@host`
-
-### Git Operations Fail on Remote
-
-**Symptoms:** Git commands return errors
-
-**Solutions:**
-1. Ensure Git is installed on remote server: `ssh user@host git --version`
-2. Check repository permissions
-3. Verify Git config (user.name, user.email) on remote
-4. For private repos, ensure SSH agent forwarding or deploy keys
-
-### Slow File Operations
-
-**Symptoms:** File browsing or editing is slow
-
-**Solutions:**
-1. Check network latency: `ping server`
-2. Consider connection multiplexing in ~/.ssh/config:
-```
-Host server
-    ControlMaster auto
-    ControlPath ~/.ssh/sockets/%r@%h-%p
-    ControlPersist 600
-```
-
-## Security Best Practices
-
-### 1. Use SSH Keys, Not Passwords
-
-Keys are more secure and convenient:
-```bash
-# Generate Ed25519 key (recommended)
-ssh-keygen -t ed25519 -C "emdash@workstation"
-
-# Copy to server
-ssh-copy-id user@server
-```
-
-### 2. Protect Private Keys
-
-- Never commit private keys to Git
-- Use strong passphrases for keys
-- Store keys in `~/.ssh/` with 600 permissions
-- Use hardware security keys (YubiKey) for high-security environments
-
-### 3. Verify Host Keys
-
-Always verify host key fingerprints on first connection. For known servers, distribute fingerprints securely:
-
-```bash
-# Get server fingerprint
-ssh-keyscan -t ed25519 server.example.com
-```
-
-### 4. Use SSH Config for Advanced Options
-
-Create `~/.ssh/config` for server-specific settings:
-
-```
-Host prod-server
-    HostName prod.example.com
-    User deploy
-    IdentityFile ~/.ssh/prod_ed25519
-    StrictHostKeyChecking accept-new
-    ServerAliveInterval 60
-
-Host dev-server
-    HostName 192.168.1.100
-    User developer
-    ForwardAgent yes
-```
-
-### 5. Limit Agent Forwarding
-
-Only enable agent forwarding when needed:
-```
-Host trusted-server
-    ForwardAgent yes
-```
-
-### 6. Regular Key Rotation
-
-Rotate SSH keys periodically:
-- Generate new keys every 6-12 months
-- Remove old keys from `authorized_keys`
-- Update Emdash connections with new key paths
-
-### 7. Audit Connections
-
-Review your `~/.ssh/known_hosts` periodically:
-```bash
-# List known hosts
-ssh-keygen -l -f ~/.ssh/known_hosts
-
-# Remove stale entries
-ssh-keygen -R old-server.example.com
-```
-
-## Quick Reference
-
-### SSH Config File Location
-
-- **macOS/Linux:** `~/.ssh/config`
-- **Windows:** `%USERPROFILE%\.ssh\config`
-- **Known hosts:** `~/.ssh/known_hosts` (Windows: `%USERPROFILE%\.ssh\known_hosts`)
-
-### Common SSH Commands
-
-```bash
-# Test connection
-ssh -v user@host
-
-# Check loaded keys
-ssh-add -l
-
-# Add key to agent
-ssh-add ~/.ssh/id_ed25519
-
-# Remove key from agent
-ssh-add -d ~/.ssh/id_ed25519
-
-# Remove host from known_hosts
-ssh-keygen -R hostname
-
-# Get server fingerprint
-ssh-keyscan -t ed25519 hostname
-```
-
-### Emdash SSH Storage Locations
-
-- **Connection configs:** Local SQLite database
-- **Passwords/Passphrases:** System keychain (via keytar)
-- **Host keys:** `~/.ssh/known_hosts` (shared with system SSH)
-- **Private keys:** Never stored by Emdash (only paths are stored)
-
----
-
-For technical details on SSH implementation, see [SSH Architecture](./ssh-architecture.md).
diff --git a/docs/tsconfig.json b/docs/tsconfig.json
deleted file mode 100644
index 0d8c42f3be..0000000000
--- a/docs/tsconfig.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "include": ["**/*.ts", "**/*.tsx", ".next/types/**/*.ts", ".next/dev/types/**/*.ts"],
-  "exclude": ["node_modules"],
-  "compilerOptions": {
-    "strict": true,
-    "esModuleInterop": true,
-    "jsx": "react-jsx",
-    "module": "ESNext",
-    "moduleResolution": "Bundler",
-    "lib": ["DOM", "DOM.Iterable", "ES2022"],
-    "isolatedModules": true,
-    "resolveJsonModule": true,
-    "skipLibCheck": true,
-    "target": "ES2022",
-    "allowJs": true,
-    "forceConsistentCasingInFileNames": true,
-    "incremental": true,
-    "baseUrl": ".",
-    "paths": {
-      "@/*": ["./*"],
-      "fumadocs-mdx:collections/*": [".source/*"]
-    },
-    "noEmit": true,
-    "plugins": [
-      {
-        "name": "next"
-      }
-    ]
-  }
-}
diff --git a/docs/tsconfig.tsbuildinfo b/docs/tsconfig.tsbuildinfo
deleted file mode 100644
index bd62cb9664..0000000000
--- a/docs/tsconfig.tsbuildinfo
+++ /dev/null
@@ -1 +0,0 @@
-{"fileNames":["./node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/lib/lib.es5.d.ts","./node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/lib/lib.es2015.d.ts","./node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/lib/lib.es2016.d.ts","./node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/lib/lib.es2017.d.ts","./node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/lib/lib.es2018.d.ts","./node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/lib/lib.es2019.d.ts","./node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/lib/lib.es2020.d.ts","./node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/lib/lib.es2021.d.ts","./node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/lib/lib.es2022.d.ts","./node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/lib/lib.dom.d.ts","./node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/lib/lib.dom.iterable.d.ts","./node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/lib/lib.es2015.core.d.ts","./node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/lib/lib.es2015.collection.d.ts","./node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/lib/lib.es2015.generator.d.ts","./node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/lib/lib.es2015.iterable.d.ts","./node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/lib/lib.es2015.promise.d.ts","./node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/lib/lib.es2015.proxy.d.ts","./node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/lib/lib.es2015.reflect.d.ts","./node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/lib/lib.es2015.symbol.d.ts","./node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/lib/lib.es2015.symbol.wellknown.d.ts","./node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/lib/lib.es2016.array.include.d.ts","./node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/lib/lib.es2016.intl.d.ts","./node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/lib/lib.es2017.arraybuffer.d.ts","./node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/lib/lib.es2017.date.d.ts","./node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/lib/lib.es2017.object.d.ts","./node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/lib/lib.es2017.sharedmemory.d.ts","./node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/lib/lib.es2017.string.d.ts","./node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/lib/lib.es2017.intl.d.ts","./node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/lib/lib.es2017.typedarrays.d.ts","./node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/lib/lib.es2018.asyncgenerator.d.ts","./node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/lib/lib.es2018.asynciterable.d.ts","./node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/lib/lib.es2018.intl.d.ts","./node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/lib/lib.es2018.promise.d.ts","./node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/lib/lib.es2018.regexp.d.ts","./node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/lib/lib.es2019.array.d.ts","./node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/lib/lib.es2019.object.d.ts","./node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/lib/lib.es2019.string.d.ts","./node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/lib/lib.es2019.symbol.d.ts","./node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/lib/lib.es2019.intl.d.ts","./node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/lib/lib.es2020.bigint.d.ts","./node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/lib/lib.es2020.date.d.ts","./node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/lib/lib.es2020.promise.d.ts","./node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/lib/lib.es2020.sharedmemory.d.ts","./node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/lib/lib.es2020.string.d.ts","./node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/lib/lib.es2020.symbol.wellknown.d.ts","./node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/lib/lib.es2020.intl.d.ts","./node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/lib/lib.es2020.number.d.ts","./node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/lib/lib.es2021.promise.d.ts","./node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/lib/lib.es2021.string.d.ts","./node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/lib/lib.es2021.weakref.d.ts","./node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/lib/lib.es2021.intl.d.ts","./node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/lib/lib.es2022.array.d.ts","./node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/lib/lib.es2022.error.d.ts","./node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/lib/lib.es2022.intl.d.ts","./node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/lib/lib.es2022.object.d.ts","./node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/lib/lib.es2022.string.d.ts","./node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/lib/lib.es2022.regexp.d.ts","./node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/lib/lib.esnext.disposable.d.ts","./node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/lib/lib.esnext.float16.d.ts","./node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/lib/lib.decorators.d.ts","./node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/lib/lib.decorators.legacy.d.ts","./node_modules/.pnpm/@types+react@19.2.14/node_modules/@types/react/global.d.ts","./node_modules/.pnpm/csstype@3.2.3/node_modules/csstype/index.d.ts","./node_modules/.pnpm/@types+react@19.2.14/node_modules/@types/react/index.d.ts","./node_modules/.pnpm/@types+react@19.2.14/node_modules/@types/react/jsx-runtime.d.ts","./node_modules/.pnpm/@types+unist@3.0.3/node_modules/@types/unist/index.d.ts","./node_modules/.pnpm/@types+mdast@4.0.4/node_modules/@types/mdast/index.d.ts","./node_modules/.pnpm/@types+estree@1.0.8/node_modules/@types/estree/index.d.ts","./node_modules/.pnpm/@types+estree-jsx@1.0.5/node_modules/@types/estree-jsx/index.d.ts","./node_modules/.pnpm/vfile-message@4.0.3/node_modules/vfile-message/lib/index.d.ts","./node_modules/.pnpm/vfile-message@4.0.3/node_modules/vfile-message/index.d.ts","./node_modules/.pnpm/vfile@6.0.3/node_modules/vfile/lib/index.d.ts","./node_modules/.pnpm/vfile@6.0.3/node_modules/vfile/index.d.ts","./node_modules/.pnpm/unified@11.0.5/node_modules/unified/lib/callable-instance.d.ts","./node_modules/.pnpm/trough@2.2.0/node_modules/trough/lib/index.d.ts","./node_modules/.pnpm/trough@2.2.0/node_modules/trough/index.d.ts","./node_modules/.pnpm/unified@11.0.5/node_modules/unified/lib/index.d.ts","./node_modules/.pnpm/unified@11.0.5/node_modules/unified/index.d.ts","./node_modules/.pnpm/source-map@0.7.6/node_modules/source-map/source-map.d.ts","./node_modules/.pnpm/@types+hast@3.0.4/node_modules/@types/hast/index.d.ts","./node_modules/.pnpm/hast-util-to-estree@3.1.3/node_modules/hast-util-to-estree/lib/handlers/comment.d.ts","./node_modules/.pnpm/hast-util-to-estree@3.1.3/node_modules/hast-util-to-estree/lib/handlers/element.d.ts","./node_modules/.pnpm/micromark-util-types@2.0.2/node_modules/micromark-util-types/index.d.ts","./node_modules/.pnpm/mdast-util-from-markdown@2.0.2/node_modules/mdast-util-from-markdown/lib/types.d.ts","./node_modules/.pnpm/mdast-util-from-markdown@2.0.2/node_modules/mdast-util-from-markdown/lib/index.d.ts","./node_modules/.pnpm/mdast-util-from-markdown@2.0.2/node_modules/mdast-util-from-markdown/index.d.ts","./node_modules/.pnpm/mdast-util-to-markdown@2.1.2/node_modules/mdast-util-to-markdown/lib/types.d.ts","./node_modules/.pnpm/mdast-util-to-markdown@2.1.2/node_modules/mdast-util-to-markdown/lib/index.d.ts","./node_modules/.pnpm/mdast-util-to-markdown@2.1.2/node_modules/mdast-util-to-markdown/lib/handle/blockquote.d.ts","./node_modules/.pnpm/mdast-util-to-markdown@2.1.2/node_modules/mdast-util-to-markdown/lib/handle/break.d.ts","./node_modules/.pnpm/mdast-util-to-markdown@2.1.2/node_modules/mdast-util-to-markdown/lib/handle/code.d.ts","./node_modules/.pnpm/mdast-util-to-markdown@2.1.2/node_modules/mdast-util-to-markdown/lib/handle/definition.d.ts","./node_modules/.pnpm/mdast-util-to-markdown@2.1.2/node_modules/mdast-util-to-markdown/lib/handle/emphasis.d.ts","./node_modules/.pnpm/mdast-util-to-markdown@2.1.2/node_modules/mdast-util-to-markdown/lib/handle/heading.d.ts","./node_modules/.pnpm/mdast-util-to-markdown@2.1.2/node_modules/mdast-util-to-markdown/lib/handle/html.d.ts","./node_modules/.pnpm/mdast-util-to-markdown@2.1.2/node_modules/mdast-util-to-markdown/lib/handle/image.d.ts","./node_modules/.pnpm/mdast-util-to-markdown@2.1.2/node_modules/mdast-util-to-markdown/lib/handle/image-reference.d.ts","./node_modules/.pnpm/mdast-util-to-markdown@2.1.2/node_modules/mdast-util-to-markdown/lib/handle/inline-code.d.ts","./node_modules/.pnpm/mdast-util-to-markdown@2.1.2/node_modules/mdast-util-to-markdown/lib/handle/link.d.ts","./node_modules/.pnpm/mdast-util-to-markdown@2.1.2/node_modules/mdast-util-to-markdown/lib/handle/link-reference.d.ts","./node_modules/.pnpm/mdast-util-to-markdown@2.1.2/node_modules/mdast-util-to-markdown/lib/handle/list.d.ts","./node_modules/.pnpm/mdast-util-to-markdown@2.1.2/node_modules/mdast-util-to-markdown/lib/handle/list-item.d.ts","./node_modules/.pnpm/mdast-util-to-markdown@2.1.2/node_modules/mdast-util-to-markdown/lib/handle/paragraph.d.ts","./node_modules/.pnpm/mdast-util-to-markdown@2.1.2/node_modules/mdast-util-to-markdown/lib/handle/root.d.ts","./node_modules/.pnpm/mdast-util-to-markdown@2.1.2/node_modules/mdast-util-to-markdown/lib/handle/strong.d.ts","./node_modules/.pnpm/mdast-util-to-markdown@2.1.2/node_modules/mdast-util-to-markdown/lib/handle/text.d.ts","./node_modules/.pnpm/mdast-util-to-markdown@2.1.2/node_modules/mdast-util-to-markdown/lib/handle/thematic-break.d.ts","./node_modules/.pnpm/mdast-util-to-markdown@2.1.2/node_modules/mdast-util-to-markdown/lib/handle/index.d.ts","./node_modules/.pnpm/mdast-util-to-markdown@2.1.2/node_modules/mdast-util-to-markdown/index.d.ts","./node_modules/.pnpm/mdast-util-mdx-expression@2.0.1/node_modules/mdast-util-mdx-expression/lib/index.d.ts","./node_modules/.pnpm/mdast-util-mdx-expression@2.0.1/node_modules/mdast-util-mdx-expression/index.d.ts","./node_modules/.pnpm/hast-util-to-estree@3.1.3/node_modules/hast-util-to-estree/lib/handlers/mdx-expression.d.ts","./node_modules/.pnpm/mdast-util-mdx-jsx@3.2.0/node_modules/mdast-util-mdx-jsx/lib/index.d.ts","./node_modules/.pnpm/mdast-util-mdx-jsx@3.2.0/node_modules/mdast-util-mdx-jsx/index.d.ts","./node_modules/.pnpm/hast-util-to-estree@3.1.3/node_modules/hast-util-to-estree/lib/handlers/mdx-jsx-element.d.ts","./node_modules/.pnpm/mdast-util-mdxjs-esm@2.0.1/node_modules/mdast-util-mdxjs-esm/lib/index.d.ts","./node_modules/.pnpm/mdast-util-mdxjs-esm@2.0.1/node_modules/mdast-util-mdxjs-esm/index.d.ts","./node_modules/.pnpm/hast-util-to-estree@3.1.3/node_modules/hast-util-to-estree/lib/handlers/mdxjs-esm.d.ts","./node_modules/.pnpm/hast-util-to-estree@3.1.3/node_modules/hast-util-to-estree/lib/handlers/root.d.ts","./node_modules/.pnpm/hast-util-to-estree@3.1.3/node_modules/hast-util-to-estree/lib/handlers/text.d.ts","./node_modules/.pnpm/hast-util-to-estree@3.1.3/node_modules/hast-util-to-estree/lib/handlers/index.d.ts","./node_modules/.pnpm/hast-util-to-estree@3.1.3/node_modules/hast-util-to-estree/lib/index.d.ts","./node_modules/.pnpm/property-information@7.1.0/node_modules/property-information/lib/util/info.d.ts","./node_modules/.pnpm/property-information@7.1.0/node_modules/property-information/lib/find.d.ts","./node_modules/.pnpm/property-information@7.1.0/node_modules/property-information/lib/hast-to-react.d.ts","./node_modules/.pnpm/property-information@7.1.0/node_modules/property-information/lib/normalize.d.ts","./node_modules/.pnpm/property-information@7.1.0/node_modules/property-information/index.d.ts","./node_modules/.pnpm/hast-util-to-estree@3.1.3/node_modules/hast-util-to-estree/lib/state.d.ts","./node_modules/.pnpm/hast-util-to-estree@3.1.3/node_modules/hast-util-to-estree/index.d.ts","./node_modules/.pnpm/rehype-recma@1.0.0/node_modules/rehype-recma/lib/index.d.ts","./node_modules/.pnpm/rehype-recma@1.0.0/node_modules/rehype-recma/index.d.ts","./node_modules/.pnpm/mdast-util-to-hast@13.2.1/node_modules/mdast-util-to-hast/lib/state.d.ts","./node_modules/.pnpm/mdast-util-to-hast@13.2.1/node_modules/mdast-util-to-hast/lib/footer.d.ts","./node_modules/.pnpm/mdast-util-to-hast@13.2.1/node_modules/mdast-util-to-hast/lib/handlers/blockquote.d.ts","./node_modules/.pnpm/mdast-util-to-hast@13.2.1/node_modules/mdast-util-to-hast/lib/handlers/break.d.ts","./node_modules/.pnpm/mdast-util-to-hast@13.2.1/node_modules/mdast-util-to-hast/lib/handlers/code.d.ts","./node_modules/.pnpm/mdast-util-to-hast@13.2.1/node_modules/mdast-util-to-hast/lib/handlers/delete.d.ts","./node_modules/.pnpm/mdast-util-to-hast@13.2.1/node_modules/mdast-util-to-hast/lib/handlers/emphasis.d.ts","./node_modules/.pnpm/mdast-util-to-hast@13.2.1/node_modules/mdast-util-to-hast/lib/handlers/footnote-reference.d.ts","./node_modules/.pnpm/mdast-util-to-hast@13.2.1/node_modules/mdast-util-to-hast/lib/handlers/heading.d.ts","./node_modules/.pnpm/mdast-util-to-hast@13.2.1/node_modules/mdast-util-to-hast/lib/handlers/html.d.ts","./node_modules/.pnpm/mdast-util-to-hast@13.2.1/node_modules/mdast-util-to-hast/lib/handlers/image-reference.d.ts","./node_modules/.pnpm/mdast-util-to-hast@13.2.1/node_modules/mdast-util-to-hast/lib/handlers/image.d.ts","./node_modules/.pnpm/mdast-util-to-hast@13.2.1/node_modules/mdast-util-to-hast/lib/handlers/inline-code.d.ts","./node_modules/.pnpm/mdast-util-to-hast@13.2.1/node_modules/mdast-util-to-hast/lib/handlers/link-reference.d.ts","./node_modules/.pnpm/mdast-util-to-hast@13.2.1/node_modules/mdast-util-to-hast/lib/handlers/link.d.ts","./node_modules/.pnpm/mdast-util-to-hast@13.2.1/node_modules/mdast-util-to-hast/lib/handlers/list-item.d.ts","./node_modules/.pnpm/mdast-util-to-hast@13.2.1/node_modules/mdast-util-to-hast/lib/handlers/list.d.ts","./node_modules/.pnpm/mdast-util-to-hast@13.2.1/node_modules/mdast-util-to-hast/lib/handlers/paragraph.d.ts","./node_modules/.pnpm/mdast-util-to-hast@13.2.1/node_modules/mdast-util-to-hast/lib/handlers/root.d.ts","./node_modules/.pnpm/mdast-util-to-hast@13.2.1/node_modules/mdast-util-to-hast/lib/handlers/strong.d.ts","./node_modules/.pnpm/mdast-util-to-hast@13.2.1/node_modules/mdast-util-to-hast/lib/handlers/table.d.ts","./node_modules/.pnpm/mdast-util-to-hast@13.2.1/node_modules/mdast-util-to-hast/lib/handlers/table-cell.d.ts","./node_modules/.pnpm/mdast-util-to-hast@13.2.1/node_modules/mdast-util-to-hast/lib/handlers/table-row.d.ts","./node_modules/.pnpm/mdast-util-to-hast@13.2.1/node_modules/mdast-util-to-hast/lib/handlers/text.d.ts","./node_modules/.pnpm/mdast-util-to-hast@13.2.1/node_modules/mdast-util-to-hast/lib/handlers/thematic-break.d.ts","./node_modules/.pnpm/mdast-util-to-hast@13.2.1/node_modules/mdast-util-to-hast/lib/handlers/index.d.ts","./node_modules/.pnpm/mdast-util-to-hast@13.2.1/node_modules/mdast-util-to-hast/lib/index.d.ts","./node_modules/.pnpm/mdast-util-to-hast@13.2.1/node_modules/mdast-util-to-hast/index.d.ts","./node_modules/.pnpm/remark-rehype@11.1.2/node_modules/remark-rehype/lib/index.d.ts","./node_modules/.pnpm/remark-rehype@11.1.2/node_modules/remark-rehype/index.d.ts","./node_modules/.pnpm/@mdx-js+mdx@3.1.1/node_modules/@mdx-js/mdx/lib/core.d.ts","./node_modules/.pnpm/@mdx-js+mdx@3.1.1/node_modules/@mdx-js/mdx/lib/node-types.d.ts","./node_modules/.pnpm/@mdx-js+mdx@3.1.1/node_modules/@mdx-js/mdx/lib/compile.d.ts","./node_modules/.pnpm/hast-util-to-jsx-runtime@2.3.6/node_modules/hast-util-to-jsx-runtime/lib/types.d.ts","./node_modules/.pnpm/hast-util-to-jsx-runtime@2.3.6/node_modules/hast-util-to-jsx-runtime/lib/index.d.ts","./node_modules/.pnpm/hast-util-to-jsx-runtime@2.3.6/node_modules/hast-util-to-jsx-runtime/index.d.ts","./node_modules/.pnpm/@types+mdx@2.0.13/node_modules/@types/mdx/types.d.ts","./node_modules/.pnpm/@mdx-js+mdx@3.1.1/node_modules/@mdx-js/mdx/lib/util/resolve-evaluate-options.d.ts","./node_modules/.pnpm/@mdx-js+mdx@3.1.1/node_modules/@mdx-js/mdx/lib/evaluate.d.ts","./node_modules/.pnpm/@mdx-js+mdx@3.1.1/node_modules/@mdx-js/mdx/lib/run.d.ts","./node_modules/.pnpm/@mdx-js+mdx@3.1.1/node_modules/@mdx-js/mdx/index.d.ts","./node_modules/.pnpm/@standard-schema+spec@1.1.0/node_modules/@standard-schema/spec/dist/index.d.ts","./node_modules/.pnpm/micromark-extension-gfm-footnote@2.1.0/node_modules/micromark-extension-gfm-footnote/lib/html.d.ts","./node_modules/.pnpm/micromark-extension-gfm-footnote@2.1.0/node_modules/micromark-extension-gfm-footnote/lib/syntax.d.ts","./node_modules/.pnpm/micromark-extension-gfm-footnote@2.1.0/node_modules/micromark-extension-gfm-footnote/index.d.ts","./node_modules/.pnpm/micromark-extension-gfm-strikethrough@2.1.0/node_modules/micromark-extension-gfm-strikethrough/lib/html.d.ts","./node_modules/.pnpm/micromark-extension-gfm-strikethrough@2.1.0/node_modules/micromark-extension-gfm-strikethrough/lib/syntax.d.ts","./node_modules/.pnpm/micromark-extension-gfm-strikethrough@2.1.0/node_modules/micromark-extension-gfm-strikethrough/index.d.ts","./node_modules/.pnpm/micromark-extension-gfm@3.0.0/node_modules/micromark-extension-gfm/index.d.ts","./node_modules/.pnpm/mdast-util-gfm-footnote@2.1.0/node_modules/mdast-util-gfm-footnote/lib/index.d.ts","./node_modules/.pnpm/mdast-util-gfm-footnote@2.1.0/node_modules/mdast-util-gfm-footnote/index.d.ts","./node_modules/.pnpm/markdown-table@3.0.4/node_modules/markdown-table/index.d.ts","./node_modules/.pnpm/mdast-util-gfm-table@2.0.0/node_modules/mdast-util-gfm-table/lib/index.d.ts","./node_modules/.pnpm/mdast-util-gfm-table@2.0.0/node_modules/mdast-util-gfm-table/index.d.ts","./node_modules/.pnpm/mdast-util-gfm@3.1.0/node_modules/mdast-util-gfm/lib/index.d.ts","./node_modules/.pnpm/mdast-util-gfm@3.1.0/node_modules/mdast-util-gfm/index.d.ts","./node_modules/.pnpm/remark-gfm@4.0.1/node_modules/remark-gfm/lib/index.d.ts","./node_modules/.pnpm/remark-gfm@4.0.1/node_modules/remark-gfm/index.d.ts","./node_modules/.pnpm/@shikijs+vscode-textmate@10.0.2/node_modules/@shikijs/vscode-textmate/dist/index.d.ts","./node_modules/.pnpm/@shikijs+types@3.22.0/node_modules/@shikijs/types/dist/index.d.mts","./node_modules/.pnpm/shiki@3.22.0/node_modules/shiki/dist/langs.d.mts","./node_modules/.pnpm/stringify-entities@4.0.4/node_modules/stringify-entities/lib/util/format-smart.d.ts","./node_modules/.pnpm/stringify-entities@4.0.4/node_modules/stringify-entities/lib/core.d.ts","./node_modules/.pnpm/stringify-entities@4.0.4/node_modules/stringify-entities/lib/index.d.ts","./node_modules/.pnpm/stringify-entities@4.0.4/node_modules/stringify-entities/index.d.ts","./node_modules/.pnpm/hast-util-to-html@9.0.5/node_modules/hast-util-to-html/lib/index.d.ts","./node_modules/.pnpm/hast-util-to-html@9.0.5/node_modules/hast-util-to-html/index.d.ts","./node_modules/.pnpm/@shikijs+core@3.22.0/node_modules/@shikijs/core/dist/index.d.mts","./node_modules/.pnpm/shiki@3.22.0/node_modules/shiki/dist/themes.d.mts","./node_modules/.pnpm/shiki@3.22.0/node_modules/shiki/dist/bundle-full.d.mts","./node_modules/.pnpm/@shikijs+core@3.22.0/node_modules/@shikijs/core/dist/types.d.mts","./node_modules/.pnpm/shiki@3.22.0/node_modules/shiki/dist/types.d.mts","./node_modules/.pnpm/oniguruma-to-es@4.3.4/node_modules/oniguruma-to-es/dist/esm/subclass.d.ts","./node_modules/.pnpm/oniguruma-to-es@4.3.4/node_modules/oniguruma-to-es/dist/esm/index.d.ts","./node_modules/.pnpm/@shikijs+engine-javascript@3.22.0/node_modules/@shikijs/engine-javascript/dist/shared/engine-javascript.cdednu-m.d.mts","./node_modules/.pnpm/@shikijs+engine-javascript@3.22.0/node_modules/@shikijs/engine-javascript/dist/engine-raw.d.mts","./node_modules/.pnpm/@shikijs+engine-javascript@3.22.0/node_modules/@shikijs/engine-javascript/dist/index.d.mts","./node_modules/.pnpm/@shikijs+engine-oniguruma@3.22.0/node_modules/@shikijs/engine-oniguruma/dist/chunk-index.d.d.mts","./node_modules/.pnpm/@shikijs+engine-oniguruma@3.22.0/node_modules/@shikijs/engine-oniguruma/dist/index.d.mts","./node_modules/.pnpm/shiki@3.22.0/node_modules/shiki/dist/index.d.mts","./node_modules/.pnpm/@shikijs+rehype@3.22.0/node_modules/@shikijs/rehype/dist/shared/rehype.dcmmi29i.d.mts","./node_modules/.pnpm/@shikijs+rehype@3.22.0/node_modules/@shikijs/rehype/dist/index.d.mts","./node_modules/.pnpm/fumadocs-core@16.1.0_@types+react@19.2.14_next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/fumadocs-core/dist/mdx-plugins/rehype-code.d.ts","./node_modules/.pnpm/fumadocs-core@16.1.0_@types+react@19.2.14_next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/fumadocs-core/dist/mdx-plugins/remark-image.d.ts","./node_modules/.pnpm/fumadocs-core@16.1.0_@types+react@19.2.14_next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/fumadocs-core/dist/mdx-plugins/remark-structure.d.ts","./node_modules/.pnpm/fumadocs-core@16.1.0_@types+react@19.2.14_next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/fumadocs-core/dist/mdx-plugins/remark-heading.d.ts","./node_modules/.pnpm/fumadocs-core@16.1.0_@types+react@19.2.14_next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/fumadocs-core/dist/mdx-plugins/remark-admonition.d.ts","./node_modules/.pnpm/fumadocs-core@16.1.0_@types+react@19.2.14_next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/fumadocs-core/dist/mdx-plugins/remark-directive-admonition.d.ts","./node_modules/.pnpm/fumadocs-core@16.1.0_@types+react@19.2.14_next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/fumadocs-core/dist/mdx-plugins/rehype-toc.d.ts","./node_modules/.pnpm/fumadocs-core@16.1.0_@types+react@19.2.14_next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/fumadocs-core/dist/mdx-plugins/remark-code-tab.d.ts","./node_modules/.pnpm/fumadocs-core@16.1.0_@types+react@19.2.14_next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/fumadocs-core/dist/mdx-plugins/remark-steps.d.ts","./node_modules/.pnpm/fumadocs-core@16.1.0_@types+react@19.2.14_next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/fumadocs-core/dist/mdx-plugins/remark-npm.d.ts","./node_modules/.pnpm/fumadocs-core@16.1.0_@types+react@19.2.14_next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/fumadocs-core/dist/mdx-plugins/codeblock-utils.d.ts","./node_modules/.pnpm/fumadocs-core@16.1.0_@types+react@19.2.14_next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/fumadocs-core/dist/mdx-plugins/remark-mdx-files.d.ts","./node_modules/.pnpm/fumadocs-core@16.1.0_@types+react@19.2.14_next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/fumadocs-core/dist/mdx-plugins/remark-mdx-mermaid.d.ts","./node_modules/.pnpm/fumadocs-core@16.1.0_@types+react@19.2.14_next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/fumadocs-core/dist/mdx-plugins/index.d.ts","./node_modules/.pnpm/zod@4.3.6/node_modules/zod/v4/core/json-schema.d.cts","./node_modules/.pnpm/zod@4.3.6/node_modules/zod/v4/core/standard-schema.d.cts","./node_modules/.pnpm/zod@4.3.6/node_modules/zod/v4/core/registries.d.cts","./node_modules/.pnpm/zod@4.3.6/node_modules/zod/v4/core/to-json-schema.d.cts","./node_modules/.pnpm/zod@4.3.6/node_modules/zod/v4/core/util.d.cts","./node_modules/.pnpm/zod@4.3.6/node_modules/zod/v4/core/versions.d.cts","./node_modules/.pnpm/zod@4.3.6/node_modules/zod/v4/core/schemas.d.cts","./node_modules/.pnpm/zod@4.3.6/node_modules/zod/v4/core/checks.d.cts","./node_modules/.pnpm/zod@4.3.6/node_modules/zod/v4/core/errors.d.cts","./node_modules/.pnpm/zod@4.3.6/node_modules/zod/v4/core/core.d.cts","./node_modules/.pnpm/zod@4.3.6/node_modules/zod/v4/core/parse.d.cts","./node_modules/.pnpm/zod@4.3.6/node_modules/zod/v4/core/regexes.d.cts","./node_modules/.pnpm/zod@4.3.6/node_modules/zod/v4/locales/ar.d.cts","./node_modules/.pnpm/zod@4.3.6/node_modules/zod/v4/locales/az.d.cts","./node_modules/.pnpm/zod@4.3.6/node_modules/zod/v4/locales/be.d.cts","./node_modules/.pnpm/zod@4.3.6/node_modules/zod/v4/locales/bg.d.cts","./node_modules/.pnpm/zod@4.3.6/node_modules/zod/v4/locales/ca.d.cts","./node_modules/.pnpm/zod@4.3.6/node_modules/zod/v4/locales/cs.d.cts","./node_modules/.pnpm/zod@4.3.6/node_modules/zod/v4/locales/da.d.cts","./node_modules/.pnpm/zod@4.3.6/node_modules/zod/v4/locales/de.d.cts","./node_modules/.pnpm/zod@4.3.6/node_modules/zod/v4/locales/en.d.cts","./node_modules/.pnpm/zod@4.3.6/node_modules/zod/v4/locales/eo.d.cts","./node_modules/.pnpm/zod@4.3.6/node_modules/zod/v4/locales/es.d.cts","./node_modules/.pnpm/zod@4.3.6/node_modules/zod/v4/locales/fa.d.cts","./node_modules/.pnpm/zod@4.3.6/node_modules/zod/v4/locales/fi.d.cts","./node_modules/.pnpm/zod@4.3.6/node_modules/zod/v4/locales/fr.d.cts","./node_modules/.pnpm/zod@4.3.6/node_modules/zod/v4/locales/fr-ca.d.cts","./node_modules/.pnpm/zod@4.3.6/node_modules/zod/v4/locales/he.d.cts","./node_modules/.pnpm/zod@4.3.6/node_modules/zod/v4/locales/hu.d.cts","./node_modules/.pnpm/zod@4.3.6/node_modules/zod/v4/locales/hy.d.cts","./node_modules/.pnpm/zod@4.3.6/node_modules/zod/v4/locales/id.d.cts","./node_modules/.pnpm/zod@4.3.6/node_modules/zod/v4/locales/is.d.cts","./node_modules/.pnpm/zod@4.3.6/node_modules/zod/v4/locales/it.d.cts","./node_modules/.pnpm/zod@4.3.6/node_modules/zod/v4/locales/ja.d.cts","./node_modules/.pnpm/zod@4.3.6/node_modules/zod/v4/locales/ka.d.cts","./node_modules/.pnpm/zod@4.3.6/node_modules/zod/v4/locales/kh.d.cts","./node_modules/.pnpm/zod@4.3.6/node_modules/zod/v4/locales/km.d.cts","./node_modules/.pnpm/zod@4.3.6/node_modules/zod/v4/locales/ko.d.cts","./node_modules/.pnpm/zod@4.3.6/node_modules/zod/v4/locales/lt.d.cts","./node_modules/.pnpm/zod@4.3.6/node_modules/zod/v4/locales/mk.d.cts","./node_modules/.pnpm/zod@4.3.6/node_modules/zod/v4/locales/ms.d.cts","./node_modules/.pnpm/zod@4.3.6/node_modules/zod/v4/locales/nl.d.cts","./node_modules/.pnpm/zod@4.3.6/node_modules/zod/v4/locales/no.d.cts","./node_modules/.pnpm/zod@4.3.6/node_modules/zod/v4/locales/ota.d.cts","./node_modules/.pnpm/zod@4.3.6/node_modules/zod/v4/locales/ps.d.cts","./node_modules/.pnpm/zod@4.3.6/node_modules/zod/v4/locales/pl.d.cts","./node_modules/.pnpm/zod@4.3.6/node_modules/zod/v4/locales/pt.d.cts","./node_modules/.pnpm/zod@4.3.6/node_modules/zod/v4/locales/ru.d.cts","./node_modules/.pnpm/zod@4.3.6/node_modules/zod/v4/locales/sl.d.cts","./node_modules/.pnpm/zod@4.3.6/node_modules/zod/v4/locales/sv.d.cts","./node_modules/.pnpm/zod@4.3.6/node_modules/zod/v4/locales/ta.d.cts","./node_modules/.pnpm/zod@4.3.6/node_modules/zod/v4/locales/th.d.cts","./node_modules/.pnpm/zod@4.3.6/node_modules/zod/v4/locales/tr.d.cts","./node_modules/.pnpm/zod@4.3.6/node_modules/zod/v4/locales/ua.d.cts","./node_modules/.pnpm/zod@4.3.6/node_modules/zod/v4/locales/uk.d.cts","./node_modules/.pnpm/zod@4.3.6/node_modules/zod/v4/locales/ur.d.cts","./node_modules/.pnpm/zod@4.3.6/node_modules/zod/v4/locales/uz.d.cts","./node_modules/.pnpm/zod@4.3.6/node_modules/zod/v4/locales/vi.d.cts","./node_modules/.pnpm/zod@4.3.6/node_modules/zod/v4/locales/zh-cn.d.cts","./node_modules/.pnpm/zod@4.3.6/node_modules/zod/v4/locales/zh-tw.d.cts","./node_modules/.pnpm/zod@4.3.6/node_modules/zod/v4/locales/yo.d.cts","./node_modules/.pnpm/zod@4.3.6/node_modules/zod/v4/locales/index.d.cts","./node_modules/.pnpm/zod@4.3.6/node_modules/zod/v4/core/doc.d.cts","./node_modules/.pnpm/zod@4.3.6/node_modules/zod/v4/core/api.d.cts","./node_modules/.pnpm/zod@4.3.6/node_modules/zod/v4/core/json-schema-processors.d.cts","./node_modules/.pnpm/zod@4.3.6/node_modules/zod/v4/core/json-schema-generator.d.cts","./node_modules/.pnpm/zod@4.3.6/node_modules/zod/v4/core/index.d.cts","./node_modules/.pnpm/zod@4.3.6/node_modules/zod/v4/classic/errors.d.cts","./node_modules/.pnpm/zod@4.3.6/node_modules/zod/v4/classic/parse.d.cts","./node_modules/.pnpm/zod@4.3.6/node_modules/zod/v4/classic/schemas.d.cts","./node_modules/.pnpm/zod@4.3.6/node_modules/zod/v4/classic/checks.d.cts","./node_modules/.pnpm/zod@4.3.6/node_modules/zod/v4/classic/compat.d.cts","./node_modules/.pnpm/zod@4.3.6/node_modules/zod/v4/classic/from-json-schema.d.cts","./node_modules/.pnpm/zod@4.3.6/node_modules/zod/v4/classic/iso.d.cts","./node_modules/.pnpm/zod@4.3.6/node_modules/zod/v4/classic/coerce.d.cts","./node_modules/.pnpm/zod@4.3.6/node_modules/zod/v4/classic/external.d.cts","./node_modules/.pnpm/zod@4.3.6/node_modules/zod/index.d.cts","./node_modules/.pnpm/readdirp@4.1.2/node_modules/readdirp/esm/index.d.ts","./node_modules/.pnpm/chokidar@4.0.3/node_modules/chokidar/esm/handler.d.ts","./node_modules/.pnpm/chokidar@4.0.3/node_modules/chokidar/esm/index.d.ts","./node_modules/.pnpm/fumadocs-core@16.1.0_@types+react@19.2.14_next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/fumadocs-core/dist/definitions-dbcug1p3.d.ts","./node_modules/.pnpm/fumadocs-core@16.1.0_@types+react@19.2.14_next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/fumadocs-core/dist/i18n/index.d.ts","./node_modules/.pnpm/fumadocs-core@16.1.0_@types+react@19.2.14_next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/fumadocs-core/dist/loader-dgl6g4ca.d.ts","./node_modules/.pnpm/fumadocs-core@16.1.0_@types+react@19.2.14_next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/fumadocs-core/dist/source/index.d.ts","./node_modules/.pnpm/fumadocs-core@16.1.0_@types+react@19.2.14_next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/fumadocs-core/dist/toc.d.ts","./node_modules/.pnpm/fumadocs-mdx@14.0.3_fumadocs-core@16.1.0_next@16.1.6_react@19.2.4_vite@7.3.1/node_modules/fumadocs-mdx/dist/runtime/types.d.ts","./node_modules/.pnpm/fumadocs-mdx@14.0.3_fumadocs-core@16.1.0_next@16.1.6_react@19.2.4_vite@7.3.1/node_modules/fumadocs-mdx/dist/core-c3qzsdex.d.ts","./node_modules/.pnpm/fumadocs-mdx@14.0.3_fumadocs-core@16.1.0_next@16.1.6_react@19.2.4_vite@7.3.1/node_modules/fumadocs-mdx/dist/config/index.d.ts","./node_modules/.pnpm/fumadocs-mdx@14.0.3_fumadocs-core@16.1.0_next@16.1.6_react@19.2.4_vite@7.3.1/node_modules/fumadocs-mdx/dist/plugins/last-modified.d.ts","./source.config.ts","./node_modules/.pnpm/lucide-static@0.552.0/node_modules/lucide-static/dist/lucide-static.d.ts","./node_modules/.pnpm/fumadocs-mdx@14.0.3_fumadocs-core@16.1.0_next@16.1.6_react@19.2.4_vite@7.3.1/node_modules/fumadocs-mdx/dist/runtime/server.d.ts","./.source/server.ts","./lib/source.ts","./node_modules/.pnpm/@orama+orama@3.1.18/node_modules/@orama/orama/dist/esm/methods/insert.d.ts","./node_modules/.pnpm/@orama+orama@3.1.18/node_modules/@orama/orama/dist/esm/constants.d.ts","./node_modules/.pnpm/@orama+orama@3.1.18/node_modules/@orama/orama/dist/esm/components/internal-document-id-store.d.ts","./node_modules/.pnpm/@orama+orama@3.1.18/node_modules/@orama/orama/dist/esm/trees/radix.d.ts","./node_modules/.pnpm/@orama+orama@3.1.18/node_modules/@orama/orama/dist/esm/trees/avl.d.ts","./node_modules/.pnpm/@orama+orama@3.1.18/node_modules/@orama/orama/dist/esm/trees/flat.d.ts","./node_modules/.pnpm/@orama+orama@3.1.18/node_modules/@orama/orama/dist/esm/trees/bkd.d.ts","./node_modules/.pnpm/@orama+orama@3.1.18/node_modules/@orama/orama/dist/esm/trees/bool.d.ts","./node_modules/.pnpm/@orama+orama@3.1.18/node_modules/@orama/orama/dist/esm/trees/vector.d.ts","./node_modules/.pnpm/@orama+orama@3.1.18/node_modules/@orama/orama/dist/esm/components/index.d.ts","./node_modules/.pnpm/@orama+orama@3.1.18/node_modules/@orama/orama/dist/esm/components/sorter.d.ts","./node_modules/.pnpm/@orama+orama@3.1.18/node_modules/@orama/orama/dist/esm/components/tokenizer/languages.d.ts","./node_modules/.pnpm/@orama+orama@3.1.18/node_modules/@orama/orama/dist/esm/methods/answer-session.d.ts","./node_modules/.pnpm/@orama+orama@3.1.18/node_modules/@orama/orama/dist/esm/components/tokenizer/index.d.ts","./node_modules/.pnpm/@orama+orama@3.1.18/node_modules/@orama/orama/dist/esm/types.d.ts","./node_modules/.pnpm/@orama+orama@3.1.18/node_modules/@orama/orama/dist/esm/components/documents-store.d.ts","./node_modules/.pnpm/@orama+orama@3.1.18/node_modules/@orama/orama/dist/esm/methods/create.d.ts","./node_modules/.pnpm/@orama+orama@3.1.18/node_modules/@orama/orama/dist/esm/methods/docs.d.ts","./node_modules/.pnpm/@orama+orama@3.1.18/node_modules/@orama/orama/dist/esm/components/pinning.d.ts","./node_modules/.pnpm/@orama+orama@3.1.18/node_modules/@orama/orama/dist/esm/methods/pinning.d.ts","./node_modules/.pnpm/@orama+orama@3.1.18/node_modules/@orama/orama/dist/esm/methods/remove.d.ts","./node_modules/.pnpm/@orama+orama@3.1.18/node_modules/@orama/orama/dist/esm/methods/search.d.ts","./node_modules/.pnpm/@orama+orama@3.1.18/node_modules/@orama/orama/dist/esm/methods/search-vector.d.ts","./node_modules/.pnpm/@orama+orama@3.1.18/node_modules/@orama/orama/dist/esm/methods/serialization.d.ts","./node_modules/.pnpm/@orama+orama@3.1.18/node_modules/@orama/orama/dist/esm/methods/update.d.ts","./node_modules/.pnpm/@orama+orama@3.1.18/node_modules/@orama/orama/dist/esm/methods/upsert.d.ts","./node_modules/.pnpm/@orama+orama@3.1.18/node_modules/@orama/orama/dist/esm/utils.d.ts","./node_modules/.pnpm/@orama+orama@3.1.18/node_modules/@orama/orama/dist/esm/components/defaults.d.ts","./node_modules/.pnpm/@orama+orama@3.1.18/node_modules/@orama/orama/dist/esm/components.d.ts","./node_modules/.pnpm/@orama+orama@3.1.18/node_modules/@orama/orama/dist/esm/components/levenshtein.d.ts","./node_modules/.pnpm/@orama+orama@3.1.18/node_modules/@orama/orama/dist/esm/internals.d.ts","./node_modules/.pnpm/@orama+orama@3.1.18/node_modules/@orama/orama/dist/esm/index.d.ts","./node_modules/.pnpm/fumadocs-core@16.1.0_@types+react@19.2.14_next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/fumadocs-core/dist/search/index.d.ts","./node_modules/.pnpm/fumadocs-core@16.1.0_@types+react@19.2.14_next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/fumadocs-core/dist/search/server.d.ts","./app/api/search/route.ts","./node_modules/.pnpm/next-themes@0.4.6_react-dom@19.2.4_react@19.2.4/node_modules/next-themes/dist/index.d.ts","./node_modules/.pnpm/@radix-ui+react-context@1.1.2_@types+react@19.2.14_react@19.2.4/node_modules/@radix-ui/react-context/dist/index.d.mts","./node_modules/.pnpm/@radix-ui+react-primitive@2.1.3_@types+react-dom@19.2.3_@types+react@19.2.14_react-dom@19.2.4_react@19.2.4/node_modules/@radix-ui/react-primitive/dist/index.d.mts","./node_modules/.pnpm/@radix-ui+react-dismissable-layer@1.1.11_@types+react-dom@19.2.3_@types+react@19.2.14_react-dom@19.2.4_react@19.2.4/node_modules/@radix-ui/react-dismissable-layer/dist/index.d.mts","./node_modules/.pnpm/@radix-ui+react-focus-scope@1.1.7_@types+react-dom@19.2.3_@types+react@19.2.14_react-dom@19.2.4_react@19.2.4/node_modules/@radix-ui/react-focus-scope/dist/index.d.mts","./node_modules/.pnpm/@radix-ui+react-portal@1.1.9_@types+react-dom@19.2.3_@types+react@19.2.14_react-dom@19.2.4_react@19.2.4/node_modules/@radix-ui/react-portal/dist/index.d.mts","./node_modules/.pnpm/@radix-ui+react-dialog@1.1.15_@types+react-dom@19.2.3_@types+react@19.2.14_react-dom@19.2.4_react@19.2.4/node_modules/@radix-ui/react-dialog/dist/index.d.mts","./node_modules/.pnpm/fumadocs-ui@16.1.0_@types+react-dom@19.2.3_@types+react@19.2.14_next@16.1.6_react-dom@19.2.4__p7khta47lz3jqrc7k4gav3dphu/node_modules/fumadocs-ui/dist/contexts/search.d.ts","./node_modules/.pnpm/fumadocs-ui@16.1.0_@types+react-dom@19.2.3_@types+react@19.2.14_next@16.1.6_react-dom@19.2.4__p7khta47lz3jqrc7k4gav3dphu/node_modules/fumadocs-ui/dist/components/dialog/search.d.ts","./node_modules/.pnpm/fumadocs-ui@16.1.0_@types+react-dom@19.2.3_@types+react@19.2.14_next@16.1.6_react-dom@19.2.4__p7khta47lz3jqrc7k4gav3dphu/node_modules/fumadocs-ui/dist/components/dialog/search-default.d.ts","./node_modules/.pnpm/fumadocs-ui@16.1.0_@types+react-dom@19.2.3_@types+react@19.2.14_next@16.1.6_react-dom@19.2.4__p7khta47lz3jqrc7k4gav3dphu/node_modules/fumadocs-ui/dist/contexts/i18n.d.ts","./node_modules/.pnpm/fumadocs-ui@16.1.0_@types+react-dom@19.2.3_@types+react@19.2.14_next@16.1.6_react-dom@19.2.4__p7khta47lz3jqrc7k4gav3dphu/node_modules/fumadocs-ui/dist/provider/base.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/shared/lib/image-config.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/shared/lib/get-img-props.d.ts","./node_modules/.pnpm/fumadocs-core@16.1.0_@types+react@19.2.14_next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/fumadocs-core/dist/framework/index.d.ts","./node_modules/.pnpm/fumadocs-ui@16.1.0_@types+react-dom@19.2.3_@types+react@19.2.14_next@16.1.6_react-dom@19.2.4__p7khta47lz3jqrc7k4gav3dphu/node_modules/fumadocs-ui/dist/provider/next.d.ts","./app/layout.tsx","./node_modules/.pnpm/fumadocs-core@16.1.0_@types+react@19.2.14_next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/fumadocs-core/dist/page-tree/index.d.ts","./node_modules/.pnpm/fumadocs-core@16.1.0_@types+react@19.2.14_next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/fumadocs-core/dist/link.d.ts","./node_modules/.pnpm/@radix-ui+react-scroll-area@1.2.10_@types+react-dom@19.2.3_@types+react@19.2.14_react-dom@19.2.4_react@19.2.4/node_modules/@radix-ui/react-scroll-area/dist/index.d.mts","./node_modules/.pnpm/@radix-ui+react-collapsible@1.1.12_@types+react-dom@19.2.3_@types+react@19.2.14_react-dom@19.2.4_react@19.2.4/node_modules/@radix-ui/react-collapsible/dist/index.d.mts","./node_modules/.pnpm/fumadocs-ui@16.1.0_@types+react-dom@19.2.3_@types+react@19.2.14_next@16.1.6_react-dom@19.2.4__p7khta47lz3jqrc7k4gav3dphu/node_modules/fumadocs-ui/dist/components/layout/sidebar.d.ts","./node_modules/.pnpm/fumadocs-ui@16.1.0_@types+react-dom@19.2.3_@types+react@19.2.14_next@16.1.6_react-dom@19.2.4__p7khta47lz3jqrc7k4gav3dphu/node_modules/fumadocs-ui/dist/utils/get-sidebar-tabs.d.ts","./node_modules/.pnpm/fumadocs-ui@16.1.0_@types+react-dom@19.2.3_@types+react@19.2.14_next@16.1.6_react-dom@19.2.4__p7khta47lz3jqrc7k4gav3dphu/node_modules/fumadocs-ui/dist/components/layout/root-toggle.d.ts","./node_modules/.pnpm/fumadocs-ui@16.1.0_@types+react-dom@19.2.3_@types+react@19.2.14_next@16.1.6_react-dom@19.2.4__p7khta47lz3jqrc7k4gav3dphu/node_modules/fumadocs-ui/dist/contexts/layout.d.ts","./node_modules/.pnpm/fumadocs-ui@16.1.0_@types+react-dom@19.2.3_@types+react@19.2.14_next@16.1.6_react-dom@19.2.4__p7khta47lz3jqrc7k4gav3dphu/node_modules/fumadocs-ui/dist/layouts/shared/client.d.ts","./node_modules/.pnpm/fumadocs-ui@16.1.0_@types+react-dom@19.2.3_@types+react@19.2.14_next@16.1.6_react-dom@19.2.4__p7khta47lz3jqrc7k4gav3dphu/node_modules/fumadocs-ui/dist/layouts/shared/index.d.ts","./node_modules/.pnpm/fumadocs-ui@16.1.0_@types+react-dom@19.2.3_@types+react@19.2.14_next@16.1.6_react-dom@19.2.4__p7khta47lz3jqrc7k4gav3dphu/node_modules/fumadocs-ui/dist/layouts/docs/client.d.ts","./node_modules/.pnpm/fumadocs-ui@16.1.0_@types+react-dom@19.2.3_@types+react@19.2.14_next@16.1.6_react-dom@19.2.4__p7khta47lz3jqrc7k4gav3dphu/node_modules/fumadocs-ui/dist/layouts/docs/index.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/client/image-component.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/shared/lib/image-external.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/image.d.ts","./lib/layout.shared.tsx","./app/[[...slug]]/layout.tsx","./node_modules/.pnpm/fumadocs-core@16.1.0_@types+react@19.2.14_next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/fumadocs-core/dist/breadcrumb.d.ts","./node_modules/.pnpm/fumadocs-ui@16.1.0_@types+react-dom@19.2.3_@types+react@19.2.14_next@16.1.6_react-dom@19.2.4__p7khta47lz3jqrc7k4gav3dphu/node_modules/fumadocs-ui/dist/layouts/docs/page-client.d.ts","./node_modules/.pnpm/fumadocs-ui@16.1.0_@types+react-dom@19.2.3_@types+react@19.2.14_next@16.1.6_react-dom@19.2.4__p7khta47lz3jqrc7k4gav3dphu/node_modules/fumadocs-ui/dist/layouts/docs/page.d.ts","./node_modules/.pnpm/fumadocs-ui@16.1.0_@types+react-dom@19.2.3_@types+react@19.2.14_next@16.1.6_react-dom@19.2.4__p7khta47lz3jqrc7k4gav3dphu/node_modules/fumadocs-ui/dist/page.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/get-page-files.d.ts","./node_modules/.pnpm/@types+node@24.10.13/node_modules/@types/node/compatibility/iterators.d.ts","./node_modules/.pnpm/@types+node@24.10.13/node_modules/@types/node/globals.typedarray.d.ts","./node_modules/.pnpm/@types+node@24.10.13/node_modules/@types/node/buffer.buffer.d.ts","./node_modules/.pnpm/@types+node@24.10.13/node_modules/@types/node/globals.d.ts","./node_modules/.pnpm/@types+node@24.10.13/node_modules/@types/node/web-globals/abortcontroller.d.ts","./node_modules/.pnpm/@types+node@24.10.13/node_modules/@types/node/web-globals/crypto.d.ts","./node_modules/.pnpm/@types+node@24.10.13/node_modules/@types/node/web-globals/domexception.d.ts","./node_modules/.pnpm/@types+node@24.10.13/node_modules/@types/node/web-globals/events.d.ts","./node_modules/.pnpm/undici-types@7.16.0/node_modules/undici-types/utility.d.ts","./node_modules/.pnpm/undici-types@7.16.0/node_modules/undici-types/header.d.ts","./node_modules/.pnpm/undici-types@7.16.0/node_modules/undici-types/readable.d.ts","./node_modules/.pnpm/undici-types@7.16.0/node_modules/undici-types/fetch.d.ts","./node_modules/.pnpm/undici-types@7.16.0/node_modules/undici-types/formdata.d.ts","./node_modules/.pnpm/undici-types@7.16.0/node_modules/undici-types/connector.d.ts","./node_modules/.pnpm/undici-types@7.16.0/node_modules/undici-types/client-stats.d.ts","./node_modules/.pnpm/undici-types@7.16.0/node_modules/undici-types/client.d.ts","./node_modules/.pnpm/undici-types@7.16.0/node_modules/undici-types/errors.d.ts","./node_modules/.pnpm/undici-types@7.16.0/node_modules/undici-types/dispatcher.d.ts","./node_modules/.pnpm/undici-types@7.16.0/node_modules/undici-types/global-dispatcher.d.ts","./node_modules/.pnpm/undici-types@7.16.0/node_modules/undici-types/global-origin.d.ts","./node_modules/.pnpm/undici-types@7.16.0/node_modules/undici-types/pool-stats.d.ts","./node_modules/.pnpm/undici-types@7.16.0/node_modules/undici-types/pool.d.ts","./node_modules/.pnpm/undici-types@7.16.0/node_modules/undici-types/handlers.d.ts","./node_modules/.pnpm/undici-types@7.16.0/node_modules/undici-types/balanced-pool.d.ts","./node_modules/.pnpm/undici-types@7.16.0/node_modules/undici-types/h2c-client.d.ts","./node_modules/.pnpm/undici-types@7.16.0/node_modules/undici-types/agent.d.ts","./node_modules/.pnpm/undici-types@7.16.0/node_modules/undici-types/mock-interceptor.d.ts","./node_modules/.pnpm/undici-types@7.16.0/node_modules/undici-types/mock-call-history.d.ts","./node_modules/.pnpm/undici-types@7.16.0/node_modules/undici-types/mock-agent.d.ts","./node_modules/.pnpm/undici-types@7.16.0/node_modules/undici-types/mock-client.d.ts","./node_modules/.pnpm/undici-types@7.16.0/node_modules/undici-types/mock-pool.d.ts","./node_modules/.pnpm/undici-types@7.16.0/node_modules/undici-types/snapshot-agent.d.ts","./node_modules/.pnpm/undici-types@7.16.0/node_modules/undici-types/mock-errors.d.ts","./node_modules/.pnpm/undici-types@7.16.0/node_modules/undici-types/proxy-agent.d.ts","./node_modules/.pnpm/undici-types@7.16.0/node_modules/undici-types/env-http-proxy-agent.d.ts","./node_modules/.pnpm/undici-types@7.16.0/node_modules/undici-types/retry-handler.d.ts","./node_modules/.pnpm/undici-types@7.16.0/node_modules/undici-types/retry-agent.d.ts","./node_modules/.pnpm/undici-types@7.16.0/node_modules/undici-types/api.d.ts","./node_modules/.pnpm/undici-types@7.16.0/node_modules/undici-types/cache-interceptor.d.ts","./node_modules/.pnpm/undici-types@7.16.0/node_modules/undici-types/interceptors.d.ts","./node_modules/.pnpm/undici-types@7.16.0/node_modules/undici-types/util.d.ts","./node_modules/.pnpm/undici-types@7.16.0/node_modules/undici-types/cookies.d.ts","./node_modules/.pnpm/undici-types@7.16.0/node_modules/undici-types/patch.d.ts","./node_modules/.pnpm/undici-types@7.16.0/node_modules/undici-types/websocket.d.ts","./node_modules/.pnpm/undici-types@7.16.0/node_modules/undici-types/eventsource.d.ts","./node_modules/.pnpm/undici-types@7.16.0/node_modules/undici-types/diagnostics-channel.d.ts","./node_modules/.pnpm/undici-types@7.16.0/node_modules/undici-types/content-type.d.ts","./node_modules/.pnpm/undici-types@7.16.0/node_modules/undici-types/cache.d.ts","./node_modules/.pnpm/undici-types@7.16.0/node_modules/undici-types/index.d.ts","./node_modules/.pnpm/@types+node@24.10.13/node_modules/@types/node/web-globals/fetch.d.ts","./node_modules/.pnpm/@types+node@24.10.13/node_modules/@types/node/web-globals/navigator.d.ts","./node_modules/.pnpm/@types+node@24.10.13/node_modules/@types/node/web-globals/storage.d.ts","./node_modules/.pnpm/@types+node@24.10.13/node_modules/@types/node/web-globals/streams.d.ts","./node_modules/.pnpm/@types+node@24.10.13/node_modules/@types/node/assert.d.ts","./node_modules/.pnpm/@types+node@24.10.13/node_modules/@types/node/assert/strict.d.ts","./node_modules/.pnpm/@types+node@24.10.13/node_modules/@types/node/async_hooks.d.ts","./node_modules/.pnpm/@types+node@24.10.13/node_modules/@types/node/buffer.d.ts","./node_modules/.pnpm/@types+node@24.10.13/node_modules/@types/node/child_process.d.ts","./node_modules/.pnpm/@types+node@24.10.13/node_modules/@types/node/cluster.d.ts","./node_modules/.pnpm/@types+node@24.10.13/node_modules/@types/node/console.d.ts","./node_modules/.pnpm/@types+node@24.10.13/node_modules/@types/node/constants.d.ts","./node_modules/.pnpm/@types+node@24.10.13/node_modules/@types/node/crypto.d.ts","./node_modules/.pnpm/@types+node@24.10.13/node_modules/@types/node/dgram.d.ts","./node_modules/.pnpm/@types+node@24.10.13/node_modules/@types/node/diagnostics_channel.d.ts","./node_modules/.pnpm/@types+node@24.10.13/node_modules/@types/node/dns.d.ts","./node_modules/.pnpm/@types+node@24.10.13/node_modules/@types/node/dns/promises.d.ts","./node_modules/.pnpm/@types+node@24.10.13/node_modules/@types/node/domain.d.ts","./node_modules/.pnpm/@types+node@24.10.13/node_modules/@types/node/events.d.ts","./node_modules/.pnpm/@types+node@24.10.13/node_modules/@types/node/fs.d.ts","./node_modules/.pnpm/@types+node@24.10.13/node_modules/@types/node/fs/promises.d.ts","./node_modules/.pnpm/@types+node@24.10.13/node_modules/@types/node/http.d.ts","./node_modules/.pnpm/@types+node@24.10.13/node_modules/@types/node/http2.d.ts","./node_modules/.pnpm/@types+node@24.10.13/node_modules/@types/node/https.d.ts","./node_modules/.pnpm/@types+node@24.10.13/node_modules/@types/node/inspector.d.ts","./node_modules/.pnpm/@types+node@24.10.13/node_modules/@types/node/inspector.generated.d.ts","./node_modules/.pnpm/@types+node@24.10.13/node_modules/@types/node/module.d.ts","./node_modules/.pnpm/@types+node@24.10.13/node_modules/@types/node/net.d.ts","./node_modules/.pnpm/@types+node@24.10.13/node_modules/@types/node/os.d.ts","./node_modules/.pnpm/@types+node@24.10.13/node_modules/@types/node/path.d.ts","./node_modules/.pnpm/@types+node@24.10.13/node_modules/@types/node/perf_hooks.d.ts","./node_modules/.pnpm/@types+node@24.10.13/node_modules/@types/node/process.d.ts","./node_modules/.pnpm/@types+node@24.10.13/node_modules/@types/node/punycode.d.ts","./node_modules/.pnpm/@types+node@24.10.13/node_modules/@types/node/querystring.d.ts","./node_modules/.pnpm/@types+node@24.10.13/node_modules/@types/node/readline.d.ts","./node_modules/.pnpm/@types+node@24.10.13/node_modules/@types/node/readline/promises.d.ts","./node_modules/.pnpm/@types+node@24.10.13/node_modules/@types/node/repl.d.ts","./node_modules/.pnpm/@types+node@24.10.13/node_modules/@types/node/sea.d.ts","./node_modules/.pnpm/@types+node@24.10.13/node_modules/@types/node/sqlite.d.ts","./node_modules/.pnpm/@types+node@24.10.13/node_modules/@types/node/stream.d.ts","./node_modules/.pnpm/@types+node@24.10.13/node_modules/@types/node/stream/promises.d.ts","./node_modules/.pnpm/@types+node@24.10.13/node_modules/@types/node/stream/consumers.d.ts","./node_modules/.pnpm/@types+node@24.10.13/node_modules/@types/node/stream/web.d.ts","./node_modules/.pnpm/@types+node@24.10.13/node_modules/@types/node/string_decoder.d.ts","./node_modules/.pnpm/@types+node@24.10.13/node_modules/@types/node/test.d.ts","./node_modules/.pnpm/@types+node@24.10.13/node_modules/@types/node/timers.d.ts","./node_modules/.pnpm/@types+node@24.10.13/node_modules/@types/node/timers/promises.d.ts","./node_modules/.pnpm/@types+node@24.10.13/node_modules/@types/node/tls.d.ts","./node_modules/.pnpm/@types+node@24.10.13/node_modules/@types/node/trace_events.d.ts","./node_modules/.pnpm/@types+node@24.10.13/node_modules/@types/node/tty.d.ts","./node_modules/.pnpm/@types+node@24.10.13/node_modules/@types/node/url.d.ts","./node_modules/.pnpm/@types+node@24.10.13/node_modules/@types/node/util.d.ts","./node_modules/.pnpm/@types+node@24.10.13/node_modules/@types/node/v8.d.ts","./node_modules/.pnpm/@types+node@24.10.13/node_modules/@types/node/vm.d.ts","./node_modules/.pnpm/@types+node@24.10.13/node_modules/@types/node/wasi.d.ts","./node_modules/.pnpm/@types+node@24.10.13/node_modules/@types/node/worker_threads.d.ts","./node_modules/.pnpm/@types+node@24.10.13/node_modules/@types/node/zlib.d.ts","./node_modules/.pnpm/@types+node@24.10.13/node_modules/@types/node/index.d.ts","./node_modules/.pnpm/@types+react@19.2.14/node_modules/@types/react/canary.d.ts","./node_modules/.pnpm/@types+react@19.2.14/node_modules/@types/react/experimental.d.ts","./node_modules/.pnpm/@types+react-dom@19.2.3_@types+react@19.2.14/node_modules/@types/react-dom/index.d.ts","./node_modules/.pnpm/@types+react-dom@19.2.3_@types+react@19.2.14/node_modules/@types/react-dom/canary.d.ts","./node_modules/.pnpm/@types+react-dom@19.2.3_@types+react@19.2.14/node_modules/@types/react-dom/experimental.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/lib/fallback.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/compiled/webpack/webpack.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/shared/lib/modern-browserslist-target.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/shared/lib/entry-constants.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/shared/lib/constants.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/config.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/lib/load-custom-routes.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/build/webpack/plugins/subresource-integrity-plugin.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/body-streams.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/route-kind.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/route-definitions/route-definition.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/route-matches/route-match.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/client/components/app-router-headers.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/lib/cache-control.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/lib/cache-handlers/types.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/resume-data-cache/cache-store.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/resume-data-cache/resume-data-cache.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/lib/constants.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/render-result.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/response-cache/types.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/response-cache/index.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/next-devtools/userspace/pages/pages-dev-overlay-setup.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/shared/lib/app-router-types.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/build/static-paths/types.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/route-definitions/app-page-route-definition.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/instrumentation/types.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/lib/setup-exception-listeners.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/lib/worker.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/lib/bundler.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/lib/experimental/ppr.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/lib/page-types.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/build/segment-config/app/app-segment-config.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/build/segment-config/pages/pages-segment-config.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/build/analysis/get-page-static-info.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/build/webpack/loaders/get-module-build-info.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/build/webpack/plugins/middleware-plugin.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/require-hook.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/node-polyfill-crypto.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/node-environment-baseline.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/node-environment-extensions/error-inspect.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/node-environment-extensions/console-file.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/node-environment-extensions/console-exit.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/node-environment-extensions/console-dim.external.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/node-environment-extensions/unhandled-rejection.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/node-environment-extensions/random.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/node-environment-extensions/date.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/node-environment-extensions/web-crypto.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/node-environment-extensions/node-crypto.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/node-environment-extensions/fast-set-immediate.external.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/node-environment.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/build/page-extensions-type.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/route-modules/app-page/module.compiled.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/route-definitions/app-route-route-definition.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/lib/i18n-provider.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/web/next-url.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/compiled/@edge-runtime/cookies/index.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/web/spec-extension/cookies.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/web/spec-extension/request.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/shared/lib/deep-readonly.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/shared/lib/router/utils/middleware-route-matcher.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/build/webpack/plugins/flight-manifest-plugin.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/build/webpack/plugins/next-font-manifest-plugin.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/route-definitions/locale-route-definition.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/route-definitions/pages-route-definition.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/shared/lib/mitt.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/client/with-router.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/client/router.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/client/route-loader.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/client/page-loader.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/shared/lib/bloom-filter.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/shared/lib/router/router.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/shared/lib/router-context.shared-runtime.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/shared/lib/loadable-context.shared-runtime.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/shared/lib/loadable.shared-runtime.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/shared/lib/image-config-context.shared-runtime.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/client/components/readonly-url-search-params.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/shared/lib/hooks-client-context.shared-runtime.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/shared/lib/head-manager-context.shared-runtime.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/client/flight-data-helpers.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/client/components/router-reducer/ppr-navigations.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/client/components/segment-cache/types.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/client/components/segment-cache/navigation.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/client/components/segment-cache/cache-key.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/client/components/router-reducer/fetch-server-response.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/client/components/router-reducer/router-reducer-types.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/shared/lib/app-router-context.shared-runtime.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/shared/lib/server-inserted-html.shared-runtime.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/route-modules/pages/vendored/contexts/entrypoints.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/route-modules/pages/module.compiled.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/build/templates/pages.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/route-modules/pages/module.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/render.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/build/webpack/plugins/pages-manifest-plugin.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/route-definitions/pages-api-route-definition.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/route-matches/pages-api-route-match.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/route-matchers/route-matcher.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/route-matcher-providers/route-matcher-provider.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/route-matcher-managers/route-matcher-manager.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/normalizers/normalizer.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/normalizers/locale-route-normalizer.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/normalizers/request/pathname-normalizer.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/normalizers/request/suffix.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/normalizers/request/rsc.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/normalizers/request/next-data.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/after/builtin-request-context.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/normalizers/request/segment-prefix-rsc.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/route-modules/pages/builtin/_error.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/load-default-error-components.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/base-server.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/use-cache/cache-life.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/async-storage/work-store.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/web/http.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/client/components/hooks-server-context.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/route-modules/app-route/shared-modules.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/client/components/redirect-status-code.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/client/components/redirect-error.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/web/spec-extension/adapters/request-cookies.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/async-storage/draft-mode-provider.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/web/spec-extension/adapters/headers.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/app-render/cache-signal.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/app-render/dynamic-rendering.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/app-render/work-unit-async-storage-instance.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/lib/lazy-result.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/lib/implicit-tags.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/app-render/staged-rendering.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/app-render/work-unit-async-storage.external.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/build/templates/app-route.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/app-render/action-async-storage-instance.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/app-render/action-async-storage.external.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/route-modules/app-route/module.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/route-modules/app-route/module.compiled.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/build/segment-config/app/app-segments.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/build/swc/generated-native.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/build/swc/types.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/build/utils.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/build/rendering-mode.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/lib/router-utils/build-prefetch-segment-data-route.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/build/turborepo-access-trace/types.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/build/turborepo-access-trace/result.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/build/turborepo-access-trace/helpers.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/build/turborepo-access-trace/index.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/export/routes/types.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/export/types.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/export/worker.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/build/worker.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/build/index.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/lib/coalesced-function.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/lib/router-utils/types.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/trace/types.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/trace/trace.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/trace/shared.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/trace/index.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/build/load-jsconfig.d.ts","./node_modules/.pnpm/@next+env@16.1.6/node_modules/@next/env/dist/index.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/build/webpack/plugins/telemetry-plugin/use-cache-tracker-utils.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/build/webpack/plugins/telemetry-plugin/telemetry-plugin.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/telemetry/storage.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/build/build-context.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/build/webpack-config.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/dev/parse-version-info.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/next-devtools/shared/types.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/dev/dev-indicator-server-state.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/next-devtools/dev-overlay/cache-indicator.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/lib/parse-stack.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/next-devtools/server/shared.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/next-devtools/shared/stack-frame.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/next-devtools/dev-overlay/utils/get-error-by-type.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/next-devtools/dev-overlay/container/runtime-error/render-error.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/next-devtools/dev-overlay/shared.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/dev/debug-channel.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/dev/hot-reloader-types.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/web/spec-extension/fetch-event.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/web/spec-extension/response.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/build/segment-config/middleware/middleware-config.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/web/types.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/shared/lib/router/utils/parse-url.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/base-http/node.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/lib/async-callback-set.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/shared/lib/router/utils/route-regex.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/shared/lib/router/utils/route-matcher.d.ts","./node_modules/.pnpm/sharp@0.34.5/node_modules/sharp/lib/index.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/image-optimizer.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/next-server.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/lib/types.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/lib/lru-cache.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/lib/dev-bundler-service.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/dev/static-paths-worker.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/dev/next-dev-server.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/next.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/lib/render-server.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/lib/router-server.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/shared/lib/router/utils/path-match.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/lib/router-utils/filesystem.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/lib/router-utils/setup-dev-bundler.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/lib/router-utils/router-server-context.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/route-modules/route-module.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/load-components.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/web/adapter.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/app-render/types.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/build/webpack/loaders/metadata/types.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/build/webpack/loaders/next-app-loader/index.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/lib/app-dir-module.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/shared/lib/router/utils/parse-relative-url.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/app-render/app-render.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/route-modules/app-page/vendored/contexts/entrypoints.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/client/components/error-boundary.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/client/components/layout-router.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/client/components/render-from-template-context.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/client/components/client-page.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/client/components/client-segment.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/request/search-params.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/client/components/http-access-fallback/error-boundary.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/lib/metadata/types/alternative-urls-types.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/lib/metadata/types/extra-types.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/lib/metadata/types/metadata-types.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/lib/metadata/types/manifest-types.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/lib/metadata/types/opengraph-types.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/lib/metadata/types/twitter-types.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/lib/metadata/types/metadata-interface.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/lib/metadata/types/resolvers.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/lib/metadata/types/icons.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/lib/metadata/resolve-metadata.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/lib/metadata/metadata.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/lib/framework/boundary-components.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/app-render/rsc/preloads.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/app-render/rsc/postpone.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/app-render/rsc/taint.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/shared/lib/segment-cache/segment-value-encoding.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/app-render/collect-segment-data.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/next-devtools/userspace/app/segment-explorer-node.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/app-render/entry-base.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/build/templates/app-page.d.ts","./node_modules/.pnpm/@types+react@19.2.14/node_modules/@types/react/jsx-dev-runtime.d.ts","./node_modules/.pnpm/@types+react@19.2.14/node_modules/@types/react/compiler-runtime.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/route-modules/app-page/vendored/rsc/entrypoints.d.ts","./node_modules/.pnpm/@types+react-dom@19.2.3_@types+react@19.2.14/node_modules/@types/react-dom/client.d.ts","./node_modules/.pnpm/@types+react-dom@19.2.3_@types+react@19.2.14/node_modules/@types/react-dom/static.d.ts","./node_modules/.pnpm/@types+react-dom@19.2.3_@types+react@19.2.14/node_modules/@types/react-dom/server.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/route-modules/app-page/vendored/ssr/entrypoints.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/route-modules/app-page/module.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/request/fallback-params.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/request-meta.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/cli/next-test.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/shared/lib/size-limit.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/config-shared.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/base-http/index.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/api-utils/index.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/build/adapter/build-complete.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/types.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/shared/lib/html-context.shared-runtime.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/shared/lib/utils.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/lib/incremental-cache/index.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/after/after.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/after/after-context.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/app-render/work-async-storage-instance.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/app-render/create-error-handler.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/shared/lib/action-revalidation-kind.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/app-render/work-async-storage.external.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/request/params.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/client/components/unrecognized-action-error.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/client/components/redirect.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/client/components/not-found.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/client/components/forbidden.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/client/components/unauthorized.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/client/components/unstable-rethrow.server.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/client/components/unstable-rethrow.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/client/components/navigation.react-server.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/client/components/navigation.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/navigation.d.ts","./node_modules/.pnpm/fumadocs-ui@16.1.0_@types+react-dom@19.2.3_@types+react@19.2.14_next@16.1.6_react-dom@19.2.4__p7khta47lz3jqrc7k4gav3dphu/node_modules/fumadocs-ui/dist/components/card.d.ts","./node_modules/.pnpm/fumadocs-ui@16.1.0_@types+react-dom@19.2.3_@types+react@19.2.14_next@16.1.6_react-dom@19.2.4__p7khta47lz3jqrc7k4gav3dphu/node_modules/fumadocs-ui/dist/components/callout.d.ts","./node_modules/.pnpm/@radix-ui+react-roving-focus@1.1.11_@types+react-dom@19.2.3_@types+react@19.2.14_react-dom@19.2.4_react@19.2.4/node_modules/@radix-ui/react-roving-focus/dist/index.d.mts","./node_modules/.pnpm/@radix-ui+react-tabs@1.1.13_@types+react-dom@19.2.3_@types+react@19.2.14_react-dom@19.2.4_react@19.2.4/node_modules/@radix-ui/react-tabs/dist/index.d.mts","./node_modules/.pnpm/fumadocs-ui@16.1.0_@types+react-dom@19.2.3_@types+react@19.2.14_next@16.1.6_react-dom@19.2.4__p7khta47lz3jqrc7k4gav3dphu/node_modules/fumadocs-ui/dist/components/tabs.unstyled.d.ts","./node_modules/.pnpm/fumadocs-ui@16.1.0_@types+react-dom@19.2.3_@types+react@19.2.14_next@16.1.6_react-dom@19.2.4__p7khta47lz3jqrc7k4gav3dphu/node_modules/fumadocs-ui/dist/components/codeblock.d.ts","./node_modules/.pnpm/fumadocs-ui@16.1.0_@types+react-dom@19.2.3_@types+react@19.2.14_next@16.1.6_react-dom@19.2.4__p7khta47lz3jqrc7k4gav3dphu/node_modules/fumadocs-ui/dist/mdx.server.d.ts","./node_modules/.pnpm/fumadocs-ui@16.1.0_@types+react-dom@19.2.3_@types+react@19.2.14_next@16.1.6_react-dom@19.2.4__p7khta47lz3jqrc7k4gav3dphu/node_modules/fumadocs-ui/dist/mdx.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/styled-jsx/types/css.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/styled-jsx/types/macro.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/styled-jsx/types/style.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/styled-jsx/types/global.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/styled-jsx/types/index.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/pages/_app.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/app.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/web/spec-extension/unstable-cache.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/web/spec-extension/revalidate.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/web/spec-extension/unstable-no-store.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/use-cache/cache-tag.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/cache.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/pages/_document.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/document.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/shared/lib/dynamic.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dynamic.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/pages/_error.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/error.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/shared/lib/head.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/head.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/request/cookies.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/request/headers.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/request/draft-mode.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/headers.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/client/link.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/link.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/router.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/client/script.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/script.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/web/spec-extension/user-agent.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/compiled/@edge-runtime/primitives/url.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/web/spec-extension/image-response.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/compiled/@vercel/og/satori/index.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/compiled/@vercel/og/emoji/index.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/compiled/@vercel/og/types.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/after/index.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/dist/server/request/connection.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/server.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/types/global.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/types/compiled.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/types.d.ts","./node_modules/.pnpm/next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/next/index.d.ts","./components/copymarkdownbutton.tsx","./components/lastupdated.tsx","./node_modules/.pnpm/fumadocs-core@16.1.0_@types+react@19.2.14_next@16.1.6_react-dom@19.2.4_react@19.2.4/node_modules/fumadocs-core/dist/content/github.d.ts","./app/[[...slug]]/page.tsx","./components/changelog.tsx","./node_modules/.pnpm/@types+mdx@2.0.13/node_modules/@types/mdx/index.d.ts"],"fileIdsList":[[65,313,317,319,398,452,469,470],[64,65,321,385,389,398,452,469,470],[65,321,394,398,452,469,470,776,784,826,827,828,829],[65,321,355,398,452,469,470],[64,65,372,398,452,469,470],[64,65,398,452,469,470],[65,398,452,469,470],[65,383,388,398,452,469,470],[65,311,318,320,398,452,469,470],[162,163,164,167,169,170,171,398,452,469,470],[73,162,216,398,452,469,470],[67,69,78,79,111,114,117,131,159,161,216,217,221,398,452,469,470],[73,168,169,216,398,452,469,470],[398,452,469,470],[168,169,398,452,469,470],[164,167,168,398,452,469,470],[324,331,332,335,337,349,398,452,469,470],[328,336,348,398,452,469,470],[324,336,398,452,469,470],[322,324,325,326,327,328,329,330,336,398,452,469,470],[336,398,452,469,470],[324,398,452,469,470],[333,336,398,452,469,470],[322,333,334,336,338,339,340,341,342,343,344,345,346,347,350,352,398,452,469,470],[335,348,351,398,452,469,470],[331,332,336,337,398,452,469,470],[336,340,398,452,469,470],[330,336,353,398,452,469,470],[336,353,398,452,469,470],[322,336,398,452,469,470],[322,323,324,328,330,331,332,333,334,335,337,398,452,469,470],[64,358,359,398,452,469,470],[64,398,452,469,470],[64,358,359,360,361,362,398,452,469,470],[64,359,398,452,469,470],[64,358,359,398,452,469,470,779],[80,111,114,117,159,191,198,398,452,469,470],[190,191,398,452,469,470],[191,398,452,469,470],[190,191,205,206,207,398,452,469,470],[190,191,205,398,452,469,470],[209,398,452,469,470],[78,80,111,114,117,159,191,211,212,398,452,469,470],[80,111,114,117,159,211,398,452,469,470],[80,111,114,117,159,190,398,452,469,470],[68,69,398,452,469,470],[66,398,452,469,470],[168,398,452,469,470,832],[398,449,450,452,469,470],[398,451,452,469,470],[452,469,470],[398,452,457,469,470,487],[398,452,453,458,463,469,470,472,484,495],[398,452,453,454,463,469,470,472],[398,452,455,469,470,496],[398,452,456,457,464,469,470,473],[398,452,457,469,470,484,492],[398,452,458,460,463,469,470,472],[398,451,452,459,469,470],[398,452,460,461,469,470],[398,452,462,463,469,470],[398,451,452,463,469,470],[398,452,463,464,465,469,470,484,495],[398,452,463,464,465,469,470,479,484,487],[398,444,452,460,463,466,469,470,472,484,495],[398,452,463,464,466,467,469,470,472,484,492,495],[398,452,466,468,469,470,484,492,495],[396,397,398,399,400,401,402,403,445,446,447,448,449,450,451,452,453,454,455,456,457,458,459,460,461,462,463,464,465,466,467,468,469,470,471,472,473,474,475,476,477,478,479,480,481,482,483,484,485,486,487,488,489,490,491,492,493,494,495,496,497,498,499,500,501],[398,452,463,469,470],[398,452,469,470,471,495],[398,452,460,463,469,470,472,484],[398,452,469,470,473],[398,452,469,470,474],[398,451,452,469,470,475],[398,449,450,451,452,453,454,455,456,457,458,459,460,461,462,463,464,465,466,467,468,469,470,471,472,473,474,475,476,477,478,479,480,481,482,483,484,485,486,487,488,489,490,491,492,493,494,495,496,497,498,499,500,501],[398,452,469,470,477],[398,452,469,470,478],[398,452,463,469,470,479,480],[398,452,469,470,479,481,496,498],[398,452,464,469,470],[398,452,463,469,470,484,485,487],[398,452,469,470,486,487],[398,452,469,470,484,485],[398,452,469,470,487],[398,452,469,470,488],[398,449,452,469,470,484,489,495],[398,452,463,469,470,490,491],[398,452,469,470,490,491],[398,452,457,469,470,472,484,492],[398,452,469,470,493],[398,452,469,470,472,494],[398,452,466,469,470,478,495],[398,452,457,469,470,496],[398,452,469,470,484,497],[398,452,469,470,471,498],[398,452,469,470,499],[398,452,457,469,470],[398,444,452,469,470],[398,452,469,470,500],[398,444,452,463,465,469,470,475,484,487,495,497,498,500],[398,452,469,470,484,501],[64,398,452,469,470,503,504,505,507,756,788,819],[64,398,452,469,470,503,504,505,506,743,756,788,819],[64,398,452,469,470,503,504,506,507,756,788,819],[64,398,452,469,470,507,743,744],[64,398,452,469,470,507,743],[64,398,452,469,470,504,505,506,507,756,788,819],[64,398,452,469,470,503,505,506,507,756,788,819],[62,63,398,452,469,470],[305,307,398,452,464,469,470],[305,306,398,452,463,464,469,470],[64,308,398,452,469,470],[64,65,370,398,452,469,470],[64,308,309,398,452,469,470],[67,111,114,117,159,216,217,221,398,452,469,470],[67,78,80,111,114,117,159,189,211,213,214,215,216,217,218,219,220,221,222,223,224,225,226,398,452,469,470],[78,80,111,114,117,159,211,213,398,452,469,470],[78,80,111,114,117,159,398,452,469,470],[67,78,111,114,117,159,216,217,221,398,452,469,470],[67,73,78,111,114,117,159,216,217,221,398,452,469,470],[64,67,78,111,114,117,159,216,217,221,308,309,310,353,354,398,452,469,470],[64,308,309,310,398,452,469,470],[67,73,78,111,114,117,159,168,172,173,216,217,221,227,304,307,311,312,313,314,398,452,469,470],[73,78,172,173,216,227,304,307,311,313,398,452,469,470],[67,111,114,117,159,168,216,217,221,312,398,452,469,470],[64,65,398,452,469,470,781],[64,65,364,365,398,452,469,470],[64,65,354,363,364,398,452,469,470],[64,65,379,398,452,469,470],[64,65,374,375,376,377,398,452,469,470],[64,65,398,452,469,470,780],[64,65,380,398,452,469,470],[64,65,374,378,379,380,383,384,398,452,469,470],[64,65,374,391,398,452,469,470],[64,65,312,392,398,452,469,470],[64,65,383,398,452,469,470],[64,309,381,382,398,452,469,470],[64,65,398,452,469,470,777,778,782,783],[64,311,398,452,469,470,784],[64,65,312,393,398,452,469,470],[64,65,357,364,366,367,398,452,469,470],[64,65,368,371,398,452,469,470],[64,374,398,452,469,470],[121,122,128,398,452,469,470],[69,80,111,114,117,129,159,398,452,469,470],[81,82,112,115,118,119,120,398,452,469,470],[69,111,129,398,452,469,470],[69,114,129,398,452,469,470],[117,129,398,452,469,470],[68,69,80,111,114,117,129,159,398,452,469,470],[68,69,80,111,114,117,127,159,398,452,469,470],[197,398,452,469,470],[80,111,114,117,127,159,196,398,452,469,470],[165,166,398,452,469,470],[80,111,114,117,159,165,167,398,452,469,470],[83,84,85,86,176,179,398,452,469,470],[67,83,84,86,111,114,117,159,176,179,216,217,221,398,452,469,470],[67,83,86,111,114,117,159,176,179,216,217,221,398,452,469,470],[109,114,181,185,398,452,469,470],[86,109,114,182,185,398,452,469,470],[86,109,114,182,184,398,452,469,470],[67,86,109,111,114,117,159,182,183,185,216,217,221,398,452,469,470],[182,185,186,398,452,469,470],[86,109,114,182,185,187,398,452,469,470],[67,69,80,110,111,114,117,159,216,217,221,398,452,469,470],[66,67,69,80,86,109,111,113,114,117,159,182,185,216,217,221,398,452,469,470],[67,69,80,111,114,116,117,159,216,217,221,398,452,469,470],[86,109,114,117,182,185,398,452,469,470],[67,80,111,114,117,132,133,157,158,159,216,217,221,398,452,469,470],[80,111,114,117,132,159,398,452,469,470],[67,80,111,114,117,132,159,216,217,221,398,452,469,470],[134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,398,452,469,470],[67,73,80,111,114,117,133,159,216,217,221,398,452,469,470],[87,88,108,398,452,469,470],[67,109,111,114,117,159,182,185,216,217,221,398,452,469,470],[89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,398,452,469,470],[66,67,111,114,117,159,216,217,221,398,452,469,470],[83,86,174,175,179,398,452,469,470],[83,86,176,179,398,452,469,470],[83,86,176,177,178,398,452,469,470],[398,452,469,470,790],[398,452,469,470,792,793,794,795],[398,452,469,470,512,514,521,543,643,653,752],[398,452,469,470,514,538,539,540,542,752],[398,452,469,470,514,659,661,663,664,666,752,754],[398,452,469,470,514,520,521,525,531,535,536,642,643,644,652,752,754],[398,452,469,470,752],[398,452,469,470,530,539,559,638,766],[398,452,469,470,514],[398,452,469,470,508,530,766],[398,452,469,470,641],[398,452,469,470,640,752],[398,452,466,469,470,559,738,824],[398,452,466,469,470,620,633,638,765],[398,452,466,469,470,596],[398,452,469,470,646],[398,452,469,470,645,646,647],[398,452,469,470,645],[395,398,452,466,469,470,508,514,521,525,531,537,539,543,544,557,558,617,639,641,653,752,756],[398,452,469,470,512,514,541,577,659,660,665,752,824],[398,452,469,470,541,824],[398,452,469,470,512,558,707,752,824],[398,452,469,470,824],[398,452,469,470,514,541,542,824],[398,452,469,470,662,824],[398,452,469,470,544,642,651],[65,398,452,469,470,478,766],[65,398,452,469,470,766],[64,398,452,469,470,713],[398,452,469,470,584,593,594,766,767,774],[398,452,469,470,583,623,768,769,770,771,773],[398,452,469,470,622],[398,452,469,470,622,623],[398,452,469,470,520,530,586,590],[398,452,469,470,530],[398,452,469,470,530,589,591],[398,452,469,470,530,586,587,588],[398,452,469,470,772],[64,369,370,398,452,469,470],[64,398,452,469,470,495],[64,398,452,469,470,541,575],[64,398,452,469,470,541,653],[398,452,469,470,573,578],[64,398,452,469,470,574,758],[64,398,452,466,469,470,502,503,504,505,506,507,756,788,817,818],[398,452,466,469,470],[398,452,466,469,470,521,524,599,616,648,649,653,704,706,752,753],[398,452,469,470,557,650],[398,452,469,470,756],[398,452,469,470,513],[64,398,452,469,470,709,711,718,727,729,765],[398,452,469,470,478,709,711,726,727,728,765,823],[398,452,469,470,720,721,722,723,724,725],[398,452,469,470,722],[398,452,469,470,726],[65,398,452,469,470,673,674,676],[64,398,452,469,470,667,668,669,670,675],[398,452,469,470,673,675],[398,452,469,470,671],[398,452,469,470,672],[64,65,398,452,469,470,574,758],[64,65,398,452,469,470,757,758],[64,65,398,452,469,470,758],[398,452,469,470,616,760],[398,452,469,470,760],[398,452,466,469,470,753,758],[398,452,469,470,636],[398,451,452,469,470,635],[398,452,469,470,526,528,530,631,633,706,710,747,748,749,753,765],[398,452,469,470,530,568,735],[398,452,469,470,633,765],[64,398,452,469,470,620,633,636,714,715,716,717,718,719,730,731,732,733,734,736,737,765,766,824],[398,452,469,470,628],[369,398,452,466,469,470,478,524,533,566,569,616,617,670,704,705,747,752,753,754,756,759,824],[398,452,469,470,765],[398,451,452,469,470,539,566,617,630,753,759,761,762,763,764],[398,452,469,470,633],[398,451,452,469,470,524,528,564,624,625,626,627,628,629,631,632,748,765,766],[398,452,466,469,470,564,565,624,753,754],[398,452,469,470,539,616,617,706,753,759,765],[398,452,466,469,470,752,754],[398,452,466,469,470,484,749,753,754],[398,452,466,469,470,478,495,508,521,526,528,531,533,541,561,566,567,568,569,599,600,602,605,607,610,611,612,613,615,653,704,706,749,752,753,754,759,766],[398,452,466,469,470,484],[369,398,452,469,470,514,515,537,749,750,751,756,758,824],[398,452,469,470,512,752],[398,452,469,470,678],[398,452,466,469,470,484,495,518,641,666,667,668,669,670,676,677,824],[398,452,469,470,478,495,508,518,528,531,600,605,615,616,659,682,683,684,690,693,694,704,706,749,752,759,766],[398,452,469,470,531,537,544,557,617,752,759],[369,398,452,466,469,470,495,521,528,688,749,752],[398,452,469,470,708],[398,452,466,469,470,678,691,692,701],[398,452,469,470,749,752],[398,452,469,470,630,748],[398,452,469,470,528,566,653,758],[398,452,466,469,470,478,605,655,659,684,690,693,696,749],[398,452,466,469,470,544,557,659,697],[398,452,469,470,514,567,653,699,752],[398,452,466,469,470,495,670,752],[398,452,466,469,470,541,567,653,654,655,664,678,698,700,752],[395,398,452,466,469,470,566,703,756,758],[398,452,469,470,614,704],[398,452,466,469,470,478,495,519,521,526,528,533,543,544,557,569,600,602,612,615,616,653,682,683,684,685,687,689,704,706,749,758,759,766],[398,452,466,469,470,484,544,690,695,701,749],[398,452,469,470,547,548,549,550,551,552,553,554,555,556],[398,452,469,470,561,606],[398,452,469,470,608],[398,452,469,470,606],[398,452,469,470,608,609],[398,452,466,469,470,520,521,524,525,753],[369,398,452,466,469,470,478,513,526,529,566,568,569,598,704,749,754,756,758],[398,452,466,469,470,478,495,516,519,520,528,529,748,753,759],[398,452,469,470,624],[398,452,469,470,625],[398,452,469,470,530,531,747],[398,452,469,470,626],[398,452,469,470,517,527],[398,452,466,469,470,517,521,526],[398,452,469,470,522,527],[398,452,469,470,523],[398,452,469,470,517,518],[398,452,469,470,517,570],[398,452,469,470,517],[398,452,469,470,519,561,604],[398,452,469,470,603],[398,452,469,470,518,519,766],[398,452,469,470,519,601],[398,452,469,470,518,766],[398,452,469,470,747],[398,452,469,470,521,526,528,530,532,566,643,653,703,706,709,711,712,739,742,746,748,749,753],[398,452,469,470,579,582,584,585,593,594],[64,65,398,452,469,470,505,507,740,741],[64,65,398,452,469,470,505,507,740,741,745],[398,452,469,470,637],[398,452,469,470,539,560,565,566,618,619,620,621,623,633,634,636,639,653,703,706,752,765],[398,452,469,470,593],[398,452,466,469,470,598],[398,452,469,470,598],[398,452,466,469,470,526,571,595,597,599,703,749,756,758],[398,452,469,470,579,580,581,582,584,585,593,594,757],[395,398,452,466,469,470,478,495,517,518,528,533,566,569,653,701,702,704,749,752,753,756,759],[398,452,469,470,565,679,682,759],[398,452,466,469,470,561,752],[398,452,469,470,564,633],[398,452,469,470,563],[398,452,469,470,565,612],[398,452,469,470,562,564,752],[398,452,466,469,470,516,565,679,680,681,752,753],[64,398,452,469,470,530,592,766],[398,452,469,470,510,511],[64,369,398,452,469,470],[64,398,452,469,470,583,766],[64,395,398,452,469,470,566,569,756,758],[369,370,386,398,452,469,470],[64,398,452,469,470,578],[64,398,452,469,470,478,495,513,572,574,576,577,758],[398,452,469,470,541,753,766],[398,452,469,470,686,766],[64,398,452,464,466,469,470,478,512,513,578,661,756,757],[64,398,452,469,470,503,504,505,506,507,756,819],[64,398,452,469,470,785,786,787,788],[398,452,469,470,656,657,658],[398,452,469,470,656],[64,398,452,466,468,469,470,478,502,503,504,505,506,507,508,513,533,696,726,754,755,758,788,819],[398,452,469,470,797],[398,452,469,470,799],[398,452,469,470,801],[398,452,469,470,803],[398,452,469,470,805,806,807],[387,398,452,469,470],[388,398,452,469,470,776,789,791,796,798,800,802,804,808,810,811,813,822,823,824,825],[398,452,469,470,809],[398,452,469,470,775],[398,452,469,470,574],[398,452,469,470,812],[398,451,452,469,470,565,679,680,682,814,815,816,819,820,821],[398,452,469,470,502],[204,398,452,469,470],[124,125,126,398,452,469,470],[123,127,398,452,469,470],[127,398,452,469,470],[398,452,464,469,470,484],[129,130,398,452,469,470],[68,69,80,111,114,117,131,159,398,452,469,470],[180,187,188,398,452,469,470],[189,398,452,469,470],[159,160,398,452,469,470],[67,73,78,80,111,114,117,159,216,217,221,398,452,469,470],[398,452,469,470,484,502],[80,111,114,117,159,191,192,199,200,398,452,469,470],[80,111,114,117,159,191,192,199,200,201,202,203,208,210,398,452,469,470],[199,398,452,469,470],[191,192,199,200,202,398,452,469,470],[195,398,452,469,470],[193,398,452,469,470],[193,194,398,452,469,470],[75,398,452,469,470],[398,410,413,416,417,452,469,470,495],[398,413,452,469,470,484,495],[398,413,417,452,469,470,495],[398,452,469,470,484],[398,407,452,469,470],[398,411,452,469,470],[398,409,410,413,452,469,470,495],[398,452,469,470,472,492],[398,407,452,469,470,502],[398,409,413,452,469,470,472,495],[398,404,405,406,408,412,452,463,469,470,484,495],[398,413,421,429,452,469,470],[398,405,411,452,469,470],[398,413,438,439,452,469,470],[398,405,408,413,452,469,470,487,495,502],[398,413,452,469,470],[398,409,413,452,469,470,495],[398,404,452,469,470],[398,407,408,409,411,412,413,414,415,417,418,419,420,421,422,423,424,425,426,427,428,429,430,431,432,433,434,435,436,437,439,440,441,442,443,452,469,470],[398,413,431,434,452,460,469,470],[398,413,421,422,423,452,469,470],[398,411,413,422,424,452,469,470],[398,412,452,469,470],[398,405,407,413,452,469,470],[398,413,417,422,424,452,469,470],[398,417,452,469,470],[398,411,413,416,452,469,470,495],[398,405,409,413,421,452,469,470],[398,413,431,452,469,470],[398,424,452,469,470],[398,407,413,438,452,469,470,487,500,502],[73,77,216,398,452,469,470],[66,73,74,76,78,216,398,452,469,470],[70,398,452,469,470],[71,72,398,452,469,470],[66,71,73,216,398,452,469,470],[303,398,452,469,470],[294,398,452,469,470],[294,297,398,452,469,470],[289,292,294,295,296,297,298,299,300,301,302,398,452,469,470],[228,230,297,398,452,469,470],[294,295,398,452,469,470],[229,294,296,398,452,469,470],[230,232,234,235,236,237,398,452,469,470],[232,234,236,237,398,452,469,470],[232,234,236,398,452,469,470],[229,232,234,235,237,398,452,469,470],[228,230,231,232,233,234,235,236,237,238,239,289,290,291,292,293,398,452,469,470],[228,230,231,234,398,452,469,470],[230,231,234,398,452,469,470],[234,237,398,452,469,470],[228,229,231,232,233,235,236,237,398,452,469,470],[228,229,230,234,294,398,452,469,470],[234,235,236,237,398,452,469,470],[236,398,452,469,470],[240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,398,452,469,470],[65,315,316,398,452,469,470]],"fileInfos":[{"version":"c430d44666289dae81f30fa7b2edebf186ecc91a2d4c71266ea6ae76388792e1","affectsGlobalScope":true,"impliedFormat":1},{"version":"45b7ab580deca34ae9729e97c13cfd999df04416a79116c3bfb483804f85ded4","impliedFormat":1},{"version":"3facaf05f0c5fc569c5649dd359892c98a85557e3e0c847964caeb67076f4d75","impliedFormat":1},{"version":"e44bb8bbac7f10ecc786703fe0a6a4b952189f908707980ba8f3c8975a760962","impliedFormat":1},{"version":"5e1c4c362065a6b95ff952c0eab010f04dcd2c3494e813b493ecfd4fcb9fc0d8","impliedFormat":1},{"version":"68d73b4a11549f9c0b7d352d10e91e5dca8faa3322bfb77b661839c42b1ddec7","impliedFormat":1},{"version":"5efce4fc3c29ea84e8928f97adec086e3dc876365e0982cc8479a07954a3efd4","impliedFormat":1},{"version":"feecb1be483ed332fad555aff858affd90a48ab19ba7272ee084704eb7167569","impliedFormat":1},{"version":"ee7bad0c15b58988daa84371e0b89d313b762ab83cb5b31b8a2d1162e8eb41c2","impliedFormat":1},{"version":"080941d9f9ff9307f7e27a83bcd888b7c8270716c39af943532438932ec1d0b9","affectsGlobalScope":true,"impliedFormat":1},{"version":"2e80ee7a49e8ac312cc11b77f1475804bee36b3b2bc896bead8b6e1266befb43","affectsGlobalScope":true,"impliedFormat":1},{"version":"c57796738e7f83dbc4b8e65132f11a377649c00dd3eee333f672b8f0a6bea671","affectsGlobalScope":true,"impliedFormat":1},{"version":"dc2df20b1bcdc8c2d34af4926e2c3ab15ffe1160a63e58b7e09833f616efff44","affectsGlobalScope":true,"impliedFormat":1},{"version":"515d0b7b9bea2e31ea4ec968e9edd2c39d3eebf4a2d5cbd04e88639819ae3b71","affectsGlobalScope":true,"impliedFormat":1},{"version":"0559b1f683ac7505ae451f9a96ce4c3c92bdc71411651ca6ddb0e88baaaad6a3","affectsGlobalScope":true,"impliedFormat":1},{"version":"0dc1e7ceda9b8b9b455c3a2d67b0412feab00bd2f66656cd8850e8831b08b537","affectsGlobalScope":true,"impliedFormat":1},{"version":"ce691fb9e5c64efb9547083e4a34091bcbe5bdb41027e310ebba8f7d96a98671","affectsGlobalScope":true,"impliedFormat":1},{"version":"8d697a2a929a5fcb38b7a65594020fcef05ec1630804a33748829c5ff53640d0","affectsGlobalScope":true,"impliedFormat":1},{"version":"4ff2a353abf8a80ee399af572debb8faab2d33ad38c4b4474cff7f26e7653b8d","affectsGlobalScope":true,"impliedFormat":1},{"version":"fb0f136d372979348d59b3f5020b4cdb81b5504192b1cacff5d1fbba29378aa1","affectsGlobalScope":true,"impliedFormat":1},{"version":"d15bea3d62cbbdb9797079416b8ac375ae99162a7fba5de2c6c505446486ac0a","affectsGlobalScope":true,"impliedFormat":1},{"version":"68d18b664c9d32a7336a70235958b8997ebc1c3b8505f4f1ae2b7e7753b87618","affectsGlobalScope":true,"impliedFormat":1},{"version":"eb3d66c8327153d8fa7dd03f9c58d351107fe824c79e9b56b462935176cdf12a","affectsGlobalScope":true,"impliedFormat":1},{"version":"38f0219c9e23c915ef9790ab1d680440d95419ad264816fa15009a8851e79119","affectsGlobalScope":true,"impliedFormat":1},{"version":"69ab18c3b76cd9b1be3d188eaf8bba06112ebbe2f47f6c322b5105a6fbc45a2e","affectsGlobalScope":true,"impliedFormat":1},{"version":"a680117f487a4d2f30ea46f1b4b7f58bef1480456e18ba53ee85c2746eeca012","affectsGlobalScope":true,"impliedFormat":1},{"version":"2f11ff796926e0832f9ae148008138ad583bd181899ab7dd768a2666700b1893","affectsGlobalScope":true,"impliedFormat":1},{"version":"4de680d5bb41c17f7f68e0419412ca23c98d5749dcaaea1896172f06435891fc","affectsGlobalScope":true,"impliedFormat":1},{"version":"954296b30da6d508a104a3a0b5d96b76495c709785c1d11610908e63481ee667","affectsGlobalScope":true,"impliedFormat":1},{"version":"ac9538681b19688c8eae65811b329d3744af679e0bdfa5d842d0e32524c73e1c","affectsGlobalScope":true,"impliedFormat":1},{"version":"0a969edff4bd52585473d24995c5ef223f6652d6ef46193309b3921d65dd4376","affectsGlobalScope":true,"impliedFormat":1},{"version":"9e9fbd7030c440b33d021da145d3232984c8bb7916f277e8ffd3dc2e3eae2bdb","affectsGlobalScope":true,"impliedFormat":1},{"version":"811ec78f7fefcabbda4bfa93b3eb67d9ae166ef95f9bff989d964061cbf81a0c","affectsGlobalScope":true,"impliedFormat":1},{"version":"717937616a17072082152a2ef351cb51f98802fb4b2fdabd32399843875974ca","affectsGlobalScope":true,"impliedFormat":1},{"version":"d7e7d9b7b50e5f22c915b525acc5a49a7a6584cf8f62d0569e557c5cfc4b2ac2","affectsGlobalScope":true,"impliedFormat":1},{"version":"71c37f4c9543f31dfced6c7840e068c5a5aacb7b89111a4364b1d5276b852557","affectsGlobalScope":true,"impliedFormat":1},{"version":"576711e016cf4f1804676043e6a0a5414252560eb57de9faceee34d79798c850","affectsGlobalScope":true,"impliedFormat":1},{"version":"89c1b1281ba7b8a96efc676b11b264de7a8374c5ea1e6617f11880a13fc56dc6","affectsGlobalScope":true,"impliedFormat":1},{"version":"74f7fa2d027d5b33eb0471c8e82a6c87216223181ec31247c357a3e8e2fddc5b","affectsGlobalScope":true,"impliedFormat":1},{"version":"d6d7ae4d1f1f3772e2a3cde568ed08991a8ae34a080ff1151af28b7f798e22ca","affectsGlobalScope":true,"impliedFormat":1},{"version":"063600664504610fe3e99b717a1223f8b1900087fab0b4cad1496a114744f8df","affectsGlobalScope":true,"impliedFormat":1},{"version":"934019d7e3c81950f9a8426d093458b65d5aff2c7c1511233c0fd5b941e608ab","affectsGlobalScope":true,"impliedFormat":1},{"version":"52ada8e0b6e0482b728070b7639ee42e83a9b1c22d205992756fe020fd9f4a47","affectsGlobalScope":true,"impliedFormat":1},{"version":"3bdefe1bfd4d6dee0e26f928f93ccc128f1b64d5d501ff4a8cf3c6371200e5e6","affectsGlobalScope":true,"impliedFormat":1},{"version":"59fb2c069260b4ba00b5643b907ef5d5341b167e7d1dbf58dfd895658bda2867","affectsGlobalScope":true,"impliedFormat":1},{"version":"639e512c0dfc3fad96a84caad71b8834d66329a1f28dc95e3946c9b58176c73a","affectsGlobalScope":true,"impliedFormat":1},{"version":"368af93f74c9c932edd84c58883e736c9e3d53cec1fe24c0b0ff451f529ceab1","affectsGlobalScope":true,"impliedFormat":1},{"version":"af3dd424cf267428f30ccfc376f47a2c0114546b55c44d8c0f1d57d841e28d74","affectsGlobalScope":true,"impliedFormat":1},{"version":"995c005ab91a498455ea8dfb63aa9f83fa2ea793c3d8aa344be4a1678d06d399","affectsGlobalScope":true,"impliedFormat":1},{"version":"959d36cddf5e7d572a65045b876f2956c973a586da58e5d26cde519184fd9b8a","affectsGlobalScope":true,"impliedFormat":1},{"version":"965f36eae237dd74e6cca203a43e9ca801ce38824ead814728a2807b1910117d","affectsGlobalScope":true,"impliedFormat":1},{"version":"3925a6c820dcb1a06506c90b1577db1fdbf7705d65b62b99dce4be75c637e26b","affectsGlobalScope":true,"impliedFormat":1},{"version":"0a3d63ef2b853447ec4f749d3f368ce642264246e02911fcb1590d8c161b8005","affectsGlobalScope":true,"impliedFormat":1},{"version":"8cdf8847677ac7d20486e54dd3fcf09eda95812ac8ace44b4418da1bbbab6eb8","affectsGlobalScope":true,"impliedFormat":1},{"version":"8444af78980e3b20b49324f4a16ba35024fef3ee069a0eb67616ea6ca821c47a","affectsGlobalScope":true,"impliedFormat":1},{"version":"3287d9d085fbd618c3971944b65b4be57859f5415f495b33a6adc994edd2f004","affectsGlobalScope":true,"impliedFormat":1},{"version":"b4b67b1a91182421f5df999988c690f14d813b9850b40acd06ed44691f6727ad","affectsGlobalScope":true,"impliedFormat":1},{"version":"51ad4c928303041605b4d7ae32e0c1ee387d43a24cd6f1ebf4a2699e1076d4fa","affectsGlobalScope":true,"impliedFormat":1},{"version":"196cb558a13d4533a5163286f30b0509ce0210e4b316c56c38d4c0fd2fb38405","affectsGlobalScope":true,"impliedFormat":1},{"version":"8e7f8264d0fb4c5339605a15daadb037bf238c10b654bb3eee14208f860a32ea","affectsGlobalScope":true,"impliedFormat":1},{"version":"782dec38049b92d4e85c1585fbea5474a219c6984a35b004963b00beb1aab538","affectsGlobalScope":true,"impliedFormat":1},{"version":"7e29f41b158de217f94cb9676bf9cbd0cd9b5a46e1985141ed36e075c52bf6ad","affectsGlobalScope":true,"impliedFormat":1},{"version":"ac51dd7d31333793807a6abaa5ae168512b6131bd41d9c5b98477fc3b7800f9f","impliedFormat":1},{"version":"dc0a7f107690ee5cd8afc8dbf05c4df78085471ce16bdd9881642ec738bc81fe","impliedFormat":1},{"version":"42c169fb8c2d42f4f668c624a9a11e719d5d07dacbebb63cbcf7ef365b0a75b3","impliedFormat":1},{"version":"89121c1bf2990f5219bfd802a3e7fc557de447c62058d6af68d6b6348d64499a","impliedFormat":1},{"version":"d4a22007b481fe2a2e6bfd3a42c00cd62d41edb36d30fc4697df2692e9891fc8","impliedFormat":1},{"version":"151ff381ef9ff8da2da9b9663ebf657eac35c4c9a19183420c05728f31a6761d","impliedFormat":1},{"version":"5d08a179b846f5ee674624b349ebebe2121c455e3a265dc93da4e8d9e89722b4","impliedFormat":1},{"version":"2b37ba54ec067598bf912d56fcb81f6d8ad86a045c757e79440bdef97b52fe1b","impliedFormat":99},{"version":"1bc9dd465634109668661f998485a32da369755d9f32b5a55ed64a525566c94b","impliedFormat":99},{"version":"5702b3c2f5d248290ed99419d77ca1cc3e6c29db5847172377659c50e6303768","impliedFormat":99},{"version":"9764b2eb5b4fc0b8951468fb3dbd6cd922d7752343ef5fbf1a7cd3dfcd54a75e","impliedFormat":99},{"version":"1fc2d3fe8f31c52c802c4dee6c0157c5a1d1f6be44ece83c49174e316cf931ad","impliedFormat":99},{"version":"dc4aae103a0c812121d9db1f7a5ea98231801ed405bf577d1c9c46a893177e36","impliedFormat":99},{"version":"106d3f40907ba68d2ad8ce143a68358bad476e1cc4a5c710c11c7dbaac878308","impliedFormat":99},{"version":"42ad582d92b058b88570d5be95393cf0a6c09a29ba9aa44609465b41d39d2534","impliedFormat":99},{"version":"36e051a1e0d2f2a808dbb164d846be09b5d98e8b782b37922a3b75f57ee66698","impliedFormat":99},{"version":"89dcbbf69b16cd94043e16c7fbcfa04256577ec98bb8ae894833d2a922394db4","impliedFormat":1},{"version":"79b4369233a12c6fa4a07301ecb7085802c98f3a77cf9ab97eee27e1656f82e6","impliedFormat":1},{"version":"d9a75d09e41d52d7e1c8315cc637f995820a4a18a7356a0d30b1bed6d798aa70","impliedFormat":99},{"version":"a76819b2b56ccfc03484098828bdfe457bc16adb842f4308064a424cb8dba3e4","impliedFormat":99},{"version":"a5dbd4c9941b614526619bad31047ddd5f504ec4cdad88d6117b549faef34dd3","impliedFormat":99},{"version":"011423c04bfafb915ceb4faec12ea882d60acbe482780a667fa5095796c320f8","impliedFormat":99},{"version":"f8eb2909590ec619643841ead2fc4b4b183fbd859848ef051295d35fef9d8469","impliedFormat":99},{"version":"fe784567dd721417e2c4c7c1d7306f4b8611a4f232f5b7ce734382cf34b417d2","impliedFormat":99},{"version":"45d1e8fb4fd3e265b15f5a77866a8e21870eae4c69c473c33289a4b971e93704","impliedFormat":99},{"version":"cd40919f70c875ca07ecc5431cc740e366c008bcbe08ba14b8c78353fb4680df","impliedFormat":99},{"version":"ddfd9196f1f83997873bbe958ce99123f11b062f8309fc09d9c9667b2c284391","impliedFormat":99},{"version":"2999ba314a310f6a333199848166d008d088c6e36d090cbdcc69db67d8ae3154","impliedFormat":99},{"version":"62c1e573cd595d3204dfc02b96eba623020b181d2aa3ce6a33e030bc83bebb41","impliedFormat":99},{"version":"ca1616999d6ded0160fea978088a57df492b6c3f8c457a5879837a7e68d69033","impliedFormat":99},{"version":"835e3d95251bbc48918bb874768c13b8986b87ea60471ad8eceb6e38ddd8845e","impliedFormat":99},{"version":"de54e18f04dbcc892a4b4241b9e4c233cfce9be02ac5f43a631bbc25f479cd84","impliedFormat":99},{"version":"453fb9934e71eb8b52347e581b36c01d7751121a75a5cd1a96e3237e3fd9fc7e","impliedFormat":99},{"version":"bc1a1d0eba489e3eb5c2a4aa8cd986c700692b07a76a60b73a3c31e52c7ef983","impliedFormat":99},{"version":"4098e612efd242b5e203c5c0b9afbf7473209905ab2830598be5c7b3942643d0","impliedFormat":99},{"version":"28410cfb9a798bd7d0327fbf0afd4c4038799b1d6a3f86116dc972e31156b6d2","impliedFormat":99},{"version":"514ae9be6724e2164eb38f2a903ef56cf1d0e6ddb62d0d40f155f32d1317c116","impliedFormat":99},{"version":"970e5e94a9071fd5b5c41e2710c0ef7d73e7f7732911681592669e3f7bd06308","impliedFormat":99},{"version":"491fb8b0e0aef777cec1339cb8f5a1a599ed4973ee22a2f02812dd0f48bd78c1","impliedFormat":99},{"version":"6acf0b3018881977d2cfe4382ac3e3db7e103904c4b634be908f1ade06eb302d","impliedFormat":99},{"version":"2dbb2e03b4b7f6524ad5683e7b5aa2e6aef9c83cab1678afd8467fde6d5a3a92","impliedFormat":99},{"version":"135b12824cd5e495ea0a8f7e29aba52e1adb4581bb1e279fb179304ba60c0a44","impliedFormat":99},{"version":"e4c784392051f4bbb80304d3a909da18c98bc58b093456a09b3e3a1b7b10937f","impliedFormat":99},{"version":"2e87c3480512f057f2e7f44f6498b7e3677196e84e0884618fc9e8b6d6228bed","impliedFormat":99},{"version":"66984309d771b6b085e3369227077da237b40e798570f0a2ddbfea383db39812","impliedFormat":99},{"version":"e41be8943835ad083a4f8a558bd2a89b7fe39619ed99f1880187c75e231d033e","impliedFormat":99},{"version":"260558fff7344e4985cfc78472ae58cbc2487e406d23c1ddaf4d484618ce4cfd","impliedFormat":99},{"version":"a3d5be0365b28b3281541d39d9db08d30b88de49576ddfbbb5d086155017b283","impliedFormat":99},{"version":"985d310b29f50ce5d4b4666cf2e5a06e841f3e37d1d507bd14186c78649aa3dd","impliedFormat":99},{"version":"af1120ba3de51e52385019b7800e66e4694ebc9e6a4a68e9f4afc711f6ae88be","impliedFormat":99},{"version":"5c6b3840cbc84f6f60abfc5c58c3b67b7296b5ebe26fd370710cfc89bbe3a5f1","impliedFormat":99},{"version":"91ef552cc29ec57d616e95d73ee09765198c710fa34e20b25cb9f9cf502821f1","impliedFormat":99},{"version":"25b6edf357caf505aa8e21a944bb0f7a166c8dac6a61a49ad1a0366f1bde5160","impliedFormat":99},{"version":"1ab840e4672a64e3c705a9163142e2b79b898db88b3c18400e37dbe88a58fa60","impliedFormat":99},{"version":"48516730c1cf1b72cac2da04481983cfe61359101d8563314457ecb059b102a9","impliedFormat":99},{"version":"d391200bb56f44a4be56e6571b2aeedfe602c0fd3c686b87b1306ae62e80b1e9","impliedFormat":99},{"version":"3b3e4b39cbb8adb1f210af60388e4ad66f6dfdeb45b3c8dde961f557776d88fe","impliedFormat":99},{"version":"431f31d10ad58b5767c57ffbf44198303b754193ba8fbf034b7cf8a3ab68abc1","impliedFormat":99},{"version":"a52180aca81ba4ef18ac145083d5d272c3a19f26db54441d5a7d8ef4bd601765","impliedFormat":99},{"version":"9de8aba529388309bc46248fb9c6cca493111a6c9fc1c1f087a3b281fb145d77","impliedFormat":99},{"version":"2ccdfd33a753c18e8e5fe8a1eadefff968531d920bc9cdc7e4c97b0c6d3dcaf8","impliedFormat":99},{"version":"d64a434d7fb5040dbe7d5f4911145deda53e281b3f1887b9a610defd51b3c1a2","impliedFormat":99},{"version":"927f406568919fd7cd238ef7fe5e9c5e9ec826f1fff89830e480aff8cfd197da","impliedFormat":99},{"version":"a77d742410fe78bb054d325b690fda75459531db005b62ba0e9371c00163353c","impliedFormat":99},{"version":"f8de61dd3e3c4dc193bb341891d67d3979cb5523a57fcacaf46bf1e6284e6c35","impliedFormat":99},{"version":"f07c5fb951dfaf5eb0c6053f6a77c67e02d21c9586c58ed0836d892e438c5bb2","impliedFormat":99},{"version":"c97b20bb0ad5d42e1475255cb13ede29fe1b8c398db5cba2a5842f1cb973b658","impliedFormat":99},{"version":"5559999a83ecfa2da6009cdab20b402c63cd6bb0f7a13fc033a5b567b3eb404b","impliedFormat":99},{"version":"aec26ed2e2ef8f2dbc6ffce8e93503f0c1a6b6cf50b6a13141a8462e7a6b8c79","impliedFormat":99},{"version":"9d62e577adb05f5aafed137e747b3a1b26f8dce7b20f350d22f6fb3255a3c0ed","impliedFormat":99},{"version":"7ed92bcef308af6e3925b3b61c83ad6157a03ff15c7412cf325f24042fe5d363","impliedFormat":99},{"version":"3da9062d0c762c002b7ab88187d72e1978c0224db61832221edc8f4eb0b54414","impliedFormat":99},{"version":"84dbf6af43b0b5ad42c01e332fddf4c690038248140d7c4ccb74a424e9226d4d","impliedFormat":99},{"version":"00884fc0ea3731a9ffecffcde8b32e181b20e1039977a8ae93ae5bce3ab3d245","impliedFormat":99},{"version":"0bd8b6493d9bf244afe133ccb52d32d293de8d08d15437cca2089beed5f5a6b5","impliedFormat":99},{"version":"7fc3099c95752c6e7b0ea215915464c7203e835fcd6878210f2ce4f0dcbbfe67","impliedFormat":99},{"version":"83b5499dbc74ee1add93aef162f7d44b769dcef3a74afb5f80c70f9a5ce77cc0","impliedFormat":99},{"version":"8bf8b772b38fc4da471248320f49a2219c363a9669938c720e0e0a5a2531eabf","impliedFormat":99},{"version":"7da6e8c98eacf084c961e039255f7ebb9d97a43377e7eee2695cb77fec640c66","impliedFormat":99},{"version":"0b5b064c5145a48cd3e2a5d9528c63f49bac55aa4bc5f5b4e68a160066401375","impliedFormat":99},{"version":"702ff40d28906c05d9d60b23e646c2577ad1cc7cd177d5c0791255a2eab13c07","impliedFormat":99},{"version":"49ff0f30d6e757d865ae0b422103f42737234e624815eee2b7f523240aa0c8f8","impliedFormat":99},{"version":"0389aacf0ffd49a877a46814a21a4770f33fc33e99951a1584de866c8e971993","impliedFormat":99},{"version":"5cb7a51cf151c1056b61f078cf80b811e19787d1f29a33a2a6e4bf00334bbc10","impliedFormat":99},{"version":"215aa8915d707f97ad511b7abbf7eda51d3a7048e9a656955cf0dda767ae7db0","impliedFormat":99},{"version":"0d689a717fbef83da07ab4de33f83db5cbcec9bc4e3b04edb106c538a50a0210","impliedFormat":99},{"version":"d00bc73e8d1f4137f2f6238bb3aa2bbdad8573658cc95920e2cdfa7ad491a8d8","impliedFormat":99},{"version":"e3667aa9f5245d1a99fb4a2a1ac48daf1429040c29cc0d262e3843f9ae3b9d65","impliedFormat":99},{"version":"08c0f3222b50ec2b534be1a59392660102549129246425d33ec43f35aa051dc6","impliedFormat":99},{"version":"612fb780f312e6bb3c40f3cb2b827ea7455b922198f651c799d844fdd44cf2e9","impliedFormat":99},{"version":"bcd98e8f44bc76e4fcb41e4b1a8bab648161a942653a3d1f261775a891d258de","impliedFormat":99},{"version":"5abaa19aa91bb4f63ea58154ada5d021e33b1f39aa026ca56eb95f13b12c497a","impliedFormat":99},{"version":"356a18b0c50f297fee148f4a2c64b0affd352cbd6f21c7b6bfa569d30622c693","impliedFormat":99},{"version":"5876027679fd5257b92eb55d62efee634358012b9f25c5711ad02b918e52c837","impliedFormat":99},{"version":"f5622423ee5642dcf2b92d71b37967b458e8df3cf90b468675ff9fddaa532a0f","impliedFormat":99},{"version":"70265bc75baf24ec0d61f12517b91ea711732b9c349fceef71a446c4ff4a247a","impliedFormat":99},{"version":"41a4b2454b2d3a13b4fc4ec57d6a0a639127369f87da8f28037943019705d619","impliedFormat":99},{"version":"e9b82ac7186490d18dffaafda695f5d975dfee549096c0bf883387a8b6c3ab5a","impliedFormat":99},{"version":"eed9b5f5a6998abe0b408db4b8847a46eb401c9924ddc5b24b1cede3ebf4ee8c","impliedFormat":99},{"version":"f99db2cd80274f32467ae5231d74632c35596ab75fa65baac3fec9dd551cf9d7","impliedFormat":99},{"version":"c799ceedd4821387e6f3518cf5725f9430e2fb7cae1d4606119a243dea28ee40","impliedFormat":99},{"version":"dcf54538d0bfa5006f03bf111730788a7dd409a49036212a36b678afa0a5d8c6","impliedFormat":99},{"version":"1ed428700390f2f81996f60341acef406b26ad72f74fc05afaf3ca101ae18e61","impliedFormat":99},{"version":"417048bbdce52a57110e6c221d6fa4e883bde6464450894f3af378a8b9a82a47","impliedFormat":99},{"version":"ab0048d2b673c0d60afc882a4154abcb2edb9a10873375366f090ae7ae336fe8","impliedFormat":99},{"version":"f8a6bb79327f4a6afc63d28624654522fc80f7536efa7a617ef48200b7a5f673","impliedFormat":1},{"version":"3e61b9db82b5e4a8ffcdd54812fda9d980cd4772b1d9f56b323524368eed9e5a","impliedFormat":99},{"version":"dcbc70889e6105d3e0a369dcea59a2bd3094800be802cd206b617540ff422708","impliedFormat":99},{"version":"f0d325b9e8d30a91593dc922c602720cec5f41011e703655d1c3e4e183a22268","impliedFormat":99},{"version":"afbd42eb9f22aa6a53aa4d5f8e09bb289dd110836908064d2a18ea3ab86a1984","impliedFormat":99},{"version":"bdd14f07b4eca0b4b5203b85b8dbc4d084c749fa590bee5ea613e1641dcd3b29","impliedFormat":99},{"version":"e87873f06fa094e76ac439c7756b264f3c76a41deb8bc7d39c1d30e0f03ef547","impliedFormat":99},{"version":"488861dc4f870c77c2f2f72c1f27a63fa2e81106f308e3fc345581938928f925","impliedFormat":99},{"version":"eff73acfacda1d3e62bb3cb5bc7200bb0257ea0c8857ce45b3fee5bfec38ad12","impliedFormat":99},{"version":"aff4ac6e11917a051b91edbb9a18735fe56bcfd8b1802ea9dbfb394ad8f6ce8e","impliedFormat":99},{"version":"1f68aed2648740ac69c6634c112fcaae4252fbae11379d6eabee09c0fbf00286","impliedFormat":99},{"version":"5e7c2eff249b4a86fb31e6b15e4353c3ddd5c8aefc253f4c3e4d9caeb4a739d4","impliedFormat":99},{"version":"14c8d1819e24a0ccb0aa64f85c61a6436c403eaf44c0e733cdaf1780fed5ec9f","impliedFormat":99},{"version":"413d50bc66826f899c842524e5f50f42d45c8cb3b26fd478a62f26ac8da3d90e","impliedFormat":99},{"version":"d9083e10a491b6f8291c7265555ba0e9d599d1f76282812c399ab7639019f365","impliedFormat":99},{"version":"09de774ebab62974edad71cb3c7c6fa786a3fda2644e6473392bd4b600a9c79c","impliedFormat":99},{"version":"e8bcc823792be321f581fcdd8d0f2639d417894e67604d884c38b699284a1a2a","impliedFormat":99},{"version":"7c99839c518dcf5ab8a741a97c190f0703c0a71e30c6d44f0b7921b0deec9f67","impliedFormat":99},{"version":"44c14e4da99cd71f9fe4e415756585cec74b9e7dc47478a837d5bedfb7db1e04","impliedFormat":99},{"version":"1f46ee2b76d9ae1159deb43d14279d04bcebcb9b75de4012b14b1f7486e36f82","impliedFormat":99},{"version":"2838028b54b421306639f4419606306b940a5c5fcc5bc485954cbb0ab84d90f4","impliedFormat":99},{"version":"7116e0399952e03afe9749a77ceaca29b0e1950989375066a9ddc9cb0b7dd252","impliedFormat":99},{"version":"6c3741e44c9b0ebd563c8c74dcfb2f593190dfd939266c07874dc093ecb4aa0e","impliedFormat":99},{"version":"e12cbccd28ee5c537fe59e3afdd55e6c9130a42d9d5bb4beb1c9da1d16f31680","impliedFormat":99},{"version":"16f4b05d144b4689870a3b12b4fae5e256d5b8108f360b4ac5add01956d5a86e","impliedFormat":99},{"version":"a65735a086ae8b401c1c41b51b41546532670c919fd2cedc1606fd186fcee2d7","impliedFormat":99},{"version":"fe021dbde66bd0d6195d4116dcb4c257966ebc8cfba0f34441839415e9e913e1","impliedFormat":99},{"version":"d52a4b1cabee2c94ed18c741c480a45dd9fed32477dd94a9cc8630a8bc263426","impliedFormat":99},{"version":"d059a52684789e6ef30f8052244cb7c52fb786e4066ac415c50642174cc76d14","impliedFormat":99},{"version":"addca1bb7478ebc3f1c67b710755acc945329875207a3c9befd6b5cbcab12574","impliedFormat":99},{"version":"50b565f4771b6b150cbf3ae31eb815c31f15e2e0f45518958a5f4348a1a01660","impliedFormat":99},{"version":"1453d1146382f9bcdf801cdcb5cadd9360c33a41d4be0f188bbaa01aa194ad72","impliedFormat":99},{"version":"842a0374c3dc4eac1c6f6cefeab3f1a7bc46f1ebaee6d13ddede169bce76367e","impliedFormat":99},{"version":"4056a596190daaaa7268f5465b972915facc5eca90ee6432e90afa130ba2e4ee","impliedFormat":99},{"version":"aa20728bb08af6288996197b97b5ed7bcfb0b183423bb482a9b25867a5b33c57","impliedFormat":99},{"version":"5322c3686d3797d415f8570eec54e898f328e59f8271b38516b1366074b499aa","impliedFormat":99},{"version":"b0aa778c53f491350d81ec58eb3e435d34bef2ec93b496c51d9b50aa5a8a61e5","impliedFormat":99},{"version":"fa454230c32f38213198cf47db147caf4c03920b3f8904566b29a1a033341602","impliedFormat":99},{"version":"5571608cd06d2935efe2ed7ba105ec93e5c5d1e822d300e5770a1ad9a065c8b6","impliedFormat":99},{"version":"6bf8aa6ed64228b4d065f334b8fe11bc11f59952fd15015b690dfb3301c94484","impliedFormat":99},{"version":"41ae2bf47844e4643ebe68b8e0019af7a87a9daea2d38959a9f7520ada9ad3cb","impliedFormat":99},{"version":"f4498a2ac4186466abe5f9641c9279a3458fa5992dc10ed4581c265469b118d4","impliedFormat":99},{"version":"bd09a0e906dae9a9351c658e7d8d6caa9f4df2ba104df650ebca96d1c4f81c23","impliedFormat":99},{"version":"055ad004f230e10cf1099d08c6f5774c564782bd76fbefbda669ab1ad132c175","impliedFormat":99},{"version":"55cc6faff37d64f21b0154469335e1918c7c9ed3531bd1bd09d0dab7ec3cb209","impliedFormat":99},{"version":"3a6888b7a0ce9a26de5fec6e4bf9401d0458f347098f524613cc4db8788d4d66","impliedFormat":99},{"version":"905b63e7c08e596aa40e0cda8a733d479ef49ce58c63b9bf534f544c47b86cf4","impliedFormat":99},{"version":"993bbf0cc9e59d3d09661a7851f22196ce93c3a12a4dc4116b424636c8548acb","impliedFormat":99},{"version":"11e5df7b2d205924b2c8fc6555b26a7e00bf6ad105b20aa9a0b5dea10aee0353","impliedFormat":99},{"version":"44b2bf4af6f235d90a59b7dd98d20de71d813742707d4cea38415afa6c895bed","impliedFormat":99},{"version":"9009e5bab1099a7a4427456b97185a606767294f330b248f6fd4bfaf47e58f1c","impliedFormat":99},{"version":"945ba40070b4fc0a0e288e4ee3d23327d9d972f5f364454409e8f0bf97d48327","impliedFormat":99},{"version":"2566008927db5ac0be2b1dc7b031c221914669f821ce2b45094b44e74f7c240e","impliedFormat":99},{"version":"fbe707d31a1bf214337e9254de51d4cd92c0fc22e691ef8c5b9d75ed03445d6d","impliedFormat":99},{"version":"2a51fce1374a33b8398940466d31be982f400ea80fc4298e240cfa8d88394329","impliedFormat":99},{"version":"5d96fcc2abaff5db2621ba566d3356ee7f437107d62d8310e78c172c30aef5a4","impliedFormat":99},{"version":"3b1df7d07b7f9dda15a8e222b3b62a575542c968e24f55e1164c9508b0545142","impliedFormat":99},{"version":"77cbb914aa1f4ea32578ac8a790ede70eee91a44c56e696634ba54741fb1473b","impliedFormat":99},{"version":"c634f41de3b9541389c42940cbff292972efdeef2bb0f1415bf0ea5fa4115d0a","impliedFormat":99},{"version":"ccc8a5cc2dd937455fadc569b95371081e2d3f15fc5201d475c208e52dbaf2c5","impliedFormat":99},{"version":"c1a2e05eb6d7ca8d7e4a7f4c93ccf0c2857e842a64c98eaee4d85841ee9855e6","impliedFormat":1},{"version":"835fb2909ce458740fb4a49fc61709896c6864f5ce3db7f0a88f06c720d74d02","impliedFormat":1},{"version":"6e5857f38aa297a859cab4ec891408659218a5a2610cd317b6dcbef9979459cc","impliedFormat":1},{"version":"ead8e39c2e11891f286b06ae2aa71f208b1802661fcdb2425cffa4f494a68854","impliedFormat":1},{"version":"82919acbb38870fcf5786ec1292f0f5afe490f9b3060123e48675831bd947192","impliedFormat":1},{"version":"e222701788ec77bd57c28facbbd142eadf5c749a74d586bc2f317db7e33544b1","impliedFormat":1},{"version":"09154713fae0ed7befacdad783e5bd1970c06fc41a5f866f7f933b96312ce764","impliedFormat":1},{"version":"8d67b13da77316a8a2fabc21d340866ddf8a4b99e76a6c951cc45189142df652","impliedFormat":1},{"version":"a91c8d28d10fee7fe717ddf3743f287b68770c813c98f796b6e38d5d164bd459","impliedFormat":1},{"version":"68add36d9632bc096d7245d24d6b0b8ad5f125183016102a3dad4c9c2438ccb0","impliedFormat":1},{"version":"3a819c2928ee06bbcc84e2797fd3558ae2ebb7e0ed8d87f71732fb2e2acc87b4","impliedFormat":1},{"version":"f6f827cd43e92685f194002d6b52a9408309cda1cec46fb7ca8489a95cbd2fd4","impliedFormat":1},{"version":"e0bfe601a9fdf6defe94ed62dc60ac71597566001a1f86e705c95e431a9c816d","impliedFormat":1},{"version":"e0bfe601a9fdf6defe94ed62dc60ac71597566001a1f86e705c95e431a9c816d","impliedFormat":1},{"version":"e0bfe601a9fdf6defe94ed62dc60ac71597566001a1f86e705c95e431a9c816d","impliedFormat":1},{"version":"e0bfe601a9fdf6defe94ed62dc60ac71597566001a1f86e705c95e431a9c816d","impliedFormat":1},{"version":"e0bfe601a9fdf6defe94ed62dc60ac71597566001a1f86e705c95e431a9c816d","impliedFormat":1},{"version":"e0bfe601a9fdf6defe94ed62dc60ac71597566001a1f86e705c95e431a9c816d","impliedFormat":1},{"version":"e0bfe601a9fdf6defe94ed62dc60ac71597566001a1f86e705c95e431a9c816d","impliedFormat":1},{"version":"e0bfe601a9fdf6defe94ed62dc60ac71597566001a1f86e705c95e431a9c816d","impliedFormat":1},{"version":"e0bfe601a9fdf6defe94ed62dc60ac71597566001a1f86e705c95e431a9c816d","impliedFormat":1},{"version":"e0bfe601a9fdf6defe94ed62dc60ac71597566001a1f86e705c95e431a9c816d","impliedFormat":1},{"version":"e0bfe601a9fdf6defe94ed62dc60ac71597566001a1f86e705c95e431a9c816d","impliedFormat":1},{"version":"e0bfe601a9fdf6defe94ed62dc60ac71597566001a1f86e705c95e431a9c816d","impliedFormat":1},{"version":"e0bfe601a9fdf6defe94ed62dc60ac71597566001a1f86e705c95e431a9c816d","impliedFormat":1},{"version":"e0bfe601a9fdf6defe94ed62dc60ac71597566001a1f86e705c95e431a9c816d","impliedFormat":1},{"version":"e0bfe601a9fdf6defe94ed62dc60ac71597566001a1f86e705c95e431a9c816d","impliedFormat":1},{"version":"e0bfe601a9fdf6defe94ed62dc60ac71597566001a1f86e705c95e431a9c816d","impliedFormat":1},{"version":"e0bfe601a9fdf6defe94ed62dc60ac71597566001a1f86e705c95e431a9c816d","impliedFormat":1},{"version":"e0bfe601a9fdf6defe94ed62dc60ac71597566001a1f86e705c95e431a9c816d","impliedFormat":1},{"version":"e0bfe601a9fdf6defe94ed62dc60ac71597566001a1f86e705c95e431a9c816d","impliedFormat":1},{"version":"e0bfe601a9fdf6defe94ed62dc60ac71597566001a1f86e705c95e431a9c816d","impliedFormat":1},{"version":"e0bfe601a9fdf6defe94ed62dc60ac71597566001a1f86e705c95e431a9c816d","impliedFormat":1},{"version":"e0bfe601a9fdf6defe94ed62dc60ac71597566001a1f86e705c95e431a9c816d","impliedFormat":1},{"version":"e0bfe601a9fdf6defe94ed62dc60ac71597566001a1f86e705c95e431a9c816d","impliedFormat":1},{"version":"e0bfe601a9fdf6defe94ed62dc60ac71597566001a1f86e705c95e431a9c816d","impliedFormat":1},{"version":"e0bfe601a9fdf6defe94ed62dc60ac71597566001a1f86e705c95e431a9c816d","impliedFormat":1},{"version":"e0bfe601a9fdf6defe94ed62dc60ac71597566001a1f86e705c95e431a9c816d","impliedFormat":1},{"version":"e0bfe601a9fdf6defe94ed62dc60ac71597566001a1f86e705c95e431a9c816d","impliedFormat":1},{"version":"e0bfe601a9fdf6defe94ed62dc60ac71597566001a1f86e705c95e431a9c816d","impliedFormat":1},{"version":"e0bfe601a9fdf6defe94ed62dc60ac71597566001a1f86e705c95e431a9c816d","impliedFormat":1},{"version":"e0bfe601a9fdf6defe94ed62dc60ac71597566001a1f86e705c95e431a9c816d","impliedFormat":1},{"version":"e0bfe601a9fdf6defe94ed62dc60ac71597566001a1f86e705c95e431a9c816d","impliedFormat":1},{"version":"e0bfe601a9fdf6defe94ed62dc60ac71597566001a1f86e705c95e431a9c816d","impliedFormat":1},{"version":"e0bfe601a9fdf6defe94ed62dc60ac71597566001a1f86e705c95e431a9c816d","impliedFormat":1},{"version":"e0bfe601a9fdf6defe94ed62dc60ac71597566001a1f86e705c95e431a9c816d","impliedFormat":1},{"version":"e0bfe601a9fdf6defe94ed62dc60ac71597566001a1f86e705c95e431a9c816d","impliedFormat":1},{"version":"e0bfe601a9fdf6defe94ed62dc60ac71597566001a1f86e705c95e431a9c816d","impliedFormat":1},{"version":"e0bfe601a9fdf6defe94ed62dc60ac71597566001a1f86e705c95e431a9c816d","impliedFormat":1},{"version":"e0bfe601a9fdf6defe94ed62dc60ac71597566001a1f86e705c95e431a9c816d","impliedFormat":1},{"version":"e0bfe601a9fdf6defe94ed62dc60ac71597566001a1f86e705c95e431a9c816d","impliedFormat":1},{"version":"e0bfe601a9fdf6defe94ed62dc60ac71597566001a1f86e705c95e431a9c816d","impliedFormat":1},{"version":"e0bfe601a9fdf6defe94ed62dc60ac71597566001a1f86e705c95e431a9c816d","impliedFormat":1},{"version":"e0bfe601a9fdf6defe94ed62dc60ac71597566001a1f86e705c95e431a9c816d","impliedFormat":1},{"version":"e0bfe601a9fdf6defe94ed62dc60ac71597566001a1f86e705c95e431a9c816d","impliedFormat":1},{"version":"e0bfe601a9fdf6defe94ed62dc60ac71597566001a1f86e705c95e431a9c816d","impliedFormat":1},{"version":"e0bfe601a9fdf6defe94ed62dc60ac71597566001a1f86e705c95e431a9c816d","impliedFormat":1},{"version":"e0bfe601a9fdf6defe94ed62dc60ac71597566001a1f86e705c95e431a9c816d","impliedFormat":1},{"version":"e0bfe601a9fdf6defe94ed62dc60ac71597566001a1f86e705c95e431a9c816d","impliedFormat":1},{"version":"e0bfe601a9fdf6defe94ed62dc60ac71597566001a1f86e705c95e431a9c816d","impliedFormat":1},{"version":"e0bfe601a9fdf6defe94ed62dc60ac71597566001a1f86e705c95e431a9c816d","impliedFormat":1},{"version":"a270a1a893d1aee5a3c1c8c276cd2778aa970a2741ee2ccf29cc3210d7da80f5","impliedFormat":1},{"version":"add0ce7b77ba5b308492fa68f77f24d1ed1d9148534bdf05ac17c30763fc1a79","impliedFormat":1},{"version":"8926594ee895917e90701d8cbb5fdf77fc238b266ac540f929c7253f8ad6233d","impliedFormat":1},{"version":"2f67911e4bf4e0717dc2ded248ce2d5e4398d945ee13889a6852c1233ea41508","impliedFormat":1},{"version":"d8430c275b0f59417ea8e173cfb888a4477b430ec35b595bf734f3ec7a7d729f","impliedFormat":1},{"version":"69364df1c776372d7df1fb46a6cb3a6bf7f55e700f533a104e3f9d70a32bec18","impliedFormat":1},{"version":"6042774c61ece4ba77b3bf375f15942eb054675b7957882a00c22c0e4fe5865c","impliedFormat":1},{"version":"5a3bd57ed7a9d9afef74c75f77fce79ba3c786401af9810cdf45907c4e93f30e","impliedFormat":1},{"version":"ed8763205f02fb65e84eff7432155258df7f93b7d938f01785cb447d043d53f3","impliedFormat":1},{"version":"30db853bb2e60170ba11e39ab48bacecb32d06d4def89eedf17e58ebab762a65","impliedFormat":1},{"version":"e27451b24234dfed45f6cf22112a04955183a99c42a2691fb4936d63cfe42761","impliedFormat":1},{"version":"2316301dd223d31962d917999acf8e543e0119c5d24ec984c9f22cb23247160c","impliedFormat":1},{"version":"58d65a2803c3b6629b0e18c8bf1bc883a686fcf0333230dd0151ab6e85b74307","impliedFormat":1},{"version":"e818471014c77c103330aee11f00a7a00b37b35500b53ea6f337aefacd6174c9","impliedFormat":1},{"version":"d4a5b1d2ff02c37643e18db302488cd64c342b00e2786e65caac4e12bda9219b","impliedFormat":1},{"version":"29f823cbe0166e10e7176a94afe609a24b9e5af3858628c541ff8ce1727023cd","impliedFormat":1},{"version":"d3a6e1ff56a0a760b1b36eb34925042a8148d8e0ab4c2d28fcbdbf40fb5a8acc","impliedFormat":99},{"version":"839114ddc4236b8304df6a6c7cc6784913b7c69a63afd4ecb36fc5c9c57276fc","impliedFormat":99},{"version":"cc4ecb6238b32248c6b58577a2ac2a6223c002c1a9e3f1f9424a89f44aa84f0a","impliedFormat":99},{"version":"b1e7a09644f81b1f6445e1cd103ccb6af6abf5455c2b0061fb2f1505814445ac","impliedFormat":99},{"version":"73caab25ef0e9cac9fa83c39527035b96814443ba3e1081fcf02e28e9ff5d063","impliedFormat":99},{"version":"eed6f8e5ba72c1c2327643aba311bf83968530aea2713ffcc64a7328be42cb7b","impliedFormat":99},{"version":"d9fdc24b918caacab2e2954171d4aa453a810ba8fe637c9c77eb9c82e6e5c9b5","impliedFormat":99},{"version":"9621061af7d41f0fed10cc9c5c610f7a1297d0a80e77c41995af26d1d875775d","impliedFormat":99},{"version":"fe0e2758a8a8b3dc3c23acd450df8dd510e0ac4ee79970af52301fb9307ef621","impliedFormat":99},{"version":"ae8ea796987c2692c6d1847cb16b2ca3ec84d519a4426e7f90e0cd6b3a57d76b","impliedFormat":99},{"version":"da5403deff1164f4917c1f71ab3365853401acf83379abfa8b0e4c219e3b5b9c","impliedFormat":99},{"version":"21f8774a90e6e2c997ac1b165f8c375d46921a589cf1117ce8b63a3da7317208","impliedFormat":99},{"version":"4de612234aee194b3cc9f1998499db2f9447309331428e534524cb057e78642c","signature":"daf6a0b10aca8681e68361b871f02b422d68e7a555ee039ce058067df6c0784a"},{"version":"bb02a8958047c58998585e91c248a80b2a2ca7c2f3d5416daca6e78a145bf507","impliedFormat":1},{"version":"0170ed5ba2e3b3497af9878c5d48c58f815d4429aaad9fc0bce6602ad03870df","impliedFormat":99},{"version":"89e6cb3a9555b92f531ea6222eea4a40be054a9f58bcf8b24c63c2ffb7bab0c9","signature":"dce1a087265c9161efd328f43ed9ea761438ef9683d906a8b9f7751b2c9527a7"},{"version":"fa8fd0c1b380b525c38216ac8f296402d460100942bb7f5cc32494d2cd9e6b06","signature":"75fc791929321fba6ba7a3276ccd4c2b6560bc47e9ca1aaa457afeae13b8f5c6"},{"version":"168bf3629d87ea4d9c947b4454b6b47c6ae646e697676f194e55cfe9fea29deb","impliedFormat":99},{"version":"445749eb9eaba85286f2329f7b043fbbaef2567f49cb89dab7d1ad941c506d8d","impliedFormat":99},{"version":"909e4aba623c453e3effe342f0d79c5fe0b4c0653004a8db316b3a3f53a6b7d3","impliedFormat":99},{"version":"0b2d6655ae1c1b1f8f825eb397d758a0b24b8a556dd03d3ad001e884f2171488","impliedFormat":99},{"version":"5105bbffcc9bf47e1de2380df13cd334b36fc3a582427826f40c8f627320ae16","impliedFormat":99},{"version":"adfda365e7a7b3f6b6c4909d8dd3a00c133bb67ad925204c358702b32e2351ee","impliedFormat":99},{"version":"c2ba6dea9b641828281fad5dbcca7ed9ea263b2fae1d90ab98304f9582bb589e","impliedFormat":99},{"version":"622c3617ec1da0036d7a68ac30c01fa401791a320898ea866c29ae49a293f4db","impliedFormat":99},{"version":"6cc0caaae7b01ddd72c9c36ab12827b6a1e4ed722e4433d7d3f8903ed31645ae","impliedFormat":99},{"version":"bd98c5555dd88b9f9686e5711cd3b42380a1958eeb4d5aee8249c4b84393471e","impliedFormat":99},{"version":"f431f0000f3ff27dd8824931dbf17c8bc68ee2551eec691f2812bae39bb3ce45","impliedFormat":99},{"version":"4e1deafdca057e04cc798f8c6bdecec1b624d1c2df1591848663939daffbd675","impliedFormat":99},{"version":"1fc64c6bda09d1f250436c0690262eeab55f803d1abc2b7e0620ef8cc1500087","impliedFormat":99},{"version":"0a76797de90647d13ddae055b94bebb9aaa24f96fdfb3c99556677652e98167b","impliedFormat":99},{"version":"a0cc536a85dca0de44d25c2c704e4e4009f6b6eabe3ae1e965c886529a6f8341","impliedFormat":99},{"version":"06d6a979c4cac9fe223b5fb768fc6c7c31586308a1360a6edf5971afe129faab","impliedFormat":99},{"version":"432904aba95c74008e841a949b01d39e84915e5b9fc58a075894d802fa60dace","impliedFormat":99},{"version":"0cacc9158e69c16f24cf7f4d7497ddc0bb641b39c085bd5d93963ac218a185fc","impliedFormat":99},{"version":"19005244c31b94d94c872d226b684c11143f554f772e36b09f4aa9159192be74","impliedFormat":99},{"version":"94a003d5819de12cbd240a778c4b8543c8f693d85468223a2cc6878be18cf81f","impliedFormat":99},{"version":"c098ecfc6f67903ac2a51b9aae5b64cd04672fa7f194032e44efdff4e435ca2c","impliedFormat":99},{"version":"8d56dc11df16222ec8f72002d31b40bef472a96a73d713d760c4b3927787f8c6","impliedFormat":99},{"version":"4d46e4bc399668902131af2af99959f735e5d664687b05a8b85ce6684b1a81e5","impliedFormat":99},{"version":"77d7913479c9ce4ea7a4a31eb4d82a7f5059bed39ba4b05386784bbe96da88c4","impliedFormat":99},{"version":"888d7eb20ac16f2d61ebca87a6c6366c9be236356cf207d25814f60b141ca822","impliedFormat":99},{"version":"a7775e809c78f34e318f3b556f6b48986fcacae382363de053d22531315019b9","impliedFormat":99},{"version":"e7b0aaf53c4aeb8777bf07cc717341b8c248243e4eac281fbff9b1b9b5b30609","impliedFormat":99},{"version":"9aee2824983bbea0aed365194e957a4e7e596927a05a7a0a189ed259baa0b615","impliedFormat":99},{"version":"723c8d96de2952aa6400859bc69a54995bea3cfcf1cde9ea273a491e055d76e0","impliedFormat":99},{"version":"416f76fcfa73d480084832cce6748a0bab9aaac25b13b8d941efe8922c26165d","impliedFormat":99},{"version":"9b1e0b3ef3bfd4dd83832298a45d21f36363f789ec62ceeda33b6174bdd0ed76","impliedFormat":99},{"version":"629a5b84340b49c75877efe93e5411f8e0d30457e2e30d441d6eaeccf7bf48c5","impliedFormat":99},{"version":"8a63950706b3422f381afc99a2a271367bcc7886826804c16b9de9035dba1dc5","impliedFormat":99},{"version":"a94c6ab42fda4fc3b59e5e25e89391fa6e795fd5ba8b8db80da20e52cea1307d","impliedFormat":99},{"version":"dbf537dc9a40af4eb3b7970c7aec3486ac65357ee750b328605b76dd0d73662a","signature":"81581e91744769c6f2dfe013318fa82f32cff0954f715a191a422dbac560aa8f"},{"version":"6c05d0fcee91437571513c404e62396ee798ff37a2d8bef2104accdc79deb9c0","impliedFormat":1},{"version":"a9373d52584b48809ffd61d74f5b3dfd127da846e3c4ee3c415560386df3994b","impliedFormat":99},{"version":"caf4af98bf464ad3e10c46cf7d340556f89197aab0f87f032c7b84eb8ddb24d9","impliedFormat":99},{"version":"7ec047b73f621c526468517fea779fec2007dd05baa880989def59126c98ef79","impliedFormat":99},{"version":"8dd450de6d756cee0761f277c6dc58b0b5a66b8c274b980949318b8cad26d712","impliedFormat":99},{"version":"904d6ad970b6bd825449480488a73d9b98432357ab38cf8d31ffd651ae376ff5","impliedFormat":99},{"version":"dfcf16e716338e9fe8cf790ac7756f61c85b83b699861df970661e97bf482692","impliedFormat":99},{"version":"f3621142447482ed13dd7d468743f33252328453d6a61ff032b011ee48535957","impliedFormat":99},{"version":"fff5b0ae589e75961162f3dc50bf1115d808f7d4e04dbd7d5081f99b437d101b","impliedFormat":99},{"version":"2f90c30dcd9d485862a1a6816851fba71dfaad8626108b3a385023d3f3f3819d","impliedFormat":99},{"version":"a19016a2b1018356e27889ab01b32358e0168229b53f04deecd44866a71f165e","impliedFormat":99},{"version":"b5f7d776c8920b3fb4b2ee16d18b6b2516ea19a4108f6e87b5f585e9576281c0","impliedFormat":99},{"version":"3677988e03b749874eb9c1aa8dc88cd77b6005e5c4c39d821cda7b80d5388619","impliedFormat":1},{"version":"ff863d17c6c659440f7c5c536e4db7762d8c2565547b2608f36b798a743606ca","impliedFormat":1},{"version":"9e59e4e82e2f8136ff84c322b80a4c3c0edbae212000449f8d27f0ee6f9bad1b","impliedFormat":99},{"version":"e15ebce84f4c117f38aa2b2978eb5cc4cd6196c165c7334c7c926d14a2e4fc2b","impliedFormat":99},{"version":"919059821b88ddc0f60e89fb1b8415a09218cfc808a8d5a574a8c62716b63674","signature":"bd0ddc78128b4289fe5e39e1b44f80442ec25c5f5261b6c15770348447c124b9"},{"version":"3b4c93da713d16dc92af11b46efc260ace64eda03f76dc2a0ccc3f9cee187a13","impliedFormat":99},{"version":"4aba443be88627c25a3b0e8cffd32bbb0b650dbcd71b5f5c5fd2d8d7cab36663","impliedFormat":99},{"version":"99d1a601593495371e798da1850b52877bf63d0678f15722d5f048e404f002e4","impliedFormat":99},{"version":"0943a6e4e026d0de8a4969ee975a7283e0627bf41aa4635d8502f6f24365ac9b","impliedFormat":99},{"version":"22399c4e9eede1c6b716dd1a29e3e1a58f2cf8404cf57e7f33dd0730c9ab1766","impliedFormat":99},{"version":"db74b180e4b11e4a97ebf070a2872d60cafbed9532817d05fbb1e3fdfc035316","impliedFormat":99},{"version":"32f424d43980d7e1cc85811ee013573140eeefe818fd7b13f6363b694f25c8e5","impliedFormat":99},{"version":"d6c76b0ddf1fa28d2854badf47752b9dec1933a2bb4f69553bfdf21d6ca7ed12","impliedFormat":99},{"version":"6da77e8d67ae57842ca65fa27d2a24632f5a16287d535ed254edd8925c4a74f0","impliedFormat":99},{"version":"c2193977365638d6b7188080cea173dfe0e967d8d7c68c28941ca46393937e35","impliedFormat":99},{"version":"c4f238e3ed1957e6f8ebaba7b384b563438acc39e04fb27234a11c78226c190a","impliedFormat":99},{"version":"686cdf732d387f9035e2dcc87467f27513382ff6bc972c9d6d6540f05fe47ce6","impliedFormat":99},{"version":"5412ad0043cd60d1f1406fc12cb4fb987e9a734decbdd4db6f6acf71791e36fe","impliedFormat":1},{"version":"ad036a85efcd9e5b4f7dd5c1a7362c8478f9a3b6c3554654ca24a29aa850a9c5","impliedFormat":1},{"version":"fedebeae32c5cdd1a85b4e0504a01996e4a8adf3dfa72876920d3dd6e42978e7","impliedFormat":1},{"version":"e110dcbf457ae2911799895b76e8478d6502ac85742b059184fb90ec2a55ba3f","signature":"7f38e519eb16ce4ce8d09c37b38d5fc8818316ab6a477c085ec80b7ee8737674"},{"version":"ebaa7157364a7a2bd6e4d9d538c3e104ac2d1143d39d2a67281729d52da24e11","signature":"6b9fbf41229dc7ca3f98ae99ddc9ed4a9472680b244deae0bca620e81314ddc8"},{"version":"9a8098210fe09d5a0d6f8351789e033a9d7525dfe272cf89ae0e34200986ee4d","impliedFormat":99},{"version":"f38918a703d8cbba6cfa9cc0ca34ba7851fa09e6be5498428112806135e7a824","impliedFormat":99},{"version":"e994c2a0c24a5c9fb0f838d4be75f6b108a71a4716d1616a208c27abfe00b761","impliedFormat":99},{"version":"e5a1c7d86d7462f04a9d032fa8572305015632229fdfc5713be07cbc446cba25","impliedFormat":99},{"version":"21da358700a3893281ce0c517a7a30cbd46be020d9f0c3f2834d0a8ad1f5fc75","impliedFormat":1},{"version":"d153a11543fd884b596587ccd97aebbeed950b26933ee000f94009f1ab142848","affectsGlobalScope":true,"impliedFormat":1},{"version":"378281aa35786c27d5811af7e6bcaa492eebd0c7013d48137c35bbc69a2b9751","affectsGlobalScope":true,"impliedFormat":1},{"version":"3af97acf03cc97de58a3a4bc91f8f616408099bc4233f6d0852e72a8ffb91ac9","affectsGlobalScope":true,"impliedFormat":1},{"version":"1b2dd1cbeb0cc6ae20795958ba5950395ebb2849b7c8326853dd15530c77ab0c","affectsGlobalScope":true,"impliedFormat":1},{"version":"1db0b7dca579049ca4193d034d835f6bfe73096c73663e5ef9a0b5779939f3d0","affectsGlobalScope":true,"impliedFormat":1},{"version":"387a023d363f755eb63450a66c28b14cdd7bc30a104565e2dbf0a8988bb4a56c","affectsGlobalScope":true,"impliedFormat":1},{"version":"9798340ffb0d067d69b1ae5b32faa17ab31b82466a3fc00d8f2f2df0c8554aaa","affectsGlobalScope":true,"impliedFormat":1},{"version":"f26b11d8d8e4b8028f1c7d618b22274c892e4b0ef5b3678a8ccbad85419aef43","affectsGlobalScope":true,"impliedFormat":1},{"version":"cdcf9ea426ad970f96ac930cd176d5c69c6c24eebd9fc580e1572d6c6a88f62c","impliedFormat":1},{"version":"23cd712e2ce083d68afe69224587438e5914b457b8acf87073c22494d706a3d0","impliedFormat":1},{"version":"487b694c3de27ddf4ad107d4007ad304d29effccf9800c8ae23c2093638d906a","impliedFormat":1},{"version":"3a80bc85f38526ca3b08007ee80712e7bb0601df178b23fbf0bf87036fce40ce","impliedFormat":1},{"version":"ccf4552357ce3c159ef75f0f0114e80401702228f1898bdc9402214c9499e8c0","impliedFormat":1},{"version":"c6fd2c5a395f2432786c9cb8deb870b9b0e8ff7e22c029954fabdd692bff6195","impliedFormat":1},{"version":"68834d631c8838c715f225509cfc3927913b9cc7a4870460b5b60c8dbdb99baf","impliedFormat":1},{"version":"2931540c47ee0ff8a62860e61782eb17b155615db61e36986e54645ec67f67c2","impliedFormat":1},{"version":"ccab02f3920fc75c01174c47fcf67882a11daf16baf9e81701d0a94636e94556","impliedFormat":1},{"version":"f6faf5f74e4c4cc309a6c6a6c4da02dbb840be5d3e92905a23dcd7b2b0bd1986","impliedFormat":1},{"version":"ea6bc8de8b59f90a7a3960005fd01988f98fd0784e14bc6922dde2e93305ec7d","impliedFormat":1},{"version":"36107995674b29284a115e21a0618c4c2751b32a8766dd4cb3ba740308b16d59","impliedFormat":1},{"version":"914a0ae30d96d71915fc519ccb4efbf2b62c0ddfb3a3fc6129151076bc01dc60","impliedFormat":1},{"version":"33e981bf6376e939f99bd7f89abec757c64897d33c005036b9a10d9587d80187","impliedFormat":1},{"version":"7fd1b31fd35876b0aa650811c25ec2c97a3c6387e5473eb18004bed86cdd76b6","impliedFormat":1},{"version":"b41767d372275c154c7ea6c9d5449d9a741b8ce080f640155cc88ba1763e35b3","impliedFormat":1},{"version":"3bacf516d686d08682751a3bd2519ea3b8041a164bfb4f1d35728993e70a2426","impliedFormat":1},{"version":"7fb266686238369442bd1719bc0d7edd0199da4fb8540354e1ff7f16669b4323","impliedFormat":1},{"version":"0a60a292b89ca7218b8616f78e5bbd1c96b87e048849469cccb4355e98af959a","impliedFormat":1},{"version":"0b6e25234b4eec6ed96ab138d96eb70b135690d7dd01f3dd8a8ab291c35a683a","impliedFormat":1},{"version":"9666f2f84b985b62400d2e5ab0adae9ff44de9b2a34803c2c5bd3c8325b17dc0","impliedFormat":1},{"version":"40cd35c95e9cf22cfa5bd84e96408b6fcbca55295f4ff822390abb11afbc3dca","impliedFormat":1},{"version":"b1616b8959bf557feb16369c6124a97a0e74ed6f49d1df73bb4b9ddf68acf3f3","impliedFormat":1},{"version":"5b03a034c72146b61573aab280f295b015b9168470f2df05f6080a2122f9b4df","impliedFormat":1},{"version":"40b463c6766ca1b689bfcc46d26b5e295954f32ad43e37ee6953c0a677e4ae2b","impliedFormat":1},{"version":"249b9cab7f5d628b71308c7d9bb0a808b50b091e640ba3ed6e2d0516f4a8d91d","impliedFormat":1},{"version":"80aae6afc67faa5ac0b32b5b8bc8cc9f7fa299cff15cf09cc2e11fd28c6ae29e","impliedFormat":1},{"version":"f473cd2288991ff3221165dcf73cd5d24da30391f87e85b3dd4d0450c787a391","impliedFormat":1},{"version":"499e5b055a5aba1e1998f7311a6c441a369831c70905cc565ceac93c28083d53","impliedFormat":1},{"version":"54c3e2371e3d016469ad959697fd257e5621e16296fa67082c2575d0bf8eced0","impliedFormat":1},{"version":"beb8233b2c220cfa0feea31fbe9218d89fa02faa81ef744be8dce5acb89bb1fd","impliedFormat":1},{"version":"c183b931b68ad184bc8e8372bf663f3d33304772fb482f29fb91b3c391031f3e","impliedFormat":1},{"version":"5d0375ca7310efb77e3ef18d068d53784faf62705e0ad04569597ae0e755c401","impliedFormat":1},{"version":"59af37caec41ecf7b2e76059c9672a49e682c1a2aa6f9d7dc78878f53aa284d6","impliedFormat":1},{"version":"addf417b9eb3f938fddf8d81e96393a165e4be0d4a8b6402292f9c634b1cb00d","impliedFormat":1},{"version":"48cc3ec153b50985fb95153258a710782b25975b10dd4ac8a4f3920632d10790","impliedFormat":1},{"version":"adf27937dba6af9f08a68c5b1d3fce0ca7d4b960c57e6d6c844e7d1a8e53adae","impliedFormat":1},{"version":"e1528ca65ac90f6fa0e4a247eb656b4263c470bb22d9033e466463e13395e599","impliedFormat":1},{"version":"2e85db9e6fd73cfa3d7f28e0ab6b55417ea18931423bd47b409a96e4a169e8e6","impliedFormat":1},{"version":"c46e079fe54c76f95c67fb89081b3e399da2c7d109e7dca8e4b58d83e332e605","impliedFormat":1},{"version":"866078923a56d026e39243b4392e282c1c63159723996fa89243140e1388a98d","impliedFormat":1},{"version":"f724236417941ea77ec8d38c6b7021f5fb7f8521c7f8c1538e87661f2c6a0774","affectsGlobalScope":true,"impliedFormat":1},{"version":"1cf059eaf468efcc649f8cf6075d3cb98e9a35a0fe9c44419ec3d2f5428d7123","affectsGlobalScope":true,"impliedFormat":1},{"version":"e7721c4f69f93c91360c26a0a84ee885997d748237ef78ef665b153e622b36c1","affectsGlobalScope":true,"impliedFormat":1},{"version":"d97fb21da858fb18b8ae72c314e9743fd52f73ebe2764e12af1db32fc03f853f","affectsGlobalScope":true,"impliedFormat":1},{"version":"4ea15fd99b2e34cb25fe8346c955000bb70c8b423ae4377a972ef46bfb37f595","impliedFormat":1},{"version":"7cf69dd5502c41644c9e5106210b5da7144800670cbe861f66726fa209e231c4","impliedFormat":1},{"version":"72c1f5e0a28e473026074817561d1bc9647909cf253c8d56c41d1df8d95b85f7","impliedFormat":1},{"version":"f9b4137a0d285bd77dba2e6e895530112264310ae47e07bf311feae428fb8b61","affectsGlobalScope":true,"impliedFormat":1},{"version":"8b21e13ed07d0df176ae31d6b7f01f7b17d66dbeb489c0d31d00de2ca14883da","impliedFormat":1},{"version":"51aecd2df90a3cffea1eb4696b33b2d78594ea2aa2138e6b9471ec4841c6c2ee","impliedFormat":1},{"version":"9d8f9e63e29a3396285620908e7f14d874d066caea747dc4b2c378f0599166b4","affectsGlobalScope":true,"impliedFormat":1},{"version":"5524481e56c48ff486f42926778c0a3cce1cc85dc46683b92b1271865bcf015a","impliedFormat":1},{"version":"f929f0b6b3421a2d34344b0f421f45aeb2c84ad365ebf29d04312023b3accc58","impliedFormat":1},{"version":"db9ada976f9e52e13f7ae8b9a320f4b67b87685938c5879187d8864b2fbe97f3","impliedFormat":1},{"version":"9f39e70a354d0fba29ac3cdf6eca00b7f9e96f64b2b2780c432e8ea27f133743","impliedFormat":1},{"version":"0dace96cc0f7bc6d0ee2044921bdf19fe42d16284dbcc8ae200800d1c9579335","impliedFormat":1},{"version":"a2e2bbde231b65c53c764c12313897ffdfb6c49183dd31823ee2405f2f7b5378","impliedFormat":1},{"version":"ad1cc0ed328f3f708771272021be61ab146b32ecf2b78f3224959ff1e2cd2a5c","impliedFormat":1},{"version":"c64e1888baaa3253ca4405b455e4bf44f76357868a1bd0a52998ade9a092ad78","affectsGlobalScope":true,"impliedFormat":1},{"version":"dc8c6f5322961b56d9906601b20798725df60baeab45ec014fba9f795d5596fd","impliedFormat":1},{"version":"0904660ae854e6d41f6ff25356db1d654436c6305b0f0aa89d1532df0253486e","impliedFormat":1},{"version":"9cdfd0a77dd7eeed57e91d3f449274ea2470abdb7e167a2f146b1ea8de6224e0","impliedFormat":1},{"version":"230bdc111d7578276e4a3bb9d075d85c78c6b68f428c3a9935e2eaa10f4ae1f5","impliedFormat":1},{"version":"e8aabbee5e7b9101b03bb4222607d57f38859b8115a8050a4eb91b4ee43a3a73","impliedFormat":1},{"version":"bbf42f98a5819f4f06e18c8b669a994afe9a17fe520ae3454a195e6eabf7700d","impliedFormat":1},{"version":"c0bb1b65757c72bbf8ddf7eaa532223bacf58041ff16c883e76f45506596e925","impliedFormat":1},{"version":"c8b85f7aed29f8f52b813f800611406b0bfe5cf3224d20a4bdda7c7f73ce368e","affectsGlobalScope":true,"impliedFormat":1},{"version":"145dcf25fd4967c610c53d93d7bc4dce8fbb1b6dd7935362472d4ae49363c7ba","impliedFormat":1},{"version":"ff65b8a8bd380c6d129becc35de02f7c29ad7ce03300331ca91311fb4044d1a9","impliedFormat":1},{"version":"04bf1aa481d1adfb16d93d76e44ce71c51c8ef68039d849926551199489637f6","impliedFormat":1},{"version":"9043daec15206650fa119bad6b8d70136021ea7d52673a71f79a87a42ee38d44","affectsGlobalScope":true,"impliedFormat":1},{"version":"d00e86e2e74089bf416b4c5cc433d88eb2e09dcef5e3c5b79ca04a36d8d8d6f5","affectsGlobalScope":true,"impliedFormat":1},{"version":"a58a15da4c5ba3df60c910a043281256fa52d36a0fcdef9b9100c646282e88dd","impliedFormat":1},{"version":"b36beffbf8acdc3ebc58c8bb4b75574b31a2169869c70fc03f82895b93950a12","impliedFormat":1},{"version":"de263f0089aefbfd73c89562fb7254a7468b1f33b61839aafc3f035d60766cb4","impliedFormat":1},{"version":"77fbe5eecb6fac4b6242bbf6eebfc43e98ce5ccba8fa44e0ef6a95c945ff4d98","impliedFormat":1},{"version":"8c81fd4a110490c43d7c578e8c6f69b3af01717189196899a6a44f93daa57a3a","impliedFormat":1},{"version":"5fb39858b2459864b139950a09adae4f38dad87c25bf572ce414f10e4bd7baab","impliedFormat":1},{"version":"65faec1b4bd63564aeec33eab9cacfaefd84ce2400f03903a71a1841fbce195f","impliedFormat":1},{"version":"b33b74b97952d9bf4fbd2951dcfbb5136656ddb310ce1c84518aaa77dbca9992","impliedFormat":1},{"version":"37ba7b45141a45ce6e80e66f2a96c8a5ab1bcef0fc2d0f56bb58df96ec67e972","impliedFormat":1},{"version":"45650f47bfb376c8a8ed39d4bcda5902ab899a3150029684ee4c10676d9fbaee","impliedFormat":1},{"version":"8d117798e5228c7fdff887f44851d07320739c5cc0d511afae8f250c51809a36","affectsGlobalScope":true,"impliedFormat":1},{"version":"c119835edf36415081dfd9ed15fc0cd37aaa28d232be029ad073f15f3d88c323","impliedFormat":1},{"version":"8e7c3bed5f19ade8f911677ddc83052e2283e25b0a8654cd89db9079d4b323c7","impliedFormat":1},{"version":"9705cd157ffbb91c5cab48bdd2de5a437a372e63f870f8a8472e72ff634d47c1","affectsGlobalScope":true,"impliedFormat":1},{"version":"ae86f30d5d10e4f75ce8dcb6e1bd3a12ecec3d071a21e8f462c5c85c678efb41","impliedFormat":1},{"version":"a1a3cbade20430dcb7f00fa23c2f020e827d5620c0d44213db1665c53231f1fc","impliedFormat":1},{"version":"e03460fe72b259f6d25ad029f085e4bedc3f90477da4401d8fbc1efa9793230e","impliedFormat":1},{"version":"4286a3a6619514fca656089aee160bb6f2e77f4dd53dc5a96b26a0b4fc778055","impliedFormat":1},{"version":"69e0a41d620fb678a899c65e073413b452f4db321b858fe422ad93fd686cd49a","affectsGlobalScope":true,"impliedFormat":1},{"version":"3585d6891e9ea18e07d0755a6d90d71331558ba5dc5561933553209f886db106","affectsGlobalScope":true,"impliedFormat":1},{"version":"86be71cbb0593468644932a6eb96d527cfa600cecfc0b698af5f52e51804451d","impliedFormat":1},{"version":"84dd6b0fd2505135692935599d6606f50a421389e8d4535194bcded307ee5cf2","impliedFormat":1},{"version":"0d5b085f36e6dc55bc6332ecb9c733be3a534958c238fb8d8d18d4a2b6f2a15a","impliedFormat":1},{"version":"db19ea066fdc5f97df3f769e582ae3000380ab7942e266654bdb1a4650d19eaf","affectsGlobalScope":true,"impliedFormat":1},{"version":"2a034894bf28c220a331c7a0229d33564803abe2ac1b9a5feee91b6b9b6e88ea","impliedFormat":1},{"version":"d7e9ab1b0996639047c61c1e62f85c620e4382206b3abb430d9a21fb7bc23c77","impliedFormat":1},{"version":"2beff543f6e9a9701df88daeee3cdd70a34b4a1c11cb4c734472195a5cb2af54","impliedFormat":1},{"version":"2e07abf27aa06353d46f4448c0bbac73431f6065eef7113128a5cd804d0c384d","impliedFormat":1},{"version":"be1cc4d94ea60cbe567bc29ed479d42587bf1e6cba490f123d329976b0fe4ee5","impliedFormat":1},{"version":"42bc0e1a903408137c3df2b06dfd7e402cdab5bbfa5fcfb871b22ebfdb30bd0b","impliedFormat":1},{"version":"9894dafe342b976d251aac58e616ac6df8db91fb9d98934ff9dd103e9e82578f","impliedFormat":1},{"version":"413df52d4ea14472c2fa5bee62f7a40abd1eb49be0b9722ee01ee4e52e63beb2","impliedFormat":1},{"version":"db6d2d9daad8a6d83f281af12ce4355a20b9a3e71b82b9f57cddcca0a8964a96","impliedFormat":1},{"version":"446a50749b24d14deac6f8843e057a6355dd6437d1fac4f9e5ce4a5071f34bff","impliedFormat":1},{"version":"182e9fcbe08ac7c012e0a6e2b5798b4352470be29a64fdc114d23c2bab7d5106","impliedFormat":1},{"version":"5c9b31919ea1cb350a7ae5e71c9ced8f11723e4fa258a8cc8d16ae46edd623c7","impliedFormat":1},{"version":"4aa42ce8383b45823b3a1d3811c0fdd5f939f90254bc4874124393febbaf89f6","impliedFormat":1},{"version":"96ffa70b486207241c0fcedb5d9553684f7fa6746bc2b04c519e7ebf41a51205","impliedFormat":1},{"version":"a86f82d646a739041d6702101afa82dcb935c416dd93cbca7fd754fd0282ce1f","impliedFormat":1},{"version":"ad0d1d75d129b1c80f911be438d6b61bfa8703930a8ff2be2f0e1f8a91841c64","impliedFormat":1},{"version":"3e7efde639c6a6c3edb9847b3f61e308bf7a69685b92f665048c45132f51c218","impliedFormat":1},{"version":"df45ca1176e6ac211eae7ddf51336dc075c5314bc5c253651bae639defd5eec5","impliedFormat":1},{"version":"8a0e762ceb20c7e72504feef83d709468a70af4abccb304f32d6b9bac1129b2c","impliedFormat":1},{"version":"7cb0ee103671d1e201cd53dda12bc1cd0a35f1c63d6102720c6eeb322cb8e17e","impliedFormat":1},{"version":"ce75b1aebb33d510ff28af960a9221410a3eaf7f18fc5f21f9404075fba77256","impliedFormat":1},{"version":"ee8df1cb8d0faaca4013a1b442e99130769ce06f438d18d510fed95890067563","impliedFormat":1},{"version":"6f491d0108927478d3247bbbc489c78c2da7ef552fd5277f1ab6819986fdf0b1","impliedFormat":1},{"version":"594fe24fc54645ab6ccb9dba15d3a35963a73a395b2ef0375ea34bf181ccfd63","impliedFormat":1},{"version":"f4625edcb57b37b84506e8b276eb59ca30d31f88c6656d29d4e90e3bc58e69df","impliedFormat":1},{"version":"15a234e5031b19c48a69ccc1607522d6e4b50f57d308ecb7fe863d44cd9f9eb3","impliedFormat":1},{"version":"bfb7f8475428637bee12bdd31bd9968c1c8a1cc2c3e426c959e2f3a307f8936f","impliedFormat":1},{"version":"7580e62139cb2b44a0270c8d01abcbfcba2819a02514a527342447fa69b34ef1","impliedFormat":1},{"version":"f374cb24e93e7798c4d9e83ff872fa52d2cdb36306392b840a6ddf46cb925cb6","impliedFormat":1},{"version":"6b3453eebd474cc8acf6d759f1668e6ce7425a565e2996a20b644c72916ecf75","impliedFormat":1},{"version":"7e6ac205dcb9714f708354fd863bffa45cee90740706cc64b3b39b23ebb84744","impliedFormat":1},{"version":"106c6025f1d99fd468fd8bf6e5bda724e11e5905a4076c5d29790b6c3745e50c","impliedFormat":1},{"version":"148679c6d0f449210a96e7d2e562d589e56fcde87f843a92808b3ff103f1a774","impliedFormat":1},{"version":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","impliedFormat":1},{"version":"02436d7e9ead85e09a2f8e27d5f47d9464bced31738dec138ca735390815c9f0","impliedFormat":1},{"version":"78a2869ad0cbf3f9045dda08c0d4562b7e1b2bfe07b19e0db072f5c3c56e9584","impliedFormat":1},{"version":"f8d5ff8eafd37499f2b6a98659dd9b45a321de186b8db6b6142faed0fea3de77","impliedFormat":1},{"version":"c86fe861cf1b4c46a0fb7d74dffe596cf679a2e5e8b1456881313170f092e3fa","impliedFormat":1},{"version":"c685d9f68c70fe11ce527287526585a06ea13920bb6c18482ca84945a4e433a7","impliedFormat":1},{"version":"540cc83ab772a2c6bc509fe1354f314825b5dba3669efdfbe4693ecd3048e34f","impliedFormat":1},{"version":"121b0696021ab885c570bbeb331be8ad82c6efe2f3b93a6e63874901bebc13e3","impliedFormat":1},{"version":"4e01846df98d478a2a626ec3641524964b38acaac13945c2db198bf9f3df22ee","impliedFormat":1},{"version":"678d6d4c43e5728bf66e92fc2269da9fa709cb60510fed988a27161473c3853f","impliedFormat":1},{"version":"ffa495b17a5ef1d0399586b590bd281056cee6ce3583e34f39926f8dcc6ecdb5","impliedFormat":1},{"version":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","impliedFormat":1},{"version":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","impliedFormat":1},{"version":"8e609bb71c20b858c77f0e9f90bb1319db8477b13f9f965f1a1e18524bf50881","impliedFormat":1},{"version":"8e609bb71c20b858c77f0e9f90bb1319db8477b13f9f965f1a1e18524bf50881","impliedFormat":1},{"version":"aa14cee20aa0db79f8df101fc027d929aec10feb5b8a8da3b9af3895d05b7ba2","impliedFormat":1},{"version":"493c700ac3bd317177b2eb913805c87fe60d4e8af4fb39c41f04ba81fae7e170","impliedFormat":1},{"version":"aeb554d876c6b8c818da2e118d8b11e1e559adbe6bf606cc9a611c1b6c09f670","impliedFormat":1},{"version":"acf5a2ac47b59ca07afa9abbd2b31d001bf7448b041927befae2ea5b1951d9f9","impliedFormat":1},{"version":"8e609bb71c20b858c77f0e9f90bb1319db8477b13f9f965f1a1e18524bf50881","impliedFormat":1},{"version":"d71291eff1e19d8762a908ba947e891af44749f3a2cbc5bd2ec4b72f72ea795f","impliedFormat":1},{"version":"c0480e03db4b816dff2682b347c95f2177699525c54e7e6f6aa8ded890b76be7","impliedFormat":1},{"version":"e2a37ac938c4bede5bb284b9d2d042da299528f1e61f6f57538f1bd37d760869","impliedFormat":1},{"version":"76def37aff8e3a051cf406e10340ffba0f28b6991c5d987474cc11137796e1eb","impliedFormat":1},{"version":"b620391fe8060cf9bedc176a4d01366e6574d7a71e0ac0ab344a4e76576fcbb8","impliedFormat":1},{"version":"6ac6715916fa75a1f7ebdfeacac09513b4d904b667d827b7535e84ff59679aff","impliedFormat":1},{"version":"2652448ac55a2010a1f71dd141f828b682298d39728f9871e1cdf8696ef443fd","impliedFormat":1},{"version":"d682336018141807fb602709e2d95a192828fcb8d5ba06dda3833a8ea98f69e3","impliedFormat":1},{"version":"6124e973eab8c52cabf3c07575204efc1784aca6b0a30c79eb85fe240a857efa","impliedFormat":1},{"version":"0d891735a21edc75df51f3eb995e18149e119d1ce22fd40db2b260c5960b914e","impliedFormat":1},{"version":"3b414b99a73171e1c4b7b7714e26b87d6c5cb03d200352da5342ab4088a54c85","impliedFormat":1},{"version":"4fbd3116e00ed3a6410499924b6403cc9367fdca303e34838129b328058ede40","impliedFormat":1},{"version":"9c82171d836c47486074e4ca8e059735bf97b205e70b196535b5efd40cbe1bc5","impliedFormat":1},{"version":"2f9c89cbb29d362290531b48880a4024f258c6033aaeb7e59fbc62db26819650","impliedFormat":1},{"version":"a365c4d3bed3be4e4e20793c999c51f5cd7e6792322f14650949d827fbcd170f","impliedFormat":1},{"version":"c5426dbfc1cf90532f66965a7aa8c1136a78d4d0f96d8180ecbfc11d7722f1a5","impliedFormat":1},{"version":"65a15fc47900787c0bd18b603afb98d33ede930bed1798fc984d5ebb78b26cf9","impliedFormat":1},{"version":"9d202701f6e0744adb6314d03d2eb8fc994798fc83d91b691b75b07626a69801","impliedFormat":1},{"version":"de9d2df7663e64e3a91bf495f315a7577e23ba088f2949d5ce9ec96f44fba37d","impliedFormat":1},{"version":"c7af78a2ea7cb1cd009cfb5bdb48cd0b03dad3b54f6da7aab615c2e9e9d570c5","impliedFormat":1},{"version":"1ee45496b5f8bdee6f7abc233355898e5bf9bd51255db65f5ff7ede617ca0027","impliedFormat":1},{"version":"97e5ccc7bb88419005cbdf812243a5b3186cdef81b608540acabe1be163fc3e4","affectsGlobalScope":true,"impliedFormat":1},{"version":"3fbdd025f9d4d820414417eeb4107ffa0078d454a033b506e22d3a23bc3d9c41","affectsGlobalScope":true,"impliedFormat":1},{"version":"dba114fb6a32b355a9cfc26ca2276834d72fe0e94cd2c3494005547025015369","impliedFormat":1},{"version":"a8f8e6ab2fa07b45251f403548b78eaf2022f3c2254df3dc186cb2671fe4996d","affectsGlobalScope":true,"impliedFormat":1},{"version":"fa6c12a7c0f6b84d512f200690bfc74819e99efae69e4c95c4cd30f6884c526e","impliedFormat":1},{"version":"f1c32f9ce9c497da4dc215c3bc84b722ea02497d35f9134db3bb40a8d918b92b","impliedFormat":1},{"version":"b73c319af2cc3ef8f6421308a250f328836531ea3761823b4cabbd133047aefa","affectsGlobalScope":true,"impliedFormat":1},{"version":"e433b0337b8106909e7953015e8fa3f2d30797cea27141d1c5b135365bb975a6","impliedFormat":1},{"version":"9f9bb6755a8ce32d656ffa4763a8144aa4f274d6b69b59d7c32811031467216e","impliedFormat":1},{"version":"5c32bdfbd2d65e8fffbb9fbda04d7165e9181b08dad61154961852366deb7540","impliedFormat":1},{"version":"ddff7fc6edbdc5163a09e22bf8df7bef75f75369ebd7ecea95ba55c4386e2441","impliedFormat":1},{"version":"0c05e9842ec4f8b7bfebfd3ca61604bb8c914ba8da9b5337c4f25da427a005f2","impliedFormat":1},{"version":"89cd3444e389e42c56fd0d072afef31387e7f4107651afd2c03950f22dc36f77","impliedFormat":1},{"version":"7f2aa4d4989a82530aaac3f72b3dceca90e9c25bee0b1a327e8a08a1262435ad","impliedFormat":1},{"version":"e39a304f882598138a8022106cb8de332abbbb87f3fee71c5ca6b525c11c51fc","impliedFormat":1},{"version":"faed7a5153215dbd6ebe76dfdcc0af0cfe760f7362bed43284be544308b114cf","impliedFormat":1},{"version":"fcdf3e40e4a01b9a4b70931b8b51476b210c511924fcfe3f0dae19c4d52f1a54","impliedFormat":1},{"version":"345c4327b637d34a15aba4b7091eb068d6ab40a3dedaab9f00986253c9704e53","impliedFormat":1},{"version":"3a788c7fb7b1b1153d69a4d1d9e1d0dfbcf1127e703bdb02b6d12698e683d1fb","impliedFormat":1},{"version":"2e4f37ffe8862b14d8e24ae8763daaa8340c0df0b859d9a9733def0eee7562d9","impliedFormat":1},{"version":"d38530db0601215d6d767f280e3a3c54b2a83b709e8d9001acb6f61c67e965fc","impliedFormat":1},{"version":"6ac6715916fa75a1f7ebdfeacac09513b4d904b667d827b7535e84ff59679aff","impliedFormat":1},{"version":"4805f6161c2c8cefb8d3b8bd96a080c0fe8dbc9315f6ad2e53238f9a79e528a6","impliedFormat":1},{"version":"b83cb14474fa60c5f3ec660146b97d122f0735627f80d82dd03e8caa39b4388c","impliedFormat":1},{"version":"42b81043b00ff27c6bd955aea0f6e741545f2265978bf364b614702b72a027ab","impliedFormat":1},{"version":"7274fbffbd7c9589d8d0ffba68157237afd5cecff1e99881ea3399127e60572f","impliedFormat":1},{"version":"b73cbf0a72c8800cf8f96a9acfe94f3ad32ca71342a8908b8ae484d61113f647","impliedFormat":1},{"version":"bae6dd176832f6423966647382c0d7ba9e63f8c167522f09a982f086cd4e8b23","impliedFormat":1},{"version":"20865ac316b8893c1a0cc383ccfc1801443fbcc2a7255be166cf90d03fac88c9","impliedFormat":1},{"version":"c9958eb32126a3843deedda8c22fb97024aa5d6dd588b90af2d7f2bfac540f23","impliedFormat":1},{"version":"461d0ad8ae5f2ff981778af912ba71b37a8426a33301daa00f21c6ccb27f8156","impliedFormat":1},{"version":"e927c2c13c4eaf0a7f17e6022eee8519eb29ef42c4c13a31e81a611ab8c95577","impliedFormat":1},{"version":"fcafff163ca5e66d3b87126e756e1b6dfa8c526aa9cd2a2b0a9da837d81bbd72","impliedFormat":1},{"version":"70246ad95ad8a22bdfe806cb5d383a26c0c6e58e7207ab9c431f1cb175aca657","impliedFormat":1},{"version":"f00f3aa5d64ff46e600648b55a79dcd1333458f7a10da2ed594d9f0a44b76d0b","impliedFormat":1},{"version":"772d8d5eb158b6c92412c03228bd9902ccb1457d7a705b8129814a5d1a6308fc","impliedFormat":1},{"version":"802e797bcab5663b2c9f63f51bdf67eff7c41bc64c0fd65e6da3e7941359e2f7","impliedFormat":1},{"version":"b01bd582a6e41457bc56e6f0f9de4cb17f33f5f3843a7cf8210ac9c18472fb0f","impliedFormat":1},{"version":"8b4327413e5af38cd8cb97c59f48c3c866015d5d642f28518e3a891c469f240e","impliedFormat":1},{"version":"2b5b70d7782fe028487a80a1c214e67bd610532b9f978b78fa60f5b4a359f77e","impliedFormat":1},{"version":"7ee86fbb3754388e004de0ef9e6505485ddfb3be7640783d6d015711c03d302d","impliedFormat":1},{"version":"61dc6e3ac78d64aa864eedd0a208b97b5887cc99c5ba65c03287bf57d83b1eb9","impliedFormat":1},{"version":"43e96a3d5d1411ab40ba2f61d6a3192e58177bcf3b133a80ad2a16591611726d","impliedFormat":1},{"version":"02c4fc9e6bb27545fa021f6056e88ff5fdf10d9d9f1467f1d10536c6e749ac50","impliedFormat":1},{"version":"120599fd965257b1f4d0ff794bc696162832d9d8467224f4665f713a3119078b","impliedFormat":1},{"version":"43ba4f2fa8c698f5c304d21a3ef596741e8e85a810b7c1f9b692653791d8d97a","impliedFormat":1},{"version":"5433f33b0a20300cca35d2f229a7fc20b0e8477c44be2affeb21cb464af60c76","impliedFormat":1},{"version":"db036c56f79186da50af66511d37d9fe77fa6793381927292d17f81f787bb195","impliedFormat":1},{"version":"bd4131091b773973ca5d2326c60b789ab1f5e02d8843b3587effe6e1ea7c9d86","impliedFormat":1},{"version":"c49469a5349b3cc1965710b5b0f98ed6c028686aa8450bcb3796728873eb923e","impliedFormat":1},{"version":"4a889f2c763edb4d55cb624257272ac10d04a1cad2ed2948b10ed4a7fda2a428","impliedFormat":1},{"version":"7bb79aa2fead87d9d56294ef71e056487e848d7b550c9a367523ee5416c44cfa","impliedFormat":1},{"version":"d88ea80a6447d7391f52352ec97e56b52ebec934a4a4af6e2464cfd8b39c3ba8","impliedFormat":1},{"version":"55095860901097726220b6923e35a812afdd49242a1246d7b0942ee7eb34c6e4","impliedFormat":1},{"version":"27ff4196654e6373c9af16b6165120e2dd2169f9ad6abb5c935af5abd8c7938c","impliedFormat":1},{"version":"bb8f2dbc03533abca2066ce4655c119bff353dd4514375beb93c08590c03e023","impliedFormat":1},{"version":"d193c8a86144b3a87b22bc1f5534b9c3e0f5a187873ec337c289a183973a58fe","impliedFormat":1},{"version":"1a6e6ba8a07b74e3ad237717c0299d453f9ceb795dbc2f697d1f2dd07cb782d2","impliedFormat":1},{"version":"58d70c38037fc0f949243388ff7ae20cf43321107152f14a9d36ca79311e0ada","impliedFormat":1},{"version":"c7f6485931085bf010fbaf46880a9b9ec1a285ad9dc8c695a9e936f5a48f34b4","impliedFormat":1},{"version":"796273b2edc72e78a04e86d7c58ae94d370ab93a0ddf40b1aa85a37a1c29ecd7","impliedFormat":1},{"version":"5df15a69187d737d6d8d066e189ae4f97e41f4d53712a46b2710ff9f8563ec9f","impliedFormat":1},{"version":"14f6b927888a1112d662877a5966b05ac1bf7ed25d6c84386db4c23c95a5363b","impliedFormat":1},{"version":"6ac6715916fa75a1f7ebdfeacac09513b4d904b667d827b7535e84ff59679aff","impliedFormat":1},{"version":"622694a8522b46f6310c2a9b5d2530dde1e2854cb5829354e6d1ff8f371cf469","impliedFormat":1},{"version":"ad37fb4be61c1035b68f532b7220f4e8236cf245381ce3b90ac15449ecfe7305","impliedFormat":1},{"version":"93436bd74c66baba229bfefe1314d122c01f0d4c1d9e35081a0c4f0470ac1a6c","impliedFormat":1},{"version":"d24ff95760ea2dfcc7c57d0e269356984e7046b7e0b745c80fea71559f15bdd8","impliedFormat":1},{"version":"9e2739b32f741859263fdba0244c194ca8e96da49b430377930b8f721d77c000","impliedFormat":1},{"version":"a9e6c0ff3f8186fccd05752cf75fc94e147c02645087ac6de5cc16403323d870","impliedFormat":1},{"version":"49c346823ba6d4b12278c12c977fb3a31c06b9ca719015978cb145eb86da1c61","impliedFormat":1},{"version":"bfac6e50eaa7e73bb66b7e052c38fdc8ccfc8dbde2777648642af33cf349f7f1","impliedFormat":1},{"version":"92f7c1a4da7fbfd67a2228d1687d5c2e1faa0ba865a94d3550a3941d7527a45d","impliedFormat":1},{"version":"f53b120213a9289d9a26f5af90c4c686dd71d91487a0aa5451a38366c70dc64b","impliedFormat":1},{"version":"83fe880c090afe485a5c02262c0b7cdd76a299a50c48d9bde02be8e908fb4ae6","impliedFormat":1},{"version":"13c1b657932e827a7ed510395d94fc8b743b9d053ab95b7cd829b2bc46fb06db","impliedFormat":1},{"version":"57d67b72e06059adc5e9454de26bbfe567d412b962a501d263c75c2db430f40e","impliedFormat":1},{"version":"6511e4503cf74c469c60aafd6589e4d14d5eb0a25f9bf043dcbecdf65f261972","impliedFormat":1},{"version":"078131f3a722a8ad3fc0b724cd3497176513cdcb41c80f96a3acbda2a143b58e","impliedFormat":1},{"version":"6459054aabb306821a043e02b89d54da508e3a6966601a41e71c166e4ea1474f","impliedFormat":1},{"version":"bb37588926aba35c9283fe8d46ebf4e79ffe976343105f5c6d45f282793352b2","impliedFormat":1},{"version":"05c97cddbaf99978f83d96de2d8af86aded9332592f08ce4a284d72d0952c391","impliedFormat":1},{"version":"72179f9dd22a86deaad4cc3490eb0fe69ee084d503b686985965654013f1391b","impliedFormat":1},{"version":"2e6114a7dd6feeef85b2c80120fdbfb59a5529c0dcc5bfa8447b6996c97a69f5","impliedFormat":1},{"version":"7b6ff760c8a240b40dab6e4419b989f06a5b782f4710d2967e67c695ef3e93c4","impliedFormat":1},{"version":"c8f004e6036aa1c764ad4ec543cf89a5c1893a9535c80ef3f2b653e370de45e6","impliedFormat":1},{"version":"dd80b1e600d00f5c6a6ba23f455b84a7db121219e68f89f10552c54ba46e4dc9","impliedFormat":1},{"version":"b064c36f35de7387d71c599bfcf28875849a1dbc733e82bd26cae3d1cd060521","impliedFormat":1},{"version":"05c7280d72f3ed26f346cbe7cbbbb002fb7f15739197cbbee6ab3fd1a6cb9347","impliedFormat":1},{"version":"8de9fe97fa9e00ec00666fa77ab6e91b35d25af8ca75dabcb01e14ad3299b150","impliedFormat":1},{"version":"803cd2aaf1921c218916c2c7ee3fce653e852d767177eb51047ff15b5b253893","impliedFormat":1},{"version":"7ab12b2f1249187223d11a589f5789c75177a0b597b9eb7f8e2e42d045393347","impliedFormat":1},{"version":"f974e4a06953682a2c15d5bd5114c0284d5abf8bc0fe4da25cb9159427b70072","impliedFormat":1},{"version":"50256e9c31318487f3752b7ac12ff365c8949953e04568009c8705db802776fb","impliedFormat":1},{"version":"7d73b24e7bf31dfb8a931ca6c4245f6bb0814dfae17e4b60c9e194a631fe5f7b","impliedFormat":1},{"version":"d130c5f73768de51402351d5dc7d1b36eaec980ca697846e53156e4ea9911476","impliedFormat":1},{"version":"413586add0cfe7369b64979d4ec2ed56c3f771c0667fbde1bf1f10063ede0b08","impliedFormat":1},{"version":"06472528e998d152375ad3bd8ebcb69ff4694fd8d2effaf60a9d9f25a37a097a","impliedFormat":1},{"version":"50b5bc34ce6b12eccb76214b51aadfa56572aa6cc79c2b9455cdbb3d6c76af1d","impliedFormat":1},{"version":"b7e16ef7f646a50991119b205794ebfd3a4d8f8e0f314981ebbe991639023d0e","impliedFormat":1},{"version":"a401617604fa1f6ce437b81689563dfdc377069e4c58465dbd8d16069aede0a5","impliedFormat":1},{"version":"6e9082e91370de5040e415cd9f24e595b490382e8c7402c4e938a8ce4bccc99f","impliedFormat":1},{"version":"8695dec09ad439b0ceef3776ea68a232e381135b516878f0901ed2ea114fd0fe","impliedFormat":1},{"version":"304b44b1e97dd4c94697c3313df89a578dca4930a104454c99863f1784a54357","impliedFormat":1},{"version":"0a437ae178f999b46b6153d79095b60c42c996bc0458c04955f1c996dc68b971","impliedFormat":1},{"version":"74b2a5e5197bd0f2e0077a1ea7c07455bbea67b87b0869d9786d55104006784f","impliedFormat":1},{"version":"4a7baeb6325920044f66c0f8e5e6f1f52e06e6d87588d837bdf44feb6f35c664","impliedFormat":1},{"version":"12d218a49dbe5655b911e6cc3c13b2c655e4c783471c3b0432137769c79e1b3c","impliedFormat":1},{"version":"6b0fc04121360f752d196ba35b6567192f422d04a97b2840d7d85f8b79921c92","impliedFormat":1},{"version":"1a82deef4c1d39f6882f28d275cad4c01f907b9b39be9cbc472fcf2cf051e05b","impliedFormat":1},{"version":"4b20fcf10a5413680e39f5666464859fc56b1003e7dfe2405ced82371ebd49b6","impliedFormat":1},{"version":"c06ef3b2569b1c1ad99fcd7fe5fba8d466e2619da5375dfa940a94e0feea899b","impliedFormat":1},{"version":"f7d628893c9fa52ba3ab01bcb5e79191636c4331ee5667ecc6373cbccff8ae12","impliedFormat":1},{"version":"1d879125d1ec570bf04bc1f362fdbe0cb538315c7ac4bcfcdf0c1e9670846aa6","impliedFormat":1},{"version":"f730b468deecf26188ad62ee8950dc29aa2aea9543bb08ed714c3db019359fd9","impliedFormat":1},{"version":"933aee906d42ea2c53b6892192a8127745f2ec81a90695df4024308ba35a8ff4","impliedFormat":1},{"version":"d663134457d8d669ae0df34eabd57028bddc04fc444c4bc04bc5215afc91e1f4","impliedFormat":1},{"version":"144bc326e90b894d1ec78a2af3ffb2eb3733f4d96761db0ca0b6239a8285f972","impliedFormat":1},{"version":"a3e3f0efcae272ab8ee3298e4e819f7d9dd9ff411101f45444877e77cfeca9a4","impliedFormat":1},{"version":"58659b06d33fa430bee1105b75cf876c0a35b2567207487c8578aec51ca2d977","impliedFormat":1},{"version":"71d9eb4c4e99456b78ae182fb20a5dfc20eb1667f091dbb9335b3c017dd1c783","impliedFormat":1},{"version":"cfa846a7b7847a1d973605fbb8c91f47f3a0f0643c18ac05c47077ebc72e71c7","impliedFormat":1},{"version":"30e6520444df1a004f46fdc8096f3fe06f7bbd93d09c53ada9dcdde59919ccca","impliedFormat":1},{"version":"6c800b281b9e89e69165fd11536195488de3ff53004e55905e6c0059a2d8591e","impliedFormat":1},{"version":"7d4254b4c6c67a29d5e7f65e67d72540480ac2cfb041ca484847f5ae70480b62","impliedFormat":1},{"version":"a58beefce74db00dbb60eb5a4bb0c6726fb94c7797c721f629142c0ae9c94306","impliedFormat":1},{"version":"41eeb453ccb75c5b2c3abef97adbbd741bd7e9112a2510e12f03f646dc9ad13d","impliedFormat":1},{"version":"502fa5863df08b806dbf33c54bee8c19f7e2ad466785c0fc35465d7c5ff80995","impliedFormat":1},{"version":"c91a2d08601a1547ffef326201be26db94356f38693bb18db622ae5e9b3d7c92","impliedFormat":1},{"version":"888cda0fa66d7f74e985a3f7b1af1f64b8ff03eb3d5e80d051c3cbdeb7f32ab7","impliedFormat":1},{"version":"60681e13f3545be5e9477acb752b741eae6eaf4cc01658a25ec05bff8b82a2ef","impliedFormat":1},{"version":"9586918b63f24124a5ca1d0cc2979821a8a57f514781f09fc5aa9cae6d7c0138","impliedFormat":1},{"version":"a57b1802794433adec9ff3fed12aa79d671faed86c49b09e02e1ac41b4f1d33a","impliedFormat":1},{"version":"ad10d4f0517599cdeca7755b930f148804e3e0e5b5a3847adce0f1f71bbccd74","impliedFormat":1},{"version":"1042064ece5bb47d6aba91648fbe0635c17c600ebdf567588b4ca715602f0a9d","impliedFormat":1},{"version":"f56bdc6884648806d34bc66d31cdb787c4718d04105ce2cd88535db214631f82","impliedFormat":1},{"version":"190da5eac6478d61ab9731ab2146fbc0164af2117a363013249b7e7992f1cccb","impliedFormat":1},{"version":"01479d9d5a5dda16d529b91811375187f61a06e74be294a35ecce77e0b9e8d6c","impliedFormat":1},{"version":"49f95e989b4632c6c2a578cc0078ee19a5831832d79cc59abecf5160ea71abad","impliedFormat":1},{"version":"9666533332f26e8995e4d6fe472bdeec9f15d405693723e6497bf94120c566c8","impliedFormat":1},{"version":"ce0df82a9ae6f914ba08409d4d883983cc08e6d59eb2df02d8e4d68309e7848b","impliedFormat":1},{"version":"1a4dc28334a926d90ba6a2d811ba0ff6c22775fcc13679521f034c124269fd40","impliedFormat":1},{"version":"f05315ff85714f0b87cc0b54bcd3dde2716e5a6b99aedcc19cad02bf2403e08c","impliedFormat":1},{"version":"8a8c64dafaba11c806efa56f5c69f611276471bef80a1db1f71316ec4168acef","impliedFormat":1},{"version":"5fad3b31fc17a5bc58095118a8b160f5260964787c52e7eb51e3d4fcf5d4a6f0","impliedFormat":1},{"version":"72105519d0390262cf0abe84cf41c926ade0ff475d35eb21307b2f94de985778","impliedFormat":1},{"version":"d0a4cac61fa080f2be5ebb68b82726be835689b35994ba0e22e3ed4d2bc45e3b","impliedFormat":1},{"version":"c857e0aae3f5f444abd791ec81206020fbcc1223e187316677e026d1c1d6fe08","impliedFormat":1},{"version":"ccf6dd45b708fb74ba9ed0f2478d4eb9195c9dfef0ff83a6092fa3cf2ff53b4f","impliedFormat":1},{"version":"2d7db1d73456e8c5075387d4240c29a2a900847f9c1bff106a2e490da8fbd457","impliedFormat":1},{"version":"2b15c805f48e4e970f8ec0b1915f22d13ca6212375e8987663e2ef5f0205e832","impliedFormat":1},{"version":"205a31b31beb7be73b8df18fcc43109cbc31f398950190a0967afc7a12cb478c","impliedFormat":1},{"version":"8fca3039857709484e5893c05c1f9126ab7451fa6c29e19bb8c2411a2e937345","impliedFormat":1},{"version":"35069c2c417bd7443ae7c7cafd1de02f665bf015479fec998985ffbbf500628c","impliedFormat":1},{"version":"dba6c7006e14a98ec82999c6f89fbbbfd1c642f41db148535f3b77b8018829b8","impliedFormat":1},{"version":"7f897b285f22a57a5c4dc14a27da2747c01084a542b4d90d33897216dceeea2e","impliedFormat":1},{"version":"7e0b7f91c5ab6e33f511efc640d36e6f933510b11be24f98836a20a2dc914c2d","impliedFormat":1},{"version":"045b752f44bf9bbdcaffd882424ab0e15cb8d11fa94e1448942e338c8ef19fba","impliedFormat":1},{"version":"2894c56cad581928bb37607810af011764a2f511f575d28c9f4af0f2ef02d1ab","impliedFormat":1},{"version":"0a72186f94215d020cb386f7dca81d7495ab6c17066eb07d0f44a5bf33c1b21a","impliedFormat":1},{"version":"d96b39301d0ded3f1a27b47759676a33a02f6f5049bfcbde81e533fd10f50dcb","impliedFormat":1},{"version":"2ded4f930d6abfaa0625cf55e58f565b7cbd4ab5b574dd2cb19f0a83a2f0be8b","impliedFormat":1},{"version":"0aedb02516baf3e66b2c1db9fef50666d6ed257edac0f866ea32f1aa05aa474f","impliedFormat":1},{"version":"ca0f4d9068d652bad47e326cf6ba424ac71ab866e44b24ddb6c2bd82d129586a","affectsGlobalScope":true,"impliedFormat":1},{"version":"04d36005fcbeac741ac50c421181f4e0316d57d148d37cc321a8ea285472462b","impliedFormat":1},{"version":"56ccb49443bfb72e5952f7012f0de1a8679f9f75fc93a5c1ac0bafb28725fc5f","impliedFormat":1},{"version":"20fa37b636fdcc1746ea0738f733d0aed17890d1cd7cb1b2f37010222c23f13e","impliedFormat":1},{"version":"d90b9f1520366d713a73bd30c5a9eb0040d0fb6076aff370796bc776fd705943","impliedFormat":1},{"version":"bc03c3c352f689e38c0ddd50c39b1e65d59273991bfc8858a9e3c0ebb79c023b","impliedFormat":1},{"version":"19df3488557c2fc9b4d8f0bac0fd20fb59aa19dec67c81f93813951a81a867f8","affectsGlobalScope":true,"impliedFormat":1},{"version":"b25350193e103ae90423c5418ddb0ad1168dc9c393c9295ef34980b990030617","affectsGlobalScope":true,"impliedFormat":1},{"version":"bef86adb77316505c6b471da1d9b8c9e428867c2566270e8894d4d773a1c4dc2","impliedFormat":1},{"version":"a46dba563f70f32f9e45ae015f3de979225f668075d7a427f874e0f6db584991","impliedFormat":1},{"version":"96171c03c2e7f314d66d38acd581f9667439845865b7f85da8df598ff9617476","impliedFormat":1},{"version":"d408d6f32de8d1aba2ff4a20f1aa6a6edd7d92c997f63b90f8ad3f9017cf5e46","impliedFormat":1},{"version":"9252d498a77517aab5d8d4b5eb9d71e4b225bbc7123df9713e08181de63180f6","impliedFormat":1},{"version":"b1f1d57fde8247599731b24a733395c880a6561ec0c882efaaf20d7df968c5af","impliedFormat":1},{"version":"9d622ea608d43eb463c0c4538fd5baa794bc18ea0bb8e96cd2ab6fd483d55fe2","impliedFormat":1},{"version":"35e6379c3f7cb27b111ad4c1aa69538fd8e788ab737b8ff7596a1b40e96f4f90","impliedFormat":1},{"version":"1fffe726740f9787f15b532e1dc870af3cd964dbe29e191e76121aa3dd8693f2","impliedFormat":1},{"version":"371bf6127c1d427836de95197155132501cb6b69ef8709176ce6e0b85d059264","impliedFormat":1},{"version":"2bafd700e617d3693d568e972d02b92224b514781f542f70d497a8fdf92d52a2","affectsGlobalScope":true,"impliedFormat":1},{"version":"5542d8a7ea13168cb573be0d1ba0d29460d59430fb12bb7bf4674efd5604e14c","impliedFormat":1},{"version":"af48e58339188d5737b608d41411a9c054685413d8ae88b8c1d0d9bfabdf6e7e","impliedFormat":1},{"version":"8c70ddc0c22d85e56011d49fddfaae3405eb53d47b59327b9dd589e82df672e7","impliedFormat":1},{"version":"a67b87d0281c97dfc1197ef28dfe397fc2c865ccd41f7e32b53f647184cc7307","impliedFormat":1},{"version":"771ffb773f1ddd562492a6b9aaca648192ac3f056f0e1d997678ff97dbb6bf9b","impliedFormat":1},{"version":"232f70c0cf2b432f3a6e56a8dc3417103eb162292a9fd376d51a3a9ea5fbbf6f","impliedFormat":1},{"version":"9e155d2255348d950b1f65643fb26c0f14f5109daf8bd9ee24a866ad0a743648","affectsGlobalScope":true,"impliedFormat":1},{"version":"0b103e9abfe82d14c0ad06a55d9f91d6747154ef7cacc73cf27ecad2bfb3afcf","impliedFormat":1},{"version":"7a883e9c84e720810f86ef4388f54938a65caa0f4d181a64e9255e847a7c9f51","impliedFormat":1},{"version":"a0ba218ac1baa3da0d5d9c1ec1a7c2f8676c284e6f5b920d6d049b13fa267377","impliedFormat":1},{"version":"bc9ee0192f056b3d5527bcd78dc3f9e527a9ba2bdc0a2c296fbc9027147df4b2","impliedFormat":1},{"version":"330896c1a2b9693edd617be24fbf9e5895d6e18c7955d6c08f028f272b37314d","impliedFormat":1},{"version":"1d9c0a9a6df4e8f29dc84c25c5aa0bb1da5456ebede7a03e03df08bb8b27bae6","impliedFormat":1},{"version":"84380af21da938a567c65ef95aefb5354f676368ee1a1cbb4cae81604a4c7d17","impliedFormat":1},{"version":"1af3e1f2a5d1332e136f8b0b95c0e6c0a02aaabd5092b36b64f3042a03debf28","impliedFormat":1},{"version":"30d8da250766efa99490fc02801047c2c6d72dd0da1bba6581c7e80d1d8842a4","impliedFormat":1},{"version":"03566202f5553bd2d9de22dfab0c61aa163cabb64f0223c08431fb3fc8f70280","impliedFormat":1},{"version":"4c0a1233155afb94bd4d7518c75c84f98567cd5f13fc215d258de196cdb40d91","impliedFormat":1},{"version":"e7765aa8bcb74a38b3230d212b4547686eb9796621ffb4367a104451c3f9614f","impliedFormat":1},{"version":"1de80059b8078ea5749941c9f863aa970b4735bdbb003be4925c853a8b6b4450","impliedFormat":1},{"version":"0f9c78b3b70716baaa82ed4823f6bb77469ed608a6ff2137c8935f79aa941127","impliedFormat":99},{"version":"98762b44ededffcd7be5018e761c11e89bd6a47e970595e6033cbd45e4a9d011","impliedFormat":99},{"version":"68b6a7501a56babd7bcd840e0d638ee7ec582f1e70b3c36ebf32e5e5836913c8","impliedFormat":99},{"version":"7a14bf21ae8a29d64c42173c08f026928daf418bed1b97b37ac4bb2aa197b89b","impliedFormat":99},{"version":"a56d48691b5dd2fdde127a93acfdc48294d7c0f9d400f6775cccf96e69e74841","impliedFormat":99},{"version":"ab30f03ed8946add42204d4d94f67d9a92d233567186e85de513443aa2a39ee5","impliedFormat":99},{"version":"fcbfb107aa5367daa52f716c613e12ded24e5c1d6e3c8adeecc770ae445aaa4c","impliedFormat":99},{"version":"b26f35f2b2799212182464e914ea2d2adb26b175cf194580c99aff980afa8952","impliedFormat":99},{"version":"acd8fd5090ac73902278889c38336ff3f48af6ba03aa665eb34a75e7ba1dccc4","impliedFormat":1},{"version":"d6258883868fb2680d2ca96bc8b1352cab69874581493e6d52680c5ffecdb6cc","impliedFormat":1},{"version":"1b61d259de5350f8b1e5db06290d31eaebebc6baafd5f79d314b5af9256d7153","impliedFormat":1},{"version":"f258e3960f324a956fc76a3d3d9e964fff2244ff5859dcc6ce5951e5413ca826","impliedFormat":1},{"version":"643f7232d07bf75e15bd8f658f664d6183a0efaca5eb84b48201c7671a266979","impliedFormat":1},{"version":"616775f16134fa9d01fc677ad3f76e68c051a056c22ab552c64cc281a9686790","impliedFormat":1},{"version":"65c24a8baa2cca1de069a0ba9fba82a173690f52d7e2d0f1f7542d59d5eb4db0","impliedFormat":1},{"version":"f9fe6af238339a0e5f7563acee3178f51db37f32a2e7c09f85273098cee7ec49","impliedFormat":1},{"version":"1de8c302fd35220d8f29dea378a4ae45199dc8ff83ca9923aca1400f2b28848a","impliedFormat":1},{"version":"77e71242e71ebf8528c5802993697878f0533db8f2299b4d36aa015bae08a79c","impliedFormat":1},{"version":"98a787be42bd92f8c2a37d7df5f13e5992da0d967fab794adbb7ee18370f9849","impliedFormat":1},{"version":"332248ee37cca52903572e66c11bef755ccc6e235835e63d3c3e60ddda3e9b93","impliedFormat":1},{"version":"94e8cc88ae2ef3d920bb3bdc369f48436db123aa2dc07f683309ad8c9968a1e1","impliedFormat":1},{"version":"4545c1a1ceca170d5d83452dd7c4994644c35cf676a671412601689d9a62da35","impliedFormat":1},{"version":"320f4091e33548b554d2214ce5fc31c96631b513dffa806e2e3a60766c8c49d9","impliedFormat":1},{"version":"a2d648d333cf67b9aeac5d81a1a379d563a8ffa91ddd61c6179f68de724260ff","impliedFormat":1},{"version":"d90d5f524de38889d1e1dbc2aeef00060d779f8688c02766ddb9ca195e4a713d","impliedFormat":1},{"version":"a3f41ed1b4f2fc3049394b945a68ae4fdefd49fa1739c32f149d32c0545d67f5","impliedFormat":1},{"version":"b0309e1eda99a9e76f87c18992d9c3689b0938266242835dd4611f2b69efe456","impliedFormat":1},{"version":"47699512e6d8bebf7be488182427189f999affe3addc1c87c882d36b7f2d0b0e","impliedFormat":1},{"version":"6ceb10ca57943be87ff9debe978f4ab73593c0c85ee802c051a93fc96aaf7a20","impliedFormat":1},{"version":"1de3ffe0cc28a9fe2ac761ece075826836b5a02f340b412510a59ba1d41a505a","impliedFormat":1},{"version":"e46d6cc08d243d8d0d83986f609d830991f00450fb234f5b2f861648c42dc0d8","impliedFormat":1},{"version":"1c0a98de1323051010ce5b958ad47bc1c007f7921973123c999300e2b7b0ecc0","impliedFormat":1},{"version":"b6c1f64158da02580f55e8a2728eda6805f79419aed46a930f43e68ad66a38fc","impliedFormat":1},{"version":"cdf21eee8007e339b1b9945abf4a7b44930b1d695cc528459e68a3adc39a622e","impliedFormat":1},{"version":"1d079c37fa53e3c21ed3fa214a27507bda9991f2a41458705b19ed8c2b61173d","impliedFormat":1},{"version":"5bf5c7a44e779790d1eb54c234b668b15e34affa95e78eada73e5757f61ed76a","impliedFormat":1},{"version":"5835a6e0d7cd2738e56b671af0e561e7c1b4fb77751383672f4b009f4e161d70","impliedFormat":1},{"version":"5c634644d45a1b6bc7b05e71e05e52ec04f3d73d9ac85d5927f647a5f965181a","impliedFormat":1},{"version":"4b7f74b772140395e7af67c4841be1ab867c11b3b82a51b1aeb692822b76c872","impliedFormat":1},{"version":"27be6622e2922a1b412eb057faa854831b95db9db5035c3f6d4b677b902ab3b7","impliedFormat":1},{"version":"a68d4b3182e8d776cdede7ac9630c209a7bfbb59191f99a52479151816ef9f9e","impliedFormat":99},{"version":"39644b343e4e3d748344af8182111e3bbc594930fff0170256567e13bbdbebb0","impliedFormat":99},{"version":"ed7fd5160b47b0de3b1571c5c5578e8e7e3314e33ae0b8ea85a895774ee64749","impliedFormat":99},{"version":"63a7595a5015e65262557f883463f934904959da563b4f788306f699411e9bac","impliedFormat":1},{"version":"4ba137d6553965703b6b55fd2000b4e07ba365f8caeb0359162ad7247f9707a6","impliedFormat":1},{"version":"6de125ea94866c736c6d58d68eb15272cf7d1020a5b459fea1c660027eca9a90","affectsGlobalScope":true,"impliedFormat":1},{"version":"8fac4a15690b27612d8474fb2fc7cc00388df52d169791b78d1a3645d60b4c8b","affectsGlobalScope":true,"impliedFormat":1},{"version":"064ac1c2ac4b2867c2ceaa74bbdce0cb6a4c16e7c31a6497097159c18f74aa7c","impliedFormat":1},{"version":"3dc14e1ab45e497e5d5e4295271d54ff689aeae00b4277979fdd10fa563540ae","impliedFormat":1},{"version":"d3b315763d91265d6b0e7e7fa93cfdb8a80ce7cdd2d9f55ba0f37a22db00bdb8","impliedFormat":1},{"version":"cf9a3dce951b6e4062777e867839477099a2f53adb54c66dcb001853531ac9ff","signature":"435dd9e2032d15a4e17312337de643804c9fc67018b37acfc24e0d6021af7c64"},{"version":"2d3b52720ad64fd004da688d83db83d277ce6aa9e0bc64fe954b9771849cc654","signature":"f9a0f8f4350741fd4d49b6340138a0a67c4b38081a879887154a89094a4bd800"},{"version":"a2f0f4afc5d8ec75945ebd0ff7a05af837d4ccba40b3053fb6bc890768c0fe76","impliedFormat":99},{"version":"38678c40f58bf6a1dad5eb788d11e8c1c1480930d0f236fa8e142083620bff8b","signature":"093e81cd492066822983d7a21c1b1b4188d2d369eccfc6679dfb7e3b7c990fc2"},{"version":"cf3a3a9e88e9045336e974f3984d6a4e279515544f6918fa44426e4f96e1d82e","signature":"8354cf08dfa94290b0a8f2e30538ade528b32e14508f669508c6089aef674d19"},{"version":"8e0733c50eaac49b4e84954106acc144ec1a8019922d6afcde3762523a3634af","impliedFormat":1}],"root":[317,321,356,373,389,390,827,828,830,831],"options":{"allowJs":true,"esModuleInterop":true,"jsx":4,"module":99,"skipLibCheck":true,"strict":true,"target":9},"referencedMap":[[320,1],[390,2],[830,3],[356,4],[373,5],[831,6],[827,6],[828,7],[389,8],[321,9],[172,10],[164,11],[162,12],[170,13],[163,14],[171,15],[169,16],[661,14],[350,17],[349,18],[337,19],[331,20],[324,21],[351,14],[340,22],[332,19],[335,23],[333,14],[323,14],[353,24],[352,25],[334,21],[338,26],[339,21],[322,21],[341,27],[342,19],[344,28],[343,19],[345,29],[346,21],[347,30],[326,21],[328,19],[329,14],[327,19],[325,22],[330,22],[336,31],[348,21],[377,32],[358,33],[363,34],[360,35],[361,35],[362,35],[359,33],[779,32],[376,32],[780,36],[199,37],[202,38],[207,39],[208,40],[206,41],[209,14],[210,42],[213,43],[212,44],[191,45],[190,14],[173,14],[69,46],[68,14],[80,47],[67,47],[832,48],[168,14],[449,49],[450,49],[451,50],[398,51],[452,52],[453,53],[454,54],[396,14],[455,55],[456,56],[457,57],[458,58],[459,59],[460,60],[461,60],[462,61],[463,62],[464,63],[465,64],[399,14],[397,14],[466,65],[467,66],[468,67],[502,68],[469,69],[470,14],[471,70],[472,71],[473,72],[474,73],[475,74],[476,75],[477,76],[478,77],[479,78],[480,78],[481,79],[482,14],[483,80],[484,81],[486,82],[485,83],[487,84],[488,85],[489,86],[490,87],[491,88],[492,89],[493,90],[494,91],[495,92],[496,93],[497,94],[498,95],[499,96],[400,14],[401,97],[402,14],[403,14],[445,98],[446,99],[447,14],[448,84],[500,100],[501,101],[506,102],[743,33],[507,103],[505,104],[745,105],[744,106],[503,107],[741,14],[504,108],[62,14],[64,109],[740,33],[65,33],[66,14],[306,110],[307,111],[63,14],[391,112],[829,14],[308,33],[371,113],[309,14],[375,33],[310,114],[224,115],[227,116],[214,117],[220,118],[218,119],[221,119],[219,119],[217,119],[215,119],[225,119],[226,119],[223,119],[222,119],[216,120],[374,112],[354,33],[355,121],[311,122],[312,6],[315,123],[314,124],[316,123],[319,123],[313,125],[778,6],[777,6],[782,126],[366,127],[365,128],[380,129],[378,130],[781,131],[367,33],[381,6],[364,6],[384,132],[385,133],[392,134],[393,135],[382,136],[383,137],[784,138],[783,139],[394,140],[368,141],[372,142],[379,143],[129,144],[81,145],[82,145],[121,146],[112,147],[115,148],[118,149],[119,145],[120,145],[122,150],[128,151],[198,152],[197,153],[167,154],[166,155],[165,151],[318,14],[183,14],[86,156],[85,157],[84,158],[182,159],[181,160],[185,161],[184,162],[187,163],[186,164],[111,165],[110,160],[114,166],[113,160],[117,167],[116,168],[159,169],[133,170],[134,171],[135,171],[136,171],[137,171],[138,171],[139,171],[140,171],[141,171],[142,171],[143,171],[157,172],[144,171],[145,171],[146,171],[147,171],[148,171],[149,171],[150,171],[151,171],[153,171],[154,171],[152,171],[155,171],[156,171],[158,171],[132,173],[109,174],[89,175],[90,175],[91,175],[92,175],[93,175],[94,175],[95,115],[97,175],[96,175],[108,176],[98,175],[100,175],[99,175],[102,175],[101,175],[103,175],[104,175],[105,175],[106,175],[107,175],[88,175],[87,177],[176,178],[174,179],[175,179],[179,180],[177,179],[178,179],[180,179],[83,14],[357,33],[791,181],[796,182],[755,183],[541,184],[665,185],[653,186],[660,187],[558,14],[643,14],[539,14],[639,188],[681,189],[540,14],[531,190],[640,191],[641,192],[739,193],[634,194],[597,195],[647,196],[648,197],[646,198],[645,14],[642,199],[666,200],[542,201],[707,14],[708,202],[568,203],[543,204],[569,203],[600,203],[515,203],[663,205],[662,14],[652,206],[750,14],[520,14],[716,207],[717,208],[713,33],[770,14],[620,14],[719,6],[714,209],[775,210],[774,211],[769,14],[583,14],[623,212],[622,14],[768,213],[715,33],[591,214],[587,215],[592,216],[590,14],[589,217],[588,14],[771,14],[767,14],[773,218],[772,14],[586,215],[386,219],[809,220],[576,221],[575,222],[574,223],[812,33],[573,224],[563,14],[815,14],[818,14],[817,33],[819,225],[509,14],[649,226],[650,227],[651,228],[536,14],[654,14],[525,229],[508,14],[731,33],[514,230],[730,231],[729,232],[720,14],[721,14],[728,14],[723,14],[726,233],[722,14],[724,234],[727,235],[725,234],[538,14],[534,14],[535,203],[670,14],[675,236],[676,237],[674,238],[672,239],[673,240],[668,14],[737,6],[529,6],[790,241],[797,242],[801,243],[761,244],[760,14],[612,14],[820,245],[754,246],[635,247],[636,248],[711,249],[627,14],[736,250],[763,33],[628,251],[738,252],[733,253],[732,14],[734,14],[632,14],[706,254],[762,255],[765,256],[629,257],[633,258],[625,259],[618,260],[753,261],[684,262],[616,263],[516,264],[752,265],[513,266],[677,267],[669,14],[678,268],[695,269],[667,14],[694,270],[395,14],[689,271],[533,14],[709,272],[685,14],[521,14],[522,14],[693,273],[537,14],[561,274],[631,275],[759,276],[630,14],[692,14],[671,14],[697,277],[698,278],[644,14],[700,279],[702,280],[701,281],[655,14],[691,264],[704,282],[615,283],[690,284],[696,285],[546,14],[550,14],[549,14],[548,14],[553,14],[547,14],[556,14],[555,14],[552,14],[551,14],[554,14],[557,286],[545,14],[607,287],[606,14],[611,288],[608,289],[610,290],[613,288],[609,289],[526,291],[599,292],[749,293],[821,14],[805,294],[807,295],[748,296],[806,297],[766,255],[718,255],[544,14],[528,298],[527,299],[523,300],[524,301],[532,302],[560,302],[570,302],[601,303],[571,303],[518,304],[517,14],[605,305],[604,306],[603,307],[602,308],[519,309],[559,310],[747,311],[712,312],[742,313],[746,314],[638,315],[637,316],[621,317],[614,318],[596,319],[598,320],[595,321],[703,322],[617,14],[795,14],[705,323],[619,14],[562,324],[626,226],[624,325],[564,326],[679,327],[816,14],[565,328],[680,328],[793,14],[792,14],[794,14],[814,14],[682,329],[764,14],[593,330],[530,33],[577,14],[512,331],[566,14],[799,33],[511,14],[370,332],[585,33],[803,6],[584,333],[757,334],[582,332],[369,14],[387,335],[580,33],[581,33],[572,14],[510,14],[579,336],[578,337],[567,338],[710,77],[683,77],[699,14],[687,339],[686,14],[735,215],[594,33],[751,229],[758,340],[785,33],[788,341],[789,342],[786,33],[787,14],[664,97],[659,343],[658,14],[657,344],[656,14],[756,345],[798,346],[800,347],[802,348],[804,349],[808,350],[388,351],[826,352],[810,353],[776,354],[811,355],[813,356],[822,357],[825,229],[824,14],[823,358],[205,359],[204,14],[127,360],[124,361],[125,14],[126,14],[123,362],[305,363],[131,364],[130,365],[189,366],[188,367],[161,368],[160,369],[688,370],[201,371],[211,372],[192,39],[200,373],[203,374],[79,14],[196,375],[194,376],[195,377],[193,14],[76,378],[75,14],[60,14],[61,14],[10,14],[11,14],[13,14],[12,14],[2,14],[14,14],[15,14],[16,14],[17,14],[18,14],[19,14],[20,14],[21,14],[3,14],[22,14],[23,14],[4,14],[24,14],[28,14],[25,14],[26,14],[27,14],[29,14],[30,14],[31,14],[5,14],[32,14],[33,14],[34,14],[35,14],[6,14],[39,14],[36,14],[37,14],[38,14],[40,14],[7,14],[41,14],[46,14],[47,14],[42,14],[43,14],[44,14],[45,14],[8,14],[51,14],[48,14],[49,14],[50,14],[52,14],[9,14],[53,14],[54,14],[55,14],[57,14],[56,14],[1,14],[58,14],[59,14],[421,379],[433,380],[419,381],[434,382],[443,383],[410,384],[411,385],[409,386],[442,358],[437,387],[441,388],[413,389],[430,390],[412,391],[440,392],[407,393],[408,387],[414,394],[415,14],[420,395],[418,394],[405,396],[444,397],[435,398],[424,399],[423,394],[425,400],[428,401],[422,402],[426,403],[438,358],[416,404],[417,405],[429,406],[406,382],[432,407],[431,394],[427,408],[436,14],[404,14],[439,409],[78,410],[74,14],[77,411],[71,412],[70,47],[73,413],[72,414],[304,415],[298,416],[302,417],[299,417],[295,416],[303,418],[300,419],[301,417],[296,420],[297,421],[291,422],[235,423],[237,424],[290,14],[236,425],[294,426],[293,427],[292,428],[228,14],[238,423],[239,14],[230,429],[234,430],[229,14],[231,431],[232,432],[233,14],[240,433],[241,433],[242,433],[243,433],[244,433],[245,433],[246,433],[247,433],[248,433],[249,433],[250,433],[251,433],[252,433],[254,433],[253,433],[255,433],[256,433],[257,433],[258,433],[289,434],[259,433],[260,433],[261,433],[262,433],[263,433],[264,433],[265,433],[266,433],[267,433],[268,433],[269,433],[270,433],[271,433],[273,433],[272,433],[274,433],[275,433],[276,433],[277,433],[278,433],[279,433],[280,433],[281,433],[282,433],[283,433],[284,433],[285,433],[288,433],[286,433],[287,433],[317,435]],"affectedFilesPendingEmit":[320,390,830,356,373,831,827,828,389,321,317],"version":"5.9.3"}
\ No newline at end of file
diff --git a/drizzle.config.ts b/drizzle.config.ts
index c103c130d7..c7a40cae49 100644
--- a/drizzle.config.ts
+++ b/drizzle.config.ts
@@ -1,27 +1,13 @@
+import { resolve } from 'node:path';
 import { defineConfig } from 'drizzle-kit';
-import { join } from 'path';
-import { homedir } from 'os';
+import { defaultDbFilePath, resolveDefaultUserDataPath } from './src/main/db/default-path';
 
-function resolveDefaultDbFile() {
-  const explicit = process.env.EMDASH_DB_FILE;
-  if (explicit && explicit.length > 0) {
-    return explicit;
+function resolveDbUrl(): string {
+  const explicit = process.env.EMDASH_DB_FILE?.trim();
+  if (explicit) {
+    return resolve(explicit);
   }
-
-  const home = process.env.HOME ?? homedir();
-  const platform = process.platform;
-
-  if (platform === 'darwin') {
-    return join(home, 'Library', 'Application Support', 'emdash', 'emdash.db');
-  }
-
-  if (platform === 'win32') {
-    const appData = process.env.APPDATA ?? join(home, 'AppData', 'Roaming');
-    return join(appData, 'emdash', 'emdash.db');
-  }
-
-  const xdgData = process.env.XDG_DATA_HOME ?? join(home, '.local', 'share');
-  return join(xdgData, 'emdash', 'emdash.db');
+  return defaultDbFilePath(resolveDefaultUserDataPath());
 }
 
 export default defineConfig({
@@ -29,7 +15,7 @@ export default defineConfig({
   out: './drizzle',
   dialect: 'sqlite',
   dbCredentials: {
-    url: resolveDefaultDbFile(),
+    url: resolveDbUrl(),
   },
   strict: true,
   verbose: true,
diff --git a/drizzle/0000_cuddly_scarecrow.sql b/drizzle/0000_cuddly_scarecrow.sql
new file mode 100644
index 0000000000..1d87288f67
--- /dev/null
+++ b/drizzle/0000_cuddly_scarecrow.sql
@@ -0,0 +1,185 @@
+CREATE TABLE `app_settings` (
+	`key` text PRIMARY KEY NOT NULL,
+	`value` text NOT NULL,
+	`updated_at` integer DEFAULT CURRENT_TIMESTAMP NOT NULL
+);
+--> statement-breakpoint
+CREATE TABLE `conversations` (
+	`id` text PRIMARY KEY NOT NULL,
+	`project_id` text NOT NULL,
+	`task_id` text NOT NULL,
+	`title` text NOT NULL,
+	`provider` text,
+	`config` text,
+	`created_at` text DEFAULT CURRENT_TIMESTAMP NOT NULL,
+	`updated_at` text DEFAULT CURRENT_TIMESTAMP NOT NULL,
+	FOREIGN KEY (`project_id`) REFERENCES `projects`(`id`) ON UPDATE no action ON DELETE cascade,
+	FOREIGN KEY (`task_id`) REFERENCES `tasks`(`id`) ON UPDATE no action ON DELETE cascade
+);
+--> statement-breakpoint
+CREATE TABLE `editor_buffers` (
+	`id` text PRIMARY KEY NOT NULL,
+	`project_id` text NOT NULL,
+	`workspace_id` text NOT NULL,
+	`file_path` text NOT NULL,
+	`content` text NOT NULL,
+	`updated_at` integer NOT NULL,
+	FOREIGN KEY (`project_id`) REFERENCES `projects`(`id`) ON UPDATE no action ON DELETE cascade
+);
+--> statement-breakpoint
+CREATE TABLE `kv` (
+	`key` text PRIMARY KEY NOT NULL,
+	`value` text NOT NULL,
+	`updated_at` integer DEFAULT CURRENT_TIMESTAMP NOT NULL
+);
+--> statement-breakpoint
+CREATE TABLE `line_comments` (
+	`id` text PRIMARY KEY NOT NULL,
+	`task_id` text NOT NULL,
+	`file_path` text NOT NULL,
+	`line_number` integer NOT NULL,
+	`line_content` text,
+	`content` text NOT NULL,
+	`created_at` text DEFAULT CURRENT_TIMESTAMP NOT NULL,
+	`updated_at` text DEFAULT CURRENT_TIMESTAMP NOT NULL,
+	`sent_at` text,
+	FOREIGN KEY (`task_id`) REFERENCES `tasks`(`id`) ON UPDATE no action ON DELETE cascade
+);
+--> statement-breakpoint
+CREATE TABLE `messages` (
+	`id` text PRIMARY KEY NOT NULL,
+	`conversation_id` text NOT NULL,
+	`content` text NOT NULL,
+	`sender` text NOT NULL,
+	`timestamp` text DEFAULT CURRENT_TIMESTAMP NOT NULL,
+	`metadata` text,
+	FOREIGN KEY (`conversation_id`) REFERENCES `conversations`(`id`) ON UPDATE no action ON DELETE cascade
+);
+--> statement-breakpoint
+CREATE TABLE `project_pull_requests` (
+	`project_id` text NOT NULL,
+	`pull_request_url` text NOT NULL,
+	PRIMARY KEY(`project_id`, `pull_request_url`),
+	FOREIGN KEY (`project_id`) REFERENCES `projects`(`id`) ON UPDATE no action ON DELETE cascade,
+	FOREIGN KEY (`pull_request_url`) REFERENCES `pull_requests`(`url`) ON UPDATE no action ON DELETE cascade
+);
+--> statement-breakpoint
+CREATE TABLE `projects` (
+	`id` text PRIMARY KEY NOT NULL,
+	`name` text NOT NULL,
+	`path` text NOT NULL,
+	`workspace_provider` text DEFAULT 'local' NOT NULL,
+	`base_ref` text,
+	`ssh_connection_id` text,
+	`created_at` text DEFAULT CURRENT_TIMESTAMP NOT NULL,
+	`updated_at` text DEFAULT CURRENT_TIMESTAMP NOT NULL,
+	FOREIGN KEY (`ssh_connection_id`) REFERENCES `ssh_connections`(`id`) ON UPDATE no action ON DELETE set null
+);
+--> statement-breakpoint
+CREATE TABLE `pull_request_assignees` (
+	`pull_request_id` text NOT NULL,
+	`login` text NOT NULL,
+	`avatar_url` text,
+	PRIMARY KEY(`pull_request_id`, `login`),
+	FOREIGN KEY (`pull_request_id`) REFERENCES `pull_requests`(`id`) ON UPDATE no action ON DELETE cascade
+);
+--> statement-breakpoint
+CREATE TABLE `pull_request_labels` (
+	`pull_request_id` text NOT NULL,
+	`name` text NOT NULL,
+	`color` text,
+	PRIMARY KEY(`pull_request_id`, `name`),
+	FOREIGN KEY (`pull_request_id`) REFERENCES `pull_requests`(`id`) ON UPDATE no action ON DELETE cascade
+);
+--> statement-breakpoint
+CREATE TABLE `pull_requests` (
+	`id` text PRIMARY KEY NOT NULL,
+	`provider` text DEFAULT 'github' NOT NULL,
+	`name_with_owner` text DEFAULT '' NOT NULL,
+	`url` text NOT NULL,
+	`title` text NOT NULL,
+	`identifier` text,
+	`status` text DEFAULT 'open' NOT NULL,
+	`author` text,
+	`author_login` text,
+	`author_display_name` text,
+	`author_avatar_url` text,
+	`is_draft` integer,
+	`head_ref_name` text,
+	`metadata` text,
+	`created_at` text DEFAULT CURRENT_TIMESTAMP NOT NULL,
+	`updated_at` text DEFAULT CURRENT_TIMESTAMP NOT NULL,
+	`fetched_at` text DEFAULT CURRENT_TIMESTAMP NOT NULL
+);
+--> statement-breakpoint
+CREATE TABLE `ssh_connections` (
+	`id` text PRIMARY KEY NOT NULL,
+	`name` text NOT NULL,
+	`host` text NOT NULL,
+	`port` integer DEFAULT 22 NOT NULL,
+	`username` text NOT NULL,
+	`auth_type` text DEFAULT 'agent' NOT NULL,
+	`private_key_path` text,
+	`use_agent` integer DEFAULT 0 NOT NULL,
+	`metadata` text,
+	`created_at` text DEFAULT CURRENT_TIMESTAMP NOT NULL,
+	`updated_at` text DEFAULT CURRENT_TIMESTAMP NOT NULL
+);
+--> statement-breakpoint
+CREATE TABLE `tasks` (
+	`id` text PRIMARY KEY NOT NULL,
+	`project_id` text NOT NULL,
+	`name` text NOT NULL,
+	`status` text NOT NULL,
+	`source_branch` text NOT NULL,
+	`task_branch` text,
+	`linked_issue` text,
+	`archived_at` text,
+	`created_at` text DEFAULT CURRENT_TIMESTAMP NOT NULL,
+	`updated_at` text DEFAULT CURRENT_TIMESTAMP NOT NULL,
+	`last_interacted_at` text,
+	`status_changed_at` text DEFAULT CURRENT_TIMESTAMP NOT NULL,
+	`is_pinned` integer DEFAULT 0 NOT NULL,
+	FOREIGN KEY (`project_id`) REFERENCES `projects`(`id`) ON UPDATE no action ON DELETE cascade
+);
+--> statement-breakpoint
+CREATE TABLE `tasks_pull_requests` (
+	`task_id` text NOT NULL,
+	`pull_request_url` text NOT NULL,
+	PRIMARY KEY(`task_id`, `pull_request_url`),
+	FOREIGN KEY (`task_id`) REFERENCES `tasks`(`id`) ON UPDATE no action ON DELETE cascade,
+	FOREIGN KEY (`pull_request_url`) REFERENCES `pull_requests`(`url`) ON UPDATE no action ON DELETE cascade
+);
+--> statement-breakpoint
+CREATE TABLE `terminals` (
+	`id` text PRIMARY KEY NOT NULL,
+	`project_id` text NOT NULL,
+	`task_id` text NOT NULL,
+	`ssh` integer DEFAULT 0 NOT NULL,
+	`name` text NOT NULL,
+	`created_at` text DEFAULT CURRENT_TIMESTAMP NOT NULL,
+	`updated_at` text DEFAULT CURRENT_TIMESTAMP NOT NULL,
+	FOREIGN KEY (`project_id`) REFERENCES `projects`(`id`) ON UPDATE no action ON DELETE cascade,
+	FOREIGN KEY (`task_id`) REFERENCES `tasks`(`id`) ON UPDATE no action ON DELETE cascade
+);
+--> statement-breakpoint
+CREATE UNIQUE INDEX `idx_app_settings_key` ON `app_settings` (`key`);--> statement-breakpoint
+CREATE INDEX `idx_conversations_task_id` ON `conversations` (`task_id`);--> statement-breakpoint
+CREATE INDEX `idx_editor_buffers_workspace_file` ON `editor_buffers` (`workspace_id`,`file_path`);--> statement-breakpoint
+CREATE UNIQUE INDEX `idx_kv_key` ON `kv` (`key`);--> statement-breakpoint
+CREATE INDEX `idx_line_comments_task_file` ON `line_comments` (`task_id`,`file_path`);--> statement-breakpoint
+CREATE INDEX `idx_messages_conversation_id` ON `messages` (`conversation_id`);--> statement-breakpoint
+CREATE INDEX `idx_messages_timestamp` ON `messages` (`timestamp`);--> statement-breakpoint
+CREATE INDEX `idx_project_pull_requests_project_id` ON `project_pull_requests` (`project_id`);--> statement-breakpoint
+CREATE UNIQUE INDEX `idx_projects_path` ON `projects` (`path`);--> statement-breakpoint
+CREATE INDEX `idx_projects_ssh_connection_id` ON `projects` (`ssh_connection_id`);--> statement-breakpoint
+CREATE INDEX `idx_pra_login` ON `pull_request_assignees` (`login`);--> statement-breakpoint
+CREATE INDEX `idx_prl_name` ON `pull_request_labels` (`name`);--> statement-breakpoint
+CREATE UNIQUE INDEX `idx_pull_requests_url` ON `pull_requests` (`url`);--> statement-breakpoint
+CREATE INDEX `idx_pull_requests_name_with_owner` ON `pull_requests` (`name_with_owner`);--> statement-breakpoint
+CREATE INDEX `idx_pull_requests_author_login` ON `pull_requests` (`author_login`);--> statement-breakpoint
+CREATE INDEX `idx_pull_requests_head_ref_name` ON `pull_requests` (`head_ref_name`);--> statement-breakpoint
+CREATE UNIQUE INDEX `idx_ssh_connections_name` ON `ssh_connections` (`name`);--> statement-breakpoint
+CREATE INDEX `idx_ssh_connections_host` ON `ssh_connections` (`host`);--> statement-breakpoint
+CREATE INDEX `idx_tasks_project_id` ON `tasks` (`project_id`);--> statement-breakpoint
+CREATE INDEX `idx_terminals_task_id` ON `terminals` (`task_id`);
\ No newline at end of file
diff --git a/drizzle/0000_initial.sql b/drizzle/0000_initial.sql
deleted file mode 100644
index 4613593149..0000000000
--- a/drizzle/0000_initial.sql
+++ /dev/null
@@ -1,50 +0,0 @@
-CREATE TABLE `conversations` (
-	`id` text PRIMARY KEY NOT NULL,
-	`workspace_id` text NOT NULL,
-	`title` text NOT NULL,
-	`created_at` text DEFAULT CURRENT_TIMESTAMP NOT NULL,
-	`updated_at` text DEFAULT CURRENT_TIMESTAMP NOT NULL,
-	FOREIGN KEY (`workspace_id`) REFERENCES `workspaces`(`id`) ON UPDATE no action ON DELETE cascade
-);
---> statement-breakpoint
-CREATE INDEX `idx_conversations_workspace_id` ON `conversations` (`workspace_id`);--> statement-breakpoint
-CREATE TABLE `messages` (
-	`id` text PRIMARY KEY NOT NULL,
-	`conversation_id` text NOT NULL,
-	`content` text NOT NULL,
-	`sender` text NOT NULL,
-	`timestamp` text DEFAULT CURRENT_TIMESTAMP NOT NULL,
-	`metadata` text,
-	FOREIGN KEY (`conversation_id`) REFERENCES `conversations`(`id`) ON UPDATE no action ON DELETE cascade
-);
---> statement-breakpoint
-CREATE INDEX `idx_messages_conversation_id` ON `messages` (`conversation_id`);--> statement-breakpoint
-CREATE INDEX `idx_messages_timestamp` ON `messages` (`timestamp`);--> statement-breakpoint
-CREATE TABLE `projects` (
-	`id` text PRIMARY KEY NOT NULL,
-	`name` text NOT NULL,
-	`path` text NOT NULL,
-	`git_remote` text,
-	`git_branch` text,
-	`github_repository` text,
-	`github_connected` integer DEFAULT 0 NOT NULL,
-	`created_at` text DEFAULT CURRENT_TIMESTAMP NOT NULL,
-	`updated_at` text DEFAULT CURRENT_TIMESTAMP NOT NULL
-);
---> statement-breakpoint
-CREATE UNIQUE INDEX `idx_projects_path` ON `projects` (`path`);--> statement-breakpoint
-CREATE TABLE `workspaces` (
-	`id` text PRIMARY KEY NOT NULL,
-	`project_id` text NOT NULL,
-	`name` text NOT NULL,
-	`branch` text NOT NULL,
-	`path` text NOT NULL,
-	`status` text DEFAULT 'idle' NOT NULL,
-	`agent_id` text,
-	`metadata` text,
-	`created_at` text DEFAULT CURRENT_TIMESTAMP NOT NULL,
-	`updated_at` text DEFAULT CURRENT_TIMESTAMP NOT NULL,
-	FOREIGN KEY (`project_id`) REFERENCES `projects`(`id`) ON UPDATE no action ON DELETE cascade
-);
---> statement-breakpoint
-CREATE INDEX `idx_workspaces_project_id` ON `workspaces` (`project_id`);
\ No newline at end of file
diff --git a/drizzle/0001_add_base_ref_to_projects.sql b/drizzle/0001_add_base_ref_to_projects.sql
deleted file mode 100644
index 4638969014..0000000000
--- a/drizzle/0001_add_base_ref_to_projects.sql
+++ /dev/null
@@ -1,11 +0,0 @@
-ALTER TABLE `projects` ADD COLUMN `base_ref` text;
---> statement-breakpoint
-UPDATE `projects`
-SET `base_ref` = CASE
-  WHEN git_branch IS NOT NULL AND length(trim(git_branch)) > 0 THEN
-    CASE
-      WHEN instr(git_branch, '/') > 0 THEN trim(git_branch)
-      ELSE printf('%s/%s', COALESCE(NULLIF(trim(git_remote), ''), 'origin'), trim(git_branch))
-    END
-  ELSE NULL
-END;
diff --git a/drizzle/0001_skinny_robin_chapel.sql b/drizzle/0001_skinny_robin_chapel.sql
new file mode 100644
index 0000000000..ae224dc619
--- /dev/null
+++ b/drizzle/0001_skinny_robin_chapel.sql
@@ -0,0 +1,6 @@
+CREATE TABLE `app_secrets` (
+	`key` text PRIMARY KEY NOT NULL,
+	`secret` text NOT NULL
+);
+--> statement-breakpoint
+CREATE UNIQUE INDEX `idx_app_secrets_key` ON `app_secrets` (`key`);
\ No newline at end of file
diff --git a/drizzle/0002_lyrical_impossible_man.sql b/drizzle/0002_lyrical_impossible_man.sql
deleted file mode 100644
index d379502581..0000000000
--- a/drizzle/0002_lyrical_impossible_man.sql
+++ /dev/null
@@ -1,34 +0,0 @@
-ALTER TABLE `workspaces` RENAME TO `tasks`;--> statement-breakpoint
-PRAGMA foreign_keys=OFF;--> statement-breakpoint
-CREATE TABLE `__new_tasks` (
-	`id` text PRIMARY KEY NOT NULL,
-	`project_id` text NOT NULL,
-	`name` text NOT NULL,
-	`branch` text NOT NULL,
-	`path` text NOT NULL,
-	`status` text DEFAULT 'idle' NOT NULL,
-	`agent_id` text,
-	`metadata` text,
-	`created_at` text DEFAULT CURRENT_TIMESTAMP NOT NULL,
-	`updated_at` text DEFAULT CURRENT_TIMESTAMP NOT NULL,
-	FOREIGN KEY (`project_id`) REFERENCES `projects`(`id`) ON UPDATE no action ON DELETE cascade
-);
---> statement-breakpoint
-INSERT INTO `__new_tasks`("id", "project_id", "name", "branch", "path", "status", "agent_id", "metadata", "created_at", "updated_at") SELECT "id", "project_id", "name", "branch", "path", "status", "agent_id", "metadata", "created_at", "updated_at" FROM `tasks`;--> statement-breakpoint
-DROP TABLE `tasks`;--> statement-breakpoint
-ALTER TABLE `__new_tasks` RENAME TO `tasks`;--> statement-breakpoint
-PRAGMA foreign_keys=ON;--> statement-breakpoint
-CREATE INDEX `idx_tasks_project_id` ON `tasks` (`project_id`);--> statement-breakpoint
-CREATE TABLE `__new_conversations` (
-	`id` text PRIMARY KEY NOT NULL,
-	`task_id` text NOT NULL,
-	`title` text NOT NULL,
-	`created_at` text DEFAULT CURRENT_TIMESTAMP NOT NULL,
-	`updated_at` text DEFAULT CURRENT_TIMESTAMP NOT NULL,
-	FOREIGN KEY (`task_id`) REFERENCES `tasks`(`id`) ON UPDATE no action ON DELETE cascade
-);
---> statement-breakpoint
-INSERT INTO `__new_conversations`("id", "task_id", "title", "created_at", "updated_at") SELECT "id", "workspace_id", "title", "created_at", "updated_at" FROM `conversations`;--> statement-breakpoint
-DROP TABLE `conversations`;--> statement-breakpoint
-ALTER TABLE `__new_conversations` RENAME TO `conversations`;--> statement-breakpoint
-CREATE INDEX `idx_conversations_task_id` ON `conversations` (`task_id`);
\ No newline at end of file
diff --git a/drizzle/0002_noisy_maestro.sql b/drizzle/0002_noisy_maestro.sql
new file mode 100644
index 0000000000..a82775379f
--- /dev/null
+++ b/drizzle/0002_noisy_maestro.sql
@@ -0,0 +1,4 @@
+-- Custom SQL migration file, put you code below! --
+UPDATE tasks
+SET source_branch = json_object('type', 'local', 'branch', source_branch)
+WHERE json_valid(source_branch) = 0;
\ No newline at end of file
diff --git a/drizzle/0003_add_run_config_status_to_projects.sql b/drizzle/0003_add_run_config_status_to_projects.sql
deleted file mode 100644
index 206054283a..0000000000
--- a/drizzle/0003_add_run_config_status_to_projects.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-ALTER TABLE `projects` ADD COLUMN `run_config_status` text;
---> statement-breakpoint
-ALTER TABLE `projects` ADD COLUMN `run_config_error` text;
---> statement-breakpoint
-ALTER TABLE `projects` ADD COLUMN `run_config_provider` text;
---> statement-breakpoint
-ALTER TABLE `projects` ADD COLUMN `run_config_updated_at` text;
-
diff --git a/drizzle/0003_even_vampiro.sql b/drizzle/0003_even_vampiro.sql
new file mode 100644
index 0000000000..99b10856b8
--- /dev/null
+++ b/drizzle/0003_even_vampiro.sql
@@ -0,0 +1,4 @@
+-- Custom SQL migration file, put you code below!
+UPDATE tasks
+SET source_branch = json_object('type', 'local', 'branch', source_branch)
+WHERE json_valid(source_branch) = 0;
\ No newline at end of file
diff --git a/drizzle/0004_add_line_comments.sql b/drizzle/0004_add_line_comments.sql
deleted file mode 100644
index ab38009199..0000000000
--- a/drizzle/0004_add_line_comments.sql
+++ /dev/null
@@ -1,14 +0,0 @@
-CREATE TABLE `line_comments` (
-	`id` text PRIMARY KEY NOT NULL,
-	`task_id` text NOT NULL,
-	`file_path` text NOT NULL,
-	`line_number` integer NOT NULL,
-	`line_content` text,
-	`content` text NOT NULL,
-	`created_at` text DEFAULT CURRENT_TIMESTAMP NOT NULL,
-	`updated_at` text DEFAULT CURRENT_TIMESTAMP NOT NULL,
-	`sent_at` text,
-	FOREIGN KEY (`task_id`) REFERENCES `tasks`(`id`) ON UPDATE no action ON DELETE cascade
-);
---> statement-breakpoint
-CREATE INDEX `idx_line_comments_task_file` ON `line_comments` (`task_id`, `file_path`);
diff --git a/drizzle/0004_material_flatman.sql b/drizzle/0004_material_flatman.sql
new file mode 100644
index 0000000000..815805b3fa
--- /dev/null
+++ b/drizzle/0004_material_flatman.sql
@@ -0,0 +1 @@
+DROP TABLE `line_comments`;
\ No newline at end of file
diff --git a/drizzle/0005_add_pull_requests.sql b/drizzle/0005_add_pull_requests.sql
new file mode 100644
index 0000000000..89bedc1355
--- /dev/null
+++ b/drizzle/0005_add_pull_requests.sql
@@ -0,0 +1,118 @@
+-- Drop old PR bridge/join tables first (they reference pull_requests)
+DROP TABLE IF EXISTS `tasks_pull_requests`;
+--> statement-breakpoint
+DROP TABLE IF EXISTS `project_pull_requests`;
+--> statement-breakpoint
+-- Drop old pull_request child tables before the parent
+DROP TABLE IF EXISTS `pull_request_assignees`;
+--> statement-breakpoint
+DROP TABLE IF EXISTS `pull_request_labels`;
+--> statement-breakpoint
+-- Drop old pull_requests table (old schema with id PK / name_with_owner / metadata blob)
+DROP TABLE IF EXISTS `pull_requests`;
+--> statement-breakpoint
+
+-- pull_request_users: stable GitHub user records
+CREATE TABLE `pull_request_users` (
+	`user_id` text PRIMARY KEY NOT NULL,
+	`user_name` text NOT NULL,
+	`display_name` text,
+	`avatar_url` text,
+	`url` text,
+	`user_updated_at` text,
+	`user_created_at` text
+);
+--> statement-breakpoint
+
+-- pull_requests: new schema — url is PK, repositoryUrl for project scoping
+CREATE TABLE `pull_requests` (
+	`url` text PRIMARY KEY NOT NULL,
+	`provider` text DEFAULT 'github' NOT NULL,
+	`repository_url` text NOT NULL,
+	`base_ref_name` text NOT NULL,
+	`base_ref_oid` text NOT NULL,
+	`head_repository_url` text NOT NULL,
+	`head_ref_name` text NOT NULL,
+	`head_ref_oid` text NOT NULL,
+	`identifier` text,
+	`title` text NOT NULL,
+	`description` text,
+	`status` text DEFAULT 'open' NOT NULL,
+	`is_draft` integer,
+	`author_user_id` text REFERENCES `pull_request_users`(`user_id`) ON DELETE set null,
+	`additions` integer,
+	`deletions` integer,
+	`changed_files` integer,
+	`commit_count` integer,
+	`mergeable_status` text,
+	`merge_state_status` text,
+	`review_decision` text,
+	`pull_request_created_at` text DEFAULT CURRENT_TIMESTAMP NOT NULL,
+	`pull_request_updated_at` text DEFAULT CURRENT_TIMESTAMP NOT NULL
+);
+--> statement-breakpoint
+CREATE UNIQUE INDEX `idx_pull_requests_url` ON `pull_requests` (`url`);
+--> statement-breakpoint
+CREATE INDEX `idx_pull_requests_repository_url` ON `pull_requests` (`repository_url`);
+--> statement-breakpoint
+CREATE INDEX `idx_pull_requests_head_repository_url` ON `pull_requests` (`head_repository_url`);
+--> statement-breakpoint
+CREATE INDEX `idx_pull_requests_head_ref_name` ON `pull_requests` (`head_ref_name`);
+--> statement-breakpoint
+
+-- pull_request_labels: FK to pull_requests.url
+CREATE TABLE `pull_request_labels` (
+	`pull_request_id` text NOT NULL,
+	`name` text NOT NULL,
+	`color` text,
+	PRIMARY KEY(`pull_request_id`, `name`),
+	FOREIGN KEY (`pull_request_id`) REFERENCES `pull_requests`(`url`) ON UPDATE no action ON DELETE cascade
+);
+--> statement-breakpoint
+CREATE INDEX `idx_prl_name` ON `pull_request_labels` (`name`);
+--> statement-breakpoint
+
+-- pull_request_assignees: FK to pull_requests.url + pull_request_users.user_id
+CREATE TABLE `pull_request_assignees` (
+	`pull_request_url` text NOT NULL,
+	`user_id` text NOT NULL,
+	PRIMARY KEY(`pull_request_url`, `user_id`),
+	FOREIGN KEY (`pull_request_url`) REFERENCES `pull_requests`(`url`) ON UPDATE no action ON DELETE cascade,
+	FOREIGN KEY (`user_id`) REFERENCES `pull_request_users`(`user_id`) ON UPDATE no action ON DELETE cascade
+);
+--> statement-breakpoint
+CREATE INDEX `idx_pra_pull_request_url` ON `pull_request_assignees` (`pull_request_url`);
+--> statement-breakpoint
+CREATE INDEX `idx_pra_user_id` ON `pull_request_assignees` (`user_id`);
+--> statement-breakpoint
+
+-- pull_request_checks: stored check runs keyed by commitSha for smart invalidation
+CREATE TABLE `pull_request_checks` (
+	`id` text PRIMARY KEY NOT NULL,
+	`pull_request_url` text NOT NULL,
+	`commit_sha` text NOT NULL,
+	`name` text NOT NULL,
+	`status` text NOT NULL,
+	`conclusion` text NOT NULL,
+	`details_url` text,
+	`started_at` text,
+	`completed_at` text,
+	`workflow_name` text,
+	`app_name` text,
+	`app_logo_url` text,
+	FOREIGN KEY (`pull_request_url`) REFERENCES `pull_requests`(`url`) ON UPDATE no action ON DELETE cascade
+);
+--> statement-breakpoint
+CREATE INDEX `idx_prc_pull_request_url` ON `pull_request_checks` (`pull_request_url`);
+--> statement-breakpoint
+CREATE INDEX `idx_prc_commit_sha` ON `pull_request_checks` (`commit_sha`);
+--> statement-breakpoint
+
+-- project_remotes: tracks all git remotes per project for PR scoping
+CREATE TABLE `project_remotes` (
+	`project_id` text NOT NULL,
+	`remote_name` text NOT NULL,
+	`remote_url` text NOT NULL,
+	PRIMARY KEY(`project_id`, `remote_name`),
+	FOREIGN KEY (`project_id`) REFERENCES `projects`(`id`) ON UPDATE no action ON DELETE cascade
+);
diff --git a/drizzle/0005_add_use_worktree_to_tasks.sql b/drizzle/0005_add_use_worktree_to_tasks.sql
deleted file mode 100644
index 0c0ef463d2..0000000000
--- a/drizzle/0005_add_use_worktree_to_tasks.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-ALTER TABLE `tasks` ADD COLUMN `use_worktree` integer DEFAULT 1 NOT NULL;
---> statement-breakpoint
-UPDATE `tasks` SET `use_worktree` = 1 WHERE `use_worktree` IS NULL;
diff --git a/drizzle/0006_add_multi_chat_support.sql b/drizzle/0006_add_multi_chat_support.sql
deleted file mode 100644
index f6030ced89..0000000000
--- a/drizzle/0006_add_multi_chat_support.sql
+++ /dev/null
@@ -1,11 +0,0 @@
--- Add multi-chat support fields to conversations table
-ALTER TABLE conversations ADD COLUMN provider TEXT;
-ALTER TABLE conversations ADD COLUMN is_active INTEGER DEFAULT 0;
-ALTER TABLE conversations ADD COLUMN display_order INTEGER DEFAULT 0;
-ALTER TABLE conversations ADD COLUMN metadata TEXT;
-
--- Update existing conversations to be active (first chat in each task)
-UPDATE conversations SET is_active = 1, display_order = 0 WHERE is_active IS NULL;
-
--- Create index for quick active conversation lookup
-CREATE INDEX IF NOT EXISTS idx_conversations_active ON conversations (task_id, is_active);
\ No newline at end of file
diff --git a/drizzle/0006_bumpy_gamma_corps.sql b/drizzle/0006_bumpy_gamma_corps.sql
new file mode 100644
index 0000000000..6fad4162f8
--- /dev/null
+++ b/drizzle/0006_bumpy_gamma_corps.sql
@@ -0,0 +1,55 @@
+PRAGMA foreign_keys=OFF;
+
+CREATE TABLE `__new_tasks` (
+  `id` text PRIMARY KEY NOT NULL,
+  `project_id` text NOT NULL,
+  `name` text NOT NULL,
+  `status` text NOT NULL,
+  `source_branch` text,
+  `task_branch` text,
+  `linked_issue` text,
+  `archived_at` text,
+  `created_at` text DEFAULT CURRENT_TIMESTAMP NOT NULL,
+  `updated_at` text DEFAULT CURRENT_TIMESTAMP NOT NULL,
+  `last_interacted_at` text,
+  `status_changed_at` text DEFAULT CURRENT_TIMESTAMP NOT NULL,
+  `is_pinned` integer DEFAULT 0 NOT NULL,
+  FOREIGN KEY (`project_id`) REFERENCES `projects`(`id`) ON UPDATE no action ON DELETE cascade
+);
+
+INSERT INTO `__new_tasks` (
+  `id`,
+  `project_id`,
+  `name`,
+  `status`,
+  `source_branch`,
+  `task_branch`,
+  `linked_issue`,
+  `archived_at`,
+  `created_at`,
+  `updated_at`,
+  `last_interacted_at`,
+  `status_changed_at`,
+  `is_pinned`
+)
+SELECT
+  `id`,
+  `project_id`,
+  `name`,
+  `status`,
+  `source_branch`,
+  `task_branch`,
+  `linked_issue`,
+  `archived_at`,
+  `created_at`,
+  `updated_at`,
+  `last_interacted_at`,
+  `status_changed_at`,
+  `is_pinned`
+FROM `tasks`;
+
+DROP TABLE `tasks`;
+ALTER TABLE `__new_tasks` RENAME TO `tasks`;
+CREATE INDEX `idx_tasks_project_id` ON `tasks` (`project_id`);
+
+PRAGMA foreign_keys=ON;
diff --git a/drizzle/0007_add_is_main_to_conversations.sql b/drizzle/0007_add_is_main_to_conversations.sql
deleted file mode 100644
index cfd00f9514..0000000000
--- a/drizzle/0007_add_is_main_to_conversations.sql
+++ /dev/null
@@ -1,13 +0,0 @@
--- Add is_main column to conversations table
-ALTER TABLE conversations ADD COLUMN is_main INTEGER NOT NULL DEFAULT 0;
-
--- Mark first conversation of each task as main (for backward compatibility)
-UPDATE conversations
-SET is_main = 1
-WHERE id IN (
-  SELECT id FROM (
-    SELECT id, ROW_NUMBER() OVER (PARTITION BY task_id ORDER BY created_at ASC) as rn
-    FROM conversations
-  ) t
-  WHERE rn = 1
-);
\ No newline at end of file
diff --git a/drizzle/0008_add_archived_at_to_tasks.sql b/drizzle/0008_add_archived_at_to_tasks.sql
deleted file mode 100644
index d0e1ee173f..0000000000
--- a/drizzle/0008_add_archived_at_to_tasks.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE `tasks` ADD COLUMN `archived_at` text;
diff --git a/drizzle/0009_add_ssh_support.sql b/drizzle/0009_add_ssh_support.sql
deleted file mode 100644
index d8a1906b2c..0000000000
--- a/drizzle/0009_add_ssh_support.sql
+++ /dev/null
@@ -1,26 +0,0 @@
--- Create ssh_connections table
-CREATE TABLE `ssh_connections` (
-	`id` text PRIMARY KEY NOT NULL,
-	`name` text NOT NULL,
-	`host` text NOT NULL,
-	`port` integer DEFAULT 22 NOT NULL,
-	`username` text NOT NULL,
-	`auth_type` text DEFAULT 'agent' NOT NULL,
-	`private_key_path` text,
-	`use_agent` integer DEFAULT 0 NOT NULL,
-	`created_at` text DEFAULT CURRENT_TIMESTAMP NOT NULL,
-	`updated_at` text DEFAULT CURRENT_TIMESTAMP NOT NULL
-);
-
--- Add indexes for ssh_connections
-CREATE UNIQUE INDEX `idx_ssh_connections_name` ON `ssh_connections` (`name`);
-CREATE INDEX `idx_ssh_connections_host` ON `ssh_connections` (`host`);
-
--- Add columns to projects table for SSH support
-ALTER TABLE `projects` ADD COLUMN `ssh_connection_id` text REFERENCES ssh_connections(id) ON DELETE SET NULL;
-ALTER TABLE `projects` ADD COLUMN `is_remote` integer DEFAULT 0 NOT NULL;
-ALTER TABLE `projects` ADD COLUMN `remote_path` text;
-
--- Add indexes for projects
-CREATE INDEX `idx_projects_ssh_connection_id` ON `projects` (`ssh_connection_id`);
-CREATE INDEX `idx_projects_is_remote` ON `projects` (`is_remote`);
diff --git a/drizzle/meta/0000_snapshot.json b/drizzle/meta/0000_snapshot.json
index c56f856ab1..f8f521e0a2 100644
--- a/drizzle/meta/0000_snapshot.json
+++ b/drizzle/meta/0000_snapshot.json
@@ -1,9 +1,46 @@
 {
   "version": "6",
   "dialect": "sqlite",
-  "id": "b932945e-f26a-4c07-9c63-08179d95d5bc",
+  "id": "c27ff25e-ba13-4a7d-93ba-45b2fe92bff2",
   "prevId": "00000000-0000-0000-0000-000000000000",
   "tables": {
+    "app_settings": {
+      "name": "app_settings",
+      "columns": {
+        "key": {
+          "name": "key",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "value": {
+          "name": "value",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {
+        "idx_app_settings_key": {
+          "name": "idx_app_settings_key",
+          "columns": ["key"],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
     "conversations": {
       "name": "conversations",
       "columns": {
@@ -14,8 +51,627 @@
           "notNull": true,
           "autoincrement": false
         },
-        "workspace_id": {
-          "name": "workspace_id",
+        "project_id": {
+          "name": "project_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "task_id": {
+          "name": "task_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "title": {
+          "name": "title",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "provider": {
+          "name": "provider",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "config": {
+          "name": "config",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {
+        "idx_conversations_task_id": {
+          "name": "idx_conversations_task_id",
+          "columns": ["task_id"],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "conversations_project_id_projects_id_fk": {
+          "name": "conversations_project_id_projects_id_fk",
+          "tableFrom": "conversations",
+          "tableTo": "projects",
+          "columnsFrom": ["project_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "conversations_task_id_tasks_id_fk": {
+          "name": "conversations_task_id_tasks_id_fk",
+          "tableFrom": "conversations",
+          "tableTo": "tasks",
+          "columnsFrom": ["task_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "editor_buffers": {
+      "name": "editor_buffers",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "project_id": {
+          "name": "project_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "file_path": {
+          "name": "file_path",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "content": {
+          "name": "content",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "idx_editor_buffers_workspace_file": {
+          "name": "idx_editor_buffers_workspace_file",
+          "columns": ["workspace_id", "file_path"],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "editor_buffers_project_id_projects_id_fk": {
+          "name": "editor_buffers_project_id_projects_id_fk",
+          "tableFrom": "editor_buffers",
+          "tableTo": "projects",
+          "columnsFrom": ["project_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "kv": {
+      "name": "kv",
+      "columns": {
+        "key": {
+          "name": "key",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "value": {
+          "name": "value",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {
+        "idx_kv_key": {
+          "name": "idx_kv_key",
+          "columns": ["key"],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "line_comments": {
+      "name": "line_comments",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "task_id": {
+          "name": "task_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "file_path": {
+          "name": "file_path",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "line_number": {
+          "name": "line_number",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "line_content": {
+          "name": "line_content",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "content": {
+          "name": "content",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "sent_at": {
+          "name": "sent_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "idx_line_comments_task_file": {
+          "name": "idx_line_comments_task_file",
+          "columns": ["task_id", "file_path"],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "line_comments_task_id_tasks_id_fk": {
+          "name": "line_comments_task_id_tasks_id_fk",
+          "tableFrom": "line_comments",
+          "tableTo": "tasks",
+          "columnsFrom": ["task_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "messages": {
+      "name": "messages",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "conversation_id": {
+          "name": "conversation_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "content": {
+          "name": "content",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "sender": {
+          "name": "sender",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "timestamp": {
+          "name": "timestamp",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "idx_messages_conversation_id": {
+          "name": "idx_messages_conversation_id",
+          "columns": ["conversation_id"],
+          "isUnique": false
+        },
+        "idx_messages_timestamp": {
+          "name": "idx_messages_timestamp",
+          "columns": ["timestamp"],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "messages_conversation_id_conversations_id_fk": {
+          "name": "messages_conversation_id_conversations_id_fk",
+          "tableFrom": "messages",
+          "tableTo": "conversations",
+          "columnsFrom": ["conversation_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "project_pull_requests": {
+      "name": "project_pull_requests",
+      "columns": {
+        "project_id": {
+          "name": "project_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "pull_request_url": {
+          "name": "pull_request_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "idx_project_pull_requests_project_id": {
+          "name": "idx_project_pull_requests_project_id",
+          "columns": ["project_id"],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "project_pull_requests_project_id_projects_id_fk": {
+          "name": "project_pull_requests_project_id_projects_id_fk",
+          "tableFrom": "project_pull_requests",
+          "tableTo": "projects",
+          "columnsFrom": ["project_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "project_pull_requests_pull_request_url_pull_requests_url_fk": {
+          "name": "project_pull_requests_pull_request_url_pull_requests_url_fk",
+          "tableFrom": "project_pull_requests",
+          "tableTo": "pull_requests",
+          "columnsFrom": ["pull_request_url"],
+          "columnsTo": ["url"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {
+        "project_pull_requests_project_id_pull_request_url_pk": {
+          "columns": ["project_id", "pull_request_url"],
+          "name": "project_pull_requests_project_id_pull_request_url_pk"
+        }
+      },
+      "uniqueConstraints": {}
+    },
+    "projects": {
+      "name": "projects",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "path": {
+          "name": "path",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "workspace_provider": {
+          "name": "workspace_provider",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'local'"
+        },
+        "base_ref": {
+          "name": "base_ref",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "ssh_connection_id": {
+          "name": "ssh_connection_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {
+        "idx_projects_path": {
+          "name": "idx_projects_path",
+          "columns": ["path"],
+          "isUnique": true
+        },
+        "idx_projects_ssh_connection_id": {
+          "name": "idx_projects_ssh_connection_id",
+          "columns": ["ssh_connection_id"],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "projects_ssh_connection_id_ssh_connections_id_fk": {
+          "name": "projects_ssh_connection_id_ssh_connections_id_fk",
+          "tableFrom": "projects",
+          "tableTo": "ssh_connections",
+          "columnsFrom": ["ssh_connection_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "pull_request_assignees": {
+      "name": "pull_request_assignees",
+      "columns": {
+        "pull_request_id": {
+          "name": "pull_request_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "login": {
+          "name": "login",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "avatar_url": {
+          "name": "avatar_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "idx_pra_login": {
+          "name": "idx_pra_login",
+          "columns": ["login"],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "pull_request_assignees_pull_request_id_pull_requests_id_fk": {
+          "name": "pull_request_assignees_pull_request_id_pull_requests_id_fk",
+          "tableFrom": "pull_request_assignees",
+          "tableTo": "pull_requests",
+          "columnsFrom": ["pull_request_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {
+        "pull_request_assignees_pull_request_id_login_pk": {
+          "columns": ["pull_request_id", "login"],
+          "name": "pull_request_assignees_pull_request_id_login_pk"
+        }
+      },
+      "uniqueConstraints": {}
+    },
+    "pull_request_labels": {
+      "name": "pull_request_labels",
+      "columns": {
+        "pull_request_id": {
+          "name": "pull_request_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "color": {
+          "name": "color",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "idx_prl_name": {
+          "name": "idx_prl_name",
+          "columns": ["name"],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "pull_request_labels_pull_request_id_pull_requests_id_fk": {
+          "name": "pull_request_labels_pull_request_id_pull_requests_id_fk",
+          "tableFrom": "pull_request_labels",
+          "tableTo": "pull_requests",
+          "columnsFrom": ["pull_request_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {
+        "pull_request_labels_pull_request_id_name_pk": {
+          "columns": ["pull_request_id", "name"],
+          "name": "pull_request_labels_pull_request_id_name_pk"
+        }
+      },
+      "uniqueConstraints": {}
+    },
+    "pull_requests": {
+      "name": "pull_requests",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "provider": {
+          "name": "provider",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'github'"
+        },
+        "name_with_owner": {
+          "name": "name_with_owner",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "''"
+        },
+        "url": {
+          "name": "url",
           "type": "text",
           "primaryKey": false,
           "notNull": true,
@@ -28,6 +684,70 @@
           "notNull": true,
           "autoincrement": false
         },
+        "identifier": {
+          "name": "identifier",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'open'"
+        },
+        "author": {
+          "name": "author",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "author_login": {
+          "name": "author_login",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "author_display_name": {
+          "name": "author_display_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "author_avatar_url": {
+          "name": "author_avatar_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "is_draft": {
+          "name": "is_draft",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "head_ref_name": {
+          "name": "head_ref_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
         "created_at": {
           "name": "created_at",
           "type": "text",
@@ -43,32 +763,44 @@
           "notNull": true,
           "autoincrement": false,
           "default": "CURRENT_TIMESTAMP"
+        },
+        "fetched_at": {
+          "name": "fetched_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
         }
       },
       "indexes": {
-        "idx_conversations_workspace_id": {
-          "name": "idx_conversations_workspace_id",
-          "columns": ["workspace_id"],
+        "idx_pull_requests_url": {
+          "name": "idx_pull_requests_url",
+          "columns": ["url"],
+          "isUnique": true
+        },
+        "idx_pull_requests_name_with_owner": {
+          "name": "idx_pull_requests_name_with_owner",
+          "columns": ["name_with_owner"],
+          "isUnique": false
+        },
+        "idx_pull_requests_author_login": {
+          "name": "idx_pull_requests_author_login",
+          "columns": ["author_login"],
+          "isUnique": false
+        },
+        "idx_pull_requests_head_ref_name": {
+          "name": "idx_pull_requests_head_ref_name",
+          "columns": ["head_ref_name"],
           "isUnique": false
         }
       },
-      "foreignKeys": {
-        "conversations_workspace_id_workspaces_id_fk": {
-          "name": "conversations_workspace_id_workspaces_id_fk",
-          "tableFrom": "conversations",
-          "tableTo": "workspaces",
-          "columnsFrom": ["workspace_id"],
-          "columnsTo": ["id"],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
+      "foreignKeys": {},
       "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
+      "uniqueConstraints": {}
     },
-    "messages": {
-      "name": "messages",
+    "ssh_connections": {
+      "name": "ssh_connections",
       "columns": {
         "id": {
           "name": "id",
@@ -77,34 +809,57 @@
           "notNull": true,
           "autoincrement": false
         },
-        "conversation_id": {
-          "name": "conversation_id",
+        "name": {
+          "name": "name",
           "type": "text",
           "primaryKey": false,
           "notNull": true,
           "autoincrement": false
         },
-        "content": {
-          "name": "content",
+        "host": {
+          "name": "host",
           "type": "text",
           "primaryKey": false,
           "notNull": true,
           "autoincrement": false
         },
-        "sender": {
-          "name": "sender",
+        "port": {
+          "name": "port",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 22
+        },
+        "username": {
+          "name": "username",
           "type": "text",
           "primaryKey": false,
           "notNull": true,
           "autoincrement": false
         },
-        "timestamp": {
-          "name": "timestamp",
+        "auth_type": {
+          "name": "auth_type",
           "type": "text",
           "primaryKey": false,
           "notNull": true,
           "autoincrement": false,
-          "default": "CURRENT_TIMESTAMP"
+          "default": "'agent'"
+        },
+        "private_key_path": {
+          "name": "private_key_path",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "use_agent": {
+          "name": "use_agent",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
         },
         "metadata": {
           "name": "metadata",
@@ -112,37 +867,42 @@
           "primaryKey": false,
           "notNull": false,
           "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
         }
       },
       "indexes": {
-        "idx_messages_conversation_id": {
-          "name": "idx_messages_conversation_id",
-          "columns": ["conversation_id"],
-          "isUnique": false
+        "idx_ssh_connections_name": {
+          "name": "idx_ssh_connections_name",
+          "columns": ["name"],
+          "isUnique": true
         },
-        "idx_messages_timestamp": {
-          "name": "idx_messages_timestamp",
-          "columns": ["timestamp"],
+        "idx_ssh_connections_host": {
+          "name": "idx_ssh_connections_host",
+          "columns": ["host"],
           "isUnique": false
         }
       },
-      "foreignKeys": {
-        "messages_conversation_id_conversations_id_fk": {
-          "name": "messages_conversation_id_conversations_id_fk",
-          "tableFrom": "messages",
-          "tableTo": "conversations",
-          "columnsFrom": ["conversation_id"],
-          "columnsTo": ["id"],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
+      "foreignKeys": {},
       "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
+      "uniqueConstraints": {}
     },
-    "projects": {
-      "name": "projects",
+    "tasks": {
+      "name": "tasks",
       "columns": {
         "id": {
           "name": "id",
@@ -151,6 +911,13 @@
           "notNull": true,
           "autoincrement": false
         },
+        "project_id": {
+          "name": "project_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
         "name": {
           "name": "name",
           "type": "text",
@@ -158,41 +925,40 @@
           "notNull": true,
           "autoincrement": false
         },
-        "path": {
-          "name": "path",
+        "status": {
+          "name": "status",
           "type": "text",
           "primaryKey": false,
           "notNull": true,
           "autoincrement": false
         },
-        "git_remote": {
-          "name": "git_remote",
+        "source_branch": {
+          "name": "source_branch",
           "type": "text",
           "primaryKey": false,
-          "notNull": false,
+          "notNull": true,
           "autoincrement": false
         },
-        "git_branch": {
-          "name": "git_branch",
+        "task_branch": {
+          "name": "task_branch",
           "type": "text",
           "primaryKey": false,
           "notNull": false,
           "autoincrement": false
         },
-        "github_repository": {
-          "name": "github_repository",
+        "linked_issue": {
+          "name": "linked_issue",
           "type": "text",
           "primaryKey": false,
           "notNull": false,
           "autoincrement": false
         },
-        "github_connected": {
-          "name": "github_connected",
-          "type": "integer",
+        "archived_at": {
+          "name": "archived_at",
+          "type": "text",
           "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 0
+          "notNull": false,
+          "autoincrement": false
         },
         "created_at": {
           "name": "created_at",
@@ -209,78 +975,136 @@
           "notNull": true,
           "autoincrement": false,
           "default": "CURRENT_TIMESTAMP"
+        },
+        "last_interacted_at": {
+          "name": "last_interacted_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "status_changed_at": {
+          "name": "status_changed_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "is_pinned": {
+          "name": "is_pinned",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
         }
       },
       "indexes": {
-        "idx_projects_path": {
-          "name": "idx_projects_path",
-          "columns": ["path"],
-          "isUnique": true
+        "idx_tasks_project_id": {
+          "name": "idx_tasks_project_id",
+          "columns": ["project_id"],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "tasks_project_id_projects_id_fk": {
+          "name": "tasks_project_id_projects_id_fk",
+          "tableFrom": "tasks",
+          "tableTo": "projects",
+          "columnsFrom": ["project_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
         }
       },
-      "foreignKeys": {},
       "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
+      "uniqueConstraints": {}
     },
-    "workspaces": {
-      "name": "workspaces",
+    "tasks_pull_requests": {
+      "name": "tasks_pull_requests",
       "columns": {
-        "id": {
-          "name": "id",
+        "task_id": {
+          "name": "task_id",
           "type": "text",
-          "primaryKey": true,
+          "primaryKey": false,
           "notNull": true,
           "autoincrement": false
         },
-        "project_id": {
-          "name": "project_id",
+        "pull_request_url": {
+          "name": "pull_request_url",
           "type": "text",
           "primaryKey": false,
           "notNull": true,
           "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "tasks_pull_requests_task_id_tasks_id_fk": {
+          "name": "tasks_pull_requests_task_id_tasks_id_fk",
+          "tableFrom": "tasks_pull_requests",
+          "tableTo": "tasks",
+          "columnsFrom": ["task_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
         },
-        "name": {
-          "name": "name",
+        "tasks_pull_requests_pull_request_url_pull_requests_url_fk": {
+          "name": "tasks_pull_requests_pull_request_url_pull_requests_url_fk",
+          "tableFrom": "tasks_pull_requests",
+          "tableTo": "pull_requests",
+          "columnsFrom": ["pull_request_url"],
+          "columnsTo": ["url"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {
+        "tasks_pull_requests_task_id_pull_request_url_pk": {
+          "columns": ["task_id", "pull_request_url"],
+          "name": "tasks_pull_requests_task_id_pull_request_url_pk"
+        }
+      },
+      "uniqueConstraints": {}
+    },
+    "terminals": {
+      "name": "terminals",
+      "columns": {
+        "id": {
+          "name": "id",
           "type": "text",
-          "primaryKey": false,
+          "primaryKey": true,
           "notNull": true,
           "autoincrement": false
         },
-        "branch": {
-          "name": "branch",
+        "project_id": {
+          "name": "project_id",
           "type": "text",
           "primaryKey": false,
           "notNull": true,
           "autoincrement": false
         },
-        "path": {
-          "name": "path",
+        "task_id": {
+          "name": "task_id",
           "type": "text",
           "primaryKey": false,
           "notNull": true,
           "autoincrement": false
         },
-        "status": {
-          "name": "status",
-          "type": "text",
+        "ssh": {
+          "name": "ssh",
+          "type": "integer",
           "primaryKey": false,
           "notNull": true,
           "autoincrement": false,
-          "default": "'idle'"
-        },
-        "agent_id": {
-          "name": "agent_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
+          "default": 0
         },
-        "metadata": {
-          "name": "metadata",
+        "name": {
+          "name": "name",
           "type": "text",
           "primaryKey": false,
-          "notNull": false,
+          "notNull": true,
           "autoincrement": false
         },
         "created_at": {
@@ -301,29 +1125,36 @@
         }
       },
       "indexes": {
-        "idx_workspaces_project_id": {
-          "name": "idx_workspaces_project_id",
-          "columns": ["project_id"],
+        "idx_terminals_task_id": {
+          "name": "idx_terminals_task_id",
+          "columns": ["task_id"],
           "isUnique": false
         }
       },
       "foreignKeys": {
-        "workspaces_project_id_projects_id_fk": {
-          "name": "workspaces_project_id_projects_id_fk",
-          "tableFrom": "workspaces",
+        "terminals_project_id_projects_id_fk": {
+          "name": "terminals_project_id_projects_id_fk",
+          "tableFrom": "terminals",
           "tableTo": "projects",
           "columnsFrom": ["project_id"],
           "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
+        },
+        "terminals_task_id_tasks_id_fk": {
+          "name": "terminals_task_id_tasks_id_fk",
+          "tableFrom": "terminals",
+          "tableTo": "tasks",
+          "columnsFrom": ["task_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
         }
       },
       "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
+      "uniqueConstraints": {}
     }
   },
-  "views": {},
   "enums": {},
   "_meta": {
     "schemas": {},
diff --git a/drizzle/meta/0001_snapshot.json b/drizzle/meta/0001_snapshot.json
index 90204e2605..f14c0dca46 100644
--- a/drizzle/meta/0001_snapshot.json
+++ b/drizzle/meta/0001_snapshot.json
@@ -1,9 +1,75 @@
 {
   "version": "6",
   "dialect": "sqlite",
-  "id": "ec5ad35e-22ec-4c0b-9d48-cfb1033d9d93",
-  "prevId": "b932945e-f26a-4c07-9c63-08179d95d5bc",
+  "id": "b2ea8fea-221f-44e4-ac8f-931f6d0edbbe",
+  "prevId": "c27ff25e-ba13-4a7d-93ba-45b2fe92bff2",
   "tables": {
+    "app_secrets": {
+      "name": "app_secrets",
+      "columns": {
+        "key": {
+          "name": "key",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "secret": {
+          "name": "secret",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "idx_app_secrets_key": {
+          "name": "idx_app_secrets_key",
+          "columns": ["key"],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "app_settings": {
+      "name": "app_settings",
+      "columns": {
+        "key": {
+          "name": "key",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "value": {
+          "name": "value",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {
+        "idx_app_settings_key": {
+          "name": "idx_app_settings_key",
+          "columns": ["key"],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
     "conversations": {
       "name": "conversations",
       "columns": {
@@ -14,8 +80,627 @@
           "notNull": true,
           "autoincrement": false
         },
-        "workspace_id": {
-          "name": "workspace_id",
+        "project_id": {
+          "name": "project_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "task_id": {
+          "name": "task_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "title": {
+          "name": "title",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "provider": {
+          "name": "provider",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "config": {
+          "name": "config",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {
+        "idx_conversations_task_id": {
+          "name": "idx_conversations_task_id",
+          "columns": ["task_id"],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "conversations_project_id_projects_id_fk": {
+          "name": "conversations_project_id_projects_id_fk",
+          "tableFrom": "conversations",
+          "tableTo": "projects",
+          "columnsFrom": ["project_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "conversations_task_id_tasks_id_fk": {
+          "name": "conversations_task_id_tasks_id_fk",
+          "tableFrom": "conversations",
+          "tableTo": "tasks",
+          "columnsFrom": ["task_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "editor_buffers": {
+      "name": "editor_buffers",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "project_id": {
+          "name": "project_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "file_path": {
+          "name": "file_path",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "content": {
+          "name": "content",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "idx_editor_buffers_workspace_file": {
+          "name": "idx_editor_buffers_workspace_file",
+          "columns": ["workspace_id", "file_path"],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "editor_buffers_project_id_projects_id_fk": {
+          "name": "editor_buffers_project_id_projects_id_fk",
+          "tableFrom": "editor_buffers",
+          "tableTo": "projects",
+          "columnsFrom": ["project_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "kv": {
+      "name": "kv",
+      "columns": {
+        "key": {
+          "name": "key",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "value": {
+          "name": "value",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {
+        "idx_kv_key": {
+          "name": "idx_kv_key",
+          "columns": ["key"],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "line_comments": {
+      "name": "line_comments",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "task_id": {
+          "name": "task_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "file_path": {
+          "name": "file_path",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "line_number": {
+          "name": "line_number",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "line_content": {
+          "name": "line_content",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "content": {
+          "name": "content",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "sent_at": {
+          "name": "sent_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "idx_line_comments_task_file": {
+          "name": "idx_line_comments_task_file",
+          "columns": ["task_id", "file_path"],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "line_comments_task_id_tasks_id_fk": {
+          "name": "line_comments_task_id_tasks_id_fk",
+          "tableFrom": "line_comments",
+          "tableTo": "tasks",
+          "columnsFrom": ["task_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "messages": {
+      "name": "messages",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "conversation_id": {
+          "name": "conversation_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "content": {
+          "name": "content",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "sender": {
+          "name": "sender",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "timestamp": {
+          "name": "timestamp",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "idx_messages_conversation_id": {
+          "name": "idx_messages_conversation_id",
+          "columns": ["conversation_id"],
+          "isUnique": false
+        },
+        "idx_messages_timestamp": {
+          "name": "idx_messages_timestamp",
+          "columns": ["timestamp"],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "messages_conversation_id_conversations_id_fk": {
+          "name": "messages_conversation_id_conversations_id_fk",
+          "tableFrom": "messages",
+          "tableTo": "conversations",
+          "columnsFrom": ["conversation_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "project_pull_requests": {
+      "name": "project_pull_requests",
+      "columns": {
+        "project_id": {
+          "name": "project_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "pull_request_url": {
+          "name": "pull_request_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "idx_project_pull_requests_project_id": {
+          "name": "idx_project_pull_requests_project_id",
+          "columns": ["project_id"],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "project_pull_requests_project_id_projects_id_fk": {
+          "name": "project_pull_requests_project_id_projects_id_fk",
+          "tableFrom": "project_pull_requests",
+          "tableTo": "projects",
+          "columnsFrom": ["project_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "project_pull_requests_pull_request_url_pull_requests_url_fk": {
+          "name": "project_pull_requests_pull_request_url_pull_requests_url_fk",
+          "tableFrom": "project_pull_requests",
+          "tableTo": "pull_requests",
+          "columnsFrom": ["pull_request_url"],
+          "columnsTo": ["url"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {
+        "project_pull_requests_project_id_pull_request_url_pk": {
+          "columns": ["project_id", "pull_request_url"],
+          "name": "project_pull_requests_project_id_pull_request_url_pk"
+        }
+      },
+      "uniqueConstraints": {}
+    },
+    "projects": {
+      "name": "projects",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "path": {
+          "name": "path",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "workspace_provider": {
+          "name": "workspace_provider",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'local'"
+        },
+        "base_ref": {
+          "name": "base_ref",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "ssh_connection_id": {
+          "name": "ssh_connection_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {
+        "idx_projects_path": {
+          "name": "idx_projects_path",
+          "columns": ["path"],
+          "isUnique": true
+        },
+        "idx_projects_ssh_connection_id": {
+          "name": "idx_projects_ssh_connection_id",
+          "columns": ["ssh_connection_id"],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "projects_ssh_connection_id_ssh_connections_id_fk": {
+          "name": "projects_ssh_connection_id_ssh_connections_id_fk",
+          "tableFrom": "projects",
+          "tableTo": "ssh_connections",
+          "columnsFrom": ["ssh_connection_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "pull_request_assignees": {
+      "name": "pull_request_assignees",
+      "columns": {
+        "pull_request_id": {
+          "name": "pull_request_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "login": {
+          "name": "login",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "avatar_url": {
+          "name": "avatar_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "idx_pra_login": {
+          "name": "idx_pra_login",
+          "columns": ["login"],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "pull_request_assignees_pull_request_id_pull_requests_id_fk": {
+          "name": "pull_request_assignees_pull_request_id_pull_requests_id_fk",
+          "tableFrom": "pull_request_assignees",
+          "tableTo": "pull_requests",
+          "columnsFrom": ["pull_request_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {
+        "pull_request_assignees_pull_request_id_login_pk": {
+          "columns": ["pull_request_id", "login"],
+          "name": "pull_request_assignees_pull_request_id_login_pk"
+        }
+      },
+      "uniqueConstraints": {}
+    },
+    "pull_request_labels": {
+      "name": "pull_request_labels",
+      "columns": {
+        "pull_request_id": {
+          "name": "pull_request_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "color": {
+          "name": "color",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "idx_prl_name": {
+          "name": "idx_prl_name",
+          "columns": ["name"],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "pull_request_labels_pull_request_id_pull_requests_id_fk": {
+          "name": "pull_request_labels_pull_request_id_pull_requests_id_fk",
+          "tableFrom": "pull_request_labels",
+          "tableTo": "pull_requests",
+          "columnsFrom": ["pull_request_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {
+        "pull_request_labels_pull_request_id_name_pk": {
+          "columns": ["pull_request_id", "name"],
+          "name": "pull_request_labels_pull_request_id_name_pk"
+        }
+      },
+      "uniqueConstraints": {}
+    },
+    "pull_requests": {
+      "name": "pull_requests",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "provider": {
+          "name": "provider",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'github'"
+        },
+        "name_with_owner": {
+          "name": "name_with_owner",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "''"
+        },
+        "url": {
+          "name": "url",
           "type": "text",
           "primaryKey": false,
           "notNull": true,
@@ -28,6 +713,70 @@
           "notNull": true,
           "autoincrement": false
         },
+        "identifier": {
+          "name": "identifier",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'open'"
+        },
+        "author": {
+          "name": "author",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "author_login": {
+          "name": "author_login",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "author_display_name": {
+          "name": "author_display_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "author_avatar_url": {
+          "name": "author_avatar_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "is_draft": {
+          "name": "is_draft",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "head_ref_name": {
+          "name": "head_ref_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
         "created_at": {
           "name": "created_at",
           "type": "text",
@@ -43,32 +792,44 @@
           "notNull": true,
           "autoincrement": false,
           "default": "CURRENT_TIMESTAMP"
+        },
+        "fetched_at": {
+          "name": "fetched_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
         }
       },
       "indexes": {
-        "idx_conversations_workspace_id": {
-          "name": "idx_conversations_workspace_id",
-          "columns": ["workspace_id"],
+        "idx_pull_requests_url": {
+          "name": "idx_pull_requests_url",
+          "columns": ["url"],
+          "isUnique": true
+        },
+        "idx_pull_requests_name_with_owner": {
+          "name": "idx_pull_requests_name_with_owner",
+          "columns": ["name_with_owner"],
+          "isUnique": false
+        },
+        "idx_pull_requests_author_login": {
+          "name": "idx_pull_requests_author_login",
+          "columns": ["author_login"],
+          "isUnique": false
+        },
+        "idx_pull_requests_head_ref_name": {
+          "name": "idx_pull_requests_head_ref_name",
+          "columns": ["head_ref_name"],
           "isUnique": false
         }
       },
-      "foreignKeys": {
-        "conversations_workspace_id_workspaces_id_fk": {
-          "name": "conversations_workspace_id_workspaces_id_fk",
-          "tableFrom": "conversations",
-          "tableTo": "workspaces",
-          "columnsFrom": ["workspace_id"],
-          "columnsTo": ["id"],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
+      "foreignKeys": {},
       "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
+      "uniqueConstraints": {}
     },
-    "messages": {
-      "name": "messages",
+    "ssh_connections": {
+      "name": "ssh_connections",
       "columns": {
         "id": {
           "name": "id",
@@ -77,34 +838,57 @@
           "notNull": true,
           "autoincrement": false
         },
-        "conversation_id": {
-          "name": "conversation_id",
+        "name": {
+          "name": "name",
           "type": "text",
           "primaryKey": false,
           "notNull": true,
           "autoincrement": false
         },
-        "content": {
-          "name": "content",
+        "host": {
+          "name": "host",
           "type": "text",
           "primaryKey": false,
           "notNull": true,
           "autoincrement": false
         },
-        "sender": {
-          "name": "sender",
+        "port": {
+          "name": "port",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 22
+        },
+        "username": {
+          "name": "username",
           "type": "text",
           "primaryKey": false,
           "notNull": true,
           "autoincrement": false
         },
-        "timestamp": {
-          "name": "timestamp",
+        "auth_type": {
+          "name": "auth_type",
           "type": "text",
           "primaryKey": false,
           "notNull": true,
           "autoincrement": false,
-          "default": "CURRENT_TIMESTAMP"
+          "default": "'agent'"
+        },
+        "private_key_path": {
+          "name": "private_key_path",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "use_agent": {
+          "name": "use_agent",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
         },
         "metadata": {
           "name": "metadata",
@@ -112,37 +896,42 @@
           "primaryKey": false,
           "notNull": false,
           "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
         }
       },
       "indexes": {
-        "idx_messages_conversation_id": {
-          "name": "idx_messages_conversation_id",
-          "columns": ["conversation_id"],
-          "isUnique": false
+        "idx_ssh_connections_name": {
+          "name": "idx_ssh_connections_name",
+          "columns": ["name"],
+          "isUnique": true
         },
-        "idx_messages_timestamp": {
-          "name": "idx_messages_timestamp",
-          "columns": ["timestamp"],
+        "idx_ssh_connections_host": {
+          "name": "idx_ssh_connections_host",
+          "columns": ["host"],
           "isUnique": false
         }
       },
-      "foreignKeys": {
-        "messages_conversation_id_conversations_id_fk": {
-          "name": "messages_conversation_id_conversations_id_fk",
-          "tableFrom": "messages",
-          "tableTo": "conversations",
-          "columnsFrom": ["conversation_id"],
-          "columnsTo": ["id"],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
+      "foreignKeys": {},
       "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
+      "uniqueConstraints": {}
     },
-    "projects": {
-      "name": "projects",
+    "tasks": {
+      "name": "tasks",
       "columns": {
         "id": {
           "name": "id",
@@ -151,6 +940,13 @@
           "notNull": true,
           "autoincrement": false
         },
+        "project_id": {
+          "name": "project_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
         "name": {
           "name": "name",
           "type": "text",
@@ -158,41 +954,40 @@
           "notNull": true,
           "autoincrement": false
         },
-        "path": {
-          "name": "path",
+        "status": {
+          "name": "status",
           "type": "text",
           "primaryKey": false,
           "notNull": true,
           "autoincrement": false
         },
-        "git_remote": {
-          "name": "git_remote",
+        "source_branch": {
+          "name": "source_branch",
           "type": "text",
           "primaryKey": false,
-          "notNull": false,
+          "notNull": true,
           "autoincrement": false
         },
-        "git_branch": {
-          "name": "git_branch",
+        "task_branch": {
+          "name": "task_branch",
           "type": "text",
           "primaryKey": false,
           "notNull": false,
           "autoincrement": false
         },
-        "github_repository": {
-          "name": "github_repository",
+        "linked_issue": {
+          "name": "linked_issue",
           "type": "text",
           "primaryKey": false,
           "notNull": false,
           "autoincrement": false
         },
-        "github_connected": {
-          "name": "github_connected",
-          "type": "integer",
+        "archived_at": {
+          "name": "archived_at",
+          "type": "text",
           "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 0
+          "notNull": false,
+          "autoincrement": false
         },
         "created_at": {
           "name": "created_at",
@@ -210,84 +1005,135 @@
           "autoincrement": false,
           "default": "CURRENT_TIMESTAMP"
         },
-        "base_ref": {
-          "name": "base_ref",
+        "last_interacted_at": {
+          "name": "last_interacted_at",
           "type": "text",
           "primaryKey": false,
           "notNull": false,
           "autoincrement": false
+        },
+        "status_changed_at": {
+          "name": "status_changed_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "is_pinned": {
+          "name": "is_pinned",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
         }
       },
       "indexes": {
-        "idx_projects_path": {
-          "name": "idx_projects_path",
-          "columns": ["path"],
-          "isUnique": true
+        "idx_tasks_project_id": {
+          "name": "idx_tasks_project_id",
+          "columns": ["project_id"],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "tasks_project_id_projects_id_fk": {
+          "name": "tasks_project_id_projects_id_fk",
+          "tableFrom": "tasks",
+          "tableTo": "projects",
+          "columnsFrom": ["project_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
         }
       },
-      "foreignKeys": {},
       "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
+      "uniqueConstraints": {}
     },
-    "workspaces": {
-      "name": "workspaces",
+    "tasks_pull_requests": {
+      "name": "tasks_pull_requests",
       "columns": {
-        "id": {
-          "name": "id",
+        "task_id": {
+          "name": "task_id",
           "type": "text",
-          "primaryKey": true,
+          "primaryKey": false,
           "notNull": true,
           "autoincrement": false
         },
-        "project_id": {
-          "name": "project_id",
+        "pull_request_url": {
+          "name": "pull_request_url",
           "type": "text",
           "primaryKey": false,
           "notNull": true,
           "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "tasks_pull_requests_task_id_tasks_id_fk": {
+          "name": "tasks_pull_requests_task_id_tasks_id_fk",
+          "tableFrom": "tasks_pull_requests",
+          "tableTo": "tasks",
+          "columnsFrom": ["task_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
         },
-        "name": {
-          "name": "name",
+        "tasks_pull_requests_pull_request_url_pull_requests_url_fk": {
+          "name": "tasks_pull_requests_pull_request_url_pull_requests_url_fk",
+          "tableFrom": "tasks_pull_requests",
+          "tableTo": "pull_requests",
+          "columnsFrom": ["pull_request_url"],
+          "columnsTo": ["url"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {
+        "tasks_pull_requests_task_id_pull_request_url_pk": {
+          "columns": ["task_id", "pull_request_url"],
+          "name": "tasks_pull_requests_task_id_pull_request_url_pk"
+        }
+      },
+      "uniqueConstraints": {}
+    },
+    "terminals": {
+      "name": "terminals",
+      "columns": {
+        "id": {
+          "name": "id",
           "type": "text",
-          "primaryKey": false,
+          "primaryKey": true,
           "notNull": true,
           "autoincrement": false
         },
-        "branch": {
-          "name": "branch",
+        "project_id": {
+          "name": "project_id",
           "type": "text",
           "primaryKey": false,
           "notNull": true,
           "autoincrement": false
         },
-        "path": {
-          "name": "path",
+        "task_id": {
+          "name": "task_id",
           "type": "text",
           "primaryKey": false,
           "notNull": true,
           "autoincrement": false
         },
-        "status": {
-          "name": "status",
-          "type": "text",
+        "ssh": {
+          "name": "ssh",
+          "type": "integer",
           "primaryKey": false,
           "notNull": true,
           "autoincrement": false,
-          "default": "'idle'"
-        },
-        "agent_id": {
-          "name": "agent_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
+          "default": 0
         },
-        "metadata": {
-          "name": "metadata",
+        "name": {
+          "name": "name",
           "type": "text",
           "primaryKey": false,
-          "notNull": false,
+          "notNull": true,
           "autoincrement": false
         },
         "created_at": {
@@ -308,29 +1154,36 @@
         }
       },
       "indexes": {
-        "idx_workspaces_project_id": {
-          "name": "idx_workspaces_project_id",
-          "columns": ["project_id"],
+        "idx_terminals_task_id": {
+          "name": "idx_terminals_task_id",
+          "columns": ["task_id"],
           "isUnique": false
         }
       },
       "foreignKeys": {
-        "workspaces_project_id_projects_id_fk": {
-          "name": "workspaces_project_id_projects_id_fk",
-          "tableFrom": "workspaces",
+        "terminals_project_id_projects_id_fk": {
+          "name": "terminals_project_id_projects_id_fk",
+          "tableFrom": "terminals",
           "tableTo": "projects",
           "columnsFrom": ["project_id"],
           "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
+        },
+        "terminals_task_id_tasks_id_fk": {
+          "name": "terminals_task_id_tasks_id_fk",
+          "tableFrom": "terminals",
+          "tableTo": "tasks",
+          "columnsFrom": ["task_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
         }
       },
       "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
+      "uniqueConstraints": {}
     }
   },
-  "views": {},
   "enums": {},
   "_meta": {
     "schemas": {},
diff --git a/drizzle/meta/0002_snapshot.json b/drizzle/meta/0002_snapshot.json
index fc0d0457f1..6408bf19b7 100644
--- a/drizzle/meta/0002_snapshot.json
+++ b/drizzle/meta/0002_snapshot.json
@@ -1,9 +1,75 @@
 {
+  "id": "15af6546-957e-48f0-a596-0f9fb9958b68",
+  "prevId": "b2ea8fea-221f-44e4-ac8f-931f6d0edbbe",
   "version": "6",
   "dialect": "sqlite",
-  "id": "f61fcd81-f000-4e2d-84f2-2f79133ae5d6",
-  "prevId": "ec5ad35e-22ec-4c0b-9d48-cfb1033d9d93",
   "tables": {
+    "app_secrets": {
+      "name": "app_secrets",
+      "columns": {
+        "key": {
+          "name": "key",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "secret": {
+          "name": "secret",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "idx_app_secrets_key": {
+          "name": "idx_app_secrets_key",
+          "columns": ["key"],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "app_settings": {
+      "name": "app_settings",
+      "columns": {
+        "key": {
+          "name": "key",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "value": {
+          "name": "value",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {
+        "idx_app_settings_key": {
+          "name": "idx_app_settings_key",
+          "columns": ["key"],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
     "conversations": {
       "name": "conversations",
       "columns": {
@@ -14,6 +80,13 @@
           "notNull": true,
           "autoincrement": false
         },
+        "project_id": {
+          "name": "project_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
         "task_id": {
           "name": "task_id",
           "type": "text",
@@ -28,6 +101,20 @@
           "notNull": true,
           "autoincrement": false
         },
+        "provider": {
+          "name": "provider",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "config": {
+          "name": "config",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
         "created_at": {
           "name": "created_at",
           "type": "text",
@@ -53,22 +140,30 @@
         }
       },
       "foreignKeys": {
+        "conversations_project_id_projects_id_fk": {
+          "name": "conversations_project_id_projects_id_fk",
+          "tableFrom": "conversations",
+          "columnsFrom": ["project_id"],
+          "tableTo": "projects",
+          "columnsTo": ["id"],
+          "onUpdate": "no action",
+          "onDelete": "cascade"
+        },
         "conversations_task_id_tasks_id_fk": {
           "name": "conversations_task_id_tasks_id_fk",
           "tableFrom": "conversations",
-          "tableTo": "tasks",
           "columnsFrom": ["task_id"],
+          "tableTo": "tasks",
           "columnsTo": ["id"],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
+          "onUpdate": "no action",
+          "onDelete": "cascade"
         }
       },
       "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
+      "uniqueConstraints": {}
     },
-    "messages": {
-      "name": "messages",
+    "editor_buffers": {
+      "name": "editor_buffers",
       "columns": {
         "id": {
           "name": "id",
@@ -77,129 +172,144 @@
           "notNull": true,
           "autoincrement": false
         },
-        "conversation_id": {
-          "name": "conversation_id",
+        "project_id": {
+          "name": "project_id",
           "type": "text",
           "primaryKey": false,
           "notNull": true,
           "autoincrement": false
         },
-        "content": {
-          "name": "content",
+        "workspace_id": {
+          "name": "workspace_id",
           "type": "text",
           "primaryKey": false,
           "notNull": true,
           "autoincrement": false
         },
-        "sender": {
-          "name": "sender",
+        "file_path": {
+          "name": "file_path",
           "type": "text",
           "primaryKey": false,
           "notNull": true,
           "autoincrement": false
         },
-        "timestamp": {
-          "name": "timestamp",
+        "content": {
+          "name": "content",
           "type": "text",
           "primaryKey": false,
           "notNull": true,
-          "autoincrement": false,
-          "default": "CURRENT_TIMESTAMP"
+          "autoincrement": false
         },
-        "metadata": {
-          "name": "metadata",
-          "type": "text",
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
           "primaryKey": false,
-          "notNull": false,
+          "notNull": true,
           "autoincrement": false
         }
       },
       "indexes": {
-        "idx_messages_conversation_id": {
-          "name": "idx_messages_conversation_id",
-          "columns": ["conversation_id"],
-          "isUnique": false
-        },
-        "idx_messages_timestamp": {
-          "name": "idx_messages_timestamp",
-          "columns": ["timestamp"],
+        "idx_editor_buffers_workspace_file": {
+          "name": "idx_editor_buffers_workspace_file",
+          "columns": ["workspace_id", "file_path"],
           "isUnique": false
         }
       },
       "foreignKeys": {
-        "messages_conversation_id_conversations_id_fk": {
-          "name": "messages_conversation_id_conversations_id_fk",
-          "tableFrom": "messages",
-          "tableTo": "conversations",
-          "columnsFrom": ["conversation_id"],
+        "editor_buffers_project_id_projects_id_fk": {
+          "name": "editor_buffers_project_id_projects_id_fk",
+          "tableFrom": "editor_buffers",
+          "columnsFrom": ["project_id"],
+          "tableTo": "projects",
           "columnsTo": ["id"],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
+          "onUpdate": "no action",
+          "onDelete": "cascade"
         }
       },
       "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
+      "uniqueConstraints": {}
     },
-    "projects": {
-      "name": "projects",
+    "kv": {
+      "name": "kv",
       "columns": {
-        "id": {
-          "name": "id",
+        "key": {
+          "name": "key",
           "type": "text",
           "primaryKey": true,
           "notNull": true,
           "autoincrement": false
         },
-        "name": {
-          "name": "name",
+        "value": {
+          "name": "value",
           "type": "text",
           "primaryKey": false,
           "notNull": true,
           "autoincrement": false
         },
-        "path": {
-          "name": "path",
-          "type": "text",
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
           "primaryKey": false,
           "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {
+        "idx_kv_key": {
+          "name": "idx_kv_key",
+          "columns": ["key"],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "line_comments": {
+      "name": "line_comments",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
           "autoincrement": false
         },
-        "git_remote": {
-          "name": "git_remote",
+        "task_id": {
+          "name": "task_id",
           "type": "text",
           "primaryKey": false,
-          "notNull": false,
+          "notNull": true,
           "autoincrement": false
         },
-        "git_branch": {
-          "name": "git_branch",
+        "file_path": {
+          "name": "file_path",
           "type": "text",
           "primaryKey": false,
-          "notNull": false,
+          "notNull": true,
           "autoincrement": false
         },
-        "base_ref": {
-          "name": "base_ref",
-          "type": "text",
+        "line_number": {
+          "name": "line_number",
+          "type": "integer",
           "primaryKey": false,
-          "notNull": false,
+          "notNull": true,
           "autoincrement": false
         },
-        "github_repository": {
-          "name": "github_repository",
+        "line_content": {
+          "name": "line_content",
           "type": "text",
           "primaryKey": false,
           "notNull": false,
           "autoincrement": false
         },
-        "github_connected": {
-          "name": "github_connected",
-          "type": "integer",
+        "content": {
+          "name": "content",
+          "type": "text",
           "primaryKey": false,
           "notNull": true,
-          "autoincrement": false,
-          "default": 0
+          "autoincrement": false
         },
         "created_at": {
           "name": "created_at",
@@ -216,22 +326,38 @@
           "notNull": true,
           "autoincrement": false,
           "default": "CURRENT_TIMESTAMP"
+        },
+        "sent_at": {
+          "name": "sent_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
         }
       },
       "indexes": {
-        "idx_projects_path": {
-          "name": "idx_projects_path",
-          "columns": ["path"],
-          "isUnique": true
+        "idx_line_comments_task_file": {
+          "name": "idx_line_comments_task_file",
+          "columns": ["task_id", "file_path"],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "line_comments_task_id_tasks_id_fk": {
+          "name": "line_comments_task_id_tasks_id_fk",
+          "tableFrom": "line_comments",
+          "columnsFrom": ["task_id"],
+          "tableTo": "tasks",
+          "columnsTo": ["id"],
+          "onUpdate": "no action",
+          "onDelete": "cascade"
         }
       },
-      "foreignKeys": {},
       "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
+      "uniqueConstraints": {}
     },
-    "tasks": {
-      "name": "tasks",
+    "messages": {
+      "name": "messages",
       "columns": {
         "id": {
           "name": "id",
@@ -240,48 +366,34 @@
           "notNull": true,
           "autoincrement": false
         },
-        "project_id": {
-          "name": "project_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "name": {
-          "name": "name",
+        "conversation_id": {
+          "name": "conversation_id",
           "type": "text",
           "primaryKey": false,
           "notNull": true,
           "autoincrement": false
         },
-        "branch": {
-          "name": "branch",
+        "content": {
+          "name": "content",
           "type": "text",
           "primaryKey": false,
           "notNull": true,
           "autoincrement": false
         },
-        "path": {
-          "name": "path",
+        "sender": {
+          "name": "sender",
           "type": "text",
           "primaryKey": false,
           "notNull": true,
           "autoincrement": false
         },
-        "status": {
-          "name": "status",
+        "timestamp": {
+          "name": "timestamp",
           "type": "text",
           "primaryKey": false,
           "notNull": true,
           "autoincrement": false,
-          "default": "'idle'"
-        },
-        "agent_id": {
-          "name": "agent_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
+          "default": "CURRENT_TIMESTAMP"
         },
         "metadata": {
           "name": "metadata",
@@ -289,58 +401,795 @@
           "primaryKey": false,
           "notNull": false,
           "autoincrement": false
+        }
+      },
+      "indexes": {
+        "idx_messages_conversation_id": {
+          "name": "idx_messages_conversation_id",
+          "columns": ["conversation_id"],
+          "isUnique": false
         },
-        "created_at": {
-          "name": "created_at",
+        "idx_messages_timestamp": {
+          "name": "idx_messages_timestamp",
+          "columns": ["timestamp"],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "messages_conversation_id_conversations_id_fk": {
+          "name": "messages_conversation_id_conversations_id_fk",
+          "tableFrom": "messages",
+          "columnsFrom": ["conversation_id"],
+          "tableTo": "conversations",
+          "columnsTo": ["id"],
+          "onUpdate": "no action",
+          "onDelete": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "project_pull_requests": {
+      "name": "project_pull_requests",
+      "columns": {
+        "project_id": {
+          "name": "project_id",
           "type": "text",
           "primaryKey": false,
           "notNull": true,
-          "autoincrement": false,
-          "default": "CURRENT_TIMESTAMP"
+          "autoincrement": false
         },
-        "updated_at": {
-          "name": "updated_at",
+        "pull_request_url": {
+          "name": "pull_request_url",
           "type": "text",
           "primaryKey": false,
           "notNull": true,
-          "autoincrement": false,
-          "default": "CURRENT_TIMESTAMP"
+          "autoincrement": false
         }
       },
       "indexes": {
-        "idx_tasks_project_id": {
-          "name": "idx_tasks_project_id",
+        "idx_project_pull_requests_project_id": {
+          "name": "idx_project_pull_requests_project_id",
           "columns": ["project_id"],
           "isUnique": false
         }
       },
       "foreignKeys": {
-        "tasks_project_id_projects_id_fk": {
-          "name": "tasks_project_id_projects_id_fk",
-          "tableFrom": "tasks",
-          "tableTo": "projects",
+        "project_pull_requests_project_id_projects_id_fk": {
+          "name": "project_pull_requests_project_id_projects_id_fk",
+          "tableFrom": "project_pull_requests",
           "columnsFrom": ["project_id"],
+          "tableTo": "projects",
           "columnsTo": ["id"],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
+          "onUpdate": "no action",
+          "onDelete": "cascade"
+        },
+        "project_pull_requests_pull_request_url_pull_requests_url_fk": {
+          "name": "project_pull_requests_pull_request_url_pull_requests_url_fk",
+          "tableFrom": "project_pull_requests",
+          "columnsFrom": ["pull_request_url"],
+          "tableTo": "pull_requests",
+          "columnsTo": ["url"],
+          "onUpdate": "no action",
+          "onDelete": "cascade"
         }
       },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    }
-  },
-  "views": {},
-  "enums": {},
-  "_meta": {
-    "schemas": {},
-    "tables": {
-      "\"workspaces\"": "\"tasks\""
+      "compositePrimaryKeys": {
+        "project_pull_requests_project_id_pull_request_url_pk": {
+          "columns": ["project_id", "pull_request_url"],
+          "name": "project_pull_requests_project_id_pull_request_url_pk"
+        }
+      },
+      "uniqueConstraints": {}
+    },
+    "projects": {
+      "name": "projects",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "path": {
+          "name": "path",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "workspace_provider": {
+          "name": "workspace_provider",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'local'"
+        },
+        "base_ref": {
+          "name": "base_ref",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "ssh_connection_id": {
+          "name": "ssh_connection_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {
+        "idx_projects_path": {
+          "name": "idx_projects_path",
+          "columns": ["path"],
+          "isUnique": true
+        },
+        "idx_projects_ssh_connection_id": {
+          "name": "idx_projects_ssh_connection_id",
+          "columns": ["ssh_connection_id"],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "projects_ssh_connection_id_ssh_connections_id_fk": {
+          "name": "projects_ssh_connection_id_ssh_connections_id_fk",
+          "tableFrom": "projects",
+          "columnsFrom": ["ssh_connection_id"],
+          "tableTo": "ssh_connections",
+          "columnsTo": ["id"],
+          "onUpdate": "no action",
+          "onDelete": "set null"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "pull_request_assignees": {
+      "name": "pull_request_assignees",
+      "columns": {
+        "pull_request_id": {
+          "name": "pull_request_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "login": {
+          "name": "login",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "avatar_url": {
+          "name": "avatar_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "idx_pra_login": {
+          "name": "idx_pra_login",
+          "columns": ["login"],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "pull_request_assignees_pull_request_id_pull_requests_id_fk": {
+          "name": "pull_request_assignees_pull_request_id_pull_requests_id_fk",
+          "tableFrom": "pull_request_assignees",
+          "columnsFrom": ["pull_request_id"],
+          "tableTo": "pull_requests",
+          "columnsTo": ["id"],
+          "onUpdate": "no action",
+          "onDelete": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {
+        "pull_request_assignees_pull_request_id_login_pk": {
+          "columns": ["pull_request_id", "login"],
+          "name": "pull_request_assignees_pull_request_id_login_pk"
+        }
+      },
+      "uniqueConstraints": {}
+    },
+    "pull_request_labels": {
+      "name": "pull_request_labels",
+      "columns": {
+        "pull_request_id": {
+          "name": "pull_request_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "color": {
+          "name": "color",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "idx_prl_name": {
+          "name": "idx_prl_name",
+          "columns": ["name"],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "pull_request_labels_pull_request_id_pull_requests_id_fk": {
+          "name": "pull_request_labels_pull_request_id_pull_requests_id_fk",
+          "tableFrom": "pull_request_labels",
+          "columnsFrom": ["pull_request_id"],
+          "tableTo": "pull_requests",
+          "columnsTo": ["id"],
+          "onUpdate": "no action",
+          "onDelete": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {
+        "pull_request_labels_pull_request_id_name_pk": {
+          "columns": ["pull_request_id", "name"],
+          "name": "pull_request_labels_pull_request_id_name_pk"
+        }
+      },
+      "uniqueConstraints": {}
+    },
+    "pull_requests": {
+      "name": "pull_requests",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "provider": {
+          "name": "provider",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'github'"
+        },
+        "name_with_owner": {
+          "name": "name_with_owner",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "''"
+        },
+        "url": {
+          "name": "url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "title": {
+          "name": "title",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "identifier": {
+          "name": "identifier",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'open'"
+        },
+        "author": {
+          "name": "author",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "author_login": {
+          "name": "author_login",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "author_display_name": {
+          "name": "author_display_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "author_avatar_url": {
+          "name": "author_avatar_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "is_draft": {
+          "name": "is_draft",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "head_ref_name": {
+          "name": "head_ref_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "fetched_at": {
+          "name": "fetched_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {
+        "idx_pull_requests_url": {
+          "name": "idx_pull_requests_url",
+          "columns": ["url"],
+          "isUnique": true
+        },
+        "idx_pull_requests_name_with_owner": {
+          "name": "idx_pull_requests_name_with_owner",
+          "columns": ["name_with_owner"],
+          "isUnique": false
+        },
+        "idx_pull_requests_author_login": {
+          "name": "idx_pull_requests_author_login",
+          "columns": ["author_login"],
+          "isUnique": false
+        },
+        "idx_pull_requests_head_ref_name": {
+          "name": "idx_pull_requests_head_ref_name",
+          "columns": ["head_ref_name"],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "ssh_connections": {
+      "name": "ssh_connections",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "host": {
+          "name": "host",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "port": {
+          "name": "port",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 22
+        },
+        "username": {
+          "name": "username",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "auth_type": {
+          "name": "auth_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'agent'"
+        },
+        "private_key_path": {
+          "name": "private_key_path",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "use_agent": {
+          "name": "use_agent",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {
+        "idx_ssh_connections_name": {
+          "name": "idx_ssh_connections_name",
+          "columns": ["name"],
+          "isUnique": true
+        },
+        "idx_ssh_connections_host": {
+          "name": "idx_ssh_connections_host",
+          "columns": ["host"],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "tasks": {
+      "name": "tasks",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "project_id": {
+          "name": "project_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "source_branch": {
+          "name": "source_branch",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "task_branch": {
+          "name": "task_branch",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "linked_issue": {
+          "name": "linked_issue",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "archived_at": {
+          "name": "archived_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "last_interacted_at": {
+          "name": "last_interacted_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "status_changed_at": {
+          "name": "status_changed_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "is_pinned": {
+          "name": "is_pinned",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        }
+      },
+      "indexes": {
+        "idx_tasks_project_id": {
+          "name": "idx_tasks_project_id",
+          "columns": ["project_id"],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "tasks_project_id_projects_id_fk": {
+          "name": "tasks_project_id_projects_id_fk",
+          "tableFrom": "tasks",
+          "columnsFrom": ["project_id"],
+          "tableTo": "projects",
+          "columnsTo": ["id"],
+          "onUpdate": "no action",
+          "onDelete": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
     },
-    "columns": {
-      "\"conversations\".\"workspace_id\"": "\"conversations\".\"task_id\""
+    "tasks_pull_requests": {
+      "name": "tasks_pull_requests",
+      "columns": {
+        "task_id": {
+          "name": "task_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "pull_request_url": {
+          "name": "pull_request_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "tasks_pull_requests_task_id_tasks_id_fk": {
+          "name": "tasks_pull_requests_task_id_tasks_id_fk",
+          "tableFrom": "tasks_pull_requests",
+          "columnsFrom": ["task_id"],
+          "tableTo": "tasks",
+          "columnsTo": ["id"],
+          "onUpdate": "no action",
+          "onDelete": "cascade"
+        },
+        "tasks_pull_requests_pull_request_url_pull_requests_url_fk": {
+          "name": "tasks_pull_requests_pull_request_url_pull_requests_url_fk",
+          "tableFrom": "tasks_pull_requests",
+          "columnsFrom": ["pull_request_url"],
+          "tableTo": "pull_requests",
+          "columnsTo": ["url"],
+          "onUpdate": "no action",
+          "onDelete": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {
+        "tasks_pull_requests_task_id_pull_request_url_pk": {
+          "columns": ["task_id", "pull_request_url"],
+          "name": "tasks_pull_requests_task_id_pull_request_url_pk"
+        }
+      },
+      "uniqueConstraints": {}
+    },
+    "terminals": {
+      "name": "terminals",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "project_id": {
+          "name": "project_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "task_id": {
+          "name": "task_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "ssh": {
+          "name": "ssh",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {
+        "idx_terminals_task_id": {
+          "name": "idx_terminals_task_id",
+          "columns": ["task_id"],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "terminals_project_id_projects_id_fk": {
+          "name": "terminals_project_id_projects_id_fk",
+          "tableFrom": "terminals",
+          "columnsFrom": ["project_id"],
+          "tableTo": "projects",
+          "columnsTo": ["id"],
+          "onUpdate": "no action",
+          "onDelete": "cascade"
+        },
+        "terminals_task_id_tasks_id_fk": {
+          "name": "terminals_task_id_tasks_id_fk",
+          "tableFrom": "terminals",
+          "columnsFrom": ["task_id"],
+          "tableTo": "tasks",
+          "columnsTo": ["id"],
+          "onUpdate": "no action",
+          "onDelete": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
     }
   },
+  "enums": {},
+  "_meta": {
+    "columns": {},
+    "schemas": {},
+    "tables": {}
+  },
   "internal": {
     "indexes": {}
   }
diff --git a/drizzle/meta/0003_snapshot.json b/drizzle/meta/0003_snapshot.json
new file mode 100644
index 0000000000..ee1b217d5f
--- /dev/null
+++ b/drizzle/meta/0003_snapshot.json
@@ -0,0 +1,1196 @@
+{
+  "id": "71b9bacc-a2f1-4bfe-905e-95f3d34f5928",
+  "prevId": "15af6546-957e-48f0-a596-0f9fb9958b68",
+  "version": "6",
+  "dialect": "sqlite",
+  "tables": {
+    "app_secrets": {
+      "name": "app_secrets",
+      "columns": {
+        "key": {
+          "name": "key",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "secret": {
+          "name": "secret",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "idx_app_secrets_key": {
+          "name": "idx_app_secrets_key",
+          "columns": ["key"],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "app_settings": {
+      "name": "app_settings",
+      "columns": {
+        "key": {
+          "name": "key",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "value": {
+          "name": "value",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {
+        "idx_app_settings_key": {
+          "name": "idx_app_settings_key",
+          "columns": ["key"],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "conversations": {
+      "name": "conversations",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "project_id": {
+          "name": "project_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "task_id": {
+          "name": "task_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "title": {
+          "name": "title",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "provider": {
+          "name": "provider",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "config": {
+          "name": "config",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {
+        "idx_conversations_task_id": {
+          "name": "idx_conversations_task_id",
+          "columns": ["task_id"],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "conversations_project_id_projects_id_fk": {
+          "name": "conversations_project_id_projects_id_fk",
+          "tableFrom": "conversations",
+          "columnsFrom": ["project_id"],
+          "tableTo": "projects",
+          "columnsTo": ["id"],
+          "onUpdate": "no action",
+          "onDelete": "cascade"
+        },
+        "conversations_task_id_tasks_id_fk": {
+          "name": "conversations_task_id_tasks_id_fk",
+          "tableFrom": "conversations",
+          "columnsFrom": ["task_id"],
+          "tableTo": "tasks",
+          "columnsTo": ["id"],
+          "onUpdate": "no action",
+          "onDelete": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "editor_buffers": {
+      "name": "editor_buffers",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "project_id": {
+          "name": "project_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "file_path": {
+          "name": "file_path",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "content": {
+          "name": "content",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "idx_editor_buffers_workspace_file": {
+          "name": "idx_editor_buffers_workspace_file",
+          "columns": ["workspace_id", "file_path"],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "editor_buffers_project_id_projects_id_fk": {
+          "name": "editor_buffers_project_id_projects_id_fk",
+          "tableFrom": "editor_buffers",
+          "columnsFrom": ["project_id"],
+          "tableTo": "projects",
+          "columnsTo": ["id"],
+          "onUpdate": "no action",
+          "onDelete": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "kv": {
+      "name": "kv",
+      "columns": {
+        "key": {
+          "name": "key",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "value": {
+          "name": "value",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {
+        "idx_kv_key": {
+          "name": "idx_kv_key",
+          "columns": ["key"],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "line_comments": {
+      "name": "line_comments",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "task_id": {
+          "name": "task_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "file_path": {
+          "name": "file_path",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "line_number": {
+          "name": "line_number",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "line_content": {
+          "name": "line_content",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "content": {
+          "name": "content",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "sent_at": {
+          "name": "sent_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "idx_line_comments_task_file": {
+          "name": "idx_line_comments_task_file",
+          "columns": ["task_id", "file_path"],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "line_comments_task_id_tasks_id_fk": {
+          "name": "line_comments_task_id_tasks_id_fk",
+          "tableFrom": "line_comments",
+          "columnsFrom": ["task_id"],
+          "tableTo": "tasks",
+          "columnsTo": ["id"],
+          "onUpdate": "no action",
+          "onDelete": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "messages": {
+      "name": "messages",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "conversation_id": {
+          "name": "conversation_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "content": {
+          "name": "content",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "sender": {
+          "name": "sender",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "timestamp": {
+          "name": "timestamp",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "idx_messages_conversation_id": {
+          "name": "idx_messages_conversation_id",
+          "columns": ["conversation_id"],
+          "isUnique": false
+        },
+        "idx_messages_timestamp": {
+          "name": "idx_messages_timestamp",
+          "columns": ["timestamp"],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "messages_conversation_id_conversations_id_fk": {
+          "name": "messages_conversation_id_conversations_id_fk",
+          "tableFrom": "messages",
+          "columnsFrom": ["conversation_id"],
+          "tableTo": "conversations",
+          "columnsTo": ["id"],
+          "onUpdate": "no action",
+          "onDelete": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "project_pull_requests": {
+      "name": "project_pull_requests",
+      "columns": {
+        "project_id": {
+          "name": "project_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "pull_request_url": {
+          "name": "pull_request_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "idx_project_pull_requests_project_id": {
+          "name": "idx_project_pull_requests_project_id",
+          "columns": ["project_id"],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "project_pull_requests_project_id_projects_id_fk": {
+          "name": "project_pull_requests_project_id_projects_id_fk",
+          "tableFrom": "project_pull_requests",
+          "columnsFrom": ["project_id"],
+          "tableTo": "projects",
+          "columnsTo": ["id"],
+          "onUpdate": "no action",
+          "onDelete": "cascade"
+        },
+        "project_pull_requests_pull_request_url_pull_requests_url_fk": {
+          "name": "project_pull_requests_pull_request_url_pull_requests_url_fk",
+          "tableFrom": "project_pull_requests",
+          "columnsFrom": ["pull_request_url"],
+          "tableTo": "pull_requests",
+          "columnsTo": ["url"],
+          "onUpdate": "no action",
+          "onDelete": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {
+        "project_pull_requests_project_id_pull_request_url_pk": {
+          "columns": ["project_id", "pull_request_url"],
+          "name": "project_pull_requests_project_id_pull_request_url_pk"
+        }
+      },
+      "uniqueConstraints": {}
+    },
+    "projects": {
+      "name": "projects",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "path": {
+          "name": "path",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "workspace_provider": {
+          "name": "workspace_provider",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'local'"
+        },
+        "base_ref": {
+          "name": "base_ref",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "ssh_connection_id": {
+          "name": "ssh_connection_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {
+        "idx_projects_path": {
+          "name": "idx_projects_path",
+          "columns": ["path"],
+          "isUnique": true
+        },
+        "idx_projects_ssh_connection_id": {
+          "name": "idx_projects_ssh_connection_id",
+          "columns": ["ssh_connection_id"],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "projects_ssh_connection_id_ssh_connections_id_fk": {
+          "name": "projects_ssh_connection_id_ssh_connections_id_fk",
+          "tableFrom": "projects",
+          "columnsFrom": ["ssh_connection_id"],
+          "tableTo": "ssh_connections",
+          "columnsTo": ["id"],
+          "onUpdate": "no action",
+          "onDelete": "set null"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "pull_request_assignees": {
+      "name": "pull_request_assignees",
+      "columns": {
+        "pull_request_id": {
+          "name": "pull_request_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "login": {
+          "name": "login",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "avatar_url": {
+          "name": "avatar_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "idx_pra_login": {
+          "name": "idx_pra_login",
+          "columns": ["login"],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "pull_request_assignees_pull_request_id_pull_requests_id_fk": {
+          "name": "pull_request_assignees_pull_request_id_pull_requests_id_fk",
+          "tableFrom": "pull_request_assignees",
+          "columnsFrom": ["pull_request_id"],
+          "tableTo": "pull_requests",
+          "columnsTo": ["id"],
+          "onUpdate": "no action",
+          "onDelete": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {
+        "pull_request_assignees_pull_request_id_login_pk": {
+          "columns": ["pull_request_id", "login"],
+          "name": "pull_request_assignees_pull_request_id_login_pk"
+        }
+      },
+      "uniqueConstraints": {}
+    },
+    "pull_request_labels": {
+      "name": "pull_request_labels",
+      "columns": {
+        "pull_request_id": {
+          "name": "pull_request_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "color": {
+          "name": "color",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "idx_prl_name": {
+          "name": "idx_prl_name",
+          "columns": ["name"],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "pull_request_labels_pull_request_id_pull_requests_id_fk": {
+          "name": "pull_request_labels_pull_request_id_pull_requests_id_fk",
+          "tableFrom": "pull_request_labels",
+          "columnsFrom": ["pull_request_id"],
+          "tableTo": "pull_requests",
+          "columnsTo": ["id"],
+          "onUpdate": "no action",
+          "onDelete": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {
+        "pull_request_labels_pull_request_id_name_pk": {
+          "columns": ["pull_request_id", "name"],
+          "name": "pull_request_labels_pull_request_id_name_pk"
+        }
+      },
+      "uniqueConstraints": {}
+    },
+    "pull_requests": {
+      "name": "pull_requests",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "provider": {
+          "name": "provider",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'github'"
+        },
+        "name_with_owner": {
+          "name": "name_with_owner",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "''"
+        },
+        "url": {
+          "name": "url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "title": {
+          "name": "title",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "identifier": {
+          "name": "identifier",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'open'"
+        },
+        "author": {
+          "name": "author",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "author_login": {
+          "name": "author_login",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "author_display_name": {
+          "name": "author_display_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "author_avatar_url": {
+          "name": "author_avatar_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "is_draft": {
+          "name": "is_draft",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "head_ref_name": {
+          "name": "head_ref_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "fetched_at": {
+          "name": "fetched_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {
+        "idx_pull_requests_url": {
+          "name": "idx_pull_requests_url",
+          "columns": ["url"],
+          "isUnique": true
+        },
+        "idx_pull_requests_name_with_owner": {
+          "name": "idx_pull_requests_name_with_owner",
+          "columns": ["name_with_owner"],
+          "isUnique": false
+        },
+        "idx_pull_requests_author_login": {
+          "name": "idx_pull_requests_author_login",
+          "columns": ["author_login"],
+          "isUnique": false
+        },
+        "idx_pull_requests_head_ref_name": {
+          "name": "idx_pull_requests_head_ref_name",
+          "columns": ["head_ref_name"],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "ssh_connections": {
+      "name": "ssh_connections",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "host": {
+          "name": "host",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "port": {
+          "name": "port",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 22
+        },
+        "username": {
+          "name": "username",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "auth_type": {
+          "name": "auth_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'agent'"
+        },
+        "private_key_path": {
+          "name": "private_key_path",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "use_agent": {
+          "name": "use_agent",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {
+        "idx_ssh_connections_name": {
+          "name": "idx_ssh_connections_name",
+          "columns": ["name"],
+          "isUnique": true
+        },
+        "idx_ssh_connections_host": {
+          "name": "idx_ssh_connections_host",
+          "columns": ["host"],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "tasks": {
+      "name": "tasks",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "project_id": {
+          "name": "project_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "source_branch": {
+          "name": "source_branch",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "task_branch": {
+          "name": "task_branch",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "linked_issue": {
+          "name": "linked_issue",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "archived_at": {
+          "name": "archived_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "last_interacted_at": {
+          "name": "last_interacted_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "status_changed_at": {
+          "name": "status_changed_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "is_pinned": {
+          "name": "is_pinned",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        }
+      },
+      "indexes": {
+        "idx_tasks_project_id": {
+          "name": "idx_tasks_project_id",
+          "columns": ["project_id"],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "tasks_project_id_projects_id_fk": {
+          "name": "tasks_project_id_projects_id_fk",
+          "tableFrom": "tasks",
+          "columnsFrom": ["project_id"],
+          "tableTo": "projects",
+          "columnsTo": ["id"],
+          "onUpdate": "no action",
+          "onDelete": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "tasks_pull_requests": {
+      "name": "tasks_pull_requests",
+      "columns": {
+        "task_id": {
+          "name": "task_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "pull_request_url": {
+          "name": "pull_request_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "tasks_pull_requests_task_id_tasks_id_fk": {
+          "name": "tasks_pull_requests_task_id_tasks_id_fk",
+          "tableFrom": "tasks_pull_requests",
+          "columnsFrom": ["task_id"],
+          "tableTo": "tasks",
+          "columnsTo": ["id"],
+          "onUpdate": "no action",
+          "onDelete": "cascade"
+        },
+        "tasks_pull_requests_pull_request_url_pull_requests_url_fk": {
+          "name": "tasks_pull_requests_pull_request_url_pull_requests_url_fk",
+          "tableFrom": "tasks_pull_requests",
+          "columnsFrom": ["pull_request_url"],
+          "tableTo": "pull_requests",
+          "columnsTo": ["url"],
+          "onUpdate": "no action",
+          "onDelete": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {
+        "tasks_pull_requests_task_id_pull_request_url_pk": {
+          "columns": ["task_id", "pull_request_url"],
+          "name": "tasks_pull_requests_task_id_pull_request_url_pk"
+        }
+      },
+      "uniqueConstraints": {}
+    },
+    "terminals": {
+      "name": "terminals",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "project_id": {
+          "name": "project_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "task_id": {
+          "name": "task_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "ssh": {
+          "name": "ssh",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {
+        "idx_terminals_task_id": {
+          "name": "idx_terminals_task_id",
+          "columns": ["task_id"],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "terminals_project_id_projects_id_fk": {
+          "name": "terminals_project_id_projects_id_fk",
+          "tableFrom": "terminals",
+          "columnsFrom": ["project_id"],
+          "tableTo": "projects",
+          "columnsTo": ["id"],
+          "onUpdate": "no action",
+          "onDelete": "cascade"
+        },
+        "terminals_task_id_tasks_id_fk": {
+          "name": "terminals_task_id_tasks_id_fk",
+          "tableFrom": "terminals",
+          "columnsFrom": ["task_id"],
+          "tableTo": "tasks",
+          "columnsTo": ["id"],
+          "onUpdate": "no action",
+          "onDelete": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    }
+  },
+  "enums": {},
+  "_meta": {
+    "columns": {},
+    "schemas": {},
+    "tables": {}
+  },
+  "internal": {
+    "indexes": {}
+  }
+}
diff --git a/drizzle/meta/0004_snapshot.json b/drizzle/meta/0004_snapshot.json
new file mode 100644
index 0000000000..2f103fd13b
--- /dev/null
+++ b/drizzle/meta/0004_snapshot.json
@@ -0,0 +1,1106 @@
+{
+  "version": "6",
+  "dialect": "sqlite",
+  "id": "5a9526e3-8d61-467e-8cc4-81524040592c",
+  "prevId": "71b9bacc-a2f1-4bfe-905e-95f3d34f5928",
+  "tables": {
+    "app_secrets": {
+      "name": "app_secrets",
+      "columns": {
+        "key": {
+          "name": "key",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "secret": {
+          "name": "secret",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "idx_app_secrets_key": {
+          "name": "idx_app_secrets_key",
+          "columns": ["key"],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "app_settings": {
+      "name": "app_settings",
+      "columns": {
+        "key": {
+          "name": "key",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "value": {
+          "name": "value",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {
+        "idx_app_settings_key": {
+          "name": "idx_app_settings_key",
+          "columns": ["key"],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "conversations": {
+      "name": "conversations",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "project_id": {
+          "name": "project_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "task_id": {
+          "name": "task_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "title": {
+          "name": "title",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "provider": {
+          "name": "provider",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "config": {
+          "name": "config",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {
+        "idx_conversations_task_id": {
+          "name": "idx_conversations_task_id",
+          "columns": ["task_id"],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "conversations_project_id_projects_id_fk": {
+          "name": "conversations_project_id_projects_id_fk",
+          "tableFrom": "conversations",
+          "tableTo": "projects",
+          "columnsFrom": ["project_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "conversations_task_id_tasks_id_fk": {
+          "name": "conversations_task_id_tasks_id_fk",
+          "tableFrom": "conversations",
+          "tableTo": "tasks",
+          "columnsFrom": ["task_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "editor_buffers": {
+      "name": "editor_buffers",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "project_id": {
+          "name": "project_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "file_path": {
+          "name": "file_path",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "content": {
+          "name": "content",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "idx_editor_buffers_workspace_file": {
+          "name": "idx_editor_buffers_workspace_file",
+          "columns": ["workspace_id", "file_path"],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "editor_buffers_project_id_projects_id_fk": {
+          "name": "editor_buffers_project_id_projects_id_fk",
+          "tableFrom": "editor_buffers",
+          "tableTo": "projects",
+          "columnsFrom": ["project_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "kv": {
+      "name": "kv",
+      "columns": {
+        "key": {
+          "name": "key",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "value": {
+          "name": "value",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {
+        "idx_kv_key": {
+          "name": "idx_kv_key",
+          "columns": ["key"],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "messages": {
+      "name": "messages",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "conversation_id": {
+          "name": "conversation_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "content": {
+          "name": "content",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "sender": {
+          "name": "sender",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "timestamp": {
+          "name": "timestamp",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "idx_messages_conversation_id": {
+          "name": "idx_messages_conversation_id",
+          "columns": ["conversation_id"],
+          "isUnique": false
+        },
+        "idx_messages_timestamp": {
+          "name": "idx_messages_timestamp",
+          "columns": ["timestamp"],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "messages_conversation_id_conversations_id_fk": {
+          "name": "messages_conversation_id_conversations_id_fk",
+          "tableFrom": "messages",
+          "tableTo": "conversations",
+          "columnsFrom": ["conversation_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "project_pull_requests": {
+      "name": "project_pull_requests",
+      "columns": {
+        "project_id": {
+          "name": "project_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "pull_request_url": {
+          "name": "pull_request_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "idx_project_pull_requests_project_id": {
+          "name": "idx_project_pull_requests_project_id",
+          "columns": ["project_id"],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "project_pull_requests_project_id_projects_id_fk": {
+          "name": "project_pull_requests_project_id_projects_id_fk",
+          "tableFrom": "project_pull_requests",
+          "tableTo": "projects",
+          "columnsFrom": ["project_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "project_pull_requests_pull_request_url_pull_requests_url_fk": {
+          "name": "project_pull_requests_pull_request_url_pull_requests_url_fk",
+          "tableFrom": "project_pull_requests",
+          "tableTo": "pull_requests",
+          "columnsFrom": ["pull_request_url"],
+          "columnsTo": ["url"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {
+        "project_pull_requests_project_id_pull_request_url_pk": {
+          "columns": ["project_id", "pull_request_url"],
+          "name": "project_pull_requests_project_id_pull_request_url_pk"
+        }
+      },
+      "uniqueConstraints": {}
+    },
+    "projects": {
+      "name": "projects",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "path": {
+          "name": "path",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "workspace_provider": {
+          "name": "workspace_provider",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'local'"
+        },
+        "base_ref": {
+          "name": "base_ref",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "ssh_connection_id": {
+          "name": "ssh_connection_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {
+        "idx_projects_path": {
+          "name": "idx_projects_path",
+          "columns": ["path"],
+          "isUnique": true
+        },
+        "idx_projects_ssh_connection_id": {
+          "name": "idx_projects_ssh_connection_id",
+          "columns": ["ssh_connection_id"],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "projects_ssh_connection_id_ssh_connections_id_fk": {
+          "name": "projects_ssh_connection_id_ssh_connections_id_fk",
+          "tableFrom": "projects",
+          "tableTo": "ssh_connections",
+          "columnsFrom": ["ssh_connection_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "pull_request_assignees": {
+      "name": "pull_request_assignees",
+      "columns": {
+        "pull_request_id": {
+          "name": "pull_request_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "login": {
+          "name": "login",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "avatar_url": {
+          "name": "avatar_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "idx_pra_login": {
+          "name": "idx_pra_login",
+          "columns": ["login"],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "pull_request_assignees_pull_request_id_pull_requests_id_fk": {
+          "name": "pull_request_assignees_pull_request_id_pull_requests_id_fk",
+          "tableFrom": "pull_request_assignees",
+          "tableTo": "pull_requests",
+          "columnsFrom": ["pull_request_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {
+        "pull_request_assignees_pull_request_id_login_pk": {
+          "columns": ["pull_request_id", "login"],
+          "name": "pull_request_assignees_pull_request_id_login_pk"
+        }
+      },
+      "uniqueConstraints": {}
+    },
+    "pull_request_labels": {
+      "name": "pull_request_labels",
+      "columns": {
+        "pull_request_id": {
+          "name": "pull_request_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "color": {
+          "name": "color",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "idx_prl_name": {
+          "name": "idx_prl_name",
+          "columns": ["name"],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "pull_request_labels_pull_request_id_pull_requests_id_fk": {
+          "name": "pull_request_labels_pull_request_id_pull_requests_id_fk",
+          "tableFrom": "pull_request_labels",
+          "tableTo": "pull_requests",
+          "columnsFrom": ["pull_request_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {
+        "pull_request_labels_pull_request_id_name_pk": {
+          "columns": ["pull_request_id", "name"],
+          "name": "pull_request_labels_pull_request_id_name_pk"
+        }
+      },
+      "uniqueConstraints": {}
+    },
+    "pull_requests": {
+      "name": "pull_requests",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "provider": {
+          "name": "provider",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'github'"
+        },
+        "name_with_owner": {
+          "name": "name_with_owner",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "''"
+        },
+        "url": {
+          "name": "url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "title": {
+          "name": "title",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "identifier": {
+          "name": "identifier",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'open'"
+        },
+        "author": {
+          "name": "author",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "author_login": {
+          "name": "author_login",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "author_display_name": {
+          "name": "author_display_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "author_avatar_url": {
+          "name": "author_avatar_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "is_draft": {
+          "name": "is_draft",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "head_ref_name": {
+          "name": "head_ref_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "fetched_at": {
+          "name": "fetched_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {
+        "idx_pull_requests_url": {
+          "name": "idx_pull_requests_url",
+          "columns": ["url"],
+          "isUnique": true
+        },
+        "idx_pull_requests_name_with_owner": {
+          "name": "idx_pull_requests_name_with_owner",
+          "columns": ["name_with_owner"],
+          "isUnique": false
+        },
+        "idx_pull_requests_author_login": {
+          "name": "idx_pull_requests_author_login",
+          "columns": ["author_login"],
+          "isUnique": false
+        },
+        "idx_pull_requests_head_ref_name": {
+          "name": "idx_pull_requests_head_ref_name",
+          "columns": ["head_ref_name"],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "ssh_connections": {
+      "name": "ssh_connections",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "host": {
+          "name": "host",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "port": {
+          "name": "port",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 22
+        },
+        "username": {
+          "name": "username",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "auth_type": {
+          "name": "auth_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'agent'"
+        },
+        "private_key_path": {
+          "name": "private_key_path",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "use_agent": {
+          "name": "use_agent",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {
+        "idx_ssh_connections_name": {
+          "name": "idx_ssh_connections_name",
+          "columns": ["name"],
+          "isUnique": true
+        },
+        "idx_ssh_connections_host": {
+          "name": "idx_ssh_connections_host",
+          "columns": ["host"],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "tasks": {
+      "name": "tasks",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "project_id": {
+          "name": "project_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "source_branch": {
+          "name": "source_branch",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "task_branch": {
+          "name": "task_branch",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "linked_issue": {
+          "name": "linked_issue",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "archived_at": {
+          "name": "archived_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "last_interacted_at": {
+          "name": "last_interacted_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "status_changed_at": {
+          "name": "status_changed_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "is_pinned": {
+          "name": "is_pinned",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        }
+      },
+      "indexes": {
+        "idx_tasks_project_id": {
+          "name": "idx_tasks_project_id",
+          "columns": ["project_id"],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "tasks_project_id_projects_id_fk": {
+          "name": "tasks_project_id_projects_id_fk",
+          "tableFrom": "tasks",
+          "tableTo": "projects",
+          "columnsFrom": ["project_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "tasks_pull_requests": {
+      "name": "tasks_pull_requests",
+      "columns": {
+        "task_id": {
+          "name": "task_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "pull_request_url": {
+          "name": "pull_request_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "tasks_pull_requests_task_id_tasks_id_fk": {
+          "name": "tasks_pull_requests_task_id_tasks_id_fk",
+          "tableFrom": "tasks_pull_requests",
+          "tableTo": "tasks",
+          "columnsFrom": ["task_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "tasks_pull_requests_pull_request_url_pull_requests_url_fk": {
+          "name": "tasks_pull_requests_pull_request_url_pull_requests_url_fk",
+          "tableFrom": "tasks_pull_requests",
+          "tableTo": "pull_requests",
+          "columnsFrom": ["pull_request_url"],
+          "columnsTo": ["url"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {
+        "tasks_pull_requests_task_id_pull_request_url_pk": {
+          "columns": ["task_id", "pull_request_url"],
+          "name": "tasks_pull_requests_task_id_pull_request_url_pk"
+        }
+      },
+      "uniqueConstraints": {}
+    },
+    "terminals": {
+      "name": "terminals",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "project_id": {
+          "name": "project_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "task_id": {
+          "name": "task_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "ssh": {
+          "name": "ssh",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {
+        "idx_terminals_task_id": {
+          "name": "idx_terminals_task_id",
+          "columns": ["task_id"],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "terminals_project_id_projects_id_fk": {
+          "name": "terminals_project_id_projects_id_fk",
+          "tableFrom": "terminals",
+          "tableTo": "projects",
+          "columnsFrom": ["project_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "terminals_task_id_tasks_id_fk": {
+          "name": "terminals_task_id_tasks_id_fk",
+          "tableFrom": "terminals",
+          "tableTo": "tasks",
+          "columnsFrom": ["task_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    }
+  },
+  "enums": {},
+  "_meta": {
+    "schemas": {},
+    "tables": {},
+    "columns": {}
+  },
+  "internal": {
+    "indexes": {}
+  }
+}
diff --git a/drizzle/meta/0005_snapshot.json b/drizzle/meta/0005_snapshot.json
new file mode 100644
index 0000000000..390a648667
--- /dev/null
+++ b/drizzle/meta/0005_snapshot.json
@@ -0,0 +1,1272 @@
+{
+  "version": "6",
+  "dialect": "sqlite",
+  "id": "902bc036-89f3-4b0d-a703-90f93c188f7d",
+  "prevId": "5a9526e3-8d61-467e-8cc4-81524040592c",
+  "tables": {
+    "app_secrets": {
+      "name": "app_secrets",
+      "columns": {
+        "key": {
+          "name": "key",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "secret": {
+          "name": "secret",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "idx_app_secrets_key": {
+          "name": "idx_app_secrets_key",
+          "columns": ["key"],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "app_settings": {
+      "name": "app_settings",
+      "columns": {
+        "key": {
+          "name": "key",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "value": {
+          "name": "value",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {
+        "idx_app_settings_key": {
+          "name": "idx_app_settings_key",
+          "columns": ["key"],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "conversations": {
+      "name": "conversations",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "project_id": {
+          "name": "project_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "task_id": {
+          "name": "task_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "title": {
+          "name": "title",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "provider": {
+          "name": "provider",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "config": {
+          "name": "config",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {
+        "idx_conversations_task_id": {
+          "name": "idx_conversations_task_id",
+          "columns": ["task_id"],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "conversations_project_id_projects_id_fk": {
+          "name": "conversations_project_id_projects_id_fk",
+          "tableFrom": "conversations",
+          "tableTo": "projects",
+          "columnsFrom": ["project_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "conversations_task_id_tasks_id_fk": {
+          "name": "conversations_task_id_tasks_id_fk",
+          "tableFrom": "conversations",
+          "tableTo": "tasks",
+          "columnsFrom": ["task_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "editor_buffers": {
+      "name": "editor_buffers",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "project_id": {
+          "name": "project_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "file_path": {
+          "name": "file_path",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "content": {
+          "name": "content",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "idx_editor_buffers_workspace_file": {
+          "name": "idx_editor_buffers_workspace_file",
+          "columns": ["workspace_id", "file_path"],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "editor_buffers_project_id_projects_id_fk": {
+          "name": "editor_buffers_project_id_projects_id_fk",
+          "tableFrom": "editor_buffers",
+          "tableTo": "projects",
+          "columnsFrom": ["project_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "kv": {
+      "name": "kv",
+      "columns": {
+        "key": {
+          "name": "key",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "value": {
+          "name": "value",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {
+        "idx_kv_key": {
+          "name": "idx_kv_key",
+          "columns": ["key"],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "messages": {
+      "name": "messages",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "conversation_id": {
+          "name": "conversation_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "content": {
+          "name": "content",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "sender": {
+          "name": "sender",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "timestamp": {
+          "name": "timestamp",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "idx_messages_conversation_id": {
+          "name": "idx_messages_conversation_id",
+          "columns": ["conversation_id"],
+          "isUnique": false
+        },
+        "idx_messages_timestamp": {
+          "name": "idx_messages_timestamp",
+          "columns": ["timestamp"],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "messages_conversation_id_conversations_id_fk": {
+          "name": "messages_conversation_id_conversations_id_fk",
+          "tableFrom": "messages",
+          "tableTo": "conversations",
+          "columnsFrom": ["conversation_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "project_remotes": {
+      "name": "project_remotes",
+      "columns": {
+        "project_id": {
+          "name": "project_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "remote_name": {
+          "name": "remote_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "remote_url": {
+          "name": "remote_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "project_remotes_project_id_projects_id_fk": {
+          "name": "project_remotes_project_id_projects_id_fk",
+          "tableFrom": "project_remotes",
+          "tableTo": "projects",
+          "columnsFrom": ["project_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {
+        "project_remotes_project_id_remote_name_pk": {
+          "columns": ["project_id", "remote_name"],
+          "name": "project_remotes_project_id_remote_name_pk"
+        }
+      },
+      "uniqueConstraints": {}
+    },
+    "projects": {
+      "name": "projects",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "path": {
+          "name": "path",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "workspace_provider": {
+          "name": "workspace_provider",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'local'"
+        },
+        "base_ref": {
+          "name": "base_ref",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "ssh_connection_id": {
+          "name": "ssh_connection_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {
+        "idx_projects_path": {
+          "name": "idx_projects_path",
+          "columns": ["path"],
+          "isUnique": true
+        },
+        "idx_projects_ssh_connection_id": {
+          "name": "idx_projects_ssh_connection_id",
+          "columns": ["ssh_connection_id"],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "projects_ssh_connection_id_ssh_connections_id_fk": {
+          "name": "projects_ssh_connection_id_ssh_connections_id_fk",
+          "tableFrom": "projects",
+          "tableTo": "ssh_connections",
+          "columnsFrom": ["ssh_connection_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "pull_request_assignees": {
+      "name": "pull_request_assignees",
+      "columns": {
+        "pull_request_url": {
+          "name": "pull_request_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "idx_pra_pull_request_url": {
+          "name": "idx_pra_pull_request_url",
+          "columns": ["pull_request_url"],
+          "isUnique": false
+        },
+        "idx_pra_user_id": {
+          "name": "idx_pra_user_id",
+          "columns": ["user_id"],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "pull_request_assignees_pull_request_url_pull_requests_url_fk": {
+          "name": "pull_request_assignees_pull_request_url_pull_requests_url_fk",
+          "tableFrom": "pull_request_assignees",
+          "tableTo": "pull_requests",
+          "columnsFrom": ["pull_request_url"],
+          "columnsTo": ["url"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "pull_request_assignees_user_id_pull_request_users_user_id_fk": {
+          "name": "pull_request_assignees_user_id_pull_request_users_user_id_fk",
+          "tableFrom": "pull_request_assignees",
+          "tableTo": "pull_request_users",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["user_id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {
+        "pull_request_assignees_pull_request_url_user_id_pk": {
+          "columns": ["pull_request_url", "user_id"],
+          "name": "pull_request_assignees_pull_request_url_user_id_pk"
+        }
+      },
+      "uniqueConstraints": {}
+    },
+    "pull_request_checks": {
+      "name": "pull_request_checks",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "pull_request_url": {
+          "name": "pull_request_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "commit_sha": {
+          "name": "commit_sha",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "conclusion": {
+          "name": "conclusion",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "details_url": {
+          "name": "details_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "started_at": {
+          "name": "started_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "completed_at": {
+          "name": "completed_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "workflow_name": {
+          "name": "workflow_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "app_name": {
+          "name": "app_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "app_logo_url": {
+          "name": "app_logo_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "idx_prc_pull_request_url": {
+          "name": "idx_prc_pull_request_url",
+          "columns": ["pull_request_url"],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "pull_request_checks_pull_request_url_pull_requests_url_fk": {
+          "name": "pull_request_checks_pull_request_url_pull_requests_url_fk",
+          "tableFrom": "pull_request_checks",
+          "tableTo": "pull_requests",
+          "columnsFrom": ["pull_request_url"],
+          "columnsTo": ["url"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "pull_request_labels": {
+      "name": "pull_request_labels",
+      "columns": {
+        "pull_request_id": {
+          "name": "pull_request_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "color": {
+          "name": "color",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "idx_prl_name": {
+          "name": "idx_prl_name",
+          "columns": ["name"],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "pull_request_labels_pull_request_id_pull_requests_url_fk": {
+          "name": "pull_request_labels_pull_request_id_pull_requests_url_fk",
+          "tableFrom": "pull_request_labels",
+          "tableTo": "pull_requests",
+          "columnsFrom": ["pull_request_id"],
+          "columnsTo": ["url"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {
+        "pull_request_labels_pull_request_id_name_pk": {
+          "columns": ["pull_request_id", "name"],
+          "name": "pull_request_labels_pull_request_id_name_pk"
+        }
+      },
+      "uniqueConstraints": {}
+    },
+    "pull_request_users": {
+      "name": "pull_request_users",
+      "columns": {
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "user_name": {
+          "name": "user_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "display_name": {
+          "name": "display_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "avatar_url": {
+          "name": "avatar_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "url": {
+          "name": "url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "user_updated_at": {
+          "name": "user_updated_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "user_created_at": {
+          "name": "user_created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "pull_requests": {
+      "name": "pull_requests",
+      "columns": {
+        "url": {
+          "name": "url",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "provider": {
+          "name": "provider",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'github'"
+        },
+        "repository_url": {
+          "name": "repository_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "base_ref_name": {
+          "name": "base_ref_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "base_ref_oid": {
+          "name": "base_ref_oid",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "head_repository_url": {
+          "name": "head_repository_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "head_ref_name": {
+          "name": "head_ref_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "head_ref_oid": {
+          "name": "head_ref_oid",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "identifier": {
+          "name": "identifier",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "title": {
+          "name": "title",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'open'"
+        },
+        "is_draft": {
+          "name": "is_draft",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "author_user_id": {
+          "name": "author_user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "additions": {
+          "name": "additions",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "deletions": {
+          "name": "deletions",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "changed_files": {
+          "name": "changed_files",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "commit_count": {
+          "name": "commit_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "mergeable_status": {
+          "name": "mergeable_status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "merge_state_status": {
+          "name": "merge_state_status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "review_decision": {
+          "name": "review_decision",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "pull_request_created_at": {
+          "name": "pull_request_created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "pull_request_updated_at": {
+          "name": "pull_request_updated_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {
+        "idx_pull_requests_url": {
+          "name": "idx_pull_requests_url",
+          "columns": ["url"],
+          "isUnique": true
+        },
+        "idx_pull_requests_repository_url": {
+          "name": "idx_pull_requests_repository_url",
+          "columns": ["repository_url"],
+          "isUnique": false
+        },
+        "idx_pull_requests_head_repository_url": {
+          "name": "idx_pull_requests_head_repository_url",
+          "columns": ["head_repository_url"],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "pull_requests_author_user_id_pull_request_users_user_id_fk": {
+          "name": "pull_requests_author_user_id_pull_request_users_user_id_fk",
+          "tableFrom": "pull_requests",
+          "tableTo": "pull_request_users",
+          "columnsFrom": ["author_user_id"],
+          "columnsTo": ["user_id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "ssh_connections": {
+      "name": "ssh_connections",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "host": {
+          "name": "host",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "port": {
+          "name": "port",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 22
+        },
+        "username": {
+          "name": "username",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "auth_type": {
+          "name": "auth_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'agent'"
+        },
+        "private_key_path": {
+          "name": "private_key_path",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "use_agent": {
+          "name": "use_agent",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {
+        "idx_ssh_connections_name": {
+          "name": "idx_ssh_connections_name",
+          "columns": ["name"],
+          "isUnique": true
+        },
+        "idx_ssh_connections_host": {
+          "name": "idx_ssh_connections_host",
+          "columns": ["host"],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "tasks": {
+      "name": "tasks",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "project_id": {
+          "name": "project_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "source_branch": {
+          "name": "source_branch",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "task_branch": {
+          "name": "task_branch",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "linked_issue": {
+          "name": "linked_issue",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "archived_at": {
+          "name": "archived_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "last_interacted_at": {
+          "name": "last_interacted_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "status_changed_at": {
+          "name": "status_changed_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "is_pinned": {
+          "name": "is_pinned",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        }
+      },
+      "indexes": {
+        "idx_tasks_project_id": {
+          "name": "idx_tasks_project_id",
+          "columns": ["project_id"],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "tasks_project_id_projects_id_fk": {
+          "name": "tasks_project_id_projects_id_fk",
+          "tableFrom": "tasks",
+          "tableTo": "projects",
+          "columnsFrom": ["project_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "terminals": {
+      "name": "terminals",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "project_id": {
+          "name": "project_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "task_id": {
+          "name": "task_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "ssh": {
+          "name": "ssh",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {
+        "idx_terminals_task_id": {
+          "name": "idx_terminals_task_id",
+          "columns": ["task_id"],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "terminals_project_id_projects_id_fk": {
+          "name": "terminals_project_id_projects_id_fk",
+          "tableFrom": "terminals",
+          "tableTo": "projects",
+          "columnsFrom": ["project_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "terminals_task_id_tasks_id_fk": {
+          "name": "terminals_task_id_tasks_id_fk",
+          "tableFrom": "terminals",
+          "tableTo": "tasks",
+          "columnsFrom": ["task_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    }
+  },
+  "enums": {},
+  "_meta": {
+    "schemas": {},
+    "tables": {},
+    "columns": {
+      "\"pull_request_assignees\".\"pull_request_id\"": "\"pull_request_assignees\".\"pull_request_url\""
+    }
+  },
+  "internal": {
+    "indexes": {}
+  }
+}
diff --git a/drizzle/meta/0006_snapshot.json b/drizzle/meta/0006_snapshot.json
new file mode 100644
index 0000000000..6f41b3b849
--- /dev/null
+++ b/drizzle/meta/0006_snapshot.json
@@ -0,0 +1,1270 @@
+{
+  "version": "6",
+  "dialect": "sqlite",
+  "id": "79109ea2-737d-48d0-b5c6-ec2ceb4b0d3c",
+  "prevId": "902bc036-89f3-4b0d-a703-90f93c188f7d",
+  "tables": {
+    "app_secrets": {
+      "name": "app_secrets",
+      "columns": {
+        "key": {
+          "name": "key",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "secret": {
+          "name": "secret",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "idx_app_secrets_key": {
+          "name": "idx_app_secrets_key",
+          "columns": ["key"],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "app_settings": {
+      "name": "app_settings",
+      "columns": {
+        "key": {
+          "name": "key",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "value": {
+          "name": "value",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {
+        "idx_app_settings_key": {
+          "name": "idx_app_settings_key",
+          "columns": ["key"],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "conversations": {
+      "name": "conversations",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "project_id": {
+          "name": "project_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "task_id": {
+          "name": "task_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "title": {
+          "name": "title",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "provider": {
+          "name": "provider",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "config": {
+          "name": "config",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {
+        "idx_conversations_task_id": {
+          "name": "idx_conversations_task_id",
+          "columns": ["task_id"],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "conversations_project_id_projects_id_fk": {
+          "name": "conversations_project_id_projects_id_fk",
+          "tableFrom": "conversations",
+          "tableTo": "projects",
+          "columnsFrom": ["project_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "conversations_task_id_tasks_id_fk": {
+          "name": "conversations_task_id_tasks_id_fk",
+          "tableFrom": "conversations",
+          "tableTo": "tasks",
+          "columnsFrom": ["task_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "editor_buffers": {
+      "name": "editor_buffers",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "project_id": {
+          "name": "project_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "file_path": {
+          "name": "file_path",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "content": {
+          "name": "content",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "idx_editor_buffers_workspace_file": {
+          "name": "idx_editor_buffers_workspace_file",
+          "columns": ["workspace_id", "file_path"],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "editor_buffers_project_id_projects_id_fk": {
+          "name": "editor_buffers_project_id_projects_id_fk",
+          "tableFrom": "editor_buffers",
+          "tableTo": "projects",
+          "columnsFrom": ["project_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "kv": {
+      "name": "kv",
+      "columns": {
+        "key": {
+          "name": "key",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "value": {
+          "name": "value",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {
+        "idx_kv_key": {
+          "name": "idx_kv_key",
+          "columns": ["key"],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "messages": {
+      "name": "messages",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "conversation_id": {
+          "name": "conversation_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "content": {
+          "name": "content",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "sender": {
+          "name": "sender",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "timestamp": {
+          "name": "timestamp",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "idx_messages_conversation_id": {
+          "name": "idx_messages_conversation_id",
+          "columns": ["conversation_id"],
+          "isUnique": false
+        },
+        "idx_messages_timestamp": {
+          "name": "idx_messages_timestamp",
+          "columns": ["timestamp"],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "messages_conversation_id_conversations_id_fk": {
+          "name": "messages_conversation_id_conversations_id_fk",
+          "tableFrom": "messages",
+          "tableTo": "conversations",
+          "columnsFrom": ["conversation_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "project_remotes": {
+      "name": "project_remotes",
+      "columns": {
+        "project_id": {
+          "name": "project_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "remote_name": {
+          "name": "remote_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "remote_url": {
+          "name": "remote_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "project_remotes_project_id_projects_id_fk": {
+          "name": "project_remotes_project_id_projects_id_fk",
+          "tableFrom": "project_remotes",
+          "tableTo": "projects",
+          "columnsFrom": ["project_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {
+        "project_remotes_project_id_remote_name_pk": {
+          "columns": ["project_id", "remote_name"],
+          "name": "project_remotes_project_id_remote_name_pk"
+        }
+      },
+      "uniqueConstraints": {}
+    },
+    "projects": {
+      "name": "projects",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "path": {
+          "name": "path",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "workspace_provider": {
+          "name": "workspace_provider",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'local'"
+        },
+        "base_ref": {
+          "name": "base_ref",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "ssh_connection_id": {
+          "name": "ssh_connection_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {
+        "idx_projects_path": {
+          "name": "idx_projects_path",
+          "columns": ["path"],
+          "isUnique": true
+        },
+        "idx_projects_ssh_connection_id": {
+          "name": "idx_projects_ssh_connection_id",
+          "columns": ["ssh_connection_id"],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "projects_ssh_connection_id_ssh_connections_id_fk": {
+          "name": "projects_ssh_connection_id_ssh_connections_id_fk",
+          "tableFrom": "projects",
+          "tableTo": "ssh_connections",
+          "columnsFrom": ["ssh_connection_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "pull_request_assignees": {
+      "name": "pull_request_assignees",
+      "columns": {
+        "pull_request_url": {
+          "name": "pull_request_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "idx_pra_pull_request_url": {
+          "name": "idx_pra_pull_request_url",
+          "columns": ["pull_request_url"],
+          "isUnique": false
+        },
+        "idx_pra_user_id": {
+          "name": "idx_pra_user_id",
+          "columns": ["user_id"],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "pull_request_assignees_pull_request_url_pull_requests_url_fk": {
+          "name": "pull_request_assignees_pull_request_url_pull_requests_url_fk",
+          "tableFrom": "pull_request_assignees",
+          "tableTo": "pull_requests",
+          "columnsFrom": ["pull_request_url"],
+          "columnsTo": ["url"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "pull_request_assignees_user_id_pull_request_users_user_id_fk": {
+          "name": "pull_request_assignees_user_id_pull_request_users_user_id_fk",
+          "tableFrom": "pull_request_assignees",
+          "tableTo": "pull_request_users",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["user_id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {
+        "pull_request_assignees_pull_request_url_user_id_pk": {
+          "columns": ["pull_request_url", "user_id"],
+          "name": "pull_request_assignees_pull_request_url_user_id_pk"
+        }
+      },
+      "uniqueConstraints": {}
+    },
+    "pull_request_checks": {
+      "name": "pull_request_checks",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "pull_request_url": {
+          "name": "pull_request_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "commit_sha": {
+          "name": "commit_sha",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "conclusion": {
+          "name": "conclusion",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "details_url": {
+          "name": "details_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "started_at": {
+          "name": "started_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "completed_at": {
+          "name": "completed_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "workflow_name": {
+          "name": "workflow_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "app_name": {
+          "name": "app_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "app_logo_url": {
+          "name": "app_logo_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "idx_prc_pull_request_url": {
+          "name": "idx_prc_pull_request_url",
+          "columns": ["pull_request_url"],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "pull_request_checks_pull_request_url_pull_requests_url_fk": {
+          "name": "pull_request_checks_pull_request_url_pull_requests_url_fk",
+          "tableFrom": "pull_request_checks",
+          "tableTo": "pull_requests",
+          "columnsFrom": ["pull_request_url"],
+          "columnsTo": ["url"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "pull_request_labels": {
+      "name": "pull_request_labels",
+      "columns": {
+        "pull_request_id": {
+          "name": "pull_request_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "color": {
+          "name": "color",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "idx_prl_name": {
+          "name": "idx_prl_name",
+          "columns": ["name"],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "pull_request_labels_pull_request_id_pull_requests_url_fk": {
+          "name": "pull_request_labels_pull_request_id_pull_requests_url_fk",
+          "tableFrom": "pull_request_labels",
+          "tableTo": "pull_requests",
+          "columnsFrom": ["pull_request_id"],
+          "columnsTo": ["url"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {
+        "pull_request_labels_pull_request_id_name_pk": {
+          "columns": ["pull_request_id", "name"],
+          "name": "pull_request_labels_pull_request_id_name_pk"
+        }
+      },
+      "uniqueConstraints": {}
+    },
+    "pull_request_users": {
+      "name": "pull_request_users",
+      "columns": {
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "user_name": {
+          "name": "user_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "display_name": {
+          "name": "display_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "avatar_url": {
+          "name": "avatar_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "url": {
+          "name": "url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "user_updated_at": {
+          "name": "user_updated_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "user_created_at": {
+          "name": "user_created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "pull_requests": {
+      "name": "pull_requests",
+      "columns": {
+        "url": {
+          "name": "url",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "provider": {
+          "name": "provider",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'github'"
+        },
+        "repository_url": {
+          "name": "repository_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "base_ref_name": {
+          "name": "base_ref_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "base_ref_oid": {
+          "name": "base_ref_oid",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "head_repository_url": {
+          "name": "head_repository_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "head_ref_name": {
+          "name": "head_ref_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "head_ref_oid": {
+          "name": "head_ref_oid",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "identifier": {
+          "name": "identifier",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "title": {
+          "name": "title",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'open'"
+        },
+        "is_draft": {
+          "name": "is_draft",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "author_user_id": {
+          "name": "author_user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "additions": {
+          "name": "additions",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "deletions": {
+          "name": "deletions",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "changed_files": {
+          "name": "changed_files",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "commit_count": {
+          "name": "commit_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "mergeable_status": {
+          "name": "mergeable_status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "merge_state_status": {
+          "name": "merge_state_status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "review_decision": {
+          "name": "review_decision",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "pull_request_created_at": {
+          "name": "pull_request_created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "pull_request_updated_at": {
+          "name": "pull_request_updated_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {
+        "idx_pull_requests_url": {
+          "name": "idx_pull_requests_url",
+          "columns": ["url"],
+          "isUnique": true
+        },
+        "idx_pull_requests_repository_url": {
+          "name": "idx_pull_requests_repository_url",
+          "columns": ["repository_url"],
+          "isUnique": false
+        },
+        "idx_pull_requests_head_repository_url": {
+          "name": "idx_pull_requests_head_repository_url",
+          "columns": ["head_repository_url"],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "pull_requests_author_user_id_pull_request_users_user_id_fk": {
+          "name": "pull_requests_author_user_id_pull_request_users_user_id_fk",
+          "tableFrom": "pull_requests",
+          "tableTo": "pull_request_users",
+          "columnsFrom": ["author_user_id"],
+          "columnsTo": ["user_id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "ssh_connections": {
+      "name": "ssh_connections",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "host": {
+          "name": "host",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "port": {
+          "name": "port",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 22
+        },
+        "username": {
+          "name": "username",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "auth_type": {
+          "name": "auth_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'agent'"
+        },
+        "private_key_path": {
+          "name": "private_key_path",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "use_agent": {
+          "name": "use_agent",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {
+        "idx_ssh_connections_name": {
+          "name": "idx_ssh_connections_name",
+          "columns": ["name"],
+          "isUnique": true
+        },
+        "idx_ssh_connections_host": {
+          "name": "idx_ssh_connections_host",
+          "columns": ["host"],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "tasks": {
+      "name": "tasks",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "project_id": {
+          "name": "project_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "source_branch": {
+          "name": "source_branch",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "task_branch": {
+          "name": "task_branch",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "linked_issue": {
+          "name": "linked_issue",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "archived_at": {
+          "name": "archived_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "last_interacted_at": {
+          "name": "last_interacted_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "status_changed_at": {
+          "name": "status_changed_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "is_pinned": {
+          "name": "is_pinned",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        }
+      },
+      "indexes": {
+        "idx_tasks_project_id": {
+          "name": "idx_tasks_project_id",
+          "columns": ["project_id"],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "tasks_project_id_projects_id_fk": {
+          "name": "tasks_project_id_projects_id_fk",
+          "tableFrom": "tasks",
+          "tableTo": "projects",
+          "columnsFrom": ["project_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "terminals": {
+      "name": "terminals",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "project_id": {
+          "name": "project_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "task_id": {
+          "name": "task_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "ssh": {
+          "name": "ssh",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {
+        "idx_terminals_task_id": {
+          "name": "idx_terminals_task_id",
+          "columns": ["task_id"],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "terminals_project_id_projects_id_fk": {
+          "name": "terminals_project_id_projects_id_fk",
+          "tableFrom": "terminals",
+          "tableTo": "projects",
+          "columnsFrom": ["project_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "terminals_task_id_tasks_id_fk": {
+          "name": "terminals_task_id_tasks_id_fk",
+          "tableFrom": "terminals",
+          "tableTo": "tasks",
+          "columnsFrom": ["task_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    }
+  },
+  "enums": {},
+  "_meta": {
+    "schemas": {},
+    "tables": {},
+    "columns": {}
+  },
+  "internal": {
+    "indexes": {}
+  }
+}
diff --git a/drizzle/meta/_journal.json b/drizzle/meta/_journal.json
index ec51ccb786..e9a35926ba 100644
--- a/drizzle/meta/_journal.json
+++ b/drizzle/meta/_journal.json
@@ -5,71 +5,50 @@
     {
       "idx": 0,
       "version": "6",
-      "when": 1761210820918,
-      "tag": "0000_initial",
+      "when": 1776084172070,
+      "tag": "0000_cuddly_scarecrow",
       "breakpoints": true
     },
     {
       "idx": 1,
       "version": "6",
-      "when": 1761240000000,
-      "tag": "0001_add_base_ref_to_projects",
+      "when": 1776180612307,
+      "tag": "0001_skinny_robin_chapel",
       "breakpoints": true
     },
     {
       "idx": 2,
       "version": "6",
-      "when": 1765592430354,
-      "tag": "0002_lyrical_impossible_man",
+      "when": 1776700840315,
+      "tag": "0002_noisy_maestro",
       "breakpoints": true
     },
     {
       "idx": 3,
       "version": "6",
-      "when": 1765592430355,
-      "tag": "0003_add_run_config_status_to_projects",
+      "when": 1776845763296,
+      "tag": "0003_even_vampiro",
       "breakpoints": true
     },
     {
       "idx": 4,
       "version": "6",
-      "when": 1765592430356,
-      "tag": "0004_add_line_comments",
+      "when": 1776862823258,
+      "tag": "0004_material_flatman",
       "breakpoints": true
     },
     {
       "idx": 5,
       "version": "6",
-      "when": 1765592430357,
-      "tag": "0005_add_use_worktree_to_tasks",
+      "when": 1776938559947,
+      "tag": "0005_add_pull_requests",
       "breakpoints": true
     },
     {
       "idx": 6,
       "version": "6",
-      "when": 1765592430358,
-      "tag": "0006_add_multi_chat_support",
-      "breakpoints": true
-    },
-    {
-      "idx": 7,
-      "version": "6",
-      "when": 1765592430359,
-      "tag": "0007_add_is_main_to_conversations",
-      "breakpoints": true
-    },
-    {
-      "idx": 8,
-      "version": "6",
-      "when": 1765592430360,
-      "tag": "0008_add_archived_at_to_tasks",
-      "breakpoints": true
-    },
-    {
-      "idx": 9,
-      "version": "6",
-      "when": 1738857600000,
-      "tag": "0009_add_ssh_support",
+      "when": 1776959681864,
+      "tag": "0006_bumpy_gamma_corps",
       "breakpoints": true
     }
   ]
diff --git a/electron-builder.config.ts b/electron-builder.config.ts
new file mode 100644
index 0000000000..eac59f3fb7
--- /dev/null
+++ b/electron-builder.config.ts
@@ -0,0 +1,79 @@
+import type { Configuration } from 'electron-builder';
+import {
+  APP_ID,
+  ARTIFACT_PREFIX,
+  PRODUCT_NAME,
+  R2_BASE_URL,
+  UPDATE_CHANNEL,
+} from './src/shared/app-identity';
+
+const config: Configuration = {
+  appId: APP_ID,
+  productName: PRODUCT_NAME,
+  directories: { output: 'release' },
+  artifactName: `${ARTIFACT_PREFIX}-\${arch}.\${ext}`,
+  publish: [
+    {
+      provider: 'generic',
+      url: R2_BASE_URL,
+      channel: UPDATE_CHANNEL,
+    },
+  ],
+  generateUpdatesFilesForAllChannels: false,
+  files: ['out/**/*', 'node_modules/**/*', 'drizzle/**/*'],
+  asarUnpack: [
+    'node_modules/better-sqlite3/**',
+    'node_modules/node-pty/**',
+    'node_modules/@parcel/watcher/**',
+    '**/*.node',
+  ],
+  mac: {
+    category: 'public.app-category.developer-tools',
+    hardenedRuntime: true,
+    entitlements: 'build/entitlements.mac.plist',
+    entitlementsInherit: 'build/entitlements.mac.plist',
+    target: [
+      { target: 'dmg', arch: ['arm64'] },
+      { target: 'zip', arch: ['arm64'] },
+    ],
+    icon: 'src/assets/images/emdash/emdash-beta.icns',
+    notarize: false,
+  },
+  dmg: {
+    icon: 'src/assets/images/emdash/emdash-beta.icns',
+  },
+  linux: {
+    category: 'Development',
+    target: [
+      { target: 'AppImage', arch: ['x64'] },
+      { target: 'deb', arch: ['x64'] },
+      { target: 'rpm', arch: ['x64'] },
+    ],
+  },
+  win: {
+    icon: 'src/assets/images/emdash/app-icon-beta.png',
+    target: [
+      { target: 'nsis', arch: ['x64'] },
+      { target: 'msi', arch: ['x64'] },
+    ],
+    azureSignOptions: {
+      publisherName: 'General Action, Inc.',
+      endpoint: 'https://eus.codesigning.azure.net/',
+      certificateProfileName: 'emdash-public',
+      codeSigningAccountName: 'emdash',
+    },
+  },
+  msi: {
+    oneClick: false,
+    perMachine: false,
+  },
+  nsis: {
+    differentialPackage: true,
+    oneClick: false,
+    allowToChangeInstallationDirectory: true,
+    perMachine: false,
+  },
+  npmRebuild: false,
+};
+
+export default config;
diff --git a/electron.vite.config.ts b/electron.vite.config.ts
new file mode 100644
index 0000000000..dc59a84d79
--- /dev/null
+++ b/electron.vite.config.ts
@@ -0,0 +1,43 @@
+import { resolve } from 'node:path';
+import tailwindcss from '@tailwindcss/vite';
+import react from '@vitejs/plugin-react';
+import { defineConfig } from 'electron-vite';
+
+export default defineConfig({
+  main: {
+    root: 'src/main',
+    envDir: resolve('.'),
+    resolve: {
+      alias: {
+        '@': resolve('src'),
+        '@main': resolve('src/main'),
+        '@shared': resolve('src/shared'),
+        '@root': resolve('.'),
+      },
+    },
+  },
+  preload: {
+    root: 'src/preload',
+    resolve: {
+      alias: {
+        '@shared': resolve('src/shared'),
+        '@root': resolve('.'),
+      },
+    },
+  },
+  renderer: {
+    root: 'src/renderer',
+    plugins: [react(), tailwindcss()],
+    resolve: {
+      alias: {
+        '@': resolve('src'),
+        '@renderer': resolve('src/renderer'),
+        '@shared': resolve('src/shared'),
+        '@root': resolve('.'),
+      },
+    },
+    server: {
+      port: 3000,
+    },
+  },
+});
diff --git a/package.json b/package.json
index ad41012e91..39fb53662e 100644
--- a/package.json
+++ b/package.json
@@ -1,30 +1,37 @@
 {
   "name": "emdash",
-  "version": "0.4.25",
+  "version": "1.1.3",
   "description": "A cross-platform Electron app that orchestrates multiple coding agents in parallel",
-  "main": "dist/main/main/entry.js",
+  "type": "module",
+  "main": "./out/main/index.js",
   "packageManager": "pnpm@10.28.2",
   "scripts": {
     "d": "pnpm install && pnpm run dev",
-    "dev": "concurrently \"pnpm run dev:main\" \"pnpm run dev:renderer\"",
-    "dev:main": "tsc -p tsconfig.main.json && node scripts/copy-main-assets.cjs && electron dist/main/main/entry.js --dev",
-    "dev:renderer": "vite",
+    "dev": "electron-vite dev",
+    "dev:debug": "VITE_LOG_LEVEL=debug electron-vite dev",
+    "dev:main": "electron-vite dev --watch main",
+    "dev:renderer": "electron-vite dev --watch renderer",
+    "db:generate": "drizzle-kit generate",
+    "db:reset": "pnpm run db:reset:3 && pnpm run db:reset:4",
+    "db:reset:3": "rm -f \"$HOME/Library/Application Support/emdash/emdash3.db\" \"$HOME/Library/Application Support/emdash/emdash3.db-wal\" \"$HOME/Library/Application Support/emdash/emdash3.db-shm\" \"$HOME/.config/emdash/emdash3.db\" \"$HOME/.config/emdash/emdash3.db-wal\" \"$HOME/.config/emdash/emdash3.db-shm\"",
+    "db:reset:4": "rm -f \"$HOME/Library/Application Support/emdash/emdash4.db\" \"$HOME/Library/Application Support/emdash/emdash4.db-wal\" \"$HOME/Library/Application Support/emdash/emdash4.db-shm\" \"$HOME/.config/emdash/emdash4.db\" \"$HOME/.config/emdash/emdash4.db-wal\" \"$HOME/.config/emdash/emdash4.db-shm\"",
     "test": "vitest run",
-    "build": "pnpm run build:main && pnpm run build:renderer",
-    "build:main": "tsc -p tsconfig.main.json && node scripts/copy-main-assets.cjs",
-    "build:renderer": "vite build",
-    "package": "pnpm run build && electron-builder",
-    "package:mac": "pnpm run build && electron-builder --mac",
-    "package:linux": "pnpm run build && electron-builder --linux --publish never",
-    "package:win": "pnpm run build && electron-builder --win --publish never",
-    "postinstall": "node scripts/postinstall.cjs",
-    "rebuild": "electron-rebuild -f -v 30.5.1 --only=sqlite3,node-pty,keytar",
-    "clean": "node scripts/clean.cjs",
+    "build": "electron-vite build",
+    "build:main": "electron-vite build --filter main",
+    "build:renderer": "electron-vite build --filter renderer",
+    "package": "pnpm run build && electron-builder --config electron-builder.config.ts",
+    "package:mac": "pnpm run build && electron-builder --mac --config electron-builder.config.ts",
+    "package:linux": "pnpm run build && electron-builder --linux --publish never --config electron-builder.config.ts",
+    "package:win": "pnpm run build && electron-builder --win --publish never --config electron-builder.config.ts",
+    "postinstall": "node --experimental-strip-types scripts/postinstall.ts",
+    "rebuild": "electron-rebuild -f -v 40.7.0 --only=better-sqlite3,node-pty",
+    "run:docker-ssh": "docker compose up --build -d",
+    "clean": "rm -rf node_modules dist",
     "reset": "pnpm run clean && pnpm install",
     "lint": "eslint . --ext .ts,.tsx",
     "format": "prettier --write .",
     "format:check": "prettier --check .",
-    "type-check": "tsc --noEmit",
+    "typecheck": "tsc --noEmit && tsc --noEmit -p scripts/release/tsconfig.json",
     "docs": "cd docs && pnpm run dev",
     "docs:build": "cd docs && pnpm run build",
     "prepare": "husky"
@@ -41,40 +48,58 @@
     "email": "support@emdash.sh"
   },
   "engines": {
-    "node": ">=20.0.0 <23.0.0",
+    "node": ">=24.0.0",
     "pnpm": ">=10.28.0"
   },
   "devDependencies": {
     "@electron/rebuild": "^4.0.1",
+    "@ianvs/prettier-plugin-sort-imports": "^4.7.1",
+    "@tailwindcss/vite": "^4.2.1",
     "@types/node": "^20.10.0",
-    "@types/react": "^18.2.45",
-    "@types/react-dom": "^18.2.18",
+    "@types/react": "^19.0.0",
+    "@types/react-dom": "^19.0.0",
     "@types/react-syntax-highlighter": "^15.5.13",
     "@typescript-eslint/eslint-plugin": "^6.14.0",
     "@typescript-eslint/parser": "^6.14.0",
     "@vitejs/plugin-react": "^4.7.0",
-    "autoprefixer": "^10.4.16",
-    "better-sqlite3": "^12.6.0",
+    "@vitest/browser": "^4.1.0",
+    "@vitest/browser-playwright": "^4.1.0",
+    "@vitest/browser-preview": "^4.1.0",
     "concurrently": "^8.2.2",
     "drizzle-kit": "^0.24.2",
-    "electron": "^30.5.1",
-    "electron-builder": "^26.0.12",
+    "electron": "^40.7.0",
+    "electron-builder": "^26.8.1",
+    "electron-vite": "^5.0.0",
     "eslint": "^8.55.0",
     "eslint-plugin-import": "^2.32.0",
     "eslint-plugin-react-hooks": "^7.0.0",
     "husky": "^9.1.7",
+    "jsdom": "^29.0.2",
     "lint-staged": "^16.3.0",
     "postcss": "^8.4.32",
     "prettier": "3.6.2",
     "prettier-plugin-tailwindcss": "^0.6.14",
-    "tailwindcss": "^3.3.6",
-    "typescript": "^5.3.3",
-    "vite": "^5.0.10",
-    "vitest": "^3.2.4"
+    "s3mini": "^0.9.4",
+    "tailwindcss": "^4.2.1",
+    "typescript": "^6.0.2",
+    "vite": "^6.4.1",
+    "vitest": "^4.1.0",
+    "vitest-browser-react": "^2.1.0"
   },
   "dependencies": {
+    "@base-ui/react": "^1.3.0",
+    "@dnd-kit/core": "^6.3.1",
+    "@dnd-kit/react": "^0.3.2",
+    "@dnd-kit/sortable": "^10.0.0",
+    "@dnd-kit/utilities": "^3.2.2",
+    "@gitbeaker/rest": "^43.8.0",
     "@isaacs/brace-expansion": "^5.0.1",
+    "@linear/sdk": "^77.0.0",
+    "@llamaduck/forgejo-ts": "^14.0.3",
     "@monaco-editor/react": "^4.7.0",
+    "@octokit/auth-oauth-device": "^8.0.3",
+    "@octokit/rest": "^22.0.1",
+    "@parcel/watcher": "^2.5.6",
     "@radix-ui/react-accordion": "^1.2.12",
     "@radix-ui/react-alert-dialog": "^1.1.15",
     "@radix-ui/react-checkbox": "^1.3.3",
@@ -91,171 +116,73 @@
     "@radix-ui/react-slot": "^1.2.3",
     "@radix-ui/react-switch": "^1.2.6",
     "@radix-ui/react-toast": "^1.2.15",
+    "@radix-ui/react-toggle": "^1.1.10",
+    "@radix-ui/react-toggle-group": "^1.1.11",
     "@radix-ui/react-tooltip": "^1.2.8",
     "@radix-ui/react-use-controllable-state": "^1.2.2",
+    "@tanstack/react-form": "^1.28.4",
+    "@tanstack/react-hotkeys": "^0.4.1",
     "@tanstack/react-query": "^5.90.21",
+    "@tanstack/react-virtual": "^3.13.23",
+    "@team-plain/graphql": "^1.0.1",
+    "@types/better-sqlite3": "^7.6.13",
     "@types/react-window": "^1.8.8",
-    "@types/sqlite3": "^3.1.11",
     "@types/ssh2": "^1.15.5",
+    "@xterm/addon-canvas": "^0.7.0",
     "@xterm/addon-fit": "^0.11.0",
-    "@xterm/addon-serialize": "^0.14.0",
     "@xterm/addon-web-links": "^0.12.0",
-    "@xterm/addon-webgl": "^0.19.0",
     "@xterm/xterm": "^6.0.0",
+    "allotment": "^1.20.5",
+    "better-sqlite3": "^12.6.0",
+    "chokidar": "^5.0.0",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
     "cmdk": "^1.1.1",
-    "dotenv": "^17.2.3",
+    "date-fns": "^4.1.0",
+    "devicon": "^2.17.0",
     "drizzle-orm": "^0.32.1",
     "electron-updater": "^6.3.9",
     "fix-path": "^4.0.0",
     "framer-motion": "^12.33.0",
+    "glob": "^13.0.6",
     "human-id": "^4.1.2",
     "ignore": "^5.3.1",
-    "keytar": "^7.9.0",
+    "jsonc-parser": "^3.3.1",
     "lucide-react": "^0.564.0",
     "minimatch": "^10.1.1",
+    "mobx": "^6.15.0",
+    "mobx-react-lite": "^4.1.1",
     "monaco-editor": "^0.55.1",
     "motion": "^12.23.12",
     "nbranch": "^0.1.0",
-    "node-pty": "1.0.0",
+    "node-pty": "1.1.0",
     "posthog-js": "^1.297.2",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
+    "react": "^19.2.0",
+    "react-dom": "^19.2.0",
     "react-icons": "^5.5.0",
     "react-markdown": "^10.1.0",
-    "react-resizable-panels": "^3.0.6",
+    "react-resizable-panels": "^4.7.3",
     "react-syntax-highlighter": "^15.6.6",
     "react-window": "^2.2.4",
     "rehype-raw": "^7.0.0",
     "rehype-sanitize": "^6.0.0",
     "remark-gfm": "^4.0.1",
-    "sqlite3": "^5.1.7",
+    "smol-toml": "^1.6.0",
+    "sonner": "^2.0.7",
     "ssh2": "^1.17.0",
     "streamdown": "^1.3.0",
     "tailwind-merge": "^2.6.0",
-    "tailwindcss-animate": "^1.0.7",
-    "tsconfig-paths": "^3.15.0"
-  },
-  "build": {
-    "appId": "com.emdash",
-    "productName": "Emdash",
-    "directories": {
-      "output": "release"
-    },
-    "artifactName": "emdash-${arch}.${ext}",
-    "publish": [
-      {
-        "provider": "github",
-        "owner": "generalaction",
-        "repo": "emdash",
-        "releaseType": "release"
-      }
-    ],
-    "generateUpdatesFilesForAllChannels": true,
-    "files": [
-      "dist/**/*",
-      "node_modules/**/*",
-      "drizzle/**/*"
-    ],
-    "asarUnpack": [
-      "node_modules/sqlite3/**",
-      "node_modules/node-pty/**",
-      "node_modules/keytar/**",
-      "**/*.node"
-    ],
-    "mac": {
-      "category": "public.app-category.developer-tools",
-      "hardenedRuntime": true,
-      "entitlements": "build/entitlements.mac.plist",
-      "entitlementsInherit": "build/entitlements.mac.plist",
-      "target": [
-        {
-          "target": "dmg",
-          "arch": [
-            "arm64"
-          ]
-        },
-        {
-          "target": "zip",
-          "arch": [
-            "arm64"
-          ]
-        }
-      ],
-      "icon": "src/assets/images/emdash/emdash.icns",
-      "notarize": false
-    },
-    "dmg": {
-      "icon": "src/assets/images/emdash/emdash.icns"
-    },
-    "linux": {
-      "category": "Development",
-      "target": [
-        {
-          "target": "AppImage",
-          "arch": [
-            "x64"
-          ]
-        },
-        {
-          "target": "deb",
-          "arch": [
-            "x64"
-          ]
-        },
-        {
-          "target": "rpm",
-          "arch": [
-            "x64"
-          ]
-        }
-      ]
-    },
-    "win": {
-      "icon": "src/assets/images/emdash/icon-light.png",
-      "target": [
-        {
-          "target": "nsis",
-          "arch": [
-            "x64"
-          ]
-        },
-        {
-          "target": "msi",
-          "arch": [
-            "x64"
-          ]
-        }
-      ],
-      "azureSignOptions": {
-        "publisherName": "General Action, Inc.",
-        "endpoint": "https://eus.codesigning.azure.net/",
-        "certificateProfileName": "emdash-public",
-        "codeSigningAccountName": "emdash"
-      }
-    },
-    "msi": {
-      "oneClick": false,
-      "perMachine": false
-    },
-    "nsis": {
-      "differentialPackage": true,
-      "oneClick": false,
-      "allowToChangeInstallationDirectory": true,
-      "perMachine": false
-    },
-    "npmRebuild": false
+    "tsconfig-paths": "^3.15.0",
+    "tw-animate-css": "^1.4.0",
+    "zod": "^4.3.6"
   },
   "pnpm": {
     "onlyBuiltDependencies": [
-      "sqlite3",
+      "better-sqlite3",
       "node-pty",
-      "keytar",
       "electron"
     ],
     "ignoredBuiltDependencies": [
-      "better-sqlite3",
       "core-js",
       "cpu-features",
       "esbuild",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index ea650ed58a..81a1ef8aba 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -8,93 +8,150 @@ importers:
 
   .:
     dependencies:
+      '@base-ui/react':
+        specifier: ^1.3.0
+        version: 1.3.0(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      '@dnd-kit/core':
+        specifier: ^6.3.1
+        version: 6.3.1(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      '@dnd-kit/react':
+        specifier: ^0.3.2
+        version: 0.3.2(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      '@dnd-kit/sortable':
+        specifier: ^10.0.0
+        version: 10.0.0(@dnd-kit/core@6.3.1(react-dom@19.2.4(react@19.2.4))(react@19.2.4))(react@19.2.4)
+      '@dnd-kit/utilities':
+        specifier: ^3.2.2
+        version: 3.2.2(react@19.2.4)
+      '@gitbeaker/rest':
+        specifier: ^43.8.0
+        version: 43.8.0
       '@isaacs/brace-expansion':
         specifier: ^5.0.1
         version: 5.0.1
+      '@linear/sdk':
+        specifier: ^77.0.0
+        version: 77.0.0(graphql@16.13.1)
+      '@llamaduck/forgejo-ts':
+        specifier: ^14.0.3
+        version: 14.0.3
       '@monaco-editor/react':
         specifier: ^4.7.0
-        version: 4.7.0(monaco-editor@0.55.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+        version: 4.7.0(monaco-editor@0.55.1)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      '@octokit/auth-oauth-device':
+        specifier: ^8.0.3
+        version: 8.0.3
+      '@octokit/rest':
+        specifier: ^22.0.1
+        version: 22.0.1
+      '@parcel/watcher':
+        specifier: ^2.5.6
+        version: 2.5.6
       '@radix-ui/react-accordion':
         specifier: ^1.2.12
-        version: 1.2.12(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+        version: 1.2.12(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
       '@radix-ui/react-alert-dialog':
         specifier: ^1.1.15
-        version: 1.1.15(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+        version: 1.1.15(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
       '@radix-ui/react-checkbox':
         specifier: ^1.3.3
-        version: 1.3.3(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+        version: 1.3.3(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
       '@radix-ui/react-collapsible':
         specifier: ^1.1.12
-        version: 1.1.12(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+        version: 1.1.12(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
       '@radix-ui/react-context-menu':
         specifier: ^2.2.16
-        version: 2.2.16(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+        version: 2.2.16(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
       '@radix-ui/react-dialog':
         specifier: ^1.1.15
-        version: 1.1.15(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+        version: 1.1.15(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
       '@radix-ui/react-label':
         specifier: ^2.1.8
-        version: 2.1.8(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+        version: 2.1.8(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
       '@radix-ui/react-popover':
         specifier: ^1.1.15
-        version: 1.1.15(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+        version: 1.1.15(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
       '@radix-ui/react-progress':
         specifier: ^1.1.8
-        version: 1.1.8(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+        version: 1.1.8(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
       '@radix-ui/react-radio-group':
         specifier: ^1.3.8
-        version: 1.3.8(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+        version: 1.3.8(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
       '@radix-ui/react-scroll-area':
         specifier: ^1.2.10
-        version: 1.2.10(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+        version: 1.2.10(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
       '@radix-ui/react-select':
         specifier: ^2.2.6
-        version: 2.2.6(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+        version: 2.2.6(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
       '@radix-ui/react-separator':
         specifier: ^1.1.7
-        version: 1.1.8(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+        version: 1.1.8(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
       '@radix-ui/react-slot':
         specifier: ^1.2.3
-        version: 1.2.4(@types/react@18.3.28)(react@18.3.1)
+        version: 1.2.4(@types/react@19.2.14)(react@19.2.4)
       '@radix-ui/react-switch':
         specifier: ^1.2.6
-        version: 1.2.6(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+        version: 1.2.6(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
       '@radix-ui/react-toast':
         specifier: ^1.2.15
-        version: 1.2.15(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+        version: 1.2.15(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      '@radix-ui/react-toggle':
+        specifier: ^1.1.10
+        version: 1.1.10(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      '@radix-ui/react-toggle-group':
+        specifier: ^1.1.11
+        version: 1.1.11(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
       '@radix-ui/react-tooltip':
         specifier: ^1.2.8
-        version: 1.2.8(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+        version: 1.2.8(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
       '@radix-ui/react-use-controllable-state':
         specifier: ^1.2.2
-        version: 1.2.2(@types/react@18.3.28)(react@18.3.1)
+        version: 1.2.2(@types/react@19.2.14)(react@19.2.4)
+      '@tanstack/react-form':
+        specifier: ^1.28.4
+        version: 1.28.4(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      '@tanstack/react-hotkeys':
+        specifier: ^0.4.1
+        version: 0.4.1(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
       '@tanstack/react-query':
         specifier: ^5.90.21
-        version: 5.90.21(react@18.3.1)
+        version: 5.90.21(react@19.2.4)
+      '@tanstack/react-virtual':
+        specifier: ^3.13.23
+        version: 3.13.23(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      '@team-plain/graphql':
+        specifier: ^1.0.1
+        version: 1.0.1
+      '@types/better-sqlite3':
+        specifier: ^7.6.13
+        version: 7.6.13
       '@types/react-window':
         specifier: ^1.8.8
         version: 1.8.8
-      '@types/sqlite3':
-        specifier: ^3.1.11
-        version: 3.1.11
       '@types/ssh2':
         specifier: ^1.15.5
         version: 1.15.5
+      '@xterm/addon-canvas':
+        specifier: ^0.7.0
+        version: 0.7.0(@xterm/xterm@6.0.0)
       '@xterm/addon-fit':
         specifier: ^0.11.0
         version: 0.11.0
-      '@xterm/addon-serialize':
-        specifier: ^0.14.0
-        version: 0.14.0
       '@xterm/addon-web-links':
         specifier: ^0.12.0
         version: 0.12.0
-      '@xterm/addon-webgl':
-        specifier: ^0.19.0
-        version: 0.19.0
       '@xterm/xterm':
         specifier: ^6.0.0
         version: 6.0.0
+      allotment:
+        specifier: ^1.20.5
+        version: 1.20.5(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      better-sqlite3:
+        specifier: ^12.6.0
+        version: 12.6.2
+      chokidar:
+        specifier: ^5.0.0
+        version: 5.0.0
       class-variance-authority:
         specifier: ^0.7.1
         version: 0.7.1
@@ -103,13 +160,16 @@ importers:
         version: 2.1.1
       cmdk:
         specifier: ^1.1.1
-        version: 1.1.1(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      dotenv:
-        specifier: ^17.2.3
-        version: 17.2.4
+        version: 1.1.1(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      date-fns:
+        specifier: ^4.1.0
+        version: 4.1.0
+      devicon:
+        specifier: ^2.17.0
+        version: 2.17.0
       drizzle-orm:
         specifier: ^0.32.1
-        version: 0.32.2(@opentelemetry/api@1.9.0)(@types/react@18.3.28)(better-sqlite3@12.6.2)(react@18.3.1)(sqlite3@5.1.7)
+        version: 0.32.2(@opentelemetry/api@1.9.0)(@types/better-sqlite3@7.6.13)(@types/react@19.2.14)(better-sqlite3@12.6.2)(react@19.2.4)(sqlite3@5.1.7)
       electron-updater:
         specifier: ^6.3.9
         version: 6.7.3
@@ -118,58 +178,67 @@ importers:
         version: 4.0.0
       framer-motion:
         specifier: ^12.33.0
-        version: 12.33.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+        version: 12.33.0(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      glob:
+        specifier: ^13.0.6
+        version: 13.0.6
       human-id:
         specifier: ^4.1.2
         version: 4.1.3
       ignore:
         specifier: ^5.3.1
         version: 5.3.2
-      keytar:
-        specifier: ^7.9.0
-        version: 7.9.0
+      jsonc-parser:
+        specifier: ^3.3.1
+        version: 3.3.1
       lucide-react:
         specifier: ^0.564.0
-        version: 0.564.0(react@18.3.1)
+        version: 0.564.0(react@19.2.4)
       minimatch:
         specifier: ^10.1.1
         version: 10.1.2
+      mobx:
+        specifier: ^6.15.0
+        version: 6.15.0
+      mobx-react-lite:
+        specifier: ^4.1.1
+        version: 4.1.1(mobx@6.15.0)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
       monaco-editor:
         specifier: ^0.55.1
         version: 0.55.1
       motion:
         specifier: ^12.23.12
-        version: 12.33.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+        version: 12.33.0(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
       nbranch:
         specifier: ^0.1.0
         version: 0.1.0
       node-pty:
-        specifier: 1.0.0
-        version: 1.0.0
+        specifier: 1.1.0
+        version: 1.1.0
       posthog-js:
         specifier: ^1.297.2
         version: 1.342.1
       react:
-        specifier: ^18.2.0
-        version: 18.3.1
+        specifier: ^19.2.0
+        version: 19.2.4
       react-dom:
-        specifier: ^18.2.0
-        version: 18.3.1(react@18.3.1)
+        specifier: ^19.2.0
+        version: 19.2.4(react@19.2.4)
       react-icons:
         specifier: ^5.5.0
-        version: 5.5.0(react@18.3.1)
+        version: 5.5.0(react@19.2.4)
       react-markdown:
         specifier: ^10.1.0
-        version: 10.1.0(@types/react@18.3.28)(react@18.3.1)
+        version: 10.1.0(@types/react@19.2.14)(react@19.2.4)
       react-resizable-panels:
-        specifier: ^3.0.6
-        version: 3.0.6(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+        specifier: ^4.7.3
+        version: 4.7.3(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
       react-syntax-highlighter:
         specifier: ^15.6.6
-        version: 15.6.6(react@18.3.1)
+        version: 15.6.6(react@19.2.4)
       react-window:
         specifier: ^2.2.4
-        version: 2.2.6(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+        version: 2.2.6(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
       rehype-raw:
         specifier: ^7.0.0
         version: 7.0.0
@@ -179,55 +248,70 @@ importers:
       remark-gfm:
         specifier: ^4.0.1
         version: 4.0.1
-      sqlite3:
-        specifier: ^5.1.7
-        version: 5.1.7
+      smol-toml:
+        specifier: ^1.6.0
+        version: 1.6.0
+      sonner:
+        specifier: ^2.0.7
+        version: 2.0.7(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
       ssh2:
         specifier: ^1.17.0
         version: 1.17.0
       streamdown:
         specifier: ^1.3.0
-        version: 1.6.11(@types/mdast@4.0.4)(micromark-util-types@2.0.2)(micromark@4.0.2)(react@18.3.1)
+        version: 1.6.11(@types/mdast@4.0.4)(micromark-util-types@2.0.2)(micromark@4.0.2)(react@19.2.4)
       tailwind-merge:
         specifier: ^2.6.0
         version: 2.6.1
-      tailwindcss-animate:
-        specifier: ^1.0.7
-        version: 1.0.7(tailwindcss@3.4.19(yaml@2.8.2))
       tsconfig-paths:
         specifier: ^3.15.0
         version: 3.15.0
+      tw-animate-css:
+        specifier: ^1.4.0
+        version: 1.4.0
+      zod:
+        specifier: ^4.3.6
+        version: 4.3.6
     devDependencies:
       '@electron/rebuild':
         specifier: ^4.0.1
         version: 4.0.3
+      '@ianvs/prettier-plugin-sort-imports':
+        specifier: ^4.7.1
+        version: 4.7.1(prettier@3.6.2)
+      '@tailwindcss/vite':
+        specifier: ^4.2.1
+        version: 4.2.1(vite@6.4.1(@types/node@20.19.32)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.8.2))
       '@types/node':
         specifier: ^20.10.0
         version: 20.19.32
       '@types/react':
-        specifier: ^18.2.45
-        version: 18.3.28
+        specifier: ^19.0.0
+        version: 19.2.14
       '@types/react-dom':
-        specifier: ^18.2.18
-        version: 18.3.7(@types/react@18.3.28)
+        specifier: ^19.0.0
+        version: 19.2.3(@types/react@19.2.14)
       '@types/react-syntax-highlighter':
         specifier: ^15.5.13
         version: 15.5.13
       '@typescript-eslint/eslint-plugin':
         specifier: ^6.14.0
-        version: 6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.9.3))(eslint@8.57.1)(typescript@5.9.3)
+        version: 6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@6.0.2))(eslint@8.57.1)(typescript@6.0.2)
       '@typescript-eslint/parser':
         specifier: ^6.14.0
-        version: 6.21.0(eslint@8.57.1)(typescript@5.9.3)
+        version: 6.21.0(eslint@8.57.1)(typescript@6.0.2)
       '@vitejs/plugin-react':
         specifier: ^4.7.0
-        version: 4.7.0(vite@5.4.21(@types/node@20.19.32))
-      autoprefixer:
-        specifier: ^10.4.16
-        version: 10.4.24(postcss@8.5.6)
-      better-sqlite3:
-        specifier: ^12.6.0
-        version: 12.6.2
+        version: 4.7.0(vite@6.4.1(@types/node@20.19.32)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.8.2))
+      '@vitest/browser':
+        specifier: ^4.1.0
+        version: 4.1.0(vite@6.4.1(@types/node@20.19.32)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.8.2))(vitest@4.1.0)
+      '@vitest/browser-playwright':
+        specifier: ^4.1.0
+        version: 4.1.0(playwright@1.58.2)(vite@6.4.1(@types/node@20.19.32)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.8.2))(vitest@4.1.0)
+      '@vitest/browser-preview':
+        specifier: ^4.1.0
+        version: 4.1.0(vite@6.4.1(@types/node@20.19.32)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.8.2))(vitest@4.1.0)
       concurrently:
         specifier: ^8.2.2
         version: 8.2.2
@@ -235,23 +319,29 @@ importers:
         specifier: ^0.24.2
         version: 0.24.2
       electron:
-        specifier: ^30.5.1
-        version: 30.5.1
+        specifier: ^40.7.0
+        version: 40.7.0
       electron-builder:
-        specifier: ^26.0.12
+        specifier: ^26.8.1
         version: 26.8.1(electron-builder-squirrel-windows@24.13.3)
+      electron-vite:
+        specifier: ^5.0.0
+        version: 5.0.0(vite@6.4.1(@types/node@20.19.32)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.8.2))
       eslint:
         specifier: ^8.55.0
         version: 8.57.1
       eslint-plugin-import:
         specifier: ^2.32.0
-        version: 2.32.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.9.3))(eslint@8.57.1)
+        version: 2.32.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@6.0.2))(eslint@8.57.1)
       eslint-plugin-react-hooks:
         specifier: ^7.0.0
         version: 7.0.1(eslint@8.57.1)
       husky:
         specifier: ^9.1.7
         version: 9.1.7
+      jsdom:
+        specifier: ^29.0.2
+        version: 29.0.2
       lint-staged:
         specifier: ^16.3.0
         version: 16.3.0
@@ -263,32 +353,49 @@ importers:
         version: 3.6.2
       prettier-plugin-tailwindcss:
         specifier: ^0.6.14
-        version: 0.6.14(prettier@3.6.2)
+        version: 0.6.14(@ianvs/prettier-plugin-sort-imports@4.7.1(prettier@3.6.2))(prettier@3.6.2)
+      s3mini:
+        specifier: ^0.9.4
+        version: 0.9.4
       tailwindcss:
-        specifier: ^3.3.6
-        version: 3.4.19(yaml@2.8.2)
+        specifier: ^4.2.1
+        version: 4.2.1
       typescript:
-        specifier: ^5.3.3
-        version: 5.9.3
+        specifier: ^6.0.2
+        version: 6.0.2
       vite:
-        specifier: ^5.0.10
-        version: 5.4.21(@types/node@20.19.32)
+        specifier: ^6.4.1
+        version: 6.4.1(@types/node@20.19.32)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.8.2)
       vitest:
-        specifier: ^3.2.4
-        version: 3.2.4(@types/debug@4.1.12)(@types/node@20.19.32)
+        specifier: ^4.1.0
+        version: 4.1.0(@opentelemetry/api@1.9.0)(@types/node@20.19.32)(@vitest/browser-playwright@4.1.0)(@vitest/browser-preview@4.1.0)(jsdom@29.0.2)(vite@6.4.1(@types/node@20.19.32)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.8.2))
+      vitest-browser-react:
+        specifier: ^2.1.0
+        version: 2.1.0(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(vitest@4.1.0)
 
 packages:
 
   7zip-bin@5.2.0:
     resolution: {integrity: sha512-ukTPVhqG4jNzMro2qA9HSCSSVJN3aN7tlb+hfqYCt3ER0yWroeA2VR38MNrOHLQ/cVj+DaIMad0kFCtWWowh/A==}
 
-  '@alloc/quick-lru@5.2.0':
-    resolution: {integrity: sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw==}
-    engines: {node: '>=10'}
-
   '@antfu/install-pkg@1.1.0':
     resolution: {integrity: sha512-MGQsmw10ZyI+EJo45CdSER4zEb+p31LpDAFp2Z3gkSd1yqVZGi0Ebx++YTEMonJy4oChEMLsxZ64j8FH6sSqtQ==}
 
+  '@asamuzakjp/css-color@5.1.11':
+    resolution: {integrity: sha512-KVw6qIiCTUQhByfTd78h2yD1/00waTmm9uy/R7Ck/ctUyAPj+AEDLkQIdJW0T8+qGgj3j5bpNKK7Q3G+LedJWg==}
+    engines: {node: ^20.19.0 || ^22.12.0 || >=24.0.0}
+
+  '@asamuzakjp/dom-selector@7.1.1':
+    resolution: {integrity: sha512-67RZDnYRc8H/8MLDgQCDE//zoqVFwajkepHZgmXrbwybzXOEwOWGPYGmALYl9J2DOLfFPPs6kKCqmbzV895hTQ==}
+    engines: {node: ^20.19.0 || ^22.12.0 || >=24.0.0}
+
+  '@asamuzakjp/generational-cache@1.0.1':
+    resolution: {integrity: sha512-wajfB8KqzMCN2KGNFdLkReeHncd0AslUSrvHVvvYWuU8ghncRJoA50kT3zP9MVL0+9g4/67H+cdvBskj9THPzg==}
+    engines: {node: ^20.19.0 || ^22.12.0 || >=24.0.0}
+
+  '@asamuzakjp/nwsapi@2.3.9':
+    resolution: {integrity: sha512-n8GuYSrI9bF7FFZ/SjhwevlHc8xaVlb/7HmHelnc/PZXBD2ZR49NnN9sMMuDdEGPeeRQ5d0hqlSlEpgCX3Wl0Q==}
+
   '@babel/code-frame@7.29.0':
     resolution: {integrity: sha512-9NhCeYjq9+3uxgdtp20LSiJXJvN0FeCtNGpJxuMFZ1Kv3cWUNb6DOhJwUvcVCzKGR66cw4njwM6hrJLqgOwbcw==}
     engines: {node: '>=6.9.0'}
@@ -348,6 +455,12 @@ packages:
     engines: {node: '>=6.0.0'}
     hasBin: true
 
+  '@babel/plugin-transform-arrow-functions@7.27.1':
+    resolution: {integrity: sha512-8Z4TGic6xW70FKThA5HYEKKyBpOOsucTOD1DjU3fZxDg+K3zBJcXMFnt/4yQiZnf5+MiOMSXQ9PaEK/Ilh1DeA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
   '@babel/plugin-transform-react-jsx-self@7.27.1':
     resolution: {integrity: sha512-6UzkCs+ejGdZ5mFFC/OCUrv028ab2fp1znZmCZjAOBKiBK2jXD1O+BPSfX8X2qjJ75fZBMSnQn3Rq2mrBJK2mw==}
     engines: {node: '>=6.9.0'}
@@ -376,9 +489,37 @@ packages:
     resolution: {integrity: sha512-LwdZHpScM4Qz8Xw2iKSzS+cfglZzJGvofQICy7W7v4caru4EaAmyUuO6BGrbyQ2mYV11W0U8j5mBhd14dd3B0A==}
     engines: {node: '>=6.9.0'}
 
+  '@base-ui/react@1.3.0':
+    resolution: {integrity: sha512-FwpKqZbPz14AITp1CVgf4AjhKPe1OeeVKSBMdgD10zbFlj3QSWelmtCMLi2+/PFZZcIm3l87G7rwtCZJwHyXWA==}
+    engines: {node: '>=14.0.0'}
+    peerDependencies:
+      '@types/react': ^17 || ^18 || ^19
+      react: ^17 || ^18 || ^19
+      react-dom: ^17 || ^18 || ^19
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
+  '@base-ui/utils@0.2.6':
+    resolution: {integrity: sha512-yQ+qeuqohwhsNpoYDqqXaLllYAkPCP4vYdDrVo8FQXaAPfHWm1pG/Vm+jmGTA5JFS0BAIjookyapuJFY8F9PIw==}
+    peerDependencies:
+      '@types/react': ^17 || ^18 || ^19
+      react: ^17 || ^18 || ^19
+      react-dom: ^17 || ^18 || ^19
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
+  '@blazediff/core@1.9.1':
+    resolution: {integrity: sha512-ehg3jIkYKulZh+8om/O25vkvSsXXwC+skXmyA87FFx6A/45eqOkZsBltMw/TVteb0mloiGT8oGRTcjRAz66zaA==}
+
   '@braintree/sanitize-url@7.1.2':
     resolution: {integrity: sha512-jigsZK+sMF/cuiB7sERuo9V7N9jx+dhmHHnQyDSVdpZwVutaBu7WvNYqMDLSgFgfB30n452TP3vjDAvFC973mA==}
 
+  '@bramus/specificity@2.4.2':
+    resolution: {integrity: sha512-ctxtJ/eA+t+6q2++vj5j7FYX3nRu311q1wfYH3xjlLOsczhlhxAg2FWNUXhpGvAw3BWo1xBcvOV6/YLc2r5FJw==}
+    hasBin: true
+
   '@chevrotain/cst-dts-gen@11.0.3':
     resolution: {integrity: sha512-BvIKpRLeS/8UbfxXxgC33xOumsacaeCKAjAeLyOn7Pcp95HiRbrpl14S+9vaZLolnbssPIUuiUd8IvgkRyt6NQ==}
 
@@ -394,10 +535,89 @@ packages:
   '@chevrotain/utils@11.0.3':
     resolution: {integrity: sha512-YslZMgtJUyuMbZ+aKvfF3x1f5liK4mWNxghFRv7jqRR9C3R3fAOGTTKvxXDa2Y1s9zSbcpuO0cAxDYsc9SrXoQ==}
 
+  '@csstools/color-helpers@6.0.2':
+    resolution: {integrity: sha512-LMGQLS9EuADloEFkcTBR3BwV/CGHV7zyDxVRtVDTwdI2Ca4it0CCVTT9wCkxSgokjE5Ho41hEPgb8OEUwoXr6Q==}
+    engines: {node: '>=20.19.0'}
+
+  '@csstools/css-calc@3.2.0':
+    resolution: {integrity: sha512-bR9e6o2BDB12jzN/gIbjHa5wLJ4UjD1CB9pM7ehlc0ddk6EBz+yYS1EV2MF55/HUxrHcB/hehAyt5vhsA3hx7w==}
+    engines: {node: '>=20.19.0'}
+    peerDependencies:
+      '@csstools/css-parser-algorithms': ^4.0.0
+      '@csstools/css-tokenizer': ^4.0.0
+
+  '@csstools/css-color-parser@4.1.0':
+    resolution: {integrity: sha512-U0KhLYmy2GVj6q4T3WaAe6NPuFYCPQoE3b0dRGxejWDgcPp8TP7S5rVdM5ZrFaqu4N67X8YaPBw14dQSYx3IyQ==}
+    engines: {node: '>=20.19.0'}
+    peerDependencies:
+      '@csstools/css-parser-algorithms': ^4.0.0
+      '@csstools/css-tokenizer': ^4.0.0
+
+  '@csstools/css-parser-algorithms@4.0.0':
+    resolution: {integrity: sha512-+B87qS7fIG3L5h3qwJ/IFbjoVoOe/bpOdh9hAjXbvx0o8ImEmUsGXN0inFOnk2ChCFgqkkGFQ+TpM5rbhkKe4w==}
+    engines: {node: '>=20.19.0'}
+    peerDependencies:
+      '@csstools/css-tokenizer': ^4.0.0
+
+  '@csstools/css-syntax-patches-for-csstree@1.1.3':
+    resolution: {integrity: sha512-SH60bMfrRCJF3morcdk57WklujF4Jr/EsQUzqkarfHXEFcAR1gg7fS/chAE922Sehgzc1/+Tz5H3Ypa1HiEKrg==}
+    peerDependencies:
+      css-tree: ^3.2.1
+    peerDependenciesMeta:
+      css-tree:
+        optional: true
+
+  '@csstools/css-tokenizer@4.0.0':
+    resolution: {integrity: sha512-QxULHAm7cNu72w97JUNCBFODFaXpbDg+dP8b/oWFAZ2MTRppA3U00Y2L1HqaS4J6yBqxwa/Y3nMBaxVKbB/NsA==}
+    engines: {node: '>=20.19.0'}
+
   '@develar/schema-utils@2.6.5':
     resolution: {integrity: sha512-0cp4PsWQ/9avqTVMCtZ+GirikIA36ikvjtHweU4/j8yLtgObI0+JUPhYFScgwlteveGB1rt3Cm8UhN04XayDig==}
     engines: {node: '>= 8.9.0'}
 
+  '@dnd-kit/abstract@0.3.2':
+    resolution: {integrity: sha512-uvPVK+SZYD6Viddn9M0K0JQdXknuVSxA/EbMlFRanve3P/XTc18oLa5zGftKSGjfQGmuzkZ34E26DSbly1zi3Q==}
+
+  '@dnd-kit/accessibility@3.1.1':
+    resolution: {integrity: sha512-2P+YgaXF+gRsIihwwY1gCsQSYnu9Zyj2py8kY5fFvUM1qm2WA2u639R6YNVfU4GWr+ZM5mqEsfHZZLoRONbemw==}
+    peerDependencies:
+      react: '>=16.8.0'
+
+  '@dnd-kit/collision@0.3.2':
+    resolution: {integrity: sha512-pNmNSLCI8S9fNQ7QJ3fBCDjiT0sqBhUFcKgmyYaGvGCAU+kq0AP8OWlh0JSisc9k5mFyxmRpmFQcnJpILz/RPA==}
+
+  '@dnd-kit/core@6.3.1':
+    resolution: {integrity: sha512-xkGBRQQab4RLwgXxoqETICr6S5JlogafbhNsidmrkVv2YRs5MLwpjoF2qpiGjQt8S9AoxtIV603s0GIUpY5eYQ==}
+    peerDependencies:
+      react: '>=16.8.0'
+      react-dom: '>=16.8.0'
+
+  '@dnd-kit/dom@0.3.2':
+    resolution: {integrity: sha512-cIUAVgt2szQyz6JRy7I+0r+xeyOAGH21Y15hb5bIyHoDEaZBvIDH+OOlD9eoLjCbsxDLN9WloU2CBi3OE6LYDg==}
+
+  '@dnd-kit/geometry@0.3.2':
+    resolution: {integrity: sha512-3UBPuIS7E3oGiHxOE8h810QA+0pnrnCtGxl4Os1z3yy5YkC/BEYGY+TxWPTQaY1/OMV7GCX7ZNMlama2QN3n3w==}
+
+  '@dnd-kit/react@0.3.2':
+    resolution: {integrity: sha512-1Opg1xw6I75Z95c+rF2NJa0pdGb8rLAENtuopKtJ1J0PudWlz+P6yL137xy/6DV43uaRmNGtsdbMbR0yRYJ72g==}
+    peerDependencies:
+      react: ^18.0.0 || ^19.0.0
+      react-dom: ^18.0.0 || ^19.0.0
+
+  '@dnd-kit/sortable@10.0.0':
+    resolution: {integrity: sha512-+xqhmIIzvAYMGfBYYnbKuNicfSsk4RksY2XdmJhT+HAC01nix6fHCztU68jooFiMUB01Ky3F0FyOvhG/BZrWkg==}
+    peerDependencies:
+      '@dnd-kit/core': ^6.3.0
+      react: '>=16.8.0'
+
+  '@dnd-kit/state@0.3.2':
+    resolution: {integrity: sha512-dLUIkoYrIJhGXfF2wGLTfb46vUokEsO/OoE21TSfmahYrx7ysTmnwbePsznFaHlwgZhQEh6AlLvthLCeY21b1A==}
+
+  '@dnd-kit/utilities@3.2.2':
+    resolution: {integrity: sha512-+MKAJEOfaBe5SmV6t34p80MMKhjvUz0vRrvVJbPT0WElzaOJ/1xs+D+KDv+tD/NE5ujfrChEcshd4fLn0wpiqg==}
+    peerDependencies:
+      react: '>=16.8.0'
+
   '@drizzle-team/brocli@0.10.2':
     resolution: {integrity: sha512-z33Il7l5dKjUgGULTqBsQBQwckHh5AbIuxhdsIxDDiZAzBOrZO6q9ogcWC65kU382AfynTfgNumVcNIjuIua6w==}
 
@@ -463,9 +683,9 @@ packages:
     cpu: [ppc64]
     os: [aix]
 
-  '@esbuild/aix-ppc64@0.21.5':
-    resolution: {integrity: sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==}
-    engines: {node: '>=12'}
+  '@esbuild/aix-ppc64@0.25.12':
+    resolution: {integrity: sha512-Hhmwd6CInZ3dwpuGTF8fJG6yoWmsToE+vYgD4nytZVxcu1ulHpUQRAB1UJ8+N1Am3Mz4+xOByoQoSZf4D+CpkA==}
+    engines: {node: '>=18'}
     cpu: [ppc64]
     os: [aix]
 
@@ -481,9 +701,9 @@ packages:
     cpu: [arm64]
     os: [android]
 
-  '@esbuild/android-arm64@0.21.5':
-    resolution: {integrity: sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==}
-    engines: {node: '>=12'}
+  '@esbuild/android-arm64@0.25.12':
+    resolution: {integrity: sha512-6AAmLG7zwD1Z159jCKPvAxZd4y/VTO0VkprYy+3N2FtJ8+BQWFXU+OxARIwA46c5tdD9SsKGZ/1ocqBS/gAKHg==}
+    engines: {node: '>=18'}
     cpu: [arm64]
     os: [android]
 
@@ -499,9 +719,9 @@ packages:
     cpu: [arm]
     os: [android]
 
-  '@esbuild/android-arm@0.21.5':
-    resolution: {integrity: sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==}
-    engines: {node: '>=12'}
+  '@esbuild/android-arm@0.25.12':
+    resolution: {integrity: sha512-VJ+sKvNA/GE7Ccacc9Cha7bpS8nyzVv0jdVgwNDaR4gDMC/2TTRc33Ip8qrNYUcpkOHUT5OZ0bUcNNVZQ9RLlg==}
+    engines: {node: '>=18'}
     cpu: [arm]
     os: [android]
 
@@ -517,9 +737,9 @@ packages:
     cpu: [x64]
     os: [android]
 
-  '@esbuild/android-x64@0.21.5':
-    resolution: {integrity: sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==}
-    engines: {node: '>=12'}
+  '@esbuild/android-x64@0.25.12':
+    resolution: {integrity: sha512-5jbb+2hhDHx5phYR2By8GTWEzn6I9UqR11Kwf22iKbNpYrsmRB18aX/9ivc5cabcUiAT/wM+YIZ6SG9QO6a8kg==}
+    engines: {node: '>=18'}
     cpu: [x64]
     os: [android]
 
@@ -535,9 +755,9 @@ packages:
     cpu: [arm64]
     os: [darwin]
 
-  '@esbuild/darwin-arm64@0.21.5':
-    resolution: {integrity: sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==}
-    engines: {node: '>=12'}
+  '@esbuild/darwin-arm64@0.25.12':
+    resolution: {integrity: sha512-N3zl+lxHCifgIlcMUP5016ESkeQjLj/959RxxNYIthIg+CQHInujFuXeWbWMgnTo4cp5XVHqFPmpyu9J65C1Yg==}
+    engines: {node: '>=18'}
     cpu: [arm64]
     os: [darwin]
 
@@ -553,9 +773,9 @@ packages:
     cpu: [x64]
     os: [darwin]
 
-  '@esbuild/darwin-x64@0.21.5':
-    resolution: {integrity: sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==}
-    engines: {node: '>=12'}
+  '@esbuild/darwin-x64@0.25.12':
+    resolution: {integrity: sha512-HQ9ka4Kx21qHXwtlTUVbKJOAnmG1ipXhdWTmNXiPzPfWKpXqASVcWdnf2bnL73wgjNrFXAa3yYvBSd9pzfEIpA==}
+    engines: {node: '>=18'}
     cpu: [x64]
     os: [darwin]
 
@@ -571,9 +791,9 @@ packages:
     cpu: [arm64]
     os: [freebsd]
 
-  '@esbuild/freebsd-arm64@0.21.5':
-    resolution: {integrity: sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==}
-    engines: {node: '>=12'}
+  '@esbuild/freebsd-arm64@0.25.12':
+    resolution: {integrity: sha512-gA0Bx759+7Jve03K1S0vkOu5Lg/85dou3EseOGUes8flVOGxbhDDh/iZaoek11Y8mtyKPGF3vP8XhnkDEAmzeg==}
+    engines: {node: '>=18'}
     cpu: [arm64]
     os: [freebsd]
 
@@ -589,9 +809,9 @@ packages:
     cpu: [x64]
     os: [freebsd]
 
-  '@esbuild/freebsd-x64@0.21.5':
-    resolution: {integrity: sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==}
-    engines: {node: '>=12'}
+  '@esbuild/freebsd-x64@0.25.12':
+    resolution: {integrity: sha512-TGbO26Yw2xsHzxtbVFGEXBFH0FRAP7gtcPE7P5yP7wGy7cXK2oO7RyOhL5NLiqTlBh47XhmIUXuGciXEqYFfBQ==}
+    engines: {node: '>=18'}
     cpu: [x64]
     os: [freebsd]
 
@@ -607,9 +827,9 @@ packages:
     cpu: [arm64]
     os: [linux]
 
-  '@esbuild/linux-arm64@0.21.5':
-    resolution: {integrity: sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==}
-    engines: {node: '>=12'}
+  '@esbuild/linux-arm64@0.25.12':
+    resolution: {integrity: sha512-8bwX7a8FghIgrupcxb4aUmYDLp8pX06rGh5HqDT7bB+8Rdells6mHvrFHHW2JAOPZUbnjUpKTLg6ECyzvas2AQ==}
+    engines: {node: '>=18'}
     cpu: [arm64]
     os: [linux]
 
@@ -625,9 +845,9 @@ packages:
     cpu: [arm]
     os: [linux]
 
-  '@esbuild/linux-arm@0.21.5':
-    resolution: {integrity: sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==}
-    engines: {node: '>=12'}
+  '@esbuild/linux-arm@0.25.12':
+    resolution: {integrity: sha512-lPDGyC1JPDou8kGcywY0YILzWlhhnRjdof3UlcoqYmS9El818LLfJJc3PXXgZHrHCAKs/Z2SeZtDJr5MrkxtOw==}
+    engines: {node: '>=18'}
     cpu: [arm]
     os: [linux]
 
@@ -643,9 +863,9 @@ packages:
     cpu: [ia32]
     os: [linux]
 
-  '@esbuild/linux-ia32@0.21.5':
-    resolution: {integrity: sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==}
-    engines: {node: '>=12'}
+  '@esbuild/linux-ia32@0.25.12':
+    resolution: {integrity: sha512-0y9KrdVnbMM2/vG8KfU0byhUN+EFCny9+8g202gYqSSVMonbsCfLjUO+rCci7pM0WBEtz+oK/PIwHkzxkyharA==}
+    engines: {node: '>=18'}
     cpu: [ia32]
     os: [linux]
 
@@ -661,9 +881,9 @@ packages:
     cpu: [loong64]
     os: [linux]
 
-  '@esbuild/linux-loong64@0.21.5':
-    resolution: {integrity: sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==}
-    engines: {node: '>=12'}
+  '@esbuild/linux-loong64@0.25.12':
+    resolution: {integrity: sha512-h///Lr5a9rib/v1GGqXVGzjL4TMvVTv+s1DPoxQdz7l/AYv6LDSxdIwzxkrPW438oUXiDtwM10o9PmwS/6Z0Ng==}
+    engines: {node: '>=18'}
     cpu: [loong64]
     os: [linux]
 
@@ -679,9 +899,9 @@ packages:
     cpu: [mips64el]
     os: [linux]
 
-  '@esbuild/linux-mips64el@0.21.5':
-    resolution: {integrity: sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==}
-    engines: {node: '>=12'}
+  '@esbuild/linux-mips64el@0.25.12':
+    resolution: {integrity: sha512-iyRrM1Pzy9GFMDLsXn1iHUm18nhKnNMWscjmp4+hpafcZjrr2WbT//d20xaGljXDBYHqRcl8HnxbX6uaA/eGVw==}
+    engines: {node: '>=18'}
     cpu: [mips64el]
     os: [linux]
 
@@ -697,9 +917,9 @@ packages:
     cpu: [ppc64]
     os: [linux]
 
-  '@esbuild/linux-ppc64@0.21.5':
-    resolution: {integrity: sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==}
-    engines: {node: '>=12'}
+  '@esbuild/linux-ppc64@0.25.12':
+    resolution: {integrity: sha512-9meM/lRXxMi5PSUqEXRCtVjEZBGwB7P/D4yT8UG/mwIdze2aV4Vo6U5gD3+RsoHXKkHCfSxZKzmDssVlRj1QQA==}
+    engines: {node: '>=18'}
     cpu: [ppc64]
     os: [linux]
 
@@ -715,9 +935,9 @@ packages:
     cpu: [riscv64]
     os: [linux]
 
-  '@esbuild/linux-riscv64@0.21.5':
-    resolution: {integrity: sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==}
-    engines: {node: '>=12'}
+  '@esbuild/linux-riscv64@0.25.12':
+    resolution: {integrity: sha512-Zr7KR4hgKUpWAwb1f3o5ygT04MzqVrGEGXGLnj15YQDJErYu/BGg+wmFlIDOdJp0PmB0lLvxFIOXZgFRrdjR0w==}
+    engines: {node: '>=18'}
     cpu: [riscv64]
     os: [linux]
 
@@ -733,9 +953,9 @@ packages:
     cpu: [s390x]
     os: [linux]
 
-  '@esbuild/linux-s390x@0.21.5':
-    resolution: {integrity: sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==}
-    engines: {node: '>=12'}
+  '@esbuild/linux-s390x@0.25.12':
+    resolution: {integrity: sha512-MsKncOcgTNvdtiISc/jZs/Zf8d0cl/t3gYWX8J9ubBnVOwlk65UIEEvgBORTiljloIWnBzLs4qhzPkJcitIzIg==}
+    engines: {node: '>=18'}
     cpu: [s390x]
     os: [linux]
 
@@ -751,12 +971,18 @@ packages:
     cpu: [x64]
     os: [linux]
 
-  '@esbuild/linux-x64@0.21.5':
-    resolution: {integrity: sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==}
-    engines: {node: '>=12'}
+  '@esbuild/linux-x64@0.25.12':
+    resolution: {integrity: sha512-uqZMTLr/zR/ed4jIGnwSLkaHmPjOjJvnm6TVVitAa08SLS9Z0VM8wIRx7gWbJB5/J54YuIMInDquWyYvQLZkgw==}
+    engines: {node: '>=18'}
     cpu: [x64]
     os: [linux]
 
+  '@esbuild/netbsd-arm64@0.25.12':
+    resolution: {integrity: sha512-xXwcTq4GhRM7J9A8Gv5boanHhRa/Q9KLVmcyXHCTaM4wKfIpWkdXiMog/KsnxzJ0A1+nD+zoecuzqPmCRyBGjg==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [netbsd]
+
   '@esbuild/netbsd-x64@0.18.20':
     resolution: {integrity: sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==}
     engines: {node: '>=12'}
@@ -769,12 +995,18 @@ packages:
     cpu: [x64]
     os: [netbsd]
 
-  '@esbuild/netbsd-x64@0.21.5':
-    resolution: {integrity: sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==}
-    engines: {node: '>=12'}
+  '@esbuild/netbsd-x64@0.25.12':
+    resolution: {integrity: sha512-Ld5pTlzPy3YwGec4OuHh1aCVCRvOXdH8DgRjfDy/oumVovmuSzWfnSJg+VtakB9Cm0gxNO9BzWkj6mtO1FMXkQ==}
+    engines: {node: '>=18'}
     cpu: [x64]
     os: [netbsd]
 
+  '@esbuild/openbsd-arm64@0.25.12':
+    resolution: {integrity: sha512-fF96T6KsBo/pkQI950FARU9apGNTSlZGsv1jZBAlcLL1MLjLNIWPBkj5NlSz8aAzYKg+eNqknrUJ24QBybeR5A==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [openbsd]
+
   '@esbuild/openbsd-x64@0.18.20':
     resolution: {integrity: sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==}
     engines: {node: '>=12'}
@@ -787,12 +1019,18 @@ packages:
     cpu: [x64]
     os: [openbsd]
 
-  '@esbuild/openbsd-x64@0.21.5':
-    resolution: {integrity: sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==}
-    engines: {node: '>=12'}
+  '@esbuild/openbsd-x64@0.25.12':
+    resolution: {integrity: sha512-MZyXUkZHjQxUvzK7rN8DJ3SRmrVrke8ZyRusHlP+kuwqTcfWLyqMOE3sScPPyeIXN/mDJIfGXvcMqCgYKekoQw==}
+    engines: {node: '>=18'}
     cpu: [x64]
     os: [openbsd]
 
+  '@esbuild/openharmony-arm64@0.25.12':
+    resolution: {integrity: sha512-rm0YWsqUSRrjncSXGA7Zv78Nbnw4XL6/dzr20cyrQf7ZmRcsovpcRBdhD43Nuk3y7XIoW2OxMVvwuRvk9XdASg==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [openharmony]
+
   '@esbuild/sunos-x64@0.18.20':
     resolution: {integrity: sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==}
     engines: {node: '>=12'}
@@ -805,9 +1043,9 @@ packages:
     cpu: [x64]
     os: [sunos]
 
-  '@esbuild/sunos-x64@0.21.5':
-    resolution: {integrity: sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==}
-    engines: {node: '>=12'}
+  '@esbuild/sunos-x64@0.25.12':
+    resolution: {integrity: sha512-3wGSCDyuTHQUzt0nV7bocDy72r2lI33QL3gkDNGkod22EsYl04sMf0qLb8luNKTOmgF/eDEDP5BFNwoBKH441w==}
+    engines: {node: '>=18'}
     cpu: [x64]
     os: [sunos]
 
@@ -823,9 +1061,9 @@ packages:
     cpu: [arm64]
     os: [win32]
 
-  '@esbuild/win32-arm64@0.21.5':
-    resolution: {integrity: sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==}
-    engines: {node: '>=12'}
+  '@esbuild/win32-arm64@0.25.12':
+    resolution: {integrity: sha512-rMmLrur64A7+DKlnSuwqUdRKyd3UE7oPJZmnljqEptesKM8wx9J8gx5u0+9Pq0fQQW8vqeKebwNXdfOyP+8Bsg==}
+    engines: {node: '>=18'}
     cpu: [arm64]
     os: [win32]
 
@@ -841,9 +1079,9 @@ packages:
     cpu: [ia32]
     os: [win32]
 
-  '@esbuild/win32-ia32@0.21.5':
-    resolution: {integrity: sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==}
-    engines: {node: '>=12'}
+  '@esbuild/win32-ia32@0.25.12':
+    resolution: {integrity: sha512-HkqnmmBoCbCwxUKKNPBixiWDGCpQGVsrQfJoVGYLPT41XWF8lHuE5N6WhVia2n4o5QK5M4tYr21827fNhi4byQ==}
+    engines: {node: '>=18'}
     cpu: [ia32]
     os: [win32]
 
@@ -859,9 +1097,9 @@ packages:
     cpu: [x64]
     os: [win32]
 
-  '@esbuild/win32-x64@0.21.5':
-    resolution: {integrity: sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==}
-    engines: {node: '>=12'}
+  '@esbuild/win32-x64@0.25.12':
+    resolution: {integrity: sha512-alJC0uCZpTFrSL0CCDjcgleBXPnCrEAhTBILpeAp7M/OFgoqtAetfBzX0xM00MUsVVPpVjlPuMbREqnZCXaTnA==}
+    engines: {node: '>=18'}
     cpu: [x64]
     os: [win32]
 
@@ -883,24 +1121,65 @@ packages:
     resolution: {integrity: sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
 
+  '@exodus/bytes@1.15.0':
+    resolution: {integrity: sha512-UY0nlA+feH81UGSHv92sLEPLCeZFjXOuHhrIo0HQydScuQc8s0A7kL/UdgwgDq8g8ilksmuoF35YVTNphV2aBQ==}
+    engines: {node: ^20.19.0 || ^22.12.0 || >=24.0.0}
+    peerDependencies:
+      '@noble/hashes': ^1.8.0 || ^2.0.0
+    peerDependenciesMeta:
+      '@noble/hashes':
+        optional: true
+
   '@floating-ui/core@1.7.4':
     resolution: {integrity: sha512-C3HlIdsBxszvm5McXlB8PeOEWfBhcGBTZGkGlWc2U0KFY5IwG5OQEuQ8rq52DZmcHDlPLd+YFBK+cZcytwIFWg==}
 
+  '@floating-ui/core@1.7.5':
+    resolution: {integrity: sha512-1Ih4WTWyw0+lKyFMcBHGbb5U5FtuHJuujoyyr5zTaWS5EYMeT6Jb2AuDeftsCsEuchO+mM2ij5+q9crhydzLhQ==}
+
   '@floating-ui/dom@1.7.5':
     resolution: {integrity: sha512-N0bD2kIPInNHUHehXhMke1rBGs1dwqvC9O9KYMyyjK7iXt7GAhnro7UlcuYcGdS/yYOlq0MAVgrow8IbWJwyqg==}
 
+  '@floating-ui/dom@1.7.6':
+    resolution: {integrity: sha512-9gZSAI5XM36880PPMm//9dfiEngYoC6Am2izES1FF406YFsjvyBMmeJ2g4SAju3xWwtuynNRFL2s9hgxpLI5SQ==}
+
   '@floating-ui/react-dom@2.1.7':
     resolution: {integrity: sha512-0tLRojf/1Go2JgEVm+3Frg9A3IW8bJgKgdO0BN5RkF//ufuz2joZM63Npau2ff3J6lUVYgDSNzNkR+aH3IVfjg==}
     peerDependencies:
       react: '>=16.8.0'
       react-dom: '>=16.8.0'
 
+  '@floating-ui/react-dom@2.1.8':
+    resolution: {integrity: sha512-cC52bHwM/n/CxS87FH0yWdngEZrjdtLW/qVruo68qg+prK7ZQ4YGdut2GyDVpoGeAYe/h899rVeOVm6Oi40k2A==}
+    peerDependencies:
+      react: '>=16.8.0'
+      react-dom: '>=16.8.0'
+
   '@floating-ui/utils@0.2.10':
     resolution: {integrity: sha512-aGTxbpbg8/b5JfU1HXSrbH3wXZuLPJcNEcZQFMxLs3oSzgtVu6nFPkbbGGUvBcUjKV2YyB9Wxxabo+HEH9tcRQ==}
 
+  '@floating-ui/utils@0.2.11':
+    resolution: {integrity: sha512-RiB/yIh78pcIxl6lLMG0CgBXAZ2Y0eVHqMPYugu+9U0AeT6YBeiJpf7lbdJNIugFP5SIjwNRgo4DhR1Qxi26Gg==}
+
   '@gar/promisify@1.1.3':
     resolution: {integrity: sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==}
 
+  '@gitbeaker/core@43.8.0':
+    resolution: {integrity: sha512-H+LfKuf4dExBinb79c+CXViRBvTVQNf5BYLNSizm2SiqdED5JruhKX88payefleY0szp7G/mySlFSXPyGRH1dQ==}
+    engines: {node: '>=18.20.0'}
+
+  '@gitbeaker/requester-utils@43.8.0':
+    resolution: {integrity: sha512-d/SiJdxijc+aH5ZBQOw83XLxNSXqsBZNm5k3nPu1EHxGxK0fajXmxdMl0/vNXbKRggnIquFCxURkrQSEzfjqxQ==}
+    engines: {node: '>=18.20.0'}
+
+  '@gitbeaker/rest@43.8.0':
+    resolution: {integrity: sha512-xxqsNsUXaFang9b2e/NTIgqUeuUlifA2Opy1mOVqTDuJZZNIOTgUNyziwBJoleBhMC0XuvY3JNVMWthufcVjRw==}
+    engines: {node: '>=18.20.0'}
+
+  '@graphql-typed-document-node/core@3.2.0':
+    resolution: {integrity: sha512-mB9oAsNCm9aM3/SOv4YtBMqZbYj10R7dkq8byBqxGY/ncFwhf2oQzMV+LCRlWoDSEBJ3COiR1yeDvMtsoOsuFQ==}
+    peerDependencies:
+      graphql: ^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
+
   '@humanwhocodes/config-array@0.13.0':
     resolution: {integrity: sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==}
     engines: {node: '>=10.10.0'}
@@ -914,6 +1193,24 @@ packages:
     resolution: {integrity: sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==}
     deprecated: Use @eslint/object-schema instead
 
+  '@ianvs/prettier-plugin-sort-imports@4.7.1':
+    resolution: {integrity: sha512-jmTNYGlg95tlsoG3JLCcuC4BrFELJtLirLAkQW/71lXSyOhVt/Xj7xWbbGcuVbNq1gwWgSyMrPjJc9Z30hynVw==}
+    peerDependencies:
+      '@prettier/plugin-oxc': ^0.0.4 || ^0.1.0
+      '@vue/compiler-sfc': 2.7.x || 3.x
+      content-tag: ^4.0.0
+      prettier: 2 || 3 || ^4.0.0-0
+      prettier-plugin-ember-template-tag: ^2.1.0
+    peerDependenciesMeta:
+      '@prettier/plugin-oxc':
+        optional: true
+      '@vue/compiler-sfc':
+        optional: true
+      content-tag:
+        optional: true
+      prettier-plugin-ember-template-tag:
+        optional: true
+
   '@iconify/types@2.0.0':
     resolution: {integrity: sha512-+wluvCrRhXrhyOmRDJ3q8mux9JkKy5SJ/v8ol2tu4FVjyYvtEzkc/3pK15ET6RKg4b4w4BmTk1+gsCUhf21Ykg==}
 
@@ -952,6 +1249,14 @@ packages:
   '@jridgewell/trace-mapping@0.3.31':
     resolution: {integrity: sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==}
 
+  '@linear/sdk@77.0.0':
+    resolution: {integrity: sha512-pI7ZNh/UZF12JoVhCi8tdubYnCp2DJ1hkraMA+kDyYqjU+elKOVd5yAdN/SoAR17V7Kg8dtDabgArjknvUnQSA==}
+    engines: {node: '>=18.x'}
+
+  '@llamaduck/forgejo-ts@14.0.3':
+    resolution: {integrity: sha512-51Qvei5AS/KuPAFrlIys2zedKk1S2hMhnFKraLBHqQumlAAlsKegT/hYQN02SmzXwB5scHEQe8LPYZmwYgwMcg==}
+    engines: {node: '>=20'}
+
   '@malept/cross-spawn-promise@1.1.1':
     resolution: {integrity: sha512-RTBGWL5FWQcg9orDOCcp4LvItNzUPcyEU9bwaeJX0rJ1IQxzucC48Y0/sQLp/g6t99IQgAlGIaesJS+gTn7tVQ==}
     engines: {node: '>= 10'}
@@ -1005,6 +1310,70 @@ packages:
     engines: {node: '>=10'}
     deprecated: This functionality has been moved to @npmcli/fs
 
+  '@octokit/auth-oauth-device@8.0.3':
+    resolution: {integrity: sha512-zh2W0mKKMh/VWZhSqlaCzY7qFyrgd9oTWmTmHaXnHNeQRCZr/CXy2jCgHo4e4dJVTiuxP5dLa0YM5p5QVhJHbw==}
+    engines: {node: '>= 20'}
+
+  '@octokit/auth-token@6.0.0':
+    resolution: {integrity: sha512-P4YJBPdPSpWTQ1NU4XYdvHvXJJDxM6YwpS0FZHRgP7YFkdVxsWcpWGy/NVqlAA7PcPCnMacXlRm1y2PFZRWL/w==}
+    engines: {node: '>= 20'}
+
+  '@octokit/core@7.0.6':
+    resolution: {integrity: sha512-DhGl4xMVFGVIyMwswXeyzdL4uXD5OGILGX5N8Y+f6W7LhC1Ze2poSNrkF/fedpVDHEEZ+PHFW0vL14I+mm8K3Q==}
+    engines: {node: '>= 20'}
+
+  '@octokit/endpoint@11.0.3':
+    resolution: {integrity: sha512-FWFlNxghg4HrXkD3ifYbS/IdL/mDHjh9QcsNyhQjN8dplUoZbejsdpmuqdA76nxj2xoWPs7p8uX2SNr9rYu0Ag==}
+    engines: {node: '>= 20'}
+
+  '@octokit/graphql@9.0.3':
+    resolution: {integrity: sha512-grAEuupr/C1rALFnXTv6ZQhFuL1D8G5y8CN04RgrO4FIPMrtm+mcZzFG7dcBm+nq+1ppNixu+Jd78aeJOYxlGA==}
+    engines: {node: '>= 20'}
+
+  '@octokit/oauth-authorization-url@8.0.0':
+    resolution: {integrity: sha512-7QoLPRh/ssEA/HuHBHdVdSgF8xNLz/Bc5m9fZkArJE5bb6NmVkDm3anKxXPmN1zh6b5WKZPRr3697xKT/yM3qQ==}
+    engines: {node: '>= 20'}
+
+  '@octokit/oauth-methods@6.0.2':
+    resolution: {integrity: sha512-HiNOO3MqLxlt5Da5bZbLV8Zarnphi4y9XehrbaFMkcoJ+FL7sMxH/UlUsCVxpddVu4qvNDrBdaTVE2o4ITK8ng==}
+    engines: {node: '>= 20'}
+
+  '@octokit/openapi-types@27.0.0':
+    resolution: {integrity: sha512-whrdktVs1h6gtR+09+QsNk2+FO+49j6ga1c55YZudfEG+oKJVvJLQi3zkOm5JjiUXAagWK2tI2kTGKJ2Ys7MGA==}
+
+  '@octokit/plugin-paginate-rest@14.0.0':
+    resolution: {integrity: sha512-fNVRE7ufJiAA3XUrha2omTA39M6IXIc6GIZLvlbsm8QOQCYvpq/LkMNGyFlB1d8hTDzsAXa3OKtybdMAYsV/fw==}
+    engines: {node: '>= 20'}
+    peerDependencies:
+      '@octokit/core': '>=6'
+
+  '@octokit/plugin-request-log@6.0.0':
+    resolution: {integrity: sha512-UkOzeEN3W91/eBq9sPZNQ7sUBvYCqYbrrD8gTbBuGtHEuycE4/awMXcYvx6sVYo7LypPhmQwwpUe4Yyu4QZN5Q==}
+    engines: {node: '>= 20'}
+    peerDependencies:
+      '@octokit/core': '>=6'
+
+  '@octokit/plugin-rest-endpoint-methods@17.0.0':
+    resolution: {integrity: sha512-B5yCyIlOJFPqUUeiD0cnBJwWJO8lkJs5d8+ze9QDP6SvfiXSz1BF+91+0MeI1d2yxgOhU/O+CvtiZ9jSkHhFAw==}
+    engines: {node: '>= 20'}
+    peerDependencies:
+      '@octokit/core': '>=6'
+
+  '@octokit/request-error@7.1.0':
+    resolution: {integrity: sha512-KMQIfq5sOPpkQYajXHwnhjCC0slzCNScLHs9JafXc4RAJI+9f+jNDlBNaIMTvazOPLgb4BnlhGJOTbnN0wIjPw==}
+    engines: {node: '>= 20'}
+
+  '@octokit/request@10.0.8':
+    resolution: {integrity: sha512-SJZNwY9pur9Agf7l87ywFi14W+Hd9Jg6Ifivsd33+/bGUQIjNujdFiXII2/qSlN2ybqUHfp5xpekMEjIBTjlSw==}
+    engines: {node: '>= 20'}
+
+  '@octokit/rest@22.0.1':
+    resolution: {integrity: sha512-Jzbhzl3CEexhnivb1iQ0KJ7s5vvjMWcmRtq5aUsKmKDrRW6z3r84ngmiFKFvpZjpiU/9/S6ITPFRpn5s/3uQJw==}
+    engines: {node: '>= 20'}
+
+  '@octokit/types@16.0.0':
+    resolution: {integrity: sha512-sKq+9r1Mm4efXW1FCk7hFSeJo4QKreL/tTbR0rz/qx/r1Oa2VV83LTA/H/MuCOX7uCIJmQVRKBcbmWoySjAnSg==}
+
   '@opentelemetry/api-logs@0.208.0':
     resolution: {integrity: sha512-CjruKY9V6NMssL/T1kAFgzosF1v9o6oeN+aX5JB/C/xPNtmgIJqcXHG7fA82Ou1zCpWGl4lROQUKwUNE1pMCyg==}
     engines: {node: '>=8.0.0'}
@@ -1077,16 +1446,110 @@ packages:
     resolution: {integrity: sha512-R5R9tb2AXs2IRLNKLBJDynhkfmx7mX0vi8NkhZb3gUkPWHn6HXk5J8iQ/dql0U3ApfWym4kXXmBDRGO+oeOfjg==}
     engines: {node: '>=14'}
 
+  '@parcel/watcher-android-arm64@2.5.6':
+    resolution: {integrity: sha512-YQxSS34tPF/6ZG7r/Ih9xy+kP/WwediEUsqmtf0cuCV5TPPKw/PQHRhueUo6JdeFJaqV3pyjm0GdYjZotbRt/A==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [arm64]
+    os: [android]
+
+  '@parcel/watcher-darwin-arm64@2.5.6':
+    resolution: {integrity: sha512-Z2ZdrnwyXvvvdtRHLmM4knydIdU9adO3D4n/0cVipF3rRiwP+3/sfzpAwA/qKFL6i1ModaabkU7IbpeMBgiVEA==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@parcel/watcher-darwin-x64@2.5.6':
+    resolution: {integrity: sha512-HgvOf3W9dhithcwOWX9uDZyn1lW9R+7tPZ4sug+NGrGIo4Rk1hAXLEbcH1TQSqxts0NYXXlOWqVpvS1SFS4fRg==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [x64]
+    os: [darwin]
+
+  '@parcel/watcher-freebsd-x64@2.5.6':
+    resolution: {integrity: sha512-vJVi8yd/qzJxEKHkeemh7w3YAn6RJCtYlE4HPMoVnCpIXEzSrxErBW5SJBgKLbXU3WdIpkjBTeUNtyBVn8TRng==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [x64]
+    os: [freebsd]
+
+  '@parcel/watcher-linux-arm-glibc@2.5.6':
+    resolution: {integrity: sha512-9JiYfB6h6BgV50CCfasfLf/uvOcJskMSwcdH1PHH9rvS1IrNy8zad6IUVPVUfmXr+u+Km9IxcfMLzgdOudz9EQ==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [arm]
+    os: [linux]
+    libc: [glibc]
+
+  '@parcel/watcher-linux-arm-musl@2.5.6':
+    resolution: {integrity: sha512-Ve3gUCG57nuUUSyjBq/MAM0CzArtuIOxsBdQ+ftz6ho8n7s1i9E1Nmk/xmP323r2YL0SONs1EuwqBp2u1k5fxg==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [arm]
+    os: [linux]
+    libc: [musl]
+
+  '@parcel/watcher-linux-arm64-glibc@2.5.6':
+    resolution: {integrity: sha512-f2g/DT3NhGPdBmMWYoxixqYr3v/UXcmLOYy16Bx0TM20Tchduwr4EaCbmxh1321TABqPGDpS8D/ggOTaljijOA==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [arm64]
+    os: [linux]
+    libc: [glibc]
+
+  '@parcel/watcher-linux-arm64-musl@2.5.6':
+    resolution: {integrity: sha512-qb6naMDGlbCwdhLj6hgoVKJl2odL34z2sqkC7Z6kzir8b5W65WYDpLB6R06KabvZdgoHI/zxke4b3zR0wAbDTA==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [arm64]
+    os: [linux]
+    libc: [musl]
+
+  '@parcel/watcher-linux-x64-glibc@2.5.6':
+    resolution: {integrity: sha512-kbT5wvNQlx7NaGjzPFu8nVIW1rWqV780O7ZtkjuWaPUgpv2NMFpjYERVi0UYj1msZNyCzGlaCWEtzc+exjMGbQ==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [x64]
+    os: [linux]
+    libc: [glibc]
+
+  '@parcel/watcher-linux-x64-musl@2.5.6':
+    resolution: {integrity: sha512-1JRFeC+h7RdXwldHzTsmdtYR/Ku8SylLgTU/reMuqdVD7CtLwf0VR1FqeprZ0eHQkO0vqsbvFLXUmYm/uNKJBg==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [x64]
+    os: [linux]
+    libc: [musl]
+
+  '@parcel/watcher-win32-arm64@2.5.6':
+    resolution: {integrity: sha512-3ukyebjc6eGlw9yRt678DxVF7rjXatWiHvTXqphZLvo7aC5NdEgFufVwjFfY51ijYEWpXbqF5jtrK275z52D4Q==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [arm64]
+    os: [win32]
+
+  '@parcel/watcher-win32-ia32@2.5.6':
+    resolution: {integrity: sha512-k35yLp1ZMwwee3Ez/pxBi5cf4AoBKYXj00CZ80jUz5h8prpiaQsiRPKQMxoLstNuqe2vR4RNPEAEcjEFzhEz/g==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [ia32]
+    os: [win32]
+
+  '@parcel/watcher-win32-x64@2.5.6':
+    resolution: {integrity: sha512-hbQlYcCq5dlAX9Qx+kFb0FHue6vbjlf0FrNzSKdYK2APUf7tGfGxQCk2ihEREmbR6ZMc0MVAD5RIX/41gpUzTw==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [x64]
+    os: [win32]
+
+  '@parcel/watcher@2.5.6':
+    resolution: {integrity: sha512-tmmZ3lQxAe/k/+rNnXQRawJ4NjxO2hqiOLTHvWchtGZULp4RyFeh6aU4XdOYBFe2KE1oShQTv4AblOs2iOrNnQ==}
+    engines: {node: '>= 10.0.0'}
+
   '@pkgjs/parseargs@0.11.0':
     resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==}
     engines: {node: '>=14'}
 
+  '@polka/url@1.0.0-next.29':
+    resolution: {integrity: sha512-wwQAWhWSuHaag8c4q/KN/vCoeOJYshAIvMQwD4GpSb3OiZklFfvAgmj0VCBBImRpuF/aFgIRzllXlVX93Jevww==}
+
   '@posthog/core@1.20.1':
     resolution: {integrity: sha512-uoTmWkYCtLYFpiK37/JCq+BuCA/OZn1qQZn5cPv1EEKt3ni3Zgg48xWCnSEyGFl5KKSXlfCruiRTwnbAtCgrBA==}
 
   '@posthog/types@1.342.1':
     resolution: {integrity: sha512-bcyBdO88FWTkd5AVTa4Nu8T7RfY0WJrG7WMCXum/rcvNjYhS3DmOfKf8o/Bt56vA3J3yeU0vbgrmltYVoTAfaA==}
 
+  '@preact/signals-core@1.14.1':
+    resolution: {integrity: sha512-vxPpfXqrwUe9lpjqfYNjAF/0RF/eFGeLgdJzdmIIZjpOnTmGmAB4BjWone562mJGMRP4frU6iZ6ei3PDsu52Ng==}
+
   '@protobufjs/aspromise@1.1.2':
     resolution: {integrity: sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ==}
 
@@ -1533,6 +1996,32 @@ packages:
       '@types/react-dom':
         optional: true
 
+  '@radix-ui/react-toggle-group@1.1.11':
+    resolution: {integrity: sha512-5umnS0T8JQzQT6HbPyO7Hh9dgd82NmS36DQr+X/YJ9ctFNCiiQd6IJAYYZ33LUwm8M+taCz5t2ui29fHZc4Y6Q==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
+  '@radix-ui/react-toggle@1.1.10':
+    resolution: {integrity: sha512-lS1odchhFTeZv3xwHH31YPObmJn8gOg7Lq12inrr0+BH/l3Tsq32VfjqH1oh80ARM3mlkfMic15n0kg4sD1poQ==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
   '@radix-ui/react-tooltip@1.2.8':
     resolution: {integrity: sha512-tY7sVt1yL9ozIxvmbtN5qtmH2krXcBCfjEiCgKGLqunJHvgvZG2Pcl2oQ3kbcZARb1BGEHdkLzcYGO8ynVlieg==}
     peerDependencies:
@@ -1803,18 +2292,177 @@ packages:
     resolution: {integrity: sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==}
     engines: {node: '>=10'}
 
+  '@standard-schema/spec@1.1.0':
+    resolution: {integrity: sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w==}
+
   '@szmarczak/http-timer@4.0.6':
     resolution: {integrity: sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==}
     engines: {node: '>=10'}
 
+  '@tailwindcss/node@4.2.1':
+    resolution: {integrity: sha512-jlx6sLk4EOwO6hHe1oCGm1Q4AN/s0rSrTTPBGPM0/RQ6Uylwq17FuU8IeJJKEjtc6K6O07zsvP+gDO6MMWo7pg==}
+
+  '@tailwindcss/oxide-android-arm64@4.2.1':
+    resolution: {integrity: sha512-eZ7G1Zm5EC8OOKaesIKuw77jw++QJ2lL9N+dDpdQiAB/c/B2wDh0QPFHbkBVrXnwNugvrbJFk1gK2SsVjwWReg==}
+    engines: {node: '>= 20'}
+    cpu: [arm64]
+    os: [android]
+
+  '@tailwindcss/oxide-darwin-arm64@4.2.1':
+    resolution: {integrity: sha512-q/LHkOstoJ7pI1J0q6djesLzRvQSIfEto148ppAd+BVQK0JYjQIFSK3JgYZJa+Yzi0DDa52ZsQx2rqytBnf8Hw==}
+    engines: {node: '>= 20'}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@tailwindcss/oxide-darwin-x64@4.2.1':
+    resolution: {integrity: sha512-/f/ozlaXGY6QLbpvd/kFTro2l18f7dHKpB+ieXz+Cijl4Mt9AI2rTrpq7V+t04nK+j9XBQHnSMdeQRhbGyt6fw==}
+    engines: {node: '>= 20'}
+    cpu: [x64]
+    os: [darwin]
+
+  '@tailwindcss/oxide-freebsd-x64@4.2.1':
+    resolution: {integrity: sha512-5e/AkgYJT/cpbkys/OU2Ei2jdETCLlifwm7ogMC7/hksI2fC3iiq6OcXwjibcIjPung0kRtR3TxEITkqgn0TcA==}
+    engines: {node: '>= 20'}
+    cpu: [x64]
+    os: [freebsd]
+
+  '@tailwindcss/oxide-linux-arm-gnueabihf@4.2.1':
+    resolution: {integrity: sha512-Uny1EcVTTmerCKt/1ZuKTkb0x8ZaiuYucg2/kImO5A5Y/kBz41/+j0gxUZl+hTF3xkWpDmHX+TaWhOtba2Fyuw==}
+    engines: {node: '>= 20'}
+    cpu: [arm]
+    os: [linux]
+
+  '@tailwindcss/oxide-linux-arm64-gnu@4.2.1':
+    resolution: {integrity: sha512-CTrwomI+c7n6aSSQlsPL0roRiNMDQ/YzMD9EjcR+H4f0I1SQ8QqIuPnsVp7QgMkC1Qi8rtkekLkOFjo7OlEFRQ==}
+    engines: {node: '>= 20'}
+    cpu: [arm64]
+    os: [linux]
+    libc: [glibc]
+
+  '@tailwindcss/oxide-linux-arm64-musl@4.2.1':
+    resolution: {integrity: sha512-WZA0CHRL/SP1TRbA5mp9htsppSEkWuQ4KsSUumYQnyl8ZdT39ntwqmz4IUHGN6p4XdSlYfJwM4rRzZLShHsGAQ==}
+    engines: {node: '>= 20'}
+    cpu: [arm64]
+    os: [linux]
+    libc: [musl]
+
+  '@tailwindcss/oxide-linux-x64-gnu@4.2.1':
+    resolution: {integrity: sha512-qMFzxI2YlBOLW5PhblzuSWlWfwLHaneBE0xHzLrBgNtqN6mWfs+qYbhryGSXQjFYB1Dzf5w+LN5qbUTPhW7Y5g==}
+    engines: {node: '>= 20'}
+    cpu: [x64]
+    os: [linux]
+    libc: [glibc]
+
+  '@tailwindcss/oxide-linux-x64-musl@4.2.1':
+    resolution: {integrity: sha512-5r1X2FKnCMUPlXTWRYpHdPYUY6a1Ar/t7P24OuiEdEOmms5lyqjDRvVY1yy9Rmioh+AunQ0rWiOTPE8F9A3v5g==}
+    engines: {node: '>= 20'}
+    cpu: [x64]
+    os: [linux]
+    libc: [musl]
+
+  '@tailwindcss/oxide-wasm32-wasi@4.2.1':
+    resolution: {integrity: sha512-MGFB5cVPvshR85MTJkEvqDUnuNoysrsRxd6vnk1Lf2tbiqNlXpHYZqkqOQalydienEWOHHFyyuTSYRsLfxFJ2Q==}
+    engines: {node: '>=14.0.0'}
+    cpu: [wasm32]
+    bundledDependencies:
+      - '@napi-rs/wasm-runtime'
+      - '@emnapi/core'
+      - '@emnapi/runtime'
+      - '@tybys/wasm-util'
+      - '@emnapi/wasi-threads'
+      - tslib
+
+  '@tailwindcss/oxide-win32-arm64-msvc@4.2.1':
+    resolution: {integrity: sha512-YlUEHRHBGnCMh4Nj4GnqQyBtsshUPdiNroZj8VPkvTZSoHsilRCwXcVKnG9kyi0ZFAS/3u+qKHBdDc81SADTRA==}
+    engines: {node: '>= 20'}
+    cpu: [arm64]
+    os: [win32]
+
+  '@tailwindcss/oxide-win32-x64-msvc@4.2.1':
+    resolution: {integrity: sha512-rbO34G5sMWWyrN/idLeVxAZgAKWrn5LiR3/I90Q9MkA67s6T1oB0xtTe+0heoBvHSpbU9Mk7i6uwJnpo4u21XQ==}
+    engines: {node: '>= 20'}
+    cpu: [x64]
+    os: [win32]
+
+  '@tailwindcss/oxide@4.2.1':
+    resolution: {integrity: sha512-yv9jeEFWnjKCI6/T3Oq50yQEOqmpmpfzG1hcZsAOaXFQPfzWprWrlHSdGPEF3WQTi8zu8ohC9Mh9J470nT5pUw==}
+    engines: {node: '>= 20'}
+
+  '@tailwindcss/vite@4.2.1':
+    resolution: {integrity: sha512-TBf2sJjYeb28jD2U/OhwdW0bbOsxkWPwQ7SrqGf9sVcoYwZj7rkXljroBO9wKBut9XnmQLXanuDUeqQK0lGg/w==}
+    peerDependencies:
+      vite: ^5.2.0 || ^6 || ^7
+
+  '@tanstack/devtools-event-client@0.4.1':
+    resolution: {integrity: sha512-GRxmPw4OHZ2oZeIEUkEwt/NDvuEqzEYRAjzUVMs+I0pd4C7k1ySOiuJK2CqF+K/yEAR3YZNkW3ExrpDarh9Vwg==}
+    engines: {node: '>=18'}
+
+  '@tanstack/form-core@1.28.4':
+    resolution: {integrity: sha512-2eox5ePrJ6kvA1DXD5QHk/GeGr3VFZ0uYR63UgQOe7bUg6h1JfXaIMqTjZK9sdGyE4oRNqFpoW54H0pZM7nObQ==}
+
+  '@tanstack/hotkeys@0.4.1':
+    resolution: {integrity: sha512-EGHqcdKP2jzy0dEkahA3ABtEXohMqPlU3Ac04sBQjgesJqr9xWuesJotOfWPh3P68kQQg8krNAtFTydIN3+WSw==}
+    engines: {node: '>=18'}
+
+  '@tanstack/pacer-lite@0.1.1':
+    resolution: {integrity: sha512-y/xtNPNt/YeyoVxE/JCx+T7yjEzpezmbb+toK8DDD1P4m7Kzs5YR956+7OKexG3f8aXgC3rLZl7b1V+yNUSy5w==}
+    engines: {node: '>=18'}
+
   '@tanstack/query-core@5.90.20':
     resolution: {integrity: sha512-OMD2HLpNouXEfZJWcKeVKUgQ5n+n3A2JFmBaScpNDUqSrQSjiveC7dKMe53uJUg1nDG16ttFPz2xfilz6i2uVg==}
 
+  '@tanstack/react-form@1.28.4':
+    resolution: {integrity: sha512-ZGBwl9JM2u0kol7jAWpqAkr2JSHfXJaLPsFDZWPf+ewpVkwngTTW/rGgtoDe5uVpHoDIpOhzpPCAh6O1SjGEOg==}
+    peerDependencies:
+      '@tanstack/react-start': '*'
+      react: ^17.0.0 || ^18.0.0 || ^19.0.0
+    peerDependenciesMeta:
+      '@tanstack/react-start':
+        optional: true
+
+  '@tanstack/react-hotkeys@0.4.1':
+    resolution: {integrity: sha512-hFh/kKQODn4kSytfIsEE/Vf1AaAb+NAFi4lx+OB49NmKY5z/BNH1/uEdYlVgOEvnDm4QrCISIMBOVpMgK5QNQg==}
+    engines: {node: '>=18'}
+    peerDependencies:
+      react: '>=16.8'
+      react-dom: '>=16.8'
+
   '@tanstack/react-query@5.90.21':
     resolution: {integrity: sha512-0Lu6y5t+tvlTJMTO7oh5NSpJfpg/5D41LlThfepTixPYkJ0sE2Jj0m0f6yYqujBwIXlId87e234+MxG3D3g7kg==}
     peerDependencies:
       react: ^18 || ^19
 
+  '@tanstack/react-store@0.9.2':
+    resolution: {integrity: sha512-Vt5usJE5sHG/cMechQfmwvwne6ktGCELe89Lmvoxe3LKRoFrhPa8OCKWs0NliG8HTJElEIj7PLtaBQIcux5pAQ==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
+      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
+
+  '@tanstack/react-virtual@3.13.23':
+    resolution: {integrity: sha512-XnMRnHQ23piOVj2bzJqHrRrLg4r+F86fuBcwteKfbIjJrtGxb4z7tIvPVAe4B+4UVwo9G4Giuz5fmapcrnZ0OQ==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
+      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
+
+  '@tanstack/store@0.9.2':
+    resolution: {integrity: sha512-K013lUJEFJK2ofFQ/hZKJUmCnpcV00ebLyOyFOWQvyQHUOZp/iYO84BM6aOGiV81JzwbX0APTVmW8YI7yiG5oA==}
+
+  '@tanstack/virtual-core@3.13.23':
+    resolution: {integrity: sha512-zSz2Z2HNyLjCplANTDyl3BcdQJc2k1+yyFoKhNRmCr7V7dY8o8q5m8uFTI1/Pg1kL+Hgrz6u3Xo6eFUB7l66cg==}
+
+  '@team-plain/graphql@1.0.1':
+    resolution: {integrity: sha512-irl4xeVRZE1qdAORSvTdCpS/KOEsZZmY0wG9foMwwjQowwRlvWbHoRG3lV03AvDurgtvp+JgRea31QF1f0B+WA==}
+
+  '@testing-library/dom@10.4.1':
+    resolution: {integrity: sha512-o4PXJQidqJl82ckFaXUeoAW+XysPLauYI43Abki5hABd853iMhitooc6znOnczgbTYmEP6U6/y1ZyKAIsvMKGg==}
+    engines: {node: '>=18'}
+
+  '@testing-library/user-event@14.6.1':
+    resolution: {integrity: sha512-vq7fv0rnt+QTXgPxr5Hjc210p6YKq2kmdziLgnsZGgLJ9e6VAShx1pACLuRjd/AS/sr7phAR58OIIpf0LlmQNw==}
+    engines: {node: '>=12', npm: '>=6'}
+    peerDependencies:
+      '@testing-library/dom': '>=7.21.4'
+
   '@tootallnate/once@1.1.2':
     resolution: {integrity: sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==}
     engines: {node: '>= 6'}
@@ -1823,6 +2471,9 @@ packages:
     resolution: {integrity: sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==}
     engines: {node: '>= 10'}
 
+  '@types/aria-query@5.0.4':
+    resolution: {integrity: sha512-rfT93uj5s0PRL7EzccGMs3brplhcrghnDoV26NqKhCAS1hVo+WdNsPvE/yb6ilfr5hi2MEk6d5EWJTKdxg8jVw==}
+
   '@types/babel__core@7.20.5':
     resolution: {integrity: sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==}
 
@@ -1835,6 +2486,9 @@ packages:
   '@types/babel__traverse@7.28.0':
     resolution: {integrity: sha512-8PvcXf70gTDZBgt9ptxJ8elBeBjcLOAcOtoO/mPJjtji1+CdGbHgm77om1GrsPxsiE+uXIpNSK64UYaIwQXd4Q==}
 
+  '@types/better-sqlite3@7.6.13':
+    resolution: {integrity: sha512-NMv9ASNARoKksWtsq/SHakpYAYnhBrQgGD8zkLYk/jaK8jUGn08CfEdTRgYhMypUQAfzSP8W6gNLe0q19/t4VA==}
+
   '@types/cacheable-request@6.0.3':
     resolution: {integrity: sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw==}
 
@@ -1985,16 +2639,16 @@ packages:
   '@types/node@20.19.32':
     resolution: {integrity: sha512-Ez8QE4DMfhjjTsES9K2dwfV258qBui7qxUsoaixZDiTzbde4U12e1pXGNu/ECsUIOi5/zoCxAQxIhQnaUQ2VvA==}
 
+  '@types/node@24.11.0':
+    resolution: {integrity: sha512-fPxQqz4VTgPI/IQ+lj9r0h+fDR66bzoeMGHp8ASee+32OSGIkeASsoZuJixsQoVef1QJbeubcPBxKk22QVoWdw==}
+
   '@types/plist@3.0.5':
     resolution: {integrity: sha512-E6OCaRmAe4WDmWNsL/9RMqdkkzDCY1etutkflWk4c+AcjDU07Pcz1fQwTX0TQz+Pxqn9i4L1TU3UFpjnrcDgxA==}
 
-  '@types/prop-types@15.7.15':
-    resolution: {integrity: sha512-F6bEyamV9jKGAFBEmlQnesRPGOQqS2+Uwi0Em15xenOxHaf2hv6L8YCVn3rPdPJOiJfPiCnLIRyvwVaqMY3MIw==}
-
-  '@types/react-dom@18.3.7':
-    resolution: {integrity: sha512-MEe3UeoENYVFXzoXEWsvcpg6ZvlrFNlOQ7EOsvhI3CfAXwzPfO8Qwuxd40nepsYKqyyVQnTdEfv68q91yLcKrQ==}
+  '@types/react-dom@19.2.3':
+    resolution: {integrity: sha512-jp2L/eY6fn+KgVVQAOqYItbF0VY/YApe5Mz2F0aykSO8gx31bYCZyvSeYxCHKvzHG5eZjc+zyaS5BrBWya2+kQ==}
     peerDependencies:
-      '@types/react': ^18.0.0
+      '@types/react': ^19.2.0
 
   '@types/react-syntax-highlighter@15.5.13':
     resolution: {integrity: sha512-uLGJ87j6Sz8UaBAooU0T6lWJ0dBmjZgN1PZTrj05TNql2/XpC6+4HhMT5syIdFUUt+FASfCeLLv4kBygNU+8qA==}
@@ -2002,8 +2656,8 @@ packages:
   '@types/react-window@1.8.8':
     resolution: {integrity: sha512-8Ls660bHR1AUA2kuRvVG9D/4XpRC6wjAaPT9dil7Ckc76eP9TKWZwwmgfq8Q1LANX3QNDnoU4Zp48A3w+zK69Q==}
 
-  '@types/react@18.3.28':
-    resolution: {integrity: sha512-z9VXpC7MWrhfWipitjNdgCauoMLRdIILQsAEV+ZesIzBq/oUlxk0m3ApZuMFCXdnS4U7KrI+l3WRUEGQ8K1QKw==}
+  '@types/react@19.2.14':
+    resolution: {integrity: sha512-ilcTH/UniCkMdtexkoCN0bI7pMcJDvmQFPvuPvmEaYA/NSfFTAgdUSLAoVjaRJm7+6PvcM+q1zYOwS4wTYMF9w==}
 
   '@types/responselike@1.0.3':
     resolution: {integrity: sha512-H/+L+UkTV33uf49PH5pCAUBVPNj2nDBXTN+qS1dOwyyg24l3CcicicCA7ca+HMvJBZcFgl5r8e+RR6elsb4Lyw==}
@@ -2011,9 +2665,6 @@ packages:
   '@types/semver@7.7.1':
     resolution: {integrity: sha512-FmgJfu+MOcQ370SD0ev7EI8TlCAfKYU+B4m5T3yXc1CiRN94g/SZPtsCkk506aUDtlMnFZvasDwHHUcZUEaYuA==}
 
-  '@types/sqlite3@3.1.11':
-    resolution: {integrity: sha512-KYF+QgxAnnAh7DWPdNDroxkDI3/MspH1NMx6m/N/6fT1G6+jvsw4/ZePt8R8cr7ta58aboeTfYFBDxTJ5yv15w==}
-
   '@types/ssh2@1.15.5':
     resolution: {integrity: sha512-N1ASjp/nXH3ovBHddRJpli4ozpk6UdDYIX4RJWFa9L1YKnzdhTlVmiGHm4DZnj/jLbqZpes4aeR30EFGQtvhQQ==}
 
@@ -2102,51 +2753,66 @@ packages:
     peerDependencies:
       vite: ^4.2.0 || ^5.0.0 || ^6.0.0 || ^7.0.0
 
-  '@vitest/expect@3.2.4':
-    resolution: {integrity: sha512-Io0yyORnB6sikFlt8QW5K7slY4OjqNX9jmJQ02QDda8lyM6B5oNgVWoSoKPac8/kgnCUzuHQKrSLtu/uOqqrig==}
+  '@vitest/browser-playwright@4.1.0':
+    resolution: {integrity: sha512-2RU7pZELY9/aVMLmABNy1HeZ4FX23FXGY1jRuHLHgWa2zaAE49aNW2GLzebW+BmbTZIKKyFF1QXvk7DEWViUCQ==}
+    peerDependencies:
+      playwright: '*'
+      vitest: 4.1.0
+
+  '@vitest/browser-preview@4.1.0':
+    resolution: {integrity: sha512-P2bxouIqn8yKpjKaVuOwwCjgdbhHWfx0dmDoe44+OdMyxz1dkEvmxEorx+usyLLr98AM2jUI2aYLZ6eMYhx2BQ==}
+    peerDependencies:
+      vitest: 4.1.0
+
+  '@vitest/browser@4.1.0':
+    resolution: {integrity: sha512-tG/iOrgbiHQks0ew7CdelUyNEHkv8NLrt+CqdTivIuoSnXvO7scWMn4Kqo78/UGY1NJ6Hv+vp8BvRnED/bjFdQ==}
+    peerDependencies:
+      vitest: 4.1.0
+
+  '@vitest/expect@4.1.0':
+    resolution: {integrity: sha512-EIxG7k4wlWweuCLG9Y5InKFwpMEOyrMb6ZJ1ihYu02LVj/bzUwn2VMU+13PinsjRW75XnITeFrQBMH5+dLvCDA==}
 
-  '@vitest/mocker@3.2.4':
-    resolution: {integrity: sha512-46ryTE9RZO/rfDd7pEqFl7etuyzekzEhUbTW3BvmeO/BcCMEgq59BKhek3dXDWgAj4oMK6OZi+vRr1wPW6qjEQ==}
+  '@vitest/mocker@4.1.0':
+    resolution: {integrity: sha512-evxREh+Hork43+Y4IOhTo+h5lGmVRyjqI739Rz4RlUPqwrkFFDF6EMvOOYjTx4E8Tl6gyCLRL8Mu7Ry12a13Tw==}
     peerDependencies:
       msw: ^2.4.9
-      vite: ^5.0.0 || ^6.0.0 || ^7.0.0-0
+      vite: ^6.0.0 || ^7.0.0 || ^8.0.0-0
     peerDependenciesMeta:
       msw:
         optional: true
       vite:
         optional: true
 
-  '@vitest/pretty-format@3.2.4':
-    resolution: {integrity: sha512-IVNZik8IVRJRTr9fxlitMKeJeXFFFN0JaB9PHPGQ8NKQbGpfjlTx9zO4RefN8gp7eqjNy8nyK3NZmBzOPeIxtA==}
+  '@vitest/pretty-format@4.1.0':
+    resolution: {integrity: sha512-3RZLZlh88Ib0J7NQTRATfc/3ZPOnSUn2uDBUoGNn5T36+bALixmzphN26OUD3LRXWkJu4H0s5vvUeqBiw+kS0A==}
 
-  '@vitest/runner@3.2.4':
-    resolution: {integrity: sha512-oukfKT9Mk41LreEW09vt45f8wx7DordoWUZMYdY/cyAk7w5TWkTRCNZYF7sX7n2wB7jyGAl74OxgwhPgKaqDMQ==}
+  '@vitest/runner@4.1.0':
+    resolution: {integrity: sha512-Duvx2OzQ7d6OjchL+trw+aSrb9idh7pnNfxrklo14p3zmNL4qPCDeIJAK+eBKYjkIwG96Bc6vYuxhqDXQOWpoQ==}
 
-  '@vitest/snapshot@3.2.4':
-    resolution: {integrity: sha512-dEYtS7qQP2CjU27QBC5oUOxLE/v5eLkGqPE0ZKEIDGMs4vKWe7IjgLOeauHsR0D5YuuycGRO5oSRXnwnmA78fQ==}
+  '@vitest/snapshot@4.1.0':
+    resolution: {integrity: sha512-0Vy9euT1kgsnj1CHttwi9i9o+4rRLEaPRSOJ5gyv579GJkNpgJK+B4HSv/rAWixx2wdAFci1X4CEPjiu2bXIMg==}
 
-  '@vitest/spy@3.2.4':
-    resolution: {integrity: sha512-vAfasCOe6AIK70iP5UD11Ac4siNUNJ9i/9PZ3NKx07sG6sUxeag1LWdNrMWeKKYBLlzuK+Gn65Yd5nyL6ds+nw==}
+  '@vitest/spy@4.1.0':
+    resolution: {integrity: sha512-pz77k+PgNpyMDv2FV6qmk5ZVau6c3R8HC8v342T2xlFxQKTrSeYw9waIJG8KgV9fFwAtTu4ceRzMivPTH6wSxw==}
 
-  '@vitest/utils@3.2.4':
-    resolution: {integrity: sha512-fB2V0JFrQSMsCo9HiSq3Ezpdv4iYaXRG1Sx8edX3MwxfyNn83mKiGzOcH+Fkxt4MHxr3y42fQi1oeAInqgX2QA==}
+  '@vitest/utils@4.1.0':
+    resolution: {integrity: sha512-XfPXT6a8TZY3dcGY8EdwsBulFCIw+BeeX0RZn2x/BtiY/75YGh8FeWGG8QISN/WhaqSrE2OrlDgtF8q5uhOTmw==}
 
   '@xmldom/xmldom@0.8.11':
     resolution: {integrity: sha512-cQzWCtO6C8TQiYl1ruKNn2U6Ao4o4WBBcbL61yJl84x+j5sOWWFU9X7DpND8XZG3daDppSsigMdfAIl2upQBRw==}
     engines: {node: '>=10.0.0'}
 
+  '@xterm/addon-canvas@0.7.0':
+    resolution: {integrity: sha512-LF5LYcfvefJuJ7QotNRdRSPc9YASAVDeoT5uyXS/nZshZXjYplGXRECBGiznwvhNL2I8bq1Lf5MzRwstsYQ2Iw==}
+    peerDependencies:
+      '@xterm/xterm': ^5.0.0
+
   '@xterm/addon-fit@0.11.0':
     resolution: {integrity: sha512-jYcgT6xtVYhnhgxh3QgYDnnNMYTcf8ElbxxFzX0IZo+vabQqSPAjC3c1wJrKB5E19VwQei89QCiZZP86DCPF7g==}
 
-  '@xterm/addon-serialize@0.14.0':
-    resolution: {integrity: sha512-uteyTU1EkrQa2Ux6P/uFl2fzmXI46jy5uoQMKEOM0fKTyiW7cSn0WrFenHm5vO5uEXX/GpwW/FgILvv3r0WbkA==}
-
   '@xterm/addon-web-links@0.12.0':
     resolution: {integrity: sha512-4Smom3RPyVp7ZMYOYDoC/9eGJJJqYhnPLGGqJ6wOBfB8VxPViJNSKdgRYb8NpaM6YSelEKbA2SStD7lGyqaobw==}
 
-  '@xterm/addon-webgl@0.19.0':
-    resolution: {integrity: sha512-b3fMOsyLVuCeNJWxolACEUED0vm7qC0cy4wRvf3oURSzDTYVQiGPhTnhWZwIHdvC48Y+oLhvYXnY4XDXPoJo6A==}
-
   '@xterm/xterm@6.0.0':
     resolution: {integrity: sha512-TQwDdQGtwwDt+2cgKDLn0IRaSxYu1tSUjgKarSDkUM0ZNiSRXFpjxEsvc/Zgc5kq5omJ+V0a8/kIM2WD3sMOYg==}
 
@@ -2191,6 +2857,12 @@ packages:
   ajv@6.12.6:
     resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==}
 
+  allotment@1.20.5:
+    resolution: {integrity: sha512-7i4NT7ieXEyAd5lBrXmE7WHz/e7hRuo97+j+TwrPE85ha6kyFURoc76nom0dWSZ1pTKVEAMJy/+f3/Isfu/41A==}
+    peerDependencies:
+      react: ^17.0.0 || ^18.0.0 || ^19.0.0
+      react-dom: ^17.0.0 || ^18.0.0 || ^19.0.0
+
   ansi-escapes@7.3.0:
     resolution: {integrity: sha512-BvU8nYgGQBxcmMuEeUEmNTvrMVjJNSH7RgW24vXexN4Ven6qCvy4TntnvlnwnMLTVlcRQQdbRY8NKnaIoeWDNg==}
     engines: {node: '>=18'}
@@ -2207,17 +2879,14 @@ packages:
     resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==}
     engines: {node: '>=8'}
 
+  ansi-styles@5.2.0:
+    resolution: {integrity: sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==}
+    engines: {node: '>=10'}
+
   ansi-styles@6.2.3:
     resolution: {integrity: sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==}
     engines: {node: '>=12'}
 
-  any-promise@1.3.0:
-    resolution: {integrity: sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==}
-
-  anymatch@3.1.3:
-    resolution: {integrity: sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==}
-    engines: {node: '>= 8'}
-
   app-builder-bin@4.0.0:
     resolution: {integrity: sha512-xwdG0FJPQMe0M0UA4Tz0zEB8rBJTRA5a476ZawAqiBkMv16GRK5xpXThOjMaEOFnZ6zabejjG4J3da0SXG63KA==}
 
@@ -2258,9 +2927,6 @@ packages:
     engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
     deprecated: This package is no longer supported.
 
-  arg@5.0.2:
-    resolution: {integrity: sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==}
-
   argparse@2.0.1:
     resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==}
 
@@ -2268,6 +2934,9 @@ packages:
     resolution: {integrity: sha512-ik3ZgC9dY/lYVVM++OISsaYDeg1tb0VtP5uL3ouh1koGOaUMDPpbFIei4JkFimWUFPn90sbMNMXQAIVOlnYKJA==}
     engines: {node: '>=10'}
 
+  aria-query@5.3.0:
+    resolution: {integrity: sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==}
+
   array-buffer-byte-length@1.0.2:
     resolution: {integrity: sha512-LHE+8BuR7RYGDKvnrmcuSq3tDcKv9OFEXQt/HpbZhY7V6h0zlUXutnAD82GiFx9rdieCMjkvtcsPqBwgUl1Iiw==}
     engines: {node: '>= 0.4'}
@@ -2329,23 +2998,23 @@ packages:
     resolution: {integrity: sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==}
     engines: {node: '>= 4.0.0'}
 
-  autoprefixer@10.4.24:
-    resolution: {integrity: sha512-uHZg7N9ULTVbutaIsDRoUkoS8/h3bdsmVJYZ5l3wv8Cp/6UIIoRDm90hZ+BwxUj/hGBEzLxdHNSKuFpn8WOyZw==}
-    engines: {node: ^10 || ^12 || >=14}
-    hasBin: true
-    peerDependencies:
-      postcss: ^8.1.0
-
   available-typed-arrays@1.0.7:
     resolution: {integrity: sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==}
     engines: {node: '>= 0.4'}
 
+  axios@1.14.0:
+    resolution: {integrity: sha512-3Y8yrqLSwjuzpXuZ0oIYZ/XGgLwUIBU3uLvbcpb0pidD9ctpShJd43KSlEEkVQg6DS0G9NKyzOvBfUtDKEyHvQ==}
+
   bail@2.0.2:
     resolution: {integrity: sha512-0xO6mYd7JB2YesxDKplafRpsiOzPt9V02ddPCLbY1xYGPOX24NTyN50qnUxgCPcSoYMhKpAuBTjQoRZCAkUDRw==}
 
   balanced-match@1.0.2:
     resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==}
 
+  balanced-match@4.0.4:
+    resolution: {integrity: sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==}
+    engines: {node: 18 || 20 || >=22}
+
   base64-js@1.5.1:
     resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==}
 
@@ -2356,13 +3025,15 @@ packages:
   bcrypt-pbkdf@1.0.2:
     resolution: {integrity: sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==}
 
+  before-after-hook@4.0.0:
+    resolution: {integrity: sha512-q6tR3RPqIB1pMiTRMFcZwuG5T8vwp+vUvEG0vuI6B+Rikh5BfPp2fQ82c925FOs+b0lcFQ8CFrL+KbilfZFhOQ==}
+
   better-sqlite3@12.6.2:
     resolution: {integrity: sha512-8VYKM3MjCa9WcaSAI3hzwhmyHVlH8tiGFwf0RlTsZPWJ1I5MkzjiudCo4KC4DxOaL/53A5B1sI/IbldNFDbsKA==}
     engines: {node: 20.x || 22.x || 23.x || 24.x || 25.x}
 
-  binary-extensions@2.3.0:
-    resolution: {integrity: sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==}
-    engines: {node: '>=8'}
+  bidi-js@1.0.3:
+    resolution: {integrity: sha512-RKshQI1R3YQ+n9YJz2QQ147P66ELpa1FQEg20Dk8oW9t2KgLbpDLLp9aGZ7y8WHSshDknG0bknqGw5/tyCs5tw==}
 
   bindings@1.5.0:
     resolution: {integrity: sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==}
@@ -2386,6 +3057,10 @@ packages:
   brace-expansion@2.0.2:
     resolution: {integrity: sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==}
 
+  brace-expansion@5.0.4:
+    resolution: {integrity: sha512-h+DEnpVvxmfVefa4jFbCf5HdH5YMDXRsmKflpf1pILZWRFlTbJpxeU55nJl4Smt5HQaGzg1o6RHFPJaOqnmBDg==}
+    engines: {node: 18 || 20 || >=22}
+
   braces@3.0.3:
     resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==}
     engines: {node: '>=8'}
@@ -2462,18 +3137,14 @@ packages:
     resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==}
     engines: {node: '>=6'}
 
-  camelcase-css@2.0.1:
-    resolution: {integrity: sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==}
-    engines: {node: '>= 6'}
-
   caniuse-lite@1.0.30001769:
     resolution: {integrity: sha512-BCfFL1sHijQlBGWBMuJyhZUhzo7wer5sVj9hqekB/7xn0Ypy+pER/edCYQm4exbXj4WiySGp40P8UuTh6w1srg==}
 
   ccount@2.0.1:
     resolution: {integrity: sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==}
 
-  chai@5.3.3:
-    resolution: {integrity: sha512-4zNhdJD/iOjSH0A05ea+Ke6MU5mmpQcbQsSOkgdaUMJ9zTlDTD/GYlwohmIE2u0gaxHYiVHEn1Fw9mZ/ktJWgw==}
+  chai@6.2.2:
+    resolution: {integrity: sha512-NUPRluOfOiTKBKvWPtSD4PhFvWCqOi0BGStNWs57X9js7XGTprSmFoz5F0tWhR4WPjNeR9jXqdC7/UpSJTnlRg==}
     engines: {node: '>=18'}
 
   chalk@4.1.2:
@@ -2501,10 +3172,6 @@ packages:
   character-reference-invalid@2.0.1:
     resolution: {integrity: sha512-iBZ4F4wRbyORVsu0jPV7gXkOsGYjGHPmAyv+HiHG8gi5PtC9KI2j1+v8/tlibRvjoWX027ypmG/n0HtO5t7unw==}
 
-  check-error@2.1.3:
-    resolution: {integrity: sha512-PAJdDJusoxnwm1VwW07VWwUN1sl7smmC3OKggvndJFadxxDRyFJBX/ggnu/KE4kQAB7a3Dp8f/YXC1FlUprWmA==}
-    engines: {node: '>= 16'}
-
   chevrotain-allstar@0.3.1:
     resolution: {integrity: sha512-b7g+y9A0v4mxCW1qUhf3BSVPg+/NvGErk/dOkrDaHA0nQIQGAtrOjlX//9OQtRlSCy+x9rfB5N8yC71lH1nvMw==}
     peerDependencies:
@@ -2513,9 +3180,9 @@ packages:
   chevrotain@11.0.3:
     resolution: {integrity: sha512-ci2iJH6LeIkvP9eJW6gpueU8cnZhv85ELY8w8WiFtNjMHA5ad6pQLaJo9mEly/9qUyCpvqX8/POVUTf18/HFdw==}
 
-  chokidar@3.6.0:
-    resolution: {integrity: sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==}
-    engines: {node: '>= 8.10.0'}
+  chokidar@5.0.0:
+    resolution: {integrity: sha512-TQMmc3w+5AxjpL8iIiwebF73dRDF4fBIieAqGn9RGCWaEVwQ6Fb2cGe31Yns0RRIzii5goJ1Y7xbMwo1TxMplw==}
+    engines: {node: '>= 20.19.0'}
 
   chownr@1.1.4:
     resolution: {integrity: sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==}
@@ -2546,6 +3213,9 @@ packages:
   class-variance-authority@0.7.1:
     resolution: {integrity: sha512-Ka+9Trutv7G8M6WT6SeiRWz792K5qEqIGEGzXKhAE6xOWAY6pPH8U+9IY3oCMv6kqTmLsv7Xh/2w2RigkePMsg==}
 
+  classnames@2.5.1:
+    resolution: {integrity: sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow==}
+
   clean-stack@2.2.0:
     resolution: {integrity: sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==}
     engines: {node: '>=6'}
@@ -2619,10 +3289,6 @@ packages:
     resolution: {integrity: sha512-H+y0Jo/T1RZ9qPP4Eh1pkcQcLRglraJaSLoyOtHxu6AapkjWVCy2Sit1QQ4x3Dng8qDlSsZEet7g5Pq06MvTgw==}
     engines: {node: '>=20'}
 
-  commander@4.1.1:
-    resolution: {integrity: sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==}
-    engines: {node: '>= 6'}
-
   commander@5.1.0:
     resolution: {integrity: sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==}
     engines: {node: '>= 6'}
@@ -2702,10 +3368,9 @@ packages:
     resolution: {integrity: sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==}
     engines: {node: '>= 8'}
 
-  cssesc@3.0.0:
-    resolution: {integrity: sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==}
-    engines: {node: '>=4'}
-    hasBin: true
+  css-tree@3.2.1:
+    resolution: {integrity: sha512-X7sjQzceUhu1u7Y/ylrRZFU2FS6LRiFVp6rKLPg23y3x3c3DOKAwuXGDp+PAGjh6CSnCjYeAul8pcT8bAl+lSA==}
+    engines: {node: ^10 || ^12.20.0 || ^14.13.0 || >=15.0.0}
 
   csstype@3.2.3:
     resolution: {integrity: sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==}
@@ -2866,6 +3531,10 @@ packages:
   dagre-d3-es@7.0.13:
     resolution: {integrity: sha512-efEhnxpSuwpYOKRm/L5KbqoZmNNukHa/Flty4Wp62JRvgH2ojwVgPgdYyr4twpieZnyRDdIH7PY2mopX26+j2Q==}
 
+  data-urls@7.0.0:
+    resolution: {integrity: sha512-23XHcCF+coGYevirZceTVD7NdJOqVn+49IHyxgszm+JIiHLoB2TkmPtsYkNWT1pvRSGkc35L6NHs0yHkN2SumA==}
+    engines: {node: ^20.19.0 || ^22.12.0 || >=24.0.0}
+
   data-view-buffer@1.0.2:
     resolution: {integrity: sha512-EmKO5V3OLXh1rtK2wgXRansaK1/mtVdTUEiEI0W8RkvgT05kfxaH29PliLnpLP73yYO6142Q72QNa8Wx/A5CqQ==}
     engines: {node: '>= 0.4'}
@@ -2882,6 +3551,9 @@ packages:
     resolution: {integrity: sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==}
     engines: {node: '>=0.11'}
 
+  date-fns@4.1.0:
+    resolution: {integrity: sha512-Ukq0owbQXxa/U3EGtsdVBkR1w7KOQ5gIBqdH2hkvknzZPYvBxb/aa6E8L7tmjFtkwZBu3UXBbjIgPo/Ez4xaNg==}
+
   dayjs@1.11.19:
     resolution: {integrity: sha512-t5EcLVS6QPBNqM2z8fakk/NKel+Xzshgt8FFKAn+qwlD1pzZWxh0nVCrvFK7ZDb6XucZeF9z8C7CBWTRIVApAw==}
 
@@ -2902,6 +3574,9 @@ packages:
       supports-color:
         optional: true
 
+  decimal.js@10.6.0:
+    resolution: {integrity: sha512-YpgQiITW3JXGntzdUmyUR1V812Hn8T1YVXhCu+wO3OpS4eU9l4YdD3qjyiKdV6mvV29zapkMeD390UVEf2lkUg==}
+
   decode-named-character-reference@1.3.0:
     resolution: {integrity: sha512-GtpQYB283KrPp6nRw50q3U9/VfOutZOe103qlN7BPP6Ad27xYnOIWv4lPzo8HCAL+mMZofJ9KEy30fq6MfaK6Q==}
 
@@ -2909,10 +3584,6 @@ packages:
     resolution: {integrity: sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==}
     engines: {node: '>=10'}
 
-  deep-eql@5.0.2:
-    resolution: {integrity: sha512-h5k/5U50IJJFpzfL6nO9jaaumfjO/f2NjK/oYB2Djzm4p9L+3T9qWpZqZ2hAbLPuuYq9wrU08WQyBTL5GbPk5Q==}
-    engines: {node: '>=6'}
-
   deep-extend@0.6.0:
     resolution: {integrity: sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==}
     engines: {node: '>=4.0.0'}
@@ -2963,12 +3634,12 @@ packages:
   detect-node@2.1.0:
     resolution: {integrity: sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==}
 
+  devicon@2.17.0:
+    resolution: {integrity: sha512-2nKUdjobJlmRSaCHa50PGsVq0VDURnq9gVzQoJggsM/NKN0tLhC/Uq2zmy2pH36Q/1q3gvYwp/GjTgv/R0Ysbg==}
+
   devlop@1.1.0:
     resolution: {integrity: sha512-RWmIqhcFf1lRYBvNmr7qTNuyCt/7/ns2jbpp1+PalgE/rDQcBT0fioSMUpJ93irlUhC5hrg4cYqe6U+0ImW0rA==}
 
-  didyoumean@1.2.2:
-    resolution: {integrity: sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==}
-
   dir-compare@3.3.0:
     resolution: {integrity: sha512-J7/et3WlGUCxjdnD3HAAzQ6nsnc0WL6DD7WcwJb7c39iH1+AWfg+9OqzJNaI6PkBwBvm1mhZNL9iY/nRiZXlPg==}
 
@@ -2979,9 +3650,6 @@ packages:
     resolution: {integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==}
     engines: {node: '>=8'}
 
-  dlv@1.1.3:
-    resolution: {integrity: sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==}
-
   dmg-builder@26.8.1:
     resolution: {integrity: sha512-glMJgnTreo8CFINujtAhCgN96QAqApDMZ8Vl1r8f0QT8QprvC1UCltV4CcWj20YoIyLZx6IUskaJZ0NV8fokcg==}
 
@@ -2999,6 +3667,9 @@ packages:
     resolution: {integrity: sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==}
     engines: {node: '>=6.0.0'}
 
+  dom-accessibility-api@0.5.16:
+    resolution: {integrity: sha512-X7BJ2yElsnOJ30pZF4uIIDfBEVgF4XEBxL9Bxhy6dnrm5hkzqmsWHGTiHqRiITNhMyFLyAiWndIJP7Z1NTteDg==}
+
   dompurify@3.2.7:
     resolution: {integrity: sha512-WhL/YuveyGXJaerVlMYGWhvQswa7myDG17P7Vu65EWC05o8vfeNbvNf4d/BOvH99+ZW+LlQsc1GDKMa1vNK6dw==}
 
@@ -3016,10 +3687,6 @@ packages:
     resolution: {integrity: sha512-uBq4egWHTcTt33a72vpSG0z3HnPuIl6NqYcTrKEg2azoEyl2hpW0zqlxysq2pK9HlDIHyHyakeYaYnSAwd8bow==}
     engines: {node: '>=12'}
 
-  dotenv@17.2.4:
-    resolution: {integrity: sha512-mudtfb4zRB4bVvdj0xRo+e6duH1csJRM8IukBqfTRvHotn9+LBXB8ynAidP9zHqoRC/fsllXgk4kCKlR21fIhw==}
-    engines: {node: '>=12'}
-
   dotenv@9.0.2:
     resolution: {integrity: sha512-I9OvvrHp4pIARv4+x9iuewrWycX6CcZtoAu1XrzPxc5UygMJXJZYmBsynku8IkrJwgypE5DGNjDPmPRhDCptUg==}
     engines: {node: '>=10'}
@@ -3153,8 +3820,19 @@ packages:
   electron-updater@6.7.3:
     resolution: {integrity: sha512-EgkT8Z9noqXKbwc3u5FkJA+r48jwZ5DTUiOkJMOTEEH//n5Am6wfQGz7nvSFEA2oIAMv9jRzn5JKTyWeSKOPgg==}
 
-  electron@30.5.1:
-    resolution: {integrity: sha512-AhL7+mZ8Lg14iaNfoYTkXQ2qee8mmsQyllKdqxlpv/zrKgfxz6jNVtcRRbQtLxtF8yzcImWdfTQROpYiPumdbw==}
+  electron-vite@5.0.0:
+    resolution: {integrity: sha512-OHp/vjdlubNlhNkPkL/+3JD34ii5ov7M0GpuXEVdQeqdQ3ulvVR7Dg/rNBLfS5XPIFwgoBLDf9sjjrL+CuDyRQ==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    hasBin: true
+    peerDependencies:
+      '@swc/core': ^1.0.0
+      vite: ^5.0.0 || ^6.0.0 || ^7.0.0
+    peerDependenciesMeta:
+      '@swc/core':
+        optional: true
+
+  electron@40.7.0:
+    resolution: {integrity: sha512-oQe76S/3V1rcb0+i45hAxnCH8udkRZSaHUNwglzNAEKbB94LSJ1qwbFo8+uRc2UsYZgCqSIMRcyX40GyOkD+Xw==}
     engines: {node: '>= 12.20.55'}
     hasBin: true
 
@@ -3173,10 +3851,18 @@ packages:
   end-of-stream@1.4.5:
     resolution: {integrity: sha512-ooEGc6HP26xXq/N+GCGOT0JKCLDGrq2bQUZrQ7gyrJiZANJ/8YDTxTpQBXGMn+WbIQXNVpyWymm7KYVICQnyOg==}
 
+  enhanced-resolve@5.20.0:
+    resolution: {integrity: sha512-/ce7+jQ1PQ6rVXwe+jKEg5hW5ciicHwIQUagZkp6IufBoY3YDgdTTY1azVs0qoRgVmvsNB+rbjLJxDAeHHtwsQ==}
+    engines: {node: '>=10.13.0'}
+
   entities@6.0.1:
     resolution: {integrity: sha512-aN97NXWF6AWBTahfVOIrB/NShkzi5H7F9r1s9mD3cDj4Ko5f2qhhVoYMibXF7GlLveb/D2ioWay8lxI97Ven3g==}
     engines: {node: '>=0.12'}
 
+  entities@8.0.0:
+    resolution: {integrity: sha512-zwfzJecQ/Uej6tusMqwAqU/6KL2XaB2VZ2Jg54Je6ahNBGNH6Ek6g3jjNCF0fG9EWQKGZNddNjU5F1ZQn/sBnA==}
+    engines: {node: '>=20.19.0'}
+
   env-paths@2.2.1:
     resolution: {integrity: sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==}
     engines: {node: '>=6'}
@@ -3200,8 +3886,8 @@ packages:
     resolution: {integrity: sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==}
     engines: {node: '>= 0.4'}
 
-  es-module-lexer@1.7.0:
-    resolution: {integrity: sha512-jEQoCwk8hyb2AZziIOLhDqpm5+2ww5uIE6lkO/6jcOCusfk6LhMHpXXfBLXTZ7Ydyt0j4VoUQv6uGNYbdW+kBA==}
+  es-module-lexer@2.0.0:
+    resolution: {integrity: sha512-5POEcUuZybH7IdmGsD8wlf0AI55wMecM9rVBTI/qEAy2c1kTOm3DjFYjrBdI2K3BaJjJYfYFeRtM0t9ssnRuxw==}
 
   es-object-atoms@1.1.1:
     resolution: {integrity: sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==}
@@ -3237,9 +3923,9 @@ packages:
     engines: {node: '>=12'}
     hasBin: true
 
-  esbuild@0.21.5:
-    resolution: {integrity: sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==}
-    engines: {node: '>=12'}
+  esbuild@0.25.12:
+    resolution: {integrity: sha512-bbPBYYrtZbkt6Os6FiTLCTFxvq4tt3JKall1vRwshA3fdVztsLAatFaZobhkBC8/BrPetoa0oksYoKXoG4ryJg==}
+    engines: {node: '>=18'}
     hasBin: true
 
   escalade@3.2.0:
@@ -3364,6 +4050,9 @@ packages:
     resolution: {integrity: sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA==}
     engines: {'0': node >=0.6.0}
 
+  fast-content-type-parse@3.0.0:
+    resolution: {integrity: sha512-ZvLdcY8P+N8mGQJahJV5G4U88CSvT1rP8ApL6uETe88MBXrBHAkZlSEySdUlyztF7ccb+Znos3TFqaepHxdhBg==}
+
   fast-deep-equal@3.1.3:
     resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==}
 
@@ -3427,6 +4116,15 @@ packages:
   flatted@3.3.3:
     resolution: {integrity: sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==}
 
+  follow-redirects@1.15.11:
+    resolution: {integrity: sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ==}
+    engines: {node: '>=4.0'}
+    peerDependencies:
+      debug: '*'
+    peerDependenciesMeta:
+      debug:
+        optional: true
+
   for-each@0.3.5:
     resolution: {integrity: sha512-dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg==}
     engines: {node: '>= 0.4'}
@@ -3443,9 +4141,6 @@ packages:
     resolution: {integrity: sha512-wzsgA6WOq+09wrU1tsJ09udeR/YZRaeArL9e1wPbFg3GG2yDnC2ldKpxs4xunpFF9DgqCqOIra3bc1HWrJ37Ww==}
     engines: {node: '>=0.4.x'}
 
-  fraction.js@5.3.4:
-    resolution: {integrity: sha512-1X1NTtiJphryn/uLQz3whtY6jK3fTqoE3ohKs0tT+Ujr1W59oopxmoEh7Lu5p6vBaPbgoM0bzveAW4Qi5RyWDQ==}
-
   framer-motion@12.33.0:
     resolution: {integrity: sha512-ca8d+rRPcDP5iIF+MoT3WNc0KHJMjIyFAbtVLvM9eA7joGSpeqDfiNH/kCs1t4CHi04njYvWyj0jS4QlEK/rJQ==}
     peerDependencies:
@@ -3490,6 +4185,11 @@ packages:
   fs.realpath@1.0.0:
     resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==}
 
+  fsevents@2.3.2:
+    resolution: {integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==}
+    engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
+    os: [darwin]
+
   fsevents@2.3.3:
     resolution: {integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==}
     engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
@@ -3573,6 +4273,10 @@ packages:
     deprecated: Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me
     hasBin: true
 
+  glob@13.0.6:
+    resolution: {integrity: sha512-Wjlyrolmm8uDpm/ogGyXZXb1Z+Ca2B8NbJwqBVg0axK9GbBeoS7yGV6vjXnYdGm6X53iehEuxxbyiKp8QmN4Vw==}
+    engines: {node: 18 || 20 || >=22}
+
   glob@7.2.3:
     resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==}
     deprecated: Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me
@@ -3611,6 +4315,10 @@ packages:
   graphemer@1.4.0:
     resolution: {integrity: sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==}
 
+  graphql@16.13.1:
+    resolution: {integrity: sha512-gGgrVCoDKlIZ8fIqXBBb0pPKqDgki0Z/FSKNiQzSGj2uEYHr1tq5wmBegGwJx6QB5S5cM0khSBpi/JFHMCvsmQ==}
+    engines: {node: ^12.22.0 || ^14.16.0 || ^16.0.0 || >=17.0.0}
+
   hachure-fill@0.5.2:
     resolution: {integrity: sha512-3GKBOn+m2LX9iq+JC1064cSFprJY4jL1jCXTcpnfER5HYE2l/4EfWSGzkPa/ZDBmYI0ZOEj5VHV/eKnPGkHuOg==}
 
@@ -3712,6 +4420,10 @@ packages:
     resolution: {integrity: sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==}
     engines: {node: '>=10'}
 
+  html-encoding-sniffer@6.0.0:
+    resolution: {integrity: sha512-CV9TW3Y3f8/wT0BRFc1/KAVQ3TUHiXmaAb6VW9vtiMFf7SLoMd1PdAc4W3KFOFETBJUb90KatHqlsZMWV+R9Gg==}
+    engines: {node: ^20.19.0 || ^22.12.0 || >=24.0.0}
+
   html-url-attributes@3.0.1:
     resolution: {integrity: sha512-ol6UPyBWqsrO6EJySPz2O7ZSr856WDrEzM5zMqp+FJJLGMW35cLYmmZnl0vztAZxRUoNZJFTCohfjuIJ8I4QBQ==}
 
@@ -3844,10 +4556,6 @@ packages:
     resolution: {integrity: sha512-n4ZT37wG78iz03xPRKJrHTdZbe3IicyucEtdRsV5yglwc3GyUfbAfpSeD0FJ41NbUNSt5wbhqfp1fS+BgnvDFQ==}
     engines: {node: '>= 0.4'}
 
-  is-binary-path@2.1.0:
-    resolution: {integrity: sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==}
-    engines: {node: '>=8'}
-
   is-boolean-object@1.2.2:
     resolution: {integrity: sha512-wa56o2/ElJMYqjCjGkXri7it5FbebW5usLw/nPmCMs5DeZ7eziSYZhSmPRn0txqeW4LnAmQQU7FgqLpsEFKM4A==}
     engines: {node: '>= 0.4'}
@@ -3939,6 +4647,9 @@ packages:
     resolution: {integrity: sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg==}
     engines: {node: '>=12'}
 
+  is-potential-custom-element-name@1.0.1:
+    resolution: {integrity: sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==}
+
   is-regex@1.2.1:
     resolution: {integrity: sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==}
     engines: {node: '>= 0.4'}
@@ -4012,10 +4723,6 @@ packages:
     engines: {node: '>=10'}
     hasBin: true
 
-  jiti@1.21.7:
-    resolution: {integrity: sha512-/imKNG4EbWNrVjoNC/1H5/9GFy+tqjGBHCaSsN+P2RnPqjsLmv6UD3Ej+Kj8nBWaRAwyk7kK5ZUc+OEatnTR3A==}
-    hasBin: true
-
   jiti@2.6.1:
     resolution: {integrity: sha512-ekilCSN1jwRvIbgeg/57YFh8qQDNbwDb9xT/qu2DAHbFFZUicIl4ygVaAvzveMhMVr3LnpSKTNnwt8PoOfmKhQ==}
     hasBin: true
@@ -4023,13 +4730,19 @@ packages:
   js-tokens@4.0.0:
     resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==}
 
-  js-tokens@9.0.1:
-    resolution: {integrity: sha512-mxa9E9ITFOt0ban3j6L5MpjwegGz6lBQmM1IJkWeBZGcMxto50+eWdjC/52xDbS2vy0k7vIMK0Fe2wfL9OQSpQ==}
-
   js-yaml@4.1.1:
     resolution: {integrity: sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==}
     hasBin: true
 
+  jsdom@29.0.2:
+    resolution: {integrity: sha512-9VnGEBosc/ZpwyOsJBCQ/3I5p7Q5ngOY14a9bf5btenAORmZfDse1ZEheMiWcJ3h81+Fv7HmJFdS0szo/waF2w==}
+    engines: {node: ^20.19.0 || ^22.13.0 || >=24.0.0}
+    peerDependencies:
+      canvas: ^3.0.0
+    peerDependenciesMeta:
+      canvas:
+        optional: true
+
   jsesc@3.1.0:
     resolution: {integrity: sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==}
     engines: {node: '>=6'}
@@ -4047,6 +4760,9 @@ packages:
   json-stringify-safe@5.0.1:
     resolution: {integrity: sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==}
 
+  json-with-bigint@3.5.7:
+    resolution: {integrity: sha512-7ei3MdAI5+fJPVnKlW77TKNKwQ5ppSzWvhPuSuINT/GYW9ZOC1eRKOuhV9yHG5aEsUPj9BBx5JIekkmoLHxZOw==}
+
   json5@1.0.2:
     resolution: {integrity: sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==}
     hasBin: true
@@ -4056,6 +4772,9 @@ packages:
     engines: {node: '>=6'}
     hasBin: true
 
+  jsonc-parser@3.3.1:
+    resolution: {integrity: sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==}
+
   jsonfile@4.0.0:
     resolution: {integrity: sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==}
 
@@ -4066,9 +4785,6 @@ packages:
     resolution: {integrity: sha512-YHzO7721WbmAL6Ov1uzN/l5mY5WWWhJBSW+jq4tkfZfsxmo1hu6frS0EOswvjBUnWE6NtjEs48SFn5CQESRLZg==}
     hasBin: true
 
-  keytar@7.9.0:
-    resolution: {integrity: sha512-VPD8mtVtm5JNtA2AErl6Chp06JBfy7diFQ7TQQhdpWOl6MrCRB+eRbvAZUsbGQS9kiMq0coJsy0W0vHpDCkWsQ==}
-
   keyv@4.5.4:
     resolution: {integrity: sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==}
 
@@ -4088,20 +4804,87 @@ packages:
   lazy-val@1.0.5:
     resolution: {integrity: sha512-0/BnGCCfyUMkBpeDgWihanIAF9JmZhHBgUhEqzvf+adhNGLoP6TaiI5oF8oyb3I45P+PcnrqihSf01M0l0G5+Q==}
 
-  lazystream@1.0.1:
-    resolution: {integrity: sha512-b94GiNHQNy6JNTrt5w6zNyffMrNkXZb3KTkCZJb2V1xaEGCk093vkZ2jk3tpaeP33/OiXC+WvK9AxUebnf5nbw==}
-    engines: {node: '>= 0.6.3'}
+  lazystream@1.0.1:
+    resolution: {integrity: sha512-b94GiNHQNy6JNTrt5w6zNyffMrNkXZb3KTkCZJb2V1xaEGCk093vkZ2jk3tpaeP33/OiXC+WvK9AxUebnf5nbw==}
+    engines: {node: '>= 0.6.3'}
+
+  levn@0.4.1:
+    resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==}
+    engines: {node: '>= 0.8.0'}
+
+  lightningcss-android-arm64@1.31.1:
+    resolution: {integrity: sha512-HXJF3x8w9nQ4jbXRiNppBCqeZPIAfUo8zE/kOEGbW5NZvGc/K7nMxbhIr+YlFlHW5mpbg/YFPdbnCh1wAXCKFg==}
+    engines: {node: '>= 12.0.0'}
+    cpu: [arm64]
+    os: [android]
+
+  lightningcss-darwin-arm64@1.31.1:
+    resolution: {integrity: sha512-02uTEqf3vIfNMq3h/z2cJfcOXnQ0GRwQrkmPafhueLb2h7mqEidiCzkE4gBMEH65abHRiQvhdcQ+aP0D0g67sg==}
+    engines: {node: '>= 12.0.0'}
+    cpu: [arm64]
+    os: [darwin]
+
+  lightningcss-darwin-x64@1.31.1:
+    resolution: {integrity: sha512-1ObhyoCY+tGxtsz1lSx5NXCj3nirk0Y0kB/g8B8DT+sSx4G9djitg9ejFnjb3gJNWo7qXH4DIy2SUHvpoFwfTA==}
+    engines: {node: '>= 12.0.0'}
+    cpu: [x64]
+    os: [darwin]
+
+  lightningcss-freebsd-x64@1.31.1:
+    resolution: {integrity: sha512-1RINmQKAItO6ISxYgPwszQE1BrsVU5aB45ho6O42mu96UiZBxEXsuQ7cJW4zs4CEodPUioj/QrXW1r9pLUM74A==}
+    engines: {node: '>= 12.0.0'}
+    cpu: [x64]
+    os: [freebsd]
+
+  lightningcss-linux-arm-gnueabihf@1.31.1:
+    resolution: {integrity: sha512-OOCm2//MZJ87CdDK62rZIu+aw9gBv4azMJuA8/KB74wmfS3lnC4yoPHm0uXZ/dvNNHmnZnB8XLAZzObeG0nS1g==}
+    engines: {node: '>= 12.0.0'}
+    cpu: [arm]
+    os: [linux]
+
+  lightningcss-linux-arm64-gnu@1.31.1:
+    resolution: {integrity: sha512-WKyLWztD71rTnou4xAD5kQT+982wvca7E6QoLpoawZ1gP9JM0GJj4Tp5jMUh9B3AitHbRZ2/H3W5xQmdEOUlLg==}
+    engines: {node: '>= 12.0.0'}
+    cpu: [arm64]
+    os: [linux]
+    libc: [glibc]
+
+  lightningcss-linux-arm64-musl@1.31.1:
+    resolution: {integrity: sha512-mVZ7Pg2zIbe3XlNbZJdjs86YViQFoJSpc41CbVmKBPiGmC4YrfeOyz65ms2qpAobVd7WQsbW4PdsSJEMymyIMg==}
+    engines: {node: '>= 12.0.0'}
+    cpu: [arm64]
+    os: [linux]
+    libc: [musl]
+
+  lightningcss-linux-x64-gnu@1.31.1:
+    resolution: {integrity: sha512-xGlFWRMl+0KvUhgySdIaReQdB4FNudfUTARn7q0hh/V67PVGCs3ADFjw+6++kG1RNd0zdGRlEKa+T13/tQjPMA==}
+    engines: {node: '>= 12.0.0'}
+    cpu: [x64]
+    os: [linux]
+    libc: [glibc]
+
+  lightningcss-linux-x64-musl@1.31.1:
+    resolution: {integrity: sha512-eowF8PrKHw9LpoZii5tdZwnBcYDxRw2rRCyvAXLi34iyeYfqCQNA9rmUM0ce62NlPhCvof1+9ivRaTY6pSKDaA==}
+    engines: {node: '>= 12.0.0'}
+    cpu: [x64]
+    os: [linux]
+    libc: [musl]
 
-  levn@0.4.1:
-    resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==}
-    engines: {node: '>= 0.8.0'}
+  lightningcss-win32-arm64-msvc@1.31.1:
+    resolution: {integrity: sha512-aJReEbSEQzx1uBlQizAOBSjcmr9dCdL3XuC/6HLXAxmtErsj2ICo5yYggg1qOODQMtnjNQv2UHb9NpOuFtYe4w==}
+    engines: {node: '>= 12.0.0'}
+    cpu: [arm64]
+    os: [win32]
 
-  lilconfig@3.1.3:
-    resolution: {integrity: sha512-/vlFKAoH5Cgt3Ie+JLhRbwOsCQePABiU3tJ1egGvyQ+33R/vcwM2Zl2QR/LzjsBeItPt3oSVXapn+m4nQDvpzw==}
-    engines: {node: '>=14'}
+  lightningcss-win32-x64-msvc@1.31.1:
+    resolution: {integrity: sha512-I9aiFrbd7oYHwlnQDqr1Roz+fTz61oDDJX7n9tYF9FJymH1cIN1DtKw3iYt6b8WZgEjoNwVSncwF4wx/ZedMhw==}
+    engines: {node: '>= 12.0.0'}
+    cpu: [x64]
+    os: [win32]
 
-  lines-and-columns@1.2.4:
-    resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==}
+  lightningcss@1.31.1:
+    resolution: {integrity: sha512-l51N2r93WmGUye3WuFoN5k10zyvrVs0qfKBhyC5ogUQ6Ew6JUSswh78mbSO+IU3nTWsyOArqPCcShdQSadghBQ==}
+    engines: {node: '>= 12.0.0'}
 
   lint-staged@16.3.0:
     resolution: {integrity: sha512-YVHHy/p6U4/No9Af+35JLh3umJ9dPQnGTvNCbfO/T5fC60us0jFnc+vw33cqveI+kqxIFJQakcMVTO2KM+653A==}
@@ -4122,6 +4905,12 @@ packages:
   lodash-es@4.17.23:
     resolution: {integrity: sha512-kVI48u3PZr38HdYz98UmfPnXl2DXrpdctLrFLCd3kOx1xUkOmpFPx7gCWWM5MPkL/fD8zb+Ph0QzjGFs4+hHWg==}
 
+  lodash.clamp@4.0.3:
+    resolution: {integrity: sha512-HvzRFWjtcguTW7yd8NJBshuNaCa8aqNFtnswdT7f/cMd/1YKy5Zzoq4W/Oxvnx9l7aeY258uSdDfM793+eLsVg==}
+
+  lodash.debounce@4.0.8:
+    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+
   lodash.defaults@4.2.0:
     resolution: {integrity: sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==}
 
@@ -4164,13 +4953,6 @@ packages:
   longest-streak@3.1.0:
     resolution: {integrity: sha512-9Ri+o0JYgehTaVBBDoMqIl8GXtbWg711O3srftcHhZ0dqnETqLaoIK0x17fUw9rFSlK/0NlsKe0Ahhyl5pXE2g==}
 
-  loose-envify@1.4.0:
-    resolution: {integrity: sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==}
-    hasBin: true
-
-  loupe@3.2.1:
-    resolution: {integrity: sha512-CdzqowRJCeLU72bHvWqwRBBlLcMEtIvGrlvef74kMnV2AolS9Y8xUv1I0U/MNAWMhBlKIoyuEgoJ0t/bbwHbLQ==}
-
   lowercase-keys@2.0.0:
     resolution: {integrity: sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==}
     engines: {node: '>=8'}
@@ -4181,6 +4963,14 @@ packages:
   lru-cache@10.4.3:
     resolution: {integrity: sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==}
 
+  lru-cache@11.2.6:
+    resolution: {integrity: sha512-ESL2CrkS/2wTPfuend7Zhkzo2u0daGJ/A2VucJOgQ/C48S/zB8MMeMHSGKYpXhIjbPxfuezITkaBH1wqv00DDQ==}
+    engines: {node: 20 || >=22}
+
+  lru-cache@11.3.5:
+    resolution: {integrity: sha512-NxVFwLAnrd9i7KUBxC4DrUhmgjzOs+1Qm50D3oF1/oL+r1NpZ4gA7xvG0/zJ8evR7zIKn4vLf7qTNduWFtCrRw==}
+    engines: {node: 20 || >=22}
+
   lru-cache@5.1.1:
     resolution: {integrity: sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==}
 
@@ -4198,6 +4988,10 @@ packages:
     peerDependencies:
       react: ^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0
 
+  lz-string@1.5.0:
+    resolution: {integrity: sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==}
+    hasBin: true
+
   magic-string@0.30.21:
     resolution: {integrity: sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==}
 
@@ -4278,6 +5072,9 @@ packages:
   mdast-util-to-string@4.0.0:
     resolution: {integrity: sha512-0H44vDimn51F0YwvxSJSm0eCDOJTRlmN0R1yBh4HLj9wiV1Dn0QoXGbvFAWj2hSItVTlCmBF1hqKlIyUBVFLPg==}
 
+  mdn-data@2.27.1:
+    resolution: {integrity: sha512-9Yubnt3e8A0OKwxYSXyhLymGW4sCufcLG6VdiDdUGVkPhpqLxlvP5vl1983gQjJl3tqbrM731mjaZaP68AgosQ==}
+
   merge-stream@2.0.0:
     resolution: {integrity: sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==}
 
@@ -4441,6 +5238,10 @@ packages:
     resolution: {integrity: sha512-fu656aJ0n2kcXwsnwnv9g24tkU5uSmOlTjd6WyyaKm2Z+h1qmY6bAjrcaIxF/BslFqbZ8UBtbJi7KgQOZD2PTw==}
     engines: {node: 20 || >=22}
 
+  minimatch@10.2.4:
+    resolution: {integrity: sha512-oRjTw/97aTBN0RHbYCdtF1MQfvusSIBQM0IZEgzl6426+8jSC0nF1a/GmnVLpfB9yyr6g6FTqWqiZVbxrtaCIg==}
+    engines: {node: 18 || 20 || >=22}
+
   minimatch@3.1.2:
     resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==}
 
@@ -4499,6 +5300,10 @@ packages:
     resolution: {integrity: sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==}
     engines: {node: '>=16 || 14 >=14.17'}
 
+  minipass@7.1.3:
+    resolution: {integrity: sha512-tEBHqDnIoM/1rXME1zgka9g6Q2lcoCkxHLuc7ODJ5BxbP5d4c2Z5cGgtXAku59200Cx7diuHTOYfSBD8n6mm8A==}
+    engines: {node: '>=16 || 14 >=14.17'}
+
   minizlib@2.1.2:
     resolution: {integrity: sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==}
     engines: {node: '>= 8'}
@@ -4518,6 +5323,22 @@ packages:
   mlly@1.8.0:
     resolution: {integrity: sha512-l8D9ODSRWLe2KHJSifWGwBqpTZXIXTeo8mlKjY+E2HAakaTeNpqAyBZ8GSqLzHgw4XmHmC8whvpjJNMbFZN7/g==}
 
+  mobx-react-lite@4.1.1:
+    resolution: {integrity: sha512-iUxiMpsvNraCKXU+yPotsOncNNmyeS2B5DKL+TL6Tar/xm+wwNJAubJmtRSeAoYawdZqwv8Z/+5nPRHeQxTiXg==}
+    peerDependencies:
+      mobx: ^6.9.0
+      react: ^16.8.0 || ^17 || ^18 || ^19
+      react-dom: '*'
+      react-native: '*'
+    peerDependenciesMeta:
+      react-dom:
+        optional: true
+      react-native:
+        optional: true
+
+  mobx@6.15.0:
+    resolution: {integrity: sha512-UczzB+0nnwGotYSgllfARAqWCJ5e/skuV2K/l+Zyck/H6pJIhLXuBnz+6vn2i211o7DtbE78HQtsYEKICHGI+g==}
+
   monaco-editor@0.55.1:
     resolution: {integrity: sha512-jz4x+TJNFHwHtwuV9vA9rMujcZRb0CEilTEwG2rRSpe/A7Jdkuj8xPKttCgOh+v/lkHy7HsZ64oj+q3xoAFl9A==}
 
@@ -4541,12 +5362,13 @@ packages:
       react-dom:
         optional: true
 
+  mrmime@2.0.1:
+    resolution: {integrity: sha512-Y3wQdFg2Va6etvQ5I82yUhGdsKrcYox6p7FfL1LbK2J4V01F9TGlepTIhnK24t7koZibmg82KGglhA1XK5IsLQ==}
+    engines: {node: '>=10'}
+
   ms@2.1.3:
     resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==}
 
-  mz@2.7.0:
-    resolution: {integrity: sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==}
-
   nan@2.25.0:
     resolution: {integrity: sha512-0M90Ag7Xn5KMLLZ7zliPWP3rT90P6PN+IzVFS0VqmnPktBk3700xUVv8Ikm9EUaUE5SDWdp/BIxdENzVznpm1g==}
 
@@ -4588,9 +5410,6 @@ packages:
   node-addon-api@1.7.2:
     resolution: {integrity: sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg==}
 
-  node-addon-api@4.3.0:
-    resolution: {integrity: sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ==}
-
   node-addon-api@7.1.1:
     resolution: {integrity: sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==}
 
@@ -4607,8 +5426,8 @@ packages:
     engines: {node: '>= 10.12.0'}
     hasBin: true
 
-  node-pty@1.0.0:
-    resolution: {integrity: sha512-wtBMWWS7dFZm/VgqElrTvtfMq4GzJ6+edFI0Y0zyzygUSZMgZdraDUMUhCIvkjhJjme15qWmbyJbtAx4ot4uZA==}
+  node-pty@1.1.0:
+    resolution: {integrity: sha512-20JqtutY6JPXTUnL0ij1uad7Qe1baT46lyolh2sSENDd4sTzKZ4nmAFkeAARDKwmlLjPx6XKRlwRUxwjOy+lUg==}
 
   node-releases@2.0.27:
     resolution: {integrity: sha512-nmh3lCkYZ3grZvqcCH+fjmQ7X+H0OeZgP40OierEaAptX4XofMh5kwNbWh7lBduUzCcV/8kZ+NDLCwm2iorIlA==}
@@ -4640,14 +5459,6 @@ packages:
     engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
     deprecated: This package is no longer supported.
 
-  object-assign@4.1.1:
-    resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==}
-    engines: {node: '>=0.10.0'}
-
-  object-hash@3.0.0:
-    resolution: {integrity: sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==}
-    engines: {node: '>= 6'}
-
   object-inspect@1.13.4:
     resolution: {integrity: sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==}
     engines: {node: '>= 0.4'}
@@ -4672,6 +5483,9 @@ packages:
     resolution: {integrity: sha512-gXah6aZrcUxjWg2zR2MwouP2eHlCBzdV4pygudehaKXSGW4v2AsRQUK+lwwXhii6KFZcunEnmSUoYp5CXibxtA==}
     engines: {node: '>= 0.4'}
 
+  obug@2.1.1:
+    resolution: {integrity: sha512-uTqF9MuPraAQ+IsnPf366RG4cP9RtUi7MLO1N3KEc+wb0a6yKpeL0lmk2IB1jY5KHPAlTc6T/JRdC/YqxHNwkQ==}
+
   once@1.4.0:
     resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==}
 
@@ -4740,6 +5554,9 @@ packages:
   parse5@7.3.0:
     resolution: {integrity: sha512-IInvU7fabl34qmi9gY8XOVxhYyMyuH2xUNpb2q8/Y+7552KlejkRvqvD19nMoUW/uQGGbqNpA6Tufu5FL5BZgw==}
 
+  parse5@8.0.1:
+    resolution: {integrity: sha512-z1e/HMG90obSGeidlli3hj7cbocou0/wa5HacvI3ASx34PecNjNQeaHNo5WIZpWofN9kgkqV1q5YvXe3F0FoPw==}
+
   path-data-parser@0.1.0:
     resolution: {integrity: sha512-NOnmBpt5Y2RWbuv0LMzsayp3lVylAHLPUTut412ZA3l+C4uw4ZVkQbjShYCQ8TCpUMdPapr4YjUqLYD6v68j+w==}
 
@@ -4762,6 +5579,10 @@ packages:
     resolution: {integrity: sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==}
     engines: {node: '>=16 || 14 >=14.18'}
 
+  path-scurry@2.0.2:
+    resolution: {integrity: sha512-3O/iVVsJAPsOnpwWIeD+d6z/7PmqApyQePUtCndjatj/9I5LylHvt5qluFaBT3I5h3r1ejfR056c+FCv+NnNXg==}
+    engines: {node: 18 || 20 || >=22}
+
   path-type@4.0.0:
     resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==}
     engines: {node: '>=8'}
@@ -4769,10 +5590,6 @@ packages:
   pathe@2.0.3:
     resolution: {integrity: sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==}
 
-  pathval@2.0.1:
-    resolution: {integrity: sha512-//nshmD55c46FuFw26xV/xFAaB5HF9Xdap7HJBBnrKdAd6/GxDBaNA1870O79+9ueg61cZLSVc+OaFlfmObYVQ==}
-    engines: {node: '>= 14.16'}
-
   pe-library@0.4.1:
     resolution: {integrity: sha512-eRWB5LBz7PpDu4PUlwT0PhnQfTQJlDDdPa35urV4Osrm0t0AqQFGn+UIkU3klZvwJ8KPO3VbBFsXquA6p6kqZw==}
     engines: {node: '>=12', npm: '>=6'}
@@ -4783,6 +5600,10 @@ packages:
   picocolors@1.1.1:
     resolution: {integrity: sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==}
 
+  picomatch-browser@2.2.6:
+    resolution: {integrity: sha512-0ypsOQt9D4e3hziV8O4elD9uN0z/jtUEfxVRtNaAAtXIyUx9m/SzlO020i8YNL2aL/E6blOvvHQcin6HZlFy/w==}
+    engines: {node: '>=8.6'}
+
   picomatch@2.3.1:
     resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==}
     engines: {node: '>=8.6'}
@@ -4791,21 +5612,27 @@ packages:
     resolution: {integrity: sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==}
     engines: {node: '>=12'}
 
-  pify@2.3.0:
-    resolution: {integrity: sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==}
-    engines: {node: '>=0.10.0'}
-
-  pirates@4.0.7:
-    resolution: {integrity: sha512-TfySrs/5nm8fQJDcBDuUng3VOUKsd7S+zqvbOTiGXHfxX4wK31ard+hoNuvkicM/2YFzlpDgABOevKSsB4G/FA==}
-    engines: {node: '>= 6'}
-
   pkg-types@1.3.1:
     resolution: {integrity: sha512-/Jm5M4RvtBFVkKWRu2BLUTNP8/M2a+UwuAX+ae4770q1qVGtfjG+WTCupoZixokjmHiry8uI+dlY8KXYV5HVVQ==}
 
+  playwright-core@1.58.2:
+    resolution: {integrity: sha512-yZkEtftgwS8CsfYo7nm0KE8jsvm6i/PTgVtB8DL726wNf6H2IMsDuxCpJj59KDaxCtSnrWan2AeDqM7JBaultg==}
+    engines: {node: '>=18'}
+    hasBin: true
+
+  playwright@1.58.2:
+    resolution: {integrity: sha512-vA30H8Nvkq/cPBnNw4Q8TWz1EJyqgpuinBcHET0YVJVFldr8JDNiU9LaWAE1KqSkRYazuaBhTpB5ZzShOezQ6A==}
+    engines: {node: '>=18'}
+    hasBin: true
+
   plist@3.1.0:
     resolution: {integrity: sha512-uysumyrvkUX0rX/dEVqt8gC3sTBzd4zoWfLeS29nb53imdaXVvLINYXTI2GNqzaMuvacNx4uJQ8+b3zXR0pkgQ==}
     engines: {node: '>=10.4.0'}
 
+  pngjs@7.0.0:
+    resolution: {integrity: sha512-LKWqWJRhstyYo9pGvgor/ivk2w94eSjE3RGVuzLGlr3NmD8bf7RcYGze1mNdEHRP6TRP6rMuDHk5t44hnTRyow==}
+    engines: {node: '>=14.19.0'}
+
   points-on-curve@0.2.0:
     resolution: {integrity: sha512-0mYKnYYe9ZcqMCWhUjItv/oHjvgEsfKvnUTg8sAtnHr3GVy7rGkXCb6d5cSyqrWqL4k81b9CPg3urd+T7aop3A==}
 
@@ -4816,49 +5643,6 @@ packages:
     resolution: {integrity: sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg==}
     engines: {node: '>= 0.4'}
 
-  postcss-import@15.1.0:
-    resolution: {integrity: sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew==}
-    engines: {node: '>=14.0.0'}
-    peerDependencies:
-      postcss: ^8.0.0
-
-  postcss-js@4.1.0:
-    resolution: {integrity: sha512-oIAOTqgIo7q2EOwbhb8UalYePMvYoIeRY2YKntdpFQXNosSu3vLrniGgmH9OKs/qAkfoj5oB3le/7mINW1LCfw==}
-    engines: {node: ^12 || ^14 || >= 16}
-    peerDependencies:
-      postcss: ^8.4.21
-
-  postcss-load-config@6.0.1:
-    resolution: {integrity: sha512-oPtTM4oerL+UXmx+93ytZVN82RrlY/wPUV8IeDxFrzIjXOLF1pN+EmKPLbubvKHT2HC20xXsCAH2Z+CKV6Oz/g==}
-    engines: {node: '>= 18'}
-    peerDependencies:
-      jiti: '>=1.21.0'
-      postcss: '>=8.0.9'
-      tsx: ^4.8.1
-      yaml: ^2.4.2
-    peerDependenciesMeta:
-      jiti:
-        optional: true
-      postcss:
-        optional: true
-      tsx:
-        optional: true
-      yaml:
-        optional: true
-
-  postcss-nested@6.2.0:
-    resolution: {integrity: sha512-HQbt28KulC5AJzG+cZtj9kvKB93CFCdLvog1WFLf1D+xmMvPGlBstkpTEZfK5+AN9hfJocyBFCNiqyS48bpgzQ==}
-    engines: {node: '>=12.0'}
-    peerDependencies:
-      postcss: ^8.2.14
-
-  postcss-selector-parser@6.1.2:
-    resolution: {integrity: sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==}
-    engines: {node: '>=4'}
-
-  postcss-value-parser@4.2.0:
-    resolution: {integrity: sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==}
-
   postcss@8.5.6:
     resolution: {integrity: sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==}
     engines: {node: ^10 || ^12 || >=14}
@@ -4944,6 +5728,10 @@ packages:
     engines: {node: '>=14'}
     hasBin: true
 
+  pretty-format@27.5.1:
+    resolution: {integrity: sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+
   prismjs@1.27.0:
     resolution: {integrity: sha512-t13BGPUlFDR7wRB5kQDG4jjl7XeuH6jbJGt11JHPL96qwsEHNX2+68tFXqc1/k+/jALsbSWJKUOT/hcYAZ5LkA==}
     engines: {node: '>=6'}
@@ -4988,6 +5776,10 @@ packages:
     resolution: {integrity: sha512-CvexbZtbov6jW2eXAvLukXjXUW1TzFaivC46BpWc/3BpcCysb5Vffu+B3XHMm8lVEuy2Mm4XGex8hBSg1yapPg==}
     engines: {node: '>=12.0.0'}
 
+  proxy-from-env@2.1.0:
+    resolution: {integrity: sha512-cJ+oHTW1VAEa8cJslgmUZrc+sjRKgAKl3Zyse6+PV38hZe/V6Z14TbCuXcan9F9ghlz4QrFr2c92TNF82UkYHA==}
+    engines: {node: '>=10'}
+
   pump@3.0.3:
     resolution: {integrity: sha512-todwxLMY7/heScKmntwQG8CXVkWUOdYxIvY2s0VWAAMh/nd8SoYiRaKjlr7+iCs984f2P8zvrfWcDDYVb73NfA==}
 
@@ -4995,6 +5787,10 @@ packages:
     resolution: {integrity: sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==}
     engines: {node: '>=6'}
 
+  qs@6.15.0:
+    resolution: {integrity: sha512-mAZTtNCeetKMH+pSjrb76NAM8V9a05I9aBZOHztWy/UqcJdQYNsf59vrRKWnojAT9Y+GbIvoTBC++CPHqpDBhQ==}
+    engines: {node: '>=0.6'}
+
   query-selector-shadow-dom@1.0.1:
     resolution: {integrity: sha512-lT5yCqEBgfoMYpf3F2xQRK7zEr1rhIIZuceDK6+xRkJQ4NMbHTwXqk4NkwDwQMNqXgG9r9fyHnzwNVs6zV5KRw==}
 
@@ -5005,20 +5801,26 @@ packages:
     resolution: {integrity: sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==}
     engines: {node: '>=10'}
 
+  rate-limiter-flexible@8.3.0:
+    resolution: {integrity: sha512-mzwlfipDLlRinPgELqVDJetke6Snq26nL565m8nLWXIcWgosYSeNRgqwh7ZrZ4MfYs8CNfmLvR5SBVz3rISQsQ==}
+
   rc@1.2.8:
     resolution: {integrity: sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==}
     hasBin: true
 
-  react-dom@18.3.1:
-    resolution: {integrity: sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==}
+  react-dom@19.2.4:
+    resolution: {integrity: sha512-AXJdLo8kgMbimY95O2aKQqsz2iWi9jMgKJhRBAxECE4IFxfcazB2LmzloIoibJI3C12IlY20+KFaLv+71bUJeQ==}
     peerDependencies:
-      react: ^18.3.1
+      react: ^19.2.4
 
   react-icons@5.5.0:
     resolution: {integrity: sha512-MEFcXdkP3dLo8uumGI5xN3lDFNsRtrjbOEKDLD7yv76v4wpnEq2Lt2qeHaQOr34I/wPN3s3+N08WkQ+CW37Xiw==}
     peerDependencies:
       react: '*'
 
+  react-is@17.0.2:
+    resolution: {integrity: sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==}
+
   react-markdown@10.1.0:
     resolution: {integrity: sha512-qKxVopLT/TyA6BX3Ue5NwabOsAzm0Q7kAPwq6L+wWDwisYs7R8vZ0nRXqq6rkueboxpkjvLGU9fWifiX/ZZFxQ==}
     peerDependencies:
@@ -5049,11 +5851,11 @@ packages:
       '@types/react':
         optional: true
 
-  react-resizable-panels@3.0.6:
-    resolution: {integrity: sha512-b3qKHQ3MLqOgSS+FRYKapNkJZf5EQzuf6+RLiq1/IlTHw99YrZ2NJZLk4hQIzTnnIkRg2LUqyVinu6YWWpUYew==}
+  react-resizable-panels@4.7.3:
+    resolution: {integrity: sha512-PYcYMLtvJD+Pr0TQNeMvddcnLOwUa/Yb4iNwU7ThNLlHaQYEEC9MIBWHaBGODzYuXIkPRZ/OWe5sbzG1Rzq5ew==}
     peerDependencies:
-      react: ^16.14.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc
-      react-dom: ^16.14.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc
+      react: ^18.0.0 || ^19.0.0
+      react-dom: ^18.0.0 || ^19.0.0
 
   react-style-singleton@2.2.3:
     resolution: {integrity: sha512-b6jSvxvVnyptAiLjbkWLE/lOnR4lfTtDAl+eUC7RZy+QQWc6wRzIV2CE6xBuMmDxc2qIihtDCZD5NPOFl7fRBQ==}
@@ -5076,17 +5878,14 @@ packages:
       react: ^18.0.0 || ^19.0.0
       react-dom: ^18.0.0 || ^19.0.0
 
-  react@18.3.1:
-    resolution: {integrity: sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==}
+  react@19.2.4:
+    resolution: {integrity: sha512-9nfp2hYpCwOjAN+8TZFGhtWEwgvWHXqESH8qT89AT/lWklpLON22Lc8pEtnpsZz7VmawabSU0gCjnj8aC0euHQ==}
     engines: {node: '>=0.10.0'}
 
   read-binary-file-arch@1.0.6:
     resolution: {integrity: sha512-BNg9EN3DD3GsDXX7Aa8O4p92sryjkmzYYgmgTAc6CA4uGLEDzFfxOxugu21akOxpcXHiEgsYkC6nPsQvLLLmEg==}
     hasBin: true
 
-  read-cache@1.0.0:
-    resolution: {integrity: sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==}
-
   read-config-file@6.3.2:
     resolution: {integrity: sha512-M80lpCjnE6Wt6zb98DoW8WHR09nzMSpu8XHtPkiTHrJ5Az9CybfeQhTJ8D7saeBHpGhLPIVyA8lcL6ZmdKwY6Q==}
     engines: {node: '>=12.0.0'}
@@ -5101,9 +5900,9 @@ packages:
   readdir-glob@1.1.3:
     resolution: {integrity: sha512-v05I2k7xN8zXvPD9N+z/uhXPaj0sUFCe2rcWZIpBsqxfP7xXFQ0tipAd/wjj1YxWyWtUS5IDJpOG82JKt2EAVA==}
 
-  readdirp@3.6.0:
-    resolution: {integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==}
-    engines: {node: '>=8.10.0'}
+  readdirp@5.0.0:
+    resolution: {integrity: sha512-9u/XQ1pvrQtYyMpZe7DXKv2p5CNvyVwzUB6uhLAnQwHMSgKMBR62lc7AHljaeteeHXn11XTAaLLUVZYVZyuRBQ==}
+    engines: {node: '>= 20.19.0'}
 
   reflect.getprototypeof@1.0.10:
     resolution: {integrity: sha512-00o4I+DVrefhv+nX0ulyi3biSHCPDe+yLv5o/p6d/UVlirijB8E16FtfwSAi4g3tcqrQ4lRAqQSoFEZJehYEcw==}
@@ -5179,10 +5978,17 @@ packages:
     resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==}
     engines: {node: '>=0.10.0'}
 
+  require-from-string@2.0.2:
+    resolution: {integrity: sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==}
+    engines: {node: '>=0.10.0'}
+
   resedit@1.7.2:
     resolution: {integrity: sha512-vHjcY2MlAITJhC0eRD/Vv8Vlgmu9Sd3LX9zZvtGzU5ZImdTN3+d6e/4mnTyV8vEbyf1sgNIrWxhWlrys52OkEA==}
     engines: {node: '>=12', npm: '>=6'}
 
+  reselect@5.1.1:
+    resolution: {integrity: sha512-K/BG6eIky/SBpzfHZv/dd+9JBFiS4SWV7FIujVyJRux6e45+73RaUHXLmIR1f7WOMaQ0U1km6qwklRQxpJJY0w==}
+
   resolve-alpn@1.2.1:
     resolution: {integrity: sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==}
 
@@ -5249,6 +6055,10 @@ packages:
   rxjs@7.8.2:
     resolution: {integrity: sha512-dhKf903U/PQZY6boNNtAGdWbG85WAbjT/1xYoZIC7FAY0yWapOBQVsVrDl58W86//e1VpMNBtRV4MaXfdMySFA==}
 
+  s3mini@0.9.4:
+    resolution: {integrity: sha512-lA6p6JY0+lbcz/NJL8O/BKU8q96iA3f+wDO/QCg4QxOooEJwe0fomHZoeDJhs8TDDRTA40OVNY2E9wOQgAoAVw==}
+    engines: {node: '>=20'}
+
   safe-array-concat@1.1.3:
     resolution: {integrity: sha512-AURm5f0jYEOydBj7VQlVvDrjeFgthDdEF5H1dP+6mNpoXOMo1quQqJ4wvJDyRZ9+pO3kGWoOdmV08cSv2aJV6Q==}
     engines: {node: '>=0.4'}
@@ -5277,8 +6087,12 @@ packages:
     resolution: {integrity: sha512-1n3r/tGXO6b6VXMdFT54SHzT9ytu9yr7TaELowdYpMqY/Ao7EnlQGmAQ1+RatX7Tkkdm6hONI2owqNx2aZj5Sw==}
     engines: {node: '>=11.0.0'}
 
-  scheduler@0.23.2:
-    resolution: {integrity: sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==}
+  saxes@6.0.0:
+    resolution: {integrity: sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==}
+    engines: {node: '>=v12.22.7'}
+
+  scheduler@0.27.0:
+    resolution: {integrity: sha512-eNv+WrVbKu1f3vbYJT/xtiF5syA5HPIMtf9IgY/nKg0sWqzAUEvqY/xm7OcZc/qafLx/iO9FgOmeSAp4v5ti/Q==}
 
   semver-compare@1.0.0:
     resolution: {integrity: sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==}
@@ -5374,6 +6188,10 @@ packages:
     resolution: {integrity: sha512-a2B9Y0KlNXl9u/vsW6sTIu9vGEpfKu2wRV6l1H3XEas/0gUIzGzBoP/IouTcUQbm9JWZLH3COxyn03TYlFax6w==}
     engines: {node: '>=10'}
 
+  sirv@3.0.2:
+    resolution: {integrity: sha512-2wcC/oGxHis/BoHkkPwldgiPSYcpZK3JU28WoMVv55yHJgcZ8rlXvuG9iZggz+sU1d4bRgIGASwyWqjxu3FM0g==}
+    engines: {node: '>=18'}
+
   slash@3.0.0:
     resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==}
     engines: {node: '>=8'}
@@ -5390,6 +6208,10 @@ packages:
     resolution: {integrity: sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==}
     engines: {node: '>= 6.0.0', npm: '>= 3.0.0'}
 
+  smol-toml@1.6.0:
+    resolution: {integrity: sha512-4zemZi0HvTnYwLfrpk/CF9LOd9Lt87kAt50GnqhMpyF9U3poDAP2+iukq2bZsO/ufegbYehBkqINbsWxj4l4cw==}
+    engines: {node: '>= 18'}
+
   socks-proxy-agent@6.2.1:
     resolution: {integrity: sha512-a6KW9G+6B3nWZ1yB8G7pJwL3ggLy1uTzKAgCb7ttblwqdz9fMGJUuTy3uFzEP48FAs9FLILlmzDlE2JJhVQaXQ==}
     engines: {node: '>= 10'}
@@ -5402,6 +6224,12 @@ packages:
     resolution: {integrity: sha512-HLpt+uLy/pxB+bum/9DzAgiKS8CX1EvbWxI4zlmgGCExImLdiad2iCwXT5Z4c9c3Eq8rP2318mPW2c+QbtjK8A==}
     engines: {node: '>= 10.0.0', npm: '>= 3.0.0'}
 
+  sonner@2.0.7:
+    resolution: {integrity: sha512-W6ZN4p58k8aDKA4XPcx2hpIQXBRAgyiWVkYhT7CvK6D3iAu7xjvVyhQHg2/iaKJZ1XVJ4r7XuwGL+WGEK37i9w==}
+    peerDependencies:
+      react: ^18.0.0 || ^19.0.0 || ^19.0.0-rc
+      react-dom: ^18.0.0 || ^19.0.0 || ^19.0.0-rc
+
   source-map-js@1.2.1:
     resolution: {integrity: sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==}
     engines: {node: '>=0.10.0'}
@@ -5450,8 +6278,8 @@ packages:
   state-local@1.0.7:
     resolution: {integrity: sha512-HTEHMNieakEnoe33shBYcZ7NX83ACUjCu8c40iOGEZsngj9zRnkqS9j1pqQPXwobB0ZcVTk27REb7COQ0UR59w==}
 
-  std-env@3.10.0:
-    resolution: {integrity: sha512-5GS12FdOZNliM5mAOxFRg7Ir0pWz8MdpYm6AY6VPkGpbA7ZzmbzNcBJQ0GPvvyWgcY7QAhCgf9Uy89I03faLkg==}
+  std-env@4.0.0:
+    resolution: {integrity: sha512-zUMPtQ/HBY3/50VbpkupYHbRroTRZJPRLvreamgErJVys0ceuzMkD44J/QjqhHjOzK42GQ3QZIeFG1OYfOtKqQ==}
 
   stop-iteration-iterator@1.1.0:
     resolution: {integrity: sha512-eLoXW/DHyl62zxY4SCaIgnRhuMr6ri4juEYARS8E6sCEqzKpOiE521Ucofdx+KnDZl5xmvGYaaKCk5FEOxJCoQ==}
@@ -5530,9 +6358,6 @@ packages:
     resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==}
     engines: {node: '>=8'}
 
-  strip-literal@3.1.0:
-    resolution: {integrity: sha512-8r3mkIM/2+PpjHoOtiAW8Rg3jJLHaV7xPwG+YRGrv6FP0wwk/toTpATxWYOW0BKdWwl82VT2tFYi5DlROa0Mxg==}
-
   style-to-js@1.1.21:
     resolution: {integrity: sha512-RjQetxJrrUJLQPHbLku6U/ocGtzyjbJMP9lCNK7Ag0CNh690nSH8woqWH9u16nMjYBAok+i7JO1NP2pOy8IsPQ==}
 
@@ -5542,11 +6367,6 @@ packages:
   stylis@4.3.6:
     resolution: {integrity: sha512-yQ3rwFWRfwNUY7H5vpU0wfdkNSnvnJinhF9830Swlaxl03zsOjCfmX0ugac+3LtK0lYSgwL/KXc8oYL3mG4YFQ==}
 
-  sucrase@3.35.1:
-    resolution: {integrity: sha512-DhuTmvZWux4H1UOnWMB3sk0sbaCVOoQZjv8u1rDoTV0HTdGem9hkAZtl4JZy8P2z4Bg0nT+YMeOFyVr4zcG5Tw==}
-    engines: {node: '>=16 || 14 >=14.17'}
-    hasBin: true
-
   suffix-thumb@5.0.2:
     resolution: {integrity: sha512-I5PWXAFKx3FYnI9a+dQMWNqTxoRt6vdBdb0O+BJ1sxXCWtSoQCusc13E58f+9p4MYx/qCnEMkD5jac6K2j3dgA==}
 
@@ -5566,21 +6386,24 @@ packages:
     resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==}
     engines: {node: '>= 0.4'}
 
+  symbol-tree@3.2.4:
+    resolution: {integrity: sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==}
+
+  tabbable@6.4.0:
+    resolution: {integrity: sha512-05PUHKSNE8ou2dwIxTngl4EzcnsCDZGJ/iCLtDflR/SHB/ny14rXc+qU5P4mG9JkusiV7EivzY9Mhm55AzAvCg==}
+
   tailwind-merge@2.6.1:
     resolution: {integrity: sha512-Oo6tHdpZsGpkKG88HJ8RR1rg/RdnEkQEfMoEk2x1XRI3F1AxeU+ijRXpiVUF4UbLfcxxRGw6TbUINKYdWVsQTQ==}
 
   tailwind-merge@3.4.0:
     resolution: {integrity: sha512-uSaO4gnW+b3Y2aWoWfFpX62vn2sR3skfhbjsEnaBI81WD1wBLlHZe5sWf0AqjksNdYTbGBEd0UasQMT3SNV15g==}
 
-  tailwindcss-animate@1.0.7:
-    resolution: {integrity: sha512-bl6mpH3T7I3UFxuvDEXLxy/VuFxBk5bbzplh7tXI68mwMokNYd1t9qPBHlnyTwfa4JGC4zP516I1hYYtQ/vspA==}
-    peerDependencies:
-      tailwindcss: '>=3.0.0 || insiders'
+  tailwindcss@4.2.1:
+    resolution: {integrity: sha512-/tBrSQ36vCleJkAOsy9kbNTgaxvGbyOamC30PRePTQe/o1MFwEKHQk4Cn7BNGaPtjp+PuUrByJehM1hgxfq4sw==}
 
-  tailwindcss@3.4.19:
-    resolution: {integrity: sha512-3ofp+LL8E+pK/JuPLPggVAIaEuhvIz4qNcf3nA1Xn2o/7fb7s/TYpHhwGDv1ZU3PkBluUVaF8PyCHcm48cKLWQ==}
-    engines: {node: '>=14.0.0'}
-    hasBin: true
+  tapable@2.3.0:
+    resolution: {integrity: sha512-g9ljZiwki/LfxmQADO3dEY1CbpmXT5Hm2fJ+QaGKwSXUylMybePR7/67YW7jOrrvjEgL1Fmz5kzyAjWVWLlucg==}
+    engines: {node: '>=6'}
 
   tar-fs@2.1.4:
     resolution: {integrity: sha512-mDAjwmZdh7LTT6pNleZ05Yt65HC3E+NiQzl672vQG38jIrehtJk/J3mNwIg+vShQPcLF/LV7CMnDW6vjj6sfYQ==}
@@ -5604,13 +6427,6 @@ packages:
   text-table@0.2.0:
     resolution: {integrity: sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==}
 
-  thenify-all@1.6.0:
-    resolution: {integrity: sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==}
-    engines: {node: '>=0.8'}
-
-  thenify@3.3.1:
-    resolution: {integrity: sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==}
-
   tiny-async-pool@1.3.0:
     resolution: {integrity: sha512-01EAw5EDrcVrdgyCLgoSPvqznC0sVxDSVeiOz09FUpjh71G79VCqneOr+xvt7T1r76CF6ZZfPjHorN2+d+3mqA==}
 
@@ -5620,9 +6436,6 @@ packages:
   tinybench@2.9.0:
     resolution: {integrity: sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg==}
 
-  tinyexec@0.3.2:
-    resolution: {integrity: sha512-KQQR9yN7R5+OSwaK0XQoj22pwHoTlgYqmUscPYoknOoWCWfj/5/ABTMRi69FrKU5ffPVh5QcFikpWJI/P1ocHA==}
-
   tinyexec@1.0.2:
     resolution: {integrity: sha512-W/KYk+NFhkmsYpuHq5JykngiOCnxeVL8v8dFnqxSD8qEEdRfXk1SDM6JzNqcERbcGYj9tMrDQBYV9cjgnunFIg==}
     engines: {node: '>=18'}
@@ -5631,17 +6444,16 @@ packages:
     resolution: {integrity: sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==}
     engines: {node: '>=12.0.0'}
 
-  tinypool@1.1.1:
-    resolution: {integrity: sha512-Zba82s87IFq9A9XmjiX5uZA/ARWDrB03OHlq+Vw1fSdt0I+4/Kutwy8BP4Y/y/aORMo61FQ0vIb5j44vSo5Pkg==}
-    engines: {node: ^18.0.0 || >=20.0.0}
-
-  tinyrainbow@2.0.0:
-    resolution: {integrity: sha512-op4nsTR47R6p0vMUUoYl/a+ljLFVtlfaXkLQmqfLR1qHma1h/ysYk4hEXZ880bf2CYgTskvTa/e196Vd5dDQXw==}
+  tinyrainbow@3.1.0:
+    resolution: {integrity: sha512-Bf+ILmBgretUrdJxzXM0SgXLZ3XfiaUuOj/IKQHuTXip+05Xn+uyEYdVg0kYDipTBcLrCVyUzAPz7QmArb0mmw==}
     engines: {node: '>=14.0.0'}
 
-  tinyspy@4.0.4:
-    resolution: {integrity: sha512-azl+t0z7pw/z958Gy9svOTuzqIk6xq+NSheJzn5MMWtWTFywIacg2wUlzKFGtt3cthx0r2SxMK0yzJOR0IES7Q==}
-    engines: {node: '>=14.0.0'}
+  tldts-core@7.0.28:
+    resolution: {integrity: sha512-7W5Efjhsc3chVdFhqtaU0KtK32J37Zcr9RKtID54nG+tIpcY79CQK/veYPODxtD/LJ4Lue66jvrQzIX2Z2/pUQ==}
+
+  tldts@7.0.28:
+    resolution: {integrity: sha512-+Zg3vWhRUv8B1maGSTFdev9mjoo8Etn2Ayfs4cnjlD3CsGkxXX4QyW3j2WJ0wdjYcYmy7Lx2RDsZMhgCWafKIw==}
+    hasBin: true
 
   tmp-promise@3.0.3:
     resolution: {integrity: sha512-RwM7MoPojPxsOBYnyd2hy0bxtIlVrihNs9pj5SUvY8Zz1sQcQG2tG1hSr8PDxfgEB8RNKDhqbIlroIarSNDNsQ==}
@@ -5654,6 +6466,18 @@ packages:
     resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==}
     engines: {node: '>=8.0'}
 
+  totalist@3.0.1:
+    resolution: {integrity: sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==}
+    engines: {node: '>=6'}
+
+  tough-cookie@6.0.1:
+    resolution: {integrity: sha512-LktZQb3IeoUWB9lqR5EWTHgW/VTITCXg4D21M+lvybRVdylLrRMnqaIONLVb5mav8vM19m44HIcGq4qASeu2Qw==}
+    engines: {node: '>=16'}
+
+  tr46@6.0.0:
+    resolution: {integrity: sha512-bLVMLPtstlZ4iMQHpFHTR7GAGj2jxi8Dg0s2h2MafAE4uSWF98FC/3MomU51iQAMf8/qDUbKWf5GxuvvVcXEhw==}
+    engines: {node: '>=20'}
+
   tree-kill@1.2.2:
     resolution: {integrity: sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==}
     hasBin: true
@@ -5677,9 +6501,6 @@ packages:
     resolution: {integrity: sha512-q5W7tVM71e2xjHZTlgfTDoPF/SmqKG5hddq9SzR49CH2hayqRKJtQ4mtRlSxKaJlR/+9rEM+mnBHf7I2/BQcpQ==}
     engines: {node: '>=6.10'}
 
-  ts-interface-checker@0.1.13:
-    resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==}
-
   tsconfig-paths@3.15.0:
     resolution: {integrity: sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==}
 
@@ -5689,6 +6510,9 @@ packages:
   tunnel-agent@0.6.0:
     resolution: {integrity: sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==}
 
+  tw-animate-css@1.4.0:
+    resolution: {integrity: sha512-7bziOlRqH0hJx80h/3mbicLW7o8qLsH5+RaLR2t+OHM3D0JlWGODQKQ4cxbK7WlvmUxpcj6Kgu6EKqjrGFe3QQ==}
+
   tweetnacl@0.14.5:
     resolution: {integrity: sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==}
 
@@ -5725,6 +6549,11 @@ packages:
     engines: {node: '>=14.17'}
     hasBin: true
 
+  typescript@6.0.2:
+    resolution: {integrity: sha512-bGdAIrZ0wiGDo5l8c++HWtbaNCWTS4UTv7RaTH/ThVIgjkveJt83m74bBHMJkuCbslY8ixgLBVZJIOiQlQTjfQ==}
+    engines: {node: '>=14.17'}
+    hasBin: true
+
   ufo@1.6.3:
     resolution: {integrity: sha512-yDJTmhydvl5lJzBmy/hyOAA0d+aqCBuwl818haVdYCRrWV84o7YyeVm4QlVHStqNrrJSTb6jKuFAVqAFsr+K3Q==}
 
@@ -5738,6 +6567,13 @@ packages:
   undici-types@6.21.0:
     resolution: {integrity: sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==}
 
+  undici-types@7.16.0:
+    resolution: {integrity: sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==}
+
+  undici@7.25.0:
+    resolution: {integrity: sha512-xXnp4kTyor2Zq+J1FfPI6Eq3ew5h6Vl0F/8d9XU5zZQf1tX9s2Su1/3PiMmUANFULpmksxkClamIZcaUqryHsQ==}
+    engines: {node: '>=20.18.1'}
+
   unified@11.0.5:
     resolution: {integrity: sha512-xKvGhPWw3k84Qjh8bI3ZeJjqnyadK+GEFtazSfZv/rKeTkTjOJho6mFqh2SM96iIcZokxiOpg78GazTSg8+KHA==}
 
@@ -5776,6 +6612,9 @@ packages:
   unist-util-visit@5.1.0:
     resolution: {integrity: sha512-m+vIdyeCOpdr/QeQCu2EzxX/ohgS8KbnPDgFni4dQsfSCtpz8UqDyY5GjRru8PDKuYn7Fq19j1CQ+nJSsGKOzg==}
 
+  universal-user-agent@7.0.3:
+    resolution: {integrity: sha512-TmnEAEAsBJVZM/AADELsK76llnwcf9vMKuPz8JflO1frO8Lchitr0fNaN9d+Ap0BjKtqWqd/J17qeDnXh8CL2A==}
+
   universalify@0.1.2:
     resolution: {integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==}
     engines: {node: '>= 4.0.0'}
@@ -5813,6 +6652,17 @@ packages:
       '@types/react':
         optional: true
 
+  use-sync-external-store@1.6.0:
+    resolution: {integrity: sha512-Pp6GSwGP/NrPIrxVFAIkOQeyw8lFenOHijQWkUTrDvrF4ALqylP2C/KCkeS9dpUM3KvYRQhna5vt7IL95+ZQ9w==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
+
+  usehooks-ts@3.1.1:
+    resolution: {integrity: sha512-I4diPp9Cq6ieSUH2wu+fDAVQO43xwtulo+fKEidHUwZPnYImbtkTjzIJYcDcJqxgmX31GVqNFURodvcgHcW0pA==}
+    engines: {node: '>=16.15.0'}
+    peerDependencies:
+      react: ^16.8.0  || ^17 || ^18 || ^19 || ^19.0.0-rc
+
   utf8-byte-length@1.0.5:
     resolution: {integrity: sha512-Xn0w3MtiQ6zoz2vFyUVruaCL53O/DwUvkEeOvj+uulMm0BkUGYWmBYVyElqZaSLhY6ZD0ulfU3aBra2aVT4xfA==}
 
@@ -5836,27 +6686,27 @@ packages:
   vfile@6.0.3:
     resolution: {integrity: sha512-KzIbH/9tXat2u30jf+smMwFCsno4wHVdNmzFyL+T/L3UGqqk6JKfVqOFOZEpZSHADH1k40ab6NUIXZq422ov3Q==}
 
-  vite-node@3.2.4:
-    resolution: {integrity: sha512-EbKSKh+bh1E1IFxeO0pg1n4dvoOTt0UDiXMd/qn++r98+jPO1xtJilvXldeuQ8giIB5IkpjCgMleHMNEsGH6pg==}
+  vite@6.4.1:
+    resolution: {integrity: sha512-+Oxm7q9hDoLMyJOYfUYBuHQo+dkAloi33apOPP56pzj+vsdJDzr+j1NISE5pyaAuKL4A3UD34qd0lx5+kfKp2g==}
     engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0}
     hasBin: true
-
-  vite@5.4.21:
-    resolution: {integrity: sha512-o5a9xKjbtuhY6Bi5S3+HvbRERmouabWbyUcpXXUA1u+GNUKoROi9byOJ8M0nHbHYHkYICiMlqxkg1KkYmm25Sw==}
-    engines: {node: ^18.0.0 || >=20.0.0}
-    hasBin: true
     peerDependencies:
-      '@types/node': ^18.0.0 || >=20.0.0
+      '@types/node': ^18.0.0 || ^20.0.0 || >=22.0.0
+      jiti: '>=1.21.0'
       less: '*'
       lightningcss: ^1.21.0
       sass: '*'
       sass-embedded: '*'
       stylus: '*'
       sugarss: '*'
-      terser: ^5.4.0
+      terser: ^5.16.0
+      tsx: ^4.8.1
+      yaml: ^2.4.2
     peerDependenciesMeta:
       '@types/node':
         optional: true
+      jiti:
+        optional: true
       less:
         optional: true
       lightningcss:
@@ -5871,27 +6721,52 @@ packages:
         optional: true
       terser:
         optional: true
+      tsx:
+        optional: true
+      yaml:
+        optional: true
 
-  vitest@3.2.4:
-    resolution: {integrity: sha512-LUCP5ev3GURDysTWiP47wRRUpLKMOfPh+yKTx3kVIEiu5KOMeqzpnYNsKyOoVrULivR8tLcks4+lga33Whn90A==}
-    engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0}
+  vitest-browser-react@2.1.0:
+    resolution: {integrity: sha512-/cOVQ+dZojhavfsbHjcfzB3zrUxG39HIbGdvK9vSBdGc8b8HRu5Bql0p8aXtKw4sb8/E8n5XEncQxvqHtfjjag==}
+    peerDependencies:
+      '@types/react': ^18.0.0 || ^19.0.0
+      '@types/react-dom': ^18.0.0 || ^19.0.0
+      react: ^18.0.0 || ^19.0.0
+      react-dom: ^18.0.0 || ^19.0.0
+      vitest: ^4.0.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
+  vitest@4.1.0:
+    resolution: {integrity: sha512-YbDrMF9jM2Lqc++2530UourxZHmkKLxrs4+mYhEwqWS97WJ7wOYEkcr+QfRgJ3PW9wz3odRijLZjHEaRLTNbqw==}
+    engines: {node: ^20.0.0 || ^22.0.0 || >=24.0.0}
     hasBin: true
     peerDependencies:
       '@edge-runtime/vm': '*'
-      '@types/debug': ^4.1.12
-      '@types/node': ^18.0.0 || ^20.0.0 || >=22.0.0
-      '@vitest/browser': 3.2.4
-      '@vitest/ui': 3.2.4
+      '@opentelemetry/api': ^1.9.0
+      '@types/node': ^20.0.0 || ^22.0.0 || >=24.0.0
+      '@vitest/browser-playwright': 4.1.0
+      '@vitest/browser-preview': 4.1.0
+      '@vitest/browser-webdriverio': 4.1.0
+      '@vitest/ui': 4.1.0
       happy-dom: '*'
       jsdom: '*'
+      vite: ^6.0.0 || ^7.0.0 || ^8.0.0-0
     peerDependenciesMeta:
       '@edge-runtime/vm':
         optional: true
-      '@types/debug':
+      '@opentelemetry/api':
         optional: true
       '@types/node':
         optional: true
-      '@vitest/browser':
+      '@vitest/browser-playwright':
+        optional: true
+      '@vitest/browser-preview':
+        optional: true
+      '@vitest/browser-webdriverio':
         optional: true
       '@vitest/ui':
         optional: true
@@ -5920,6 +6795,10 @@ packages:
   vscode-uri@3.0.8:
     resolution: {integrity: sha512-AyFQ0EVmsOZOlAnxoFOGOq1SQDWAB7C6aqMGS23svWAllfOaxbuFvcT8D1i8z3Gyn8fraVeZNNmN6e9bxxXkKw==}
 
+  w3c-xmlserializer@5.0.0:
+    resolution: {integrity: sha512-o8qghlI8NZHU1lLPrpi2+Uq7abh4GGPpYANlalzWxyWteJOCsr/P+oPBA49TOLu5FTZO4d3F9MnWJfiMo4BkmA==}
+    engines: {node: '>=18'}
+
   wcwidth@1.0.1:
     resolution: {integrity: sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==}
 
@@ -5929,6 +6808,18 @@ packages:
   web-vitals@5.1.0:
     resolution: {integrity: sha512-ArI3kx5jI0atlTtmV0fWU3fjpLmq/nD3Zr1iFFlJLaqa5wLBkUSzINwBPySCX/8jRyjlmy1Volw1kz1g9XE4Jg==}
 
+  webidl-conversions@8.0.1:
+    resolution: {integrity: sha512-BMhLD/Sw+GbJC21C/UgyaZX41nPt8bUTg+jWyDeg7e7YN4xOM05YPSIXceACnXVtqyEw/LMClUQMtMZ+PGGpqQ==}
+    engines: {node: '>=20'}
+
+  whatwg-mimetype@5.0.0:
+    resolution: {integrity: sha512-sXcNcHOC51uPGF0P/D4NVtrkjSU2fNsm9iog4ZvZJsL3rjoDAzXZhkm2MWt1y+PUdggKAYVoMAIYcs78wJ51Cw==}
+    engines: {node: '>=20'}
+
+  whatwg-url@16.0.1:
+    resolution: {integrity: sha512-1to4zXBxmXHV3IiSSEInrreIlu02vUOvrhxJJH5vcxYTBDAx51cqZiKdyTxlecdKNSjj8EcxGBxNf6Vg+945gw==}
+    engines: {node: ^20.19.0 || ^22.12.0 || >=24.0.0}
+
   which-boxed-primitive@1.1.1:
     resolution: {integrity: sha512-TbX3mj8n0odCBFVlY8AxkqcHASw3L60jIuF8jFP78az3C2YhmGvqbHBpAjTRH2/xqYunrJ9g1jSyjCjpoWzIAA==}
     engines: {node: '>= 0.4'}
@@ -5982,10 +6873,32 @@ packages:
   wrappy@1.0.2:
     resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==}
 
+  ws@8.19.0:
+    resolution: {integrity: sha512-blAT2mjOEIi0ZzruJfIhb3nps74PRWTCz1IjglWEEpQl5XS/UNama6u2/rjFkDDouqr4L67ry+1aGIALViWjDg==}
+    engines: {node: '>=10.0.0'}
+    peerDependencies:
+      bufferutil: ^4.0.1
+      utf-8-validate: '>=5.0.2'
+    peerDependenciesMeta:
+      bufferutil:
+        optional: true
+      utf-8-validate:
+        optional: true
+
+  xcase@2.0.1:
+    resolution: {integrity: sha512-UmFXIPU+9Eg3E9m/728Bii0lAIuoc+6nbrNUKaRPJOFp91ih44qqGlWtxMB6kXFrRD6po+86ksHM5XHCfk6iPw==}
+
+  xml-name-validator@5.0.0:
+    resolution: {integrity: sha512-EvGK8EJ3DhaHfbRlETOWAS5pO9MZITeauHKJyb8wyajUfQUenkIg2MvLDTZ4T/TgIcm3HU0TFBgWWboAZ30UHg==}
+    engines: {node: '>=18'}
+
   xmlbuilder@15.1.1:
     resolution: {integrity: sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg==}
     engines: {node: '>=8.0'}
 
+  xmlchars@2.2.0:
+    resolution: {integrity: sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==}
+
   xtend@4.0.2:
     resolution: {integrity: sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==}
     engines: {node: '>=0.4'}
@@ -6044,13 +6957,31 @@ snapshots:
 
   7zip-bin@5.2.0: {}
 
-  '@alloc/quick-lru@5.2.0': {}
-
   '@antfu/install-pkg@1.1.0':
     dependencies:
       package-manager-detector: 1.6.0
       tinyexec: 1.0.2
 
+  '@asamuzakjp/css-color@5.1.11':
+    dependencies:
+      '@asamuzakjp/generational-cache': 1.0.1
+      '@csstools/css-calc': 3.2.0(@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.0))(@csstools/css-tokenizer@4.0.0)
+      '@csstools/css-color-parser': 4.1.0(@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.0))(@csstools/css-tokenizer@4.0.0)
+      '@csstools/css-parser-algorithms': 4.0.0(@csstools/css-tokenizer@4.0.0)
+      '@csstools/css-tokenizer': 4.0.0
+
+  '@asamuzakjp/dom-selector@7.1.1':
+    dependencies:
+      '@asamuzakjp/generational-cache': 1.0.1
+      '@asamuzakjp/nwsapi': 2.3.9
+      bidi-js: 1.0.3
+      css-tree: 3.2.1
+      is-potential-custom-element-name: 1.0.1
+
+  '@asamuzakjp/generational-cache@1.0.1': {}
+
+  '@asamuzakjp/nwsapi@2.3.9': {}
+
   '@babel/code-frame@7.29.0':
     dependencies:
       '@babel/helper-validator-identifier': 7.28.5
@@ -6130,6 +7061,11 @@ snapshots:
     dependencies:
       '@babel/types': 7.29.0
 
+  '@babel/plugin-transform-arrow-functions@7.27.1(@babel/core@7.29.0)':
+    dependencies:
+      '@babel/core': 7.29.0
+      '@babel/helper-plugin-utils': 7.28.6
+
   '@babel/plugin-transform-react-jsx-self@7.27.1(@babel/core@7.29.0)':
     dependencies:
       '@babel/core': 7.29.0
@@ -6160,34 +7096,152 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/types@7.29.0':
+  '@babel/types@7.29.0':
+    dependencies:
+      '@babel/helper-string-parser': 7.27.1
+      '@babel/helper-validator-identifier': 7.28.5
+
+  '@base-ui/react@1.3.0(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)':
+    dependencies:
+      '@babel/runtime': 7.28.6
+      '@base-ui/utils': 0.2.6(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      '@floating-ui/react-dom': 2.1.8(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      '@floating-ui/utils': 0.2.11
+      react: 19.2.4
+      react-dom: 19.2.4(react@19.2.4)
+      tabbable: 6.4.0
+      use-sync-external-store: 1.6.0(react@19.2.4)
+    optionalDependencies:
+      '@types/react': 19.2.14
+
+  '@base-ui/utils@0.2.6(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)':
+    dependencies:
+      '@babel/runtime': 7.28.6
+      '@floating-ui/utils': 0.2.11
+      react: 19.2.4
+      react-dom: 19.2.4(react@19.2.4)
+      reselect: 5.1.1
+      use-sync-external-store: 1.6.0(react@19.2.4)
+    optionalDependencies:
+      '@types/react': 19.2.14
+
+  '@blazediff/core@1.9.1': {}
+
+  '@braintree/sanitize-url@7.1.2': {}
+
+  '@bramus/specificity@2.4.2':
+    dependencies:
+      css-tree: 3.2.1
+
+  '@chevrotain/cst-dts-gen@11.0.3':
+    dependencies:
+      '@chevrotain/gast': 11.0.3
+      '@chevrotain/types': 11.0.3
+      lodash-es: 4.17.21
+
+  '@chevrotain/gast@11.0.3':
+    dependencies:
+      '@chevrotain/types': 11.0.3
+      lodash-es: 4.17.21
+
+  '@chevrotain/regexp-to-ast@11.0.3': {}
+
+  '@chevrotain/types@11.0.3': {}
+
+  '@chevrotain/utils@11.0.3': {}
+
+  '@csstools/color-helpers@6.0.2': {}
+
+  '@csstools/css-calc@3.2.0(@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.0))(@csstools/css-tokenizer@4.0.0)':
+    dependencies:
+      '@csstools/css-parser-algorithms': 4.0.0(@csstools/css-tokenizer@4.0.0)
+      '@csstools/css-tokenizer': 4.0.0
+
+  '@csstools/css-color-parser@4.1.0(@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.0))(@csstools/css-tokenizer@4.0.0)':
+    dependencies:
+      '@csstools/color-helpers': 6.0.2
+      '@csstools/css-calc': 3.2.0(@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.0))(@csstools/css-tokenizer@4.0.0)
+      '@csstools/css-parser-algorithms': 4.0.0(@csstools/css-tokenizer@4.0.0)
+      '@csstools/css-tokenizer': 4.0.0
+
+  '@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.0)':
+    dependencies:
+      '@csstools/css-tokenizer': 4.0.0
+
+  '@csstools/css-syntax-patches-for-csstree@1.1.3(css-tree@3.2.1)':
+    optionalDependencies:
+      css-tree: 3.2.1
+
+  '@csstools/css-tokenizer@4.0.0': {}
+
+  '@develar/schema-utils@2.6.5':
+    dependencies:
+      ajv: 6.12.6
+      ajv-keywords: 3.5.2(ajv@6.12.6)
+
+  '@dnd-kit/abstract@0.3.2':
+    dependencies:
+      '@dnd-kit/geometry': 0.3.2
+      '@dnd-kit/state': 0.3.2
+      tslib: 2.8.1
+
+  '@dnd-kit/accessibility@3.1.1(react@19.2.4)':
+    dependencies:
+      react: 19.2.4
+      tslib: 2.8.1
+
+  '@dnd-kit/collision@0.3.2':
     dependencies:
-      '@babel/helper-string-parser': 7.27.1
-      '@babel/helper-validator-identifier': 7.28.5
+      '@dnd-kit/abstract': 0.3.2
+      '@dnd-kit/geometry': 0.3.2
+      tslib: 2.8.1
 
-  '@braintree/sanitize-url@7.1.2': {}
+  '@dnd-kit/core@6.3.1(react-dom@19.2.4(react@19.2.4))(react@19.2.4)':
+    dependencies:
+      '@dnd-kit/accessibility': 3.1.1(react@19.2.4)
+      '@dnd-kit/utilities': 3.2.2(react@19.2.4)
+      react: 19.2.4
+      react-dom: 19.2.4(react@19.2.4)
+      tslib: 2.8.1
 
-  '@chevrotain/cst-dts-gen@11.0.3':
+  '@dnd-kit/dom@0.3.2':
     dependencies:
-      '@chevrotain/gast': 11.0.3
-      '@chevrotain/types': 11.0.3
-      lodash-es: 4.17.21
+      '@dnd-kit/abstract': 0.3.2
+      '@dnd-kit/collision': 0.3.2
+      '@dnd-kit/geometry': 0.3.2
+      '@dnd-kit/state': 0.3.2
+      tslib: 2.8.1
 
-  '@chevrotain/gast@11.0.3':
+  '@dnd-kit/geometry@0.3.2':
     dependencies:
-      '@chevrotain/types': 11.0.3
-      lodash-es: 4.17.21
+      '@dnd-kit/state': 0.3.2
+      tslib: 2.8.1
 
-  '@chevrotain/regexp-to-ast@11.0.3': {}
+  '@dnd-kit/react@0.3.2(react-dom@19.2.4(react@19.2.4))(react@19.2.4)':
+    dependencies:
+      '@dnd-kit/abstract': 0.3.2
+      '@dnd-kit/dom': 0.3.2
+      '@dnd-kit/state': 0.3.2
+      react: 19.2.4
+      react-dom: 19.2.4(react@19.2.4)
+      tslib: 2.8.1
 
-  '@chevrotain/types@11.0.3': {}
+  '@dnd-kit/sortable@10.0.0(@dnd-kit/core@6.3.1(react-dom@19.2.4(react@19.2.4))(react@19.2.4))(react@19.2.4)':
+    dependencies:
+      '@dnd-kit/core': 6.3.1(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      '@dnd-kit/utilities': 3.2.2(react@19.2.4)
+      react: 19.2.4
+      tslib: 2.8.1
 
-  '@chevrotain/utils@11.0.3': {}
+  '@dnd-kit/state@0.3.2':
+    dependencies:
+      '@preact/signals-core': 1.14.1
+      tslib: 2.8.1
 
-  '@develar/schema-utils@2.6.5':
+  '@dnd-kit/utilities@3.2.2(react@19.2.4)':
     dependencies:
-      ajv: 6.12.6
-      ajv-keywords: 3.5.2(ajv@6.12.6)
+      react: 19.2.4
+      tslib: 2.8.1
 
   '@drizzle-team/brocli@0.10.2': {}
 
@@ -6324,7 +7378,7 @@ snapshots:
   '@esbuild/aix-ppc64@0.19.12':
     optional: true
 
-  '@esbuild/aix-ppc64@0.21.5':
+  '@esbuild/aix-ppc64@0.25.12':
     optional: true
 
   '@esbuild/android-arm64@0.18.20':
@@ -6333,7 +7387,7 @@ snapshots:
   '@esbuild/android-arm64@0.19.12':
     optional: true
 
-  '@esbuild/android-arm64@0.21.5':
+  '@esbuild/android-arm64@0.25.12':
     optional: true
 
   '@esbuild/android-arm@0.18.20':
@@ -6342,7 +7396,7 @@ snapshots:
   '@esbuild/android-arm@0.19.12':
     optional: true
 
-  '@esbuild/android-arm@0.21.5':
+  '@esbuild/android-arm@0.25.12':
     optional: true
 
   '@esbuild/android-x64@0.18.20':
@@ -6351,7 +7405,7 @@ snapshots:
   '@esbuild/android-x64@0.19.12':
     optional: true
 
-  '@esbuild/android-x64@0.21.5':
+  '@esbuild/android-x64@0.25.12':
     optional: true
 
   '@esbuild/darwin-arm64@0.18.20':
@@ -6360,7 +7414,7 @@ snapshots:
   '@esbuild/darwin-arm64@0.19.12':
     optional: true
 
-  '@esbuild/darwin-arm64@0.21.5':
+  '@esbuild/darwin-arm64@0.25.12':
     optional: true
 
   '@esbuild/darwin-x64@0.18.20':
@@ -6369,7 +7423,7 @@ snapshots:
   '@esbuild/darwin-x64@0.19.12':
     optional: true
 
-  '@esbuild/darwin-x64@0.21.5':
+  '@esbuild/darwin-x64@0.25.12':
     optional: true
 
   '@esbuild/freebsd-arm64@0.18.20':
@@ -6378,7 +7432,7 @@ snapshots:
   '@esbuild/freebsd-arm64@0.19.12':
     optional: true
 
-  '@esbuild/freebsd-arm64@0.21.5':
+  '@esbuild/freebsd-arm64@0.25.12':
     optional: true
 
   '@esbuild/freebsd-x64@0.18.20':
@@ -6387,7 +7441,7 @@ snapshots:
   '@esbuild/freebsd-x64@0.19.12':
     optional: true
 
-  '@esbuild/freebsd-x64@0.21.5':
+  '@esbuild/freebsd-x64@0.25.12':
     optional: true
 
   '@esbuild/linux-arm64@0.18.20':
@@ -6396,7 +7450,7 @@ snapshots:
   '@esbuild/linux-arm64@0.19.12':
     optional: true
 
-  '@esbuild/linux-arm64@0.21.5':
+  '@esbuild/linux-arm64@0.25.12':
     optional: true
 
   '@esbuild/linux-arm@0.18.20':
@@ -6405,7 +7459,7 @@ snapshots:
   '@esbuild/linux-arm@0.19.12':
     optional: true
 
-  '@esbuild/linux-arm@0.21.5':
+  '@esbuild/linux-arm@0.25.12':
     optional: true
 
   '@esbuild/linux-ia32@0.18.20':
@@ -6414,7 +7468,7 @@ snapshots:
   '@esbuild/linux-ia32@0.19.12':
     optional: true
 
-  '@esbuild/linux-ia32@0.21.5':
+  '@esbuild/linux-ia32@0.25.12':
     optional: true
 
   '@esbuild/linux-loong64@0.18.20':
@@ -6423,7 +7477,7 @@ snapshots:
   '@esbuild/linux-loong64@0.19.12':
     optional: true
 
-  '@esbuild/linux-loong64@0.21.5':
+  '@esbuild/linux-loong64@0.25.12':
     optional: true
 
   '@esbuild/linux-mips64el@0.18.20':
@@ -6432,7 +7486,7 @@ snapshots:
   '@esbuild/linux-mips64el@0.19.12':
     optional: true
 
-  '@esbuild/linux-mips64el@0.21.5':
+  '@esbuild/linux-mips64el@0.25.12':
     optional: true
 
   '@esbuild/linux-ppc64@0.18.20':
@@ -6441,7 +7495,7 @@ snapshots:
   '@esbuild/linux-ppc64@0.19.12':
     optional: true
 
-  '@esbuild/linux-ppc64@0.21.5':
+  '@esbuild/linux-ppc64@0.25.12':
     optional: true
 
   '@esbuild/linux-riscv64@0.18.20':
@@ -6450,7 +7504,7 @@ snapshots:
   '@esbuild/linux-riscv64@0.19.12':
     optional: true
 
-  '@esbuild/linux-riscv64@0.21.5':
+  '@esbuild/linux-riscv64@0.25.12':
     optional: true
 
   '@esbuild/linux-s390x@0.18.20':
@@ -6459,7 +7513,7 @@ snapshots:
   '@esbuild/linux-s390x@0.19.12':
     optional: true
 
-  '@esbuild/linux-s390x@0.21.5':
+  '@esbuild/linux-s390x@0.25.12':
     optional: true
 
   '@esbuild/linux-x64@0.18.20':
@@ -6468,7 +7522,10 @@ snapshots:
   '@esbuild/linux-x64@0.19.12':
     optional: true
 
-  '@esbuild/linux-x64@0.21.5':
+  '@esbuild/linux-x64@0.25.12':
+    optional: true
+
+  '@esbuild/netbsd-arm64@0.25.12':
     optional: true
 
   '@esbuild/netbsd-x64@0.18.20':
@@ -6477,7 +7534,10 @@ snapshots:
   '@esbuild/netbsd-x64@0.19.12':
     optional: true
 
-  '@esbuild/netbsd-x64@0.21.5':
+  '@esbuild/netbsd-x64@0.25.12':
+    optional: true
+
+  '@esbuild/openbsd-arm64@0.25.12':
     optional: true
 
   '@esbuild/openbsd-x64@0.18.20':
@@ -6486,7 +7546,10 @@ snapshots:
   '@esbuild/openbsd-x64@0.19.12':
     optional: true
 
-  '@esbuild/openbsd-x64@0.21.5':
+  '@esbuild/openbsd-x64@0.25.12':
+    optional: true
+
+  '@esbuild/openharmony-arm64@0.25.12':
     optional: true
 
   '@esbuild/sunos-x64@0.18.20':
@@ -6495,7 +7558,7 @@ snapshots:
   '@esbuild/sunos-x64@0.19.12':
     optional: true
 
-  '@esbuild/sunos-x64@0.21.5':
+  '@esbuild/sunos-x64@0.25.12':
     optional: true
 
   '@esbuild/win32-arm64@0.18.20':
@@ -6504,7 +7567,7 @@ snapshots:
   '@esbuild/win32-arm64@0.19.12':
     optional: true
 
-  '@esbuild/win32-arm64@0.21.5':
+  '@esbuild/win32-arm64@0.25.12':
     optional: true
 
   '@esbuild/win32-ia32@0.18.20':
@@ -6513,7 +7576,7 @@ snapshots:
   '@esbuild/win32-ia32@0.19.12':
     optional: true
 
-  '@esbuild/win32-ia32@0.21.5':
+  '@esbuild/win32-ia32@0.25.12':
     optional: true
 
   '@esbuild/win32-x64@0.18.20':
@@ -6522,7 +7585,7 @@ snapshots:
   '@esbuild/win32-x64@0.19.12':
     optional: true
 
-  '@esbuild/win32-x64@0.21.5':
+  '@esbuild/win32-x64@0.25.12':
     optional: true
 
   '@eslint-community/eslint-utils@4.9.1(eslint@8.57.1)':
@@ -6548,26 +7611,67 @@ snapshots:
 
   '@eslint/js@8.57.1': {}
 
+  '@exodus/bytes@1.15.0': {}
+
   '@floating-ui/core@1.7.4':
     dependencies:
       '@floating-ui/utils': 0.2.10
 
+  '@floating-ui/core@1.7.5':
+    dependencies:
+      '@floating-ui/utils': 0.2.11
+
   '@floating-ui/dom@1.7.5':
     dependencies:
       '@floating-ui/core': 1.7.4
       '@floating-ui/utils': 0.2.10
 
-  '@floating-ui/react-dom@2.1.7(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
+  '@floating-ui/dom@1.7.6':
+    dependencies:
+      '@floating-ui/core': 1.7.5
+      '@floating-ui/utils': 0.2.11
+
+  '@floating-ui/react-dom@2.1.7(react-dom@19.2.4(react@19.2.4))(react@19.2.4)':
     dependencies:
       '@floating-ui/dom': 1.7.5
-      react: 18.3.1
-      react-dom: 18.3.1(react@18.3.1)
+      react: 19.2.4
+      react-dom: 19.2.4(react@19.2.4)
+
+  '@floating-ui/react-dom@2.1.8(react-dom@19.2.4(react@19.2.4))(react@19.2.4)':
+    dependencies:
+      '@floating-ui/dom': 1.7.6
+      react: 19.2.4
+      react-dom: 19.2.4(react@19.2.4)
 
   '@floating-ui/utils@0.2.10': {}
 
+  '@floating-ui/utils@0.2.11': {}
+
   '@gar/promisify@1.1.3':
     optional: true
 
+  '@gitbeaker/core@43.8.0':
+    dependencies:
+      '@gitbeaker/requester-utils': 43.8.0
+      qs: 6.15.0
+      xcase: 2.0.1
+
+  '@gitbeaker/requester-utils@43.8.0':
+    dependencies:
+      picomatch-browser: 2.2.6
+      qs: 6.15.0
+      rate-limiter-flexible: 8.3.0
+      xcase: 2.0.1
+
+  '@gitbeaker/rest@43.8.0':
+    dependencies:
+      '@gitbeaker/core': 43.8.0
+      '@gitbeaker/requester-utils': 43.8.0
+
+  '@graphql-typed-document-node/core@3.2.0(graphql@16.13.1)':
+    dependencies:
+      graphql: 16.13.1
+
   '@humanwhocodes/config-array@0.13.0':
     dependencies:
       '@humanwhocodes/object-schema': 2.0.3
@@ -6580,6 +7684,17 @@ snapshots:
 
   '@humanwhocodes/object-schema@2.0.3': {}
 
+  '@ianvs/prettier-plugin-sort-imports@4.7.1(prettier@3.6.2)':
+    dependencies:
+      '@babel/generator': 7.29.1
+      '@babel/parser': 7.29.0
+      '@babel/traverse': 7.29.0
+      '@babel/types': 7.29.0
+      prettier: 3.6.2
+      semver: 7.7.4
+    transitivePeerDependencies:
+      - supports-color
+
   '@iconify/types@2.0.0': {}
 
   '@iconify/utils@3.1.0':
@@ -6626,6 +7741,18 @@ snapshots:
       '@jridgewell/resolve-uri': 3.1.2
       '@jridgewell/sourcemap-codec': 1.5.5
 
+  '@linear/sdk@77.0.0(graphql@16.13.1)':
+    dependencies:
+      '@graphql-typed-document-node/core': 3.2.0(graphql@16.13.1)
+    transitivePeerDependencies:
+      - graphql
+
+  '@llamaduck/forgejo-ts@14.0.3':
+    dependencies:
+      axios: 1.14.0
+    transitivePeerDependencies:
+      - debug
+
   '@malept/cross-spawn-promise@1.1.1':
     dependencies:
       cross-spawn: 7.0.6
@@ -6651,12 +7778,12 @@ snapshots:
     dependencies:
       state-local: 1.0.7
 
-  '@monaco-editor/react@4.7.0(monaco-editor@0.55.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
+  '@monaco-editor/react@4.7.0(monaco-editor@0.55.1)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)':
     dependencies:
       '@monaco-editor/loader': 1.7.0
       monaco-editor: 0.55.1
-      react: 18.3.1
-      react-dom: 18.3.1(react@18.3.1)
+      react: 19.2.4
+      react-dom: 19.2.4(react@19.2.4)
 
   '@nodelib/fs.scandir@2.1.5':
     dependencies:
@@ -6696,6 +7823,85 @@ snapshots:
       rimraf: 3.0.2
     optional: true
 
+  '@octokit/auth-oauth-device@8.0.3':
+    dependencies:
+      '@octokit/oauth-methods': 6.0.2
+      '@octokit/request': 10.0.8
+      '@octokit/types': 16.0.0
+      universal-user-agent: 7.0.3
+
+  '@octokit/auth-token@6.0.0': {}
+
+  '@octokit/core@7.0.6':
+    dependencies:
+      '@octokit/auth-token': 6.0.0
+      '@octokit/graphql': 9.0.3
+      '@octokit/request': 10.0.8
+      '@octokit/request-error': 7.1.0
+      '@octokit/types': 16.0.0
+      before-after-hook: 4.0.0
+      universal-user-agent: 7.0.3
+
+  '@octokit/endpoint@11.0.3':
+    dependencies:
+      '@octokit/types': 16.0.0
+      universal-user-agent: 7.0.3
+
+  '@octokit/graphql@9.0.3':
+    dependencies:
+      '@octokit/request': 10.0.8
+      '@octokit/types': 16.0.0
+      universal-user-agent: 7.0.3
+
+  '@octokit/oauth-authorization-url@8.0.0': {}
+
+  '@octokit/oauth-methods@6.0.2':
+    dependencies:
+      '@octokit/oauth-authorization-url': 8.0.0
+      '@octokit/request': 10.0.8
+      '@octokit/request-error': 7.1.0
+      '@octokit/types': 16.0.0
+
+  '@octokit/openapi-types@27.0.0': {}
+
+  '@octokit/plugin-paginate-rest@14.0.0(@octokit/core@7.0.6)':
+    dependencies:
+      '@octokit/core': 7.0.6
+      '@octokit/types': 16.0.0
+
+  '@octokit/plugin-request-log@6.0.0(@octokit/core@7.0.6)':
+    dependencies:
+      '@octokit/core': 7.0.6
+
+  '@octokit/plugin-rest-endpoint-methods@17.0.0(@octokit/core@7.0.6)':
+    dependencies:
+      '@octokit/core': 7.0.6
+      '@octokit/types': 16.0.0
+
+  '@octokit/request-error@7.1.0':
+    dependencies:
+      '@octokit/types': 16.0.0
+
+  '@octokit/request@10.0.8':
+    dependencies:
+      '@octokit/endpoint': 11.0.3
+      '@octokit/request-error': 7.1.0
+      '@octokit/types': 16.0.0
+      fast-content-type-parse: 3.0.0
+      json-with-bigint: 3.5.7
+      universal-user-agent: 7.0.3
+
+  '@octokit/rest@22.0.1':
+    dependencies:
+      '@octokit/core': 7.0.6
+      '@octokit/plugin-paginate-rest': 14.0.0(@octokit/core@7.0.6)
+      '@octokit/plugin-request-log': 6.0.0(@octokit/core@7.0.6)
+      '@octokit/plugin-rest-endpoint-methods': 17.0.0(@octokit/core@7.0.6)
+
+  '@octokit/types@16.0.0':
+    dependencies:
+      '@octokit/openapi-types': 27.0.0
+
   '@opentelemetry/api-logs@0.208.0':
     dependencies:
       '@opentelemetry/api': 1.9.0
@@ -6772,15 +7978,79 @@ snapshots:
 
   '@opentelemetry/semantic-conventions@1.39.0': {}
 
+  '@parcel/watcher-android-arm64@2.5.6':
+    optional: true
+
+  '@parcel/watcher-darwin-arm64@2.5.6':
+    optional: true
+
+  '@parcel/watcher-darwin-x64@2.5.6':
+    optional: true
+
+  '@parcel/watcher-freebsd-x64@2.5.6':
+    optional: true
+
+  '@parcel/watcher-linux-arm-glibc@2.5.6':
+    optional: true
+
+  '@parcel/watcher-linux-arm-musl@2.5.6':
+    optional: true
+
+  '@parcel/watcher-linux-arm64-glibc@2.5.6':
+    optional: true
+
+  '@parcel/watcher-linux-arm64-musl@2.5.6':
+    optional: true
+
+  '@parcel/watcher-linux-x64-glibc@2.5.6':
+    optional: true
+
+  '@parcel/watcher-linux-x64-musl@2.5.6':
+    optional: true
+
+  '@parcel/watcher-win32-arm64@2.5.6':
+    optional: true
+
+  '@parcel/watcher-win32-ia32@2.5.6':
+    optional: true
+
+  '@parcel/watcher-win32-x64@2.5.6':
+    optional: true
+
+  '@parcel/watcher@2.5.6':
+    dependencies:
+      detect-libc: 2.1.2
+      is-glob: 4.0.3
+      node-addon-api: 7.1.1
+      picomatch: 4.0.3
+    optionalDependencies:
+      '@parcel/watcher-android-arm64': 2.5.6
+      '@parcel/watcher-darwin-arm64': 2.5.6
+      '@parcel/watcher-darwin-x64': 2.5.6
+      '@parcel/watcher-freebsd-x64': 2.5.6
+      '@parcel/watcher-linux-arm-glibc': 2.5.6
+      '@parcel/watcher-linux-arm-musl': 2.5.6
+      '@parcel/watcher-linux-arm64-glibc': 2.5.6
+      '@parcel/watcher-linux-arm64-musl': 2.5.6
+      '@parcel/watcher-linux-x64-glibc': 2.5.6
+      '@parcel/watcher-linux-x64-musl': 2.5.6
+      '@parcel/watcher-win32-arm64': 2.5.6
+      '@parcel/watcher-win32-ia32': 2.5.6
+      '@parcel/watcher-win32-x64': 2.5.6
+
   '@pkgjs/parseargs@0.11.0':
     optional: true
 
+  '@polka/url@1.0.0-next.29': {}
+
   '@posthog/core@1.20.1':
     dependencies:
       cross-spawn: 7.0.6
 
   '@posthog/types@1.342.1': {}
 
+  '@preact/signals-core@1.14.1': {}
+
   '@protobufjs/aspromise@1.1.2': {}
 
   '@protobufjs/base64@1.1.2': {}
@@ -6808,532 +8078,558 @@ snapshots:
 
   '@radix-ui/primitive@1.1.3': {}
 
-  '@radix-ui/react-accordion@1.2.12(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
+  '@radix-ui/react-accordion@1.2.12(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)':
     dependencies:
       '@radix-ui/primitive': 1.1.3
-      '@radix-ui/react-collapsible': 1.1.12(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@radix-ui/react-collection': 1.1.7(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-context': 1.1.2(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-direction': 1.1.1(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-id': 1.1.1(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@18.3.28)(react@18.3.1)
-      react: 18.3.1
-      react-dom: 18.3.1(react@18.3.1)
+      '@radix-ui/react-collapsible': 1.1.12(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      '@radix-ui/react-collection': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-context': 1.1.2(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-direction': 1.1.1(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-id': 1.1.1(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.14)(react@19.2.4)
+      react: 19.2.4
+      react-dom: 19.2.4(react@19.2.4)
     optionalDependencies:
-      '@types/react': 18.3.28
-      '@types/react-dom': 18.3.7(@types/react@18.3.28)
+      '@types/react': 19.2.14
+      '@types/react-dom': 19.2.3(@types/react@19.2.14)
 
-  '@radix-ui/react-alert-dialog@1.1.15(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
+  '@radix-ui/react-alert-dialog@1.1.15(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)':
     dependencies:
       '@radix-ui/primitive': 1.1.3
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-context': 1.1.2(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-dialog': 1.1.15(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@radix-ui/react-slot': 1.2.3(@types/react@18.3.28)(react@18.3.1)
-      react: 18.3.1
-      react-dom: 18.3.1(react@18.3.1)
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-context': 1.1.2(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-dialog': 1.1.15(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      '@radix-ui/react-slot': 1.2.3(@types/react@19.2.14)(react@19.2.4)
+      react: 19.2.4
+      react-dom: 19.2.4(react@19.2.4)
     optionalDependencies:
-      '@types/react': 18.3.28
-      '@types/react-dom': 18.3.7(@types/react@18.3.28)
+      '@types/react': 19.2.14
+      '@types/react-dom': 19.2.3(@types/react@19.2.14)
 
-  '@radix-ui/react-arrow@1.1.7(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
+  '@radix-ui/react-arrow@1.1.7(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)':
     dependencies:
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      react: 18.3.1
-      react-dom: 18.3.1(react@18.3.1)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      react: 19.2.4
+      react-dom: 19.2.4(react@19.2.4)
     optionalDependencies:
-      '@types/react': 18.3.28
-      '@types/react-dom': 18.3.7(@types/react@18.3.28)
+      '@types/react': 19.2.14
+      '@types/react-dom': 19.2.3(@types/react@19.2.14)
 
-  '@radix-ui/react-checkbox@1.3.3(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
+  '@radix-ui/react-checkbox@1.3.3(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)':
     dependencies:
       '@radix-ui/primitive': 1.1.3
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-context': 1.1.2(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-presence': 1.1.5(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-use-previous': 1.1.1(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-use-size': 1.1.1(@types/react@18.3.28)(react@18.3.1)
-      react: 18.3.1
-      react-dom: 18.3.1(react@18.3.1)
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-context': 1.1.2(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-presence': 1.1.5(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-use-previous': 1.1.1(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-use-size': 1.1.1(@types/react@19.2.14)(react@19.2.4)
+      react: 19.2.4
+      react-dom: 19.2.4(react@19.2.4)
     optionalDependencies:
-      '@types/react': 18.3.28
-      '@types/react-dom': 18.3.7(@types/react@18.3.28)
+      '@types/react': 19.2.14
+      '@types/react-dom': 19.2.3(@types/react@19.2.14)
 
-  '@radix-ui/react-collapsible@1.1.12(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
+  '@radix-ui/react-collapsible@1.1.12(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)':
     dependencies:
       '@radix-ui/primitive': 1.1.3
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-context': 1.1.2(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-id': 1.1.1(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-presence': 1.1.5(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@18.3.28)(react@18.3.1)
-      react: 18.3.1
-      react-dom: 18.3.1(react@18.3.1)
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-context': 1.1.2(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-id': 1.1.1(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-presence': 1.1.5(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.14)(react@19.2.4)
+      react: 19.2.4
+      react-dom: 19.2.4(react@19.2.4)
     optionalDependencies:
-      '@types/react': 18.3.28
-      '@types/react-dom': 18.3.7(@types/react@18.3.28)
+      '@types/react': 19.2.14
+      '@types/react-dom': 19.2.3(@types/react@19.2.14)
 
-  '@radix-ui/react-collection@1.1.7(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
+  '@radix-ui/react-collection@1.1.7(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)':
     dependencies:
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-context': 1.1.2(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@radix-ui/react-slot': 1.2.3(@types/react@18.3.28)(react@18.3.1)
-      react: 18.3.1
-      react-dom: 18.3.1(react@18.3.1)
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-context': 1.1.2(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      '@radix-ui/react-slot': 1.2.3(@types/react@19.2.14)(react@19.2.4)
+      react: 19.2.4
+      react-dom: 19.2.4(react@19.2.4)
     optionalDependencies:
-      '@types/react': 18.3.28
-      '@types/react-dom': 18.3.7(@types/react@18.3.28)
+      '@types/react': 19.2.14
+      '@types/react-dom': 19.2.3(@types/react@19.2.14)
 
-  '@radix-ui/react-compose-refs@1.1.2(@types/react@18.3.28)(react@18.3.1)':
+  '@radix-ui/react-compose-refs@1.1.2(@types/react@19.2.14)(react@19.2.4)':
     dependencies:
-      react: 18.3.1
+      react: 19.2.4
     optionalDependencies:
-      '@types/react': 18.3.28
+      '@types/react': 19.2.14
 
-  '@radix-ui/react-context-menu@2.2.16(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
+  '@radix-ui/react-context-menu@2.2.16(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)':
     dependencies:
       '@radix-ui/primitive': 1.1.3
-      '@radix-ui/react-context': 1.1.2(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-menu': 2.1.16(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@18.3.28)(react@18.3.1)
-      react: 18.3.1
-      react-dom: 18.3.1(react@18.3.1)
+      '@radix-ui/react-context': 1.1.2(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-menu': 2.1.16(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.14)(react@19.2.4)
+      react: 19.2.4
+      react-dom: 19.2.4(react@19.2.4)
     optionalDependencies:
-      '@types/react': 18.3.28
-      '@types/react-dom': 18.3.7(@types/react@18.3.28)
+      '@types/react': 19.2.14
+      '@types/react-dom': 19.2.3(@types/react@19.2.14)
 
-  '@radix-ui/react-context@1.1.2(@types/react@18.3.28)(react@18.3.1)':
+  '@radix-ui/react-context@1.1.2(@types/react@19.2.14)(react@19.2.4)':
     dependencies:
-      react: 18.3.1
+      react: 19.2.4
     optionalDependencies:
-      '@types/react': 18.3.28
+      '@types/react': 19.2.14
 
-  '@radix-ui/react-context@1.1.3(@types/react@18.3.28)(react@18.3.1)':
+  '@radix-ui/react-context@1.1.3(@types/react@19.2.14)(react@19.2.4)':
     dependencies:
-      react: 18.3.1
+      react: 19.2.4
     optionalDependencies:
-      '@types/react': 18.3.28
+      '@types/react': 19.2.14
 
-  '@radix-ui/react-dialog@1.1.15(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
+  '@radix-ui/react-dialog@1.1.15(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)':
     dependencies:
       '@radix-ui/primitive': 1.1.3
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-context': 1.1.2(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-dismissable-layer': 1.1.11(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@radix-ui/react-focus-guards': 1.1.3(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-focus-scope': 1.1.7(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@radix-ui/react-id': 1.1.1(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-portal': 1.1.9(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@radix-ui/react-presence': 1.1.5(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@radix-ui/react-slot': 1.2.3(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@18.3.28)(react@18.3.1)
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-context': 1.1.2(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-dismissable-layer': 1.1.11(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      '@radix-ui/react-focus-guards': 1.1.3(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-focus-scope': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      '@radix-ui/react-id': 1.1.1(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-portal': 1.1.9(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      '@radix-ui/react-presence': 1.1.5(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      '@radix-ui/react-slot': 1.2.3(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.14)(react@19.2.4)
       aria-hidden: 1.2.6
-      react: 18.3.1
-      react-dom: 18.3.1(react@18.3.1)
-      react-remove-scroll: 2.7.2(@types/react@18.3.28)(react@18.3.1)
+      react: 19.2.4
+      react-dom: 19.2.4(react@19.2.4)
+      react-remove-scroll: 2.7.2(@types/react@19.2.14)(react@19.2.4)
     optionalDependencies:
-      '@types/react': 18.3.28
-      '@types/react-dom': 18.3.7(@types/react@18.3.28)
+      '@types/react': 19.2.14
+      '@types/react-dom': 19.2.3(@types/react@19.2.14)
 
-  '@radix-ui/react-direction@1.1.1(@types/react@18.3.28)(react@18.3.1)':
+  '@radix-ui/react-direction@1.1.1(@types/react@19.2.14)(react@19.2.4)':
     dependencies:
-      react: 18.3.1
+      react: 19.2.4
     optionalDependencies:
-      '@types/react': 18.3.28
+      '@types/react': 19.2.14
 
-  '@radix-ui/react-dismissable-layer@1.1.11(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
+  '@radix-ui/react-dismissable-layer@1.1.11(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)':
     dependencies:
       '@radix-ui/primitive': 1.1.3
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-use-escape-keydown': 1.1.1(@types/react@18.3.28)(react@18.3.1)
-      react: 18.3.1
-      react-dom: 18.3.1(react@18.3.1)
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-use-escape-keydown': 1.1.1(@types/react@19.2.14)(react@19.2.4)
+      react: 19.2.4
+      react-dom: 19.2.4(react@19.2.4)
     optionalDependencies:
-      '@types/react': 18.3.28
-      '@types/react-dom': 18.3.7(@types/react@18.3.28)
+      '@types/react': 19.2.14
+      '@types/react-dom': 19.2.3(@types/react@19.2.14)
 
-  '@radix-ui/react-focus-guards@1.1.3(@types/react@18.3.28)(react@18.3.1)':
+  '@radix-ui/react-focus-guards@1.1.3(@types/react@19.2.14)(react@19.2.4)':
     dependencies:
-      react: 18.3.1
+      react: 19.2.4
     optionalDependencies:
-      '@types/react': 18.3.28
+      '@types/react': 19.2.14
 
-  '@radix-ui/react-focus-scope@1.1.7(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
+  '@radix-ui/react-focus-scope@1.1.7(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)':
     dependencies:
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@18.3.28)(react@18.3.1)
-      react: 18.3.1
-      react-dom: 18.3.1(react@18.3.1)
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.14)(react@19.2.4)
+      react: 19.2.4
+      react-dom: 19.2.4(react@19.2.4)
     optionalDependencies:
-      '@types/react': 18.3.28
-      '@types/react-dom': 18.3.7(@types/react@18.3.28)
+      '@types/react': 19.2.14
+      '@types/react-dom': 19.2.3(@types/react@19.2.14)
 
-  '@radix-ui/react-id@1.1.1(@types/react@18.3.28)(react@18.3.1)':
+  '@radix-ui/react-id@1.1.1(@types/react@19.2.14)(react@19.2.4)':
     dependencies:
-      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@18.3.28)(react@18.3.1)
-      react: 18.3.1
+      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.14)(react@19.2.4)
+      react: 19.2.4
     optionalDependencies:
-      '@types/react': 18.3.28
+      '@types/react': 19.2.14
 
-  '@radix-ui/react-label@2.1.8(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
+  '@radix-ui/react-label@2.1.8(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)':
     dependencies:
-      '@radix-ui/react-primitive': 2.1.4(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      react: 18.3.1
-      react-dom: 18.3.1(react@18.3.1)
+      '@radix-ui/react-primitive': 2.1.4(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      react: 19.2.4
+      react-dom: 19.2.4(react@19.2.4)
     optionalDependencies:
-      '@types/react': 18.3.28
-      '@types/react-dom': 18.3.7(@types/react@18.3.28)
+      '@types/react': 19.2.14
+      '@types/react-dom': 19.2.3(@types/react@19.2.14)
 
-  '@radix-ui/react-menu@2.1.16(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
+  '@radix-ui/react-menu@2.1.16(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)':
     dependencies:
       '@radix-ui/primitive': 1.1.3
-      '@radix-ui/react-collection': 1.1.7(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-context': 1.1.2(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-direction': 1.1.1(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-dismissable-layer': 1.1.11(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@radix-ui/react-focus-guards': 1.1.3(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-focus-scope': 1.1.7(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@radix-ui/react-id': 1.1.1(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-popper': 1.2.8(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@radix-ui/react-portal': 1.1.9(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@radix-ui/react-presence': 1.1.5(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@radix-ui/react-roving-focus': 1.1.11(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@radix-ui/react-slot': 1.2.3(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@18.3.28)(react@18.3.1)
+      '@radix-ui/react-collection': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-context': 1.1.2(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-direction': 1.1.1(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-dismissable-layer': 1.1.11(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      '@radix-ui/react-focus-guards': 1.1.3(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-focus-scope': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      '@radix-ui/react-id': 1.1.1(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-popper': 1.2.8(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      '@radix-ui/react-portal': 1.1.9(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      '@radix-ui/react-presence': 1.1.5(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      '@radix-ui/react-roving-focus': 1.1.11(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      '@radix-ui/react-slot': 1.2.3(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.14)(react@19.2.4)
       aria-hidden: 1.2.6
-      react: 18.3.1
-      react-dom: 18.3.1(react@18.3.1)
-      react-remove-scroll: 2.7.2(@types/react@18.3.28)(react@18.3.1)
+      react: 19.2.4
+      react-dom: 19.2.4(react@19.2.4)
+      react-remove-scroll: 2.7.2(@types/react@19.2.14)(react@19.2.4)
     optionalDependencies:
-      '@types/react': 18.3.28
-      '@types/react-dom': 18.3.7(@types/react@18.3.28)
+      '@types/react': 19.2.14
+      '@types/react-dom': 19.2.3(@types/react@19.2.14)
 
-  '@radix-ui/react-popover@1.1.15(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
+  '@radix-ui/react-popover@1.1.15(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)':
     dependencies:
       '@radix-ui/primitive': 1.1.3
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-context': 1.1.2(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-dismissable-layer': 1.1.11(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@radix-ui/react-focus-guards': 1.1.3(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-focus-scope': 1.1.7(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@radix-ui/react-id': 1.1.1(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-popper': 1.2.8(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@radix-ui/react-portal': 1.1.9(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@radix-ui/react-presence': 1.1.5(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@radix-ui/react-slot': 1.2.3(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@18.3.28)(react@18.3.1)
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-context': 1.1.2(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-dismissable-layer': 1.1.11(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      '@radix-ui/react-focus-guards': 1.1.3(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-focus-scope': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      '@radix-ui/react-id': 1.1.1(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-popper': 1.2.8(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      '@radix-ui/react-portal': 1.1.9(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      '@radix-ui/react-presence': 1.1.5(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      '@radix-ui/react-slot': 1.2.3(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.14)(react@19.2.4)
       aria-hidden: 1.2.6
-      react: 18.3.1
-      react-dom: 18.3.1(react@18.3.1)
-      react-remove-scroll: 2.7.2(@types/react@18.3.28)(react@18.3.1)
+      react: 19.2.4
+      react-dom: 19.2.4(react@19.2.4)
+      react-remove-scroll: 2.7.2(@types/react@19.2.14)(react@19.2.4)
     optionalDependencies:
-      '@types/react': 18.3.28
-      '@types/react-dom': 18.3.7(@types/react@18.3.28)
-
-  '@radix-ui/react-popper@1.2.8(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
-    dependencies:
-      '@floating-ui/react-dom': 2.1.7(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@radix-ui/react-arrow': 1.1.7(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-context': 1.1.2(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-use-rect': 1.1.1(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-use-size': 1.1.1(@types/react@18.3.28)(react@18.3.1)
+      '@types/react': 19.2.14
+      '@types/react-dom': 19.2.3(@types/react@19.2.14)
+
+  '@radix-ui/react-popper@1.2.8(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)':
+    dependencies:
+      '@floating-ui/react-dom': 2.1.7(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      '@radix-ui/react-arrow': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-context': 1.1.2(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-use-rect': 1.1.1(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-use-size': 1.1.1(@types/react@19.2.14)(react@19.2.4)
       '@radix-ui/rect': 1.1.1
-      react: 18.3.1
-      react-dom: 18.3.1(react@18.3.1)
+      react: 19.2.4
+      react-dom: 19.2.4(react@19.2.4)
     optionalDependencies:
-      '@types/react': 18.3.28
-      '@types/react-dom': 18.3.7(@types/react@18.3.28)
+      '@types/react': 19.2.14
+      '@types/react-dom': 19.2.3(@types/react@19.2.14)
 
-  '@radix-ui/react-portal@1.1.9(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
+  '@radix-ui/react-portal@1.1.9(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)':
     dependencies:
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@18.3.28)(react@18.3.1)
-      react: 18.3.1
-      react-dom: 18.3.1(react@18.3.1)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.14)(react@19.2.4)
+      react: 19.2.4
+      react-dom: 19.2.4(react@19.2.4)
     optionalDependencies:
-      '@types/react': 18.3.28
-      '@types/react-dom': 18.3.7(@types/react@18.3.28)
+      '@types/react': 19.2.14
+      '@types/react-dom': 19.2.3(@types/react@19.2.14)
 
-  '@radix-ui/react-presence@1.1.5(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
+  '@radix-ui/react-presence@1.1.5(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)':
     dependencies:
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@18.3.28)(react@18.3.1)
-      react: 18.3.1
-      react-dom: 18.3.1(react@18.3.1)
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.14)(react@19.2.4)
+      react: 19.2.4
+      react-dom: 19.2.4(react@19.2.4)
     optionalDependencies:
-      '@types/react': 18.3.28
-      '@types/react-dom': 18.3.7(@types/react@18.3.28)
+      '@types/react': 19.2.14
+      '@types/react-dom': 19.2.3(@types/react@19.2.14)
 
-  '@radix-ui/react-primitive@2.1.3(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
+  '@radix-ui/react-primitive@2.1.3(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)':
     dependencies:
-      '@radix-ui/react-slot': 1.2.3(@types/react@18.3.28)(react@18.3.1)
-      react: 18.3.1
-      react-dom: 18.3.1(react@18.3.1)
+      '@radix-ui/react-slot': 1.2.3(@types/react@19.2.14)(react@19.2.4)
+      react: 19.2.4
+      react-dom: 19.2.4(react@19.2.4)
     optionalDependencies:
-      '@types/react': 18.3.28
-      '@types/react-dom': 18.3.7(@types/react@18.3.28)
+      '@types/react': 19.2.14
+      '@types/react-dom': 19.2.3(@types/react@19.2.14)
 
-  '@radix-ui/react-primitive@2.1.4(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
+  '@radix-ui/react-primitive@2.1.4(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)':
     dependencies:
-      '@radix-ui/react-slot': 1.2.4(@types/react@18.3.28)(react@18.3.1)
-      react: 18.3.1
-      react-dom: 18.3.1(react@18.3.1)
+      '@radix-ui/react-slot': 1.2.4(@types/react@19.2.14)(react@19.2.4)
+      react: 19.2.4
+      react-dom: 19.2.4(react@19.2.4)
     optionalDependencies:
-      '@types/react': 18.3.28
-      '@types/react-dom': 18.3.7(@types/react@18.3.28)
+      '@types/react': 19.2.14
+      '@types/react-dom': 19.2.3(@types/react@19.2.14)
 
-  '@radix-ui/react-progress@1.1.8(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
+  '@radix-ui/react-progress@1.1.8(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)':
     dependencies:
-      '@radix-ui/react-context': 1.1.3(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-primitive': 2.1.4(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      react: 18.3.1
-      react-dom: 18.3.1(react@18.3.1)
+      '@radix-ui/react-context': 1.1.3(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-primitive': 2.1.4(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      react: 19.2.4
+      react-dom: 19.2.4(react@19.2.4)
     optionalDependencies:
-      '@types/react': 18.3.28
-      '@types/react-dom': 18.3.7(@types/react@18.3.28)
+      '@types/react': 19.2.14
+      '@types/react-dom': 19.2.3(@types/react@19.2.14)
 
-  '@radix-ui/react-radio-group@1.3.8(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
+  '@radix-ui/react-radio-group@1.3.8(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)':
     dependencies:
       '@radix-ui/primitive': 1.1.3
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-context': 1.1.2(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-direction': 1.1.1(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-presence': 1.1.5(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@radix-ui/react-roving-focus': 1.1.11(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-use-previous': 1.1.1(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-use-size': 1.1.1(@types/react@18.3.28)(react@18.3.1)
-      react: 18.3.1
-      react-dom: 18.3.1(react@18.3.1)
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-context': 1.1.2(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-direction': 1.1.1(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-presence': 1.1.5(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      '@radix-ui/react-roving-focus': 1.1.11(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-use-previous': 1.1.1(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-use-size': 1.1.1(@types/react@19.2.14)(react@19.2.4)
+      react: 19.2.4
+      react-dom: 19.2.4(react@19.2.4)
     optionalDependencies:
-      '@types/react': 18.3.28
-      '@types/react-dom': 18.3.7(@types/react@18.3.28)
+      '@types/react': 19.2.14
+      '@types/react-dom': 19.2.3(@types/react@19.2.14)
 
-  '@radix-ui/react-roving-focus@1.1.11(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
+  '@radix-ui/react-roving-focus@1.1.11(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)':
     dependencies:
       '@radix-ui/primitive': 1.1.3
-      '@radix-ui/react-collection': 1.1.7(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-context': 1.1.2(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-direction': 1.1.1(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-id': 1.1.1(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@18.3.28)(react@18.3.1)
-      react: 18.3.1
-      react-dom: 18.3.1(react@18.3.1)
+      '@radix-ui/react-collection': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-context': 1.1.2(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-direction': 1.1.1(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-id': 1.1.1(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.14)(react@19.2.4)
+      react: 19.2.4
+      react-dom: 19.2.4(react@19.2.4)
     optionalDependencies:
-      '@types/react': 18.3.28
-      '@types/react-dom': 18.3.7(@types/react@18.3.28)
+      '@types/react': 19.2.14
+      '@types/react-dom': 19.2.3(@types/react@19.2.14)
 
-  '@radix-ui/react-scroll-area@1.2.10(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
+  '@radix-ui/react-scroll-area@1.2.10(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)':
     dependencies:
       '@radix-ui/number': 1.1.1
       '@radix-ui/primitive': 1.1.3
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-context': 1.1.2(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-direction': 1.1.1(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-presence': 1.1.5(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@18.3.28)(react@18.3.1)
-      react: 18.3.1
-      react-dom: 18.3.1(react@18.3.1)
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-context': 1.1.2(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-direction': 1.1.1(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-presence': 1.1.5(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.14)(react@19.2.4)
+      react: 19.2.4
+      react-dom: 19.2.4(react@19.2.4)
     optionalDependencies:
-      '@types/react': 18.3.28
-      '@types/react-dom': 18.3.7(@types/react@18.3.28)
+      '@types/react': 19.2.14
+      '@types/react-dom': 19.2.3(@types/react@19.2.14)
 
-  '@radix-ui/react-select@2.2.6(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
+  '@radix-ui/react-select@2.2.6(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)':
     dependencies:
       '@radix-ui/number': 1.1.1
       '@radix-ui/primitive': 1.1.3
-      '@radix-ui/react-collection': 1.1.7(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-context': 1.1.2(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-direction': 1.1.1(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-dismissable-layer': 1.1.11(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@radix-ui/react-focus-guards': 1.1.3(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-focus-scope': 1.1.7(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@radix-ui/react-id': 1.1.1(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-popper': 1.2.8(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@radix-ui/react-portal': 1.1.9(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@radix-ui/react-slot': 1.2.3(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-use-previous': 1.1.1(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-visually-hidden': 1.2.3(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@radix-ui/react-collection': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-context': 1.1.2(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-direction': 1.1.1(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-dismissable-layer': 1.1.11(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      '@radix-ui/react-focus-guards': 1.1.3(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-focus-scope': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      '@radix-ui/react-id': 1.1.1(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-popper': 1.2.8(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      '@radix-ui/react-portal': 1.1.9(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      '@radix-ui/react-slot': 1.2.3(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-use-previous': 1.1.1(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-visually-hidden': 1.2.3(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
       aria-hidden: 1.2.6
-      react: 18.3.1
-      react-dom: 18.3.1(react@18.3.1)
-      react-remove-scroll: 2.7.2(@types/react@18.3.28)(react@18.3.1)
+      react: 19.2.4
+      react-dom: 19.2.4(react@19.2.4)
+      react-remove-scroll: 2.7.2(@types/react@19.2.14)(react@19.2.4)
+    optionalDependencies:
+      '@types/react': 19.2.14
+      '@types/react-dom': 19.2.3(@types/react@19.2.14)
+
+  '@radix-ui/react-separator@1.1.8(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)':
+    dependencies:
+      '@radix-ui/react-primitive': 2.1.4(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      react: 19.2.4
+      react-dom: 19.2.4(react@19.2.4)
     optionalDependencies:
-      '@types/react': 18.3.28
-      '@types/react-dom': 18.3.7(@types/react@18.3.28)
+      '@types/react': 19.2.14
+      '@types/react-dom': 19.2.3(@types/react@19.2.14)
 
-  '@radix-ui/react-separator@1.1.8(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
+  '@radix-ui/react-slot@1.2.3(@types/react@19.2.14)(react@19.2.4)':
     dependencies:
-      '@radix-ui/react-primitive': 2.1.4(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      react: 18.3.1
-      react-dom: 18.3.1(react@18.3.1)
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.2.4)
+      react: 19.2.4
     optionalDependencies:
-      '@types/react': 18.3.28
-      '@types/react-dom': 18.3.7(@types/react@18.3.28)
+      '@types/react': 19.2.14
 
-  '@radix-ui/react-slot@1.2.3(@types/react@18.3.28)(react@18.3.1)':
+  '@radix-ui/react-slot@1.2.4(@types/react@19.2.14)(react@19.2.4)':
     dependencies:
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@18.3.28)(react@18.3.1)
-      react: 18.3.1
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.2.4)
+      react: 19.2.4
+    optionalDependencies:
+      '@types/react': 19.2.14
+
+  '@radix-ui/react-switch@1.2.6(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)':
+    dependencies:
+      '@radix-ui/primitive': 1.1.3
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-context': 1.1.2(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-use-previous': 1.1.1(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-use-size': 1.1.1(@types/react@19.2.14)(react@19.2.4)
+      react: 19.2.4
+      react-dom: 19.2.4(react@19.2.4)
     optionalDependencies:
-      '@types/react': 18.3.28
+      '@types/react': 19.2.14
+      '@types/react-dom': 19.2.3(@types/react@19.2.14)
 
-  '@radix-ui/react-slot@1.2.4(@types/react@18.3.28)(react@18.3.1)':
+  '@radix-ui/react-toast@1.2.15(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)':
     dependencies:
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@18.3.28)(react@18.3.1)
-      react: 18.3.1
+      '@radix-ui/primitive': 1.1.3
+      '@radix-ui/react-collection': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-context': 1.1.2(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-dismissable-layer': 1.1.11(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      '@radix-ui/react-portal': 1.1.9(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      '@radix-ui/react-presence': 1.1.5(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-visually-hidden': 1.2.3(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      react: 19.2.4
+      react-dom: 19.2.4(react@19.2.4)
     optionalDependencies:
-      '@types/react': 18.3.28
+      '@types/react': 19.2.14
+      '@types/react-dom': 19.2.3(@types/react@19.2.14)
 
-  '@radix-ui/react-switch@1.2.6(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
+  '@radix-ui/react-toggle-group@1.1.11(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)':
     dependencies:
       '@radix-ui/primitive': 1.1.3
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-context': 1.1.2(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-use-previous': 1.1.1(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-use-size': 1.1.1(@types/react@18.3.28)(react@18.3.1)
-      react: 18.3.1
-      react-dom: 18.3.1(react@18.3.1)
+      '@radix-ui/react-context': 1.1.2(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-direction': 1.1.1(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      '@radix-ui/react-roving-focus': 1.1.11(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      '@radix-ui/react-toggle': 1.1.10(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.14)(react@19.2.4)
+      react: 19.2.4
+      react-dom: 19.2.4(react@19.2.4)
     optionalDependencies:
-      '@types/react': 18.3.28
-      '@types/react-dom': 18.3.7(@types/react@18.3.28)
+      '@types/react': 19.2.14
+      '@types/react-dom': 19.2.3(@types/react@19.2.14)
 
-  '@radix-ui/react-toast@1.2.15(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
+  '@radix-ui/react-toggle@1.1.10(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)':
     dependencies:
       '@radix-ui/primitive': 1.1.3
-      '@radix-ui/react-collection': 1.1.7(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-context': 1.1.2(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-dismissable-layer': 1.1.11(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@radix-ui/react-portal': 1.1.9(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@radix-ui/react-presence': 1.1.5(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-visually-hidden': 1.2.3(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      react: 18.3.1
-      react-dom: 18.3.1(react@18.3.1)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.14)(react@19.2.4)
+      react: 19.2.4
+      react-dom: 19.2.4(react@19.2.4)
     optionalDependencies:
-      '@types/react': 18.3.28
-      '@types/react-dom': 18.3.7(@types/react@18.3.28)
+      '@types/react': 19.2.14
+      '@types/react-dom': 19.2.3(@types/react@19.2.14)
 
-  '@radix-ui/react-tooltip@1.2.8(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
+  '@radix-ui/react-tooltip@1.2.8(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)':
     dependencies:
       '@radix-ui/primitive': 1.1.3
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-context': 1.1.2(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-dismissable-layer': 1.1.11(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@radix-ui/react-id': 1.1.1(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-popper': 1.2.8(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@radix-ui/react-portal': 1.1.9(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@radix-ui/react-presence': 1.1.5(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@radix-ui/react-slot': 1.2.3(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-visually-hidden': 1.2.3(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      react: 18.3.1
-      react-dom: 18.3.1(react@18.3.1)
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-context': 1.1.2(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-dismissable-layer': 1.1.11(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      '@radix-ui/react-id': 1.1.1(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-popper': 1.2.8(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      '@radix-ui/react-portal': 1.1.9(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      '@radix-ui/react-presence': 1.1.5(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      '@radix-ui/react-slot': 1.2.3(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-visually-hidden': 1.2.3(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      react: 19.2.4
+      react-dom: 19.2.4(react@19.2.4)
     optionalDependencies:
-      '@types/react': 18.3.28
-      '@types/react-dom': 18.3.7(@types/react@18.3.28)
+      '@types/react': 19.2.14
+      '@types/react-dom': 19.2.3(@types/react@19.2.14)
 
-  '@radix-ui/react-use-callback-ref@1.1.1(@types/react@18.3.28)(react@18.3.1)':
+  '@radix-ui/react-use-callback-ref@1.1.1(@types/react@19.2.14)(react@19.2.4)':
     dependencies:
-      react: 18.3.1
+      react: 19.2.4
     optionalDependencies:
-      '@types/react': 18.3.28
+      '@types/react': 19.2.14
 
-  '@radix-ui/react-use-controllable-state@1.2.2(@types/react@18.3.28)(react@18.3.1)':
+  '@radix-ui/react-use-controllable-state@1.2.2(@types/react@19.2.14)(react@19.2.4)':
     dependencies:
-      '@radix-ui/react-use-effect-event': 0.0.2(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@18.3.28)(react@18.3.1)
-      react: 18.3.1
+      '@radix-ui/react-use-effect-event': 0.0.2(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.14)(react@19.2.4)
+      react: 19.2.4
     optionalDependencies:
-      '@types/react': 18.3.28
+      '@types/react': 19.2.14
 
-  '@radix-ui/react-use-effect-event@0.0.2(@types/react@18.3.28)(react@18.3.1)':
+  '@radix-ui/react-use-effect-event@0.0.2(@types/react@19.2.14)(react@19.2.4)':
     dependencies:
-      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@18.3.28)(react@18.3.1)
-      react: 18.3.1
+      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.14)(react@19.2.4)
+      react: 19.2.4
     optionalDependencies:
-      '@types/react': 18.3.28
+      '@types/react': 19.2.14
 
-  '@radix-ui/react-use-escape-keydown@1.1.1(@types/react@18.3.28)(react@18.3.1)':
+  '@radix-ui/react-use-escape-keydown@1.1.1(@types/react@19.2.14)(react@19.2.4)':
     dependencies:
-      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@18.3.28)(react@18.3.1)
-      react: 18.3.1
+      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.14)(react@19.2.4)
+      react: 19.2.4
     optionalDependencies:
-      '@types/react': 18.3.28
+      '@types/react': 19.2.14
 
-  '@radix-ui/react-use-layout-effect@1.1.1(@types/react@18.3.28)(react@18.3.1)':
+  '@radix-ui/react-use-layout-effect@1.1.1(@types/react@19.2.14)(react@19.2.4)':
     dependencies:
-      react: 18.3.1
+      react: 19.2.4
     optionalDependencies:
-      '@types/react': 18.3.28
+      '@types/react': 19.2.14
 
-  '@radix-ui/react-use-previous@1.1.1(@types/react@18.3.28)(react@18.3.1)':
+  '@radix-ui/react-use-previous@1.1.1(@types/react@19.2.14)(react@19.2.4)':
     dependencies:
-      react: 18.3.1
+      react: 19.2.4
     optionalDependencies:
-      '@types/react': 18.3.28
+      '@types/react': 19.2.14
 
-  '@radix-ui/react-use-rect@1.1.1(@types/react@18.3.28)(react@18.3.1)':
+  '@radix-ui/react-use-rect@1.1.1(@types/react@19.2.14)(react@19.2.4)':
     dependencies:
       '@radix-ui/rect': 1.1.1
-      react: 18.3.1
+      react: 19.2.4
     optionalDependencies:
-      '@types/react': 18.3.28
+      '@types/react': 19.2.14
 
-  '@radix-ui/react-use-size@1.1.1(@types/react@18.3.28)(react@18.3.1)':
+  '@radix-ui/react-use-size@1.1.1(@types/react@19.2.14)(react@19.2.4)':
     dependencies:
-      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@18.3.28)(react@18.3.1)
-      react: 18.3.1
+      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.14)(react@19.2.4)
+      react: 19.2.4
     optionalDependencies:
-      '@types/react': 18.3.28
+      '@types/react': 19.2.14
 
-  '@radix-ui/react-visually-hidden@1.2.3(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
+  '@radix-ui/react-visually-hidden@1.2.3(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)':
     dependencies:
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      react: 18.3.1
-      react-dom: 18.3.1(react@18.3.1)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      react: 19.2.4
+      react-dom: 19.2.4(react@19.2.4)
     optionalDependencies:
-      '@types/react': 18.3.28
-      '@types/react-dom': 18.3.7(@types/react@18.3.28)
+      '@types/react': 19.2.14
+      '@types/react-dom': 19.2.3(@types/react@19.2.14)
 
   '@radix-ui/rect@1.1.1': {}
 
@@ -7451,22 +8747,160 @@ snapshots:
 
   '@sindresorhus/is@4.6.0': {}
 
+  '@standard-schema/spec@1.1.0': {}
+
   '@szmarczak/http-timer@4.0.6':
     dependencies:
       defer-to-connect: 2.0.1
 
+  '@tailwindcss/node@4.2.1':
+    dependencies:
+      '@jridgewell/remapping': 2.3.5
+      enhanced-resolve: 5.20.0
+      jiti: 2.6.1
+      lightningcss: 1.31.1
+      magic-string: 0.30.21
+      source-map-js: 1.2.1
+      tailwindcss: 4.2.1
+
+  '@tailwindcss/oxide-android-arm64@4.2.1':
+    optional: true
+
+  '@tailwindcss/oxide-darwin-arm64@4.2.1':
+    optional: true
+
+  '@tailwindcss/oxide-darwin-x64@4.2.1':
+    optional: true
+
+  '@tailwindcss/oxide-freebsd-x64@4.2.1':
+    optional: true
+
+  '@tailwindcss/oxide-linux-arm-gnueabihf@4.2.1':
+    optional: true
+
+  '@tailwindcss/oxide-linux-arm64-gnu@4.2.1':
+    optional: true
+
+  '@tailwindcss/oxide-linux-arm64-musl@4.2.1':
+    optional: true
+
+  '@tailwindcss/oxide-linux-x64-gnu@4.2.1':
+    optional: true
+
+  '@tailwindcss/oxide-linux-x64-musl@4.2.1':
+    optional: true
+
+  '@tailwindcss/oxide-wasm32-wasi@4.2.1':
+    optional: true
+
+  '@tailwindcss/oxide-win32-arm64-msvc@4.2.1':
+    optional: true
+
+  '@tailwindcss/oxide-win32-x64-msvc@4.2.1':
+    optional: true
+
+  '@tailwindcss/oxide@4.2.1':
+    optionalDependencies:
+      '@tailwindcss/oxide-android-arm64': 4.2.1
+      '@tailwindcss/oxide-darwin-arm64': 4.2.1
+      '@tailwindcss/oxide-darwin-x64': 4.2.1
+      '@tailwindcss/oxide-freebsd-x64': 4.2.1
+      '@tailwindcss/oxide-linux-arm-gnueabihf': 4.2.1
+      '@tailwindcss/oxide-linux-arm64-gnu': 4.2.1
+      '@tailwindcss/oxide-linux-arm64-musl': 4.2.1
+      '@tailwindcss/oxide-linux-x64-gnu': 4.2.1
+      '@tailwindcss/oxide-linux-x64-musl': 4.2.1
+      '@tailwindcss/oxide-wasm32-wasi': 4.2.1
+      '@tailwindcss/oxide-win32-arm64-msvc': 4.2.1
+      '@tailwindcss/oxide-win32-x64-msvc': 4.2.1
+
+  '@tailwindcss/vite@4.2.1(vite@6.4.1(@types/node@20.19.32)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.8.2))':
+    dependencies:
+      '@tailwindcss/node': 4.2.1
+      '@tailwindcss/oxide': 4.2.1
+      tailwindcss: 4.2.1
+      vite: 6.4.1(@types/node@20.19.32)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.8.2)
+
+  '@tanstack/devtools-event-client@0.4.1': {}
+
+  '@tanstack/form-core@1.28.4':
+    dependencies:
+      '@tanstack/devtools-event-client': 0.4.1
+      '@tanstack/pacer-lite': 0.1.1
+      '@tanstack/store': 0.9.2
+
+  '@tanstack/hotkeys@0.4.1':
+    dependencies:
+      '@tanstack/store': 0.9.2
+
+  '@tanstack/pacer-lite@0.1.1': {}
+
   '@tanstack/query-core@5.90.20': {}
 
-  '@tanstack/react-query@5.90.21(react@18.3.1)':
+  '@tanstack/react-form@1.28.4(react-dom@19.2.4(react@19.2.4))(react@19.2.4)':
+    dependencies:
+      '@tanstack/form-core': 1.28.4
+      '@tanstack/react-store': 0.9.2(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      react: 19.2.4
+    transitivePeerDependencies:
+      - react-dom
+
+  '@tanstack/react-hotkeys@0.4.1(react-dom@19.2.4(react@19.2.4))(react@19.2.4)':
+    dependencies:
+      '@tanstack/hotkeys': 0.4.1
+      '@tanstack/react-store': 0.9.2(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      react: 19.2.4
+      react-dom: 19.2.4(react@19.2.4)
+
+  '@tanstack/react-query@5.90.21(react@19.2.4)':
     dependencies:
       '@tanstack/query-core': 5.90.20
-      react: 18.3.1
+      react: 19.2.4
+
+  '@tanstack/react-store@0.9.2(react-dom@19.2.4(react@19.2.4))(react@19.2.4)':
+    dependencies:
+      '@tanstack/store': 0.9.2
+      react: 19.2.4
+      react-dom: 19.2.4(react@19.2.4)
+      use-sync-external-store: 1.6.0(react@19.2.4)
+
+  '@tanstack/react-virtual@3.13.23(react-dom@19.2.4(react@19.2.4))(react@19.2.4)':
+    dependencies:
+      '@tanstack/virtual-core': 3.13.23
+      react: 19.2.4
+      react-dom: 19.2.4(react@19.2.4)
+
+  '@tanstack/store@0.9.2': {}
+
+  '@tanstack/virtual-core@3.13.23': {}
+
+  '@team-plain/graphql@1.0.1':
+    dependencies:
+      '@graphql-typed-document-node/core': 3.2.0(graphql@16.13.1)
+      graphql: 16.13.1
+
+  '@testing-library/dom@10.4.1':
+    dependencies:
+      '@babel/code-frame': 7.29.0
+      '@babel/runtime': 7.28.6
+      '@types/aria-query': 5.0.4
+      aria-query: 5.3.0
+      dom-accessibility-api: 0.5.16
+      lz-string: 1.5.0
+      picocolors: 1.1.1
+      pretty-format: 27.5.1
+
+  '@testing-library/user-event@14.6.1(@testing-library/dom@10.4.1)':
+    dependencies:
+      '@testing-library/dom': 10.4.1
 
   '@tootallnate/once@1.1.2':
     optional: true
 
   '@tootallnate/once@2.0.0': {}
 
+  '@types/aria-query@5.0.4': {}
+
   '@types/babel__core@7.20.5':
     dependencies:
       '@babel/parser': 7.29.0
@@ -7488,6 +8922,10 @@ snapshots:
     dependencies:
       '@babel/types': 7.29.0
 
+  '@types/better-sqlite3@7.6.13':
+    dependencies:
+      '@types/node': 20.19.32
+
   '@types/cacheable-request@6.0.3':
     dependencies:
       '@types/http-cache-semantics': 4.2.0
@@ -7669,29 +9107,30 @@ snapshots:
     dependencies:
       undici-types: 6.21.0
 
+  '@types/node@24.11.0':
+    dependencies:
+      undici-types: 7.16.0
+
   '@types/plist@3.0.5':
     dependencies:
       '@types/node': 20.19.32
       xmlbuilder: 15.1.1
     optional: true
 
-  '@types/prop-types@15.7.15': {}
-
-  '@types/react-dom@18.3.7(@types/react@18.3.28)':
+  '@types/react-dom@19.2.3(@types/react@19.2.14)':
     dependencies:
-      '@types/react': 18.3.28
+      '@types/react': 19.2.14
 
   '@types/react-syntax-highlighter@15.5.13':
     dependencies:
-      '@types/react': 18.3.28
+      '@types/react': 19.2.14
 
   '@types/react-window@1.8.8':
     dependencies:
-      '@types/react': 18.3.28
+      '@types/react': 19.2.14
 
-  '@types/react@18.3.28':
+  '@types/react@19.2.14':
     dependencies:
-      '@types/prop-types': 15.7.15
       csstype: 3.2.3
 
   '@types/responselike@1.0.3':
@@ -7700,10 +9139,6 @@ snapshots:
 
   '@types/semver@7.7.1': {}
 
-  '@types/sqlite3@3.1.11':
-    dependencies:
-      '@types/node': 20.19.32
-
   '@types/ssh2@1.15.5':
     dependencies:
       '@types/node': 18.19.130
@@ -7725,13 +9160,13 @@ snapshots:
       '@types/node': 20.19.32
     optional: true
 
-  '@typescript-eslint/eslint-plugin@6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.9.3))(eslint@8.57.1)(typescript@5.9.3)':
+  '@typescript-eslint/eslint-plugin@6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@6.0.2))(eslint@8.57.1)(typescript@6.0.2)':
     dependencies:
       '@eslint-community/regexpp': 4.12.2
-      '@typescript-eslint/parser': 6.21.0(eslint@8.57.1)(typescript@5.9.3)
+      '@typescript-eslint/parser': 6.21.0(eslint@8.57.1)(typescript@6.0.2)
       '@typescript-eslint/scope-manager': 6.21.0
-      '@typescript-eslint/type-utils': 6.21.0(eslint@8.57.1)(typescript@5.9.3)
-      '@typescript-eslint/utils': 6.21.0(eslint@8.57.1)(typescript@5.9.3)
+      '@typescript-eslint/type-utils': 6.21.0(eslint@8.57.1)(typescript@6.0.2)
+      '@typescript-eslint/utils': 6.21.0(eslint@8.57.1)(typescript@6.0.2)
       '@typescript-eslint/visitor-keys': 6.21.0
       debug: 4.4.3
       eslint: 8.57.1
@@ -7739,22 +9174,22 @@ snapshots:
       ignore: 5.3.2
       natural-compare: 1.4.0
       semver: 7.7.4
-      ts-api-utils: 1.4.3(typescript@5.9.3)
+      ts-api-utils: 1.4.3(typescript@6.0.2)
     optionalDependencies:
-      typescript: 5.9.3
+      typescript: 6.0.2
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.9.3)':
+  '@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@6.0.2)':
     dependencies:
       '@typescript-eslint/scope-manager': 6.21.0
       '@typescript-eslint/types': 6.21.0
-      '@typescript-eslint/typescript-estree': 6.21.0(typescript@5.9.3)
+      '@typescript-eslint/typescript-estree': 6.21.0(typescript@6.0.2)
       '@typescript-eslint/visitor-keys': 6.21.0
       debug: 4.4.3
       eslint: 8.57.1
     optionalDependencies:
-      typescript: 5.9.3
+      typescript: 6.0.2
     transitivePeerDependencies:
       - supports-color
 
@@ -7763,21 +9198,21 @@ snapshots:
       '@typescript-eslint/types': 6.21.0
       '@typescript-eslint/visitor-keys': 6.21.0
 
-  '@typescript-eslint/type-utils@6.21.0(eslint@8.57.1)(typescript@5.9.3)':
+  '@typescript-eslint/type-utils@6.21.0(eslint@8.57.1)(typescript@6.0.2)':
     dependencies:
-      '@typescript-eslint/typescript-estree': 6.21.0(typescript@5.9.3)
-      '@typescript-eslint/utils': 6.21.0(eslint@8.57.1)(typescript@5.9.3)
+      '@typescript-eslint/typescript-estree': 6.21.0(typescript@6.0.2)
+      '@typescript-eslint/utils': 6.21.0(eslint@8.57.1)(typescript@6.0.2)
       debug: 4.4.3
       eslint: 8.57.1
-      ts-api-utils: 1.4.3(typescript@5.9.3)
+      ts-api-utils: 1.4.3(typescript@6.0.2)
     optionalDependencies:
-      typescript: 5.9.3
+      typescript: 6.0.2
     transitivePeerDependencies:
       - supports-color
 
   '@typescript-eslint/types@6.21.0': {}
 
-  '@typescript-eslint/typescript-estree@6.21.0(typescript@5.9.3)':
+  '@typescript-eslint/typescript-estree@6.21.0(typescript@6.0.2)':
     dependencies:
       '@typescript-eslint/types': 6.21.0
       '@typescript-eslint/visitor-keys': 6.21.0
@@ -7786,20 +9221,20 @@ snapshots:
       is-glob: 4.0.3
       minimatch: 9.0.3
       semver: 7.7.4
-      ts-api-utils: 1.4.3(typescript@5.9.3)
+      ts-api-utils: 1.4.3(typescript@6.0.2)
     optionalDependencies:
-      typescript: 5.9.3
+      typescript: 6.0.2
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/utils@6.21.0(eslint@8.57.1)(typescript@5.9.3)':
+  '@typescript-eslint/utils@6.21.0(eslint@8.57.1)(typescript@6.0.2)':
     dependencies:
       '@eslint-community/eslint-utils': 4.9.1(eslint@8.57.1)
       '@types/json-schema': 7.0.15
       '@types/semver': 7.7.1
       '@typescript-eslint/scope-manager': 6.21.0
       '@typescript-eslint/types': 6.21.0
-      '@typescript-eslint/typescript-estree': 6.21.0(typescript@5.9.3)
+      '@typescript-eslint/typescript-estree': 6.21.0(typescript@6.0.2)
       eslint: 8.57.1
       semver: 7.7.4
     transitivePeerDependencies:
@@ -7813,7 +9248,7 @@ snapshots:
 
   '@ungap/structured-clone@1.3.0': {}
 
-  '@vitejs/plugin-react@4.7.0(vite@5.4.21(@types/node@20.19.32))':
+  '@vitejs/plugin-react@4.7.0(vite@6.4.1(@types/node@20.19.32)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.8.2))':
     dependencies:
       '@babel/core': 7.29.0
       '@babel/plugin-transform-react-jsx-self': 7.27.1(@babel/core@7.29.0)
@@ -7821,62 +9256,103 @@ snapshots:
       '@rolldown/pluginutils': 1.0.0-beta.27
       '@types/babel__core': 7.20.5
       react-refresh: 0.17.0
-      vite: 5.4.21(@types/node@20.19.32)
+      vite: 6.4.1(@types/node@20.19.32)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.8.2)
     transitivePeerDependencies:
       - supports-color
 
-  '@vitest/expect@3.2.4':
+  '@vitest/browser-playwright@4.1.0(playwright@1.58.2)(vite@6.4.1(@types/node@20.19.32)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.8.2))(vitest@4.1.0)':
+    dependencies:
+      '@vitest/browser': 4.1.0(vite@6.4.1(@types/node@20.19.32)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.8.2))(vitest@4.1.0)
+      '@vitest/mocker': 4.1.0(vite@6.4.1(@types/node@20.19.32)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.8.2))
+      playwright: 1.58.2
+      tinyrainbow: 3.1.0
+      vitest: 4.1.0(@opentelemetry/api@1.9.0)(@types/node@20.19.32)(@vitest/browser-playwright@4.1.0)(@vitest/browser-preview@4.1.0)(jsdom@29.0.2)(vite@6.4.1(@types/node@20.19.32)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.8.2))
+    transitivePeerDependencies:
+      - bufferutil
+      - msw
+      - utf-8-validate
+      - vite
+
+  '@vitest/browser-preview@4.1.0(vite@6.4.1(@types/node@20.19.32)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.8.2))(vitest@4.1.0)':
+    dependencies:
+      '@testing-library/dom': 10.4.1
+      '@testing-library/user-event': 14.6.1(@testing-library/dom@10.4.1)
+      '@vitest/browser': 4.1.0(vite@6.4.1(@types/node@20.19.32)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.8.2))(vitest@4.1.0)
+      vitest: 4.1.0(@opentelemetry/api@1.9.0)(@types/node@20.19.32)(@vitest/browser-playwright@4.1.0)(@vitest/browser-preview@4.1.0)(jsdom@29.0.2)(vite@6.4.1(@types/node@20.19.32)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.8.2))
+    transitivePeerDependencies:
+      - bufferutil
+      - msw
+      - utf-8-validate
+      - vite
+
+  '@vitest/browser@4.1.0(vite@6.4.1(@types/node@20.19.32)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.8.2))(vitest@4.1.0)':
+    dependencies:
+      '@blazediff/core': 1.9.1
+      '@vitest/mocker': 4.1.0(vite@6.4.1(@types/node@20.19.32)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.8.2))
+      '@vitest/utils': 4.1.0
+      magic-string: 0.30.21
+      pngjs: 7.0.0
+      sirv: 3.0.2
+      tinyrainbow: 3.1.0
+      vitest: 4.1.0(@opentelemetry/api@1.9.0)(@types/node@20.19.32)(@vitest/browser-playwright@4.1.0)(@vitest/browser-preview@4.1.0)(jsdom@29.0.2)(vite@6.4.1(@types/node@20.19.32)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.8.2))
+      ws: 8.19.0
+    transitivePeerDependencies:
+      - bufferutil
+      - msw
+      - utf-8-validate
+      - vite
+
+  '@vitest/expect@4.1.0':
     dependencies:
+      '@standard-schema/spec': 1.1.0
       '@types/chai': 5.2.3
-      '@vitest/spy': 3.2.4
-      '@vitest/utils': 3.2.4
-      chai: 5.3.3
-      tinyrainbow: 2.0.0
+      '@vitest/spy': 4.1.0
+      '@vitest/utils': 4.1.0
+      chai: 6.2.2
+      tinyrainbow: 3.1.0
 
-  '@vitest/mocker@3.2.4(vite@5.4.21(@types/node@20.19.32))':
+  '@vitest/mocker@4.1.0(vite@6.4.1(@types/node@20.19.32)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.8.2))':
     dependencies:
-      '@vitest/spy': 3.2.4
+      '@vitest/spy': 4.1.0
       estree-walker: 3.0.3
       magic-string: 0.30.21
     optionalDependencies:
-      vite: 5.4.21(@types/node@20.19.32)
+      vite: 6.4.1(@types/node@20.19.32)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.8.2)
 
-  '@vitest/pretty-format@3.2.4':
+  '@vitest/pretty-format@4.1.0':
     dependencies:
-      tinyrainbow: 2.0.0
+      tinyrainbow: 3.1.0
 
-  '@vitest/runner@3.2.4':
+  '@vitest/runner@4.1.0':
     dependencies:
-      '@vitest/utils': 3.2.4
+      '@vitest/utils': 4.1.0
       pathe: 2.0.3
-      strip-literal: 3.1.0
 
-  '@vitest/snapshot@3.2.4':
+  '@vitest/snapshot@4.1.0':
     dependencies:
-      '@vitest/pretty-format': 3.2.4
+      '@vitest/pretty-format': 4.1.0
+      '@vitest/utils': 4.1.0
       magic-string: 0.30.21
       pathe: 2.0.3
 
-  '@vitest/spy@3.2.4':
-    dependencies:
-      tinyspy: 4.0.4
+  '@vitest/spy@4.1.0': {}
 
-  '@vitest/utils@3.2.4':
+  '@vitest/utils@4.1.0':
     dependencies:
-      '@vitest/pretty-format': 3.2.4
-      loupe: 3.2.1
-      tinyrainbow: 2.0.0
+      '@vitest/pretty-format': 4.1.0
+      convert-source-map: 2.0.0
+      tinyrainbow: 3.1.0
 
   '@xmldom/xmldom@0.8.11': {}
 
-  '@xterm/addon-fit@0.11.0': {}
+  '@xterm/addon-canvas@0.7.0(@xterm/xterm@6.0.0)':
+    dependencies:
+      '@xterm/xterm': 6.0.0
 
-  '@xterm/addon-serialize@0.14.0': {}
+  '@xterm/addon-fit@0.11.0': {}
 
   '@xterm/addon-web-links@0.12.0': {}
 
-  '@xterm/addon-webgl@0.19.0': {}
-
   '@xterm/xterm@6.0.0': {}
 
   abbrev@1.1.1:
@@ -7920,6 +9396,17 @@ snapshots:
       json-schema-traverse: 0.4.1
       uri-js: 4.4.1
 
+  allotment@1.20.5(react-dom@19.2.4(react@19.2.4))(react@19.2.4):
+    dependencies:
+      classnames: 2.5.1
+      eventemitter3: 5.0.4
+      fast-deep-equal: 3.1.3
+      lodash.clamp: 4.0.3
+      lodash.debounce: 4.0.8
+      react: 19.2.4
+      react-dom: 19.2.4(react@19.2.4)
+      usehooks-ts: 3.1.1(react@19.2.4)
+
   ansi-escapes@7.3.0:
     dependencies:
       environment: 1.1.0
@@ -7932,14 +9419,9 @@ snapshots:
     dependencies:
       color-convert: 2.0.1
 
-  ansi-styles@6.2.3: {}
-
-  any-promise@1.3.0: {}
+  ansi-styles@5.2.0: {}
 
-  anymatch@3.1.3:
-    dependencies:
-      normalize-path: 3.0.0
-      picomatch: 2.3.1
+  ansi-styles@6.2.3: {}
 
   app-builder-bin@4.0.0: {}
 
@@ -8067,14 +9549,16 @@ snapshots:
       readable-stream: 3.6.2
     optional: true
 
-  arg@5.0.2: {}
-
   argparse@2.0.1: {}
 
   aria-hidden@1.2.6:
     dependencies:
       tslib: 2.8.1
 
+  aria-query@5.3.0:
+    dependencies:
+      dequal: 2.0.3
+
   array-buffer-byte-length@1.0.2:
     dependencies:
       call-bound: 1.0.4
@@ -8143,29 +9627,30 @@ snapshots:
 
   async-function@1.0.0: {}
 
-  async@3.2.6: {}
-
-  asynckit@0.4.0: {}
-
-  at-least-node@1.0.0: {}
-
-  autoprefixer@10.4.24(postcss@8.5.6):
-    dependencies:
-      browserslist: 4.28.1
-      caniuse-lite: 1.0.30001769
-      fraction.js: 5.3.4
-      picocolors: 1.1.1
-      postcss: 8.5.6
-      postcss-value-parser: 4.2.0
+  async@3.2.6: {}
+
+  asynckit@0.4.0: {}
+
+  at-least-node@1.0.0: {}
 
   available-typed-arrays@1.0.7:
     dependencies:
       possible-typed-array-names: 1.1.0
 
+  axios@1.14.0:
+    dependencies:
+      follow-redirects: 1.15.11
+      form-data: 4.0.5
+      proxy-from-env: 2.1.0
+    transitivePeerDependencies:
+      - debug
+
   bail@2.0.2: {}
 
   balanced-match@1.0.2: {}
 
+  balanced-match@4.0.4: {}
+
   base64-js@1.5.1: {}
 
   baseline-browser-mapping@2.9.19: {}
@@ -8174,12 +9659,16 @@ snapshots:
     dependencies:
       tweetnacl: 0.14.5
 
+  before-after-hook@4.0.0: {}
+
   better-sqlite3@12.6.2:
     dependencies:
       bindings: 1.5.0
       prebuild-install: 7.1.3
 
-  binary-extensions@2.3.0: {}
+  bidi-js@1.0.3:
+    dependencies:
+      require-from-string: 2.0.2
 
   bindings@1.5.0:
     dependencies:
@@ -8209,6 +9698,10 @@ snapshots:
     dependencies:
       balanced-match: 1.0.2
 
+  brace-expansion@5.0.4:
+    dependencies:
+      balanced-match: 4.0.4
+
   braces@3.0.3:
     dependencies:
       fill-range: 7.1.1
@@ -8363,19 +9856,11 @@ snapshots:
 
   callsites@3.1.0: {}
 
-  camelcase-css@2.0.1: {}
-
   caniuse-lite@1.0.30001769: {}
 
   ccount@2.0.1: {}
 
-  chai@5.3.3:
-    dependencies:
-      assertion-error: 2.0.1
-      check-error: 2.1.3
-      deep-eql: 5.0.2
-      loupe: 3.2.1
-      pathval: 2.0.1
+  chai@6.2.2: {}
 
   chalk@4.1.2:
     dependencies:
@@ -8396,8 +9881,6 @@ snapshots:
 
   character-reference-invalid@2.0.1: {}
 
-  check-error@2.1.3: {}
-
   chevrotain-allstar@0.3.1(chevrotain@11.0.3):
     dependencies:
       chevrotain: 11.0.3
@@ -8412,17 +9895,9 @@ snapshots:
       '@chevrotain/utils': 11.0.3
       lodash-es: 4.17.21
 
-  chokidar@3.6.0:
+  chokidar@5.0.0:
     dependencies:
-      anymatch: 3.1.3
-      braces: 3.0.3
-      glob-parent: 5.1.2
-      is-binary-path: 2.1.0
-      is-glob: 4.0.3
-      normalize-path: 3.0.0
-      readdirp: 3.6.0
-    optionalDependencies:
-      fsevents: 2.3.3
+      readdirp: 5.0.0
 
   chownr@1.1.4: {}
 
@@ -8442,6 +9917,8 @@ snapshots:
     dependencies:
       clsx: 2.1.1
 
+  classnames@2.5.1: {}
+
   clean-stack@2.2.0:
     optional: true
 
@@ -8480,14 +9957,14 @@ snapshots:
 
   clsx@2.1.1: {}
 
-  cmdk@1.1.1(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
+  cmdk@1.1.1(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4):
     dependencies:
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-dialog': 1.1.15(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@radix-ui/react-id': 1.1.1(@types/react@18.3.28)(react@18.3.1)
-      '@radix-ui/react-primitive': 2.1.4(@types/react-dom@18.3.7(@types/react@18.3.28))(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      react: 18.3.1
-      react-dom: 18.3.1(react@18.3.1)
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-dialog': 1.1.15(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      '@radix-ui/react-id': 1.1.1(@types/react@19.2.14)(react@19.2.4)
+      '@radix-ui/react-primitive': 2.1.4(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      react: 19.2.4
+      react-dom: 19.2.4(react@19.2.4)
     transitivePeerDependencies:
       - '@types/react'
       - '@types/react-dom'
@@ -8513,8 +9990,6 @@ snapshots:
 
   commander@14.0.3: {}
 
-  commander@4.1.1: {}
-
   commander@5.1.0: {}
 
   commander@7.2.0: {}
@@ -8601,7 +10076,10 @@ snapshots:
       shebang-command: 2.0.0
       which: 2.0.2
 
-  cssesc@3.0.0: {}
+  css-tree@3.2.1:
+    dependencies:
+      mdn-data: 2.27.1
+      source-map-js: 1.2.1
 
   csstype@3.2.3: {}
 
@@ -8789,6 +10267,13 @@ snapshots:
       d3: 7.9.0
       lodash-es: 4.17.23
 
+  data-urls@7.0.0:
+    dependencies:
+      whatwg-mimetype: 5.0.0
+      whatwg-url: 16.0.1
+    transitivePeerDependencies:
+      - '@noble/hashes'
+
   data-view-buffer@1.0.2:
     dependencies:
       call-bound: 1.0.4
@@ -8811,6 +10296,8 @@ snapshots:
     dependencies:
       '@babel/runtime': 7.28.6
 
+  date-fns@4.1.0: {}
+
   dayjs@1.11.19: {}
 
   debug@3.2.7:
@@ -8821,6 +10308,8 @@ snapshots:
     dependencies:
       ms: 2.1.3
 
+  decimal.js@10.6.0: {}
+
   decode-named-character-reference@1.3.0:
     dependencies:
       character-entities: 2.0.2
@@ -8829,8 +10318,6 @@ snapshots:
     dependencies:
       mimic-response: 3.1.0
 
-  deep-eql@5.0.2: {}
-
   deep-extend@0.6.0: {}
 
   deep-is@0.1.4: {}
@@ -8873,12 +10360,12 @@ snapshots:
   detect-node@2.1.0:
     optional: true
 
+  devicon@2.17.0: {}
+
   devlop@1.1.0:
     dependencies:
       dequal: 2.0.3
 
-  didyoumean@1.2.2: {}
-
   dir-compare@3.3.0:
     dependencies:
       buffer-equal: 1.0.1
@@ -8893,8 +10380,6 @@ snapshots:
     dependencies:
       path-type: 4.0.0
 
-  dlv@1.1.3: {}
-
   dmg-builder@26.8.1(electron-builder-squirrel-windows@24.13.3):
     dependencies:
       app-builder-lib: 26.8.1(dmg-builder@26.8.1)(electron-builder-squirrel-windows@24.13.3)
@@ -8928,6 +10413,8 @@ snapshots:
     dependencies:
       esutils: 2.0.3
 
+  dom-accessibility-api@0.5.16: {}
+
   dompurify@3.2.7:
     optionalDependencies:
       '@types/trusted-types': 2.0.7
@@ -8944,8 +10431,6 @@ snapshots:
 
   dotenv@16.6.1: {}
 
-  dotenv@17.2.4: {}
-
   dotenv@9.0.2: {}
 
   drizzle-kit@0.24.2:
@@ -8957,12 +10442,13 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  drizzle-orm@0.32.2(@opentelemetry/api@1.9.0)(@types/react@18.3.28)(better-sqlite3@12.6.2)(react@18.3.1)(sqlite3@5.1.7):
+  drizzle-orm@0.32.2(@opentelemetry/api@1.9.0)(@types/better-sqlite3@7.6.13)(@types/react@19.2.14)(better-sqlite3@12.6.2)(react@19.2.4)(sqlite3@5.1.7):
     optionalDependencies:
       '@opentelemetry/api': 1.9.0
-      '@types/react': 18.3.28
+      '@types/better-sqlite3': 7.6.13
+      '@types/react': 19.2.14
       better-sqlite3: 12.6.2
-      react: 18.3.1
+      react: 19.2.4
       sqlite3: 5.1.7
 
   dunder-proto@1.0.1:
@@ -9045,10 +10531,22 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  electron@30.5.1:
+  electron-vite@5.0.0(vite@6.4.1(@types/node@20.19.32)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.8.2)):
+    dependencies:
+      '@babel/core': 7.29.0
+      '@babel/plugin-transform-arrow-functions': 7.27.1(@babel/core@7.29.0)
+      cac: 6.7.14
+      esbuild: 0.25.12
+      magic-string: 0.30.21
+      picocolors: 1.1.1
+      vite: 6.4.1(@types/node@20.19.32)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.8.2)
+    transitivePeerDependencies:
+      - supports-color
+
+  electron@40.7.0:
     dependencies:
       '@electron/get': 2.0.3
-      '@types/node': 20.19.32
+      '@types/node': 24.11.0
       extract-zip: 2.0.1
     transitivePeerDependencies:
       - supports-color
@@ -9068,8 +10566,15 @@ snapshots:
     dependencies:
       once: 1.4.0
 
+  enhanced-resolve@5.20.0:
+    dependencies:
+      graceful-fs: 4.2.11
+      tapable: 2.3.0
+
   entities@6.0.1: {}
 
+  entities@8.0.0: {}
+
   env-paths@2.2.1: {}
 
   environment@1.1.0: {}
@@ -9137,7 +10642,7 @@ snapshots:
 
   es-errors@1.3.0: {}
 
-  es-module-lexer@1.7.0: {}
+  es-module-lexer@2.0.0: {}
 
   es-object-atoms@1.1.1:
     dependencies:
@@ -9221,31 +10726,34 @@ snapshots:
       '@esbuild/win32-ia32': 0.19.12
       '@esbuild/win32-x64': 0.19.12
 
-  esbuild@0.21.5:
+  esbuild@0.25.12:
     optionalDependencies:
-      '@esbuild/aix-ppc64': 0.21.5
-      '@esbuild/android-arm': 0.21.5
-      '@esbuild/android-arm64': 0.21.5
-      '@esbuild/android-x64': 0.21.5
-      '@esbuild/darwin-arm64': 0.21.5
-      '@esbuild/darwin-x64': 0.21.5
-      '@esbuild/freebsd-arm64': 0.21.5
-      '@esbuild/freebsd-x64': 0.21.5
-      '@esbuild/linux-arm': 0.21.5
-      '@esbuild/linux-arm64': 0.21.5
-      '@esbuild/linux-ia32': 0.21.5
-      '@esbuild/linux-loong64': 0.21.5
-      '@esbuild/linux-mips64el': 0.21.5
-      '@esbuild/linux-ppc64': 0.21.5
-      '@esbuild/linux-riscv64': 0.21.5
-      '@esbuild/linux-s390x': 0.21.5
-      '@esbuild/linux-x64': 0.21.5
-      '@esbuild/netbsd-x64': 0.21.5
-      '@esbuild/openbsd-x64': 0.21.5
-      '@esbuild/sunos-x64': 0.21.5
-      '@esbuild/win32-arm64': 0.21.5
-      '@esbuild/win32-ia32': 0.21.5
-      '@esbuild/win32-x64': 0.21.5
+      '@esbuild/aix-ppc64': 0.25.12
+      '@esbuild/android-arm': 0.25.12
+      '@esbuild/android-arm64': 0.25.12
+      '@esbuild/android-x64': 0.25.12
+      '@esbuild/darwin-arm64': 0.25.12
+      '@esbuild/darwin-x64': 0.25.12
+      '@esbuild/freebsd-arm64': 0.25.12
+      '@esbuild/freebsd-x64': 0.25.12
+      '@esbuild/linux-arm': 0.25.12
+      '@esbuild/linux-arm64': 0.25.12
+      '@esbuild/linux-ia32': 0.25.12
+      '@esbuild/linux-loong64': 0.25.12
+      '@esbuild/linux-mips64el': 0.25.12
+      '@esbuild/linux-ppc64': 0.25.12
+      '@esbuild/linux-riscv64': 0.25.12
+      '@esbuild/linux-s390x': 0.25.12
+      '@esbuild/linux-x64': 0.25.12
+      '@esbuild/netbsd-arm64': 0.25.12
+      '@esbuild/netbsd-x64': 0.25.12
+      '@esbuild/openbsd-arm64': 0.25.12
+      '@esbuild/openbsd-x64': 0.25.12
+      '@esbuild/openharmony-arm64': 0.25.12
+      '@esbuild/sunos-x64': 0.25.12
+      '@esbuild/win32-arm64': 0.25.12
+      '@esbuild/win32-ia32': 0.25.12
+      '@esbuild/win32-x64': 0.25.12
 
   escalade@3.2.0: {}
 
@@ -9261,17 +10769,17 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  eslint-module-utils@2.12.1(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.9.3))(eslint-import-resolver-node@0.3.9)(eslint@8.57.1):
+  eslint-module-utils@2.12.1(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@6.0.2))(eslint-import-resolver-node@0.3.9)(eslint@8.57.1):
     dependencies:
       debug: 3.2.7
     optionalDependencies:
-      '@typescript-eslint/parser': 6.21.0(eslint@8.57.1)(typescript@5.9.3)
+      '@typescript-eslint/parser': 6.21.0(eslint@8.57.1)(typescript@6.0.2)
       eslint: 8.57.1
       eslint-import-resolver-node: 0.3.9
     transitivePeerDependencies:
       - supports-color
 
-  eslint-plugin-import@2.32.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.9.3))(eslint@8.57.1):
+  eslint-plugin-import@2.32.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@6.0.2))(eslint@8.57.1):
     dependencies:
       '@rtsao/scc': 1.1.0
       array-includes: 3.1.9
@@ -9282,7 +10790,7 @@ snapshots:
       doctrine: 2.1.0
       eslint: 8.57.1
       eslint-import-resolver-node: 0.3.9
-      eslint-module-utils: 2.12.1(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.9.3))(eslint-import-resolver-node@0.3.9)(eslint@8.57.1)
+      eslint-module-utils: 2.12.1(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@6.0.2))(eslint-import-resolver-node@0.3.9)(eslint@8.57.1)
       hasown: 2.0.2
       is-core-module: 2.16.1
       is-glob: 4.0.3
@@ -9294,7 +10802,7 @@ snapshots:
       string.prototype.trimend: 1.0.9
       tsconfig-paths: 3.15.0
     optionalDependencies:
-      '@typescript-eslint/parser': 6.21.0(eslint@8.57.1)(typescript@5.9.3)
+      '@typescript-eslint/parser': 6.21.0(eslint@8.57.1)(typescript@6.0.2)
     transitivePeerDependencies:
       - eslint-import-resolver-typescript
       - eslint-import-resolver-webpack
@@ -9420,6 +10928,8 @@ snapshots:
   extsprintf@1.4.1:
     optional: true
 
+  fast-content-type-parse@3.0.0: {}
+
   fast-deep-equal@3.1.3: {}
 
   fast-glob@3.3.3:
@@ -9483,6 +10993,8 @@ snapshots:
 
   flatted@3.3.3: {}
 
+  follow-redirects@1.15.11: {}
+
   for-each@0.3.5:
     dependencies:
       is-callable: 1.2.7
@@ -9502,16 +11014,14 @@ snapshots:
 
   format@0.2.2: {}
 
-  fraction.js@5.3.4: {}
-
-  framer-motion@12.33.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
+  framer-motion@12.33.0(react-dom@19.2.4(react@19.2.4))(react@19.2.4):
     dependencies:
       motion-dom: 12.33.0
       motion-utils: 12.29.2
       tslib: 2.8.1
     optionalDependencies:
-      react: 18.3.1
-      react-dom: 18.3.1(react@18.3.1)
+      react: 19.2.4
+      react-dom: 19.2.4(react@19.2.4)
 
   fs-constants@1.0.0: {}
 
@@ -9550,6 +11060,9 @@ snapshots:
 
   fs.realpath@1.0.0: {}
 
+  fsevents@2.3.2:
+    optional: true
+
   fsevents@2.3.3:
     optional: true
 
@@ -9643,6 +11156,12 @@ snapshots:
       package-json-from-dist: 1.0.1
       path-scurry: 1.11.1
 
+  glob@13.0.6:
+    dependencies:
+      minimatch: 10.2.4
+      minipass: 7.1.3
+      path-scurry: 2.0.2
+
   glob@7.2.3:
     dependencies:
       fs.realpath: 1.0.0
@@ -9702,6 +11221,8 @@ snapshots:
 
   graphemer@1.4.0: {}
 
+  graphql@16.13.1: {}
+
   hachure-fill@0.5.2: {}
 
   has-bigints@1.1.0: {}
@@ -9881,6 +11402,12 @@ snapshots:
     dependencies:
       lru-cache: 6.0.0
 
+  html-encoding-sniffer@6.0.0:
+    dependencies:
+      '@exodus/bytes': 1.15.0
+    transitivePeerDependencies:
+      - '@noble/hashes'
+
   html-url-attributes@3.0.1: {}
 
   html-void-elements@3.0.0: {}
@@ -10023,10 +11550,6 @@ snapshots:
     dependencies:
       has-bigints: 1.1.0
 
-  is-binary-path@2.1.0:
-    dependencies:
-      binary-extensions: 2.3.0
-
   is-boolean-object@1.2.2:
     dependencies:
       call-bound: 1.0.4
@@ -10105,6 +11628,8 @@ snapshots:
 
   is-plain-obj@4.1.0: {}
 
+  is-potential-custom-element-name@1.0.1: {}
+
   is-regex@1.2.1:
     dependencies:
       call-bound: 1.0.4
@@ -10172,18 +11697,40 @@ snapshots:
       filelist: 1.0.4
       picocolors: 1.1.1
 
-  jiti@1.21.7: {}
-
   jiti@2.6.1: {}
 
   js-tokens@4.0.0: {}
 
-  js-tokens@9.0.1: {}
-
   js-yaml@4.1.1:
     dependencies:
       argparse: 2.0.1
 
+  jsdom@29.0.2:
+    dependencies:
+      '@asamuzakjp/css-color': 5.1.11
+      '@asamuzakjp/dom-selector': 7.1.1
+      '@bramus/specificity': 2.4.2
+      '@csstools/css-syntax-patches-for-csstree': 1.1.3(css-tree@3.2.1)
+      '@exodus/bytes': 1.15.0
+      css-tree: 3.2.1
+      data-urls: 7.0.0
+      decimal.js: 10.6.0
+      html-encoding-sniffer: 6.0.0
+      is-potential-custom-element-name: 1.0.1
+      lru-cache: 11.3.5
+      parse5: 8.0.1
+      saxes: 6.0.0
+      symbol-tree: 3.2.4
+      tough-cookie: 6.0.1
+      undici: 7.25.0
+      w3c-xmlserializer: 5.0.0
+      webidl-conversions: 8.0.1
+      whatwg-mimetype: 5.0.0
+      whatwg-url: 16.0.1
+      xml-name-validator: 5.0.0
+    transitivePeerDependencies:
+      - '@noble/hashes'
+
   jsesc@3.1.0: {}
 
   json-buffer@3.0.1: {}
@@ -10195,12 +11742,16 @@ snapshots:
   json-stringify-safe@5.0.1:
     optional: true
 
+  json-with-bigint@3.5.7: {}
+
   json5@1.0.2:
     dependencies:
       minimist: 1.2.8
 
   json5@2.2.3: {}
 
+  jsonc-parser@3.3.1: {}
+
   jsonfile@4.0.0:
     optionalDependencies:
       graceful-fs: 4.2.11
@@ -10215,11 +11766,6 @@ snapshots:
     dependencies:
       commander: 8.3.0
 
-  keytar@7.9.0:
-    dependencies:
-      node-addon-api: 4.3.0
-      prebuild-install: 7.1.3
-
   keyv@4.5.4:
     dependencies:
       json-buffer: 3.0.1
@@ -10249,9 +11795,54 @@ snapshots:
       prelude-ls: 1.2.1
       type-check: 0.4.0
 
-  lilconfig@3.1.3: {}
+  lightningcss-android-arm64@1.31.1:
+    optional: true
+
+  lightningcss-darwin-arm64@1.31.1:
+    optional: true
+
+  lightningcss-darwin-x64@1.31.1:
+    optional: true
+
+  lightningcss-freebsd-x64@1.31.1:
+    optional: true
+
+  lightningcss-linux-arm-gnueabihf@1.31.1:
+    optional: true
+
+  lightningcss-linux-arm64-gnu@1.31.1:
+    optional: true
+
+  lightningcss-linux-arm64-musl@1.31.1:
+    optional: true
+
+  lightningcss-linux-x64-gnu@1.31.1:
+    optional: true
+
+  lightningcss-linux-x64-musl@1.31.1:
+    optional: true
+
+  lightningcss-win32-arm64-msvc@1.31.1:
+    optional: true
+
+  lightningcss-win32-x64-msvc@1.31.1:
+    optional: true
 
-  lines-and-columns@1.2.4: {}
+  lightningcss@1.31.1:
+    dependencies:
+      detect-libc: 2.1.2
+    optionalDependencies:
+      lightningcss-android-arm64: 1.31.1
+      lightningcss-darwin-arm64: 1.31.1
+      lightningcss-darwin-x64: 1.31.1
+      lightningcss-freebsd-x64: 1.31.1
+      lightningcss-linux-arm-gnueabihf: 1.31.1
+      lightningcss-linux-arm64-gnu: 1.31.1
+      lightningcss-linux-arm64-musl: 1.31.1
+      lightningcss-linux-x64-gnu: 1.31.1
+      lightningcss-linux-x64-musl: 1.31.1
+      lightningcss-win32-arm64-msvc: 1.31.1
+      lightningcss-win32-x64-msvc: 1.31.1
 
   lint-staged@16.3.0:
     dependencies:
@@ -10280,6 +11871,10 @@ snapshots:
 
   lodash-es@4.17.23: {}
 
+  lodash.clamp@4.0.3: {}
+
+  lodash.debounce@4.0.8: {}
+
   lodash.defaults@4.2.0: {}
 
   lodash.difference@4.5.0: {}
@@ -10315,12 +11910,6 @@ snapshots:
 
   longest-streak@3.1.0: {}
 
-  loose-envify@1.4.0:
-    dependencies:
-      js-tokens: 4.0.0
-
-  loupe@3.2.1: {}
-
   lowercase-keys@2.0.0: {}
 
   lowlight@1.20.0:
@@ -10330,6 +11919,10 @@ snapshots:
 
   lru-cache@10.4.3: {}
 
+  lru-cache@11.2.6: {}
+
+  lru-cache@11.3.5: {}
+
   lru-cache@5.1.1:
     dependencies:
       yallist: 3.1.1
@@ -10338,13 +11931,15 @@ snapshots:
     dependencies:
       yallist: 4.0.0
 
-  lucide-react@0.542.0(react@18.3.1):
+  lucide-react@0.542.0(react@19.2.4):
     dependencies:
-      react: 18.3.1
+      react: 19.2.4
 
-  lucide-react@0.564.0(react@18.3.1):
+  lucide-react@0.564.0(react@19.2.4):
     dependencies:
-      react: 18.3.1
+      react: 19.2.4
+
+  lz-string@1.5.0: {}
 
   magic-string@0.30.21:
     dependencies:
@@ -10567,6 +12162,8 @@ snapshots:
     dependencies:
       '@types/mdast': 4.0.4
 
+  mdn-data@2.27.1: {}
+
   merge-stream@2.0.0: {}
 
   merge2@1.4.1: {}
@@ -10852,6 +12449,10 @@ snapshots:
     dependencies:
       '@isaacs/brace-expansion': 5.0.1
 
+  minimatch@10.2.4:
+    dependencies:
+      brace-expansion: 5.0.4
+
   minimatch@3.1.2:
     dependencies:
       brace-expansion: 1.1.12
@@ -10916,6 +12517,8 @@ snapshots:
 
   minipass@7.1.2: {}
 
+  minipass@7.1.3: {}
+
   minizlib@2.1.2:
     dependencies:
       minipass: 3.3.6
@@ -10936,6 +12539,16 @@ snapshots:
       pkg-types: 1.3.1
       ufo: 1.6.3
 
+  mobx-react-lite@4.1.1(mobx@6.15.0)(react-dom@19.2.4(react@19.2.4))(react@19.2.4):
+    dependencies:
+      mobx: 6.15.0
+      react: 19.2.4
+      use-sync-external-store: 1.6.0(react@19.2.4)
+    optionalDependencies:
+      react-dom: 19.2.4(react@19.2.4)
+
+  mobx@6.15.0: {}
+
   monaco-editor@0.55.1:
     dependencies:
       dompurify: 3.2.7
@@ -10947,23 +12560,20 @@ snapshots:
 
   motion-utils@12.29.2: {}
 
-  motion@12.33.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
+  motion@12.33.0(react-dom@19.2.4(react@19.2.4))(react@19.2.4):
     dependencies:
-      framer-motion: 12.33.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      framer-motion: 12.33.0(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
       tslib: 2.8.1
     optionalDependencies:
-      react: 18.3.1
-      react-dom: 18.3.1(react@18.3.1)
+      react: 19.2.4
+      react-dom: 19.2.4(react@19.2.4)
 
-  ms@2.1.3: {}
+  mrmime@2.0.1: {}
 
-  mz@2.7.0:
-    dependencies:
-      any-promise: 1.3.0
-      object-assign: 4.1.1
-      thenify-all: 1.6.0
+  ms@2.1.3: {}
 
-  nan@2.25.0: {}
+  nan@2.25.0:
+    optional: true
 
   nano-spawn@2.0.0: {}
 
@@ -10995,8 +12605,6 @@ snapshots:
   node-addon-api@1.7.2:
     optional: true
 
-  node-addon-api@4.3.0: {}
-
   node-addon-api@7.1.1: {}
 
   node-api-version@0.2.1:
@@ -11035,9 +12643,9 @@ snapshots:
       - supports-color
     optional: true
 
-  node-pty@1.0.0:
+  node-pty@1.1.0:
     dependencies:
-      nan: 2.25.0
+      node-addon-api: 7.1.1
 
   node-releases@2.0.27: {}
 
@@ -11066,10 +12674,6 @@ snapshots:
       set-blocking: 2.0.0
     optional: true
 
-  object-assign@4.1.1: {}
-
-  object-hash@3.0.0: {}
-
   object-inspect@1.13.4: {}
 
   object-keys@1.1.1: {}
@@ -11103,6 +12707,8 @@ snapshots:
       define-properties: 1.2.1
       es-object-atoms: 1.1.1
 
+  obug@2.1.1: {}
+
   once@1.4.0:
     dependencies:
       wrappy: 1.0.2
@@ -11198,6 +12804,10 @@ snapshots:
     dependencies:
       entities: 6.0.1
 
+  parse5@8.0.1:
+    dependencies:
+      entities: 8.0.0
+
   path-data-parser@0.1.0: {}
 
   path-exists@4.0.0: {}
@@ -11213,38 +12823,49 @@ snapshots:
       lru-cache: 10.4.3
       minipass: 7.1.2
 
+  path-scurry@2.0.2:
+    dependencies:
+      lru-cache: 11.2.6
+      minipass: 7.1.3
+
   path-type@4.0.0: {}
 
   pathe@2.0.3: {}
 
-  pathval@2.0.1: {}
-
   pe-library@0.4.1: {}
 
   pend@1.2.0: {}
 
   picocolors@1.1.1: {}
 
+  picomatch-browser@2.2.6: {}
+
   picomatch@2.3.1: {}
 
   picomatch@4.0.3: {}
 
-  pify@2.3.0: {}
-
-  pirates@4.0.7: {}
-
   pkg-types@1.3.1:
     dependencies:
       confbox: 0.1.8
       mlly: 1.8.0
       pathe: 2.0.3
 
+  playwright-core@1.58.2: {}
+
+  playwright@1.58.2:
+    dependencies:
+      playwright-core: 1.58.2
+    optionalDependencies:
+      fsevents: 2.3.2
+
   plist@3.1.0:
     dependencies:
       '@xmldom/xmldom': 0.8.11
       base64-js: 1.5.1
       xmlbuilder: 15.1.1
 
+  pngjs@7.0.0: {}
+
   points-on-curve@0.2.0: {}
 
   points-on-path@0.2.1:
@@ -11254,38 +12875,6 @@ snapshots:
 
   possible-typed-array-names@1.1.0: {}
 
-  postcss-import@15.1.0(postcss@8.5.6):
-    dependencies:
-      postcss: 8.5.6
-      postcss-value-parser: 4.2.0
-      read-cache: 1.0.0
-      resolve: 1.22.11
-
-  postcss-js@4.1.0(postcss@8.5.6):
-    dependencies:
-      camelcase-css: 2.0.1
-      postcss: 8.5.6
-
-  postcss-load-config@6.0.1(jiti@1.21.7)(postcss@8.5.6)(yaml@2.8.2):
-    dependencies:
-      lilconfig: 3.1.3
-    optionalDependencies:
-      jiti: 1.21.7
-      postcss: 8.5.6
-      yaml: 2.8.2
-
-  postcss-nested@6.2.0(postcss@8.5.6):
-    dependencies:
-      postcss: 8.5.6
-      postcss-selector-parser: 6.1.2
-
-  postcss-selector-parser@6.1.2:
-    dependencies:
-      cssesc: 3.0.0
-      util-deprecate: 1.0.2
-
-  postcss-value-parser@4.2.0: {}
-
   postcss@8.5.6:
     dependencies:
       nanoid: 3.3.11
@@ -11327,12 +12916,20 @@ snapshots:
 
   prelude-ls@1.2.1: {}
 
-  prettier-plugin-tailwindcss@0.6.14(prettier@3.6.2):
+  prettier-plugin-tailwindcss@0.6.14(@ianvs/prettier-plugin-sort-imports@4.7.1(prettier@3.6.2))(prettier@3.6.2):
     dependencies:
       prettier: 3.6.2
+    optionalDependencies:
+      '@ianvs/prettier-plugin-sort-imports': 4.7.1(prettier@3.6.2)
 
   prettier@3.6.2: {}
 
+  pretty-format@27.5.1:
+    dependencies:
+      ansi-regex: 5.0.1
+      ansi-styles: 5.2.0
+      react-is: 17.0.2
+
   prismjs@1.27.0: {}
 
   prismjs@1.30.0: {}
@@ -11378,6 +12975,8 @@ snapshots:
       '@types/node': 20.19.32
       long: 5.3.2
 
+  proxy-from-env@2.1.0: {}
+
   pump@3.0.3:
     dependencies:
       end-of-stream: 1.4.5
@@ -11385,12 +12984,18 @@ snapshots:
 
   punycode@2.3.1: {}
 
+  qs@6.15.0:
+    dependencies:
+      side-channel: 1.1.0
+
   query-selector-shadow-dom@1.0.1: {}
 
   queue-microtask@1.2.3: {}
 
   quick-lru@5.1.1: {}
 
+  rate-limiter-flexible@8.3.0: {}
+
   rc@1.2.8:
     dependencies:
       deep-extend: 0.6.0
@@ -11398,26 +13003,27 @@ snapshots:
       minimist: 1.2.8
       strip-json-comments: 2.0.1
 
-  react-dom@18.3.1(react@18.3.1):
+  react-dom@19.2.4(react@19.2.4):
     dependencies:
-      loose-envify: 1.4.0
-      react: 18.3.1
-      scheduler: 0.23.2
+      react: 19.2.4
+      scheduler: 0.27.0
 
-  react-icons@5.5.0(react@18.3.1):
+  react-icons@5.5.0(react@19.2.4):
     dependencies:
-      react: 18.3.1
+      react: 19.2.4
 
-  react-markdown@10.1.0(@types/react@18.3.28)(react@18.3.1):
+  react-is@17.0.2: {}
+
+  react-markdown@10.1.0(@types/react@19.2.14)(react@19.2.4):
     dependencies:
       '@types/hast': 3.0.4
       '@types/mdast': 4.0.4
-      '@types/react': 18.3.28
+      '@types/react': 19.2.14
       devlop: 1.1.0
       hast-util-to-jsx-runtime: 2.3.6
       html-url-attributes: 3.0.1
       mdast-util-to-hast: 13.2.1
-      react: 18.3.1
+      react: 19.2.4
       remark-parse: 11.0.0
       remark-rehype: 11.1.2
       unified: 11.0.5
@@ -11428,56 +13034,54 @@ snapshots:
 
   react-refresh@0.17.0: {}
 
-  react-remove-scroll-bar@2.3.8(@types/react@18.3.28)(react@18.3.1):
+  react-remove-scroll-bar@2.3.8(@types/react@19.2.14)(react@19.2.4):
     dependencies:
-      react: 18.3.1
-      react-style-singleton: 2.2.3(@types/react@18.3.28)(react@18.3.1)
+      react: 19.2.4
+      react-style-singleton: 2.2.3(@types/react@19.2.14)(react@19.2.4)
       tslib: 2.8.1
     optionalDependencies:
-      '@types/react': 18.3.28
+      '@types/react': 19.2.14
 
-  react-remove-scroll@2.7.2(@types/react@18.3.28)(react@18.3.1):
+  react-remove-scroll@2.7.2(@types/react@19.2.14)(react@19.2.4):
     dependencies:
-      react: 18.3.1
-      react-remove-scroll-bar: 2.3.8(@types/react@18.3.28)(react@18.3.1)
-      react-style-singleton: 2.2.3(@types/react@18.3.28)(react@18.3.1)
+      react: 19.2.4
+      react-remove-scroll-bar: 2.3.8(@types/react@19.2.14)(react@19.2.4)
+      react-style-singleton: 2.2.3(@types/react@19.2.14)(react@19.2.4)
       tslib: 2.8.1
-      use-callback-ref: 1.3.3(@types/react@18.3.28)(react@18.3.1)
-      use-sidecar: 1.1.3(@types/react@18.3.28)(react@18.3.1)
+      use-callback-ref: 1.3.3(@types/react@19.2.14)(react@19.2.4)
+      use-sidecar: 1.1.3(@types/react@19.2.14)(react@19.2.4)
     optionalDependencies:
-      '@types/react': 18.3.28
+      '@types/react': 19.2.14
 
-  react-resizable-panels@3.0.6(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
+  react-resizable-panels@4.7.3(react-dom@19.2.4(react@19.2.4))(react@19.2.4):
     dependencies:
-      react: 18.3.1
-      react-dom: 18.3.1(react@18.3.1)
+      react: 19.2.4
+      react-dom: 19.2.4(react@19.2.4)
 
-  react-style-singleton@2.2.3(@types/react@18.3.28)(react@18.3.1):
+  react-style-singleton@2.2.3(@types/react@19.2.14)(react@19.2.4):
     dependencies:
       get-nonce: 1.0.1
-      react: 18.3.1
+      react: 19.2.4
       tslib: 2.8.1
     optionalDependencies:
-      '@types/react': 18.3.28
+      '@types/react': 19.2.14
 
-  react-syntax-highlighter@15.6.6(react@18.3.1):
+  react-syntax-highlighter@15.6.6(react@19.2.4):
     dependencies:
       '@babel/runtime': 7.28.6
       highlight.js: 10.7.3
       highlightjs-vue: 1.0.0
       lowlight: 1.20.0
       prismjs: 1.30.0
-      react: 18.3.1
+      react: 19.2.4
       refractor: 3.6.0
 
-  react-window@2.2.6(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
+  react-window@2.2.6(react-dom@19.2.4(react@19.2.4))(react@19.2.4):
     dependencies:
-      react: 18.3.1
-      react-dom: 18.3.1(react@18.3.1)
+      react: 19.2.4
+      react-dom: 19.2.4(react@19.2.4)
 
-  react@18.3.1:
-    dependencies:
-      loose-envify: 1.4.0
+  react@19.2.4: {}
 
   read-binary-file-arch@1.0.6:
     dependencies:
@@ -11485,10 +13089,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  read-cache@1.0.0:
-    dependencies:
-      pify: 2.3.0
-
   read-config-file@6.3.2:
     dependencies:
       config-file-ts: 0.2.6
@@ -11518,9 +13118,7 @@ snapshots:
     dependencies:
       minimatch: 5.1.6
 
-  readdirp@3.6.0:
-    dependencies:
-      picomatch: 2.3.1
+  readdirp@5.0.0: {}
 
   reflect.getprototypeof@1.0.10:
     dependencies:
@@ -11650,10 +13248,14 @@ snapshots:
 
   require-directory@2.1.1: {}
 
+  require-from-string@2.0.2: {}
+
   resedit@1.7.2:
     dependencies:
       pe-library: 0.4.1
 
+  reselect@5.1.1: {}
+
   resolve-alpn@1.2.1: {}
 
   resolve-from@4.0.0: {}
@@ -11750,6 +13352,8 @@ snapshots:
     dependencies:
       tslib: 2.8.1
 
+  s3mini@0.9.4: {}
+
   safe-array-concat@1.1.3:
     dependencies:
       call-bind: 1.0.8
@@ -11781,9 +13385,11 @@ snapshots:
 
   sax@1.4.4: {}
 
-  scheduler@0.23.2:
+  saxes@6.0.0:
     dependencies:
-      loose-envify: 1.4.0
+      xmlchars: 2.2.0
+
+  scheduler@0.27.0: {}
 
   semver-compare@1.0.0:
     optional: true
@@ -11899,6 +13505,12 @@ snapshots:
     dependencies:
       semver: 7.7.4
 
+  sirv@3.0.2:
+    dependencies:
+      '@polka/url': 1.0.0-next.29
+      mrmime: 2.0.1
+      totalist: 3.0.1
+
   slash@3.0.0: {}
 
   slice-ansi@3.0.0:
@@ -11915,6 +13527,8 @@ snapshots:
 
   smart-buffer@4.2.0: {}
 
+  smol-toml@1.6.0: {}
+
   socks-proxy-agent@6.2.1:
     dependencies:
       agent-base: 6.0.2
@@ -11937,6 +13551,11 @@ snapshots:
       ip-address: 10.1.0
       smart-buffer: 4.2.0
 
+  sonner@2.0.7(react-dom@19.2.4(react@19.2.4))(react@19.2.4):
+    dependencies:
+      react: 19.2.4
+      react-dom: 19.2.4(react@19.2.4)
+
   source-map-js@1.2.1: {}
 
   source-map-support@0.5.21:
@@ -11966,6 +13585,7 @@ snapshots:
     transitivePeerDependencies:
       - bluebird
       - supports-color
+    optional: true
 
   ssh2@1.17.0:
     dependencies:
@@ -11990,7 +13610,7 @@ snapshots:
 
   state-local@1.0.7: {}
 
-  std-env@3.10.0: {}
+  std-env@4.0.0: {}
 
   stop-iteration-iterator@1.1.0:
     dependencies:
@@ -11999,17 +13619,17 @@ snapshots:
 
   stopword@3.1.5: {}
 
-  streamdown@1.6.11(@types/mdast@4.0.4)(micromark-util-types@2.0.2)(micromark@4.0.2)(react@18.3.1):
+  streamdown@1.6.11(@types/mdast@4.0.4)(micromark-util-types@2.0.2)(micromark@4.0.2)(react@19.2.4):
     dependencies:
       clsx: 2.1.1
       hast: 1.0.0
       hast-util-to-jsx-runtime: 2.3.6
       html-url-attributes: 3.0.1
       katex: 0.16.28
-      lucide-react: 0.542.0(react@18.3.1)
+      lucide-react: 0.542.0(react@19.2.4)
       marked: 16.4.2
       mermaid: 11.12.2
-      react: 18.3.1
+      react: 19.2.4
       rehype-harden: 1.1.7
       rehype-katex: 7.0.1
       rehype-raw: 7.0.0
@@ -12108,10 +13728,6 @@ snapshots:
 
   strip-json-comments@3.1.1: {}
 
-  strip-literal@3.1.0:
-    dependencies:
-      js-tokens: 9.0.1
-
   style-to-js@1.1.21:
     dependencies:
       style-to-object: 1.0.14
@@ -12122,16 +13738,6 @@ snapshots:
 
   stylis@4.3.6: {}
 
-  sucrase@3.35.1:
-    dependencies:
-      '@jridgewell/gen-mapping': 0.3.13
-      commander: 4.1.1
-      lines-and-columns: 1.2.4
-      mz: 2.7.0
-      pirates: 4.0.7
-      tinyglobby: 0.2.15
-      ts-interface-checker: 0.1.13
-
   suffix-thumb@5.0.2: {}
 
   sumchecker@3.0.1:
@@ -12150,41 +13756,17 @@ snapshots:
 
   supports-preserve-symlinks-flag@1.0.0: {}
 
+  symbol-tree@3.2.4: {}
+
+  tabbable@6.4.0: {}
+
   tailwind-merge@2.6.1: {}
 
   tailwind-merge@3.4.0: {}
 
-  tailwindcss-animate@1.0.7(tailwindcss@3.4.19(yaml@2.8.2)):
-    dependencies:
-      tailwindcss: 3.4.19(yaml@2.8.2)
+  tailwindcss@4.2.1: {}
 
-  tailwindcss@3.4.19(yaml@2.8.2):
-    dependencies:
-      '@alloc/quick-lru': 5.2.0
-      arg: 5.0.2
-      chokidar: 3.6.0
-      didyoumean: 1.2.2
-      dlv: 1.1.3
-      fast-glob: 3.3.3
-      glob-parent: 6.0.2
-      is-glob: 4.0.3
-      jiti: 1.21.7
-      lilconfig: 3.1.3
-      micromatch: 4.0.8
-      normalize-path: 3.0.0
-      object-hash: 3.0.0
-      picocolors: 1.1.1
-      postcss: 8.5.6
-      postcss-import: 15.1.0(postcss@8.5.6)
-      postcss-js: 4.1.0(postcss@8.5.6)
-      postcss-load-config: 6.0.1(jiti@1.21.7)(postcss@8.5.6)(yaml@2.8.2)
-      postcss-nested: 6.2.0(postcss@8.5.6)
-      postcss-selector-parser: 6.1.2
-      resolve: 1.22.11
-      sucrase: 3.35.1
-    transitivePeerDependencies:
-      - tsx
-      - yaml
+  tapable@2.3.0: {}
 
   tar-fs@2.1.4:
     dependencies:
@@ -12225,14 +13807,6 @@ snapshots:
 
   text-table@0.2.0: {}
 
-  thenify-all@1.6.0:
-    dependencies:
-      thenify: 3.3.1
-
-  thenify@3.3.1:
-    dependencies:
-      any-promise: 1.3.0
-
   tiny-async-pool@1.3.0:
     dependencies:
       semver: 5.7.2
@@ -12241,8 +13815,6 @@ snapshots:
 
   tinybench@2.9.0: {}
 
-  tinyexec@0.3.2: {}
-
   tinyexec@1.0.2: {}
 
   tinyglobby@0.2.15:
@@ -12250,11 +13822,13 @@ snapshots:
       fdir: 6.5.0(picomatch@4.0.3)
       picomatch: 4.0.3
 
-  tinypool@1.1.1: {}
+  tinyrainbow@3.1.0: {}
 
-  tinyrainbow@2.0.0: {}
+  tldts-core@7.0.28: {}
 
-  tinyspy@4.0.4: {}
+  tldts@7.0.28:
+    dependencies:
+      tldts-core: 7.0.28
 
   tmp-promise@3.0.3:
     dependencies:
@@ -12266,6 +13840,16 @@ snapshots:
     dependencies:
       is-number: 7.0.0
 
+  totalist@3.0.1: {}
+
+  tough-cookie@6.0.1:
+    dependencies:
+      tldts: 7.0.28
+
+  tr46@6.0.0:
+    dependencies:
+      punycode: 2.3.1
+
   tree-kill@1.2.2: {}
 
   trim-lines@3.0.1: {}
@@ -12276,14 +13860,12 @@ snapshots:
     dependencies:
       utf8-byte-length: 1.0.5
 
-  ts-api-utils@1.4.3(typescript@5.9.3):
+  ts-api-utils@1.4.3(typescript@6.0.2):
     dependencies:
-      typescript: 5.9.3
+      typescript: 6.0.2
 
   ts-dedent@2.2.0: {}
 
-  ts-interface-checker@0.1.13: {}
-
   tsconfig-paths@3.15.0:
     dependencies:
       '@types/json5': 0.0.29
@@ -12297,6 +13879,8 @@ snapshots:
     dependencies:
       safe-buffer: 5.2.1
 
+  tw-animate-css@1.4.0: {}
+
   tweetnacl@0.14.5: {}
 
   type-check@0.4.0:
@@ -12343,6 +13927,8 @@ snapshots:
 
   typescript@5.9.3: {}
 
+  typescript@6.0.2: {}
+
   ufo@1.6.3: {}
 
   unbox-primitive@1.1.0:
@@ -12356,6 +13942,10 @@ snapshots:
 
   undici-types@6.21.0: {}
 
+  undici-types@7.16.0: {}
+
+  undici@7.25.0: {}
+
   unified@11.0.5:
     dependencies:
       '@types/unist': 3.0.3
@@ -12417,6 +14007,8 @@ snapshots:
       unist-util-is: 6.0.1
       unist-util-visit-parents: 6.0.2
 
+  universal-user-agent@7.0.3: {}
+
   universalify@0.1.2: {}
 
   universalify@2.0.1: {}
@@ -12431,20 +14023,29 @@ snapshots:
     dependencies:
       punycode: 2.3.1
 
-  use-callback-ref@1.3.3(@types/react@18.3.28)(react@18.3.1):
+  use-callback-ref@1.3.3(@types/react@19.2.14)(react@19.2.4):
     dependencies:
-      react: 18.3.1
+      react: 19.2.4
       tslib: 2.8.1
     optionalDependencies:
-      '@types/react': 18.3.28
+      '@types/react': 19.2.14
 
-  use-sidecar@1.1.3(@types/react@18.3.28)(react@18.3.1):
+  use-sidecar@1.1.3(@types/react@19.2.14)(react@19.2.4):
     dependencies:
       detect-node-es: 1.1.0
-      react: 18.3.1
+      react: 19.2.4
       tslib: 2.8.1
     optionalDependencies:
-      '@types/react': 18.3.28
+      '@types/react': 19.2.14
+
+  use-sync-external-store@1.6.0(react@19.2.4):
+    dependencies:
+      react: 19.2.4
+
+  usehooks-ts@3.1.1(react@19.2.4):
+    dependencies:
+      lodash.debounce: 4.0.8
+      react: 19.2.4
 
   utf8-byte-length@1.0.5: {}
 
@@ -12474,71 +14075,60 @@ snapshots:
       '@types/unist': 3.0.3
       vfile-message: 4.0.3
 
-  vite-node@3.2.4(@types/node@20.19.32):
-    dependencies:
-      cac: 6.7.14
-      debug: 4.4.3
-      es-module-lexer: 1.7.0
-      pathe: 2.0.3
-      vite: 5.4.21(@types/node@20.19.32)
-    transitivePeerDependencies:
-      - '@types/node'
-      - less
-      - lightningcss
-      - sass
-      - sass-embedded
-      - stylus
-      - sugarss
-      - supports-color
-      - terser
-
-  vite@5.4.21(@types/node@20.19.32):
+  vite@6.4.1(@types/node@20.19.32)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.8.2):
     dependencies:
-      esbuild: 0.21.5
+      esbuild: 0.25.12
+      fdir: 6.5.0(picomatch@4.0.3)
+      picomatch: 4.0.3
       postcss: 8.5.6
       rollup: 4.57.1
+      tinyglobby: 0.2.15
     optionalDependencies:
       '@types/node': 20.19.32
       fsevents: 2.3.3
+      jiti: 2.6.1
+      lightningcss: 1.31.1
+      yaml: 2.8.2
 
-  vitest@3.2.4(@types/debug@4.1.12)(@types/node@20.19.32):
+  vitest-browser-react@2.1.0(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(vitest@4.1.0):
     dependencies:
-      '@types/chai': 5.2.3
-      '@vitest/expect': 3.2.4
-      '@vitest/mocker': 3.2.4(vite@5.4.21(@types/node@20.19.32))
-      '@vitest/pretty-format': 3.2.4
-      '@vitest/runner': 3.2.4
-      '@vitest/snapshot': 3.2.4
-      '@vitest/spy': 3.2.4
-      '@vitest/utils': 3.2.4
-      chai: 5.3.3
-      debug: 4.4.3
+      react: 19.2.4
+      react-dom: 19.2.4(react@19.2.4)
+      vitest: 4.1.0(@opentelemetry/api@1.9.0)(@types/node@20.19.32)(@vitest/browser-playwright@4.1.0)(@vitest/browser-preview@4.1.0)(jsdom@29.0.2)(vite@6.4.1(@types/node@20.19.32)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.8.2))
+    optionalDependencies:
+      '@types/react': 19.2.14
+      '@types/react-dom': 19.2.3(@types/react@19.2.14)
+
+  vitest@4.1.0(@opentelemetry/api@1.9.0)(@types/node@20.19.32)(@vitest/browser-playwright@4.1.0)(@vitest/browser-preview@4.1.0)(jsdom@29.0.2)(vite@6.4.1(@types/node@20.19.32)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.8.2)):
+    dependencies:
+      '@vitest/expect': 4.1.0
+      '@vitest/mocker': 4.1.0(vite@6.4.1(@types/node@20.19.32)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.8.2))
+      '@vitest/pretty-format': 4.1.0
+      '@vitest/runner': 4.1.0
+      '@vitest/snapshot': 4.1.0
+      '@vitest/spy': 4.1.0
+      '@vitest/utils': 4.1.0
+      es-module-lexer: 2.0.0
       expect-type: 1.3.0
       magic-string: 0.30.21
+      obug: 2.1.1
       pathe: 2.0.3
       picomatch: 4.0.3
-      std-env: 3.10.0
+      std-env: 4.0.0
       tinybench: 2.9.0
-      tinyexec: 0.3.2
+      tinyexec: 1.0.2
       tinyglobby: 0.2.15
-      tinypool: 1.1.1
-      tinyrainbow: 2.0.0
-      vite: 5.4.21(@types/node@20.19.32)
-      vite-node: 3.2.4(@types/node@20.19.32)
+      tinyrainbow: 3.1.0
+      vite: 6.4.1(@types/node@20.19.32)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.8.2)
       why-is-node-running: 2.3.0
     optionalDependencies:
-      '@types/debug': 4.1.12
+      '@opentelemetry/api': 1.9.0
       '@types/node': 20.19.32
+      '@vitest/browser-playwright': 4.1.0(playwright@1.58.2)(vite@6.4.1(@types/node@20.19.32)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.8.2))(vitest@4.1.0)
+      '@vitest/browser-preview': 4.1.0(vite@6.4.1(@types/node@20.19.32)(jiti@2.6.1)(lightningcss@1.31.1)(yaml@2.8.2))(vitest@4.1.0)
+      jsdom: 29.0.2
     transitivePeerDependencies:
-      - less
-      - lightningcss
       - msw
-      - sass
-      - sass-embedded
-      - stylus
-      - sugarss
-      - supports-color
-      - terser
 
   vscode-jsonrpc@8.2.0: {}
 
@@ -12557,6 +14147,10 @@ snapshots:
 
   vscode-uri@3.0.8: {}
 
+  w3c-xmlserializer@5.0.0:
+    dependencies:
+      xml-name-validator: 5.0.0
+
   wcwidth@1.0.1:
     dependencies:
       defaults: 1.0.4
@@ -12565,6 +14159,18 @@ snapshots:
 
   web-vitals@5.1.0: {}
 
+  webidl-conversions@8.0.1: {}
+
+  whatwg-mimetype@5.0.0: {}
+
+  whatwg-url@16.0.1:
+    dependencies:
+      '@exodus/bytes': 1.15.0
+      tr46: 6.0.0
+      webidl-conversions: 8.0.1
+    transitivePeerDependencies:
+      - '@noble/hashes'
+
   which-boxed-primitive@1.1.1:
     dependencies:
       is-bigint: 1.1.0
@@ -12646,8 +14252,16 @@ snapshots:
 
   wrappy@1.0.2: {}
 
+  ws@8.19.0: {}
+
+  xcase@2.0.1: {}
+
+  xml-name-validator@5.0.0: {}
+
   xmlbuilder@15.1.1: {}
 
+  xmlchars@2.2.0: {}
+
   xtend@4.0.2: {}
 
   y18n@5.0.8: {}
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index c9885dc8ba..9c5adff08a 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -6,7 +6,6 @@ onlyBuiltDependencies:
   - core-js
   - electron
   - esbuild
-  - keytar
   - node-pty
   - protobufjs
   - sqlite3
diff --git a/postcss.config.js b/postcss.config.js
deleted file mode 100644
index 12a703d900..0000000000
--- a/postcss.config.js
+++ /dev/null
@@ -1,6 +0,0 @@
-module.exports = {
-  plugins: {
-    tailwindcss: {},
-    autoprefixer: {},
-  },
-};
diff --git a/scripts/clean.cjs b/scripts/clean.cjs
deleted file mode 100644
index 870f1861c9..0000000000
--- a/scripts/clean.cjs
+++ /dev/null
@@ -1,8 +0,0 @@
-const fs = require('node:fs');
-const path = require('node:path');
-
-const repoRoot = path.resolve(__dirname, '..');
-
-for (const dir of ['node_modules', 'dist']) {
-  fs.rmSync(path.join(repoRoot, dir), { recursive: true, force: true });
-}
diff --git a/scripts/copy-main-assets.cjs b/scripts/copy-main-assets.cjs
deleted file mode 100644
index 1b8dbb3889..0000000000
--- a/scripts/copy-main-assets.cjs
+++ /dev/null
@@ -1,29 +0,0 @@
-const fs = require('node:fs');
-const path = require('node:path');
-
-const repoRoot = path.resolve(__dirname, '..');
-
-function copyFile(src, dest) {
-  fs.mkdirSync(path.dirname(dest), { recursive: true });
-  fs.copyFileSync(src, dest);
-}
-
-const assets = [
-  {
-    src: path.join(repoRoot, 'src', 'main', 'appConfig.json'),
-    dest: path.join(repoRoot, 'dist', 'main', 'appConfig.json'),
-  },
-  {
-    src: path.join(repoRoot, 'src', 'main', 'services', 'skills', 'bundled-catalog.json'),
-    dest: path.join(repoRoot, 'dist', 'main', 'main', 'services', 'skills', 'bundled-catalog.json'),
-  },
-];
-
-for (const asset of assets) {
-  if (!fs.existsSync(asset.src)) {
-    // eslint-disable-next-line no-console
-    console.error(`copy-main-assets: missing source file: ${asset.src}`);
-    process.exit(1);
-  }
-  copyFile(asset.src, asset.dest);
-}
diff --git a/scripts/emdash-run.ts b/scripts/emdash-run.ts
deleted file mode 100644
index 81f2a9ad86..0000000000
--- a/scripts/emdash-run.ts
+++ /dev/null
@@ -1,115 +0,0 @@
-#!/usr/bin/env node
-import { readFileSync } from 'node:fs';
-import { resolve } from 'node:path';
-
-import { ContainerConfigError, resolveContainerConfig } from '../src/shared/container/config';
-import { generateMockStartEvents } from '../src/shared/container/mockRunner';
-import { PortManager } from '../src/shared/container/portManager';
-
-interface StartCommandOptions {
-  workspaceId: string;
-  configPath: string;
-  runId?: string;
-  mode?: 'container' | 'host';
-}
-
-interface ParsedArgs {
-  command: 'start' | 'help';
-  options: StartCommandOptions;
-}
-
-function parseArgs(argv: string[]): ParsedArgs {
-  const [commandRaw, ...rest] = argv;
-  const command = (commandRaw ?? 'help') as ParsedArgs['command'];
-
-  if (command !== 'start') {
-    return { command: 'help', options: { workspaceId: '', configPath: '.emdash/config.json' } };
-  }
-
-  const options: StartCommandOptions = {
-    workspaceId: '',
-    configPath: '.emdash/config.json',
-  };
-
-  for (let i = 0; i < rest.length; i += 1) {
-    const arg = rest[i];
-    if (!arg) continue;
-    switch (arg) {
-      case '--workspace':
-      case '-w':
-        options.workspaceId = rest[i + 1] ?? '';
-        i += 1;
-        break;
-      case '--config':
-      case '-c':
-        options.configPath = rest[i + 1] ?? options.configPath;
-        i += 1;
-        break;
-      case '--mode':
-        options.mode = (rest[i + 1] ?? 'container') as 'container' | 'host';
-        i += 1;
-        break;
-      case '--run-id':
-        options.runId = rest[i + 1] ?? options.runId;
-        i += 1;
-        break;
-      default:
-        break;
-    }
-  }
-
-  return { command, options };
-}
-
-function printUsage(): void {
-  process.stderr.write(`Usage: emdash-run start --workspace <id> [--config path]\n`);
-}
-
-function loadConfig(configPath: string) {
-  const absolute = resolve(process.cwd(), configPath);
-  const raw = readFileSync(absolute, 'utf8');
-  return JSON.parse(raw) as unknown;
-}
-
-async function runStart(options: StartCommandOptions): Promise<void> {
-  if (!options.workspaceId) {
-    throw new Error('Missing required --workspace argument');
-  }
-
-  const rawConfig = loadConfig(options.configPath);
-  const resolvedConfig = resolveContainerConfig(rawConfig);
-
-  const portManager = new PortManager();
-  const events = await generateMockStartEvents({
-    workspaceId: options.workspaceId,
-    config: resolvedConfig,
-    portAllocator: portManager,
-    runId: options.runId,
-    mode: options.mode,
-  });
-
-  for (const event of events) {
-    process.stdout.write(`${JSON.stringify(event)}\n`);
-  }
-}
-
-async function main(argv: string[]): Promise<void> {
-  const parsed = parseArgs(argv);
-  if (parsed.command !== 'start') {
-    printUsage();
-    return;
-  }
-
-  try {
-    await runStart(parsed.options);
-  } catch (error) {
-    if (error instanceof ContainerConfigError) {
-      process.stderr.write(`Invalid config: ${error.message}\n`);
-    } else if (error instanceof Error) {
-      process.stderr.write(`${error.message}\n`);
-    }
-    process.exitCode = 1;
-  }
-}
-
-void main(process.argv.slice(2));
diff --git a/scripts/postinstall.cjs b/scripts/postinstall.cjs
deleted file mode 100644
index 59ecb1d6c3..0000000000
--- a/scripts/postinstall.cjs
+++ /dev/null
@@ -1,47 +0,0 @@
-const { spawnSync } = require('node:child_process');
-const path = require('node:path');
-
-if (process.env.CI || process.env.EMDASH_SKIP_ELECTRON_REBUILD === '1') {
-  process.exit(0);
-}
-
-function getElectronRebuildBin() {
-  const binName = process.platform === 'win32' ? 'electron-rebuild.cmd' : 'electron-rebuild';
-  return path.resolve(__dirname, '..', 'node_modules', '.bin', binName);
-}
-
-function runElectronRebuild(onlyModules) {
-  const electronRebuildBin = getElectronRebuildBin();
-  const args = ['-f'];
-
-  if (onlyModules && onlyModules.length > 0) {
-    args.push('--only', onlyModules.join(','));
-  }
-
-  const result =
-    process.platform === 'win32'
-      ? spawnSync(electronRebuildBin, args, { stdio: 'inherit', shell: true })
-      : spawnSync(electronRebuildBin, args, { stdio: 'inherit' });
-
-  if (result.error) {
-    // eslint-disable-next-line no-console
-    console.error('postinstall: failed to run electron-rebuild:', result.error);
-  }
-
-  if (result.status === 0) return;
-  process.exit(typeof result.status === 'number' ? result.status : 1);
-}
-
-const disablePty = process.env.EMDASH_DISABLE_PTY === '1';
-const disableNativeDb = process.env.EMDASH_DISABLE_NATIVE_DB === '1';
-
-const nativeModules = [];
-if (!disableNativeDb) nativeModules.push('sqlite3');
-if (!disablePty) nativeModules.push('node-pty');
-nativeModules.push('keytar');
-
-if (nativeModules.length === 0) {
-  process.exit(0);
-}
-
-runElectronRebuild(nativeModules);
diff --git a/scripts/postinstall.ts b/scripts/postinstall.ts
new file mode 100644
index 0000000000..dcea87cf92
--- /dev/null
+++ b/scripts/postinstall.ts
@@ -0,0 +1,50 @@
+import { spawnSync } from 'node:child_process';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+
+if (process.env.CI || process.env.EMDASH_SKIP_ELECTRON_REBUILD === '1') {
+  process.exit(0);
+}
+
+function getElectronRebuildBin() {
+  const binName = process.platform === 'win32' ? 'electron-rebuild.cmd' : 'electron-rebuild';
+
+  return path.resolve(__dirname, '..', 'node_modules', '.bin', binName);
+}
+
+function runElectronRebuild(onlyModules) {
+  const electronRebuildBin = getElectronRebuildBin();
+  const args = ['-f'];
+
+  if (onlyModules && onlyModules.length > 0) {
+    args.push('--only', onlyModules.join(','));
+  }
+
+  const result =
+    process.platform === 'win32'
+      ? spawnSync(electronRebuildBin, args, { stdio: 'inherit', shell: true })
+      : spawnSync(electronRebuildBin, args, { stdio: 'inherit' });
+
+  if (result.error) {
+    // eslint-disable-next-line no-console
+    console.error('postinstall: failed to run electron-rebuild:', result.error);
+  }
+
+  if (result.status === 0) return;
+  process.exit(typeof result.status === 'number' ? result.status : 1);
+}
+
+const disablePty = process.env.EMDASH_DISABLE_PTY === '1';
+const disableNativeDb = process.env.EMDASH_DISABLE_NATIVE_DB === '1';
+
+const nativeModules = [];
+if (!disableNativeDb) nativeModules.push('better-sqlite3');
+if (!disablePty) nativeModules.push('node-pty');
+
+if (nativeModules.length === 0) {
+  process.exit(0);
+}
+
+runElectronRebuild(nativeModules);
diff --git a/scripts/release/build.ts b/scripts/release/build.ts
new file mode 100644
index 0000000000..68db2f4b63
--- /dev/null
+++ b/scripts/release/build.ts
@@ -0,0 +1,50 @@
+import { parseArgs } from 'node:util';
+import { exec } from './lib/exec.ts';
+import { fail, info, step } from './lib/log.ts';
+
+const { values } = parseArgs({
+  options: {
+    platform: { type: 'string' },
+    arch: { type: 'string', default: 'both' },
+    targets: { type: 'string' },
+  },
+  strict: true,
+});
+
+const platform = values.platform;
+if (!platform || !['mac', 'linux', 'win'].includes(platform)) {
+  fail('Usage: build.ts --platform mac|linux|win [--arch arm64|x64|both] [--targets dmg,zip]');
+}
+
+const archInput = values.arch ?? 'both';
+const archs: string[] = archInput === 'both' ? ['x64', 'arm64'] : [archInput];
+
+const defaultTargets: Record<string, string> = {
+  mac: 'dmg zip',
+  linux: 'AppImage deb rpm',
+  win: 'nsis msi',
+};
+const targets = values.targets ? values.targets.split(',').join(' ') : defaultTargets[platform];
+
+for (const arch of archs) {
+  step(`Building ${platform} ${targets} for ${arch}`);
+
+  exec(`node --experimental-strip-types scripts/release/rebuild-native.ts --arch ${arch}`, {
+    echo: true,
+  });
+
+  const platformFlag = `--${platform}`;
+  const archFlag = `--${arch}`;
+  const cmd = [
+    'pnpm exec electron-builder',
+    platformFlag,
+    targets,
+    archFlag,
+    '--publish always',
+    '--config electron-builder.config.ts',
+    '--config.npmRebuild=false',
+  ].join(' ');
+
+  exec(cmd, { echo: true });
+  info(`Built ${platform} ${targets} for ${arch}`);
+}
diff --git a/scripts/release/inject-telemetry.ts b/scripts/release/inject-telemetry.ts
new file mode 100644
index 0000000000..90b1fdfb0a
--- /dev/null
+++ b/scripts/release/inject-telemetry.ts
@@ -0,0 +1,18 @@
+import { mkdirSync, writeFileSync } from 'node:fs';
+import { info, step } from './lib/log.ts';
+
+const phKey = process.env.PH_KEY ?? '';
+const phHost = process.env.PH_HOST ?? '';
+
+if (!phKey || !phHost) {
+  console.log('PostHog secrets not set; skipping telemetry injection.');
+  process.exit(0);
+}
+
+step('Inject PostHog config');
+mkdirSync('dist/main', { recursive: true });
+writeFileSync(
+  'dist/main/appConfig.json',
+  JSON.stringify({ posthogHost: phHost, posthogKey: phKey }, null, 2)
+);
+info('Wrote dist/main/appConfig.json');
diff --git a/scripts/release/lib/artifacts.ts b/scripts/release/lib/artifacts.ts
new file mode 100644
index 0000000000..dacd6dec96
--- /dev/null
+++ b/scripts/release/lib/artifacts.ts
@@ -0,0 +1,30 @@
+import { readdirSync } from 'node:fs';
+import { join } from 'node:path';
+import { ARTIFACT_PREFIX, RELEASE_DIR, UPDATE_CHANNEL } from './config.ts';
+
+function matchFiles(pattern: RegExp): string[] {
+  try {
+    return readdirSync(RELEASE_DIR)
+      .filter((f) => pattern.test(f))
+      .map((f) => join(RELEASE_DIR, f));
+  } catch {
+    return [];
+  }
+}
+
+export function findManifests(): string[] {
+  return matchFiles(new RegExp(`^${UPDATE_CHANNEL}.*\\.yml$`));
+}
+
+export function findInstallers(): string[] {
+  return matchFiles(new RegExp(`^${ARTIFACT_PREFIX}-.*\\.(dmg|zip|exe|msi|AppImage|deb|rpm)$`));
+}
+
+export function findBlockmaps(): string[] {
+  return matchFiles(/\.blockmap$/);
+}
+
+export function findArtifacts(patterns: string[]): string[] {
+  const combined = new RegExp(patterns.map((p) => `(?:${p})`).join('|'));
+  return matchFiles(combined);
+}
diff --git a/scripts/release/lib/config.ts b/scripts/release/lib/config.ts
new file mode 100644
index 0000000000..958d87624f
--- /dev/null
+++ b/scripts/release/lib/config.ts
@@ -0,0 +1,25 @@
+import { PRODUCT_NAME } from '../../../src/shared/app-identity.ts';
+
+export {
+  APP_ID,
+  APP_NAME_LOWER,
+  ARTIFACT_PREFIX,
+  PRODUCT_NAME,
+  R2_BASE_URL,
+  UPDATE_CHANNEL,
+} from '../../../src/shared/app-identity.ts';
+
+export const APP_BUNDLE = `${PRODUCT_NAME}.app`;
+export const APP_BINARY = PRODUCT_NAME;
+export const RELEASE_DIR = 'release';
+export const NATIVE_MODULES = ['better-sqlite3', 'node-pty', '@parcel/watcher'];
+
+export function requireEnv(name: string): string {
+  const val = process.env[name];
+  if (!val) throw new Error(`Missing required env var: ${name}`);
+  return val;
+}
+
+export function r2Endpoint(): string {
+  return `https://${requireEnv('R2_ACCOUNT_ID')}.r2.cloudflarestorage.com/${requireEnv('R2_BUCKET')}`;
+}
diff --git a/scripts/release/lib/exec.ts b/scripts/release/lib/exec.ts
new file mode 100644
index 0000000000..2b37158c10
--- /dev/null
+++ b/scripts/release/lib/exec.ts
@@ -0,0 +1,35 @@
+import { execSync, type ExecSyncOptions } from 'node:child_process';
+
+export interface ExecOptions {
+  cwd?: string;
+  env?: NodeJS.ProcessEnv;
+  /** Print the command before running it */
+  echo?: boolean;
+}
+
+export function exec(cmd: string, opts?: ExecOptions): string {
+  if (opts?.echo) {
+    console.log(`$ ${cmd}`);
+  }
+  const execOpts: ExecSyncOptions = {
+    encoding: 'utf-8',
+    stdio: ['inherit', 'pipe', 'pipe'],
+    ...(opts?.cwd && { cwd: opts.cwd }),
+    ...(opts?.env && { env: { ...process.env, ...opts.env } }),
+  };
+  try {
+    return (execSync(cmd, execOpts) as string).trim();
+  } catch (error: unknown) {
+    const e = error as { stderr?: string; status?: number };
+    const stderr = typeof e.stderr === 'string' ? e.stderr.trim() : '';
+    throw new Error(`Command failed (exit ${e.status ?? '?'}): ${cmd}\n${stderr}`);
+  }
+}
+
+export function execOrNull(cmd: string, opts?: ExecOptions): string | null {
+  try {
+    return exec(cmd, opts);
+  } catch {
+    return null;
+  }
+}
diff --git a/scripts/release/lib/log.ts b/scripts/release/lib/log.ts
new file mode 100644
index 0000000000..0b5a37acb1
--- /dev/null
+++ b/scripts/release/lib/log.ts
@@ -0,0 +1,36 @@
+const isCI = !!process.env.CI;
+
+export function step(name: string): void {
+  if (isCI) {
+    console.log(`::group::${name}`);
+  } else {
+    console.log(`\n==> ${name}`);
+  }
+}
+
+export function endStep(): void {
+  if (isCI) {
+    console.log('::endgroup::');
+  }
+}
+
+export function info(msg: string): void {
+  console.log(`    ${msg}`);
+}
+
+export function warn(msg: string): void {
+  if (isCI) {
+    console.log(`::warning::${msg}`);
+  } else {
+    console.warn(`⚠  ${msg}`);
+  }
+}
+
+export function fail(msg: string): never {
+  if (isCI) {
+    console.error(`::error::${msg}`);
+  } else {
+    console.error(`✖  ${msg}`);
+  }
+  process.exit(1);
+}
diff --git a/scripts/release/notarize-mac.ts b/scripts/release/notarize-mac.ts
new file mode 100644
index 0000000000..8c868be954
--- /dev/null
+++ b/scripts/release/notarize-mac.ts
@@ -0,0 +1,85 @@
+import { existsSync, mkdtempSync, readdirSync, rmSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+import { APP_BUNDLE, RELEASE_DIR } from './lib/config.ts';
+import { exec } from './lib/exec.ts';
+import { fail, info, step, warn } from './lib/log.ts';
+
+if (process.platform !== 'darwin') {
+  console.log('Not macOS — skipping notarization.');
+  process.exit(0);
+}
+
+const apiKeyPath = process.env.APPLE_API_KEY ?? process.env.APPLE_API_KEY_CONTENT;
+const apiKeyId = process.env.APPLE_API_KEY_ID;
+const apiIssuer = process.env.APPLE_API_ISSUER;
+
+if (!apiKeyPath || !apiKeyId || !apiIssuer) {
+  warn('Apple API key not configured; skipping notarization.');
+  process.exit(0);
+}
+
+let keyFile = apiKeyPath;
+if (apiKeyPath.includes('BEGIN PRIVATE KEY') || apiKeyPath.length > 500) {
+  const { writeFileSync } = await import('node:fs');
+  keyFile = join(tmpdir(), `apple_api_key_${Date.now()}.p8`);
+  writeFileSync(keyFile, apiKeyPath);
+}
+
+const dmgs = readdirSync(RELEASE_DIR)
+  .filter((f) => f.endsWith('.dmg'))
+  .map((f) => join(RELEASE_DIR, f));
+
+if (dmgs.length === 0) {
+  warn('No DMG files found — nothing to notarize.');
+  process.exit(0);
+}
+
+for (const dmg of dmgs) {
+  step(`Notarizing ${dmg}`);
+  exec(
+    `xcrun notarytool submit "${dmg}" --key "${keyFile}" --key-id "${apiKeyId}" --issuer "${apiIssuer}" --wait`,
+    { echo: true }
+  );
+
+  info('Stapling DMG');
+  exec(`xcrun stapler staple -v "${dmg}"`, { echo: true });
+  exec(`xcrun stapler validate "${dmg}"`, { echo: true });
+}
+
+step('Staple app bundles');
+const macDirs = readdirSync(RELEASE_DIR)
+  .filter((d) => d.startsWith('mac'))
+  .map((d) => join(RELEASE_DIR, d, APP_BUNDLE))
+  .filter((p) => existsSync(p));
+
+for (const appDir of macDirs) {
+  info(`Stapling ${appDir}`);
+  try {
+    exec(`xcrun stapler staple "${appDir}"`, { echo: true });
+    exec(`xcrun stapler validate "${appDir}"`, { echo: true });
+  } catch {
+    warn(`App staple failed for ${appDir} (may not be individually notarized)`);
+  }
+}
+
+step('Gatekeeper check (app inside DMG)');
+for (const dmg of dmgs) {
+  const mnt = mkdtempSync(join(tmpdir(), 'dmg-'));
+  try {
+    exec(`hdiutil attach "${dmg}" -mountpoint "${mnt}" -nobrowse -quiet`, { echo: true });
+    const appPath = join(mnt, APP_BUNDLE);
+    if (!existsSync(appPath)) {
+      fail(`No ${APP_BUNDLE} found inside ${dmg}`);
+    }
+    exec(`spctl -a -vv --type execute "${appPath}"`, { echo: true });
+    info(`Gatekeeper passed for ${dmg}`);
+  } finally {
+    try {
+      exec(`hdiutil detach "${mnt}" -quiet`);
+    } catch {
+      /* best effort */
+    }
+    rmSync(mnt, { recursive: true, force: true });
+  }
+}
diff --git a/scripts/release/rebuild-native.ts b/scripts/release/rebuild-native.ts
new file mode 100644
index 0000000000..7ca95b2b6e
--- /dev/null
+++ b/scripts/release/rebuild-native.ts
@@ -0,0 +1,27 @@
+import { parseArgs } from 'node:util';
+import { NATIVE_MODULES } from './lib/config.ts';
+import { exec } from './lib/exec.ts';
+import { fail, info, step } from './lib/log.ts';
+
+const { values } = parseArgs({
+  options: {
+    arch: { type: 'string' },
+  },
+  strict: true,
+});
+
+const arch = values.arch;
+if (!arch || !['arm64', 'x64'].includes(arch)) {
+  fail('Usage: rebuild-native.ts --arch arm64|x64');
+}
+
+const electronVersion = exec('node -p "require(\'electron/package.json\').version"');
+step(`Rebuilding native modules for ${arch} (Electron ${electronVersion})`);
+
+const modules = NATIVE_MODULES.join(',');
+exec(`pnpm exec electron-rebuild -f -a ${arch} -v ${electronVersion} -o ${modules}`, {
+  echo: true,
+  env: { npm_config_build_from_source: 'true' },
+});
+
+info(`Native modules rebuilt for ${arch}`);
diff --git a/scripts/release/tsconfig.json b/scripts/release/tsconfig.json
new file mode 100644
index 0000000000..59f2bf7ec3
--- /dev/null
+++ b/scripts/release/tsconfig.json
@@ -0,0 +1,16 @@
+{
+  "compilerOptions": {
+    "target": "ES2022",
+    "module": "ESNext",
+    "moduleResolution": "bundler",
+    "strict": true,
+    "noEmit": true,
+    "skipLibCheck": true,
+    "resolveJsonModule": true,
+    "isolatedModules": true,
+    "lib": ["ES2022"],
+    "types": ["node"],
+    "allowImportingTsExtensions": true
+  },
+  "include": ["**/*.ts"]
+}
diff --git a/scripts/release/upload-r2.ts b/scripts/release/upload-r2.ts
new file mode 100644
index 0000000000..afa8b1345d
--- /dev/null
+++ b/scripts/release/upload-r2.ts
@@ -0,0 +1,32 @@
+import { readFileSync } from 'node:fs';
+import { basename } from 'node:path';
+import { S3mini } from 's3mini';
+import { findBlockmaps, findInstallers, findManifests } from './lib/artifacts.ts';
+import { r2Endpoint, requireEnv } from './lib/config.ts';
+import { fail, info, step } from './lib/log.ts';
+
+const s3 = new S3mini({
+  accessKeyId: requireEnv('R2_ACCESS_KEY_ID'),
+  secretAccessKey: requireEnv('R2_SECRET_ACCESS_KEY'),
+  endpoint: r2Endpoint(),
+  region: 'auto',
+});
+
+const files = [...findManifests(), ...findInstallers(), ...findBlockmaps()];
+
+if (files.length === 0) {
+  fail('No artifacts found to upload');
+}
+
+step(`Uploading ${files.length} artifact(s) to R2`);
+
+for (const file of files) {
+  const key = basename(file);
+  const contentType = key.endsWith('.yml') ? 'application/yaml' : 'application/octet-stream';
+  const data = readFileSync(file);
+  info(`Uploading ${key} (${(data.length / 1024 / 1024).toFixed(1)} MB)`);
+  await s3.putObject(key, new Uint8Array(data), contentType);
+  info(`Uploaded ${key}`);
+}
+
+info('All artifacts uploaded to R2');
diff --git a/scripts/release/verify-mac.ts b/scripts/release/verify-mac.ts
new file mode 100644
index 0000000000..26a92b43a5
--- /dev/null
+++ b/scripts/release/verify-mac.ts
@@ -0,0 +1,112 @@
+import { existsSync, readdirSync } from 'node:fs';
+import { join } from 'node:path';
+import { parseArgs } from 'node:util';
+import { APP_BUNDLE, APP_ID, PRODUCT_NAME, RELEASE_DIR } from './lib/config.ts';
+import { exec, execOrNull } from './lib/exec.ts';
+import { fail, info, step, warn } from './lib/log.ts';
+
+if (process.platform !== 'darwin') {
+  console.log('Not macOS — skipping verification.');
+  process.exit(0);
+}
+
+const { values } = parseArgs({
+  options: {
+    'smoke-test': { type: 'boolean', default: false },
+    'expected-team-id': { type: 'string' },
+  },
+  strict: true,
+});
+
+const smokeTest = values['smoke-test'] ?? false;
+const expectedTeamId = values['expected-team-id'];
+
+const macDirs = readdirSync(RELEASE_DIR)
+  .filter((d) => d.startsWith('mac'))
+  .map((d) => join(RELEASE_DIR, d, APP_BUNDLE))
+  .filter((p) => existsSync(p));
+
+if (macDirs.length === 0) {
+  fail('No app bundles found to verify');
+}
+
+let verified = 0;
+
+for (const appDir of macDirs) {
+  const archDir = appDir.split('/').at(-2)!;
+  const expectedArch =
+    archDir === 'mac-arm64' ? 'arm64' : archDir.startsWith('mac') ? 'x86_64' : null;
+
+  step(`Verifying ${appDir} (expected: ${expectedArch ?? 'unknown'})`);
+
+  const electronBin = join(appDir, 'Contents', 'MacOS', PRODUCT_NAME);
+  const sqliteNode = join(
+    appDir,
+    'Contents',
+    'Resources',
+    'app.asar.unpacked',
+    'node_modules',
+    'sqlite3',
+    'build',
+    'Release',
+    'node_sqlite3.node'
+  );
+
+  if (expectedArch) {
+    const binArch = execOrNull(`file "${electronBin}" | grep -o 'arm64\\|x86_64' | head -1`);
+    info(`Electron binary: ${binArch}`);
+    if (binArch !== expectedArch) {
+      fail(`Electron arch mismatch: got ${binArch}, expected ${expectedArch}`);
+    }
+
+    if (existsSync(sqliteNode)) {
+      const sqliteArch = execOrNull(`file "${sqliteNode}" | grep -o 'arm64\\|x86_64' | head -1`);
+      info(`sqlite3 native module: ${sqliteArch}`);
+      if (sqliteArch !== expectedArch) {
+        fail(`sqlite3 arch mismatch: got ${sqliteArch}, expected ${expectedArch}`);
+      }
+    } else {
+      warn(`sqlite3 native module not found at ${sqliteNode}`);
+    }
+  }
+
+  if (smokeTest && archDir === 'mac-arm64') {
+    step('Smoke test sqlite3 (arm64)');
+    exec(
+      `ELECTRON_RUN_AS_NODE=1 NODE_PATH="${appDir}/Contents/Resources/app.asar.unpacked/node_modules" "${electronBin}" -e "require('sqlite3'); console.log('sqlite3 OK')"`,
+      { echo: true }
+    );
+  }
+
+  const plist = join(appDir, 'Contents', 'Info.plist');
+  if (existsSync(plist)) {
+    const bid =
+      execOrNull(`/usr/libexec/PlistBuddy -c 'Print :CFBundleIdentifier' "${plist}"`) ??
+      execOrNull(
+        `plutil -extract CFBundleIdentifier xml1 -o - "${plist}" | sed -n 's/.*<string>\\(.*\\)<\\/string>.*/\\1/p' | head -n1`
+      );
+    info(`CFBundleIdentifier: ${bid}`);
+    if (bid !== APP_ID) {
+      fail(`CFBundleIdentifier mismatch (got '${bid}', expected '${APP_ID}')`);
+    }
+  }
+
+  exec(`codesign --verify --deep --strict --verbose=2 "${appDir}"`, { echo: true });
+
+  if (expectedTeamId) {
+    const meta = exec(`codesign -dv --verbose=4 "${appDir}" 2>&1`);
+    if (!meta.includes('Authority=Developer ID Application')) {
+      fail('Not Developer ID Application signed');
+    }
+    const tidMatch = meta.match(/TeamIdentifier=(\S+)/);
+    const tid = tidMatch?.[1];
+    if (tid !== expectedTeamId) {
+      fail(`TeamIdentifier mismatch (got '${tid}', expected '${expectedTeamId}')`);
+    }
+    info(`TeamIdentifier: ${tid}`);
+  }
+
+  verified++;
+}
+
+info(`Verified ${verified} app bundle(s)`);
diff --git a/scripts/release/verify-win.ts b/scripts/release/verify-win.ts
new file mode 100644
index 0000000000..c58a86b738
--- /dev/null
+++ b/scripts/release/verify-win.ts
@@ -0,0 +1,45 @@
+import { readdirSync } from 'node:fs';
+import { join } from 'node:path';
+import { ARTIFACT_PREFIX, RELEASE_DIR } from './lib/config.ts';
+import { exec } from './lib/exec.ts';
+import { fail, info, step } from './lib/log.ts';
+
+if (process.platform !== 'win32') {
+  console.log('Not Windows — skipping signature verification.');
+  process.exit(0);
+}
+
+step('Verify Windows code signatures');
+
+const files = readdirSync(RELEASE_DIR).filter(
+  (f) => f.startsWith(ARTIFACT_PREFIX) && (f.endsWith('.exe') || f.endsWith('.msi'))
+);
+
+if (files.length === 0) {
+  fail('No .exe or .msi files found in release/ to verify');
+}
+
+let failed = false;
+
+for (const f of files) {
+  const fullPath = join(RELEASE_DIR, f);
+  info(`Verifying signature on ${f}...`);
+  try {
+    const output = exec(
+      `powershell -Command "` +
+        `$sig = Get-AuthenticodeSignature -FilePath '${fullPath}'; ` +
+        `if ($sig.Status -ne 'Valid') { Write-Error \\"Invalid: $($sig.Status) - $($sig.StatusMessage)\\"; exit 1 } ` +
+        `Write-Host \\"Status: $($sig.Status)\\"; Write-Host \\"Subject: $($sig.SignerCertificate.Subject)\\""`
+    );
+    info(output);
+  } catch {
+    console.error(`Signature invalid on ${f}`);
+    failed = true;
+  }
+}
+
+if (failed) {
+  fail('One or more Windows installers have invalid signatures');
+}
+
+info('All Windows installers are properly signed.');
diff --git a/src/assets/images/Forgejo.svg b/src/assets/images/Forgejo.svg
new file mode 100644
index 0000000000..e409658d99
--- /dev/null
+++ b/src/assets/images/Forgejo.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" viewBox="0 0 512 512"><path fill="#ff6600" d="M357.9 165c-23.1 0-43.2 12.7-53.9 31.5h-28.6c-34.1 0-65.6 11.3-91 30.4v-43.7c0-50.2 40.8-91 91-91H304c10.6 18.8 30.8 31.6 53.9 31.6 34.1 0 61.9-27.8 61.9-61.9S392 0 357.9 0c-23.1 0-43.2 12.7-53.9 31.5h-28.6c-83.7 0-151.7 68.1-151.7 151.7v213c-18.8 10.6-31.5 30.8-31.5 53.9 0 34.1 27.8 61.9 61.9 61.9s61.9-27.8 61.9-61.9c0-23.1-12.8-43.3-31.6-53.9v-48c0-50.2 40.8-91 91-91H304c10.6 18.8 30.8 31.6 53.9 31.6 34.1 0 61.9-27.8 61.9-61.9S392 165 357.9 165m0-128.6c14.1 0 25.5 11.4 25.5 25.5s-11.5 25.5-25.5 25.5c-14.1 0-25.5-11.4-25.5-25.5s11.5-25.5 25.5-25.5M154.1 475.6c-14.1 0-25.5-11.5-25.5-25.5 0-14.1 11.5-25.5 25.5-25.5s25.5 11.5 25.5 25.5c0 14.1-11.5 25.5-25.5 25.5m203.8-223.2c-14.1 0-25.5-11.4-25.5-25.5s11.5-25.5 25.5-25.5c14.1 0 25.5 11.4 25.5 25.5s-11.5 25.5-25.5 25.5"/></svg>
diff --git a/src/assets/images/Plain.svg b/src/assets/images/Plain.svg
new file mode 100644
index 0000000000..9ab1aa7864
--- /dev/null
+++ b/src/assets/images/Plain.svg
@@ -0,0 +1,4 @@
+<svg width="989" height="1000" viewBox="0 0 989 1000" fill="#1C1C1C" xmlns="http://www.w3.org/2000/svg">
+<path d="M301.784 666.637C279.762 666.637 250.165 680.425 236.009 697.28L7.51425 969.357C-6.63941 986.212 -0.203706 1000 21.8183 1000H437.503C621.773 1000 771.154 850.749 771.154 666.637C771.154 659.753 770.879 652.934 770.466 646.154C734.514 659.392 695.657 666.637 655.104 666.637H301.784Z"/>
+<path d="M988.461 333.319C988.461 149.233 839.303 0 655.309 0H395.565C373.577 0 344.022 13.7897 329.888 30.6419L101.735 302.677C87.6007 319.529 94.0268 333.315 116.014 333.315H438.034C615.149 333.315 759.916 471.614 770.499 646.154C897.724 599.246 988.461 476.892 988.461 333.319Z"/>
+</svg>
diff --git a/src/assets/images/antigravity.png b/src/assets/images/antigravity.png
new file mode 100644
index 0000000000..ce40c20fb8
Binary files /dev/null and b/src/assets/images/antigravity.png differ
diff --git a/src/assets/images/emdash/app-icon-beta-rounded.png b/src/assets/images/emdash/app-icon-beta-rounded.png
new file mode 100644
index 0000000000..42914efff7
Binary files /dev/null and b/src/assets/images/emdash/app-icon-beta-rounded.png differ
diff --git a/src/assets/images/emdash/app-icon-beta.png b/src/assets/images/emdash/app-icon-beta.png
new file mode 100644
index 0000000000..0745d41379
Binary files /dev/null and b/src/assets/images/emdash/app-icon-beta.png differ
diff --git a/src/assets/images/emdash/emdash-beta.icns b/src/assets/images/emdash/emdash-beta.icns
new file mode 100644
index 0000000000..143d5ea886
Binary files /dev/null and b/src/assets/images/emdash/emdash-beta.icns differ
diff --git a/src/assets/images/emdash/emdash-beta.iconset/icon_128x128.png b/src/assets/images/emdash/emdash-beta.iconset/icon_128x128.png
new file mode 100644
index 0000000000..619e3e3f41
Binary files /dev/null and b/src/assets/images/emdash/emdash-beta.iconset/icon_128x128.png differ
diff --git a/src/assets/images/emdash/emdash-beta.iconset/icon_128x128@2x.png b/src/assets/images/emdash/emdash-beta.iconset/icon_128x128@2x.png
new file mode 100644
index 0000000000..9d7faa2590
Binary files /dev/null and b/src/assets/images/emdash/emdash-beta.iconset/icon_128x128@2x.png differ
diff --git a/src/assets/images/emdash/emdash-beta.iconset/icon_16x16.png b/src/assets/images/emdash/emdash-beta.iconset/icon_16x16.png
new file mode 100644
index 0000000000..b491427e79
Binary files /dev/null and b/src/assets/images/emdash/emdash-beta.iconset/icon_16x16.png differ
diff --git a/src/assets/images/emdash/emdash-beta.iconset/icon_16x16@2x.png b/src/assets/images/emdash/emdash-beta.iconset/icon_16x16@2x.png
new file mode 100644
index 0000000000..ae4e1042f6
Binary files /dev/null and b/src/assets/images/emdash/emdash-beta.iconset/icon_16x16@2x.png differ
diff --git a/src/assets/images/emdash/emdash-beta.iconset/icon_256x256.png b/src/assets/images/emdash/emdash-beta.iconset/icon_256x256.png
new file mode 100644
index 0000000000..9d7faa2590
Binary files /dev/null and b/src/assets/images/emdash/emdash-beta.iconset/icon_256x256.png differ
diff --git a/src/assets/images/emdash/emdash-beta.iconset/icon_256x256@2x.png b/src/assets/images/emdash/emdash-beta.iconset/icon_256x256@2x.png
new file mode 100644
index 0000000000..299b81234e
Binary files /dev/null and b/src/assets/images/emdash/emdash-beta.iconset/icon_256x256@2x.png differ
diff --git a/src/assets/images/emdash/emdash-beta.iconset/icon_32x32.png b/src/assets/images/emdash/emdash-beta.iconset/icon_32x32.png
new file mode 100644
index 0000000000..ae4e1042f6
Binary files /dev/null and b/src/assets/images/emdash/emdash-beta.iconset/icon_32x32.png differ
diff --git a/src/assets/images/emdash/emdash-beta.iconset/icon_32x32@2x.png b/src/assets/images/emdash/emdash-beta.iconset/icon_32x32@2x.png
new file mode 100644
index 0000000000..7eb0fc9a3e
Binary files /dev/null and b/src/assets/images/emdash/emdash-beta.iconset/icon_32x32@2x.png differ
diff --git a/src/assets/images/emdash/emdash-beta.iconset/icon_512x512.png b/src/assets/images/emdash/emdash-beta.iconset/icon_512x512.png
new file mode 100644
index 0000000000..299b81234e
Binary files /dev/null and b/src/assets/images/emdash/emdash-beta.iconset/icon_512x512.png differ
diff --git a/src/assets/images/emdash/emdash-beta.iconset/icon_512x512@2x.png b/src/assets/images/emdash/emdash-beta.iconset/icon_512x512@2x.png
new file mode 100644
index 0000000000..42914efff7
Binary files /dev/null and b/src/assets/images/emdash/emdash-beta.iconset/icon_512x512@2x.png differ
diff --git a/src/assets/images/mcp/amplitude.svg b/src/assets/images/mcp/amplitude.svg
new file mode 100644
index 0000000000..469642dcdd
--- /dev/null
+++ b/src/assets/images/mcp/amplitude.svg
@@ -0,0 +1,12 @@
+<svg version="1.2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1518 1580" width="1518" height="1580">
+	<title>amplitude-svg</title>
+	<style>
+		.s0 { fill: #1e61f0 } 
+	</style>
+	<g id="Layer">
+		<g id="Layer">
+			<path id="Layer" class="s0" d="m685.5 389.6q8 17.2 15 34.8q7 17.6 13 35.6q6 18 10.9 36.3c18.7 58.4 38.6 130.8 60 215.3c-80.9-1.3-162.6-2.3-241.9-3.1l-40.1-0.6c45.3-184.4 100.6-324.3 141-357.3q1.2-0.9 2.5-1.6q1.3-0.6 2.7-1.1q1.4-0.5 2.9-0.8q1.4-0.3 2.9-0.3q2.2 0.1 4.2 0.8q2.1 0.7 4 1.8q1.9 1.2 3.4 2.8q1.5 1.5 2.7 3.4q8.9 16.8 16.8 34z" />
+			<path id="Layer" fill-rule="evenodd" class="s0" d="m1517.3 789.8c0 436.1-339.7 789.7-758.7 789.7c-418.9 0-758.6-353.5-758.6-789.7c0-436.2 339.7-789.8 758.6-789.8c419 0 758.7 353.6 758.7 789.8zm-205.5 5.6c2.2-3.3 4-6.8 5.2-10.6c1.2-3.7 2-7.6 2.1-11.5c0.2-3.9-0.1-7.9-1-11.7c-0.9-3.8-2.2-7.5-4.1-10.9c-1.9-3.4-4.2-6.5-7-9.2c-2.7-2.8-5.9-5.1-9.3-7c-3.4-1.9-7-3.3-10.8-4.1h-1.7q-0.8-0.1-1.6-0.2q-0.7-0.1-1.5-0.2q-0.7 0-1.5-0.1q-0.8 0-1.5 0l-5.4-0.5c-127-9.6-257.7-13.4-380.4-16l-0.2-0.9c-59.7-233.1-134.2-471.4-234.7-471.4c-93.7 0.3-178.3 157.1-251.1 465.4c-51.4-0.6-98.5-1.3-142.8-2.1h-6.8q-2-0.1-4.1-0.1q-2 0.1-4 0.2q-2.1 0-4.1 0.2q-2.1 0.2-4.1 0.4c-12.4 2.8-23.4 9.8-31.2 19.7c-7.9 10-12 22.4-11.8 35.1c0.2 12.7 4.8 24.9 12.9 34.6c8.2 9.7 19.4 16.3 31.9 18.7l0.5 0.6h139.4c-13 61.7-24.3 122.7-33.8 181.5l-4.2 25.8v1.3c0 3.8 0.6 7.7 1.8 11.3c1.1 3.7 2.9 7.1 5.2 10.2c2.2 3.1 5 5.9 8.1 8.1c3.1 2.3 6.5 4 10.2 5.2c3.6 1 7.4 1.5 11.2 1.3c3.8-0.2 7.5-1 11-2.4c3.5-1.3 6.8-3.3 9.6-5.8c2.9-2.4 5.4-5.3 7.3-8.6l1.1 0.9l68.6-228.7h330.7c25.2 99.4 51.5 202.1 86.1 298.4c18.6 51.5 61.9 172.1 134.4 172.7h0.8c112.2 0 155.9-188.6 184.8-313.5c6.3-26.9 11.6-50.1 16.7-67.1l2-7.1q0.2-0.6 0.4-1.2q0.1-0.7 0.2-1.3q0.1-0.7 0.1-1.3q0.1-0.7 0.1-1.3c0-2.1-0.4-4.1-1.1-6c-0.7-2-1.7-3.7-3-5.3c-1.3-1.6-2.8-3-4.6-4c-1.7-1.1-3.6-1.8-5.6-2.2c-2-0.4-4-0.4-6 0c-1.9 0.4-3.8 1.1-5.6 2.1c-1.7 1-3.2 2.3-4.5 3.8c-1.3 1.6-2.3 3.3-3 5.2l-2.4 7c-9.6 27.4-18.3 53.4-26.2 76.4l-0.6 1.8c-48.5 143.1-70.6 208.4-114.1 208.4h-2.9c-55.5 0-107.8-235.3-127.5-323.9c-3.5-15.3-6.6-29.4-9.6-41.8h359.6q2.4 0 4.8-0.3q2.4-0.3 4.8-0.9q2.3-0.6 4.6-1.5q2.3-0.9 4.4-2.1q0.2-0.1 0.4-0.2q0.2-0.1 0.4-0.3q0.3-0.1 0.5-0.2q0.2-0.1 0.4-0.3l1.8-1.1l0.8-0.6c0.9-0.6 1.7-1.3 2.5-1.9l0.2-0.2c3-2.6 5.6-5.5 7.8-8.7z" />
+		</g>
+	</g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/images/mcp/asana.svg b/src/assets/images/mcp/asana.svg
new file mode 100644
index 0000000000..eebccc8cac
--- /dev/null
+++ b/src/assets/images/mcp/asana.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Asana</title><path d="M18.78 12.653c-2.882 0-5.22 2.336-5.22 5.22s2.338 5.22 5.22 5.22 5.22-2.34 5.22-5.22-2.336-5.22-5.22-5.22zm-13.56 0c-2.88 0-5.22 2.337-5.22 5.22s2.338 5.22 5.22 5.22 5.22-2.338 5.22-5.22-2.336-5.22-5.22-5.22zm12-6.525c0 2.883-2.337 5.22-5.22 5.22-2.882 0-5.22-2.337-5.22-5.22 0-2.88 2.338-5.22 5.22-5.22 2.883 0 5.22 2.34 5.22 5.22z"/></svg>
\ No newline at end of file
diff --git a/src/assets/images/mcp/atlassian.svg b/src/assets/images/mcp/atlassian.svg
new file mode 100644
index 0000000000..8752138604
--- /dev/null
+++ b/src/assets/images/mcp/atlassian.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Atlassian</title><path d="M7.12 11.084a.683.683 0 00-1.16.126L.075 22.974a.703.703 0 00.63 1.018h8.19a.678.678 0 00.63-.39c1.767-3.65.696-9.203-2.406-12.52zM11.434.386a15.515 15.515 0 00-.906 15.317l3.95 7.9a.703.703 0 00.628.388h8.19a.703.703 0 00.63-1.017L12.63.38a.664.664 0 00-1.196.006z"/></svg>
\ No newline at end of file
diff --git a/src/assets/images/mcp/aws_marketplace.svg b/src/assets/images/mcp/aws_marketplace.svg
new file mode 100644
index 0000000000..9fd688c41f
--- /dev/null
+++ b/src/assets/images/mcp/aws_marketplace.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Amazon AWS</title><path d="M6.763 10.036c0 .296.032.535.088.71.064.176.144.368.256.576.04.063.056.127.056.183 0 .08-.048.16-.152.24l-.503.335a.383.383 0 0 1-.208.072c-.08 0-.16-.04-.239-.112a2.47 2.47 0 0 1-.287-.375 6.18 6.18 0 0 1-.248-.471c-.622.734-1.405 1.101-2.347 1.101-.67 0-1.205-.191-1.596-.574-.391-.384-.59-.894-.59-1.533 0-.678.239-1.23.726-1.644.487-.415 1.133-.623 1.955-.623.272 0 .551.024.846.064.296.04.6.104.918.176v-.583c0-.607-.127-1.03-.375-1.277-.255-.248-.686-.367-1.3-.367-.28 0-.568.031-.863.103-.295.072-.583.16-.862.272a2.287 2.287 0 0 1-.28.104.488.488 0 0 1-.127.023c-.112 0-.168-.08-.168-.247v-.391c0-.128.016-.224.056-.28a.597.597 0 0 1 .224-.167c.279-.144.614-.264 1.005-.36a4.84 4.84 0 0 1 1.246-.151c.95 0 1.644.216 2.091.647.439.43.662 1.085.662 1.963v2.586zm-3.24 1.214c.263 0 .534-.048.822-.144.287-.096.543-.271.758-.51.128-.152.224-.32.272-.512.047-.191.08-.423.08-.694v-.335a6.66 6.66 0 0 0-.735-.136 6.02 6.02 0 0 0-.75-.048c-.535 0-.926.104-1.19.32-.263.215-.39.518-.39.917 0 .375.095.655.295.846.191.2.47.296.838.296zm6.41.862c-.144 0-.24-.024-.304-.08-.064-.048-.12-.16-.168-.311L7.586 5.55a1.398 1.398 0 0 1-.072-.32c0-.128.064-.2.191-.2h.783c.151 0 .255.025.31.08.065.048.113.16.16.312l1.342 5.284 1.245-5.284c.04-.16.088-.264.151-.312a.549.549 0 0 1 .32-.08h.638c.152 0 .256.025.32.08.063.048.12.16.151.312l1.261 5.348 1.381-5.348c.048-.16.104-.264.16-.312a.52.52 0 0 1 .311-.08h.743c.127 0 .2.065.2.2 0 .04-.009.08-.017.128a1.137 1.137 0 0 1-.056.2l-1.923 6.17c-.048.16-.104.263-.168.311a.51.51 0 0 1-.303.08h-.687c-.151 0-.255-.024-.32-.08-.063-.056-.119-.16-.15-.32l-1.238-5.148-1.23 5.14c-.04.16-.087.264-.15.32-.065.056-.177.08-.32.08zm10.256.215c-.415 0-.83-.048-1.229-.143-.399-.096-.71-.2-.918-.32-.128-.071-.215-.151-.247-.223a.563.563 0 0 1-.048-.224v-.407c0-.167.064-.247.183-.247.048 0 .096.008.144.024.048.016.12.048.2.08.271.12.566.215.878.279.319.064.63.096.95.096.502 0 .894-.088 1.165-.264a.86.86 0 0 0 .415-.758.777.777 0 0 0-.215-.559c-.144-.151-.416-.287-.807-.415l-1.157-.36c-.583-.183-1.014-.454-1.277-.813a1.902 1.902 0 0 1-.4-1.158c0-.335.073-.63.216-.886.144-.255.335-.479.575-.654.24-.184.51-.32.83-.415.32-.096.655-.136 1.006-.136.175 0 .359.008.535.032.183.024.35.056.518.088.16.04.312.08.455.127.144.048.256.096.336.144a.69.69 0 0 1 .24.2.43.43 0 0 1 .071.263v.375c0 .168-.064.256-.184.256a.83.83 0 0 1-.303-.096 3.652 3.652 0 0 0-1.532-.311c-.455 0-.815.071-1.062.223-.248.152-.375.383-.375.71 0 .224.08.416.24.567.159.152.454.304.877.44l1.134.358c.574.184.99.44 1.237.767.247.327.367.702.367 1.117 0 .343-.072.655-.207.926-.144.272-.336.511-.583.703-.248.2-.543.343-.886.447-.36.111-.734.167-1.142.167zM21.698 16.207c-2.626 1.94-6.442 2.969-9.722 2.969-4.598 0-8.74-1.7-11.87-4.526-.247-.223-.024-.527.272-.351 3.384 1.963 7.559 3.153 11.877 3.153 2.914 0 6.114-.607 9.06-1.852.439-.2.814.287.383.607zM22.792 14.961c-.336-.43-2.22-.207-3.074-.103-.255.032-.295-.192-.063-.36 1.5-1.053 3.967-.75 4.254-.399.287.36-.08 2.826-1.485 4.007-.215.184-.423.088-.327-.151.32-.79 1.03-2.57.695-2.994z"/></svg>
\ No newline at end of file
diff --git a/src/assets/images/mcp/bigquery.svg b/src/assets/images/mcp/bigquery.svg
new file mode 100644
index 0000000000..5aa562ba11
--- /dev/null
+++ b/src/assets/images/mcp/bigquery.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Google BigQuery</title><path d="M5.676 10.595h2.052v5.244a5.892 5.892 0 0 1-2.052-2.088v-3.156zm18.179 10.836a.504.504 0 0 1 0 .708l-1.716 1.716a.504.504 0 0 1-.708 0l-4.248-4.248a.206.206 0 0 1-.007-.007c-.02-.02-.028-.045-.043-.066a10.736 10.736 0 0 1-6.334 2.065C4.835 21.599 0 16.764 0 10.799S4.835 0 10.8 0s10.799 4.835 10.799 10.8c0 2.369-.772 4.553-2.066 6.333.025.017.052.028.074.05l4.248 4.248zm-5.028-10.632a8.015 8.015 0 1 0-8.028 8.028h.024a8.016 8.016 0 0 0 8.004-8.028zm-4.86 4.98a6.002 6.002 0 0 0 2.04-2.184v-1.764h-2.04v3.948zm-4.5.948c.442.057.887.08 1.332.072.4.025.8.025 1.2 0V7.692H9.468v9.035z"/></svg>
\ No newline at end of file
diff --git a/src/assets/images/mcp/canva.svg b/src/assets/images/mcp/canva.svg
new file mode 100644
index 0000000000..f3d793d093
--- /dev/null
+++ b/src/assets/images/mcp/canva.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Canva</title><path d="M12 0C5.373 0 0 5.373 0 12s5.373 12 12 12 12-5.373 12-12S18.627 0 12 0zM6.962 7.68c.754 0 1.337.549 1.405 1.2.069.583-.171 1.097-.822 1.406-.343.171-.48.172-.549.069-.034-.069 0-.137.069-.206.617-.514.617-.926.548-1.508-.034-.378-.308-.618-.583-.618-1.2 0-2.914 2.674-2.674 4.629.103.754.549 1.646 1.509 1.646.308 0 .65-.103.96-.24.5-.264.799-.47 1.097-.8-.073-.885.704-2.046 1.851-2.046.515 0 .926.205.96.583.068.514-.377.582-.514.582s-.378-.034-.378-.17c-.034-.138.309-.07.275-.378-.035-.206-.24-.274-.446-.274-.72 0-1.131.994-1.029 1.611.035.275.172.549.447.549.205 0 .514-.31.617-.755.068-.308.343-.514.583-.514.102 0 .17.034.205.171v.138c-.034.137-.137.548-.102.651 0 .069.034.171.17.171.092 0 .436-.18.777-.459.117-.59.253-1.298.253-1.357.034-.24.137-.48.617-.48.103 0 .171.034.205.171v.138l-.136.617c.445-.583 1.097-.994 1.508-.994.172 0 .309.102.309.274 0 .103 0 .274-.069.446-.137.377-.309.96-.412 1.474 0 .137.035.274.207.274.171 0 .685-.206 1.096-.754l.007-.004c-.002-.068-.007-.134-.007-.202 0-.411.035-.754.104-.994.068-.274.411-.514.617-.514.103 0 .205.069.205.171 0 .035 0 .103-.034.137-.137.446-.24.857-.24 1.269 0 .24.034.582.102.788 0 .034.035.069.07.069.068 0 .548-.445.89-1.028-.308-.206-.48-.549-.48-.96 0-.72.446-1.097.858-1.097.343 0 .617.24.617.72 0 .308-.103.65-.274.96h.102a.77.77 0 0 0 .584-.24.293.293 0 0 1 .134-.117c.335-.425.83-.74 1.41-.74.48 0 .924.205.959.582.068.515-.378.618-.515.618l-.002-.002c-.138 0-.377-.035-.377-.172 0-.137.309-.068.274-.376-.034-.206-.24-.275-.446-.275-.686 0-1.13.891-1.028 1.611.034.275.171.583.445.583.206 0 .515-.308.652-.754.068-.274.343-.514.583-.514.103 0 .17.034.205.171 0 .069 0 .206-.137.652-.17.308-.171.48-.137.617.034.274.171.48.309.583.034.034.068.102.068.102 0 .069-.034.138-.137.138-.034 0-.068 0-.103-.035-.514-.205-.72-.548-.789-.891-.205.24-.445.377-.72.377-.445 0-.89-.411-.96-.926a1.609 1.609 0 0 1 .075-.649c-.203.13-.422.203-.623.203h-.17c-.447.652-.927 1.098-1.27 1.303a.896.896 0 0 1-.377.104c-.068 0-.171-.035-.205-.104-.095-.152-.156-.392-.193-.667-.481.527-1.145.805-1.453.805-.343 0-.548-.206-.582-.55v-.376c.102-.754.377-1.2.377-1.337a.074.074 0 0 0-.069-.07c-.24 0-1.028.824-1.166 1.373l-.103.445c-.068.309-.377.515-.582.515-.103 0-.172-.035-.206-.172v-.137l.046-.233c-.435.31-.87.508-1.075.508-.308 0-.48-.172-.514-.412-.206.274-.445.412-.754.412-.352 0-.696-.24-.862-.593-.244.275-.523.553-.852.764-.48.309-1.028.549-1.68.549-.582 0-1.097-.309-1.371-.583-.412-.377-.651-.96-.686-1.509-.205-1.68.823-3.84 2.4-4.8.378-.205.755-.343 1.132-.343zm9.77 3.291c-.104 0-.172.172-.172.343 0 .274.137.583.309.755a1.74 1.74 0 0 0 .102-.583c0-.343-.137-.515-.24-.515z"/></svg>
\ No newline at end of file
diff --git a/src/assets/images/mcp/chrome_devtools.svg b/src/assets/images/mcp/chrome_devtools.svg
new file mode 100644
index 0000000000..919ac2a1a8
--- /dev/null
+++ b/src/assets/images/mcp/chrome_devtools.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Google Chrome</title><path d="M12 0C8.21 0 4.831 1.757 2.632 4.501l3.953 6.848A5.454 5.454 0 0 1 12 6.545h10.691A12 12 0 0 0 12 0zM1.931 5.47A11.943 11.943 0 0 0 0 12c0 6.012 4.42 10.991 10.189 11.864l3.953-6.847a5.45 5.45 0 0 1-6.865-2.29zm13.342 2.166a5.446 5.446 0 0 1 1.45 7.09l.002.001h-.002l-5.344 9.257c.206.01.413.016.621.016 6.627 0 12-5.373 12-12 0-1.54-.29-3.011-.818-4.364zM12 16.364a4.364 4.364 0 1 1 0-8.728 4.364 4.364 0 0 1 0 8.728Z"/></svg>
\ No newline at end of file
diff --git a/src/assets/images/mcp/clerk.svg b/src/assets/images/mcp/clerk.svg
new file mode 100644
index 0000000000..b30e97ef65
--- /dev/null
+++ b/src/assets/images/mcp/clerk.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Clerk</title><path d="m21.47 20.829-2.881-2.881a.572.572 0 0 0-.7-.084 6.854 6.854 0 0 1-7.081 0 .576.576 0 0 0-.7.084l-2.881 2.881a.576.576 0 0 0-.103.69.57.57 0 0 0 .166.186 12 12 0 0 0 14.113 0 .58.58 0 0 0 .239-.423.576.576 0 0 0-.172-.453Zm.002-17.668-2.88 2.88a.569.569 0 0 1-.701.084A6.857 6.857 0 0 0 8.724 8.08a6.862 6.862 0 0 0-1.222 3.692 6.86 6.86 0 0 0 .978 3.764.573.573 0 0 1-.083.699l-2.881 2.88a.567.567 0 0 1-.864-.063A11.993 11.993 0 0 1 6.771 2.7a11.99 11.99 0 0 1 14.637-.405.566.566 0 0 1 .232.418.57.57 0 0 1-.168.448Zm-7.118 12.261a3.427 3.427 0 1 0 0-6.854 3.427 3.427 0 0 0 0 6.854Z"/></svg>
\ No newline at end of file
diff --git a/src/assets/images/mcp/clickup.svg b/src/assets/images/mcp/clickup.svg
new file mode 100644
index 0000000000..4bf99cfd82
--- /dev/null
+++ b/src/assets/images/mcp/clickup.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>ClickUp</title><path d="M2 18.439l3.69-2.828c1.961 2.56 4.044 3.739 6.363 3.739 2.307 0 4.33-1.166 6.203-3.704L22 18.405C19.298 22.065 15.941 24 12.053 24 8.178 24 4.788 22.078 2 18.439zM12.04 6.15l-6.568 5.66-3.036-3.52L12.055 0l9.543 8.296-3.05 3.509z"/></svg>
\ No newline at end of file
diff --git a/src/assets/images/mcp/cloudflare.svg b/src/assets/images/mcp/cloudflare.svg
new file mode 100644
index 0000000000..a1cf2d6d3d
--- /dev/null
+++ b/src/assets/images/mcp/cloudflare.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Cloudflare</title><path d="M16.5088 16.8447c.1475-.5068.0908-.9707-.1553-1.3154-.2246-.3164-.6045-.499-1.0615-.5205l-8.6592-.1123a.1559.1559 0 0 1-.1333-.0713c-.0283-.042-.0351-.0986-.021-.1553.0278-.084.1123-.1484.2036-.1562l8.7359-.1123c1.0351-.0489 2.1601-.8868 2.5537-1.9136l.499-1.3013c.0215-.0561.0293-.1128.0147-.168-.5625-2.5463-2.835-4.4453-5.5499-4.4453-2.5039 0-4.6284 1.6177-5.3876 3.8614-.4927-.3658-1.1187-.5625-1.794-.499-1.2026.119-2.1665 1.083-2.2861 2.2856-.0283.31-.0069.6128.0635.894C1.5683 13.171 0 14.7754 0 16.752c0 .1748.0142.3515.0352.5273.0141.083.0844.1475.1689.1475h15.9814c.0909 0 .1758-.0645.2032-.1553l.12-.4268zm2.7568-5.5634c-.0771 0-.1611 0-.2383.0112-.0566 0-.1054.0415-.127.0976l-.3378 1.1744c-.1475.5068-.0918.9707.1543 1.3164.2256.3164.6055.498 1.0625.5195l1.8437.1133c.0557 0 .1055.0263.1329.0703.0283.043.0351.1074.0214.1562-.0283.084-.1132.1485-.204.1553l-1.921.1123c-1.041.0488-2.1582.8867-2.5527 1.914l-.1406.3585c-.0283.0713.0215.1416.0986.1416h6.5977c.0771 0 .1474-.0489.169-.126.1122-.4082.1757-.837.1757-1.2803 0-2.6025-2.125-4.727-4.7344-4.727"/></svg>
\ No newline at end of file
diff --git a/src/assets/images/mcp/cloudinary.svg b/src/assets/images/mcp/cloudinary.svg
new file mode 100644
index 0000000000..28ab3c967f
--- /dev/null
+++ b/src/assets/images/mcp/cloudinary.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Cloudinary</title><path d="M24 14.8598c0 2.1729-1.3757 3.974-3.5903 4.6996l-.0995.0318V17.989c1.3777-.5805 2.1869-1.7275 2.1869-3.1291-.0072-2-1.6087-3.6288-3.6082-3.6699h-.5964l-.1432-.5686c-.7025-2.8996-3.2886-4.9489-6.2721-4.97a6.3915 6.3915 0 0 0-5.811 3.664l-.1828.3757-.4175.0437a4.4311 4.4311 0 0 0-3.3052 2.088c-1.2803 2.0856-.6274 4.8143 1.4583 6.0947v1.6897h-.01l-.149-.0675a5.9402 5.9402 0 0 1-3.3658-4.3494c-.5787-3.2291 1.57-6.3161 4.7991-6.8948a7.8766 7.8766 0 0 1 6.9839-4.149c3.4724.025 6.535 2.28 7.5901 5.5883 2.5789.3366 4.5138 2.5245 4.5327 5.1251zm-15.3176-1.322h.5647a.0656.0656 0 0 0 .0457-.1113L7.084 11.2158l-.0007-.0007a.0656.0656 0 0 0-.0927.0007L4.78 13.4265a.0656.0656 0 0 0 .0477.1113h.5566a.0656.0656 0 0 1 .0657.0656v5.0574c0 .6588.534 1.1928 1.1928 1.1928H9.247a.0656.0656 0 0 0 .0457-.1113l-.33-.33a1.1928 1.1928 0 0 1-.348-.839v-4.97a.0676.0676 0 0 1 .0676-.0655zm9.769 2.5466h.5667a.0655.0655 0 0 0 .0457-.1133l-2.2107-2.2087-.0015-.0015a.0636.0636 0 0 0-.0899.0015L14.551 15.971a.0657.0657 0 0 0 .0457.1133h.5567a.0656.0656 0 0 1 .0656.0656v2.5108c0 .6588.534 1.1928 1.1928 1.1928h2.6063a.0655.0655 0 0 0 .0457-.1113l-.33-.33a1.1928 1.1928 0 0 1-.348-.839V16.15a.0656.0656 0 0 1 .0657-.0656zm-4.8844-1.2743h.5646a.0656.0656 0 0 0 .0477-.1114l-2.2107-2.2027-.0006-.0006a.0656.0656 0 0 0-.0928.0006l-2.2087 2.2068a.0656.0656 0 0 0 .0457.1113h.5626a.0676.0676 0 0 1 .0657.0676v3.7791c0 .6588.534 1.1928 1.1928 1.1928h2.5983a.0656.0656 0 0 0 .0477-.1113l-.332-.33a1.193 1.193 0 0 1-.346-.839v-3.6956c0-.0366.0291-.0665.0657-.0676z"/></svg>
\ No newline at end of file
diff --git a/src/assets/images/mcp/context7.svg b/src/assets/images/mcp/context7.svg
new file mode 100644
index 0000000000..123d62ead5
--- /dev/null
+++ b/src/assets/images/mcp/context7.svg
@@ -0,0 +1,7 @@
+<svg width="28" height="28" viewBox="0 0 28 28" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="28" height="28" rx="4" fill="black" style="fill:black;fill-opacity:1;"/>
+<path d="M10.5724 15.2565C10.5724 17.5025 9.6613 19.3778 8.17805 21.1047H11.6319L11.6319 22.7786H6.33459V21.1895C7.95557 19.3566 8.58065 17.8628 8.58065 15.2565L10.5724 15.2565Z" fill="white" style="fill:white;fill-opacity:1;"/>
+<path d="M17.4276 15.2565C17.4276 17.5025 18.3387 19.3778 19.822 21.1047H16.3681V22.7786H21.6654V21.1895C20.0444 19.3566 19.4194 17.8628 19.4194 15.2565H17.4276Z" fill="white" style="fill:white;fill-opacity:1;"/>
+<path d="M10.5724 12.7435C10.5724 10.4975 9.66131 8.62224 8.17807 6.89532L11.6319 6.89532V5.22137L6.33461 5.22137V6.81056C7.95558 8.64343 8.58066 10.1373 8.58066 12.7435L10.5724 12.7435Z" fill="white" style="fill:white;fill-opacity:1;"/>
+<path d="M17.4276 12.7435C17.4276 10.4975 18.3387 8.62224 19.822 6.89532L16.3681 6.89532L16.3681 5.22138L21.6654 5.22138V6.81056C20.0444 8.64343 19.4194 10.1373 19.4194 12.7435H17.4276Z" fill="white" style="fill:white;fill-opacity:1;"/>
+</svg>
diff --git a/src/assets/images/mcp/deepwiki.png b/src/assets/images/mcp/deepwiki.png
new file mode 100644
index 0000000000..64e0459c45
Binary files /dev/null and b/src/assets/images/mcp/deepwiki.png differ
diff --git a/src/assets/images/mcp/devrev.svg b/src/assets/images/mcp/devrev.svg
new file mode 100644
index 0000000000..d49a55106e
--- /dev/null
+++ b/src/assets/images/mcp/devrev.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 690.8 720"><defs><clipPath id="clippath"><path style="fill:#fff" d="M0 0h720v720H0z"/></clipPath><style>@media (prefers-color-scheme:dark){.cls-1{fill:#000}.cls-3{fill:#fff}}</style></defs><g style="clip-path:url(#clippath)"><path d="M182.9 348.1v-174h177.8C360.7 78.6 280.4 0 182.9 0S5.1 78.6 5.1 174.1c0 95.4 80.2 174 177.8 174Zm325 371.9V545.9h177.8c0-95.5-80.3-174.1-177.8-174.1s-177.8 78.6-177.8 174.1S410.4 720 507.9 720Zm0-376.9 182.9-338H325.1l182.8 338Zm-142.2 33.8-182.9 338L0 376.9h365.7Z" style="fill-rule:evenodd;fill:#000"/></g></svg>
\ No newline at end of file
diff --git a/src/assets/images/mcp/figma.svg b/src/assets/images/mcp/figma.svg
new file mode 100644
index 0000000000..6a06daa63a
--- /dev/null
+++ b/src/assets/images/mcp/figma.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Figma</title><path d="M15.852 8.981h-4.588V0h4.588c2.476 0 4.49 2.014 4.49 4.49s-2.014 4.491-4.49 4.491zM12.735 7.51h3.117c1.665 0 3.019-1.355 3.019-3.019s-1.355-3.019-3.019-3.019h-3.117V7.51zm0 1.471H8.148c-2.476 0-4.49-2.014-4.49-4.49S5.672 0 8.148 0h4.588v8.981zm-4.587-7.51c-1.665 0-3.019 1.355-3.019 3.019s1.354 3.02 3.019 3.02h3.117V1.471H8.148zm4.587 15.019H8.148c-2.476 0-4.49-2.014-4.49-4.49s2.014-4.49 4.49-4.49h4.588v8.98zM8.148 8.981c-1.665 0-3.019 1.355-3.019 3.019s1.355 3.019 3.019 3.019h3.117V8.981H8.148zM8.172 24c-2.489 0-4.515-2.014-4.515-4.49s2.014-4.49 4.49-4.49h4.588v4.441c0 2.503-2.047 4.539-4.563 4.539zm-.024-7.51a3.023 3.023 0 0 0-3.019 3.019c0 1.665 1.365 3.019 3.044 3.019 1.705 0 3.093-1.376 3.093-3.068v-2.97H8.148zm7.704 0h-.098c-2.476 0-4.49-2.014-4.49-4.49s2.014-4.49 4.49-4.49h.098c2.476 0 4.49 2.014 4.49 4.49s-2.014 4.49-4.49 4.49zm-.097-7.509c-1.665 0-3.019 1.355-3.019 3.019s1.355 3.019 3.019 3.019h.098c1.665 0 3.019-1.355 3.019-3.019s-1.355-3.019-3.019-3.019h-.098z"/></svg>
\ No newline at end of file
diff --git a/src/assets/images/mcp/graphos.svg b/src/assets/images/mcp/graphos.svg
new file mode 100644
index 0000000000..fb6c1f346d
--- /dev/null
+++ b/src/assets/images/mcp/graphos.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Apollo GraphQL</title><path d="M12,0C5.372,0 0,5.373 0,12 0,18.628 5.372,24 12,24 18.627,24 24,18.628 24,12A12.014,12.014 0 0 0 23.527,8.657 0.6,0.6 0 0 0 22.4,9.066H22.398C22.663,10.009 22.8,10.994 22.8,12A10.73,10.73 0 0 1 19.637,19.637 10.729,10.729 0 0 1 12,22.8 10.73,10.73 0 0 1 4.363,19.637 10.728,10.728 0 0 1 1.2,12 10.73,10.73 0 0 1 4.363,4.363 10.728,10.728 0 0 1 12,1.2C14.576,1.2 17.013,2.096 18.958,3.74A1.466,1.466 0 1 0 19.82,2.9 11.953,11.953 0 0 0 12,0ZM10.56,5.88 6.36,16.782H8.99L9.677,14.934H13.646L12.927,12.892H10.314L12.014,8.201 15.038,16.781H17.669L13.47,5.88Z"/></svg>
\ No newline at end of file
diff --git a/src/assets/images/mcp/honeycomb.png b/src/assets/images/mcp/honeycomb.png
new file mode 100644
index 0000000000..96f5417b76
Binary files /dev/null and b/src/assets/images/mcp/honeycomb.png differ
diff --git a/src/assets/images/mcp/hugging_face.svg b/src/assets/images/mcp/hugging_face.svg
new file mode 100644
index 0000000000..dd2db93b2d
--- /dev/null
+++ b/src/assets/images/mcp/hugging_face.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Hugging Face</title><path d="M12.025 1.13c-5.77 0-10.449 4.647-10.449 10.378 0 1.112.178 2.181.503 3.185.064-.222.203-.444.416-.577a.96.96 0 0 1 .524-.15c.293 0 .584.124.84.284.278.173.48.408.71.694.226.282.458.611.684.951v-.014c.017-.324.106-.622.264-.874s.403-.487.762-.543c.3-.047.596.06.787.203s.31.313.4.467c.15.257.212.468.233.542.01.026.653 1.552 1.657 2.54.616.605 1.01 1.223 1.082 1.912.055.537-.096 1.059-.38 1.572.637.121 1.294.187 1.967.187.657 0 1.298-.063 1.921-.178-.287-.517-.44-1.041-.384-1.581.07-.69.465-1.307 1.081-1.913 1.004-.987 1.647-2.513 1.657-2.539.021-.074.083-.285.233-.542.09-.154.208-.323.4-.467a1.08 1.08 0 0 1 .787-.203c.359.056.604.29.762.543s.247.55.265.874v.015c.225-.34.457-.67.683-.952.23-.286.432-.52.71-.694.257-.16.547-.284.84-.285a.97.97 0 0 1 .524.151c.228.143.373.388.43.625l.006.04a10.3 10.3 0 0 0 .534-3.273c0-5.731-4.678-10.378-10.449-10.378M8.327 6.583a1.5 1.5 0 0 1 .713.174 1.487 1.487 0 0 1 .617 2.013c-.183.343-.762-.214-1.102-.094-.38.134-.532.914-.917.71a1.487 1.487 0 0 1 .69-2.803m7.486 0a1.487 1.487 0 0 1 .689 2.803c-.385.204-.536-.576-.916-.71-.34-.12-.92.437-1.103.094a1.487 1.487 0 0 1 .617-2.013 1.5 1.5 0 0 1 .713-.174m-10.68 1.55a.96.96 0 1 1 0 1.921.96.96 0 0 1 0-1.92m13.838 0a.96.96 0 1 1 0 1.92.96.96 0 0 1 0-1.92M8.489 11.458c.588.01 1.965 1.157 3.572 1.164 1.607-.007 2.984-1.155 3.572-1.164.196-.003.305.12.305.454 0 .886-.424 2.328-1.563 3.202-.22-.756-1.396-1.366-1.63-1.32q-.011.001-.02.006l-.044.026-.01.008-.03.024q-.018.017-.035.036l-.032.04a1 1 0 0 0-.058.09l-.014.025q-.049.088-.11.19a1 1 0 0 1-.083.116 1.2 1.2 0 0 1-.173.18q-.035.029-.075.058a1.3 1.3 0 0 1-.251-.243 1 1 0 0 1-.076-.107c-.124-.193-.177-.363-.337-.444-.034-.016-.104-.008-.2.022q-.094.03-.216.087-.06.028-.125.063l-.13.074q-.067.04-.136.086a3 3 0 0 0-.135.096 3 3 0 0 0-.26.219 2 2 0 0 0-.12.121 2 2 0 0 0-.106.128l-.002.002a2 2 0 0 0-.09.132l-.001.001a1.2 1.2 0 0 0-.105.212q-.013.036-.024.073c-1.139-.875-1.563-2.317-1.563-3.203 0-.334.109-.457.305-.454m.836 10.354c.824-1.19.766-2.082-.365-3.194-1.13-1.112-1.789-2.738-1.789-2.738s-.246-.945-.806-.858-.97 1.499.202 2.362c1.173.864-.233 1.45-.685.64-.45-.812-1.683-2.896-2.322-3.295s-1.089-.175-.938.647 2.822 2.813 2.562 3.244-1.176-.506-1.176-.506-2.866-2.567-3.49-1.898.473 1.23 2.037 2.16c1.564.932 1.686 1.178 1.464 1.53s-3.675-2.511-4-1.297c-.323 1.214 3.524 1.567 3.287 2.405-.238.839-2.71-1.587-3.216-.642-.506.946 3.49 2.056 3.522 2.064 1.29.33 4.568 1.028 5.713-.624m5.349 0c-.824-1.19-.766-2.082.365-3.194 1.13-1.112 1.789-2.738 1.789-2.738s.246-.945.806-.858.97 1.499-.202 2.362c-1.173.864.233 1.45.685.64.451-.812 1.683-2.896 2.322-3.295s1.089-.175.938.647-2.822 2.813-2.562 3.244 1.176-.506 1.176-.506 2.866-2.567 3.49-1.898-.473 1.23-2.037 2.16c-1.564.932-1.686 1.178-1.464 1.53s3.675-2.511 4-1.297c.323 1.214-3.524 1.567-3.287 2.405.238.839 2.71-1.587 3.216-.642.506.946-3.49 2.056-3.522 2.064-1.29.33-4.568 1.028-5.713-.624"/></svg>
\ No newline at end of file
diff --git a/src/assets/images/mcp/intercom.svg b/src/assets/images/mcp/intercom.svg
new file mode 100644
index 0000000000..3a0ec690cf
--- /dev/null
+++ b/src/assets/images/mcp/intercom.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Intercom</title><path d="M21 0H3C1.343 0 0 1.343 0 3v18c0 1.658 1.343 3 3 3h18c1.658 0 3-1.342 3-3V3c0-1.657-1.342-3-3-3zm-5.801 4.399c0-.44.36-.8.802-.8.44 0 .8.36.8.8v10.688c0 .442-.36.801-.8.801-.443 0-.802-.359-.802-.801V4.399zM11.2 3.994c0-.44.357-.799.8-.799s.8.359.8.799v11.602c0 .44-.357.8-.8.8s-.8-.36-.8-.8V3.994zm-4 .405c0-.44.359-.8.799-.8.443 0 .802.36.802.8v10.688c0 .442-.36.801-.802.801-.44 0-.799-.359-.799-.801V4.399zM3.199 6c0-.442.36-.8.802-.8.44 0 .799.358.799.8v7.195c0 .441-.359.8-.799.8-.443 0-.802-.36-.802-.8V6zM20.52 18.202c-.123.105-3.086 2.593-8.52 2.593-5.433 0-8.397-2.486-8.521-2.593-.335-.288-.375-.792-.086-1.128.285-.334.79-.375 1.125-.09.047.041 2.693 2.211 7.481 2.211 4.848 0 7.456-2.186 7.479-2.207.334-.289.839-.25 1.128.086.289.336.25.84-.086 1.128zm.281-5.007c0 .441-.36.8-.801.8-.441 0-.801-.36-.801-.8V6c0-.442.361-.8.801-.8.441 0 .801.357.801.8v7.195z"/></svg>
\ No newline at end of file
diff --git a/src/assets/images/mcp/jam.png b/src/assets/images/mcp/jam.png
new file mode 100644
index 0000000000..a1ac546b4c
Binary files /dev/null and b/src/assets/images/mcp/jam.png differ
diff --git a/src/assets/images/mcp/linear.svg b/src/assets/images/mcp/linear.svg
new file mode 100644
index 0000000000..f3770d654e
--- /dev/null
+++ b/src/assets/images/mcp/linear.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Linear</title><path d="M2.886 4.18A11.982 11.982 0 0 1 11.99 0C18.624 0 24 5.376 24 12.009c0 3.64-1.62 6.903-4.18 9.105L2.887 4.18ZM1.817 5.626l16.556 16.556c-.524.33-1.075.62-1.65.866L.951 7.277c.247-.575.537-1.126.866-1.65ZM.322 9.163l14.515 14.515c-.71.172-1.443.282-2.195.322L0 11.358a12 12 0 0 1 .322-2.195Zm-.17 4.862 9.823 9.824a12.02 12.02 0 0 1-9.824-9.824Z"/></svg>
\ No newline at end of file
diff --git a/src/assets/images/mcp/magic_patterns.png b/src/assets/images/mcp/magic_patterns.png
new file mode 100644
index 0000000000..f264b7eb8a
Binary files /dev/null and b/src/assets/images/mcp/magic_patterns.png differ
diff --git a/src/assets/images/mcp/make.svg b/src/assets/images/mcp/make.svg
new file mode 100644
index 0000000000..1365fe619b
--- /dev/null
+++ b/src/assets/images/mcp/make.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Make</title><path d="M13.38 3.498c-.27 0-.511.19-.566.465L9.85 18.986a.578.578 0 0 0 .453.678l4.095.826a.58.58 0 0 0 .682-.455l2.963-15.021a.578.578 0 0 0-.453-.678l-4.096-.826a.589.589 0 0 0-.113-.012zm-5.876.098a.576.576 0 0 0-.516.318L.062 17.697a.575.575 0 0 0 .256.774l3.733 1.877a.578.578 0 0 0 .775-.258l6.926-13.781a.577.577 0 0 0-.256-.776L7.762 3.658a.571.571 0 0 0-.258-.062zm11.74.115a.576.576 0 0 0-.576.576v15.426c0 .318.258.578.576.578h4.178a.58.58 0 0 0 .578-.578V4.287a.578.578 0 0 0-.578-.576Z"/></svg>
\ No newline at end of file
diff --git a/src/assets/images/mcp/microsoft_learn.svg b/src/assets/images/mcp/microsoft_learn.svg
new file mode 100644
index 0000000000..eeacf25206
--- /dev/null
+++ b/src/assets/images/mcp/microsoft_learn.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Microsoft</title><path d="M0 0v11.408h11.408V0zm12.594 0v11.408H24V0zM0 12.594V24h11.408V12.594zm12.594 0V24H24V12.594z"/></svg>
\ No newline at end of file
diff --git a/src/assets/images/mcp/miro.svg b/src/assets/images/mcp/miro.svg
new file mode 100644
index 0000000000..f8a11806da
--- /dev/null
+++ b/src/assets/images/mcp/miro.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Miro</title><path d="M17.392 0H13.9L17 4.808 10.444 0H6.949l3.102 6.3L3.494 0H0l3.05 8.131L0 24h3.494L10.05 6.985 6.949 24h3.494L17 5.494 13.899 24h3.493L24 3.672 17.392 0z"/></svg>
\ No newline at end of file
diff --git a/src/assets/images/mcp/motherduck.png b/src/assets/images/mcp/motherduck.png
new file mode 100644
index 0000000000..653e3cdf7d
Binary files /dev/null and b/src/assets/images/mcp/motherduck.png differ
diff --git a/src/assets/images/mcp/netlify.svg b/src/assets/images/mcp/netlify.svg
new file mode 100644
index 0000000000..085838e3a8
--- /dev/null
+++ b/src/assets/images/mcp/netlify.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Netlify</title><path d="M6.49 19.04h-.23L5.13 17.9v-.23l1.73-1.71h1.2l.15.15v1.2L6.5 19.04ZM5.13 6.31V6.1l1.13-1.13h.23L8.2 6.68v1.2l-.15.15h-1.2L5.13 6.31Zm9.96 9.09h-1.65l-.14-.13v-3.83c0-.68-.27-1.2-1.1-1.23-.42 0-.9 0-1.43.02l-.07.08v4.96l-.14.14H8.9l-.13-.14V8.73l.13-.14h3.7a2.6 2.6 0 0 1 2.61 2.6v4.08l-.13.14Zm-8.37-2.44H.14L0 12.82v-1.64l.14-.14h6.58l.14.14v1.64l-.14.14Zm17.14 0h-6.58l-.14-.14v-1.64l.14-.14h6.58l.14.14v1.64l-.14.14ZM11.05 6.55V1.64l.14-.14h1.65l.14.14v4.9l-.14.14h-1.65l-.14-.13Zm0 15.81v-4.9l.14-.14h1.65l.14.13v4.91l-.14.14h-1.65l-.14-.14Z"/></svg>
\ No newline at end of file
diff --git a/src/assets/images/mcp/notion.svg b/src/assets/images/mcp/notion.svg
new file mode 100644
index 0000000000..2917f42eeb
--- /dev/null
+++ b/src/assets/images/mcp/notion.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Notion</title><path d="M4.459 4.208c.746.606 1.026.56 2.428.466l13.215-.793c.28 0 .047-.28-.046-.326L17.86 1.968c-.42-.326-.981-.7-2.055-.607L3.01 2.295c-.466.046-.56.28-.374.466zm.793 3.08v13.904c0 .747.373 1.027 1.214.98l14.523-.84c.841-.046.935-.56.935-1.167V6.354c0-.606-.233-.933-.748-.887l-15.177.887c-.56.047-.747.327-.747.933zm14.337.745c.093.42 0 .84-.42.888l-.7.14v10.264c-.608.327-1.168.514-1.635.514-.748 0-.935-.234-1.495-.933l-4.577-7.186v6.952L12.21 19s0 .84-1.168.84l-3.222.186c-.093-.186 0-.653.327-.746l.84-.233V9.854L7.822 9.76c-.094-.42.14-1.026.793-1.073l3.456-.233 4.764 7.279v-6.44l-1.215-.139c-.093-.514.28-.887.747-.933zM1.936 1.035l13.31-.98c1.634-.14 2.055-.047 3.082.7l4.249 2.986c.7.513.934.653.934 1.213v16.378c0 1.026-.373 1.634-1.68 1.726l-15.458.934c-.98.047-1.448-.093-1.962-.747l-3.129-4.06c-.56-.747-.793-1.306-.793-1.96V2.667c0-.839.374-1.54 1.447-1.632z"/></svg>
\ No newline at end of file
diff --git a/src/assets/images/mcp/planetscale.svg b/src/assets/images/mcp/planetscale.svg
new file mode 100644
index 0000000000..284eeb740b
--- /dev/null
+++ b/src/assets/images/mcp/planetscale.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>PlanetScale</title><path d="M0 12C0 5.373 5.373 0 12 0c4.873 0 9.067 2.904 10.947 7.077l-15.87 15.87a11.981 11.981 0 0 1-1.935-1.099L14.99 12H12l-8.485 8.485A11.962 11.962 0 0 1 0 12Zm12.004 12L24 12.004C23.998 18.628 18.628 23.998 12.004 24Z"/></svg>
\ No newline at end of file
diff --git a/src/assets/images/mcp/playwright.svg b/src/assets/images/mcp/playwright.svg
new file mode 100644
index 0000000000..3d45a76393
--- /dev/null
+++ b/src/assets/images/mcp/playwright.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Playwright</title><path d="M23.996 7.462c-.056.837-.257 2.135-.716 3.85-.995 3.715-4.27 10.874-10.42 9.227-6.15-1.65-5.407-9.487-4.412-13.201.46-1.716.934-2.94 1.305-3.694.42-.853.846-.289 1.815.523.684.573 2.41 1.791 5.011 2.488 2.601.697 4.706.506 5.583.352 1.245-.219 1.897-.494 1.834.455Zm-9.807 3.863s-.127-1.819-1.773-2.286c-1.644-.467-2.613 1.04-2.613 1.04Zm4.058 4.539-7.769-2.172s.446 2.306 3.338 3.153c2.862.836 4.43-.98 4.43-.981Zm2.701-2.51s-.13-1.818-1.773-2.286c-1.644-.469-2.612 1.038-2.612 1.038ZM8.57 18.23c-4.749 1.279-7.261-4.224-8.021-7.08C.197 9.831.044 8.832.003 8.188c-.047-.73.455-.52 1.415-.354.677.118 2.3.261 4.308-.28a11.28 11.28 0 0 0 2.41-.956c-.058.197-.114.4-.17.61-.433 1.618-.827 4.055-.632 6.426-1.976.732-2.267 2.423-2.267 2.423l2.524-.715c.227 1.002.6 1.987 1.15 2.838a5.914 5.914 0 0 1-.171.049Zm-4.188-6.298c1.265-.333 1.363-1.631 1.363-1.631l-3.374.888s.745 1.076 2.01.743Z"/></svg>
\ No newline at end of file
diff --git a/src/assets/images/mcp/posthog.svg b/src/assets/images/mcp/posthog.svg
new file mode 100644
index 0000000000..70d8cb7782
--- /dev/null
+++ b/src/assets/images/mcp/posthog.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>PostHog</title><path d="M9.854 14.5 5 9.647.854 5.5A.5.5 0 0 0 0 5.854V8.44a.5.5 0 0 0 .146.353L5 13.647l.147.146L9.854 18.5l.146.147v-.049c.065.03.134.049.207.049h2.586a.5.5 0 0 0 .353-.854L9.854 14.5zm0-5-4-4a.487.487 0 0 0-.409-.144.515.515 0 0 0-.356.21.493.493 0 0 0-.089.288V8.44a.5.5 0 0 0 .147.353l9 9a.5.5 0 0 0 .853-.354v-2.585a.5.5 0 0 0-.146-.354l-5-5zm1-4a.5.5 0 0 0-.854.354V8.44a.5.5 0 0 0 .147.353l4 4a.5.5 0 0 0 .853-.354V9.854a.5.5 0 0 0-.146-.354l-4-4zm12.647 11.515a3.863 3.863 0 0 1-2.232-1.1l-4.708-4.707a.5.5 0 0 0-.854.354v6.585a.5.5 0 0 0 .5.5H23.5a.5.5 0 0 0 .5-.5v-.6c0-.276-.225-.497-.499-.532zm-5.394.032a.8.8 0 1 1 0-1.6.8.8 0 0 1 0 1.6zM.854 15.5a.5.5 0 0 0-.854.354v2.293a.5.5 0 0 0 .5.5h2.293c.222 0 .39-.135.462-.309a.493.493 0 0 0-.109-.545L.854 15.501zM5 14.647.854 10.5a.5.5 0 0 0-.854.353v2.586a.5.5 0 0 0 .146.353L4.854 18.5l.146.147h2.793a.5.5 0 0 0 .353-.854L5 14.647z"/></svg>
\ No newline at end of file
diff --git a/src/assets/images/mcp/sanity.svg b/src/assets/images/mcp/sanity.svg
new file mode 100644
index 0000000000..6a7ad4b777
--- /dev/null
+++ b/src/assets/images/mcp/sanity.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Sanity</title><path d="m23.327 15.205-.893-1.555-4.321 2.632 4.799-6.11.726-.426-.179-.27.33-.421-1.515-1.261-.693.883-13.992 8.186 5.173-6.221 9.636-5.282-.915-1.769-5.248 2.876 2.584-3.106-1.481-1.305-5.816 6.994-5.777 3.168 4.423-5.847 2.771-1.442-.88-1.789-8.075 4.203L6.186 4.43 4.648 3.198 0 9.349l.072.058.868 1.768 5.153-2.683-4.696 6.207.77.617.458.885 5.425-2.974-5.974 7.185 1.481 1.304.297-.358 14.411-8.459-4.785 6.094.078.065-.007.005.992 1.726 6.364-3.877-2.451 3.954 1.642 1.077L24 15.648z"/></svg>
\ No newline at end of file
diff --git a/src/assets/images/mcp/sentry.svg b/src/assets/images/mcp/sentry.svg
new file mode 100644
index 0000000000..11bb3c8acb
--- /dev/null
+++ b/src/assets/images/mcp/sentry.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Sentry</title><path d="M13.91 2.505c-.873-1.448-2.972-1.448-3.844 0L6.904 7.92a15.478 15.478 0 0 1 8.53 12.811h-2.221A13.301 13.301 0 0 0 5.784 9.814l-2.926 5.06a7.65 7.65 0 0 1 4.435 5.848H2.194a.365.365 0 0 1-.298-.534l1.413-2.402a5.16 5.16 0 0 0-1.614-.913L.296 19.275a2.182 2.182 0 0 0 .812 2.999 2.24 2.24 0 0 0 1.086.288h6.983a9.322 9.322 0 0 0-3.845-8.318l1.11-1.922a11.47 11.47 0 0 1 4.95 10.24h5.915a17.242 17.242 0 0 0-7.885-15.28l2.244-3.845a.37.37 0 0 1 .504-.13c.255.14 9.75 16.708 9.928 16.9a.365.365 0 0 1-.327.543h-2.287c.029.612.029 1.223 0 1.831h2.297a2.206 2.206 0 0 0 1.922-3.31z"/></svg>
\ No newline at end of file
diff --git a/src/assets/images/mcp/slack.svg b/src/assets/images/mcp/slack.svg
new file mode 100644
index 0000000000..004e266300
--- /dev/null
+++ b/src/assets/images/mcp/slack.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Slack</title><path d="M5.042 15.165a2.528 2.528 0 0 1-2.52 2.523A2.528 2.528 0 0 1 0 15.165a2.527 2.527 0 0 1 2.522-2.52h2.52v2.52zM6.313 15.165a2.527 2.527 0 0 1 2.521-2.52 2.527 2.527 0 0 1 2.521 2.52v6.313A2.528 2.528 0 0 1 8.834 24a2.528 2.528 0 0 1-2.521-2.522v-6.313zM8.834 5.042a2.528 2.528 0 0 1-2.521-2.52A2.528 2.528 0 0 1 8.834 0a2.528 2.528 0 0 1 2.521 2.522v2.52H8.834zM8.834 6.313a2.528 2.528 0 0 1 2.521 2.521 2.528 2.528 0 0 1-2.521 2.521H2.522A2.528 2.528 0 0 1 0 8.834a2.528 2.528 0 0 1 2.522-2.521h6.312zM18.956 8.834a2.528 2.528 0 0 1 2.522-2.521A2.528 2.528 0 0 1 24 8.834a2.528 2.528 0 0 1-2.522 2.521h-2.522V8.834zM17.688 8.834a2.528 2.528 0 0 1-2.523 2.521 2.527 2.527 0 0 1-2.52-2.521V2.522A2.527 2.527 0 0 1 15.165 0a2.528 2.528 0 0 1 2.523 2.522v6.312zM15.165 18.956a2.528 2.528 0 0 1 2.523 2.522A2.528 2.528 0 0 1 15.165 24a2.527 2.527 0 0 1-2.52-2.522v-2.522h2.52zM15.165 17.688a2.527 2.527 0 0 1-2.52-2.523 2.526 2.526 0 0 1 2.52-2.52h6.313A2.527 2.527 0 0 1 24 15.165a2.528 2.528 0 0 1-2.522 2.523h-6.313z"/></svg>
\ No newline at end of file
diff --git a/src/assets/images/mcp/stripe.svg b/src/assets/images/mcp/stripe.svg
new file mode 100644
index 0000000000..8ebadf74d3
--- /dev/null
+++ b/src/assets/images/mcp/stripe.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Stripe</title><path d="M13.976 9.15c-2.172-.806-3.356-1.426-3.356-2.409 0-.831.683-1.305 1.901-1.305 2.227 0 4.515.858 6.09 1.631l.89-5.494C18.252.975 15.697 0 12.165 0 9.667 0 7.589.654 6.104 1.872 4.56 3.147 3.757 4.992 3.757 7.218c0 4.039 2.467 5.76 6.476 7.219 2.585.92 3.445 1.574 3.445 2.583 0 .98-.84 1.545-2.354 1.545-1.875 0-4.965-.921-6.99-2.109l-.9 5.555C5.175 22.99 8.385 24 11.714 24c2.641 0 4.843-.624 6.328-1.813 1.664-1.305 2.525-3.236 2.525-5.732 0-4.128-2.524-5.851-6.594-7.305h.003z"/></svg>
\ No newline at end of file
diff --git a/src/assets/images/mcp/supabase.svg b/src/assets/images/mcp/supabase.svg
new file mode 100644
index 0000000000..b773557067
--- /dev/null
+++ b/src/assets/images/mcp/supabase.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Supabase</title><path d="M11.9 1.036c-.015-.986-1.26-1.41-1.874-.637L.764 12.05C-.33 13.427.65 15.455 2.409 15.455h9.579l.113 7.51c.014.985 1.259 1.408 1.873.636l9.262-11.653c1.093-1.375.113-3.403-1.645-3.403h-9.642z"/></svg>
\ No newline at end of file
diff --git a/src/assets/images/mcp/vercel.svg b/src/assets/images/mcp/vercel.svg
new file mode 100644
index 0000000000..821ecfff21
--- /dev/null
+++ b/src/assets/images/mcp/vercel.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Vercel</title><path d="m12 1.608 12 20.784H0Z"/></svg>
\ No newline at end of file
diff --git a/src/assets/images/mcp/webflow.svg b/src/assets/images/mcp/webflow.svg
new file mode 100644
index 0000000000..c5c6fca68e
--- /dev/null
+++ b/src/assets/images/mcp/webflow.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Webflow</title><path d="m24 4.515-7.658 14.97H9.149l3.205-6.204h-.144C9.566 16.713 5.621 18.973 0 19.485v-6.118s3.596-.213 5.71-2.435H0V4.515h6.417v5.278l.144-.001 2.622-5.277h4.854v5.244h.144l2.72-5.244H24Z"/></svg>
\ No newline at end of file
diff --git a/src/assets/images/mcp/wix.svg b/src/assets/images/mcp/wix.svg
new file mode 100644
index 0000000000..0408309d44
--- /dev/null
+++ b/src/assets/images/mcp/wix.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Wix</title><path d="m0 7.354 2.113 9.292h.801a1.54 1.54 0 0 0 1.506-1.218l1.351-6.34a.171.171 0 0 1 .167-.137c.08 0 .15.058.167.137l1.352 6.34a1.54 1.54 0 0 0 1.506 1.218h.805l2.113-9.292h-.565c-.62 0-1.159.43-1.296 1.035l-1.26 5.545-1.106-5.176a1.76 1.76 0 0 0-2.19-1.324c-.639.176-1.113.716-1.251 1.365l-1.094 5.127-1.26-5.537A1.33 1.33 0 0 0 .563 7.354H0zm13.992 0a.951.951 0 0 0-.951.95v8.342h.635a.952.952 0 0 0 .951-.95V7.353h-.635zm1.778 0 3.158 4.66-3.14 4.632h1.325c.368 0 .712-.181.918-.486l1.756-2.59a.12.12 0 0 1 .197 0l1.754 2.59c.206.305.55.486.918.486h1.326l-3.14-4.632L24 7.354h-1.326c-.368 0-.712.181-.918.486l-1.772 2.617a.12.12 0 0 1-.197 0L18.014 7.84a1.108 1.108 0 0 0-.918-.486H15.77z"/></svg>
\ No newline at end of file
diff --git a/src/assets/images/mcp/wordpress.svg b/src/assets/images/mcp/wordpress.svg
new file mode 100644
index 0000000000..08ecac100f
--- /dev/null
+++ b/src/assets/images/mcp/wordpress.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>WordPress</title><path d="M21.469 6.825c.84 1.537 1.318 3.3 1.318 5.175 0 3.979-2.156 7.456-5.363 9.325l3.295-9.527c.615-1.54.82-2.771.82-3.864 0-.405-.026-.78-.07-1.11m-7.981.105c.647-.03 1.232-.105 1.232-.105.582-.075.514-.93-.067-.899 0 0-1.755.135-2.88.135-1.064 0-2.85-.15-2.85-.15-.585-.03-.661.855-.075.885 0 0 .54.061 1.125.09l1.68 4.605-2.37 7.08L5.354 6.9c.649-.03 1.234-.1 1.234-.1.585-.075.516-.93-.065-.896 0 0-1.746.138-2.874.138-.2 0-.438-.008-.69-.015C4.911 3.15 8.235 1.215 12 1.215c2.809 0 5.365 1.072 7.286 2.833-.046-.003-.091-.009-.141-.009-1.06 0-1.812.923-1.812 1.914 0 .89.513 1.643 1.06 2.531.411.72.89 1.643.89 2.977 0 .915-.354 1.994-.821 3.479l-1.075 3.585-3.9-11.61.001.014zM12 22.784c-1.059 0-2.081-.153-3.048-.437l3.237-9.406 3.315 9.087c.024.053.05.101.078.149-1.12.393-2.325.609-3.582.609M1.211 12c0-1.564.336-3.05.935-4.39L7.29 21.709C3.694 19.96 1.212 16.271 1.211 12M12 0C5.385 0 0 5.385 0 12s5.385 12 12 12 12-5.385 12-12S18.615 0 12 0"/></svg>
\ No newline at end of file
diff --git a/src/assets/images/skills/anthropic.svg b/src/assets/images/skills/anthropic.svg
new file mode 100644
index 0000000000..c917480d32
--- /dev/null
+++ b/src/assets/images/skills/anthropic.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Anthropic</title><path d="M17.3041 3.541h-3.6718l6.696 16.918H24Zm-10.6082 0L0 20.459h3.7442l1.3693-3.5527h7.0052l1.3693 3.5528h3.7442L10.5363 3.5409Zm-.3712 10.2232 2.2914-5.9456 2.2914 5.9456Z"/></svg>
\ No newline at end of file
diff --git a/src/assets/images/skills/apple.svg b/src/assets/images/skills/apple.svg
new file mode 100644
index 0000000000..de4b0d17b3
--- /dev/null
+++ b/src/assets/images/skills/apple.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Apple</title><path d="M12.152 6.896c-.948 0-2.415-1.078-3.96-1.04-2.04.027-3.91 1.183-4.961 3.014-2.117 3.675-.546 9.103 1.519 12.09 1.013 1.454 2.208 3.09 3.792 3.039 1.52-.065 2.09-.987 3.935-.987 1.831 0 2.35.987 3.96.948 1.637-.026 2.676-1.48 3.676-2.948 1.156-1.688 1.636-3.325 1.662-3.415-.039-.013-3.182-1.221-3.22-4.857-.026-3.04 2.48-4.494 2.597-4.559-1.429-2.09-3.623-2.324-4.39-2.376-2-.156-3.675 1.09-4.61 1.09zM15.53 3.83c.843-1.012 1.4-2.427 1.245-3.83-1.207.052-2.662.805-3.532 1.818-.78.896-1.454 2.338-1.273 3.714 1.338.104 2.715-.688 3.559-1.701"/></svg>
\ No newline at end of file
diff --git a/src/assets/images/skills/bun.svg b/src/assets/images/skills/bun.svg
new file mode 100644
index 0000000000..c9090d5fbe
--- /dev/null
+++ b/src/assets/images/skills/bun.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Bun</title><path d="M12 22.596c6.628 0 12-4.338 12-9.688 0-3.318-2.057-6.248-5.219-7.986-1.286-.715-2.297-1.357-3.139-1.89C14.058 2.025 13.08 1.404 12 1.404c-1.097 0-2.334.785-3.966 1.821a49.92 49.92 0 0 1-2.816 1.697C2.057 6.66 0 9.59 0 12.908c0 5.35 5.372 9.687 12 9.687v.001ZM10.599 4.715c.334-.759.503-1.58.498-2.409 0-.145.202-.187.23-.029.658 2.783-.902 4.162-2.057 4.624-.124.048-.199-.121-.103-.209a5.763 5.763 0 0 0 1.432-1.977Zm2.058-.102a5.82 5.82 0 0 0-.782-2.306v-.016c-.069-.123.086-.263.185-.172 1.962 2.111 1.307 4.067.556 5.051-.082.103-.23-.003-.189-.126a5.85 5.85 0 0 0 .23-2.431Zm1.776-.561a5.727 5.727 0 0 0-1.612-1.806v-.014c-.112-.085-.024-.274.114-.218 2.595 1.087 2.774 3.18 2.459 4.407a.116.116 0 0 1-.049.071.11.11 0 0 1-.153-.026.122.122 0 0 1-.022-.083 5.891 5.891 0 0 0-.737-2.331Zm-5.087.561c-.617.546-1.282.76-2.063 1-.117 0-.195-.078-.156-.181 1.752-.909 2.376-1.649 2.999-2.778 0 0 .155-.118.188.085 0 .304-.349 1.329-.968 1.874Zm4.945 11.237a2.957 2.957 0 0 1-.937 1.553c-.346.346-.8.565-1.286.62a2.178 2.178 0 0 1-1.327-.62 2.955 2.955 0 0 1-.925-1.553.244.244 0 0 1 .064-.198.234.234 0 0 1 .193-.069h3.965a.226.226 0 0 1 .19.07c.05.053.073.125.063.197Zm-5.458-2.176a1.862 1.862 0 0 1-2.384-.245 1.98 1.98 0 0 1-.233-2.447c.207-.319.503-.566.848-.713a1.84 1.84 0 0 1 1.092-.11c.366.075.703.261.967.531a1.98 1.98 0 0 1 .408 2.114 1.931 1.931 0 0 1-.698.869v.001Zm8.495.005a1.86 1.86 0 0 1-2.381-.253 1.964 1.964 0 0 1-.547-1.366c0-.384.11-.76.32-1.079.207-.319.503-.567.849-.713a1.844 1.844 0 0 1 1.093-.108c.367.076.704.262.968.534a1.98 1.98 0 0 1 .4 2.117 1.932 1.932 0 0 1-.702.868Z"/></svg>
\ No newline at end of file
diff --git a/src/assets/images/skills/github.svg b/src/assets/images/skills/github.svg
new file mode 100644
index 0000000000..538ec5bf2a
--- /dev/null
+++ b/src/assets/images/skills/github.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>GitHub</title><path d="M12 .297c-6.63 0-12 5.373-12 12 0 5.303 3.438 9.8 8.205 11.385.6.113.82-.258.82-.577 0-.285-.01-1.04-.015-2.04-3.338.724-4.042-1.61-4.042-1.61C4.422 18.07 3.633 17.7 3.633 17.7c-1.087-.744.084-.729.084-.729 1.205.084 1.838 1.236 1.838 1.236 1.07 1.835 2.809 1.305 3.495.998.108-.776.417-1.305.76-1.605-2.665-.3-5.466-1.332-5.466-5.93 0-1.31.465-2.38 1.235-3.22-.135-.303-.54-1.523.105-3.176 0 0 1.005-.322 3.3 1.23.96-.267 1.98-.399 3-.405 1.02.006 2.04.138 3 .405 2.28-1.552 3.285-1.23 3.285-1.23.645 1.653.24 2.873.12 3.176.765.84 1.23 1.91 1.23 3.22 0 4.61-2.805 5.625-5.475 5.92.42.36.81 1.096.81 2.22 0 1.606-.015 2.896-.015 3.286 0 .315.21.69.825.57C20.565 22.092 24 17.592 24 12.297c0-6.627-5.373-12-12-12"/></svg>
\ No newline at end of file
diff --git a/src/assets/images/skills/jupyter.svg b/src/assets/images/skills/jupyter.svg
new file mode 100644
index 0000000000..9353854efa
--- /dev/null
+++ b/src/assets/images/skills/jupyter.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Jupyter</title><path d="M7.157 22.201A1.784 1.799 0 0 1 5.374 24a1.784 1.799 0 0 1-1.784-1.799 1.784 1.799 0 0 1 1.784-1.799 1.784 1.799 0 0 1 1.783 1.799zM20.582 1.427a1.415 1.427 0 0 1-1.415 1.428 1.415 1.427 0 0 1-1.416-1.428A1.415 1.427 0 0 1 19.167 0a1.415 1.427 0 0 1 1.415 1.427zM4.992 3.336A1.047 1.056 0 0 1 3.946 4.39a1.047 1.056 0 0 1-1.047-1.055A1.047 1.056 0 0 1 3.946 2.28a1.047 1.056 0 0 1 1.046 1.056zm7.336 1.517c3.769 0 7.06 1.38 8.768 3.424a9.363 9.363 0 0 0-3.393-4.547 9.238 9.238 0 0 0-5.377-1.728A9.238 9.238 0 0 0 6.95 3.73a9.363 9.363 0 0 0-3.394 4.547c1.713-2.04 5.004-3.424 8.772-3.424zm.001 13.295c-3.768 0-7.06-1.381-8.768-3.425a9.363 9.363 0 0 0 3.394 4.547A9.238 9.238 0 0 0 12.33 21a9.238 9.238 0 0 0 5.377-1.729 9.363 9.363 0 0 0 3.393-4.547c-1.712 2.044-5.003 3.425-8.772 3.425Z"/></svg>
\ No newline at end of file
diff --git a/src/assets/images/skills/mysql.svg b/src/assets/images/skills/mysql.svg
new file mode 100644
index 0000000000..195caada06
--- /dev/null
+++ b/src/assets/images/skills/mysql.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>MySQL</title><path d="M16.405 5.501c-.115 0-.193.014-.274.033v.013h.014c.054.104.146.18.214.273.054.107.1.214.154.32l.014-.015c.094-.066.14-.172.14-.333-.04-.047-.046-.094-.08-.14-.04-.067-.126-.1-.18-.153zM5.77 18.695h-.927a50.854 50.854 0 00-.27-4.41h-.008l-1.41 4.41H2.45l-1.4-4.41h-.01a72.892 72.892 0 00-.195 4.41H0c.055-1.966.192-3.81.41-5.53h1.15l1.335 4.064h.008l1.347-4.064h1.095c.242 2.015.384 3.86.428 5.53zm4.017-4.08c-.378 2.045-.876 3.533-1.492 4.46-.482.716-1.01 1.073-1.583 1.073-.153 0-.34-.046-.566-.138v-.494c.11.017.24.026.386.026.268 0 .483-.075.647-.222.197-.18.295-.382.295-.605 0-.155-.077-.47-.23-.944L6.23 14.615h.91l.727 2.36c.164.536.233.91.205 1.123.4-1.064.678-2.227.835-3.483zm12.325 4.08h-2.63v-5.53h.885v4.85h1.745zm-3.32.135l-1.016-.5c.09-.076.177-.158.255-.25.433-.506.648-1.258.648-2.253 0-1.83-.718-2.746-2.155-2.746-.704 0-1.254.232-1.65.697-.43.508-.646 1.256-.646 2.245 0 .972.19 1.686.574 2.14.35.41.877.615 1.583.615.264 0 .506-.033.725-.098l1.325.772.36-.622zM15.5 17.588c-.225-.36-.337-.94-.337-1.736 0-1.393.424-2.09 1.27-2.09.443 0 .77.167.977.5.224.362.336.936.336 1.723 0 1.404-.424 2.108-1.27 2.108-.445 0-.77-.167-.978-.5zm-1.658-.425c0 .47-.172.856-.516 1.156-.344.3-.803.45-1.384.45-.543 0-1.064-.172-1.573-.515l.237-.476c.438.22.833.328 1.19.328.332 0 .593-.073.783-.22a.754.754 0 00.3-.615c0-.33-.23-.61-.648-.845-.388-.213-1.163-.657-1.163-.657-.422-.307-.632-.636-.632-1.177 0-.45.157-.81.47-1.085.315-.278.72-.415 1.22-.415.512 0 .98.136 1.4.41l-.213.476a2.726 2.726 0 00-1.064-.23c-.283 0-.502.068-.654.206a.685.685 0 00-.248.524c0 .328.234.61.666.85.393.215 1.187.67 1.187.67.433.305.648.63.648 1.168zm9.382-5.852c-.535-.014-.95.04-1.297.188-.1.04-.26.04-.274.167.055.053.063.14.11.214.08.134.218.313.346.407.14.11.28.216.427.31.26.16.555.255.81.416.145.094.293.213.44.313.073.05.12.14.214.172v-.02c-.046-.06-.06-.147-.105-.214-.067-.067-.134-.127-.2-.193a3.223 3.223 0 00-.695-.675c-.214-.146-.682-.35-.77-.595l-.013-.014c.146-.013.32-.066.46-.106.227-.06.435-.047.67-.106.106-.027.213-.06.32-.094v-.06c-.12-.12-.21-.283-.334-.395a8.867 8.867 0 00-1.104-.823c-.21-.134-.476-.22-.697-.334-.08-.04-.214-.06-.26-.127-.12-.146-.19-.34-.275-.514a17.69 17.69 0 01-.547-1.163c-.12-.262-.193-.523-.34-.763-.69-1.137-1.437-1.826-2.586-2.5-.247-.14-.543-.2-.856-.274-.167-.008-.334-.02-.5-.027-.11-.047-.216-.174-.31-.235-.38-.24-1.364-.76-1.644-.072-.18.434.267.862.422 1.082.115.153.26.328.34.5.047.116.06.235.107.356.106.294.207.622.347.897.073.14.153.287.247.413.054.073.146.107.167.227-.094.136-.1.334-.154.5-.24.757-.146 1.693.194 2.25.107.166.362.534.703.393.3-.12.234-.5.32-.835.02-.08.007-.133.048-.187v.015c.094.188.188.367.274.555.206.328.566.668.867.895.16.12.287.328.487.402v-.02h-.015c-.043-.058-.1-.086-.154-.133a3.445 3.445 0 01-.35-.4 8.76 8.76 0 01-.747-1.218c-.11-.21-.202-.436-.29-.643-.04-.08-.04-.2-.107-.24-.1.146-.247.273-.32.453-.127.288-.14.642-.188 1.01-.027.007-.014 0-.027.014-.214-.052-.287-.274-.367-.46-.2-.475-.233-1.238-.06-1.785.047-.14.247-.582.167-.716-.042-.127-.174-.2-.247-.303a2.478 2.478 0 01-.24-.427c-.16-.374-.24-.788-.414-1.162-.08-.173-.22-.354-.334-.513-.127-.18-.267-.307-.368-.52-.033-.073-.08-.194-.027-.274.014-.054.042-.075.094-.09.088-.072.335.022.422.062.247.1.455.194.662.334.094.066.195.193.315.226h.14c.214.047.455.014.655.073.355.114.675.28.962.46a5.953 5.953 0 012.085 2.286c.08.154.115.295.188.455.14.33.313.663.455.982.14.315.275.636.476.897.1.14.502.213.682.286.133.06.34.115.46.188.23.14.454.3.67.454.11.076.443.243.463.378z"/></svg>
\ No newline at end of file
diff --git a/src/assets/images/skills/openai.svg b/src/assets/images/skills/openai.svg
new file mode 100644
index 0000000000..7d9d324ed0
--- /dev/null
+++ b/src/assets/images/skills/openai.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>OpenAI</title><path d="M22.2819 9.8211a5.9847 5.9847 0 0 0-.5157-4.9108 6.0462 6.0462 0 0 0-6.5098-2.9A6.0651 6.0651 0 0 0 4.9807 4.1818a5.9847 5.9847 0 0 0-3.9977 2.9 6.0462 6.0462 0 0 0 .7427 7.0966 5.98 5.98 0 0 0 .511 4.9107 6.051 6.051 0 0 0 6.5146 2.9001A5.9847 5.9847 0 0 0 13.2599 24a6.0557 6.0557 0 0 0 5.7718-4.2058 5.9894 5.9894 0 0 0 3.9977-2.9001 6.0557 6.0557 0 0 0-.7475-7.0729zm-9.022 12.6081a4.4755 4.4755 0 0 1-2.8764-1.0408l.1419-.0804 4.7783-2.7582a.7948.7948 0 0 0 .3927-.6813v-6.7369l2.02 1.1686a.071.071 0 0 1 .038.052v5.5826a4.504 4.504 0 0 1-4.4945 4.4944zm-9.6607-4.1254a4.4708 4.4708 0 0 1-.5346-3.0137l.142.0852 4.783 2.7582a.7712.7712 0 0 0 .7806 0l5.8428-3.3685v2.3324a.0804.0804 0 0 1-.0332.0615L9.74 19.9502a4.4992 4.4992 0 0 1-6.1408-1.6464zM2.3408 7.8956a4.485 4.485 0 0 1 2.3655-1.9728V11.6a.7664.7664 0 0 0 .3879.6765l5.8144 3.3543-2.0201 1.1685a.0757.0757 0 0 1-.071 0l-4.8303-2.7865A4.504 4.504 0 0 1 2.3408 7.872zm16.5963 3.8558L13.1038 8.364 15.1192 7.2a.0757.0757 0 0 1 .071 0l4.8303 2.7913a4.4944 4.4944 0 0 1-.6765 8.1042v-5.6772a.79.79 0 0 0-.407-.667zm2.0107-3.0231l-.142-.0852-4.7735-2.7818a.7759.7759 0 0 0-.7854 0L9.409 9.2297V6.8974a.0662.0662 0 0 1 .0284-.0615l4.8303-2.7866a4.4992 4.4992 0 0 1 6.6802 4.66zM8.3065 12.863l-2.02-1.1638a.0804.0804 0 0 1-.038-.0567V6.0742a4.4992 4.4992 0 0 1 7.3757-3.4537l-.142.0805L8.704 5.459a.7948.7948 0 0 0-.3927.6813zm1.0976-2.3654l2.602-1.4998 2.6069 1.4998v2.9994l-2.5974 1.4997-2.6067-1.4997Z"/></svg>
diff --git a/src/assets/images/skills/postgresql.svg b/src/assets/images/skills/postgresql.svg
new file mode 100644
index 0000000000..dcf75b726d
--- /dev/null
+++ b/src/assets/images/skills/postgresql.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>PostgreSQL</title><path d="M23.5594 14.7228a.5269.5269 0 0 0-.0563-.1191c-.139-.2632-.4768-.3418-1.0074-.2321-1.6533.3411-2.2935.1312-2.5256-.0191 1.342-2.0482 2.445-4.522 3.0411-6.8297.2714-1.0507.7982-3.5237.1222-4.7316a1.5641 1.5641 0 0 0-.1509-.235C21.6931.9086 19.8007.0248 17.5099.0005c-1.4947-.0158-2.7705.3461-3.1161.4794a9.449 9.449 0 0 0-.5159-.0816 8.044 8.044 0 0 0-1.3114-.1278c-1.1822-.0184-2.2038.2642-3.0498.8406-.8573-.3211-4.7888-1.645-7.2219.0788C.9359 2.1526.3086 3.8733.4302 6.3043c.0409.818.5069 3.334 1.2423 5.7436.4598 1.5065.9387 2.7019 1.4334 3.582.553.9942 1.1259 1.5933 1.7143 1.7895.4474.1491 1.1327.1441 1.8581-.7279.8012-.9635 1.5903-1.8258 1.9446-2.2069.4351.2355.9064.3625 1.39.3772a.0569.0569 0 0 0 .0004.0041 11.0312 11.0312 0 0 0-.2472.3054c-.3389.4302-.4094.5197-1.5002.7443-.3102.064-1.1344.2339-1.1464.8115-.0025.1224.0329.2309.0919.3268.2269.4231.9216.6097 1.015.6331 1.3345.3335 2.5044.092 3.3714-.6787-.017 2.231.0775 4.4174.3454 5.0874.2212.5529.7618 1.9045 2.4692 1.9043.2505 0 .5263-.0291.8296-.0941 1.7819-.3821 2.5557-1.1696 2.855-2.9059.1503-.8707.4016-2.8753.5388-4.1012.0169-.0703.0357-.1207.057-.1362.0007-.0005.0697-.0471.4272.0307a.3673.3673 0 0 0 .0443.0068l.2539.0223.0149.001c.8468.0384 1.9114-.1426 2.5312-.4308.6438-.2988 1.8057-1.0323 1.5951-1.6698zM2.371 11.8765c-.7435-2.4358-1.1779-4.8851-1.2123-5.5719-.1086-2.1714.4171-3.6829 1.5623-4.4927 1.8367-1.2986 4.8398-.5408 6.108-.13-.0032.0032-.0066.0061-.0098.0094-2.0238 2.044-1.9758 5.536-1.9708 5.7495-.0002.0823.0066.1989.0162.3593.0348.5873.0996 1.6804-.0735 2.9184-.1609 1.1504.1937 2.2764.9728 3.0892.0806.0841.1648.1631.2518.2374-.3468.3714-1.1004 1.1926-1.9025 2.1576-.5677.6825-.9597.5517-1.0886.5087-.3919-.1307-.813-.5871-1.2381-1.3223-.4796-.839-.9635-2.0317-1.4155-3.5126zm6.0072 5.0871c-.1711-.0428-.3271-.1132-.4322-.1772.0889-.0394.2374-.0902.4833-.1409 1.2833-.2641 1.4815-.4506 1.9143-1.0002.0992-.126.2116-.2687.3673-.4426a.3549.3549 0 0 0 .0737-.1298c.1708-.1513.2724-.1099.4369-.0417.156.0646.3078.26.3695.4752.0291.1016.0619.2945-.0452.4444-.9043 1.2658-2.2216 1.2494-3.1676 1.0128zm2.094-3.988-.0525.141c-.133.3566-.2567.6881-.3334 1.003-.6674-.0021-1.3168-.2872-1.8105-.8024-.6279-.6551-.9131-1.5664-.7825-2.5004.1828-1.3079.1153-2.4468.079-3.0586-.005-.0857-.0095-.1607-.0122-.2199.2957-.2621 1.6659-.9962 2.6429-.7724.4459.1022.7176.4057.8305.928.5846 2.7038.0774 3.8307-.3302 4.7363-.084.1866-.1633.3629-.2311.5454zm7.3637 4.5725c-.0169.1768-.0358.376-.0618.5959l-.146.4383a.3547.3547 0 0 0-.0182.1077c-.0059.4747-.054.6489-.115.8693-.0634.2292-.1353.4891-.1794 1.0575-.11 1.4143-.8782 2.2267-2.4172 2.5565-1.5155.3251-1.7843-.4968-2.0212-1.2217a6.5824 6.5824 0 0 0-.0769-.2266c-.2154-.5858-.1911-1.4119-.1574-2.5551.0165-.5612-.0249-1.9013-.3302-2.6462.0044-.2932.0106-.5909.019-.8918a.3529.3529 0 0 0-.0153-.1126 1.4927 1.4927 0 0 0-.0439-.208c-.1226-.4283-.4213-.7866-.7797-.9351-.1424-.059-.4038-.1672-.7178-.0869.067-.276.1831-.5875.309-.9249l.0529-.142c.0595-.16.134-.3257.213-.5012.4265-.9476 1.0106-2.2453.3766-5.1772-.2374-1.0981-1.0304-1.6343-2.2324-1.5098-.7207.0746-1.3799.3654-1.7088.5321a5.6716 5.6716 0 0 0-.1958.1041c.0918-1.1064.4386-3.1741 1.7357-4.4823a4.0306 4.0306 0 0 1 .3033-.276.3532.3532 0 0 0 .1447-.0644c.7524-.5706 1.6945-.8506 2.802-.8325.4091.0067.8017.0339 1.1742.081 1.939.3544 3.2439 1.4468 4.0359 2.3827.8143.9623 1.2552 1.9315 1.4312 2.4543-1.3232-.1346-2.2234.1268-2.6797.779-.9926 1.4189.543 4.1729 1.2811 5.4964.1353.2426.2522.4522.2889.5413.2403.5825.5515.9713.7787 1.2552.0696.087.1372.1714.1885.245-.4008.1155-1.1208.3825-1.0552 1.717-.0123.1563-.0423.4469-.0834.8148-.0461.2077-.0702.4603-.0994.7662zm.8905-1.6211c-.0405-.8316.2691-.9185.5967-1.0105a2.8566 2.8566 0 0 0 .135-.0406 1.202 1.202 0 0 0 .1342.103c.5703.3765 1.5823.4213 3.0068.1344-.2016.1769-.5189.3994-.9533.6011-.4098.1903-1.0957.333-1.7473.3636-.7197.0336-1.0859-.0807-1.1721-.151zm.5695-9.2712c-.0059.3508-.0542.6692-.1054 1.0017-.055.3576-.112.7274-.1264 1.1762-.0142.4368.0404.8909.0932 1.3301.1066.887.216 1.8003-.2075 2.7014a3.5272 3.5272 0 0 1-.1876-.3856c-.0527-.1276-.1669-.3326-.3251-.6162-.6156-1.1041-2.0574-3.6896-1.3193-4.7446.3795-.5427 1.3408-.5661 2.1781-.463zm.2284 7.0137a12.3762 12.3762 0 0 0-.0853-.1074l-.0355-.0444c.7262-1.1995.5842-2.3862.4578-3.4385-.0519-.4318-.1009-.8396-.0885-1.2226.0129-.4061.0666-.7543.1185-1.0911.0639-.415.1288-.8443.1109-1.3505.0134-.0531.0188-.1158.0118-.1902-.0457-.4855-.5999-1.938-1.7294-3.253-.6076-.7073-1.4896-1.4972-2.6889-2.0395.5251-.1066 1.2328-.2035 2.0244-.1859 2.0515.0456 3.6746.8135 4.8242 2.2824a.908.908 0 0 1 .0667.1002c.7231 1.3556-.2762 6.2751-2.9867 10.5405zm-8.8166-6.1162c-.025.1794-.3089.4225-.6211.4225a.5821.5821 0 0 1-.0809-.0056c-.1873-.026-.3765-.144-.5059-.3156-.0458-.0605-.1203-.178-.1055-.2844.0055-.0401.0261-.0985.0925-.1488.1182-.0894.3518-.1226.6096-.0867.3163.0441.6426.1938.6113.4186zm7.9305-.4114c.0111.0792-.049.201-.1531.3102-.0683.0717-.212.1961-.4079.2232a.5456.5456 0 0 1-.075.0052c-.2935 0-.5414-.2344-.5607-.3717-.024-.1765.2641-.3106.5611-.352.297-.0414.6111.0088.6356.1851z"/></svg>
\ No newline at end of file
diff --git a/src/assets/images/skills/react.svg b/src/assets/images/skills/react.svg
new file mode 100644
index 0000000000..6006995638
--- /dev/null
+++ b/src/assets/images/skills/react.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>React</title><path d="M14.23 12.004a2.236 2.236 0 0 1-2.235 2.236 2.236 2.236 0 0 1-2.236-2.236 2.236 2.236 0 0 1 2.235-2.236 2.236 2.236 0 0 1 2.236 2.236zm2.648-10.69c-1.346 0-3.107.96-4.888 2.622-1.78-1.653-3.542-2.602-4.887-2.602-.41 0-.783.093-1.106.278-1.375.793-1.683 3.264-.973 6.365C1.98 8.917 0 10.42 0 12.004c0 1.59 1.99 3.097 5.043 4.03-.704 3.113-.39 5.588.988 6.38.32.187.69.275 1.102.275 1.345 0 3.107-.96 4.888-2.624 1.78 1.654 3.542 2.603 4.887 2.603.41 0 .783-.09 1.106-.275 1.374-.792 1.683-3.263.973-6.365C22.02 15.096 24 13.59 24 12.004c0-1.59-1.99-3.097-5.043-4.032.704-3.11.39-5.587-.988-6.38-.318-.184-.688-.277-1.092-.278zm-.005 1.09v.006c.225 0 .406.044.558.127.666.382.955 1.835.73 3.704-.054.46-.142.945-.25 1.44-.96-.236-2.006-.417-3.107-.534-.66-.905-1.345-1.727-2.035-2.447 1.592-1.48 3.087-2.292 4.105-2.295zm-9.77.02c1.012 0 2.514.808 4.11 2.28-.686.72-1.37 1.537-2.02 2.442-1.107.117-2.154.298-3.113.538-.112-.49-.195-.964-.254-1.42-.23-1.868.054-3.32.714-3.707.19-.09.4-.127.563-.132zm4.882 3.05c.455.468.91.992 1.36 1.564-.44-.02-.89-.034-1.345-.034-.46 0-.915.01-1.36.034.44-.572.895-1.096 1.345-1.565zM12 8.1c.74 0 1.477.034 2.202.093.406.582.802 1.203 1.183 1.86.372.64.71 1.29 1.018 1.946-.308.655-.646 1.31-1.013 1.95-.38.66-.773 1.288-1.18 1.87-.728.063-1.466.098-2.21.098-.74 0-1.477-.035-2.202-.093-.406-.582-.802-1.204-1.183-1.86-.372-.64-.71-1.29-1.018-1.946.303-.657.646-1.313 1.013-1.954.38-.66.773-1.286 1.18-1.868.728-.064 1.466-.098 2.21-.098zm-3.635.254c-.24.377-.48.763-.704 1.16-.225.39-.435.782-.635 1.174-.265-.656-.49-1.31-.676-1.947.64-.15 1.315-.283 2.015-.386zm7.26 0c.695.103 1.365.23 2.006.387-.18.632-.405 1.282-.66 1.933-.2-.39-.41-.783-.64-1.174-.225-.392-.465-.774-.705-1.146zm3.063.675c.484.15.944.317 1.375.498 1.732.74 2.852 1.708 2.852 2.476-.005.768-1.125 1.74-2.857 2.475-.42.18-.88.342-1.355.493-.28-.958-.646-1.956-1.1-2.98.45-1.017.81-2.01 1.085-2.964zm-13.395.004c.278.96.645 1.957 1.1 2.98-.45 1.017-.812 2.01-1.086 2.964-.484-.15-.944-.318-1.37-.5-1.732-.737-2.852-1.706-2.852-2.474 0-.768 1.12-1.742 2.852-2.476.42-.18.88-.342 1.356-.494zm11.678 4.28c.265.657.49 1.312.676 1.948-.64.157-1.316.29-2.016.39.24-.375.48-.762.705-1.158.225-.39.435-.788.636-1.18zm-9.945.02c.2.392.41.783.64 1.175.23.39.465.772.705 1.143-.695-.102-1.365-.23-2.006-.386.18-.63.406-1.282.66-1.933zM17.92 16.32c.112.493.2.968.254 1.423.23 1.868-.054 3.32-.714 3.708-.147.09-.338.128-.563.128-1.012 0-2.514-.807-4.11-2.28.686-.72 1.37-1.536 2.02-2.44 1.107-.118 2.154-.3 3.113-.54zm-11.83.01c.96.234 2.006.415 3.107.532.66.905 1.345 1.727 2.035 2.446-1.595 1.483-3.092 2.295-4.11 2.295-.22-.005-.406-.05-.553-.132-.666-.38-.955-1.834-.73-3.703.054-.46.142-.944.25-1.438zm4.56.64c.44.02.89.034 1.345.034.46 0 .915-.01 1.36-.034-.44.572-.895 1.095-1.345 1.565-.455-.47-.91-.993-1.36-1.565z"/></svg>
\ No newline at end of file
diff --git a/src/assets/images/skills/render.svg b/src/assets/images/skills/render.svg
new file mode 100644
index 0000000000..34d7d34860
--- /dev/null
+++ b/src/assets/images/skills/render.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Render</title><path d="M18.263.007c-3.121-.147-5.744 2.109-6.192 5.082-.018.138-.045.272-.067.405-.696 3.703-3.936 6.507-7.827 6.507-1.388 0-2.691-.356-3.825-.979a.2024.2024 0 0 0-.302.178V24H12v-8.999c0-1.656 1.338-3 2.987-3h2.988c3.382 0 6.103-2.817 5.97-6.244-.12-3.084-2.61-5.603-5.682-5.75"/></svg>
\ No newline at end of file
diff --git a/src/assets/images/skills/resend.svg b/src/assets/images/skills/resend.svg
new file mode 100644
index 0000000000..1a625a9d15
--- /dev/null
+++ b/src/assets/images/skills/resend.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Resend</title><path d="M14.679 0c4.648 0 7.413 2.765 7.413 6.434s-2.765 6.434-7.413 6.434H12.33L24 24h-8.245l-8.88-8.44c-.636-.588-.93-1.273-.93-1.86 0-.831.587-1.565 1.713-1.883l4.574-1.224c1.737-.465 2.936-1.81 2.936-3.572 0-2.153-1.761-3.4-3.939-3.4H0V0z"/></svg>
\ No newline at end of file
diff --git a/src/assets/images/skills/shadcn.svg b/src/assets/images/skills/shadcn.svg
new file mode 100644
index 0000000000..5a23e483ed
--- /dev/null
+++ b/src/assets/images/skills/shadcn.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>shadcn/ui</title><path d="M22.219 11.784 11.784 22.219c-.407.407-.407 1.068 0 1.476.407.407 1.068.407 1.476 0L23.695 13.26c.407-.408.407-1.069 0-1.476-.408-.407-1.069-.407-1.476 0ZM20.132.305.305 20.132c-.407.407-.407 1.068 0 1.476.408.407 1.069.407 1.476 0L21.608 1.781c.407-.407.407-1.068 0-1.476-.408-.407-1.069-.407-1.476 0Z"/></svg>
\ No newline at end of file
diff --git a/src/assets/images/skills/swift.svg b/src/assets/images/skills/swift.svg
new file mode 100644
index 0000000000..ffaf098efc
--- /dev/null
+++ b/src/assets/images/skills/swift.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Swift</title><path d="M7.508 0c-.287 0-.573 0-.86.002-.241.002-.483.003-.724.01-.132.003-.263.009-.395.015A9.154 9.154 0 0 0 4.348.15 5.492 5.492 0 0 0 2.85.645 5.04 5.04 0 0 0 .645 2.848c-.245.48-.4.972-.495 1.5-.093.52-.122 1.05-.136 1.576a35.2 35.2 0 0 0-.012.724C0 6.935 0 7.221 0 7.508v8.984c0 .287 0 .575.002.862.002.24.005.481.012.722.014.526.043 1.057.136 1.576.095.528.25 1.02.495 1.5a5.03 5.03 0 0 0 2.205 2.203c.48.244.97.4 1.498.495.52.093 1.05.124 1.576.138.241.007.483.009.724.01.287.002.573.002.86.002h8.984c.287 0 .573 0 .86-.002.241-.001.483-.003.724-.01a10.523 10.523 0 0 0 1.578-.138 5.322 5.322 0 0 0 1.498-.495 5.035 5.035 0 0 0 2.203-2.203c.245-.48.4-.972.495-1.5.093-.52.124-1.05.138-1.576.007-.241.009-.481.01-.722.002-.287.002-.575.002-.862V7.508c0-.287 0-.573-.002-.86a33.662 33.662 0 0 0-.01-.724 10.5 10.5 0 0 0-.138-1.576 5.328 5.328 0 0 0-.495-1.5A5.039 5.039 0 0 0 21.152.645 5.32 5.32 0 0 0 19.654.15a10.493 10.493 0 0 0-1.578-.138 34.98 34.98 0 0 0-.722-.01C17.067 0 16.779 0 16.492 0H7.508zm6.035 3.41c4.114 2.47 6.545 7.162 5.549 11.131-.024.093-.05.181-.076.272l.002.001c2.062 2.538 1.5 5.258 1.236 4.745-1.072-2.086-3.066-1.568-4.088-1.043a6.803 6.803 0 0 1-.281.158l-.02.012-.002.002c-2.115 1.123-4.957 1.205-7.812-.022a12.568 12.568 0 0 1-5.64-4.838c.649.48 1.35.902 2.097 1.252 3.019 1.414 6.051 1.311 8.197-.002C9.651 12.73 7.101 9.67 5.146 7.191a10.628 10.628 0 0 1-1.005-1.384c2.34 2.142 6.038 4.83 7.365 5.576C8.69 8.408 6.208 4.743 6.324 4.86c4.436 4.47 8.528 6.996 8.528 6.996.154.085.27.154.36.213.085-.215.16-.437.224-.668.708-2.588-.09-5.548-1.893-7.992z"/></svg>
\ No newline at end of file
diff --git a/src/assets/images/skills/xcode.svg b/src/assets/images/skills/xcode.svg
new file mode 100644
index 0000000000..c10eb77cdd
--- /dev/null
+++ b/src/assets/images/skills/xcode.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Xcode</title><path d="M19.06 5.3327c.4517-.1936.7744-.2581 1.097-.1936.5163.1291.7744.5163.968.7098.1936.3872.9034.7744 1.2261.8389.2581.0645.7098-.6453 1.0325-1.2906.3227-.5808.5163-1.3552.4517-1.5488-.0645-.1936-.968-.5808-1.1616-.5808-.1291 0-.3872.1291-.8389.0645-.4517-.0645-.9034-.5808-1.1616-.968-.4517-.6453-1.097-1.0325-1.6778-1.3552-.6453-.3227-1.3552-.5163-2.065-.6453-1.0325-.2581-2.065-.4517-3.0975-.3227-.5808.0645-1.2906.1291-1.8069.3227-.0645 0-.1936.1936-.0645.1936s.5808.0645.5808.0645-.5807.1292-.5807.2583c0 .1291.0645.1291.1291.1291.0645 0 1.4842-.0645 2.065 0 .6453.1291 1.3552.4517 1.8069 1.2261.7744 1.4197.4517 2.7749.2581 3.2266-.968 2.1295-8.6472 15.2294-9.0344 16.1328-.3873.9034-.5163 1.4842.5807 2.065s1.6778.3227 2.0005-.0645c.3872-.5163 7.0339-17.1654 9.2925-18.2624zm-3.6138 8.7117h1.5488c1.0325 0 1.2261.5163 1.2261.7098.0645.5163-.1936 1.1616-1.2261 1.1616h-.968l.7744 1.2906c.4517.7744.2581 1.1616 0 1.4197-.3872.3872-1.2261.3872-1.6778-.4517l-.9034-1.5488c-.6453 1.4197-1.2906 2.9684-2.065 4.7753h4.0009c1.9359 0 3.5492-1.6133 3.5492-3.5492V6.5588c-.0645-.1291-.1936-.0645-.2581 0-.3872.4517-1.4842 2.0004-4.001 7.4856zm-9.8087 8.0019h-.3227c-2.3231 0-4.1945-1.8714-4.1945-4.1945V7.0105c0-2.3231 1.8714-4.1945 4.1945-4.1945h9.3571c-.1936-.1936-.968-.5163-1.7423-.4517-.3227 0-.968.1291-1.3552-.1291-.3872-.3227-.3227-.5163-.9034-.5163H4.9277c-2.6458 0-4.7753 2.1295-4.7753 4.7753v11.7447c0 2.6458 2.1295 4.7753 4.4527 4.7108.6452 0 .8388-.5162 1.0324-.9034zM20.4152 6.9459v10.9058c0 2.3231-1.8714 4.1945-4.1945 4.1945H11.897s-.3872 1.0325.8389 1.0325h3.8719c2.6458 0 4.7753-2.1295 4.7753-4.7753V8.8173c.0646-.9034-.7098-1.4842-.9679-1.8714zm-18.5851.0646v10.8413c0 1.9359 1.6133 3.5492 3.5492 3.5492h.5808c0-.0645.7744-1.4197 2.4522-4.2591.1936-.3872.4517-.7744.7098-1.2261H4.4114c-.5808 0-.9034-.3872-.968-.7098-.1291-.5163.1936-1.1616.9034-1.1616h2.3877l3.033-5.2916s-.7098-1.2906-.9034-1.6133c-.2582-.4517-.1291-.9034.129-1.1615.3872-.3872 1.0325-.5808 1.6778.4517l.2581.3872.2581-.3872c.5808-.8389.968-.7744 1.2906-.7098.5163.1291.8389.7098.3872 1.6133L8.864 14.0444h1.3552c.4517-.7744.9034-1.5488 1.3552-2.3877-.0645-.3227-.1291-.7098-.0645-1.0325.0645-.5163.3227-.968.6453-1.3552l.3872.6453c1.2261-2.1295 2.1295-3.9364 2.3877-4.6463.1291-.3872.3227-1.1616.1291-1.8069H5.3794c-2.0005.0001-3.5493 1.6134-3.5493 3.5494zM4.605 17.7872c0-.0645.7744-1.4197.7744-1.4197 1.2261-.3227 1.8069.4517 1.8714.5163 0 0-.8389 1.4842-1.097 1.7423s-.5808.3227-.9034.2581c-.5164-.129-.839-.6453-.6454-1.097z"/></svg>
\ No newline at end of file
diff --git a/src/assets/images/windsurf.png b/src/assets/images/windsurf.png
new file mode 100644
index 0000000000..931141d24c
Binary files /dev/null and b/src/assets/images/windsurf.png differ
diff --git a/src/assets/images/xcode.png b/src/assets/images/xcode.png
new file mode 100644
index 0000000000..3eafc3d7ab
Binary files /dev/null and b/src/assets/images/xcode.png differ
diff --git a/src/main/app/lifecycle.ts b/src/main/app/lifecycle.ts
deleted file mode 100644
index 61a9171cd3..0000000000
--- a/src/main/app/lifecycle.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { app, BrowserWindow } from 'electron';
-import { createMainWindow } from './window';
-
-export function registerAppLifecycle() {
-  app.on('window-all-closed', () => {
-    if (process.platform !== 'darwin') {
-      app.quit();
-    }
-  });
-
-  app.on('activate', () => {
-    if (BrowserWindow.getAllWindows().length === 0) {
-      createMainWindow();
-    }
-  });
-}
diff --git a/src/main/app/menu.ts b/src/main/app/menu.ts
index 573b7b056b..09d72fdc60 100644
--- a/src/main/app/menu.ts
+++ b/src/main/app/menu.ts
@@ -1,14 +1,13 @@
-import { Menu, shell, app, BrowserWindow, nativeImage } from 'electron';
-import { EMDASH_RELEASES_URL, EMDASH_DOCS_URL } from '@shared/urls';
-
-function getFocusedWindow(): BrowserWindow | null {
-  return BrowserWindow.getFocusedWindow() ?? BrowserWindow.getAllWindows()[0] ?? null;
-}
-
-function sendToRenderer(channel: string) {
-  const win = getFocusedWindow();
-  if (win) win.webContents.send(channel);
-}
+import { app, Menu, shell } from 'electron';
+import {
+  menuCheckForUpdatesChannel,
+  menuCloseTabChannel,
+  menuOpenSettingsChannel,
+  menuRedoChannel,
+  menuUndoChannel,
+} from '@shared/events/appEvents';
+import { EMDASH_DOCS_URL, EMDASH_RELEASES_URL } from '@shared/urls';
+import { events } from '@main/lib/events';
 
 export function setupApplicationMenu(): void {
   const isMac = process.platform === 'darwin';
@@ -28,11 +27,11 @@ export function setupApplicationMenu(): void {
               {
                 label: 'Settings\u2026',
                 accelerator: 'CmdOrCtrl+,',
-                click: () => sendToRenderer('menu:open-settings'),
+                click: () => events.emit(menuOpenSettingsChannel, undefined),
               },
               {
                 label: 'Check for Updates\u2026',
-                click: () => sendToRenderer('menu:check-for-updates'),
+                click: () => events.emit(menuCheckForUpdatesChannel, undefined),
               },
               { type: 'separator' as const },
               { role: 'services' as const },
@@ -60,7 +59,7 @@ export function setupApplicationMenu(): void {
               {
                 label: 'Settings\u2026',
                 accelerator: 'CmdOrCtrl+,',
-                click: () => sendToRenderer('menu:open-settings'),
+                click: () => events.emit(menuOpenSettingsChannel, undefined),
               },
               { type: 'separator' as const },
             ]
@@ -69,7 +68,7 @@ export function setupApplicationMenu(): void {
           ? {
               label: 'Close Tab',
               accelerator: 'CmdOrCtrl+W',
-              click: () => sendToRenderer('menu:close-tab'),
+              click: () => events.emit(menuCloseTabChannel, undefined),
             }
           : { role: 'quit' as const },
       ],
@@ -81,12 +80,12 @@ export function setupApplicationMenu(): void {
         {
           label: 'Undo',
           accelerator: 'CmdOrCtrl+Z',
-          click: () => sendToRenderer('menu:undo'),
+          click: () => events.emit(menuUndoChannel, undefined),
         },
         {
           label: 'Redo',
           accelerator: isMac ? 'Shift+CmdOrCtrl+Z' : 'CmdOrCtrl+Y',
-          click: () => sendToRenderer('menu:redo'),
+          click: () => events.emit(menuRedoChannel, undefined),
         },
         { type: 'separator' as const },
         { role: 'cut' as const },
@@ -131,7 +130,7 @@ export function setupApplicationMenu(): void {
               { type: 'separator' as const },
               {
                 label: 'Check for Updates\u2026',
-                click: () => sendToRenderer('menu:check-for-updates'),
+                click: () => events.emit(menuCheckForUpdatesChannel, undefined),
               },
             ]
           : []),
diff --git a/src/main/app/protocol.ts b/src/main/app/protocol.ts
new file mode 100644
index 0000000000..a4776dc1a4
--- /dev/null
+++ b/src/main/app/protocol.ts
@@ -0,0 +1,40 @@
+import { join, normalize, sep } from 'node:path';
+import { net, protocol } from 'electron';
+import { APP_NAME_LOWER } from '@shared/app-identity';
+
+export const APP_SCHEME = 'app';
+export const APP_ORIGIN = `${APP_SCHEME}://${APP_NAME_LOWER}`;
+
+export function registerAppScheme(): void {
+  protocol.registerSchemesAsPrivileged([
+    {
+      scheme: APP_SCHEME,
+      privileges: {
+        standard: true,
+        secure: true,
+        supportFetchAPI: true,
+        corsEnabled: true,
+      },
+    },
+  ]);
+}
+
+export function setupAppProtocol(rendererRoot: string): void {
+  const root = normalize(rendererRoot);
+
+  protocol.handle(APP_SCHEME, async (request) => {
+    const { pathname } = new URL(request.url);
+    const relPath = decodeURIComponent(pathname).replace(/^\/+/, '');
+    const resolved = normalize(join(root, relPath || 'index.html'));
+
+    if (!resolved.startsWith(root + sep) && resolved !== root) {
+      return new Response(null, { status: 403 });
+    }
+
+    try {
+      return await net.fetch(`file://${resolved}`);
+    } catch {
+      return net.fetch(`file://${join(root, 'index.html')}`);
+    }
+  });
+}
diff --git a/src/main/app/staticServer.ts b/src/main/app/staticServer.ts
deleted file mode 100644
index a565225757..0000000000
--- a/src/main/app/staticServer.ts
+++ /dev/null
@@ -1,156 +0,0 @@
-import { createServer, type IncomingMessage, type ServerResponse } from 'http';
-import { promises as fs } from 'fs';
-import { extname, join, normalize, sep } from 'path';
-import type { AddressInfo } from 'net';
-
-let serverUrl: string | null = null;
-let serverStarted = false;
-
-const DEFAULT_RENDERER_PORT = 12112;
-const RENDERER_PORT_RANGE = 100;
-
-const MIME_MAP: Record<string, string> = {
-  '.html': 'text/html; charset=utf-8',
-  '.js': 'application/javascript; charset=utf-8',
-  '.mjs': 'application/javascript; charset=utf-8',
-  '.cjs': 'application/javascript; charset=utf-8',
-  '.css': 'text/css; charset=utf-8',
-  '.json': 'application/json; charset=utf-8',
-  '.svg': 'image/svg+xml',
-  '.png': 'image/png',
-  '.jpg': 'image/jpeg',
-  '.jpeg': 'image/jpeg',
-  '.gif': 'image/gif',
-  '.webp': 'image/webp',
-  '.ico': 'image/x-icon',
-  '.woff2': 'font/woff2',
-};
-
-function getMime(filePath: string) {
-  return MIME_MAP[extname(filePath).toLowerCase()] ?? 'application/octet-stream';
-}
-
-function isPathInside(parent: string, child: string) {
-  const parentPath = normalize(parent + sep);
-  const childPath = normalize(child);
-  return childPath.startsWith(parentPath);
-}
-
-function getRendererPortCandidates(): number[] {
-  const raw = process.env.EMDASH_RENDERER_PORT;
-  const parsed = raw ? Number.parseInt(raw, 10) : Number.NaN;
-  const start = Number.isFinite(parsed) && parsed > 0 ? parsed : DEFAULT_RENDERER_PORT;
-  return Array.from({ length: RENDERER_PORT_RANGE }, (_, i) => start + i);
-}
-
-async function listenWithFallback(server: ReturnType<typeof createServer>): Promise<AddressInfo> {
-  const candidates = getRendererPortCandidates();
-
-  for (const port of candidates) {
-    try {
-      const addr = await new Promise<AddressInfo>((resolve, reject) => {
-        let onError: (error: unknown) => void;
-        let onListening: () => void;
-
-        const cleanup = () => {
-          server.removeListener('error', onError);
-          server.removeListener('listening', onListening);
-        };
-
-        onError = (error: unknown) => {
-          cleanup();
-          reject(error);
-        };
-        onListening = () => {
-          cleanup();
-          resolve(server.address() as AddressInfo);
-        };
-
-        server.once('error', onError);
-        server.once('listening', onListening);
-        server.listen(port, '127.0.0.1');
-      });
-
-      if (!addr || typeof addr.port !== 'number') {
-        throw new Error('Failed to start renderer server');
-      }
-      return addr;
-    } catch (error) {
-      const code = (error as any)?.code;
-      if (code === 'EADDRINUSE') {
-        if (server.listening) {
-          await new Promise<void>((resolve) => server.close(() => resolve()));
-        }
-        continue;
-      }
-      throw error;
-    }
-  }
-
-  // As a last resort, pick an ephemeral port (should be extremely rare).
-  const addr = await new Promise<AddressInfo>((resolve, reject) => {
-    server.once('error', reject);
-    server.listen(0, '127.0.0.1', () => resolve(server.address() as AddressInfo));
-  });
-
-  if (!addr || typeof addr.port !== 'number') {
-    throw new Error('Failed to start renderer server');
-  }
-  return addr;
-}
-
-export async function ensureRendererServer(root: string): Promise<string> {
-  if (serverStarted && serverUrl) return serverUrl;
-
-  const server = createServer(async (req: IncomingMessage, res: ServerResponse) => {
-    try {
-      if (!req.url) {
-        res.writeHead(400);
-        res.end();
-        return;
-      }
-
-      const url = new URL(req.url, 'http://localhost');
-      const isHead = req.method === 'HEAD';
-
-      const rawPath = decodeURIComponent(url.pathname || '/');
-      const safePath = normalize(rawPath).replace(/^(\.\.[/\\])+/, '');
-      let filePath = join(root, safePath);
-
-      // Block path traversal
-      if (!isPathInside(root, filePath)) {
-        res.writeHead(403);
-        res.end();
-        return;
-      }
-
-      let stat;
-      try {
-        stat = await fs.stat(filePath);
-      } catch {
-        stat = null;
-      }
-
-      if (!stat || stat.isDirectory()) {
-        filePath = join(root, 'index.html');
-      }
-
-      const data = await fs.readFile(filePath);
-      res.writeHead(200, {
-        'Content-Type': getMime(filePath),
-        'Cache-Control': 'no-cache, no-store, must-revalidate',
-      });
-      if (!isHead) res.write(data);
-      res.end();
-    } catch {
-      res.writeHead(500);
-      res.end();
-    }
-  });
-
-  const addr = await listenWithFallback(server);
-  serverUrl = `http://127.0.0.1:${addr.port}/index.html`;
-  serverStarted = true;
-
-  return serverUrl!;
-}
diff --git a/src/main/app/window.ts b/src/main/app/window.ts
index ff7da73af6..a9c525a083 100644
--- a/src/main/app/window.ts
+++ b/src/main/app/window.ts
@@ -1,60 +1,47 @@
-import { BrowserWindow, app } from 'electron';
-import { join } from 'path';
-import { isDev } from '../utils/dev';
-import { registerExternalLinkHandlers } from '../utils/externalLinks';
-import { ensureRendererServer } from './staticServer';
+import { join } from 'node:path';
+import { BrowserWindow } from 'electron';
+import appIcon from '@/assets/images/emdash/emdash_logo.png?asset';
+import { PRODUCT_NAME } from '@shared/app-identity';
+import { capture, checkAndReportDailyActiveUser } from '@main/lib/telemetry';
+import { registerExternalLinkHandlers } from '@main/utils/externalLinks';
+import { APP_ORIGIN } from './protocol';
 
 let mainWindow: BrowserWindow | null = null;
 
 export function createMainWindow(): BrowserWindow {
-  // In development, resolve icon from src/assets
-  // In production (packaged), electron-builder handles the icon
-  const iconPath = isDev
-    ? join(__dirname, '..', '..', '..', 'src', 'assets', 'images', 'emdash', 'emdash_logo.png')
-    : undefined;
-
   mainWindow = new BrowserWindow({
     width: 1400,
     height: 900,
     minWidth: 700,
     minHeight: 500,
-    title: 'Emdash',
-    ...(iconPath && { icon: iconPath }),
+    title: PRODUCT_NAME,
+    // In production, electron-builder injects the icon from the app bundle.
+    ...(import.meta.env.DEV && { icon: appIcon }),
     webPreferences: {
       nodeIntegration: false,
       contextIsolation: true,
+      // Required for ESM preload scripts (.mjs)
+      sandbox: false,
       // Allow using <webview> in renderer for in‑app browser pane.
       // The webview runs in a separate process; nodeIntegration remains disabled.
       webviewTag: true,
-      // __dirname here resolves to dist/main/main/app at runtime (dev)
-      // Preload is emitted to dist/main/main/preload.js
-      preload: join(__dirname, '..', 'preload.js'),
+      // __dirname resolves to out/main/ at runtime; preload is at out/preload/index.mjs
+      preload: join(__dirname, '../preload/index.mjs'),
     },
-    ...(process.platform === 'darwin' ? { titleBarStyle: 'hiddenInset' } : {}),
+    ...(process.platform === 'darwin'
+      ? { titleBarStyle: 'hiddenInset', trafficLightPosition: { x: 10, y: 10 } }
+      : {}),
     show: false,
   });
 
-  if (isDev) {
-    mainWindow.loadURL('http://localhost:3000');
+  if (import.meta.env.DEV) {
+    mainWindow.loadURL(process.env.ELECTRON_RENDERER_URL!);
   } else {
-    // Serve renderer over an HTTP origin in production so embeds work.
-    const rendererRoot = join(app.getAppPath(), 'dist', 'renderer');
-    void ensureRendererServer(rendererRoot)
-      .then((url: string) => {
-        if (mainWindow && !mainWindow.isDestroyed()) {
-          mainWindow.loadURL(url);
-        }
-      })
-      .catch(() => {
-        // Fallback to file load if server fails for any reason.
-        if (mainWindow && !mainWindow.isDestroyed()) {
-          mainWindow.loadFile(join(rendererRoot, 'index.html'));
-        }
-      });
+    mainWindow.loadURL(`${APP_ORIGIN}/index.html`);
   }
 
   // Route external links to the user’s default browser
-  registerExternalLinkHandlers(mainWindow, isDev);
+  registerExternalLinkHandlers(mainWindow, import.meta.env.DEV);
 
   // Show when ready
   mainWindow.once('ready-to-show', () => {
@@ -63,12 +50,15 @@ export function createMainWindow(): BrowserWindow {
 
   // Track window focus for telemetry
   mainWindow.on('focus', () => {
-    // Lazy import to avoid circular dependencies
-    void import('../telemetry').then(({ capture, checkAndReportDailyActiveUser }) => {
-      void capture('app_window_focused');
-      // Also check for daily active user when window gains focus
-      checkAndReportDailyActiveUser();
-    });
+    capture('app_window_focused');
+    if (typeof mainWindow?.setWindowButtonVisibility === 'function') {
+      mainWindow.setWindowButtonVisibility(true);
+    }
+    checkAndReportDailyActiveUser();
+  });
+
+  mainWindow.on('blur', () => {
+    capture('app_window_unfocused');
   });
 
   // Cleanup reference on close
diff --git a/src/main/appConfig.json b/src/main/appConfig.json
deleted file mode 100644
index 12a855e784..0000000000
--- a/src/main/appConfig.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "posthogHost": "https://us.i.posthog.com",
-  "posthogKey": "phc_HwVnk5sjxn8S0xnVyTjEl5S2GAP2kxC8tpbR1qyww9"
-}
diff --git a/src/main/config/github.config.ts b/src/main/config/github.config.ts
deleted file mode 100644
index 102d94b08f..0000000000
--- a/src/main/config/github.config.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
- * GitHub OAuth configuration for Device Flow authentication.
- * No client secret needed - Device Flow is designed for desktop/CLI apps.
- */
-export const GITHUB_CONFIG = {
-  clientId: 'Ov23ligC35uHWopzCeWf',
-  scopes: ['repo', 'read:user', 'read:org'],
-};
diff --git a/src/main/core/account/config.ts b/src/main/core/account/config.ts
new file mode 100644
index 0000000000..98c62ef4e0
--- /dev/null
+++ b/src/main/core/account/config.ts
@@ -0,0 +1,6 @@
+export const ACCOUNT_CONFIG = {
+  authServer: {
+    baseUrl: 'https://auth.emdash.sh',
+    authTimeoutMs: Number(process.env.EMDASH_AUTH_TIMEOUT_MS || 300000),
+  },
+};
diff --git a/src/main/core/account/controller.ts b/src/main/core/account/controller.ts
new file mode 100644
index 0000000000..617365b6aa
--- /dev/null
+++ b/src/main/core/account/controller.ts
@@ -0,0 +1,57 @@
+import { createRPCController } from '@shared/ipc/rpc';
+import { log } from '@main/lib/logger';
+import { capture, identify as telemetryIdentify } from '@main/lib/telemetry';
+import { emdashAccountService } from './services/emdash-account-service';
+
+export const accountController = createRPCController({
+  getSession: async () => {
+    try {
+      return await emdashAccountService.getSession();
+    } catch (error) {
+      log.error('Failed to get account session:', error);
+      return { user: null, isSignedIn: false, hasAccount: false };
+    }
+  },
+
+  signIn: async (provider?: string) => {
+    try {
+      const result = await emdashAccountService.signIn(provider);
+      telemetryIdentify(result.user.username, result.user.userId);
+      capture('user_signed_in');
+      return { success: true, user: result.user };
+    } catch (error) {
+      log.error('Account sign-in failed:', error);
+      return {
+        success: false,
+        error: error instanceof Error ? error.message : 'Sign-in failed',
+      };
+    }
+  },
+
+  signOut: async () => {
+    try {
+      await emdashAccountService.signOut();
+      capture('user_signed_out');
+      return { success: true };
+    } catch (error) {
+      log.error('Account sign-out failed:', error);
+      return { success: false, error: 'Sign-out failed' };
+    }
+  },
+
+  checkHealth: async () => {
+    try {
+      return await emdashAccountService.checkServerHealth();
+    } catch {
+      return false;
+    }
+  },
+
+  validateSession: async () => {
+    try {
+      return await emdashAccountService.validateSession();
+    } catch {
+      return false;
+    }
+  },
+});
diff --git a/src/main/core/account/provider-token-registry.test.ts b/src/main/core/account/provider-token-registry.test.ts
new file mode 100644
index 0000000000..d83e3540d3
--- /dev/null
+++ b/src/main/core/account/provider-token-registry.test.ts
@@ -0,0 +1,42 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { providerTokenRegistry } from './provider-token-registry';
+
+describe('providerTokenRegistry', () => {
+  beforeEach(() => {
+    providerTokenRegistry.clear();
+  });
+
+  it('dispatches to registered handler', async () => {
+    const handler = vi.fn().mockResolvedValue(undefined);
+    providerTokenRegistry.register('github', handler);
+
+    await providerTokenRegistry.dispatch('github', 'ghp_token123');
+
+    expect(handler).toHaveBeenCalledWith('ghp_token123');
+  });
+
+  it('is a no-op when no handler is registered for the provider', async () => {
+    await expect(providerTokenRegistry.dispatch('gitlab', 'token')).resolves.not.toThrow();
+  });
+
+  it('propagates handler errors', async () => {
+    const handler = vi.fn().mockRejectedValue(new Error('secure storage failed'));
+    providerTokenRegistry.register('github', handler);
+
+    await expect(providerTokenRegistry.dispatch('github', 'token')).rejects.toThrow(
+      'secure storage failed'
+    );
+  });
+
+  it('replaces handler on re-registration', async () => {
+    const first = vi.fn();
+    const second = vi.fn();
+    providerTokenRegistry.register('github', first);
+    providerTokenRegistry.register('github', second);
+
+    await providerTokenRegistry.dispatch('github', 'token');
+
+    expect(first).not.toHaveBeenCalled();
+    expect(second).toHaveBeenCalledWith('token');
+  });
+});
diff --git a/src/main/core/account/provider-token-registry.ts b/src/main/core/account/provider-token-registry.ts
new file mode 100644
index 0000000000..deb8842f49
--- /dev/null
+++ b/src/main/core/account/provider-token-registry.ts
@@ -0,0 +1,20 @@
+type ProviderTokenHandler = (token: string) => Promise<void>;
+
+const handlers = new Map<string, ProviderTokenHandler>();
+
+export const providerTokenRegistry = {
+  register(provider: string, handler: ProviderTokenHandler): void {
+    handlers.set(provider, handler);
+  },
+
+  async dispatch(provider: string, token: string): Promise<void> {
+    const handler = handlers.get(provider);
+    if (!handler) return;
+    await handler(token);
+  },
+
+  /** For testing only — removes all registered handlers. */
+  clear(): void {
+    handlers.clear();
+  },
+};
diff --git a/src/main/core/account/services/credential-store.ts b/src/main/core/account/services/credential-store.ts
new file mode 100644
index 0000000000..eeb48fb904
--- /dev/null
+++ b/src/main/core/account/services/credential-store.ts
@@ -0,0 +1,34 @@
+import { encryptedAppSecretsStore } from '@main/core/secrets/encrypted-app-secrets-store';
+import { log } from '@main/lib/logger';
+
+const ACCOUNT_SESSION_SECRET_KEY = 'emdash-account-token';
+
+export class AccountCredentialStore {
+  async get(): Promise<string | null> {
+    try {
+      return await encryptedAppSecretsStore.getSecret(ACCOUNT_SESSION_SECRET_KEY);
+    } catch (error) {
+      log.error('Failed to retrieve session token:', error);
+      return null;
+    }
+  }
+
+  async set(token: string): Promise<void> {
+    try {
+      await encryptedAppSecretsStore.setSecret(ACCOUNT_SESSION_SECRET_KEY, token);
+    } catch (error) {
+      log.error('Failed to store session token:', error);
+      throw error;
+    }
+  }
+
+  async clear(): Promise<void> {
+    try {
+      await encryptedAppSecretsStore.deleteSecret(ACCOUNT_SESSION_SECRET_KEY);
+    } catch (error) {
+      log.error('Failed to clear session token:', error);
+    }
+  }
+}
+
+export const accountCredentialStore = new AccountCredentialStore();
diff --git a/src/main/core/account/services/emdash-account-service.test.ts b/src/main/core/account/services/emdash-account-service.test.ts
new file mode 100644
index 0000000000..ee2c7b84ac
--- /dev/null
+++ b/src/main/core/account/services/emdash-account-service.test.ts
@@ -0,0 +1,270 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { EmdashAccountService } from './emdash-account-service';
+
+const mockCredGet = vi.fn();
+const mockCredSet = vi.fn();
+const mockCredClear = vi.fn();
+vi.mock('./credential-store', () => ({
+  accountCredentialStore: {
+    get: (...args: unknown[]) => mockCredGet(...args),
+    set: (...args: unknown[]) => mockCredSet(...args),
+    clear: (...args: unknown[]) => mockCredClear(...args),
+  },
+}));
+
+const mockKvGet = vi.fn();
+const mockKvSet = vi.fn();
+vi.mock('@main/db/kv', () => ({
+  KV: class {
+    get(...args: unknown[]) {
+      return mockKvGet(...args);
+    }
+    set(...args: unknown[]) {
+      return mockKvSet(...args);
+    }
+  },
+}));
+
+const mockExecuteOAuthFlow = vi.fn();
+vi.mock('@main/core/shared/oauth-flow', () => ({
+  executeOAuthFlow: (...args: unknown[]) => mockExecuteOAuthFlow(...args),
+}));
+
+const mockDispatch = vi.fn().mockResolvedValue(undefined);
+vi.mock('../provider-token-registry', () => ({
+  providerTokenRegistry: {
+    dispatch: (...args: unknown[]) => mockDispatch(...args),
+  },
+}));
+
+vi.mock('../config', () => ({
+  ACCOUNT_CONFIG: {
+    authServer: { baseUrl: 'https://auth.test.emdash.sh', authTimeoutMs: 5000 },
+  },
+}));
+
+const mockFetch = vi.fn();
+vi.stubGlobal('fetch', mockFetch);
+
+describe('EmdashAccountService', () => {
+  let service: EmdashAccountService;
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+    mockKvGet.mockResolvedValue(null);
+    mockKvSet.mockResolvedValue(undefined);
+    service = new EmdashAccountService();
+  });
+
+  describe('getSession()', () => {
+    it('returns no account when profile cache is empty', async () => {
+      const session = await service.getSession();
+      expect(session).toEqual({ user: null, isSignedIn: false, hasAccount: false });
+    });
+
+    it('returns hasAccount true but not signed in when profile exists but no token', async () => {
+      mockKvGet.mockResolvedValue({
+        hasAccount: true,
+        userId: 'u1',
+        username: 'test',
+        avatarUrl: '',
+        email: 'test@test.com',
+        lastValidated: '2026-01-01',
+      });
+      const session = await service.getSession();
+      expect(session.hasAccount).toBe(true);
+      expect(session.isSignedIn).toBe(false);
+      expect(session.user).toBeNull();
+    });
+  });
+
+  describe('loadSessionToken()', () => {
+    it('loads token from credential store', async () => {
+      mockCredGet.mockResolvedValue('token-123');
+      await service.loadSessionToken();
+      expect(mockCredGet).toHaveBeenCalled();
+    });
+  });
+
+  describe('signIn()', () => {
+    it('calls executeOAuthFlow and stores session', async () => {
+      const oauthResponse = {
+        sessionToken: 'session-abc',
+        accessToken: 'ghp_123',
+        providerId: 'github',
+        user: {
+          userId: 'u1',
+          username: 'testuser',
+          avatarUrl: 'https://img.com/a',
+          email: 'a@b.com',
+        },
+      };
+      mockExecuteOAuthFlow.mockResolvedValue(oauthResponse);
+
+      const result = await service.signIn();
+
+      expect(mockExecuteOAuthFlow).toHaveBeenCalledWith(expect.objectContaining({}));
+      expect(mockCredSet).toHaveBeenCalledWith('session-abc');
+      expect(mockKvSet).toHaveBeenCalledWith(
+        'profile',
+        expect.objectContaining({ hasAccount: true, username: 'testuser' })
+      );
+      expect(result).toEqual({
+        providerToken: 'ghp_123',
+        provider: 'github',
+        user: oauthResponse.user,
+      });
+    });
+
+    it('passes provider as extraParam when specified', async () => {
+      const oauthResponse = {
+        sessionToken: 'session-abc',
+        accessToken: 'ghp_123',
+        providerId: 'github',
+        user: { userId: 'u1', username: 'test', avatarUrl: '', email: '' },
+      };
+      mockExecuteOAuthFlow.mockResolvedValue(oauthResponse);
+
+      await service.signIn('github');
+
+      expect(mockExecuteOAuthFlow).toHaveBeenCalledWith(expect.objectContaining({}));
+    });
+
+    it('dispatches provider token via registry when provider token is present', async () => {
+      const oauthResponse = {
+        sessionToken: 'session-abc',
+        accessToken: 'ghp_123',
+        providerId: 'github',
+        user: { userId: 'u1', username: 'test', avatarUrl: '', email: '' },
+      };
+      mockExecuteOAuthFlow.mockResolvedValue(oauthResponse);
+
+      await service.signIn();
+
+      expect(mockDispatch).toHaveBeenCalledWith('github', 'ghp_123');
+    });
+
+    it('throws when provider token persistence fails', async () => {
+      const oauthResponse = {
+        sessionToken: 'session-abc',
+        accessToken: 'ghp_123',
+        providerId: 'github',
+        user: { userId: 'u1', username: 'test', avatarUrl: '', email: '' },
+      };
+      mockExecuteOAuthFlow.mockResolvedValue(oauthResponse);
+      mockDispatch.mockRejectedValueOnce(new Error('secure storage failed'));
+
+      await expect(service.signIn()).rejects.toThrow('secure storage failed');
+    });
+
+    it('does not dispatch when provider token is absent', async () => {
+      const oauthResponse = {
+        sessionToken: 'session-abc',
+        user: { userId: 'u1', username: 'test', avatarUrl: '', email: '' },
+      };
+      mockExecuteOAuthFlow.mockResolvedValue(oauthResponse);
+
+      await service.signIn();
+
+      expect(mockDispatch).not.toHaveBeenCalled();
+    });
+  });
+
+  describe('signOut()', () => {
+    it('clears session token and preserves hasAccount in profile cache', async () => {
+      const exchangeResult = {
+        sessionToken: 'session-abc',
+        accessToken: 'ghp_123',
+        providerId: 'github',
+        user: { userId: 'u1', username: 'test', avatarUrl: '', email: '' },
+      };
+      mockExecuteOAuthFlow.mockResolvedValue(exchangeResult);
+      await service.signIn();
+      vi.clearAllMocks();
+      mockKvSet.mockResolvedValue(undefined);
+
+      await service.signOut();
+
+      expect(mockCredClear).toHaveBeenCalled();
+      expect(mockKvSet).toHaveBeenCalledWith(
+        'profile',
+        expect.objectContaining({ hasAccount: true })
+      );
+      mockKvGet.mockResolvedValue({
+        hasAccount: true,
+        userId: 'u1',
+        username: 'test',
+        avatarUrl: '',
+        email: '',
+      });
+      const session = await service.getSession();
+      expect(session.isSignedIn).toBe(false);
+      expect(session.hasAccount).toBe(true);
+    });
+  });
+
+  describe('validateSession()', () => {
+    it('returns false when no session token', async () => {
+      const result = await service.validateSession();
+      expect(result).toBe(false);
+      expect(mockFetch).not.toHaveBeenCalled();
+    });
+
+    it('clears session on 401 and preserves hasAccount', async () => {
+      const exchangeResult = {
+        sessionToken: 'session-abc',
+        accessToken: 'ghp_123',
+        providerId: 'github',
+        user: { userId: 'u1', username: 'test', avatarUrl: '', email: '' },
+      };
+      mockExecuteOAuthFlow.mockResolvedValue(exchangeResult);
+      await service.signIn();
+      vi.clearAllMocks();
+      mockKvSet.mockResolvedValue(undefined);
+
+      mockFetch.mockResolvedValue({ ok: false, status: 401 });
+      const result = await service.validateSession();
+
+      expect(result).toBe(false);
+      expect(mockCredClear).toHaveBeenCalled();
+      expect(mockKvSet).toHaveBeenCalledWith(
+        'profile',
+        expect.objectContaining({ hasAccount: true })
+      );
+    });
+
+    it('returns true on network error (optimistic)', async () => {
+      const exchangeResult = {
+        sessionToken: 'session-abc',
+        accessToken: 'ghp_123',
+        providerId: 'github',
+        user: { userId: 'u1', username: 'test', avatarUrl: '', email: '' },
+      };
+      mockExecuteOAuthFlow.mockResolvedValue(exchangeResult);
+      await service.signIn();
+      vi.clearAllMocks();
+
+      mockFetch.mockRejectedValue(new Error('network error'));
+      const result = await service.validateSession();
+      expect(result).toBe(true);
+    });
+  });
+
+  describe('checkServerHealth()', () => {
+    it('returns true on successful health check', async () => {
+      mockFetch.mockResolvedValue({ ok: true });
+      const result = await service.checkServerHealth();
+      expect(result).toBe(true);
+      expect(mockFetch).toHaveBeenCalledWith(
+        'https://auth.test.emdash.sh/health',
+        expect.objectContaining({ signal: expect.any(AbortSignal) })
+      );
+    });
+
+    it('returns false on network error', async () => {
+      mockFetch.mockRejectedValue(new Error('network error'));
+      const result = await service.checkServerHealth();
+      expect(result).toBe(false);
+    });
+  });
+});
diff --git a/src/main/core/account/services/emdash-account-service.ts b/src/main/core/account/services/emdash-account-service.ts
new file mode 100644
index 0000000000..8a66f2debc
--- /dev/null
+++ b/src/main/core/account/services/emdash-account-service.ts
@@ -0,0 +1,174 @@
+import { executeOAuthFlow } from '@main/core/shared/oauth-flow';
+import { KV } from '@main/db/kv';
+import { ACCOUNT_CONFIG } from '../config';
+import { providerTokenRegistry } from '../provider-token-registry';
+import { accountCredentialStore } from './credential-store';
+
+export interface AccountUser {
+  userId: string;
+  username: string;
+  avatarUrl: string;
+  email: string;
+}
+
+export interface CachedProfile {
+  hasAccount: boolean;
+  userId: string;
+  username: string;
+  avatarUrl: string;
+  email: string;
+  lastValidated: string;
+}
+
+export interface SignInResult {
+  providerToken?: string;
+  provider?: string;
+  user: AccountUser;
+}
+
+export interface SessionState {
+  user: AccountUser | null;
+  isSignedIn: boolean;
+  hasAccount: boolean;
+}
+
+interface AccountKVSchema extends Record<string, unknown> {
+  profile: CachedProfile;
+}
+
+const accountKV = new KV<AccountKVSchema>('account');
+
+export class EmdashAccountService {
+  private cachedProfile: CachedProfile | null = null;
+  private sessionToken: string | null = null;
+
+  async getSession(): Promise<SessionState> {
+    this.cachedProfile = await accountKV.get('profile');
+    const hasAccount = this.cachedProfile?.hasAccount === true;
+    const isSignedIn = hasAccount && this.sessionToken !== null;
+    return {
+      user:
+        isSignedIn && this.cachedProfile
+          ? {
+              userId: this.cachedProfile.userId,
+              username: this.cachedProfile.username,
+              avatarUrl: this.cachedProfile.avatarUrl,
+              email: this.cachedProfile.email,
+            }
+          : null,
+      isSignedIn,
+      hasAccount,
+    };
+  }
+
+  async loadSessionToken(): Promise<void> {
+    this.sessionToken = await accountCredentialStore.get();
+  }
+
+  /**  make provider optional and remove default in case emdash starts supporting more providers */
+  async signIn(provider: string = 'github'): Promise<SignInResult> {
+    const { baseUrl } = ACCOUNT_CONFIG.authServer;
+
+    const extraParams: Record<string, string> = {};
+
+    if (provider) {
+      extraParams.provider_id = provider;
+    }
+
+    const raw = await executeOAuthFlow({
+      authorizeUrl: `${baseUrl}/sign-in`,
+      exchangeUrl: `${baseUrl}/api/v1/auth/electron/exchange`,
+      successRedirectUrl: `${baseUrl}/auth/success`,
+      errorRedirectUrl: `${baseUrl}/auth/error`,
+      extraParams,
+      timeoutMs: ACCOUNT_CONFIG.authServer.authTimeoutMs,
+    });
+
+    const sessionToken = raw.sessionToken as string;
+    const user = raw.user as AccountUser;
+    if (!sessionToken || !user) {
+      throw new Error('Invalid sign-in response: missing sessionToken or user');
+    }
+
+    await accountCredentialStore.set(sessionToken);
+    this.sessionToken = sessionToken;
+
+    const profile: CachedProfile = {
+      hasAccount: true,
+      userId: user.userId,
+      username: user.username,
+      avatarUrl: user.avatarUrl,
+      email: user.email,
+      lastValidated: new Date().toISOString(),
+    };
+    this.cachedProfile = profile;
+    await accountKV.set('profile', profile);
+
+    const accessToken = raw.accessToken as string | undefined;
+    const providerId = raw.providerId as string | undefined;
+    if (accessToken && providerId) {
+      await providerTokenRegistry.dispatch(providerId, accessToken);
+    }
+
+    return {
+      providerToken: accessToken || undefined,
+      provider: providerId || undefined,
+      user,
+    };
+  }
+
+  async signOut(): Promise<void> {
+    this.sessionToken = null;
+    await accountCredentialStore.clear();
+    if (this.cachedProfile) {
+      this.cachedProfile.hasAccount = true;
+      await accountKV.set('profile', this.cachedProfile);
+    }
+  }
+
+  async checkServerHealth(): Promise<boolean> {
+    const { baseUrl } = ACCOUNT_CONFIG.authServer;
+    try {
+      const response = await fetch(`${baseUrl}/health`, {
+        signal: AbortSignal.timeout(3000),
+      });
+      return response.ok;
+    } catch {
+      return false;
+    }
+  }
+
+  async validateSession(): Promise<boolean> {
+    const token = this.sessionToken;
+    if (!token) return false;
+
+    const { baseUrl } = ACCOUNT_CONFIG.authServer;
+    try {
+      const response = await fetch(`${baseUrl}/api/auth/get-session`, {
+        method: 'POST',
+        headers: { Authorization: `Bearer ${token}` },
+        signal: AbortSignal.timeout(3000),
+      });
+
+      if (!response.ok) {
+        this.sessionToken = null;
+        await accountCredentialStore.clear();
+        if (this.cachedProfile) {
+          this.cachedProfile.hasAccount = true;
+          await accountKV.set('profile', this.cachedProfile);
+        }
+        return false;
+      }
+
+      if (this.cachedProfile) {
+        this.cachedProfile.lastValidated = new Date().toISOString();
+        await accountKV.set('profile', this.cachedProfile);
+      }
+      return true;
+    } catch {
+      return this.sessionToken !== null;
+    }
+  }
+}
+
+export const emdashAccountService = new EmdashAccountService();
diff --git a/src/main/core/agent-hooks/agent-hook-service.ts b/src/main/core/agent-hooks/agent-hook-service.ts
new file mode 100644
index 0000000000..71962a2f4d
--- /dev/null
+++ b/src/main/core/agent-hooks/agent-hook-service.ts
@@ -0,0 +1,31 @@
+import { agentEventChannel } from '@shared/events/agentEvents';
+import { events } from '@main/lib/events';
+import { enrichEvent } from './event-enricher';
+import { HookServer } from './hook-server';
+import { isAppFocused, maybeShowNotification } from './notification';
+
+class AgentHookService {
+  private server = new HookServer();
+
+  async start(): Promise<void> {
+    await this.server.start(async (raw) => {
+      const event = await enrichEvent(raw);
+      event.source = 'hook';
+      const appFocused = isAppFocused();
+      await maybeShowNotification(event, appFocused);
+      events.emit(agentEventChannel, { event, appFocused });
+    });
+  }
+
+  stop(): void {
+    this.server.stop();
+  }
+  getPort(): number {
+    return this.server.getPort();
+  }
+  getToken(): string {
+    return this.server.getToken();
+  }
+}
+
+export const agentHookService = new AgentHookService();
diff --git a/src/main/core/agent-hooks/classifier-wiring.ts b/src/main/core/agent-hooks/classifier-wiring.ts
new file mode 100644
index 0000000000..e09b619b3b
--- /dev/null
+++ b/src/main/core/agent-hooks/classifier-wiring.ts
@@ -0,0 +1,126 @@
+import { BrowserWindow } from 'electron';
+import { AgentProviderId } from '@shared/agent-provider-registry';
+import { agentEventChannel, type AgentEvent } from '@shared/events/agentEvents';
+import { makePtyId } from '@shared/ptyId';
+import { Pty } from '@main/core/pty/pty';
+import { events } from '@main/lib/events';
+import { log } from '@main/lib/logger';
+import { createClassifier } from './classifiers';
+import { stripAnsi, type ClassificationResult } from './classifiers/base';
+import { maybeShowNotification } from './notification';
+
+const IDLE_THRESHOLD_MS = 2500;
+const COOLDOWN_MS = 10_000;
+const EDGE_RESET_THRESHOLD = 20;
+
+// ── Helpers ──────────────────────────────────────────────────────────
+
+function isSubstantiveOutput(chunk: string): boolean {
+  return stripAnsi(chunk).trim().length > 0;
+}
+
+function classificationKey(result: ClassificationResult): string | undefined {
+  if (!result) return undefined;
+  return result.type === 'notification' ? `${result.type}:${result.notificationType}` : result.type;
+}
+
+function isAppFocused(): boolean {
+  return BrowserWindow.getAllWindows().some((w) => !w.isDestroyed() && w.isFocused());
+}
+
+// ── Emission guard ───────────────────────────────────────────────────
+
+function createEmissionGuard() {
+  let lastEmittedKey: string | undefined;
+  let lastEmitTime = 0;
+  let chunksSinceLastEmit = 0;
+
+  return {
+    onVisibleChunk() {
+      chunksSinceLastEmit++;
+      if (chunksSinceLastEmit > EDGE_RESET_THRESHOLD) {
+        lastEmittedKey = undefined;
+      }
+    },
+
+    shouldEmit(result: ClassificationResult): boolean {
+      const key = classificationKey(result);
+
+      if (!key) {
+        lastEmittedKey = undefined;
+        return false;
+      }
+
+      if (key === lastEmittedKey) return false;
+
+      const now = Date.now();
+      if (now - lastEmitTime < COOLDOWN_MS) return false;
+
+      lastEmittedKey = key;
+      lastEmitTime = now;
+      chunksSinceLastEmit = 0;
+      return true;
+    },
+  };
+}
+
+export function wireAgentClassifier({
+  pty,
+  providerId,
+  projectId,
+  taskId,
+  conversationId,
+}: {
+  pty: Pty;
+  providerId: AgentProviderId;
+  projectId: string;
+  taskId: string;
+  conversationId: string;
+}): void {
+  const classifier = createClassifier(providerId);
+  const ptyId = makePtyId(providerId, conversationId);
+  const guard = createEmissionGuard();
+
+  let idleTimer: ReturnType<typeof setTimeout> | null = null;
+
+  pty.onExit(() => {
+    if (idleTimer) clearTimeout(idleTimer);
+  });
+
+  pty.onData((chunk) => {
+    classifier.classify(chunk);
+
+    if (!isSubstantiveOutput(chunk)) return;
+
+    guard.onVisibleChunk();
+
+    if (idleTimer) clearTimeout(idleTimer);
+    idleTimer = setTimeout(() => {
+      try {
+        const result = classifier.classify('');
+        if (!guard.shouldEmit(result)) return;
+
+        const event: AgentEvent = {
+          type: result!.type,
+          source: 'classifier',
+          ptyId,
+          providerId,
+          conversationId,
+          taskId,
+          projectId,
+          timestamp: Date.now(),
+          payload: {
+            message: result!.message,
+            notificationType:
+              result!.type === 'notification' ? result!.notificationType : undefined,
+          },
+        };
+        const appFocused = isAppFocused();
+        void maybeShowNotification(event, appFocused);
+        events.emit(agentEventChannel, { event, appFocused });
+      } catch (err) {
+        log.warn('wireAgentClassifier: idle check failed', { error: String(err) });
+      }
+    }, IDLE_THRESHOLD_MS);
+  });
+}
diff --git a/src/main/core/agent-hooks/classifiers/amp.ts b/src/main/core/agent-hooks/classifiers/amp.ts
new file mode 100644
index 0000000000..6ab4b49673
--- /dev/null
+++ b/src/main/core/agent-hooks/classifiers/amp.ts
@@ -0,0 +1,48 @@
+import { createProviderClassifier, type ClassificationResult } from './base';
+
+export function createAmpClassifier() {
+  return createProviderClassifier((text: string): ClassificationResult => {
+    const tail = text.slice(-500);
+
+    // Permission/approval prompts
+    if (/approve|reject|permission|allow|confirm/i.test(tail)) {
+      return {
+        type: 'notification',
+        notificationType: 'permission_prompt',
+      };
+    }
+
+    // Idle/ready prompts
+    if (/Ready|Awaiting|Press Enter|Next command|Type your message/i.test(tail)) {
+      return {
+        type: 'notification',
+        notificationType: 'idle_prompt',
+      };
+    }
+
+    // Auth success
+    if (/Successfully authenticated|Login successful/i.test(text)) {
+      return {
+        type: 'notification',
+        notificationType: 'auth_success',
+      };
+    }
+
+    // Questions/elicitation
+    if (/What.*\?|How.*\?|Which.*\?|Please (provide|specify|clarify)/i.test(tail)) {
+      return {
+        type: 'notification',
+        notificationType: 'elicitation_dialog',
+      };
+    }
+
+    // Error detection
+    if (/error:|fatal:|exception|failed/i.test(text)) {
+      return {
+        type: 'error',
+      };
+    }
+
+    return undefined;
+  });
+}
diff --git a/src/main/core/agent-hooks/classifiers/auggie.ts b/src/main/core/agent-hooks/classifiers/auggie.ts
new file mode 100644
index 0000000000..0095936d7a
--- /dev/null
+++ b/src/main/core/agent-hooks/classifiers/auggie.ts
@@ -0,0 +1,55 @@
+import { createProviderClassifier, type ClassificationResult } from './base';
+
+export function createAuggieClassifier() {
+  return createProviderClassifier((text: string): ClassificationResult => {
+    const tail = text.slice(-500);
+
+    // Permission/approval prompts
+    if (/approve|reject|permission|allow|confirm/i.test(tail)) {
+      return {
+        type: 'notification',
+        notificationType: 'permission_prompt',
+      };
+    }
+
+    // Idle/ready prompts
+    if (/Ready|Awaiting|Press Enter|Next command/i.test(tail)) {
+      return {
+        type: 'notification',
+        notificationType: 'idle_prompt',
+      };
+    }
+
+    if (/auggie\s*>/i.test(tail)) {
+      return {
+        type: 'notification',
+        notificationType: 'idle_prompt',
+      };
+    }
+
+    // Auth success
+    if (/Successfully authenticated|Login successful/i.test(text)) {
+      return {
+        type: 'notification',
+        notificationType: 'auth_success',
+      };
+    }
+
+    // Questions/elicitation
+    if (/What.*\?|How can I|Please provide/i.test(tail)) {
+      return {
+        type: 'notification',
+        notificationType: 'elicitation_dialog',
+      };
+    }
+
+    // Error detection
+    if (/error:|fatal:|exception|failed/i.test(text)) {
+      return {
+        type: 'error',
+      };
+    }
+
+    return undefined;
+  });
+}
diff --git a/src/main/core/agent-hooks/classifiers/autohand.ts b/src/main/core/agent-hooks/classifiers/autohand.ts
new file mode 100644
index 0000000000..0ae320fcef
--- /dev/null
+++ b/src/main/core/agent-hooks/classifiers/autohand.ts
@@ -0,0 +1,48 @@
+import { createProviderClassifier, type ClassificationResult } from './base';
+
+export function createAutohandClassifier() {
+  return createProviderClassifier((text: string): ClassificationResult => {
+    const tail = text.slice(-500);
+
+    // Permission/approval prompts
+    if (/approve|reject|permission|allow|confirm/i.test(tail)) {
+      return {
+        type: 'notification',
+        notificationType: 'permission_prompt',
+      };
+    }
+
+    // Idle/ready prompts
+    if (/Ready|Awaiting|Press Enter|Next command/i.test(tail)) {
+      return {
+        type: 'notification',
+        notificationType: 'idle_prompt',
+      };
+    }
+
+    // Auth success
+    if (/Successfully authenticated|Login successful/i.test(text)) {
+      return {
+        type: 'notification',
+        notificationType: 'auth_success',
+      };
+    }
+
+    // Questions/elicitation
+    if (/What.*\?|How.*\?|Which.*\?|Please (provide|specify|clarify)/i.test(tail)) {
+      return {
+        type: 'notification',
+        notificationType: 'elicitation_dialog',
+      };
+    }
+
+    // Error detection
+    if (/error:|fatal:|exception|failed/i.test(text)) {
+      return {
+        type: 'error',
+      };
+    }
+
+    return undefined;
+  });
+}
diff --git a/src/main/core/agent-hooks/classifiers/base.ts b/src/main/core/agent-hooks/classifiers/base.ts
new file mode 100644
index 0000000000..f6095354d8
--- /dev/null
+++ b/src/main/core/agent-hooks/classifiers/base.ts
@@ -0,0 +1,70 @@
+import type { NotificationType } from '@shared/events/agentEvents';
+
+export type ClassificationResult =
+  | {
+      type: 'notification';
+      notificationType: NotificationType;
+      message?: string;
+    }
+  | {
+      type: 'stop';
+      message?: string;
+    }
+  | {
+      type: 'error';
+      message?: string;
+    }
+  | undefined;
+
+export interface ProviderClassifier {
+  /**
+   * Feed a new data chunk. Returns classification result if pattern detected, undefined otherwise.
+   * Maintains internal buffer for multi-chunk pattern matching.
+   */
+  classify(chunk: string): ClassificationResult;
+
+  /** Reset buffer state (called on session restart) */
+  reset(): void;
+}
+
+type ClassifyFn = (text: string) => ClassificationResult;
+
+const MAX_BUFFER = 4096; // 4KB sliding window
+
+export function stripAnsi(s: string): string {
+  return s
+    .replace(/\x1b\[[0-9;]*[A-Za-z]/g, '')
+    .replace(/\r/g, '')
+    .replace(/\x1b\][^\x07]*\x07/g, '')
+    .replace(/\x1b\][^\x1b]*\x1b\\/g, '');
+}
+
+/**
+ * Factory function that creates a classifier with buffering and ANSI stripping.
+ * The provided callback receives cleaned text and returns classification result.
+ */
+export function createProviderClassifier(classifyFn: ClassifyFn): ProviderClassifier {
+  let buffer = '';
+
+  return {
+    classify(chunk: string): ClassificationResult {
+      // Append to buffer
+      buffer += chunk;
+
+      // Trim from front if too large (keep most recent data)
+      if (buffer.length > MAX_BUFFER) {
+        buffer = buffer.slice(-MAX_BUFFER);
+      }
+
+      // Strip ANSI codes for pattern matching
+      const clean = stripAnsi(buffer);
+
+      // Call provider-specific classification
+      return classifyFn(clean);
+    },
+
+    reset(): void {
+      buffer = '';
+    },
+  };
+}
diff --git a/src/main/core/agent-hooks/classifiers/charm.ts b/src/main/core/agent-hooks/classifiers/charm.ts
new file mode 100644
index 0000000000..e4f6bc8eda
--- /dev/null
+++ b/src/main/core/agent-hooks/classifiers/charm.ts
@@ -0,0 +1,55 @@
+import { createProviderClassifier, type ClassificationResult } from './base';
+
+export function createCharmClassifier() {
+  return createProviderClassifier((text: string): ClassificationResult => {
+    const tail = text.slice(-500);
+
+    // Permission/approval prompts
+    if (/approve|reject|permission|allow|confirm/i.test(tail)) {
+      return {
+        type: 'notification',
+        notificationType: 'permission_prompt',
+      };
+    }
+
+    // Idle/ready prompts
+    if (/Ready|Awaiting|Press Enter/i.test(tail)) {
+      return {
+        type: 'notification',
+        notificationType: 'idle_prompt',
+      };
+    }
+
+    if (/crush\s*>/i.test(tail)) {
+      return {
+        type: 'notification',
+        notificationType: 'idle_prompt',
+      };
+    }
+
+    // Auth success
+    if (/Successfully authenticated|Login successful/i.test(text)) {
+      return {
+        type: 'notification',
+        notificationType: 'auth_success',
+      };
+    }
+
+    // Questions/elicitation
+    if (/What.*\?|Choose|Select/i.test(tail)) {
+      return {
+        type: 'notification',
+        notificationType: 'elicitation_dialog',
+      };
+    }
+
+    // Error detection
+    if (/error:|fatal:|exception|failed/i.test(text)) {
+      return {
+        type: 'error',
+      };
+    }
+
+    return undefined;
+  });
+}
diff --git a/src/main/core/agent-hooks/classifiers/cline.ts b/src/main/core/agent-hooks/classifiers/cline.ts
new file mode 100644
index 0000000000..cbfe6759f9
--- /dev/null
+++ b/src/main/core/agent-hooks/classifiers/cline.ts
@@ -0,0 +1,63 @@
+import { createProviderClassifier, type ClassificationResult } from './base';
+
+export function createClineClassifier() {
+  return createProviderClassifier((text: string): ClassificationResult => {
+    const tail = text.slice(-500);
+
+    // Permission/approval prompts
+    if (/approve|reject|permission|allow|confirm/i.test(tail)) {
+      return {
+        type: 'notification',
+        notificationType: 'permission_prompt',
+      };
+    }
+
+    // Task completion
+    if (/Task completed|Done\./i.test(tail)) {
+      return {
+        type: 'stop',
+        message: 'Task completed',
+      };
+    }
+
+    // Idle/ready prompts
+    if (/Ready|Awaiting|Press Enter|Next command/i.test(tail)) {
+      return {
+        type: 'notification',
+        notificationType: 'idle_prompt',
+      };
+    }
+
+    if (/cline\s*>/i.test(tail)) {
+      return {
+        type: 'notification',
+        notificationType: 'idle_prompt',
+      };
+    }
+
+    // Auth success
+    if (/Successfully authenticated|Login successful/i.test(text)) {
+      return {
+        type: 'notification',
+        notificationType: 'auth_success',
+      };
+    }
+
+    // Questions/elicitation
+    if (/What.*\?|How can I|Please.*:/i.test(tail)) {
+      return {
+        type: 'notification',
+        notificationType: 'elicitation_dialog',
+      };
+    }
+
+    // Error detection
+    if (/error:|fatal:|exception|failed/i.test(text)) {
+      return {
+        type: 'error',
+      };
+    }
+
+    return undefined;
+  });
+}
diff --git a/src/main/core/agent-hooks/classifiers/codebuff.ts b/src/main/core/agent-hooks/classifiers/codebuff.ts
new file mode 100644
index 0000000000..a0637009d3
--- /dev/null
+++ b/src/main/core/agent-hooks/classifiers/codebuff.ts
@@ -0,0 +1,55 @@
+import { createProviderClassifier, type ClassificationResult } from './base';
+
+export function createCodebuffClassifier() {
+  return createProviderClassifier((text: string): ClassificationResult => {
+    const tail = text.slice(-500);
+
+    // Permission/approval prompts
+    if (/approve|reject|permission|allow|confirm/i.test(tail)) {
+      return {
+        type: 'notification',
+        notificationType: 'permission_prompt',
+      };
+    }
+
+    // Idle/ready prompts
+    if (/Ready|Awaiting|Press Enter/i.test(tail)) {
+      return {
+        type: 'notification',
+        notificationType: 'idle_prompt',
+      };
+    }
+
+    if (/codebuff\s*>/i.test(tail)) {
+      return {
+        type: 'notification',
+        notificationType: 'idle_prompt',
+      };
+    }
+
+    // Auth success
+    if (/Successfully authenticated|Login successful/i.test(text)) {
+      return {
+        type: 'notification',
+        notificationType: 'auth_success',
+      };
+    }
+
+    // Questions/elicitation
+    if (/What.*\?|Enter.*command/i.test(tail)) {
+      return {
+        type: 'notification',
+        notificationType: 'elicitation_dialog',
+      };
+    }
+
+    // Error detection
+    if (/error:|fatal:|exception|failed/i.test(text)) {
+      return {
+        type: 'error',
+      };
+    }
+
+    return undefined;
+  });
+}
diff --git a/src/main/core/agent-hooks/classifiers/continue.ts b/src/main/core/agent-hooks/classifiers/continue.ts
new file mode 100644
index 0000000000..4b76dca77c
--- /dev/null
+++ b/src/main/core/agent-hooks/classifiers/continue.ts
@@ -0,0 +1,55 @@
+import { createProviderClassifier, type ClassificationResult } from './base';
+
+export function createContinueClassifier() {
+  return createProviderClassifier((text: string): ClassificationResult => {
+    const tail = text.slice(-500);
+
+    // Permission/approval prompts
+    if (/approve|reject|permission|allow|confirm/i.test(tail)) {
+      return {
+        type: 'notification',
+        notificationType: 'permission_prompt',
+      };
+    }
+
+    // Idle/ready prompts
+    if (/Ready|Awaiting|Press Enter/i.test(tail)) {
+      return {
+        type: 'notification',
+        notificationType: 'idle_prompt',
+      };
+    }
+
+    if (/cn\s*>|continue\s*>/i.test(tail)) {
+      return {
+        type: 'notification',
+        notificationType: 'idle_prompt',
+      };
+    }
+
+    // Auth success
+    if (/Successfully authenticated|Login successful/i.test(text)) {
+      return {
+        type: 'notification',
+        notificationType: 'auth_success',
+      };
+    }
+
+    // Questions/elicitation
+    if (/What.*\?|How can I|Next step/i.test(tail)) {
+      return {
+        type: 'notification',
+        notificationType: 'elicitation_dialog',
+      };
+    }
+
+    // Error detection
+    if (/error:|fatal:|exception|failed/i.test(text)) {
+      return {
+        type: 'error',
+      };
+    }
+
+    return undefined;
+  });
+}
diff --git a/src/main/core/agent-hooks/classifiers/copilot.ts b/src/main/core/agent-hooks/classifiers/copilot.ts
new file mode 100644
index 0000000000..2ecc1a9280
--- /dev/null
+++ b/src/main/core/agent-hooks/classifiers/copilot.ts
@@ -0,0 +1,52 @@
+import { createProviderClassifier, type ClassificationResult } from './base';
+
+export function createCopilotClassifier() {
+  return createProviderClassifier((text: string): ClassificationResult => {
+    const tail = text.slice(-500);
+
+    // Permission/approval prompts
+    if (
+      /Do you want to|Confirm with number keys|approve all file operations|Yes, and approve/i.test(
+        tail
+      )
+    ) {
+      return {
+        type: 'notification',
+        notificationType: 'permission_prompt',
+      };
+    }
+
+    // Idle/ready prompts
+    if (/Ready|Press Enter|Next step/i.test(tail)) {
+      return {
+        type: 'notification',
+        notificationType: 'idle_prompt',
+      };
+    }
+
+    // Auth success
+    if (/Successfully authenticated|Login successful/i.test(text)) {
+      return {
+        type: 'notification',
+        notificationType: 'auth_success',
+      };
+    }
+
+    // Questions/elicitation
+    if (/What.*\?|How.*\?|Which.*\?|Please (provide|specify|clarify)/i.test(tail)) {
+      return {
+        type: 'notification',
+        notificationType: 'elicitation_dialog',
+      };
+    }
+
+    // Error detection
+    if (/error:|fatal:|exception|failed/i.test(text)) {
+      return {
+        type: 'error',
+      };
+    }
+
+    return undefined;
+  });
+}
diff --git a/src/main/core/agent-hooks/classifiers/cursor.ts b/src/main/core/agent-hooks/classifiers/cursor.ts
new file mode 100644
index 0000000000..5e5e38404c
--- /dev/null
+++ b/src/main/core/agent-hooks/classifiers/cursor.ts
@@ -0,0 +1,55 @@
+import { createProviderClassifier, type ClassificationResult } from './base';
+
+export function createCursorClassifier() {
+  return createProviderClassifier((text: string): ClassificationResult => {
+    const tail = text.slice(-500);
+
+    // Permission/approval prompts
+    if (/approve|reject|permission|allow|confirm/i.test(tail)) {
+      return {
+        type: 'notification',
+        notificationType: 'permission_prompt',
+      };
+    }
+
+    // Idle/ready prompts
+    if (/Add a follow-up/i.test(tail)) {
+      return {
+        type: 'notification',
+        notificationType: 'idle_prompt',
+      };
+    }
+
+    if (/Auto\s*[\r\n]+\s*\/\s*commands/i.test(tail)) {
+      return {
+        type: 'notification',
+        notificationType: 'idle_prompt',
+      };
+    }
+
+    // Auth success
+    if (/Successfully authenticated|Login successful/i.test(text)) {
+      return {
+        type: 'notification',
+        notificationType: 'auth_success',
+      };
+    }
+
+    // Questions/elicitation
+    if (/What.*\?|How.*\?|Which.*\?|Please (provide|specify|clarify)/i.test(tail)) {
+      return {
+        type: 'notification',
+        notificationType: 'elicitation_dialog',
+      };
+    }
+
+    // Error detection
+    if (/error:|fatal:|exception|failed/i.test(text)) {
+      return {
+        type: 'error',
+      };
+    }
+
+    return undefined;
+  });
+}
diff --git a/src/main/core/agent-hooks/classifiers/droid.ts b/src/main/core/agent-hooks/classifiers/droid.ts
new file mode 100644
index 0000000000..e5c4a28838
--- /dev/null
+++ b/src/main/core/agent-hooks/classifiers/droid.ts
@@ -0,0 +1,48 @@
+import { createProviderClassifier, type ClassificationResult } from './base';
+
+export function createDroidClassifier() {
+  return createProviderClassifier((text: string): ClassificationResult => {
+    const tail = text.slice(-500);
+
+    // Permission/approval prompts
+    if (/approve|reject|permission|allow|confirm/i.test(tail)) {
+      return {
+        type: 'notification',
+        notificationType: 'permission_prompt',
+      };
+    }
+
+    // Idle/ready prompts
+    if (/Ready|Awaiting|Press Enter/i.test(tail)) {
+      return {
+        type: 'notification',
+        notificationType: 'idle_prompt',
+      };
+    }
+
+    // Auth success
+    if (/Successfully authenticated|Login successful|API key valid/i.test(text)) {
+      return {
+        type: 'notification',
+        notificationType: 'auth_success',
+      };
+    }
+
+    // Questions/elicitation
+    if (/What.*\?|How.*\?|Which.*\?|Please (provide|specify|clarify)/i.test(tail)) {
+      return {
+        type: 'notification',
+        notificationType: 'elicitation_dialog',
+      };
+    }
+
+    // Error detection
+    if (/error:|fatal:|exception|failed/i.test(text)) {
+      return {
+        type: 'error',
+      };
+    }
+
+    return undefined;
+  });
+}
diff --git a/src/main/core/agent-hooks/classifiers/gemini.ts b/src/main/core/agent-hooks/classifiers/gemini.ts
new file mode 100644
index 0000000000..5371ac5b62
--- /dev/null
+++ b/src/main/core/agent-hooks/classifiers/gemini.ts
@@ -0,0 +1,23 @@
+import { createProviderClassifier, type ClassificationResult } from './base';
+
+export function createGeminiClassifier() {
+  return createProviderClassifier((text: string): ClassificationResult => {
+    const tail = text.slice(-500);
+
+    if (/Action Required/i.test(tail)) {
+      return {
+        type: 'notification',
+        notificationType: 'permission_prompt',
+      };
+    }
+
+    if (/\[INSERT\]|\[NORMAL\]/.test(tail)) {
+      return {
+        type: 'notification',
+        notificationType: 'idle_prompt',
+      };
+    }
+
+    return undefined;
+  });
+}
diff --git a/src/main/core/agent-hooks/classifiers/generic.ts b/src/main/core/agent-hooks/classifiers/generic.ts
new file mode 100644
index 0000000000..efb6e10c35
--- /dev/null
+++ b/src/main/core/agent-hooks/classifiers/generic.ts
@@ -0,0 +1,74 @@
+import { createProviderClassifier, type ClassificationResult } from './base';
+
+/**
+ * Generic fallback classifier for providers without specific patterns.
+ * Uses common patterns across most CLI agents.
+ */
+export function createGenericClassifier() {
+  return createProviderClassifier((text: string): ClassificationResult => {
+    const tail = text.slice(-500);
+
+    // Permission/approval prompts (y/n, confirm, approve, etc.)
+    if (/\[y\/n\]|\[Y\/N\]|Continue\?/i.test(tail)) {
+      return {
+        type: 'notification',
+        notificationType: 'permission_prompt',
+      };
+    }
+
+    if (/approve|reject|permission|allow|confirm/i.test(tail)) {
+      return {
+        type: 'notification',
+        notificationType: 'permission_prompt',
+      };
+    }
+
+    // Task completion (stop signal)
+    if (/✓|✔|Task completed|Finished|Done\./i.test(tail)) {
+      return {
+        type: 'stop',
+        message: 'Task completed',
+      };
+    }
+
+    // Idle/ready prompts
+    if (/Ready|Awaiting|Press Enter|Next command/i.test(tail)) {
+      return {
+        type: 'notification',
+        notificationType: 'idle_prompt',
+      };
+    }
+
+    if (/Add a follow-up/i.test(tail)) {
+      return {
+        type: 'notification',
+        notificationType: 'idle_prompt',
+      };
+    }
+
+    // Auth success
+    if (/Successfully authenticated|Login successful|API key (accepted|valid)/i.test(text)) {
+      return {
+        type: 'notification',
+        notificationType: 'auth_success',
+      };
+    }
+
+    // Questions/elicitation
+    if (/What.*\?|How.*\?|Which.*\?|Please (provide|specify|clarify)/i.test(tail)) {
+      return {
+        type: 'notification',
+        notificationType: 'elicitation_dialog',
+      };
+    }
+
+    // Error detection
+    if (/error:|fatal:|exception|failed/i.test(text)) {
+      return {
+        type: 'error',
+      };
+    }
+
+    return undefined;
+  });
+}
diff --git a/src/main/core/agent-hooks/classifiers/goose.ts b/src/main/core/agent-hooks/classifiers/goose.ts
new file mode 100644
index 0000000000..4aafa8a87e
--- /dev/null
+++ b/src/main/core/agent-hooks/classifiers/goose.ts
@@ -0,0 +1,63 @@
+import { createProviderClassifier, type ClassificationResult } from './base';
+
+export function createGooseClassifier() {
+  return createProviderClassifier((text: string): ClassificationResult => {
+    const tail = text.slice(-500);
+
+    // Permission/approval prompts
+    if (/approve|reject|permission|allow|confirm/i.test(tail)) {
+      return {
+        type: 'notification',
+        notificationType: 'permission_prompt',
+      };
+    }
+
+    // Session started/resumed could be idle
+    if (/Session.*started|Session.*resumed/i.test(tail)) {
+      return {
+        type: 'notification',
+        notificationType: 'idle_prompt',
+      };
+    }
+
+    // Idle/ready prompts
+    if (/Ready|Awaiting|Press Enter/i.test(tail)) {
+      return {
+        type: 'notification',
+        notificationType: 'idle_prompt',
+      };
+    }
+
+    if (/goose\s*>/i.test(tail)) {
+      return {
+        type: 'notification',
+        notificationType: 'idle_prompt',
+      };
+    }
+
+    // Auth success
+    if (/Successfully authenticated|Login successful/i.test(text)) {
+      return {
+        type: 'notification',
+        notificationType: 'auth_success',
+      };
+    }
+
+    // Questions/elicitation
+    if (/What.*\?|How can I|Choose/i.test(tail)) {
+      return {
+        type: 'notification',
+        notificationType: 'elicitation_dialog',
+      };
+    }
+
+    // Error detection
+    if (/error:|fatal:|exception|failed/i.test(text)) {
+      return {
+        type: 'error',
+      };
+    }
+
+    return undefined;
+  });
+}
diff --git a/src/main/core/agent-hooks/classifiers/index.ts b/src/main/core/agent-hooks/classifiers/index.ts
new file mode 100644
index 0000000000..a35dd63cec
--- /dev/null
+++ b/src/main/core/agent-hooks/classifiers/index.ts
@@ -0,0 +1,53 @@
+import type { AgentProviderId } from '@shared/agent-provider-registry';
+import { createAmpClassifier } from './amp';
+import { createAuggieClassifier } from './auggie';
+import { createAutohandClassifier } from './autohand';
+import type { ProviderClassifier } from './base';
+import { createCharmClassifier } from './charm';
+import { createClineClassifier } from './cline';
+import { createCodebuffClassifier } from './codebuff';
+import { createContinueClassifier } from './continue';
+import { createCopilotClassifier } from './copilot';
+import { createCursorClassifier } from './cursor';
+import { createDroidClassifier } from './droid';
+import { createGeminiClassifier } from './gemini';
+import { createGenericClassifier } from './generic';
+import { createGooseClassifier } from './goose';
+import { createKilocodeClassifier } from './kilocode';
+import { createKimiClassifier } from './kimi';
+import { createKiroClassifier } from './kiro';
+import { createMistralClassifier } from './mistral';
+import { createOpenCodeClassifier } from './opencode';
+import { createPiClassifier } from './pi';
+import { createQwenClassifier } from './qwen';
+import { createRovoClassifier } from './rovo';
+
+export type { ProviderClassifier, ClassificationResult } from './base';
+
+const classifierFactories: Partial<Record<AgentProviderId, () => ProviderClassifier>> = {
+  amp: createAmpClassifier,
+  auggie: createAuggieClassifier,
+  autohand: createAutohandClassifier,
+  charm: createCharmClassifier,
+  cline: createClineClassifier,
+  codebuff: createCodebuffClassifier,
+  continue: createContinueClassifier,
+  copilot: createCopilotClassifier,
+  cursor: createCursorClassifier,
+  droid: createDroidClassifier,
+  gemini: createGeminiClassifier,
+  goose: createGooseClassifier,
+  kilocode: createKilocodeClassifier,
+  kimi: createKimiClassifier,
+  kiro: createKiroClassifier,
+  mistral: createMistralClassifier,
+  opencode: createOpenCodeClassifier,
+  pi: createPiClassifier,
+  qwen: createQwenClassifier,
+  rovo: createRovoClassifier,
+};
+
+export function createClassifier(providerId: AgentProviderId): ProviderClassifier {
+  const factory = classifierFactories[providerId];
+  return factory ? factory() : createGenericClassifier();
+}
diff --git a/src/main/core/agent-hooks/classifiers/kilocode.ts b/src/main/core/agent-hooks/classifiers/kilocode.ts
new file mode 100644
index 0000000000..a21405575d
--- /dev/null
+++ b/src/main/core/agent-hooks/classifiers/kilocode.ts
@@ -0,0 +1,77 @@
+import { createProviderClassifier, type ClassificationResult } from './base';
+
+export function createKilocodeClassifier() {
+  return createProviderClassifier((text: string): ClassificationResult => {
+    const tail = text.slice(-500);
+
+    // Permission/approval prompts
+    if (/approve|reject|permission|allow|confirm/i.test(tail)) {
+      return {
+        type: 'notification',
+        notificationType: 'permission_prompt',
+      };
+    }
+
+    // Task completion (potential stop signal)
+    if (/✓\s*Task Completed|Checkpoint Saved/i.test(tail)) {
+      return {
+        type: 'stop',
+        message: 'Task completed',
+      };
+    }
+
+    // Idle/ready prompts
+    if (/Type a message or \/command/i.test(tail)) {
+      return {
+        type: 'notification',
+        notificationType: 'idle_prompt',
+      };
+    }
+
+    if (/What would you like to work on/i.test(tail)) {
+      return {
+        type: 'notification',
+        notificationType: 'idle_prompt',
+      };
+    }
+
+    if (/Ready|Awaiting|Press Enter|Next command/i.test(tail)) {
+      return {
+        type: 'notification',
+        notificationType: 'idle_prompt',
+      };
+    }
+
+    if (/\/help for commands|\/mode to switch mode|! for shell mode/i.test(tail)) {
+      return {
+        type: 'notification',
+        notificationType: 'idle_prompt',
+      };
+    }
+
+    // Auth success
+    if (/Successfully authenticated|Login successful/i.test(text)) {
+      return {
+        type: 'notification',
+        notificationType: 'auth_success',
+      };
+    }
+
+    // Questions/elicitation
+    if (/What.*\?|How.*\?|Which.*\?|Please (provide|specify|clarify)/i.test(tail)) {
+      return {
+        type: 'notification',
+        notificationType: 'elicitation_dialog',
+      };
+    }
+
+    // Error detection
+    if (/error:|fatal:|exception|failed/i.test(text)) {
+      return {
+        type: 'error',
+      };
+    }
+
+    return undefined;
+  });
+}
diff --git a/src/main/core/agent-hooks/classifiers/kimi.ts b/src/main/core/agent-hooks/classifiers/kimi.ts
new file mode 100644
index 0000000000..5f97bb875a
--- /dev/null
+++ b/src/main/core/agent-hooks/classifiers/kimi.ts
@@ -0,0 +1,55 @@
+import { createProviderClassifier, type ClassificationResult } from './base';
+
+export function createKimiClassifier() {
+  return createProviderClassifier((text: string): ClassificationResult => {
+    const tail = text.slice(-500);
+
+    // Permission/approval prompts
+    if (/approve|reject|permission|allow|confirm/i.test(tail)) {
+      return {
+        type: 'notification',
+        notificationType: 'permission_prompt',
+      };
+    }
+
+    // Idle/ready prompts
+    if (/Ready|Awaiting|Press Enter|Next command|\/help|\/setup/i.test(tail)) {
+      return {
+        type: 'notification',
+        notificationType: 'idle_prompt',
+      };
+    }
+
+    if (/qwen\s*>/i.test(tail)) {
+      return {
+        type: 'notification',
+        notificationType: 'idle_prompt',
+      };
+    }
+
+    // Auth success
+    if (/Successfully authenticated|Login successful/i.test(text)) {
+      return {
+        type: 'notification',
+        notificationType: 'auth_success',
+      };
+    }
+
+    // Questions/elicitation
+    if (/What.*\?|How can I|Please.*:/i.test(tail)) {
+      return {
+        type: 'notification',
+        notificationType: 'elicitation_dialog',
+      };
+    }
+
+    // Error detection
+    if (/error:|fatal:|exception|failed/i.test(text)) {
+      return {
+        type: 'error',
+      };
+    }
+
+    return undefined;
+  });
+}
diff --git a/src/main/core/agent-hooks/classifiers/kiro.ts b/src/main/core/agent-hooks/classifiers/kiro.ts
new file mode 100644
index 0000000000..23b90023a5
--- /dev/null
+++ b/src/main/core/agent-hooks/classifiers/kiro.ts
@@ -0,0 +1,48 @@
+import { createProviderClassifier, type ClassificationResult } from './base';
+
+export function createKiroClassifier() {
+  return createProviderClassifier((text: string): ClassificationResult => {
+    const tail = text.slice(-500);
+
+    // Permission/approval prompts
+    if (/approve|reject|permission|allow|confirm/i.test(tail)) {
+      return {
+        type: 'notification',
+        notificationType: 'permission_prompt',
+      };
+    }
+
+    // Idle/ready prompts
+    if (/Ready|Awaiting|Press Enter|Next command|Kiro CLI/i.test(tail)) {
+      return {
+        type: 'notification',
+        notificationType: 'idle_prompt',
+      };
+    }
+
+    // Auth success
+    if (/Successfully authenticated|Login successful/i.test(text)) {
+      return {
+        type: 'notification',
+        notificationType: 'auth_success',
+      };
+    }
+
+    // Questions/elicitation
+    if (/What.*\?|How.*\?|Which.*\?|Please (provide|specify|clarify)/i.test(tail)) {
+      return {
+        type: 'notification',
+        notificationType: 'elicitation_dialog',
+      };
+    }
+
+    // Error detection
+    if (/error:|fatal:|exception|failed/i.test(text)) {
+      return {
+        type: 'error',
+      };
+    }
+
+    return undefined;
+  });
+}
diff --git a/src/main/core/agent-hooks/classifiers/mistral.ts b/src/main/core/agent-hooks/classifiers/mistral.ts
new file mode 100644
index 0000000000..b8f0aeb6ce
--- /dev/null
+++ b/src/main/core/agent-hooks/classifiers/mistral.ts
@@ -0,0 +1,77 @@
+import { createProviderClassifier, type ClassificationResult } from './base';
+
+export function createMistralClassifier() {
+  return createProviderClassifier((text: string): ClassificationResult => {
+    const tail = text.slice(-500);
+
+    // Permission/approval prompts (y/n confirmations)
+    if (/\[y\/n\]|\[Y\/N\]|Continue\?|Approve|Reject|Cancel/i.test(tail)) {
+      return {
+        type: 'notification',
+        notificationType: 'permission_prompt',
+      };
+    }
+
+    // Task completion
+    if (/✓|✔|Completed|Finished|Done\.|Task completed/i.test(tail)) {
+      return {
+        type: 'stop',
+        message: 'Task completed',
+      };
+    }
+
+    // Idle/ready prompts
+    if (/Type.*message|Enter.*prompt/i.test(tail)) {
+      return {
+        type: 'notification',
+        notificationType: 'idle_prompt',
+      };
+    }
+
+    if (/What would you like|How can I help/i.test(tail)) {
+      return {
+        type: 'notification',
+        notificationType: 'idle_prompt',
+      };
+    }
+
+    if (/Ready|Awaiting|Press Enter|Next command/i.test(tail)) {
+      return {
+        type: 'notification',
+        notificationType: 'idle_prompt',
+      };
+    }
+
+    if (/\bvibe\s*>|›|»|>/i.test(tail) && tail.length < 100) {
+      return {
+        type: 'notification',
+        notificationType: 'idle_prompt',
+      };
+    }
+
+    // Auth success
+    if (/Successfully authenticated|Login successful|API key accepted/i.test(text)) {
+      return {
+        type: 'notification',
+        notificationType: 'auth_success',
+      };
+    }
+
+    // Questions/elicitation
+    if (/What.*\?|Please.*:/i.test(tail)) {
+      return {
+        type: 'notification',
+        notificationType: 'elicitation_dialog',
+      };
+    }
+
+    // Error detection
+    if (/error:|fatal:|exception|failed/i.test(text)) {
+      return {
+        type: 'error',
+      };
+    }
+
+    return undefined;
+  });
+}
diff --git a/src/main/core/agent-hooks/classifiers/opencode.ts b/src/main/core/agent-hooks/classifiers/opencode.ts
new file mode 100644
index 0000000000..571af4e163
--- /dev/null
+++ b/src/main/core/agent-hooks/classifiers/opencode.ts
@@ -0,0 +1,48 @@
+import { createProviderClassifier, type ClassificationResult } from './base';
+
+export function createOpenCodeClassifier() {
+  return createProviderClassifier((text: string): ClassificationResult => {
+    const tail = text.slice(-500);
+
+    // Permission/approval prompts
+    if (/approve|reject|permission|allow|confirm/i.test(tail)) {
+      return {
+        type: 'notification',
+        notificationType: 'permission_prompt',
+      };
+    }
+
+    // Idle/ready prompts
+    if (/Ready|Awaiting|Press Enter|Next command|Type your message/i.test(tail)) {
+      return {
+        type: 'notification',
+        notificationType: 'idle_prompt',
+      };
+    }
+
+    // Auth success
+    if (/Successfully authenticated|Login successful/i.test(text)) {
+      return {
+        type: 'notification',
+        notificationType: 'auth_success',
+      };
+    }
+
+    // Questions/elicitation
+    if (/What.*\?|How.*\?|Which.*\?|Please (provide|specify|clarify)/i.test(tail)) {
+      return {
+        type: 'notification',
+        notificationType: 'elicitation_dialog',
+      };
+    }
+
+    // Error detection
+    if (/error:|fatal:|exception|failed/i.test(text)) {
+      return {
+        type: 'error',
+      };
+    }
+
+    return undefined;
+  });
+}
diff --git a/src/main/core/agent-hooks/classifiers/pi.ts b/src/main/core/agent-hooks/classifiers/pi.ts
new file mode 100644
index 0000000000..da1038dbd6
--- /dev/null
+++ b/src/main/core/agent-hooks/classifiers/pi.ts
@@ -0,0 +1,48 @@
+import { createProviderClassifier, type ClassificationResult } from './base';
+
+export function createPiClassifier() {
+  return createProviderClassifier((text: string): ClassificationResult => {
+    const tail = text.slice(-500);
+
+    // Permission/approval prompts
+    if (/approve|reject|permission|allow|confirm/i.test(tail)) {
+      return {
+        type: 'notification',
+        notificationType: 'permission_prompt',
+      };
+    }
+
+    // Idle/ready prompts
+    if (/Ready|Awaiting|Press Enter|Next command/i.test(tail)) {
+      return {
+        type: 'notification',
+        notificationType: 'idle_prompt',
+      };
+    }
+
+    // Auth success
+    if (/Successfully authenticated|Login successful/i.test(text)) {
+      return {
+        type: 'notification',
+        notificationType: 'auth_success',
+      };
+    }
+
+    // Questions/elicitation
+    if (/What.*\?|How.*\?|Which.*\?|Please (provide|specify|clarify)/i.test(tail)) {
+      return {
+        type: 'notification',
+        notificationType: 'elicitation_dialog',
+      };
+    }
+
+    // Error detection
+    if (/error:|fatal:|exception|failed/i.test(text)) {
+      return {
+        type: 'error',
+      };
+    }
+
+    return undefined;
+  });
+}
diff --git a/src/main/core/agent-hooks/classifiers/qwen.ts b/src/main/core/agent-hooks/classifiers/qwen.ts
new file mode 100644
index 0000000000..55fe8f7996
--- /dev/null
+++ b/src/main/core/agent-hooks/classifiers/qwen.ts
@@ -0,0 +1,63 @@
+import { createProviderClassifier, type ClassificationResult } from './base';
+
+export function createQwenClassifier() {
+  return createProviderClassifier((text: string): ClassificationResult => {
+    const tail = text.slice(-500);
+
+    // Permission/approval prompts
+    if (/approve|reject|permission|allow|confirm/i.test(tail)) {
+      return {
+        type: 'notification',
+        notificationType: 'permission_prompt',
+      };
+    }
+
+    // Task completion
+    if (/Task completed|Finished/i.test(tail)) {
+      return {
+        type: 'stop',
+        message: 'Task completed',
+      };
+    }
+
+    // Idle/ready prompts
+    if (/Ready|Awaiting|Press Enter|Next command/i.test(tail)) {
+      return {
+        type: 'notification',
+        notificationType: 'idle_prompt',
+      };
+    }
+
+    if (/qwen\s*>/i.test(tail)) {
+      return {
+        type: 'notification',
+        notificationType: 'idle_prompt',
+      };
+    }
+
+    // Auth success
+    if (/Successfully authenticated|Login successful/i.test(text)) {
+      return {
+        type: 'notification',
+        notificationType: 'auth_success',
+      };
+    }
+
+    // Questions/elicitation
+    if (/What.*\?|How can I|Please.*:/i.test(tail)) {
+      return {
+        type: 'notification',
+        notificationType: 'elicitation_dialog',
+      };
+    }
+
+    // Error detection
+    if (/error:|fatal:|exception|failed/i.test(text)) {
+      return {
+        type: 'error',
+      };
+    }
+
+    return undefined;
+  });
+}
diff --git a/src/main/core/agent-hooks/classifiers/rovo.ts b/src/main/core/agent-hooks/classifiers/rovo.ts
new file mode 100644
index 0000000000..a380742792
--- /dev/null
+++ b/src/main/core/agent-hooks/classifiers/rovo.ts
@@ -0,0 +1,48 @@
+import { createProviderClassifier, type ClassificationResult } from './base';
+
+export function createRovoClassifier() {
+  return createProviderClassifier((text: string): ClassificationResult => {
+    const tail = text.slice(-500);
+
+    // Permission/approval prompts
+    if (/approve|reject|permission|allow|confirm/i.test(tail)) {
+      return {
+        type: 'notification',
+        notificationType: 'permission_prompt',
+      };
+    }
+
+    // Idle/ready prompts
+    if (/Ready|Awaiting|Press Enter|Next command|rovodev/i.test(tail)) {
+      return {
+        type: 'notification',
+        notificationType: 'idle_prompt',
+      };
+    }
+
+    // Auth success (rovodev may show connecting/session messages)
+    if (/Successfully authenticated|Login successful|connected|session started/i.test(text)) {
+      return {
+        type: 'notification',
+        notificationType: 'auth_success',
+      };
+    }
+
+    // Questions/elicitation
+    if (/What.*\?|How.*\?|Which.*\?|Please (provide|specify|clarify)/i.test(tail)) {
+      return {
+        type: 'notification',
+        notificationType: 'elicitation_dialog',
+      };
+    }
+
+    // Error detection
+    if (/error:|fatal:|exception|failed/i.test(text)) {
+      return {
+        type: 'error',
+      };
+    }
+
+    return undefined;
+  });
+}
diff --git a/src/main/core/agent-hooks/claude-trust-service.test.ts b/src/main/core/agent-hooks/claude-trust-service.test.ts
new file mode 100644
index 0000000000..2c11e2787f
--- /dev/null
+++ b/src/main/core/agent-hooks/claude-trust-service.test.ts
@@ -0,0 +1,262 @@
+import path from 'node:path';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import {
+  FileSystemError,
+  FileSystemErrorCodes,
+  type FileSystemProvider,
+} from '@main/core/fs/types';
+import type { ExecFn } from '@main/core/utils/exec';
+import { ClaudeTrustService } from './claude-trust-service';
+
+const mockReadFile = vi.hoisted(() => vi.fn());
+const mockWriteFile = vi.hoisted(() => vi.fn());
+const mockRename = vi.hoisted(() => vi.fn());
+const mockRm = vi.hoisted(() => vi.fn());
+const mockWarn = vi.hoisted(() => vi.fn());
+
+vi.mock('node:fs', () => ({
+  promises: {
+    readFile: mockReadFile,
+    writeFile: mockWriteFile,
+    rename: mockRename,
+    rm: mockRm,
+  },
+}));
+
+vi.mock('@main/core/settings/settings-service', () => ({
+  appSettingsService: { get: vi.fn() },
+}));
+
+vi.mock('@main/lib/logger', () => ({
+  log: {
+    warn: mockWarn,
+    info: vi.fn(),
+    error: vi.fn(),
+    debug: vi.fn(),
+  },
+}));
+
+function notFound(pathName: string): FileSystemError {
+  return new FileSystemError(
+    `File not found: ${pathName}`,
+    FileSystemErrorCodes.NOT_FOUND,
+    pathName
+  );
+}
+
+function makeService(overrides: { autoTrustWorktrees?: boolean } = {}): ClaudeTrustService {
+  return new ClaudeTrustService({
+    getTaskSettings: () =>
+      Promise.resolve({ autoTrustWorktrees: overrides.autoTrustWorktrees ?? true }),
+  });
+}
+
+function makeRemoteFs(
+  overrides: Partial<Pick<FileSystemProvider, 'realPath' | 'read' | 'write'>> = {}
+): Pick<FileSystemProvider, 'realPath' | 'read' | 'write'> {
+  return {
+    realPath: vi.fn(async (p: string) => p),
+    read: vi.fn().mockRejectedValue(notFound('/home/remote-user/.claude.json')),
+    write: vi.fn().mockResolvedValue({ success: true, bytesWritten: 0 }),
+    ...overrides,
+  };
+}
+
+describe('ClaudeTrustService', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+    mockReadFile.mockRejectedValue(Object.assign(new Error('not found'), { code: 'ENOENT' }));
+    mockWriteFile.mockResolvedValue(undefined);
+    mockRename.mockResolvedValue(undefined);
+    mockRm.mockResolvedValue(undefined);
+  });
+
+  it('skips non-Claude providers', async () => {
+    const service = makeService();
+
+    await service.maybeAutoTrustLocal({
+      providerId: 'codex',
+      cwd: '/tmp/worktree',
+      homedir: '/home/local-user',
+    });
+
+    expect(mockReadFile).not.toHaveBeenCalled();
+    expect(mockWriteFile).not.toHaveBeenCalled();
+  });
+
+  it('skips when auto-trust is disabled', async () => {
+    const service = makeService({ autoTrustWorktrees: false });
+
+    await service.maybeAutoTrustLocal({
+      providerId: 'claude',
+      cwd: '/tmp/worktree',
+      homedir: '/home/local-user',
+    });
+
+    expect(mockReadFile).not.toHaveBeenCalled();
+    expect(mockWriteFile).not.toHaveBeenCalled();
+  });
+
+  it('writes local config atomically when missing', async () => {
+    const service = makeService();
+    const relPath = './relative/path';
+
+    await service.maybeAutoTrustLocal({
+      providerId: 'claude',
+      cwd: relPath,
+      homedir: '/home/local-user',
+    });
+
+    expect(mockWriteFile).toHaveBeenCalledTimes(1);
+    expect(mockRename).toHaveBeenCalledTimes(1);
+
+    const [tmpPath, content] = mockWriteFile.mock.calls[0];
+    const [renameFrom, renameTo] = mockRename.mock.calls[0];
+    expect(tmpPath).toContain('/home/local-user/.claude.json.');
+    expect(tmpPath).toContain('.tmp');
+    expect(renameFrom).toBe(tmpPath);
+    expect(renameTo).toBe('/home/local-user/.claude.json');
+
+    const written = JSON.parse(String(content));
+    expect(written.projects[path.resolve(relPath)]).toEqual({
+      hasTrustDialogAccepted: true,
+      hasCompletedProjectOnboarding: true,
+    });
+  });
+
+  it('is idempotent when already trusted', async () => {
+    const service = makeService();
+    const trustedPath = '/already/trusted';
+    mockReadFile.mockResolvedValue(
+      JSON.stringify({
+        projects: {
+          [trustedPath]: {
+            hasTrustDialogAccepted: true,
+            hasCompletedProjectOnboarding: true,
+          },
+        },
+      })
+    );
+
+    await service.maybeAutoTrustLocal({
+      providerId: 'claude',
+      cwd: trustedPath,
+      homedir: '/home/local-user',
+    });
+
+    expect(mockWriteFile).not.toHaveBeenCalled();
+    expect(mockRename).not.toHaveBeenCalled();
+  });
+
+  it('refuses to overwrite corrupt JSON and logs a warning', async () => {
+    const service = makeService();
+    mockReadFile.mockResolvedValue('{ invalid json');
+
+    await service.maybeAutoTrustLocal({
+      providerId: 'claude',
+      cwd: '/tmp/worktree',
+      homedir: '/home/local-user',
+    });
+
+    expect(mockWriteFile).not.toHaveBeenCalled();
+    expect(mockRename).not.toHaveBeenCalled();
+    expect(mockWarn).toHaveBeenCalledWith(
+      'ClaudeTrustService: refusing to overwrite corrupt Claude config',
+      expect.objectContaining({ error: expect.any(String) })
+    );
+  });
+
+  it('refuses to overwrite non-object config root', async () => {
+    const service = makeService();
+    mockReadFile.mockResolvedValue(JSON.stringify([1, 2, 3]));
+
+    await service.maybeAutoTrustLocal({
+      providerId: 'claude',
+      cwd: '/tmp/worktree',
+      homedir: '/home/local-user',
+    });
+
+    expect(mockWriteFile).not.toHaveBeenCalled();
+    expect(mockWarn).toHaveBeenCalledWith(
+      'ClaudeTrustService: refusing to overwrite non-object Claude config root'
+    );
+  });
+
+  it('serializes concurrent calls so no trust entry is lost', async () => {
+    const service = makeService();
+    let callCount = 0;
+
+    mockReadFile.mockImplementation(async () => {
+      callCount++;
+      if (callCount === 1) return null;
+      const [, content] = mockWriteFile.mock.calls[0];
+      return String(content);
+    });
+
+    await Promise.all([
+      service.maybeAutoTrustLocal({
+        providerId: 'claude',
+        cwd: '/worktree/a',
+        homedir: '/home/local-user',
+      }),
+      service.maybeAutoTrustLocal({
+        providerId: 'claude',
+        cwd: '/worktree/b',
+        homedir: '/home/local-user',
+      }),
+    ]);
+
+    expect(mockWriteFile).toHaveBeenCalledTimes(2);
+    const secondWriteContent = JSON.parse(String(mockWriteFile.mock.calls[1][1]));
+    expect(secondWriteContent.projects[path.resolve('/worktree/a')]).toEqual({
+      hasTrustDialogAccepted: true,
+      hasCompletedProjectOnboarding: true,
+    });
+    expect(secondWriteContent.projects[path.resolve('/worktree/b')]).toEqual({
+      hasTrustDialogAccepted: true,
+      hasCompletedProjectOnboarding: true,
+    });
+  });
+
+  it('writes ssh config and renames tmp file remotely', async () => {
+    const service = makeService();
+    const remoteFs = makeRemoteFs({
+      realPath: vi.fn().mockResolvedValue('/remote/worktree'),
+    });
+
+    const exec: ExecFn = vi
+      .fn()
+      .mockImplementation(async (command: string, args: string[] = []) => {
+        if (command === 'sh') {
+          return { stdout: '/home/remote-user', stderr: '' };
+        }
+        if (command === 'mv') {
+          expect(args[0]).toContain('/home/remote-user/.claude.json.');
+          expect(args[1]).toBe('/home/remote-user/.claude.json');
+          return { stdout: '', stderr: '' };
+        }
+        return { stdout: '', stderr: '' };
+      });
+
+    await service.maybeAutoTrustSsh({
+      providerId: 'claude',
+      cwd: '/remote/worktree',
+      exec,
+      remoteFs,
+    });
+
+    expect(remoteFs.read).toHaveBeenCalledWith(
+      '/home/remote-user/.claude.json',
+      expect.any(Number)
+    );
+    expect(remoteFs.write).toHaveBeenCalledTimes(1);
+    const [tmpPath, content] = vi.mocked(remoteFs.write).mock.calls[0];
+    expect(tmpPath).toContain('/home/remote-user/.claude.json.');
+    const written = JSON.parse(String(content));
+    expect(written.projects['/remote/worktree']).toEqual({
+      hasTrustDialogAccepted: true,
+      hasCompletedProjectOnboarding: true,
+    });
+    expect(exec).toHaveBeenCalledWith('mv', [tmpPath, '/home/remote-user/.claude.json']);
+  });
+});
diff --git a/src/main/core/agent-hooks/claude-trust-service.ts b/src/main/core/agent-hooks/claude-trust-service.ts
new file mode 100644
index 0000000000..745fec9ec2
--- /dev/null
+++ b/src/main/core/agent-hooks/claude-trust-service.ts
@@ -0,0 +1,219 @@
+import { randomUUID } from 'node:crypto';
+import { promises as fs } from 'node:fs';
+import path from 'node:path';
+import type { AgentProviderId } from '@shared/agent-provider-registry';
+import {
+  FileSystemError,
+  FileSystemErrorCodes,
+  type FileSystemProvider,
+} from '@main/core/fs/types';
+import { appSettingsService } from '@main/core/settings/settings-service';
+import { resolveRemoteHome } from '@main/core/ssh/utils';
+import type { ExecFn } from '@main/core/utils/exec';
+import { log } from '@main/lib/logger';
+
+const CLAUDE_PROVIDER_ID: AgentProviderId = 'claude';
+const CLAUDE_CONFIG_NAME = '.claude.json';
+const CLAUDE_CONFIG_MAX_BYTES = 2 * 1024 * 1024;
+
+export class ClaudeTrustService {
+  private readonly configLocks = new Map<string, Promise<void>>();
+
+  constructor(
+    private readonly deps: {
+      getTaskSettings: () => Promise<{ autoTrustWorktrees: boolean }>;
+    }
+  ) {}
+
+  async maybeAutoTrustLocal({
+    providerId,
+    cwd,
+    homedir,
+  }: {
+    providerId: AgentProviderId;
+    cwd?: string;
+    homedir: string;
+  }): Promise<void> {
+    if (!cwd) return;
+    if (!(await this.shouldAutoTrust(providerId))) return;
+    const normalizedPath = path.resolve(cwd);
+    const configPath = path.join(homedir, CLAUDE_CONFIG_NAME);
+    await this.withLock(configPath, () =>
+      this.ensureTrusted(normalizedPath, {
+        readConfig: () => readLocalConfig(configPath),
+        writeConfig: (content) => writeLocalConfigAtomic(configPath, content),
+      })
+    );
+  }
+
+  async maybeAutoTrustSsh({
+    providerId,
+    cwd,
+    exec,
+    remoteFs,
+  }: {
+    providerId: AgentProviderId;
+    cwd?: string;
+    exec: ExecFn;
+    remoteFs: Pick<FileSystemProvider, 'realPath' | 'read' | 'write'>;
+  }): Promise<void> {
+    if (!cwd) return;
+    if (!(await this.shouldAutoTrust(providerId))) return;
+
+    const normalizedPath = await remoteFs.realPath(cwd).catch(() => path.posix.resolve('/', cwd));
+    const homeDir = await resolveRemoteHome(exec);
+    const configPath = path.posix.join(homeDir, CLAUDE_CONFIG_NAME);
+
+    await this.withLock(configPath, () =>
+      this.ensureTrusted(normalizedPath, {
+        readConfig: () => readRemoteConfig(remoteFs, configPath),
+        writeConfig: (content) => writeRemoteConfigAtomic(remoteFs, exec, configPath, content),
+      })
+    );
+  }
+
+  private async shouldAutoTrust(providerId: AgentProviderId): Promise<boolean> {
+    if (providerId !== CLAUDE_PROVIDER_ID) return false;
+    const { autoTrustWorktrees } = await this.deps.getTaskSettings();
+    return autoTrustWorktrees;
+  }
+
+  private withLock(configPath: string, fn: () => Promise<void>): Promise<void> {
+    const prev = this.configLocks.get(configPath) ?? Promise.resolve();
+    const next = prev.then(fn, fn);
+    this.configLocks.set(configPath, next);
+    return next;
+  }
+
+  private async ensureTrusted(
+    normalizedPath: string,
+    io: {
+      readConfig: () => Promise<string | null>;
+      writeConfig: (content: string) => Promise<void>;
+    }
+  ): Promise<void> {
+    try {
+      const rawConfig = await io.readConfig();
+      const config = parseConfig(rawConfig);
+      if (!config) return;
+      const nextConfig = withTrustedProject(config, normalizedPath);
+      if (!nextConfig) return;
+      await io.writeConfig(JSON.stringify(nextConfig, null, 2) + '\n');
+    } catch (error: unknown) {
+      log.warn('ClaudeTrustService: failed to auto-trust worktree', {
+        path: normalizedPath,
+        error: String(error),
+      });
+    }
+  }
+}
+
+export const claudeTrustService = new ClaudeTrustService({
+  getTaskSettings: () => appSettingsService.get('tasks'),
+});
+
+function parseConfig(raw: string | null): Record<string, unknown> | null {
+  if (!raw || raw.trim() === '') return {};
+
+  try {
+    const parsed = JSON.parse(raw);
+    if (isPlainObject(parsed)) return parsed;
+    log.warn('ClaudeTrustService: refusing to overwrite non-object Claude config root');
+    return null;
+  } catch (error: unknown) {
+    log.warn('ClaudeTrustService: refusing to overwrite corrupt Claude config', {
+      error: String(error),
+    });
+    return null;
+  }
+}
+
+function withTrustedProject(
+  config: Record<string, unknown>,
+  worktreePath: string
+): Record<string, unknown> | null {
+  const projects = isPlainObject(config.projects) ? config.projects : {};
+  const existing = isPlainObject(projects[worktreePath]) ? projects[worktreePath] : {};
+
+  const alreadyTrusted =
+    existing['hasTrustDialogAccepted'] === true &&
+    existing['hasCompletedProjectOnboarding'] === true;
+  if (alreadyTrusted) return null;
+
+  return {
+    ...config,
+    projects: {
+      ...projects,
+      [worktreePath]: {
+        ...existing,
+        hasTrustDialogAccepted: true,
+        hasCompletedProjectOnboarding: true,
+      },
+    },
+  };
+}
+
+async function readLocalConfig(configPath: string): Promise<string | null> {
+  try {
+    return await fs.readFile(configPath, 'utf8');
+  } catch (error: unknown) {
+    if (isNodeNotFound(error)) return null;
+    throw error;
+  }
+}
+
+async function writeLocalConfigAtomic(configPath: string, content: string): Promise<void> {
+  const tmpPath = `${configPath}.${randomUUID()}.tmp`;
+  try {
+    await fs.writeFile(tmpPath, content, 'utf8');
+    await fs.rename(tmpPath, configPath);
+  } catch (error: unknown) {
+    try {
+      await fs.rm(tmpPath, { force: true });
+    } catch {}
+    throw error;
+  }
+}
+
+async function readRemoteConfig(
+  remoteFs: Pick<FileSystemProvider, 'read'>,
+  configPath: string
+): Promise<string | null> {
+  try {
+    const result = await remoteFs.read(configPath, CLAUDE_CONFIG_MAX_BYTES);
+    return result.content;
+  } catch (error: unknown) {
+    if (isFsNotFound(error)) return null;
+    throw error;
+  }
+}
+
+async function writeRemoteConfigAtomic(
+  remoteFs: Pick<FileSystemProvider, 'write'>,
+  exec: ExecFn,
+  configPath: string,
+  content: string
+): Promise<void> {
+  const tmpPath = `${configPath}.${randomUUID()}.tmp`;
+  try {
+    await remoteFs.write(tmpPath, content);
+    await exec('mv', [tmpPath, configPath]);
+  } catch (error: unknown) {
+    try {
+      await exec('rm', ['-f', tmpPath]);
+    } catch {}
+    throw error;
+  }
+}
+
+function isNodeNotFound(error: unknown): boolean {
+  return (error as NodeJS.ErrnoException)?.code === 'ENOENT';
+}
+
+function isFsNotFound(error: unknown): boolean {
+  return error instanceof FileSystemError && error.code === FileSystemErrorCodes.NOT_FOUND;
+}
+
+function isPlainObject(value: unknown): value is Record<string, unknown> {
+  return typeof value === 'object' && value !== null && !Array.isArray(value);
+}
diff --git a/src/main/core/agent-hooks/event-enricher.ts b/src/main/core/agent-hooks/event-enricher.ts
new file mode 100644
index 0000000000..a5ec2e29b2
--- /dev/null
+++ b/src/main/core/agent-hooks/event-enricher.ts
@@ -0,0 +1,56 @@
+import { eq } from 'drizzle-orm';
+import type { AgentEvent } from '@shared/events/agentEvents';
+import { parsePtyId } from '@shared/ptyId';
+import { db } from '@main/db/client';
+import { conversations } from '@main/db/schema';
+import type { RawHookRequest } from './hook-server';
+
+function normalizePayload(
+  providerId: string,
+  body: Record<string, unknown>
+): AgentEvent['payload'] {
+  const payload: AgentEvent['payload'] = {
+    notificationType: (body.notification_type ??
+      body.notificationType) as AgentEvent['payload']['notificationType'],
+    lastAssistantMessage: (body.last_assistant_message ?? body.lastAssistantMessage) as
+      | string
+      | undefined,
+    title: body.title as string | undefined,
+    message: body.message as string | undefined,
+  };
+
+  if (!payload.notificationType && providerId === 'codex' && body.type === 'agent-turn-complete') {
+    payload.notificationType = 'idle_prompt';
+  }
+
+  return payload;
+}
+
+export async function enrichEvent(raw: RawHookRequest): Promise<AgentEvent> {
+  const parsed = parsePtyId(raw.ptyId);
+  if (!parsed) {
+    throw new Error(`Unrecognised ptyId: ${raw.ptyId}`);
+  }
+
+  const [convRows] = await db
+    .select({ taskId: conversations.taskId, projectId: conversations.projectId })
+    .from(conversations)
+    .where(eq(conversations.id, parsed.conversationId))
+    .limit(1);
+
+  const taskId = convRows.taskId;
+  const projectId = convRows.projectId;
+  const body = raw.body ? JSON.parse(raw.body) : {};
+  const payload = normalizePayload(parsed.providerId, body);
+
+  return {
+    type: raw.type as AgentEvent['type'],
+    ptyId: raw.ptyId,
+    providerId: parsed.providerId,
+    projectId,
+    conversationId: parsed.conversationId,
+    taskId,
+    timestamp: Date.now(),
+    payload,
+  };
+}
diff --git a/src/main/core/agent-hooks/hook-config.ts b/src/main/core/agent-hooks/hook-config.ts
new file mode 100644
index 0000000000..c2e2c4e072
--- /dev/null
+++ b/src/main/core/agent-hooks/hook-config.ts
@@ -0,0 +1,160 @@
+import * as toml from 'smol-toml';
+import type { AgentProviderId } from '@shared/agent-provider-registry';
+import { resolveCommandPath } from '@main/core/dependencies/probe';
+import type { FileSystemProvider } from '@main/core/fs/types';
+import type { ExecFn } from '@main/core/utils/exec';
+import { log } from '@main/lib/logger';
+
+const EMDASH_MARKER = 'EMDASH_HOOK_PORT';
+
+const CLAUDE_SETTINGS_PATH = '.claude/settings.local.json';
+const CODEX_CONFIG_PATH = '.codex/config.toml';
+const GITIGNORE_PATH = '.gitignore';
+type HookConfigWriteOptions = { writeGitIgnoreEntries?: boolean };
+
+const HOOK_EVENT_MAP = [
+  { eventType: 'notification', hookKey: 'Notification' },
+  { eventType: 'stop', hookKey: 'Stop' },
+] satisfies { eventType: string; hookKey: string }[];
+
+function makeClaudeHookCommand(eventType: string): string {
+  return (
+    'curl -sf -X POST ' +
+    '-H "Content-Type: application/json" ' +
+    '-H "X-Emdash-Token: $EMDASH_HOOK_TOKEN" ' +
+    '-H "X-Emdash-Pty-Id: $EMDASH_PTY_ID" ' +
+    `-H "X-Emdash-Event-Type: ${eventType}" ` +
+    '-d @- ' +
+    '"http://127.0.0.1:$EMDASH_HOOK_PORT/hook" || true'
+  );
+}
+
+function makeCodexNotifyCommand(): string[] {
+  return [
+    'bash',
+    '-c',
+    'curl -sf -X POST ' +
+      "-H 'Content-Type: application/json' " +
+      '-H "X-Emdash-Token: $EMDASH_HOOK_TOKEN" ' +
+      '-H "X-Emdash-Pty-Id: $EMDASH_PTY_ID" ' +
+      '-H "X-Emdash-Event-Type: notification" ' +
+      '-d "$1" ' +
+      '"http://127.0.0.1:$EMDASH_HOOK_PORT/hook" || true',
+    '_',
+  ];
+}
+
+export class HookConfigWriter {
+  constructor(
+    private readonly fs: FileSystemProvider,
+    private readonly exec: ExecFn
+  ) {}
+
+  async writeClaudeHooks(): Promise<boolean> {
+    if (!(await resolveCommandPath('claude', this.exec))) return false;
+
+    const config: Record<string, unknown> = await this.fs
+      .read(CLAUDE_SETTINGS_PATH)
+      .then((r) => JSON.parse(r.content) ?? {})
+      .catch(() => ({}));
+
+    const hooks = (config.hooks ?? {}) as Record<string, unknown[]>;
+
+    for (const { eventType, hookKey } of HOOK_EVENT_MAP) {
+      const existing = Array.isArray(hooks[hookKey]) ? hooks[hookKey] : [];
+      hooks[hookKey] = this.buildHookEntries(existing, makeClaudeHookCommand(eventType));
+    }
+
+    await this.fs.write(CLAUDE_SETTINGS_PATH, JSON.stringify({ ...config, hooks }, null, 2) + '\n');
+    return true;
+  }
+
+  async writeCodexNotify(): Promise<boolean> {
+    if (!(await resolveCommandPath('codex', this.exec))) return false;
+
+    const config: Record<string, unknown> = await this.fs
+      .read(CODEX_CONFIG_PATH)
+      .then((result) => toml.parse(result.content) ?? {})
+      .catch(() => ({}));
+
+    config.notify = makeCodexNotifyCommand();
+    await this.fs.write(CODEX_CONFIG_PATH, toml.stringify(config));
+    return true;
+  }
+
+  async writeForProvider(
+    providerId: AgentProviderId,
+    options: HookConfigWriteOptions = {}
+  ): Promise<void> {
+    const writeGitIgnoreEntries = options.writeGitIgnoreEntries ?? true;
+
+    if (providerId === 'claude') {
+      const wroteConfig = await this.writeClaudeHooks();
+      if (wroteConfig && writeGitIgnoreEntries) {
+        await this.ensureGitIgnoreEntries([CLAUDE_SETTINGS_PATH]);
+      }
+      return;
+    }
+
+    if (providerId === 'codex') {
+      const wroteConfig = await this.writeCodexNotify();
+      if (wroteConfig && writeGitIgnoreEntries) {
+        await this.ensureGitIgnoreEntries([CODEX_CONFIG_PATH]);
+      }
+    }
+  }
+
+  async writeAll(options: HookConfigWriteOptions = {}): Promise<void> {
+    await Promise.all(
+      (['claude', 'codex'] as const).map((providerId) =>
+        this.writeForProvider(providerId, options).catch((err: Error) => {
+          log.warn(`Failed to write ${providerId} hook config`, { error: String(err) });
+        })
+      )
+    );
+  }
+
+  private buildHookEntries(existing: unknown[], command: string): unknown[] {
+    const userEntries = existing.filter((entry) => !JSON.stringify(entry).includes(EMDASH_MARKER));
+    return [...userEntries, { hooks: [{ type: 'command', command }] }];
+  }
+
+  private async ensureGitIgnoreEntries(entries: string[]): Promise<void> {
+    const existingGitIgnore = await this.fs
+      .read(GITIGNORE_PATH)
+      .then((result) => result.content)
+      .catch(() => '');
+
+    const existingEntries = existingGitIgnore
+      .split(/\r?\n/)
+      .map((line) => line.trim())
+      .filter((line) => line.length > 0 && !line.startsWith('#'));
+    const missing = entries.filter((entry) => !this.isGitIgnored(existingEntries, entry));
+
+    if (missing.length === 0) return;
+
+    const content = existingGitIgnore.replace(/\s*$/, '');
+    const next =
+      content.length > 0 ? `${content}\n${missing.join('\n')}\n` : `${missing.join('\n')}\n`;
+    await this.fs.write(GITIGNORE_PATH, next);
+  }
+
+  private isGitIgnored(existingEntries: string[], entry: string): boolean {
+    const normalizedEntry = entry.replace(/^\/+/, '');
+    return existingEntries.some((rawPattern) => {
+      const pattern = rawPattern.replace(/^\/+/, '');
+      if (pattern === normalizedEntry) return true;
+
+      if (pattern.endsWith('/')) {
+        return normalizedEntry.startsWith(pattern);
+      }
+
+      if (pattern.endsWith('/**')) {
+        const prefix = pattern.slice(0, -2);
+        return normalizedEntry.startsWith(prefix);
+      }
+
+      return false;
+    });
+  }
+}
diff --git a/src/main/core/agent-hooks/hook-server.ts b/src/main/core/agent-hooks/hook-server.ts
new file mode 100644
index 0000000000..5ade10700b
--- /dev/null
+++ b/src/main/core/agent-hooks/hook-server.ts
@@ -0,0 +1,94 @@
+import crypto from 'node:crypto';
+import http from 'node:http';
+import { log } from '@main/lib/logger';
+
+export interface RawHookRequest {
+  ptyId: string;
+  type: string;
+  body: string;
+}
+
+export type HookHandler = (raw: RawHookRequest) => Promise<void>;
+
+export class HookServer {
+  private server: http.Server | null = null;
+  private port = 0;
+  private token = '';
+
+  async start(handler: HookHandler): Promise<void> {
+    if (this.server) return;
+    this.token = crypto.randomUUID();
+
+    this.server = http.createServer((req, res) => {
+      if (req.method !== 'POST' || req.url !== '/hook') {
+        res.writeHead(404);
+        res.end();
+        return;
+      }
+      if (req.headers['x-emdash-token'] !== this.token) {
+        log.warn('HookServer: rejected request with invalid token');
+        res.writeHead(403);
+        res.end();
+        return;
+      }
+
+      let body = '';
+      req.on('data', (chunk: Buffer) => {
+        body += chunk.toString();
+        if (body.length > 1_000_000) {
+          req.destroy();
+        }
+      });
+
+      req.on('end', () => {
+        const ptyId = String(req.headers['x-emdash-pty-id'] || '');
+        const type = String(req.headers['x-emdash-event-type'] || '');
+        if (!ptyId || !type) {
+          log.warn('HookServer: malformed request — missing ptyId or type headers');
+          res.writeHead(400);
+          res.end();
+          return;
+        }
+        handler({ ptyId, type, body })
+          .then(() => {
+            res.writeHead(200);
+            res.end();
+          })
+          .catch((err) => {
+            log.warn('HookServer: handler error', { error: String(err) });
+            res.writeHead(500);
+            res.end();
+          });
+      });
+    });
+
+    return new Promise<void>((resolve, reject) => {
+      this.server!.listen(0, '127.0.0.1', () => {
+        const addr = this.server!.address();
+        if (addr && typeof addr === 'object') {
+          this.port = addr.port;
+        }
+        log.info('HookServer: started', { port: this.port });
+        resolve();
+      });
+      this.server!.on('error', (err) => {
+        log.error('HookServer: failed to start', { error: String(err) });
+        reject(err);
+      });
+    });
+  }
+
+  stop(): void {
+    if (this.server) {
+      this.server.close();
+      this.server = null;
+      this.port = 0;
+    }
+  }
+  getPort(): number {
+    return this.port;
+  }
+  getToken(): string {
+    return this.token;
+  }
+}
diff --git a/src/main/core/agent-hooks/notification.ts b/src/main/core/agent-hooks/notification.ts
new file mode 100644
index 0000000000..62c55b3234
--- /dev/null
+++ b/src/main/core/agent-hooks/notification.ts
@@ -0,0 +1,67 @@
+import { eq } from 'drizzle-orm';
+import { BrowserWindow, Notification } from 'electron';
+import { getProvider, type AgentProviderId } from '@shared/agent-provider-registry';
+import { isAttentionNotification, type AgentEvent } from '@shared/events/agentEvents';
+import { notificationFocusTaskChannel } from '@shared/events/appEvents';
+import { getMainWindow } from '@main/app/window';
+import { appSettingsService } from '@main/core/settings/settings-service';
+import { db } from '@main/db/client';
+import { tasks } from '@main/db/schema';
+import { events } from '@main/lib/events';
+import { log } from '@main/lib/logger';
+
+function getNotificationBody(event: AgentEvent): string | null {
+  if (event.type === 'stop') return 'Your agent has finished working';
+  if (event.type === 'notification') {
+    const { notificationType } = event.payload;
+    if (!notificationType) return null;
+    if (isAttentionNotification(notificationType)) {
+      return 'Your agent is waiting for input';
+    }
+  }
+  return null;
+}
+
+async function getTaskName(taskId: string | undefined): Promise<string | null> {
+  if (!taskId) return null;
+  const [row] = await db
+    .select({ name: tasks.name })
+    .from(tasks)
+    .where(eq(tasks.id, taskId))
+    .limit(1);
+  return row?.name ?? null;
+}
+
+export async function maybeShowNotification(event: AgentEvent, appFocused: boolean): Promise<void> {
+  try {
+    const { enabled, osNotifications } = await appSettingsService.get('notifications');
+    if (!enabled || !osNotifications || appFocused || !Notification.isSupported()) return;
+
+    const body = getNotificationBody(event);
+    if (!body) return;
+
+    const providerName = getProvider(event.providerId as AgentProviderId)?.name ?? event.providerId;
+    const taskName = await getTaskName(event.taskId);
+    const title = taskName ? `${providerName} — ${taskName}` : providerName;
+
+    const notification = new Notification({ title, body, silent: true });
+
+    notification.on('click', () => {
+      const win = getMainWindow();
+      if (!win || win.isDestroyed()) return;
+      if (win.isMinimized()) win.restore();
+      win.show();
+      win.focus();
+      if (event.taskId) events.emit(notificationFocusTaskChannel, { taskId: event.taskId });
+    });
+
+    notification.show();
+  } catch (error) {
+    log.warn('notification: failed to show OS notification', { error: String(error) });
+  }
+}
+
+export function isAppFocused(): boolean {
+  const windows = BrowserWindow.getAllWindows();
+  return windows.some((w) => !w.isDestroyed() && w.isFocused());
+}
diff --git a/src/main/core/app/controller.ts b/src/main/core/app/controller.ts
new file mode 100644
index 0000000000..79a4c2dbd7
--- /dev/null
+++ b/src/main/core/app/controller.ts
@@ -0,0 +1,48 @@
+import { createRPCController } from '@shared/ipc/rpc';
+import type { OpenInAppId } from '@shared/openInApps';
+import { capture } from '@main/lib/telemetry';
+import { appService } from './service';
+
+export const appController = createRPCController({
+  openExternal: async (url: string) => {
+    try {
+      await appService.openExternal(url);
+      capture('open_in_external', { app: 'browser' });
+      return { success: true };
+    } catch (error) {
+      return { success: false, error: error instanceof Error ? error.message : String(error) };
+    }
+  },
+  clipboardWriteText: async (text: string) => {
+    try {
+      appService.clipboardWriteText(text);
+      return { success: true };
+    } catch (error) {
+      return { success: false, error: error instanceof Error ? error.message : String(error) };
+    }
+  },
+  openIn: async (args: {
+    app: OpenInAppId;
+    path: string;
+    isRemote?: boolean;
+    sshConnectionId?: string | null;
+  }) => {
+    try {
+      await appService.openIn(args);
+      capture('open_in_external', { app: args.app });
+      return { success: true };
+    } catch (error) {
+      return { success: false, error: error instanceof Error ? error.message : String(error) };
+    }
+  },
+  checkInstalledApps: () => appService.checkInstalledApps(),
+  listInstalledFonts: async (args?: { refresh?: boolean }) => {
+    const { fonts, cached, error } = await appService.listInstalledFonts(args?.refresh);
+    return { success: !error, fonts, cached, ...(error ? { error } : {}) };
+  },
+  openSelectDirectoryDialog: (args: { title: string; message: string }) =>
+    appService.openSelectDirectoryDialog(args),
+  getAppVersion: () => appService.getCachedAppVersion(),
+  getElectronVersion: () => process.versions.electron,
+  getPlatform: () => process.platform,
+});
diff --git a/src/main/core/app/service.ts b/src/main/core/app/service.ts
new file mode 100644
index 0000000000..c1e97b683f
--- /dev/null
+++ b/src/main/core/app/service.ts
@@ -0,0 +1,331 @@
+import { exec } from 'node:child_process';
+import { eq } from 'drizzle-orm';
+import { clipboard, dialog, shell } from 'electron';
+import { appPasteChannel, appRedoChannel, appUndoChannel } from '@shared/events/appEvents';
+import {
+  getAppById,
+  getResolvedLabel,
+  OPEN_IN_APPS,
+  type OpenInAppId,
+  type PlatformConfig,
+  type PlatformKey,
+} from '@shared/openInApps';
+import { getMainWindow } from '@main/app/window';
+import { db } from '@main/db/client';
+import { sshConnections } from '@main/db/schema';
+import { events } from '@main/lib/events';
+import { log } from '@main/lib/logger';
+import { buildExternalToolEnv } from '@main/utils/childProcessEnv';
+import {
+  buildGhosttyRemoteExecArgs,
+  buildRemoteEditorUrl,
+  buildRemoteSshCommand,
+} from '@main/utils/remoteOpenIn';
+import {
+  checkCommand,
+  checkMacApp,
+  checkMacAppByName,
+  escapeAppleScriptString,
+  execFileCommand,
+  listInstalledFontsAll,
+  resolveAppVersion,
+} from './utils';
+
+const FONT_CACHE_TTL_MS = 5 * 60 * 1_000;
+
+class AppService {
+  private cachedAppVersion: string | null = null;
+  private cachedAppVersionPromise: Promise<string> | null = null;
+  private cachedInstalledFonts: { fonts: string[]; fetchedAt: number } | null = null;
+
+  initialize(): void {
+    void this.getCachedAppVersion();
+
+    events.on(appUndoChannel, () => {
+      getMainWindow()?.webContents.undo();
+    });
+    events.on(appRedoChannel, () => {
+      getMainWindow()?.webContents.redo();
+    });
+    events.on(appPasteChannel, () => {
+      getMainWindow()?.webContents.paste();
+    });
+  }
+
+  getCachedAppVersion(): Promise<string> {
+    if (this.cachedAppVersion) return Promise.resolve(this.cachedAppVersion);
+    if (!this.cachedAppVersionPromise) {
+      this.cachedAppVersionPromise = resolveAppVersion().then((version) => {
+        this.cachedAppVersion = version;
+        return version;
+      });
+    }
+    return this.cachedAppVersionPromise;
+  }
+
+  async listInstalledFonts(
+    refresh?: boolean
+  ): Promise<{ fonts: string[]; cached: boolean; error?: string }> {
+    const now = Date.now();
+    if (
+      !refresh &&
+      this.cachedInstalledFonts &&
+      now - this.cachedInstalledFonts.fetchedAt < FONT_CACHE_TTL_MS
+    ) {
+      return { fonts: this.cachedInstalledFonts.fonts, cached: true };
+    }
+    try {
+      const fonts = await listInstalledFontsAll();
+      this.cachedInstalledFonts = { fonts, fetchedAt: now };
+      return { fonts, cached: false };
+    } catch (error) {
+      return {
+        fonts: this.cachedInstalledFonts?.fonts ?? [],
+        cached: Boolean(this.cachedInstalledFonts),
+        error: error instanceof Error ? error.message : String(error),
+      };
+    }
+  }
+
+  async checkInstalledApps(): Promise<Record<string, boolean>> {
+    const platform = process.platform as PlatformKey;
+    const availability: Record<string, boolean> = {};
+
+    for (const openInApp of Object.values(OPEN_IN_APPS)) {
+      const platformConfig = openInApp.platforms[platform];
+      if (!platformConfig && !openInApp.alwaysAvailable) {
+        availability[openInApp.id] = false;
+        continue;
+      }
+      if (openInApp.alwaysAvailable) {
+        availability[openInApp.id] = true;
+        continue;
+      }
+      try {
+        let isAvailable = false;
+        if (platformConfig?.bundleIds) {
+          for (const bundleId of platformConfig.bundleIds) {
+            if (await checkMacApp(bundleId)) {
+              isAvailable = true;
+              break;
+            }
+          }
+        }
+        if (!isAvailable && platformConfig?.appNames) {
+          for (const appName of platformConfig.appNames) {
+            if (await checkMacAppByName(appName)) {
+              isAvailable = true;
+              break;
+            }
+          }
+        }
+        if (!isAvailable && platformConfig?.checkCommands) {
+          for (const cmd of platformConfig.checkCommands) {
+            if (await checkCommand(cmd)) {
+              isAvailable = true;
+              break;
+            }
+          }
+        }
+        availability[openInApp.id] = isAvailable;
+      } catch (error) {
+        log.error(`Error checking installed app ${openInApp.id}:`, error);
+        availability[openInApp.id] = false;
+      }
+    }
+
+    return availability;
+  }
+
+  async openExternal(url: string): Promise<void> {
+    if (!url || typeof url !== 'string') throw new Error('Invalid URL');
+    let parsedUrl: URL;
+    try {
+      parsedUrl = new URL(url);
+    } catch {
+      throw new Error('Invalid URL format');
+    }
+    if (!['http:', 'https:'].includes(parsedUrl.protocol)) {
+      throw new Error(
+        `Protocol "${parsedUrl.protocol}" is not allowed. Only http and https URLs are permitted.`
+      );
+    }
+    await shell.openExternal(url);
+  }
+
+  clipboardWriteText(text: string): void {
+    if (typeof text !== 'string') throw new Error('Invalid clipboard text');
+    clipboard.writeText(text);
+  }
+
+  async openIn(args: {
+    app: OpenInAppId;
+    path: string;
+    isRemote?: boolean;
+    sshConnectionId?: string | null;
+  }): Promise<void> {
+    const { path: target, app: appId, isRemote = false, sshConnectionId } = args;
+
+    if (!target || typeof target !== 'string' || !appId) {
+      throw new Error('Invalid arguments');
+    }
+
+    const platform = process.platform as PlatformKey;
+    const appConfig = getAppById(appId);
+    if (!appConfig) throw new Error('Invalid app ID');
+
+    const platformConfig = appConfig.platforms?.[platform];
+    const label = getResolvedLabel(appConfig, platform);
+
+    if (!platformConfig && !appConfig.alwaysAvailable) {
+      throw new Error(`${label} is not available on this platform.`);
+    }
+
+    if (isRemote && sshConnectionId) {
+      await this.openInRemote({ appId, appConfig, label, target, platform, sshConnectionId });
+      return;
+    }
+
+    await this.openInLocal({ label, target, platformConfig });
+  }
+
+  private async openInRemote(args: {
+    appId: OpenInAppId;
+    appConfig: ReturnType<typeof getAppById>;
+    label: string;
+    target: string;
+    platform: PlatformKey;
+    sshConnectionId: string;
+  }): Promise<void> {
+    const { appId, appConfig, label, target, platform, sshConnectionId } = args;
+
+    const [connection] = await db
+      .select()
+      .from(sshConnections)
+      .where(eq(sshConnections.id, sshConnectionId))
+      .limit(1);
+
+    if (!connection) throw new Error('SSH connection not found');
+
+    const { host, username, port } = connection;
+
+    if (appId === 'vscode' || appId === 'cursor') {
+      await shell.openExternal(buildRemoteEditorUrl(appId, host, username, target));
+      return;
+    }
+
+    if ((appId === 'terminal' || appId === 'iterm2') && platform === 'darwin') {
+      const sshCommand = buildRemoteSshCommand({ host, username, port, targetPath: target });
+      const escapedCommand = escapeAppleScriptString(sshCommand);
+      const appName = appId === 'terminal' ? 'Terminal' : 'iTerm';
+      const script =
+        appId === 'terminal'
+          ? `tell application "${appName}" to do script "${escapedCommand}"`
+          : `tell application "${appName}" to create window with default profile command "${escapedCommand}"`;
+      await execFileCommand('osascript', [
+        '-e',
+        script,
+        '-e',
+        `tell application "${appName}" to activate`,
+      ]);
+      return;
+    }
+
+    if (appId === 'warp' && platform === 'darwin') {
+      const sshCommand = buildRemoteSshCommand({ host, username, port, targetPath: target });
+      await shell.openExternal(`warp://action/new_window?cmd=${encodeURIComponent(sshCommand)}`);
+      return;
+    }
+
+    if (appId === 'ghostty') {
+      const ghosttyExecArgs = buildGhosttyRemoteExecArgs({
+        host,
+        username,
+        port,
+        targetPath: target,
+      });
+      const attempts =
+        platform === 'darwin'
+          ? [
+              {
+                file: 'open',
+                args: ['-n', '-b', 'com.mitchellh.ghostty', '--args', '-e', ...ghosttyExecArgs],
+              },
+              { file: 'open', args: ['-na', 'Ghostty', '--args', '-e', ...ghosttyExecArgs] },
+              { file: 'ghostty', args: ['-e', ...ghosttyExecArgs] },
+            ]
+          : [{ file: 'ghostty', args: ['-e', ...ghosttyExecArgs] }];
+
+      let lastError: unknown = null;
+      for (const attempt of attempts) {
+        try {
+          await execFileCommand(attempt.file, attempt.args);
+          return;
+        } catch (error) {
+          lastError = error;
+        }
+      }
+      if (lastError instanceof Error) throw lastError;
+      throw new Error('Unable to launch Ghostty');
+    }
+
+    if (appConfig?.supportsRemote) {
+      throw new Error(`Remote SSH not yet implemented for ${label}`);
+    }
+  }
+
+  private async openInLocal(args: {
+    label: string;
+    target: string;
+    platformConfig: PlatformConfig | undefined;
+  }): Promise<void> {
+    const { label, target, platformConfig } = args;
+
+    if (platformConfig?.openUrls) {
+      for (const urlTemplate of platformConfig.openUrls) {
+        const url = urlTemplate
+          .replace('{{path_url}}', encodeURIComponent(target))
+          .replace('{{path}}', target);
+        try {
+          await shell.openExternal(url);
+          return;
+        } catch {
+          // try next URL
+        }
+      }
+      throw new Error(
+        `${label} is not installed or its URI scheme is not registered on this platform.`
+      );
+    }
+
+    const quoted = (p: string) => `'${p.replace(/'/g, "'\\''")}'`;
+    const commands: string[] = platformConfig?.openCommands ?? [];
+    const command = commands
+      .map((cmd) => cmd.replace('{{path}}', quoted(target)).replace('{{path_raw}}', target))
+      .join(' || ');
+
+    if (!command) throw new Error('Unsupported platform or app');
+
+    await new Promise<void>((resolve, reject) => {
+      exec(command, { cwd: target, env: buildExternalToolEnv() }, (err) => {
+        if (err) return reject(err);
+        resolve();
+      });
+    });
+  }
+
+  async openSelectDirectoryDialog(args: {
+    title: string;
+    message: string;
+  }): Promise<string | undefined> {
+    const result = await dialog.showOpenDialog(getMainWindow()!, {
+      title: args.title,
+      properties: ['openDirectory'],
+      message: args.message,
+    });
+    if (result.canceled) return undefined;
+    return result.filePaths[0];
+  }
+}
+
+export const appService = new AppService();
diff --git a/src/main/core/app/utils.ts b/src/main/core/app/utils.ts
new file mode 100644
index 0000000000..22844d6946
--- /dev/null
+++ b/src/main/core/app/utils.ts
@@ -0,0 +1,186 @@
+import { exec, execFile } from 'node:child_process';
+import { readFile } from 'node:fs/promises';
+import { join } from 'node:path';
+import { app } from 'electron';
+import { buildExternalToolEnv } from '@main/utils/childProcessEnv';
+
+const UNKNOWN_VERSION = 'unknown';
+
+export const execCommand = (
+  command: string,
+  opts?: { maxBuffer?: number; timeout?: number }
+): Promise<string> =>
+  new Promise((resolve, reject) => {
+    exec(
+      command,
+      {
+        maxBuffer: opts?.maxBuffer ?? 8 * 1024 * 1024,
+        timeout: opts?.timeout ?? 30_000,
+        env: buildExternalToolEnv(),
+      },
+      (error, stdout) => {
+        if (error) return reject(error);
+        resolve(stdout ?? '');
+      }
+    );
+  });
+
+export const execFileCommand = (
+  file: string,
+  args: string[],
+  opts?: { timeout?: number }
+): Promise<void> =>
+  new Promise((resolve, reject) => {
+    execFile(
+      file,
+      args,
+      {
+        timeout: opts?.timeout ?? 30_000,
+        env: buildExternalToolEnv(),
+      },
+      (error) => {
+        if (error) return reject(error);
+        resolve();
+      }
+    );
+  });
+
+export const escapeAppleScriptString = (value: string): string =>
+  value.replace(/\\/g, '\\\\').replace(/"/g, '\\"');
+
+// ─── Font discovery ───────────────────────────────────────────────────────────
+
+const dedupeAndSortFonts = (fonts: string[]): string[] => {
+  const unique = Array.from(new Set(fonts.map((f) => f.trim()).filter(Boolean)));
+  return unique.sort((a, b) => a.localeCompare(b));
+};
+
+const listInstalledFontsMac = async (): Promise<string[]> => {
+  const stdout = await execCommand('system_profiler SPFontsDataType -json', {
+    maxBuffer: 24 * 1024 * 1024,
+    timeout: 60_000,
+  });
+  const parsed = JSON.parse(stdout) as {
+    SPFontsDataType?: Array<{
+      typefaces?: Array<{ family?: string; fullname?: string }>;
+      _name?: string;
+    }>;
+  };
+  const fonts: string[] = [];
+  for (const item of parsed.SPFontsDataType ?? []) {
+    for (const typeface of item.typefaces ?? []) {
+      if (typeface.family) fonts.push(typeface.family);
+    }
+  }
+  return dedupeAndSortFonts(fonts);
+};
+
+const listInstalledFontsLinux = async (): Promise<string[]> => {
+  const stdout = await execCommand('fc-list : family', { timeout: 30_000 });
+  const fonts = stdout
+    .split('\n')
+    .flatMap((line) => line.split(','))
+    .map((font) => font.trim())
+    .filter(Boolean);
+  return dedupeAndSortFonts(fonts);
+};
+
+const listInstalledFontsWindows = async (): Promise<string[]> => {
+  const script =
+    "$fonts = Get-ItemProperty -Path 'HKLM:\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Fonts';" +
+    "$props = $fonts.PSObject.Properties | Where-Object { $_.Name -notlike 'PS*' };" +
+    "$props | ForEach-Object { ($_.Name -replace '\\s*\\(.*\\)$','').Trim() }";
+  const stdout = await execCommand(`powershell -NoProfile -Command "${script}"`, {
+    timeout: 30_000,
+  });
+  return dedupeAndSortFonts(
+    stdout
+      .split('\n')
+      .map((line) => line.trim())
+      .filter(Boolean)
+  );
+};
+
+export const listInstalledFontsAll = async (): Promise<string[]> => {
+  switch (process.platform) {
+    case 'darwin':
+      return listInstalledFontsMac();
+    case 'linux':
+      return listInstalledFontsLinux();
+    case 'win32':
+      return listInstalledFontsWindows();
+    default:
+      return [];
+  }
+};
+
+// ─── App version ─────────────────────────────────────────────────────────────
+
+const readPackageVersion = async (packageJsonPath: string): Promise<string | null> => {
+  try {
+    const packageJson = JSON.parse(await readFile(packageJsonPath, 'utf-8'));
+    if (packageJson.name === 'emdash' && packageJson.version) {
+      return packageJson.version as string;
+    }
+  } catch {
+    // Ignore missing or malformed package.json; try the next path.
+  }
+  return null;
+};
+
+export const resolveAppVersion = async (): Promise<string> => {
+  try {
+    const version = app.getVersion();
+    if (version && version !== '0.0.0') return version;
+  } catch {
+    // fall through
+  }
+
+  const possiblePaths = [
+    join(__dirname, '../../package.json'),
+    join(process.cwd(), 'package.json'),
+    join(app.getAppPath(), 'package.json'),
+  ];
+
+  for (const packageJsonPath of possiblePaths) {
+    const version = await readPackageVersion(packageJsonPath);
+    if (version) return version;
+  }
+
+  try {
+    return app.getVersion();
+  } catch {
+    return UNKNOWN_VERSION;
+  }
+};
+
+// ─── Installed-app detection ─────────────────────────────────────────────────
+
+export const checkCommand = (cmd: string): Promise<boolean> =>
+  new Promise((resolve) => {
+    exec(`command -v ${cmd} >/dev/null 2>&1`, { env: buildExternalToolEnv() }, (error) => {
+      resolve(!error);
+    });
+  });
+
+export const checkMacApp = (bundleId: string): Promise<boolean> =>
+  new Promise((resolve) => {
+    exec(
+      `mdfind "kMDItemCFBundleIdentifier == '${bundleId}'"`,
+      { env: buildExternalToolEnv() },
+      (error, stdout) => {
+        resolve(!error && stdout.trim().length > 0);
+      }
+    );
+  });
+
+export const checkMacAppByName = (appName: string): Promise<boolean> =>
+  new Promise((resolve) => {
+    exec(
+      `osascript -e 'id of application "${appName}"' 2>/dev/null`,
+      { env: buildExternalToolEnv() },
+      (error) => {
+        resolve(!error);
+      }
+    );
+  });
diff --git a/src/main/core/conversations/controller.ts b/src/main/core/conversations/controller.ts
new file mode 100644
index 0000000000..7ff550842a
--- /dev/null
+++ b/src/main/core/conversations/controller.ts
@@ -0,0 +1,14 @@
+import { createRPCController } from '@shared/ipc/rpc';
+import { createConversation } from './createConversation';
+import { deleteConversation } from './deleteConversation';
+import { getConversations } from './getConversations';
+import { getConversationsForTask } from './getConversationsForTask';
+import { renameConversation } from './renameConversation';
+
+export const conversationController = createRPCController({
+  getConversations,
+  createConversation,
+  deleteConversation,
+  renameConversation,
+  getConversationsForTask,
+});
diff --git a/src/main/core/conversations/createConversation.ts b/src/main/core/conversations/createConversation.ts
new file mode 100644
index 0000000000..c4f6095da6
--- /dev/null
+++ b/src/main/core/conversations/createConversation.ts
@@ -0,0 +1,59 @@
+import { randomUUID } from 'node:crypto';
+import { eq, sql } from 'drizzle-orm';
+import { Conversation, CreateConversationParams } from '@shared/conversations';
+import { db } from '@main/db/client';
+import { conversations } from '@main/db/schema';
+import { capture } from '@main/lib/telemetry';
+import { resolveTask } from '../projects/utils';
+import { mapConversationRowToConversation } from './utils';
+
+export async function createConversation(params: CreateConversationParams): Promise<Conversation> {
+  const id = params.id ?? randomUUID();
+  const [existingConversation] = await db
+    .select({ id: conversations.id })
+    .from(conversations)
+    .where(eq(conversations.taskId, params.taskId))
+    .limit(1);
+
+  const config =
+    params.autoApprove === undefined
+      ? undefined
+      : JSON.stringify({ autoApprove: params.autoApprove });
+
+  const [row] = await db
+    .insert(conversations)
+    .values({
+      id,
+      projectId: params.projectId,
+      taskId: params.taskId,
+      title: params.title,
+      provider: params.provider,
+      config,
+      createdAt: sql`CURRENT_TIMESTAMP`,
+      updatedAt: sql`CURRENT_TIMESTAMP`,
+    })
+    .returning();
+
+  const task = resolveTask(params.projectId, params.taskId);
+  if (!task) {
+    throw new Error('Task not found');
+  }
+
+  const conversation = mapConversationRowToConversation(row);
+
+  await task.conversations.startSession(
+    conversation,
+    params.initialSize,
+    false,
+    params.initialPrompt
+  );
+  capture('conversation_created', {
+    provider: params.provider,
+    is_first_in_task: existingConversation === undefined,
+    project_id: params.projectId,
+    task_id: params.taskId,
+    conversation_id: id,
+  });
+
+  return mapConversationRowToConversation(row);
+}
diff --git a/src/main/core/conversations/deleteConversation.ts b/src/main/core/conversations/deleteConversation.ts
new file mode 100644
index 0000000000..bfe9219aa7
--- /dev/null
+++ b/src/main/core/conversations/deleteConversation.ts
@@ -0,0 +1,29 @@
+import { and, eq } from 'drizzle-orm';
+import { db } from '@main/db/client';
+import { conversations } from '@main/db/schema';
+import { capture } from '@main/lib/telemetry';
+import { resolveTask } from '../projects/utils';
+
+export async function deleteConversation(
+  projectId: string,
+  taskId: string,
+  conversationId: string
+): Promise<void> {
+  await db
+    .delete(conversations)
+    .where(
+      and(
+        eq(conversations.id, conversationId),
+        eq(conversations.projectId, projectId),
+        eq(conversations.taskId, taskId)
+      )
+    );
+
+  const task = resolveTask(projectId, taskId);
+  await task?.conversations.stopSession(conversationId);
+  capture('conversation_deleted', {
+    project_id: projectId,
+    task_id: taskId,
+    conversation_id: conversationId,
+  });
+}
diff --git a/src/main/core/conversations/getConversations.ts b/src/main/core/conversations/getConversations.ts
new file mode 100644
index 0000000000..4e2cee63b9
--- /dev/null
+++ b/src/main/core/conversations/getConversations.ts
@@ -0,0 +1,13 @@
+import { eq, isNull } from 'drizzle-orm';
+import { db } from '@main/db/client';
+import { conversations, tasks } from '@main/db/schema';
+import { mapConversationRowToConversation } from './utils';
+
+export async function getConversations() {
+  const rows = await db
+    .select({ conversation: conversations })
+    .from(conversations)
+    .innerJoin(tasks, eq(conversations.taskId, tasks.id))
+    .where(isNull(tasks.archivedAt));
+  return rows.map(({ conversation }) => mapConversationRowToConversation(conversation, false));
+}
diff --git a/src/main/core/conversations/getConversationsForTask.ts b/src/main/core/conversations/getConversationsForTask.ts
new file mode 100644
index 0000000000..be737beac5
--- /dev/null
+++ b/src/main/core/conversations/getConversationsForTask.ts
@@ -0,0 +1,12 @@
+import { and, eq } from 'drizzle-orm';
+import { db } from '@main/db/client';
+import { conversations } from '@main/db/schema';
+import { mapConversationRowToConversation } from './utils';
+
+export async function getConversationsForTask(projectId: string, taskId: string) {
+  const rows = await db
+    .select()
+    .from(conversations)
+    .where(and(eq(conversations.projectId, projectId), eq(conversations.taskId, taskId)));
+  return rows.map((r) => mapConversationRowToConversation(r, false));
+}
diff --git a/src/main/core/conversations/impl/agent-command.ts b/src/main/core/conversations/impl/agent-command.ts
new file mode 100644
index 0000000000..d14ec73cdc
--- /dev/null
+++ b/src/main/core/conversations/impl/agent-command.ts
@@ -0,0 +1,48 @@
+import { AgentProviderId, getProvider } from '@shared/agent-provider-registry';
+import { providerOverrideSettings } from '@main/core/settings/provider-settings-service';
+
+export async function buildAgentCommand({
+  providerId,
+  autoApprove,
+  initialPrompt,
+  sessionId,
+  isResuming,
+}: {
+  providerId: AgentProviderId;
+  autoApprove?: boolean;
+  initialPrompt?: string;
+  sessionId: string;
+  isResuming?: boolean;
+}) {
+  const providerConfig = await providerOverrideSettings.getItem(providerId);
+  const providerDef = getProvider(providerId);
+
+  const cli = providerConfig?.cli;
+  const args: string[] = [];
+
+  if (isResuming && providerConfig?.resumeFlag) {
+    args.push(...providerConfig.resumeFlag.split(' '));
+    if (providerConfig?.sessionIdFlag) {
+      args.push(sessionId);
+    }
+  } else if (providerConfig?.sessionIdFlag) {
+    args.push(providerConfig.sessionIdFlag, sessionId);
+  }
+
+  if (autoApprove && providerConfig?.autoApproveFlag) {
+    args.push(providerConfig.autoApproveFlag);
+  }
+
+  if (!isResuming && initialPrompt && !providerDef?.useKeystrokeInjection) {
+    const flag = providerConfig?.initialPromptFlag;
+    if (flag) {
+      args.push(flag, initialPrompt);
+    } else {
+      args.push(initialPrompt);
+    }
+  }
+
+  args.push(...(providerConfig?.defaultArgs ?? []));
+
+  return { command: cli!, args };
+}
diff --git a/src/main/core/conversations/impl/local-conversation.ts b/src/main/core/conversations/impl/local-conversation.ts
new file mode 100644
index 0000000000..715b2c6652
--- /dev/null
+++ b/src/main/core/conversations/impl/local-conversation.ts
@@ -0,0 +1,265 @@
+import { homedir } from 'node:os';
+import { getProvider } from '@shared/agent-provider-registry';
+import type { AgentSessionConfig } from '@shared/agent-session';
+import { Conversation } from '@shared/conversations';
+import { agentSessionExitedChannel } from '@shared/events/agentEvents';
+import { makePtyId } from '@shared/ptyId';
+import { makePtySessionId } from '@shared/ptySessionId';
+import { agentHookService } from '@main/core/agent-hooks/agent-hook-service';
+import { wireAgentClassifier } from '@main/core/agent-hooks/classifier-wiring';
+import { claudeTrustService } from '@main/core/agent-hooks/claude-trust-service';
+import { HookConfigWriter } from '@main/core/agent-hooks/hook-config';
+import type { ConversationProvider } from '@main/core/conversations/types';
+import { LocalFileSystem } from '@main/core/fs/impl/local-fs';
+import { spawnLocalPty } from '@main/core/pty/local-pty';
+import { Pty } from '@main/core/pty/pty';
+import { buildAgentEnv } from '@main/core/pty/pty-env';
+import { ptySessionRegistry } from '@main/core/pty/pty-session-registry';
+import { resolveSpawnParams } from '@main/core/pty/spawn-utils';
+import { killTmuxSession, makeTmuxSessionName } from '@main/core/pty/tmux-session-name';
+import { appSettingsService } from '@main/core/settings/settings-service';
+import type { ExecFn } from '@main/core/utils/exec';
+import { events } from '@main/lib/events';
+import { log } from '@main/lib/logger';
+import { capture } from '@main/lib/telemetry';
+import { buildAgentCommand } from './agent-command';
+
+const DEFAULT_COLS = 80;
+const DEFAULT_ROWS = 24;
+const MAX_RESPAWNS = 2;
+
+export class LocalConversationProvider implements ConversationProvider {
+  private sessions = new Map<string, Pty>();
+  private knownSessionIds = new Set<string>();
+  private respawnCounts = new Map<string, number>();
+  private readonly projectId: string;
+  private readonly taskPath: string;
+  private readonly taskId: string;
+  private readonly tmux: boolean;
+  private readonly shellSetup?: string;
+  private readonly exec: ExecFn;
+  private readonly taskEnvVars: Record<string, string>;
+  private readonly hookConfigWriter: HookConfigWriter;
+  private readonly preparedHookProviders = new Map<string, boolean>();
+
+  constructor({
+    projectId,
+    taskPath,
+    taskId,
+    tmux = false,
+    shellSetup,
+    exec,
+    taskEnvVars = {},
+  }: {
+    projectId: string;
+    taskPath: string;
+    taskId: string;
+    tmux?: boolean;
+    shellSetup?: string;
+    exec: ExecFn;
+    taskEnvVars?: Record<string, string>;
+  }) {
+    this.projectId = projectId;
+    this.taskPath = taskPath;
+    this.taskId = taskId;
+    this.tmux = tmux;
+    this.shellSetup = shellSetup;
+    this.exec = exec;
+    this.taskEnvVars = taskEnvVars;
+    this.hookConfigWriter = new HookConfigWriter(new LocalFileSystem(taskPath), exec);
+  }
+
+  async startSession(
+    conversation: Conversation,
+    initialSize: { cols: number; rows: number } = { cols: DEFAULT_COLS, rows: DEFAULT_ROWS },
+    isResuming: boolean = false,
+    initialPrompt?: string
+  ): Promise<void> {
+    const sessionId = makePtySessionId(
+      conversation.projectId,
+      conversation.taskId,
+      conversation.id
+    );
+    this.knownSessionIds.add(sessionId);
+    if (this.sessions.has(sessionId)) return;
+
+    await claudeTrustService.maybeAutoTrustLocal({
+      providerId: conversation.providerId,
+      cwd: this.taskPath,
+      homedir: homedir(),
+    });
+    await this.prepareHookConfig(conversation.providerId);
+
+    const { command, args } = await buildAgentCommand({
+      providerId: conversation.providerId,
+      autoApprove: conversation.autoApprove,
+      sessionId: conversation.id,
+      isResuming,
+      initialPrompt,
+    });
+
+    const tmuxSessionName = this.tmux ? makeTmuxSessionName(sessionId) : undefined;
+
+    const cfg: AgentSessionConfig = {
+      taskId: this.taskId,
+      conversationId: conversation.id,
+      providerId: conversation.providerId,
+      command,
+      args,
+      cwd: this.taskPath,
+      shellSetup: this.shellSetup,
+      tmuxSessionName,
+      autoApprove: conversation.autoApprove ?? false,
+      resume: isResuming,
+    };
+
+    const spawnParams = resolveSpawnParams('agent', cfg);
+
+    const ptyId = makePtyId(conversation.providerId, conversation.id);
+    const port = agentHookService.getPort();
+    const token = agentHookService.getToken();
+    const pty = spawnLocalPty({
+      id: sessionId,
+      command: spawnParams.command,
+      args: spawnParams.args,
+      cwd: this.taskPath,
+      env: {
+        ...buildAgentEnv({
+          hook: port > 0 ? { port, ptyId, token } : undefined,
+        }),
+        ...this.taskEnvVars,
+      },
+      cols: initialSize.cols,
+      rows: initialSize.rows,
+    });
+
+    const hookActive = port > 0;
+    const provider = getProvider(conversation.providerId);
+    const useHooksOnly = hookActive && provider?.supportsHooks;
+
+    if (!useHooksOnly) {
+      wireAgentClassifier({
+        pty,
+        providerId: conversation.providerId,
+        projectId: conversation.projectId,
+        taskId: conversation.taskId,
+        conversationId: conversation.id,
+      });
+    }
+
+    pty.onExit(({ exitCode }) => {
+      ptySessionRegistry.unregister(sessionId);
+      const shouldRespawn = this.sessions.has(sessionId);
+      this.sessions.delete(sessionId);
+      capture('agent_run_finished', {
+        provider: conversation.providerId,
+        exit_code: typeof exitCode === 'number' ? exitCode : -1,
+        project_id: conversation.projectId,
+        task_id: conversation.taskId,
+        conversation_id: conversation.id,
+      });
+      events.emit(agentSessionExitedChannel, {
+        sessionId,
+        projectId: conversation.projectId,
+        conversationId: conversation.id,
+        taskId: conversation.taskId,
+        exitCode,
+      });
+      if (shouldRespawn && !this.tmux) {
+        const count = (this.respawnCounts.get(sessionId) ?? 0) + 1;
+        this.respawnCounts.set(sessionId, count);
+
+        if (count > MAX_RESPAWNS && !isResuming) {
+          log.error('LocalConversationProvider: respawn limit reached, giving up', {
+            conversationId: conversation.id,
+          });
+          this.respawnCounts.delete(sessionId);
+          return;
+        }
+
+        const resumeNext = isResuming && count <= MAX_RESPAWNS;
+        if (count > MAX_RESPAWNS) this.respawnCounts.set(sessionId, 0);
+
+        setTimeout(() => {
+          this.startSession(conversation, initialSize, resumeNext, initialPrompt).catch((e) => {
+            log.error('LocalConversationProvider: respawn failed', {
+              conversationId: conversation.id,
+              error: String(e),
+            });
+          });
+        }, 500);
+      }
+    });
+
+    ptySessionRegistry.register(sessionId, pty);
+    this.sessions.set(sessionId, pty);
+    capture('agent_run_started', {
+      provider: conversation.providerId,
+      project_id: conversation.projectId,
+      task_id: conversation.taskId,
+      conversation_id: conversation.id,
+    });
+  }
+
+  private async prepareHookConfig(providerId: Conversation['providerId']): Promise<void> {
+    try {
+      const localProjectSettings = await appSettingsService.get('localProject');
+      const writeGitIgnoreEntries = localProjectSettings.writeAgentConfigToGitIgnore ?? true;
+      const previousWriteGitIgnoreEntries = this.preparedHookProviders.get(providerId);
+      const shouldPrepareHookConfig =
+        previousWriteGitIgnoreEntries === undefined ||
+        (!previousWriteGitIgnoreEntries && writeGitIgnoreEntries);
+      if (!shouldPrepareHookConfig) return;
+
+      await this.hookConfigWriter.writeForProvider(providerId, {
+        writeGitIgnoreEntries,
+      });
+      this.preparedHookProviders.set(providerId, writeGitIgnoreEntries);
+    } catch (error) {
+      log.warn('LocalConversationProvider: failed to prepare hook config', {
+        providerId,
+        taskPath: this.taskPath,
+        error: String(error),
+      });
+    }
+  }
+
+  async stopSession(conversationId: string): Promise<void> {
+    const sessionId = makePtySessionId(this.projectId, this.taskId, conversationId);
+    this.knownSessionIds.delete(sessionId);
+    const pty = this.sessions.get(sessionId);
+    if (pty) {
+      try {
+        pty.kill();
+      } catch (e) {
+        log.warn('LocalAgentProvider: error killing PTY', { sessionId, error: String(e) });
+      }
+      this.sessions.delete(sessionId);
+      ptySessionRegistry.unregister(sessionId);
+    }
+    if (this.tmux) {
+      await killTmuxSession(this.exec, makeTmuxSessionName(sessionId));
+    }
+  }
+
+  async destroyAll(): Promise<void> {
+    const sessionIds = Array.from(this.knownSessionIds);
+    await this.detachAll();
+    if (this.tmux) {
+      await Promise.all(
+        sessionIds.map((id) => killTmuxSession(this.exec, makeTmuxSessionName(id)))
+      );
+    }
+    this.knownSessionIds.clear();
+  }
+
+  async detachAll(): Promise<void> {
+    for (const [sessionId, pty] of this.sessions) {
+      try {
+        pty.kill();
+      } catch {}
+      ptySessionRegistry.unregister(sessionId);
+    }
+    this.sessions.clear();
+  }
+}
diff --git a/src/main/core/conversations/impl/ssh-conversation.ts b/src/main/core/conversations/impl/ssh-conversation.ts
new file mode 100644
index 0000000000..44b144550a
--- /dev/null
+++ b/src/main/core/conversations/impl/ssh-conversation.ts
@@ -0,0 +1,232 @@
+import type { AgentSessionConfig } from '@shared/agent-session';
+import { Conversation } from '@shared/conversations';
+import { agentSessionExitedChannel } from '@shared/events/agentEvents';
+import { makePtySessionId } from '@shared/ptySessionId';
+import { wireAgentClassifier } from '@main/core/agent-hooks/classifier-wiring';
+import { claudeTrustService } from '@main/core/agent-hooks/claude-trust-service';
+import type { ConversationProvider } from '@main/core/conversations/types';
+import { SshFileSystem } from '@main/core/fs/impl/ssh-fs';
+import { Pty } from '@main/core/pty/pty';
+import { ptySessionRegistry } from '@main/core/pty/pty-session-registry';
+import { resolveSshCommand } from '@main/core/pty/spawn-utils';
+import { openSsh2Pty } from '@main/core/pty/ssh2-pty';
+import { killTmuxSession, makeTmuxSessionName } from '@main/core/pty/tmux-session-name';
+import type { SshClientProxy } from '@main/core/ssh/ssh-client-proxy';
+import type { ExecFn } from '@main/core/utils/exec';
+import { events } from '@main/lib/events';
+import { log } from '@main/lib/logger';
+import { capture } from '@main/lib/telemetry';
+import { buildAgentCommand } from './agent-command';
+
+const DEFAULT_COLS = 80;
+const DEFAULT_ROWS = 24;
+const MAX_RESPAWNS = 2;
+
+export class SshConversationProvider implements ConversationProvider {
+  private sessions = new Map<string, Pty>();
+  private knownSessionIds = new Set<string>();
+  private respawnCounts = new Map<string, number>();
+  private readonly projectId: string;
+  private readonly taskPath: string;
+  private readonly taskId: string;
+  private readonly taskEnvVars: Record<string, string>;
+  private readonly tmux: boolean = false;
+  private readonly shellSetup?: string;
+  private readonly exec: ExecFn;
+  private readonly proxy: SshClientProxy;
+
+  constructor({
+    projectId,
+    taskPath,
+    taskId,
+    taskEnvVars = {},
+    tmux = false,
+    shellSetup,
+    exec,
+    proxy,
+  }: {
+    projectId: string;
+    taskPath: string;
+    taskId: string;
+    taskEnvVars?: Record<string, string>;
+    tmux?: boolean;
+    shellSetup?: string;
+    exec: ExecFn;
+    proxy: SshClientProxy;
+  }) {
+    this.projectId = projectId;
+    this.taskPath = taskPath;
+    this.taskId = taskId;
+    this.taskEnvVars = taskEnvVars;
+    this.tmux = tmux;
+    this.shellSetup = shellSetup;
+    this.exec = exec;
+    this.proxy = proxy;
+  }
+
+  async startSession(
+    conversation: Conversation,
+    initialSize: { cols: number; rows: number } = { cols: DEFAULT_COLS, rows: DEFAULT_ROWS },
+    isResuming: boolean = false,
+    initialPrompt?: string
+  ): Promise<void> {
+    const sessionId = makePtySessionId(
+      conversation.projectId,
+      conversation.taskId,
+      conversation.id
+    );
+    this.knownSessionIds.add(sessionId);
+
+    if (this.sessions.has(sessionId)) return;
+
+    await claudeTrustService.maybeAutoTrustSsh({
+      providerId: conversation.providerId,
+      cwd: this.taskPath,
+      exec: this.exec,
+      remoteFs: new SshFileSystem(this.proxy, '/'),
+    });
+
+    const { command, args } = await buildAgentCommand({
+      providerId: conversation.providerId,
+      autoApprove: conversation.autoApprove,
+      sessionId: conversation.id,
+      isResuming,
+      initialPrompt,
+    });
+
+    const tmuxSessionName = this.tmux ? makeTmuxSessionName(sessionId) : undefined;
+
+    const cfg: AgentSessionConfig = {
+      taskId: this.taskId,
+      conversationId: conversation.id,
+      providerId: conversation.providerId,
+      command,
+      args,
+      cwd: this.taskPath,
+      shellSetup: this.shellSetup,
+      tmuxSessionName,
+      autoApprove: conversation.autoApprove ?? false,
+      resume: isResuming,
+    };
+
+    const sshCommand = resolveSshCommand('agent', cfg, this.taskEnvVars);
+
+    const result = await openSsh2Pty(this.proxy.client, {
+      id: sessionId,
+      command: sshCommand,
+      cols: initialSize.cols,
+      rows: initialSize.rows,
+    });
+
+    if (!result.success) {
+      log.error('SshConversationProvider: failed to open SSH channel', {
+        sessionId,
+        error: result.error.message,
+      });
+      return;
+    }
+
+    const pty = result.data;
+
+    // hooks not supported yet, rely on classifier for visual indicator
+    wireAgentClassifier({
+      pty,
+      providerId: conversation.providerId,
+      projectId: conversation.projectId,
+      taskId: conversation.taskId,
+      conversationId: conversation.id,
+    });
+
+    pty.onExit(({ exitCode }) => {
+      ptySessionRegistry.unregister(sessionId);
+      const shouldRespawn = this.sessions.has(sessionId);
+      this.sessions.delete(sessionId);
+      capture('agent_run_finished', {
+        provider: conversation.providerId,
+        exit_code: typeof exitCode === 'number' ? exitCode : -1,
+        project_id: conversation.projectId,
+        task_id: conversation.taskId,
+        conversation_id: conversation.id,
+      });
+      events.emit(agentSessionExitedChannel, {
+        sessionId,
+        projectId: conversation.projectId,
+        conversationId: conversation.id,
+        taskId: conversation.taskId,
+        exitCode,
+      });
+      if (shouldRespawn && !this.tmux) {
+        const count = (this.respawnCounts.get(sessionId) ?? 0) + 1;
+        this.respawnCounts.set(sessionId, count);
+
+        if (count > MAX_RESPAWNS && !isResuming) {
+          log.error('SshConversationProvider: respawn limit reached, giving up', {
+            conversationId: conversation.id,
+          });
+          this.respawnCounts.delete(sessionId);
+          return;
+        }
+
+        const resumeNext = isResuming && count <= MAX_RESPAWNS;
+        if (count > MAX_RESPAWNS) this.respawnCounts.set(sessionId, 0);
+
+        setTimeout(() => {
+          this.startSession(conversation, initialSize, resumeNext, initialPrompt).catch((e) => {
+            log.error('SshConversationProvider: respawn failed', {
+              conversationId: conversation.id,
+              error: String(e),
+            });
+          });
+        }, 500);
+      }
+    });
+
+    ptySessionRegistry.register(sessionId, pty);
+    this.sessions.set(sessionId, pty);
+    capture('agent_run_started', {
+      provider: conversation.providerId,
+      project_id: conversation.projectId,
+      task_id: conversation.taskId,
+      conversation_id: conversation.id,
+    });
+  }
+
+  async stopSession(conversationId: string): Promise<void> {
+    const sessionId = makePtySessionId(this.projectId, this.taskId, conversationId);
+    this.knownSessionIds.delete(sessionId);
+    const pty = this.sessions.get(sessionId);
+    if (pty) {
+      try {
+        pty.kill();
+      } catch (e) {
+        log.warn('SshAgentProvider: error killing PTY', { sessionId, error: String(e) });
+      }
+      this.sessions.delete(sessionId);
+      ptySessionRegistry.unregister(sessionId);
+    }
+    if (this.tmux) {
+      await killTmuxSession(this.exec, makeTmuxSessionName(sessionId));
+    }
+  }
+
+  async destroyAll(): Promise<void> {
+    const sessionIds = Array.from(this.knownSessionIds);
+    await this.detachAll();
+    if (this.tmux) {
+      await Promise.all(
+        sessionIds.map((id) => killTmuxSession(this.exec, makeTmuxSessionName(id)))
+      );
+    }
+    this.knownSessionIds.clear();
+  }
+
+  async detachAll(): Promise<void> {
+    for (const [sessionId, pty] of this.sessions) {
+      try {
+        pty.kill();
+      } catch {}
+      ptySessionRegistry.unregister(sessionId);
+    }
+    this.sessions.clear();
+  }
+}
diff --git a/src/main/core/conversations/renameConversation.ts b/src/main/core/conversations/renameConversation.ts
new file mode 100644
index 0000000000..8db99a2bdb
--- /dev/null
+++ b/src/main/core/conversations/renameConversation.ts
@@ -0,0 +1,7 @@
+import { eq } from 'drizzle-orm';
+import { db } from '@main/db/client';
+import { conversations } from '@main/db/schema';
+
+export async function renameConversation(conversationId: string, name: string) {
+  return db.update(conversations).set({ title: name }).where(eq(conversations.id, conversationId));
+}
diff --git a/src/main/core/conversations/types.ts b/src/main/core/conversations/types.ts
new file mode 100644
index 0000000000..a273800dfc
--- /dev/null
+++ b/src/main/core/conversations/types.ts
@@ -0,0 +1,17 @@
+import { Conversation } from '@shared/conversations';
+
+export interface ConversationProvider {
+  startSession(
+    conversation: Conversation,
+    initialSize?: { cols: number; rows: number },
+    isResuming?: boolean,
+    initialPrompt?: string
+  ): Promise<void>;
+  stopSession(conversationId: string): Promise<void>;
+  destroyAll(): Promise<void>;
+  detachAll(): Promise<void>;
+}
+
+export type ConversationConfig = {
+  autoApprove?: boolean;
+};
diff --git a/src/main/core/conversations/utils.ts b/src/main/core/conversations/utils.ts
new file mode 100644
index 0000000000..ef291a848d
--- /dev/null
+++ b/src/main/core/conversations/utils.ts
@@ -0,0 +1,18 @@
+import { AgentProviderId } from '@shared/agent-provider-registry';
+import { Conversation } from '@shared/conversations';
+import { ConversationRow } from '@main/db/schema';
+
+export function mapConversationRowToConversation(
+  row: ConversationRow,
+  resume: boolean = false
+): Conversation {
+  return {
+    id: row.id,
+    title: row.title,
+    taskId: row.taskId,
+    projectId: row.projectId,
+    providerId: row.provider as AgentProviderId,
+    autoApprove: row.config ? JSON.parse(row.config).autoApprove : undefined,
+    resume: resume,
+  };
+}
diff --git a/src/main/core/dependencies/controller.ts b/src/main/core/dependencies/controller.ts
new file mode 100644
index 0000000000..b69424c5ff
--- /dev/null
+++ b/src/main/core/dependencies/controller.ts
@@ -0,0 +1,34 @@
+import type { DependencyCategory, DependencyId } from '@shared/dependencies';
+import { createRPCController } from '@shared/ipc/rpc';
+import { getDependencyManager } from './dependency-manager';
+
+export const dependenciesController = createRPCController({
+  getAll: async (connectionId?: string) => {
+    const mgr = await getDependencyManager(connectionId);
+    return Object.fromEntries(mgr.getAll());
+  },
+  get: async (id: DependencyId, connectionId?: string) => {
+    const mgr = await getDependencyManager(connectionId);
+    return mgr.get(id);
+  },
+  getByCategory: async (cat: DependencyCategory, connectionId?: string) => {
+    const mgr = await getDependencyManager(connectionId);
+    return mgr.getByCategory(cat);
+  },
+  probe: async (id: DependencyId, connectionId?: string) => {
+    const mgr = await getDependencyManager(connectionId);
+    return mgr.probe(id);
+  },
+  probeAll: async (connectionId?: string) => {
+    const mgr = await getDependencyManager(connectionId);
+    return mgr.probeAll();
+  },
+  probeCategory: async (cat: DependencyCategory, connectionId?: string) => {
+    const mgr = await getDependencyManager(connectionId);
+    return mgr.probeCategory(cat);
+  },
+  install: async (id: DependencyId, connectionId?: string) => {
+    const mgr = await getDependencyManager(connectionId);
+    return mgr.install(id);
+  },
+});
diff --git a/src/main/core/dependencies/dependency-manager.test.ts b/src/main/core/dependencies/dependency-manager.test.ts
new file mode 100644
index 0000000000..1fd15a5e26
--- /dev/null
+++ b/src/main/core/dependencies/dependency-manager.test.ts
@@ -0,0 +1,121 @@
+import { describe, expect, it, vi } from 'vitest';
+import { err, ok } from '@shared/result';
+import type { ExecFn } from '../utils/exec';
+import { DependencyManager } from './dependency-manager';
+
+vi.mock('@main/lib/events', () => ({
+  events: {
+    emit: vi.fn(),
+  },
+}));
+
+vi.mock('../ssh/ssh-connection-manager', () => ({
+  sshConnectionManager: {
+    connect: vi.fn(),
+  },
+}));
+
+const missingExec: ExecFn = async () => {
+  throw new Error('missing');
+};
+
+const availableExec: ExecFn = async (command, args = []) => {
+  if (command === 'which' && args[0] === 'codex') {
+    return { stdout: '/bin/codex\n', stderr: '' };
+  }
+  if (command === '/bin/codex' && args[0] === '--version') {
+    return { stdout: 'codex-cli 1.2.3\n', stderr: '' };
+  }
+  throw new Error('missing');
+};
+
+const { events } = await import('@main/lib/events');
+
+describe('DependencyManager install', () => {
+  it('runs dependency install commands through the configured runner before probing', async () => {
+    const runInstallCommand = vi.fn(async () => ok<void>());
+    const manager = new DependencyManager(missingExec, {
+      emitEvents: false,
+      runInstallCommand,
+    });
+
+    const result = await manager.install('codex');
+
+    expect(runInstallCommand).toHaveBeenCalledWith('npm install -g @openai/codex');
+    expect(result).toEqual({
+      success: false,
+      error: { type: 'not-detected-after-install', id: 'codex' },
+    });
+  });
+
+  it('returns an error result for unknown dependency ids', async () => {
+    const manager = new DependencyManager(missingExec, { emitEvents: false });
+
+    const result = await manager.install('missing-agent' as never);
+
+    expect(result).toEqual({
+      success: false,
+      error: { type: 'unknown-dependency', id: 'missing-agent' },
+    });
+  });
+
+  it('returns an error result when no install command is configured', async () => {
+    const manager = new DependencyManager(missingExec, { emitEvents: false });
+
+    const result = await manager.install('git');
+
+    expect(result).toEqual({
+      success: false,
+      error: { type: 'no-install-command', id: 'git' },
+    });
+  });
+
+  it('returns runner errors without probing again', async () => {
+    const runInstallCommand = vi.fn(async () =>
+      err({
+        type: 'permission-denied' as const,
+        message: 'User does not have sufficient permissions.',
+        output: 'permission denied',
+        exitCode: 243,
+      })
+    );
+    const manager = new DependencyManager(availableExec, {
+      emitEvents: false,
+      runInstallCommand,
+    });
+
+    const result = await manager.install('codex');
+
+    expect(result.success).toBe(false);
+    if (!result.success) expect(result.error.type).toBe('permission-denied');
+  });
+
+  it('returns the available dependency state on successful install and probe', async () => {
+    const manager = new DependencyManager(availableExec, {
+      emitEvents: false,
+      runInstallCommand: async () => ok<void>(),
+    });
+
+    const result = await manager.install('codex');
+
+    expect(result.success).toBe(true);
+    if (result.success) expect(result.data.status).toBe('available');
+  });
+
+  it('emits dependency updates with the SSH connection id', async () => {
+    const manager = new DependencyManager(availableExec, {
+      connectionId: 'ssh-1',
+    });
+
+    await manager.probe('codex');
+
+    expect(events.emit).toHaveBeenCalledWith(
+      expect.anything(),
+      expect.objectContaining({
+        id: 'codex',
+        connectionId: 'ssh-1',
+        state: expect.objectContaining({ id: 'codex', status: 'available' }),
+      })
+    );
+  });
+});
diff --git a/src/main/core/dependencies/dependency-manager.ts b/src/main/core/dependencies/dependency-manager.ts
new file mode 100644
index 0000000000..b7c82a4aee
--- /dev/null
+++ b/src/main/core/dependencies/dependency-manager.ts
@@ -0,0 +1,244 @@
+import type {
+  DependencyCategory,
+  DependencyId,
+  DependencyInstallResult,
+  DependencyState,
+  DependencyStatus,
+} from '@shared/dependencies';
+import { dependencyStatusUpdatedChannel } from '@shared/events/appEvents';
+import { err, ok } from '@shared/result';
+import { sshConnectionManager } from '@main/core/ssh/ssh-connection-manager';
+import { getLocalExec, getSshExec, type ExecFn } from '@main/core/utils/exec';
+import { events } from '@main/lib/events';
+import { log } from '@main/lib/logger';
+import {
+  createSshInstallCommandRunner,
+  runLocalInstallCommand,
+  type InstallCommandRunner,
+} from './install-runner';
+import { resolveCommandPath, runVersionProbe } from './probe';
+import { DEPENDENCIES, getDependencyDescriptor } from './registry';
+import type { DependencyDescriptor, ProbeResult } from './types';
+
+const VERSION_RE = /(\d+\.\d+[\d.]*)/;
+
+function resolveProbeStatus(
+  descriptor: DependencyDescriptor,
+  resolvedPath: string | null,
+  probe: ProbeResult
+): DependencyStatus {
+  if (descriptor.resolveStatus) {
+    return descriptor.resolveStatus(probe);
+  }
+  if (resolvedPath !== null) return 'available';
+  if (probe.exitCode !== null && (probe.stdout || probe.stderr)) return 'available';
+  if (probe.timedOut && probe.stdout) return 'available';
+  return probe.exitCode === null ? 'missing' : 'error';
+}
+
+function extractVersion(probe: ProbeResult): string | null {
+  const raw = (probe.stdout || probe.stderr).trim();
+  const firstLine = raw.split('\n')[0]?.trim() ?? '';
+  // Extract a version-like token, e.g. "git version 2.39.0" → "2.39.0"
+  const m = VERSION_RE.exec(firstLine);
+  return m ? m[1] : firstLine || null;
+}
+
+function dependencyStateFromProbeResult(
+  descriptor: DependencyDescriptor,
+  resolvedPath: string | null,
+  probe: ProbeResult | null
+): DependencyState {
+  let status: DependencyStatus;
+  let version: string | null = null;
+
+  if (probe === null) {
+    status = resolvedPath !== null ? 'available' : 'missing';
+  } else {
+    status = resolveProbeStatus(descriptor, resolvedPath, probe);
+  }
+
+  if (status === 'available' && probe) {
+    version = extractVersion(probe);
+  }
+
+  return {
+    id: descriptor.id,
+    category: descriptor.category,
+    status,
+    version,
+    path: resolvedPath,
+    checkedAt: Date.now(),
+    error: status === 'error' ? probe?.stderr?.trim() || 'Unknown error' : undefined,
+  };
+}
+
+export class DependencyManager {
+  private state = new Map<DependencyId, DependencyState>();
+  private readonly exec: ExecFn;
+  private readonly emitEvents: boolean;
+  private readonly runInstallCommand: InstallCommandRunner;
+  private readonly connectionId: string | undefined;
+
+  constructor(
+    exec: ExecFn,
+    {
+      emitEvents = true,
+      runInstallCommand = runLocalInstallCommand,
+      connectionId,
+    }: {
+      emitEvents?: boolean;
+      runInstallCommand?: InstallCommandRunner;
+      connectionId?: string;
+    } = {}
+  ) {
+    this.exec = exec;
+    this.emitEvents = emitEvents;
+    this.runInstallCommand = runInstallCommand;
+    this.connectionId = connectionId;
+  }
+
+  /**
+   * Kick off background probing for all dependencies. Returns immediately;
+   * results stream in via `dependencyStatusUpdatedChannel` events.
+   */
+  initialize(): void {
+    void this.probeAll();
+  }
+
+  getAll(): Map<DependencyId, DependencyState> {
+    return new Map(this.state);
+  }
+
+  get(id: DependencyId): DependencyState | undefined {
+    return this.state.get(id);
+  }
+
+  getByCategory(cat: DependencyCategory): DependencyState[] {
+    return [...this.state.values()].filter((s) => {
+      const desc = getDependencyDescriptor(s.id);
+      return desc?.category === cat;
+    });
+  }
+
+  /**
+   * Two-phase probe for a single dependency:
+   *   1. Resolve path (fast, ~5ms) — emits an event immediately.
+   *   2. Run version probe (slow, up to 10s) — emits a second event on completion.
+   */
+  async probe(id: DependencyId): Promise<DependencyState> {
+    const descriptor = getDependencyDescriptor(id);
+    if (!descriptor) {
+      throw new Error(`Unknown dependency id: ${id}`);
+    }
+
+    // Phase 1: path resolution
+    const resolvedPath = await this.resolveFirstPath(descriptor);
+    const pathState = dependencyStateFromProbeResult(descriptor, resolvedPath, null);
+    this.updateState(pathState);
+
+    if (pathState.status === 'missing') {
+      return pathState;
+    }
+
+    // Phase 2: version probe
+    const versionArgs = descriptor.versionArgs ?? ['--version'];
+    const probeResult = await runVersionProbe(
+      descriptor.commands[0] ?? id,
+      resolvedPath,
+      versionArgs,
+      this.exec
+    );
+    const fullState = dependencyStateFromProbeResult(descriptor, resolvedPath, probeResult);
+    this.updateState(fullState);
+
+    return fullState;
+  }
+
+  async probeAll(): Promise<void> {
+    await Promise.all(
+      DEPENDENCIES.map((d) =>
+        this.probe(d.id).catch((err) => {
+          log.warn(`[DependencyManager] Failed to probe ${d.id}:`, err);
+        })
+      )
+    );
+  }
+
+  async probeCategory(cat: DependencyCategory): Promise<void> {
+    const targets = DEPENDENCIES.filter((d) => d.category === cat);
+    await Promise.all(
+      targets.map((d) =>
+        this.probe(d.id).catch((err) => {
+          log.warn(`[DependencyManager] Failed to probe ${d.id}:`, err);
+        })
+      )
+    );
+  }
+
+  /**
+   * Run the installCommand for a dependency, then re-probe to update state.
+   * Returns the updated DependencyState after installation attempt.
+   */
+  async install(id: DependencyId): Promise<DependencyInstallResult> {
+    const descriptor = getDependencyDescriptor(id);
+    if (!descriptor) {
+      return err({ type: 'unknown-dependency', id });
+    }
+    if (!descriptor.installCommand) {
+      return err({ type: 'no-install-command', id });
+    }
+
+    log.info(`[DependencyManager] Installing ${id}: ${descriptor.installCommand}`);
+
+    const installResult = await this.runInstallCommand(descriptor.installCommand);
+    if (!installResult.success) {
+      return err(installResult.error);
+    }
+
+    const state = await this.probe(id);
+    if (state.status !== 'available') {
+      return err({ type: 'not-detected-after-install', id });
+    }
+
+    return ok(state);
+  }
+
+  private async resolveFirstPath(descriptor: DependencyDescriptor): Promise<string | null> {
+    for (const command of descriptor.commands) {
+      const path = await resolveCommandPath(command, this.exec);
+      if (path) return path;
+    }
+    return null;
+  }
+
+  private updateState(state: DependencyState): void {
+    this.state.set(state.id, state);
+    if (this.emitEvents) {
+      events.emit(dependencyStatusUpdatedChannel, {
+        id: state.id,
+        state,
+        connectionId: this.connectionId,
+      });
+    }
+  }
+}
+
+export const localDependencyManager = new DependencyManager(getLocalExec());
+
+const sshManagers = new Map<string, DependencyManager>();
+
+export async function getDependencyManager(connectionId?: string): Promise<DependencyManager> {
+  if (!connectionId) return localDependencyManager;
+  let mgr = sshManagers.get(connectionId);
+  if (!mgr) {
+    const proxy = await sshConnectionManager.connect(connectionId);
+    mgr = new DependencyManager(getSshExec(proxy), {
+      emitEvents: true,
+      runInstallCommand: createSshInstallCommandRunner(proxy),
+      connectionId,
+    });
+    sshManagers.set(connectionId, mgr);
+  }
+  return mgr;
+}
diff --git a/src/main/core/dependencies/install-runner.test.ts b/src/main/core/dependencies/install-runner.test.ts
new file mode 100644
index 0000000000..2dda8e4dab
--- /dev/null
+++ b/src/main/core/dependencies/install-runner.test.ts
@@ -0,0 +1,34 @@
+import { describe, expect, it } from 'vitest';
+import { classifyInstallCommandFailure } from './install-runner';
+
+describe('classifyInstallCommandFailure', () => {
+  it('summarizes permission errors from npm global installs', () => {
+    expect(
+      classifyInstallCommandFailure({
+        exitCode: 243,
+        output:
+          '\u001b[1mnpm\u001b[22m \u001b[31merror\u001b[39m code EACCES\nnpm error path /usr/lib/node_modules/@openai\npermission denied',
+      })
+    ).toEqual({
+      type: 'permission-denied',
+      exitCode: 243,
+      output:
+        'npm error code EACCES\nnpm error path /usr/lib/node_modules/@openai\npermission denied',
+      message: 'User does not have sufficient permissions.',
+    });
+  });
+
+  it('returns command-failed for non-permission failures', () => {
+    expect(
+      classifyInstallCommandFailure({
+        exitCode: 1,
+        output: 'network unavailable',
+      })
+    ).toEqual({
+      type: 'command-failed',
+      exitCode: 1,
+      output: 'network unavailable',
+      message: 'Install command failed.',
+    });
+  });
+});
diff --git a/src/main/core/dependencies/install-runner.ts b/src/main/core/dependencies/install-runner.ts
new file mode 100644
index 0000000000..2d86ac65f8
--- /dev/null
+++ b/src/main/core/dependencies/install-runner.ts
@@ -0,0 +1,104 @@
+import os from 'node:os';
+import type { InstallCommandError } from '@shared/dependencies';
+import { err, ok, type Result } from '@shared/result';
+import { spawnLocalPty } from '@main/core/pty/local-pty';
+import type { Pty } from '@main/core/pty/pty';
+import { openSsh2Pty } from '@main/core/pty/ssh2-pty';
+import type { SshClientProxy } from '@main/core/ssh/ssh-client-proxy';
+import { log } from '@main/lib/logger';
+import { ensureUserBinDirsInPath } from '@main/utils/userEnv';
+import { quoteShellArg } from '../../utils/shellEscape';
+
+export type InstallCommandRunner<TData = void, TError = InstallCommandError> = (
+  command: string
+) => Promise<Result<TData, TError>>;
+
+const ANSI_RE = /\u001b\[[0-?]*[ -/]*[@-~]/g;
+
+export function classifyInstallCommandFailure({
+  exitCode,
+  output,
+}: {
+  exitCode: number | undefined;
+  output: string;
+}): InstallCommandError {
+  const cleanOutput = output.replace(ANSI_RE, '').trim();
+  if (/\bEACCES\b|permission denied|not have the permissions/i.test(cleanOutput)) {
+    return {
+      type: 'permission-denied',
+      exitCode,
+      output: cleanOutput,
+      message: 'User does not have sufficient permissions.',
+    };
+  }
+
+  return {
+    type: 'command-failed',
+    exitCode,
+    output: cleanOutput,
+    message: 'Install command failed.',
+  };
+}
+
+function waitForInstallPty(pty: Pty): Promise<Result<void, InstallCommandError>> {
+  return new Promise((resolve) => {
+    const chunks: string[] = [];
+    pty.onData((chunk: string) => chunks.push(chunk));
+    pty.onExit(({ exitCode }) => {
+      if (exitCode === 0) {
+        log.info(`[DependencyManager] Install succeeded`);
+        resolve(ok());
+        return;
+      }
+
+      const output = chunks.join('').trim();
+      log.error(`[DependencyManager] Install failed`, { exitCode, output });
+      resolve(err(classifyInstallCommandFailure({ exitCode, output })));
+    });
+  });
+}
+
+export function runLocalInstallCommand(
+  command: string
+): Promise<Result<void, InstallCommandError>> {
+  const shell = process.env.SHELL ?? '/bin/sh';
+  let pty: Pty;
+  try {
+    pty = spawnLocalPty({
+      id: `install:${crypto.randomUUID()}`,
+      command: shell,
+      args: ['-c', command],
+      cwd: os.homedir(),
+      env: process.env as Record<string, string>,
+      cols: 80,
+      rows: 24,
+    });
+  } catch (error: unknown) {
+    const message = error instanceof Error ? error.message : String(error);
+    return Promise.resolve(err({ type: 'pty-open-failed', message }));
+  }
+
+  return waitForInstallPty(pty).then((result) => {
+    if (result.success) {
+      ensureUserBinDirsInPath();
+    }
+    return result;
+  });
+}
+
+export function createSshInstallCommandRunner(proxy: SshClientProxy): InstallCommandRunner {
+  return async (command: string) => {
+    const result = await openSsh2Pty(proxy.client, {
+      id: `install:${crypto.randomUUID()}`,
+      command: `bash -l -c ${quoteShellArg(command)}`,
+      cols: 80,
+      rows: 24,
+    });
+
+    if (!result.success) {
+      return err({ type: 'pty-open-failed', message: result.error.message });
+    }
+
+    return waitForInstallPty(result.data);
+  };
+}
diff --git a/src/main/core/dependencies/probe.ts b/src/main/core/dependencies/probe.ts
new file mode 100644
index 0000000000..6fa449df50
--- /dev/null
+++ b/src/main/core/dependencies/probe.ts
@@ -0,0 +1,51 @@
+import type { ExecFn } from '@main/core/utils/exec';
+import type { ProbeResult } from './types';
+
+const WHICH_TIMEOUT_MS = 5_000;
+const VERSION_PROBE_TIMEOUT_MS = 10_000;
+
+// `where` on Windows, `which` on macOS/Linux
+const RESOLVE_CMD = process.platform === 'win32' ? 'where' : 'which';
+
+/**
+ * Resolves the absolute path of a command binary.
+ * Uses `where` on Windows and `which` on macOS/Linux.
+ * Returns `null` if the command is not found or the resolution fails.
+ */
+export async function resolveCommandPath(command: string, exec: ExecFn): Promise<string | null> {
+  try {
+    const { stdout } = await exec(RESOLVE_CMD, [command], { timeout: WHICH_TIMEOUT_MS });
+    const firstLine = stdout.trim().split('\n')[0]?.trim();
+    return firstLine ?? null;
+  } catch {
+    return null;
+  }
+}
+
+/**
+ * Runs `command args` and collects stdout/stderr up to a timeout.
+ * Never throws — all failures are captured in the returned `ProbeResult`.
+ */
+export async function runVersionProbe(
+  command: string,
+  resolvedPath: string | null,
+  args: string[],
+  exec: ExecFn,
+  timeoutMs: number = VERSION_PROBE_TIMEOUT_MS
+): Promise<ProbeResult> {
+  const bin = resolvedPath ?? command;
+  try {
+    const { stdout, stderr } = await exec(bin, args, { timeout: timeoutMs });
+    return { command, path: resolvedPath, stdout, stderr, exitCode: 0, timedOut: false };
+  } catch (err: unknown) {
+    const e = err as { stdout?: string; stderr?: string; code?: number; killed?: boolean };
+    return {
+      command,
+      path: resolvedPath,
+      stdout: e.stdout ?? '',
+      stderr: e.stderr ?? '',
+      exitCode: e.code ?? null,
+      timedOut: !!e.killed,
+    };
+  }
+}
diff --git a/src/main/core/dependencies/registry.ts b/src/main/core/dependencies/registry.ts
new file mode 100644
index 0000000000..85de960a58
--- /dev/null
+++ b/src/main/core/dependencies/registry.ts
@@ -0,0 +1,97 @@
+import { listDetectableProviders } from '@shared/agent-provider-registry';
+import type { DependencyStatus } from '@shared/dependencies';
+import type { DependencyDescriptor, ProbeResult } from './types';
+
+const CORE_DEPENDENCIES: DependencyDescriptor[] = [
+  {
+    id: 'git',
+    name: 'Git',
+    category: 'core',
+    commands: ['git'],
+    versionArgs: ['--version'],
+    docUrl: 'https://git-scm.com',
+    installHint: 'Install Git from https://git-scm.com/downloads',
+  },
+  {
+    id: 'gh',
+    name: 'GitHub CLI',
+    category: 'core',
+    commands: ['gh'],
+    versionArgs: ['--version'],
+    docUrl: 'https://cli.github.com',
+    installHint: 'Run: brew install gh  (or see https://cli.github.com)',
+    installCommand: (() => {
+      switch (process.platform) {
+        case 'darwin':
+          return 'brew install gh';
+        case 'linux':
+          return 'sudo apt update && sudo apt install -y gh';
+        case 'win32':
+          return 'winget install GitHub.cli';
+        default:
+          return undefined;
+      }
+    })(),
+  },
+  {
+    id: 'tmux',
+    name: 'tmux',
+    category: 'core',
+    commands: ['tmux'],
+    versionArgs: ['-V'],
+    docUrl: 'https://github.com/tmux/tmux',
+    installHint: 'Run: brew install tmux',
+  },
+  {
+    id: 'ssh',
+    name: 'SSH',
+    category: 'core',
+    commands: ['ssh'],
+    versionArgs: ['-V'],
+    docUrl: 'https://www.openssh.com',
+  },
+  {
+    id: 'node',
+    name: 'Node.js',
+    category: 'core',
+    commands: ['node'],
+    versionArgs: ['--version'],
+    docUrl: 'https://nodejs.org',
+    installHint: 'Install Node.js from https://nodejs.org or via nvm',
+  },
+];
+
+/**
+ * Agents that output their version on stderr, time out during probing, or return
+ * a non-zero exit code are still "available" if a path was resolved or any output
+ * was produced. This mirrors the logic in ConnectionsService.resolveStatus().
+ */
+function agentResolveStatus(result: ProbeResult): DependencyStatus {
+  if (result.path !== null) return 'available';
+  if (result.timedOut && result.stdout) return 'available';
+  if (result.exitCode !== null && (result.stdout || result.stderr)) return 'available';
+  return result.exitCode === null ? 'missing' : 'error';
+}
+
+function buildAgentDependencies(): DependencyDescriptor[] {
+  return listDetectableProviders().map((provider) => ({
+    id: provider.id,
+    name: provider.name,
+    category: 'agent' as const,
+    commands: provider.commands ?? [provider.cli ?? provider.id],
+    versionArgs: provider.versionArgs ?? ['--version'],
+    docUrl: provider.docUrl,
+    installHint: provider.installCommand ? `Run: ${provider.installCommand}` : undefined,
+    installCommand: provider.installCommand,
+    resolveStatus: agentResolveStatus,
+  }));
+}
+
+export const DEPENDENCIES: DependencyDescriptor[] = [
+  ...CORE_DEPENDENCIES,
+  ...buildAgentDependencies(),
+];
+
+export function getDependencyDescriptor(id: string): DependencyDescriptor | undefined {
+  return DEPENDENCIES.find((d) => d.id === id);
+}
diff --git a/src/main/core/dependencies/types.ts b/src/main/core/dependencies/types.ts
new file mode 100644
index 0000000000..2f82887bf6
--- /dev/null
+++ b/src/main/core/dependencies/types.ts
@@ -0,0 +1,30 @@
+import type { DependencyCategory, DependencyId, DependencyStatus } from '@shared/dependencies';
+
+export interface ProbeResult {
+  command: string;
+  path: string | null;
+  stdout: string;
+  stderr: string;
+  exitCode: number | null;
+  timedOut: boolean;
+}
+
+export interface DependencyDescriptor {
+  id: DependencyId;
+  name: string;
+  category: DependencyCategory;
+  /** Binary names to try in order; first success wins. */
+  commands: string[];
+  /** Args passed when probing for a version string. Defaults to ['--version']. */
+  versionArgs?: string[];
+  docUrl?: string;
+  /** Human-readable installation hint shown in UI. */
+  installHint?: string;
+  /** Machine-executable install command, e.g. "npm install -g @openai/codex". */
+  installCommand?: string;
+  /**
+   * Override the default status resolution logic.
+   * Useful for CLIs that exit non-zero on `--version` but are still available.
+   */
+  resolveStatus?: (result: ProbeResult) => DependencyStatus;
+}
diff --git a/src/main/core/editor/controller.ts b/src/main/core/editor/controller.ts
new file mode 100644
index 0000000000..dbdd5b1fbc
--- /dev/null
+++ b/src/main/core/editor/controller.ts
@@ -0,0 +1,13 @@
+import { createRPCController } from '@shared/ipc/rpc';
+import { editorBufferService } from './editor-buffer-service';
+
+export const editorBufferController = createRPCController({
+  saveBuffer: (projectId: string, workspaceId: string, filePath: string, content: string) =>
+    editorBufferService.saveBuffer(projectId, workspaceId, filePath, content),
+
+  clearBuffer: (projectId: string, workspaceId: string, filePath: string) =>
+    editorBufferService.clearBuffer(projectId, workspaceId, filePath),
+
+  listBuffers: (projectId: string, workspaceId: string) =>
+    editorBufferService.listBuffers(projectId, workspaceId),
+});
diff --git a/src/main/core/editor/editor-buffer-service.ts b/src/main/core/editor/editor-buffer-service.ts
new file mode 100644
index 0000000000..7b42e20aef
--- /dev/null
+++ b/src/main/core/editor/editor-buffer-service.ts
@@ -0,0 +1,50 @@
+import { and, eq, lt } from 'drizzle-orm';
+import { db } from '@/main/db/client';
+import { editorBuffers } from '@/main/db/schema';
+
+export class EditorBufferService {
+  async saveBuffer(
+    projectId: string,
+    workspaceId: string,
+    filePath: string,
+    content: string
+  ): Promise<void> {
+    const id = `${projectId}:${workspaceId}:${filePath}`;
+    await db
+      .insert(editorBuffers)
+      .values({ id, projectId, workspaceId, filePath, content, updatedAt: Date.now() })
+      .onConflictDoUpdate({
+        target: editorBuffers.id,
+        set: { content, updatedAt: Date.now() },
+      });
+  }
+
+  async clearBuffer(projectId: string, workspaceId: string, filePath: string): Promise<void> {
+    const id = `${projectId}:${workspaceId}:${filePath}`;
+    await db.delete(editorBuffers).where(eq(editorBuffers.id, id));
+  }
+
+  async clearAllForWorkspace(workspaceId: string): Promise<void> {
+    await db.delete(editorBuffers).where(eq(editorBuffers.workspaceId, workspaceId));
+  }
+
+  async listBuffers(
+    projectId: string,
+    workspaceId: string
+  ): Promise<{ filePath: string; content: string }[]> {
+    const rows = await db
+      .select({ filePath: editorBuffers.filePath, content: editorBuffers.content })
+      .from(editorBuffers)
+      .where(
+        and(eq(editorBuffers.projectId, projectId), eq(editorBuffers.workspaceId, workspaceId))
+      );
+    return rows;
+  }
+
+  async pruneStale(olderThanMs: number): Promise<void> {
+    const cutoff = Date.now() - olderThanMs;
+    await db.delete(editorBuffers).where(lt(editorBuffers.updatedAt, cutoff));
+  }
+}
+
+export const editorBufferService = new EditorBufferService();
diff --git a/src/main/core/forgejo/controller.ts b/src/main/core/forgejo/controller.ts
new file mode 100644
index 0000000000..4cdc27d878
--- /dev/null
+++ b/src/main/core/forgejo/controller.ts
@@ -0,0 +1,15 @@
+import { createRPCController } from '@shared/ipc/rpc';
+import { forgejoConnectionService } from './forgejo-connection-service';
+
+export const forgejoController = createRPCController({
+  saveCredentials: async (creds: { instanceUrl: string; token: string }) => {
+    if (!creds.instanceUrl || !creds.token) {
+      return { success: false, error: 'Instance URL and API token are required.' };
+    }
+    return forgejoConnectionService.saveCredentials(creds.instanceUrl, creds.token);
+  },
+
+  clearCredentials: async () => forgejoConnectionService.clearCredentials(),
+
+  checkConnection: async () => forgejoConnectionService.checkConnection(),
+});
diff --git a/src/main/core/forgejo/forgejo-connection-service.ts b/src/main/core/forgejo/forgejo-connection-service.ts
new file mode 100644
index 0000000000..87a1e60c8e
--- /dev/null
+++ b/src/main/core/forgejo/forgejo-connection-service.ts
@@ -0,0 +1,218 @@
+import { userGetCurrent } from '@llamaduck/forgejo-ts';
+import { createClient, type Client } from '@llamaduck/forgejo-ts/client';
+import { AxiosError } from 'axios';
+import { ISSUE_PROVIDER_CAPABILITIES, type ConnectionStatus } from '@shared/issue-providers';
+import { resolvePreferredRemote } from '@main/core/issues/git-remote-resolver';
+import {
+  assertRemoteHostMatchesInstance,
+  hasKnownNetworkErrorCode,
+  normalizeHostedInstanceUrl,
+} from '@main/core/issues/helpers/hosted-instance';
+import { encryptedAppSecretsStore } from '@main/core/secrets/encrypted-app-secrets-store';
+import { KV } from '@main/db/kv';
+
+interface ForgejoConnectionConfig {
+  instanceUrl: string;
+}
+
+interface ForgejoKVSchema extends Record<string, unknown> {
+  connection: ForgejoConnectionConfig;
+}
+
+const forgejoKV = new KV<ForgejoKVSchema>('forgejo');
+const NOT_CONFIGURED_ERROR = 'Forgejo is not configured. Connect Forgejo in settings.';
+
+export function toForgejoErrorMessage(error: unknown, fallback: string): string {
+  if (error instanceof AxiosError) {
+    const status = error.response?.status;
+    if (status === 401 || status === 403) {
+      return 'Forgejo authentication failed. Check your token permissions.';
+    }
+    if (status === 404) {
+      return 'Forgejo repository or resource not found.';
+    }
+    if (status === 429) {
+      return 'Forgejo API rate limit exceeded. Please try again shortly.';
+    }
+    if (typeof status === 'number' && status >= 500) {
+      return 'Forgejo API is temporarily unavailable. Please try again.';
+    }
+    return error.message || fallback;
+  }
+
+  if (hasKnownNetworkErrorCode(error)) {
+    return 'Unable to reach Forgejo instance. Check your URL and network connection.';
+  }
+
+  if (error instanceof Error && error.message) {
+    return error.message;
+  }
+
+  return fallback;
+}
+
+function isNotConfigured(error: unknown): boolean {
+  return error instanceof Error && error.message === NOT_CONFIGURED_ERROR;
+}
+
+export class ForgejoConnectionService {
+  private readonly FORGEJO_TOKEN_SECRET_KEY = 'emdash-forgejo-token';
+
+  private client: Client | null = null;
+  private clientKey: string | null = null;
+
+  async saveCredentials(
+    instanceUrl: string,
+    token: string
+  ): Promise<{ success: boolean; username?: string; displayName?: string; error?: string }> {
+    const normalizedUrl = normalizeHostedInstanceUrl(instanceUrl);
+    if (!normalizedUrl) {
+      return { success: false, error: 'A valid Forgejo instance URL is required.' };
+    }
+
+    const cleanToken = token.trim();
+    if (!cleanToken) {
+      return { success: false, error: 'A Forgejo API token is required.' };
+    }
+
+    try {
+      const client = this.getClientForCredentials(normalizedUrl, cleanToken);
+      const { data: user } = await userGetCurrent({ client, throwOnError: true });
+
+      await encryptedAppSecretsStore.setSecret(this.FORGEJO_TOKEN_SECRET_KEY, cleanToken);
+      await this.writeConnection({ instanceUrl: normalizedUrl });
+
+      const username = user?.login ?? undefined;
+      const displayName = user?.full_name || username;
+
+      return { success: true, username, displayName };
+    } catch (error) {
+      return {
+        success: false,
+        error: toForgejoErrorMessage(error, 'Failed to validate Forgejo credentials.'),
+      };
+    }
+  }
+
+  async clearCredentials(): Promise<{ success: boolean; error?: string }> {
+    try {
+      await encryptedAppSecretsStore.deleteSecret(this.FORGEJO_TOKEN_SECRET_KEY);
+      await forgejoKV.del('connection');
+
+      this.client = null;
+      this.clientKey = null;
+
+      return { success: true };
+    } catch (error) {
+      return {
+        success: false,
+        error: toForgejoErrorMessage(error, 'Failed to clear Forgejo credentials.'),
+      };
+    }
+  }
+
+  async checkConnection(): Promise<ConnectionStatus> {
+    try {
+      const { client } = await this.requireAuth();
+      const { data: user } = await userGetCurrent({ client, throwOnError: true });
+
+      const username = user?.login ?? undefined;
+      const displayName = user?.full_name || username;
+
+      return {
+        connected: true,
+        displayName,
+        capabilities: ISSUE_PROVIDER_CAPABILITIES.forgejo,
+      };
+    } catch (error) {
+      if (isNotConfigured(error)) {
+        return {
+          connected: false,
+          capabilities: ISSUE_PROVIDER_CAPABILITIES.forgejo,
+        };
+      }
+
+      return {
+        connected: false,
+        error: toForgejoErrorMessage(error, 'Failed to verify Forgejo connection.'),
+        capabilities: ISSUE_PROVIDER_CAPABILITIES.forgejo,
+      };
+    }
+  }
+
+  async getClient(): Promise<Client | null> {
+    try {
+      const { client } = await this.requireAuth();
+      return client;
+    } catch (error) {
+      if (isNotConfigured(error)) {
+        return null;
+      }
+      throw error;
+    }
+  }
+
+  async resolveRepo(
+    projectPath: string,
+    remoteName?: string
+  ): Promise<{ client: Client; owner: string; repo: string; repoName: string }> {
+    const { instanceUrl, client } = await this.requireAuth();
+    const remote = await resolvePreferredRemote(projectPath, remoteName);
+
+    assertRemoteHostMatchesInstance(remote.host, instanceUrl, 'Forgejo');
+
+    const parts = remote.slug.split('/');
+    if (parts.length < 2) {
+      throw new Error('Unable to extract owner/repo from remote URL.');
+    }
+
+    const owner = parts[0];
+    const repo = parts.slice(1).join('/');
+
+    return { client, owner, repo, repoName: repo };
+  }
+
+  private async requireAuth(): Promise<{ instanceUrl: string; client: Client }> {
+    const connection = await this.readConnection();
+    if (!connection) {
+      throw new Error(NOT_CONFIGURED_ERROR);
+    }
+
+    const token = await encryptedAppSecretsStore.getSecret(this.FORGEJO_TOKEN_SECRET_KEY);
+    if (!token) {
+      throw new Error(NOT_CONFIGURED_ERROR);
+    }
+
+    return {
+      instanceUrl: connection.instanceUrl,
+      client: this.getClientForCredentials(connection.instanceUrl, token),
+    };
+  }
+
+  private getClientForCredentials(instanceUrl: string, token: string): Client {
+    const key = `${instanceUrl}|${token}`;
+    if (!this.client || this.clientKey !== key) {
+      this.client = createClient({
+        baseURL: `${instanceUrl}/api/v1`,
+        headers: {
+          Authorization: `token ${token}`,
+        },
+      });
+      this.clientKey = key;
+    }
+
+    return this.client;
+  }
+
+  private async writeConnection(connection: ForgejoConnectionConfig): Promise<void> {
+    await forgejoKV.set('connection', connection);
+  }
+
+  private async readConnection(): Promise<ForgejoConnectionConfig | null> {
+    const connection = await forgejoKV.get('connection');
+    if (typeof connection?.instanceUrl !== 'string' || !connection.instanceUrl.trim()) return null;
+    return { instanceUrl: connection.instanceUrl };
+  }
+}
+
+export const forgejoConnectionService = new ForgejoConnectionService();
diff --git a/src/main/core/forgejo/forgejo-issue-provider.ts b/src/main/core/forgejo/forgejo-issue-provider.ts
new file mode 100644
index 0000000000..542cdb6e5a
--- /dev/null
+++ b/src/main/core/forgejo/forgejo-issue-provider.ts
@@ -0,0 +1,130 @@
+import { issueListIssues, type Issue as ForgejoIssue } from '@llamaduck/forgejo-ts';
+import { ISSUE_PROVIDER_CAPABILITIES, type IssueListResult } from '@shared/issue-providers';
+import type { Issue } from '@shared/tasks';
+import {
+  clampIssueLimit,
+  normalizeSearchTerm,
+  requireProjectPath,
+} from '@main/core/issues/helpers/provider-inputs';
+import type { IssueProvider } from '@main/core/issues/issue-provider';
+import { forgejoConnectionService, toForgejoErrorMessage } from './forgejo-connection-service';
+
+function toIssue(issue: ForgejoIssue, repoName: string): Issue {
+  const assignee = issue.assignee;
+  const assigneeName = assignee?.full_name || assignee?.login;
+  const assigneeLogin = assignee?.login || assignee?.full_name;
+
+  return {
+    provider: 'forgejo',
+    identifier: `#${issue.number ?? 0}`,
+    title: issue.title ?? '',
+    url: issue.html_url ?? '',
+    description: issue.body ?? undefined,
+    status: issue.state ?? undefined,
+    assignees: assigneeName || assigneeLogin ? [assigneeName ?? assigneeLogin ?? ''] : undefined,
+    project: repoName,
+    updatedAt: issue.updated_at ?? undefined,
+    fetchedAt: new Date().toISOString(),
+  };
+}
+
+async function listIssues(
+  projectPath: string,
+  remoteName: string | undefined,
+  limit: number
+): Promise<IssueListResult> {
+  const perPage = clampIssueLimit(limit, 50, 100);
+
+  try {
+    const { client, owner, repo, repoName } = await forgejoConnectionService.resolveRepo(
+      projectPath,
+      remoteName
+    );
+
+    const { data: issues } = await issueListIssues({
+      client,
+      path: { owner, repo },
+      query: { state: 'open', type: 'issues', sort: 'recentupdate', limit: perPage },
+      throwOnError: true,
+    });
+
+    return {
+      success: true,
+      issues: (issues ?? []).map((issue) => toIssue(issue, repoName)),
+    };
+  } catch (error) {
+    return {
+      success: false,
+      error: toForgejoErrorMessage(error, 'Failed to fetch Forgejo issues.'),
+    };
+  }
+}
+
+async function searchIssues(
+  projectPath: string,
+  remoteName: string | undefined,
+  searchTerm: string,
+  limit: number
+): Promise<IssueListResult> {
+  const term = normalizeSearchTerm(searchTerm);
+  if (!term) {
+    return { success: true, issues: [] };
+  }
+
+  const perPage = clampIssueLimit(limit, 20, 100);
+
+  try {
+    const { client, owner, repo, repoName } = await forgejoConnectionService.resolveRepo(
+      projectPath,
+      remoteName
+    );
+
+    const { data: issues } = await issueListIssues({
+      client,
+      path: { owner, repo },
+      query: {
+        state: 'open',
+        type: 'issues',
+        q: term,
+        sort: 'recentupdate',
+        limit: perPage,
+      },
+      throwOnError: true,
+    });
+
+    return {
+      success: true,
+      issues: (issues ?? []).map((issue) => toIssue(issue, repoName)),
+    };
+  } catch (error) {
+    return {
+      success: false,
+      error: toForgejoErrorMessage(error, 'Failed to search Forgejo issues.'),
+    };
+  }
+}
+
+export const forgejoIssueProvider: IssueProvider = {
+  type: 'forgejo',
+  capabilities: ISSUE_PROVIDER_CAPABILITIES.forgejo,
+
+  checkConnection: () => forgejoConnectionService.checkConnection(),
+
+  listIssues: async (opts) => {
+    const projectPath = requireProjectPath(opts.projectPath);
+    if (!projectPath) {
+      return { success: false, error: 'Project path is required.' };
+    }
+
+    return listIssues(projectPath, opts.remote, opts.limit ?? 50);
+  },
+
+  searchIssues: async (opts) => {
+    const projectPath = requireProjectPath(opts.projectPath);
+    if (!projectPath) {
+      return { success: false, error: 'Project path is required.' };
+    }
+
+    return searchIssues(projectPath, opts.remote, opts.searchTerm, opts.limit ?? 20);
+  },
+};
diff --git a/src/main/core/fs/controller.ts b/src/main/core/fs/controller.ts
new file mode 100644
index 0000000000..e497e30b89
--- /dev/null
+++ b/src/main/core/fs/controller.ts
@@ -0,0 +1,287 @@
+import { planEventChannel } from '@shared/events/appEvents';
+import { fsWatchEventChannel } from '@shared/events/fsEvents';
+import { createRPCController } from '@shared/ipc/rpc';
+import { err, ok } from '@shared/result';
+import { events } from '@main/lib/events';
+import { resolveWorkspace } from '../projects/utils';
+import {
+  FileSystemErrorCodes,
+  type FileWatcher,
+  type ListOptions,
+  type SearchOptions,
+} from './types';
+
+// One watcher per (projectId, workspaceId) pair, shared across all consumers via labels.
+// Local: single recursive @parcel/watcher subscription — update() is a no-op.
+// SSH:   poll-based — update() receives the union of all labels' paths to poll.
+const watcherRegistry = new Map<string, FileWatcher>();
+// Per-label path groups, keyed by `${projectId}::${workspaceId}` → label → paths.
+// Paths are forwarded to update() for SSH compatibility; local ignores them.
+const watcherLabeledPaths = new Map<string, Map<string, string[]>>();
+
+export const filesController = createRPCController({
+  listFiles: async (
+    projectId: string,
+    workspaceId: string,
+    dirPath: string,
+    options?: ListOptions
+  ) => {
+    const env = resolveWorkspace(projectId, workspaceId);
+    if (!env)
+      return err({ type: 'not_found' as const, entity: 'filesystem' as const, detail: undefined });
+
+    try {
+      const result = await env.fs.list(dirPath, options);
+      return ok(result);
+    } catch (e) {
+      return err({ type: 'fs_error' as const, message: String(e) });
+    }
+  },
+
+  readFile: async (projectId: string, workspaceId: string, filePath: string, maxBytes?: number) => {
+    const env = resolveWorkspace(projectId, workspaceId);
+    if (!env)
+      return err({ type: 'not_found' as const, entity: 'filesystem' as const, detail: undefined });
+
+    try {
+      const result = await env.fs.read(filePath, maxBytes);
+      return ok(result);
+    } catch (e) {
+      return err({ type: 'fs_error' as const, message: String(e) });
+    }
+  },
+
+  writeFile: async (projectId: string, workspaceId: string, filePath: string, content: string) => {
+    const env = resolveWorkspace(projectId, workspaceId);
+    if (!env)
+      return err({ type: 'not_found' as const, entity: 'filesystem' as const, detail: undefined });
+
+    try {
+      const result = await env.fs.write(filePath, content);
+      return ok(result);
+    } catch (e) {
+      if (
+        e instanceof Error &&
+        (e as unknown as { code?: string }).code === FileSystemErrorCodes.PERMISSION_DENIED
+      ) {
+        events.emit(planEventChannel, {
+          type: 'write_blocked' as const,
+          root: projectId,
+          relPath: filePath,
+          message: e.message,
+        });
+      }
+      return err({ type: 'fs_error' as const, message: String(e) });
+    }
+  },
+
+  removeFile: async (projectId: string, workspaceId: string, filePath: string) => {
+    const env = resolveWorkspace(projectId, workspaceId);
+    if (!env)
+      return err({ type: 'not_found' as const, entity: 'filesystem' as const, detail: undefined });
+
+    if (!env.fs.remove) {
+      return err({
+        type: 'fs_error' as const,
+        message: 'remove not supported by this filesystem',
+      });
+    }
+
+    try {
+      const result = await env.fs.remove(filePath);
+      return ok(result);
+    } catch (e) {
+      if (
+        e instanceof Error &&
+        (e as unknown as { code?: string }).code === FileSystemErrorCodes.PERMISSION_DENIED
+      ) {
+        events.emit(planEventChannel, {
+          type: 'remove_blocked' as const,
+          root: projectId,
+          relPath: filePath,
+          message: e.message,
+        });
+      }
+      return err({ type: 'fs_error' as const, message: String(e) });
+    }
+  },
+
+  readImage: async (projectId: string, workspaceId: string, filePath: string) => {
+    const env = resolveWorkspace(projectId, workspaceId);
+    if (!env)
+      return err({ type: 'not_found' as const, entity: 'filesystem' as const, detail: undefined });
+
+    if (!env.fs.readImage) {
+      return err({
+        type: 'fs_error' as const,
+        message: 'readImage not supported by this filesystem',
+      });
+    }
+
+    try {
+      const result = await env.fs.readImage(filePath);
+      return ok(result);
+    } catch (e) {
+      return err({ type: 'fs_error' as const, message: String(e) });
+    }
+  },
+
+  searchFiles: async (
+    projectId: string,
+    workspaceId: string,
+    query: string,
+    options?: SearchOptions
+  ) => {
+    const env = resolveWorkspace(projectId, workspaceId);
+    if (!env)
+      return err({ type: 'not_found' as const, entity: 'filesystem' as const, detail: undefined });
+
+    try {
+      const result = await env.fs.search(query, options);
+      return ok(result);
+    } catch (e) {
+      return err({ type: 'fs_error' as const, message: String(e) });
+    }
+  },
+
+  statFile: async (projectId: string, workspaceId: string, filePath: string) => {
+    const env = resolveWorkspace(projectId, workspaceId);
+    if (!env)
+      return err({ type: 'not_found' as const, entity: 'filesystem' as const, detail: undefined });
+
+    try {
+      const entry = await env.fs.stat(filePath);
+      return ok({ entry });
+    } catch (e) {
+      return err({ type: 'fs_error' as const, message: String(e) });
+    }
+  },
+
+  fileExists: async (projectId: string, workspaceId: string, filePath: string) => {
+    const env = resolveWorkspace(projectId, workspaceId);
+    if (!env)
+      return err({ type: 'not_found' as const, entity: 'filesystem' as const, detail: undefined });
+
+    try {
+      const exists = await env.fs.exists(filePath);
+      return ok({ exists });
+    } catch (e) {
+      return err({ type: 'fs_error' as const, message: String(e) });
+    }
+  },
+
+  getProjectConfig: async (projectId: string, workspaceId: string) => {
+    const env = resolveWorkspace(projectId, workspaceId);
+    if (!env)
+      return err({ type: 'not_found' as const, entity: 'filesystem' as const, detail: undefined });
+
+    if (!env.fs.getProjectConfig) {
+      return err({
+        type: 'fs_error' as const,
+        message: 'getProjectConfig not supported by this filesystem',
+      });
+    }
+
+    try {
+      const result = await env.fs.getProjectConfig();
+      return ok(result);
+    } catch (e) {
+      return err({ type: 'fs_error' as const, message: String(e) });
+    }
+  },
+
+  saveProjectConfig: async (projectId: string, workspaceId: string, content: string) => {
+    const env = resolveWorkspace(projectId, workspaceId);
+    if (!env)
+      return err({ type: 'not_found' as const, entity: 'filesystem' as const, detail: undefined });
+
+    if (!env.fs.saveProjectConfig) {
+      return err({
+        type: 'fs_error' as const,
+        message: 'saveProjectConfig not supported by this filesystem',
+      });
+    }
+
+    try {
+      const result = await env.fs.saveProjectConfig(content);
+      return ok(result);
+    } catch (e) {
+      return err({ type: 'fs_error' as const, message: String(e) });
+    }
+  },
+
+  saveAttachment: async (
+    projectId: string,
+    workspaceId: string,
+    srcPath: string,
+    subdir?: string
+  ) => {
+    const env = resolveWorkspace(projectId, workspaceId);
+    if (!env)
+      return err({ type: 'not_found' as const, entity: 'filesystem' as const, detail: undefined });
+
+    if (!env.fs.saveAttachment) {
+      return err({
+        type: 'fs_error' as const,
+        message: 'saveAttachment not supported by this filesystem',
+      });
+    }
+
+    try {
+      const result = await env.fs.saveAttachment(srcPath, subdir);
+      return ok(result);
+    } catch (e) {
+      return err({ type: 'fs_error' as const, message: String(e) });
+    }
+  },
+
+  watchSetPaths: async (
+    projectId: string,
+    workspaceId: string,
+    paths: string[],
+    label = 'default'
+  ) => {
+    const env = resolveWorkspace(projectId, workspaceId);
+    if (!env) {
+      return err({ type: 'not_found' as const, entity: 'filesystem' as const, detail: undefined });
+    }
+
+    if (!env.fs.watch) {
+      return ok({ supported: false as const });
+    }
+
+    const key = `${projectId}::${workspaceId}`;
+    const groups = watcherLabeledPaths.get(key) ?? new Map<string, string[]>();
+    groups.set(label, paths);
+    watcherLabeledPaths.set(key, groups);
+    const union = [...new Set([...groups.values()].flat())];
+
+    const existing = watcherRegistry.get(key);
+    if (existing) {
+      existing.update(union);
+    } else {
+      const watcher = env.fs.watch((evts) => {
+        events.emit(fsWatchEventChannel, { projectId, workspaceId, events: evts });
+      });
+      watcher.update(union);
+      watcherRegistry.set(key, watcher);
+    }
+    return ok({ supported: true as const });
+  },
+
+  watchStop: async (projectId: string, workspaceId: string, label = 'default') => {
+    const key = `${projectId}::${workspaceId}`;
+    const groups = watcherLabeledPaths.get(key);
+    groups?.delete(label);
+
+    if (!groups?.size) {
+      watcherLabeledPaths.delete(key);
+      watcherRegistry.get(key)?.close();
+      watcherRegistry.delete(key);
+    } else {
+      const union = [...new Set([...groups.values()].flat())];
+      watcherRegistry.get(key)?.update(union);
+    }
+    return ok({});
+  },
+});
diff --git a/src/main/core/fs/impl/local-fs.test.ts b/src/main/core/fs/impl/local-fs.test.ts
new file mode 100644
index 0000000000..1f6709bf4f
--- /dev/null
+++ b/src/main/core/fs/impl/local-fs.test.ts
@@ -0,0 +1,523 @@
+import fs from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
+import { afterEach, beforeEach, describe, expect, it } from 'vitest';
+import { FileSystemError } from '../types';
+import { LocalFileSystem } from './local-fs';
+
+describe('LocalFileSystem', () => {
+  let tempDir: string;
+  let fsService: LocalFileSystem;
+
+  beforeEach(() => {
+    tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'fs-test-'));
+    fsService = new LocalFileSystem(tempDir);
+  });
+
+  afterEach(() => {
+    fs.rmSync(tempDir, { recursive: true, force: true });
+  });
+
+  describe('constructor', () => {
+    it('should throw error when project path is empty', () => {
+      expect(() => new LocalFileSystem('')).toThrow(FileSystemError);
+      expect(() => new LocalFileSystem('')).toThrow('Project path is required');
+    });
+
+    it('should resolve project path', () => {
+      const relativePath = 'relative/project';
+      const service = new LocalFileSystem(relativePath);
+      expect(service).toBeDefined();
+    });
+  });
+
+  describe('list', () => {
+    it('should list files in directory', async () => {
+      fs.writeFileSync(path.join(tempDir, 'file1.txt'), 'content1');
+      fs.writeFileSync(path.join(tempDir, 'file2.txt'), 'content2');
+      fs.mkdirSync(path.join(tempDir, 'subdir'));
+
+      const result = await fsService.list('');
+
+      expect(result.entries).toHaveLength(3);
+      expect(result.entries.some((e) => e.path === 'file1.txt' && e.type === 'file')).toBe(true);
+      expect(result.entries.some((e) => e.path === 'file2.txt' && e.type === 'file')).toBe(true);
+      expect(result.entries.some((e) => e.path === 'subdir' && e.type === 'dir')).toBe(true);
+    });
+
+    it('should list files in subdirectory', async () => {
+      const subdir = path.join(tempDir, 'subdir');
+      fs.mkdirSync(subdir);
+      fs.writeFileSync(path.join(subdir, 'nested.txt'), 'nested content');
+
+      const result = await fsService.list('subdir');
+
+      expect(result.entries).toHaveLength(1);
+      expect(result.entries[0].path).toBe('subdir/nested.txt');
+    });
+
+    it('should list recursively', async () => {
+      fs.mkdirSync(path.join(tempDir, 'level1'));
+      fs.writeFileSync(path.join(tempDir, 'level1/file1.txt'), 'content1');
+      fs.mkdirSync(path.join(tempDir, 'level1/level2'));
+      fs.writeFileSync(path.join(tempDir, 'level1/level2/file2.txt'), 'content2');
+
+      const result = await fsService.list('', { recursive: true });
+
+      expect(result.entries.some((e) => e.path === 'level1')).toBe(true);
+      expect(result.entries.some((e) => e.path === 'level1/file1.txt')).toBe(true);
+      expect(result.entries.some((e) => e.path === 'level1/level2')).toBe(true);
+      expect(result.entries.some((e) => e.path === 'level1/level2/file2.txt')).toBe(true);
+    });
+
+    it('should exclude hidden files by default', async () => {
+      fs.writeFileSync(path.join(tempDir, 'visible.txt'), 'content');
+      fs.writeFileSync(path.join(tempDir, '.hidden'), 'hidden content');
+
+      const result = await fsService.list('');
+
+      expect(result.entries.some((e) => e.path === 'visible.txt')).toBe(true);
+      expect(result.entries.some((e) => e.path === '.hidden')).toBe(false);
+    });
+
+    it('should include hidden files when specified', async () => {
+      fs.writeFileSync(path.join(tempDir, 'visible.txt'), 'content');
+      fs.writeFileSync(path.join(tempDir, '.hidden'), 'hidden content');
+
+      const result = await fsService.list('', { includeHidden: true });
+
+      expect(result.entries.some((e) => e.path === '.hidden')).toBe(true);
+    });
+
+    it('should apply filter pattern', async () => {
+      fs.writeFileSync(path.join(tempDir, 'test.ts'), 'typescript');
+      fs.writeFileSync(path.join(tempDir, 'test.js'), 'javascript');
+      fs.writeFileSync(path.join(tempDir, 'readme.md'), 'markdown');
+
+      const result = await fsService.list('', { filter: '.*\\.ts$' });
+
+      expect(result.entries).toHaveLength(1);
+      expect(result.entries[0].path).toBe('test.ts');
+    });
+
+    it('should truncate when maxEntries reached', async () => {
+      for (let i = 0; i < 10; i++) {
+        fs.writeFileSync(path.join(tempDir, `file${i}.txt`), 'content');
+      }
+
+      const result = await fsService.list('', { maxEntries: 5 });
+
+      expect(result.total).toBe(5);
+      expect(result.truncated).toBe(true);
+      expect(result.truncateReason).toBe('maxEntries');
+    });
+
+    it('should truncate when time budget exceeded', async () => {
+      // Create many files to ensure time budget is exceeded
+      for (let i = 0; i < 1000; i++) {
+        fs.writeFileSync(path.join(tempDir, `file${i}.txt`), 'content');
+      }
+
+      const result = await fsService.list('', { recursive: true, timeBudgetMs: 1 });
+
+      expect(result.truncated).toBe(true);
+      expect(result.truncateReason).toBe('timeBudget');
+    });
+
+    it('should include file metadata', async () => {
+      const filePath = path.join(tempDir, 'test.txt');
+      fs.writeFileSync(filePath, 'test content');
+
+      const result = await fsService.list('');
+
+      expect(result.entries[0].size).toBe(12);
+      expect(result.entries[0].mtime).toBeInstanceOf(Date);
+      expect(result.entries[0].mode).toBeDefined();
+    });
+  });
+
+  describe('read', () => {
+    it('should read file content', async () => {
+      fs.writeFileSync(path.join(tempDir, 'test.txt'), 'Hello, World!');
+
+      const result = await fsService.read('test.txt');
+
+      expect(result.content).toBe('Hello, World!');
+      expect(result.truncated).toBe(false);
+      expect(result.totalSize).toBe(13);
+    });
+
+    it('should throw error when file not found', async () => {
+      await expect(fsService.read('nonexistent.txt')).rejects.toThrow(FileSystemError);
+      await expect(fsService.read('nonexistent.txt')).rejects.toThrow('File not found');
+    });
+
+    it('should throw error when path is directory', async () => {
+      fs.mkdirSync(path.join(tempDir, 'subdir'));
+
+      await expect(fsService.read('subdir')).rejects.toThrow(FileSystemError);
+      await expect(fsService.read('subdir')).rejects.toThrow('Path is a directory');
+    });
+
+    it('should truncate large files', async () => {
+      const largeContent = 'x'.repeat(300 * 1024); // 300KB
+      fs.writeFileSync(path.join(tempDir, 'large.txt'), largeContent);
+
+      const result = await fsService.read('large.txt', 200 * 1024);
+
+      expect(result.truncated).toBe(true);
+      expect(result.content.length).toBe(200 * 1024);
+      expect(result.totalSize).toBe(300 * 1024);
+    });
+
+    it('should not truncate files under maxBytes', async () => {
+      const content = 'Small content';
+      fs.writeFileSync(path.join(tempDir, 'small.txt'), content);
+
+      const result = await fsService.read('small.txt', 200 * 1024);
+
+      expect(result.truncated).toBe(false);
+      expect(result.content).toBe(content);
+    });
+  });
+
+  describe('write', () => {
+    it('should write file content', async () => {
+      const result = await fsService.write('newfile.txt', 'New content');
+
+      expect(result.success).toBe(true);
+      expect(fs.readFileSync(path.join(tempDir, 'newfile.txt'), 'utf-8')).toBe('New content');
+    });
+
+    it('should create parent directories', async () => {
+      const result = await fsService.write('nested/deep/file.txt', 'Deep content');
+
+      expect(result.success).toBe(true);
+      expect(fs.existsSync(path.join(tempDir, 'nested/deep/file.txt'))).toBe(true);
+    });
+
+    it('should return bytes written', async () => {
+      const content = 'Test content';
+      const result = await fsService.write('test.txt', content);
+
+      expect(result.bytesWritten).toBe(Buffer.byteLength(content, 'utf-8'));
+    });
+
+    it('should throw error when cannot create directory', async () => {
+      // Make tempDir read-only (on Unix systems)
+      if (process.platform !== 'win32') {
+        fs.chmodSync(tempDir, 0o555);
+
+        try {
+          await expect(fsService.write('readonly/test.txt', 'content')).rejects.toThrow(
+            FileSystemError
+          );
+        } finally {
+          fs.chmodSync(tempDir, 0o755);
+        }
+      }
+    });
+  });
+
+  describe('exists', () => {
+    it('should return true for existing file', async () => {
+      fs.writeFileSync(path.join(tempDir, 'exists.txt'), 'content');
+
+      const result = await fsService.exists('exists.txt');
+
+      expect(result).toBe(true);
+    });
+
+    it('should return true for existing directory', async () => {
+      fs.mkdirSync(path.join(tempDir, 'subdir'));
+
+      const result = await fsService.exists('subdir');
+
+      expect(result).toBe(true);
+    });
+
+    it('should return false for non-existent path', async () => {
+      const result = await fsService.exists('nonexistent.txt');
+
+      expect(result).toBe(false);
+    });
+  });
+
+  describe('stat', () => {
+    it('should return file entry for file', async () => {
+      fs.writeFileSync(path.join(tempDir, 'test.txt'), 'content');
+
+      const result = await fsService.stat('test.txt');
+
+      expect(result).not.toBeNull();
+      expect(result?.path).toBe('test.txt');
+      expect(result?.type).toBe('file');
+      expect(result?.size).toBe(7);
+    });
+
+    it('should return file entry for directory', async () => {
+      fs.mkdirSync(path.join(tempDir, 'subdir'));
+
+      const result = await fsService.stat('subdir');
+
+      expect(result).not.toBeNull();
+      expect(result?.path).toBe('subdir');
+      expect(result?.type).toBe('dir');
+    });
+
+    it('should return null for non-existent path', async () => {
+      const result = await fsService.stat('nonexistent.txt');
+
+      expect(result).toBeNull();
+    });
+  });
+
+  describe('search', () => {
+    beforeEach(() => {
+      fs.writeFileSync(path.join(tempDir, 'file1.ts'), 'const foo = "bar";\nfunction test() {}');
+      fs.writeFileSync(path.join(tempDir, 'file2.ts'), 'let x = 1;\nconst foo = 2;');
+      fs.writeFileSync(path.join(tempDir, 'readme.md'), '# README\nThis is documentation');
+
+      const subdir = path.join(tempDir, 'src');
+      fs.mkdirSync(subdir);
+      fs.writeFileSync(path.join(subdir, 'main.ts'), 'function main() {\n  console.log(foo);\n}');
+    });
+
+    it('should find matches in files', async () => {
+      const result = await fsService.search('foo');
+
+      expect(result.total).toBeGreaterThan(0);
+      expect(result.matches.some((m) => m.filePath === 'file1.ts')).toBe(true);
+      expect(result.matches.some((m) => m.filePath === 'file2.ts')).toBe(true);
+      expect(result.matches.some((m) => m.filePath === 'src/main.ts')).toBe(true);
+    });
+
+    it('should return match details', async () => {
+      const result = await fsService.search('foo');
+
+      const match = result.matches.find((m) => m.filePath === 'file1.ts');
+      expect(match).toBeDefined();
+      expect(match?.line).toBe(1);
+      expect(match?.column).toBeGreaterThan(0);
+      expect(match?.content).toContain('foo');
+    });
+
+    it('should respect maxResults', async () => {
+      const result = await fsService.search('foo', { maxResults: 2 });
+
+      expect(result.total).toBe(2);
+      expect(result.truncated).toBe(true);
+    });
+
+    it('should filter by file extensions', async () => {
+      const result = await fsService.search('foo', { fileExtensions: ['.ts'] });
+
+      expect(result.matches.every((m) => m.filePath.endsWith('.ts'))).toBe(true);
+    });
+
+    it('should filter by file pattern', async () => {
+      const result = await fsService.search('foo', { filePattern: '*.md' });
+
+      expect(result.total).toBe(0);
+    });
+
+    it('should be case-insensitive by default', async () => {
+      const result1 = await fsService.search('FOO');
+      const result2 = await fsService.search('foo');
+
+      expect(result1.total).toBe(result2.total);
+    });
+
+    it('should respect caseSensitive option', async () => {
+      const result = await fsService.search('FOO', { caseSensitive: true });
+
+      expect(result.total).toBe(0);
+    });
+
+    it('should skip binary files', async () => {
+      // Create a "binary" file with null bytes
+      fs.writeFileSync(path.join(tempDir, 'binary.bin'), Buffer.from([0x00, 0x01, 0x02, 0x03]));
+
+      const result = await fsService.search('\x00');
+
+      expect(result.matches).toHaveLength(0);
+    });
+
+    it('should skip ignored directories', async () => {
+      const nodeModules = path.join(tempDir, 'node_modules');
+      fs.mkdirSync(nodeModules);
+      fs.writeFileSync(path.join(nodeModules, 'test.ts'), 'const foo = "ignored";');
+
+      const result = await fsService.search('foo');
+
+      expect(result.matches.some((m) => m.filePath.includes('node_modules'))).toBe(false);
+    });
+
+    it('should track files searched', async () => {
+      const result = await fsService.search('foo');
+
+      expect(result.filesSearched).toBeGreaterThan(0);
+    });
+  });
+
+  describe('remove', () => {
+    it('should remove file', async () => {
+      fs.writeFileSync(path.join(tempDir, 'delete.txt'), 'content');
+
+      const result = await fsService.remove('delete.txt');
+
+      expect(result.success).toBe(true);
+      expect(fs.existsSync(path.join(tempDir, 'delete.txt'))).toBe(false);
+    });
+
+    it('should fail when file not found', async () => {
+      const result = await fsService.remove('nonexistent.txt');
+
+      expect(result.success).toBe(false);
+      expect(result.error).toContain('File not found');
+    });
+
+    it('should fail when path is directory', async () => {
+      fs.mkdirSync(path.join(tempDir, 'subdir'));
+
+      const result = await fsService.remove('subdir');
+
+      expect(result.success).toBe(false);
+      expect(result.error).toContain('directory');
+    });
+
+    it('should retry with chmod on permission error', async () => {
+      if (process.platform !== 'win32') {
+        const filePath = path.join(tempDir, 'readonly.txt');
+        fs.writeFileSync(filePath, 'content');
+        fs.chmodSync(filePath, 0o444);
+
+        try {
+          const result = await fsService.remove('readonly.txt');
+          expect(result.success).toBe(true);
+        } finally {
+          // Restore permissions for cleanup
+          try {
+            fs.chmodSync(filePath, 0o666);
+          } catch {
+            // Ignore
+          }
+        }
+      }
+    });
+  });
+
+  describe('readImage', () => {
+    it('should read image as data URL', async () => {
+      // Create a minimal valid PNG file (1x1 transparent pixel)
+      const pngBuffer = Buffer.from(
+        'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mP8z8BQDwAEhQGAhKmMIQAAAABJRU5ErkJggg==',
+        'base64'
+      );
+      fs.writeFileSync(path.join(tempDir, 'test.png'), pngBuffer);
+
+      const result = await fsService.readImage('test.png');
+
+      expect(result.success).toBe(true);
+      expect(result.dataUrl).toMatch(/^data:image\/png;base64,/);
+      expect(result.mimeType).toBe('image/png');
+      expect(result.size).toBe(pngBuffer.length);
+    });
+
+    it('should reject unsupported image formats', async () => {
+      // bmp is not in the allowed list
+      fs.writeFileSync(path.join(tempDir, 'test.xyz'), 'fake-data');
+
+      const result = await fsService.readImage('test.xyz');
+
+      expect(result.success).toBe(false);
+      expect(result.error).toContain('Unsupported image format');
+    });
+
+    it('should fail when image not found', async () => {
+      const result = await fsService.readImage('nonexistent.png');
+
+      expect(result.success).toBe(false);
+      expect(result.error).toContain('not found');
+    });
+
+    it('should fail when path is directory', async () => {
+      fs.mkdirSync(path.join(tempDir, 'images'));
+
+      // Directories don't have extensions, so this will fail with unsupported format
+      // or directory error depending on implementation order
+      const result = await fsService.readImage('images');
+
+      expect(result.success).toBe(false);
+    });
+
+    it('should reject oversized images', async () => {
+      // Create a fake large "image" file
+      const largeBuffer = Buffer.alloc(11 * 1024 * 1024); // 11MB
+      fs.writeFileSync(path.join(tempDir, 'large.png'), largeBuffer);
+
+      const result = await fsService.readImage('large.png');
+
+      expect(result.success).toBe(false);
+      expect(result.error).toContain('too large');
+    });
+  });
+
+  describe('path traversal protection', () => {
+    it('should block absolute path traversal', async () => {
+      // Absolute paths get normalized by resolvePath
+      await expect(fsService.read('/etc/passwd')).rejects.toThrow();
+    });
+
+    it('should block relative path traversal', async () => {
+      await expect(fsService.read('../package.json')).rejects.toThrow();
+    });
+
+    it('should block nested path traversal', async () => {
+      fs.mkdirSync(path.join(tempDir, 'subdir'));
+      fs.writeFileSync(path.join(tempDir, 'subdir/file.txt'), 'content');
+
+      await expect(fsService.read('subdir/../../../etc/passwd')).rejects.toThrow();
+    });
+
+    it('should normalize paths with double slashes', async () => {
+      fs.writeFileSync(path.join(tempDir, 'test.txt'), 'content');
+
+      const result = await fsService.read('//test.txt');
+
+      expect(result.content).toBe('content');
+    });
+
+    it('should allow valid subpaths', async () => {
+      fs.mkdirSync(path.join(tempDir, 'valid'));
+      fs.mkdirSync(path.join(tempDir, 'valid/nested'));
+      fs.writeFileSync(path.join(tempDir, 'valid/nested/file.txt'), 'content');
+
+      const result = await fsService.read('valid/nested/file.txt');
+
+      expect(result.content).toBe('content');
+    });
+  });
+
+  describe('large file handling', () => {
+    it('should handle files larger than default maxBytes', async () => {
+      const largeContent = 'x'.repeat(500 * 1024); // 500KB
+      fs.writeFileSync(path.join(tempDir, 'large.txt'), largeContent);
+
+      const result = await fsService.read('large.txt');
+
+      expect(result.truncated).toBe(true);
+      expect(result.content.length).toBe(200 * 1024); // Default limit
+    });
+
+    it('should handle custom maxBytes limit', async () => {
+      const content = 'x'.repeat(100);
+      fs.writeFileSync(path.join(tempDir, 'medium.txt'), content);
+
+      const result = await fsService.read('medium.txt', 50);
+
+      expect(result.truncated).toBe(true);
+      expect(result.content.length).toBe(50);
+    });
+  });
+});
diff --git a/src/main/core/fs/impl/local-fs.ts b/src/main/core/fs/impl/local-fs.ts
new file mode 100644
index 0000000000..dea86ccd89
--- /dev/null
+++ b/src/main/core/fs/impl/local-fs.ts
@@ -0,0 +1,835 @@
+import { createReadStream, promises as fs, statSync, type Stats } from 'node:fs';
+import { basename, dirname, extname, join, relative, resolve, sep } from 'node:path';
+import { createInterface } from 'node:readline';
+import parcelWatcher from '@parcel/watcher';
+import { glob } from 'glob';
+import ignore from 'ignore';
+import type { FileWatchEvent } from '@shared/fs';
+import {
+  DEFAULT_EMDASH_CONFIG,
+  FileEntry,
+  FileListResult,
+  FileSystemError,
+  FileSystemErrorCodes,
+  FileSystemProvider,
+  FileWatcher,
+  ListOptions,
+  ReadResult,
+  SearchMatch,
+  SearchOptions,
+  SearchResult,
+  WriteResult,
+} from '../types';
+
+// Binary file extensions to skip during search
+const BINARY_EXTENSIONS = new Set([
+  '.exe',
+  '.dll',
+  '.so',
+  '.dylib',
+  '.bin',
+  '.jpg',
+  '.jpeg',
+  '.png',
+  '.gif',
+  '.bmp',
+  '.ico',
+  '.svg',
+  '.mp3',
+  '.mp4',
+  '.avi',
+  '.mov',
+  '.wmv',
+  '.flv',
+  '.webm',
+  '.zip',
+  '.tar',
+  '.gz',
+  '.bz2',
+  '.7z',
+  '.rar',
+  '.pdf',
+  '.doc',
+  '.docx',
+  '.xls',
+  '.xlsx',
+  '.ppt',
+  '.pptx',
+  '.woff',
+  '.woff2',
+  '.ttf',
+  '.otf',
+  '.eot',
+  '.wasm',
+  '.class',
+  '.jar',
+  '.pyc',
+  '.o',
+  '.a',
+]);
+
+// Directories to skip during search
+const SEARCH_IGNORES = new Set([
+  'node_modules',
+  '.git',
+  '.svn',
+  '.hg',
+  'dist',
+  'build',
+  '.next',
+  '.nuxt',
+  'coverage',
+  '.cache',
+  '.parcel-cache',
+]);
+
+const WATCH_IGNORED_NAMES = [
+  '.svn',
+  '.hg',
+  '.git',
+  'node_modules',
+  'dist',
+  'build',
+  '.next',
+  '.nuxt',
+  'coverage',
+  '__pycache__',
+  '.pytest_cache',
+  'venv',
+  '.venv',
+  'target',
+  '.terraform',
+  '.serverless',
+  'worktrees',
+  '.emdash',
+  '.conductor',
+  '.cursor',
+  '.claude',
+  '.amp',
+  '.codex',
+  '.aider',
+  '.continue',
+  '.cody',
+  '.windsurf',
+];
+
+// Glob patterns for parcel/watcher ignore option, derived from WATCH_IGNORED_NAMES.
+const WATCH_IGNORE_GLOBS = WATCH_IGNORED_NAMES.map((n) => `**/${n}/**`);
+
+// Allowed image extensions for readImage
+const ALLOWED_IMAGE_EXTENSIONS = new Set([
+  '.png',
+  '.jpg',
+  '.jpeg',
+  '.gif',
+  '.webp',
+  '.svg',
+  '.bmp',
+  '.ico',
+]);
+
+// MIME types for images
+const IMAGE_MIME_TYPES: Record<string, string> = {
+  '.png': 'image/png',
+  '.jpg': 'image/jpeg',
+  '.jpeg': 'image/jpeg',
+  '.gif': 'image/gif',
+  '.webp': 'image/webp',
+  '.svg': 'image/svg+xml',
+  '.bmp': 'image/bmp',
+  '.ico': 'image/x-icon',
+};
+
+export class LocalFileSystem implements FileSystemProvider {
+  private listAbort: AbortController | null = null;
+
+  constructor(private projectPath: string) {
+    if (!projectPath) {
+      throw new FileSystemError('Project path is required', FileSystemErrorCodes.INVALID_PATH);
+    }
+    this.projectPath = resolve(projectPath);
+  }
+
+  /**
+   * Cancel any in-flight list() traversal. Used by the IPC layer for per-sender debouncing.
+   * The in-process traversal checks the abort signal and exits early on the next tick.
+   */
+  cancelPendingList(): void {
+    if (this.listAbort) {
+      this.listAbort.abort();
+      this.listAbort = null;
+    }
+  }
+
+  /**
+   * Resolve and validate a relative path, ensuring it doesn't escape the project root
+   */
+  private resolvePath(relPath: string): string {
+    // Normalize the path and resolve it against project root
+    const normalizedRelPath = relPath.replace(/\\/g, '/').replace(/^\//, '');
+    const fullPath = resolve(join(this.projectPath, normalizedRelPath));
+
+    // Security: ensure path is within projectPath (handle trailing separator edge cases)
+    const projectPathWithSep = this.projectPath.endsWith(sep)
+      ? this.projectPath
+      : this.projectPath + sep;
+    const fullPathWithSep = fullPath.endsWith(sep) ? fullPath : fullPath + sep;
+
+    if (!fullPathWithSep.startsWith(projectPathWithSep) && fullPath !== this.projectPath) {
+      throw new FileSystemError(
+        `Path traversal detected: ${relPath}`,
+        FileSystemErrorCodes.PATH_ESCAPE,
+        relPath
+      );
+    }
+
+    return fullPath;
+  }
+
+  /**
+   * Get relative path from absolute path
+   */
+  private relPath(fullPath: string): string {
+    return relative(this.projectPath, fullPath);
+  }
+
+  /**
+   * Check if a path should be ignored during search
+   */
+  private shouldIgnore(name: string): boolean {
+    return SEARCH_IGNORES.has(name);
+  }
+
+  /**
+   * Check if file is binary by extension
+   */
+  private isBinaryFile(filePath: string): boolean {
+    const ext = extname(filePath).toLowerCase();
+    return BINARY_EXTENSIONS.has(ext);
+  }
+
+  /**
+   * Convert fs.Stats to FileEntry
+   */
+  private statToEntry(fullPath: string, stat: Stats): FileEntry {
+    const relPath = this.relPath(fullPath);
+    return {
+      path: relPath,
+      type: stat.isDirectory() ? 'dir' : 'file',
+      size: stat.size,
+      mtime: stat.mtime,
+      ctime: stat.ctime,
+      mode: stat.mode,
+    };
+  }
+
+  async list(path: string = '', options: ListOptions = {}): Promise<FileListResult> {
+    const startTime = Date.now();
+    const fullPath = this.resolvePath(path);
+    const entries: FileEntry[] = [];
+    const maxEntries = options.maxEntries || 10000;
+    const timeBudgetMs = options.timeBudgetMs || 30000;
+
+    const abort = new AbortController();
+    this.listAbort = abort;
+
+    let truncated = false;
+    let truncateReason: 'maxEntries' | 'timeBudget' | undefined;
+
+    const listDir = async (dirPath: string, recursive: boolean) => {
+      if (abort.signal.aborted) return;
+
+      if (Date.now() - startTime > timeBudgetMs) {
+        truncated = true;
+        truncateReason = 'timeBudget';
+        return;
+      }
+
+      if (entries.length >= maxEntries) {
+        truncated = true;
+        truncateReason = 'maxEntries';
+        return;
+      }
+
+      let items;
+      try {
+        items = await fs.readdir(dirPath, { withFileTypes: true });
+      } catch {
+        return;
+      }
+
+      for (const item of items) {
+        if (abort.signal.aborted) return;
+
+        if (entries.length % 100 === 0 && Date.now() - startTime > timeBudgetMs) {
+          truncated = true;
+          truncateReason = 'timeBudget';
+          return;
+        }
+
+        if (!options.includeHidden && item.name.startsWith('.')) {
+          continue;
+        }
+
+        if (this.shouldIgnore(item.name)) {
+          continue;
+        }
+
+        const itemPath = join(dirPath, item.name);
+
+        try {
+          const stat = await fs.stat(itemPath);
+          const entry: FileEntry = {
+            path: this.relPath(itemPath),
+            type: item.isDirectory() ? 'dir' : 'file',
+            size: stat.size,
+            mtime: stat.mtime,
+            ctime: stat.ctime,
+            mode: stat.mode,
+          };
+
+          if (options.filter) {
+            const filterRegex = new RegExp(options.filter);
+            if (!filterRegex.test(item.name)) {
+              continue;
+            }
+          }
+
+          entries.push(entry);
+
+          if (entries.length >= maxEntries) {
+            truncated = true;
+            truncateReason = 'maxEntries';
+            return;
+          }
+
+          if (recursive && item.isDirectory()) {
+            await listDir(itemPath, true);
+          }
+        } catch {
+          // Skip entries we can't stat
+        }
+      }
+    };
+
+    await listDir(fullPath, options.recursive || false);
+
+    if (this.listAbort === abort) {
+      this.listAbort = null;
+    }
+
+    return {
+      entries,
+      total: entries.length,
+      truncated,
+      truncateReason,
+      durationMs: Date.now() - startTime,
+    };
+  }
+
+  async read(path: string, maxBytes: number = 200 * 1024): Promise<ReadResult> {
+    const fullPath = this.resolvePath(path);
+
+    let stat;
+    try {
+      stat = await fs.stat(fullPath);
+    } catch (err) {
+      throw new FileSystemError(`File not found: ${path}`, FileSystemErrorCodes.NOT_FOUND, path);
+    }
+
+    if (stat.isDirectory()) {
+      throw new FileSystemError(
+        `Path is a directory: ${path}`,
+        FileSystemErrorCodes.IS_DIRECTORY,
+        path
+      );
+    }
+
+    // Handle large files with truncation
+    if (stat.size > maxBytes) {
+      const fd = await fs.open(fullPath, 'r');
+      try {
+        const buffer = Buffer.alloc(maxBytes);
+        await fd.read(buffer, 0, maxBytes, 0);
+
+        return {
+          content: buffer.toString('utf-8'),
+          truncated: true,
+          totalSize: stat.size,
+        };
+      } finally {
+        await fd.close();
+      }
+    }
+
+    const content = await fs.readFile(fullPath, 'utf-8');
+    return {
+      content,
+      truncated: false,
+      totalSize: stat.size,
+    };
+  }
+
+  async write(path: string, content: string): Promise<WriteResult> {
+    const fullPath = this.resolvePath(path);
+
+    // Ensure directory exists
+    const dir = dirname(fullPath);
+    try {
+      await fs.mkdir(dir, { recursive: true });
+    } catch (err) {
+      throw new FileSystemError(
+        `Failed to create directory: ${dir}`,
+        FileSystemErrorCodes.PERMISSION_DENIED,
+        path
+      );
+    }
+
+    try {
+      await fs.writeFile(fullPath, content, 'utf-8');
+    } catch (err) {
+      throw new FileSystemError(
+        `Failed to write file: ${path}`,
+        FileSystemErrorCodes.PERMISSION_DENIED,
+        path
+      );
+    }
+
+    const stat = await fs.stat(fullPath);
+    return {
+      success: true,
+      bytesWritten: stat.size,
+    };
+  }
+
+  async exists(path: string): Promise<boolean> {
+    try {
+      await fs.access(this.resolvePath(path));
+      return true;
+    } catch {
+      return false;
+    }
+  }
+
+  async stat(path: string): Promise<FileEntry | null> {
+    try {
+      const fullPath = this.resolvePath(path);
+      const stat = await fs.stat(fullPath);
+      return this.statToEntry(fullPath, stat);
+    } catch {
+      return null;
+    }
+  }
+
+  async search(query: string, options: SearchOptions = {}): Promise<SearchResult> {
+    const pattern = options.pattern || query;
+    const matches: SearchMatch[] = [];
+    const maxResults = options.maxResults || 10000;
+    const fileExtensions = options.fileExtensions;
+    const caseSensitive = options.caseSensitive ?? false;
+
+    let filesSearched = 0;
+    let truncated = false;
+
+    let gitIgnore: ReturnType<typeof ignore> | undefined;
+    try {
+      const gitIgnorePath = join(this.projectPath, '.gitignore');
+      const content = await fs.readFile(gitIgnorePath, 'utf-8');
+      gitIgnore = ignore().add(content);
+    } catch {
+      // Ignore error reading .gitignore
+    }
+
+    const searchDir = async (dirPath: string) => {
+      let items;
+      try {
+        items = await fs.readdir(dirPath, { withFileTypes: true });
+      } catch {
+        return;
+      }
+
+      for (const item of items) {
+        if (matches.length >= maxResults) {
+          truncated = true;
+          return;
+        }
+
+        const itemPath = join(dirPath, item.name);
+
+        if (item.isDirectory()) {
+          const relPath = this.relPath(itemPath);
+          if (gitIgnore && gitIgnore.ignores(relPath)) {
+            continue;
+          }
+
+          if (!this.shouldIgnore(item.name) && !item.name.startsWith('.')) {
+            await searchDir(itemPath);
+          }
+        } else if (item.isFile()) {
+          // Skip binary files
+          if (this.isBinaryFile(itemPath)) {
+            continue;
+          }
+
+          // Check file extension filter
+          if (fileExtensions && fileExtensions.length > 0) {
+            const ext = extname(item.name).toLowerCase();
+            if (
+              !fileExtensions.some((e) => ext === e.toLowerCase() || ext === `.${e.toLowerCase()}`)
+            ) {
+              continue;
+            }
+          }
+
+          // Check file pattern if specified
+          if (options.filePattern) {
+            const filePatternRegex = new RegExp(options.filePattern.replace(/\*/g, '.*'));
+            if (!filePatternRegex.test(item.name)) {
+              continue;
+            }
+          }
+
+          filesSearched++;
+
+          try {
+            const fileStream = createReadStream(itemPath, { encoding: 'utf-8' });
+            const rl = createInterface({
+              input: fileStream,
+              crlfDelay: Infinity,
+            });
+
+            let lineNum = 0;
+            for await (const line of rl) {
+              lineNum++;
+
+              // Check for null bytes (binary file indicator)
+              if (line.includes('\0')) {
+                fileStream.destroy();
+                break;
+              }
+
+              const matchResult = caseSensitive
+                ? line.includes(pattern)
+                : line.toLowerCase().includes(pattern.toLowerCase());
+
+              if (matchResult) {
+                const column =
+                  (caseSensitive
+                    ? line.indexOf(pattern)
+                    : line.toLowerCase().indexOf(pattern.toLowerCase())) + 1;
+
+                matches.push({
+                  filePath: this.relPath(itemPath),
+                  line: lineNum,
+                  column,
+                  content: line.trim(),
+                  preview: line.trim().substring(0, 200),
+                });
+
+                if (matches.length >= maxResults) {
+                  fileStream.destroy();
+                  truncated = true;
+                  return;
+                }
+              }
+            }
+          } catch {
+            // Skip files that can't be read
+          }
+        }
+      }
+    };
+
+    await searchDir(this.projectPath);
+
+    return {
+      matches,
+      total: matches.length,
+      truncated,
+      filesSearched,
+    };
+  }
+
+  async remove(
+    path: string,
+    options?: { recursive?: boolean }
+  ): Promise<{ success: boolean; error?: string }> {
+    const fullPath = this.resolvePath(path);
+
+    let stat;
+    try {
+      stat = await fs.stat(fullPath);
+    } catch {
+      return { success: false, error: `File not found: ${path}` };
+    }
+
+    if (stat.isDirectory()) {
+      if (!options?.recursive) {
+        return { success: false, error: `Path is a directory: ${path}` };
+      }
+      try {
+        await fs.rm(fullPath, { recursive: true, force: true });
+        return { success: true };
+      } catch (err: unknown) {
+        return { success: false, error: err instanceof Error ? err.message : String(err) };
+      }
+    }
+
+    try {
+      await fs.unlink(fullPath);
+      return { success: true };
+    } catch (err: unknown) {
+      const code = (err as NodeJS.ErrnoException).code;
+      // Attempt chmod retry on permission error
+      if (code === 'EACCES' || code === 'EPERM') {
+        try {
+          await fs.chmod(fullPath, 0o666);
+          await fs.unlink(fullPath);
+          return { success: true };
+        } catch {
+          return { success: false, error: `Permission denied: ${path}` };
+        }
+      }
+      return { success: false, error: err instanceof Error ? err.message : String(err) };
+    }
+  }
+
+  async getProjectConfig(): Promise<{ success: boolean; content?: string; error?: string }> {
+    const configPath = join(this.projectPath, '.emdash.json');
+    try {
+      try {
+        const content = await fs.readFile(configPath, 'utf-8');
+        return { success: true, content };
+      } catch (err: unknown) {
+        const code = (err as NodeJS.ErrnoException).code;
+        if (code !== 'ENOENT') throw err;
+        // File doesn't exist — create with defaults
+        await fs.writeFile(configPath, DEFAULT_EMDASH_CONFIG, 'utf-8');
+        return { success: true, content: DEFAULT_EMDASH_CONFIG };
+      }
+    } catch (err: unknown) {
+      return { success: false, error: err instanceof Error ? err.message : String(err) };
+    }
+  }
+
+  async saveProjectConfig(content: string): Promise<{ success: boolean; error?: string }> {
+    try {
+      JSON.parse(content);
+    } catch {
+      return { success: false, error: 'Invalid JSON format' };
+    }
+    const configPath = join(this.projectPath, '.emdash.json');
+    try {
+      await fs.writeFile(configPath, content, 'utf-8');
+      return { success: true };
+    } catch (err: unknown) {
+      return { success: false, error: err instanceof Error ? err.message : String(err) };
+    }
+  }
+
+  async saveAttachment(
+    srcPath: string,
+    subdir?: string
+  ): Promise<{
+    success: boolean;
+    absPath?: string;
+    relPath?: string;
+    fileName?: string;
+    error?: string;
+  }> {
+    const ALLOWED_ATTACHMENT_EXTENSIONS = new Set([
+      '.png',
+      '.jpg',
+      '.jpeg',
+      '.gif',
+      '.webp',
+      '.bmp',
+      '.svg',
+    ]);
+
+    try {
+      try {
+        await fs.access(srcPath);
+      } catch {
+        return { success: false, error: 'Source file not found' };
+      }
+
+      const ext = extname(srcPath).toLowerCase();
+      if (!ALLOWED_ATTACHMENT_EXTENSIONS.has(ext)) {
+        return { success: false, error: 'Unsupported attachment type' };
+      }
+
+      const destDir = join(this.projectPath, '.emdash', subdir ?? 'attachments');
+      await fs.mkdir(destDir, { recursive: true });
+
+      const baseName = basename(srcPath);
+      let destName = baseName;
+      let counter = 1;
+      let destAbs = join(destDir, destName);
+
+      while (true) {
+        try {
+          await fs.access(destAbs);
+          // File exists — try next name
+          const nameWithoutExt = basename(baseName, ext);
+          destName = `${nameWithoutExt}-${counter}${ext}`;
+          destAbs = join(destDir, destName);
+          counter++;
+        } catch {
+          // File does not exist — safe to write here
+          break;
+        }
+      }
+
+      await fs.copyFile(srcPath, destAbs);
+      const relPath = relative(this.projectPath, destAbs);
+      return { success: true, absPath: destAbs, relPath, fileName: destName };
+    } catch (err: unknown) {
+      return { success: false, error: err instanceof Error ? err.message : String(err) };
+    }
+  }
+
+  async readImage(path: string): Promise<{
+    success: boolean;
+    dataUrl?: string;
+    mimeType?: string;
+    size?: number;
+    error?: string;
+  }> {
+    const fullPath = this.resolvePath(path);
+
+    // Check file extension
+    const ext = extname(path).toLowerCase();
+    if (!ALLOWED_IMAGE_EXTENSIONS.has(ext)) {
+      return {
+        success: false,
+        error: `Unsupported image format: ${ext}. Allowed: ${Array.from(ALLOWED_IMAGE_EXTENSIONS).join(', ')}`,
+      };
+    }
+
+    let stat;
+    try {
+      stat = await fs.stat(fullPath);
+    } catch {
+      return { success: false, error: `Image not found: ${path}` };
+    }
+
+    if (stat.isDirectory()) {
+      return { success: false, error: `Path is a directory: ${path}` };
+    }
+
+    // Size limit for images (10MB)
+    const MAX_IMAGE_SIZE = 10 * 1024 * 1024;
+    if (stat.size > MAX_IMAGE_SIZE) {
+      return {
+        success: false,
+        error: `Image too large: ${stat.size} bytes (max ${MAX_IMAGE_SIZE})`,
+      };
+    }
+
+    try {
+      const buffer = await fs.readFile(fullPath);
+      const base64 = buffer.toString('base64');
+      const mimeType = IMAGE_MIME_TYPES[ext] || 'application/octet-stream';
+      const dataUrl = `data:${mimeType};base64,${base64}`;
+
+      return {
+        success: true,
+        dataUrl,
+        mimeType,
+        size: stat.size,
+      };
+    } catch (err: unknown) {
+      return { success: false, error: err instanceof Error ? err.message : String(err) };
+    }
+  }
+
+  async mkdir(dirPath: string, options?: { recursive?: boolean }): Promise<void> {
+    await fs.mkdir(this.resolvePath(dirPath), { recursive: options?.recursive ?? false });
+  }
+
+  async realPath(path: string): Promise<string> {
+    return fs.realpath(this.resolvePath(path));
+  }
+
+  async glob(pattern: string, options?: { cwd?: string; dot?: boolean }): Promise<string[]> {
+    const cwd = options?.cwd ? this.resolvePath(options.cwd) : this.projectPath;
+    return glob(pattern, { cwd, dot: options?.dot ?? false, absolute: false });
+  }
+
+  async copyFile(src: string, dest: string): Promise<void> {
+    await fs.copyFile(this.resolvePath(src), this.resolvePath(dest));
+  }
+
+  watch(
+    callback: (events: FileWatchEvent[]) => void,
+    options: { debounceMs?: number } = {}
+  ): FileWatcher {
+    const stabilityMs = options.debounceMs ?? 200;
+    let pending: FileWatchEvent[] = [];
+    let flushTimer: ReturnType<typeof setTimeout> | null = null;
+    // Set when the async subscribe resolves; used by close() if it resolves after close() is called.
+    let resolvedSub: parcelWatcher.AsyncSubscription | null = null;
+    let closed = false;
+
+    const flush = () => {
+      if (pending.length) {
+        callback(pending);
+        pending = [];
+      }
+    };
+
+    const enqueue = (evt: FileWatchEvent) => {
+      pending.push(evt);
+      if (flushTimer) clearTimeout(flushTimer);
+      flushTimer = setTimeout(flush, stabilityMs);
+    };
+
+    const toRel = (absPath: string) => relative(this.projectPath, absPath).replace(/\\/g, '/');
+
+    void parcelWatcher
+      .subscribe(
+        this.projectPath,
+        (err, events) => {
+          if (err) return;
+          for (const e of events) {
+            const rel = toRel(e.path);
+            // Skip paths outside the project root (shouldn't happen, but guard anyway).
+            if (rel.startsWith('..')) continue;
+
+            let entryType: 'file' | 'directory' = 'file';
+            if (e.type !== 'delete') {
+              try {
+                entryType = statSync(e.path).isDirectory() ? 'directory' : 'file';
+              } catch {
+                // File removed between the event and the stat — treat as file.
+              }
+            }
+            const type = e.type === 'update' ? ('modify' as const) : e.type;
+            enqueue({ type, entryType, path: rel });
+          }
+        },
+        { ignore: WATCH_IGNORE_GLOBS }
+      )
+      .then((sub) => {
+        if (closed) {
+          void sub.unsubscribe();
+        } else {
+          resolvedSub = sub;
+        }
+      })
+      .catch(() => {
+        // Subscription failed (e.g. project path removed before watch started).
+      });
+
+    return {
+      // No-op: the recursive subscription already covers the entire worktree.
+      update(_paths: string[]) {},
+      close() {
+        closed = true;
+        if (flushTimer) clearTimeout(flushTimer);
+        if (resolvedSub) void resolvedSub.unsubscribe();
+      },
+    };
+  }
+}
diff --git a/src/main/core/fs/impl/ssh-fs.ts b/src/main/core/fs/impl/ssh-fs.ts
new file mode 100644
index 0000000000..f4d81aa57d
--- /dev/null
+++ b/src/main/core/fs/impl/ssh-fs.ts
@@ -0,0 +1,1028 @@
+/**
+ * Remote FileSystem implementation
+ * Uses SFTP over SSH for remote filesystem operations
+ */
+
+import type { SFTPWrapper } from 'ssh2';
+import type { FileWatchEvent } from '@shared/fs';
+import { quoteShellArg } from '../../../utils/shellEscape';
+import type { SshClientProxy } from '../../ssh/ssh-client-proxy';
+import {
+  DEFAULT_EMDASH_CONFIG,
+  FileEntry,
+  FileListResult,
+  FileSystemError,
+  FileSystemErrorCodes,
+  FileSystemProvider,
+  FileWatcher,
+  ListOptions,
+  ReadResult,
+  SearchOptions,
+  SearchResult,
+  WriteResult,
+} from '../types';
+
+const SFTP_STATUS = {
+  NO_SUCH_FILE: 2,
+  PERMISSION_DENIED: 3,
+  FAILURE: 4,
+} as const;
+
+interface SftpError extends Error {
+  code?: number;
+}
+
+/**
+ * Allowed image extensions for readImage
+ */
+const ALLOWED_IMAGE_EXTENSIONS = ['.png', '.jpg', '.jpeg', '.gif', '.webp', '.svg', '.bmp', '.ico'];
+
+/**
+ * Maximum file size for reading (100MB to prevent memory issues)
+ */
+const MAX_READ_SIZE = 100 * 1024 * 1024;
+
+/**
+ * Default max bytes for read operations
+ */
+const DEFAULT_MAX_BYTES = 200 * 1024;
+
+/**
+ * SshFileSystem implements IFileSystem using SFTP over SSH.
+ * Provides path traversal protection and proper error handling.
+ */
+export class SshFileSystem implements FileSystemProvider {
+  private cachedSftp: SFTPWrapper | undefined;
+
+  constructor(
+    private readonly proxy: SshClientProxy,
+    private readonly remotePath: string
+  ) {
+    if (!remotePath) {
+      throw new FileSystemError('Remote path is required', FileSystemErrorCodes.INVALID_PATH);
+    }
+    // Normalize remote path to use forward slashes
+    this.remotePath = remotePath.replace(/\\/g, '/');
+  }
+
+  // ─── Private helpers ──────────────────────────────────────────────────────
+
+  private getSftp(): Promise<SFTPWrapper> {
+    if (this.cachedSftp) return Promise.resolve(this.cachedSftp);
+    return new Promise((resolve, reject) => {
+      this.proxy.client.sftp((err, sftp) => {
+        if (err) return reject(err);
+        this.cachedSftp = sftp;
+        sftp.on('close', () => {
+          this.cachedSftp = undefined;
+        });
+        resolve(sftp);
+      });
+    });
+  }
+
+  private exec(command: string): Promise<{ stdout: string; stderr: string; exitCode: number }> {
+    const full = `bash -l -c ${quoteShellArg(command)}`;
+    return new Promise((resolve, reject) => {
+      this.proxy.client.exec(full, (err, stream) => {
+        if (err) return reject(err);
+        let stdout = '';
+        let stderr = '';
+        stream.on('close', (code: number | null) => {
+          resolve({ stdout: stdout.trim(), stderr: stderr.trim(), exitCode: code ?? -1 });
+        });
+        stream.on('data', (d: Buffer) => {
+          stdout += d.toString('utf-8');
+        });
+        stream.stderr.on('data', (d: Buffer) => {
+          stderr += d.toString('utf-8');
+        });
+        stream.on('error', reject);
+      });
+    });
+  }
+
+  // ─── IFileSystem ──────────────────────────────────────────────────────────
+
+  /**
+   * List directory contents via SFTP
+   */
+  async list(path: string = '', options?: ListOptions): Promise<FileListResult> {
+    const startTime = Date.now();
+    const fullPath = this.resolveRemotePath(path);
+    const sftp = await this.getSftp();
+
+    return new Promise((resolve, reject) => {
+      sftp.readdir(fullPath, (err, list) => {
+        if (err) {
+          reject(this.mapSftpError(err, fullPath));
+          return;
+        }
+
+        const entries: FileEntry[] = [];
+        const seen = new Set<string>();
+
+        for (const item of list) {
+          // Skip hidden files if not included
+          if (!options?.includeHidden && item.filename.startsWith('.')) {
+            continue;
+          }
+
+          // Apply filter if provided
+          if (options?.filter) {
+            const filterRegex = new RegExp(options.filter);
+            if (!filterRegex.test(item.filename)) {
+              continue;
+            }
+          }
+
+          const entryPath = this.relativePath(`${fullPath}/${item.filename}`);
+          if (seen.has(entryPath)) {
+            continue;
+          }
+          seen.add(entryPath);
+
+          const entry: FileEntry = {
+            path: entryPath,
+            type: item.attrs.isDirectory() ? 'dir' : 'file',
+            size: item.attrs.size,
+            mtime: new Date(item.attrs.mtime * 1000),
+            ctime: new Date(item.attrs.atime * 1000),
+            mode: item.attrs.mode,
+          };
+
+          entries.push(entry);
+
+          // Handle recursive listing
+          if (options?.recursive && item.attrs.isDirectory()) {
+            // Note: Recursive listing is async and needs special handling
+            // For now, we note that full recursive support requires additional implementation
+          }
+        }
+
+        // Sort entries: directories first, then files, both alphabetically
+        entries.sort((a, b) => {
+          if (a.type === b.type) {
+            return a.path.localeCompare(b.path);
+          }
+          return a.type === 'dir' ? -1 : 1;
+        });
+
+        let result = entries;
+        let truncated = false;
+        let truncateReason: 'maxEntries' | 'timeBudget' | undefined;
+
+        // Apply maxEntries limit
+        if (options?.maxEntries && entries.length > options.maxEntries) {
+          result = entries.slice(0, options.maxEntries);
+          truncated = true;
+          truncateReason = 'maxEntries';
+        }
+
+        // Apply time budget
+        const durationMs = Date.now() - startTime;
+        if (options?.timeBudgetMs && durationMs > options.timeBudgetMs) {
+          truncated = true;
+          truncateReason = 'timeBudget';
+        }
+
+        resolve({
+          entries: result,
+          total: entries.length,
+          truncated,
+          truncateReason,
+          durationMs,
+        });
+      });
+    });
+  }
+
+  /**
+   * Read file contents via SFTP
+   * Handles large files by respecting maxBytes limit
+   */
+  async read(path: string, maxBytes: number = DEFAULT_MAX_BYTES): Promise<ReadResult> {
+    const fullPath = this.resolveRemotePath(path);
+    const sftp = await this.getSftp();
+
+    return new Promise((resolve, reject) => {
+      sftp.open(fullPath, 'r', (err, handle) => {
+        if (err) {
+          reject(this.mapSftpError(err, fullPath));
+          return;
+        }
+
+        sftp.fstat(handle, (statErr, stats) => {
+          if (statErr) {
+            sftp.close(handle, () => {});
+            reject(this.mapSftpError(statErr, fullPath));
+            return;
+          }
+
+          // Check if it's a directory
+          if (stats.isDirectory()) {
+            sftp.close(handle, () => {});
+            reject(
+              new FileSystemError(
+                `Path is a directory: ${path}`,
+                FileSystemErrorCodes.IS_DIRECTORY,
+                path
+              )
+            );
+            return;
+          }
+
+          const fileSize = stats.size;
+          const readSize = Math.min(fileSize, maxBytes, MAX_READ_SIZE);
+
+          if (readSize === 0) {
+            sftp.close(handle, () => {});
+            resolve({ content: '', truncated: false, totalSize: fileSize });
+            return;
+          }
+
+          const buffer = Buffer.alloc(readSize);
+
+          sftp.read(handle, buffer, 0, readSize, 0, (readErr, bytesRead) => {
+            sftp.close(handle, () => {});
+
+            if (readErr) {
+              reject(this.mapSftpError(readErr, fullPath));
+              return;
+            }
+
+            // Convert buffer to string, handling only the bytes actually read
+            const content = buffer.subarray(0, bytesRead).toString('utf-8');
+
+            resolve({
+              content,
+              truncated: fileSize > maxBytes,
+              totalSize: fileSize,
+            });
+          });
+        });
+      });
+    });
+  }
+
+  /**
+   * Write file contents via SFTP
+   * Creates parent directories recursively if needed
+   */
+  async write(path: string, content: string): Promise<WriteResult> {
+    const fullPath = this.resolveRemotePath(path);
+    const sftp = await this.getSftp();
+
+    // Ensure parent directory exists
+    const lastSlash = fullPath.lastIndexOf('/');
+    if (lastSlash > 0) {
+      const parentDir = fullPath.substring(0, lastSlash);
+      await this.ensureRemoteDir(sftp, parentDir);
+    }
+
+    return new Promise((resolve, reject) => {
+      sftp.open(fullPath, 'w', (err, handle) => {
+        if (err) {
+          reject(this.mapSftpError(err, fullPath));
+          return;
+        }
+
+        const buffer = Buffer.from(content, 'utf-8');
+
+        if (buffer.length === 0) {
+          sftp.close(handle, (closeErr) => {
+            if (closeErr) {
+              reject(this.mapSftpError(closeErr, fullPath));
+              return;
+            }
+            resolve({ success: true, bytesWritten: 0 });
+          });
+          return;
+        }
+
+        sftp.write(handle, buffer, 0, buffer.length, 0, (writeErr) => {
+          sftp.close(handle, (closeErr) => {
+            if (writeErr) {
+              reject(this.mapSftpError(writeErr, fullPath));
+              return;
+            }
+
+            if (closeErr) {
+              reject(this.mapSftpError(closeErr, fullPath));
+              return;
+            }
+
+            resolve({
+              success: true,
+              bytesWritten: buffer.length,
+            });
+          });
+        });
+      });
+    });
+  }
+
+  /**
+   * Recursively list all files and directories via SSH find (single round-trip).
+   * Returns items in the same {path, type} format used by the local fs:list handler.
+   */
+  async listRecursive(options?: { includeDirs?: boolean; maxEntries?: number }): Promise<{
+    items: Array<{ path: string; type: 'file' | 'dir' }>;
+    truncated: boolean;
+  }> {
+    const includeDirs = options?.includeDirs ?? true;
+    const maxEntries = options?.maxEntries ?? 5000;
+
+    // Directories to prune from the listing
+    const pruneNames = [
+      '.git',
+      'node_modules',
+      'dist',
+      'build',
+      '.next',
+      'out',
+      '.turbo',
+      'coverage',
+      '.nyc_output',
+      '.cache',
+      'tmp',
+      'temp',
+      '__pycache__',
+      '.pytest_cache',
+      'venv',
+      '.venv',
+      'target',
+      '.terraform',
+      '.serverless',
+      'vendor',
+      'bower_components',
+      'worktrees',
+      '.worktrees',
+      '.DS_Store',
+    ];
+
+    // Build prune clause for find (names are hardcoded, but escape for safety)
+    const pruneExpr = pruneNames.map((name) => `-name ${quoteShellArg(name)}`).join(' -o ');
+
+    // Build find command: prune ignored dirs, print files (and optionally dirs)
+    const typeFilter = includeDirs ? '' : '-type f';
+    const command = [
+      `find ${quoteShellArg(this.remotePath)}`,
+      `\\( ${pruneExpr} \\) -prune -o`,
+      typeFilter ? `${typeFilter} -print` : '-print',
+      `2>/dev/null`,
+      `| head -n ${maxEntries + 1}`,
+    ]
+      .filter(Boolean)
+      .join(' ');
+
+    try {
+      const result = await this.exec(command);
+
+      const lines = result.stdout.split('\n').filter((line) => line.trim());
+
+      // Check if we exceeded maxEntries (we asked for maxEntries+1 to detect truncation)
+      const truncated = lines.length > maxEntries;
+      const effectiveLines = truncated ? lines.slice(0, maxEntries) : lines;
+
+      const items: Array<{ path: string; type: 'file' | 'dir' }> = [];
+
+      for (const line of effectiveLines) {
+        const trimmed = line.trim();
+        if (!trimmed) continue;
+
+        // Skip the root path itself
+        if (trimmed === this.remotePath || trimmed === this.remotePath + '/') continue;
+
+        const relPath = this.relativePath(trimmed);
+        if (!relPath) continue;
+
+        // Determine type: find outputs directories with trailing / when using -print,
+        // but standard find doesn't. We'll use a heuristic: if any other entry starts
+        // with this path + '/', it's a directory. For efficiency, detect trailing slash.
+        const isDir = trimmed.endsWith('/');
+        const cleanRel = relPath.replace(/\/$/, '');
+
+        if (!cleanRel) continue;
+
+        items.push({
+          path: cleanRel,
+          type: isDir ? 'dir' : 'file',
+        });
+      }
+
+      // Since `find` doesn't always indicate directories clearly with just -print,
+      // we do a second pass: any path that is a prefix of another path is a directory.
+      const pathSet = new Set(items.map((i) => i.path));
+      for (const item of items) {
+        if (item.type === 'file') {
+          // Check if any other path starts with this path + '/'
+          const prefix = item.path + '/';
+          for (const otherPath of pathSet) {
+            if (otherPath.startsWith(prefix)) {
+              item.type = 'dir';
+              break;
+            }
+          }
+        }
+      }
+
+      // Filter out dirs if not requested
+      const finalItems = includeDirs ? items : items.filter((i) => i.type === 'file');
+
+      return { items: finalItems, truncated };
+    } catch {
+      return { items: [], truncated: false };
+    }
+  }
+
+  /**
+   * Check if a path exists via SFTP
+   */
+  async exists(path: string): Promise<boolean> {
+    try {
+      const entry = await this.stat(path);
+      return entry !== null;
+    } catch {
+      return false;
+    }
+  }
+
+  async mkdir(dirPath: string, options?: { recursive?: boolean }): Promise<void> {
+    const fullPath = this.resolveRemotePath(dirPath);
+    const sftp = await this.getSftp();
+    if (options?.recursive) {
+      await this.ensureRemoteDir(sftp, fullPath);
+    } else {
+      await new Promise<void>((resolve, reject) => {
+        sftp.mkdir(fullPath, (err) => (err ? reject(this.mapSftpError(err, fullPath)) : resolve()));
+      });
+    }
+  }
+
+  async realPath(path: string): Promise<string> {
+    const fullPath = this.resolveRemotePath(path);
+    const result = await this.exec(`realpath ${quoteShellArg(fullPath)}`);
+    if (result.exitCode !== 0) {
+      throw new Error(`realpath failed: ${result.stderr}`);
+    }
+    return result.stdout.trim();
+  }
+
+  async glob(pattern: string, options?: { cwd?: string; dot?: boolean }): Promise<string[]> {
+    const cwd = options?.cwd ? this.resolveRemotePath(options.cwd) : this.remotePath;
+    const dotSetup = options?.dot ? 'shopt -s dotglob;' : '';
+    const command = `${dotSetup} shopt -s nullglob; cd ${quoteShellArg(cwd)} && printf '%s\\n' ${pattern}`;
+    try {
+      const result = await this.exec(command);
+      if (result.exitCode !== 0) return [];
+      return result.stdout.trim().split('\n').filter(Boolean);
+    } catch {
+      return [];
+    }
+  }
+
+  async copyFile(src: string, dest: string): Promise<void> {
+    const fullSrc = this.resolveRemotePath(src);
+    const fullDest = this.resolveRemotePath(dest);
+    const result = await this.exec(`cp ${quoteShellArg(fullSrc)} ${quoteShellArg(fullDest)}`);
+    if (result.exitCode !== 0) {
+      throw new Error(`Failed to copy file: ${result.stderr}`);
+    }
+  }
+
+  /**
+   * Get file/directory metadata via SFTP
+   */
+  async stat(path: string): Promise<FileEntry | null> {
+    const fullPath = this.resolveRemotePath(path);
+    const sftp = await this.getSftp();
+
+    return new Promise((resolve, reject) => {
+      sftp.stat(fullPath, (err, stats) => {
+        if (err) {
+          // Check if file doesn't exist
+          const sftpErr = err as SftpError;
+          if (
+            sftpErr.message?.includes('No such file') ||
+            sftpErr.code === SFTP_STATUS.NO_SUCH_FILE
+          ) {
+            resolve(null);
+            return;
+          }
+          reject(this.mapSftpError(err, fullPath));
+          return;
+        }
+
+        resolve({
+          path,
+          type: stats.isDirectory() ? 'dir' : 'file',
+          size: stats.size,
+          mtime: new Date(stats.mtime * 1000),
+          ctime: new Date(stats.atime * 1000),
+          mode: stats.mode,
+        });
+      });
+    });
+  }
+
+  /**
+   * Search for content in files via SSH exec (grep)
+   * Uses grep on the remote host for better performance on large codebases
+   */
+  async search(query: string, options?: SearchOptions): Promise<SearchResult> {
+    const searchPattern = options?.pattern || query;
+    const basePath = this.remotePath;
+    const maxResults = options?.maxResults || 10000;
+    const caseFlag = options?.caseSensitive ? '' : '-i';
+
+    // Build grep command with shell-safe escaping
+    const escapedPattern = quoteShellArg(searchPattern);
+
+    // Build file extension filter if provided
+    let includeFilter = '';
+    if (options?.fileExtensions && options.fileExtensions.length > 0) {
+      const extensions = options.fileExtensions.map((ext) =>
+        ext.startsWith('.') ? ext : `.${ext}`
+      );
+      includeFilter = extensions.map((e) => `--include=${quoteShellArg(`*${e}`)}`).join(' ');
+    }
+
+    // Use grep recursively with line numbers
+    const command = `grep -rn ${caseFlag} ${includeFilter} -e ${escapedPattern} ${quoteShellArg(basePath)} 2>/dev/null | head -n ${maxResults}`;
+
+    try {
+      const result = await this.exec(command);
+
+      // If grep returns non-zero exit but no stderr, it just means no matches
+      if (result.exitCode !== 0 && result.exitCode !== 1) {
+        // grep exit code 1 means no matches found, which is fine
+        return { matches: [], total: 0, filesSearched: 0 };
+      }
+
+      const matches: import('../types').SearchMatch[] = [];
+      const lines = result.stdout.split('\n').filter((line) => line.trim());
+      const seenFiles = new Set<string>();
+
+      for (const line of lines) {
+        // Parse grep output format: path:line:content
+        const firstColon = line.indexOf(':');
+        if (firstColon === -1) continue;
+
+        const filePath = line.substring(0, firstColon);
+        const rest = line.substring(firstColon + 1);
+
+        const secondColon = rest.indexOf(':');
+        if (secondColon === -1) continue;
+
+        const lineNum = parseInt(rest.substring(0, secondColon), 10);
+        const content = rest.substring(secondColon + 1);
+
+        if (isNaN(lineNum)) continue;
+
+        const relPath = this.relativePath(filePath);
+
+        // Apply file pattern filter if provided
+        if (options?.filePattern) {
+          const patternRegex = new RegExp(options.filePattern);
+          if (!patternRegex.test(relPath)) {
+            continue;
+          }
+        }
+
+        seenFiles.add(filePath);
+
+        // Find column by searching for the pattern in the content
+        const searchPat = options?.caseSensitive ? searchPattern : searchPattern.toLowerCase();
+        const column = content.indexOf(searchPat) + 1;
+
+        matches.push({
+          filePath: relPath,
+          line: lineNum,
+          column: column > 0 ? column : 1,
+          content: content.trim(),
+          preview: content.trim(),
+        });
+      }
+
+      return {
+        matches,
+        total: matches.length,
+        truncated: lines.length >= maxResults,
+        filesSearched: seenFiles.size,
+      };
+    } catch (error) {
+      // If command execution fails, return empty results
+      return { matches: [], total: 0, filesSearched: 0 };
+    }
+  }
+
+  /**
+   * Remove a file via SFTP
+   * For directories, uses SSH exec with rm -rf
+   */
+  async remove(
+    path: string,
+    options?: { recursive?: boolean }
+  ): Promise<{ success: boolean; error?: string }> {
+    const fullPath = this.resolveRemotePath(path);
+
+    try {
+      const entry = await this.stat(path);
+
+      if (!entry) {
+        return { success: false, error: `File not found: ${path}` };
+      }
+
+      const sftp = await this.getSftp();
+
+      if (entry.type === 'dir') {
+        if (!options?.recursive) {
+          return { success: false, error: `Path is a directory: ${path}` };
+        }
+        const command = `rm -rf ${quoteShellArg(fullPath)}`;
+        const result = await this.exec(command);
+
+        if (result.exitCode !== 0) {
+          return { success: false, error: result.stderr || 'Failed to remove directory' };
+        }
+      } else {
+        // For files, use SFTP unlink
+        return new Promise((resolve) => {
+          sftp.unlink(fullPath, (err) => {
+            if (err) {
+              resolve({ success: false, error: err.message });
+            } else {
+              resolve({ success: true });
+            }
+          });
+        });
+      }
+
+      return { success: true };
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      return { success: false, error: message };
+    }
+  }
+
+  /**
+   * Read image file as base64 data URL via SFTP
+   */
+  async readImage(path: string): Promise<{
+    success: boolean;
+    dataUrl?: string;
+    mimeType?: string;
+    size?: number;
+    error?: string;
+  }> {
+    // Check file extension
+    const ext = path.toLowerCase().substring(path.lastIndexOf('.'));
+    if (!ALLOWED_IMAGE_EXTENSIONS.includes(ext)) {
+      return {
+        success: false,
+        error: `Unsupported image format: ${ext}`,
+      };
+    }
+
+    const fullPath = this.resolveRemotePath(path);
+    const sftp = await this.getSftp();
+
+    return new Promise((resolve, reject) => {
+      sftp.open(fullPath, 'r', (err, handle) => {
+        if (err) {
+          reject(this.mapSftpError(err, fullPath));
+          return;
+        }
+
+        sftp.fstat(handle, (statErr, stats) => {
+          if (statErr) {
+            sftp.close(handle, () => {});
+            reject(this.mapSftpError(statErr, fullPath));
+            return;
+          }
+
+          // Check file size limit (5MB for images)
+          const maxImageSize = 5 * 1024 * 1024;
+          if (stats.size > maxImageSize) {
+            sftp.close(handle, () => {});
+            resolve({
+              success: false,
+              error: `Image too large: ${stats.size} bytes (max ${maxImageSize})`,
+            });
+            return;
+          }
+
+          if (stats.size === 0) {
+            sftp.close(handle, () => {});
+            resolve({ success: false, error: 'Image file is empty' });
+            return;
+          }
+
+          const buffer = Buffer.alloc(stats.size);
+
+          sftp.read(handle, buffer, 0, stats.size, 0, (readErr) => {
+            sftp.close(handle, () => {});
+
+            if (readErr) {
+              reject(this.mapSftpError(readErr, fullPath));
+              return;
+            }
+
+            // Determine MIME type from extension
+            const mimeTypes: Record<string, string> = {
+              '.png': 'image/png',
+              '.jpg': 'image/jpeg',
+              '.jpeg': 'image/jpeg',
+              '.gif': 'image/gif',
+              '.webp': 'image/webp',
+              '.svg': 'image/svg+xml',
+              '.bmp': 'image/bmp',
+              '.ico': 'image/x-icon',
+            };
+            const mimeType = mimeTypes[ext] || 'application/octet-stream';
+
+            // Convert to base64
+            const base64 = buffer.toString('base64');
+            const dataUrl = `data:${mimeType};base64,${base64}`;
+
+            resolve({
+              success: true,
+              dataUrl,
+              mimeType,
+              size: stats.size,
+            });
+          });
+        });
+      });
+    });
+  }
+
+  /**
+   * Read (or auto-create) the project's .emdash.json config file via SFTP
+   */
+  async getProjectConfig(): Promise<{ success: boolean; content?: string; error?: string }> {
+    try {
+      const result = await this.read('.emdash.json').catch(async (err: unknown) => {
+        const code = (err as FileSystemError).code;
+        if (code !== FileSystemErrorCodes.NOT_FOUND) throw err;
+        // File doesn't exist — create with defaults then return defaults
+        await this.write('.emdash.json', DEFAULT_EMDASH_CONFIG);
+        return {
+          content: DEFAULT_EMDASH_CONFIG,
+          truncated: false,
+          totalSize: Buffer.byteLength(DEFAULT_EMDASH_CONFIG),
+        };
+      });
+      return { success: true, content: result.content };
+    } catch (err: unknown) {
+      return { success: false, error: err instanceof Error ? err.message : String(err) };
+    }
+  }
+
+  /**
+   * Write the project's .emdash.json config file via SFTP after validating JSON
+   */
+  async saveProjectConfig(content: string): Promise<{ success: boolean; error?: string }> {
+    try {
+      JSON.parse(content);
+    } catch {
+      return { success: false, error: 'Invalid JSON format' };
+    }
+    try {
+      await this.write('.emdash.json', content);
+      return { success: true };
+    } catch (err: unknown) {
+      return { success: false, error: err instanceof Error ? err.message : String(err) };
+    }
+  }
+
+  // ─── Private utilities ────────────────────────────────────────────────────
+
+  /**
+   * Build absolute remote path from relative path
+   * Provides path traversal protection
+   */
+  private resolveRemotePath(relPath: string): string {
+    // Normalize path separators to forward slashes
+    const normalized = relPath.replace(/\\/g, '/');
+
+    // Handle absolute paths (should not escape base)
+    if (normalized.startsWith('/')) {
+      const resolved = normalized;
+      // Security: ensure resolved path is within remotePath base
+      if (!this.isWithinBase(resolved)) {
+        throw new FileSystemError(
+          'Path traversal detected: path escapes base directory',
+          FileSystemErrorCodes.PATH_ESCAPE,
+          relPath
+        );
+      }
+      return resolved;
+    }
+
+    // Join with base path
+    const fullPath = `${this.remotePath}/${normalized}`.replace(/\/+/g, '/');
+
+    // Security: ensure path is within basePath
+    if (!this.isWithinBase(fullPath)) {
+      throw new FileSystemError(
+        'Path traversal detected: path escapes base directory',
+        FileSystemErrorCodes.PATH_ESCAPE,
+        relPath
+      );
+    }
+
+    return fullPath;
+  }
+
+  /**
+   * Check if a path is within the base directory
+   */
+  private isWithinBase(fullPath: string): boolean {
+    // Normalize both paths
+    const normalizedPath = fullPath.replace(/\/+/g, '/').replace(/\/$/, '');
+    const normalizedBase = this.remotePath.replace(/\/+/g, '/').replace(/\/$/, '');
+
+    // Path must start with base path
+    return normalizedPath === normalizedBase || normalizedPath.startsWith(`${normalizedBase}/`);
+  }
+
+  /**
+   * Get relative path from full remote path
+   */
+  private relativePath(fullPath: string): string {
+    const normalized = fullPath.replace(/\\/g, '/');
+    const normalizedBase = this.remotePath.replace(/\\/g, '/');
+
+    if (normalized === normalizedBase) {
+      return '';
+    }
+
+    const prefix = `${normalizedBase}/`;
+    if (normalized.startsWith(prefix)) {
+      return normalized.substring(prefix.length);
+    }
+
+    return normalized;
+  }
+
+  /**
+   * Recursively ensure a remote directory exists
+   */
+  private async ensureRemoteDir(sftp: SFTPWrapper, dirPath: string): Promise<void> {
+    return new Promise((resolve, reject) => {
+      sftp.mkdir(dirPath, (err) => {
+        if (!err) {
+          resolve();
+          return;
+        }
+
+        const sftpErr = err as SftpError;
+        const msg = sftpErr.message ?? '';
+        const code = sftpErr.code;
+
+        const isAlreadyExists =
+          msg.includes('already exists') ||
+          msg.includes('File exists') ||
+          (code === SFTP_STATUS.FAILURE && (msg === 'Failure' || msg === ''));
+        const isMissingParent = code === SFTP_STATUS.NO_SUCH_FILE || msg.includes('No such file');
+
+        if (isAlreadyExists) {
+          resolve();
+          return;
+        }
+
+        const parentPath = dirPath.substring(0, dirPath.lastIndexOf('/'));
+        if (
+          isMissingParent &&
+          parentPath &&
+          parentPath !== dirPath &&
+          parentPath.length >= this.remotePath.length
+        ) {
+          this.ensureRemoteDir(sftp, parentPath)
+            .then(() => this.ensureRemoteDir(sftp, dirPath))
+            .then(resolve)
+            .catch(reject);
+        } else {
+          reject(this.mapSftpError(err, dirPath));
+        }
+      });
+    });
+  }
+
+  /**
+   * Map SFTP error codes to FileSystemError
+   */
+  private mapSftpError(error: unknown, path?: string): FileSystemError {
+    const sftpErr = error as SftpError;
+    const message = typeof sftpErr?.message === 'string' ? sftpErr.message : String(error);
+    const code = sftpErr?.code;
+
+    // Map common SFTP error codes
+    if (code === SFTP_STATUS.NO_SUCH_FILE || message.includes('No such file')) {
+      return new FileSystemError(
+        `File or directory not found: ${path || message}`,
+        FileSystemErrorCodes.NOT_FOUND,
+        path
+      );
+    }
+
+    if (code === SFTP_STATUS.PERMISSION_DENIED || message.includes('Permission denied')) {
+      return new FileSystemError(
+        `Permission denied: ${path || message}`,
+        FileSystemErrorCodes.PERMISSION_DENIED,
+        path
+      );
+    }
+
+    if (message.includes('is a directory')) {
+      return new FileSystemError(
+        `Path is a directory: ${path || message}`,
+        FileSystemErrorCodes.IS_DIRECTORY,
+        path
+      );
+    }
+
+    if (message.includes('Not a directory')) {
+      return new FileSystemError(
+        `Path is not a directory: ${path || message}`,
+        FileSystemErrorCodes.NOT_DIRECTORY,
+        path
+      );
+    }
+
+    if (message.includes('connection') || message.includes('Connection')) {
+      return new FileSystemError(
+        `Connection error: ${message}`,
+        FileSystemErrorCodes.CONNECTION_ERROR,
+        path
+      );
+    }
+
+    // Default to unknown error
+    return new FileSystemError(`Filesystem error: ${message}`, FileSystemErrorCodes.UNKNOWN, path);
+  }
+
+  watch(
+    callback: (events: FileWatchEvent[]) => void,
+    options: { debounceMs?: number } = {}
+  ): FileWatcher {
+    const interval = options.debounceMs ?? 4000;
+    let watched: string[] = [];
+    // Map from dirPath → previous entries (keyed by relative entry path)
+    const snapshots = new Map<string, Map<string, FileEntry>>();
+
+    const poll = async () => {
+      for (const dirPath of watched) {
+        let result: FileListResult | null = null;
+        try {
+          result = await this.list(dirPath, { includeHidden: true });
+        } catch {
+          continue;
+        }
+
+        const currMap = new Map(result.entries.map((e) => [e.path, e]));
+        const prevMap = snapshots.get(dirPath);
+        snapshots.set(dirPath, currMap);
+
+        if (!prevMap) continue;
+
+        const evts: FileWatchEvent[] = [];
+        for (const [p, e] of currMap) {
+          if (!prevMap.has(p))
+            evts.push({
+              type: 'create',
+              entryType: e.type === 'dir' ? 'directory' : 'file',
+              path: p,
+            });
+        }
+        for (const [p, e] of prevMap) {
+          if (!currMap.has(p))
+            evts.push({
+              type: 'delete',
+              entryType: e.type === 'dir' ? 'directory' : 'file',
+              path: p,
+            });
+        }
+        if (evts.length) callback(evts);
+      }
+    };
+
+    const timer = setInterval(() => {
+      void poll();
+    }, interval);
+
+    return {
+      update(paths: string[]) {
+        watched = paths;
+        for (const p of snapshots.keys()) {
+          if (!paths.includes(p)) snapshots.delete(p);
+        }
+      },
+      close() {
+        clearInterval(timer);
+      },
+    };
+  }
+}
diff --git a/src/main/core/fs/types.ts b/src/main/core/fs/types.ts
new file mode 100644
index 0000000000..936216d6e9
--- /dev/null
+++ b/src/main/core/fs/types.ts
@@ -0,0 +1,334 @@
+/**
+ * Filesystem abstraction layer types
+ * Provides unified interface for local and remote (SSH/SFTP) filesystem operations
+ */
+
+import type { FileWatchEvent } from '@shared/fs';
+
+/**
+ * Handle returned by FileSystemProvider.watch().
+ * Call update() to change the set of watched paths, close() to stop.
+ */
+export interface FileWatcher {
+  update(paths: string[]): void;
+  close(): void;
+}
+
+/**
+ * File entry metadata returned by filesystem operations
+ */
+export interface FileEntry {
+  /** Relative path from the project root */
+  path: string;
+  /** Entry type - file or directory */
+  type: 'file' | 'dir';
+  /** File size in bytes (files only) */
+  size?: number;
+  /** Last modification time */
+  mtime?: Date;
+  /** Creation time */
+  ctime?: Date;
+  /** File permissions (Unix mode) */
+  mode?: number;
+}
+
+/**
+ * Options for listing directory contents
+ */
+export interface ListOptions {
+  /** Include entries from subdirectories recursively */
+  recursive?: boolean;
+  /** Include hidden files (starting with .) */
+  includeHidden?: boolean;
+  /** Filter pattern (glob or regex, implementation-dependent) */
+  filter?: string;
+  /** Maximum number of entries to return */
+  maxEntries?: number;
+  /** Time budget in milliseconds */
+  timeBudgetMs?: number;
+}
+
+/**
+ * Result of a list operation
+ */
+export interface FileListResult {
+  /** File and directory entries */
+  entries: FileEntry[];
+  /** Total number of entries found (may be more than entries.length if truncated) */
+  total: number;
+  /** Whether the result was truncated due to limits */
+  truncated?: boolean;
+  /** Reason for truncation if applicable */
+  truncateReason?: 'maxEntries' | 'timeBudget';
+  /** Duration of the operation in milliseconds */
+  durationMs?: number;
+}
+
+/**
+ * Result of a file read operation
+ */
+export interface ReadResult {
+  /** File content as string */
+  content: string;
+  /** Whether the content was truncated due to maxBytes limit */
+  truncated: boolean;
+  /** Total file size in bytes */
+  totalSize: number;
+}
+
+/**
+ * Result of a file write operation
+ */
+export interface WriteResult {
+  /** Whether the write was successful */
+  success: boolean;
+  /** Number of bytes written */
+  bytesWritten: number;
+  /** Error message if unsuccessful */
+  error?: string;
+}
+
+/**
+ * Options for search operations
+ */
+export interface SearchOptions {
+  /**
+   * Optional override pattern. If omitted, the `query` argument to `IFileSystem.search()` is used.
+   */
+  pattern?: string;
+  /** Optional file pattern filter (e.g., "*.ts") */
+  filePattern?: string;
+  /** Maximum number of results to return */
+  maxResults?: number;
+  /** Case-sensitive search */
+  caseSensitive?: boolean;
+  /** File extensions to include */
+  fileExtensions?: string[];
+}
+
+/**
+ * Result of a search operation
+ */
+export interface SearchResult {
+  /** Search matches found */
+  matches: SearchMatch[];
+  /** Total number of matches */
+  total: number;
+  /** Whether results were truncated */
+  truncated?: boolean;
+  /** Number of files searched */
+  filesSearched?: number;
+}
+
+/**
+ * Individual search match
+ */
+export interface SearchMatch {
+  /** Path to the file containing the match */
+  filePath: string;
+  /** Line number (1-based) */
+  line: number;
+  /** Column number (1-based) */
+  column: number;
+  /** Match text */
+  content: string;
+  /** Preview with context */
+  preview?: string;
+}
+
+/**
+ * Filesystem interface abstraction
+ * Implementations: LocalFileSystem (local disk), RemoteFileSystem (SFTP over SSH)
+ */
+export interface FileSystemProvider {
+  /**
+   * List directory contents
+   * @param path - Directory path relative to project root
+   * @param options - Listing options
+   * @returns Promise resolving to file list result
+   */
+  list(path: string, options?: ListOptions): Promise<FileListResult>;
+
+  /**
+   * Read file contents
+   * @param path - File path relative to project root
+   * @param maxBytes - Maximum bytes to read (default: 200KB)
+   * @returns Promise resolving to read result
+   */
+  read(path: string, maxBytes?: number): Promise<ReadResult>;
+
+  /**
+   * Write file contents
+   * @param path - File path relative to project root
+   * @param content - Content to write
+   * @returns Promise resolving to write result
+   */
+  write(path: string, content: string): Promise<WriteResult>;
+
+  /**
+   * Check if a path exists
+   * @param path - Path to check relative to project root
+   * @returns Promise resolving to true if exists
+   */
+  exists(path: string): Promise<boolean>;
+
+  /**
+   * Get file/directory metadata
+   * @param path - Path to stat relative to project root
+   * @returns Promise resolving to file entry or null if not found
+   */
+  stat(path: string): Promise<FileEntry | null>;
+
+  /**
+   * Search for content in files
+   * @param query - Search query string
+   * @param options - Search options
+   * @returns Promise resolving to search results
+   */
+  search(query: string, options?: SearchOptions): Promise<SearchResult>;
+
+  /**
+   * Remove a file or directory.
+   * @param path - Path relative to project root
+   * @param options - Pass `{ recursive: true }` to remove directories and all contents
+   * @returns Promise resolving to success status
+   */
+  remove(
+    path: string,
+    options?: { recursive?: boolean }
+  ): Promise<{ success: boolean; error?: string }>;
+
+  /**
+   * Resolve a path to its absolute, canonical form (resolving symlinks).
+   * @param path - Path relative to project root
+   * @returns Promise resolving to the absolute path
+   */
+  realPath(path: string): Promise<string>;
+
+  /**
+   * Find files matching a glob pattern.
+   * @param pattern - Glob pattern (e.g., ".env", ".env.*.local")
+   * @param options - cwd: directory to search in; dot: include dotfiles (default false)
+   * @returns Relative paths of matching entries
+   */
+  glob(pattern: string, options?: { cwd?: string; dot?: boolean }): Promise<string[]>;
+
+  /**
+   * Copy a file from src to dest (both paths relative to project root).
+   * Does not create parent directories — caller must ensure they exist.
+   * @param src - Source path
+   * @param dest - Destination path
+   */
+  copyFile(src: string, dest: string): Promise<void>;
+
+  /**
+   * Read image file as base64 data URL
+   * @param path - Image file path relative to project root
+   * @returns Promise resolving to image data
+   */
+  readImage?(path: string): Promise<{
+    success: boolean;
+    dataUrl?: string;
+    mimeType?: string;
+    size?: number;
+    error?: string;
+  }>;
+
+  /**
+   * Read (or auto-create) the project's .emdash.json config file
+   * @returns Promise resolving to the config file content
+   */
+  getProjectConfig?(): Promise<{ success: boolean; content?: string; error?: string }>;
+
+  /**
+   * Write the project's .emdash.json config file after validating JSON
+   * @param content - JSON string to write
+   * @returns Promise resolving to success status
+   */
+  saveProjectConfig?(content: string): Promise<{ success: boolean; error?: string }>;
+
+  /**
+   * Copy a local file into the project's .emdash attachments directory.
+   * Only supported on local filesystems (srcPath is an absolute local path).
+   * @param srcPath - Absolute local path of the source file
+   * @param subdir - Subdirectory inside .emdash/ (defaults to "attachments")
+   * @returns Promise resolving to the saved file paths
+   */
+  saveAttachment?(
+    srcPath: string,
+    subdir?: string
+  ): Promise<{
+    success: boolean;
+    absPath?: string;
+    relPath?: string;
+    fileName?: string;
+    error?: string;
+  }>;
+
+  mkdir(diPath: string, options?: { recursive?: boolean }): Promise<void>;
+
+  /**
+   * Watch the worktree for filesystem changes. Returns a FileWatcher handle;
+   * call update() to hint which paths matter (SSH uses this for polling),
+   * call close() to stop. Batches events and delivers them via callback.
+   * Optional — not all implementations support watching.
+   *
+   * Local: uses @parcel/watcher for a single recursive native-OS subscription.
+   * SSH:   polls directories passed to update() at a fixed interval.
+   */
+  watch?(
+    callback: (events: FileWatchEvent[]) => void,
+    options?: { debounceMs?: number }
+  ): FileWatcher;
+}
+
+/**
+ * Default content written to .emdash.json when the file is first created.
+ * Shared between LocalFileSystem and SshFileSystem so both produce identical defaults.
+ */
+export const DEFAULT_EMDASH_CONFIG = `{
+  "preservePatterns": [
+    ".env",
+    ".env.keys",
+    ".env.local",
+    ".env.*.local",
+    ".envrc",
+    "docker-compose.override.yml",
+    ".emdash.json"
+  ],
+  "scripts": {
+    "setup": "",
+    "run": "",
+    "teardown": ""
+  }
+}
+`;
+
+/**
+ * Base error class for filesystem operations
+ */
+export class FileSystemError extends Error {
+  constructor(
+    message: string,
+    public readonly code: string,
+    public readonly path?: string
+  ) {
+    super(message);
+    this.name = 'FileSystemError';
+  }
+}
+
+/**
+ * Error codes for filesystem operations
+ */
+export const FileSystemErrorCodes = {
+  PATH_ESCAPE: 'PATH_ESCAPE',
+  NOT_FOUND: 'NOT_FOUND',
+  IS_DIRECTORY: 'IS_DIRECTORY',
+  NOT_DIRECTORY: 'NOT_DIRECTORY',
+  PERMISSION_DENIED: 'PERMISSION_DENIED',
+  INVALID_PATH: 'INVALID_PATH',
+  CONNECTION_ERROR: 'CONNECTION_ERROR',
+  TIMEOUT: 'TIMEOUT',
+  UNKNOWN: 'UNKNOWN',
+} as const;
diff --git a/src/main/core/git/controller.ts b/src/main/core/git/controller.ts
new file mode 100644
index 0000000000..58655fd616
--- /dev/null
+++ b/src/main/core/git/controller.ts
@@ -0,0 +1,448 @@
+import type { DiffMode, GitObjectRef, GitRef, MergeBaseRange } from '@shared/git';
+import { createRPCController } from '@shared/ipc/rpc';
+import { err, ok } from '@shared/result';
+import { TooManyFilesChangedError } from '@main/core/git/impl/status-parser';
+import { resolveWorkspace } from '@main/core/projects/utils';
+import { log } from '@main/lib/logger';
+import { capture } from '@main/lib/telemetry';
+
+export const gitController = createRPCController({
+  getFullStatus: async (projectId: string, workspaceId: string) => {
+    try {
+      const env = resolveWorkspace(projectId, workspaceId);
+      if (!env) return err({ type: 'not_found' as const });
+      const data = await env.git.getFullStatus();
+      return ok(data);
+    } catch (e) {
+      if (e instanceof TooManyFilesChangedError) {
+        return err({ type: 'too_many_files' as const });
+      }
+      log.error('gitCtrl.getFullStatus failed', { projectId, workspaceId, error: e });
+      return err({ type: 'git_error' as const, message: String(e) });
+    }
+  },
+
+  getStatus: async (projectId: string, workspaceId: string) => {
+    try {
+      const env = resolveWorkspace(projectId, workspaceId);
+      if (!env) return err({ type: 'not_found' as const });
+      const { changes, currentBranch } = await env.git.getStatus();
+      return ok({ changes, currentBranch });
+    } catch (e) {
+      if (e instanceof TooManyFilesChangedError) {
+        return err({ type: 'too_many_files' as const });
+      }
+      log.error('gitCtrl.getStatus failed', { projectId, workspaceId, error: e });
+      return err({ type: 'git_error' as const, message: String(e) });
+    }
+  },
+
+  getStagedChanges: async (projectId: string, workspaceId: string) => {
+    try {
+      const env = resolveWorkspace(projectId, workspaceId);
+      if (!env) return err({ type: 'not_found' as const });
+      const data = await env.git.getStagedChanges();
+      return ok(data);
+    } catch (e) {
+      log.error('gitCtrl.getStagedChanges failed', { projectId, workspaceId, error: e });
+      return err({ type: 'git_error' as const, message: String(e) });
+    }
+  },
+
+  getUnstagedChanges: async (projectId: string, workspaceId: string) => {
+    try {
+      const env = resolveWorkspace(projectId, workspaceId);
+      if (!env) return err({ type: 'not_found' as const });
+      const data = await env.git.getUnstagedChanges();
+      return ok(data);
+    } catch (e) {
+      log.error('gitCtrl.getUnstagedChanges failed', { projectId, workspaceId, error: e });
+      return err({ type: 'git_error' as const, message: String(e) });
+    }
+  },
+
+  getCurrentBranch: async (projectId: string, workspaceId: string) => {
+    try {
+      const env = resolveWorkspace(projectId, workspaceId);
+      if (!env) return err({ type: 'not_found' as const });
+      const currentBranch = await env.git.getCurrentBranch();
+      return ok({ currentBranch });
+    } catch (e) {
+      log.error('gitCtrl.getCurrentBranch failed', { projectId, workspaceId, error: e });
+      return err({ type: 'git_error' as const, message: String(e) });
+    }
+  },
+
+  getChangedFiles: async (
+    projectId: string,
+    workspaceId: string,
+    base: DiffMode | GitObjectRef | MergeBaseRange
+  ) => {
+    try {
+      const env = resolveWorkspace(projectId, workspaceId);
+      if (!env) return err({ type: 'not_found' as const });
+      const changes = await env.git.getChangedFiles(base);
+      return ok({ changes });
+    } catch (e) {
+      log.error('gitCtrl.getChangedFiles failed', { projectId, workspaceId, base, error: e });
+      return err({ type: 'git_error' as const, message: String(e) });
+    }
+  },
+
+  getFileAtHead: async (projectId: string, workspaceId: string, filePath: string) => {
+    try {
+      const env = resolveWorkspace(projectId, workspaceId);
+      if (!env) return err({ type: 'not_found' as const });
+      const content = await env.git.getFileAtHead(filePath);
+      return ok({ content });
+    } catch (e) {
+      log.error('gitCtrl.getFileAtHead failed', { projectId, workspaceId, filePath, error: e });
+      return err({ type: 'git_error' as const, message: String(e) });
+    }
+  },
+
+  getFileAtRef: async (projectId: string, workspaceId: string, filePath: string, ref: string) => {
+    try {
+      const env = resolveWorkspace(projectId, workspaceId);
+      if (!env) return err({ type: 'not_found' as const });
+      const content = await env.git.getFileAtRef(filePath, ref);
+      return ok({ content });
+    } catch (e) {
+      log.error('gitCtrl.getFileAtRef failed', { projectId, workspaceId, filePath, ref, error: e });
+      return err({ type: 'git_error' as const, message: String(e) });
+    }
+  },
+
+  getFileAtIndex: async (projectId: string, workspaceId: string, filePath: string) => {
+    try {
+      const env = resolveWorkspace(projectId, workspaceId);
+      if (!env) return err({ type: 'not_found' as const });
+      const content = await env.git.getFileAtIndex(filePath);
+      return ok({ content });
+    } catch (e) {
+      log.error('gitCtrl.getFileAtIndex failed', { projectId, workspaceId, filePath, error: e });
+      return err({ type: 'git_error' as const, message: String(e) });
+    }
+  },
+
+  getFileDiff: async (projectId: string, workspaceId: string, filePath: string, base?: GitRef) => {
+    try {
+      const env = resolveWorkspace(projectId, workspaceId);
+      if (!env) return err({ type: 'not_found' as const });
+      const diff = await env.git.getFileDiff(filePath, base);
+      return ok({ diff });
+    } catch (e) {
+      log.error('gitCtrl.getFileDiff failed', { projectId, workspaceId, filePath, error: e });
+      return err({ type: 'git_error' as const, message: String(e) });
+    }
+  },
+
+  stageFile: async (projectId: string, workspaceId: string, filePath: string) => {
+    try {
+      const env = resolveWorkspace(projectId, workspaceId);
+      if (!env) return err({ type: 'not_found' as const });
+      await env.git.stageFiles([filePath]);
+      capture('vcs_files_staged', {
+        count: 1,
+        scope: 'single',
+        project_id: projectId,
+        task_id: workspaceId,
+      });
+      return ok();
+    } catch (e) {
+      log.error('gitCtrl.stageFile failed', { projectId, workspaceId, filePath, error: e });
+      return err({ type: 'git_error' as const, message: String(e) });
+    }
+  },
+
+  stageFiles: async (projectId: string, workspaceId: string, filePaths: string[]) => {
+    try {
+      const env = resolveWorkspace(projectId, workspaceId);
+      if (!env) return err({ type: 'not_found' as const });
+      await env.git.stageFiles(filePaths);
+      capture('vcs_files_staged', {
+        count: filePaths.length,
+        scope: filePaths.length === 1 ? 'single' : 'multiple',
+        project_id: projectId,
+        task_id: workspaceId,
+      });
+      return ok();
+    } catch (e) {
+      log.error('gitCtrl.stageFiles failed', { projectId, workspaceId, filePaths, error: e });
+      return err({ type: 'git_error' as const, message: String(e) });
+    }
+  },
+
+  stageAllFiles: async (projectId: string, workspaceId: string) => {
+    try {
+      const env = resolveWorkspace(projectId, workspaceId);
+      if (!env) return err({ type: 'not_found' as const });
+      const unstaged = await env.git.getUnstagedChanges();
+      await env.git.stageAllFiles();
+      capture('vcs_files_staged', {
+        count: unstaged.changes.length,
+        scope: 'all',
+        project_id: projectId,
+        task_id: workspaceId,
+      });
+      return ok();
+    } catch (e) {
+      log.error('gitCtrl.stageAllFiles failed', { projectId, workspaceId, error: e });
+      return err({ type: 'git_error' as const, message: String(e) });
+    }
+  },
+
+  unstageFile: async (projectId: string, workspaceId: string, filePath: string) => {
+    try {
+      const env = resolveWorkspace(projectId, workspaceId);
+      if (!env) return err({ type: 'not_found' as const });
+      await env.git.unstageFiles([filePath]);
+      capture('vcs_files_unstaged', {
+        count: 1,
+        scope: 'single',
+        project_id: projectId,
+        task_id: workspaceId,
+      });
+      return ok();
+    } catch (e) {
+      log.error('gitCtrl.unstageFile failed', { projectId, workspaceId, filePath, error: e });
+      return err({ type: 'git_error' as const, message: String(e) });
+    }
+  },
+
+  unstageFiles: async (projectId: string, workspaceId: string, filePaths: string[]) => {
+    try {
+      const env = resolveWorkspace(projectId, workspaceId);
+      if (!env) return err({ type: 'not_found' as const });
+      await env.git.unstageFiles(filePaths);
+      capture('vcs_files_unstaged', {
+        count: filePaths.length,
+        scope: filePaths.length === 1 ? 'single' : 'multiple',
+        project_id: projectId,
+        task_id: workspaceId,
+      });
+      return ok();
+    } catch (e) {
+      log.error('gitCtrl.unstageFiles failed', { projectId, workspaceId, filePaths, error: e });
+      return err({ type: 'git_error' as const, message: String(e) });
+    }
+  },
+
+  unstageAllFiles: async (projectId: string, workspaceId: string) => {
+    try {
+      const env = resolveWorkspace(projectId, workspaceId);
+      if (!env) return err({ type: 'not_found' as const });
+      const staged = await env.git.getStagedChanges();
+      await env.git.unstageAllFiles();
+      capture('vcs_files_unstaged', {
+        count: staged.changes.length,
+        scope: 'all',
+        project_id: projectId,
+        task_id: workspaceId,
+      });
+      return ok();
+    } catch (e) {
+      log.error('gitCtrl.unstageAllFiles failed', { projectId, workspaceId, error: e });
+      return err({ type: 'git_error' as const, message: String(e) });
+    }
+  },
+
+  revertFile: async (projectId: string, workspaceId: string, filePath: string) => {
+    try {
+      const env = resolveWorkspace(projectId, workspaceId);
+      if (!env) return err({ type: 'not_found' as const });
+      await env.git.revertFiles([filePath]);
+      capture('vcs_files_discarded', {
+        count: 1,
+        scope: 'single',
+        project_id: projectId,
+        task_id: workspaceId,
+      });
+      return ok();
+    } catch (e) {
+      log.error('gitCtrl.revertFile failed', { projectId, workspaceId, filePath, error: e });
+      return err({ type: 'git_error' as const, message: String(e) });
+    }
+  },
+
+  revertFiles: async (projectId: string, workspaceId: string, filePaths: string[]) => {
+    try {
+      const env = resolveWorkspace(projectId, workspaceId);
+      if (!env) return err({ type: 'not_found' as const });
+      await env.git.revertFiles(filePaths);
+      capture('vcs_files_discarded', {
+        count: filePaths.length,
+        scope: filePaths.length === 1 ? 'single' : 'multiple',
+        project_id: projectId,
+        task_id: workspaceId,
+      });
+      return ok();
+    } catch (e) {
+      log.error('gitCtrl.revertFiles failed', { projectId, workspaceId, filePaths, error: e });
+      return err({ type: 'git_error' as const, message: String(e) });
+    }
+  },
+
+  revertAllFiles: async (projectId: string, workspaceId: string) => {
+    try {
+      const env = resolveWorkspace(projectId, workspaceId);
+      if (!env) return err({ type: 'not_found' as const });
+      const status = await env.git.getStatus();
+      const changedCount = new Set(status.changes.map((change) => change.path)).size;
+      await env.git.revertAllFiles();
+      capture('vcs_files_discarded', {
+        count: changedCount,
+        scope: 'all',
+        project_id: projectId,
+        task_id: workspaceId,
+      });
+      return ok();
+    } catch (e) {
+      log.error('gitCtrl.revertAllFiles failed', { projectId, workspaceId, error: e });
+      return err({ type: 'git_error' as const, message: String(e) });
+    }
+  },
+
+  commit: async (projectId: string, workspaceId: string, message: string) => {
+    const env = resolveWorkspace(projectId, workspaceId);
+    if (!env) return err({ type: 'not_found' as const });
+    const result = await env.git.commit(message);
+    if (!result.success) return err(result.error);
+    return ok({ hash: result.data.hash });
+  },
+
+  push: async (projectId: string, workspaceId: string, remote: string) => {
+    const env = resolveWorkspace(projectId, workspaceId);
+    if (!env) return err({ type: 'not_found' as const });
+    const result = await env.git.push(remote);
+    capture('vcs_push', {
+      success: result.success,
+      project_id: projectId,
+      task_id: workspaceId,
+      ...(result.success ? {} : { error_type: result.error.type }),
+    });
+    if (!result.success) return err(result.error);
+    return ok({ output: result.data.output });
+  },
+
+  publishBranch: async (
+    projectId: string,
+    workspaceId: string,
+    branchName: string,
+    remote: string
+  ) => {
+    const env = resolveWorkspace(projectId, workspaceId);
+    if (!env) return err({ type: 'not_found' as const });
+    const result = await env.git.publishBranch(branchName, remote);
+    capture('vcs_branch_published', {
+      success: result.success,
+      project_id: projectId,
+      task_id: workspaceId,
+      ...(result.success ? {} : { error_type: result.error.type }),
+    });
+    if (!result.success) return err(result.error);
+    return ok({ output: result.data.output });
+  },
+
+  pull: async (projectId: string, workspaceId: string) => {
+    const env = resolveWorkspace(projectId, workspaceId);
+    if (!env) return err({ type: 'not_found' as const });
+    const result = await env.git.pull();
+    capture('vcs_pull', {
+      success: result.success,
+      project_id: projectId,
+      task_id: workspaceId,
+      ...(result.success
+        ? {}
+        : {
+            error_type: result.error.type,
+            conflicts: result.error.type === 'conflict',
+          }),
+    });
+    if (!result.success) return err(result.error);
+    return ok({ output: result.data.output });
+  },
+
+  softReset: async (projectId: string, workspaceId: string) => {
+    const env = resolveWorkspace(projectId, workspaceId);
+    if (!env) return err({ type: 'not_found' as const });
+    const result = await env.git.softReset();
+    if (!result.success) return err(result.error);
+    return ok({ subject: result.data.subject, body: result.data.body });
+  },
+
+  getLog: async (
+    projectId: string,
+    workspaceId: string,
+    maxCount?: number,
+    skip?: number,
+    knownAheadCount?: number,
+    remote?: string,
+    base?: GitObjectRef,
+    head?: GitObjectRef
+  ) => {
+    try {
+      const env = resolveWorkspace(projectId, workspaceId);
+      if (!env) return err({ type: 'not_found' as const });
+      const result = await env.git.getLog({
+        maxCount,
+        skip,
+        knownAheadCount,
+        preferredRemote: remote,
+        base,
+        head,
+      });
+      return ok({ commits: result.commits, aheadCount: result.aheadCount });
+    } catch (e) {
+      log.error('gitCtrl.getLog failed', { projectId, workspaceId, error: e });
+      return err({ type: 'git_error' as const, message: String(e) });
+    }
+  },
+
+  getLatestCommit: async (projectId: string, workspaceId: string) => {
+    try {
+      const env = resolveWorkspace(projectId, workspaceId);
+      if (!env) return err({ type: 'not_found' as const });
+      const commit = await env.git.getLatestCommit();
+      return ok({ commit });
+    } catch (e) {
+      log.error('gitCtrl.getLatestCommit failed', { projectId, workspaceId, error: e });
+      return err({ type: 'git_error' as const, message: String(e) });
+    }
+  },
+
+  getCommitFiles: async (projectId: string, workspaceId: string, commitHash: string) => {
+    try {
+      const env = resolveWorkspace(projectId, workspaceId);
+      if (!env) return err({ type: 'not_found' as const });
+      const files = await env.git.getCommitFiles(commitHash);
+      return ok({ files });
+    } catch (e) {
+      log.error('gitCtrl.getCommitFiles failed', { projectId, workspaceId, commitHash, error: e });
+      return err({ type: 'git_error' as const, message: String(e) });
+    }
+  },
+
+  getCommitFileDiff: async (
+    projectId: string,
+    workspaceId: string,
+    commitHash: string,
+    filePath: string
+  ) => {
+    try {
+      const env = resolveWorkspace(projectId, workspaceId);
+      if (!env) return err({ type: 'not_found' as const });
+      const diff = await env.git.getCommitFileDiff(commitHash, filePath);
+      return ok({ diff });
+    } catch (e) {
+      log.error('gitCtrl.getCommitFileDiff failed', {
+        projectId,
+        workspaceId,
+        commitHash,
+        filePath,
+        error: e,
+      });
+      return err({ type: 'git_error' as const, message: String(e) });
+    }
+  },
+});
diff --git a/src/main/core/git/git-fetch-service.ts b/src/main/core/git/git-fetch-service.ts
new file mode 100644
index 0000000000..7391b20ee8
--- /dev/null
+++ b/src/main/core/git/git-fetch-service.ts
@@ -0,0 +1,60 @@
+import type { FetchError } from '@shared/git';
+import { err, type Result } from '@shared/result';
+import { log } from '@main/lib/logger';
+import type { GitService } from './impl/git-service';
+
+const DEFAULT_INTERVAL_MS = 2 * 60 * 1000;
+
+export class GitFetchService {
+  private _timer: ReturnType<typeof setInterval> | undefined;
+  private _inflight: Promise<Result<void, FetchError>> | undefined;
+
+  constructor(
+    private readonly git: GitService,
+    private readonly intervalMs = DEFAULT_INTERVAL_MS
+  ) {}
+
+  /** Start the background fetch loop: immediate fetch, then every `intervalMs`. */
+  start(): void {
+    void this._doFetch();
+    this._scheduleNext();
+  }
+
+  /**
+   * Trigger an immediate fetch and reset the interval timer so the next
+   * background tick is `intervalMs` from now. Concurrent callers share the
+   * same in-flight promise (deduplicated).
+   */
+  async fetch(): Promise<Result<void, FetchError>> {
+    this._resetTimer();
+    return this._doFetch();
+  }
+
+  stop(): void {
+    clearInterval(this._timer);
+    this._timer = undefined;
+  }
+
+  private _doFetch(): Promise<Result<void, FetchError>> {
+    if (this._inflight) return this._inflight;
+    this._inflight = this.git
+      .fetch()
+      .catch((e): Result<void, FetchError> => {
+        log.warn('GitFetchService: fetch threw unexpectedly', { error: String(e) });
+        return err({ type: 'error', message: String(e) });
+      })
+      .finally(() => {
+        this._inflight = undefined;
+      });
+    return this._inflight;
+  }
+
+  private _resetTimer(): void {
+    clearInterval(this._timer);
+    this._scheduleNext();
+  }
+
+  private _scheduleNext(): void {
+    this._timer = setInterval(() => void this._doFetch(), this.intervalMs);
+  }
+}
diff --git a/src/main/core/git/git-watcher-service.ts b/src/main/core/git/git-watcher-service.ts
new file mode 100644
index 0000000000..d8279d1a3b
--- /dev/null
+++ b/src/main/core/git/git-watcher-service.ts
@@ -0,0 +1,126 @@
+import path from 'node:path';
+import parcelWatcher from '@parcel/watcher';
+import { gitRefChangedChannel, gitWorkspaceChangedChannel } from '@shared/events/gitEvents';
+import { branchRef, remoteRef, toRefString, type GitObjectRef } from '@shared/git';
+import { events } from '@main/lib/events';
+
+export class GitWatcherService {
+  private sub: parcelWatcher.AsyncSubscription | null = null;
+
+  /**
+   * Registered worktrees. Maps workspaceId → git-dir path relative to the
+   * repo's .git directory (from `GitService.getWorktreeGitDir`).
+   *   Main workspace → ''
+   *   Linked worktree → e.g. 'worktrees/<git-admin-id>'
+   */
+  private readonly _worktrees = new Map<string, string>();
+
+  constructor(
+    private readonly projectId: string,
+    private readonly repoPath: string
+  ) {}
+
+  /**
+   * Register a workspace so that index/HEAD changes inside its git dir are
+   * emitted as gitWorkspaceChangedChannel events.
+   *
+   * @param workspaceId  The renderer-side workspace key.
+   * @param relativeGitDir  Path of the worktree's git dir relative to .git/.
+   *   Pass '' for the main worktree; 'worktrees/<name>' for linked worktrees.
+   */
+  registerWorktree(workspaceId: string, relativeGitDir: string): void {
+    this._worktrees.set(workspaceId, relativeGitDir);
+  }
+
+  unregisterWorktree(workspaceId: string): void {
+    this._worktrees.delete(workspaceId);
+  }
+
+  async start(): Promise<void> {
+    const gitDir = path.join(this.repoPath, '.git');
+    try {
+      this.sub = await parcelWatcher.subscribe(gitDir, (_err, rawEvents) => {
+        if (_err) return;
+        let emitLocal = false;
+        let emitRemote = false;
+        let emitConfig = false;
+        const changedLocalByKey = new Map<string, GitObjectRef>();
+        const changedRemoteByKey = new Map<string, GitObjectRef>();
+        for (const e of rawEvents) {
+          const rel = path.relative(gitDir, e.path).replace(/\\/g, '/');
+          // Project-level ref changes
+          if (rel.startsWith('refs/heads/')) {
+            const branch = rel.slice('refs/heads/'.length);
+            const r = branchRef({ type: 'local', branch });
+            changedLocalByKey.set(toRefString(r), r);
+            emitLocal = true;
+          } else if (rel === 'HEAD') {
+            emitLocal = true;
+          }
+          if (rel.startsWith('refs/remotes/')) {
+            const full = rel.slice('refs/remotes/'.length);
+            const idx = full.indexOf('/');
+            if (idx > 0) {
+              const r = remoteRef(full.slice(0, idx), full.slice(idx + 1));
+              changedRemoteByKey.set(toRefString(r), r);
+            }
+            emitRemote = true;
+          }
+          if (rel === 'packed-refs') {
+            emitLocal = true;
+            emitRemote = true;
+          }
+          if (rel === 'config') emitConfig = true;
+
+          // Workspace-level index/HEAD changes
+          for (const [workspaceId, relGitDir] of this._worktrees) {
+            const prefix = relGitDir ? `${relGitDir}/` : '';
+            if (rel === `${prefix}index`) {
+              events.emit(gitWorkspaceChangedChannel, {
+                projectId: this.projectId,
+                workspaceId,
+                kind: 'index',
+              });
+            }
+            // HEAD but not refs/heads/* (that's a branch pointer update, not a checkout)
+            if (rel === `${prefix}HEAD`) {
+              events.emit(gitWorkspaceChangedChannel, {
+                projectId: this.projectId,
+                workspaceId,
+                kind: 'head',
+              });
+            }
+          }
+        }
+        if (emitLocal) {
+          const changedRefs =
+            changedLocalByKey.size > 0 ? [...changedLocalByKey.values()] : undefined;
+          events.emit(gitRefChangedChannel, {
+            projectId: this.projectId,
+            kind: 'local-refs',
+            changedRefs,
+          });
+        }
+        if (emitRemote) {
+          const changedRefs =
+            changedRemoteByKey.size > 0 ? [...changedRemoteByKey.values()] : undefined;
+          events.emit(gitRefChangedChannel, {
+            projectId: this.projectId,
+            kind: 'remote-refs',
+            changedRefs,
+          });
+        }
+        if (emitConfig) {
+          events.emit(gitRefChangedChannel, { projectId: this.projectId, kind: 'config' });
+        }
+      });
+    } catch {
+      // Subscription failed (e.g. project path removed or .git directory missing).
+    }
+  }
+
+  async stop(): Promise<void> {
+    await this.sub?.unsubscribe();
+    this.sub = null;
+  }
+}
diff --git a/src/main/core/git/impl/cat-file-batch.test.ts b/src/main/core/git/impl/cat-file-batch.test.ts
new file mode 100644
index 0000000000..aca0091c14
--- /dev/null
+++ b/src/main/core/git/impl/cat-file-batch.test.ts
@@ -0,0 +1,46 @@
+import { execSync } from 'node:child_process';
+import { mkdtempSync, writeFileSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+import { describe, expect, it } from 'vitest';
+import { CatFileBatch } from './cat-file-batch';
+
+function makeTempRepo(): string {
+  const dir = mkdtempSync(join(tmpdir(), 'emdash-catfile-'));
+  execSync('git init', { cwd: dir, stdio: 'pipe' });
+  execSync('git config user.email "t@test.local"', { cwd: dir, stdio: 'pipe' });
+  execSync('git config user.name "test"', { cwd: dir, stdio: 'pipe' });
+  writeFileSync(join(dir, 'a.txt'), 'hello\n');
+  execSync('git add a.txt && git commit -m init', { cwd: dir, stdio: 'pipe' });
+  return dir;
+}
+
+describe('CatFileBatch', () => {
+  it('reads blob contents via git cat-file --batch', async () => {
+    const dir = makeTempRepo();
+    const batch = new CatFileBatch(dir);
+    try {
+      const content = await batch.read('HEAD:a.txt');
+      expect(content).toBe('hello\n');
+    } finally {
+      batch.dispose();
+    }
+  });
+
+  it('resolves null for a missing path', async () => {
+    const dir = makeTempRepo();
+    const batch = new CatFileBatch(dir);
+    try {
+      expect(await batch.read('HEAD:does-not-exist.txt')).toBeNull();
+    } finally {
+      batch.dispose();
+    }
+  });
+
+  it('rejects new reads after dispose', async () => {
+    const dir = makeTempRepo();
+    const batch = new CatFileBatch(dir);
+    batch.dispose();
+    await expect(batch.read('HEAD:a.txt')).rejects.toThrow();
+  });
+});
diff --git a/src/main/core/git/impl/cat-file-batch.ts b/src/main/core/git/impl/cat-file-batch.ts
new file mode 100644
index 0000000000..a61aea25de
--- /dev/null
+++ b/src/main/core/git/impl/cat-file-batch.ts
@@ -0,0 +1,177 @@
+import { spawn, type ChildProcessWithoutNullStreams } from 'node:child_process';
+import { GIT_EXECUTABLE } from '@main/core/utils/exec';
+
+const REQUEST_TIMEOUT_MS = 5000;
+
+type Pending = {
+  query: string;
+  resolve: (v: string | null) => void;
+  reject: (e: Error) => void;
+};
+
+/**
+ * Persistent `git cat-file --batch` subprocess with a strictly serialized queue.
+ * Local workspace only — SSH workspaces use per-call `git show` in GitService.
+ */
+export class CatFileBatch {
+  private disposed = false;
+  private proc: ChildProcessWithoutNullStreams | null = null;
+  private buf = Buffer.alloc(0);
+  private wake: (() => void) | null = null;
+  private queue: Pending[] = [];
+  private processing = false;
+  private readAborted: Error | null = null;
+
+  constructor(
+    private readonly cwd: string,
+    private readonly gitBin: string = GIT_EXECUTABLE
+  ) {}
+
+  dispose(): void {
+    this.disposed = true;
+    try {
+      this.proc?.stdin?.end();
+      this.proc?.kill();
+    } catch {}
+    this.proc = null;
+    this.buf = Buffer.alloc(0);
+    this.readAborted = new Error('CatFileBatch disposed');
+    this.wake?.();
+    this.wake = null;
+    this.processing = false;
+    const q = this.queue;
+    this.queue = [];
+    for (const item of q) {
+      item.reject(this.readAborted);
+    }
+  }
+
+  read(query: string): Promise<string | null> {
+    return new Promise((resolve, reject) => {
+      if (this.disposed) {
+        reject(new Error('CatFileBatch disposed'));
+        return;
+      }
+      this.queue.push({ query, resolve, reject });
+      if (!this.processing) void this._next();
+    });
+  }
+
+  private _ensureProc(): ChildProcessWithoutNullStreams {
+    if (this.disposed) throw new Error('CatFileBatch disposed');
+    if (this.proc) return this.proc;
+
+    this.readAborted = null;
+    const child = spawn(this.gitBin, ['cat-file', '--batch'], {
+      cwd: this.cwd,
+      stdio: ['pipe', 'pipe', 'ignore'],
+    });
+
+    child.stdout.on('data', (chunk: Buffer) => {
+      this.buf = Buffer.concat([this.buf, chunk]);
+      this.wake?.();
+    });
+
+    child.stdout.on('end', () => {
+      this.readAborted = new Error('git cat-file stdout ended');
+      this.wake?.();
+    });
+
+    child.on('error', () => {
+      this._recordProcDeath(new Error('git cat-file process error'));
+    });
+
+    child.on('close', () => {
+      this._recordProcDeath(new Error('git cat-file process exited'));
+    });
+
+    this.proc = child as unknown as ChildProcessWithoutNullStreams;
+    return this.proc;
+  }
+
+  /** Marks the current process dead and unblocks any waiting reader; does not reject queue. */
+  private _recordProcDeath(err: Error): void {
+    this.proc = null;
+    this.readAborted = err;
+    this.buf = Buffer.alloc(0);
+    this.wake?.();
+  }
+
+  private async _next(): Promise<void> {
+    if (this.queue.length === 0) {
+      this.processing = false;
+      return;
+    }
+    this.processing = true;
+    const item = this.queue[0]!;
+
+    let timeoutId: ReturnType<typeof setTimeout> | undefined;
+    try {
+      const proc = this._ensureProc();
+      proc.stdin.write(item.query + '\n');
+
+      timeoutId = setTimeout(() => {
+        try {
+          this.proc?.kill();
+        } catch {}
+      }, REQUEST_TIMEOUT_MS);
+
+      const line = await this._readLine();
+      clearTimeout(timeoutId);
+      timeoutId = undefined;
+
+      if (line.endsWith(' missing') || line === 'missing' || line.endsWith(' ambiguous')) {
+        item.resolve(null);
+      } else {
+        const parts = line.split(' ');
+        const sizeStr = parts[parts.length - 1];
+        const size = Number.parseInt(sizeStr ?? '', 10);
+        if (Number.isNaN(size)) {
+          proc.kill();
+          throw new Error(`Unexpected cat-file header: ${line}`);
+        }
+        const body = await this._readBytes(size + 1);
+        item.resolve(body.subarray(0, -1).toString('utf8'));
+      }
+    } catch (e) {
+      const err = e instanceof Error ? e : new Error(String(e));
+      item.reject(err);
+      try {
+        this.proc?.kill();
+      } catch {}
+    } finally {
+      if (timeoutId) clearTimeout(timeoutId);
+      this.queue.shift();
+      void this._next();
+    }
+  }
+
+  private _waitData(): Promise<void> {
+    return new Promise((resolve) => {
+      this.wake = resolve;
+    });
+  }
+
+  private async _readLine(): Promise<string> {
+    while (true) {
+      if (this.readAborted) throw this.readAborted;
+      const nl = this.buf.indexOf(0x0a);
+      if (nl !== -1) {
+        const line = this.buf.subarray(0, nl).toString('utf8');
+        this.buf = this.buf.subarray(nl + 1);
+        return line;
+      }
+      await this._waitData();
+    }
+  }
+
+  private async _readBytes(count: number): Promise<Buffer> {
+    while (this.buf.length < count) {
+      if (this.readAborted) throw this.readAborted;
+      await this._waitData();
+    }
+    const out = this.buf.subarray(0, count);
+    this.buf = this.buf.subarray(count);
+    return out;
+  }
+}
diff --git a/src/main/core/git/impl/detectGitInfo.ts b/src/main/core/git/impl/detectGitInfo.ts
new file mode 100644
index 0000000000..ed93c192ec
--- /dev/null
+++ b/src/main/core/git/impl/detectGitInfo.ts
@@ -0,0 +1,119 @@
+import { exec } from 'node:child_process';
+import fs from 'node:fs';
+import { join } from 'node:path';
+import { promisify } from 'node:util';
+
+const execAsync = promisify(exec);
+
+const DEFAULT_REMOTE = 'origin';
+const DEFAULT_BRANCH = 'main';
+
+export interface GitInfo {
+  isGitRepo: boolean;
+  remote?: string;
+  branch?: string;
+  baseRef: string;
+  rootPath: string;
+}
+
+export function checkIsValidDirectory(path: string): boolean {
+  return fs.existsSync(path) && fs.statSync(path).isDirectory();
+}
+
+async function resolveRealPath(target: string): Promise<string> {
+  try {
+    return await fs.promises.realpath(target);
+  } catch {
+    return target;
+  }
+}
+
+function normalizeRemoteName(remote?: string | null): string {
+  if (!remote) return DEFAULT_REMOTE;
+  const trimmed = remote.trim();
+  if (!trimmed) return '';
+  if (/^[A-Za-z0-9._-]+$/.test(trimmed) && !trimmed.includes('://')) return trimmed;
+  return DEFAULT_REMOTE;
+}
+
+function computeBaseRef(remote?: string | null, branch?: string | null): string {
+  const remoteName = normalizeRemoteName(remote);
+  if (branch?.trim()) {
+    const trimmed = branch.trim();
+    if (trimmed.includes('/')) return trimmed;
+    return remoteName ? `${remoteName}/${trimmed}` : trimmed;
+  }
+  return remoteName ? `${remoteName}/${DEFAULT_BRANCH}` : DEFAULT_BRANCH;
+}
+
+async function detectDefaultBranch(
+  projectPath: string,
+  remote?: string | null
+): Promise<string | null> {
+  const remoteName = normalizeRemoteName(remote);
+  if (!remoteName) {
+    try {
+      const { stdout } = await execAsync('git branch --show-current', { cwd: projectPath });
+      return stdout.trim() || null;
+    } catch {
+      return null;
+    }
+  }
+  try {
+    const { stdout } = await execAsync(`git remote show ${remoteName}`, { cwd: projectPath });
+    const match = stdout.match(/HEAD branch:\s*(\S+)/);
+    return match ? match[1] : null;
+  } catch {
+    return null;
+  }
+}
+
+export async function detectGitInfo(projectPath: string): Promise<GitInfo> {
+  const resolvedPath = await resolveRealPath(projectPath);
+  const isGitRepo = fs.existsSync(join(resolvedPath, '.git'));
+
+  if (!isGitRepo) {
+    return { isGitRepo: false, baseRef: DEFAULT_BRANCH, rootPath: resolvedPath };
+  }
+
+  let remote: string | undefined;
+  try {
+    const { stdout } = await execAsync('git remote get-url origin', { cwd: resolvedPath });
+    remote = stdout.trim() || undefined;
+  } catch {}
+
+  let branch: string | undefined;
+  try {
+    const { stdout } = await execAsync('git branch --show-current', { cwd: resolvedPath });
+    branch = stdout.trim() || undefined;
+  } catch {}
+
+  if (!branch) {
+    const defaultBranch = await detectDefaultBranch(resolvedPath, remote);
+    branch = defaultBranch ?? undefined;
+  }
+
+  let rootPath = resolvedPath;
+  try {
+    const { stdout } = await execAsync('git rev-parse --show-toplevel', { cwd: resolvedPath });
+    const trimmed = stdout.trim();
+    if (trimmed) rootPath = await resolveRealPath(trimmed);
+  } catch {}
+
+  return {
+    isGitRepo: true,
+    remote,
+    branch,
+    baseRef: computeBaseRef(remote, branch),
+    rootPath,
+  };
+}
+
+export async function isGitRepository(projectPath: string): Promise<boolean> {
+  const resolvedPath = await resolveRealPath(projectPath);
+  return fs.existsSync(join(resolvedPath, '.git'));
+}
+
+export function checkIsGithubRemote(remote?: string): boolean {
+  return remote ? /github\.com[:/]/i.test(remote) : false;
+}
diff --git a/src/main/core/git/impl/git-repo-utils.ts b/src/main/core/git/impl/git-repo-utils.ts
new file mode 100644
index 0000000000..19407bc8ab
--- /dev/null
+++ b/src/main/core/git/impl/git-repo-utils.ts
@@ -0,0 +1,85 @@
+/**
+ * Standalone git utility functions for repository-level operations that don't
+ * belong on the path-scoped GitService (e.g. cloning, initial project setup,
+ * fetching PR refs).
+ *
+ * All functions accept an ExecFn + FileSystemProvider so they remain testable
+ * without touching the real filesystem or spawning real processes.
+ */
+
+import type { FileSystemProvider } from '@main/core/fs/types';
+import type { ExecFn } from '@main/core/utils/exec';
+
+// ---------------------------------------------------------------------------
+// cloneRepository
+// ---------------------------------------------------------------------------
+
+/**
+ * Clone a git repository to a local path.
+ * The caller is responsible for ensuring the parent directory exists.
+ */
+export async function cloneRepository(
+  repoUrl: string,
+  localPath: string,
+  exec: ExecFn
+): Promise<{ success: boolean; error?: string }> {
+  try {
+    await exec('git', ['clone', repoUrl, localPath]);
+    return { success: true };
+  } catch (error) {
+    return {
+      success: false,
+      error: error instanceof Error ? error.message : 'Clone failed',
+    };
+  }
+}
+
+// ---------------------------------------------------------------------------
+// initializeNewProject
+// ---------------------------------------------------------------------------
+
+export interface InitializeNewProjectParams {
+  repoUrl: string;
+  localPath: string;
+  name: string;
+  description?: string;
+}
+
+/**
+ * Initialize a freshly-cloned (empty) project with a README and initial commit.
+ *
+ * Steps:
+ *  1. Write a README.md
+ *  2. `git add README.md`
+ *  3. `git commit -m "Initial commit"`
+ *  4. `git push -u origin main` (falls back to `master` if `main` fails)
+ */
+export async function initializeNewProject(
+  params: InitializeNewProjectParams,
+  exec: ExecFn,
+  fs: FileSystemProvider
+): Promise<void> {
+  const { localPath, name, description } = params;
+
+  const exists = await fs.exists('.');
+  if (!exists) {
+    throw new Error('Local path does not exist');
+  }
+
+  const readmeContent = description ? `# ${name}\n\n${description}\n` : `# ${name}\n`;
+  await fs.write('README.md', readmeContent);
+
+  const opts = { cwd: localPath };
+  await exec('git', ['add', 'README.md'], opts);
+  await exec('git', ['commit', '-m', 'Initial commit'], opts);
+
+  try {
+    await exec('git', ['push', '-u', 'origin', 'main'], opts);
+  } catch {
+    try {
+      await exec('git', ['push', '-u', 'origin', 'master'], opts);
+    } catch {
+      throw new Error('Failed to push to remote repository');
+    }
+  }
+}
diff --git a/src/main/core/git/impl/git-service.test.ts b/src/main/core/git/impl/git-service.test.ts
new file mode 100644
index 0000000000..aa1d90f7ee
--- /dev/null
+++ b/src/main/core/git/impl/git-service.test.ts
@@ -0,0 +1,299 @@
+import { describe, expect, it } from 'vitest';
+import type { FileSystemProvider } from '@main/core/fs/types';
+import type { ExecFn } from '@main/core/utils/exec';
+import { GitService } from './git-service';
+import { computeBaseRef } from './git-utils';
+
+// ---------------------------------------------------------------------------
+// Helpers
+// ---------------------------------------------------------------------------
+
+/**
+ * Builds an ExecFn that returns pre-baked responses keyed by the joined args
+ * string. Throws for any unmapped key (surfaces missing mocks early).
+ */
+function makeExec(map: Record<string, string>): ExecFn {
+  return async (_cmd: string, args: string[] = []) => {
+    const key = args.join(' ');
+    if (key in map) {
+      return { stdout: map[key], stderr: '' };
+    }
+    throw Object.assign(new Error(`Unexpected git command: git ${key}`), {
+      stdout: '',
+      stderr: `fatal: not expected`,
+      code: 128,
+    });
+  };
+}
+
+/**
+ * Like makeExec but silently returns '' for unmapped keys. Useful when a
+ * method makes optional/fallback calls that aren't relevant to the test.
+ */
+function makePermissiveExec(map: Record<string, string>): ExecFn {
+  return async (_cmd: string, args: string[] = []) => ({
+    stdout: map[args.join(' ')] ?? '',
+    stderr: '',
+  });
+}
+
+const BRANCH_FORMAT =
+  'branch -a --format=%(refname:short)|%(upstream:short)|%(upstream:track)|%(refname)';
+
+const stubFs = {} as FileSystemProvider;
+
+function makeService(exec: ExecFn): GitService {
+  return new GitService('/repo', exec, stubFs);
+}
+
+// ---------------------------------------------------------------------------
+// getBranches()
+// ---------------------------------------------------------------------------
+
+describe('GitService.getBranches', () => {
+  it('returns an empty array when stdout is empty', async () => {
+    const svc = makeService(makeExec({ [BRANCH_FORMAT]: '' }));
+    expect(await svc.getBranches()).toEqual([]);
+  });
+
+  it('categorises a plain local branch correctly', async () => {
+    const svc = makeService(
+      makeExec({
+        [BRANCH_FORMAT]: 'main|||refs/heads/main\n',
+      })
+    );
+    const branches = await svc.getBranches();
+    expect(branches).toHaveLength(1);
+    expect(branches[0]).toMatchObject({ type: 'local', branch: 'main' });
+  });
+
+  it('normalizes disambiguated local short names like "heads/main" to "main"', async () => {
+    const svc = makeService(
+      makeExec({
+        [BRANCH_FORMAT]: 'heads/main|||refs/heads/main\n',
+      })
+    );
+    const [branch] = await svc.getBranches();
+    expect(branch).toMatchObject({ type: 'local', branch: 'main' });
+  });
+
+  it('categorises a remote tracking branch as type=remote (regression: remotes/ prefix bug)', async () => {
+    // %(refname:short) gives "origin/main" — not "remotes/origin/main".
+    // The old code checked startsWith('remotes/') which never matched, so all
+    // remote branches were misclassified as local.
+    const svc = makeService(
+      makeExec({
+        [BRANCH_FORMAT]: 'origin/main|||refs/remotes/origin/main\n',
+      })
+    );
+    const branches = await svc.getBranches();
+    expect(branches).toHaveLength(1);
+    expect(branches[0]).toMatchObject({
+      type: 'remote',
+      branch: 'main',
+      remote: { name: 'origin' },
+    });
+  });
+
+  it('skips remotes/origin/HEAD entries', async () => {
+    const svc = makeService(
+      makeExec({
+        [BRANCH_FORMAT]: 'origin/HEAD|||refs/remotes/origin/HEAD\n',
+      })
+    );
+    expect(await svc.getBranches()).toHaveLength(0);
+  });
+
+  it('parses bracketed tracking info [ahead 1, behind 2] (Apple git 2.39.5 format)', async () => {
+    // Apple git 2.39.5 outputs %(upstream:track) with brackets: [ahead 1, behind 2]
+    // The ,nobrackets modifier was only added in git 2.40 and caused a fatal error.
+    const svc = makeService(
+      makeExec({
+        [BRANCH_FORMAT]: 'feature|origin/feature|[ahead 1, behind 2]|refs/heads/feature\n',
+      })
+    );
+    const branches = await svc.getBranches();
+    expect(branches).toHaveLength(1);
+    expect(branches[0]).toMatchObject({
+      type: 'local',
+      branch: 'feature',
+      remote: { name: 'origin' },
+      divergence: { ahead: 1, behind: 2 },
+    });
+  });
+
+  it('parses unbracketed tracking info (newer git format: ahead 1, behind 2)', async () => {
+    const svc = makeService(
+      makeExec({
+        [BRANCH_FORMAT]: 'feature|origin/feature|ahead 1, behind 2|refs/heads/feature\n',
+      })
+    );
+    const branches = await svc.getBranches();
+    expect(branches[0]).toMatchObject({
+      divergence: { ahead: 1, behind: 2 },
+    });
+  });
+
+  it('handles a local branch that is only ahead (no behind)', async () => {
+    const svc = makeService(
+      makeExec({
+        [BRANCH_FORMAT]: 'feat|origin/feat|[ahead 3]|refs/heads/feat\n',
+      })
+    );
+    const [branch] = await svc.getBranches();
+    expect(branch).toMatchObject({ divergence: { ahead: 3, behind: 0 } });
+  });
+
+  it('handles a local branch that is only behind (no ahead)', async () => {
+    const svc = makeService(
+      makeExec({
+        [BRANCH_FORMAT]: 'feat|origin/feat|[behind 5]|refs/heads/feat\n',
+      })
+    );
+    const [branch] = await svc.getBranches();
+    expect(branch).toMatchObject({ divergence: { ahead: 0, behind: 5 } });
+  });
+
+  it('returns no divergence when track field is empty', async () => {
+    const svc = makeService(
+      makeExec({
+        [BRANCH_FORMAT]: 'main|origin/main||refs/heads/main\n',
+      })
+    );
+    const [branch] = await svc.getBranches();
+    expect(branch).toMatchObject({ type: 'local', branch: 'main' });
+    expect((branch as { divergence?: unknown }).divergence).toBeUndefined();
+  });
+
+  it('returns a local branch with no upstream and no divergence', async () => {
+    const svc = makeService(
+      makeExec({
+        [BRANCH_FORMAT]: 'orphan|||refs/heads/orphan\n',
+      })
+    );
+    const [branch] = await svc.getBranches();
+    expect(branch).toMatchObject({ type: 'local', branch: 'orphan' });
+    expect((branch as { remote?: unknown }).remote).toBeUndefined();
+  });
+
+  it('correctly splits a mixed list into local and remote counts', async () => {
+    const lines = [
+      'main|||refs/heads/main',
+      'feature|origin/feature|[ahead 1]|refs/heads/feature',
+      'origin/main|||refs/remotes/origin/main',
+      'origin/develop|||refs/remotes/origin/develop',
+      'origin/HEAD|||refs/remotes/origin/HEAD', // should be skipped
+    ].join('\n');
+
+    const svc = makeService(makeExec({ [BRANCH_FORMAT]: lines }));
+    const branches = await svc.getBranches();
+    const local = branches.filter((b) => b.type === 'local');
+    const remote = branches.filter((b) => b.type === 'remote');
+
+    expect(local).toHaveLength(2);
+    expect(remote).toHaveLength(2);
+  });
+});
+
+// ---------------------------------------------------------------------------
+// getDefaultBranch()
+// ---------------------------------------------------------------------------
+
+describe('GitService.getCurrentBranch', () => {
+  it('returns canonical local branch name from symbolic full ref', async () => {
+    const svc = makeService(
+      makeExec({
+        'rev-parse --symbolic-full-name HEAD': 'refs/heads/main',
+      })
+    );
+    expect(await svc.getCurrentBranch()).toBe('main');
+  });
+
+  it('returns null when HEAD is detached', async () => {
+    const svc = makeService(
+      makeExec({
+        'rev-parse --symbolic-full-name HEAD': 'HEAD',
+      })
+    );
+    expect(await svc.getCurrentBranch()).toBeNull();
+  });
+});
+
+describe('GitService.getDefaultBranch', () => {
+  it('resolves from symbolic-ref cache (heuristic 1)', async () => {
+    const svc = makeService(
+      makePermissiveExec({
+        'symbolic-ref refs/remotes/origin/HEAD --short': 'origin/main',
+      })
+    );
+    expect(await svc.getDefaultBranch()).toBe('main');
+  });
+
+  it('resolves from symbolic-ref cache when ref has no slash', async () => {
+    const svc = makeService(
+      makePermissiveExec({
+        'symbolic-ref refs/remotes/origin/HEAD --short': 'main',
+      })
+    );
+    expect(await svc.getDefaultBranch()).toBe('main');
+  });
+
+  it('falls back to local branch candidate "main" when symbolic-ref fails', async () => {
+    const exec: ExecFn = async (_cmd, args = []) => {
+      const key = args.join(' ');
+      if (key === 'symbolic-ref refs/remotes/origin/HEAD --short') {
+        throw Object.assign(new Error('no HEAD'), { code: 128 });
+      }
+      if (key === 'remote show origin') {
+        throw Object.assign(new Error('no remote'), { code: 128 });
+      }
+      // heuristic 3: "main" exists locally
+      if (key === 'rev-parse --verify refs/heads/main') {
+        return { stdout: 'abc123', stderr: '' };
+      }
+      throw Object.assign(new Error('unexpected'), { code: 128 });
+    };
+    expect(await makeService(exec).getDefaultBranch()).toBe('main');
+  });
+
+  it('falls back to "main" convention when no heuristic resolves', async () => {
+    const exec: ExecFn = async () => {
+      throw Object.assign(new Error('nothing works'), { code: 128 });
+    };
+    expect(await makeService(exec).getDefaultBranch()).toBe('main');
+  });
+});
+
+// ---------------------------------------------------------------------------
+// computeBaseRef() — pure utility, no mocking needed
+// ---------------------------------------------------------------------------
+
+describe('computeBaseRef', () => {
+  it('prefixes branch with remote name when both are provided', () => {
+    // computeBaseRef(baseRef, remote, branch) — remote is the 2nd argument
+    expect(computeBaseRef(undefined, 'origin', 'main')).toBe('origin/main');
+  });
+
+  it('uses the provided baseRef when it already contains a slash', () => {
+    expect(computeBaseRef('origin/develop')).toBe('origin/develop');
+  });
+
+  it('falls back to remote/main when no branch is provided', () => {
+    expect(computeBaseRef(undefined, 'origin')).toBe('origin/main');
+  });
+
+  it('maps a URL remote to "origin" and combines with branch', () => {
+    // A URL remote (contains "://") is normalised to the "origin" remote name.
+    expect(computeBaseRef(undefined, 'https://github.com/org/repo.git', 'main')).toBe(
+      'origin/main'
+    );
+  });
+
+  it('returns "main" when all arguments are absent', () => {
+    expect(computeBaseRef()).toBe('main');
+  });
+
+  it('strips a leading slash from a baseRef that has no remote', () => {
+    expect(computeBaseRef('/main')).toBe('main');
+  });
+});
diff --git a/src/main/core/git/impl/git-service.ts b/src/main/core/git/impl/git-service.ts
new file mode 100644
index 0000000000..bea5e5fe0c
--- /dev/null
+++ b/src/main/core/git/impl/git-service.ts
@@ -0,0 +1,1571 @@
+import { spawn } from 'node:child_process';
+import path from 'node:path';
+import {
+  HEAD_MODE,
+  toRangeString,
+  toRefString,
+  type Branch,
+  type Commit,
+  type CommitError,
+  type CommitFile,
+  type CreateBranchError,
+  type DeleteBranchError,
+  type DiffLine,
+  type DiffMode,
+  type DiffResult,
+  type FetchError,
+  type FetchPrForReviewError,
+  type FullGitStatus,
+  type GitChange,
+  type GitHeadState,
+  type GitInfo,
+  type GitObjectRef,
+  type LocalBranch,
+  type MergeBaseRange,
+  type PullError,
+  type PushError,
+  type RemoteBranch,
+  type RenameBranchError,
+  type SoftResetError,
+} from '@shared/git';
+import { DEFAULT_REMOTE_NAME } from '@shared/git-utils';
+import { ownerFromUrl } from '@shared/pull-requests';
+import { err, ok, type Result } from '@shared/result';
+import type { FileSystemProvider } from '@main/core/fs/types';
+import { GIT_EXECUTABLE, type ExecFn } from '@main/core/utils/exec';
+import { GitProvider } from '../types';
+import { CatFileBatch } from './cat-file-batch';
+import {
+  computeBaseRef,
+  mapStatus,
+  MAX_DIFF_CONTENT_BYTES,
+  MAX_DIFF_OUTPUT_BYTES,
+  parseDiffLines,
+  stripTrailingNewline,
+} from './git-utils';
+import {
+  MAX_STATUS_FILES,
+  StatusParser,
+  TooManyFilesChangedError,
+  type IFileStatus,
+} from './status-parser';
+
+export class GitService implements GitProvider {
+  private _statusInFlight: Promise<FullGitStatus> | null = null;
+  private _catFile: CatFileBatch | null = null;
+
+  constructor(
+    private readonly path: string,
+    private readonly exec: ExecFn,
+    private readonly fs: FileSystemProvider,
+    private readonly _localWorkspace = true
+  ) {}
+
+  dispose(): void {
+    this._catFile?.dispose();
+    this._catFile = null;
+  }
+
+  private _getCatFile(): CatFileBatch | null {
+    if (!this._localWorkspace) return null;
+    this._catFile ??= new CatFileBatch(this.path);
+    return this._catFile;
+  }
+
+  private parseNumstat(stdout: string): Map<string, { additions: number; deletions: number }> {
+    const map = new Map<string, { additions: number; deletions: number }>();
+    for (const l of stdout
+      .trim()
+      .split('\n')
+      .filter((s) => s.trim())) {
+      const [addStr, delStr, ...pathParts] = l.split('\t');
+      const filePath = pathParts.join('\t');
+      if (!filePath) continue;
+      const existing = map.get(filePath) ?? { additions: 0, deletions: 0 };
+      existing.additions += addStr === '-' ? 0 : Number.parseInt(addStr ?? '0', 10) || 0;
+      existing.deletions += delStr === '-' ? 0 : Number.parseInt(delStr ?? '0', 10) || 0;
+      map.set(filePath, existing);
+    }
+    return map;
+  }
+
+  async getFullStatus(): Promise<FullGitStatus> {
+    if (this._statusInFlight) return this._statusInFlight;
+    this._statusInFlight = this._loadFullStatus().finally(() => {
+      this._statusInFlight = null;
+    });
+    return this._statusInFlight;
+  }
+
+  private async _loadFullStatus(): Promise<FullGitStatus> {
+    try {
+      const parser = new StatusParser();
+      const [, stagedRes, unstagedRes, currentBranch] = await Promise.all([
+        this._runStatusZ(parser),
+        this.exec('git', ['diff', '--numstat', '--cached'], { cwd: this.path }).catch(() => ({
+          stdout: '',
+        })),
+        this.exec('git', ['diff', '--numstat'], { cwd: this.path }).catch(() => ({ stdout: '' })),
+        this.getCurrentBranch(),
+      ]);
+
+      const stagedNumstat = this.parseNumstat(stagedRes.stdout);
+      const unstagedNumstat = this.parseNumstat(unstagedRes.stdout);
+
+      if (parser.status.length > MAX_STATUS_FILES || parser.tooManyFiles) {
+        throw new TooManyFilesChangedError();
+      }
+
+      return await this._buildFullGitStatus(
+        parser.status,
+        stagedNumstat,
+        unstagedNumstat,
+        currentBranch
+      );
+    } catch (e) {
+      if (e instanceof TooManyFilesChangedError) throw e;
+      return {
+        staged: [],
+        unstaged: [],
+        currentBranch: null,
+        totalAdded: 0,
+        totalDeleted: 0,
+      };
+    }
+  }
+
+  private async _runStatusZ(parser: StatusParser): Promise<void> {
+    if (this._localWorkspace) {
+      await this._runStatusZStreaming(parser);
+    } else {
+      await this._runStatusZBuffered(parser);
+    }
+  }
+
+  private async _runStatusZStreaming(parser: StatusParser): Promise<void> {
+    await new Promise<void>((resolve, reject) => {
+      const child = spawn(GIT_EXECUTABLE, ['--no-optional-locks', 'status', '-z', '-uall'], {
+        cwd: this.path,
+        env: { ...process.env, GIT_OPTIONAL_LOCKS: '0' },
+      });
+      child.stdout.setEncoding('utf8');
+      child.stdout.on('data', (chunk: string) => {
+        parser.update(chunk);
+        if (parser.tooManyFiles) {
+          child.kill();
+        }
+      });
+      child.on('error', reject);
+      child.on('close', () => {
+        if (parser.tooManyFiles) {
+          reject(new TooManyFilesChangedError());
+          return;
+        }
+        resolve();
+      });
+    });
+  }
+
+  private async _runStatusZBuffered(parser: StatusParser): Promise<void> {
+    try {
+      const { stdout } = await this.exec('git', ['--no-optional-locks', 'status', '-z', '-uall'], {
+        cwd: this.path,
+      });
+      parser.update(stdout);
+      if (parser.tooManyFiles) throw new TooManyFilesChangedError();
+    } catch (e) {
+      if (e instanceof TooManyFilesChangedError) throw e;
+    }
+  }
+
+  private async _buildFullGitStatus(
+    entries: IFileStatus[],
+    stagedNumstat: Map<string, { additions: number; deletions: number }>,
+    unstagedNumstat: Map<string, { additions: number; deletions: number }>,
+    currentBranch: string | null
+  ): Promise<FullGitStatus> {
+    const staged: GitChange[] = [];
+    const unstaged: GitChange[] = [];
+
+    for (const e of entries) {
+      const code = `${e.x}${e.y}`;
+      const filePath = e.path;
+      const status = mapStatus(code);
+
+      if (e.x !== ' ' && e.x !== '?') {
+        const ns = stagedNumstat.get(filePath);
+        staged.push({
+          path: filePath,
+          status,
+          additions: ns?.additions ?? 0,
+          deletions: ns?.deletions ?? 0,
+        });
+      }
+
+      const isUntracked = code === '??';
+      const hasUnstaged = code[1] !== ' ' && code[1] !== '?';
+      if (!isUntracked && !hasUnstaged) {
+        continue;
+      }
+
+      let additions = unstagedNumstat.get(filePath)?.additions ?? 0;
+      const deletions = unstagedNumstat.get(filePath)?.deletions ?? 0;
+
+      if (additions === 0 && deletions === 0 && code.includes('?')) {
+        try {
+          const result = await this.fs.read(filePath, MAX_DIFF_CONTENT_BYTES);
+          if (!result.truncated) {
+            additions = (result.content.match(/\n/g) ?? []).length;
+          }
+        } catch {}
+      }
+
+      unstaged.push({
+        path: filePath,
+        status,
+        additions,
+        deletions,
+      });
+    }
+
+    const totalAdded = staged.reduce((s, c) => s + c.additions, 0);
+    const totalDeleted = staged.reduce((s, c) => s + c.deletions, 0);
+
+    return { staged, unstaged, currentBranch, totalAdded, totalDeleted };
+  }
+
+  async getStatus(): Promise<{ changes: GitChange[]; currentBranch: string | null }> {
+    try {
+      const full = await this.getFullStatus();
+      const byPath = new Map<string, GitChange>();
+      for (const c of full.staged) {
+        byPath.set(c.path, { ...c });
+      }
+      for (const c of full.unstaged) {
+        const prev = byPath.get(c.path);
+        if (prev) {
+          byPath.set(c.path, {
+            path: c.path,
+            status: c.status,
+            additions: prev.additions + c.additions,
+            deletions: prev.deletions + c.deletions,
+          });
+        } else {
+          byPath.set(c.path, c);
+        }
+      }
+      return { changes: [...byPath.values()], currentBranch: full.currentBranch };
+    } catch (e) {
+      if (e instanceof TooManyFilesChangedError) throw e;
+      return { changes: [], currentBranch: null };
+    }
+  }
+
+  async getStagedChanges(): Promise<{
+    changes: GitChange[];
+    totalAdded: number;
+    totalDeleted: number;
+  }> {
+    try {
+      const full = await this.getFullStatus();
+      return {
+        changes: full.staged,
+        totalAdded: full.totalAdded,
+        totalDeleted: full.totalDeleted,
+      };
+    } catch (e) {
+      if (e instanceof TooManyFilesChangedError) {
+        return { changes: [], totalAdded: 0, totalDeleted: 0 };
+      }
+      throw e;
+    }
+  }
+
+  async getUnstagedChanges(): Promise<{ changes: GitChange[] }> {
+    try {
+      const full = await this.getFullStatus();
+      return { changes: full.unstaged };
+    } catch (e) {
+      if (e instanceof TooManyFilesChangedError) {
+        return { changes: [] };
+      }
+      throw e;
+    }
+  }
+
+  async stageFiles(filePaths: string[]): Promise<void> {
+    if (filePaths.length === 0) return;
+    await this.exec('git', ['add', '--', ...filePaths], { cwd: this.path });
+  }
+
+  async stageAllFiles(): Promise<void> {
+    await this.exec('git', ['add', '-A'], { cwd: this.path });
+  }
+
+  async unstageFiles(filePaths: string[]): Promise<void> {
+    if (filePaths.length === 0) return;
+    try {
+      await this.exec('git', ['reset', 'HEAD', '--', ...filePaths], { cwd: this.path });
+    } catch {
+      // Fallback for edge cases (e.g. new files with no HEAD): unstage each via rm --cached
+      for (const filePath of filePaths) {
+        try {
+          await this.exec('git', ['reset', 'HEAD', '--', filePath], { cwd: this.path });
+        } catch {
+          await this.exec('git', ['rm', '--cached', '--', filePath], { cwd: this.path });
+        }
+      }
+    }
+  }
+
+  async unstageAllFiles(): Promise<void> {
+    try {
+      await this.exec('git', ['reset', 'HEAD'], { cwd: this.path });
+    } catch {
+      // Repo may have no commits yet; ignore.
+    }
+  }
+
+  async revertFiles(filePaths: string[]): Promise<void> {
+    if (filePaths.length === 0) return;
+
+    // Determine which files exist in HEAD in a single command
+    let trackedPaths = new Set<string>();
+    try {
+      const { stdout } = await this.exec(
+        'git',
+        ['ls-tree', '--name-only', 'HEAD', '--', ...filePaths],
+        { cwd: this.path }
+      );
+      trackedPaths = new Set(stdout.trim().split('\n').filter(Boolean));
+    } catch {
+      // Empty repo — no HEAD yet, all files are untracked
+    }
+
+    const tracked = filePaths.filter((f) => trackedPaths.has(f));
+    const untracked = filePaths.filter((f) => !trackedPaths.has(f));
+
+    if (tracked.length > 0) {
+      await this.exec('git', ['checkout', 'HEAD', '--', ...tracked], { cwd: this.path });
+    }
+
+    // Untracked files don't exist in git history — remove them from disk
+    for (const filePath of untracked) {
+      try {
+        const exists = await this.fs.exists(filePath);
+        if (exists) await this.fs.remove(filePath);
+      } catch {}
+    }
+  }
+
+  async revertAllFiles(): Promise<void> {
+    // Reset index and working tree for all tracked changes back to HEAD,
+    // then remove any untracked files/directories.
+    try {
+      await this.exec('git', ['reset', '--hard', 'HEAD'], { cwd: this.path });
+    } catch {
+      // Repo may have no commits yet; ignore.
+    }
+    await this.exec('git', ['clean', '-fd'], { cwd: this.path });
+  }
+
+  // ---------------------------------------------------------------------------
+  // Diffs
+  // ---------------------------------------------------------------------------
+
+  async getFileAtHead(filePath: string): Promise<string | null> {
+    return this.getFileAtRef(filePath, 'HEAD');
+  }
+
+  async getFileAtRef(filePath: string, ref: string): Promise<string | null> {
+    const cf = this._getCatFile();
+    if (cf) {
+      try {
+        return await cf.read(`${ref}:${filePath}`);
+      } catch {
+        // Batch channel failed — fall back to one-shot git show.
+      }
+    }
+    try {
+      const { stdout } = await this.exec('git', ['show', `${ref}:${filePath}`], {
+        cwd: this.path,
+        maxBuffer: MAX_DIFF_CONTENT_BYTES,
+      });
+      return stripTrailingNewline(stdout);
+    } catch {
+      return null;
+    }
+  }
+
+  async getFileAtIndex(filePath: string): Promise<string | null> {
+    const cf = this._getCatFile();
+    if (cf) {
+      try {
+        return await cf.read(`:0:${filePath}`);
+      } catch {
+        // Fall back
+      }
+    }
+    try {
+      const { stdout } = await this.exec('git', ['show', `:0:${filePath}`], {
+        cwd: this.path,
+        maxBuffer: MAX_DIFF_CONTENT_BYTES,
+      });
+      return stripTrailingNewline(stdout);
+    } catch {
+      return null;
+    }
+  }
+
+  async getFileDiff(
+    filePath: string,
+    base: DiffMode | GitObjectRef = HEAD_MODE
+  ): Promise<DiffResult> {
+    const diffArgs = (() => {
+      switch (base.kind) {
+        case 'staged':
+          return ['diff', '--no-color', '--unified=2000', '--cached', '--', filePath];
+        case 'head':
+          return ['diff', '--no-color', '--unified=2000', 'HEAD', '--', filePath];
+        default:
+          return [
+            'diff',
+            '--no-color',
+            '--unified=2000',
+            `${toRefString(base)}...HEAD`,
+            '--',
+            filePath,
+          ];
+      }
+    })();
+
+    const isObjectRef = base.kind !== 'head' && base.kind !== 'staged';
+
+    let diffStdout: string | undefined;
+    try {
+      const { stdout } = await this.exec('git', diffArgs, {
+        cwd: this.path,
+        maxBuffer: MAX_DIFF_OUTPUT_BYTES,
+      });
+      diffStdout = stdout;
+    } catch {}
+
+    const originalRef = isObjectRef ? toRefString(base as GitObjectRef) : 'HEAD';
+
+    const getOriginalContent = async (): Promise<string | undefined> => {
+      try {
+        const { stdout } = await this.exec('git', ['show', `${originalRef}:${filePath}`], {
+          cwd: this.path,
+          maxBuffer: MAX_DIFF_CONTENT_BYTES,
+        });
+        return stripTrailingNewline(stdout);
+      } catch {
+        return undefined;
+      }
+    };
+
+    const getModifiedContent = async (): Promise<string | undefined> => {
+      if (isObjectRef) {
+        try {
+          const { stdout } = await this.exec('git', ['show', `HEAD:${filePath}`], {
+            cwd: this.path,
+            maxBuffer: MAX_DIFF_CONTENT_BYTES,
+          });
+          return stripTrailingNewline(stdout);
+        } catch {
+          return undefined;
+        }
+      }
+      try {
+        const result = await this.fs.read(filePath, MAX_DIFF_CONTENT_BYTES);
+        if (result.truncated) return undefined;
+        return stripTrailingNewline(result.content);
+      } catch {
+        return undefined;
+      }
+    };
+
+    if (diffStdout !== undefined) {
+      const { lines, isBinary } = parseDiffLines(diffStdout);
+      if (isBinary) return { lines: [], isBinary: true };
+
+      const [originalContent, modifiedContent] = await Promise.all([
+        getOriginalContent(),
+        getModifiedContent(),
+      ]);
+
+      if (lines.length === 0) {
+        if (modifiedContent !== undefined) {
+          return {
+            lines: modifiedContent.split('\n').map((l) => ({ right: l, type: 'add' as const })),
+            modifiedContent,
+          };
+        }
+        if (originalContent !== undefined) {
+          return {
+            lines: originalContent.split('\n').map((l) => ({ left: l, type: 'del' as const })),
+            originalContent,
+          };
+        }
+        return { lines: [] };
+      }
+      return { lines, originalContent, modifiedContent };
+    }
+
+    const [originalContent, modifiedContent] = await Promise.all([
+      getOriginalContent(),
+      getModifiedContent(),
+    ]);
+
+    if (modifiedContent !== undefined) {
+      return {
+        lines: modifiedContent.split('\n').map((l) => ({ right: l, type: 'add' as const })),
+        originalContent,
+        modifiedContent,
+      };
+    }
+    if (originalContent !== undefined) {
+      return {
+        lines: originalContent.split('\n').map((l) => ({ left: l, type: 'del' as const })),
+        originalContent,
+      };
+    }
+    return { lines: [] };
+  }
+
+  async getCommitFileDiff(commitHash: string, filePath: string): Promise<DiffResult> {
+    const getContentAt = async (ref: string): Promise<string | undefined> => {
+      try {
+        const { stdout } = await this.exec('git', ['show', `${ref}:${filePath}`], {
+          cwd: this.path,
+          maxBuffer: MAX_DIFF_CONTENT_BYTES,
+        });
+        return stripTrailingNewline(stdout);
+      } catch {
+        return undefined;
+      }
+    };
+
+    let hasParent = true;
+    try {
+      await this.exec('git', ['rev-parse', '--verify', `${commitHash}~1`], { cwd: this.path });
+    } catch {
+      hasParent = false;
+    }
+
+    if (!hasParent) {
+      const modifiedContent = await getContentAt(commitHash);
+      if (modifiedContent === undefined) return { lines: [] };
+      if (modifiedContent === '') return { lines: [], modifiedContent };
+      return {
+        lines: modifiedContent.split('\n').map((l) => ({ right: l, type: 'add' as const })),
+        modifiedContent,
+      };
+    }
+
+    let diffStdout: string | undefined;
+    try {
+      const { stdout } = await this.exec(
+        'git',
+        ['diff', '--no-color', '--unified=2000', `${commitHash}~1`, commitHash, '--', filePath],
+        { cwd: this.path, maxBuffer: MAX_DIFF_OUTPUT_BYTES }
+      );
+      diffStdout = stdout;
+    } catch {}
+
+    let diffLines: DiffLine[] = [];
+    if (diffStdout !== undefined) {
+      const { lines, isBinary } = parseDiffLines(diffStdout);
+      if (isBinary) return { lines: [], isBinary: true };
+      diffLines = lines;
+    }
+
+    const [originalContent, modifiedContent] = await Promise.all([
+      getContentAt(`${commitHash}~1`),
+      getContentAt(commitHash),
+    ]);
+
+    if (diffLines.length > 0) return { lines: diffLines, originalContent, modifiedContent };
+
+    if (modifiedContent !== undefined && modifiedContent !== '') {
+      return {
+        lines: modifiedContent.split('\n').map((l) => ({ right: l, type: 'add' as const })),
+        originalContent,
+        modifiedContent,
+      };
+    }
+    if (originalContent !== undefined) {
+      return {
+        lines: originalContent.split('\n').map((l) => ({ left: l, type: 'del' as const })),
+        originalContent,
+        modifiedContent,
+      };
+    }
+    return { lines: [], originalContent, modifiedContent };
+  }
+
+  // ---------------------------------------------------------------------------
+  // Commit log
+  // ---------------------------------------------------------------------------
+
+  async getLog(options?: {
+    maxCount?: number;
+    skip?: number;
+    knownAheadCount?: number;
+    preferredRemote?: string;
+    /**
+     * When provided, compute aheadCount as `base..<head|HEAD>` instead of
+     * `@{upstream}..HEAD`. Use an immutable commit SHA for merged PRs so the
+     * count remains stable after the remote base branch moves forward.
+     */
+    base?: GitObjectRef;
+    /**
+     * When provided, anchor the log and aheadCount range to this ref instead
+     * of the live HEAD. Pass `commitRef(pr.headRefOid)` for merged PRs.
+     */
+    head?: GitObjectRef;
+  }): Promise<{ commits: Commit[]; aheadCount: number }> {
+    const { maxCount = 50, skip = 0, knownAheadCount, preferredRemote, base, head } = options ?? {};
+    const remote = preferredRemote?.trim() || DEFAULT_REMOTE_NAME;
+    const headStr = head ? toRefString(head) : 'HEAD';
+
+    let aheadCount = knownAheadCount ?? -1;
+    if (aheadCount < 0) {
+      aheadCount = 0;
+
+      if (base !== undefined) {
+        // PR-relative count: compare explicitly against the PR base ref.
+        try {
+          const { stdout } = await this.exec(
+            'git',
+            ['rev-list', '--count', `${toRefString(base)}..${headStr}`],
+            { cwd: this.path }
+          );
+          aheadCount = Number.parseInt(stdout.trim(), 10) || 0;
+        } catch {
+          aheadCount = 0;
+        }
+      } else {
+        try {
+          const { stdout } = await this.exec('git', ['rev-list', '--count', '@{upstream}..HEAD'], {
+            cwd: this.path,
+          });
+          aheadCount = Number.parseInt(stdout.trim(), 10) || 0;
+        } catch {
+          try {
+            const { stdout: branchOut } = await this.exec(
+              'git',
+              ['rev-parse', '--abbrev-ref', 'HEAD'],
+              { cwd: this.path }
+            );
+            const currentBranch = branchOut.trim();
+            const { stdout } = await this.exec(
+              'git',
+              ['rev-list', '--count', `${remote}/${currentBranch}..HEAD`],
+              { cwd: this.path }
+            );
+            aheadCount = Number.parseInt(stdout.trim(), 10) || 0;
+          } catch {
+            try {
+              const { stdout: defaultBranchOut } = await this.exec(
+                'git',
+                ['symbolic-ref', '--short', `refs/remotes/${remote}/HEAD`],
+                { cwd: this.path }
+              );
+              const defaultBranch = defaultBranchOut.trim();
+              const { stdout } = await this.exec(
+                'git',
+                ['rev-list', '--count', `${defaultBranch}..HEAD`],
+                { cwd: this.path }
+              );
+              aheadCount = Number.parseInt(stdout.trim(), 10) || 0;
+            } catch {
+              aheadCount = 0;
+            }
+          }
+        }
+      }
+    }
+
+    const FIELD_SEP = '---FIELD_SEP---';
+    const RECORD_SEP = '---RECORD_SEP---';
+    const format = `${RECORD_SEP}%H${FIELD_SEP}%s${FIELD_SEP}%an${FIELD_SEP}%aI${FIELD_SEP}%D${FIELD_SEP}%b`;
+    // When base is provided (PR view), use a range so only commits between
+    // base and head are returned — not a raw linear walk from head.
+    const rangeArg = base ? `${toRefString(base)}..${headStr}` : headStr;
+    const { stdout } = await this.exec(
+      'git',
+      [
+        'log',
+        `--max-count=${maxCount}`,
+        `--skip=${skip}`,
+        `--pretty=format:${format}`,
+        rangeArg,
+        '--',
+      ],
+      { cwd: this.path }
+    );
+
+    if (!stdout.trim()) return { commits: [], aheadCount };
+
+    const commits = stdout
+      .split(RECORD_SEP)
+      .filter((entry) => entry.trim())
+      .map((entry, index) => {
+        const parts = entry.trim().split(FIELD_SEP);
+        const refs = parts[4] || '';
+        const tags = refs
+          .split(',')
+          .map((r) => r.trim())
+          .filter((r) => r.startsWith('tag: '))
+          .map((r) => r.slice(5));
+        return {
+          hash: parts[0] || '',
+          subject: parts[1] || '',
+          body: (parts[5] || '').trim(),
+          author: parts[2] || '',
+          date: parts[3] || '',
+          isPushed: skip + index >= aheadCount,
+          tags,
+        };
+      });
+
+    return { commits, aheadCount };
+  }
+
+  async getLatestCommit(): Promise<Commit | null> {
+    const { commits } = await this.getLog({ maxCount: 1 });
+    return commits[0] || null;
+  }
+
+  async getChangedFiles(base: DiffMode | GitObjectRef | MergeBaseRange): Promise<GitChange[]> {
+    const isRange = 'base' in base;
+    const isStaged = !isRange && (base as DiffMode | GitObjectRef).kind === 'staged';
+    const ref = isStaged
+      ? '--cached'
+      : isRange
+        ? toRangeString(base as MergeBaseRange)
+        : toRefString(base as GitObjectRef);
+
+    const parseNumstat = (
+      stdout: string
+    ): Map<string, { additions: number; deletions: number }> => {
+      const map = new Map<string, { additions: number; deletions: number }>();
+      for (const l of stdout
+        .trim()
+        .split('\n')
+        .filter((s) => s.trim())) {
+        const [addStr, delStr, ...pathParts] = l.split('\t');
+        const filePath = pathParts.join('\t');
+        if (!filePath) continue;
+        const existing = map.get(filePath) ?? { additions: 0, deletions: 0 };
+        existing.additions += addStr === '-' ? 0 : Number.parseInt(addStr ?? '0', 10) || 0;
+        existing.deletions += delStr === '-' ? 0 : Number.parseInt(delStr ?? '0', 10) || 0;
+        map.set(filePath, existing);
+      }
+      return map;
+    };
+
+    const diffArgs = isStaged ? ['diff', '--numstat', '--cached'] : ['diff', '--numstat', ref];
+    const nameArgs = isStaged
+      ? ['diff', '--name-status', '--cached']
+      : ['diff', '--name-status', ref];
+
+    const [numstatResult, nameStatusResult] = await Promise.all([
+      this.exec('git', diffArgs, { cwd: this.path }).catch(() => ({ stdout: '' })),
+      this.exec('git', nameArgs, { cwd: this.path }).catch(() => ({ stdout: '' })),
+    ]);
+
+    const numstatMap = parseNumstat(numstatResult.stdout);
+
+    const changes: GitChange[] = [];
+    for (const line of nameStatusResult.stdout.trim().split('\n').filter(Boolean)) {
+      const parts = line.split('\t');
+      const code = parts[0] ?? '';
+      const filePath = (parts[parts.length - 1] ?? '').trim();
+      if (!filePath) continue;
+
+      const stat = numstatMap.get(filePath);
+      changes.push({
+        path: filePath,
+        status: mapStatus(code),
+        additions: stat?.additions ?? 0,
+        deletions: stat?.deletions ?? 0,
+      });
+    }
+
+    return changes;
+  }
+
+  async getCommitFiles(commitHash: string): Promise<CommitFile[]> {
+    const { stdout } = await this.exec(
+      'git',
+      [
+        'diff-tree',
+        '--root',
+        '--no-commit-id',
+        '-r',
+        '-m',
+        '--first-parent',
+        '--numstat',
+        commitHash,
+      ],
+      { cwd: this.path }
+    );
+
+    const { stdout: nameStatus } = await this.exec(
+      'git',
+      [
+        'diff-tree',
+        '--root',
+        '--no-commit-id',
+        '-r',
+        '-m',
+        '--first-parent',
+        '--name-status',
+        commitHash,
+      ],
+      { cwd: this.path }
+    );
+
+    const statLines = stdout.trim().split('\n').filter(Boolean);
+    const statusLines = nameStatus.trim().split('\n').filter(Boolean);
+
+    const statusMap = new Map<string, string>();
+    for (const line of statusLines) {
+      const [code, ...pathParts] = line.split('\t');
+      const filePath = pathParts[pathParts.length - 1] || '';
+      statusMap.set(filePath, mapStatus(code ?? ''));
+    }
+
+    return statLines.map((line) => {
+      const [addStr, delStr, ...pathParts] = line.split('\t');
+      const filePath = pathParts.join('\t');
+      return {
+        path: filePath,
+        status: statusMap.get(filePath) || 'modified',
+        additions: addStr === '-' ? 0 : Number.parseInt(addStr || '0', 10) || 0,
+        deletions: delStr === '-' ? 0 : Number.parseInt(delStr || '0', 10) || 0,
+      };
+    });
+  }
+
+  // ---------------------------------------------------------------------------
+  // Mutations
+  // ---------------------------------------------------------------------------
+
+  async commit(message: string): Promise<Result<{ hash: string }, CommitError>> {
+    if (!message || !message.trim()) return err({ type: 'empty_message' });
+    try {
+      await this.exec('git', ['commit', '-m', message], { cwd: this.path });
+    } catch (error: unknown) {
+      const stderr = (error as { stderr?: string })?.stderr || '';
+      const stdout = (error as { stdout?: string })?.stdout || '';
+      const output = stderr || stdout || String(error);
+      if (stderr.includes('nothing to commit') || stdout.includes('nothing to commit')) {
+        return err({ type: 'nothing_to_commit' });
+      }
+      return err({ type: 'hook_failed', message: output });
+    }
+    try {
+      const { stdout } = await this.exec('git', ['rev-parse', 'HEAD'], { cwd: this.path });
+      return ok({ hash: stdout.trim() });
+    } catch (error: unknown) {
+      return err({ type: 'error', message: String(error) });
+    }
+  }
+
+  async fetch(remote?: string): Promise<Result<void, FetchError>> {
+    try {
+      const remotes = await this.exec('git', ['remote'], { cwd: this.path }).catch(() => ({
+        stdout: '',
+      }));
+      const remoteNames = remotes.stdout
+        .split('\n')
+        .map((name) => name.trim())
+        .filter(Boolean);
+      if (remoteNames.length === 0) return err({ type: 'no_remote' });
+
+      const selectedRemote = remote?.trim();
+      if (selectedRemote && !remoteNames.includes(selectedRemote)) {
+        return err({ type: 'remote_not_found', message: `Remote "${selectedRemote}" not found` });
+      }
+
+      await this.exec('git', selectedRemote ? ['fetch', selectedRemote] : ['fetch'], {
+        cwd: this.path,
+      });
+      return ok();
+    } catch (error: unknown) {
+      const stderr = (error as { stderr?: string })?.stderr || String(error);
+      if (
+        stderr.includes('Authentication failed') ||
+        stderr.includes('authentication failed') ||
+        stderr.includes('Permission denied') ||
+        stderr.includes('could not read Username')
+      ) {
+        return err({ type: 'auth_failed', message: stderr });
+      }
+      if (
+        stderr.includes('Could not resolve host') ||
+        stderr.includes('could not resolve host') ||
+        stderr.includes('Network is unreachable') ||
+        stderr.includes('Connection refused') ||
+        stderr.includes('Connection timed out') ||
+        stderr.includes('unable to connect')
+      ) {
+        return err({ type: 'network_error', message: stderr });
+      }
+      if (
+        stderr.includes('does not appear to be a git repository') ||
+        stderr.includes('repository not found') ||
+        stderr.includes('Repository not found') ||
+        stderr.includes('not found') ||
+        stderr.includes('ERROR: Repository not found')
+      ) {
+        return err({ type: 'remote_not_found', message: stderr });
+      }
+      return err({ type: 'error', message: stderr });
+    }
+  }
+
+  async push(preferredRemote?: string): Promise<Result<{ output: string }, PushError>> {
+    const doPush = async (args: string[]): Promise<string> => {
+      const { stdout, stderr } = await this.exec('git', args, { cwd: this.path });
+      return (stdout || stderr || '').trim();
+    };
+
+    try {
+      const output = await doPush(['push']);
+      return ok({ output });
+    } catch (error: unknown) {
+      const stderr = (error as { stderr?: string })?.stderr || '';
+      const message = stderr || String(error);
+
+      if (stderr.includes('Everything up-to-date') || message.includes('Everything up-to-date')) {
+        return ok({ output: 'Everything up-to-date' });
+      }
+
+      if (
+        stderr.includes('has no upstream branch') ||
+        stderr.includes('no upstream configured') ||
+        stderr.includes('upstream branch of your current branch does not match')
+      ) {
+        try {
+          const { stdout: branchOut } = await this.exec('git', ['branch', '--show-current'], {
+            cwd: this.path,
+          });
+          const currentBranch = branchOut.trim();
+          let pushRemote = preferredRemote?.trim() || DEFAULT_REMOTE_NAME;
+          try {
+            const { stdout: remoteOut } = await this.exec(
+              'git',
+              ['config', '--get', `branch.${currentBranch}.remote`],
+              { cwd: this.path }
+            );
+            if (remoteOut.trim()) pushRemote = remoteOut.trim();
+          } catch {}
+          const output = await doPush(['push', '--set-upstream', pushRemote, currentBranch]);
+          return ok({ output });
+        } catch (upstreamError: unknown) {
+          const upstreamStderr = (upstreamError as { stderr?: string })?.stderr || '';
+          return err({ type: 'error', message: upstreamStderr || String(upstreamError) });
+        }
+      }
+
+      if (
+        stderr.includes('[rejected]') ||
+        stderr.includes('Updates were rejected') ||
+        stderr.includes('non-fast-forward')
+      ) {
+        return err({ type: 'rejected', message });
+      }
+
+      if (
+        stderr.includes('Authentication failed') ||
+        stderr.includes('authentication failed') ||
+        stderr.includes('Permission denied') ||
+        stderr.includes('could not read Username')
+      ) {
+        return err({ type: 'auth_failed', message });
+      }
+
+      if (
+        stderr.includes('Could not resolve host') ||
+        stderr.includes('could not resolve host') ||
+        stderr.includes('Network is unreachable') ||
+        stderr.includes('Connection refused') ||
+        stderr.includes('Connection timed out') ||
+        stderr.includes('unable to connect')
+      ) {
+        return err({ type: 'network_error', message });
+      }
+
+      if (stderr.includes('hook declined') || stderr.includes('pre-receive hook')) {
+        return err({ type: 'hook_rejected', message });
+      }
+
+      if (stderr.includes('No configured push destination') || stderr.includes('no remote')) {
+        return err({ type: 'no_remote', message });
+      }
+
+      return err({ type: 'error', message });
+    }
+  }
+
+  async publishBranch(
+    branchName: string,
+    remote = 'origin'
+  ): Promise<Result<{ output: string }, PushError>> {
+    const doPush = async (args: string[]): Promise<string> => {
+      const { stdout, stderr } = await this.exec('git', args, { cwd: this.path });
+      return (stdout || stderr || '').trim();
+    };
+
+    try {
+      const output = await doPush(['push', '--set-upstream', remote, branchName]);
+      return ok({ output });
+    } catch (error: unknown) {
+      const stderr = (error as { stderr?: string })?.stderr || '';
+      const message = stderr || String(error);
+
+      if (stderr.includes('Everything up-to-date') || message.includes('Everything up-to-date')) {
+        return ok({ output: 'Everything up-to-date' });
+      }
+
+      if (
+        stderr.includes('[rejected]') ||
+        stderr.includes('Updates were rejected') ||
+        stderr.includes('non-fast-forward')
+      ) {
+        try {
+          await this.exec(
+            'git',
+            ['branch', '--set-upstream-to', `${remote}/${branchName}`, branchName],
+            { cwd: this.path }
+          );
+        } catch {}
+        return err({ type: 'rejected', message });
+      }
+
+      if (
+        stderr.includes('Authentication failed') ||
+        stderr.includes('authentication failed') ||
+        stderr.includes('Permission denied') ||
+        stderr.includes('could not read Username')
+      ) {
+        return err({ type: 'auth_failed', message });
+      }
+
+      if (
+        stderr.includes('Could not resolve host') ||
+        stderr.includes('could not resolve host') ||
+        stderr.includes('Network is unreachable') ||
+        stderr.includes('Connection refused') ||
+        stderr.includes('Connection timed out') ||
+        stderr.includes('unable to connect')
+      ) {
+        return err({ type: 'network_error', message });
+      }
+
+      if (stderr.includes('hook declined') || stderr.includes('pre-receive hook')) {
+        return err({ type: 'hook_rejected', message });
+      }
+
+      if (
+        stderr.includes('No configured push destination') ||
+        stderr.includes('no remote') ||
+        stderr.includes('does not appear to be a git repository')
+      ) {
+        return err({ type: 'no_remote', message });
+      }
+
+      return err({ type: 'error', message });
+    }
+  }
+
+  async pull(): Promise<Result<{ output: string }, PullError>> {
+    try {
+      const { stdout } = await this.exec('git', ['pull'], { cwd: this.path });
+      return ok({ output: stdout.trim() });
+    } catch (error: unknown) {
+      const stdout = (error as { stdout?: string })?.stdout || '';
+      const stderr = (error as { stderr?: string })?.stderr || '';
+      const message = stderr || String(error);
+
+      if (stdout.includes('CONFLICT') || stderr.includes('CONFLICT')) {
+        let conflictedFiles: string[] = [];
+        try {
+          const { stdout: conflictOut } = await this.exec(
+            'git',
+            ['diff', '--name-only', '--diff-filter=U'],
+            { cwd: this.path }
+          );
+          conflictedFiles = conflictOut
+            .split('\n')
+            .map((f) => f.trim())
+            .filter(Boolean);
+        } catch {}
+        return err({ type: 'conflict', conflictedFiles, message });
+      }
+
+      if (
+        stderr.includes('There is no tracking information') ||
+        stderr.includes('no tracking information') ||
+        stderr.includes('has no upstream branch') ||
+        stderr.includes('no upstream configured')
+      ) {
+        return err({ type: 'no_upstream', message });
+      }
+
+      if (
+        stderr.includes('Need to specify how to reconcile') ||
+        stderr.includes('hint: You have divergent branches') ||
+        stderr.includes('fatal: Need to specify how to reconcile')
+      ) {
+        return err({ type: 'diverged', message });
+      }
+
+      if (
+        stderr.includes('Authentication failed') ||
+        stderr.includes('authentication failed') ||
+        stderr.includes('Permission denied') ||
+        stderr.includes('could not read Username')
+      ) {
+        return err({ type: 'auth_failed', message });
+      }
+
+      if (
+        stderr.includes('Could not resolve host') ||
+        stderr.includes('could not resolve host') ||
+        stderr.includes('Network is unreachable') ||
+        stderr.includes('Connection refused') ||
+        stderr.includes('Connection timed out') ||
+        stderr.includes('unable to connect')
+      ) {
+        return err({ type: 'network_error', message });
+      }
+
+      return err({ type: 'error', message });
+    }
+  }
+
+  async softReset(): Promise<Result<{ subject: string; body: string }, SoftResetError>> {
+    try {
+      await this.exec('git', ['rev-parse', '--verify', 'HEAD~1'], { cwd: this.path });
+    } catch {
+      return err({ type: 'initial_commit' });
+    }
+
+    const { commits: log } = await this.getLog({ maxCount: 1 });
+    if (log[0]?.isPushed) {
+      return err({ type: 'already_pushed' });
+    }
+
+    try {
+      const { stdout: subject } = await this.exec('git', ['log', '-1', '--pretty=format:%s'], {
+        cwd: this.path,
+      });
+      const { stdout: body } = await this.exec('git', ['log', '-1', '--pretty=format:%b'], {
+        cwd: this.path,
+      });
+
+      await this.exec('git', ['reset', '--soft', 'HEAD~1'], { cwd: this.path });
+
+      return ok({ subject: subject.trim(), body: body.trim() });
+    } catch (error: unknown) {
+      return err({ type: 'error', message: String(error) });
+    }
+  }
+
+  async getCurrentBranch(): Promise<string | null> {
+    try {
+      const { stdout } = await this.exec('git', ['rev-parse', '--symbolic-full-name', 'HEAD'], {
+        cwd: this.path,
+      });
+      const ref = stdout.trim();
+      if (ref === 'HEAD' || !ref) return null;
+      if (ref.startsWith('refs/heads/')) return ref.slice('refs/heads/'.length);
+      if (ref.startsWith('heads/')) return ref.slice('heads/'.length);
+      return ref;
+    } catch {
+      return null;
+    }
+  }
+
+  async getWorktreeGitDir(mainDotGitAbs: string): Promise<string> {
+    try {
+      const { stdout } = await this.exec('git', ['rev-parse', '--git-dir'], {
+        cwd: this.path,
+      });
+      const raw = stdout.trim();
+      const gitDirAbs = path.isAbsolute(raw) ? raw : path.resolve(this.path, raw);
+      const rel = path.relative(mainDotGitAbs, gitDirAbs).replace(/\\/g, '/');
+      return rel === '.' || rel === '' ? '' : rel;
+    } catch {
+      return `worktrees/${path.basename(this.path)}`;
+    }
+  }
+
+  async getBranches(): Promise<Branch[]> {
+    const remotes = await this.getRemotes();
+    const remoteByName = new Map(remotes.map((remote) => [remote.name, remote]));
+    const { stdout } = await this.exec(
+      'git',
+      ['branch', '-a', '--format=%(refname:short)|%(upstream:short)|%(upstream:track)|%(refname)'],
+      { cwd: this.path }
+    );
+
+    const branches: Branch[] = [];
+
+    for (const line of stdout.split('\n')) {
+      const trimmed = line.trim();
+      if (!trimmed) continue;
+
+      const [refname, upstreamRef, track, fullRef] = trimmed.split('|');
+
+      if (fullRef?.startsWith('refs/remotes/')) {
+        const withoutPrefix = fullRef.slice('refs/remotes/'.length);
+        if (withoutPrefix.includes('HEAD')) continue;
+        const slashIdx = withoutPrefix.indexOf('/');
+        const remoteName = slashIdx === -1 ? withoutPrefix : withoutPrefix.slice(0, slashIdx);
+        const branchName = slashIdx === -1 ? '' : withoutPrefix.slice(slashIdx + 1);
+        const entry: RemoteBranch = {
+          type: 'remote',
+          branch: branchName,
+          remote: remoteByName.get(remoteName) ?? { name: remoteName, url: '' },
+        };
+        branches.push(entry);
+      } else {
+        const localBranchName = fullRef?.startsWith('refs/heads/')
+          ? fullRef.slice('refs/heads/'.length)
+          : refname;
+        const entry: LocalBranch = { type: 'local', branch: localBranchName };
+        if (upstreamRef) {
+          const slashIdx = upstreamRef.indexOf('/');
+          const remoteName = slashIdx === -1 ? upstreamRef : upstreamRef.slice(0, slashIdx);
+          entry.remote = remoteByName.get(remoteName) ?? { name: remoteName, url: '' };
+          if (track) {
+            const ahead = Number.parseInt(/ahead (\d+)/.exec(track)?.[1] ?? '0', 10);
+            const behind = Number.parseInt(/behind (\d+)/.exec(track)?.[1] ?? '0', 10);
+            entry.divergence = { ahead, behind };
+          }
+        }
+        branches.push(entry);
+      }
+    }
+
+    return branches;
+  }
+
+  async getDefaultBranch(remote = 'origin'): Promise<string> {
+    // Heuristic 1: ask the remote what its HEAD points to (fast, no network call needed
+    // because git caches this in refs/remotes/<remote>/HEAD after a fetch/clone).
+    try {
+      const { stdout } = await this.exec(
+        'git',
+        ['symbolic-ref', `refs/remotes/${remote}/HEAD`, '--short'],
+        { cwd: this.path }
+      );
+      const ref = stdout.trim();
+      if (ref) {
+        const slashIdx = ref.indexOf('/');
+        return slashIdx === -1 ? ref : ref.slice(slashIdx + 1);
+      }
+    } catch {}
+
+    // Heuristic 2: ask the remote directly (requires a network call).
+    try {
+      const { stdout } = await this.exec('git', ['remote', 'show', remote], { cwd: this.path });
+      const match = /HEAD branch:\s*(\S+)/.exec(stdout);
+      if (match?.[1]) return match[1];
+    } catch {}
+
+    // Heuristic 3: fall back to well-known default branch names in preference order.
+    for (const candidate of ['main', 'master', 'develop', 'trunk']) {
+      if (await this._branchExistsLocally(candidate)) return candidate;
+    }
+
+    // Last resort: return "main" as a convention.
+    return 'main';
+  }
+
+  private async _branchExistsLocally(branch: string): Promise<boolean> {
+    try {
+      await this.exec('git', ['rev-parse', '--verify', `refs/heads/${branch}`], {
+        cwd: this.path,
+      });
+      return true;
+    } catch {
+      return false;
+    }
+  }
+
+  async getRemotes(): Promise<{ name: string; url: string }[]> {
+    try {
+      const { stdout } = await this.exec('git', ['remote', '-v'], { cwd: this.path });
+      const seen = new Set<string>();
+      const remotes: { name: string; url: string }[] = [];
+      for (const line of stdout.split('\n')) {
+        const match = /^(\S+)\s+(\S+)\s+\(fetch\)$/.exec(line.trim());
+        if (match?.[1] && match[2] && !seen.has(match[1])) {
+          seen.add(match[1]);
+          remotes.push({ name: match[1], url: match[2] });
+        }
+      }
+      return remotes;
+    } catch {
+      return [];
+    }
+  }
+
+  async getHeadState(): Promise<GitHeadState> {
+    let headName: string | undefined;
+    try {
+      const { stdout } = await this.exec('git', ['symbolic-ref', '--quiet', '--short', 'HEAD'], {
+        cwd: this.path,
+      });
+      headName = stdout.trim() || undefined;
+    } catch {}
+
+    try {
+      await this.exec('git', ['rev-parse', '--verify', 'HEAD'], { cwd: this.path });
+      return { headName, isUnborn: false };
+    } catch {
+      return { headName, isUnborn: true };
+    }
+  }
+
+  async addRemote(name: string, url: string): Promise<void> {
+    await this.exec('git', ['remote', 'add', name, url], { cwd: this.path });
+  }
+
+  async createBranch(
+    name: string,
+    from: string,
+    syncWithRemote = true,
+    remote = 'origin'
+  ): Promise<Result<void, CreateBranchError>> {
+    if (syncWithRemote) {
+      await this.exec('git', ['fetch', remote], { cwd: this.path }).catch(() => {});
+    }
+    const base = syncWithRemote ? `${remote}/${from}` : `refs/heads/${from}`;
+    try {
+      await this.exec('git', ['branch', '--no-track', name, base], { cwd: this.path });
+      return ok();
+    } catch (error: unknown) {
+      const stderr = (error as { stderr?: string })?.stderr || String(error);
+      if (stderr.includes('already exists')) {
+        return err({ type: 'already_exists', name });
+      }
+      if (
+        stderr.includes('not a valid object name') ||
+        stderr.includes('Not a valid object name') ||
+        stderr.includes('invalid reference')
+      ) {
+        return err({ type: 'invalid_base', from });
+      }
+      if (
+        stderr.includes('not a valid branch name') ||
+        stderr.includes('invalid branch name') ||
+        stderr.includes("'.' is not a valid branch name")
+      ) {
+        return err({ type: 'invalid_name', name });
+      }
+      return err({ type: 'error', message: stderr });
+    }
+  }
+
+  async fetchPrForReview(
+    prNumber: number,
+    headRefName: string,
+    headRepositoryUrl: string,
+    localBranch: string,
+    isFork: boolean,
+    configuredRemote = 'origin'
+  ): Promise<Result<void, FetchPrForReviewError>> {
+    try {
+      if (isFork) {
+        const forkRemote = ownerFromUrl(headRepositoryUrl) ?? 'fork';
+        // Idempotently ensure remote exists with the correct URL
+        const remotes = await this.exec('git', ['remote'], { cwd: this.path }).catch(() => ({
+          stdout: '',
+        }));
+        const names = remotes.stdout
+          .split('\n')
+          .map((s) => s.trim())
+          .filter(Boolean);
+        if (!names.includes(forkRemote)) {
+          await this.exec('git', ['remote', 'add', forkRemote, headRepositoryUrl], {
+            cwd: this.path,
+          });
+        } else {
+          await this.exec('git', ['remote', 'set-url', forkRemote, headRepositoryUrl], {
+            cwd: this.path,
+          }).catch(() => {});
+        }
+        await this.exec(
+          'git',
+          ['fetch', forkRemote, `${headRefName}:refs/heads/${localBranch}`, '--force'],
+          { cwd: this.path }
+        );
+        // Set tracking so `git push` targets the contributor's fork branch
+        await this.exec(
+          'git',
+          ['branch', `--set-upstream-to=${forkRemote}/${headRefName}`, localBranch],
+          { cwd: this.path }
+        ).catch(() => {});
+      } else {
+        // Same-repo: GitHub always exposes refs/pull/{N}/head on origin
+        await this.exec(
+          'git',
+          [
+            'fetch',
+            configuredRemote,
+            `refs/pull/${prNumber}/head:refs/heads/${localBranch}`,
+            '--force',
+          ],
+          { cwd: this.path }
+        );
+        await this.exec(
+          'git',
+          ['branch', `--set-upstream-to=${configuredRemote}/${headRefName}`, localBranch],
+          { cwd: this.path }
+        ).catch(() => {});
+      }
+      return ok();
+    } catch (error: unknown) {
+      const stderr = (error as { stderr?: string })?.stderr ?? String(error);
+      if (
+        stderr.includes('not found') ||
+        stderr.includes("couldn't find remote ref") ||
+        stderr.includes('unknown revision')
+      ) {
+        return err({ type: 'not_found', prNumber });
+      }
+      return err({ type: 'error', message: stderr });
+    }
+  }
+
+  async renameBranch(
+    oldBranch: string,
+    newBranch: string
+  ): Promise<Result<{ remotePushed: boolean }, RenameBranchError>> {
+    let remoteName: string | undefined;
+    try {
+      const { stdout } = await this.exec('git', ['config', '--get', `branch.${oldBranch}.remote`], {
+        cwd: this.path,
+      });
+      remoteName = stdout.trim() || undefined;
+    } catch {}
+
+    try {
+      await this.exec('git', ['branch', '-m', oldBranch, newBranch], { cwd: this.path });
+    } catch (error: unknown) {
+      const stderr = (error as { stderr?: string })?.stderr || String(error);
+      if (stderr.includes('already exists')) {
+        return err({ type: 'already_exists', name: newBranch });
+      }
+      return err({ type: 'error', message: stderr });
+    }
+
+    if (remoteName) {
+      try {
+        await this.exec('git', ['push', remoteName, '--delete', oldBranch], { cwd: this.path });
+      } catch {}
+      try {
+        await this.exec('git', ['push', '-u', remoteName, newBranch], { cwd: this.path });
+      } catch (error: unknown) {
+        const stderr = (error as { stderr?: string })?.stderr || String(error);
+        return err({ type: 'remote_push_failed', message: stderr });
+      }
+    }
+
+    return ok({ remotePushed: !!remoteName });
+  }
+
+  async deleteBranch(branch: string, force = true): Promise<Result<void, DeleteBranchError>> {
+    const flag = force ? '-D' : '-d';
+    try {
+      await this.exec('git', ['branch', flag, branch], { cwd: this.path });
+      return ok();
+    } catch (error: unknown) {
+      const stderr = (error as { stderr?: string })?.stderr || String(error);
+      if (stderr.includes('not fully merged')) {
+        return err({ type: 'unmerged', branch });
+      }
+      if (stderr.includes('not found') || stderr.includes('did not match any branch')) {
+        return err({ type: 'not_found', branch });
+      }
+      if (stderr.includes('checked out') || stderr.includes('is not fully merged')) {
+        return err({ type: 'is_current', branch });
+      }
+      return err({ type: 'error', message: stderr });
+    }
+  }
+
+  // ---------------------------------------------------------------------------
+  // Repo info
+  // ---------------------------------------------------------------------------
+
+  async detectInfo(): Promise<GitInfo> {
+    try {
+      await this.exec('git', ['rev-parse', '--is-inside-work-tree'], { cwd: this.path });
+    } catch {
+      return { isGitRepo: false, baseRef: 'main', rootPath: this.path };
+    }
+
+    let remoteName: string | undefined;
+    let remote: string | undefined;
+    try {
+      const { stdout } = await this.exec('git', ['remote'], { cwd: this.path });
+      const remotes = stdout.trim().split('\n').filter(Boolean);
+      remoteName = remotes.includes('origin') ? 'origin' : remotes[0];
+    } catch {}
+
+    if (remoteName) {
+      try {
+        const { stdout } = await this.exec('git', ['remote', 'get-url', remoteName], {
+          cwd: this.path,
+        });
+        remote = stdout.trim() || undefined;
+      } catch {}
+    }
+
+    let branch: string | undefined;
+    try {
+      const { stdout } = await this.exec('git', ['branch', '--show-current'], { cwd: this.path });
+      branch = stdout.trim() || undefined;
+    } catch {}
+
+    if (!branch && remoteName) {
+      try {
+        const { stdout } = await this.exec('git', ['remote', 'show', remoteName], {
+          cwd: this.path,
+        });
+        const match = /HEAD branch:\s*(\S+)/.exec(stdout);
+        branch = match?.[1] ?? undefined;
+      } catch {}
+    }
+
+    let rootPath = this.path;
+    try {
+      const { stdout } = await this.exec('git', ['rev-parse', '--show-toplevel'], {
+        cwd: this.path,
+      });
+      const trimmed = stdout.trim();
+      if (trimmed) rootPath = trimmed;
+    } catch {}
+
+    return {
+      isGitRepo: true,
+      remote,
+      branch,
+      baseRef: computeBaseRef(undefined, remoteName, branch),
+      rootPath,
+    };
+  }
+
+  async initRepository(): Promise<void> {
+    await this.exec('git', ['init'], { cwd: this.path });
+  }
+}
diff --git a/src/main/core/git/impl/git-utils.ts b/src/main/core/git/impl/git-utils.ts
new file mode 100644
index 0000000000..1804b7c32e
--- /dev/null
+++ b/src/main/core/git/impl/git-utils.ts
@@ -0,0 +1,103 @@
+import type { DiffLine, GitChangeStatus } from '@shared/git';
+
+/** Maximum bytes for fetching file content in diffs. */
+export const MAX_DIFF_CONTENT_BYTES = 512 * 1024;
+
+/** Maximum bytes for `git diff` output (larger than content limit due to headers/context). */
+export const MAX_DIFF_OUTPUT_BYTES = 10 * 1024 * 1024;
+
+/** Headers emitted by `git diff` that should be skipped when parsing hunks. */
+const DIFF_HEADER_PREFIXES = [
+  'diff ',
+  'index ',
+  '--- ',
+  '+++ ',
+  '@@',
+  'new file mode',
+  'old file mode',
+  'deleted file mode',
+  'similarity index',
+  'rename from',
+  'rename to',
+  'Binary files',
+];
+
+/**
+ * Map a git status code (porcelain or diff-tree) to a typed GitChangeStatus.
+ * Works for both two-char porcelain codes (e.g. ' M', 'A ', '??') and
+ * single-letter diff-tree codes (e.g. 'A', 'D', 'R100').
+ */
+export function mapStatus(code: string): GitChangeStatus {
+  if (code.includes('U') || code === 'AA' || code === 'DD') return 'conflicted';
+  if (code.includes('A') || code.includes('?')) return 'added';
+  if (code.includes('D')) return 'deleted';
+  if (code.includes('R')) return 'renamed';
+  return 'modified';
+}
+
+/** Strip exactly one trailing newline, if present. */
+export function stripTrailingNewline(s: string): string {
+  return s.endsWith('\n') ? s.slice(0, -1) : s;
+}
+
+/** Parse raw `git diff` output into structured diff lines, skipping headers. */
+export function parseDiffLines(stdout: string): { lines: DiffLine[]; isBinary: boolean } {
+  const result: DiffLine[] = [];
+  for (const line of stdout.split('\n')) {
+    if (!line) continue;
+    if (DIFF_HEADER_PREFIXES.some((p) => line.startsWith(p))) continue;
+    const prefix = line[0];
+    const content = line.slice(1);
+    if (prefix === '\\') continue;
+    if (prefix === ' ') result.push({ left: content, right: content, type: 'context' });
+    else if (prefix === '-') result.push({ left: content, type: 'del' });
+    else if (prefix === '+') result.push({ right: content, type: 'add' });
+    else result.push({ left: line, right: line, type: 'context' });
+  }
+  const isBinary = result.length === 0 && stdout.includes('Binary files');
+  return { lines: result, isBinary };
+}
+
+/**
+ * Strips the remote prefix from a fully-qualified remote tracking ref.
+ * e.g. "origin/main" → "main", "main" → "main"
+ */
+export function bareRefName(ref: string): string {
+  const slash = ref.indexOf('/');
+  return slash !== -1 ? ref.slice(slash + 1) : ref;
+}
+
+export function computeBaseRef(
+  baseRef?: string | null,
+  remote?: string | null,
+  branch?: string | null
+): string {
+  const remoteName = (() => {
+    const trimmed = (remote ?? '').trim();
+    if (!trimmed) return '';
+    if (/^[A-Za-z0-9._-]+$/.test(trimmed) && !trimmed.includes('://')) return trimmed;
+    return 'origin';
+  })();
+
+  const normalize = (value?: string | null): string | undefined => {
+    if (!value) return undefined;
+    const trimmed = value.trim();
+    if (!trimmed || trimmed.includes('://')) return undefined;
+
+    if (trimmed.includes('/')) {
+      const [head, ...rest] = trimmed.split('/');
+      const branchPart = rest.join('/').replace(/^\/+/, '');
+      if (head && branchPart) return `${head}/${branchPart}`;
+      if (!head && branchPart) {
+        return remoteName ? `${remoteName}/${branchPart}` : branchPart;
+      }
+      return undefined;
+    }
+
+    const suffix = trimmed.startsWith('/') ? trimmed.slice(1) : trimmed;
+    return remoteName ? `${remoteName}/${suffix}` : suffix;
+  };
+
+  const defaultBranch = remoteName ? `${remoteName}/main` : 'main';
+  return normalize(baseRef) ?? normalize(branch) ?? defaultBranch;
+}
diff --git a/src/main/core/git/impl/status-parser.test.ts b/src/main/core/git/impl/status-parser.test.ts
new file mode 100644
index 0000000000..07dd28e9af
--- /dev/null
+++ b/src/main/core/git/impl/status-parser.test.ts
@@ -0,0 +1,79 @@
+import { describe, expect, it } from 'vitest';
+import { MAX_STATUS_FILES, StatusParser } from './status-parser';
+
+describe('StatusParser', () => {
+  it('parses a single modified unstaged file', () => {
+    const p = new StatusParser();
+    p.update(' M\0src/foo.ts\0');
+    expect(p.status).toEqual([{ x: ' ', y: 'M', path: 'src/foo.ts' }]);
+    expect(p.tooManyFiles).toBe(false);
+  });
+
+  it('parses staged + unstaged on same file', () => {
+    const p = new StatusParser();
+    p.update('MM\0src/bar.ts\0');
+    expect(p.status).toEqual([{ x: 'M', y: 'M', path: 'src/bar.ts' }]);
+  });
+
+  it('parses a rename with old and new paths', () => {
+    const p = new StatusParser();
+    p.update('R \0new.ts\0old.ts\0');
+    expect(p.status).toEqual([{ x: 'R', y: ' ', rename: 'new.ts', path: 'old.ts' }]);
+  });
+
+  it('parses untracked', () => {
+    const p = new StatusParser();
+    p.update('??\0untracked.ts\0');
+    expect(p.status).toEqual([{ x: '?', y: '?', path: 'untracked.ts' }]);
+  });
+
+  it('parses conflict', () => {
+    const p = new StatusParser();
+    p.update('UU\0conflict.ts\0');
+    expect(p.status).toEqual([{ x: 'U', y: 'U', path: 'conflict.ts' }]);
+  });
+
+  it('handles split chunks across NUL boundaries', () => {
+    const p = new StatusParser();
+    p.update(' M\0src/');
+    p.update('foo.ts\0');
+    expect(p.status).toEqual([{ x: ' ', y: 'M', path: 'src/foo.ts' }]);
+  });
+
+  it('handles empty status', () => {
+    const p = new StatusParser();
+    p.update('');
+    expect(p.status).toEqual([]);
+  });
+
+  it('sets tooManyFiles when limit exceeded', () => {
+    const p = new StatusParser();
+    let chunk = '';
+    for (let i = 0; i < MAX_STATUS_FILES + 2; i++) {
+      chunk += ` M\0f${i}.ts\0`;
+    }
+    p.update(chunk);
+    expect(p.tooManyFiles).toBe(true);
+    expect(p.status.length).toBeGreaterThanOrEqual(MAX_STATUS_FILES);
+  });
+
+  it('parses path with spaces', () => {
+    const p = new StatusParser();
+    p.update(' M\0path with spaces/foo.ts\0');
+    expect(p.status).toEqual([{ x: ' ', y: 'M', path: 'path with spaces/foo.ts' }]);
+  });
+
+  it('reset clears state', () => {
+    const p = new StatusParser();
+    p.update(' M\0a.ts\0');
+    p.reset();
+    expect(p.status).toEqual([]);
+    expect(p.tooManyFiles).toBe(false);
+  });
+
+  it('skips nested git repo directory entries (trailing slash)', () => {
+    const p = new StatusParser();
+    p.update('??\0vendor/sub/\0');
+    expect(p.status).toEqual([]);
+  });
+});
diff --git a/src/main/core/git/impl/status-parser.ts b/src/main/core/git/impl/status-parser.ts
new file mode 100644
index 0000000000..b87a31e668
--- /dev/null
+++ b/src/main/core/git/impl/status-parser.ts
@@ -0,0 +1,97 @@
+/**
+ * Incremental NUL-delimited parser for `git status -z` output (porcelain v1, z mode).
+ * Matches the structure of VSCode's GitStatusParser.
+ */
+
+/** Max entries before we signal `tooManyFiles` and callers should kill `git status`. */
+export const MAX_STATUS_FILES = 10_000;
+
+export class TooManyFilesChangedError extends Error {
+  override readonly name = 'TooManyFilesChangedError';
+  constructor() {
+    super('Too many changed files');
+  }
+}
+
+export interface IFileStatus {
+  x: string;
+  y: string;
+  /** For rename/copy — the path before rename (second segment). */
+  rename?: string;
+  path: string;
+}
+
+export class StatusParser {
+  private lastRaw = '';
+  private result: IFileStatus[] = [];
+  tooManyFiles = false;
+
+  get status(): IFileStatus[] {
+    return this.result;
+  }
+
+  /**
+   * Feed raw string chunks from `git status -z` stdout. Incomplete tail bytes are buffered.
+   */
+  update(chunk: string): void {
+    let raw = this.lastRaw + chunk;
+    let i = 0;
+    let nextI: number | undefined;
+
+    while ((nextI = this.parseEntry(raw, i)) !== undefined) {
+      i = nextI;
+      if (this.result.length > MAX_STATUS_FILES) {
+        this.tooManyFiles = true;
+        raw = '';
+        i = 0;
+        break;
+      }
+    }
+
+    this.lastRaw = raw.slice(i);
+  }
+
+  /**
+   * Parse one complete entry starting at `i`. Returns index after the entry, or `undefined` if truncated.
+   */
+  private parseEntry(raw: string, i: number): number | undefined {
+    if (i + 4 > raw.length) {
+      return undefined;
+    }
+
+    const x = raw.charAt(i++);
+    const y = raw.charAt(i++);
+    // Space after XY
+    i++;
+
+    let rename: string | undefined;
+
+    if (x === 'R' || y === 'R' || x === 'C') {
+      const renameEnd = raw.indexOf('\0', i);
+      if (renameEnd === -1) {
+        return undefined;
+      }
+      rename = raw.substring(i, renameEnd);
+      i = renameEnd + 1;
+    }
+
+    const pathEnd = raw.indexOf('\0', i);
+    if (pathEnd === -1) {
+      return undefined;
+    }
+
+    const path = raw.substring(i, pathEnd);
+    // Nested git repo directory entries end with /
+    if (path.length > 0 && path[path.length - 1] !== '/') {
+      this.result.push({ x, y, rename, path });
+    }
+
+    return pathEnd + 1;
+  }
+
+  reset(): void {
+    this.lastRaw = '';
+    this.result = [];
+    this.tooManyFiles = false;
+  }
+}
diff --git a/src/main/core/git/remote-preference.test.ts b/src/main/core/git/remote-preference.test.ts
new file mode 100644
index 0000000000..ccac2e2f93
--- /dev/null
+++ b/src/main/core/git/remote-preference.test.ts
@@ -0,0 +1,24 @@
+import { describe, expect, it } from 'vitest';
+import { DEFAULT_REMOTE_NAME, selectPreferredRemote } from '@shared/git-utils';
+
+const r = (name: string, url = '') => ({ name, url });
+
+describe('selectPreferredRemote', () => {
+  it('returns origin remote when setting is empty', () => {
+    expect(selectPreferredRemote(undefined, [r('origin')])).toEqual(r('origin'));
+    expect(selectPreferredRemote('', [r('origin')])).toEqual(r('origin'));
+    expect(selectPreferredRemote('   ', [r('origin')])).toEqual(r('origin'));
+  });
+
+  it('returns configured remote when it exists', () => {
+    expect(selectPreferredRemote('upstream', [r('origin'), r('upstream')])).toEqual(r('upstream'));
+  });
+
+  it('falls back to origin when configured remote does not exist', () => {
+    expect(selectPreferredRemote('upstream', [r('origin')])).toEqual(r('origin'));
+  });
+
+  it('falls back to sentinel when no remotes are listed', () => {
+    expect(selectPreferredRemote('upstream', [])).toEqual({ name: DEFAULT_REMOTE_NAME, url: '' });
+  });
+});
diff --git a/src/main/core/git/repository-git-provider.ts b/src/main/core/git/repository-git-provider.ts
new file mode 100644
index 0000000000..736e20031e
--- /dev/null
+++ b/src/main/core/git/repository-git-provider.ts
@@ -0,0 +1,44 @@
+import type {
+  Branch,
+  CreateBranchError,
+  DeleteBranchError,
+  FetchError,
+  FetchPrForReviewError,
+  GitHeadState,
+  PushError,
+  RenameBranchError,
+} from '@shared/git';
+import type { Result } from '@shared/result';
+
+export interface RepositoryGitProvider {
+  getBranches(): Promise<Branch[]>;
+  getCurrentBranch(): Promise<string | null>;
+  getHeadState(): Promise<GitHeadState>;
+  getDefaultBranch(remote?: string): Promise<string>;
+  getRemotes(): Promise<{ name: string; url: string }[]>;
+  addRemote(name: string, url: string): Promise<void>;
+  createBranch(
+    name: string,
+    from: string,
+    syncWithRemote?: boolean,
+    remote?: string
+  ): Promise<Result<void, CreateBranchError>>;
+  renameBranch(
+    oldBranch: string,
+    newBranch: string
+  ): Promise<Result<{ remotePushed: boolean }, RenameBranchError>>;
+  deleteBranch(branch: string, force?: boolean): Promise<Result<void, DeleteBranchError>>;
+  fetchPrForReview(
+    prNumber: number,
+    headRefName: string,
+    headRepositoryUrl: string,
+    localBranch: string,
+    isFork: boolean,
+    configuredRemote?: string
+  ): Promise<Result<void, FetchPrForReviewError>>;
+  fetch(remote?: string): Promise<Result<void, FetchError>>;
+  publishBranch(
+    branchName: string,
+    remote?: string
+  ): Promise<Result<{ output: string }, PushError>>;
+}
diff --git a/src/main/core/git/repository-service.ts b/src/main/core/git/repository-service.ts
new file mode 100644
index 0000000000..ea90f27886
--- /dev/null
+++ b/src/main/core/git/repository-service.ts
@@ -0,0 +1,163 @@
+import type {
+  Branch,
+  BranchesPayload,
+  CreateBranchError,
+  DeleteBranchError,
+  FetchError,
+  FetchPrForReviewError,
+  LocalBranch,
+  LocalBranchesPayload,
+  PushError,
+  RemoteBranch,
+  RemoteBranchesPayload,
+  RenameBranchError,
+} from '@shared/git';
+import { computeDefaultBranch, selectPreferredRemote } from '@shared/git-utils';
+import type { Result } from '@shared/result';
+import type { ProjectSettingsProvider } from '@main/core/projects/settings/schema';
+import type { RepositoryGitProvider } from './repository-git-provider';
+
+export class GitRepositoryService {
+  constructor(
+    private readonly git: RepositoryGitProvider,
+    private readonly settings: ProjectSettingsProvider
+  ) {}
+
+  async getConfiguredRemote(): Promise<string> {
+    const [configured, remotes] = await Promise.all([
+      this.settings.getRemote().catch(() => undefined),
+      this.git.getRemotes().catch(() => []),
+    ]);
+    return selectPreferredRemote(configured, remotes).name;
+  }
+
+  async getDefaultBranchName(): Promise<string> {
+    const configured = await this.settings.getDefaultBranch();
+    const remote = await this.getConfiguredRemote();
+    const branches = await this.git.getBranches();
+    const gitDefault = await this.git.getDefaultBranch(remote);
+    return computeDefaultBranch(configured, branches, remote, gitDefault);
+  }
+
+  async getRepositoryInfo(): Promise<{ isUnborn: boolean; currentBranch: string | null }> {
+    const headState = await this.git.getHeadState();
+    const currentBranch = headState.isUnborn
+      ? (headState.headName ?? null)
+      : await this.git.getCurrentBranch();
+    return { isUnborn: headState.isUnborn, currentBranch };
+  }
+
+  async getBranchesPayload(): Promise<BranchesPayload> {
+    const remotes = await this.git.getRemotes();
+    const remote = await this.getConfiguredRemote();
+    const branches = await this.git.getBranches();
+    const gitDefaultBranch = await this.git.getDefaultBranch(remote);
+
+    if (branches.length === 0) {
+      const headState = await this.git.getHeadState();
+      return {
+        branches: [],
+        currentBranch: headState.headName ?? null,
+        isUnborn: headState.isUnborn,
+        gitDefaultBranch,
+        remotes,
+      };
+    }
+    const currentBranch = await this.git.getCurrentBranch();
+    return {
+      branches,
+      currentBranch,
+      isUnborn: false,
+      gitDefaultBranch,
+      remotes,
+    };
+  }
+
+  async getRemotes(): Promise<{ name: string; url: string }[]> {
+    return this.git.getRemotes();
+  }
+
+  async addRemote(name: string, url: string): Promise<void> {
+    return this.git.addRemote(name, url);
+  }
+
+  async createBranch(
+    name: string,
+    from: string,
+    syncWithRemote?: boolean,
+    remote?: string
+  ): Promise<Result<void, CreateBranchError>> {
+    return this.git.createBranch(name, from, syncWithRemote, remote);
+  }
+
+  async renameBranch(
+    oldBranch: string,
+    newBranch: string
+  ): Promise<Result<{ remotePushed: boolean }, RenameBranchError>> {
+    return this.git.renameBranch(oldBranch, newBranch);
+  }
+
+  async deleteBranch(branch: string, force?: boolean): Promise<Result<void, DeleteBranchError>> {
+    return this.git.deleteBranch(branch, force);
+  }
+
+  async fetchPrForReview(
+    prNumber: number,
+    headRefName: string,
+    headRepositoryUrl: string,
+    localBranch: string,
+    isFork: boolean,
+    remote?: string
+  ): Promise<Result<void, FetchPrForReviewError>> {
+    return this.git.fetchPrForReview(
+      prNumber,
+      headRefName,
+      headRepositoryUrl,
+      localBranch,
+      isFork,
+      remote
+    );
+  }
+
+  async fetch(remote?: string): Promise<Result<void, FetchError>> {
+    return this.git.fetch(remote);
+  }
+
+  async publishBranch(
+    branchName: string,
+    remote?: string
+  ): Promise<Result<{ output: string }, PushError>> {
+    return this.git.publishBranch(branchName, remote);
+  }
+
+  async getBranches(): Promise<Branch[]> {
+    await this.fetch();
+    return this.git.getBranches();
+  }
+
+  async getLocalBranchesPayload(): Promise<LocalBranchesPayload> {
+    const branches = await this.git.getBranches();
+    const localBranches = branches.filter((b): b is LocalBranch => b.type === 'local');
+    if (localBranches.length === 0) {
+      const headState = await this.git.getHeadState();
+      return {
+        localBranches: [],
+        currentBranch: headState.headName ?? null,
+        isUnborn: headState.isUnborn,
+      };
+    }
+    const currentBranch = await this.git.getCurrentBranch();
+    return { localBranches, currentBranch, isUnborn: false };
+  }
+
+  async getRemoteBranchesPayload(): Promise<RemoteBranchesPayload> {
+    const [branches, remotes, remote] = await Promise.all([
+      this.git.getBranches(),
+      this.git.getRemotes(),
+      this.getConfiguredRemote(),
+    ]);
+    const remoteBranches = branches.filter((b): b is RemoteBranch => b.type === 'remote');
+    const gitDefaultBranch = await this.git.getDefaultBranch(remote);
+    return { remoteBranches, remotes, gitDefaultBranch };
+  }
+}
diff --git a/src/main/core/git/types.ts b/src/main/core/git/types.ts
new file mode 100644
index 0000000000..41a75cc024
--- /dev/null
+++ b/src/main/core/git/types.ts
@@ -0,0 +1,7 @@
+import type { RepositoryGitProvider } from './repository-git-provider';
+import type { WorkspaceGitProvider } from './workspace-git-provider';
+
+export type { RepositoryGitProvider } from './repository-git-provider';
+export type { WorkspaceGitProvider } from './workspace-git-provider';
+
+export type GitProvider = RepositoryGitProvider & WorkspaceGitProvider;
diff --git a/src/main/core/git/workspace-git-provider.ts b/src/main/core/git/workspace-git-provider.ts
new file mode 100644
index 0000000000..69f0578186
--- /dev/null
+++ b/src/main/core/git/workspace-git-provider.ts
@@ -0,0 +1,71 @@
+import type {
+  Commit,
+  CommitError,
+  CommitFile,
+  DiffMode,
+  DiffResult,
+  FetchError,
+  FullGitStatus,
+  GitChange,
+  GitObjectRef,
+  MergeBaseRange,
+  PullError,
+  PushError,
+  SoftResetError,
+} from '@shared/git';
+import type { Result } from '@shared/result';
+
+export interface WorkspaceGitProvider {
+  getStatus(): Promise<{ changes: GitChange[]; currentBranch: string | null }>;
+  /** Single coalesced status refresh — preferred over separate staged/unstaged calls. */
+  getFullStatus(): Promise<FullGitStatus>;
+  getStagedChanges(): Promise<{
+    changes: GitChange[];
+    totalAdded: number;
+    totalDeleted: number;
+  }>;
+  getUnstagedChanges(): Promise<{ changes: GitChange[] }>;
+  getCurrentBranch(): Promise<string | null>;
+  /** Release persistent git resources (e.g. cat-file --batch). */
+  dispose(): void;
+  /**
+   * Path of this workspace's git admin dir relative to the main repo's `.git`
+   * directory (forward slashes). Main worktree returns `''`.
+   */
+  getWorktreeGitDir(mainDotGitAbs: string): Promise<string>;
+  getChangedFiles(base: DiffMode | GitObjectRef | MergeBaseRange): Promise<GitChange[]>;
+
+  getFileDiff(filePath: string, base?: DiffMode | GitObjectRef): Promise<DiffResult>;
+  getFileAtHead(filePath: string): Promise<string | null>;
+  getFileAtRef(filePath: string, ref: string): Promise<string | null>;
+  getFileAtIndex(filePath: string): Promise<string | null>;
+  getCommitFileDiff(commitHash: string, filePath: string): Promise<DiffResult>;
+
+  stageFiles(filePaths: string[]): Promise<void>;
+  stageAllFiles(): Promise<void>;
+  unstageFiles(filePaths: string[]): Promise<void>;
+  unstageAllFiles(): Promise<void>;
+  revertFiles(filePaths: string[]): Promise<void>;
+  revertAllFiles(): Promise<void>;
+
+  getLog(options?: {
+    maxCount?: number;
+    skip?: number;
+    knownAheadCount?: number;
+    preferredRemote?: string;
+    base?: GitObjectRef;
+    head?: GitObjectRef;
+  }): Promise<{ commits: Commit[]; aheadCount: number }>;
+  getLatestCommit(): Promise<Commit | null>;
+  getCommitFiles(commitHash: string): Promise<CommitFile[]>;
+
+  commit(message: string): Promise<Result<{ hash: string }, CommitError>>;
+  fetch(remote?: string): Promise<Result<void, FetchError>>;
+  push(preferredRemote?: string): Promise<Result<{ output: string }, PushError>>;
+  publishBranch(
+    branchName: string,
+    remote?: string
+  ): Promise<Result<{ output: string }, PushError>>;
+  pull(): Promise<Result<{ output: string }, PullError>>;
+  softReset(): Promise<Result<{ subject: string; body: string }, SoftResetError>>;
+}
diff --git a/src/main/core/github/controller.ts b/src/main/core/github/controller.ts
new file mode 100644
index 0000000000..97b8d59a68
--- /dev/null
+++ b/src/main/core/github/controller.ts
@@ -0,0 +1,371 @@
+import { homedir } from 'node:os';
+import * as path from 'node:path';
+import type {
+  GitHubAuthResponse,
+  GitHubConnectResponse,
+  GitHubStatusResponse,
+} from '@shared/github';
+import { createRPCController } from '@shared/ipc/rpc';
+import { ACCOUNT_CONFIG } from '@main/core/account/config';
+import { LocalFileSystem } from '@main/core/fs/impl/local-fs';
+import { SshFileSystem } from '@main/core/fs/impl/ssh-fs';
+import type { FileSystemProvider } from '@main/core/fs/types';
+import { cloneRepository, initializeNewProject } from '@main/core/git/impl/git-repo-utils';
+import { githubConnectionService } from '@main/core/github/services/github-connection-service';
+import { repoService } from '@main/core/github/services/repo-service';
+import { sshConnectionManager } from '@main/core/ssh/ssh-connection-manager';
+import { getGitLocalExec, getGitSshExec, type ExecFn } from '@main/core/utils/exec';
+import { log } from '@main/lib/logger';
+import { capture, identify as telemetryIdentify } from '@main/lib/telemetry';
+
+export const githubController = createRPCController({
+  getStatus: async (): Promise<GitHubStatusResponse> => {
+    try {
+      return await githubConnectionService.getStatus();
+    } catch (error) {
+      log.error('GitHub status check failed:', error);
+      return { authenticated: false, user: null, tokenSource: null };
+    }
+  },
+
+  auth: async (): Promise<GitHubAuthResponse> => {
+    try {
+      const result = await githubConnectionService.startDeviceFlowAuth();
+      if (result.success) {
+        capture('integration_connected', { provider: 'github' });
+        const user = await githubConnectionService.getCurrentUser();
+        if (user?.login) {
+          telemetryIdentify(user.login);
+        }
+      }
+      return result;
+    } catch (error) {
+      log.error('GitHub authentication failed:', error);
+      return { success: false, error: 'Authentication failed' };
+    }
+  },
+
+  connectOAuth: async (): Promise<GitHubConnectResponse> => {
+    try {
+      const { baseUrl } = ACCOUNT_CONFIG.authServer;
+      const result = await githubConnectionService.startOAuthFlow(baseUrl);
+      if (result.success) {
+        capture('integration_connected', { provider: 'github' });
+        if (result.user?.login) {
+          telemetryIdentify(result.user.login);
+        } else {
+          const user = await githubConnectionService.getCurrentUser();
+          if (user?.login) {
+            telemetryIdentify(user.login);
+          }
+        }
+      }
+      return result;
+    } catch (error) {
+      log.error('GitHub OAuth connect failed:', error);
+      return { success: false, error: 'OAuth connection failed' };
+    }
+  },
+
+  authCancel: async () => {
+    try {
+      githubConnectionService.cancelAuth();
+      return { success: true };
+    } catch (error) {
+      log.error('Failed to cancel GitHub auth:', error);
+      return { success: false, error: 'Failed to cancel' };
+    }
+  },
+
+  isAuthenticated: async () => {
+    try {
+      return await githubConnectionService.isAuthenticated();
+    } catch (error) {
+      log.error('GitHub authentication check failed:', error);
+      return false;
+    }
+  },
+
+  logout: async () => {
+    try {
+      await githubConnectionService.logout();
+      capture('integration_disconnected', { provider: 'github' });
+      return { success: true };
+    } catch (error) {
+      log.error('GitHub logout failed:', error);
+      return { success: false, error: 'Logout failed' };
+    }
+  },
+
+  getUser: async () => {
+    try {
+      return await githubConnectionService.getCurrentUser();
+    } catch (error) {
+      log.error('Failed to get user info:', error);
+      return null;
+    }
+  },
+
+  storeToken: async (token: string) => {
+    try {
+      await githubConnectionService.storeToken(token);
+      return { success: true };
+    } catch (error) {
+      log.error('Failed to store token:', error);
+      return { success: false, error: 'Failed to store token' };
+    }
+  },
+
+  // -- Repositories --------------------------------------------------------
+
+  getRepositories: async () => {
+    try {
+      return await repoService.listRepositories();
+    } catch (error) {
+      log.error('Failed to get repositories:', error);
+      return [];
+    }
+  },
+
+  getOwners: async () => {
+    try {
+      const owners = await repoService.getOwners();
+      return { success: true, owners };
+    } catch (error) {
+      log.error('Failed to get owners:', error);
+      return {
+        success: false,
+        error: error instanceof Error ? error.message : 'Failed to get owners',
+      };
+    }
+  },
+
+  createRepository: async (params: {
+    name: string;
+    owner: string;
+    description?: string;
+    isPrivate?: boolean;
+    visibility?: 'public' | 'private';
+  }) => {
+    try {
+      const isPrivate = params.isPrivate ?? params.visibility === 'private';
+      const repoInfo = await repoService.createRepository({
+        name: params.name,
+        owner: params.owner,
+        description: params.description,
+        isPrivate,
+      });
+      return {
+        success: true,
+        repoUrl: repoInfo.url,
+        nameWithOwner: repoInfo.nameWithOwner,
+        defaultBranch: repoInfo.defaultBranch,
+      };
+    } catch (error) {
+      log.error('Failed to create repository:', error);
+      return {
+        success: false,
+        error: error instanceof Error ? error.message : 'Failed to create repository',
+      };
+    }
+  },
+
+  deleteRepository: async (owner: string, name: string) => {
+    try {
+      await repoService.deleteRepository(owner, name);
+      return { success: true };
+    } catch (error) {
+      log.error('Failed to delete repository:', error);
+      return {
+        success: false,
+        error: error instanceof Error ? error.message : 'Failed to delete repository',
+      };
+    }
+  },
+
+  validateRepoName: async (name: string, owner?: string) => {
+    try {
+      const formatValidation = repoService.validateRepositoryName(name);
+      if (!formatValidation.valid) {
+        return {
+          success: true,
+          valid: false,
+          exists: false,
+          error: formatValidation.error,
+        };
+      }
+
+      if (owner) {
+        const exists = await repoService.checkRepositoryExists(owner, name);
+        if (exists) {
+          return {
+            success: true,
+            valid: true,
+            exists: true,
+            error: `Repository ${owner}/${name} already exists`,
+          };
+        }
+      }
+
+      return {
+        success: true,
+        valid: true,
+        exists: false,
+      };
+    } catch (error) {
+      log.error('Failed to validate repo name:', error);
+      return {
+        success: false,
+        error: error instanceof Error ? error.message : 'Validation failed',
+      };
+    }
+  },
+
+  checkRepositoryExists: async (owner: string, name: string) => {
+    try {
+      const exists = await repoService.checkRepositoryExists(owner, name);
+      return { success: true, exists };
+    } catch (error) {
+      log.error('Failed to check repository existence:', error);
+      return {
+        success: false,
+        error: error instanceof Error ? error.message : 'Failed to check repository',
+      };
+    }
+  },
+
+  cloneRepository: async (repoUrl: string, targetPath: string, connectionId?: string) => {
+    try {
+      let exec: ExecFn;
+      let parentFs: FileSystemProvider;
+
+      if (connectionId) {
+        const proxy = await sshConnectionManager.connect(connectionId);
+        exec = getGitSshExec(proxy, () => githubConnectionService.getToken());
+        parentFs = new SshFileSystem(proxy, path.posix.dirname(targetPath));
+      } else {
+        exec = getGitLocalExec(() => githubConnectionService.getToken());
+        parentFs = new LocalFileSystem(path.dirname(targetPath));
+      }
+
+      await parentFs.mkdir('.', { recursive: true });
+      return await cloneRepository(repoUrl, targetPath, exec);
+    } catch (error) {
+      log.error('Failed to clone repository:', error);
+      return {
+        success: false,
+        error: error instanceof Error ? error.message : 'Clone failed',
+      };
+    }
+  },
+
+  initializeProject: async (params: {
+    targetPath: string;
+    name: string;
+    description?: string;
+    connectionId?: string;
+  }) => {
+    try {
+      let exec: ExecFn;
+      let projectFs: FileSystemProvider;
+
+      if (params.connectionId) {
+        const proxy = await sshConnectionManager.connect(params.connectionId);
+        exec = getGitSshExec(proxy, () => githubConnectionService.getToken());
+        projectFs = new SshFileSystem(proxy, params.targetPath);
+      } else {
+        exec = getGitLocalExec(() => githubConnectionService.getToken());
+        projectFs = new LocalFileSystem(params.targetPath);
+      }
+
+      await initializeNewProject(
+        {
+          repoUrl: '',
+          localPath: params.targetPath,
+          name: params.name,
+          description: params.description,
+        },
+        exec,
+        projectFs
+      );
+
+      return { success: true };
+    } catch (error) {
+      log.error('Failed to initialize project:', error);
+      return {
+        success: false,
+        error: error instanceof Error ? error.message : 'Initialize failed',
+      };
+    }
+  },
+
+  createNewProject: async (params: {
+    name: string;
+    owner: string;
+    isPrivate: boolean;
+    description?: string;
+  }) => {
+    const { name, owner, isPrivate, description } = params;
+
+    let repoUrl: string | undefined;
+    let nameWithOwner: string | undefined;
+    let defaultBranch: string | undefined;
+    let githubRepoCreated = false;
+
+    try {
+      const repoInfo = await repoService.createRepository({ name, owner, isPrivate, description });
+      repoUrl = repoInfo.url;
+      nameWithOwner = repoInfo.nameWithOwner;
+      defaultBranch = repoInfo.defaultBranch;
+      githubRepoCreated = true;
+
+      const cloneUrl = `https://github.com/${nameWithOwner}.git`;
+      const settings = {};
+      const projectDir =
+        (settings as { projects?: { defaultDirectory?: string } }).projects?.defaultDirectory ??
+        path.join(homedir(), 'emdash-projects');
+      const localPath = path.join(projectDir, name);
+      const exec = getGitLocalExec(() => githubConnectionService.getToken());
+      const parentFs = new LocalFileSystem(path.dirname(localPath));
+      await parentFs.mkdir('.', { recursive: true });
+      const cloneResult = await cloneRepository(cloneUrl, localPath, exec);
+      if (!cloneResult.success) {
+        throw new Error(cloneResult.error ?? 'Clone failed');
+      }
+
+      const projectFs = new LocalFileSystem(localPath);
+      await initializeNewProject(
+        { repoUrl: cloneUrl, localPath, name, description },
+        exec,
+        projectFs
+      );
+
+      return {
+        success: true,
+        projectPath: localPath,
+        repoUrl,
+        nameWithOwner,
+        defaultBranch,
+        githubRepoCreated,
+      };
+    } catch (error) {
+      log.error('Failed to create new project:', error);
+
+      if (githubRepoCreated && nameWithOwner) {
+        try {
+          const [repoOwner, repoName] = nameWithOwner.split('/');
+          await repoService.deleteRepository(repoOwner, repoName);
+        } catch (cleanupError) {
+          log.error('Failed to clean up GitHub repo after project creation failure:', cleanupError);
+        }
+      }
+
+      return {
+        success: false,
+        error: error instanceof Error ? error.message : 'Failed to create project',
+        repoUrl,
+        githubRepoCreated,
+      };
+    }
+  },
+});
diff --git a/src/main/core/github/github-issue-provider.ts b/src/main/core/github/github-issue-provider.ts
new file mode 100644
index 0000000000..0ed62da3b4
--- /dev/null
+++ b/src/main/core/github/github-issue-provider.ts
@@ -0,0 +1,101 @@
+import { ISSUE_PROVIDER_CAPABILITIES, type IssueListResult } from '@shared/issue-providers';
+import type { Issue } from '@shared/tasks';
+import {
+  normalizeSearchTerm,
+  requireNameWithOwner,
+} from '@main/core/issues/helpers/provider-inputs';
+import type { IssueProvider } from '@main/core/issues/issue-provider';
+import { githubConnectionService } from './services/github-connection-service';
+import { issueService } from './services/issue-service';
+
+function toIssue(raw: {
+  number: number;
+  title: string;
+  url: string;
+  state: string;
+  updatedAt: string | null;
+  assignees: Array<{ login: string }>;
+  body?: string | null;
+}): Issue {
+  return {
+    provider: 'github',
+    identifier: `#${raw.number}`,
+    title: raw.title,
+    url: raw.url,
+    description: raw.body ?? undefined,
+    status: raw.state,
+    assignees: raw.assignees.map((assignee) => assignee.login).filter(Boolean),
+    updatedAt: raw.updatedAt ?? undefined,
+    fetchedAt: new Date().toISOString(),
+  };
+}
+
+async function listIssues(nameWithOwner: string, limit: number): Promise<IssueListResult> {
+  try {
+    const issues = await issueService.listIssues(nameWithOwner, limit);
+    return {
+      success: true,
+      issues: issues.map(toIssue),
+    };
+  } catch (error) {
+    return {
+      success: false,
+      error: error instanceof Error ? error.message : 'Unable to list GitHub issues',
+    };
+  }
+}
+
+async function searchIssues(
+  nameWithOwner: string,
+  searchTerm: string,
+  limit: number
+): Promise<IssueListResult> {
+  if (!normalizeSearchTerm(searchTerm)) {
+    return { success: true, issues: [] };
+  }
+
+  try {
+    const issues = await issueService.searchIssues(nameWithOwner, searchTerm, limit);
+    return {
+      success: true,
+      issues: issues.map(toIssue),
+    };
+  } catch (error) {
+    return {
+      success: false,
+      error: error instanceof Error ? error.message : 'Unable to search GitHub issues',
+    };
+  }
+}
+
+export const githubIssueProvider: IssueProvider = {
+  type: 'github',
+  capabilities: ISSUE_PROVIDER_CAPABILITIES.github,
+
+  checkConnection: async () => {
+    const status = await githubConnectionService.getStatus();
+    return {
+      connected: status.authenticated,
+      displayName: status.user?.login || status.user?.name || undefined,
+      capabilities: ISSUE_PROVIDER_CAPABILITIES.github,
+    };
+  },
+
+  listIssues: async (opts) => {
+    const nameWithOwner = requireNameWithOwner(opts.nameWithOwner);
+    if (!nameWithOwner) {
+      return { success: false, error: 'Repository name is required.' };
+    }
+
+    return listIssues(nameWithOwner, opts.limit ?? 50);
+  },
+
+  searchIssues: async (opts) => {
+    const nameWithOwner = requireNameWithOwner(opts.nameWithOwner);
+    if (!nameWithOwner) {
+      return { success: false, error: 'Repository name is required.' };
+    }
+
+    return searchIssues(nameWithOwner, opts.searchTerm, opts.limit ?? 20);
+  },
+};
diff --git a/src/main/core/github/services/gh-cli-token.test.ts b/src/main/core/github/services/gh-cli-token.test.ts
new file mode 100644
index 0000000000..0eb890b934
--- /dev/null
+++ b/src/main/core/github/services/gh-cli-token.test.ts
@@ -0,0 +1,45 @@
+import { describe, expect, it } from 'vitest';
+import type { ExecFn } from '@main/core/utils/exec';
+import { extractGhCliToken, isGhCliAuthenticated } from './gh-cli-token';
+
+function makeExec(responses: Record<string, { stdout: string; stderr: string }>): ExecFn {
+  return async (command: string, args?: string[]) => {
+    const key = [command, ...(args || [])].join(' ');
+    const response = responses[key];
+    if (!response) throw new Error(`Command not found: ${key}`);
+    return response;
+  };
+}
+
+describe('isGhCliAuthenticated', () => {
+  it('returns true when gh auth status succeeds', async () => {
+    const exec = makeExec({ 'gh auth status': { stdout: '', stderr: '' } });
+    expect(await isGhCliAuthenticated(exec)).toBe(true);
+  });
+
+  it('returns false when gh auth status fails', async () => {
+    const exec: ExecFn = async () => {
+      throw new Error('not authenticated');
+    };
+    expect(await isGhCliAuthenticated(exec)).toBe(false);
+  });
+});
+
+describe('extractGhCliToken', () => {
+  it('returns trimmed token from gh auth token', async () => {
+    const exec = makeExec({ 'gh auth token': { stdout: 'gho_abc123\n', stderr: '' } });
+    expect(await extractGhCliToken(exec)).toBe('gho_abc123');
+  });
+
+  it('returns null when gh auth token fails', async () => {
+    const exec: ExecFn = async () => {
+      throw new Error('no token');
+    };
+    expect(await extractGhCliToken(exec)).toBeNull();
+  });
+
+  it('returns null for empty stdout', async () => {
+    const exec = makeExec({ 'gh auth token': { stdout: '', stderr: '' } });
+    expect(await extractGhCliToken(exec)).toBeNull();
+  });
+});
diff --git a/src/main/core/github/services/gh-cli-token.ts b/src/main/core/github/services/gh-cli-token.ts
new file mode 100644
index 0000000000..f73033093f
--- /dev/null
+++ b/src/main/core/github/services/gh-cli-token.ts
@@ -0,0 +1,20 @@
+import type { ExecFn } from '@main/core/utils/exec';
+
+export async function isGhCliAuthenticated(exec: ExecFn): Promise<boolean> {
+  try {
+    await exec('gh', ['auth', 'status']);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+export async function extractGhCliToken(exec: ExecFn): Promise<string | null> {
+  try {
+    const { stdout } = await exec('gh', ['auth', 'token']);
+    const token = stdout.trim();
+    return token || null;
+  } catch {
+    return null;
+  }
+}
diff --git a/src/main/core/github/services/github-connection-service.ts b/src/main/core/github/services/github-connection-service.ts
new file mode 100644
index 0000000000..7f93138f50
--- /dev/null
+++ b/src/main/core/github/services/github-connection-service.ts
@@ -0,0 +1,313 @@
+import { createOAuthDeviceAuth } from '@octokit/auth-oauth-device';
+import { Octokit } from '@octokit/rest';
+import {
+  githubAuthCancelledChannel,
+  githubAuthDeviceCodeChannel,
+  githubAuthErrorChannel,
+  githubAuthSuccessChannel,
+} from '@shared/events/githubEvents';
+import type { GitHubConnectResponse, GitHubUser } from '@shared/github';
+import { encryptedAppSecretsStore } from '@main/core/secrets/encrypted-app-secrets-store';
+import { executeOAuthFlow } from '@main/core/shared/oauth-flow';
+import { getLocalExec } from '@main/core/utils/exec';
+import { KV } from '@main/db/kv';
+import { events } from '@main/lib/events';
+import { log } from '@main/lib/logger';
+import { extractGhCliToken } from './gh-cli-token';
+
+// ---------------------------------------------------------------------------
+// Types
+// ---------------------------------------------------------------------------
+
+export type AuthResult = GitHubConnectResponse;
+
+export interface DeviceCodeResult {
+  success: boolean;
+  device_code?: string;
+  user_code?: string;
+  verification_uri?: string;
+  expires_in?: number;
+  interval?: number;
+  error?: string;
+}
+
+/**
+ * Manages GitHub authentication tokens regardless of how they were obtained
+ * (Emdash Account OAuth, Device Flow, PAT, or extracted from gh CLI).
+ */
+export type TokenSource = 'secure_storage' | 'cli' | null;
+
+export interface GitHubConnectionService {
+  getToken(): Promise<string | null>;
+  getTokenSource(): Promise<TokenSource>;
+  getStatus(): Promise<{
+    authenticated: boolean;
+    user: GitHubUser | null;
+    tokenSource: TokenSource;
+  }>;
+  isAuthenticated(): Promise<boolean>;
+  getCurrentUser(): Promise<GitHubUser | null>;
+  getUserInfo(token: string): Promise<GitHubUser | null>;
+  startOAuthFlow(authServerBaseUrl: string): Promise<AuthResult>;
+  startDeviceFlowAuth(): Promise<DeviceCodeResult>;
+  storeToken(token: string): Promise<void>;
+  cancelAuth(): void;
+  logout(): Promise<void>;
+}
+
+const GITHUB_TOKEN_SECRET_KEY = 'emdash-github-token';
+
+interface GitHubKVSchema extends Record<string, unknown> {
+  tokenSource: Exclude<TokenSource, null>;
+}
+
+const githubKV = new KV<GitHubKVSchema>('github');
+
+const GITHUB_CONFIG = {
+  clientId: 'Ov23ligC35uHWopzCeWf',
+  scopes: ['repo', 'read:user', 'read:org'],
+} as const;
+
+export class GitHubConnectionServiceImpl implements GitHubConnectionService {
+  private deviceFlowAbortController: AbortController | null = null;
+
+  private parseTokenSource(raw: unknown): Exclude<TokenSource, null> | null {
+    return raw === 'cli' || raw === 'secure_storage' ? raw : null;
+  }
+
+  private async getStoredTokenSource(): Promise<Exclude<TokenSource, null> | null> {
+    try {
+      return this.parseTokenSource(await githubKV.get('tokenSource'));
+    } catch {
+      return null;
+    }
+  }
+
+  private async setStoredTokenSource(source: Exclude<TokenSource, null>): Promise<void> {
+    await githubKV.set('tokenSource', source);
+  }
+
+  private async clearStoredTokenSource(): Promise<void> {
+    await githubKV.del('tokenSource');
+  }
+
+  private async getStoredTokenRecord(): Promise<{
+    token: string | null;
+    source: Exclude<TokenSource, null> | null;
+  }> {
+    try {
+      const token = (await encryptedAppSecretsStore.getSecret(GITHUB_TOKEN_SECRET_KEY)) ?? null;
+      const source = await this.getStoredTokenSource();
+      return { token, source };
+    } catch {
+      return { token: null, source: null };
+    }
+  }
+
+  private async clearStoredToken(): Promise<void> {
+    await Promise.all([
+      encryptedAppSecretsStore.deleteSecret(GITHUB_TOKEN_SECRET_KEY),
+      this.clearStoredTokenSource(),
+    ]);
+  }
+
+  private async resolveTokenRecord(): Promise<{ token: string | null; source: TokenSource }> {
+    const { token: storedToken, source } = await this.getStoredTokenRecord();
+    const exec = getLocalExec();
+
+    if (storedToken && source === 'cli') {
+      const cliToken = await extractGhCliToken(exec);
+      if (!cliToken) {
+        try {
+          await this.clearStoredToken();
+        } catch (error) {
+          log.warn('Failed to clear stale CLI token from secure storage:', error);
+        }
+        return { token: null, source: null };
+      }
+      if (cliToken !== storedToken) {
+        try {
+          await this.storeToken(cliToken, 'cli');
+        } catch (error) {
+          log.warn('Failed to sync refreshed CLI token to secure storage:', error);
+        }
+        return { token: cliToken, source: 'cli' };
+      }
+      return { token: storedToken, source: 'cli' };
+    }
+
+    if (storedToken) {
+      return { token: storedToken, source: source ?? 'secure_storage' };
+    }
+
+    const cliToken = await extractGhCliToken(exec);
+    if (!cliToken) return { token: null, source: null };
+
+    try {
+      await this.storeToken(cliToken, 'cli');
+    } catch (error) {
+      log.warn('Failed to cache CLI token in secure storage:', error);
+    }
+    return { token: cliToken, source: 'cli' };
+  }
+
+  async getToken(): Promise<string | null> {
+    const { token } = await this.resolveTokenRecord();
+    return token;
+  }
+
+  async getTokenSource(): Promise<TokenSource> {
+    const { token, source } = await this.resolveTokenRecord();
+    if (!token) return null;
+    return source ?? 'secure_storage';
+  }
+
+  async getStatus(): Promise<{
+    authenticated: boolean;
+    user: GitHubUser | null;
+    tokenSource: TokenSource;
+  }> {
+    const { token, source } = await this.resolveTokenRecord();
+    if (!token) {
+      return { authenticated: false, user: null, tokenSource: null };
+    }
+
+    const user = await this.getUserInfo(token);
+    return {
+      authenticated: true,
+      user,
+      tokenSource: source ?? 'secure_storage',
+    };
+  }
+
+  async isAuthenticated(): Promise<boolean> {
+    const token = await this.getToken();
+    return token !== null;
+  }
+
+  async getCurrentUser(): Promise<GitHubUser | null> {
+    const token = await this.getToken();
+    if (!token) return null;
+    return this.getUserInfo(token);
+  }
+
+  async getUserInfo(token: string): Promise<GitHubUser | null> {
+    try {
+      const octokit = new Octokit({ auth: token });
+      const { data } = await octokit.rest.users.getAuthenticated();
+      return {
+        id: data.id,
+        login: data.login,
+        name: data.name ?? '',
+        email: data.email ?? '',
+        avatar_url: data.avatar_url,
+      };
+    } catch {
+      return null;
+    }
+  }
+
+  async startOAuthFlow(authServerBaseUrl: string): Promise<AuthResult> {
+    try {
+      const raw = await executeOAuthFlow({
+        authorizeUrl: `${authServerBaseUrl}/auth/github`,
+        exchangeUrl: `${authServerBaseUrl}/api/v1/auth/electron/exchange`,
+        successRedirectUrl: `${authServerBaseUrl}/auth/success`,
+        errorRedirectUrl: `${authServerBaseUrl}/auth/error`,
+      });
+
+      const accessToken = raw.accessToken as string;
+      if (!accessToken) {
+        return { success: false, error: 'No access token in response' };
+      }
+
+      await this.storeToken(accessToken);
+      const user = await this.getUserInfo(accessToken);
+      return { success: true, token: accessToken, user: user || undefined };
+    } catch (error) {
+      log.warn('GitHub OAuth flow failed:', error);
+      return {
+        success: false,
+        error: error instanceof Error ? error.message : 'OAuth authentication failed',
+      };
+    }
+  }
+
+  async startDeviceFlowAuth(): Promise<DeviceCodeResult> {
+    this.deviceFlowAbortController = new AbortController();
+    const { signal } = this.deviceFlowAbortController;
+
+    try {
+      const auth = createOAuthDeviceAuth({
+        clientId: GITHUB_CONFIG.clientId,
+        scopes: [...GITHUB_CONFIG.scopes],
+        onVerification: (verification) => {
+          events.emit(githubAuthDeviceCodeChannel, {
+            userCode: verification.user_code,
+            verificationUri: verification.verification_uri,
+            expiresIn: verification.expires_in,
+            interval: verification.interval,
+          });
+        },
+      });
+
+      const authPromise = auth({ type: 'oauth' });
+
+      const cancelPromise = new Promise<never>((_, reject) => {
+        signal.addEventListener('abort', () => {
+          reject(new Error('Auth cancelled'));
+        });
+      });
+
+      const result = await Promise.race([authPromise, cancelPromise]);
+      const token = result.token;
+
+      await this.storeToken(token);
+
+      const user = await this.getUserInfo(token);
+
+      if (user) {
+        events.emit(githubAuthSuccessChannel, { token, user });
+      }
+
+      return {
+        success: true,
+        device_code: undefined,
+        user_code: undefined,
+        verification_uri: undefined,
+      };
+    } catch (error) {
+      if (signal.aborted) {
+        events.emit(githubAuthCancelledChannel, undefined);
+        return { success: false, error: 'Auth cancelled' };
+      }
+
+      const message = error instanceof Error ? error.message : String(error);
+      events.emit(githubAuthErrorChannel, { error: 'device_flow_error', message });
+      return { success: false, error: message };
+    } finally {
+      this.deviceFlowAbortController = null;
+    }
+  }
+
+  async storeToken(
+    token: string,
+    source: Exclude<TokenSource, null> = 'secure_storage'
+  ): Promise<void> {
+    await encryptedAppSecretsStore.setSecret(GITHUB_TOKEN_SECRET_KEY, token);
+    await this.setStoredTokenSource(source);
+  }
+
+  cancelAuth(): void {
+    if (this.deviceFlowAbortController) {
+      this.deviceFlowAbortController.abort();
+      this.deviceFlowAbortController = null;
+    }
+  }
+
+  async logout(): Promise<void> {
+    await this.clearStoredToken();
+  }
+}
+
+export const githubConnectionService = new GitHubConnectionServiceImpl();
diff --git a/src/main/core/github/services/issue-service.test.ts b/src/main/core/github/services/issue-service.test.ts
new file mode 100644
index 0000000000..c461ab0f3f
--- /dev/null
+++ b/src/main/core/github/services/issue-service.test.ts
@@ -0,0 +1,169 @@
+import type { Octokit } from '@octokit/rest';
+import { describe, expect, it, vi } from 'vitest';
+import { issueService } from './issue-service';
+import { getOctokit } from './octokit-provider';
+
+vi.mock('./octokit-provider', () => ({
+  getOctokit: vi.fn(),
+}));
+
+const mockGetOctokit = vi.mocked(getOctokit);
+
+// ---------------------------------------------------------------------------
+// Helpers
+// ---------------------------------------------------------------------------
+
+function makeOctokit(overrides: {
+  listForRepo?: ReturnType<typeof vi.fn>;
+  issuesAndPullRequests?: ReturnType<typeof vi.fn>;
+  issuesGet?: ReturnType<typeof vi.fn>;
+}): Octokit {
+  return {
+    rest: {
+      issues: {
+        listForRepo: overrides.listForRepo ?? vi.fn(),
+        get: overrides.issuesGet ?? vi.fn(),
+      },
+      search: {
+        issuesAndPullRequests: overrides.issuesAndPullRequests ?? vi.fn(),
+      },
+    },
+  } as unknown as Octokit;
+}
+
+const restIssue = {
+  number: 1,
+  title: 'Test issue',
+  html_url: 'https://github.com/owner/repo/issues/1',
+  state: 'open',
+  created_at: '2024-01-01T00:00:00Z',
+  updated_at: '2024-01-02T00:00:00Z',
+  comments: 3,
+  user: { login: 'alice', avatar_url: 'https://avatar.test/alice' },
+  assignees: [{ login: 'bob', avatar_url: 'https://avatar.test/bob' }],
+  labels: [{ name: 'bug', color: 'fc2929' }],
+};
+
+const expectedIssue = {
+  number: 1,
+  title: 'Test issue',
+  url: 'https://github.com/owner/repo/issues/1',
+  state: 'open',
+  createdAt: '2024-01-01T00:00:00Z',
+  updatedAt: '2024-01-02T00:00:00Z',
+  comments: 3,
+  user: { login: 'alice', avatarUrl: 'https://avatar.test/alice' },
+  assignees: [{ login: 'bob', avatarUrl: 'https://avatar.test/bob' }],
+  labels: [{ name: 'bug', color: 'fc2929' }],
+};
+
+// ---------------------------------------------------------------------------
+// Tests
+// ---------------------------------------------------------------------------
+
+describe('GitHubIssueServiceImpl', () => {
+  describe('listIssues', () => {
+    it('maps REST response to camelCase', async () => {
+      const listForRepo = vi.fn().mockResolvedValue({ data: [restIssue] });
+      mockGetOctokit.mockResolvedValue(makeOctokit({ listForRepo }));
+
+      const result = await issueService.listIssues('owner/repo', 30);
+
+      expect(listForRepo).toHaveBeenCalledWith({
+        owner: 'owner',
+        repo: 'repo',
+        state: 'open',
+        per_page: 30,
+        sort: 'updated',
+        direction: 'desc',
+      });
+      expect(result).toEqual([expectedIssue]);
+    });
+
+    it('filters out pull requests', async () => {
+      const pr = { ...restIssue, number: 2, pull_request: { url: 'https://...' } };
+      const listForRepo = vi.fn().mockResolvedValue({ data: [restIssue, pr] });
+      mockGetOctokit.mockResolvedValue(makeOctokit({ listForRepo }));
+
+      const result = await issueService.listIssues('owner/repo');
+
+      expect(result).toHaveLength(1);
+      expect(result[0].number).toBe(1);
+    });
+
+    it('returns empty array on error', async () => {
+      const listForRepo = vi.fn().mockRejectedValue(new Error('Network error'));
+      mockGetOctokit.mockResolvedValue(makeOctokit({ listForRepo }));
+
+      expect(await issueService.listIssues('owner/repo')).toEqual([]);
+    });
+
+    it('clamps limit to 1-100', async () => {
+      const listForRepo = vi.fn().mockResolvedValue({ data: [] });
+      mockGetOctokit.mockResolvedValue(makeOctokit({ listForRepo }));
+
+      await issueService.listIssues('owner/repo', 0);
+      expect(listForRepo).toHaveBeenCalledWith(expect.objectContaining({ per_page: 1 }));
+
+      listForRepo.mockClear();
+      await issueService.listIssues('owner/repo', 999);
+      expect(listForRepo).toHaveBeenCalledWith(expect.objectContaining({ per_page: 100 }));
+    });
+  });
+
+  describe('searchIssues', () => {
+    it('maps search results to camelCase', async () => {
+      const issuesAndPullRequests = vi.fn().mockResolvedValue({ data: { items: [restIssue] } });
+      mockGetOctokit.mockResolvedValue(makeOctokit({ issuesAndPullRequests }));
+
+      const result = await issueService.searchIssues('owner/repo', 'bug fix', 15);
+
+      expect(issuesAndPullRequests).toHaveBeenCalledWith({
+        q: 'bug fix repo:owner/repo is:issue is:open',
+        per_page: 15,
+        sort: 'updated',
+        order: 'desc',
+      });
+      expect(result).toEqual([expectedIssue]);
+    });
+
+    it('returns empty for blank search term', async () => {
+      const issuesAndPullRequests = vi.fn();
+      mockGetOctokit.mockResolvedValue(makeOctokit({ issuesAndPullRequests }));
+
+      expect(await issueService.searchIssues('owner/repo', '   ')).toEqual([]);
+      expect(await issueService.searchIssues('owner/repo', '')).toEqual([]);
+      expect(issuesAndPullRequests).not.toHaveBeenCalled();
+    });
+
+    it('returns empty on error', async () => {
+      const issuesAndPullRequests = vi.fn().mockRejectedValue(new Error('API error'));
+      mockGetOctokit.mockResolvedValue(makeOctokit({ issuesAndPullRequests }));
+
+      expect(await issueService.searchIssues('owner/repo', 'query')).toEqual([]);
+    });
+  });
+
+  describe('getIssue', () => {
+    it('maps detail response to camelCase with body', async () => {
+      const issuesGet = vi.fn().mockResolvedValue({ data: { ...restIssue, body: 'Issue body' } });
+      mockGetOctokit.mockResolvedValue(makeOctokit({ issuesGet }));
+
+      const result = await issueService.getIssue('owner/repo', 42);
+
+      expect(issuesGet).toHaveBeenCalledWith({
+        owner: 'owner',
+        repo: 'repo',
+        issue_number: 42,
+      });
+      expect(result).toEqual({ ...expectedIssue, body: 'Issue body' });
+    });
+
+    it('returns null on error', async () => {
+      const issuesGet = vi.fn().mockRejectedValue(new Error('Not found'));
+      mockGetOctokit.mockResolvedValue(makeOctokit({ issuesGet }));
+
+      expect(await issueService.getIssue('owner/repo', 99)).toBeNull();
+    });
+  });
+});
diff --git a/src/main/core/github/services/issue-service.ts b/src/main/core/github/services/issue-service.ts
new file mode 100644
index 0000000000..250770cfbe
--- /dev/null
+++ b/src/main/core/github/services/issue-service.ts
@@ -0,0 +1,142 @@
+import type { Octokit } from '@octokit/rest';
+import { getOctokit } from './octokit-provider';
+import { splitRepo } from './utils';
+
+// ---------------------------------------------------------------------------
+// Types
+// ---------------------------------------------------------------------------
+
+export interface GitHubIssue {
+  number: number;
+  title: string;
+  url: string;
+  state: string;
+  createdAt: string | null;
+  updatedAt: string | null;
+  comments: number;
+  user: { login: string; avatarUrl: string } | null;
+  assignees: Array<{ login: string; avatarUrl: string }>;
+  labels: Array<{ name: string; color: string }>;
+}
+
+export interface GitHubIssueDetail extends GitHubIssue {
+  body: string | null;
+}
+
+export interface GitHubIssueService {
+  listIssues(nameWithOwner: string, limit?: number): Promise<GitHubIssue[]>;
+  searchIssues(nameWithOwner: string, searchTerm: string, limit?: number): Promise<GitHubIssue[]>;
+  getIssue(nameWithOwner: string, issueNumber: number): Promise<GitHubIssueDetail | null>;
+}
+
+// ---------------------------------------------------------------------------
+// REST response shape (internal)
+// ---------------------------------------------------------------------------
+
+interface RestIssue {
+  number: number;
+  title: string;
+  html_url: string;
+  state: string;
+  created_at: string | null;
+  updated_at: string | null;
+  comments: number;
+  user: { login: string; avatar_url: string } | null;
+  assignees: Array<{ login: string; avatar_url: string }> | null;
+  labels: Array<string | { name?: string; color?: string }>;
+  body?: string | null;
+  pull_request?: unknown;
+}
+
+// ---------------------------------------------------------------------------
+// Implementation
+// ---------------------------------------------------------------------------
+
+export class GitHubIssueServiceImpl implements GitHubIssueService {
+  constructor(private readonly getOctokit: () => Promise<Octokit>) {}
+
+  async listIssues(nameWithOwner: string, limit: number = 50): Promise<GitHubIssue[]> {
+    const { owner, repo } = splitRepo(nameWithOwner);
+    try {
+      const octokit = await this.getOctokit();
+      const { data } = await octokit.rest.issues.listForRepo({
+        owner,
+        repo,
+        state: 'open',
+        per_page: Math.min(Math.max(limit, 1), 100),
+        sort: 'updated',
+        direction: 'desc',
+      });
+      return data
+        .filter((issue) => !issue.pull_request)
+        .map((item) => this.mapIssue(item as unknown as RestIssue));
+    } catch {
+      return [];
+    }
+  }
+
+  async searchIssues(
+    nameWithOwner: string,
+    searchTerm: string,
+    limit: number = 20
+  ): Promise<GitHubIssue[]> {
+    const term = searchTerm.trim();
+    if (!term) return [];
+    const { owner, repo } = splitRepo(nameWithOwner);
+    try {
+      const octokit = await this.getOctokit();
+      const { data } = await octokit.rest.search.issuesAndPullRequests({
+        q: `${term} repo:${owner}/${repo} is:issue is:open`,
+        per_page: Math.min(Math.max(limit, 1), 100),
+        sort: 'updated',
+        order: 'desc',
+      });
+      return data.items.map((item) => this.mapIssue(item as unknown as RestIssue));
+    } catch {
+      return [];
+    }
+  }
+
+  async getIssue(nameWithOwner: string, issueNumber: number): Promise<GitHubIssueDetail | null> {
+    const { owner, repo } = splitRepo(nameWithOwner);
+    try {
+      const octokit = await this.getOctokit();
+      const { data } = await octokit.rest.issues.get({
+        owner,
+        repo,
+        issue_number: issueNumber,
+      });
+      return this.mapIssueDetail(data as unknown as RestIssue);
+    } catch {
+      return null;
+    }
+  }
+
+  private mapIssue(item: RestIssue): GitHubIssue {
+    return {
+      number: item.number,
+      title: item.title,
+      url: item.html_url,
+      state: item.state,
+      createdAt: item.created_at,
+      updatedAt: item.updated_at,
+      comments: item.comments,
+      user: item.user ? { login: item.user.login, avatarUrl: item.user.avatar_url } : null,
+      assignees: (item.assignees ?? []).map((a) => ({ login: a.login, avatarUrl: a.avatar_url })),
+      labels: (item.labels ?? []).map((l) =>
+        typeof l === 'string'
+          ? { name: l, color: '' }
+          : { name: l.name ?? '', color: l.color ?? '' }
+      ),
+    };
+  }
+
+  private mapIssueDetail(item: RestIssue): GitHubIssueDetail {
+    return {
+      ...this.mapIssue(item),
+      body: item.body ?? null,
+    };
+  }
+}
+
+export const issueService = new GitHubIssueServiceImpl(getOctokit);
diff --git a/src/main/core/github/services/octokit-provider.ts b/src/main/core/github/services/octokit-provider.ts
new file mode 100644
index 0000000000..7e1fae5b57
--- /dev/null
+++ b/src/main/core/github/services/octokit-provider.ts
@@ -0,0 +1,20 @@
+import { Octokit } from '@octokit/rest';
+import { githubConnectionService } from './github-connection-service';
+
+let cachedOctokit: Octokit | null = null;
+let cachedToken: string | null = null;
+
+export async function getOctokit(): Promise<Octokit> {
+  const token = await githubConnectionService.getToken();
+  if (!token) throw new Error('Not authenticated');
+  if (token !== cachedToken) {
+    cachedOctokit = new Octokit({ auth: token });
+    cachedToken = token;
+  }
+  return cachedOctokit!;
+}
+
+export function clearOctokitCache(): void {
+  cachedOctokit = null;
+  cachedToken = null;
+}
diff --git a/src/main/core/github/services/pr-queries.ts b/src/main/core/github/services/pr-queries.ts
new file mode 100644
index 0000000000..a57c425590
--- /dev/null
+++ b/src/main/core/github/services/pr-queries.ts
@@ -0,0 +1,202 @@
+export const PR_SUMMARY_FRAGMENT = `
+  fragment PrSummaryFields on PullRequest {
+    number
+    title
+    url
+    state
+    isDraft
+    createdAt
+    updatedAt
+    headRefName
+    headRefOid
+    baseRefName
+    baseRefOid
+    commitCount: commits { totalCount }
+    body
+    additions
+    deletions
+    changedFiles
+    mergeable
+    mergeStateStatus
+    author {
+      login avatarUrl url
+      ... on User { databaseId createdAt updatedAt }
+    }
+    headRepository {
+      nameWithOwner
+      url
+      owner { login }
+    }
+    baseRepository {
+      url
+    }
+    labels(first: 10) { nodes { name color } }
+    assignees(first: 10) {
+      nodes {
+        login avatarUrl url
+        ... on User { databaseId createdAt updatedAt }
+      }
+    }
+    reviewDecision
+  }
+`;
+
+export const LIST_PRS_QUERY = `
+  query listPullRequests($owner: String!, $repo: String!, $limit: Int!) {
+    repository(owner: $owner, name: $repo) {
+      pullRequests(states: OPEN, first: $limit, orderBy: { field: UPDATED_AT, direction: DESC }) {
+        totalCount
+        nodes { ...PrSummaryFields }
+      }
+    }
+  }
+  ${PR_SUMMARY_FRAGMENT}
+`;
+
+export const SEARCH_PRS_QUERY = `
+  query searchPullRequests($searchQuery: String!, $limit: Int!) {
+    search(query: $searchQuery, type: ISSUE, first: $limit) {
+      issueCount
+      nodes {
+        ... on PullRequest { ...PrSummaryFields }
+      }
+    }
+  }
+  ${PR_SUMMARY_FRAGMENT}
+`;
+
+export const GET_PR_DETAIL_QUERY = `
+  query getPullRequest($owner: String!, $repo: String!, $number: Int!) {
+    repository(owner: $owner, name: $repo) {
+      pullRequest(number: $number) {
+        ...PrSummaryFields
+      }
+    }
+  }
+  ${PR_SUMMARY_FRAGMENT}
+`;
+
+export const GET_PR_CHECK_RUNS_QUERY = `
+  query getPrCheckRuns($owner: String!, $repo: String!, $number: Int!, $cursor: String) {
+    repository(owner: $owner, name: $repo) {
+      pullRequest(number: $number) {
+        commits(last: 1) {
+          nodes {
+            commit {
+              statusCheckRollup {
+                contexts(first: 100, after: $cursor) {
+                  pageInfo { hasNextPage endCursor }
+                  nodes {
+                    ... on CheckRun {
+                      __typename
+                      name
+                      status
+                      conclusion
+                      detailsUrl
+                      startedAt
+                      completedAt
+                      checkSuite {
+                        app { name logoUrl }
+                        workflowRun {
+                          workflow { name }
+                        }
+                      }
+                    }
+                    ... on StatusContext {
+                      __typename
+                      context
+                      state
+                      targetUrl
+                      createdAt
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+`;
+
+export const SYNC_PRS_QUERY = `
+  query syncPullRequests($owner: String!, $repo: String!, $cursor: String) {
+    repository(owner: $owner, name: $repo) {
+      pullRequests(first: 25, after: $cursor, orderBy: { field: UPDATED_AT, direction: DESC }) {
+        totalCount
+        pageInfo { hasNextPage endCursor }
+        nodes { ...PrSummaryFields }
+      }
+    }
+  }
+  ${PR_SUMMARY_FRAGMENT}
+`;
+
+export const INCREMENTAL_SYNC_PRS_QUERY = `
+  query incrementalSyncPullRequests($owner: String!, $repo: String!, $cursor: String) {
+    repository(owner: $owner, name: $repo) {
+      pullRequests(first: 50, after: $cursor, orderBy: { field: UPDATED_AT, direction: DESC }) {
+        pageInfo { hasNextPage endCursor }
+        nodes { ...PrSummaryFields }
+      }
+    }
+  }
+  ${PR_SUMMARY_FRAGMENT}
+`;
+
+export const GET_PR_BY_NUMBER_QUERY = `
+  query getPullRequestByNumber($owner: String!, $repo: String!, $number: Int!) {
+    repository(owner: $owner, name: $repo) {
+      pullRequest(number: $number) {
+        ...PrSummaryFields
+      }
+    }
+  }
+  ${PR_SUMMARY_FRAGMENT}
+`;
+
+export const GET_PR_CHECK_RUNS_BY_URL_QUERY = `
+  query getPrCheckRunsByUrl($owner: String!, $repo: String!, $number: Int!, $cursor: String) {
+    repository(owner: $owner, name: $repo) {
+      pullRequest(number: $number) {
+        commits(last: 1) {
+          nodes {
+            commit {
+              oid
+              statusCheckRollup {
+                contexts(first: 100, after: $cursor) {
+                  pageInfo { hasNextPage endCursor }
+                  nodes {
+                    ... on CheckRun {
+                      __typename
+                      name
+                      status
+                      conclusion
+                      detailsUrl
+                      startedAt
+                      completedAt
+                      checkSuite {
+                        app { name logoUrl }
+                        workflowRun {
+                          workflow { name }
+                        }
+                      }
+                    }
+                    ... on StatusContext {
+                      __typename
+                      context
+                      state
+                      targetUrl
+                      createdAt
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+`;
diff --git a/src/main/core/github/services/repo-service.test.ts b/src/main/core/github/services/repo-service.test.ts
new file mode 100644
index 0000000000..73793eaa59
--- /dev/null
+++ b/src/main/core/github/services/repo-service.test.ts
@@ -0,0 +1,260 @@
+import type { Octokit } from '@octokit/rest';
+import { describe, expect, it, vi } from 'vitest';
+import { getOctokit } from './octokit-provider';
+import { repoService } from './repo-service';
+
+vi.mock('./octokit-provider', () => ({
+  getOctokit: vi.fn(),
+}));
+
+const mockGetOctokit = vi.mocked(getOctokit);
+
+// ---------------------------------------------------------------------------
+// Helpers
+// ---------------------------------------------------------------------------
+
+function makeOctokit(
+  overrides: Partial<{
+    reposListForAuthenticatedUser: ReturnType<typeof vi.fn>;
+    usersGetAuthenticated: ReturnType<typeof vi.fn>;
+    orgsListForAuthenticatedUser: ReturnType<typeof vi.fn>;
+    reposCreateForAuthenticatedUser: ReturnType<typeof vi.fn>;
+    reposCreateInOrg: ReturnType<typeof vi.fn>;
+    reposDelete: ReturnType<typeof vi.fn>;
+    reposGet: ReturnType<typeof vi.fn>;
+  }> = {}
+): Octokit {
+  return {
+    rest: {
+      repos: {
+        listForAuthenticatedUser:
+          overrides.reposListForAuthenticatedUser ?? vi.fn().mockResolvedValue({ data: [] }),
+        createForAuthenticatedUser: overrides.reposCreateForAuthenticatedUser ?? vi.fn(),
+        createInOrg: overrides.reposCreateInOrg ?? vi.fn(),
+        delete: overrides.reposDelete ?? vi.fn().mockResolvedValue({}),
+        get: overrides.reposGet ?? vi.fn(),
+      },
+      users: {
+        getAuthenticated:
+          overrides.usersGetAuthenticated ??
+          vi.fn().mockResolvedValue({ data: { login: 'testuser' } }),
+      },
+      orgs: {
+        listForAuthenticatedUser:
+          overrides.orgsListForAuthenticatedUser ?? vi.fn().mockResolvedValue({ data: [] }),
+      },
+    },
+  } as unknown as Octokit;
+}
+
+// REST-shaped mock data (snake_case)
+const restRepo = {
+  id: 1,
+  name: 'my-repo',
+  full_name: 'testuser/my-repo',
+  description: 'A test repo',
+  html_url: 'https://github.com/testuser/my-repo',
+  clone_url: 'https://github.com/testuser/my-repo.git',
+  ssh_url: 'git@github.com:testuser/my-repo.git',
+  default_branch: 'main',
+  private: false,
+  updated_at: '2024-01-01T00:00:00Z',
+  language: 'TypeScript',
+  stargazers_count: 10,
+  forks_count: 2,
+};
+
+// Expected camelCase output
+const expectedRepo = {
+  id: 1,
+  name: 'my-repo',
+  nameWithOwner: 'testuser/my-repo',
+  description: 'A test repo',
+  url: 'https://github.com/testuser/my-repo',
+  cloneUrl: 'https://github.com/testuser/my-repo.git',
+  sshUrl: 'git@github.com:testuser/my-repo.git',
+  defaultBranch: 'main',
+  isPrivate: false,
+  updatedAt: '2024-01-01T00:00:00Z',
+  language: 'TypeScript',
+  stargazersCount: 10,
+  forksCount: 2,
+};
+
+// ---------------------------------------------------------------------------
+// Tests
+// ---------------------------------------------------------------------------
+
+describe('GitHubRepositoryServiceImpl', () => {
+  describe('listRepositories', () => {
+    it('maps REST response to camelCase', async () => {
+      const octokit = makeOctokit({
+        reposListForAuthenticatedUser: vi.fn().mockResolvedValue({ data: [restRepo] }),
+      });
+      mockGetOctokit.mockResolvedValue(octokit);
+
+      const result = await repoService.listRepositories();
+
+      expect(result).toEqual([expectedRepo]);
+    });
+  });
+
+  describe('getOwners', () => {
+    it('returns user + orgs', async () => {
+      const octokit = makeOctokit({
+        orgsListForAuthenticatedUser: vi.fn().mockResolvedValue({ data: [{ login: 'acme' }] }),
+      });
+      mockGetOctokit.mockResolvedValue(octokit);
+
+      const owners = await repoService.getOwners();
+
+      expect(owners).toEqual([
+        { login: 'testuser', type: 'User' },
+        { login: 'acme', type: 'Organization' },
+      ]);
+    });
+
+    it('returns user only if orgs fail', async () => {
+      const octokit = makeOctokit({
+        orgsListForAuthenticatedUser: vi.fn().mockRejectedValue(new Error('forbidden')),
+      });
+      mockGetOctokit.mockResolvedValue(octokit);
+
+      const owners = await repoService.getOwners();
+
+      expect(owners).toEqual([{ login: 'testuser', type: 'User' }]);
+    });
+  });
+
+  describe('createRepository', () => {
+    it('creates for authenticated user', async () => {
+      const octokit = makeOctokit({
+        reposCreateForAuthenticatedUser: vi.fn().mockResolvedValue({
+          data: {
+            html_url: 'https://github.com/testuser/new',
+            default_branch: 'main',
+            full_name: 'testuser/new',
+          },
+        }),
+      });
+      mockGetOctokit.mockResolvedValue(octokit);
+
+      const result = await repoService.createRepository({
+        name: 'new',
+        owner: 'testuser',
+        isPrivate: false,
+      });
+
+      expect(octokit.rest.repos.createForAuthenticatedUser).toHaveBeenCalled();
+      expect(result).toEqual({
+        url: 'https://github.com/testuser/new',
+        defaultBranch: 'main',
+        nameWithOwner: 'testuser/new',
+      });
+    });
+
+    it('creates in org when owner differs', async () => {
+      const octokit = makeOctokit({
+        reposCreateInOrg: vi.fn().mockResolvedValue({
+          data: {
+            html_url: 'https://github.com/acme/new',
+            default_branch: 'main',
+            full_name: 'acme/new',
+          },
+        }),
+      });
+      mockGetOctokit.mockResolvedValue(octokit);
+
+      await repoService.createRepository({ name: 'new', owner: 'acme', isPrivate: true });
+
+      expect(octokit.rest.repos.createInOrg).toHaveBeenCalledWith(
+        expect.objectContaining({ org: 'acme', name: 'new', private: true })
+      );
+    });
+  });
+
+  describe('deleteRepository', () => {
+    it('calls repos.delete', async () => {
+      const octokit = makeOctokit();
+      mockGetOctokit.mockResolvedValue(octokit);
+
+      await repoService.deleteRepository('testuser', 'old-repo');
+
+      expect(octokit.rest.repos.delete).toHaveBeenCalledWith({
+        owner: 'testuser',
+        repo: 'old-repo',
+      });
+    });
+  });
+
+  describe('checkRepositoryExists', () => {
+    it('returns true when found', async () => {
+      const octokit = makeOctokit({
+        reposGet: vi.fn().mockResolvedValue({ data: {} }),
+      });
+      mockGetOctokit.mockResolvedValue(octokit);
+
+      expect(await repoService.checkRepositoryExists('testuser', 'repo')).toBe(true);
+    });
+
+    it('returns false on 404', async () => {
+      const octokit = makeOctokit({
+        reposGet: vi.fn().mockRejectedValue({ status: 404 }),
+      });
+      mockGetOctokit.mockResolvedValue(octokit);
+
+      expect(await repoService.checkRepositoryExists('testuser', 'missing')).toBe(false);
+    });
+
+    it('throws on non-404 errors', async () => {
+      const octokit = makeOctokit({
+        reposGet: vi.fn().mockRejectedValue({ status: 500 }),
+      });
+      mockGetOctokit.mockResolvedValue(octokit);
+
+      await expect(repoService.checkRepositoryExists('testuser', 'repo')).rejects.toEqual({
+        status: 500,
+      });
+    });
+  });
+
+  describe('validateRepositoryName', () => {
+    it('accepts valid names', () => {
+      expect(repoService.validateRepositoryName('my-repo')).toEqual({ valid: true });
+      expect(repoService.validateRepositoryName('repo.js')).toEqual({ valid: true });
+      expect(repoService.validateRepositoryName('my_repo_123')).toEqual({ valid: true });
+    });
+
+    it('rejects empty names', () => {
+      expect(repoService.validateRepositoryName('')).toEqual({
+        valid: false,
+        error: 'Repository name is required',
+      });
+    });
+
+    it('rejects names over 100 chars', () => {
+      expect(repoService.validateRepositoryName('a'.repeat(101)).valid).toBe(false);
+    });
+
+    it('rejects invalid characters', () => {
+      expect(repoService.validateRepositoryName('my repo').valid).toBe(false);
+      expect(repoService.validateRepositoryName('repo@name').valid).toBe(false);
+    });
+
+    it('rejects names starting/ending with special chars', () => {
+      expect(repoService.validateRepositoryName('-repo').valid).toBe(false);
+      expect(repoService.validateRepositoryName('repo-').valid).toBe(false);
+      expect(repoService.validateRepositoryName('.repo').valid).toBe(false);
+    });
+
+    it('rejects all-dots names', () => {
+      expect(repoService.validateRepositoryName('...').valid).toBe(false);
+    });
+
+    it('rejects reserved names', () => {
+      expect(repoService.validateRepositoryName('CON').valid).toBe(false);
+      expect(repoService.validateRepositoryName('nul').valid).toBe(false);
+      expect(repoService.validateRepositoryName('COM1').valid).toBe(false);
+    });
+  });
+});
diff --git a/src/main/core/github/services/repo-service.ts b/src/main/core/github/services/repo-service.ts
new file mode 100644
index 0000000000..0648aec2e8
--- /dev/null
+++ b/src/main/core/github/services/repo-service.ts
@@ -0,0 +1,218 @@
+import type { Octokit } from '@octokit/rest';
+import { getOctokit } from './octokit-provider';
+
+// ---------------------------------------------------------------------------
+// Types
+// ---------------------------------------------------------------------------
+
+export interface GitHubRepo {
+  id: number;
+  name: string;
+  nameWithOwner: string;
+  description: string | null;
+  url: string;
+  cloneUrl: string;
+  sshUrl: string;
+  defaultBranch: string;
+  isPrivate: boolean;
+  updatedAt: string | null;
+  language: string | null;
+  stargazersCount: number;
+  forksCount: number;
+}
+
+export interface GitHubOwner {
+  login: string;
+  type: 'User' | 'Organization';
+}
+
+export interface GitHubRepositoryService {
+  listRepositories(): Promise<GitHubRepo[]>;
+  getOwners(): Promise<GitHubOwner[]>;
+  createRepository(params: {
+    name: string;
+    description?: string;
+    owner: string;
+    isPrivate: boolean;
+  }): Promise<{ url: string; defaultBranch: string; nameWithOwner: string }>;
+  deleteRepository(owner: string, name: string): Promise<void>;
+  checkRepositoryExists(owner: string, name: string): Promise<boolean>;
+  validateRepositoryName(name: string): { valid: boolean; error?: string };
+}
+
+// ---------------------------------------------------------------------------
+// REST response shape (internal)
+// ---------------------------------------------------------------------------
+
+interface RestRepo {
+  id: number;
+  name: string;
+  full_name: string;
+  description: string | null;
+  html_url: string;
+  clone_url: string;
+  ssh_url: string;
+  default_branch: string;
+  private: boolean;
+  updated_at: string | null;
+  language: string | null;
+  stargazers_count: number;
+  forks_count: number;
+}
+
+// ---------------------------------------------------------------------------
+// Implementation
+// ---------------------------------------------------------------------------
+
+const RESERVED_NAMES = new Set([
+  'con',
+  'prn',
+  'aux',
+  'nul',
+  'com1',
+  'com2',
+  'com3',
+  'com4',
+  'com5',
+  'com6',
+  'com7',
+  'com8',
+  'com9',
+  'lpt1',
+  'lpt2',
+  'lpt3',
+  'lpt4',
+  'lpt5',
+  'lpt6',
+  'lpt7',
+  'lpt8',
+  'lpt9',
+]);
+
+export class GitHubRepositoryServiceImpl implements GitHubRepositoryService {
+  constructor(private readonly getOctokit: () => Promise<Octokit>) {}
+
+  async listRepositories(): Promise<GitHubRepo[]> {
+    const octokit = await this.getOctokit();
+    const { data } = await octokit.rest.repos.listForAuthenticatedUser({
+      per_page: 100,
+      sort: 'updated',
+      direction: 'desc',
+    });
+    return data.map((item) => this.mapRepo(item as unknown as RestRepo));
+  }
+
+  async getOwners(): Promise<GitHubOwner[]> {
+    const octokit = await this.getOctokit();
+    const { data: user } = await octokit.rest.users.getAuthenticated();
+    const owners: GitHubOwner[] = [{ login: user.login, type: 'User' }];
+
+    try {
+      const { data: orgs } = await octokit.rest.orgs.listForAuthenticatedUser();
+      for (const org of orgs) {
+        owners.push({ login: org.login, type: 'Organization' });
+      }
+    } catch {}
+
+    return owners;
+  }
+
+  async createRepository(params: {
+    name: string;
+    description?: string;
+    owner: string;
+    isPrivate: boolean;
+  }): Promise<{ url: string; defaultBranch: string; nameWithOwner: string }> {
+    const octokit = await this.getOctokit();
+    const { data: user } = await octokit.rest.users.getAuthenticated();
+    const isCurrentUser = params.owner === user.login;
+
+    const createParams = {
+      name: params.name,
+      description: params.description,
+      private: params.isPrivate,
+    };
+
+    const { data } = isCurrentUser
+      ? await octokit.rest.repos.createForAuthenticatedUser(createParams)
+      : await octokit.rest.repos.createInOrg({ ...createParams, org: params.owner });
+
+    return {
+      url: data.html_url,
+      defaultBranch: data.default_branch || 'main',
+      nameWithOwner: data.full_name,
+    };
+  }
+
+  async deleteRepository(owner: string, name: string): Promise<void> {
+    const octokit = await this.getOctokit();
+    await octokit.rest.repos.delete({ owner, repo: name });
+  }
+
+  async checkRepositoryExists(owner: string, name: string): Promise<boolean> {
+    const octokit = await this.getOctokit();
+    try {
+      await octokit.rest.repos.get({ owner, repo: name });
+      return true;
+    } catch (err: unknown) {
+      if (err != null && typeof err === 'object' && 'status' in err && err.status === 404) {
+        return false;
+      }
+      throw err;
+    }
+  }
+
+  validateRepositoryName(name: string): { valid: boolean; error?: string } {
+    if (!name || name.length === 0) {
+      return { valid: false, error: 'Repository name is required' };
+    }
+
+    if (name.length > 100) {
+      return { valid: false, error: 'Repository name must be 100 characters or fewer' };
+    }
+
+    if (!/^[a-zA-Z0-9._-]+$/.test(name)) {
+      return {
+        valid: false,
+        error: 'Repository name may only contain letters, numbers, hyphens, underscores, and dots',
+      };
+    }
+
+    if (/^\.+$/.test(name)) {
+      return { valid: false, error: 'Repository name cannot consist entirely of dots' };
+    }
+
+    if (/^[-._]/.test(name) || /[-._]$/.test(name)) {
+      return {
+        valid: false,
+        error: 'Repository name must not start or end with a hyphen, dot, or underscore',
+      };
+    }
+
+    if (RESERVED_NAMES.has(name.toLowerCase())) {
+      return { valid: false, error: `"${name}" is a reserved name and cannot be used` };
+    }
+
+    return { valid: true };
+  }
+
+  private mapRepo(item: RestRepo): GitHubRepo {
+    return {
+      id: item.id,
+      name: item.name,
+      nameWithOwner: item.full_name,
+      description: item.description,
+      url: item.html_url,
+      cloneUrl: item.clone_url,
+      sshUrl: item.ssh_url,
+      defaultBranch: item.default_branch,
+      isPrivate: item.private,
+      updatedAt: item.updated_at,
+      language: item.language,
+      stargazersCount: item.stargazers_count,
+      forksCount: item.forks_count,
+    };
+  }
+}
+
+export const repoService = new GitHubRepositoryServiceImpl(getOctokit);
diff --git a/src/main/core/github/services/utils.ts b/src/main/core/github/services/utils.ts
new file mode 100644
index 0000000000..e3f880f829
--- /dev/null
+++ b/src/main/core/github/services/utils.ts
@@ -0,0 +1,49 @@
+/**
+ * Normalise a git remote URL to a canonical HTTPS form without a `.git` suffix.
+ * Used as the stable identifier stored in `repository_url` / `head_repository_url`.
+ * Returns the original URL unchanged if it is not a recognisable GitHub remote.
+ */
+export function normalizeGitHubUrl(remoteUrl: string): string {
+  const nwo = parseNameWithOwner(remoteUrl);
+  if (!nwo) return remoteUrl;
+  return `https://github.com/${nwo}`;
+}
+
+/** Returns true when the URL points to a GitHub host (github.com). */
+export function isGitHubUrl(remoteUrl: string): boolean {
+  return parseNameWithOwner(remoteUrl) !== null;
+}
+
+/**
+ * Extract owner/repo from a normalised GitHub URL.
+ * Works for `https://github.com/owner/repo` (no .git).
+ */
+export function splitNormalizedUrl(repositoryUrl: string): { owner: string; repo: string } {
+  const match = /github\.com\/([^/]+)\/([^/?#]+)/.exec(repositoryUrl);
+  if (!match) throw new Error(`Not a GitHub URL: "${repositoryUrl}"`);
+  return { owner: match[1], repo: match[2] };
+}
+
+export function splitRepo(nameWithOwner: string): { owner: string; repo: string } {
+  const idx = nameWithOwner.indexOf('/');
+  if (idx === -1) {
+    throw new Error(`Invalid nameWithOwner: "${nameWithOwner}" (expected "owner/repo")`);
+  }
+  return { owner: nameWithOwner.slice(0, idx), repo: nameWithOwner.slice(idx + 1) };
+}
+
+/**
+ * Extract a GitHub `owner/repo` string from a git remote URL.
+ * Handles both HTTPS (`https://github.com/owner/repo.git`) and
+ * SSH (`git@github.com:owner/repo.git`) formats.
+ * Returns `null` if the URL is not a recognisable GitHub remote.
+ */
+export function parseNameWithOwner(remoteUrl: string): string | null {
+  // https://github.com/owner/repo[.git][/?#...]
+  const https = /github\.com\/([^/]+\/[^/?#]+?)(?:\.git)?(?:[/?#]|$)/.exec(remoteUrl);
+  if (https) return https[1];
+  // git@github.com:owner/repo[.git]
+  const ssh = /github\.com:([^/]+\/[^/?#]+?)(?:\.git)?$/.exec(remoteUrl);
+  if (ssh) return ssh[1];
+  return null;
+}
diff --git a/src/main/core/gitlab/controller.ts b/src/main/core/gitlab/controller.ts
new file mode 100644
index 0000000000..5ae84b405e
--- /dev/null
+++ b/src/main/core/gitlab/controller.ts
@@ -0,0 +1,15 @@
+import { createRPCController } from '@shared/ipc/rpc';
+import { gitLabConnectionService } from './gitlab-connection-service';
+
+export const gitlabController = createRPCController({
+  saveCredentials: async (creds: { instanceUrl: string; token: string }) => {
+    if (!creds.instanceUrl || !creds.token) {
+      return { success: false, error: 'Instance URL and API token are required.' };
+    }
+    return gitLabConnectionService.saveCredentials(creds.instanceUrl, creds.token);
+  },
+
+  clearCredentials: async () => gitLabConnectionService.clearCredentials(),
+
+  checkConnection: async () => gitLabConnectionService.checkConnection(),
+});
diff --git a/src/main/core/gitlab/gitlab-connection-service.ts b/src/main/core/gitlab/gitlab-connection-service.ts
new file mode 100644
index 0000000000..430c3406af
--- /dev/null
+++ b/src/main/core/gitlab/gitlab-connection-service.ts
@@ -0,0 +1,239 @@
+import { GitbeakerRequestError, Gitlab } from '@gitbeaker/rest';
+import { ISSUE_PROVIDER_CAPABILITIES, type ConnectionStatus } from '@shared/issue-providers';
+import { resolvePreferredRemote } from '@main/core/issues/git-remote-resolver';
+import {
+  assertRemoteHostMatchesInstance,
+  hasKnownNetworkErrorCode,
+  normalizeHostedInstanceUrl,
+} from '@main/core/issues/helpers/hosted-instance';
+import { encryptedAppSecretsStore } from '@main/core/secrets/encrypted-app-secrets-store';
+import { KV } from '@main/db/kv';
+
+interface GitLabConnectionConfig {
+  instanceUrl: string;
+}
+
+interface GitLabKVSchema extends Record<string, unknown> {
+  connection: GitLabConnectionConfig;
+}
+
+const gitlabKV = new KV<GitLabKVSchema>('gitlab');
+
+const NOT_CONFIGURED_ERROR = 'GitLab is not configured. Connect GitLab in settings.';
+
+export function toGitLabErrorMessage(error: unknown, fallback: string): string {
+  if (error instanceof GitbeakerRequestError) {
+    const status = error.cause?.response?.status;
+    if (status === 401 || status === 403) {
+      return 'GitLab authentication failed. Check your token permissions.';
+    }
+    if (status === 404) {
+      return 'GitLab project or resource not found.';
+    }
+    if (status === 429) {
+      return 'GitLab API rate limit exceeded. Please try again shortly.';
+    }
+    if (typeof status === 'number' && status >= 500) {
+      return 'GitLab API is temporarily unavailable. Please try again.';
+    }
+    return error.message || fallback;
+  }
+
+  if (hasKnownNetworkErrorCode(error)) {
+    return 'Unable to reach GitLab instance. Check your URL and network connection.';
+  }
+
+  if (error instanceof Error && error.message) {
+    return error.message;
+  }
+
+  return fallback;
+}
+
+function isNotConfigured(error: unknown): boolean {
+  return error instanceof Error && error.message === NOT_CONFIGURED_ERROR;
+}
+
+export class GitLabConnectionService {
+  private readonly GITLAB_TOKEN_SECRET_KEY = 'emdash-gitlab-token';
+
+  private client: Gitlab | null = null;
+  private clientKey: string | null = null;
+
+  async saveCredentials(
+    instanceUrl: string,
+    token: string
+  ): Promise<{ success: boolean; username?: string; displayName?: string; error?: string }> {
+    const normalizedUrl = normalizeHostedInstanceUrl(instanceUrl);
+    if (!normalizedUrl) {
+      return { success: false, error: 'A valid GitLab instance URL is required.' };
+    }
+
+    const cleanToken = token.trim();
+    if (!cleanToken) {
+      return { success: false, error: 'A GitLab API token is required.' };
+    }
+
+    try {
+      const client = this.getClientForCredentials(normalizedUrl, cleanToken);
+      const user = (await client.Users.showCurrentUser()) as Record<string, unknown>;
+
+      await encryptedAppSecretsStore.setSecret(this.GITLAB_TOKEN_SECRET_KEY, cleanToken);
+      await this.writeConnection({ instanceUrl: normalizedUrl });
+
+      const username = this.readString(user.username) ?? undefined;
+      const displayName = this.readString(user.name) ?? username;
+
+      return { success: true, username, displayName };
+    } catch (error) {
+      return {
+        success: false,
+        error: toGitLabErrorMessage(error, 'Failed to validate GitLab credentials.'),
+      };
+    }
+  }
+
+  async clearCredentials(): Promise<{ success: boolean; error?: string }> {
+    try {
+      await encryptedAppSecretsStore.deleteSecret(this.GITLAB_TOKEN_SECRET_KEY);
+      await gitlabKV.del('connection');
+
+      this.client = null;
+      this.clientKey = null;
+
+      return { success: true };
+    } catch (error) {
+      return {
+        success: false,
+        error: toGitLabErrorMessage(error, 'Failed to clear GitLab credentials.'),
+      };
+    }
+  }
+
+  async checkConnection(): Promise<ConnectionStatus> {
+    try {
+      const { client } = await this.requireAuth();
+      const user = (await client.Users.showCurrentUser()) as Record<string, unknown>;
+
+      const username = this.readString(user.username) ?? undefined;
+      const displayName = this.readString(user.name) ?? username;
+
+      return {
+        connected: true,
+        displayName,
+        capabilities: ISSUE_PROVIDER_CAPABILITIES.gitlab,
+      };
+    } catch (error) {
+      if (isNotConfigured(error)) {
+        return {
+          connected: false,
+          capabilities: ISSUE_PROVIDER_CAPABILITIES.gitlab,
+        };
+      }
+
+      return {
+        connected: false,
+        error: toGitLabErrorMessage(error, 'Failed to verify GitLab connection.'),
+        capabilities: ISSUE_PROVIDER_CAPABILITIES.gitlab,
+      };
+    }
+  }
+
+  async getClient(): Promise<Gitlab | null> {
+    try {
+      const { client } = await this.requireAuth();
+      return client;
+    } catch (error) {
+      if (isNotConfigured(error)) {
+        return null;
+      }
+      throw error;
+    }
+  }
+
+  async resolveProject(
+    projectPath: string,
+    remoteName?: string
+  ): Promise<{ client: Gitlab; projectId: number; projectName: string | null }> {
+    const { instanceUrl, client } = await this.requireAuth();
+
+    try {
+      const remote = await resolvePreferredRemote(projectPath, remoteName);
+
+      assertRemoteHostMatchesInstance(remote.host, instanceUrl, 'GitLab');
+
+      const project = (await client.Projects.show(remote.slug)) as Record<string, unknown>;
+      const projectId = this.readNumber(project.id);
+      if (projectId === null) {
+        throw new Error('Unable to resolve GitLab project ID.');
+      }
+
+      const projectName = this.readString(project.name);
+
+      return {
+        client,
+        projectId,
+        projectName,
+      };
+    } catch (error) {
+      throw new Error(
+        toGitLabErrorMessage(error, 'Unable to resolve GitLab project from the selected remote.')
+      );
+    }
+  }
+
+  private async requireAuth(): Promise<{ instanceUrl: string; client: Gitlab }> {
+    const connection = await this.readConnection();
+    if (!connection) {
+      throw new Error(NOT_CONFIGURED_ERROR);
+    }
+
+    const token = await encryptedAppSecretsStore.getSecret(this.GITLAB_TOKEN_SECRET_KEY);
+    if (!token) {
+      throw new Error(NOT_CONFIGURED_ERROR);
+    }
+
+    return {
+      instanceUrl: connection.instanceUrl,
+      client: this.getClientForCredentials(connection.instanceUrl, token),
+    };
+  }
+
+  private getClientForCredentials(instanceUrl: string, token: string): Gitlab {
+    const key = `${instanceUrl}|${token}`;
+    if (!this.client || this.clientKey !== key) {
+      this.client = new Gitlab({ host: instanceUrl, token });
+      this.clientKey = key;
+    }
+
+    return this.client;
+  }
+
+  private async writeConnection(connection: GitLabConnectionConfig): Promise<void> {
+    await gitlabKV.set('connection', connection);
+  }
+
+  private async readConnection(): Promise<GitLabConnectionConfig | null> {
+    const connection = await gitlabKV.get('connection');
+    const instanceUrl = this.readString(connection?.instanceUrl);
+    if (!instanceUrl) return null;
+    return { instanceUrl };
+  }
+
+  private readString(value: unknown): string | null {
+    if (typeof value !== 'string') return null;
+    const trimmed = value.trim();
+    return trimmed.length > 0 ? trimmed : null;
+  }
+
+  private readNumber(value: unknown): number | null {
+    if (typeof value === 'number' && Number.isFinite(value)) return value;
+    if (typeof value === 'string' && value.trim()) {
+      const parsed = Number(value);
+      if (Number.isFinite(parsed)) return parsed;
+    }
+    return null;
+  }
+}
+
+export const gitLabConnectionService = new GitLabConnectionService();
diff --git a/src/main/core/gitlab/gitlab-issue-provider.ts b/src/main/core/gitlab/gitlab-issue-provider.ts
new file mode 100644
index 0000000000..79ba4c942e
--- /dev/null
+++ b/src/main/core/gitlab/gitlab-issue-provider.ts
@@ -0,0 +1,168 @@
+import { ISSUE_PROVIDER_CAPABILITIES, type IssueListResult } from '@shared/issue-providers';
+import type { Issue } from '@shared/tasks';
+import {
+  clampIssueLimit,
+  normalizeSearchTerm,
+  requireProjectPath,
+} from '@main/core/issues/helpers/provider-inputs';
+import type { IssueProvider } from '@main/core/issues/issue-provider';
+import { gitLabConnectionService, toGitLabErrorMessage } from './gitlab-connection-service';
+
+function asRecord(value: unknown): Record<string, unknown> | null {
+  return value && typeof value === 'object' ? (value as Record<string, unknown>) : null;
+}
+
+function readString(value: unknown): string | null {
+  if (typeof value !== 'string') return null;
+  const trimmed = value.trim();
+  return trimmed.length > 0 ? trimmed : null;
+}
+
+function readNumber(value: unknown): number | null {
+  if (typeof value === 'number' && Number.isFinite(value)) return value;
+  if (typeof value === 'string' && value.trim()) {
+    const parsed = Number(value);
+    if (Number.isFinite(parsed)) return parsed;
+  }
+  return null;
+}
+
+function toIssue(raw: unknown, projectName: string | null): Issue | null {
+  const item = asRecord(raw);
+  if (!item) return null;
+
+  const iid = readNumber(item.iid);
+  if (iid === null) return null;
+
+  const title = readString(item.title) ?? '';
+  const description = readString(item.description) ?? undefined;
+  const webUrl = readString(item.web_url) ?? readString(item.webUrl) ?? '';
+  const state = readString(item.state) ?? undefined;
+  const updatedAt = readString(item.updated_at) ?? readString(item.updatedAt) ?? undefined;
+
+  const assigneeRecord =
+    asRecord(item.assignee) ?? (Array.isArray(item.assignees) ? asRecord(item.assignees[0]) : null);
+  const assigneeName = readString(assigneeRecord?.name) ?? readString(assigneeRecord?.username);
+  const assigneeUsername =
+    readString(assigneeRecord?.username) ?? readString(assigneeRecord?.name) ?? undefined;
+  const assignees =
+    assigneeName || assigneeUsername ? [assigneeName ?? assigneeUsername ?? ''] : undefined;
+
+  return {
+    provider: 'gitlab',
+    identifier: `#${iid}`,
+    title,
+    url: webUrl,
+    description,
+    status: state,
+    assignees,
+    project: projectName ?? undefined,
+    updatedAt,
+    fetchedAt: new Date().toISOString(),
+  };
+}
+
+async function listIssues(
+  projectPath: string,
+  remoteName: string | undefined,
+  limit: number
+): Promise<IssueListResult> {
+  const perPage = clampIssueLimit(limit, 50, 100);
+
+  try {
+    const { client, projectId, projectName } = await gitLabConnectionService.resolveProject(
+      projectPath,
+      remoteName
+    );
+
+    const issues = (await client.Issues.all({
+      projectId,
+      state: 'opened',
+      orderBy: 'updated_at',
+      sort: 'desc',
+      perPage,
+      maxPages: 1,
+    })) as unknown[];
+
+    return {
+      success: true,
+      issues: (issues ?? [])
+        .map((issue) => toIssue(issue, projectName))
+        .filter((issue): issue is Issue => issue !== null),
+    };
+  } catch (error) {
+    return {
+      success: false,
+      error: toGitLabErrorMessage(error, 'Failed to fetch GitLab issues.'),
+    };
+  }
+}
+
+async function searchIssues(
+  projectPath: string,
+  remoteName: string | undefined,
+  searchTerm: string,
+  limit: number
+): Promise<IssueListResult> {
+  const term = normalizeSearchTerm(searchTerm);
+  if (!term) {
+    return { success: true, issues: [] };
+  }
+
+  const perPage = clampIssueLimit(limit, 20, 100);
+
+  try {
+    const { client, projectId, projectName } = await gitLabConnectionService.resolveProject(
+      projectPath,
+      remoteName
+    );
+
+    const issues = (await client.Issues.all({
+      projectId,
+      state: 'opened',
+      search: term,
+      in: 'title,description',
+      orderBy: 'updated_at',
+      sort: 'desc',
+      perPage,
+      maxPages: 1,
+    })) as unknown[];
+
+    return {
+      success: true,
+      issues: (issues ?? [])
+        .map((issue) => toIssue(issue, projectName))
+        .filter((issue): issue is Issue => issue !== null),
+    };
+  } catch (error) {
+    return {
+      success: false,
+      error: toGitLabErrorMessage(error, 'Failed to search GitLab issues.'),
+    };
+  }
+}
+
+export const gitlabIssueProvider: IssueProvider = {
+  type: 'gitlab',
+  capabilities: ISSUE_PROVIDER_CAPABILITIES.gitlab,
+
+  checkConnection: () => gitLabConnectionService.checkConnection(),
+
+  listIssues: async (opts) => {
+    const projectPath = requireProjectPath(opts.projectPath);
+    if (!projectPath) {
+      return { success: false, error: 'Project path is required.' };
+    }
+
+    return listIssues(projectPath, opts.remote, opts.limit ?? 50);
+  },
+
+  searchIssues: async (opts) => {
+    const projectPath = requireProjectPath(opts.projectPath);
+    if (!projectPath) {
+      return { success: false, error: 'Project path is required.' };
+    }
+
+    return searchIssues(projectPath, opts.remote, opts.searchTerm, opts.limit ?? 20);
+  },
+};
diff --git a/src/main/core/issues/controller.ts b/src/main/core/issues/controller.ts
new file mode 100644
index 0000000000..5ccb86f1c0
--- /dev/null
+++ b/src/main/core/issues/controller.ts
@@ -0,0 +1,108 @@
+import { createRPCController } from '@shared/ipc/rpc';
+import type {
+  ConnectionStatus,
+  ConnectionStatusMap,
+  IssueProviderType,
+} from '@shared/issue-providers';
+import { projectManager } from '@main/core/projects/project-manager';
+import type { IssueProvider, IssueQueryOpts, IssueSearchOpts } from './issue-provider';
+import { getAllIssueProviders, getIssueProvider } from './registry';
+
+const DEFAULT_CAPABILITIES = {
+  requiresProjectPath: false,
+  requiresNameWithOwner: false,
+} as const;
+
+const CONNECTION_CHECK_TIMEOUT_MS = 8_000;
+
+function timeoutStatus(provider: IssueProvider): ConnectionStatus {
+  return {
+    connected: false,
+    error: `Connection check timed out after ${CONNECTION_CHECK_TIMEOUT_MS}ms.`,
+    capabilities: provider.capabilities,
+  };
+}
+
+function failureStatus(provider: IssueProvider, error: unknown): ConnectionStatus {
+  const message = error instanceof Error ? error.message : 'Connection check failed.';
+  return {
+    connected: false,
+    error: message,
+    capabilities: provider.capabilities,
+  };
+}
+
+async function checkProviderConnection(provider: IssueProvider): Promise<ConnectionStatus> {
+  let timeoutId: ReturnType<typeof setTimeout> | undefined;
+
+  const timeoutPromise = new Promise<ConnectionStatus>((resolve) => {
+    timeoutId = setTimeout(() => {
+      resolve(timeoutStatus(provider));
+    }, CONNECTION_CHECK_TIMEOUT_MS);
+  });
+
+  try {
+    return await Promise.race([provider.checkConnection(), timeoutPromise]);
+  } catch (error) {
+    return failureStatus(provider, error);
+  } finally {
+    if (timeoutId) {
+      clearTimeout(timeoutId);
+    }
+  }
+}
+
+async function withResolvedRemote<T extends IssueQueryOpts>(opts: T): Promise<T> {
+  if (!opts.projectId) return opts;
+  const project = projectManager.getProject(opts.projectId);
+  if (!project) return opts;
+
+  const remote = await project.repository.getConfiguredRemote().catch(() => undefined);
+  return { ...opts, remote };
+}
+
+export const issueController = createRPCController({
+  checkConnection: async (provider: IssueProviderType) => {
+    const issueProvider = getIssueProvider(provider);
+    if (!issueProvider) {
+      return {
+        connected: false,
+        error: `Unknown provider: ${provider}`,
+        capabilities: DEFAULT_CAPABILITIES,
+      };
+    }
+
+    return checkProviderConnection(issueProvider);
+  },
+
+  checkAllConnections: async (): Promise<ConnectionStatusMap> => {
+    const providers = getAllIssueProviders();
+
+    const settled = await Promise.all(
+      providers.map(async (provider) => {
+        const status = await checkProviderConnection(provider);
+        return [provider.type, status] as const;
+      })
+    );
+
+    return Object.fromEntries(settled) as ConnectionStatusMap;
+  },
+
+  listIssues: async (provider: IssueProviderType, opts: IssueQueryOpts) => {
+    const issueProvider = getIssueProvider(provider);
+    if (!issueProvider) {
+      return { success: false, error: `Unknown provider: ${provider}` } as const;
+    }
+
+    return issueProvider.listIssues(await withResolvedRemote(opts));
+  },
+
+  searchIssues: async (provider: IssueProviderType, opts: IssueSearchOpts) => {
+    const issueProvider = getIssueProvider(provider);
+    if (!issueProvider) {
+      return { success: false, error: `Unknown provider: ${provider}` } as const;
+    }
+
+    return issueProvider.searchIssues(await withResolvedRemote(opts));
+  },
+});
diff --git a/src/main/core/issues/git-remote-resolver.test.ts b/src/main/core/issues/git-remote-resolver.test.ts
new file mode 100644
index 0000000000..1b16443011
--- /dev/null
+++ b/src/main/core/issues/git-remote-resolver.test.ts
@@ -0,0 +1,30 @@
+import { describe, expect, it } from 'vitest';
+import { parseGitRemoteUrl } from './git-remote-resolver';
+
+describe('parseGitRemoteUrl', () => {
+  it('parses scp-like remotes', () => {
+    expect(parseGitRemoteUrl('git@gitlab.com:group/repo.git')).toEqual({
+      host: 'gitlab.com',
+      slug: 'group/repo',
+    });
+  });
+
+  it('parses ssh remotes', () => {
+    expect(parseGitRemoteUrl('ssh://git@gitlab.example.com/group/repo.git')).toEqual({
+      host: 'gitlab.example.com',
+      slug: 'group/repo',
+    });
+  });
+
+  it('parses https remotes', () => {
+    expect(parseGitRemoteUrl('https://forgejo.example.com/org/repo.git')).toEqual({
+      host: 'forgejo.example.com',
+      slug: 'org/repo',
+    });
+  });
+
+  it('returns null for invalid remotes', () => {
+    expect(parseGitRemoteUrl('')).toBeNull();
+    expect(parseGitRemoteUrl('not-a-remote')).toBeNull();
+  });
+});
diff --git a/src/main/core/issues/git-remote-resolver.ts b/src/main/core/issues/git-remote-resolver.ts
new file mode 100644
index 0000000000..2c781832b7
--- /dev/null
+++ b/src/main/core/issues/git-remote-resolver.ts
@@ -0,0 +1,93 @@
+import { execFile } from 'node:child_process';
+import { promisify } from 'node:util';
+import { DEFAULT_REMOTE_NAME } from '@shared/git-utils';
+
+const execFileAsync = promisify(execFile);
+
+export type ParsedGitRemote = {
+  host: string;
+  slug: string;
+};
+
+export async function getRemoteUrl(projectPath: string, remoteName: string): Promise<string> {
+  try {
+    const { stdout } = await execFileAsync('git', ['remote', 'get-url', remoteName], {
+      cwd: projectPath,
+      encoding: 'utf8',
+    });
+    const remote = String(stdout || '').trim();
+    if (!remote) {
+      throw new Error(`No remote URL found for ${remoteName}.`);
+    }
+    return remote;
+  } catch {
+    throw new Error(`No remote URL found for ${remoteName}.`);
+  }
+}
+
+export function parseGitRemoteUrl(remoteUrl: string): ParsedGitRemote | null {
+  const raw = String(remoteUrl || '').trim();
+  if (!raw) return null;
+
+  const scpLike = /^git@([^:]+):(.+?)(?:\.git)?$/.exec(raw);
+  if (scpLike) {
+    return {
+      host: scpLike[1].toLowerCase(),
+      slug: scpLike[2].replace(/\/+$/, ''),
+    };
+  }
+
+  if (raw.startsWith('ssh://')) {
+    try {
+      const parsed = new URL(raw);
+      const slug = parsed.pathname
+        .replace(/^\/+/, '')
+        .replace(/\.git$/, '')
+        .replace(/\/+$/, '');
+      if (!slug) return null;
+      return { host: parsed.hostname.toLowerCase(), slug };
+    } catch {
+      return null;
+    }
+  }
+
+  if (raw.startsWith('http://') || raw.startsWith('https://')) {
+    try {
+      const parsed = new URL(raw);
+      const slug = parsed.pathname
+        .replace(/^\/+/, '')
+        .replace(/\.git$/, '')
+        .replace(/\/+$/, '');
+      if (!slug) return null;
+      return { host: parsed.hostname.toLowerCase(), slug };
+    } catch {
+      return null;
+    }
+  }
+
+  return null;
+}
+
+export async function resolvePreferredRemote(
+  projectPath: string,
+  configuredRemote?: string
+): Promise<ParsedGitRemote> {
+  const preferredRemote = configuredRemote?.trim();
+  if (preferredRemote && preferredRemote !== DEFAULT_REMOTE_NAME) {
+    try {
+      const preferredUrl = await getRemoteUrl(projectPath, preferredRemote);
+      const preferred = parseGitRemoteUrl(preferredUrl);
+      if (!preferred) {
+        throw new Error(`Unable to parse git remote URL from ${preferredRemote}.`);
+      }
+      return preferred;
+    } catch {}
+  }
+
+  const originUrl = await getRemoteUrl(projectPath, DEFAULT_REMOTE_NAME);
+  const origin = parseGitRemoteUrl(originUrl);
+  if (!origin) {
+    throw new Error(`Unable to parse git remote URL from ${DEFAULT_REMOTE_NAME}.`);
+  }
+  return origin;
+}
diff --git a/src/main/core/issues/helpers/hosted-instance.test.ts b/src/main/core/issues/helpers/hosted-instance.test.ts
new file mode 100644
index 0000000000..e89aa871bb
--- /dev/null
+++ b/src/main/core/issues/helpers/hosted-instance.test.ts
@@ -0,0 +1,46 @@
+import { describe, expect, it } from 'vitest';
+import {
+  assertRemoteHostMatchesInstance,
+  hasKnownNetworkErrorCode,
+  normalizeHostedInstanceUrl,
+} from './hosted-instance';
+
+describe('normalizeHostedInstanceUrl', () => {
+  it('normalizes valid host URLs', () => {
+    expect(normalizeHostedInstanceUrl('https://gitlab.example.com/')).toBe(
+      'https://gitlab.example.com'
+    );
+    expect(normalizeHostedInstanceUrl('https://gitlab.example.com/foo/')).toBe(
+      'https://gitlab.example.com/foo'
+    );
+  });
+
+  it('rejects invalid URLs', () => {
+    expect(normalizeHostedInstanceUrl('')).toBeNull();
+    expect(normalizeHostedInstanceUrl('ssh://gitlab.example.com')).toBeNull();
+    expect(normalizeHostedInstanceUrl('https://gitlab.example.com?a=1')).toBeNull();
+  });
+});
+
+describe('hasKnownNetworkErrorCode', () => {
+  it('matches known network error codes', () => {
+    expect(hasKnownNetworkErrorCode({ code: 'ENOTFOUND' })).toBe(true);
+    expect(hasKnownNetworkErrorCode({ code: 'EAI_AGAIN' })).toBe(true);
+    expect(hasKnownNetworkErrorCode({ code: 'EOTHER' })).toBe(false);
+    expect(hasKnownNetworkErrorCode({})).toBe(false);
+  });
+});
+
+describe('assertRemoteHostMatchesInstance', () => {
+  it('allows matching hosts', () => {
+    expect(() =>
+      assertRemoteHostMatchesInstance('gitlab.example.com', 'https://gitlab.example.com', 'GitLab')
+    ).not.toThrow();
+  });
+
+  it('throws for mismatched hosts', () => {
+    expect(() =>
+      assertRemoteHostMatchesInstance('other.example.com', 'https://gitlab.example.com', 'GitLab')
+    ).toThrow('does not match configured GitLab instance');
+  });
+});
diff --git a/src/main/core/issues/helpers/hosted-instance.ts b/src/main/core/issues/helpers/hosted-instance.ts
new file mode 100644
index 0000000000..ff70fb9e80
--- /dev/null
+++ b/src/main/core/issues/helpers/hosted-instance.ts
@@ -0,0 +1,43 @@
+const NETWORK_ERROR_CODES = new Set(['ENOTFOUND', 'ECONNREFUSED', 'ETIMEDOUT', 'EAI_AGAIN']);
+
+export function normalizeHostedInstanceUrl(instanceUrl: string): string | null {
+  const trimmed = instanceUrl.trim();
+  if (!trimmed) return null;
+
+  try {
+    const parsed = new URL(trimmed);
+    if (parsed.protocol !== 'http:' && parsed.protocol !== 'https:') {
+      return null;
+    }
+    if (parsed.search || parsed.hash) {
+      return null;
+    }
+
+    const pathname = parsed.pathname.replace(/\/+$/, '');
+    return pathname && pathname !== '/'
+      ? `${parsed.protocol}//${parsed.host}${pathname}`
+      : `${parsed.protocol}//${parsed.host}`;
+  } catch {
+    return null;
+  }
+}
+
+export function hasKnownNetworkErrorCode(error: unknown): boolean {
+  const code = (error as { code?: unknown })?.code;
+  return typeof code === 'string' && NETWORK_ERROR_CODES.has(code);
+}
+
+export function assertRemoteHostMatchesInstance(
+  remoteHost: string,
+  instanceUrl: string,
+  providerName: string
+): void {
+  const instanceHost = new URL(instanceUrl).hostname.toLowerCase();
+  if (remoteHost === instanceHost) {
+    return;
+  }
+
+  throw new Error(
+    `Git remote host "${remoteHost}" does not match configured ${providerName} instance "${instanceHost}".`
+  );
+}
diff --git a/src/main/core/issues/helpers/provider-inputs.test.ts b/src/main/core/issues/helpers/provider-inputs.test.ts
new file mode 100644
index 0000000000..db6db1d4b3
--- /dev/null
+++ b/src/main/core/issues/helpers/provider-inputs.test.ts
@@ -0,0 +1,36 @@
+import { describe, expect, it } from 'vitest';
+import {
+  clampIssueLimit,
+  normalizeSearchTerm,
+  requireNameWithOwner,
+  requireProjectPath,
+} from './provider-inputs';
+
+describe('clampIssueLimit', () => {
+  it('uses fallback and clamps bounds', () => {
+    expect(clampIssueLimit(undefined, 50, 100)).toBe(50);
+    expect(clampIssueLimit(0, 50, 100)).toBe(1);
+    expect(clampIssueLimit(120, 50, 100)).toBe(100);
+  });
+});
+
+describe('requireProjectPath', () => {
+  it('returns trimmed project path', () => {
+    expect(requireProjectPath('  /tmp/repo  ')).toBe('/tmp/repo');
+    expect(requireProjectPath('')).toBeNull();
+  });
+});
+
+describe('requireNameWithOwner', () => {
+  it('returns trimmed repository name', () => {
+    expect(requireNameWithOwner('  owner/repo  ')).toBe('owner/repo');
+    expect(requireNameWithOwner('')).toBeNull();
+  });
+});
+
+describe('normalizeSearchTerm', () => {
+  it('trims and normalizes values', () => {
+    expect(normalizeSearchTerm('  abc  ')).toBe('abc');
+    expect(normalizeSearchTerm('')).toBe('');
+  });
+});
diff --git a/src/main/core/issues/helpers/provider-inputs.ts b/src/main/core/issues/helpers/provider-inputs.ts
new file mode 100644
index 0000000000..50baa7e42a
--- /dev/null
+++ b/src/main/core/issues/helpers/provider-inputs.ts
@@ -0,0 +1,18 @@
+export function clampIssueLimit(limit: number | undefined, fallback: number, max: number): number {
+  const resolved = Number.isFinite(limit) ? (limit as number) : fallback;
+  return Math.max(1, Math.min(resolved, max));
+}
+
+export function requireProjectPath(projectPath?: string): string | null {
+  const trimmed = projectPath?.trim();
+  return trimmed ? trimmed : null;
+}
+
+export function requireNameWithOwner(nameWithOwner?: string): string | null {
+  const trimmed = nameWithOwner?.trim();
+  return trimmed ? trimmed : null;
+}
+
+export function normalizeSearchTerm(searchTerm: string): string {
+  return String(searchTerm || '').trim();
+}
diff --git a/src/main/core/issues/issue-provider.ts b/src/main/core/issues/issue-provider.ts
new file mode 100644
index 0000000000..474242ec56
--- /dev/null
+++ b/src/main/core/issues/issue-provider.ts
@@ -0,0 +1,27 @@
+import type {
+  ConnectionStatus,
+  IssueListResult,
+  IssueProviderCapabilities,
+} from '@shared/issue-providers';
+import type { Issue } from '@shared/tasks';
+
+export type IssueQueryOpts = {
+  limit?: number;
+  projectId?: string;
+  projectPath?: string;
+  remote?: string;
+  nameWithOwner?: string;
+};
+
+export type IssueSearchOpts = IssueQueryOpts & {
+  searchTerm: string;
+};
+
+export interface IssueProvider {
+  readonly type: Issue['provider'];
+  readonly capabilities: IssueProviderCapabilities;
+
+  checkConnection(): Promise<ConnectionStatus>;
+  listIssues(opts: IssueQueryOpts): Promise<IssueListResult>;
+  searchIssues(opts: IssueSearchOpts): Promise<IssueListResult>;
+}
diff --git a/src/main/core/issues/registry.ts b/src/main/core/issues/registry.ts
new file mode 100644
index 0000000000..592e4b41a9
--- /dev/null
+++ b/src/main/core/issues/registry.ts
@@ -0,0 +1,29 @@
+import type { IssueProviderType } from '@shared/issue-providers';
+import { forgejoIssueProvider } from '@main/core/forgejo/forgejo-issue-provider';
+import { githubIssueProvider } from '@main/core/github/github-issue-provider';
+import { gitlabIssueProvider } from '@main/core/gitlab/gitlab-issue-provider';
+import { jiraIssueProvider } from '@main/core/jira/jira-issue-provider';
+import { linearIssueProvider } from '@main/core/linear/linear-issue-provider';
+import { plainIssueProvider } from '@main/core/plain/plain-issue-provider';
+import type { IssueProvider } from './issue-provider';
+
+const providers = new Map<IssueProviderType, IssueProvider>();
+
+function register(provider: IssueProvider) {
+  providers.set(provider.type, provider);
+}
+
+register(linearIssueProvider);
+register(githubIssueProvider);
+register(jiraIssueProvider);
+register(gitlabIssueProvider);
+register(forgejoIssueProvider);
+register(plainIssueProvider);
+
+export function getIssueProvider(type: IssueProviderType): IssueProvider | undefined {
+  return providers.get(type);
+}
+
+export function getAllIssueProviders(): IssueProvider[] {
+  return [...providers.values()];
+}
diff --git a/src/main/core/jira/controller.ts b/src/main/core/jira/controller.ts
new file mode 100644
index 0000000000..32cd244eff
--- /dev/null
+++ b/src/main/core/jira/controller.ts
@@ -0,0 +1,19 @@
+import { createRPCController } from '@shared/ipc/rpc';
+import { jiraConnectionService } from './jira-connection-service';
+
+export const jiraController = createRPCController({
+  saveCredentials: async (args: { siteUrl: string; email: string; token: string }) => {
+    const siteUrl = String(args?.siteUrl || '').trim();
+    const email = String(args?.email || '').trim();
+    const token = String(args?.token || '').trim();
+    if (!siteUrl || !email || !token) {
+      return { success: false, error: 'Site URL, email, and API token are required.' };
+    }
+
+    return jiraConnectionService.saveCredentials(siteUrl, email, token);
+  },
+
+  clearCredentials: async () => jiraConnectionService.clearCredentials(),
+
+  checkConnection: async () => jiraConnectionService.checkConnection(),
+});
diff --git a/src/main/core/jira/jira-connection-service.ts b/src/main/core/jira/jira-connection-service.ts
new file mode 100644
index 0000000000..a5c9c7ba10
--- /dev/null
+++ b/src/main/core/jira/jira-connection-service.ts
@@ -0,0 +1,182 @@
+import { request } from 'node:https';
+import { URL } from 'node:url';
+import { ISSUE_PROVIDER_CAPABILITIES, type ConnectionStatus } from '@shared/issue-providers';
+import { encryptedAppSecretsStore } from '@main/core/secrets/encrypted-app-secrets-store';
+import { KV } from '@main/db/kv';
+import { capture } from '@main/lib/telemetry';
+
+type JiraCreds = { siteUrl: string; email: string };
+
+interface JiraKVSchema extends Record<string, unknown> {
+  creds: JiraCreds;
+}
+
+interface JiraUser {
+  accountId?: string;
+  displayName?: string;
+  name?: string;
+  errorMessages?: string[];
+}
+
+const jiraKV = new KV<JiraKVSchema>('jira');
+
+function encodeBasic(email: string, token: string): string {
+  return Buffer.from(`${email}:${token}`).toString('base64');
+}
+
+export class JiraConnectionService {
+  private readonly JIRA_TOKEN_SECRET_KEY = 'emdash-jira-token';
+
+  async saveCredentials(
+    siteUrl: string,
+    email: string,
+    token: string
+  ): Promise<{ success: boolean; displayName?: string; error?: string }> {
+    try {
+      const me = await this.getMyself(siteUrl, email, token);
+      await encryptedAppSecretsStore.setSecret(this.JIRA_TOKEN_SECRET_KEY, token);
+      await this.writeCreds({ siteUrl, email });
+      capture('integration_connected', { provider: 'jira' });
+      return { success: true, displayName: me?.displayName };
+    } catch (error) {
+      return { success: false, error: error instanceof Error ? error.message : String(error) };
+    }
+  }
+
+  async clearCredentials(): Promise<{ success: boolean; error?: string }> {
+    try {
+      try {
+        await encryptedAppSecretsStore.deleteSecret(this.JIRA_TOKEN_SECRET_KEY);
+      } catch {}
+      try {
+        await jiraKV.del('creds');
+      } catch {}
+      capture('integration_disconnected', { provider: 'jira' });
+      return { success: true };
+    } catch (error) {
+      return { success: false, error: error instanceof Error ? error.message : String(error) };
+    }
+  }
+
+  async checkConnection(): Promise<ConnectionStatus> {
+    try {
+      const creds = await this.readCreds();
+      if (!creds) {
+        return {
+          connected: false,
+          capabilities: ISSUE_PROVIDER_CAPABILITIES.jira,
+        };
+      }
+
+      const token = await encryptedAppSecretsStore.getSecret(this.JIRA_TOKEN_SECRET_KEY);
+      if (!token) {
+        return {
+          connected: false,
+          capabilities: ISSUE_PROVIDER_CAPABILITIES.jira,
+        };
+      }
+
+      const me = await this.getMyself(creds.siteUrl, creds.email, token);
+      return {
+        connected: true,
+        displayName: me?.displayName,
+        capabilities: ISSUE_PROVIDER_CAPABILITIES.jira,
+      };
+    } catch (error) {
+      return {
+        connected: false,
+        error: error instanceof Error ? error.message : String(error),
+        capabilities: ISSUE_PROVIDER_CAPABILITIES.jira,
+      };
+    }
+  }
+
+  async requireAuth(): Promise<{ siteUrl: string; email: string; token: string }> {
+    const creds = await this.readCreds();
+    if (!creds) throw new Error('Jira credentials not set.');
+
+    const token = await encryptedAppSecretsStore.getSecret(this.JIRA_TOKEN_SECRET_KEY);
+    if (!token) throw new Error('Jira token not found.');
+
+    return { ...creds, token };
+  }
+
+  private async readCreds(): Promise<JiraCreds | null> {
+    try {
+      const obj = await jiraKV.get('creds');
+      const siteUrl = String(obj?.siteUrl || '').trim();
+      const email = String(obj?.email || '').trim();
+      if (!siteUrl || !email) return null;
+      return { siteUrl, email };
+    } catch {
+      return null;
+    }
+  }
+
+  private async writeCreds(creds: JiraCreds): Promise<void> {
+    await jiraKV.set('creds', { siteUrl: creds.siteUrl, email: creds.email });
+  }
+
+  private async getMyself(siteUrl: string, email: string, token: string): Promise<JiraUser> {
+    const url = new URL('/rest/api/3/myself', siteUrl);
+    const body = await this.doGet(url, email, token);
+    const data = JSON.parse(body || '{}') as JiraUser;
+    if (!data || data.errorMessages) {
+      throw new Error('Failed to verify Jira token.');
+    }
+    return data;
+  }
+
+  private async doGet(url: URL, email: string, token: string): Promise<string> {
+    return this.doRequest(url, email, token, 'GET');
+  }
+
+  private async doRequest(
+    url: URL,
+    email: string,
+    token: string,
+    method: 'GET' | 'POST',
+    payload?: string,
+    extraHeaders?: Record<string, string>
+  ): Promise<string> {
+    const auth = encodeBasic(email, token);
+    return new Promise<string>((resolve, reject) => {
+      const req = request(
+        {
+          hostname: url.hostname,
+          path: url.pathname + url.search,
+          protocol: url.protocol,
+          method,
+          headers: {
+            Authorization: `Basic ${auth}`,
+            Accept: 'application/json',
+            ...(extraHeaders || {}),
+          },
+        },
+        (res) => {
+          let data = '';
+          res.on('data', (chunk) => {
+            data += chunk;
+          });
+          res.on('end', () => {
+            if (res.statusCode && res.statusCode >= 400) {
+              const snippet = data?.slice(0, 200) || '';
+              reject(new Error(`Jira API error ${res.statusCode}${snippet ? `: ${snippet}` : ''}`));
+              return;
+            }
+
+            resolve(data);
+          });
+        }
+      );
+
+      req.on('error', reject);
+      if (payload && method === 'POST') {
+        req.write(payload);
+      }
+      req.end();
+    });
+  }
+}
+
+export const jiraConnectionService = new JiraConnectionService();
diff --git a/src/main/core/jira/jira-issue-provider.ts b/src/main/core/jira/jira-issue-provider.ts
new file mode 100644
index 0000000000..2e3e2283b6
--- /dev/null
+++ b/src/main/core/jira/jira-issue-provider.ts
@@ -0,0 +1,333 @@
+import { request } from 'node:https';
+import { URL } from 'node:url';
+import { ISSUE_PROVIDER_CAPABILITIES, type IssueListResult } from '@shared/issue-providers';
+import type { Issue } from '@shared/tasks';
+import { normalizeSearchTerm } from '@main/core/issues/helpers/provider-inputs';
+import type { IssueProvider } from '@main/core/issues/issue-provider';
+import { jiraConnectionService } from './jira-connection-service';
+
+interface RawJiraIssueFields {
+  summary?: string;
+  description?: AdfNode | null;
+  updated?: string | null;
+  project?: { key?: string; name?: string } | null;
+  status?: { name?: string } | null;
+  assignee?: { displayName?: string; name?: string } | null;
+}
+
+interface RawJiraIssue {
+  id?: string;
+  key?: string;
+  fields?: RawJiraIssueFields;
+  errorMessages?: string[];
+}
+
+interface RawJiraSearchResult {
+  issues?: RawJiraIssue[];
+}
+
+interface AdfNode {
+  type?: string;
+  text?: string;
+  content?: AdfNode[];
+}
+
+interface JiraPickerSection {
+  issues?: Array<{ key?: string }>;
+}
+
+interface JiraPickerResult {
+  sections?: JiraPickerSection[];
+}
+
+let projectKeys: string[] = [];
+
+function encodeBasic(email: string, token: string): string {
+  return Buffer.from(`${email}:${token}`).toString('base64');
+}
+
+async function listIssues(limit = 50): Promise<IssueListResult> {
+  try {
+    const { siteUrl, email, token } = await jiraConnectionService.requireAuth();
+    const jqlCandidates = [
+      'assignee = currentUser() ORDER BY updated DESC',
+      'reporter = currentUser() ORDER BY updated DESC',
+      'ORDER BY updated DESC',
+    ];
+
+    for (const jql of jqlCandidates) {
+      try {
+        const issues = await searchRaw(siteUrl, email, token, jql, limit);
+        if (issues.length > 0) {
+          return { success: true, issues: normalizeIssues(siteUrl, issues) };
+        }
+      } catch {
+        // Try next candidate.
+      }
+    }
+
+    try {
+      const keys = await getRecentIssueKeys(siteUrl, email, token, limit);
+      if (keys.length > 0) {
+        const results: RawJiraIssue[] = [];
+        for (const key of keys.slice(0, limit)) {
+          try {
+            const issue = await getIssueByKey(siteUrl, email, token, key);
+            if (issue) {
+              results.push(issue);
+            }
+          } catch {
+            // Skip individual failures.
+          }
+        }
+
+        if (results.length > 0) {
+          return { success: true, issues: normalizeIssues(siteUrl, results) };
+        }
+      }
+    } catch {
+      // Ignore final fallback errors.
+    }
+
+    return { success: true, issues: [] };
+  } catch (error) {
+    return { success: false, error: error instanceof Error ? error.message : String(error) };
+  }
+}
+
+async function smartSearchIssues(searchTerm: string, limit = 20): Promise<IssueListResult> {
+  const term = normalizeSearchTerm(searchTerm);
+  if (!term) {
+    return { success: true, issues: [] };
+  }
+
+  try {
+    const { siteUrl, email, token } = await jiraConnectionService.requireAuth();
+
+    const looksLikeKey = /^[A-Za-z][A-Za-z0-9_]*-\d+$/.test(term);
+    if (looksLikeKey) {
+      const keyUpper = term.toUpperCase();
+      try {
+        const issue = await getIssueByKey(siteUrl, email, token, keyUpper);
+        if (issue) {
+          return { success: true, issues: normalizeIssues(siteUrl, [issue]) };
+        }
+      } catch {
+        // Fall through to JQL search.
+      }
+    }
+
+    const sanitized = term.replace(/"/g, '\\"');
+    const extraKey = looksLikeKey ? ` OR issueKey = ${term.toUpperCase()}` : '';
+
+    const isNumeric = /^\d+$/.test(term);
+    if (isNumeric && projectKeys.length === 0) {
+      projectKeys = await fetchProjectKeys(siteUrl, email, token);
+    }
+
+    const keyClause =
+      isNumeric && projectKeys.length
+        ? ` OR key IN (${projectKeys.map((projectKey) => `"${projectKey}-${term}"`).join(',')})`
+        : '';
+
+    const jql = `text ~ "${sanitized}"${extraKey}${keyClause}`;
+    const data = await searchRaw(siteUrl, email, token, jql, limit);
+
+    return { success: true, issues: normalizeIssues(siteUrl, data) };
+  } catch (error) {
+    return { success: false, error: error instanceof Error ? error.message : String(error) };
+  }
+}
+
+async function searchRaw(
+  siteUrl: string,
+  email: string,
+  token: string,
+  jql: string,
+  limit: number
+): Promise<RawJiraIssue[]> {
+  const url = new URL('/rest/api/3/search', siteUrl);
+  const payload = JSON.stringify({
+    jql,
+    maxResults: Math.min(Math.max(limit, 1), 100),
+    fields: ['summary', 'description', 'updated', 'project', 'status', 'assignee'],
+  });
+
+  const body = await doRequest(url, email, token, 'POST', payload, {
+    'Content-Type': 'application/json',
+  });
+
+  const data = JSON.parse(body || '{}') as RawJiraSearchResult;
+  return Array.isArray(data?.issues) ? data.issues : [];
+}
+
+async function fetchProjectKeys(siteUrl: string, email: string, token: string): Promise<string[]> {
+  try {
+    const url = new URL('/rest/api/3/project', siteUrl);
+    const body = await doGet(url, email, token);
+    const data = JSON.parse(body || '[]') as Array<{ key?: string }>;
+    if (!Array.isArray(data)) return [];
+    return data.map((project) => String(project?.key || '')).filter(Boolean);
+  } catch {
+    return [];
+  }
+}
+
+async function getIssueByKey(
+  siteUrl: string,
+  email: string,
+  token: string,
+  key: string
+): Promise<RawJiraIssue | null> {
+  const url = new URL(`/rest/api/3/issue/${encodeURIComponent(key)}`, siteUrl);
+  url.searchParams.set('fields', 'summary,description,updated,project,status,assignee');
+
+  const body = await doGet(url, email, token);
+  const data = JSON.parse(body || '{}') as RawJiraIssue;
+  if (!data || data.errorMessages) {
+    return null;
+  }
+
+  return data;
+}
+
+async function getRecentIssueKeys(
+  siteUrl: string,
+  email: string,
+  token: string,
+  limit: number
+): Promise<string[]> {
+  const url = new URL('/rest/api/3/issue/picker', siteUrl);
+  url.searchParams.set('query', '');
+  url.searchParams.set('currentJQL', '');
+
+  const body = await doGet(url, email, token);
+  const data = JSON.parse(body || '{}') as JiraPickerResult;
+
+  const keys: string[] = [];
+  const sections = Array.isArray(data?.sections) ? data.sections : [];
+  for (const section of sections) {
+    const issues = Array.isArray(section?.issues) ? section.issues : [];
+    for (const issue of issues) {
+      const key = String(issue?.key || '').trim();
+      if (key && !keys.includes(key)) {
+        keys.push(key);
+      }
+      if (keys.length >= limit) {
+        break;
+      }
+    }
+    if (keys.length >= limit) {
+      break;
+    }
+  }
+
+  return keys;
+}
+
+async function doGet(url: URL, email: string, token: string): Promise<string> {
+  return doRequest(url, email, token, 'GET');
+}
+
+async function doRequest(
+  url: URL,
+  email: string,
+  token: string,
+  method: 'GET' | 'POST',
+  payload?: string,
+  extraHeaders?: Record<string, string>
+): Promise<string> {
+  const auth = encodeBasic(email, token);
+
+  return new Promise<string>((resolve, reject) => {
+    const req = request(
+      {
+        hostname: url.hostname,
+        path: url.pathname + url.search,
+        protocol: url.protocol,
+        method,
+        headers: {
+          Authorization: `Basic ${auth}`,
+          Accept: 'application/json',
+          ...(extraHeaders || {}),
+        },
+      },
+      (res) => {
+        let data = '';
+        res.on('data', (chunk) => {
+          data += chunk;
+        });
+        res.on('end', () => {
+          if (res.statusCode && res.statusCode >= 400) {
+            const snippet = data?.slice(0, 200) || '';
+            reject(new Error(`Jira API error ${res.statusCode}${snippet ? `: ${snippet}` : ''}`));
+            return;
+          }
+
+          resolve(data);
+        });
+      }
+    );
+
+    req.on('error', reject);
+    if (payload && method === 'POST') {
+      req.write(payload);
+    }
+    req.end();
+  });
+}
+
+function flattenAdf(node: AdfNode | string | null | undefined): string {
+  if (!node) return '';
+  if (typeof node === 'string') return node;
+  if (node.type === 'text') return node.text || '';
+
+  if (Array.isArray(node.content)) {
+    const parts = node.content.map((item) => flattenAdf(item));
+    if (['doc', 'bulletList', 'orderedList'].includes(node.type ?? '')) {
+      return parts.join('\n');
+    }
+
+    if (['paragraph', 'heading', 'listItem'].includes(node.type ?? '')) {
+      return parts.join('');
+    }
+
+    return parts.join('');
+  }
+
+  return '';
+}
+
+function normalizeIssues(siteUrl: string, rawIssues: RawJiraIssue[]): Issue[] {
+  const base = siteUrl.replace(/\/$/, '');
+
+  return (rawIssues || []).map((item) => {
+    const fields = item?.fields ?? {};
+    return {
+      provider: 'jira',
+      identifier: String(item?.key || ''),
+      title: String(fields?.summary || ''),
+      url: `${base}/browse/${item?.key}`,
+      description: fields?.description ? flattenAdf(fields.description) : undefined,
+      status: fields?.status?.name ?? undefined,
+      assignees:
+        fields?.assignee?.displayName != null
+          ? [fields.assignee.displayName ?? fields.assignee.name ?? ''].filter(Boolean)
+          : undefined,
+      project: fields?.project?.name ?? undefined,
+      updatedAt: fields?.updated ?? undefined,
+      fetchedAt: new Date().toISOString(),
+    } satisfies Issue;
+  });
+}
+
+export const jiraIssueProvider: IssueProvider = {
+  type: 'jira',
+  capabilities: ISSUE_PROVIDER_CAPABILITIES.jira,
+
+  checkConnection: () => jiraConnectionService.checkConnection(),
+
+  listIssues: async (opts) => listIssues(opts.limit ?? 50),
+
+  searchIssues: async (opts) => smartSearchIssues(opts.searchTerm, opts.limit ?? 20),
+};
diff --git a/src/main/core/linear/controller.ts b/src/main/core/linear/controller.ts
new file mode 100644
index 0000000000..8d08a9f657
--- /dev/null
+++ b/src/main/core/linear/controller.ts
@@ -0,0 +1,15 @@
+import { createRPCController } from '@shared/ipc/rpc';
+import { linearConnectionService } from './linear-connection-service';
+
+export const linearController = createRPCController({
+  saveToken: async (token: string) => {
+    if (!token || typeof token !== 'string') {
+      return { success: false, error: 'A Linear API token is required.' };
+    }
+    return linearConnectionService.saveToken(token);
+  },
+
+  checkConnection: async () => linearConnectionService.checkConnection(),
+
+  clearToken: async () => linearConnectionService.clearToken(),
+});
diff --git a/src/main/core/linear/linear-connection-service.ts b/src/main/core/linear/linear-connection-service.ts
new file mode 100644
index 0000000000..93a779d717
--- /dev/null
+++ b/src/main/core/linear/linear-connection-service.ts
@@ -0,0 +1,132 @@
+import { LinearClient } from '@linear/sdk';
+import { ISSUE_PROVIDER_CAPABILITIES, type ConnectionStatus } from '@shared/issue-providers';
+import { encryptedAppSecretsStore } from '@main/core/secrets/encrypted-app-secrets-store';
+import { log } from '@main/lib/logger';
+import { capture } from '@main/lib/telemetry';
+
+export class LinearConnectionService {
+  private readonly LINEAR_TOKEN_SECRET_KEY = 'emdash-linear-token';
+
+  private cachedToken: string | null | undefined = undefined;
+  private client: LinearClient | null = null;
+  private clientToken: string | null = null;
+
+  async saveToken(
+    token: string
+  ): Promise<{ success: boolean; workspaceName?: string; error?: string }> {
+    try {
+      const clean = token.trim();
+      if (!clean) {
+        return { success: false, error: 'Linear token cannot be empty.' };
+      }
+
+      const client = this.getClientForToken(clean);
+      const viewer = await client.viewer;
+      const org = await viewer.organization;
+
+      await this.storeToken(clean);
+      capture('integration_connected', { provider: 'linear' });
+
+      return {
+        success: true,
+        workspaceName: org?.name ?? viewer.displayName ?? undefined,
+      };
+    } catch (error) {
+      const message =
+        error instanceof Error
+          ? error.message
+          : 'Failed to validate Linear token. Please try again.';
+      return { success: false, error: message };
+    }
+  }
+
+  async clearToken(): Promise<{ success: boolean; error?: string }> {
+    try {
+      await encryptedAppSecretsStore.deleteSecret(this.LINEAR_TOKEN_SECRET_KEY);
+      this.cachedToken = null;
+      this.client = null;
+      this.clientToken = null;
+      capture('integration_disconnected', { provider: 'linear' });
+      return { success: true };
+    } catch (error) {
+      log.error('Failed to clear Linear token:', error);
+      return {
+        success: false,
+        error: 'Unable to remove Linear token from secure storage.',
+      };
+    }
+  }
+
+  async checkConnection(): Promise<ConnectionStatus> {
+    try {
+      const token = await this.getStoredToken();
+      if (!token) {
+        return {
+          connected: false,
+          capabilities: ISSUE_PROVIDER_CAPABILITIES.linear,
+        };
+      }
+
+      const client = this.getClientForToken(token);
+      const viewer = await client.viewer;
+      const org = await viewer.organization;
+
+      return {
+        connected: true,
+        displayName: org?.name ?? viewer.displayName ?? undefined,
+        capabilities: ISSUE_PROVIDER_CAPABILITIES.linear,
+      };
+    } catch (error) {
+      const message =
+        error instanceof Error ? error.message : 'Failed to verify Linear connection.';
+      return {
+        connected: false,
+        error: message,
+        capabilities: ISSUE_PROVIDER_CAPABILITIES.linear,
+      };
+    }
+  }
+
+  async getClient(): Promise<LinearClient | null> {
+    const token = await this.getStoredToken();
+    if (!token) {
+      return null;
+    }
+
+    return this.getClientForToken(token);
+  }
+
+  private getClientForToken(token: string): LinearClient {
+    if (!this.client || this.clientToken !== token) {
+      this.client = new LinearClient({ apiKey: token });
+      this.clientToken = token;
+    }
+    return this.client;
+  }
+
+  private async storeToken(token: string): Promise<void> {
+    try {
+      await encryptedAppSecretsStore.setSecret(this.LINEAR_TOKEN_SECRET_KEY, token);
+      this.cachedToken = token;
+    } catch (error) {
+      log.error('Failed to store Linear token:', error);
+      throw new Error('Unable to store Linear token securely.');
+    }
+  }
+
+  private async getStoredToken(): Promise<string | null> {
+    if (this.cachedToken) {
+      return this.cachedToken;
+    }
+
+    try {
+      this.cachedToken = await encryptedAppSecretsStore.getSecret(this.LINEAR_TOKEN_SECRET_KEY);
+      return this.cachedToken;
+    } catch (error) {
+      log.error('Failed to read Linear token from secure storage:', error);
+      return null;
+    }
+  }
+}
+
+export const linearConnectionService = new LinearConnectionService();
diff --git a/src/main/core/linear/linear-issue-provider.test.ts b/src/main/core/linear/linear-issue-provider.test.ts
new file mode 100644
index 0000000000..496eea275c
--- /dev/null
+++ b/src/main/core/linear/linear-issue-provider.test.ts
@@ -0,0 +1,107 @@
+import { describe, expect, it, vi } from 'vitest';
+import { linearConnectionService } from './linear-connection-service';
+import { linearIssueProvider } from './linear-issue-provider';
+
+vi.mock('./linear-connection-service', () => ({
+  linearConnectionService: {
+    getClient: vi.fn(),
+  },
+}));
+
+const mockGetClient = vi.mocked(linearConnectionService.getClient);
+
+function makeLinearClient(rawRequest: ReturnType<typeof vi.fn>) {
+  return {
+    client: {
+      rawRequest,
+    },
+  };
+}
+
+describe('linearIssueProvider', () => {
+  it('maps branchName from listed Linear issues', async () => {
+    const rawRequest = vi.fn().mockResolvedValue({
+      data: {
+        issues: {
+          nodes: [
+            {
+              id: 'issue-1',
+              identifier: 'GEN-626',
+              title: 'Linear issue branch name creation',
+              description: 'Use the Linear branch format',
+              url: 'https://linear.app/general-action/issue/GEN-626',
+              branchName: 'jona/gen-626-linear-issue-branch-name-creation',
+              state: { name: 'Backlog', type: 'unstarted', color: '#aaa' },
+              team: { name: 'General', key: 'GEN' },
+              project: { name: 'Refactor (v1)' },
+              assignee: { displayName: 'Jona', name: 'jona' },
+              updatedAt: '2026-04-17T12:00:00.000Z',
+            },
+          ],
+        },
+      },
+    });
+    mockGetClient.mockResolvedValue(makeLinearClient(rawRequest) as never);
+
+    const result = await linearIssueProvider.listIssues({ limit: 10 });
+
+    expect(rawRequest).toHaveBeenCalledWith(expect.stringContaining('branchName'), {
+      limit: 10,
+    });
+    expect(result).toEqual({
+      success: true,
+      issues: [
+        expect.objectContaining({
+          provider: 'linear',
+          identifier: 'GEN-626',
+          branchName: 'jona/gen-626-linear-issue-branch-name-creation',
+        }),
+      ],
+    });
+  });
+
+  it('maps branchName from searched Linear issues', async () => {
+    const rawRequest = vi.fn().mockResolvedValue({
+      data: {
+        searchIssues: {
+          nodes: [
+            {
+              id: 'issue-1',
+              identifier: 'GEN-626',
+              title: 'Linear issue branch name creation',
+              description: 'Use the Linear branch format',
+              url: 'https://linear.app/general-action/issue/GEN-626',
+              branchName: 'jona/gen-626-linear-issue-branch-name-creation',
+              state: { name: 'Backlog', type: 'unstarted', color: '#aaa' },
+              team: { name: 'General', key: 'GEN' },
+              project: { name: 'Refactor (v1)' },
+              assignee: { displayName: 'Jona', name: 'jona' },
+              updatedAt: '2026-04-17T12:00:00.000Z',
+            },
+          ],
+        },
+      },
+    });
+    mockGetClient.mockResolvedValue(makeLinearClient(rawRequest) as never);
+
+    const result = await linearIssueProvider.searchIssues({
+      searchTerm: 'GEN-626',
+      limit: 5,
+    });
+
+    expect(rawRequest).toHaveBeenCalledWith(
+      expect.stringContaining('branchName'),
+      expect.objectContaining({ term: 'GEN-626', limit: 5 })
+    );
+    expect(result).toEqual({
+      success: true,
+      issues: [
+        expect.objectContaining({
+          provider: 'linear',
+          identifier: 'GEN-626',
+          branchName: 'jona/gen-626-linear-issue-branch-name-creation',
+        }),
+      ],
+    });
+  });
+});
diff --git a/src/main/core/linear/linear-issue-provider.ts b/src/main/core/linear/linear-issue-provider.ts
new file mode 100644
index 0000000000..14428358f8
--- /dev/null
+++ b/src/main/core/linear/linear-issue-provider.ts
@@ -0,0 +1,149 @@
+import { ISSUE_PROVIDER_CAPABILITIES, type IssueListResult } from '@shared/issue-providers';
+import type { Issue } from '@shared/tasks';
+import { clampIssueLimit, normalizeSearchTerm } from '@main/core/issues/helpers/provider-inputs';
+import type { IssueProvider } from '@main/core/issues/issue-provider';
+import { log } from '@main/lib/logger';
+import { linearConnectionService } from './linear-connection-service';
+
+type LinearIssueNode = {
+  id: string;
+  identifier: string;
+  title: string;
+  description: string | null;
+  url: string;
+  branchName: string | null;
+  state: { name: string; type: string; color: string } | null;
+  team: { name: string; key: string } | null;
+  project: { name: string } | null;
+  assignee: { displayName: string; name: string } | null;
+  updatedAt: string;
+};
+
+const ISSUES_QUERY = `
+  query ListIssues($limit: Int!) {
+    issues(
+      first: $limit,
+      orderBy: updatedAt,
+      filter: { state: { type: { nin: ["completed", "cancelled"] } } }
+    ) {
+      nodes {
+        id
+        identifier
+        title
+        description
+        url
+        branchName
+        state { name type color }
+        team { name key }
+        project { name }
+        assignee { displayName name }
+        updatedAt
+      }
+    }
+  }
+`;
+
+const SEARCH_QUERY = `
+  query SearchIssues($term: String!, $limit: Int!) {
+    searchIssues(term: $term, first: $limit) {
+      nodes {
+        id
+        identifier
+        title
+        description
+        url
+        branchName
+        state { name type color }
+        team { name key }
+        project { name }
+        assignee { displayName name }
+        updatedAt
+      }
+    }
+  }
+`;
+
+function toIssue(raw: LinearIssueNode): Issue {
+  return {
+    provider: 'linear',
+    identifier: raw.identifier,
+    title: raw.title,
+    url: raw.url ?? '',
+    description: raw.description ?? undefined,
+    branchName: raw.branchName ?? undefined,
+    status: raw.state?.name ?? undefined,
+    assignees: raw.assignee
+      ? [raw.assignee.name ?? raw.assignee.displayName].filter(Boolean)
+      : undefined,
+    project: raw.project?.name ?? undefined,
+    updatedAt: raw.updatedAt ?? undefined,
+    fetchedAt: new Date().toISOString(),
+  };
+}
+
+async function listIssues(limit = 50): Promise<IssueListResult> {
+  const client = await linearConnectionService.getClient();
+  if (!client) {
+    return { success: false, error: 'Linear token not set. Connect Linear in settings first.' };
+  }
+
+  const sanitizedLimit = clampIssueLimit(limit, 50, 200);
+
+  try {
+    const { data } = await client.client.rawRequest<
+      { issues: { nodes: LinearIssueNode[] } },
+      { limit: number }
+    >(ISSUES_QUERY, { limit: sanitizedLimit });
+
+    return {
+      success: true,
+      issues: (data?.issues?.nodes ?? []).map(toIssue),
+    };
+  } catch (error) {
+    const message = error instanceof Error ? error.message : 'Unable to fetch Linear issues.';
+    return { success: false, error: message };
+  }
+}
+
+async function searchIssues(searchTerm: string, limit = 20): Promise<IssueListResult> {
+  const term = normalizeSearchTerm(searchTerm);
+  if (!term) {
+    return { success: true, issues: [] };
+  }
+
+  const client = await linearConnectionService.getClient();
+  if (!client) {
+    return { success: false, error: 'Linear token not set. Connect Linear in settings first.' };
+  }
+
+  const sanitizedLimit = clampIssueLimit(limit, 20, 200);
+
+  try {
+    const { data } = await client.client.rawRequest<
+      { searchIssues: { nodes: LinearIssueNode[] } },
+      { term: string; limit: number }
+    >(SEARCH_QUERY, {
+      term,
+      limit: sanitizedLimit,
+    });
+
+    return {
+      success: true,
+      issues: (data?.searchIssues?.nodes ?? []).map(toIssue),
+    };
+  } catch (error) {
+    log.error('[Linear] searchIssues error:', error);
+    return { success: true, issues: [] };
+  }
+}
+
+export const linearIssueProvider: IssueProvider = {
+  type: 'linear',
+  capabilities: ISSUE_PROVIDER_CAPABILITIES.linear,
+
+  checkConnection: () => linearConnectionService.checkConnection(),
+
+  listIssues: async (opts) => listIssues(opts.limit ?? 50),
+
+  searchIssues: async (opts) => searchIssues(opts.searchTerm, opts.limit ?? 20),
+};
diff --git a/src/main/core/mcp/controller.ts b/src/main/core/mcp/controller.ts
new file mode 100644
index 0000000000..62a25af137
--- /dev/null
+++ b/src/main/core/mcp/controller.ts
@@ -0,0 +1,72 @@
+import { AGENT_PROVIDERS } from '@shared/agent-provider-registry';
+import type { DependencyId } from '@shared/dependencies';
+import { createRPCController } from '@shared/ipc/rpc';
+import type { McpProvidersResponse, McpServer } from '@shared/mcp/types';
+import { localDependencyManager } from '@main/core/dependencies/dependency-manager';
+import { log } from '@main/lib/logger';
+import { mcpService } from './services/McpService';
+import { agentSupportsHttp, getAllMcpAgentIds } from './utils/config-paths';
+
+function mapProviders(agentIds: string[]): McpProvidersResponse[] {
+  return agentIds.map((id) => {
+    const provider = AGENT_PROVIDERS.find((p) => p.id === id);
+    const dep = localDependencyManager.get(id as DependencyId);
+    return {
+      id,
+      name: provider?.name ?? id,
+      installed: dep?.status === 'available',
+      supportsHttp: agentSupportsHttp(id),
+    };
+  });
+}
+
+export const mcpController = createRPCController({
+  loadAll: async () => {
+    try {
+      const data = await mcpService.loadAll();
+      return { success: true, data };
+    } catch (error) {
+      log.error('Failed to load MCP servers:', error);
+      return { success: false, error: error instanceof Error ? error.message : String(error) };
+    }
+  },
+
+  saveServer: async (server: McpServer) => {
+    try {
+      await mcpService.saveServer(server);
+      return { success: true };
+    } catch (error) {
+      log.error('Failed to save MCP server:', error);
+      return { success: false, error: error instanceof Error ? error.message : String(error) };
+    }
+  },
+
+  removeServer: async (serverName: string) => {
+    try {
+      await mcpService.removeServer(serverName);
+      return { success: true };
+    } catch (error) {
+      log.error('Failed to remove MCP server:', error);
+      return { success: false, error: error instanceof Error ? error.message : String(error) };
+    }
+  },
+
+  getProviders: async () => {
+    try {
+      return { success: true, data: mapProviders(getAllMcpAgentIds()) };
+    } catch (error) {
+      log.error('Failed to get MCP providers:', error);
+      return { success: false, error: error instanceof Error ? error.message : String(error) };
+    }
+  },
+
+  refreshProviders: async () => {
+    try {
+      await localDependencyManager.probeCategory('agent');
+      return { success: true, data: mapProviders(getAllMcpAgentIds()) };
+    } catch (error) {
+      log.error('Failed to refresh MCP providers:', error);
+      return { success: false, error: error instanceof Error ? error.message : String(error) };
+    }
+  },
+});
diff --git a/src/main/core/mcp/services/McpService.test.ts b/src/main/core/mcp/services/McpService.test.ts
new file mode 100644
index 0000000000..4a03a048e4
--- /dev/null
+++ b/src/main/core/mcp/services/McpService.test.ts
@@ -0,0 +1,177 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import type { AgentMcpMeta, ServerMap } from '@shared/mcp/types';
+import * as configIO from '../utils/config-io';
+import * as configPaths from '../utils/config-paths';
+import { McpService } from './McpService';
+
+vi.mock('../utils/config-io', () => ({
+  readServers: vi.fn(),
+  writeServers: vi.fn(),
+}));
+
+vi.mock('../utils/config-paths', () => ({
+  getAgentMcpMeta: vi.fn(),
+  getAllMcpAgentIds: vi.fn(() => ['claude', 'cursor']),
+}));
+
+vi.mock('../utils/catalog', () => ({
+  loadCatalog: vi.fn(() => []),
+  getCatalogServerConfig: vi.fn(),
+}));
+
+vi.mock('@main/lib/logger', () => ({
+  log: { error: vi.fn(), warn: vi.fn(), info: vi.fn() },
+}));
+
+const mockReadServers = vi.mocked(configIO.readServers);
+const mockWriteServers = vi.mocked(configIO.writeServers);
+const mockGetMeta = vi.mocked(configPaths.getAgentMcpMeta);
+
+const claudeMeta: AgentMcpMeta = {
+  agentId: 'claude',
+  configPath: '/home/test/.claude.json',
+  serversPath: ['mcpServers'],
+  template: { mcpServers: {} },
+  isToml: false,
+  adapter: 'passthrough',
+};
+
+const cursorMeta: AgentMcpMeta = {
+  agentId: 'cursor',
+  configPath: '/home/test/.cursor/mcp.json',
+  serversPath: ['mcpServers'],
+  template: { mcpServers: {} },
+  isToml: false,
+  adapter: 'cursor',
+};
+
+describe('McpService', () => {
+  let service: McpService;
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+    service = new McpService();
+    mockGetMeta.mockImplementation((id: string) => {
+      if (id === 'claude') return claudeMeta;
+      if (id === 'cursor') return cursorMeta;
+      return undefined;
+    });
+  });
+
+  describe('loadAll', () => {
+    it('reads servers from all agents and normalizes to McpServer[]', async () => {
+      mockReadServers
+        .mockResolvedValueOnce({ myServer: { command: 'npx', args: ['-y', 'foo'] } }) // claude
+        .mockResolvedValueOnce({}); // cursor
+
+      const result = await service.loadAll();
+      expect(result.installed).toHaveLength(1);
+      expect(result.installed[0].name).toBe('myServer');
+      expect(result.installed[0].transport).toBe('stdio');
+      expect(result.installed[0].providers).toContain('claude');
+    });
+
+    it('deduplicates servers by name, merging providers', async () => {
+      mockReadServers
+        .mockResolvedValueOnce({ shared: { command: 'npx', args: ['foo'] } })
+        .mockResolvedValueOnce({ shared: { command: 'npx', args: ['foo'] } });
+
+      const result = await service.loadAll();
+      expect(result.installed).toHaveLength(1);
+      expect(result.installed[0].providers).toContain('claude');
+      expect(result.installed[0].providers).toContain('cursor');
+    });
+
+    it('skips agents that throw on read', async () => {
+      mockReadServers
+        .mockRejectedValueOnce(new Error('malformed'))
+        .mockResolvedValueOnce({ s1: { command: 'npx' } });
+
+      const result = await service.loadAll();
+      expect(result.installed).toHaveLength(1);
+    });
+  });
+
+  describe('saveServer', () => {
+    it('writes to selected providers using forward adapters', async () => {
+      mockReadServers.mockImplementation(() => Promise.resolve({}));
+      mockWriteServers.mockResolvedValue(undefined);
+
+      await service.saveServer({
+        name: 'myServer',
+        transport: 'stdio',
+        command: 'npx',
+        args: ['-y', 'foo'],
+
+        providers: ['claude'],
+      });
+
+      expect(mockWriteServers).toHaveBeenCalledTimes(1);
+      expect(mockWriteServers.mock.calls[0][0]).toBe(claudeMeta);
+      const written = mockWriteServers.mock.calls[0][1] as ServerMap;
+      expect(written.myServer).toBeDefined();
+    });
+
+    it('removes server from deselected providers', async () => {
+      mockReadServers.mockImplementation(() =>
+        Promise.resolve({ myServer: { command: 'npx' }, other: { command: 'y' } })
+      );
+      mockWriteServers.mockResolvedValue(undefined);
+
+      // Save with only cursor selected — should remove from claude
+      await service.saveServer({
+        name: 'myServer',
+        transport: 'stdio',
+        command: 'npx',
+        args: [],
+
+        providers: ['cursor'],
+      });
+
+      // Claude should have myServer removed
+      const claudeCall = mockWriteServers.mock.calls.find((c) => c[0] === claudeMeta);
+      if (claudeCall) {
+        expect((claudeCall[1] as ServerMap).myServer).toBeUndefined();
+      }
+    });
+
+    it('rejects empty server name', async () => {
+      await expect(
+        service.saveServer({
+          name: '',
+          transport: 'stdio',
+          command: 'npx',
+          providers: ['claude'],
+        })
+      ).rejects.toThrow('Invalid server name');
+    });
+
+    it('rejects server name with invalid characters', async () => {
+      await expect(
+        service.saveServer({
+          name: 'my server/hack',
+          transport: 'stdio',
+          command: 'npx',
+          providers: ['claude'],
+        })
+      ).rejects.toThrow('Invalid server name');
+    });
+  });
+
+  describe('removeServer', () => {
+    it('removes server from all agent configs', async () => {
+      mockReadServers.mockImplementation(() =>
+        Promise.resolve({ toRemove: { command: 'npx' }, keep: { command: 'y' } })
+      );
+      mockWriteServers.mockResolvedValue(undefined);
+
+      await service.removeServer('toRemove');
+
+      for (const call of mockWriteServers.mock.calls) {
+        const servers = call[1] as ServerMap;
+        expect(servers.toRemove).toBeUndefined();
+        expect(servers.keep).toBeDefined();
+      }
+    });
+  });
+});
diff --git a/src/main/core/mcp/services/McpService.ts b/src/main/core/mcp/services/McpService.ts
new file mode 100644
index 0000000000..277c85e023
--- /dev/null
+++ b/src/main/core/mcp/services/McpService.ts
@@ -0,0 +1,161 @@
+import type { McpLoadAllResponse, McpServer, ServerMap } from '@shared/mcp/types';
+import { log } from '@main/lib/logger';
+import { adaptForward, adaptReverse } from '../utils/adapters';
+import { loadCatalog } from '../utils/catalog';
+import { readServers, writeServers } from '../utils/config-io';
+import { getAgentMcpMeta, getAllMcpAgentIds } from '../utils/config-paths';
+import { mcpServerToRaw, rawEntryToMcpFields, rawToMcpServer } from '../utils/conversion';
+
+export class McpService {
+  private _writeLock = Promise.resolve();
+
+  private async withWriteLock<T>(fn: () => Promise<T>): Promise<T> {
+    const prev = this._writeLock;
+    let resolve: () => void;
+    this._writeLock = new Promise<void>((r) => {
+      resolve = r;
+    });
+    await prev;
+    try {
+      return await fn();
+    } finally {
+      resolve!();
+    }
+  }
+
+  async loadAll(): Promise<McpLoadAllResponse> {
+    return this.withWriteLock(async () => {
+      const agentIds = getAllMcpAgentIds();
+      const serversByName = new Map<string, { server: McpServer; providers: Set<string> }>();
+
+      for (const agentId of agentIds) {
+        const meta = getAgentMcpMeta(agentId);
+        if (!meta) continue;
+
+        let rawServers: ServerMap;
+        try {
+          rawServers = await readServers(meta);
+        } catch (err) {
+          log.warn(`Failed to read MCP config for ${agentId}:`, err);
+          continue;
+        }
+
+        const canonical = adaptReverse(meta.adapter, rawServers);
+
+        for (const [name, raw] of Object.entries(canonical)) {
+          const existing = serversByName.get(name);
+          if (existing) {
+            existing.providers.add(agentId);
+
+            const newServer = rawToMcpServer(name, raw, existing.providers);
+            const existingKeyCount = Object.keys(rawEntryToMcpFields(existing.server)).length;
+            const newKeyCount = Object.keys(rawEntryToMcpFields(newServer)).length;
+            if (newKeyCount > existingKeyCount) {
+              existing.server = newServer;
+            }
+          } else {
+            const providers = new Set([agentId]);
+            serversByName.set(name, {
+              server: rawToMcpServer(name, raw, providers),
+              providers,
+            });
+          }
+        }
+      }
+
+      const installed: McpServer[] = [];
+      for (const { server, providers } of serversByName.values()) {
+        server.providers = Array.from(providers);
+        installed.push(server);
+      }
+
+      const catalog = loadCatalog();
+
+      return { installed, catalog };
+    });
+  }
+
+  async saveServer(server: McpServer): Promise<void> {
+    if (!server.name || !/^[\w\-._]+$/.test(server.name)) {
+      throw new Error(`Invalid server name: "${server.name}"`);
+    }
+    return this.withWriteLock(async () => {
+      const allAgentIds = getAllMcpAgentIds();
+      const selectedProviders = new Set(server.providers);
+      const raw = mcpServerToRaw(server);
+
+      const failures: string[] = [];
+
+      for (const agentId of allAgentIds) {
+        const meta = getAgentMcpMeta(agentId);
+        if (!meta) continue;
+
+        let existing: ServerMap;
+        try {
+          existing = await readServers(meta);
+        } catch {
+          existing = {};
+        }
+
+        if (selectedProviders.has(agentId)) {
+          const adapted = adaptForward(meta.adapter, { [server.name]: raw });
+          const adaptedEntry = adapted[server.name];
+          if (adaptedEntry) {
+            existing[server.name] = adaptedEntry;
+          }
+        } else if (server.name in existing) {
+          delete existing[server.name];
+        } else {
+          continue;
+        }
+
+        try {
+          await writeServers(meta, existing);
+        } catch (err) {
+          log.error(`Failed to write MCP config for ${agentId}:`, err);
+          failures.push(agentId);
+        }
+      }
+
+      if (failures.length) {
+        throw new Error(`Failed to write config for: ${failures.join(', ')}`);
+      }
+    });
+  }
+
+  async removeServer(serverName: string): Promise<void> {
+    return this.withWriteLock(async () => {
+      const allAgentIds = getAllMcpAgentIds();
+      const failures: string[] = [];
+
+      for (const agentId of allAgentIds) {
+        const meta = getAgentMcpMeta(agentId);
+        if (!meta) continue;
+
+        let existing: ServerMap;
+        try {
+          existing = await readServers(meta);
+        } catch {
+          continue;
+        }
+
+        if (!(serverName in existing)) continue;
+
+        delete existing[serverName];
+
+        try {
+          await writeServers(meta, existing);
+        } catch (err) {
+          log.error(`Failed to write MCP config for ${agentId}:`, err);
+          failures.push(agentId);
+        }
+      }
+
+      if (failures.length) {
+        throw new Error(`Failed to write config for: ${failures.join(', ')}`);
+      }
+    });
+  }
+}
+
+export const mcpService = new McpService();
diff --git a/src/main/core/mcp/utils/adapters.test.ts b/src/main/core/mcp/utils/adapters.test.ts
new file mode 100644
index 0000000000..3908166d1d
--- /dev/null
+++ b/src/main/core/mcp/utils/adapters.test.ts
@@ -0,0 +1,215 @@
+import { describe, expect, it } from 'vitest';
+import type { ServerMap } from '@shared/mcp/types';
+import { adaptForward, adaptReverse } from './adapters';
+
+describe('adaptForward (canonical → agent)', () => {
+  const stdioServer = { command: 'npx', args: ['-y', 'foo'] };
+  const httpServer = { type: 'http', url: 'https://example.com/mcp', headers: { 'X-Key': 'abc' } };
+
+  describe('passthrough', () => {
+    it('returns servers unchanged', () => {
+      const servers: ServerMap = { s1: stdioServer, s2: httpServer };
+      expect(adaptForward('passthrough', servers)).toEqual(servers);
+    });
+  });
+
+  describe('gemini', () => {
+    it('renames url to httpUrl and adds Accept header for HTTP servers', () => {
+      const result = adaptForward('gemini', { s1: httpServer });
+      expect(result.s1).toEqual({
+        httpUrl: 'https://example.com/mcp',
+        headers: { 'X-Key': 'abc', Accept: 'application/json, text/event-stream' },
+      });
+    });
+
+    it('leaves stdio servers unchanged', () => {
+      const result = adaptForward('gemini', { s1: stdioServer });
+      expect(result.s1).toEqual(stdioServer);
+    });
+
+    it('does not overwrite existing Accept header', () => {
+      const server = { type: 'http', url: 'https://x.com', headers: { Accept: 'custom' } };
+      const result = adaptForward('gemini', { s1: server });
+      expect(result.s1).toMatchObject({ headers: { Accept: 'custom' } });
+    });
+  });
+
+  describe('cursor', () => {
+    it('keeps only url and headers for HTTP servers', () => {
+      const result = adaptForward('cursor', { s1: httpServer });
+      expect(result.s1).toEqual({ url: 'https://example.com/mcp', headers: { 'X-Key': 'abc' } });
+      expect(result.s1).not.toHaveProperty('type');
+    });
+
+    it('leaves stdio servers unchanged', () => {
+      const result = adaptForward('cursor', { s1: stdioServer });
+      expect(result.s1).toEqual(stdioServer);
+    });
+  });
+
+  describe('codex', () => {
+    it('drops HTTP servers', () => {
+      const result = adaptForward('codex', { s1: stdioServer, s2: httpServer });
+      expect(result.s1).toEqual(stdioServer);
+      expect(result.s2).toBeUndefined();
+    });
+  });
+
+  describe('opencode', () => {
+    it('transforms HTTP to remote type with Accept and enabled', () => {
+      const result = adaptForward('opencode', { s1: httpServer });
+      expect(result.s1).toEqual({
+        type: 'remote',
+        url: 'https://example.com/mcp',
+        headers: { 'X-Key': 'abc', Accept: 'application/json, text/event-stream' },
+        enabled: true,
+      });
+    });
+
+    it('transforms stdio to local type with command array and enabled', () => {
+      const result = adaptForward('opencode', { s1: stdioServer });
+      expect(result.s1).toEqual({
+        type: 'local',
+        command: ['npx', '-y', 'foo'],
+        enabled: true,
+      });
+    });
+  });
+
+  describe('copilot', () => {
+    it('adds tools: ["*"] if missing', () => {
+      const result = adaptForward('copilot', { s1: stdioServer });
+      expect(result.s1).toHaveProperty('tools', ['*']);
+    });
+
+    it('preserves existing tools', () => {
+      const server = { ...stdioServer, tools: ['read'] };
+      const result = adaptForward('copilot', { s1: server });
+      expect(result.s1).toHaveProperty('tools', ['read']);
+    });
+  });
+});
+
+describe('adaptReverse (agent → canonical)', () => {
+  describe('passthrough', () => {
+    it('returns servers unchanged', () => {
+      const servers: ServerMap = { s1: { command: 'npx', args: ['-y', 'foo'] } };
+      expect(adaptReverse('passthrough', servers)).toEqual(servers);
+    });
+  });
+
+  describe('gemini', () => {
+    it('renames httpUrl back to url and adds type: http', () => {
+      const servers: ServerMap = {
+        s1: {
+          httpUrl: 'https://example.com',
+          headers: { Accept: 'application/json, text/event-stream' },
+        },
+      };
+      const result = adaptReverse('gemini', servers);
+      expect(result.s1).toMatchObject({ type: 'http', url: 'https://example.com' });
+      expect(result.s1).not.toHaveProperty('httpUrl');
+    });
+
+    it('strips injected Accept header during reverse', () => {
+      const servers: ServerMap = {
+        s1: {
+          httpUrl: 'https://example.com',
+          headers: { Accept: 'application/json, text/event-stream', 'X-Key': 'abc' },
+        },
+      };
+      const result = adaptReverse('gemini', servers);
+      expect(result.s1).toHaveProperty('headers', { 'X-Key': 'abc' });
+    });
+
+    it('removes headers entirely when only injected Accept remains', () => {
+      const servers: ServerMap = {
+        s1: {
+          httpUrl: 'https://example.com',
+          headers: { Accept: 'application/json, text/event-stream' },
+        },
+      };
+      const result = adaptReverse('gemini', servers);
+      expect(result.s1).not.toHaveProperty('headers');
+    });
+
+    it('preserves custom Accept header', () => {
+      const servers: ServerMap = {
+        s1: {
+          httpUrl: 'https://example.com',
+          headers: { Accept: 'text/html' },
+        },
+      };
+      const result = adaptReverse('gemini', servers);
+      expect(result.s1).toHaveProperty('headers', { Accept: 'text/html' });
+    });
+  });
+
+  describe('cursor', () => {
+    it('adds type: http when url is present and no command', () => {
+      const servers: ServerMap = { s1: { url: 'https://example.com', headers: {} } };
+      const result = adaptReverse('cursor', servers);
+      expect(result.s1).toHaveProperty('type', 'http');
+    });
+
+    it('leaves stdio servers unchanged', () => {
+      const servers: ServerMap = { s1: { command: 'npx', args: ['foo'] } };
+      const result = adaptReverse('cursor', servers);
+      expect(result.s1).toEqual({ command: 'npx', args: ['foo'] });
+    });
+  });
+
+  describe('codex', () => {
+    it('returns servers as-is (all are stdio)', () => {
+      const servers: ServerMap = { s1: { command: 'npx', args: ['foo'] } };
+      expect(adaptReverse('codex', servers)).toEqual(servers);
+    });
+  });
+
+  describe('opencode', () => {
+    it('converts remote type back to http canonical', () => {
+      const servers: ServerMap = {
+        s1: { type: 'remote', url: 'https://example.com', headers: {}, enabled: true },
+      };
+      const result = adaptReverse('opencode', servers);
+      expect(result.s1).toMatchObject({ type: 'http', url: 'https://example.com' });
+      expect(result.s1).not.toHaveProperty('enabled');
+    });
+
+    it('strips injected Accept header during reverse', () => {
+      const servers: ServerMap = {
+        s1: {
+          type: 'remote',
+          url: 'https://example.com',
+          headers: { Accept: 'application/json, text/event-stream', 'X-Key': 'abc' },
+          enabled: true,
+        },
+      };
+      const result = adaptReverse('opencode', servers);
+      expect(result.s1).toHaveProperty('headers', { 'X-Key': 'abc' });
+    });
+
+    it('converts local type back to stdio canonical', () => {
+      const servers: ServerMap = {
+        s1: { type: 'local', command: ['npx', '-y', 'foo'], enabled: true },
+      };
+      const result = adaptReverse('opencode', servers);
+      expect(result.s1).toMatchObject({ command: 'npx', args: ['-y', 'foo'] });
+      expect(result.s1).not.toHaveProperty('type');
+    });
+  });
+
+  describe('copilot', () => {
+    it('strips tools: ["*"]', () => {
+      const servers: ServerMap = { s1: { command: 'npx', args: ['foo'], tools: ['*'] } };
+      const result = adaptReverse('copilot', servers);
+      expect(result.s1).not.toHaveProperty('tools');
+    });
+
+    it('preserves non-wildcard tools', () => {
+      const servers: ServerMap = { s1: { command: 'npx', args: ['foo'], tools: ['read'] } };
+      const result = adaptReverse('copilot', servers);
+      expect(result.s1).toHaveProperty('tools', ['read']);
+    });
+  });
+});
diff --git a/src/main/core/mcp/utils/adapters.ts b/src/main/core/mcp/utils/adapters.ts
new file mode 100644
index 0000000000..9a897c9d60
--- /dev/null
+++ b/src/main/core/mcp/utils/adapters.ts
@@ -0,0 +1,236 @@
+import type { AdapterType, RawServerEntry, ServerMap } from '@shared/mcp/types';
+
+// ── Helpers ────────────────────────────────────────────────────────────────
+
+function isHttpServer(s: RawServerEntry): boolean {
+  return s.type === 'http';
+}
+
+function isStdio(s: RawServerEntry): boolean {
+  return !isHttpServer(s) && s.command !== undefined;
+}
+
+const INJECTED_ACCEPT = 'application/json, text/event-stream';
+
+function ensureHeader(headers: Record<string, string>, key: string, val: string): void {
+  if (typeof headers[key] !== 'string') {
+    headers[key] = val;
+  }
+}
+
+function stripInjectedHeaders(entry: RawServerEntry): void {
+  if (typeof entry.headers !== 'object' || entry.headers === null) return;
+  const headers = entry.headers as Record<string, string>;
+  if (headers.Accept === INJECTED_ACCEPT) {
+    delete headers.Accept;
+    if (!Object.keys(headers).length) {
+      delete entry.headers;
+    }
+  }
+}
+
+function deepClone<T>(obj: T): T {
+  return JSON.parse(JSON.stringify(obj));
+}
+
+function transformHttpServers(
+  servers: ServerMap,
+  fn: (s: RawServerEntry) => RawServerEntry
+): ServerMap {
+  const result: ServerMap = {};
+  for (const [k, v] of Object.entries(servers)) {
+    if (typeof v === 'object' && v !== null && isHttpServer(v)) {
+      result[k] = fn(deepClone(v));
+    } else {
+      result[k] = deepClone(v);
+    }
+  }
+  return result;
+}
+
+// ── Forward Adapters (canonical → agent) ───────────────────────────────────
+
+function fwdPassthrough(servers: ServerMap): ServerMap {
+  return deepClone(servers);
+}
+
+function fwdGemini(servers: ServerMap): ServerMap {
+  return transformHttpServers(servers, (s) => {
+    const url = s.url ?? '';
+    const headers: Record<string, string> = {
+      ...((s.headers as Record<string, string>) ?? {}),
+    };
+    ensureHeader(headers, 'Accept', 'application/json, text/event-stream');
+    const result: RawServerEntry = { httpUrl: url, headers };
+    if (s.env && typeof s.env === 'object') result.env = s.env;
+    return result;
+  });
+}
+
+function fwdCursor(servers: ServerMap): ServerMap {
+  return transformHttpServers(servers, (s) => {
+    const url = s.url ?? '';
+    const headers = s.headers ?? {};
+    const result: RawServerEntry = { url, headers };
+    if (s.env && typeof s.env === 'object') result.env = s.env;
+    return result;
+  });
+}
+
+function fwdCodex(servers: ServerMap): ServerMap {
+  const result: ServerMap = {};
+  for (const [k, v] of Object.entries(servers)) {
+    if (typeof v === 'object' && v !== null && isStdio(v)) {
+      result[k] = deepClone(v);
+    }
+  }
+  return result;
+}
+
+function fwdOpencode(servers: ServerMap): ServerMap {
+  const result: ServerMap = {};
+  for (const [k, v] of Object.entries(servers)) {
+    if (typeof v !== 'object' || v === null) {
+      result[k] = v;
+      continue;
+    }
+    if (isHttpServer(v)) {
+      const headers: Record<string, string> = {
+        ...((v.headers as Record<string, string>) ?? {}),
+      };
+      ensureHeader(headers, 'Accept', 'application/json, text/event-stream');
+      const entry: RawServerEntry = { type: 'remote', url: v.url ?? '', headers, enabled: true };
+      if (v.env && typeof v.env === 'object') entry.env = v.env;
+      result[k] = entry;
+    } else if (isStdio(v)) {
+      const cmdVec: string[] = [];
+      if (typeof v.command === 'string' && v.command) cmdVec.push(v.command);
+      if (Array.isArray(v.args)) cmdVec.push(...(v.args as string[]));
+      const entry: RawServerEntry = { type: 'local', command: cmdVec, enabled: true };
+      if (v.env && typeof v.env === 'object') entry.env = v.env;
+      result[k] = entry;
+    } else {
+      result[k] = deepClone(v);
+    }
+  }
+  return result;
+}
+
+function fwdCopilot(servers: ServerMap): ServerMap {
+  const result: ServerMap = {};
+  for (const [k, v] of Object.entries(servers)) {
+    if (typeof v === 'object' && v !== null && !('tools' in v)) {
+      result[k] = { ...deepClone(v), tools: ['*'] };
+    } else {
+      result[k] = deepClone(v);
+    }
+  }
+  return result;
+}
+
+// ── Reverse Adapters (agent → canonical) ───────────────────────────────────
+
+function revPassthrough(servers: ServerMap): ServerMap {
+  return deepClone(servers);
+}
+
+function revGemini(servers: ServerMap): ServerMap {
+  const result: ServerMap = {};
+  for (const [k, v] of Object.entries(servers)) {
+    if (typeof v === 'object' && v !== null && 'httpUrl' in v) {
+      const { httpUrl, ...rest } = v;
+      const entry = { ...rest, type: 'http', url: httpUrl } as RawServerEntry;
+      stripInjectedHeaders(entry);
+      result[k] = entry;
+    } else {
+      result[k] = deepClone(v);
+    }
+  }
+  return result;
+}
+
+function revCursor(servers: ServerMap): ServerMap {
+  const result: ServerMap = {};
+  for (const [k, v] of Object.entries(servers)) {
+    if (typeof v === 'object' && v !== null && 'url' in v && !('command' in v)) {
+      result[k] = { ...deepClone(v), type: 'http' };
+    } else {
+      result[k] = deepClone(v);
+    }
+  }
+  return result;
+}
+
+function revCodex(servers: ServerMap): ServerMap {
+  return deepClone(servers);
+}
+
+function revOpencode(servers: ServerMap): ServerMap {
+  const result: ServerMap = {};
+  for (const [k, v] of Object.entries(servers)) {
+    if (typeof v !== 'object' || v === null) {
+      result[k] = v;
+      continue;
+    }
+    if (v.type === 'remote') {
+      const { type: _, enabled: _e, ...rest } = v;
+      const entry = { ...rest, type: 'http' } as RawServerEntry;
+      stripInjectedHeaders(entry);
+      result[k] = entry;
+    } else if (v.type === 'local' && Array.isArray(v.command)) {
+      const cmdArr = v.command as string[];
+      const [command, ...args] = cmdArr;
+      const entry: RawServerEntry = {};
+      if (command) entry.command = command;
+      if (args.length) entry.args = args;
+      result[k] = entry;
+    } else {
+      result[k] = deepClone(v);
+    }
+  }
+  return result;
+}
+
+function revCopilot(servers: ServerMap): ServerMap {
+  const result: ServerMap = {};
+  for (const [k, v] of Object.entries(servers)) {
+    if (typeof v === 'object' && v !== null) {
+      const clone = deepClone(v);
+      if (Array.isArray(clone.tools) && clone.tools.length === 1 && clone.tools[0] === '*') {
+        delete clone.tools;
+      }
+      result[k] = clone;
+    } else {
+      result[k] = v;
+    }
+  }
+  return result;
+}
+
+// ── Public API ─────────────────────────────────────────────────────────────
+
+const FORWARD: Record<AdapterType, (s: ServerMap) => ServerMap> = {
+  passthrough: fwdPassthrough,
+  gemini: fwdGemini,
+  cursor: fwdCursor,
+  codex: fwdCodex,
+  opencode: fwdOpencode,
+  copilot: fwdCopilot,
+};
+
+const REVERSE: Record<AdapterType, (s: ServerMap) => ServerMap> = {
+  passthrough: revPassthrough,
+  gemini: revGemini,
+  cursor: revCursor,
+  codex: revCodex,
+  opencode: revOpencode,
+  copilot: revCopilot,
+};
+
+export function adaptForward(adapter: AdapterType, servers: ServerMap): ServerMap {
+  return FORWARD[adapter](servers);
+}
+
+export function adaptReverse(adapter: AdapterType, servers: ServerMap): ServerMap {
+  return REVERSE[adapter](servers);
+}
diff --git a/src/main/core/mcp/utils/catalog.ts b/src/main/core/mcp/utils/catalog.ts
new file mode 100644
index 0000000000..492938a0a7
--- /dev/null
+++ b/src/main/core/mcp/utils/catalog.ts
@@ -0,0 +1,17 @@
+import { catalogData } from '@shared/mcp/catalog';
+import type { McpCatalogEntry, RawServerEntry } from '@shared/mcp/types';
+
+export function loadCatalog(): McpCatalogEntry[] {
+  return Object.entries(catalogData).map(([key, entry]) => ({
+    key,
+    name: entry.name,
+    description: entry.description,
+    docsUrl: entry.docsUrl,
+    defaultConfig: entry.config,
+    credentialKeys: entry.credentialKeys,
+  }));
+}
+
+export function getCatalogServerConfig(key: string): RawServerEntry | undefined {
+  return catalogData[key]?.config;
+}
diff --git a/src/main/core/mcp/utils/config-io.test.ts b/src/main/core/mcp/utils/config-io.test.ts
new file mode 100644
index 0000000000..c0a392ac1b
--- /dev/null
+++ b/src/main/core/mcp/utils/config-io.test.ts
@@ -0,0 +1,128 @@
+import * as fs from 'fs/promises';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import type { AgentMcpMeta } from '@shared/mcp/types';
+import { readServers, writeServers } from './config-io';
+
+vi.mock('fs/promises', () => ({
+  readFile: vi.fn(),
+  writeFile: vi.fn(),
+  mkdir: vi.fn(),
+}));
+
+vi.mock('../../../main/lib/logger', () => ({
+  log: { error: vi.fn(), warn: vi.fn(), info: vi.fn() },
+}));
+
+const mockFs = vi.mocked(fs);
+
+function makeMeta(overrides: Partial<AgentMcpMeta> = {}): AgentMcpMeta {
+  return {
+    agentId: 'claude',
+    configPath: '/home/test/.claude.json',
+    serversPath: ['mcpServers'],
+    template: { mcpServers: {} },
+    isToml: false,
+    adapter: 'passthrough',
+    ...overrides,
+  };
+}
+
+describe('readServers', () => {
+  beforeEach(() => vi.clearAllMocks());
+
+  it('reads JSON config and extracts servers at path', async () => {
+    mockFs.readFile.mockResolvedValue(JSON.stringify({ mcpServers: { s1: { command: 'npx' } } }));
+    const result = await readServers(makeMeta());
+    expect(result).toEqual({ s1: { command: 'npx' } });
+  });
+
+  it('returns empty object when file does not exist', async () => {
+    const err = new Error('ENOENT') as NodeJS.ErrnoException;
+    err.code = 'ENOENT';
+    mockFs.readFile.mockRejectedValue(err);
+    const result = await readServers(makeMeta());
+    expect(result).toEqual({});
+  });
+
+  it('returns empty object when servers path not found in config', async () => {
+    mockFs.readFile.mockResolvedValue(JSON.stringify({ other: 'stuff' }));
+    const result = await readServers(makeMeta());
+    expect(result).toEqual({});
+  });
+
+  it('handles nested serversPath', async () => {
+    const meta = makeMeta({
+      serversPath: ['settings', 'mcp', 'servers'],
+      template: { settings: { mcp: { servers: {} } } },
+    });
+    mockFs.readFile.mockResolvedValue(
+      JSON.stringify({ settings: { mcp: { servers: { s1: { command: 'x' } } } } })
+    );
+    const result = await readServers(meta);
+    expect(result).toEqual({ s1: { command: 'x' } });
+  });
+
+  it('reads TOML config for codex', async () => {
+    const meta = makeMeta({
+      agentId: 'codex',
+      configPath: '/home/test/.codex/config.toml',
+      serversPath: ['mcp_servers'],
+      isToml: true,
+      adapter: 'codex',
+    });
+    mockFs.readFile.mockResolvedValue(
+      '[mcp_servers.myserver]\ncommand = "npx"\nargs = ["-y", "foo"]\n'
+    );
+    const result = await readServers(meta);
+    expect(result.myserver).toBeDefined();
+    expect(result.myserver.command).toBe('npx');
+  });
+});
+
+describe('writeServers', () => {
+  beforeEach(() => vi.clearAllMocks());
+
+  it('writes JSON config merging servers at path', async () => {
+    mockFs.readFile.mockResolvedValue(JSON.stringify({ otherKey: 'keep' }));
+    mockFs.mkdir.mockResolvedValue(undefined);
+    mockFs.writeFile.mockResolvedValue(undefined);
+
+    await writeServers(makeMeta(), { s1: { command: 'npx' } });
+
+    const written = JSON.parse(mockFs.writeFile.mock.calls[0][1] as string);
+    expect(written.mcpServers).toEqual({ s1: { command: 'npx' } });
+    expect(written.otherKey).toBe('keep');
+  });
+
+  it('preserves all sibling keys outside the servers path', async () => {
+    mockFs.readFile.mockResolvedValue(
+      JSON.stringify({
+        theme: 'dark',
+        mcpServers: { oldServer: { command: 'old' } },
+        anotherKey: [1, 2, 3],
+      })
+    );
+    mockFs.mkdir.mockResolvedValue(undefined);
+    mockFs.writeFile.mockResolvedValue(undefined);
+
+    await writeServers(makeMeta(), { newServer: { command: 'new' } });
+
+    const written = JSON.parse(mockFs.writeFile.mock.calls[0][1] as string);
+    expect(written.theme).toBe('dark');
+    expect(written.anotherKey).toEqual([1, 2, 3]);
+    expect(written.mcpServers).toEqual({ newServer: { command: 'new' } });
+  });
+
+  it('creates file from template when file does not exist', async () => {
+    const err = new Error('ENOENT') as NodeJS.ErrnoException;
+    err.code = 'ENOENT';
+    mockFs.readFile.mockRejectedValue(err);
+    mockFs.mkdir.mockResolvedValue(undefined);
+    mockFs.writeFile.mockResolvedValue(undefined);
+
+    await writeServers(makeMeta(), { s1: { command: 'npx' } });
+
+    const written = JSON.parse(mockFs.writeFile.mock.calls[0][1] as string);
+    expect(written.mcpServers).toEqual({ s1: { command: 'npx' } });
+  });
+});
diff --git a/src/main/core/mcp/utils/config-io.ts b/src/main/core/mcp/utils/config-io.ts
new file mode 100644
index 0000000000..2abf2d6c64
--- /dev/null
+++ b/src/main/core/mcp/utils/config-io.ts
@@ -0,0 +1,117 @@
+import * as fs from 'fs/promises';
+import path from 'path';
+import * as jsoncParser from 'jsonc-parser';
+import * as toml from 'smol-toml';
+import type { AgentMcpMeta, RawServerEntry, ServerMap } from '@shared/mcp/types';
+import { log } from '@main/lib/logger';
+
+// ── Read ───────────────────────────────────────────────────────────────────
+
+export async function readServers(meta: AgentMcpMeta): Promise<ServerMap> {
+  let content: string;
+  try {
+    content = await fs.readFile(meta.configPath, 'utf-8');
+  } catch (err: unknown) {
+    if ((err as NodeJS.ErrnoException).code === 'ENOENT') return {};
+    throw err;
+  }
+
+  if (!content.trim()) return {};
+
+  let parsed: Record<string, unknown>;
+  if (meta.isToml) {
+    parsed = toml.parse(content) as Record<string, unknown>;
+  } else if (meta.configPath.endsWith('.jsonc')) {
+    const errors: jsoncParser.ParseError[] = [];
+    parsed = (jsoncParser.parse(content, errors) ?? {}) as Record<string, unknown>;
+    if (errors.length) {
+      log.warn(`JSONC parse errors in ${meta.configPath}:`, errors);
+    }
+  } else {
+    try {
+      parsed = JSON.parse(content);
+    } catch {
+      log.warn(`Invalid JSON in ${meta.configPath}, returning empty`);
+      return {};
+    }
+  }
+
+  return extractAtPath(parsed, meta.serversPath);
+}
+
+function extractAtPath(obj: Record<string, unknown>, pathSegments: string[]): ServerMap {
+  let current: unknown = obj;
+  for (const key of pathSegments) {
+    if (typeof current !== 'object' || current === null) return {};
+    current = (current as Record<string, unknown>)[key];
+    if (current === undefined) return {};
+  }
+  if (typeof current !== 'object' || current === null || Array.isArray(current)) return {};
+  const result: ServerMap = {};
+  for (const [k, v] of Object.entries(current as Record<string, unknown>)) {
+    if (typeof v === 'object' && v !== null && !Array.isArray(v)) {
+      result[k] = v as RawServerEntry;
+    }
+  }
+  return result;
+}
+
+// ── Write ──────────────────────────────────────────────────────────────────
+
+export async function writeServers(meta: AgentMcpMeta, servers: ServerMap): Promise<void> {
+  await fs.mkdir(path.dirname(meta.configPath), { recursive: true });
+  let existing: Record<string, unknown>;
+  let existingRaw: string | undefined;
+  try {
+    existingRaw = await fs.readFile(meta.configPath, 'utf-8');
+  } catch (err: unknown) {
+    if ((err as NodeJS.ErrnoException).code !== 'ENOENT') throw err;
+  }
+
+  if (meta.isToml) {
+    existing = existingRaw
+      ? (toml.parse(existingRaw) as Record<string, unknown>)
+      : { ...meta.template };
+    setAtPath(existing, meta.serversPath, servers);
+    await fs.writeFile(
+      meta.configPath,
+      toml.stringify(existing as Parameters<typeof toml.stringify>[0])
+    );
+    return;
+  }
+
+  if (meta.configPath.endsWith('.jsonc') && existingRaw) {
+    let modified = existingRaw;
+    const edits = jsoncParser.modify(modified, meta.serversPath, servers, {});
+    modified = jsoncParser.applyEdits(modified, edits);
+    await fs.writeFile(meta.configPath, modified);
+    return;
+  }
+
+  if (existingRaw) {
+    try {
+      existing = JSON.parse(existingRaw);
+    } catch {
+      log.warn(`Invalid JSON in ${meta.configPath}, resetting to template`);
+      existing = JSON.parse(JSON.stringify(meta.template));
+    }
+  } else {
+    existing = JSON.parse(JSON.stringify(meta.template));
+  }
+  setAtPath(existing, meta.serversPath, servers);
+  await fs.writeFile(meta.configPath, JSON.stringify(existing, null, 2));
+}
+
+function setAtPath(obj: Record<string, unknown>, pathSegments: string[], value: unknown): void {
+  let current: Record<string, unknown> = obj;
+  for (let i = 0; i < pathSegments.length - 1; i++) {
+    const key = pathSegments[i];
+    if (typeof current[key] !== 'object' || current[key] === null) {
+      current[key] = {};
+    }
+    current = current[key] as Record<string, unknown>;
+  }
+  if (pathSegments.length > 0) {
+    current[pathSegments[pathSegments.length - 1]] = value;
+  }
+}
diff --git a/src/main/core/mcp/utils/config-paths.test.ts b/src/main/core/mcp/utils/config-paths.test.ts
new file mode 100644
index 0000000000..bc4b89ecf3
--- /dev/null
+++ b/src/main/core/mcp/utils/config-paths.test.ts
@@ -0,0 +1,94 @@
+import { describe, expect, it, vi } from 'vitest';
+import { getAgentMcpMeta, getAllMcpAgentIds } from './config-paths';
+
+vi.mock('os', () => ({
+  default: { homedir: () => '/home/testuser' },
+  homedir: () => '/home/testuser',
+}));
+
+describe('getAgentMcpMeta', () => {
+  it('returns correct meta for claude', () => {
+    const meta = getAgentMcpMeta('claude');
+    expect(meta).toBeDefined();
+    expect(meta!.configPath).toBe('/home/testuser/.claude.json');
+    expect(meta!.serversPath).toEqual(['mcpServers']);
+    expect(meta!.adapter).toBe('passthrough');
+    expect(meta!.isToml).toBe(false);
+  });
+
+  it('returns correct meta for cursor', () => {
+    const meta = getAgentMcpMeta('cursor');
+    expect(meta).toBeDefined();
+    expect(meta!.configPath).toBe('/home/testuser/.cursor/mcp.json');
+    expect(meta!.adapter).toBe('cursor');
+  });
+
+  it('returns correct meta for codex (toml)', () => {
+    const meta = getAgentMcpMeta('codex');
+    expect(meta).toBeDefined();
+    expect(meta!.configPath).toContain('config.toml');
+    expect(meta!.isToml).toBe(true);
+    expect(meta!.adapter).toBe('codex');
+  });
+
+  it('returns correct meta for amp', () => {
+    const meta = getAgentMcpMeta('amp');
+    expect(meta).toBeDefined();
+    expect(meta!.configPath).toBe('/home/testuser/.config/amp/settings.json');
+    expect(meta!.adapter).toBe('passthrough');
+  });
+
+  it('returns correct meta for gemini', () => {
+    const meta = getAgentMcpMeta('gemini');
+    expect(meta).toBeDefined();
+    expect(meta!.configPath).toBe('/home/testuser/.gemini/settings.json');
+    expect(meta!.serversPath).toEqual(['mcpServers']);
+    expect(meta!.adapter).toBe('gemini');
+  });
+
+  it('returns correct meta for qwen (uses gemini adapter)', () => {
+    const meta = getAgentMcpMeta('qwen');
+    expect(meta).toBeDefined();
+    expect(meta!.configPath).toBe('/home/testuser/.qwen/settings.json');
+    expect(meta!.adapter).toBe('gemini');
+  });
+
+  it('returns correct meta for opencode', () => {
+    const meta = getAgentMcpMeta('opencode');
+    expect(meta).toBeDefined();
+    expect(meta!.configPath).toContain('opencode');
+    expect(meta!.adapter).toBe('opencode');
+  });
+
+  it('returns correct meta for copilot', () => {
+    const meta = getAgentMcpMeta('copilot');
+    expect(meta).toBeDefined();
+    expect(meta!.configPath).toBe('/home/testuser/.copilot/mcp-config.json');
+    expect(meta!.adapter).toBe('copilot');
+  });
+
+  it('returns correct meta for droid (passthrough)', () => {
+    const meta = getAgentMcpMeta('droid');
+    expect(meta).toBeDefined();
+    expect(meta!.adapter).toBe('passthrough');
+  });
+
+  it('returns undefined for unknown agent', () => {
+    const meta = getAgentMcpMeta('unknown-agent');
+    expect(meta).toBeUndefined();
+  });
+
+  it('getAllMcpAgentIds returns all supported agents', () => {
+    const ids = getAllMcpAgentIds();
+    expect(ids).toContain('claude');
+    expect(ids).toContain('cursor');
+    expect(ids).toContain('codex');
+    expect(ids).toContain('amp');
+    expect(ids).toContain('gemini');
+    expect(ids).toContain('qwen');
+    expect(ids).toContain('opencode');
+    expect(ids).toContain('copilot');
+    expect(ids).toContain('droid');
+    expect(ids.length).toBe(9);
+  });
+});
diff --git a/src/main/core/mcp/utils/config-paths.ts b/src/main/core/mcp/utils/config-paths.ts
new file mode 100644
index 0000000000..96e0ea3a0f
--- /dev/null
+++ b/src/main/core/mcp/utils/config-paths.ts
@@ -0,0 +1,110 @@
+import os from 'os';
+import path from 'path';
+import type { AdapterType, AgentMcpMeta } from '@shared/mcp/types';
+
+interface AgentConfigDef {
+  pathSegments: string[];
+  serversPath: string[];
+  template: Record<string, unknown>;
+  isToml: boolean;
+  adapter: AdapterType;
+  supportsHttp: boolean;
+}
+
+const AGENT_CONFIGS: Record<string, AgentConfigDef> = {
+  claude: {
+    pathSegments: ['.claude.json'],
+    serversPath: ['mcpServers'],
+    template: { mcpServers: {} },
+    isToml: false,
+    adapter: 'passthrough',
+    supportsHttp: true,
+  },
+  cursor: {
+    pathSegments: ['.cursor', 'mcp.json'],
+    serversPath: ['mcpServers'],
+    template: { mcpServers: {} },
+    isToml: false,
+    adapter: 'cursor',
+    supportsHttp: true,
+  },
+  codex: {
+    pathSegments: ['.codex', 'config.toml'],
+    serversPath: ['mcp_servers'],
+    template: { mcp_servers: {} },
+    isToml: true,
+    adapter: 'codex',
+    supportsHttp: false,
+  },
+  amp: {
+    pathSegments: ['.config', 'amp', 'settings.json'],
+    serversPath: ['mcpServers'],
+    template: { mcpServers: {} },
+    isToml: false,
+    adapter: 'passthrough',
+    supportsHttp: true,
+  },
+  gemini: {
+    pathSegments: ['.gemini', 'settings.json'],
+    serversPath: ['mcpServers'],
+    template: { mcpServers: {} },
+    isToml: false,
+    adapter: 'gemini',
+    supportsHttp: true,
+  },
+  qwen: {
+    pathSegments: ['.qwen', 'settings.json'],
+    serversPath: ['mcpServers'],
+    template: { mcpServers: {} },
+    isToml: false,
+    adapter: 'gemini',
+    supportsHttp: true,
+  },
+  opencode: {
+    pathSegments: ['.config', 'opencode', 'opencode.json'],
+    serversPath: ['mcp'],
+    template: { mcp: {} },
+    isToml: false,
+    adapter: 'opencode',
+    supportsHttp: true,
+  },
+  copilot: {
+    pathSegments: ['.copilot', 'mcp-config.json'],
+    serversPath: ['mcpServers'],
+    template: { mcpServers: {} },
+    isToml: false,
+    adapter: 'copilot',
+    supportsHttp: true,
+  },
+  droid: {
+    pathSegments: ['.droid', 'settings.json'],
+    serversPath: ['mcpServers'],
+    template: { mcpServers: {} },
+    isToml: false,
+    adapter: 'passthrough',
+    supportsHttp: true,
+  },
+};
+
+export function getAgentMcpMeta(agentId: string): AgentMcpMeta | undefined {
+  const def = AGENT_CONFIGS[agentId];
+  if (!def) return undefined;
+
+  const home = os.homedir();
+  return {
+    agentId,
+    configPath: path.join(home, ...def.pathSegments),
+    serversPath: def.serversPath,
+    template: def.template,
+    isToml: def.isToml,
+    adapter: def.adapter,
+  };
+}
+
+export function getAllMcpAgentIds(): string[] {
+  return Object.keys(AGENT_CONFIGS);
+}
+
+export function agentSupportsHttp(agentId: string): boolean {
+  return AGENT_CONFIGS[agentId]?.supportsHttp ?? true;
+}
diff --git a/src/main/core/mcp/utils/conversion.ts b/src/main/core/mcp/utils/conversion.ts
new file mode 100644
index 0000000000..2211fbadca
--- /dev/null
+++ b/src/main/core/mcp/utils/conversion.ts
@@ -0,0 +1,49 @@
+import type { McpServer, RawServerEntry } from '@shared/mcp/types';
+
+export function rawToMcpServer(
+  name: string,
+  raw: RawServerEntry,
+  providers: Set<string>
+): McpServer {
+  const isHttp = raw.type === 'http' || ('url' in raw && !('command' in raw));
+  return {
+    name,
+    transport: isHttp ? 'http' : 'stdio',
+    command: typeof raw.command === 'string' ? raw.command : undefined,
+    args: Array.isArray(raw.args) ? (raw.args as string[]) : undefined,
+    url: typeof raw.url === 'string' ? raw.url : undefined,
+    headers:
+      typeof raw.headers === 'object' && raw.headers !== null
+        ? (raw.headers as Record<string, string>)
+        : undefined,
+    env:
+      typeof raw.env === 'object' && raw.env !== null
+        ? (raw.env as Record<string, string>)
+        : undefined,
+    providers: Array.from(providers),
+  };
+}
+
+export function mcpServerToRaw(server: McpServer): RawServerEntry {
+  const raw: RawServerEntry = {};
+  if (server.transport === 'http') {
+    raw.type = 'http';
+    if (server.url) raw.url = server.url;
+    if (server.headers && Object.keys(server.headers).length) raw.headers = server.headers;
+  } else {
+    if (server.command) raw.command = server.command;
+    if (server.args?.length) raw.args = server.args;
+  }
+  if (server.env && Object.keys(server.env).length) raw.env = server.env;
+  return raw;
+}
+
+export function rawEntryToMcpFields(server: McpServer): Record<string, unknown> {
+  const fields: Record<string, unknown> = {};
+  if (server.command) fields.command = server.command;
+  if (server.args?.length) fields.args = server.args;
+  if (server.url) fields.url = server.url;
+  if (server.headers) fields.headers = server.headers;
+  if (server.env) fields.env = server.env;
+  return fields;
+}
diff --git a/src/main/core/plain/controller.ts b/src/main/core/plain/controller.ts
new file mode 100644
index 0000000000..094bd62c8b
--- /dev/null
+++ b/src/main/core/plain/controller.ts
@@ -0,0 +1,15 @@
+import { createRPCController } from '@shared/ipc/rpc';
+import { plainConnectionService } from './plain-connection-service';
+
+export const plainController = createRPCController({
+  saveToken: async (token: string) => {
+    if (!token || typeof token !== 'string') {
+      return { success: false, error: 'A Plain API key is required.' };
+    }
+    return plainConnectionService.saveToken(token);
+  },
+
+  checkConnection: async () => plainConnectionService.checkConnection(),
+
+  clearToken: async () => plainConnectionService.clearToken(),
+});
diff --git a/src/main/core/plain/plain-connection-service.ts b/src/main/core/plain/plain-connection-service.ts
new file mode 100644
index 0000000000..b38d21152e
--- /dev/null
+++ b/src/main/core/plain/plain-connection-service.ts
@@ -0,0 +1,173 @@
+import {
+  AuthenticationError,
+  ForbiddenError,
+  PlainClient,
+  PlainError,
+  RateLimitError,
+} from '@team-plain/graphql';
+import { ISSUE_PROVIDER_CAPABILITIES, type ConnectionStatus } from '@shared/issue-providers';
+import { encryptedAppSecretsStore } from '@main/core/secrets/encrypted-app-secrets-store';
+import { log } from '@main/lib/logger';
+
+const NOT_CONFIGURED_ERROR = 'Plain is not configured. Connect Plain in settings.';
+
+export function toPlainErrorMessage(error: unknown, fallback: string): string {
+  if (error instanceof AuthenticationError) {
+    return error.message || 'Plain authentication failed. Check your API key.';
+  }
+  if (error instanceof ForbiddenError) {
+    return (
+      error.message ||
+      'Plain API key was accepted but is missing required permissions. Create a key with thread read permissions.'
+    );
+  }
+  if (error instanceof RateLimitError) {
+    return 'Plain API rate limit exceeded. Please try again shortly.';
+  }
+  if (error instanceof PlainError && error.message) {
+    return error.message;
+  }
+  if (error instanceof Error && error.message) {
+    return error.message;
+  }
+  return fallback;
+}
+
+function isNotConfigured(error: unknown): boolean {
+  return error instanceof Error && error.message === NOT_CONFIGURED_ERROR;
+}
+
+export class PlainConnectionService {
+  private readonly PLAIN_TOKEN_SECRET_KEY = 'emdash-plain-token';
+
+  private cachedToken: string | null | undefined = undefined;
+  private client: PlainClient | null = null;
+  private clientToken: string | null = null;
+
+  async saveToken(token: string): Promise<{ success: boolean; error?: string }> {
+    const clean = token.trim();
+    if (!clean) {
+      return { success: false, error: 'Plain API key cannot be empty.' };
+    }
+
+    try {
+      const client = this.getClientForToken(clean);
+      await this.validateToken(client);
+      await this.storeToken(clean);
+      return { success: true };
+    } catch (error) {
+      return {
+        success: false,
+        error: toPlainErrorMessage(error, 'Failed to validate Plain API key.'),
+      };
+    }
+  }
+
+  async clearToken(): Promise<{ success: boolean; error?: string }> {
+    try {
+      await encryptedAppSecretsStore.deleteSecret(this.PLAIN_TOKEN_SECRET_KEY);
+      this.cachedToken = null;
+      this.client = null;
+      this.clientToken = null;
+      return { success: true };
+    } catch (error) {
+      return {
+        success: false,
+        error: toPlainErrorMessage(error, 'Failed to clear Plain API key.'),
+      };
+    }
+  }
+
+  async checkConnection(): Promise<ConnectionStatus> {
+    try {
+      const token = await this.getStoredToken();
+      if (!token) {
+        return {
+          connected: false,
+          capabilities: ISSUE_PROVIDER_CAPABILITIES.plain,
+        };
+      }
+
+      const client = this.getClientForToken(token);
+      await this.validateToken(client);
+
+      return {
+        connected: true,
+        capabilities: ISSUE_PROVIDER_CAPABILITIES.plain,
+      };
+    } catch (error) {
+      if (isNotConfigured(error)) {
+        return {
+          connected: false,
+          capabilities: ISSUE_PROVIDER_CAPABILITIES.plain,
+        };
+      }
+
+      return {
+        connected: false,
+        error: toPlainErrorMessage(error, 'Failed to verify Plain connection.'),
+        capabilities: ISSUE_PROVIDER_CAPABILITIES.plain,
+      };
+    }
+  }
+
+  async getClient(): Promise<PlainClient | null> {
+    const token = await this.getStoredToken();
+    if (!token) {
+      return null;
+    }
+
+    return this.getClientForToken(token);
+  }
+
+  private getClientForToken(token: string): PlainClient {
+    if (!this.client || this.clientToken !== token) {
+      this.client = new PlainClient({ apiKey: token });
+      this.clientToken = token;
+    }
+    return this.client;
+  }
+
+  private async storeToken(token: string): Promise<void> {
+    await encryptedAppSecretsStore.setSecret(this.PLAIN_TOKEN_SECRET_KEY, token);
+    this.cachedToken = token;
+  }
+
+  private async getStoredToken(): Promise<string | null> {
+    if (this.cachedToken) {
+      return this.cachedToken;
+    }
+
+    try {
+      this.cachedToken = await encryptedAppSecretsStore.getSecret(this.PLAIN_TOKEN_SECRET_KEY);
+      return this.cachedToken;
+    } catch (error) {
+      log.error('Failed to read Plain token from secure storage:', error);
+      return null;
+    }
+  }
+
+  private async validateToken(client: PlainClient): Promise<void> {
+    try {
+      await client.query.threads({ first: 1 });
+    } catch (error) {
+      if (error instanceof ForbiddenError) {
+        throw new ForbiddenError(
+          'Insufficient permissions: this key cannot read threads. Ensure thread read permissions are enabled.'
+        );
+      }
+      if (error instanceof AuthenticationError || error instanceof RateLimitError) {
+        throw error;
+      }
+      if (error instanceof PlainError) {
+        throw error;
+      }
+      if (error instanceof Error) {
+        throw new PlainError(error.message);
+      }
+      throw new PlainError(NOT_CONFIGURED_ERROR);
+    }
+  }
+}
+
+export const plainConnectionService = new PlainConnectionService();
diff --git a/src/main/core/plain/plain-issue-provider.ts b/src/main/core/plain/plain-issue-provider.ts
new file mode 100644
index 0000000000..e457d52656
--- /dev/null
+++ b/src/main/core/plain/plain-issue-provider.ts
@@ -0,0 +1,100 @@
+import { ISSUE_PROVIDER_CAPABILITIES, type IssueListResult } from '@shared/issue-providers';
+import type { Issue } from '@shared/tasks';
+import { clampIssueLimit, normalizeSearchTerm } from '@main/core/issues/helpers/provider-inputs';
+import type { IssueProvider } from '@main/core/issues/issue-provider';
+import { log } from '@main/lib/logger';
+import { plainConnectionService, toPlainErrorMessage } from './plain-connection-service';
+
+type PlainThreadLike = {
+  id: string;
+  ref?: string | null;
+  title?: string | null;
+  previewText?: string | null;
+  description?: string | null;
+  status?: string | null;
+  updatedAt?: { iso8601: string } | null;
+};
+
+function toIssue(thread: PlainThreadLike): Issue {
+  return {
+    provider: 'plain',
+    identifier: thread.ref ?? thread.id,
+    title: thread.title ?? '',
+    url: '',
+    description: thread.previewText ?? thread.description ?? undefined,
+    status: thread.status ?? undefined,
+    updatedAt: thread.updatedAt?.iso8601 ?? undefined,
+    fetchedAt: new Date().toISOString(),
+  };
+}
+
+async function listIssues(limit: number): Promise<IssueListResult> {
+  const client = await plainConnectionService.getClient();
+  if (!client) {
+    return { success: false, error: 'Plain is not configured. Connect Plain in settings.' };
+  }
+
+  const first = clampIssueLimit(limit, 50, 100);
+
+  try {
+    const connection = await client.query.threads({
+      filters: { statuses: ['TODO'] },
+      sortBy: { field: 'CREATED_AT', direction: 'DESC' },
+      first,
+    });
+
+    return {
+      success: true,
+      issues: connection.nodes.map((thread) => toIssue(thread as PlainThreadLike)),
+    };
+  } catch (error) {
+    return {
+      success: false,
+      error: toPlainErrorMessage(error, 'Failed to fetch Plain threads.'),
+    };
+  }
+}
+
+async function searchIssues(searchTerm: string, limit: number): Promise<IssueListResult> {
+  const term = normalizeSearchTerm(searchTerm);
+  if (!term || term.length < 2) {
+    return { success: true, issues: [] };
+  }
+
+  const client = await plainConnectionService.getClient();
+  if (!client) {
+    return { success: false, error: 'Plain is not configured. Connect Plain in settings.' };
+  }
+
+  const first = clampIssueLimit(limit, 20, 100);
+
+  try {
+    const result = await client.query.searchThreads({
+      searchQuery: { term },
+      first,
+    });
+
+    if (!result?.edges) {
+      return { success: true, issues: [] };
+    }
+
+    return {
+      success: true,
+      issues: result.edges.map((edge) => toIssue(edge.node.thread as PlainThreadLike)),
+    };
+  } catch (error) {
+    log.error('[Plain] searchThreads error:', error);
+    return { success: true, issues: [] };
+  }
+}
+
+export const plainIssueProvider: IssueProvider = {
+  type: 'plain',
+  capabilities: ISSUE_PROVIDER_CAPABILITIES.plain,
+
+  checkConnection: () => plainConnectionService.checkConnection(),
+
+  listIssues: async (opts) => listIssues(opts.limit ?? 50),
+
+  searchIssues: async (opts) => searchIssues(opts.searchTerm, opts.limit ?? 20),
+};
diff --git a/src/main/core/projects/controller.ts b/src/main/core/projects/controller.ts
new file mode 100644
index 0000000000..80ebe9acef
--- /dev/null
+++ b/src/main/core/projects/controller.ts
@@ -0,0 +1,30 @@
+import { createRPCController } from '@shared/ipc/rpc';
+import {
+  createLocalProject,
+  createSshProject,
+  getLocalProjectPathStatus,
+  getSshProjectPathStatus,
+} from './operations/createProject';
+import { deleteProject } from './operations/deleteProject';
+import { getProjectBootstrapStatus } from './operations/getProjectBootstrapStatus';
+import { getLocalProjectByPath, getProjects, getSshProjectByPath } from './operations/getProjects';
+import { getProjectSettings } from './operations/getProjectSettings';
+import { openProject } from './operations/openProject';
+import { updateProjectConnection } from './operations/updateProjectConnection';
+import { updateProjectSettings } from './operations/updateProjectSettings';
+
+export const projectController = createRPCController({
+  createLocalProject,
+  createSshProject,
+  getLocalProjectPathStatus,
+  getSshProjectPathStatus,
+  getProjects,
+  deleteProject,
+  getLocalProjectByPath,
+  getSshProjectByPath,
+  getProjectSettings,
+  updateProjectSettings,
+  updateProjectConnection,
+  getProjectBootstrapStatus,
+  openProject,
+});
diff --git a/src/main/core/projects/impl/local-project-provider.ts b/src/main/core/projects/impl/local-project-provider.ts
new file mode 100644
index 0000000000..cbf4da7651
--- /dev/null
+++ b/src/main/core/projects/impl/local-project-provider.ts
@@ -0,0 +1,520 @@
+import fs from 'node:fs';
+import path from 'node:path';
+import { Conversation } from '@shared/conversations';
+import { gitRefChangedChannel } from '@shared/events/gitEvents';
+import type { FetchError } from '@shared/git';
+import { bareRefName } from '@shared/git-utils';
+import { LocalProject } from '@shared/projects';
+import { makePtySessionId } from '@shared/ptySessionId';
+import { err, ok, type Result } from '@shared/result';
+import { getTaskEnvVars } from '@shared/task/envVars';
+import { Task, type TaskBootstrapStatus } from '@shared/tasks';
+import { type Terminal } from '@shared/terminals';
+import { workspaceKey } from '@shared/workspace-key';
+import { LocalConversationProvider } from '@main/core/conversations/impl/local-conversation';
+import { LocalFileSystem } from '@main/core/fs/impl/local-fs';
+import type { FileSystemProvider } from '@main/core/fs/types';
+import { GitFetchService } from '@main/core/git/git-fetch-service';
+import { GitWatcherService } from '@main/core/git/git-watcher-service';
+import { GitService } from '@main/core/git/impl/git-service';
+import { GitRepositoryService } from '@main/core/git/repository-service';
+import { githubConnectionService } from '@main/core/github/services/github-connection-service';
+import { killTmuxSession, makeTmuxSessionName } from '@main/core/pty/tmux-session-name';
+import { prSyncScheduler } from '@main/core/pull-requests/pr-sync-scheduler';
+import { getTaskSessionLeafIds } from '@main/core/tasks/session-targets';
+import { LocalTerminalProvider } from '@main/core/terminals/impl/local-terminal-provider';
+import { getGitLocalExec, getLocalExec } from '@main/core/utils/exec';
+import type { Workspace } from '@main/core/workspaces/workspace';
+import { WorkspaceLifecycleService } from '@main/core/workspaces/workspace-lifecycle-service';
+import { WorkspaceRegistry } from '@main/core/workspaces/workspace-registry';
+import { events } from '@main/lib/events';
+import { log } from '@main/lib/logger';
+import {
+  type ProjectProvider,
+  type ProjectRemoteState,
+  type ProvisionTaskError,
+  type TaskProvider,
+  type TeardownTaskError,
+} from '../project-provider';
+import {
+  formatProvisionTaskError,
+  isProvisionTaskError,
+  mapWorktreeErrorToProvisionError,
+} from '../provision-task-error';
+import { LocalProjectSettingsProvider } from '../settings/project-settings';
+import type { ProjectSettingsProvider } from '../settings/schema';
+import { getEffectiveTaskSettings } from '../settings/task-settings';
+import { TimeoutSignal, withTimeout } from '../utils';
+import { WorktreeService } from '../worktrees/worktree-service';
+
+const TASK_TIMEOUT_MS = 60_000;
+const TEARDOWN_SCRIPT_WAIT_MS = 10_000;
+
+function toProvisionError(e: unknown): ProvisionTaskError {
+  if (isProvisionTaskError(e)) return e;
+  if (e instanceof TimeoutSignal) return { type: 'timeout', message: e.message, timeout: e.ms };
+  return { type: 'error', message: e instanceof Error ? e.message : String(e) };
+}
+
+function toTeardownError(e: unknown): TeardownTaskError {
+  if (e instanceof TimeoutSignal) return { type: 'timeout', message: e.message, timeout: e.ms };
+  return { type: 'error', message: e instanceof Error ? e.message : String(e) };
+}
+
+export async function createLocalProvider(
+  project: LocalProject,
+  rootFs: FileSystemProvider
+): Promise<LocalProjectProvider> {
+  const settings = new LocalProjectSettingsProvider(
+    project.path,
+    bareRefName(project.baseRef),
+    rootFs
+  );
+  const worktreePoolPath = path.join(await settings.getWorktreeDirectory(), project.name);
+
+  await fs.promises.mkdir(worktreePoolPath, { recursive: true });
+
+  return new LocalProjectProvider(project, rootFs, { settings, worktreePoolPath });
+}
+
+export class LocalProjectProvider implements ProjectProvider {
+  readonly type = 'local';
+  readonly settings: ProjectSettingsProvider;
+  readonly repository: GitRepositoryService;
+  readonly fs: FileSystemProvider;
+
+  private tasks = new Map<string, TaskProvider>();
+  private provisioningTasks = new Map<string, Promise<Result<TaskProvider, ProvisionTaskError>>>();
+  private tearingDownTasks = new Map<string, Promise<Result<void, TeardownTaskError>>>();
+  private bootstrapErrors = new Map<string, ProvisionTaskError>();
+  private worktreeService: WorktreeService;
+  private workspaceRegistry = new WorkspaceRegistry();
+  private readonly localExec = getLocalExec();
+  private readonly _gitWatcher: GitWatcherService;
+  private readonly _gitFetchService: GitFetchService;
+  private _configChangeUnsubscribe: (() => void) | undefined;
+
+  constructor(
+    private readonly project: LocalProject,
+    readonly rootFs: FileSystemProvider,
+    options: {
+      settings: ProjectSettingsProvider;
+      worktreePoolPath: string;
+    }
+  ) {
+    this.settings = options.settings;
+    this.fs = new LocalFileSystem(project.path);
+    const gitExec = getGitLocalExec(() => githubConnectionService.getToken());
+    const repoGit = new GitService(project.path, gitExec, this.fs);
+    this.repository = new GitRepositoryService(repoGit, this.settings);
+    this.worktreeService = new WorktreeService({
+      worktreePoolPath: options.worktreePoolPath,
+      repoPath: project.path,
+      projectSettings: this.settings,
+      exec: gitExec,
+      rootFs: rootFs,
+    });
+    this._gitWatcher = new GitWatcherService(project.id, project.path);
+    void this._gitWatcher.start();
+
+    this._gitFetchService = new GitFetchService(repoGit);
+    this._gitFetchService.start();
+
+    // Re-sync remotes whenever .git/config changes (remote added/removed/changed)
+    this._configChangeUnsubscribe = events.on(gitRefChangedChannel, (p) => {
+      if (p.projectId === project.id && p.kind === 'config') {
+        void prSyncScheduler.onRemoteChanged(project.id);
+      }
+    });
+  }
+
+  async provisionTask(
+    task: Task,
+    conversations: Conversation[],
+    terminals: Terminal[]
+  ): Promise<Result<TaskProvider, ProvisionTaskError>> {
+    const existing = this.tasks.get(task.id);
+    if (existing) return ok(existing);
+    if (this.provisioningTasks.has(task.id)) return this.provisioningTasks.get(task.id)!;
+
+    const promise = withTimeout(
+      this.doProvisionTask(task, conversations, terminals),
+      TASK_TIMEOUT_MS
+    )
+      .then((taskEnv) => {
+        this.tasks.set(task.id, taskEnv);
+        this.provisioningTasks.delete(task.id);
+        return ok(taskEnv);
+      })
+      .catch((e) => {
+        const provisionError = toProvisionError(e);
+        this.bootstrapErrors.set(task.id, provisionError);
+        this.provisioningTasks.delete(task.id);
+        log.error('LocalProjectProvider: failed to provision task', {
+          taskId: task.id,
+          error: String(e),
+        });
+        return err(provisionError);
+      });
+
+    this.provisioningTasks.set(task.id, promise);
+    return promise;
+  }
+
+  private async doProvisionTask(
+    task: Task,
+    conversations: Conversation[],
+    terminals: Terminal[]
+  ): Promise<TaskProvider> {
+    log.debug('LocalProjectProvider: doProvisionTask START', {
+      taskId: task.id,
+    });
+
+    // Refresh remote-tracking refs in the background so they are as fresh as
+    // possible during the lifetime of this task. Non-blocking — provision
+    // continues without waiting for the network round-trip.
+    void this._gitFetchService.fetch();
+
+    // Sync PRs for this task's branch in the background.
+    void prSyncScheduler.onTaskProvisioned(this.project.id, task.taskBranch);
+
+    const workspaceId = workspaceKey(task.taskBranch);
+    const workspace = await this.workspaceRegistry.acquire(workspaceId, async () => {
+      const workDir = await this.resolveTaskWorkDir(task);
+      const exec = getGitLocalExec(() => githubConnectionService.getToken());
+      const workspaceFs = new LocalFileSystem(workDir);
+
+      const projectSettings = await this.settings.get();
+      const defaultBranch = await this.settings.getDefaultBranch();
+      const bootstrapTaskEnvVars = getTaskEnvVars({
+        taskId: task.id,
+        taskName: task.name,
+        taskPath: workDir,
+        projectPath: this.project.path,
+        defaultBranch,
+        portSeed: workDir,
+      });
+      const tmuxEnabled = projectSettings.tmux ?? false;
+
+      const taskLevelSettings = await getEffectiveTaskSettings({
+        projectSettings: this.settings,
+        taskFs: workspaceFs,
+      });
+      const shellSetup = taskLevelSettings.shellSetup ?? projectSettings.shellSetup;
+      const scripts = taskLevelSettings.scripts;
+
+      const workspaceTerminals = new LocalTerminalProvider({
+        projectId: this.project.id,
+        scopeId: workspaceId,
+        taskPath: workDir,
+        tmux: tmuxEnabled,
+        shellSetup,
+        exec,
+        taskEnvVars: bootstrapTaskEnvVars,
+      });
+      const lifecycleService = new WorkspaceLifecycleService({
+        projectId: this.project.id,
+        workspaceId,
+        terminals: workspaceTerminals,
+      });
+
+      const createdWorkspace: Workspace = {
+        id: workspaceId,
+        path: workDir,
+        fs: workspaceFs,
+        git: new GitService(workDir, exec, workspaceFs),
+        settings: this.settings,
+        lifecycleService,
+      };
+
+      if (scripts?.setup) {
+        void lifecycleService.prepareAndRunLifecycleScript({
+          type: 'setup',
+          script: scripts.setup,
+        });
+      }
+
+      if (scripts?.run) {
+        void lifecycleService.prepareLifecycleScript({
+          type: 'run',
+          script: scripts.run,
+        });
+      }
+
+      if (scripts?.teardown) {
+        void lifecycleService.prepareLifecycleScript({
+          type: 'teardown',
+          script: scripts.teardown,
+        });
+      }
+
+      return createdWorkspace;
+    });
+
+    // Register the workspace with the git watcher so that index/HEAD changes
+    // in its worktree git dir are emitted as granular workspace events.
+    const mainDotGitAbs = path.resolve(this.project.path, '.git');
+    const relativeGitDir = await workspace.git.getWorktreeGitDir(mainDotGitAbs);
+    this._gitWatcher.registerWorktree(workspaceId, relativeGitDir);
+
+    let provisionSucceeded = false;
+    try {
+      const exec = getGitLocalExec(() => githubConnectionService.getToken());
+      const projectSettings = await this.settings.get();
+      const defaultBranch = await this.settings.getDefaultBranch();
+      const taskEnvVars = getTaskEnvVars({
+        taskId: task.id,
+        taskName: task.name,
+        taskPath: workspace.path,
+        projectPath: this.project.path,
+        defaultBranch,
+        portSeed: workspace.path,
+      });
+      const tmuxEnabled = projectSettings.tmux ?? false;
+      const taskLevelSettings = await getEffectiveTaskSettings({
+        projectSettings: this.settings,
+        taskFs: workspace.fs,
+      });
+      const shellSetup = taskLevelSettings.shellSetup ?? projectSettings.shellSetup;
+
+      const conversationProvider = new LocalConversationProvider({
+        projectId: this.project.id,
+        taskPath: workspace.path,
+        taskId: task.id,
+        tmux: tmuxEnabled,
+        shellSetup,
+        exec,
+        taskEnvVars,
+      });
+
+      const terminalProvider = new LocalTerminalProvider({
+        projectId: this.project.id,
+        scopeId: task.id,
+        taskPath: workspace.path,
+        tmux: tmuxEnabled,
+        shellSetup,
+        exec,
+        taskEnvVars,
+      });
+
+      const taskEnv: TaskProvider = {
+        taskId: task.id,
+        taskBranch: task.taskBranch,
+        sourceBranch: task.sourceBranch,
+        taskEnvVars,
+        conversations: conversationProvider,
+        terminals: terminalProvider,
+      };
+
+      Promise.all(
+        terminals.map((term) =>
+          terminalProvider.spawnTerminal(term).catch((e) => {
+            log.error('LocalEnvironmentProvider: failed to hydrate terminal', {
+              terminalId: term.id,
+              error: String(e),
+            });
+          })
+        )
+      );
+
+      Promise.all(
+        conversations.map((conv) =>
+          conversationProvider.startSession(conv, undefined, true).catch((e) => {
+            log.error('LocalEnvironmentProvider: failed to hydrate conversation', {
+              conversationId: conv.id,
+              error: String(e),
+            });
+          })
+        )
+      );
+
+      log.debug('LocalProjectProvider: doProvisionTask DONE', {
+        taskId: task.id,
+      });
+      provisionSucceeded = true;
+      return taskEnv;
+    } finally {
+      if (!provisionSucceeded) {
+        await this.workspaceRegistry.release(workspace.id).catch(() => {});
+      }
+    }
+  }
+
+  getTask(taskId: string): TaskProvider | undefined {
+    return this.tasks.get(taskId);
+  }
+
+  getTaskBootstrapStatus(taskId: string): TaskBootstrapStatus {
+    if (this.tasks.has(taskId)) return { status: 'ready' };
+    if (this.provisioningTasks.has(taskId)) return { status: 'bootstrapping' };
+    const bootstrapError = this.bootstrapErrors.get(taskId);
+    if (bootstrapError)
+      return { status: 'error', message: formatProvisionTaskError(bootstrapError) };
+    return { status: 'not-started' };
+  }
+
+  async teardownTask(taskId: string): Promise<Result<void, TeardownTaskError>> {
+    if (this.tearingDownTasks.has(taskId)) return this.tearingDownTasks.get(taskId)!;
+    const task = this.tasks.get(taskId);
+    if (!task) {
+      await this.cleanupDetachedTmuxSessions(taskId);
+      return ok();
+    }
+
+    const promise = withTimeout(this.doTeardownTask(task), TASK_TIMEOUT_MS)
+      .then(() => ok<void>())
+      .catch(async (e) => {
+        log.error('LocalProjectProvider: failed to teardown task', {
+          taskId,
+          error: String(e),
+        });
+        await this.cleanupDetachedTmuxSessions(taskId).catch((cleanupError) => {
+          log.warn('LocalProjectProvider: fallback tmux cleanup failed', {
+            taskId,
+            error: String(cleanupError),
+          });
+        });
+        return err<TeardownTaskError>(toTeardownError(e));
+      })
+      .finally(() => {
+        this.tasks.delete(taskId);
+        this.tearingDownTasks.delete(taskId);
+      });
+
+    this.tearingDownTasks.set(taskId, promise);
+    return promise;
+  }
+
+  getWorkspace(
+    workspaceId: string
+  ): import('@main/core/workspaces/workspace').Workspace | undefined {
+    return this.workspaceRegistry.get(workspaceId);
+  }
+
+  private async doTeardownTask(task: TaskProvider): Promise<void> {
+    const wsId = workspaceKey(task.taskBranch);
+    const workspace = this.workspaceRegistry.get(wsId);
+
+    if (workspace) {
+      const settings = await getEffectiveTaskSettings({
+        projectSettings: this.settings,
+        taskFs: workspace.fs,
+      });
+      const scripts = settings.scripts;
+
+      if (scripts?.teardown && this.workspaceRegistry.refCount(wsId) === 1) {
+        try {
+          const runTeardown = workspace.lifecycleService.runLifecycleScript(
+            { type: 'teardown', script: scripts.teardown },
+            { waitForExit: true, exit: true }
+          );
+          await withTimeout(runTeardown, TEARDOWN_SCRIPT_WAIT_MS);
+        } catch (error) {
+          if (error instanceof TimeoutSignal) {
+            log.debug('LocalProjectProvider: teardown script wait timed out', {
+              taskId: task.taskId,
+              timeoutMs: TEARDOWN_SCRIPT_WAIT_MS,
+            });
+          } else {
+            log.warn('LocalProjectProvider: teardown script failed (continuing cleanup)', {
+              taskId: task.taskId,
+              error: String(error),
+            });
+          }
+        }
+      }
+    }
+
+    await task.conversations.destroyAll();
+    await task.terminals.destroyAll();
+    if (this.workspaceRegistry.refCount(wsId) <= 1) {
+      this._gitWatcher.unregisterWorktree(wsId);
+    }
+    await this.workspaceRegistry.release(wsId);
+  }
+
+  private async cleanupDetachedTmuxSessions(taskId: string): Promise<void> {
+    const { conversationIds, terminalIds } = await getTaskSessionLeafIds(this.project.id, taskId);
+    const sessionIds = [...conversationIds, ...terminalIds].map((leafId) =>
+      makePtySessionId(this.project.id, taskId, leafId)
+    );
+    await Promise.all(
+      sessionIds.map((sessionId) => killTmuxSession(this.localExec, makeTmuxSessionName(sessionId)))
+    );
+  }
+
+  async getWorktreeForBranch(branchName: string): Promise<string | undefined> {
+    return this.worktreeService.getWorktree(branchName);
+  }
+
+  async removeTaskWorktree(taskBranch: string): Promise<void> {
+    const worktreePath = await this.worktreeService.getWorktree(taskBranch);
+    if (worktreePath) {
+      await this.worktreeService.removeWorktree(worktreePath);
+    }
+  }
+
+  async fetch(): Promise<Result<void, FetchError>> {
+    return this._gitFetchService.fetch();
+  }
+
+  async cleanup(): Promise<void> {
+    this._configChangeUnsubscribe?.();
+    this._gitFetchService.stop();
+    await this._gitWatcher.stop();
+
+    const settings = await this.settings.get();
+
+    if (settings.tmux) {
+      await Promise.all(
+        Array.from(this.tasks.values()).map((task) =>
+          Promise.all([task.conversations.detachAll(), task.terminals.detachAll()])
+        )
+      );
+      this.tasks.clear();
+      await this.workspaceRegistry.releaseAll();
+    } else {
+      await Promise.all(Array.from(this.tasks.keys()).map((id) => this.teardownTask(id)));
+      await this.workspaceRegistry.releaseAll();
+    }
+  }
+
+  private async resolveTaskWorkDir(task: Task): Promise<string> {
+    if (!task.taskBranch) {
+      return this.project.path;
+    }
+
+    const existing = await this.worktreeService.getWorktree(task.taskBranch);
+    if (existing) {
+      return existing;
+    }
+
+    if (!task.sourceBranch || task.taskBranch === task.sourceBranch.branch) {
+      const result = await this.worktreeService.checkoutExistingBranch(task.taskBranch);
+      if (!result.success) {
+        throw mapWorktreeErrorToProvisionError(task.taskBranch, result.error);
+      }
+      return result.data;
+    }
+
+    const result = await this.worktreeService.checkoutBranchWorktree(
+      task.sourceBranch,
+      task.taskBranch
+    );
+    if (!result.success) {
+      throw mapWorktreeErrorToProvisionError(task.taskBranch, result.error);
+    }
+    return result.data;
+  }
+
+  async getRemoteState(): Promise<ProjectRemoteState> {
+    try {
+      const remotes = await this.repository.getRemotes();
+      const remoteName = await this.repository.getConfiguredRemote();
+      const remoteUrl = remotes.find((r) => r.name === remoteName)?.url;
+      return { hasRemote: remotes.length > 0, selectedRemoteUrl: remoteUrl ?? null };
+    } catch {
+      return { hasRemote: false, selectedRemoteUrl: null };
+    }
+  }
+}
diff --git a/src/main/core/projects/impl/ssh-project-provider.ts b/src/main/core/projects/impl/ssh-project-provider.ts
new file mode 100644
index 0000000000..0ec6bcf386
--- /dev/null
+++ b/src/main/core/projects/impl/ssh-project-provider.ts
@@ -0,0 +1,595 @@
+import { randomUUID } from 'node:crypto';
+import path from 'node:path';
+import type { SFTPWrapper } from 'ssh2';
+import { Conversation } from '@shared/conversations';
+import type { FetchError } from '@shared/git';
+import { bareRefName } from '@shared/git-utils';
+import type { SshProject } from '@shared/projects';
+import { makePtySessionId } from '@shared/ptySessionId';
+import { err, ok, type Result } from '@shared/result';
+import { getTaskEnvVars } from '@shared/task/envVars';
+import { Task, type TaskBootstrapStatus } from '@shared/tasks';
+import { Terminal } from '@shared/terminals';
+import { workspaceKey } from '@shared/workspace-key';
+import { SshConversationProvider } from '@main/core/conversations/impl/ssh-conversation';
+import { SshFileSystem } from '@main/core/fs/impl/ssh-fs';
+import type { FileSystemProvider } from '@main/core/fs/types';
+import { GitFetchService } from '@main/core/git/git-fetch-service';
+import { GitService } from '@main/core/git/impl/git-service';
+import { GitRepositoryService } from '@main/core/git/repository-service';
+import { githubConnectionService } from '@main/core/github/services/github-connection-service';
+import { killTmuxSession, makeTmuxSessionName } from '@main/core/pty/tmux-session-name';
+import { prSyncScheduler } from '@main/core/pull-requests/pr-sync-scheduler';
+import { SshClientProxy } from '@main/core/ssh/ssh-client-proxy';
+import { SshConnectionEvent, sshConnectionManager } from '@main/core/ssh/ssh-connection-manager';
+import { getTaskSessionLeafIds } from '@main/core/tasks/session-targets';
+import { SshTerminalProvider } from '@main/core/terminals/impl/ssh-terminal-provider';
+import { getGitSshExec, getSshExec } from '@main/core/utils/exec';
+import type { Workspace } from '@main/core/workspaces/workspace';
+import { WorkspaceLifecycleService } from '@main/core/workspaces/workspace-lifecycle-service';
+import { WorkspaceRegistry } from '@main/core/workspaces/workspace-registry';
+import { log } from '@main/lib/logger';
+import {
+  type ProjectProvider,
+  type ProjectRemoteState,
+  type ProvisionTaskError,
+  type TaskProvider,
+  type TeardownTaskError,
+} from '../project-provider';
+import {
+  formatProvisionTaskError,
+  isProvisionTaskError,
+  mapWorktreeErrorToProvisionError,
+} from '../provision-task-error';
+import { SshProjectSettingsProvider } from '../settings/project-settings';
+import type { ProjectSettingsProvider } from '../settings/schema';
+import { getEffectiveTaskSettings } from '../settings/task-settings';
+import { TimeoutSignal, withTimeout } from '../utils';
+import { WorktreeService } from '../worktrees/worktree-service';
+
+const TASK_TIMEOUT_MS = 60_000;
+const TEARDOWN_SCRIPT_WAIT_MS = 10_000;
+
+function toProvisionError(e: unknown): ProvisionTaskError {
+  if (isProvisionTaskError(e)) return e;
+  if (e instanceof TimeoutSignal) return { type: 'timeout', message: e.message, timeout: e.ms };
+  return { type: 'error', message: e instanceof Error ? e.message : String(e) };
+}
+
+function toTeardownError(e: unknown): TeardownTaskError {
+  if (e instanceof TimeoutSignal) return { type: 'timeout', message: e.message, timeout: e.ms };
+  return { type: 'error', message: e instanceof Error ? e.message : String(e) };
+}
+
+export async function createSshProvider(
+  project: SshProject,
+  rootFs: FileSystemProvider,
+  proxy: SshClientProxy
+): Promise<SshProjectProvider> {
+  try {
+    const projectFs = new SshFileSystem(proxy, project.path);
+    const exec = getSshExec(proxy);
+
+    const settings = new SshProjectSettingsProvider(
+      projectFs,
+      bareRefName(project.baseRef),
+      rootFs,
+      project.path,
+      exec
+    );
+    const worktreePoolPath = path.posix.join(await settings.getWorktreeDirectory(), project.name);
+    await rootFs.mkdir(worktreePoolPath, { recursive: true });
+
+    return new SshProjectProvider(project, rootFs, proxy, {
+      fs: projectFs,
+      settings,
+      worktreePoolPath,
+    });
+  } catch (error) {
+    log.warn('createSshProvider: SSH connection failed', {
+      projectId: project.id,
+      error: error instanceof Error ? error.message : String(error),
+    });
+    throw error;
+  }
+}
+
+export class SshProjectProvider implements ProjectProvider {
+  readonly type = 'ssh';
+  readonly settings: ProjectSettingsProvider;
+  readonly repository: GitRepositoryService;
+  readonly fs: SshFileSystem;
+
+  private tasks = new Map<string, TaskProvider>();
+  private conversationProviders = new Map<string, SshConversationProvider>();
+  private terminalProviders = new Map<string, SshTerminalProvider>();
+  private provisioningTasks = new Map<string, Promise<Result<TaskProvider, ProvisionTaskError>>>();
+  private tearingDownTasks = new Map<string, Promise<Result<void, TeardownTaskError>>>();
+  private bootstrapErrors = new Map<string, ProvisionTaskError>();
+  private worktreeService: WorktreeService;
+  private workspaceRegistry = new WorkspaceRegistry();
+  private cachedSftp: SFTPWrapper | undefined;
+  private readonly _gitFetchService: GitFetchService;
+
+  constructor(
+    private readonly project: SshProject,
+    rootFs: FileSystemProvider,
+    private readonly proxy: SshClientProxy,
+    options: {
+      fs: SshFileSystem;
+      settings: ProjectSettingsProvider;
+      worktreePoolPath: string;
+    }
+  ) {
+    this.fs = options.fs;
+    this.settings = options.settings;
+    const gitExec = getGitSshExec(this.proxy, () => githubConnectionService.getToken());
+    const repoGit = new GitService(project.path, gitExec, this.fs, false);
+    this.repository = new GitRepositoryService(repoGit, this.settings);
+    this.worktreeService = new WorktreeService({
+      worktreePoolPath: options.worktreePoolPath,
+      repoPath: project.path,
+      projectSettings: this.settings,
+      exec: gitExec,
+      rootFs: rootFs,
+    });
+    this._gitFetchService = new GitFetchService(repoGit);
+    this._gitFetchService.start();
+    sshConnectionManager.on('connection-event', this.handleConnectionEvent);
+  }
+
+  private handleConnectionEvent = (evt: SshConnectionEvent): void => {
+    if (evt.type === 'reconnected' && evt.connectionId === this.project.connectionId) {
+      // Re-sync remote-tracking refs as soon as the connection is restored.
+      void this._gitFetchService.fetch();
+      this.rehydrateTerminals().catch((e: unknown) => {
+        log.error('SshProjectProvider: rehydrateTerminals failed after reconnect', {
+          projectId: this.project.id,
+          connectionId: this.project.connectionId,
+          error: String(e),
+        });
+      });
+    }
+  };
+
+  private getSftp(): Promise<SFTPWrapper> {
+    if (this.cachedSftp) return Promise.resolve(this.cachedSftp);
+    return new Promise((resolve, reject) => {
+      this.proxy.client.sftp((err, sftp) => {
+        if (err) return reject(err);
+        this.cachedSftp = sftp;
+        sftp.on('close', () => {
+          this.cachedSftp = undefined;
+        });
+        resolve(sftp);
+      });
+    });
+  }
+
+  async provisionTask(
+    task: Task,
+    conversations: Conversation[],
+    terminals: Terminal[]
+  ): Promise<Result<TaskProvider, ProvisionTaskError>> {
+    const existing = this.tasks.get(task.id);
+    if (existing) return ok(existing);
+    if (this.provisioningTasks.has(task.id)) return this.provisioningTasks.get(task.id)!;
+
+    const promise = withTimeout(
+      this.doProvisionTask(task, conversations, terminals),
+      TASK_TIMEOUT_MS
+    )
+      .then((taskEnv) => {
+        this.tasks.set(task.id, taskEnv);
+        this.provisioningTasks.delete(task.id);
+        return ok(taskEnv);
+      })
+      .catch((e) => {
+        const provisionError = toProvisionError(e);
+        this.bootstrapErrors.set(task.id, provisionError);
+        this.provisioningTasks.delete(task.id);
+        log.error('SshProjectProvider: failed to provision task', {
+          taskId: task.id,
+          error: String(e),
+        });
+        return err(provisionError);
+      });
+
+    this.provisioningTasks.set(task.id, promise);
+    return promise;
+  }
+
+  private async doProvisionTask(
+    task: Task,
+    conversations: Conversation[],
+    terminals: Terminal[]
+  ): Promise<TaskProvider> {
+    log.debug('SshProjectProvider: doProvisionTask START', {
+      taskId: task.id,
+    });
+
+    // Refresh remote-tracking refs in the background so they are as fresh as
+    // possible during the lifetime of this task. Non-blocking — provision
+    // continues without waiting for the network round-trip.
+    void this._gitFetchService.fetch();
+
+    // Sync PRs for this task's branch in the background.
+    void prSyncScheduler.onTaskProvisioned(this.project.id, task.taskBranch);
+
+    const workspaceId = workspaceKey(task.taskBranch);
+    const workspace = await this.workspaceRegistry.acquire(workspaceId, async () => {
+      const workDir = await this.resolveTaskWorkDir(task);
+      const workspaceFs = new SshFileSystem(this.proxy, workDir);
+      const projectSettings = await this.settings.get();
+      const defaultBranch = await this.settings.getDefaultBranch();
+      const bootstrapTaskEnvVars = getTaskEnvVars({
+        taskId: task.id,
+        taskName: task.name,
+        taskPath: workDir,
+        projectPath: this.project.path,
+        defaultBranch,
+        portSeed: workDir,
+      });
+      const tmuxEnabled = projectSettings.tmux ?? false;
+      const taskLevelSettings = await getEffectiveTaskSettings({
+        projectSettings: this.settings,
+        taskFs: workspaceFs,
+      });
+      const shellSetup = taskLevelSettings.shellSetup ?? projectSettings.shellSetup;
+      const scripts = taskLevelSettings.scripts;
+      const proxy = this.proxy;
+      const exec = getSshExec(proxy);
+      const workspaceTerminals = new SshTerminalProvider({
+        projectId: this.project.id,
+        scopeId: workspaceId,
+        taskPath: workDir,
+        tmux: tmuxEnabled,
+        shellSetup,
+        exec,
+        proxy,
+        taskEnvVars: bootstrapTaskEnvVars,
+      });
+      const lifecycleService = new WorkspaceLifecycleService({
+        projectId: this.project.id,
+        workspaceId,
+        terminals: workspaceTerminals,
+      });
+      const workspaceGitExec = getGitSshExec(proxy, () => githubConnectionService.getToken());
+      const createdWorkspace: Workspace = {
+        id: workspaceId,
+        path: workDir,
+        fs: workspaceFs,
+        git: new GitService(workDir, workspaceGitExec, workspaceFs, false),
+        settings: this.settings,
+        lifecycleService,
+      };
+
+      if (scripts?.setup) {
+        void lifecycleService.prepareAndRunLifecycleScript({
+          type: 'setup',
+          script: scripts.setup,
+        });
+      }
+      if (scripts?.run) {
+        void lifecycleService.prepareLifecycleScript({
+          type: 'run',
+          script: scripts.run,
+        });
+      }
+      if (scripts?.teardown) {
+        void lifecycleService.prepareLifecycleScript({
+          type: 'teardown',
+          script: scripts.teardown,
+        });
+      }
+
+      return createdWorkspace;
+    });
+
+    let provisionSucceeded = false;
+    try {
+      const projectSettings = await this.settings.get();
+      const defaultBranch = await this.settings.getDefaultBranch();
+      const taskEnvVars = getTaskEnvVars({
+        taskId: task.id,
+        taskName: task.name,
+        taskPath: workspace.path,
+        projectPath: this.project.path,
+        defaultBranch,
+        portSeed: workspace.path,
+      });
+      const tmuxEnabled = projectSettings.tmux ?? false;
+      const taskLevelSettings = await getEffectiveTaskSettings({
+        projectSettings: this.settings,
+        taskFs: workspace.fs,
+      });
+      const shellSetup = taskLevelSettings.shellSetup ?? projectSettings.shellSetup;
+      const proxy = this.proxy;
+      const exec = getSshExec(proxy);
+
+      const conversationProvider = new SshConversationProvider({
+        projectId: this.project.id,
+        taskPath: workspace.path,
+        taskId: task.id,
+        tmux: tmuxEnabled,
+        shellSetup,
+        exec,
+        proxy,
+        taskEnvVars,
+      });
+
+      const terminalProvider = new SshTerminalProvider({
+        projectId: this.project.id,
+        scopeId: task.id,
+        taskPath: workspace.path,
+        tmux: tmuxEnabled,
+        shellSetup,
+        exec,
+        proxy,
+        taskEnvVars,
+      });
+
+      const taskEnv: TaskProvider = {
+        taskId: task.id,
+        taskBranch: task.taskBranch,
+        sourceBranch: task.sourceBranch,
+        taskEnvVars,
+        conversations: conversationProvider,
+        terminals: terminalProvider,
+      };
+
+      Promise.all(
+        terminals.map((term) =>
+          terminalProvider.spawnTerminal(term).catch((e) => {
+            log.error('SshEnvironmentProvider: failed to hydrate terminal', {
+              terminalId: term.id,
+              error: String(e),
+            });
+          })
+        )
+      );
+
+      Promise.all(
+        conversations.map((conv) =>
+          conversationProvider.startSession(conv, undefined, true).catch((e) => {
+            log.error('SshEnvironmentProvider: failed to hydrate conversation', {
+              conversationId: conv.id,
+              error: String(e),
+            });
+          })
+        )
+      );
+
+      this.terminalProviders.set(task.id, terminalProvider);
+      this.conversationProviders.set(task.id, conversationProvider);
+      log.debug('SshProjectProvider: doProvisionTask DONE', {
+        taskId: task.id,
+      });
+      provisionSucceeded = true;
+      return taskEnv;
+    } finally {
+      if (!provisionSucceeded) {
+        await this.workspaceRegistry.release(workspace.id).catch(() => {});
+      }
+    }
+  }
+
+  getTask(taskId: string): TaskProvider | undefined {
+    return this.tasks.get(taskId);
+  }
+
+  getTaskBootstrapStatus(taskId: string): TaskBootstrapStatus {
+    if (this.tasks.has(taskId)) return { status: 'ready' };
+    if (this.provisioningTasks.has(taskId)) return { status: 'bootstrapping' };
+    const bootstrapError = this.bootstrapErrors.get(taskId);
+    if (bootstrapError)
+      return { status: 'error', message: formatProvisionTaskError(bootstrapError) };
+    return { status: 'not-started' };
+  }
+
+  async teardownTask(taskId: string): Promise<Result<void, TeardownTaskError>> {
+    if (this.tearingDownTasks.has(taskId)) return this.tearingDownTasks.get(taskId)!;
+    const task = this.tasks.get(taskId);
+    if (!task) {
+      await this.cleanupDetachedTmuxSessions(taskId);
+      return ok();
+    }
+
+    const promise = withTimeout(this.doTeardownTask(task), TASK_TIMEOUT_MS)
+      .then(() => ok<void>())
+      .catch(async (e) => {
+        log.error('SshProjectProvider: failed to teardown task', {
+          taskId,
+          error: String(e),
+        });
+        await this.cleanupDetachedTmuxSessions(taskId).catch((cleanupError) => {
+          log.warn('SshProjectProvider: fallback tmux cleanup failed', {
+            taskId,
+            error: String(cleanupError),
+          });
+        });
+        return err<TeardownTaskError>(toTeardownError(e));
+      })
+      .finally(() => {
+        this.tasks.delete(taskId);
+        this.tearingDownTasks.delete(taskId);
+        this.conversationProviders.delete(taskId);
+        this.terminalProviders.delete(taskId);
+      });
+
+    this.tearingDownTasks.set(taskId, promise);
+    return promise;
+  }
+
+  getWorkspace(
+    workspaceId: string
+  ): import('@main/core/workspaces/workspace').Workspace | undefined {
+    return this.workspaceRegistry.get(workspaceId);
+  }
+
+  private async doTeardownTask(task: TaskProvider): Promise<void> {
+    const wsId = workspaceKey(task.taskBranch);
+    const workspace = this.workspaceRegistry.get(wsId);
+
+    if (workspace) {
+      const settings = await getEffectiveTaskSettings({
+        projectSettings: this.settings,
+        taskFs: workspace.fs,
+      });
+      const scripts = settings.scripts;
+
+      if (scripts?.teardown && this.workspaceRegistry.refCount(wsId) === 1) {
+        try {
+          const runTeardown = workspace.lifecycleService.runLifecycleScript(
+            { type: 'teardown', script: scripts.teardown },
+            { waitForExit: true, exit: true }
+          );
+          await withTimeout(runTeardown, TEARDOWN_SCRIPT_WAIT_MS);
+        } catch (error) {
+          if (error instanceof TimeoutSignal) {
+            log.debug('SshProjectProvider: teardown script wait timed out', {
+              taskId: task.taskId,
+              timeoutMs: TEARDOWN_SCRIPT_WAIT_MS,
+            });
+          } else {
+            log.warn('SshProjectProvider: teardown script failed (continuing cleanup)', {
+              taskId: task.taskId,
+              error: String(error),
+            });
+          }
+        }
+      }
+    }
+
+    await task.conversations.destroyAll();
+    await task.terminals.destroyAll();
+    await this.workspaceRegistry.release(wsId);
+  }
+
+  private async cleanupDetachedTmuxSessions(taskId: string): Promise<void> {
+    const { conversationIds, terminalIds } = await getTaskSessionLeafIds(this.project.id, taskId);
+    const sessionIds = [...conversationIds, ...terminalIds].map((leafId) =>
+      makePtySessionId(this.project.id, taskId, leafId)
+    );
+    const exec = getSshExec(this.proxy);
+    await Promise.all(
+      sessionIds.map((sessionId) => killTmuxSession(exec, makeTmuxSessionName(sessionId)))
+    );
+  }
+
+  async getWorktreeForBranch(branchName: string): Promise<string | undefined> {
+    return this.worktreeService.getWorktree(branchName);
+  }
+
+  async removeTaskWorktree(taskBranch: string): Promise<void> {
+    const worktreePath = await this.worktreeService.getWorktree(taskBranch);
+    if (worktreePath) {
+      await this.worktreeService.removeWorktree(worktreePath);
+    }
+  }
+
+  async fetch(): Promise<Result<void, FetchError>> {
+    return this._gitFetchService.fetch();
+  }
+
+  async cleanup(): Promise<void> {
+    this._gitFetchService.stop();
+    sshConnectionManager.off('connection-event', this.handleConnectionEvent);
+
+    const settings = await this.settings.get();
+
+    if (settings.tmux) {
+      await Promise.all(
+        Array.from(this.tasks.values()).map((task) =>
+          Promise.all([task.conversations.detachAll(), task.terminals.detachAll()])
+        )
+      );
+      this.tasks.clear();
+      this.conversationProviders.clear();
+      this.terminalProviders.clear();
+      await this.workspaceRegistry.releaseAll();
+    } else {
+      await Promise.all(Array.from(this.tasks.keys()).map((id) => this.teardownTask(id)));
+      await this.workspaceRegistry.releaseAll();
+    }
+  }
+
+  /**
+   * Re-spawn all terminal sessions for every active task after an SSH reconnect.
+   * Agent sessions are intentionally excluded — they must be restarted manually.
+   */
+  private async rehydrateTerminals(): Promise<void> {
+    await Promise.all(
+      Array.from(this.terminalProviders.values()).map((provider) =>
+        provider.rehydrate().catch((e: unknown) => {
+          log.error('SshEnvironmentProvider: rehydrateTerminals failed for a provider', {
+            error: String(e),
+          });
+        })
+      )
+    );
+  }
+
+  /**
+   * Upload local files into the task's working directory via SFTP and return
+   * their remote paths.
+   */
+  async uploadFiles(taskId: string, localPaths: string[]): Promise<string[]> {
+    const env = this.tasks.get(taskId);
+    if (!env) throw new Error(`No provisioned environment for task: ${taskId}`);
+
+    const sftp = await this.getSftp();
+    const wsId = workspaceKey(env.taskBranch);
+    const destDir = this.workspaceRegistry.get(wsId)?.path ?? env.taskId;
+
+    return Promise.all(
+      localPaths.map(async (localPath) => {
+        const remoteName = `${randomUUID()}-${path.basename(localPath)}`;
+        const remotePath = `${destDir}/${remoteName}`;
+        await new Promise<void>((resolve, reject) => {
+          sftp.fastPut(localPath, remotePath, (e) => (e ? reject(e) : resolve()));
+        });
+        return remotePath;
+      })
+    );
+  }
+
+  async getRemoteState(): Promise<ProjectRemoteState> {
+    try {
+      const remotes = await this.repository.getRemotes();
+      const remoteName = await this.repository.getConfiguredRemote();
+      const remoteUrl = remotes.find((r) => r.name === remoteName)?.url;
+      return { hasRemote: remotes.length > 0, selectedRemoteUrl: remoteUrl ?? null };
+    } catch {
+      return { hasRemote: false, selectedRemoteUrl: null };
+    }
+  }
+
+  private async resolveTaskWorkDir(task: Task): Promise<string> {
+    if (!task.taskBranch) {
+      return this.project.path;
+    }
+
+    const existing = await this.worktreeService.getWorktree(task.taskBranch);
+    if (existing) {
+      return existing;
+    }
+
+    if (!task.sourceBranch || task.taskBranch === task.sourceBranch.branch) {
+      const result = await this.worktreeService.checkoutExistingBranch(task.taskBranch);
+      if (!result.success) {
+        throw mapWorktreeErrorToProvisionError(task.taskBranch, result.error);
+      }
+      return result.data;
+    }
+
+    const result = await this.worktreeService.checkoutBranchWorktree(
+      task.sourceBranch,
+      task.taskBranch
+    );
+    if (!result.success) {
+      throw mapWorktreeErrorToProvisionError(task.taskBranch, result.error);
+    }
+    return result.data;
+  }
+}
diff --git a/src/main/core/projects/operations/createProject.test.ts b/src/main/core/projects/operations/createProject.test.ts
new file mode 100644
index 0000000000..6b97972e5f
--- /dev/null
+++ b/src/main/core/projects/operations/createProject.test.ts
@@ -0,0 +1,291 @@
+import fs from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import { createLocalProject, createSshProject, getSshProjectPathStatus } from './createProject';
+
+const mocks = vi.hoisted(() => ({
+  detectInfoMock: vi.fn(),
+  initRepositoryMock: vi.fn(),
+  openProjectMock: vi.fn(),
+  getProjectMock: vi.fn(),
+  insertMock: vi.fn(),
+  valuesMock: vi.fn(),
+  returningMock: vi.fn(),
+  sshConnectMock: vi.fn(),
+  sshStatMock: vi.fn(),
+}));
+
+vi.mock('@main/core/git/impl/git-service', () => ({
+  GitService: vi.fn(function MockGitService() {
+    return {
+      detectInfo: mocks.detectInfoMock,
+      initRepository: mocks.initRepositoryMock,
+    };
+  }),
+}));
+
+vi.mock('@main/core/fs/impl/ssh-fs', () => ({
+  SshFileSystem: vi.fn(function MockSshFileSystem() {
+    return {
+      stat: mocks.sshStatMock,
+    };
+  }),
+}));
+
+vi.mock('@main/core/ssh/ssh-connection-manager', () => ({
+  sshConnectionManager: {
+    connect: mocks.sshConnectMock,
+  },
+}));
+
+vi.mock('@main/core/projects/project-manager', () => ({
+  projectManager: {
+    openProject: mocks.openProjectMock,
+    getProject: mocks.getProjectMock,
+  },
+}));
+
+vi.mock('@main/db/client', () => ({
+  db: {
+    insert: mocks.insertMock,
+  },
+}));
+
+beforeEach(() => {
+  vi.clearAllMocks();
+
+  mocks.insertMock.mockReturnValue({ values: mocks.valuesMock });
+  mocks.valuesMock.mockReturnValue({ returning: mocks.returningMock });
+  mocks.openProjectMock.mockResolvedValue(undefined);
+  mocks.getProjectMock.mockReturnValue(undefined);
+  mocks.initRepositoryMock.mockResolvedValue(undefined);
+  mocks.sshConnectMock.mockResolvedValue({ id: 'ssh-proxy' });
+  mocks.sshStatMock.mockResolvedValue({ path: '', type: 'dir' });
+});
+
+describe('createLocalProject', () => {
+  const tempDirs: string[] = [];
+
+  afterEach(() => {
+    for (const dir of tempDirs.splice(0)) {
+      fs.rmSync(dir, { recursive: true, force: true });
+    }
+  });
+
+  it('initializes git when the selected folder is not yet a repository', async () => {
+    const projectPath = fs.mkdtempSync(path.join(os.tmpdir(), 'emdash-project-'));
+    tempDirs.push(projectPath);
+    const row = {
+      id: 'project-id',
+      name: 'Project',
+      path: projectPath,
+      baseRef: 'main',
+      createdAt: '2026-04-16T00:00:00.000Z',
+      updatedAt: '2026-04-16T00:00:00.000Z',
+    };
+
+    mocks.detectInfoMock
+      .mockResolvedValueOnce({
+        isGitRepo: false,
+        baseRef: 'main',
+        rootPath: projectPath,
+      })
+      .mockResolvedValueOnce({
+        isGitRepo: true,
+        baseRef: 'main',
+        rootPath: projectPath,
+      });
+    mocks.returningMock.mockResolvedValue([row]);
+
+    const created = await createLocalProject({
+      id: 'project-id',
+      name: 'Project',
+      path: projectPath,
+      initGitRepository: true,
+    });
+
+    expect(mocks.initRepositoryMock).toHaveBeenCalledTimes(1);
+    expect(mocks.detectInfoMock).toHaveBeenCalledTimes(2);
+    expect(created).toMatchObject({
+      id: 'project-id',
+      name: 'Project',
+      path: projectPath,
+      baseRef: 'main',
+      type: 'local',
+    });
+    expect(mocks.openProjectMock).toHaveBeenCalledWith(
+      expect.objectContaining({
+        id: 'project-id',
+        type: 'local',
+      })
+    );
+  });
+
+  it('rejects non-git directories unless initialization is explicitly enabled', async () => {
+    const projectPath = fs.mkdtempSync(path.join(os.tmpdir(), 'emdash-project-'));
+    tempDirs.push(projectPath);
+
+    mocks.detectInfoMock.mockResolvedValue({
+      isGitRepo: false,
+      baseRef: 'main',
+      rootPath: projectPath,
+    });
+
+    await expect(
+      createLocalProject({
+        id: 'project-id',
+        name: 'Project',
+        path: projectPath,
+      })
+    ).rejects.toThrow('Directory is not a git repository');
+
+    expect(mocks.initRepositoryMock).not.toHaveBeenCalled();
+    expect(mocks.detectInfoMock).toHaveBeenCalledTimes(1);
+  });
+
+  it('does not run git init when the folder is already a repository', async () => {
+    const projectPath = fs.mkdtempSync(path.join(os.tmpdir(), 'emdash-project-'));
+    tempDirs.push(projectPath);
+    const row = {
+      id: 'project-id',
+      name: 'Project',
+      path: projectPath,
+      baseRef: 'origin/main',
+      createdAt: '2026-04-16T00:00:00.000Z',
+      updatedAt: '2026-04-16T00:00:00.000Z',
+    };
+
+    mocks.detectInfoMock.mockResolvedValue({
+      isGitRepo: true,
+      baseRef: 'origin/main',
+      rootPath: projectPath,
+    });
+    mocks.returningMock.mockResolvedValue([row]);
+
+    await createLocalProject({
+      id: 'project-id',
+      name: 'Project',
+      path: projectPath,
+    });
+
+    expect(mocks.initRepositoryMock).not.toHaveBeenCalled();
+    expect(mocks.detectInfoMock).toHaveBeenCalledTimes(1);
+  });
+});
+
+describe('createSshProject', () => {
+  const projectPath = '/remote/worktree';
+  const row = {
+    id: 'project-id',
+    name: 'Project',
+    path: '/remote/repo-root',
+    baseRef: 'main',
+    createdAt: '2026-04-16T00:00:00.000Z',
+    updatedAt: '2026-04-16T00:00:00.000Z',
+    sshConnectionId: 'connection-id',
+  };
+
+  it('initializes git when the selected remote folder is not yet a repository', async () => {
+    mocks.detectInfoMock
+      .mockResolvedValueOnce({
+        isGitRepo: false,
+        baseRef: 'main',
+        rootPath: projectPath,
+      })
+      .mockResolvedValueOnce({
+        isGitRepo: true,
+        baseRef: 'main',
+        rootPath: row.path,
+      });
+    mocks.returningMock.mockResolvedValue([row]);
+
+    const created = await createSshProject({
+      id: 'project-id',
+      name: 'Project',
+      path: projectPath,
+      connectionId: 'connection-id',
+      initGitRepository: true,
+    });
+
+    expect(mocks.sshStatMock).toHaveBeenCalledWith('');
+    expect(mocks.initRepositoryMock).toHaveBeenCalledTimes(1);
+    expect(mocks.detectInfoMock).toHaveBeenCalledTimes(2);
+    expect(created).toMatchObject({
+      id: 'project-id',
+      name: 'Project',
+      path: row.path,
+      baseRef: 'main',
+      type: 'ssh',
+      connectionId: 'connection-id',
+    });
+    expect(mocks.openProjectMock).toHaveBeenCalledWith(
+      expect.objectContaining({
+        id: 'project-id',
+        type: 'ssh',
+      })
+    );
+  });
+
+  it('rejects non-git remote directories unless initialization is explicitly enabled', async () => {
+    mocks.detectInfoMock.mockResolvedValue({
+      isGitRepo: false,
+      baseRef: 'main',
+      rootPath: projectPath,
+    });
+
+    await expect(
+      createSshProject({
+        id: 'project-id',
+        name: 'Project',
+        path: projectPath,
+        connectionId: 'connection-id',
+      })
+    ).rejects.toThrow('Directory is not a git repository');
+
+    expect(mocks.initRepositoryMock).not.toHaveBeenCalled();
+    expect(mocks.detectInfoMock).toHaveBeenCalledTimes(1);
+  });
+
+  it('rejects invalid remote directories', async () => {
+    mocks.sshStatMock.mockResolvedValueOnce(null);
+
+    await expect(
+      createSshProject({
+        id: 'project-id',
+        name: 'Project',
+        path: projectPath,
+        connectionId: 'connection-id',
+      })
+    ).rejects.toThrow('Invalid directory');
+
+    expect(mocks.detectInfoMock).not.toHaveBeenCalled();
+    expect(mocks.initRepositoryMock).not.toHaveBeenCalled();
+  });
+});
+
+describe('getSshProjectPathStatus', () => {
+  const projectPath = '/remote/worktree';
+
+  it('returns invalid status when remote directory does not exist', async () => {
+    mocks.sshStatMock.mockResolvedValueOnce(null);
+
+    const status = await getSshProjectPathStatus(projectPath, 'connection-id');
+
+    expect(status).toEqual({ isDirectory: false, isGitRepo: false });
+    expect(mocks.detectInfoMock).not.toHaveBeenCalled();
+  });
+
+  it('returns git status for existing remote directories', async () => {
+    mocks.detectInfoMock.mockResolvedValueOnce({
+      isGitRepo: true,
+      baseRef: 'origin/main',
+      rootPath: '/remote/repo-root',
+    });
+
+    const status = await getSshProjectPathStatus(projectPath, 'connection-id');
+
+    expect(status).toEqual({ isDirectory: true, isGitRepo: true });
+    expect(mocks.detectInfoMock).toHaveBeenCalledTimes(1);
+  });
+});
diff --git a/src/main/core/projects/operations/createProject.ts b/src/main/core/projects/operations/createProject.ts
new file mode 100644
index 0000000000..de2ae5cbe3
--- /dev/null
+++ b/src/main/core/projects/operations/createProject.ts
@@ -0,0 +1,168 @@
+import { randomUUID } from 'node:crypto';
+import { sql } from 'drizzle-orm';
+import { type LocalProject, type ProjectPathStatus, type SshProject } from '@shared/projects';
+import { LocalFileSystem } from '@main/core/fs/impl/local-fs';
+import { SshFileSystem } from '@main/core/fs/impl/ssh-fs';
+import { checkIsValidDirectory } from '@main/core/git/impl/detectGitInfo';
+import { GitService } from '@main/core/git/impl/git-service';
+import { githubConnectionService } from '@main/core/github/services/github-connection-service';
+import { projectManager } from '@main/core/projects/project-manager';
+import { sshConnectionManager } from '@main/core/ssh/ssh-connection-manager';
+import { getGitSshExec, getLocalExec } from '@main/core/utils/exec';
+import { db } from '@main/db/client';
+import { projects } from '@main/db/schema';
+
+async function ensureGitRepository(
+  git: GitService,
+  initGitRepository?: boolean
+): ReturnType<GitService['detectInfo']> {
+  let gitInfo = await git.detectInfo();
+  if (!gitInfo.isGitRepo) {
+    if (!initGitRepository) {
+      throw new Error(
+        'Directory is not a git repository. Enable "Initialize git repository" to continue.'
+      );
+    }
+    await git.initRepository();
+    gitInfo = await git.detectInfo();
+  }
+  if (!gitInfo.isGitRepo) {
+    throw new Error('Failed to initialize git repository');
+  }
+  return gitInfo;
+}
+
+export type CreateLocalProjectParams = {
+  id?: string;
+  path: string;
+  name: string;
+  initGitRepository?: boolean;
+};
+
+export async function createLocalProject(params: CreateLocalProjectParams): Promise<LocalProject> {
+  const isValidDirectory = checkIsValidDirectory(params.path);
+  if (!isValidDirectory) {
+    throw new Error('Invalid directory');
+  }
+
+  const fs = new LocalFileSystem(params.path);
+  const git = new GitService(params.path, getLocalExec(), fs);
+  const gitInfo = await ensureGitRepository(git, params.initGitRepository);
+
+  const [row] = await db
+    .insert(projects)
+    .values({
+      id: params.id ?? randomUUID(),
+      name: params.name,
+      path: gitInfo.rootPath,
+      workspaceProvider: 'local',
+      baseRef: gitInfo.baseRef,
+      updatedAt: sql`CURRENT_TIMESTAMP`,
+    })
+    .returning();
+
+  const project = {
+    type: 'local' as const,
+    id: row.id,
+    name: row.name,
+    path: row.path,
+    baseRef: row.baseRef ?? gitInfo.baseRef,
+    createdAt: row.createdAt,
+    updatedAt: row.updatedAt,
+  };
+
+  await projectManager.openProject(project);
+
+  return project;
+}
+
+export async function getLocalProjectPathStatus(path: string): Promise<ProjectPathStatus> {
+  const isDirectory = checkIsValidDirectory(path);
+  if (!isDirectory) {
+    return { isDirectory: false, isGitRepo: false };
+  }
+
+  const fs = new LocalFileSystem(path);
+  const git = new GitService(path, getLocalExec(), fs);
+  const gitInfo = await git.detectInfo();
+  return { isDirectory: true, isGitRepo: gitInfo.isGitRepo };
+}
+
+export type CreateSshProjectParams = {
+  id?: string;
+  name: string;
+  path: string;
+  connectionId: string;
+  initGitRepository?: boolean;
+};
+
+export async function createSshProject(params: CreateSshProjectParams): Promise<SshProject> {
+  const sshProxy = await sshConnectionManager.connect(params.connectionId);
+
+  const sshFs = new SshFileSystem(sshProxy, params.path);
+  const pathEntry = await sshFs.stat('');
+  if (!pathEntry || pathEntry.type !== 'dir') {
+    throw new Error('Invalid directory');
+  }
+  const git = new GitService(
+    params.path,
+    getGitSshExec(sshProxy, () => githubConnectionService.getToken()),
+    sshFs,
+    false
+  );
+
+  const gitInfo = await ensureGitRepository(git, params.initGitRepository);
+
+  const [row] = await db
+    .insert(projects)
+    .values({
+      id: params.id ?? randomUUID(),
+      name: params.name,
+      path: gitInfo.rootPath,
+      workspaceProvider: 'ssh',
+      sshConnectionId: params.connectionId,
+      baseRef: gitInfo.baseRef,
+      updatedAt: sql`CURRENT_TIMESTAMP`,
+    })
+    .returning();
+
+  const project = {
+    type: 'ssh' as const,
+    id: row.id,
+    name: row.name,
+    path: row.path,
+    connectionId: params.connectionId,
+    baseRef: row.baseRef ?? gitInfo.baseRef,
+    createdAt: row.createdAt,
+    updatedAt: row.updatedAt,
+  };
+
+  await projectManager.openProject(project);
+
+  return project;
+}
+
+export async function getSshProjectPathStatus(
+  path: string,
+  connectionId: string
+): Promise<ProjectPathStatus> {
+  try {
+    const sshProxy = await sshConnectionManager.connect(connectionId);
+    const sshFs = new SshFileSystem(sshProxy, path);
+    const pathEntry = await sshFs.stat('');
+    if (!pathEntry || pathEntry.type !== 'dir') {
+      return { isDirectory: false, isGitRepo: false };
+    }
+
+    const git = new GitService(
+      path,
+      getGitSshExec(sshProxy, () => githubConnectionService.getToken()),
+      sshFs,
+      false
+    );
+    const gitInfo = await git.detectInfo();
+    return { isDirectory: true, isGitRepo: gitInfo.isGitRepo };
+  } catch {
+    return { isDirectory: false, isGitRepo: false };
+  }
+}
diff --git a/src/main/core/projects/operations/deleteProject.ts b/src/main/core/projects/operations/deleteProject.ts
new file mode 100644
index 0000000000..7060d75bad
--- /dev/null
+++ b/src/main/core/projects/operations/deleteProject.ts
@@ -0,0 +1,26 @@
+import { eq } from 'drizzle-orm';
+import { projectManager } from '@main/core/projects/project-manager';
+import { prSyncEngine } from '@main/core/pull-requests/pr-sync-engine';
+import { getTasks } from '@main/core/tasks/getTasks';
+import { viewStateService } from '@main/core/view-state/view-state-service';
+import { db } from '@main/db/client';
+import { projects } from '@main/db/schema';
+import { capture } from '@main/lib/telemetry';
+
+export async function deleteProject(id: string): Promise<void> {
+  const provider = projectManager.getProject(id);
+  if (provider) {
+    const projectTasks = await getTasks(id);
+    await Promise.allSettled([
+      ...projectTasks.map((t) => provider.teardownTask(t.id)),
+      ...projectTasks.map((t) => viewStateService.del(`task:${t.id}`)),
+    ]);
+  }
+
+  await prSyncEngine.deleteProjectData(id);
+
+  await db.delete(projects).where(eq(projects.id, id));
+  void viewStateService.del(`project:${id}`);
+  await projectManager.closeProject(id);
+  capture('project_deleted', { project_id: id });
+}
diff --git a/src/main/core/projects/operations/getProjectBootstrapStatus.ts b/src/main/core/projects/operations/getProjectBootstrapStatus.ts
new file mode 100644
index 0000000000..e1db0828ee
--- /dev/null
+++ b/src/main/core/projects/operations/getProjectBootstrapStatus.ts
@@ -0,0 +1,11 @@
+import type { ProjectBootstrapStatus } from '@shared/projects';
+import { projectManager } from '@main/core/projects/project-manager';
+import { log } from '@main/lib/logger';
+
+export async function getProjectBootstrapStatus(
+  projectId: string
+): Promise<ProjectBootstrapStatus> {
+  const status = projectManager.getProjectBootstrapStatus(projectId);
+  log.debug('getProjectBootstrapStatus', { projectId, status: status.status });
+  return status;
+}
diff --git a/src/main/core/projects/operations/getProjectSettings.ts b/src/main/core/projects/operations/getProjectSettings.ts
new file mode 100644
index 0000000000..df8c04fdb8
--- /dev/null
+++ b/src/main/core/projects/operations/getProjectSettings.ts
@@ -0,0 +1,10 @@
+import { projectManager } from '../project-manager';
+import { ProjectSettings } from '../settings/schema';
+
+export async function getProjectSettings(projectId: string): Promise<ProjectSettings> {
+  const project = projectManager.getProject(projectId);
+  if (!project) {
+    throw new Error(`Project ${projectId} not found`);
+  }
+  return project.settings.get();
+}
diff --git a/src/main/core/projects/operations/getProjects.ts b/src/main/core/projects/operations/getProjects.ts
new file mode 100644
index 0000000000..1c2ac719c8
--- /dev/null
+++ b/src/main/core/projects/operations/getProjects.ts
@@ -0,0 +1,94 @@
+import { and, desc, eq } from 'drizzle-orm';
+import type { LocalProject, SshProject } from '@shared/projects';
+import { db } from '@main/db/client';
+import { projects } from '@main/db/schema';
+
+export async function getProjects(): Promise<(LocalProject | SshProject)[]> {
+  const rows = await db.select().from(projects).orderBy(desc(projects.updatedAt));
+  return rows.map((row) =>
+    row.workspaceProvider === 'local'
+      ? {
+          type: 'local' as const,
+          id: row.id,
+          name: row.name,
+          path: row.path,
+          baseRef: row.baseRef ?? 'main',
+          createdAt: row.createdAt,
+          updatedAt: row.updatedAt,
+        }
+      : {
+          type: 'ssh' as const,
+          id: row.id,
+          name: row.name,
+          path: row.path,
+          baseRef: row.baseRef ?? 'main',
+          connectionId: row.sshConnectionId!,
+          createdAt: row.createdAt,
+          updatedAt: row.updatedAt,
+        }
+  );
+}
+
+export async function getProjectById(
+  projectId: string
+): Promise<LocalProject | SshProject | undefined> {
+  const [row] = await db.select().from(projects).where(eq(projects.id, projectId)).limit(1);
+  if (!row) return undefined;
+  if (row.workspaceProvider === 'local') {
+    return {
+      type: 'local' as const,
+      id: row.id,
+      name: row.name,
+      path: row.path,
+      baseRef: row.baseRef ?? 'main',
+      createdAt: row.createdAt,
+      updatedAt: row.updatedAt,
+    };
+  }
+  return {
+    type: 'ssh' as const,
+    id: row.id,
+    name: row.name,
+    path: row.path,
+    baseRef: row.baseRef ?? 'main',
+    connectionId: row.sshConnectionId!,
+    createdAt: row.createdAt,
+    updatedAt: row.updatedAt,
+  };
+}
+
+export async function getLocalProjectByPath(path: string): Promise<LocalProject | undefined> {
+  const [row] = await db.select().from(projects).where(eq(projects.path, path)).limit(1);
+  if (!row) return undefined;
+  return {
+    type: 'local' as const,
+    id: row.id,
+    name: row.name,
+    path: row.path,
+    baseRef: row.baseRef ?? 'main',
+    createdAt: row.createdAt,
+    updatedAt: row.updatedAt,
+  };
+}
+
+export async function getSshProjectByPath(
+  path: string,
+  connectionId: string
+): Promise<SshProject | undefined> {
+  const [row] = await db
+    .select()
+    .from(projects)
+    .where(and(eq(projects.path, path), eq(projects.sshConnectionId, connectionId)))
+    .limit(1);
+  if (!row) return undefined;
+  return {
+    type: 'ssh' as const,
+    id: row.id,
+    name: row.name,
+    path: row.path,
+    baseRef: row.baseRef ?? 'main',
+    connectionId: row.sshConnectionId!,
+    createdAt: row.createdAt,
+    updatedAt: row.updatedAt,
+  };
+}
diff --git a/src/main/core/projects/operations/openProject.ts b/src/main/core/projects/operations/openProject.ts
new file mode 100644
index 0000000000..a17e17464e
--- /dev/null
+++ b/src/main/core/projects/operations/openProject.ts
@@ -0,0 +1,7 @@
+import type { OpenProjectError } from '@shared/projects';
+import type { Result } from '@shared/result';
+import { projectManager } from '@main/core/projects/project-manager';
+
+export async function openProject(projectId: string): Promise<Result<void, OpenProjectError>> {
+  return projectManager.openProjectById(projectId);
+}
diff --git a/src/main/core/projects/operations/updateProjectConnection.ts b/src/main/core/projects/operations/updateProjectConnection.ts
new file mode 100644
index 0000000000..393ac1647b
--- /dev/null
+++ b/src/main/core/projects/operations/updateProjectConnection.ts
@@ -0,0 +1,17 @@
+import { eq } from 'drizzle-orm';
+import { db } from '@main/db/client';
+import { projects } from '@main/db/schema';
+
+export async function updateProjectConnection(
+  projectId: string,
+  connectionId: string
+): Promise<void> {
+  const [row] = await db.select().from(projects).where(eq(projects.id, projectId));
+  if (!row) throw new Error(`Project ${projectId} not found`);
+  if (row.workspaceProvider !== 'ssh')
+    throw new Error(`Project ${projectId} is not an SSH project`);
+  await db
+    .update(projects)
+    .set({ sshConnectionId: connectionId, updatedAt: new Date().toISOString() })
+    .where(eq(projects.id, projectId));
+}
diff --git a/src/main/core/projects/operations/updateProjectSettings.ts b/src/main/core/projects/operations/updateProjectSettings.ts
new file mode 100644
index 0000000000..3d6e350313
--- /dev/null
+++ b/src/main/core/projects/operations/updateProjectSettings.ts
@@ -0,0 +1,15 @@
+import type { UpdateProjectSettingsError } from '@shared/projects';
+import { err, type Result } from '@shared/result';
+import { projectManager } from '../project-manager';
+import { ProjectSettings } from '../settings/schema';
+
+export async function updateProjectSettings(
+  projectId: string,
+  settings: ProjectSettings
+): Promise<Result<void, UpdateProjectSettingsError>> {
+  const project = projectManager.getProject(projectId);
+  if (!project) {
+    return err({ type: 'project-not-found' });
+  }
+  return project.settings.update(settings);
+}
diff --git a/src/main/core/projects/project-manager.ts b/src/main/core/projects/project-manager.ts
new file mode 100644
index 0000000000..71abe61889
--- /dev/null
+++ b/src/main/core/projects/project-manager.ts
@@ -0,0 +1,179 @@
+import type {
+  LocalProject,
+  OpenProjectError,
+  ProjectBootstrapStatus,
+  SshProject,
+} from '@shared/projects';
+import { err, ok, type Result } from '@shared/result';
+import { log } from '@main/lib/logger';
+import { LocalFileSystem } from '../fs/impl/local-fs';
+import { SshFileSystem } from '../fs/impl/ssh-fs';
+import { checkIsValidDirectory } from '../git/impl/detectGitInfo';
+import { getProjectById, getProjects } from '../projects/operations/getProjects';
+import { sshConnectionManager } from '../ssh/ssh-connection-manager';
+import { createLocalProvider } from './impl/local-project-provider';
+import { createSshProvider } from './impl/ssh-project-provider';
+import type { ProjectProvider } from './project-provider';
+import { TimeoutSignal, withTimeout } from './utils';
+
+const PROVIDER_TIMEOUT_MS = 60_000;
+
+type ProjectLifecycleHook = (projectId: string) => void | Promise<void>;
+
+type ProviderError = {
+  type: 'error';
+  message: string;
+};
+
+type TimeoutError = {
+  type: 'timeout';
+  message: string;
+  timeout: number;
+};
+
+type InitializeProviderError = TimeoutError | ProviderError;
+type TeardownProviderError = TimeoutError | ProviderError;
+
+function toInitError(e: unknown): InitializeProviderError {
+  if (e instanceof TimeoutSignal) return { type: 'timeout', message: e.message, timeout: e.ms };
+  return { type: 'error', message: e instanceof Error ? e.message : String(e) };
+}
+
+function toTeardownError(e: unknown): TeardownProviderError {
+  if (e instanceof TimeoutSignal) return { type: 'timeout', message: e.message, timeout: e.ms };
+  return { type: 'error', message: e instanceof Error ? e.message : String(e) };
+}
+
+class ProjectManager {
+  private initializingProviders = new Map<
+    string,
+    Promise<Result<ProjectProvider, InitializeProviderError>>
+  >();
+  private providers = new Map<string, ProjectProvider>();
+  private tearingDownProviders = new Map<string, Promise<Result<void, TeardownProviderError>>>();
+  private initializationErrors = new Map<string, InitializeProviderError>();
+  private _onProjectOpenedHooks: ProjectLifecycleHook[] = [];
+  private _onProjectClosedHooks: ProjectLifecycleHook[] = [];
+
+  async initialize(): Promise<void> {
+    const allProjects = await getProjects();
+
+    await Promise.allSettled(
+      allProjects.map(async (project) => {
+        await this.openProject(project);
+      })
+    );
+  }
+
+  async openProject(
+    project: LocalProject | SshProject
+  ): Promise<Result<ProjectProvider, InitializeProviderError>> {
+    if (this.providers.has(project.id)) return ok(this.providers.get(project.id)!);
+    if (this.initializingProviders.has(project.id))
+      return this.initializingProviders.get(project.id)!;
+
+    const promise = withTimeout(createProvider(project), PROVIDER_TIMEOUT_MS)
+      .then((provider) => {
+        this.providers.set(project.id, provider);
+        this.initializingProviders.delete(project.id);
+        this._fireHooks(this._onProjectOpenedHooks, project.id, 'onProjectOpened');
+        return ok(provider);
+      })
+      .catch((e) => {
+        const initError = toInitError(e);
+        this.initializationErrors.set(project.id, initError);
+        this.initializingProviders.delete(project.id);
+        log.error('ProjectManager: error during project initialization', {
+          projectId: project.id,
+          ...initError,
+        });
+        return err<InitializeProviderError>(initError);
+      });
+
+    this.initializingProviders.set(project.id, promise);
+    return promise;
+  }
+
+  async closeProject(projectId: string): Promise<Result<void, TeardownProviderError>> {
+    if (this.tearingDownProviders.has(projectId)) return this.tearingDownProviders.get(projectId)!;
+    const provider = this.providers.get(projectId);
+    if (!provider) return ok();
+
+    const promise = withTimeout(provider.cleanup(), PROVIDER_TIMEOUT_MS)
+      .then(() => ok<void>())
+      .catch((e) => {
+        const error = toTeardownError(e);
+        log.error('ProjectManager: error during project teardown', { projectId, ...error });
+        return err<TeardownProviderError>(error);
+      })
+      .finally(() => {
+        this.providers.delete(projectId);
+        this.tearingDownProviders.delete(projectId);
+        this._fireHooks(this._onProjectClosedHooks, projectId, 'onProjectClosed');
+      });
+
+    this.tearingDownProviders.set(projectId, promise);
+    return promise;
+  }
+
+  registerOnProjectOpened(hook: ProjectLifecycleHook): void {
+    this._onProjectOpenedHooks.push(hook);
+  }
+
+  registerOnProjectClosed(hook: ProjectLifecycleHook): void {
+    this._onProjectClosedHooks.push(hook);
+  }
+
+  private _fireHooks(hooks: ProjectLifecycleHook[], projectId: string, name: string): void {
+    for (const hook of hooks) {
+      Promise.resolve(hook(projectId)).catch((e) =>
+        log.error(`ProjectManager: ${name} hook error`, { projectId, error: String(e) })
+      );
+    }
+  }
+
+  getProject(projectId: string): ProjectProvider | undefined {
+    return this.providers.get(projectId);
+  }
+
+  getProjectBootstrapStatus(projectId: string): ProjectBootstrapStatus {
+    if (this.providers.has(projectId)) return { status: 'ready' };
+    if (this.initializingProviders.has(projectId)) return { status: 'bootstrapping' };
+    const initError = this.initializationErrors.get(projectId);
+    if (initError) return { status: 'error', message: initError.message };
+    return { status: 'not-started' };
+  }
+
+  async openProjectById(projectId: string): Promise<Result<void, OpenProjectError>> {
+    const project = await getProjectById(projectId);
+    if (!project) return err({ type: 'error', message: `Project not found: ${projectId}` });
+    if (project.type === 'local' && !checkIsValidDirectory(project.path)) {
+      return err({ type: 'path-not-found', path: project.path });
+    }
+    const result = await this.openProject(project);
+    if (!result.success) {
+      if (project.type === 'ssh') {
+        return err({ type: 'ssh-disconnected', connectionId: project.connectionId });
+      }
+      return err({ type: 'error', message: result.error.message });
+    }
+    return ok();
+  }
+
+  async shutdown(): Promise<void> {
+    const ids = Array.from(this.providers.keys());
+    await Promise.allSettled(ids.map((id) => this.closeProject(id)));
+  }
+}
+
+async function createProvider(project: LocalProject | SshProject): Promise<ProjectProvider> {
+  if (project.type === 'ssh') {
+    const proxy = await sshConnectionManager.connect(project.connectionId);
+    const rootFs = new SshFileSystem(proxy, '/');
+    return createSshProvider(project, rootFs, proxy);
+  }
+  const rootFs = new LocalFileSystem('/');
+  return createLocalProvider(project, rootFs);
+}
+
+export const projectManager = new ProjectManager();
diff --git a/src/main/core/projects/project-provider.ts b/src/main/core/projects/project-provider.ts
new file mode 100644
index 0000000000..c42929285f
--- /dev/null
+++ b/src/main/core/projects/project-provider.ts
@@ -0,0 +1,62 @@
+import { Conversation } from '@shared/conversations';
+import type { Branch, FetchError } from '@shared/git';
+import type { Result } from '@shared/result';
+import { Task, TaskBootstrapStatus } from '@shared/tasks';
+import { Terminal } from '@shared/terminals';
+import type { FileSystemProvider } from '@main/core/fs/types';
+import { ConversationProvider } from '../conversations/types';
+import type { GitRepositoryService } from '../git/repository-service';
+import { TerminalProvider } from '../terminals/terminal-provider';
+import type { Workspace } from '../workspaces/workspace';
+import { ProjectSettingsProvider } from './settings/schema';
+
+export type BaseTaskProvisionArgs = {
+  taskId: string;
+  conversations: Conversation[];
+  terminals: Terminal[];
+};
+
+export type ProvisionTaskError =
+  | { type: 'timeout'; message: string; timeout: number }
+  | { type: 'branch-not-found'; branch: string }
+  | { type: 'worktree-setup-failed'; branch: string; message?: string }
+  | { type: 'error'; message: string };
+
+export type TeardownTaskError =
+  | { type: 'timeout'; message: string; timeout: number }
+  | { type: 'error'; message: string };
+
+export type ProjectRemoteState = {
+  hasRemote: boolean;
+  selectedRemoteUrl: string | null;
+};
+
+export interface TaskProvider {
+  readonly taskId: string;
+  readonly taskBranch: string | undefined;
+  readonly sourceBranch: Branch | undefined;
+  readonly taskEnvVars: Record<string, string>;
+  readonly conversations: ConversationProvider;
+  readonly terminals: TerminalProvider;
+}
+
+export interface ProjectProvider {
+  readonly type: string;
+  readonly settings: ProjectSettingsProvider;
+  readonly repository: GitRepositoryService;
+  readonly fs: FileSystemProvider;
+  getRemoteState(): Promise<ProjectRemoteState>;
+  getWorkspace(workspaceId: string): Workspace | undefined;
+  provisionTask(
+    args: Task,
+    conversations: Conversation[],
+    terminals: Terminal[]
+  ): Promise<Result<TaskProvider, ProvisionTaskError>>;
+  getTask(taskId: string): TaskProvider | undefined;
+  getTaskBootstrapStatus(taskId: string): TaskBootstrapStatus;
+  teardownTask(taskId: string): Promise<Result<void, TeardownTaskError>>;
+  getWorktreeForBranch(branchName: string): Promise<string | undefined>;
+  removeTaskWorktree(taskBranch: string): Promise<void>;
+  fetch(): Promise<Result<void, FetchError>>;
+  cleanup(): Promise<void>;
+}
diff --git a/src/main/core/projects/provision-task-error.ts b/src/main/core/projects/provision-task-error.ts
new file mode 100644
index 0000000000..ca22f7aaea
--- /dev/null
+++ b/src/main/core/projects/provision-task-error.ts
@@ -0,0 +1,43 @@
+import type { ProvisionTaskError } from './project-provider';
+import type { ServeWorktreeError } from './worktrees/worktree-service';
+
+export function mapWorktreeErrorToProvisionError(
+  branch: string,
+  error: ServeWorktreeError
+): ProvisionTaskError {
+  switch (error.type) {
+    case 'branch-not-found':
+      return { type: 'branch-not-found', branch: error.branch };
+    case 'worktree-setup-failed':
+      return {
+        type: 'worktree-setup-failed',
+        branch,
+        message: error.cause instanceof Error ? error.cause.message : String(error.cause),
+      };
+  }
+}
+
+export function isProvisionTaskError(e: unknown): e is ProvisionTaskError {
+  if (!e || typeof e !== 'object' || !('type' in e)) return false;
+  const type = (e as { type?: string }).type;
+  return (
+    type === 'timeout' ||
+    type === 'error' ||
+    type === 'branch-not-found' ||
+    type === 'worktree-setup-failed'
+  );
+}
+
+export function formatProvisionTaskError(error: ProvisionTaskError): string {
+  switch (error.type) {
+    case 'timeout':
+    case 'error':
+      return error.message;
+    case 'branch-not-found':
+      return `Branch "${error.branch}" was not found locally or on remote`;
+    case 'worktree-setup-failed':
+      return error.message
+        ? `Failed to set up worktree for branch "${error.branch}": ${error.message}`
+        : `Failed to set up worktree for branch "${error.branch}"`;
+  }
+}
diff --git a/src/main/core/projects/settings/project-settings.test.ts b/src/main/core/projects/settings/project-settings.test.ts
new file mode 100644
index 0000000000..60f4f05467
--- /dev/null
+++ b/src/main/core/projects/settings/project-settings.test.ts
@@ -0,0 +1,182 @@
+import fs from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
+import { afterEach, describe, expect, it, vi } from 'vitest';
+import { SshFileSystem } from '@main/core/fs/impl/ssh-fs';
+import type { ExecFn } from '@main/core/utils/exec';
+import { LocalProjectSettingsProvider, SshProjectSettingsProvider } from './project-settings';
+
+vi.mock('@main/core/settings/settings-service', () => ({
+  appSettingsService: {
+    get: vi.fn().mockResolvedValue({
+      defaultWorktreeDirectory: '/tmp/emdash/worktrees',
+    }),
+  },
+}));
+
+vi.mock('electron', () => ({
+  app: {
+    getPath: vi.fn().mockReturnValue('/tmp'),
+  },
+}));
+
+describe('ProjectSettingsProvider worktreeDirectory validation', () => {
+  const tempDirs: string[] = [];
+
+  afterEach(() => {
+    for (const dir of tempDirs.splice(0)) {
+      fs.rmSync(dir, { recursive: true, force: true });
+    }
+  });
+
+  it('normalizes and canonicalizes local worktreeDirectory on update', async () => {
+    const projectPath = fs.mkdtempSync(path.join(os.tmpdir(), 'emdash-settings-local-'));
+    tempDirs.push(projectPath);
+    const rootFs = {
+      mkdir: vi.fn().mockResolvedValue(undefined),
+      realPath: vi.fn().mockResolvedValue('/canonical/worktrees'),
+    };
+
+    const provider = new LocalProjectSettingsProvider(projectPath, 'main', rootFs);
+    const result = await provider.update({ preservePatterns: [], worktreeDirectory: 'worktrees' });
+    expect(result.success).toBe(true);
+
+    expect(rootFs.mkdir).toHaveBeenCalledWith(path.resolve(projectPath, 'worktrees'), {
+      recursive: true,
+    });
+    expect(rootFs.realPath).toHaveBeenCalledWith(path.resolve(projectPath, 'worktrees'));
+
+    const persisted = JSON.parse(fs.readFileSync(path.join(projectPath, '.emdash.json'), 'utf8'));
+    expect(persisted.worktreeDirectory).toBe('/canonical/worktrees');
+  });
+
+  it('surfaces local worktreeDirectory validation errors', async () => {
+    const projectPath = fs.mkdtempSync(path.join(os.tmpdir(), 'emdash-settings-local-'));
+    tempDirs.push(projectPath);
+    const rootFs = {
+      mkdir: vi.fn().mockRejectedValue(new Error('EACCES')),
+      realPath: vi.fn(),
+    };
+
+    const provider = new LocalProjectSettingsProvider(projectPath, 'main', rootFs);
+    const result = await provider.update({
+      preservePatterns: [],
+      worktreeDirectory: '/restricted',
+    });
+    expect(result).toEqual({
+      success: false,
+      error: { type: 'invalid-worktree-directory' },
+    });
+  });
+
+  it('clears blank local worktreeDirectory values', async () => {
+    const projectPath = fs.mkdtempSync(path.join(os.tmpdir(), 'emdash-settings-local-'));
+    tempDirs.push(projectPath);
+    const rootFs = {
+      mkdir: vi.fn().mockResolvedValue(undefined),
+      realPath: vi.fn().mockResolvedValue('/unused'),
+    };
+
+    const provider = new LocalProjectSettingsProvider(projectPath, 'main', rootFs);
+    const result = await provider.update({ preservePatterns: [], worktreeDirectory: '   ' });
+    expect(result.success).toBe(true);
+
+    expect(rootFs.mkdir).not.toHaveBeenCalled();
+    const persisted = JSON.parse(fs.readFileSync(path.join(projectPath, '.emdash.json'), 'utf8'));
+    expect(persisted.worktreeDirectory).toBeUndefined();
+  });
+
+  it('normalizes and canonicalizes ssh worktreeDirectory on update', async () => {
+    const writeMock = vi.fn().mockResolvedValue(undefined);
+    const projectFs = {
+      write: writeMock,
+    } as unknown as SshFileSystem;
+    const rootFs = {
+      mkdir: vi.fn().mockResolvedValue(undefined),
+      realPath: vi.fn().mockResolvedValue('/canonical/ssh-worktrees'),
+    };
+
+    const provider = new SshProjectSettingsProvider(projectFs, 'main', rootFs, '/remote/repo');
+    const result = await provider.update({ preservePatterns: [], worktreeDirectory: 'worktrees' });
+    expect(result.success).toBe(true);
+
+    expect(rootFs.mkdir).toHaveBeenCalledWith('/remote/repo/worktrees', { recursive: true });
+    expect(rootFs.realPath).toHaveBeenCalledWith('/remote/repo/worktrees');
+
+    expect(writeMock).toHaveBeenCalledTimes(1);
+    const persisted = JSON.parse(writeMock.mock.calls[0][1]);
+    expect(persisted.worktreeDirectory).toBe('/canonical/ssh-worktrees');
+  });
+
+  it('uses project-scoped ssh default worktree directory when not configured', async () => {
+    const projectFs = {
+      exists: vi.fn().mockResolvedValue(false),
+    } as unknown as SshFileSystem;
+
+    const provider = new SshProjectSettingsProvider(projectFs, 'main', undefined, '/remote/repo');
+    await expect(provider.getWorktreeDirectory()).resolves.toBe('/remote/repo/.emdash/worktrees');
+  });
+
+  it('rejects tilde worktreeDirectory for ssh projects', async () => {
+    const writeMock = vi.fn().mockResolvedValue(undefined);
+    const projectFs = {
+      write: writeMock,
+    } as unknown as SshFileSystem;
+    const rootFs = {
+      mkdir: vi.fn().mockResolvedValue(undefined),
+      realPath: vi.fn().mockResolvedValue('/canonical/ssh-worktrees'),
+    };
+
+    const provider = new SshProjectSettingsProvider(projectFs, 'main', rootFs, '/remote/repo');
+    const result = await provider.update({
+      preservePatterns: [],
+      worktreeDirectory: '~/worktrees',
+    });
+    expect(result).toEqual({
+      success: false,
+      error: { type: 'invalid-worktree-directory' },
+    });
+    expect(writeMock).not.toHaveBeenCalled();
+  });
+
+  it('falls back to project-scoped ssh default when configured directory is invalid', async () => {
+    const projectFs = {
+      exists: vi.fn().mockResolvedValue(true),
+      read: vi.fn().mockResolvedValue({
+        content: JSON.stringify({ worktreeDirectory: '~/worktrees' }),
+      }),
+    } as unknown as SshFileSystem;
+
+    const provider = new SshProjectSettingsProvider(projectFs, 'main', undefined, '/remote/repo');
+    await expect(provider.getWorktreeDirectory()).resolves.toBe('/remote/repo/.emdash/worktrees');
+  });
+
+  it('expands and caches ssh home for tilde worktreeDirectory values', async () => {
+    const writeMock = vi.fn().mockResolvedValue(undefined);
+    const projectFs = {
+      write: writeMock,
+    } as unknown as SshFileSystem;
+    const rootFs = {
+      mkdir: vi.fn().mockResolvedValue(undefined),
+      realPath: vi.fn().mockResolvedValue('/canonical/ssh-worktrees'),
+    };
+    const exec = vi.fn().mockResolvedValue({ stdout: '/home/ubuntu', stderr: '' }) as ExecFn;
+
+    const provider = new SshProjectSettingsProvider(
+      projectFs,
+      'main',
+      rootFs,
+      '/remote/repo',
+      exec
+    );
+    const first = await provider.update({ preservePatterns: [], worktreeDirectory: '~/worktrees' });
+    const second = await provider.update({ preservePatterns: [], worktreeDirectory: '~' });
+    expect(first.success).toBe(true);
+    expect(second.success).toBe(true);
+
+    expect(exec).toHaveBeenCalledTimes(1);
+    expect(rootFs.mkdir).toHaveBeenCalledWith('/home/ubuntu/worktrees', { recursive: true });
+    expect(rootFs.realPath).toHaveBeenCalledWith('/home/ubuntu/worktrees');
+    expect(writeMock).toHaveBeenCalledTimes(2);
+  });
+});
diff --git a/src/main/core/projects/settings/project-settings.ts b/src/main/core/projects/settings/project-settings.ts
new file mode 100644
index 0000000000..f89aaf2711
--- /dev/null
+++ b/src/main/core/projects/settings/project-settings.ts
@@ -0,0 +1,236 @@
+import fs from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
+import type { UpdateProjectSettingsError } from '@shared/projects';
+import { err, ok, type Result } from '@shared/result';
+import { SshFileSystem } from '@main/core/fs/impl/ssh-fs';
+import type { FileSystemProvider } from '@main/core/fs/types';
+import { appSettingsService } from '@main/core/settings/settings-service';
+import { getDefaultSshWorktreeDirectory } from '@main/core/settings/worktree-defaults';
+import { resolveRemoteHome } from '@main/core/ssh/utils';
+import type { ExecFn } from '@main/core/utils/exec';
+import { log } from '@main/lib/logger';
+import { ProjectSettings, ProjectSettingsProvider, projectSettingsSchema } from './schema';
+import {
+  defaultLocalWorktreeFs,
+  normalizeWorktreeDirectory,
+  resolveAndValidateWorktreeDirectory,
+} from './worktree-directory';
+
+const defaults = () => projectSettingsSchema.parse({});
+
+function parseSettingsOrDefault(raw: string, source: string): ProjectSettings {
+  try {
+    return projectSettingsSchema.parse(JSON.parse(raw));
+  } catch (err) {
+    log.warn(`Failed to parse ${source}, using defaults`, err);
+    return defaults();
+  }
+}
+
+export class LocalProjectSettingsProvider implements ProjectSettingsProvider {
+  constructor(
+    private readonly projectPath: string,
+    private readonly defaultBranchFallback: string = 'main',
+    private readonly rootFs?: Pick<FileSystemProvider, 'mkdir' | 'realPath'>
+  ) {}
+
+  async get(): Promise<ProjectSettings> {
+    const settingsPath = path.join(this.projectPath, '.emdash.json');
+    if (!fs.existsSync(settingsPath)) {
+      return defaults();
+    }
+    return parseSettingsOrDefault(fs.readFileSync(settingsPath, 'utf8'), settingsPath);
+  }
+
+  async update(settings: ProjectSettings): Promise<Result<void, UpdateProjectSettingsError>> {
+    const parsed = projectSettingsSchema.safeParse(settings);
+    if (!parsed.success) {
+      return err({ type: 'invalid-settings' });
+    }
+    const nextSettings = parsed.data;
+    const worktreeDirectoryResult = await resolveAndValidateWorktreeDirectory(
+      nextSettings.worktreeDirectory,
+      {
+        projectPath: this.projectPath,
+        pathApi: path,
+        fs: this.rootFs ?? defaultLocalWorktreeFs,
+        homeDirectory: os.homedir(),
+      }
+    );
+    if (!worktreeDirectoryResult.success) {
+      return worktreeDirectoryResult;
+    }
+
+    nextSettings.worktreeDirectory = worktreeDirectoryResult.data;
+
+    try {
+      const settingsPath = path.join(this.projectPath, '.emdash.json');
+      fs.writeFileSync(settingsPath, JSON.stringify(nextSettings, null, 2));
+      return ok();
+    } catch {
+      return err({ type: 'error' });
+    }
+  }
+
+  async ensure(): Promise<void> {
+    const settingsPath = path.join(this.projectPath, '.emdash.json');
+    if (!fs.existsSync(settingsPath)) {
+      fs.writeFileSync(settingsPath, JSON.stringify(defaults(), null, 2));
+    }
+  }
+
+  async getDefaultBranch(): Promise<string> {
+    const settings = await this.get();
+    const branch = settings.defaultBranch;
+    if (!branch) return this.defaultBranchFallback;
+    return typeof branch === 'string' ? branch : branch.name;
+  }
+
+  async getRemote(): Promise<string> {
+    const settings = await this.get();
+    return settings.remote ?? 'origin';
+  }
+
+  async getWorktreeDirectory(): Promise<string> {
+    const settings = await this.get();
+    const defaultWorktreeDirectory = (await appSettingsService.get('localProject'))
+      .defaultWorktreeDirectory;
+    if (settings.worktreeDirectory) {
+      const normalized = await normalizeWorktreeDirectory(settings.worktreeDirectory, {
+        projectPath: this.projectPath,
+        pathApi: path,
+        homeDirectory: os.homedir(),
+      });
+      if (normalized.success) {
+        return normalized.data;
+      }
+      {
+        log.warn(
+          'LocalProjectSettingsProvider: invalid worktreeDirectory, falling back to default',
+          {
+            worktreeDirectory: settings.worktreeDirectory,
+            defaultWorktreeDirectory,
+            error: normalized.error.type,
+          }
+        );
+      }
+    }
+    return defaultWorktreeDirectory;
+  }
+}
+
+export class SshProjectSettingsProvider implements ProjectSettingsProvider {
+  constructor(
+    private readonly fs: SshFileSystem,
+    private readonly defaultBranchFallback: string = 'main',
+    private readonly rootFs?: Pick<FileSystemProvider, 'mkdir' | 'realPath'>,
+    private readonly projectPath: string = '/',
+    private readonly exec?: ExecFn
+  ) {}
+
+  private homeDirectory?: Promise<string>;
+
+  private async getHomeDirectory(): Promise<Result<string, UpdateProjectSettingsError>> {
+    if (!this.exec) {
+      return err({ type: 'invalid-worktree-directory' });
+    }
+    try {
+      this.homeDirectory ??= resolveRemoteHome(this.exec);
+      return ok(await this.homeDirectory);
+    } catch {
+      return err({ type: 'invalid-worktree-directory' });
+    }
+  }
+
+  async get(): Promise<ProjectSettings> {
+    const exists = await this.fs.exists('.emdash.json');
+    if (!exists) {
+      return defaults();
+    }
+
+    return parseSettingsOrDefault(
+      (await this.fs.read('.emdash.json')).content,
+      '.emdash.json (ssh)'
+    );
+  }
+
+  async update(settings: ProjectSettings): Promise<Result<void, UpdateProjectSettingsError>> {
+    const parsed = projectSettingsSchema.safeParse(settings);
+    if (!parsed.success) {
+      return err({ type: 'invalid-settings' });
+    }
+    const nextSettings = parsed.data;
+    if (!this.rootFs) {
+      return err({ type: 'error' });
+    }
+    const worktreeDirectoryResult = await resolveAndValidateWorktreeDirectory(
+      nextSettings.worktreeDirectory,
+      {
+        projectPath: this.projectPath,
+        pathApi: path.posix,
+        fs: this.rootFs,
+        resolveHomeDirectory: async () => {
+          const homeDirectory = await this.getHomeDirectory();
+          return homeDirectory.success ? homeDirectory.data : '';
+        },
+      }
+    );
+    if (!worktreeDirectoryResult.success) {
+      return worktreeDirectoryResult;
+    }
+
+    nextSettings.worktreeDirectory = worktreeDirectoryResult.data;
+    try {
+      await this.fs.write('.emdash.json', JSON.stringify(nextSettings, null, 2));
+      return ok();
+    } catch {
+      return err({ type: 'error' });
+    }
+  }
+
+  async ensure(): Promise<void> {
+    const exists = await this.fs.exists('.emdash.json');
+    if (!exists) {
+      await this.fs.write('.emdash.json', JSON.stringify(defaults(), null, 2));
+    }
+  }
+
+  async getDefaultBranch(): Promise<string> {
+    const settings = await this.get();
+    const branch = settings.defaultBranch;
+    if (!branch) return this.defaultBranchFallback;
+    return typeof branch === 'string' ? branch : branch.name;
+  }
+
+  async getRemote(): Promise<string> {
+    const settings = await this.get();
+    return settings.remote ?? 'origin';
+  }
+
+  async getWorktreeDirectory(): Promise<string> {
+    const settings = await this.get();
+    const defaultWorktreeDirectory = getDefaultSshWorktreeDirectory(this.projectPath);
+    if (settings.worktreeDirectory) {
+      const normalized = await normalizeWorktreeDirectory(settings.worktreeDirectory, {
+        projectPath: this.projectPath,
+        pathApi: path.posix,
+        resolveHomeDirectory: async () => {
+          const homeDirectory = await this.getHomeDirectory();
+          return homeDirectory.success ? homeDirectory.data : '';
+        },
+      });
+      if (normalized.success) {
+        return normalized.data;
+      }
+      {
+        log.warn('SshProjectSettingsProvider: invalid worktreeDirectory, falling back to default', {
+          worktreeDirectory: settings.worktreeDirectory,
+          defaultWorktreeDirectory,
+          error: normalized.error.type,
+        });
+      }
+    }
+    return defaultWorktreeDirectory;
+  }
+}
diff --git a/src/main/core/projects/settings/schema.ts b/src/main/core/projects/settings/schema.ts
new file mode 100644
index 0000000000..4cb837e347
--- /dev/null
+++ b/src/main/core/projects/settings/schema.ts
@@ -0,0 +1,48 @@
+import z from 'zod';
+import type { UpdateProjectSettingsError } from '@shared/projects';
+import type { Result } from '@shared/result';
+
+export const defaultBranchSettingSchema = z.union([
+  z.string(),
+  z.object({ name: z.string(), remote: z.literal(true) }),
+]);
+
+export type DefaultBranchSetting = z.infer<typeof defaultBranchSettingSchema>;
+
+export const projectSettingsSchema = z.object({
+  preservePatterns: z
+    .array(z.string())
+    .optional()
+    .default([
+      '.env',
+      '.env.keys',
+      '.env.local',
+      '.env.*.local',
+      '.envrc',
+      'docker-compose.override.yml',
+      '.emdash.json',
+    ]),
+  shellSetup: z.string().optional(),
+  tmux: z.boolean().optional(),
+  scripts: z
+    .object({
+      setup: z.string().optional(),
+      run: z.string().optional(),
+      teardown: z.string().optional(),
+    })
+    .optional(),
+  worktreeDirectory: z.string().trim().optional(),
+  defaultBranch: defaultBranchSettingSchema.optional(),
+  remote: z.string().optional(),
+});
+
+export type ProjectSettings = z.infer<typeof projectSettingsSchema>;
+
+export interface ProjectSettingsProvider {
+  getDefaultBranch(): Promise<string>;
+  getRemote(): Promise<string>;
+  getWorktreeDirectory(): Promise<string>;
+  get(): Promise<ProjectSettings>;
+  update(settings: ProjectSettings): Promise<Result<void, UpdateProjectSettingsError>>;
+  ensure(): Promise<void>;
+}
diff --git a/src/main/core/projects/settings/task-settings.ts b/src/main/core/projects/settings/task-settings.ts
new file mode 100644
index 0000000000..100dbd646b
--- /dev/null
+++ b/src/main/core/projects/settings/task-settings.ts
@@ -0,0 +1,26 @@
+import type { FileSystemProvider } from '@main/core/fs/types';
+import { log } from '@main/lib/logger';
+import {
+  projectSettingsSchema,
+  type ProjectSettings,
+  type ProjectSettingsProvider,
+} from './schema';
+
+export async function getEffectiveTaskSettings(args: {
+  projectSettings: ProjectSettingsProvider;
+  taskFs: FileSystemProvider;
+}): Promise<ProjectSettings> {
+  const { projectSettings, taskFs } = args;
+  const exists = await taskFs.exists('.emdash.json');
+  if (!exists) {
+    return projectSettings.get();
+  }
+
+  try {
+    const { content } = await taskFs.read('.emdash.json');
+    return projectSettingsSchema.parse(JSON.parse(content));
+  } catch (err) {
+    log.warn('Failed to parse task .emdash.json, falling back to project settings', err);
+    return projectSettings.get();
+  }
+}
diff --git a/src/main/core/projects/settings/worktree-directory.test.ts b/src/main/core/projects/settings/worktree-directory.test.ts
new file mode 100644
index 0000000000..e1079386f3
--- /dev/null
+++ b/src/main/core/projects/settings/worktree-directory.test.ts
@@ -0,0 +1,87 @@
+import path from 'node:path';
+import { describe, expect, it, vi } from 'vitest';
+import { canonicalizeWorktreeDirectory, normalizeWorktreeDirectory } from './worktree-directory';
+
+describe('worktree-directory', () => {
+  describe('normalizeWorktreeDirectory', () => {
+    it('resolves local relative paths from project path', async () => {
+      await expect(
+        normalizeWorktreeDirectory('worktrees', {
+          projectPath: '/repo',
+          pathApi: path,
+          homeDirectory: '/Users/test',
+        })
+      ).resolves.toEqual({
+        success: true,
+        data: path.resolve('/repo', 'worktrees'),
+      });
+    });
+
+    it('expands local tilde paths from home', async () => {
+      await expect(
+        normalizeWorktreeDirectory('~/worktrees', {
+          projectPath: '/repo',
+          pathApi: path,
+          homeDirectory: '/Users/test',
+        })
+      ).resolves.toEqual({
+        success: true,
+        data: path.resolve('/Users/test', 'worktrees'),
+      });
+    });
+
+    it('resolves ssh relative paths with posix semantics', async () => {
+      await expect(
+        normalizeWorktreeDirectory('worktrees', {
+          projectPath: '/remote/repo',
+          pathApi: path.posix,
+        })
+      ).resolves.toEqual({
+        success: true,
+        data: '/remote/repo/worktrees',
+      });
+    });
+
+    it('rejects tilde paths when home cannot be resolved', async () => {
+      await expect(
+        normalizeWorktreeDirectory('~/worktrees', {
+          projectPath: '/remote/repo',
+          pathApi: path.posix,
+        })
+      ).resolves.toEqual({
+        success: false,
+        error: { type: 'invalid-worktree-directory' },
+      });
+    });
+
+    it('expands ssh tilde paths with async home resolver', async () => {
+      await expect(
+        normalizeWorktreeDirectory('~/worktrees', {
+          projectPath: '/remote/repo',
+          pathApi: path.posix,
+          resolveHomeDirectory: async () => '/home/ubuntu',
+        })
+      ).resolves.toEqual({
+        success: true,
+        data: '/home/ubuntu/worktrees',
+      });
+    });
+  });
+
+  describe('canonicalizeWorktreeDirectory', () => {
+    it('creates and canonicalizes directory through fs provider', async () => {
+      const fs = {
+        mkdir: vi.fn().mockResolvedValue(undefined),
+        realPath: vi.fn().mockResolvedValue('/canonical/path'),
+      };
+
+      const resolved = await canonicalizeWorktreeDirectory('/input/path', fs);
+      expect(resolved).toEqual({
+        success: true,
+        data: '/canonical/path',
+      });
+      expect(fs.mkdir).toHaveBeenCalledWith('/input/path', { recursive: true });
+      expect(fs.realPath).toHaveBeenCalledWith('/input/path');
+    });
+  });
+});
diff --git a/src/main/core/projects/settings/worktree-directory.ts b/src/main/core/projects/settings/worktree-directory.ts
new file mode 100644
index 0000000000..37c425b1c5
--- /dev/null
+++ b/src/main/core/projects/settings/worktree-directory.ts
@@ -0,0 +1,89 @@
+import fs from 'node:fs';
+import path from 'node:path';
+import type { UpdateProjectSettingsError } from '@shared/projects';
+import { err, ok, type Result } from '@shared/result';
+import type { FileSystemProvider } from '@main/core/fs/types';
+
+export type WorktreeDirectoryFs = Pick<FileSystemProvider, 'mkdir' | 'realPath'>;
+
+type PathApi = Pick<typeof path, 'isAbsolute' | 'join' | 'resolve'>;
+
+export async function normalizeWorktreeDirectory(
+  input: string,
+  options: {
+    projectPath: string;
+    pathApi: PathApi;
+    homeDirectory?: string;
+    resolveHomeDirectory?: () => Promise<string>;
+  }
+): Promise<Result<string, UpdateProjectSettingsError>> {
+  try {
+    const trimmed = input.trim();
+    let normalized = trimmed;
+
+    if (trimmed === '~' || trimmed.startsWith('~/')) {
+      const resolvedHomeDirectory = options.resolveHomeDirectory
+        ? (await options.resolveHomeDirectory()).trim()
+        : undefined;
+      const homeDirectory = options.homeDirectory ?? resolvedHomeDirectory;
+      if (!homeDirectory) {
+        return err({ type: 'invalid-worktree-directory' });
+      }
+      normalized =
+        trimmed === '~' ? homeDirectory : options.pathApi.join(homeDirectory, trimmed.slice(2));
+    }
+
+    if (options.pathApi.isAbsolute(normalized)) {
+      return ok(normalized);
+    }
+    return ok(options.pathApi.resolve(options.projectPath, normalized));
+  } catch {
+    return err({ type: 'invalid-worktree-directory' });
+  }
+}
+
+export async function canonicalizeWorktreeDirectory(
+  directory: string,
+  fs: WorktreeDirectoryFs
+): Promise<Result<string, UpdateProjectSettingsError>> {
+  try {
+    await fs.mkdir(directory, { recursive: true });
+    return ok(await fs.realPath(directory));
+  } catch {
+    return err({ type: 'invalid-worktree-directory' });
+  }
+}
+
+export const defaultLocalWorktreeFs: WorktreeDirectoryFs = {
+  mkdir: async (p, options) => {
+    await fs.promises.mkdir(p, options);
+  },
+  realPath: async (p) => fs.promises.realpath(p),
+};
+
+export async function resolveAndValidateWorktreeDirectory(
+  input: string | undefined,
+  options: {
+    projectPath: string;
+    pathApi: Pick<typeof path, 'isAbsolute' | 'join' | 'resolve'>;
+    fs: WorktreeDirectoryFs;
+    homeDirectory?: string;
+    resolveHomeDirectory?: () => Promise<string>;
+  }
+): Promise<Result<string | undefined, UpdateProjectSettingsError>> {
+  const trimmed = input?.trim();
+  if (!trimmed) {
+    return ok(undefined);
+  }
+
+  const normalized = await normalizeWorktreeDirectory(trimmed, {
+    projectPath: options.projectPath,
+    pathApi: options.pathApi,
+    homeDirectory: options.homeDirectory,
+    resolveHomeDirectory: options.resolveHomeDirectory,
+  });
+  if (!normalized.success) {
+    return normalized;
+  }
+  return canonicalizeWorktreeDirectory(normalized.data, options.fs);
+}
diff --git a/src/main/core/projects/utils.ts b/src/main/core/projects/utils.ts
new file mode 100644
index 0000000000..4c1af08d17
--- /dev/null
+++ b/src/main/core/projects/utils.ts
@@ -0,0 +1,23 @@
+import { projectManager } from './project-manager';
+
+export function resolveTask(projectId: string, taskId: string) {
+  return projectManager.getProject(projectId)?.getTask(taskId) ?? null;
+}
+
+export function resolveWorkspace(projectId: string, workspaceId: string) {
+  return projectManager.getProject(projectId)?.getWorkspace(workspaceId) ?? null;
+}
+
+export class TimeoutSignal extends Error {
+  constructor(readonly ms: number) {
+    super(`Operation timed out after ${ms}ms`);
+  }
+}
+
+export function withTimeout<T>(promise: Promise<T>, ms: number): Promise<T> {
+  let timer: ReturnType<typeof setTimeout>;
+  const timeout = new Promise<never>((_, reject) => {
+    timer = setTimeout(() => reject(new TimeoutSignal(ms)), ms);
+  });
+  return Promise.race([promise, timeout]).finally(() => clearTimeout(timer));
+}
diff --git a/src/main/core/projects/worktrees/utils.ts b/src/main/core/projects/worktrees/utils.ts
new file mode 100644
index 0000000000..0bf67a1492
--- /dev/null
+++ b/src/main/core/projects/worktrees/utils.ts
@@ -0,0 +1,35 @@
+import fs from 'fs';
+import path from 'path';
+import { FileSystemProvider } from '@main/core/fs/types';
+
+export const ensureLocalWorktreeDirectory = ({
+  directory,
+  projectName,
+}: {
+  directory?: string;
+  projectName: string;
+}): string => {
+  directory = directory ?? path.join('emdash', 'projects', 'worktrees', projectName);
+  if (!fs.existsSync(directory)) {
+    fs.mkdirSync(directory, { recursive: true });
+  }
+  return directory;
+};
+
+export const ensureSshWorktreeDirectory = async ({
+  directory,
+  projectName,
+  rootFs,
+}: {
+  directory?: string;
+  projectName: string;
+  rootFs: FileSystemProvider;
+}): Promise<string> => {
+  directory = directory ?? path.join('emdash', 'projects', 'worktrees', projectName);
+
+  const exists = await rootFs.exists(directory);
+  if (!exists) {
+    await rootFs.mkdir(directory, { recursive: true });
+  }
+  return directory;
+};
diff --git a/src/main/core/projects/worktrees/worktree-service.test.ts b/src/main/core/projects/worktrees/worktree-service.test.ts
new file mode 100644
index 0000000000..dc2c9e8a39
--- /dev/null
+++ b/src/main/core/projects/worktrees/worktree-service.test.ts
@@ -0,0 +1,201 @@
+import fs from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
+import { afterEach, beforeEach, describe, expect, it } from 'vitest';
+import type { Remote } from '@shared/git';
+import { ok } from '@shared/result';
+import { LocalFileSystem } from '@main/core/fs/impl/local-fs';
+import { getLocalExec, type ExecFn } from '@main/core/utils/exec';
+import type { ProjectSettingsProvider } from '../settings/schema';
+import { WorktreeService } from './worktree-service';
+
+async function initRepo(dir: string, exec: ExecFn): Promise<void> {
+  await exec('git', ['init'], { cwd: dir });
+  await exec('git', ['symbolic-ref', 'HEAD', 'refs/heads/main'], { cwd: dir });
+  await exec('git', ['config', 'user.email', 'test@test.com'], { cwd: dir });
+  await exec('git', ['config', 'user.name', 'Test'], { cwd: dir });
+  await exec('git', ['commit', '--allow-empty', '-m', 'init'], { cwd: dir });
+}
+
+function makeSettings(preservePatterns: string[] = []): ProjectSettingsProvider {
+  return {
+    get: async () => ({ preservePatterns }),
+    update: async () => ok(),
+    ensure: async () => {},
+    getWorktreeDirectory: async () => '',
+    getDefaultBranch: async () => 'main',
+    getRemote: async () => 'origin',
+  } as ProjectSettingsProvider;
+}
+
+const originRemote = (url = 'ssh://example.com/repo.git'): Remote => ({ name: 'origin', url });
+
+describe('WorktreeService', () => {
+  let repoDir: string;
+  let poolDir: string;
+  let exec: ExecFn;
+
+  beforeEach(async () => {
+    repoDir = fs.mkdtempSync(path.join(os.tmpdir(), 'wt-repo-'));
+    poolDir = fs.mkdtempSync(path.join(os.tmpdir(), 'wt-pool-'));
+    exec = getLocalExec();
+    await initRepo(repoDir, exec);
+  });
+
+  afterEach(() => {
+    fs.rmSync(repoDir, { recursive: true, force: true });
+    fs.rmSync(poolDir, { recursive: true, force: true });
+  });
+
+  function makeService(
+    overrides: Partial<{
+      worktreePoolPath: string;
+      repoPath: string;
+      exec: ExecFn;
+      projectSettings: ProjectSettingsProvider;
+    }> = {}
+  ): WorktreeService {
+    return new WorktreeService({
+      worktreePoolPath: poolDir,
+      repoPath: repoDir,
+      exec,
+      rootFs: new LocalFileSystem('/'),
+      projectSettings: makeSettings(),
+      ...overrides,
+    });
+  }
+
+  describe('checkoutBranchWorktree', () => {
+    it('creates a worktree from an existing local source branch', async () => {
+      await exec('git', ['branch', 'task/local-checkout'], { cwd: repoDir });
+      const svc = makeService();
+
+      const result = await svc.checkoutBranchWorktree(
+        { type: 'local', branch: 'main' },
+        'task/local-checkout'
+      );
+
+      expect(result.success).toBe(true);
+      if (!result.success) throw new Error('expected success');
+      expect(result.data).toBe(path.join(poolDir, 'task', 'local-checkout'));
+      expect(fs.existsSync(result.data)).toBe(true);
+    });
+
+    it('creates a worktree from a remote source branch when branch is not local', async () => {
+      const remoteDir = fs.mkdtempSync(path.join(os.tmpdir(), 'wt-remote-'));
+      try {
+        await exec('git', ['init', '--bare'], { cwd: remoteDir });
+        await exec('git', ['remote', 'add', 'origin', remoteDir], { cwd: repoDir });
+        await exec('git', ['branch', 'feature/remote-base'], { cwd: repoDir });
+        await exec('git', ['push', '-u', 'origin', 'feature/remote-base'], { cwd: repoDir });
+        await exec('git', ['branch', '-D', 'feature/remote-base'], { cwd: repoDir });
+
+        const svc = makeService();
+        const result = await svc.checkoutBranchWorktree(
+          { type: 'remote', branch: 'feature/remote-base', remote: originRemote(remoteDir) },
+          'task/from-remote'
+        );
+
+        expect(result.success).toBe(true);
+        if (!result.success) throw new Error('expected success');
+        expect(fs.existsSync(result.data)).toBe(true);
+
+        const { stdout } = await exec('git', ['rev-parse', '--abbrev-ref', 'HEAD'], {
+          cwd: result.data,
+        });
+        expect(stdout.trim()).toBe('task/from-remote');
+      } finally {
+        fs.rmSync(remoteDir, { recursive: true, force: true });
+      }
+    });
+
+    it('returns existing checked out path when branch is already checked out elsewhere', async () => {
+      await exec('git', ['branch', 'feature/already-open'], { cwd: repoDir });
+      const externalDir = fs.mkdtempSync(path.join(os.tmpdir(), 'wt-external-'));
+      const externalPath = path.join(externalDir, 'feature-already-open');
+      await exec('git', ['worktree', 'add', externalPath, 'feature/already-open'], {
+        cwd: repoDir,
+      });
+
+      const svc = makeService();
+      const result = await svc.checkoutBranchWorktree(
+        { type: 'local', branch: 'main' },
+        'feature/already-open'
+      );
+
+      expect(result.success).toBe(true);
+      if (!result.success) throw new Error('expected success');
+      expect(result.data).toBe(fs.realpathSync(externalPath));
+
+      fs.rmSync(externalDir, { recursive: true, force: true });
+    });
+
+    it('returns branch-not-found when source branch does not exist', async () => {
+      const svc = makeService();
+
+      const result = await svc.checkoutBranchWorktree(
+        { type: 'local', branch: 'does-not-exist' },
+        'task/no-source'
+      );
+
+      expect(result.success).toBe(false);
+      if (result.success) throw new Error('expected failure');
+      expect(result.error.type).toBe('branch-not-found');
+    });
+
+    it('copies preserved files into the created worktree', async () => {
+      fs.writeFileSync(path.join(repoDir, '.env'), 'SECRET=abc');
+      await exec('git', ['branch', 'task/env-test'], { cwd: repoDir });
+      const svc = makeService({ projectSettings: makeSettings(['.env']) });
+
+      const result = await svc.checkoutBranchWorktree(
+        { type: 'local', branch: 'main' },
+        'task/env-test'
+      );
+
+      expect(result.success).toBe(true);
+      if (!result.success) throw new Error('expected success');
+      expect(fs.readFileSync(path.join(result.data, '.env'), 'utf8')).toBe('SECRET=abc');
+    });
+  });
+
+  describe('checkoutExistingBranch', () => {
+    it('returns existing checked out path when branch is already checked out elsewhere', async () => {
+      await exec('git', ['branch', 'feature/already-open-existing'], { cwd: repoDir });
+      const externalDir = fs.mkdtempSync(path.join(os.tmpdir(), 'wt-external-'));
+      const externalPath = path.join(externalDir, 'feature-already-open-existing');
+      await exec('git', ['worktree', 'add', externalPath, 'feature/already-open-existing'], {
+        cwd: repoDir,
+      });
+
+      const svc = makeService();
+      const result = await svc.checkoutExistingBranch('feature/already-open-existing');
+
+      expect(result.success).toBe(true);
+      if (!result.success) throw new Error('expected success');
+      expect(result.data).toBe(fs.realpathSync(externalPath));
+
+      fs.rmSync(externalDir, { recursive: true, force: true });
+    });
+
+    it('creates local branch from remote when needed', async () => {
+      const remoteDir = fs.mkdtempSync(path.join(os.tmpdir(), 'wt-remote-'));
+      try {
+        await exec('git', ['init', '--bare'], { cwd: remoteDir });
+        await exec('git', ['remote', 'add', 'origin', remoteDir], { cwd: repoDir });
+        await exec('git', ['branch', 'feature/from-remote'], { cwd: repoDir });
+        await exec('git', ['push', '-u', 'origin', 'feature/from-remote'], { cwd: repoDir });
+        await exec('git', ['branch', '-D', 'feature/from-remote'], { cwd: repoDir });
+
+        const svc = makeService();
+        const result = await svc.checkoutExistingBranch('feature/from-remote');
+
+        expect(result.success).toBe(true);
+        if (!result.success) throw new Error('expected success');
+        expect(fs.existsSync(result.data)).toBe(true);
+      } finally {
+        fs.rmSync(remoteDir, { recursive: true, force: true });
+      }
+    });
+  });
+});
diff --git a/src/main/core/projects/worktrees/worktree-service.ts b/src/main/core/projects/worktrees/worktree-service.ts
new file mode 100644
index 0000000000..82f42479e8
--- /dev/null
+++ b/src/main/core/projects/worktrees/worktree-service.ts
@@ -0,0 +1,305 @@
+import path from 'node:path';
+import type { Branch } from '@shared/git';
+import { DEFAULT_REMOTE_NAME } from '@shared/git-utils';
+import { err, ok, Result } from '@shared/result';
+import { FileSystemProvider } from '@main/core/fs/types';
+import { ExecFn } from '@main/core/utils/exec';
+import { log } from '@main/lib/logger';
+import { ProjectSettingsProvider } from '../settings/schema';
+
+export type ServeWorktreeError =
+  | { type: 'worktree-setup-failed'; cause: unknown }
+  | { type: 'branch-not-found'; branch: string };
+
+export class WorktreeService {
+  private gitOpQueue: Promise<unknown> = Promise.resolve();
+  private readonly worktreePoolPath: string;
+  private readonly repoPath: string;
+  private readonly exec: ExecFn;
+  private readonly rootFs: FileSystemProvider;
+  private readonly projectSettings: ProjectSettingsProvider;
+
+  constructor(args: {
+    worktreePoolPath: string;
+    repoPath: string;
+    exec: ExecFn;
+    rootFs: FileSystemProvider;
+    projectSettings: ProjectSettingsProvider;
+  }) {
+    this.worktreePoolPath = args.worktreePoolPath;
+    this.repoPath = args.repoPath;
+    this.projectSettings = args.projectSettings;
+    this.exec = args.exec;
+    this.rootFs = args.rootFs;
+
+    this.exec('git', ['worktree', 'prune'], { cwd: this.repoPath }).catch(() => {});
+  }
+
+  private enqueueGitOp<T>(fn: () => Promise<T>): Promise<T> {
+    const result = this.gitOpQueue.then(fn, fn);
+    this.gitOpQueue = result.catch(() => {});
+    return result as Promise<T>;
+  }
+
+  private async isValidWorktree(worktreePath: string): Promise<boolean> {
+    try {
+      await this.exec('git', ['rev-parse', '--git-dir'], { cwd: worktreePath });
+      return true;
+    } catch {
+      return false;
+    }
+  }
+
+  private async ensureWorktreePoolDirExists(): Promise<void> {
+    await this.rootFs.mkdir(this.worktreePoolPath, { recursive: true });
+  }
+
+  private async getRemoteCandidates(): Promise<string[]> {
+    const configuredRemote = (await this.projectSettings.getRemote().catch(() => '')).trim();
+    if (!configuredRemote || configuredRemote === DEFAULT_REMOTE_NAME) {
+      return [DEFAULT_REMOTE_NAME];
+    }
+    return [configuredRemote, DEFAULT_REMOTE_NAME];
+  }
+
+  private async findCheckedOutPathForBranch(branchName: string): Promise<string | undefined> {
+    try {
+      const { stdout } = await this.exec('git', ['worktree', 'list', '--porcelain'], {
+        cwd: this.repoPath,
+      });
+      const branchLine = `branch refs/heads/${branchName}`;
+      for (const block of stdout.split('\n\n')) {
+        if (!block.split('\n').some((line) => line === branchLine)) {
+          continue;
+        }
+        const match = /^worktree (.+)$/m.exec(block);
+        const candidatePath = match?.[1];
+        if (!candidatePath) continue;
+        if (await this.isValidWorktree(candidatePath)) {
+          return candidatePath;
+        }
+        await this.exec('git', ['worktree', 'prune'], { cwd: this.repoPath }).catch(() => {});
+      }
+    } catch {}
+    return undefined;
+  }
+
+  private async resolveSourceBaseRef(
+    sourceBranch: Branch | undefined
+  ): Promise<string | undefined> {
+    if (!sourceBranch) return undefined;
+
+    if (sourceBranch.type === 'local') {
+      const localRef = `refs/heads/${sourceBranch.branch}`;
+      try {
+        await this.exec('git', ['rev-parse', '--verify', localRef], { cwd: this.repoPath });
+        return localRef;
+      } catch {
+        return undefined;
+      }
+    }
+
+    const remoteName = sourceBranch.remote.name;
+    await this.exec('git', ['fetch', remoteName], { cwd: this.repoPath }).catch(() => {});
+    const remoteRef = `refs/remotes/${remoteName}/${sourceBranch.branch}`;
+    try {
+      await this.exec('git', ['rev-parse', '--verify', remoteRef], { cwd: this.repoPath });
+      return remoteRef;
+    } catch {
+      return undefined;
+    }
+  }
+
+  async getWorktree(branchName: string): Promise<string | undefined> {
+    const worktreePath = path.join(this.worktreePoolPath, branchName);
+    if (await this.rootFs.exists(worktreePath)) {
+      if (await this.isValidWorktree(worktreePath)) return worktreePath;
+      await this.rootFs.remove(worktreePath, { recursive: true }).catch(() => {});
+    }
+
+    try {
+      const realPoolPath = await this.rootFs.realPath(this.worktreePoolPath);
+      const { stdout } = await this.exec('git', ['worktree', 'list', '--porcelain'], {
+        cwd: this.repoPath,
+      });
+      const branchLine = `branch refs/heads/${branchName}`;
+      for (const block of stdout.split('\n\n')) {
+        if (block.split('\n').some((line) => line === branchLine)) {
+          const match = /^worktree (.+)$/m.exec(block);
+          if (match?.[1]?.startsWith(realPoolPath)) return match[1];
+        }
+      }
+    } catch {}
+    return undefined;
+  }
+
+  async checkoutBranchWorktree(
+    sourceBranch: Branch | undefined,
+    branchName: string
+  ): Promise<Result<string, ServeWorktreeError>> {
+    await this.ensureWorktreePoolDirExists();
+    return this.enqueueGitOp(() => this.doCheckoutBranchWorktree(sourceBranch, branchName));
+  }
+
+  private async doCheckoutBranchWorktree(
+    sourceBranch: Branch | undefined,
+    branchName: string
+  ): Promise<Result<string, ServeWorktreeError>> {
+    const checkedOutPath = await this.findCheckedOutPathForBranch(branchName);
+    if (checkedOutPath) {
+      return ok(checkedOutPath);
+    }
+
+    const targetPath = path.join(this.worktreePoolPath, branchName);
+    if (await this.rootFs.exists(targetPath)) {
+      if (await this.isValidWorktree(targetPath)) return ok(targetPath);
+      await this.rootFs.remove(targetPath, { recursive: true }).catch(() => {});
+      await this.exec('git', ['worktree', 'prune'], { cwd: this.repoPath }).catch(() => {});
+    }
+
+    try {
+      let localExists = false;
+      try {
+        await this.exec('git', ['rev-parse', '--verify', `refs/heads/${branchName}`], {
+          cwd: this.repoPath,
+        });
+        localExists = true;
+      } catch {}
+
+      if (!localExists) {
+        const sourceRef = await this.resolveSourceBaseRef(sourceBranch);
+        if (!sourceRef) {
+          return err({ type: 'branch-not-found', branch: sourceBranch?.branch ?? branchName });
+        }
+        await this.exec('git', ['branch', '--no-track', branchName, sourceRef], {
+          cwd: this.repoPath,
+        });
+      }
+
+      await this.rootFs.mkdir(path.dirname(targetPath), { recursive: true });
+      await this.exec('git', ['worktree', 'prune'], { cwd: this.repoPath }).catch(() => {});
+      await this.exec('git', ['worktree', 'add', targetPath, branchName], {
+        cwd: this.repoPath,
+      });
+    } catch (cause) {
+      return err({ type: 'worktree-setup-failed', cause });
+    }
+
+    await this.copyPreservedFiles(targetPath).catch((e) => {
+      log.warn('WorktreeService: failed to copy preserved files', {
+        targetPath,
+        error: String(e),
+      });
+    });
+
+    return ok(targetPath);
+  }
+
+  async checkoutExistingBranch(branchName: string): Promise<Result<string, ServeWorktreeError>> {
+    await this.ensureWorktreePoolDirExists();
+    return this.enqueueGitOp(() => this.doCheckoutExistingBranch(branchName));
+  }
+
+  private async doCheckoutExistingBranch(
+    branchName: string
+  ): Promise<Result<string, ServeWorktreeError>> {
+    const checkedOutPath = await this.findCheckedOutPathForBranch(branchName);
+    if (checkedOutPath) {
+      return ok(checkedOutPath);
+    }
+
+    const targetPath = path.join(this.worktreePoolPath, branchName);
+    const remoteCandidates = await this.getRemoteCandidates();
+
+    if (await this.rootFs.exists(targetPath)) {
+      if (await this.isValidWorktree(targetPath)) return ok(targetPath);
+      await this.rootFs.remove(targetPath, { recursive: true });
+      await this.exec('git', ['worktree', 'prune'], { cwd: this.repoPath }).catch(() => {});
+    }
+
+    try {
+      await this.rootFs.mkdir(path.dirname(targetPath), { recursive: true });
+      for (const remoteName of remoteCandidates) {
+        await this.exec('git', ['fetch', remoteName], { cwd: this.repoPath }).catch(() => {});
+      }
+      let localExists = false;
+      try {
+        await this.exec('git', ['rev-parse', '--verify', `refs/heads/${branchName}`], {
+          cwd: this.repoPath,
+        });
+        localExists = true;
+      } catch {}
+
+      if (!localExists) {
+        let trackingRemote: string | undefined;
+        for (const remoteName of remoteCandidates) {
+          try {
+            await this.exec(
+              'git',
+              ['rev-parse', '--verify', `refs/remotes/${remoteName}/${branchName}`],
+              {
+                cwd: this.repoPath,
+              }
+            );
+            trackingRemote = remoteName;
+            break;
+          } catch {}
+        }
+        if (!trackingRemote) {
+          return err({ type: 'branch-not-found', branch: branchName });
+        }
+        await this.exec(
+          'git',
+          ['branch', '--track', branchName, `${trackingRemote}/${branchName}`],
+          {
+            cwd: this.repoPath,
+          }
+        );
+      }
+
+      await this.exec('git', ['worktree', 'prune'], { cwd: this.repoPath }).catch(() => {});
+      await this.exec('git', ['worktree', 'add', targetPath, branchName], {
+        cwd: this.repoPath,
+      });
+    } catch (cause) {
+      return err({ type: 'worktree-setup-failed', cause });
+    }
+
+    await this.copyPreservedFiles(targetPath).catch((e) => {
+      log.warn('WorktreeService: failed to copy preserved files', {
+        targetPath,
+        error: String(e),
+      });
+    });
+
+    return ok(targetPath);
+  }
+
+  async moveWorktree(oldPath: string, newPath: string): Promise<void> {
+    await this.exec('git', ['worktree', 'move', oldPath, newPath], { cwd: this.repoPath });
+  }
+
+  async removeWorktree(worktreePath: string): Promise<void> {
+    await this.rootFs.remove(worktreePath, { recursive: true }).catch(() => {});
+    await this.exec('git', ['worktree', 'prune'], { cwd: this.repoPath }).catch(() => {});
+  }
+
+  private async copyPreservedFiles(targetPath: string): Promise<void> {
+    const settings = await this.projectSettings.get();
+    const patterns = settings.preservePatterns ?? [];
+    for (const pattern of patterns) {
+      const matches = await this.rootFs.glob(pattern, {
+        cwd: this.repoPath,
+        dot: true,
+      });
+      for (const relPath of matches) {
+        const src = path.join(this.repoPath, relPath);
+        const stat = await this.rootFs.stat(src).catch(() => null);
+        if (!stat || stat.type !== 'file') continue;
+        const dest = path.join(targetPath, relPath);
+        await this.rootFs.mkdir(path.dirname(dest), { recursive: true });
+        await this.rootFs.copyFile(src, dest);
+      }
+    }
+  }
+}
diff --git a/src/main/core/pty/controller.ts b/src/main/core/pty/controller.ts
new file mode 100644
index 0000000000..fa69a23522
--- /dev/null
+++ b/src/main/core/pty/controller.ts
@@ -0,0 +1,90 @@
+import { createRPCController } from '@shared/ipc/rpc';
+import { err, ok } from '@shared/result';
+import { log } from '@main/lib/logger';
+import type { SshProjectProvider } from '../projects/impl/ssh-project-provider';
+import { projectManager } from '../projects/project-manager';
+import { ptySessionRegistry } from './pty-session-registry';
+
+export const ptyController = createRPCController({
+  /** Send raw input data to a PTY session. */
+  sendInput: (sessionId: string, data: string) => {
+    const pty = ptySessionRegistry.get(sessionId);
+    if (!pty) return err({ type: 'not_found' as const });
+    pty.write(data);
+    return ok();
+  },
+
+  /** Resize a PTY session to the given terminal dimensions. */
+  resize: (sessionId: string, cols: number, rows: number) => {
+    const pty = ptySessionRegistry.get(sessionId);
+    if (!pty) return err({ type: 'not_found' as const });
+    pty.resize(cols, rows);
+    return ok();
+  },
+
+  /**
+   * Atomically return the ring buffer and register the renderer as a consumer
+   * for future IPC delivery. Non-destructive — the ring buffer is kept intact.
+   * Called once by the renderer when connecting a FrontendPty to a session.
+   */
+  subscribe: (sessionId: string) => {
+    return ok({ buffer: ptySessionRegistry.subscribe(sessionId) });
+  },
+
+  /**
+   * Remove the renderer's consumer registration for a session.
+   * Called when the renderer disposes its FrontendPty.
+   */
+  unsubscribe: (sessionId: string) => {
+    ptySessionRegistry.unsubscribe(sessionId);
+    return ok();
+  },
+
+  /** Kill a PTY session and clean it up immediately. */
+  kill: (sessionId: string) => {
+    const pty = ptySessionRegistry.get(sessionId);
+    if (pty) {
+      try {
+        pty.kill();
+      } catch (e) {
+        log.warn('ptyController.kill: error killing PTY', { sessionId, error: String(e) });
+      }
+    }
+    ptySessionRegistry.unregister(sessionId);
+    return ok();
+  },
+
+  /**
+   * Upload local files into the task's working directory on a remote SSH host
+   * and return their remote paths.  Uses the SFTP subsystem of the already-
+   * connected ssh2 client — no local ssh/scp binaries are involved.
+   *
+   * The session ID encodes the project and scope (`projectId:scopeId:leafId`),
+   * where `scopeId` is a task ID for conversation uploads.
+   */
+  uploadFiles: async (args: { sessionId: string; localPaths: string[] }) => {
+    try {
+      const [projectId, scopeId] = args.sessionId.split(':');
+      if (!projectId || !scopeId) {
+        return err({ type: 'invalid_session' as const });
+      }
+
+      const provider = projectManager.getProject(projectId);
+      if (!provider || provider.type !== 'ssh') {
+        return err({ type: 'not_ssh' as const });
+      }
+
+      const remotePaths = await (provider as SshProjectProvider).uploadFiles(
+        scopeId,
+        args.localPaths
+      );
+      return ok({ remotePaths });
+    } catch (e: unknown) {
+      log.error('pty:uploadFiles failed', {
+        sessionId: args.sessionId,
+        error: (e as Error)?.message || e,
+      });
+      return err({ type: 'upload_failed' as const, message: String((e as Error)?.message || e) });
+    }
+  },
+});
diff --git a/src/main/core/pty/exit-signals.ts b/src/main/core/pty/exit-signals.ts
new file mode 100644
index 0000000000..4b174d322c
--- /dev/null
+++ b/src/main/core/pty/exit-signals.ts
@@ -0,0 +1,106 @@
+export type PtySignal =
+  | 'SIGHUP' // 1  — hangup / PTY master closed (common when emdash window closes)
+  | 'SIGINT' // 2  — Ctrl+C (user interrupt)
+  | 'SIGQUIT' // 3  — Ctrl+\ (quit + core dump)
+  | 'SIGILL' // 4  — illegal instruction
+  | 'SIGTRAP' // 5  — trace / breakpoint trap
+  | 'SIGABRT' // 6  — abort() called
+  | 'SIGBUS' // 7  — bus error (bad memory access)
+  | 'SIGFPE' // 8  — floating-point exception
+  | 'SIGKILL' // 9  — force kill (cannot be caught or ignored)
+  | 'SIGUSR1' // 10 — user-defined signal 1
+  | 'SIGSEGV' // 11 — invalid memory reference (segfault)
+  | 'SIGUSR2' // 12 — user-defined signal 2
+  | 'SIGPIPE' // 13 — write to closed pipe (agent output discarded)
+  | 'SIGALRM' // 14 — alarm timer expired
+  | 'SIGTERM' // 15 — graceful termination request (default `kill` signal)
+  | 'SIGCHLD' // 17 — child process state changed
+  | 'SIGCONT' // 18 — continue a stopped process
+  | 'SIGSTOP' // 19 — stop process (cannot be caught or ignored)
+  | 'SIGTSTP' // 20 — Ctrl+Z (stop from terminal)
+  | 'SIGTTIN' // 21 — background process attempted terminal read
+  | 'SIGTTOU' // 22 — background process attempted terminal write
+  | 'SIGURG' // 23 — urgent data available on socket
+  | 'SIGXCPU' // 24 — CPU time limit exceeded
+  | 'SIGXFSZ' // 25 — file size limit exceeded
+  | 'SIGVTALRM' // 26 — virtual timer expired
+  | 'SIGPROF' // 27 — profiling timer expired
+  | 'SIGWINCH' // 28 — terminal window resized (rarely surfaces as an exit signal)
+  | 'SIGPWR' // 30 — power failure
+  | 'SIGSYS'; // 31 — bad system call
+
+export const SIGNAL_BY_NUMBER: Readonly<Record<number, PtySignal>> = {
+  1: 'SIGHUP',
+  2: 'SIGINT',
+  3: 'SIGQUIT',
+  4: 'SIGILL',
+  5: 'SIGTRAP',
+  6: 'SIGABRT',
+  7: 'SIGBUS',
+  8: 'SIGFPE',
+  9: 'SIGKILL',
+  10: 'SIGUSR1',
+  11: 'SIGSEGV',
+  12: 'SIGUSR2',
+  13: 'SIGPIPE',
+  14: 'SIGALRM',
+  15: 'SIGTERM',
+  17: 'SIGCHLD',
+  18: 'SIGCONT',
+  19: 'SIGSTOP',
+  20: 'SIGTSTP',
+  21: 'SIGTTIN',
+  22: 'SIGTTOU',
+  23: 'SIGURG',
+  24: 'SIGXCPU',
+  25: 'SIGXFSZ',
+  26: 'SIGVTALRM',
+  27: 'SIGPROF',
+  28: 'SIGWINCH',
+  30: 'SIGPWR',
+  31: 'SIGSYS',
+};
+
+const KNOWN_SIGNAL_NAMES = new Set<string>(Object.values(SIGNAL_BY_NUMBER));
+
+export function normalizeSignal(raw: number | string | null | undefined): PtySignal | undefined {
+  if (raw == null) return undefined;
+  if (typeof raw === 'number') return SIGNAL_BY_NUMBER[raw];
+  const canonical = raw.startsWith('SIG') ? raw : `SIG${raw}`;
+  return KNOWN_SIGNAL_NAMES.has(canonical) ? (canonical as PtySignal) : undefined;
+}
+
+export const EXIT_CODE_MEANINGS: Readonly<Record<number, string>> = {
+  0: 'Success',
+  1: 'General error',
+  2: 'Misuse of shell built-in',
+  126: 'Command not executable (permission denied)',
+  127: 'Command not found',
+  128: 'Invalid argument to exit()',
+  129: 'Terminated by SIGHUP (PTY closed)',
+  130: 'Terminated by SIGINT (Ctrl+C)',
+  131: 'Terminated by SIGQUIT (Ctrl+\\)',
+  134: 'Terminated by SIGABRT',
+  137: 'Killed by SIGKILL (force kill / OOM)',
+  139: 'Terminated by SIGSEGV (segfault)',
+  141: 'Terminated by SIGPIPE (broken pipe)',
+  143: 'Terminated by SIGTERM (graceful stop)',
+};
+
+export function getExitCodeMeaning(exitCode: number): string {
+  const knownExitCode = EXIT_CODE_MEANINGS[exitCode];
+  if (knownExitCode) {
+    return knownExitCode;
+  }
+  if (signalFromExitCode(exitCode)) {
+    return `Terminated by ${signalFromExitCode(exitCode)}`;
+  }
+  return `Unknown exit code: ${exitCode}`;
+}
+
+function signalFromExitCode(exitCode: number): PtySignal | undefined {
+  if (exitCode > 128 && exitCode <= 159) {
+    return SIGNAL_BY_NUMBER[exitCode - 128];
+  }
+  return undefined;
+}
diff --git a/src/main/core/pty/local-pty.ts b/src/main/core/pty/local-pty.ts
new file mode 100644
index 0000000000..f1b69af416
--- /dev/null
+++ b/src/main/core/pty/local-pty.ts
@@ -0,0 +1,119 @@
+import path from 'node:path';
+import * as nodePty from 'node-pty';
+import type { IPty } from 'node-pty';
+import { log } from '@main/lib/logger';
+import { normalizeSignal } from './exit-signals';
+import type { Pty, PtyDimensions, PtyExitInfo } from './pty';
+
+export interface LocalSpawnOptions extends PtyDimensions {
+  id: string;
+  command: string;
+  args: string[];
+  cwd: string;
+  env: Record<string, string>;
+}
+
+const MIN_COLS = 2;
+const MIN_ROWS = 1;
+
+export function spawnLocalPty(options: LocalSpawnOptions): LocalPtySession {
+  const { id, command, args, cwd, env, cols, rows } = options;
+  const spawnSpec = resolveWindowsPtySpawn(command, args);
+
+  log.info('LocalPtySession:spawn', {
+    id,
+    command: spawnSpec.command,
+    args: spawnSpec.args,
+    cwd,
+    cols,
+    rows,
+  });
+
+  try {
+    const proc = nodePty.spawn(spawnSpec.command, spawnSpec.args, {
+      name: 'xterm-256color',
+      cols,
+      rows,
+      cwd,
+      env,
+    });
+    return new LocalPtySession(id, proc);
+  } catch (e: unknown) {
+    const message = e instanceof Error ? e.message : String(e);
+    throw new Error(`Failed to spawn PTY: ${message}`);
+  }
+}
+
+export class LocalPtySession implements Pty {
+  readonly id: string;
+
+  constructor(
+    id: string,
+    private readonly proc: IPty
+  ) {
+    this.id = id;
+  }
+
+  write(data: string): void {
+    this.proc.write(data);
+  }
+
+  resize(cols: number, rows: number): void {
+    const c = Number.isFinite(cols) ? Math.max(MIN_COLS, Math.floor(cols)) : MIN_COLS;
+    const r = Number.isFinite(rows) ? Math.max(MIN_ROWS, Math.floor(rows)) : MIN_ROWS;
+    try {
+      this.proc.resize(c, r);
+    } catch (e: unknown) {
+      const msg = e instanceof Error ? e.message : String(e);
+      if (/EBADF|ENOTTY|ioctl\(2\) failed|not open|Napi::Error/.test(msg)) {
+        return;
+      }
+      log.error('LocalPtySession:resize failed', { cols: c, rows: r, error: msg });
+    }
+  }
+
+  kill(): void {
+    this.proc.kill();
+  }
+
+  onData(handler: (data: string) => void): void {
+    this.proc.onData(handler);
+  }
+
+  onExit(handler: (info: PtyExitInfo) => void): void {
+    this.proc.onExit(({ exitCode, signal }) => {
+      handler({ exitCode, signal: normalizeSignal(signal) });
+    });
+  }
+}
+
+function resolveWindowsPtySpawn(
+  command: string,
+  args: string[]
+): { command: string; args: string[] } {
+  if (process.platform !== 'win32') return { command, args };
+
+  const quoteForCmdExe = (input: string): string => {
+    if (input.length === 0) return '""';
+    if (!/[\s"^&|<>()%!]/.test(input)) return input;
+    return `"${input
+      .replace(/%/g, '%%')
+      .replace(/!/g, '^!')
+      .replace(/(["^&|<>()])/g, '^$1')}"`;
+  };
+
+  const ext = path.extname(command).toLowerCase();
+  if (ext === '.cmd' || ext === '.bat') {
+    const comspec = process.env.ComSpec || String.raw`C:\\Windows\\System32\\cmd.exe`;
+    const fullCommandString = [command, ...args].map(quoteForCmdExe).join(' ');
+    return { command: comspec, args: ['/d', '/s', '/c', fullCommandString] };
+  }
+  if (ext === '.ps1') {
+    return {
+      command: 'powershell.exe',
+      args: ['-NoProfile', '-ExecutionPolicy', 'Bypass', '-File', command, ...args],
+    };
+  }
+
+  return { command, args };
+}
diff --git a/src/main/core/pty/pty-env.ts b/src/main/core/pty/pty-env.ts
new file mode 100644
index 0000000000..bb544d565e
--- /dev/null
+++ b/src/main/core/pty/pty-env.ts
@@ -0,0 +1,210 @@
+import os from 'node:os';
+import { detectSshAuthSock } from '@main/utils/shellEnv';
+
+export const AGENT_ENV_VARS = [
+  'AMP_API_KEY',
+  'ANTHROPIC_API_KEY',
+  'AUTOHAND_API_KEY',
+  'AUGMENT_SESSION_AUTH',
+  'AWS_ACCESS_KEY_ID',
+  'AWS_DEFAULT_REGION',
+  'AWS_PROFILE',
+  'AWS_REGION',
+  'AWS_SECRET_ACCESS_KEY',
+  'AWS_SESSION_TOKEN',
+  'AZURE_OPENAI_API_ENDPOINT',
+  'AZURE_OPENAI_API_KEY',
+  'AZURE_OPENAI_KEY',
+  'CODEBUFF_API_KEY',
+  'COPILOT_CLI_TOKEN',
+  'CURSOR_API_KEY',
+  'DASHSCOPE_API_KEY',
+  'FACTORY_API_KEY',
+  'GEMINI_API_KEY',
+  'GH_TOKEN',
+  'GITHUB_TOKEN',
+  'GOOGLE_API_KEY',
+  'GOOGLE_APPLICATION_CREDENTIALS',
+  'GOOGLE_CLOUD_LOCATION',
+  'GOOGLE_CLOUD_PROJECT',
+  'HTTP_PROXY',
+  'HTTPS_PROXY',
+  'KIMI_API_KEY',
+  'MISTRAL_API_KEY',
+  'MOONSHOT_API_KEY',
+  'NO_PROXY',
+  'OPENAI_API_KEY',
+  'OPENAI_BASE_URL',
+] as const;
+
+const DISPLAY_ENV_VARS = [
+  'DISPLAY', // X11 display server
+  'XAUTHORITY', // X11 auth cookie (often non-standard path on Wayland+GNOME)
+  'WAYLAND_DISPLAY', // Wayland compositor socket
+  'XDG_RUNTIME_DIR', // Contains Wayland/D-Bus sockets (e.g. /run/user/1000)
+  'XDG_CURRENT_DESKTOP', // Used by xdg-open for DE detection
+  'XDG_SESSION_TYPE', // Used by browsers/toolkits to select X11 vs Wayland
+  'DBUS_SESSION_BUS_ADDRESS', // Needed by gio open and desktop portals
+] as const;
+
+function getDisplayEnv(): Record<string, string> {
+  const env: Record<string, string> = {};
+  for (const key of DISPLAY_ENV_VARS) {
+    const val = process.env[key];
+    if (val) env[key] = val;
+  }
+  return env;
+}
+
+function getWindowsEssentialEnv(resolvedPath: string): Record<string, string> {
+  const home = os.homedir();
+  return {
+    PATH: resolvedPath,
+    PATHEXT: process.env.PATHEXT || '.COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JS;.JSE;.WSF;.WSH;.MSC',
+    SystemRoot: process.env.SystemRoot || 'C:\\Windows',
+    ComSpec: process.env.ComSpec || 'C:\\Windows\\System32\\cmd.exe',
+    TEMP: process.env.TEMP || process.env.TMP || '',
+    TMP: process.env.TMP || process.env.TEMP || '',
+    USERPROFILE: process.env.USERPROFILE || home,
+    APPDATA: process.env.APPDATA || '',
+    LOCALAPPDATA: process.env.LOCALAPPDATA || '',
+    HOMEDRIVE: process.env.HOMEDRIVE || '',
+    HOMEPATH: process.env.HOMEPATH || '',
+    USERNAME: process.env.USERNAME || os.userInfo().username,
+    ProgramFiles: process.env.ProgramFiles || 'C:\\Program Files',
+    'ProgramFiles(x86)': process.env['ProgramFiles(x86)'] || 'C:\\Program Files (x86)',
+    ProgramData: process.env.ProgramData || 'C:\\ProgramData',
+    CommonProgramFiles: process.env.CommonProgramFiles || 'C:\\Program Files\\Common Files',
+    'CommonProgramFiles(x86)':
+      process.env['CommonProgramFiles(x86)'] || 'C:\\Program Files (x86)\\Common Files',
+    ProgramW6432: process.env.ProgramW6432 || 'C:\\Program Files',
+    CommonProgramW6432: process.env.CommonProgramW6432 || 'C:\\Program Files\\Common Files',
+  };
+}
+
+export interface AgentEnvOptions {
+  /**
+   * Pass through AGENT_ENV_VARS from process.env.
+   * Defaults to true — set false only for tests or sandboxed environments.
+   */
+  agentApiVars?: boolean;
+
+  /**
+   * Include SHELL in the env (needed for shell-wrapper spawns so the shell
+   * can reconstruct login env via -il flags).
+   */
+  includeShellVar?: boolean;
+
+  /**
+   * Emdash hook server connection details.  When set, injects
+   * EMDASH_HOOK_PORT, EMDASH_PTY_ID, and EMDASH_HOOK_TOKEN so agent CLIs
+   * can call back on lifecycle events.
+   */
+  hook?: {
+    port: number;
+    ptyId: string;
+    token: string;
+  };
+
+  /**
+   * Per-provider custom env vars configured by the user.
+   * Keys are validated against ^[A-Za-z_][A-Za-z0-9_]*$.
+   */
+  customVars?: Record<string, string>;
+}
+
+/**
+ * Build an environment for a user-facing interactive terminal session.
+ *
+ * Unlike buildAgentEnv, this inherits process.env wholesale so the terminal
+ * feels identical to one opened in Ghostty or Terminal.app — the user's
+ * EDITOR, MANPATH, JAVA_HOME, custom vars, etc. are all present.
+ *
+ * TERM, COLORTERM, TERM_PROGRAM, and SHELL are always set or overridden so
+ * the shell and programs inside it report the correct terminal identity.
+ * SSH_AUTH_SOCK is injected via the same cached detector used for agents,
+ * since GUI-launched apps often don't inherit it from the user's login shell.
+ */
+export function buildTerminalEnv(): Record<string, string> {
+  // Inherit the full process environment, stripping undefined values.
+  const env: Record<string, string> = {};
+  for (const [key, val] of Object.entries(process.env)) {
+    if (val !== undefined) env[key] = val;
+  }
+
+  // Terminal identity — always override so xterm capabilities are correct.
+  env.TERM = 'xterm-256color';
+  env.COLORTERM = 'truecolor';
+  env.TERM_PROGRAM = 'emdash';
+
+  // Ensure SHELL reflects the user's configured shell (may be absent in GUI).
+  env.SHELL = process.env.SHELL ?? (process.platform === 'darwin' ? '/bin/zsh' : '/bin/bash');
+
+  // SSH_AUTH_SOCK is normally set by resolveUserEnv() at startup. The
+  // detectSshAuthSock() fallback covers cases where that failed (timeout,
+  // AppImage, CI) by trying launchctl and common socket locations.
+  if (!env.SSH_AUTH_SOCK) {
+    const sshAuthSock = detectSshAuthSock();
+    if (sshAuthSock) env.SSH_AUTH_SOCK = sshAuthSock;
+  }
+
+  return env;
+}
+
+/**
+ * Build a clean, minimal PTY environment from scratch.
+ *
+ * Does NOT inherit process.env wholesale — only well-known variables are
+ * forwarded.  Login shells (-il) will rebuild PATH, NVM, etc. from the user's
+ * shell config files.  Direct spawns (no shell) receive PATH so the CLI can
+ * find its own dependencies.
+ */
+export function buildAgentEnv(options: AgentEnvOptions = {}): Record<string, string> {
+  const { agentApiVars = true, includeShellVar = false, hook, customVars } = options;
+
+  // process.env.PATH is enriched at startup by resolveUserEnv() so it already
+  // contains the full login-shell PATH (Homebrew, nvm, npm globals, etc.).
+  const resolvedPath = process.env.PATH ?? '';
+  const env: Record<string, string> = {
+    TERM: 'xterm-256color',
+    COLORTERM: 'truecolor',
+    TERM_PROGRAM: 'emdash',
+    HOME: process.env.HOME || os.homedir(),
+    USER: process.env.USER || os.userInfo().username,
+    PATH: resolvedPath,
+    ...(process.env.LANG && { LANG: process.env.LANG }),
+    ...(process.env.TMPDIR && { TMPDIR: process.env.TMPDIR }),
+    ...getDisplayEnv(),
+    ...(process.platform === 'win32' ? getWindowsEssentialEnv(resolvedPath) : {}),
+  };
+
+  const sshAuthSock = process.env.SSH_AUTH_SOCK ?? detectSshAuthSock();
+  if (sshAuthSock) env.SSH_AUTH_SOCK = sshAuthSock;
+
+  if (includeShellVar) {
+    env.SHELL = process.env.SHELL || '/bin/bash';
+  }
+
+  if (agentApiVars) {
+    for (const key of AGENT_ENV_VARS) {
+      const val = process.env[key];
+      if (val) env[key] = val;
+    }
+  }
+
+  if (hook && hook.port > 0) {
+    env.EMDASH_HOOK_PORT = String(hook.port);
+    env.EMDASH_PTY_ID = hook.ptyId;
+    env.EMDASH_HOOK_TOKEN = hook.token;
+  }
+
+  if (customVars) {
+    for (const [key, val] of Object.entries(customVars)) {
+      if (typeof val === 'string' && /^[A-Za-z_][A-Za-z0-9_]*$/.test(key)) {
+        env[key] = val;
+      }
+    }
+  }
+
+  return env;
+}
diff --git a/src/main/core/pty/pty-session-registry.ts b/src/main/core/pty/pty-session-registry.ts
new file mode 100644
index 0000000000..efe23d0346
--- /dev/null
+++ b/src/main/core/pty/pty-session-registry.ts
@@ -0,0 +1,106 @@
+import { ptyDataChannel, ptyExitChannel, ptyInputChannel } from '@shared/events/ptyEvents';
+import { events } from '@main/lib/events';
+import type { Pty } from './pty';
+
+const FLUSH_INTERVAL_MS = 16; // ~60 fps
+const RING_BUFFER_CAP = 64 * 1024; // 64 KB per session
+
+export class PtySessionRegistry {
+  private ptyMap: Map<string, Pty> = new Map();
+  private ptyInputSubscriptions: Map<string, () => void> = new Map();
+  private ringBuffers: Map<string, string> = new Map();
+  private activeConsumers: Set<string> = new Set();
+
+  register(sessionId: string, pty: Pty, options?: { preserveBufferOnExit?: boolean }): void {
+    const preserveBufferOnExit = options?.preserveBufferOnExit ?? false;
+
+    // Clear any stale ring buffer and consumer from a previous PTY at this sessionId (respawn)
+    this.ringBuffers.delete(sessionId);
+    this.activeConsumers.delete(sessionId);
+
+    this.ptyMap.set(sessionId, pty);
+
+    let buffer = '';
+    let flushTimer: ReturnType<typeof setTimeout> | null = null;
+
+    const flush = () => {
+      if (buffer) {
+        events.emit(ptyDataChannel, buffer, sessionId);
+        buffer = '';
+      }
+      flushTimer = null;
+    };
+
+    pty.onData((data) => {
+      buffer += data;
+      if (!flushTimer) {
+        flushTimer = setTimeout(flush, FLUSH_INTERVAL_MS);
+      }
+      // Accumulate into ring buffer for late-connecting renderers
+      let rb = (this.ringBuffers.get(sessionId) ?? '') + data;
+      if (rb.length > RING_BUFFER_CAP) rb = rb.slice(-RING_BUFFER_CAP);
+      this.ringBuffers.set(sessionId, rb);
+    });
+
+    pty.onExit((info) => {
+      // Flush any buffered output before emitting exit
+      if (flushTimer !== null) {
+        clearTimeout(flushTimer);
+        flush();
+      }
+      events.emit(ptyExitChannel, info, sessionId);
+      if (preserveBufferOnExit) {
+        // Partial cleanup: keep ring buffer so late-connecting renderers can replay output
+        this.ptyMap.delete(sessionId);
+        this.ptyInputSubscriptions.get(sessionId)?.();
+        this.ptyInputSubscriptions.delete(sessionId);
+      } else {
+        this.unregister(sessionId);
+      }
+    });
+
+    const off = events.on(
+      ptyInputChannel,
+      (data) => {
+        pty.write(data);
+      },
+      sessionId
+    );
+
+    this.ptyInputSubscriptions.set(sessionId, off);
+  }
+
+  unregister(sessionId: string): void {
+    this.ptyMap.delete(sessionId);
+    this.ptyInputSubscriptions.get(sessionId)?.();
+    this.ptyInputSubscriptions.delete(sessionId);
+    this.ringBuffers.delete(sessionId);
+    this.activeConsumers.delete(sessionId);
+  }
+
+  get(sessionId: string): Pty | undefined {
+    return this.ptyMap.get(sessionId);
+  }
+
+  /**
+   * Atomically snapshot the ring buffer and register a consumer for future
+   * IPC delivery. Returns the current ring buffer without deleting it.
+   * Safe: runs in one synchronous tick — no PTY data can arrive between
+   * snapshot and consumer registration.
+   */
+  subscribe(sessionId: string): string {
+    const buf = this.ringBuffers.get(sessionId) ?? '';
+    this.activeConsumers.add(sessionId);
+    return buf;
+  }
+
+  /**
+   * Remove the consumer registration for a session.
+   * Called when the renderer disposes its FrontendPty.
+   */
+  unsubscribe(sessionId: string): void {
+    this.activeConsumers.delete(sessionId);
+  }
+}
+
+export const ptySessionRegistry = new PtySessionRegistry();
diff --git a/src/main/core/pty/pty.ts b/src/main/core/pty/pty.ts
new file mode 100644
index 0000000000..1e22f4c25d
--- /dev/null
+++ b/src/main/core/pty/pty.ts
@@ -0,0 +1,17 @@
+export type PtyExitInfo = {
+  exitCode?: number;
+  signal?: number | string;
+};
+
+export interface PtyDimensions {
+  cols: number;
+  rows: number;
+}
+
+export interface Pty {
+  write(data: string): void;
+  resize(cols: number, rows: number): void;
+  kill(): void;
+  onData(handler: (data: string) => void): void;
+  onExit(handler: (info: PtyExitInfo) => void): void;
+}
diff --git a/src/main/core/pty/spawn-utils.test.ts b/src/main/core/pty/spawn-utils.test.ts
new file mode 100644
index 0000000000..13c0eb22b4
--- /dev/null
+++ b/src/main/core/pty/spawn-utils.test.ts
@@ -0,0 +1,190 @@
+import { describe, expect, it } from 'vitest';
+import type { AgentSessionConfig } from '@shared/agent-session';
+import type { GeneralSessionConfig } from '@shared/general-session';
+import { buildTmuxParams, resolveSpawnParams, resolveSshCommand } from './spawn-utils';
+
+const SHELL = '/bin/bash';
+
+function makeAgentConfig(overrides: Partial<AgentSessionConfig> = {}): AgentSessionConfig {
+  return {
+    taskId: 'task-1',
+    conversationId: 'conv-1',
+    providerId: 'claude',
+    command: 'claude',
+    args: ['--resume', 'conv-1'],
+    cwd: '/workspace',
+    autoApprove: false,
+    resume: false,
+    ...overrides,
+  };
+}
+
+function makeGeneralConfig(overrides: Partial<GeneralSessionConfig> = {}): GeneralSessionConfig {
+  return {
+    cwd: '/workspace',
+    ...overrides,
+  };
+}
+
+describe('resolveSpawnParams – agent type', () => {
+  it('no tmux, no shellSetup → shell -c with command joined', () => {
+    const config = makeAgentConfig();
+    const result = resolveSpawnParams('agent', config);
+
+    expect(result.cwd).toBe('/workspace');
+    expect(result.command).toBe(process.env.SHELL ?? '/bin/sh');
+    expect(result.args[0]).toBe('-c');
+    expect(result.args[1]).toBe('claude --resume conv-1');
+  });
+
+  it('with shellSetup → shellSetup prepended with &&', () => {
+    const config = makeAgentConfig({ shellSetup: 'source ~/.nvm/nvm.sh' });
+    const result = resolveSpawnParams('agent', config);
+
+    expect(result.args[0]).toBe('-c');
+    expect(result.args[1]).toBe('source ~/.nvm/nvm.sh && claude --resume conv-1');
+  });
+
+  it('with tmuxSessionName → tmux command contains has-session and session name', () => {
+    const config = makeAgentConfig({ tmuxSessionName: 'my-session' });
+    const result = resolveSpawnParams('agent', config);
+
+    expect(result.args[0]).toBe('-c');
+    const cmd = result.args[1];
+    expect(cmd).toContain('tmux has-session');
+    expect(cmd).toContain('"my-session"');
+    expect(cmd).toContain('tmux attach-session');
+  });
+
+  it('with both shellSetup and tmuxSessionName → tmux command contains shellSetup', () => {
+    const config = makeAgentConfig({
+      shellSetup: 'export NVM_DIR="$HOME/.nvm"',
+      tmuxSessionName: 'agent-session',
+    });
+    const result = resolveSpawnParams('agent', config);
+
+    expect(result.args[0]).toBe('-c');
+    const cmd = result.args[1];
+    expect(cmd).toContain('tmux has-session');
+    expect(cmd).toContain('"agent-session"');
+    expect(cmd).toContain('export NVM_DIR=\\"$HOME/.nvm\\"');
+    expect(cmd).toContain('claude --resume conv-1');
+  });
+});
+
+describe('resolveSpawnParams – general type', () => {
+  it('no command, no shellSetup → shell -c exec shell -il', () => {
+    const config = makeGeneralConfig();
+    const result = resolveSpawnParams('general', config);
+
+    const shell = process.env.SHELL ?? '/bin/sh';
+    expect(result.command).toBe(shell);
+    expect(result.args[0]).toBe('-il');
+    expect(result.cwd).toBe('/workspace');
+  });
+
+  it('with shellSetup → shell -c with shellSetup && exec shell -il', () => {
+    const config = makeGeneralConfig({ shellSetup: 'source /opt/homebrew/bin/brew shellenv' });
+    const result = resolveSpawnParams('general', config);
+
+    expect(result.args[0]).toBe('-c');
+    const cmd = result.args[1];
+    expect(cmd).toContain('source /opt/homebrew/bin/brew shellenv');
+    expect(cmd).toContain('exec');
+    expect(cmd).toContain('-il');
+  });
+
+  it('with tmuxSessionName → tmux wrapping', () => {
+    const config = makeGeneralConfig({ tmuxSessionName: 'general-session' });
+    const result = resolveSpawnParams('general', config);
+
+    expect(result.args[0]).toBe('-c');
+    const cmd = result.args[1];
+    expect(cmd).toContain('tmux has-session');
+    expect(cmd).toContain('"general-session"');
+    expect(cmd).toContain('tmux attach-session');
+  });
+
+  it('with both shellSetup and tmuxSessionName → tmux command contains shellSetup', () => {
+    const config = makeGeneralConfig({
+      shellSetup: 'eval "$(rbenv init -)"',
+      tmuxSessionName: 'ruby-session',
+    });
+    const result = resolveSpawnParams('general', config);
+
+    expect(result.args[0]).toBe('-c');
+    const cmd = result.args[1];
+    expect(cmd).toContain('tmux has-session');
+    expect(cmd).toContain('"ruby-session"');
+    expect(cmd).toContain('rbenv init');
+  });
+
+  it('with command → shell -c with the command instead of interactive shell', () => {
+    const config = makeGeneralConfig({ command: 'npm', args: ['install'] });
+    const result = resolveSpawnParams('general', config);
+
+    expect(result.args[0]).toBe('-c');
+    expect(result.args[1]).toBe('npm install');
+  });
+
+  it('with command and shellSetup → shellSetup prepended to command', () => {
+    const config = makeGeneralConfig({ command: 'npm', args: ['install'], shellSetup: 'nvm use' });
+    const result = resolveSpawnParams('general', config);
+
+    expect(result.args[0]).toBe('-c');
+    expect(result.args[1]).toBe('nvm use && npm install');
+  });
+
+  it('with command and tmuxSessionName → tmux wrapping around the command', () => {
+    const config = makeGeneralConfig({
+      command: 'npm',
+      args: ['install'],
+      tmuxSessionName: 'setup-session',
+    });
+    const result = resolveSpawnParams('general', config);
+
+    expect(result.args[0]).toBe('-c');
+    const cmd = result.args[1];
+    expect(cmd).toContain('tmux has-session');
+    expect(cmd).toContain('"setup-session"');
+    expect(cmd).toContain('npm install');
+  });
+});
+
+describe('buildTmuxParams', () => {
+  it('produces attach-or-create command with has-session, new-session -d, and attach-session', () => {
+    const result = buildTmuxParams(SHELL, 'my-tmux-session', 'claude --resume conv-42', '/tmp');
+
+    expect(result.command).toBe(SHELL);
+    expect(result.cwd).toBe('/tmp');
+    expect(result.args[0]).toBe('-c');
+
+    const cmd = result.args[1];
+    expect(cmd).toContain('tmux has-session -t "my-tmux-session"');
+    expect(cmd).toContain('tmux new-session -d -s "my-tmux-session"');
+    expect(cmd).toContain('tmux attach-session -t "my-tmux-session"');
+    const attachCount = (cmd.match(/tmux attach-session/g) ?? []).length;
+    expect(attachCount).toBe(2);
+  });
+
+  it('JSON-encodes the session name and command', () => {
+    const result = buildTmuxParams(SHELL, 'session with spaces', 'echo hello', '/home/user');
+
+    const cmd = result.args[1];
+    expect(cmd).toContain('"session with spaces"');
+    expect(cmd).toContain('"echo hello"');
+  });
+
+  it('uses the provided cwd', () => {
+    const result = buildTmuxParams(SHELL, 'sess', 'cmd', '/custom/path');
+    expect(result.cwd).toBe('/custom/path');
+  });
+});
+
+describe('resolveSshCommand', () => {
+  it('runs remote commands through a login shell so PATH matches install/probe', () => {
+    const result = resolveSshCommand('agent', makeAgentConfig());
+
+    expect(result).toBe(`bash -l -c 'cd "/workspace" && claude --resume conv-1'`);
+  });
+});
diff --git a/src/main/core/pty/spawn-utils.ts b/src/main/core/pty/spawn-utils.ts
new file mode 100644
index 0000000000..9e12d39902
--- /dev/null
+++ b/src/main/core/pty/spawn-utils.ts
@@ -0,0 +1,114 @@
+import type { AgentSessionConfig } from '@shared/agent-session';
+import type { GeneralSessionConfig } from '@shared/general-session';
+import { quoteShellArg } from '@main/utils/shellEscape';
+
+export type SessionType = 'agent' | 'general' | 'lifecycle';
+export type SessionConfig = AgentSessionConfig | GeneralSessionConfig;
+
+export interface SpawnParams {
+  command: string;
+  args: string[];
+  cwd: string;
+}
+
+/**
+ * Derive the executable, arguments, and working directory from a session config.
+ * Applies shellSetup and tmux wrapping where relevant.
+ */
+export function resolveSpawnParams(type: SessionType, config: SessionConfig): SpawnParams {
+  const shell = process.env.SHELL ?? '/bin/sh';
+
+  switch (type) {
+    case 'agent': {
+      const cfg = config as AgentSessionConfig;
+      const baseCmd = [cfg.command, ...cfg.args].join(' ');
+      const fullCmd = cfg.shellSetup ? `${cfg.shellSetup} && ${baseCmd}` : baseCmd;
+
+      if (cfg.tmuxSessionName) {
+        return buildTmuxParams(shell, cfg.tmuxSessionName, fullCmd, cfg.cwd);
+      }
+
+      return {
+        command: shell,
+        args: ['-c', fullCmd],
+        cwd: cfg.cwd,
+      };
+    }
+
+    case 'general': {
+      const cfg = config as GeneralSessionConfig;
+      const baseCmd = cfg.command
+        ? [cfg.command, ...(cfg.args ?? [])].join(' ')
+        : `exec ${shell} -il`;
+      const fullCmd = cfg.shellSetup ? `${cfg.shellSetup} && ${baseCmd}` : baseCmd;
+
+      if (cfg.tmuxSessionName) {
+        return buildTmuxParams(shell, cfg.tmuxSessionName, fullCmd, cfg.cwd);
+      }
+
+      if (cfg.command || cfg.shellSetup) {
+        return { command: shell, args: ['-c', fullCmd], cwd: cfg.cwd };
+      }
+
+      return { command: shell, args: ['-il'], cwd: cfg.cwd };
+    }
+
+    default: {
+      throw new Error(`Unsupported session type: ${type}`);
+    }
+  }
+}
+
+/**
+ * Build spawn params that wrap a command in a tmux session for persistence.
+ *
+ * Behaviour:
+ * - If a tmux session named `sessionName` already exists → attach to it.
+ * - Otherwise → create a detached session running `cmd`, then attach.
+ */
+export function buildTmuxParams(
+  shell: string,
+  sessionName: string,
+  cmd: string,
+  cwd: string
+): SpawnParams {
+  const quotedName = JSON.stringify(sessionName);
+  const quotedCmd = JSON.stringify(cmd);
+
+  const checkExists = `tmux has-session -t ${quotedName} 2>/dev/null`;
+  const newSession = `tmux new-session -d -s ${quotedName} ${quotedCmd}`;
+  const attach = `tmux attach-session -t ${quotedName}`;
+
+  const tmuxCmd = `(${checkExists} && ${attach}) || (${newSession} && ${attach})`;
+
+  return {
+    command: shell,
+    args: ['-c', tmuxCmd],
+    cwd,
+  };
+}
+
+/**
+ * Build a single command string for SSH remote execution.
+ */
+export function resolveSshCommand(
+  type: SessionType,
+  config: SessionConfig,
+  envVars?: Record<string, string>
+): string {
+  const { command, args, cwd } = resolveSpawnParams(type, config);
+  const shell = process.env.SHELL ?? '/bin/sh';
+
+  const innerCmd = command === shell && args[0] === '-c' ? args[1] : [command, ...args].join(' ');
+  const envPrefix = envVars ? buildSshEnvPrefix(envVars) : '';
+  const commandString = `cd ${JSON.stringify(cwd)} && ${envPrefix}${innerCmd}`;
+
+  return `bash -l -c ${quoteShellArg(commandString)}`;
+}
+
+export function buildSshEnvPrefix(vars: Record<string, string>): string {
+  const entries = Object.entries(vars);
+  if (entries.length === 0) return '';
+  const exports = entries.map(([k, v]) => `export ${k}='${v.replace(/'/g, "'\\''")}'`).join('; ');
+  return exports + '; ';
+}
diff --git a/src/main/core/pty/ssh2-pty.ts b/src/main/core/pty/ssh2-pty.ts
new file mode 100644
index 0000000000..5287347df6
--- /dev/null
+++ b/src/main/core/pty/ssh2-pty.ts
@@ -0,0 +1,89 @@
+import type { Client, ClientChannel } from 'ssh2';
+import { err, ok, type Result } from '@shared/result';
+import { log } from '@main/lib/logger';
+import { normalizeSignal } from './exit-signals';
+import type { Pty, PtyDimensions, PtyExitInfo } from './pty';
+
+export type Ssh2OpenError = {
+  readonly kind: 'channel-open-failed';
+  readonly message: string;
+};
+
+export interface Ssh2SpawnOptions extends PtyDimensions {
+  id: string;
+  command: string;
+}
+
+export class Ssh2PtySession implements Pty {
+  readonly id: string;
+
+  constructor(
+    id: string,
+    private readonly channel: ClientChannel
+  ) {
+    this.id = id;
+  }
+
+  write(data: string): void {
+    this.channel.write(data);
+  }
+
+  resize(cols: number, rows: number): void {
+    try {
+      this.channel.setWindow(rows, cols, 0, 0);
+    } catch (err: unknown) {
+      log.warn('Ssh2PtySession:resize failed', {
+        cols,
+        rows,
+        error: String((err as Error)?.message ?? err),
+      });
+    }
+  }
+
+  kill(): void {
+    try {
+      this.channel.close();
+    } catch {}
+  }
+
+  onData(handler: (data: string) => void): void {
+    this.channel.on('data', (chunk: Buffer) => {
+      handler(chunk.toString('utf-8'));
+    });
+  }
+
+  onExit(handler: (info: PtyExitInfo) => void): void {
+    this.channel.on('close', (exitCode: number | null, signal: string | null) => {
+      handler({ exitCode: exitCode ?? undefined, signal: normalizeSignal(signal) });
+    });
+  }
+}
+
+export async function openSsh2Pty(
+  sshClient: Client,
+  options: Ssh2SpawnOptions
+): Promise<Result<Ssh2PtySession, Ssh2OpenError>> {
+  const { id, command, cols, rows } = options;
+  return new Promise((resolve) => {
+    sshClient.exec(
+      command,
+      {
+        pty: {
+          term: 'xterm-256color',
+          cols,
+          rows,
+          // width/height in pixels — set to 0, terminal uses cols/rows instead
+          width: 0,
+          height: 0,
+        },
+      },
+      (e, channel) => {
+        if (e) {
+          const message = e instanceof Error ? e.message : String(e);
+          return resolve(err({ kind: 'channel-open-failed', message }));
+        }
+        resolve(ok(new Ssh2PtySession(id, channel)));
+      }
+    );
+  });
+}
diff --git a/src/main/core/pty/tmux-session-name.ts b/src/main/core/pty/tmux-session-name.ts
new file mode 100644
index 0000000000..ac93fa4f90
--- /dev/null
+++ b/src/main/core/pty/tmux-session-name.ts
@@ -0,0 +1,20 @@
+import type { ExecFn } from '@main/core/utils/exec';
+import { log } from '@main/lib/logger';
+
+const TMUX_SESSION_PREFIX = 'emdash-';
+
+export function makeTmuxSessionName(sessionId: string): string {
+  const encoded = Buffer.from(sessionId, 'utf8').toString('base64url');
+  return `${TMUX_SESSION_PREFIX}${encoded}`;
+}
+
+export async function killTmuxSession(exec: ExecFn, sessionName: string): Promise<void> {
+  try {
+    await exec('tmux', ['kill-session', '-t', sessionName]);
+  } catch (err) {
+    log.debug('killTmuxSession: tmux session not found or already dead', {
+      sessionName,
+      error: String(err),
+    });
+  }
+}
diff --git a/src/main/core/pull-requests/controller.ts b/src/main/core/pull-requests/controller.ts
new file mode 100644
index 0000000000..3d3834a1d1
--- /dev/null
+++ b/src/main/core/pull-requests/controller.ts
@@ -0,0 +1,230 @@
+import { createRPCController } from '@shared/ipc/rpc';
+import type { ListPrOptions, PullRequestFile } from '@shared/pull-requests';
+import { log } from '@main/lib/logger';
+import { capture } from '@main/lib/telemetry';
+import { prQueryService } from './pr-query-service';
+import { prSyncEngine } from './pr-sync-engine';
+
+export const pullRequestController = createRPCController({
+  // ── DB-cached reads ────────────────────────────────────────────────────────
+
+  listPullRequests: async (projectId: string, options?: ListPrOptions) => {
+    try {
+      const prs = await prQueryService.listPullRequests(projectId, options);
+      return { success: true as const, prs, totalCount: prs.length };
+    } catch (error) {
+      log.error('Failed to list pull requests:', error);
+      return {
+        success: false as const,
+        error: error instanceof Error ? error.message : 'Unable to list pull requests',
+      };
+    }
+  },
+
+  getFilterOptions: async (projectId: string) => {
+    try {
+      const options = await prQueryService.getFilterOptions(projectId);
+      return { success: true as const, ...options };
+    } catch (error) {
+      log.error('Failed to get PR filter options:', error);
+      return {
+        success: false as const,
+        error: error instanceof Error ? error.message : 'Unable to get filter options',
+      };
+    }
+  },
+
+  getPullRequestsForTask: async (projectId: string, taskId: string) => {
+    try {
+      const capability = await prQueryService.getProjectRemoteInfo(projectId);
+      if (capability.status !== 'ready') {
+        return { success: true as const, prs: [], taskBranch: null };
+      }
+
+      const { tasks } = await import('@main/db/schema');
+      const { eq } = await import('drizzle-orm');
+      const { db } = await import('@main/db/client');
+      const [taskRow] = await db
+        .select({ taskBranch: tasks.taskBranch })
+        .from(tasks)
+        .where(eq(tasks.id, taskId))
+        .limit(1);
+
+      if (!taskRow?.taskBranch) {
+        return { success: true as const, prs: [], taskBranch: null };
+      }
+
+      const prs = await prQueryService.getTaskPullRequests(
+        projectId,
+        taskRow.taskBranch,
+        capability.repositoryUrl
+      );
+      return { success: true as const, prs, taskBranch: taskRow.taskBranch };
+    } catch (error) {
+      log.error('Failed to get pull requests for task:', error);
+      return {
+        success: false as const,
+        error: error instanceof Error ? error.message : 'Unable to get task pull requests',
+      };
+    }
+  },
+
+  // ── Sync triggers ──────────────────────────────────────────────────────────
+
+  forceFullSyncPullRequests: async (projectId: string) => {
+    try {
+      const capability = await prQueryService.getProjectRemoteInfo(projectId);
+      if (capability.status !== 'ready') {
+        return { success: false as const, error: `Remote not ready: ${capability.status}` };
+      }
+      prSyncEngine.forceFullSync(capability.repositoryUrl);
+      return { success: true as const };
+    } catch (error) {
+      log.error('Failed to force full sync:', error);
+      return {
+        success: false as const,
+        error: error instanceof Error ? error.message : 'Unable to force sync',
+      };
+    }
+  },
+
+  syncPullRequests: async (projectId: string) => {
+    try {
+      log.info('PrController: syncPullRequests called', { projectId });
+      const capability = await prQueryService.getProjectRemoteInfo(projectId);
+      if (capability.status !== 'ready') {
+        log.warn('PrController: remote not ready, skipping sync', {
+          projectId,
+          status: capability.status,
+        });
+        return { success: false as const, error: `Remote not ready: ${capability.status}` };
+      }
+      log.info('PrController: triggering sync', {
+        projectId,
+        repositoryUrl: capability.repositoryUrl,
+      });
+      prSyncEngine.sync(capability.repositoryUrl);
+      return { success: true as const };
+    } catch (error) {
+      log.error('Failed to trigger sync:', error);
+      return {
+        success: false as const,
+        error: error instanceof Error ? error.message : 'Unable to sync',
+      };
+    }
+  },
+
+  refreshPullRequest: async (repositoryUrl: string, prNumber: number) => {
+    try {
+      const pr = await prSyncEngine.syncSingle(repositoryUrl, prNumber);
+      return { success: true as const, pr };
+    } catch (error) {
+      log.error('Failed to refresh pull request:', error);
+      return {
+        success: false as const,
+        error: error instanceof Error ? error.message : 'Unable to refresh pull request',
+      };
+    }
+  },
+
+  syncChecks: async (pullRequestUrl: string, headRefOid: string) => {
+    try {
+      const hasRunning = await prSyncEngine.syncChecks(pullRequestUrl, headRefOid);
+      return { success: true as const, hasRunning };
+    } catch (error) {
+      log.error('Failed to sync checks:', error);
+      return {
+        success: false as const,
+        error: error instanceof Error ? error.message : 'Unable to sync checks',
+      };
+    }
+  },
+
+  cancelSync: (repositoryUrl: string) => {
+    prSyncEngine.cancel(repositoryUrl);
+    return { success: true as const };
+  },
+
+  // ── Mutations ──────────────────────────────────────────────────────────────
+
+  createPullRequest: async (params: {
+    repositoryUrl: string;
+    head: string;
+    base: string;
+    title: string;
+    body?: string;
+    draft: boolean;
+  }) => {
+    try {
+      const result = await prSyncEngine.createPullRequest(params);
+      // Sync the newly created PR into the DB
+      void prSyncEngine.syncSingle(params.repositoryUrl, result.number);
+      capture('pr_created', { is_draft: params.draft });
+      return { success: true as const, url: result.url, number: result.number };
+    } catch (error) {
+      log.error('Failed to create pull request:', error);
+      capture('pr_creation_failed', {
+        error_type: error instanceof Error ? error.name || 'error' : 'unknown_error',
+      });
+      const ghErrors = (error as any)?.response?.data?.errors;
+      const message =
+        Array.isArray(ghErrors) && ghErrors[0]?.message
+          ? ghErrors[0].message
+          : error instanceof Error
+            ? error.message
+            : 'Unable to create pull request';
+      return { success: false as const, error: message };
+    }
+  },
+
+  mergePullRequest: async (
+    repositoryUrl: string,
+    prNumber: number,
+    options: { strategy: 'merge' | 'squash' | 'rebase'; commitHeadOid?: string }
+  ) => {
+    try {
+      const result = await prSyncEngine.mergePullRequest(repositoryUrl, prNumber, options);
+      // Refresh the merged PR
+      void prSyncEngine.syncSingle(repositoryUrl, prNumber);
+      return { success: true as const, sha: result.sha, merged: result.merged };
+    } catch (error) {
+      log.error('Failed to merge pull request:', error);
+      return {
+        success: false as const,
+        error: error instanceof Error ? error.message : 'Unable to merge pull request',
+      };
+    }
+  },
+
+  markReadyForReview: async (repositoryUrl: string, prNumber: number) => {
+    try {
+      await prSyncEngine.markReadyForReview(repositoryUrl, prNumber);
+      void prSyncEngine.syncSingle(repositoryUrl, prNumber);
+      return { success: true as const };
+    } catch (error) {
+      log.error('Failed to mark pull request ready for review:', error);
+      return {
+        success: false as const,
+        error: error instanceof Error ? error.message : 'Unable to mark PR ready for review',
+      };
+    }
+  },
+
+  // ── Pass-through reads ─────────────────────────────────────────────────────
+
+  getPullRequestFiles: async (repositoryUrl: string, prNumber: number) => {
+    try {
+      const files: PullRequestFile[] = await prSyncEngine.getPullRequestFiles(
+        repositoryUrl,
+        prNumber
+      );
+      return { success: true as const, files };
+    } catch (error) {
+      log.error('Failed to get pull request files:', error);
+      return {
+        success: false as const,
+        error: error instanceof Error ? error.message : 'Unable to get pull request files',
+      };
+    }
+  },
+});
diff --git a/src/main/core/pull-requests/pr-query-service.ts b/src/main/core/pull-requests/pr-query-service.ts
new file mode 100644
index 0000000000..300afafdb5
--- /dev/null
+++ b/src/main/core/pull-requests/pr-query-service.ts
@@ -0,0 +1,262 @@
+import { and, asc, desc, eq, inArray, isNotNull, like, or } from 'drizzle-orm';
+import type { Label, ListPrOptions, PrFilterOptions, PullRequest } from '@shared/pull-requests';
+import { isGitHubUrl, normalizeGitHubUrl } from '@main/core/github/services/utils';
+import { projectManager } from '@main/core/projects/project-manager';
+import { db } from '@main/db/client';
+import {
+  projectRemotes,
+  pullRequestAssignees,
+  pullRequestChecks,
+  pullRequestLabels,
+  pullRequests,
+  pullRequestUsers,
+} from '@main/db/schema';
+import { assemblePullRequest, type PrRow } from './pr-utils';
+
+/** Internal capability type — not exposed to the renderer. */
+export type ProjectRemoteCapability =
+  | { status: 'ready'; repositoryUrl: string }
+  | { status: 'no_remote' }
+  | { status: 'unsupported_remote' };
+
+// ---------------------------------------------------------------------------
+// Helpers
+// ---------------------------------------------------------------------------
+
+async function fetchRelated(rows: PrRow[]): Promise<PullRequest[]> {
+  if (rows.length === 0) return [];
+
+  const urls = rows.map((r) => r.url);
+
+  const [labelRows, assigneeJoins, checkRows] = await Promise.all([
+    db.select().from(pullRequestLabels).where(inArray(pullRequestLabels.pullRequestId, urls)),
+    db
+      .select({ pullRequestUrl: pullRequestAssignees.pullRequestUrl, user: pullRequestUsers })
+      .from(pullRequestAssignees)
+      .innerJoin(pullRequestUsers, eq(pullRequestAssignees.userId, pullRequestUsers.userId))
+      .where(inArray(pullRequestAssignees.pullRequestUrl, urls)),
+    db.select().from(pullRequestChecks).where(inArray(pullRequestChecks.pullRequestUrl, urls)),
+  ]);
+
+  // Collect all author user IDs
+  const authorIds = [
+    ...new Set(rows.map((r) => r.authorUserId).filter((id): id is string => id !== null)),
+  ];
+  const authorMap = new Map<string, typeof pullRequestUsers.$inferSelect>();
+  if (authorIds.length > 0) {
+    const authors = await db
+      .select()
+      .from(pullRequestUsers)
+      .where(inArray(pullRequestUsers.userId, authorIds));
+    for (const a of authors) authorMap.set(a.userId, a);
+  }
+
+  const labelsByUrl = new Map<string, (typeof pullRequestLabels.$inferSelect)[]>();
+  for (const l of labelRows) {
+    const arr = labelsByUrl.get(l.pullRequestId) ?? [];
+    arr.push(l);
+    labelsByUrl.set(l.pullRequestId, arr);
+  }
+
+  const assigneesByUrl = new Map<string, (typeof pullRequestUsers.$inferSelect)[]>();
+  for (const a of assigneeJoins) {
+    const arr = assigneesByUrl.get(a.pullRequestUrl) ?? [];
+    arr.push(a.user);
+    assigneesByUrl.set(a.pullRequestUrl, arr);
+  }
+
+  const checksByUrl = new Map<string, (typeof pullRequestChecks.$inferSelect)[]>();
+  for (const c of checkRows) {
+    const arr = checksByUrl.get(c.pullRequestUrl) ?? [];
+    arr.push(c);
+    checksByUrl.set(c.pullRequestUrl, arr);
+  }
+
+  return rows.map((row) =>
+    assemblePullRequest(
+      row,
+      row.authorUserId ? (authorMap.get(row.authorUserId) ?? null) : null,
+      labelsByUrl.get(row.url) ?? [],
+      assigneesByUrl.get(row.url) ?? [],
+      checksByUrl.get(row.url) ?? []
+    )
+  );
+}
+
+// ---------------------------------------------------------------------------
+// PrQueryService
+// ---------------------------------------------------------------------------
+
+export class PrQueryService {
+  async listPullRequests(projectId: string, options: ListPrOptions = {}): Promise<PullRequest[]> {
+    let repositoryUrls: string[];
+
+    if (options.repositoryUrl) {
+      repositoryUrls = [options.repositoryUrl];
+    } else {
+      const remoteRows = await db
+        .select({ remoteUrl: projectRemotes.remoteUrl })
+        .from(projectRemotes)
+        .where(eq(projectRemotes.projectId, projectId));
+
+      if (remoteRows.length === 0) return [];
+      repositoryUrls = remoteRows.map((r) => r.remoteUrl);
+    }
+
+    const conditions = [inArray(pullRequests.repositoryUrl, repositoryUrls)];
+
+    const filters = options.filters;
+    if (filters?.status && filters.status !== 'all') {
+      if (filters.status === 'not-open') {
+        conditions.push(inArray(pullRequests.status, ['closed', 'merged']));
+      } else {
+        conditions.push(eq(pullRequests.status, filters.status));
+      }
+    }
+
+    if (filters?.authorUserIds && filters.authorUserIds.length > 0) {
+      conditions.push(inArray(pullRequests.authorUserId, filters.authorUserIds));
+    }
+
+    if (filters?.labelNames && filters.labelNames.length > 0) {
+      const labelSub = db
+        .select({ id: pullRequestLabels.pullRequestId })
+        .from(pullRequestLabels)
+        .where(inArray(pullRequestLabels.name, filters.labelNames));
+      conditions.push(inArray(pullRequests.url, labelSub));
+    }
+
+    if (filters?.assigneeUserIds && filters.assigneeUserIds.length > 0) {
+      const assigneeSub = db
+        .select({ id: pullRequestAssignees.pullRequestUrl })
+        .from(pullRequestAssignees)
+        .where(inArray(pullRequestAssignees.userId, filters.assigneeUserIds));
+      conditions.push(inArray(pullRequests.url, assigneeSub));
+    }
+
+    if (options.searchQuery?.trim()) {
+      const pattern = `%${options.searchQuery.trim()}%`;
+      conditions.push(
+        or(like(pullRequests.title, pattern), like(pullRequests.identifier, pattern))!
+      );
+    }
+
+    const orderClause =
+      options.sort === 'oldest'
+        ? asc(pullRequests.pullRequestCreatedAt)
+        : options.sort === 'recently-updated'
+          ? desc(pullRequests.pullRequestUpdatedAt)
+          : desc(pullRequests.pullRequestCreatedAt);
+
+    const query = db
+      .select()
+      .from(pullRequests)
+      .where(and(...conditions))
+      .orderBy(orderClause);
+
+    const limit = options.limit ?? 50;
+    const offset = options.offset ?? 0;
+    const rows = await query.limit(limit).offset(offset);
+
+    return fetchRelated(rows);
+  }
+
+  async getTaskPullRequests(
+    projectId: string,
+    taskBranch: string,
+    repositoryUrl: string
+  ): Promise<PullRequest[]> {
+    const rows = await db
+      .select()
+      .from(pullRequests)
+      .where(
+        and(eq(pullRequests.headRefName, taskBranch), eq(pullRequests.repositoryUrl, repositoryUrl))
+      );
+
+    return fetchRelated(rows);
+  }
+
+  async getFilterOptions(projectId: string): Promise<PrFilterOptions> {
+    const remoteRows = await db
+      .select({ remoteUrl: projectRemotes.remoteUrl })
+      .from(projectRemotes)
+      .where(eq(projectRemotes.projectId, projectId));
+
+    if (remoteRows.length === 0) {
+      return { authors: [], labels: [], assignees: [] };
+    }
+
+    const repositoryUrls = remoteRows.map((r) => r.remoteUrl);
+    const prUrlsSub = db
+      .select({ url: pullRequests.url })
+      .from(pullRequests)
+      .where(inArray(pullRequests.repositoryUrl, repositoryUrls));
+
+    const authorUserIdsSub = db
+      .select({ userId: pullRequests.authorUserId })
+      .from(pullRequests)
+      .where(and(inArray(pullRequests.url, prUrlsSub), isNotNull(pullRequests.authorUserId)));
+
+    const assigneeUserIdsSub = db
+      .select({ userId: pullRequestAssignees.userId })
+      .from(pullRequestAssignees)
+      .where(inArray(pullRequestAssignees.pullRequestUrl, prUrlsSub));
+
+    const [authorRows, labelRows, assigneeRows] = await Promise.all([
+      db.select().from(pullRequestUsers).where(inArray(pullRequestUsers.userId, authorUserIdsSub)),
+      db
+        .selectDistinct({ name: pullRequestLabels.name, color: pullRequestLabels.color })
+        .from(pullRequestLabels)
+        .where(inArray(pullRequestLabels.pullRequestId, prUrlsSub)),
+      db
+        .select()
+        .from(pullRequestUsers)
+        .where(inArray(pullRequestUsers.userId, assigneeUserIdsSub)),
+    ]);
+
+    const labels: Label[] = labelRows.map((r) => ({
+      name: r.name,
+      color: r.color ?? null,
+    }));
+
+    return {
+      authors: authorRows.map((r) => ({
+        userId: r.userId,
+        userName: r.userName,
+        displayName: r.displayName ?? null,
+        avatarUrl: r.avatarUrl ?? null,
+        url: r.url ?? null,
+        userUpdatedAt: r.userUpdatedAt ?? null,
+        userCreatedAt: r.userCreatedAt ?? null,
+      })),
+      labels,
+      assignees: assigneeRows.map((r) => ({
+        userId: r.userId,
+        userName: r.userName,
+        displayName: r.displayName ?? null,
+        avatarUrl: r.avatarUrl ?? null,
+        url: r.url ?? null,
+        userUpdatedAt: r.userUpdatedAt ?? null,
+        userCreatedAt: r.userCreatedAt ?? null,
+      })),
+    };
+  }
+
+  async getProjectRemoteInfo(projectId: string): Promise<ProjectRemoteCapability> {
+    const project = projectManager.getProject(projectId);
+    if (!project) return { status: 'no_remote' };
+
+    const remoteState = await project.getRemoteState();
+    if (!remoteState.hasRemote) return { status: 'no_remote' };
+    if (!remoteState.selectedRemoteUrl) return { status: 'unsupported_remote' };
+
+    if (!isGitHubUrl(remoteState.selectedRemoteUrl)) return { status: 'unsupported_remote' };
+
+    return {
+      status: 'ready',
+      repositoryUrl: normalizeGitHubUrl(remoteState.selectedRemoteUrl),
+    };
+  }
+}
+
+export const prQueryService = new PrQueryService();
diff --git a/src/main/core/pull-requests/pr-sync-engine.ts b/src/main/core/pull-requests/pr-sync-engine.ts
new file mode 100644
index 0000000000..844ab37a99
--- /dev/null
+++ b/src/main/core/pull-requests/pr-sync-engine.ts
@@ -0,0 +1,1072 @@
+import { randomUUID } from 'node:crypto';
+import type { Octokit } from '@octokit/rest';
+import { and, eq, inArray, lt, ne } from 'drizzle-orm';
+import { prSyncProgressChannel, prUpdatedChannel } from '@shared/events/prEvents';
+import type {
+  MergeableState,
+  MergeStateStatus,
+  PrSyncProgress,
+  PullRequest,
+  PullRequestStatus,
+} from '@shared/pull-requests';
+import { getOctokit } from '@main/core/github/services/octokit-provider';
+import {
+  GET_PR_BY_NUMBER_QUERY,
+  GET_PR_CHECK_RUNS_BY_URL_QUERY,
+  INCREMENTAL_SYNC_PRS_QUERY,
+  SYNC_PRS_QUERY,
+} from '@main/core/github/services/pr-queries';
+import {
+  isGitHubUrl,
+  normalizeGitHubUrl,
+  splitNormalizedUrl,
+} from '@main/core/github/services/utils';
+import { db } from '@main/db/client';
+import { KV } from '@main/db/kv';
+import {
+  projectRemotes,
+  pullRequestAssignees,
+  pullRequestChecks,
+  pullRequestLabels,
+  pullRequests,
+  pullRequestUsers,
+} from '@main/db/schema';
+import { events } from '@main/lib/events';
+import { log } from '@main/lib/logger';
+import { githubRateLimiter } from '@main/lib/rate-limiter';
+import { withRetry } from '@main/lib/retry';
+import { assemblePullRequest } from './pr-utils';
+
+const PR_SYNC_MAX_COUNT = 300;
+const PR_ARCHIVE_AGE_MONTHS = 6;
+
+type FullSyncCursor = {
+  /** The `updatedAt` of the last PR we have seen (pagination cursor). */
+  lastUpdatedAt: string;
+  /** true once we have reached the count limit or the beginning of history. */
+  done: boolean;
+  /** GraphQL page cursor from the last completed page. */
+  pageCursor?: string;
+};
+
+type IncrementalSyncCursor = {
+  /** We only fetch PRs updated after this timestamp on each incremental sync. */
+  lastUpdatedAt: string;
+  /** GraphQL page cursor for resuming mid-page. */
+  pageCursor?: string;
+  done: boolean;
+};
+
+type PrKvSchema = {
+  [key: string]: FullSyncCursor | IncrementalSyncCursor | string;
+};
+
+// ---------------------------------------------------------------------------
+// GQL node shapes
+// ---------------------------------------------------------------------------
+
+interface GqlUser {
+  databaseId?: number; // absent for Mannequin actors
+  login: string;
+  avatarUrl: string;
+  createdAt?: string;
+  updatedAt?: string;
+  url?: string;
+}
+
+function actorUserId(actor: GqlUser): string {
+  return actor.databaseId != null ? String(actor.databaseId) : `login:${actor.login}`;
+}
+
+interface GqlPrNode {
+  number: number;
+  title: string;
+  url: string;
+  state: 'OPEN' | 'CLOSED' | 'MERGED';
+  isDraft: boolean;
+  createdAt: string;
+  updatedAt: string;
+  headRefName: string;
+  headRefOid: string;
+  baseRefName: string;
+  baseRefOid: string;
+  commitCount?: { totalCount: number };
+  body: string | null;
+  additions: number;
+  deletions: number;
+  changedFiles: number;
+  mergeable: MergeableState;
+  mergeStateStatus: MergeStateStatus | null;
+  author: GqlUser | null;
+  headRepository: { nameWithOwner: string; url: string; owner: { login: string } } | null;
+  baseRepository: { url: string } | null;
+  labels: { nodes: Array<{ name: string; color: string }> };
+  assignees: { nodes: GqlUser[] };
+  reviewDecision: string | null;
+}
+
+interface GqlCheckRunNode {
+  __typename: 'CheckRun';
+  name: string;
+  status: string;
+  conclusion: string | null;
+  detailsUrl: string | null;
+  startedAt: string | null;
+  completedAt: string | null;
+  checkSuite: {
+    app: { name: string; logoUrl: string } | null;
+    workflowRun: { workflow: { name: string } } | null;
+  } | null;
+}
+
+interface GqlStatusContextNode {
+  __typename: 'StatusContext';
+  context: string;
+  state: string;
+  targetUrl: string | null;
+  createdAt: string;
+}
+
+// ---------------------------------------------------------------------------
+// PrSyncEngine
+// ---------------------------------------------------------------------------
+
+export class PrSyncEngine {
+  private readonly kv = new KV<PrKvSchema>('pr');
+
+  // Per-repository in-flight promise + AbortController
+  private readonly _inflight = new Map<string, Promise<void>>();
+  private readonly _controllers = new Map<string, AbortController>();
+  // Per-operation deduplication for single-PR and check-run syncs
+  private readonly _singleInflight = new Map<string, Promise<void>>();
+  private readonly _checksInflight = new Map<string, Promise<void>>();
+
+  constructor(private readonly getOctokit: () => Promise<Octokit>) {}
+
+  // ── Public sync API ────────────────────────────────────────────────────────
+
+  /**
+   * Smart sync: resumes a full sync if one is incomplete, otherwise runs an
+   * incremental sync. Deduplicated — no-op if a sync is already in-flight.
+   */
+  sync(repositoryUrl: string): void {
+    const key = `sync:${repositoryUrl}`;
+    if (this._inflight.has(key)) {
+      log.info('PrSyncEngine: sync already in flight, skipping', { repositoryUrl });
+      return;
+    }
+
+    const ctrl = new AbortController();
+    this._controllers.set(repositoryUrl, ctrl);
+
+    const promise = this._getFullSyncCursor(repositoryUrl)
+      .then((cursor) => {
+        if (ctrl.signal.aborted) return;
+        return cursor?.done
+          ? this._runIncrementalSync(repositoryUrl, ctrl.signal)
+          : this._runFullSync(repositoryUrl, ctrl.signal);
+      })
+      .catch((e: unknown) => {
+        if ((e as { name?: string }).name !== 'AbortError') {
+          log.error('PrSyncEngine: sync failed', { repositoryUrl, error: String(e) });
+        }
+      })
+      .finally(() => {
+        this._controllers.delete(repositoryUrl);
+        this._inflight.delete(key);
+      });
+
+    this._inflight.set(key, promise);
+  }
+
+  /** Cancel any in-flight sync, wipe both cursors, and start a fresh full sync. */
+  forceFullSync(repositoryUrl: string): void {
+    this.cancel(repositoryUrl);
+    void Promise.all([
+      this.kv.del(`fullsync:${repositoryUrl}`),
+      this.kv.del(`incrementalsync:${repositoryUrl}`),
+    ]).then(() => this.sync(repositoryUrl));
+  }
+
+  /** Abort and discard any in-flight sync for this repository URL. */
+  cancel(repositoryUrl: string): void {
+    const ctrl = this._controllers.get(repositoryUrl);
+    if (ctrl) {
+      ctrl.abort();
+      this._controllers.delete(repositoryUrl);
+      this._inflight.delete(`sync:${repositoryUrl}`);
+    }
+  }
+
+  /** Cancel any in-flight syncs for a project and clean up its PR rows and KV cursors. */
+  async deleteProjectData(projectId: string): Promise<void> {
+    log.info('PrSyncEngine: deleteProjectData', { projectId });
+
+    const remoteRows = await db
+      .select({ remoteUrl: projectRemotes.remoteUrl })
+      .from(projectRemotes)
+      .where(eq(projectRemotes.projectId, projectId));
+
+    if (remoteRows.length === 0) return;
+
+    for (const { remoteUrl: url } of remoteRows) {
+      this.cancel(url);
+
+      const shared = await db
+        .select({ projectId: projectRemotes.projectId })
+        .from(projectRemotes)
+        .where(and(eq(projectRemotes.remoteUrl, url), ne(projectRemotes.projectId, projectId)))
+        .limit(1);
+
+      if (shared.length > 0) {
+        log.info(
+          'PrSyncEngine: deleteProjectData — remote shared with other project, skipping data cleanup',
+          { url }
+        );
+        continue;
+      }
+
+      log.info('PrSyncEngine: deleteProjectData — deleting PR rows and KV cursors', { url });
+      await db.delete(pullRequests).where(eq(pullRequests.repositoryUrl, url));
+      await Promise.all([
+        this.kv.del(`fullsync:${url}`),
+        this.kv.del(`incrementalsync:${url}`),
+        this.kv.del(`users-synced-at:${url}`),
+      ]);
+    }
+  }
+
+  // ── Full sync (private implementation) ────────────────────────────────────
+
+  /**
+   * Paginate through all PRs for a repository ordered by updatedAt DESC.
+   * Saves a cursor after each page so it can be resumed on restart.
+   * Sets `done: true` once the cutoff is reached or history is exhausted.
+   */
+  private async _runFullSync(repositoryUrl: string, signal: AbortSignal): Promise<void> {
+    log.info('PrSyncEngine: runFullSync start', { repositoryUrl });
+    const { owner, repo } = splitNormalizedUrl(repositoryUrl);
+    const octokit = await this.getOctokit().catch((e: unknown) => {
+      log.warn('PrSyncEngine: runFullSync — failed to get Octokit (not authenticated?)', {
+        repositoryUrl,
+        error: String(e),
+      });
+      throw e;
+    });
+
+    // Resume from an existing cursor if available
+    const existing = (await this.kv.get(`fullsync:${repositoryUrl}`)) as FullSyncCursor | null;
+    let pageCursor: string | undefined = existing?.done ? undefined : existing?.pageCursor;
+
+    let synced = 0;
+
+    this._emitProgress({ remoteUrl: repositoryUrl, kind: 'full', status: 'running', synced: 0 });
+
+    try {
+      for (;;) {
+        if (signal.aborted) return;
+
+        const response = await withRetry(
+          () =>
+            githubRateLimiter.acquire().then(() =>
+              octokit.graphql<{
+                repository: {
+                  pullRequests: {
+                    totalCount: number;
+                    pageInfo: { hasNextPage: boolean; endCursor: string | null };
+                    nodes: GqlPrNode[];
+                  };
+                };
+              }>(SYNC_PRS_QUERY, { owner, repo, cursor: pageCursor ?? null, request: { signal } })
+            ),
+          { signal }
+        );
+
+        const { nodes, pageInfo, totalCount } = response.repository.pullRequests;
+        const batch: GqlPrNode[] = nodes.slice();
+
+        if (batch.length > 0) {
+          await this._upsertBatch(repositoryUrl, batch);
+          synced += batch.length;
+        }
+
+        const lastUpdatedAt =
+          batch[batch.length - 1]?.updatedAt ?? existing?.lastUpdatedAt ?? new Date().toISOString();
+        const done = !pageInfo.hasNextPage || synced >= PR_SYNC_MAX_COUNT;
+
+        await this.kv.set(`fullsync:${repositoryUrl}`, {
+          lastUpdatedAt,
+          done,
+          pageCursor: done ? undefined : (pageInfo.endCursor ?? undefined),
+        } as FullSyncCursor);
+
+        this._emitProgress({
+          remoteUrl: repositoryUrl,
+          kind: 'full',
+          status: 'running',
+          synced,
+          total: Math.min(totalCount, PR_SYNC_MAX_COUNT),
+        });
+
+        if (done) break;
+        pageCursor = pageInfo.endCursor ?? undefined;
+      }
+
+      await this._archiveOldPrs(repositoryUrl);
+      this._emitProgress({ remoteUrl: repositoryUrl, kind: 'full', status: 'done', synced });
+    } catch (e: unknown) {
+      if ((e as { name?: string })?.name === 'AbortError') {
+        this._emitProgress({ remoteUrl: repositoryUrl, kind: 'full', status: 'cancelled' });
+        return;
+      }
+      this._emitProgress({
+        remoteUrl: repositoryUrl,
+        kind: 'full',
+        status: 'error',
+        error: e instanceof Error ? e.message : String(e),
+      });
+      throw e;
+    }
+  }
+
+  // ── Incremental sync (private implementation) ─────────────────────────────
+
+  /**
+   * Fetch only open PRs updated since the last incremental-sync cursor.
+   * Resumable: saves a page cursor so it can continue where it left off.
+   * Callers must ensure full sync is complete before calling this (sync() does this).
+   */
+  private async _runIncrementalSync(repositoryUrl: string, signal: AbortSignal): Promise<void> {
+    log.info('PrSyncEngine: runIncrementalSync started', { repositoryUrl });
+
+    const { owner, repo } = splitNormalizedUrl(repositoryUrl);
+    const octokit = await this.getOctokit().catch((e: unknown) => {
+      log.warn('PrSyncEngine: runIncrementalSync — failed to get Octokit (not authenticated?)', {
+        repositoryUrl,
+        error: String(e),
+      });
+      throw e;
+    });
+
+    const fullCursor = (await this.kv.get(`fullsync:${repositoryUrl}`)) as FullSyncCursor | null;
+    const incrementalCursor = (await this.kv.get(
+      `incrementalsync:${repositoryUrl}`
+    )) as IncrementalSyncCursor | null;
+    const sinceUpdatedAt =
+      incrementalCursor?.lastUpdatedAt ?? fullCursor?.lastUpdatedAt ?? new Date(0).toISOString();
+
+    let pageCursor: string | undefined = incrementalCursor?.done
+      ? undefined
+      : incrementalCursor?.pageCursor;
+    let synced = 0;
+    let lastUpdatedAt = sinceUpdatedAt;
+
+    this._emitProgress({
+      remoteUrl: repositoryUrl,
+      kind: 'incremental',
+      status: 'running',
+      synced: 0,
+    });
+
+    try {
+      for (;;) {
+        if (signal.aborted) return;
+
+        const response = await withRetry(
+          () =>
+            githubRateLimiter.acquire().then(() =>
+              octokit.graphql<{
+                repository: {
+                  pullRequests: {
+                    pageInfo: { hasNextPage: boolean; endCursor: string | null };
+                    nodes: GqlPrNode[];
+                  };
+                };
+              }>(INCREMENTAL_SYNC_PRS_QUERY, {
+                owner,
+                repo,
+                cursor: pageCursor ?? null,
+                request: { signal },
+              })
+            ),
+          { signal }
+        );
+
+        const { nodes, pageInfo } = response.repository.pullRequests;
+        let reachedBoundary = false;
+        const batch: GqlPrNode[] = [];
+
+        for (const node of nodes) {
+          if (node.updatedAt < sinceUpdatedAt) {
+            reachedBoundary = true;
+            break;
+          }
+          batch.push(node);
+        }
+
+        if (batch.length > 0) {
+          await this._upsertBatch(repositoryUrl, batch);
+          synced += batch.length;
+          lastUpdatedAt = batch[0].updatedAt; // most recent first
+        }
+
+        // If we've processed too many PRs, the cursor is too stale — reset to a full sync.
+        if (synced >= PR_SYNC_MAX_COUNT) {
+          log.info('PrSyncEngine: incremental overflow — resetting to full sync', {
+            repositoryUrl,
+            synced,
+          });
+          await this.kv.del(`fullsync:${repositoryUrl}`);
+          await this.kv.del(`incrementalsync:${repositoryUrl}`);
+          this._emitProgress({
+            remoteUrl: repositoryUrl,
+            kind: 'incremental',
+            status: 'done',
+            synced,
+          });
+          return;
+        }
+
+        const done = reachedBoundary || !pageInfo.hasNextPage;
+
+        await this.kv.set(`incrementalsync:${repositoryUrl}`, {
+          lastUpdatedAt,
+          pageCursor: done ? undefined : (pageInfo.endCursor ?? undefined),
+          done,
+        } as IncrementalSyncCursor);
+
+        this._emitProgress({
+          remoteUrl: repositoryUrl,
+          kind: 'incremental',
+          status: 'running',
+          synced,
+        });
+
+        if (done) break;
+        pageCursor = pageInfo.endCursor ?? undefined;
+      }
+
+      this._emitProgress({
+        remoteUrl: repositoryUrl,
+        kind: 'incremental',
+        status: 'done',
+        synced,
+      });
+    } catch (e: unknown) {
+      if ((e as { name?: string })?.name === 'AbortError') {
+        this._emitProgress({ remoteUrl: repositoryUrl, kind: 'incremental', status: 'cancelled' });
+        return;
+      }
+      this._emitProgress({
+        remoteUrl: repositoryUrl,
+        kind: 'incremental',
+        status: 'error',
+        error: e instanceof Error ? e.message : String(e),
+      });
+      throw e;
+    }
+  }
+
+  // ── Single PR sync ─────────────────────────────────────────────────────────
+
+  /** Sync a single PR by number. Deduplicated — awaits any in-flight call for the same PR. */
+  async syncSingle(repositoryUrl: string, prNumber: number): Promise<PullRequest | null> {
+    const key = `single:${repositoryUrl}:${prNumber}`;
+    if (this._singleInflight.has(key)) {
+      await this._singleInflight.get(key);
+      return null;
+    }
+
+    const ctrl = new AbortController();
+    let result: PullRequest | null = null;
+
+    const promise = this._runSyncSingle(repositoryUrl, prNumber, ctrl.signal)
+      .then((pr) => {
+        result = pr;
+      })
+      .catch((e: unknown) => {
+        if ((e as { name?: string }).name !== 'AbortError') {
+          log.error('PrSyncEngine: syncSingle failed', {
+            repositoryUrl,
+            prNumber,
+            error: String(e),
+          });
+        }
+      })
+      .finally(() => {
+        this._singleInflight.delete(key);
+      });
+
+    this._singleInflight.set(key, promise);
+    await promise;
+    return result;
+  }
+
+  private async _runSyncSingle(
+    repositoryUrl: string,
+    prNumber: number,
+    signal: AbortSignal
+  ): Promise<PullRequest | null> {
+    if (signal.aborted) return null;
+
+    const { owner, repo } = splitNormalizedUrl(repositoryUrl);
+    const octokit = await this.getOctokit();
+
+    const response = await withRetry(() =>
+      githubRateLimiter.acquire().then(() =>
+        octokit.graphql<{
+          repository: { pullRequest: GqlPrNode | null };
+        }>(GET_PR_BY_NUMBER_QUERY, { owner, repo, number: prNumber })
+      )
+    );
+
+    const node = response.repository.pullRequest;
+    if (!node) return null;
+
+    const [pr] = await this._upsertBatch(repositoryUrl, [node]);
+    if (pr) {
+      this._notifyPrUpdated(pr);
+    }
+
+    this._emitProgress({ remoteUrl: repositoryUrl, kind: 'single', status: 'done', synced: 1 });
+    return pr ?? null;
+  }
+
+  // ── Check runs sync ────────────────────────────────────────────────────────
+
+  /**
+   * Fetch and store check runs for a PR. Deduplicated — awaits any in-flight call.
+   * Returns true if any check is still running (caller should re-invoke soon).
+   */
+  async syncChecks(pullRequestUrl: string, headRefOid: string): Promise<boolean> {
+    const key = `checks:${pullRequestUrl}:${headRefOid}`;
+    if (this._checksInflight.has(key)) {
+      await this._checksInflight.get(key);
+      return false;
+    }
+
+    const ctrl = new AbortController();
+    let result = false;
+
+    const promise = this._runSyncChecks(pullRequestUrl, headRefOid, ctrl.signal)
+      .then((r) => {
+        result = r;
+      })
+      .catch((e: unknown) => {
+        if ((e as { name?: string }).name !== 'AbortError') {
+          log.error('PrSyncEngine: syncChecks failed', { pullRequestUrl, error: String(e) });
+        }
+      })
+      .finally(() => {
+        this._checksInflight.delete(key);
+      });
+
+    this._checksInflight.set(key, promise);
+    await promise;
+    return result;
+  }
+
+  private async _runSyncChecks(
+    pullRequestUrl: string,
+    headRefOid: string,
+    signal: AbortSignal
+  ): Promise<boolean> {
+    if (signal.aborted) return false;
+
+    // Detect stale checks: delete if commitSha changed
+    const existing = await db
+      .select({ commitSha: pullRequestChecks.commitSha })
+      .from(pullRequestChecks)
+      .where(eq(pullRequestChecks.pullRequestUrl, pullRequestUrl))
+      .limit(1);
+
+    if (existing.length > 0 && existing[0].commitSha !== headRefOid) {
+      await db
+        .delete(pullRequestChecks)
+        .where(eq(pullRequestChecks.pullRequestUrl, pullRequestUrl));
+    }
+
+    // Fetch fresh check runs from GitHub
+    const pr = await db
+      .select({ identifier: pullRequests.identifier, repositoryUrl: pullRequests.repositoryUrl })
+      .from(pullRequests)
+      .where(eq(pullRequests.url, pullRequestUrl))
+      .limit(1);
+
+    if (!pr[0]) return false;
+
+    const prNumber = pr[0].identifier ? parseInt(pr[0].identifier.replace('#', ''), 10) : NaN;
+    if (isNaN(prNumber)) return false;
+
+    if (!isGitHubUrl(pr[0].repositoryUrl)) return false;
+    const { owner, repo } = splitNormalizedUrl(normalizeGitHubUrl(pr[0].repositoryUrl));
+    const octokit = await this.getOctokit();
+
+    type CheckNode = GqlCheckRunNode | GqlStatusContextNode;
+    const allNodes: CheckNode[] = [];
+    let cursor: string | undefined;
+
+    for (;;) {
+      if (signal.aborted) return false;
+
+      const response: {
+        repository: {
+          pullRequest: {
+            commits: {
+              nodes: Array<{
+                commit: {
+                  oid: string;
+                  statusCheckRollup: {
+                    contexts: {
+                      pageInfo: { hasNextPage: boolean; endCursor: string | null };
+                      nodes: CheckNode[];
+                    };
+                  } | null;
+                };
+              }>;
+            };
+          } | null;
+        };
+      } = await withRetry(() =>
+        githubRateLimiter.acquire().then(() =>
+          octokit.graphql(GET_PR_CHECK_RUNS_BY_URL_QUERY, {
+            owner,
+            repo,
+            number: prNumber,
+            cursor: cursor ?? null,
+          })
+        )
+      );
+
+      const contexts =
+        response.repository.pullRequest?.commits.nodes[0]?.commit?.statusCheckRollup?.contexts;
+      if (!contexts) break;
+
+      allNodes.push(...contexts.nodes);
+      if (!contexts.pageInfo.hasNextPage) break;
+      cursor = contexts.pageInfo.endCursor ?? undefined;
+    }
+
+    // Delete and re-insert
+    await db.delete(pullRequestChecks).where(eq(pullRequestChecks.pullRequestUrl, pullRequestUrl));
+
+    if (allNodes.length > 0) {
+      await db.insert(pullRequestChecks).values(
+        allNodes.map((node) => {
+          if (node.__typename === 'CheckRun') {
+            return {
+              id: randomUUID(),
+              pullRequestUrl,
+              commitSha: headRefOid,
+              name: node.name,
+              status: node.status,
+              conclusion: node.conclusion ?? 'NEUTRAL',
+              detailsUrl: node.detailsUrl ?? null,
+              startedAt: node.startedAt ?? null,
+              completedAt: node.completedAt ?? null,
+              workflowName: node.checkSuite?.workflowRun?.workflow?.name ?? null,
+              appName: node.checkSuite?.app?.name ?? null,
+              appLogoUrl: node.checkSuite?.app?.logoUrl ?? null,
+            };
+          }
+          // StatusContext
+          return {
+            id: randomUUID(),
+            pullRequestUrl,
+            commitSha: headRefOid,
+            name: node.context,
+            status: node.state === 'PENDING' ? 'IN_PROGRESS' : 'COMPLETED',
+            conclusion:
+              node.state === 'SUCCESS'
+                ? 'SUCCESS'
+                : node.state === 'FAILURE' || node.state === 'ERROR'
+                  ? 'FAILURE'
+                  : 'NEUTRAL',
+            detailsUrl: node.targetUrl ?? null,
+            startedAt: node.createdAt,
+            completedAt: node.state !== 'PENDING' ? node.createdAt : null,
+            workflowName: null,
+            appName: null,
+            appLogoUrl: null,
+          };
+        })
+      );
+    }
+
+    // Return true if any check is still in-progress
+    const hasRunning = allNodes.some((n) => {
+      if (n.__typename === 'CheckRun') {
+        return (
+          n.status === 'IN_PROGRESS' ||
+          n.status === 'QUEUED' ||
+          n.status === 'WAITING' ||
+          n.status === 'PENDING'
+        );
+      }
+      return n.state === 'PENDING';
+    });
+
+    // Notify the renderer with the fully-assembled PR so checks appear reactively.
+    await this._notifyPrWithChecks(pullRequestUrl);
+
+    return hasRunning;
+  }
+
+  private async _notifyPrWithChecks(pullRequestUrl: string): Promise<void> {
+    const [prRow] = await db
+      .select()
+      .from(pullRequests)
+      .where(eq(pullRequests.url, pullRequestUrl))
+      .limit(1);
+
+    if (!prRow) return;
+
+    const [checkRows, labelRows, assigneeJoins] = await Promise.all([
+      db
+        .select()
+        .from(pullRequestChecks)
+        .where(eq(pullRequestChecks.pullRequestUrl, pullRequestUrl)),
+      db
+        .select()
+        .from(pullRequestLabels)
+        .where(eq(pullRequestLabels.pullRequestId, pullRequestUrl)),
+      db
+        .select({ user: pullRequestUsers })
+        .from(pullRequestAssignees)
+        .innerJoin(pullRequestUsers, eq(pullRequestAssignees.userId, pullRequestUsers.userId))
+        .where(eq(pullRequestAssignees.pullRequestUrl, pullRequestUrl)),
+    ]);
+
+    let authorRow: typeof pullRequestUsers.$inferSelect | null = null;
+    if (prRow.authorUserId) {
+      const [a] = await db
+        .select()
+        .from(pullRequestUsers)
+        .where(eq(pullRequestUsers.userId, prRow.authorUserId))
+        .limit(1);
+      authorRow = a ?? null;
+    }
+
+    const assembled = assemblePullRequest(
+      prRow,
+      authorRow,
+      labelRows,
+      assigneeJoins.map((j) => j.user),
+      checkRows
+    );
+    this._notifyPrUpdated(assembled);
+  }
+
+  // ── Users sync ─────────────────────────────────────────────────────────────
+
+  /** Sync users referenced by PRs in this repository. Runs at most once per day. */
+  async syncUsers(repositoryUrl: string): Promise<void> {
+    const tsKey = `users-synced-at:${repositoryUrl}`;
+    const lastSync = (await this.kv.get(tsKey)) as string | null;
+    if (lastSync) {
+      const age = Date.now() - new Date(lastSync).getTime();
+      if (age < 24 * 60 * 60 * 1000) return;
+    }
+    await this.kv.set(tsKey, new Date().toISOString());
+    // Users are upserted inline during _upsertBatch, so this is a no-op for now.
+    // Reserved for future use (e.g. refreshing user profile pics in bulk).
+  }
+
+  // ── Private helpers ────────────────────────────────────────────────────────
+
+  private async _upsertBatch(repositoryUrl: string, nodes: GqlPrNode[]): Promise<PullRequest[]> {
+    const results: PullRequest[] = [];
+
+    for (const node of nodes) {
+      const pr = await this._upsertOne(repositoryUrl, node);
+      if (pr) results.push(pr);
+    }
+
+    return results;
+  }
+
+  private async _upsertOne(repositoryUrl: string, node: GqlPrNode): Promise<PullRequest | null> {
+    const status: PullRequestStatus =
+      node.state === 'MERGED' ? 'merged' : node.state === 'CLOSED' ? 'closed' : 'open';
+
+    // Normalise URLs
+    const headRepositoryUrl = node.headRepository?.url
+      ? normalizeGitHubUrl(node.headRepository.url)
+      : repositoryUrl;
+
+    const baseRepositoryUrl = node.baseRepository?.url
+      ? normalizeGitHubUrl(node.baseRepository.url)
+      : repositoryUrl;
+
+    // Upsert author
+    let authorUserId: string | null = null;
+    if (node.author) {
+      authorUserId = actorUserId(node.author);
+      await db
+        .insert(pullRequestUsers)
+        .values({
+          userId: authorUserId,
+          userName: node.author.login,
+          displayName: node.author.login,
+          avatarUrl: node.author.avatarUrl || null,
+          url: node.author.url ?? null,
+          userCreatedAt: node.author.createdAt ?? null,
+          userUpdatedAt: node.author.updatedAt ?? null,
+        })
+        .onConflictDoUpdate({
+          target: pullRequestUsers.userId,
+          set: {
+            userName: node.author.login,
+            displayName: node.author.login,
+            avatarUrl: node.author.avatarUrl || null,
+          },
+        });
+    }
+
+    // Upsert PR row
+    const [prRow] = await db
+      .insert(pullRequests)
+      .values({
+        url: node.url,
+        provider: 'github',
+        repositoryUrl: baseRepositoryUrl,
+        baseRefName: node.baseRefName,
+        baseRefOid: node.baseRefOid,
+        headRepositoryUrl,
+        headRefName: node.headRefName,
+        headRefOid: node.headRefOid,
+        identifier: `#${node.number}`,
+        title: node.title,
+        description: node.body ?? null,
+        status,
+        isDraft: node.isDraft ? 1 : 0,
+        authorUserId,
+        additions: node.additions,
+        deletions: node.deletions,
+        changedFiles: node.changedFiles,
+        commitCount: node.commitCount?.totalCount ?? null,
+        mergeableStatus: node.mergeable,
+        mergeStateStatus: node.mergeStateStatus ?? null,
+        reviewDecision: node.reviewDecision ?? null,
+        pullRequestCreatedAt: node.createdAt,
+        pullRequestUpdatedAt: node.updatedAt,
+      })
+      .onConflictDoUpdate({
+        target: pullRequests.url,
+        set: {
+          baseRefName: node.baseRefName,
+          baseRefOid: node.baseRefOid,
+          headRepositoryUrl,
+          headRefName: node.headRefName,
+          headRefOid: node.headRefOid,
+          title: node.title,
+          description: node.body ?? null,
+          status,
+          isDraft: node.isDraft ? 1 : 0,
+          authorUserId,
+          additions: node.additions,
+          deletions: node.deletions,
+          changedFiles: node.changedFiles,
+          commitCount: node.commitCount?.totalCount ?? null,
+          mergeableStatus: node.mergeable,
+          mergeStateStatus: node.mergeStateStatus ?? null,
+          reviewDecision: node.reviewDecision ?? null,
+          pullRequestUpdatedAt: node.updatedAt,
+        },
+      })
+      .returning();
+
+    if (!prRow) return null;
+
+    // Sync labels
+    await db.delete(pullRequestLabels).where(eq(pullRequestLabels.pullRequestId, node.url));
+    if (node.labels.nodes.length > 0) {
+      await db.insert(pullRequestLabels).values(
+        node.labels.nodes.map((l) => ({
+          pullRequestId: node.url,
+          name: l.name,
+          color: l.color ?? null,
+        }))
+      );
+    }
+
+    // Upsert assignee users and links
+    await db.delete(pullRequestAssignees).where(eq(pullRequestAssignees.pullRequestUrl, node.url));
+    const assigneeRows: (typeof pullRequestUsers.$inferSelect)[] = [];
+    for (const a of node.assignees.nodes) {
+      const uid = actorUserId(a);
+      await db
+        .insert(pullRequestUsers)
+        .values({
+          userId: uid,
+          userName: a.login,
+          displayName: a.login,
+          avatarUrl: a.avatarUrl || null,
+          url: a.url ?? null,
+          userCreatedAt: a.createdAt ?? null,
+          userUpdatedAt: a.updatedAt ?? null,
+        })
+        .onConflictDoUpdate({
+          target: pullRequestUsers.userId,
+          set: { userName: a.login, displayName: a.login, avatarUrl: a.avatarUrl || null },
+        });
+
+      await db
+        .insert(pullRequestAssignees)
+        .values({ pullRequestUrl: node.url, userId: uid })
+        .onConflictDoNothing();
+
+      assigneeRows.push({
+        userId: uid,
+        userName: a.login,
+        displayName: a.login,
+        avatarUrl: a.avatarUrl || null,
+        url: a.url ?? null,
+        userCreatedAt: a.createdAt ?? null,
+        userUpdatedAt: a.updatedAt ?? null,
+      });
+    }
+
+    const authorRow = node.author
+      ? {
+          userId: actorUserId(node.author),
+          userName: node.author.login,
+          displayName: node.author.login,
+          avatarUrl: node.author.avatarUrl || null,
+          url: node.author.url ?? null,
+          userCreatedAt: node.author.createdAt ?? null,
+          userUpdatedAt: node.author.updatedAt ?? null,
+        }
+      : null;
+
+    const labelRows = node.labels.nodes.map((l) => ({
+      pullRequestId: node.url,
+      name: l.name,
+      color: l.color ?? null,
+    }));
+
+    const checkRows = await db
+      .select()
+      .from(pullRequestChecks)
+      .where(eq(pullRequestChecks.pullRequestUrl, node.url));
+
+    return assemblePullRequest(prRow, authorRow, labelRows, assigneeRows, checkRows);
+  }
+
+  private async _archiveOldPrs(repositoryUrl: string): Promise<void> {
+    const cutoff = new Date();
+    cutoff.setMonth(cutoff.getMonth() - PR_ARCHIVE_AGE_MONTHS);
+    const cutoffIso = cutoff.toISOString();
+
+    await db
+      .delete(pullRequests)
+      .where(
+        and(
+          eq(pullRequests.repositoryUrl, repositoryUrl),
+          inArray(pullRequests.status, ['closed', 'merged']),
+          lt(pullRequests.pullRequestUpdatedAt, cutoffIso)
+        )
+      );
+
+    log.info('PrSyncEngine: archived old PRs', { repositoryUrl, cutoffIso });
+  }
+
+  private _notifyPrUpdated(pr: PullRequest): void {
+    events.emit(prUpdatedChannel, { prs: [pr] });
+  }
+
+  private _emitProgress(progress: PrSyncProgress): void {
+    events.emit(prSyncProgressChannel, progress);
+  }
+
+  // ── Mutation helpers (for controller use) ──────────────────────────────────
+
+  async createPullRequest(params: {
+    repositoryUrl: string;
+    head: string;
+    base: string;
+    title: string;
+    body?: string;
+    draft: boolean;
+  }): Promise<{ url: string; number: number }> {
+    const { owner, repo } = splitNormalizedUrl(params.repositoryUrl);
+    const octokit = await this.getOctokit();
+    const response = await octokit.rest.pulls.create({
+      owner,
+      repo,
+      head: params.head,
+      base: params.base,
+      title: params.title,
+      body: params.body,
+      draft: params.draft,
+    });
+    const { html_url: url, number } = response.data;
+    return { url, number };
+  }
+
+  async mergePullRequest(
+    repositoryUrl: string,
+    prNumber: number,
+    options: { strategy: 'merge' | 'squash' | 'rebase'; commitHeadOid?: string }
+  ): Promise<{ sha: string | null; merged: boolean }> {
+    const { owner, repo } = splitNormalizedUrl(repositoryUrl);
+    const octokit = await this.getOctokit();
+    const response = await octokit.rest.pulls.merge({
+      owner,
+      repo,
+      pull_number: prNumber,
+      merge_method: options.strategy,
+      sha: options.commitHeadOid,
+    });
+    return { sha: response.data.sha ?? null, merged: response.data.merged };
+  }
+
+  async markReadyForReview(repositoryUrl: string, prNumber: number): Promise<void> {
+    const { owner, repo } = splitNormalizedUrl(repositoryUrl);
+    const octokit = await this.getOctokit();
+    const { data } = await octokit.rest.pulls.get({ owner, repo, pull_number: prNumber });
+    await octokit.graphql(
+      `mutation MarkReadyForReview($id: ID!) {
+        markPullRequestReadyForReview(input: { pullRequestId: $id }) {
+          pullRequest { isDraft }
+        }
+      }`,
+      { id: data.node_id }
+    );
+  }
+
+  async getPullRequestFiles(
+    repositoryUrl: string,
+    prNumber: number
+  ): Promise<
+    {
+      filename: string;
+      status: string;
+      additions: number;
+      deletions: number;
+      patch?: string;
+    }[]
+  > {
+    const { owner, repo } = splitNormalizedUrl(repositoryUrl);
+    const octokit = await this.getOctokit();
+    const files = await octokit.paginate(octokit.rest.pulls.listFiles, {
+      owner,
+      repo,
+      pull_number: prNumber,
+      per_page: 100,
+    });
+    return files.map((f) => ({
+      filename: f.filename,
+      status: f.status,
+      additions: f.additions,
+      deletions: f.deletions,
+      patch: f.patch,
+    }));
+  }
+
+  private async _getFullSyncCursor(repositoryUrl: string): Promise<{ done: boolean } | null> {
+    return (await this.kv.get(`fullsync:${repositoryUrl}`)) as FullSyncCursor | null;
+  }
+}
+
+export const prSyncEngine = new PrSyncEngine(getOctokit);
diff --git a/src/main/core/pull-requests/pr-sync-scheduler.ts b/src/main/core/pull-requests/pr-sync-scheduler.ts
new file mode 100644
index 0000000000..748ae46b33
--- /dev/null
+++ b/src/main/core/pull-requests/pr-sync-scheduler.ts
@@ -0,0 +1,177 @@
+import { eq } from 'drizzle-orm';
+import { isGitHubUrl, normalizeGitHubUrl } from '@main/core/github/services/utils';
+import { projectManager } from '@main/core/projects/project-manager';
+import { db } from '@main/db/client';
+import { projectRemotes } from '@main/db/schema';
+import { log } from '@main/lib/logger';
+import { prSyncEngine } from './pr-sync-engine';
+import { syncProjectRemotes } from './project-remotes-service';
+
+const INCREMENTAL_SYNC_INTERVAL_MS = 5 * 60 * 1000; // 5 minutes
+
+/**
+ * Wires sync coordinator to application lifecycle events.
+ * Called from project providers at mount, unmount, provision, and config change.
+ */
+export class PrSyncScheduler {
+  /** Per-project set of interval handles for light sync polling. */
+  private readonly _intervals = new Map<string, ReturnType<typeof setInterval>[]>();
+  /** Per-project set of known GitHub remote URLs (for cleanup on unmount). */
+  private readonly _projectRemoteUrls = new Map<string, string[]>();
+
+  initialize(): void {
+    projectManager.registerOnProjectOpened((id) => this.onProjectMounted(id));
+    projectManager.registerOnProjectClosed((id) => this.onProjectUnmounted(id));
+  }
+
+  // ── Project lifecycle ──────────────────────────────────────────────────────
+
+  async onProjectMounted(projectId: string): Promise<void> {
+    log.info('PrSyncScheduler: onProjectMounted', { projectId });
+    const remoteUrls = await this._syncAndGetGitHubRemotes(projectId);
+    if (remoteUrls.length === 0) {
+      log.info('PrSyncScheduler: no GitHub remotes found, skipping sync', { projectId });
+      return;
+    }
+
+    log.info('PrSyncScheduler: found GitHub remotes', { projectId, remoteUrls });
+    this._projectRemoteUrls.set(projectId, remoteUrls);
+    const intervals: ReturnType<typeof setInterval>[] = [];
+
+    for (const url of remoteUrls) {
+      // sync() routes to full or incremental based on cursor state
+      prSyncEngine.sync(url);
+
+      const handle = setInterval(() => {
+        prSyncEngine.sync(url);
+      }, INCREMENTAL_SYNC_INTERVAL_MS);
+
+      intervals.push(handle);
+    }
+
+    this._intervals.set(projectId, intervals);
+  }
+
+  onProjectUnmounted(projectId: string): void {
+    const handles = this._intervals.get(projectId) ?? [];
+    log.info('PrSyncScheduler: onProjectUnmounted, clearing intervals and cancelling syncs', {
+      projectId,
+      intervals: handles.length,
+    });
+    for (const h of handles) clearInterval(h);
+    this._intervals.delete(projectId);
+
+    // Cancel in-flight syncs for all remotes of this project
+    const remoteUrls = this._projectRemoteUrls.get(projectId) ?? [];
+    for (const url of remoteUrls) {
+      prSyncEngine.cancel(url);
+    }
+    this._projectRemoteUrls.delete(projectId);
+  }
+
+  // ── Task lifecycle ─────────────────────────────────────────────────────────
+
+  async onTaskProvisioned(projectId: string, taskBranch: string | undefined): Promise<void> {
+    if (!taskBranch) return;
+
+    const remoteUrls = await this._getGitHubRemoteUrls(projectId);
+    for (const url of remoteUrls) {
+      const prNumber = await this._findPrNumberForBranch(url, taskBranch);
+      if (prNumber !== null) {
+        void prSyncEngine.syncSingle(url, prNumber);
+      }
+    }
+  }
+
+  async onPushCompleted(projectId: string, taskBranch: string): Promise<void> {
+    return this.onTaskProvisioned(projectId, taskBranch);
+  }
+
+  // ── Remote config change ───────────────────────────────────────────────────
+
+  async onRemoteChanged(projectId: string): Promise<void> {
+    const oldUrls = new Set(this._projectRemoteUrls.get(projectId) ?? []);
+
+    // Re-sync project_remotes table and get new set
+    const newUrls = await this._syncAndGetGitHubRemotes(projectId);
+    const newSet = new Set(newUrls);
+
+    // Cancel syncs for removed remotes
+    for (const url of oldUrls) {
+      if (!newSet.has(url)) {
+        prSyncEngine.cancel(url);
+      }
+    }
+
+    // Clear old intervals for this project
+    const handles = this._intervals.get(projectId) ?? [];
+    for (const h of handles) clearInterval(h);
+
+    this._projectRemoteUrls.set(projectId, newUrls);
+    const intervals: ReturnType<typeof setInterval>[] = [];
+
+    for (const url of newUrls) {
+      prSyncEngine.sync(url);
+
+      const handle = setInterval(() => {
+        prSyncEngine.sync(url);
+      }, INCREMENTAL_SYNC_INTERVAL_MS);
+
+      intervals.push(handle);
+    }
+
+    this._intervals.set(projectId, intervals);
+  }
+
+  // ── Private helpers ────────────────────────────────────────────────────────
+
+  private async _syncAndGetGitHubRemotes(projectId: string): Promise<string[]> {
+    const project = projectManager.getProject(projectId);
+    if (!project) return [];
+
+    try {
+      const remotes = await project.repository.getRemotes();
+      await syncProjectRemotes(projectId, remotes);
+      return remotes.filter((r) => isGitHubUrl(r.url)).map((r) => normalizeGitHubUrl(r.url));
+    } catch (e) {
+      log.warn('PrSyncScheduler: failed to sync project remotes', { projectId, error: String(e) });
+      return [];
+    }
+  }
+
+  private async _getGitHubRemoteUrls(projectId: string): Promise<string[]> {
+    const cached = this._projectRemoteUrls.get(projectId);
+    if (cached) return cached;
+
+    const rows = await db
+      .select({ remoteUrl: projectRemotes.remoteUrl })
+      .from(projectRemotes)
+      .where(eq(projectRemotes.projectId, projectId));
+
+    return rows.filter((r) => isGitHubUrl(r.remoteUrl)).map((r) => normalizeGitHubUrl(r.remoteUrl));
+  }
+
+  private async _findPrNumberForBranch(
+    repositoryUrl: string,
+    taskBranch: string
+  ): Promise<number | null> {
+    const { pullRequests } = await import('@main/db/schema');
+    const { and, eq: deq } = await import('drizzle-orm');
+    const rows = await db
+      .select({ identifier: pullRequests.identifier })
+      .from(pullRequests)
+      .where(
+        and(
+          deq(pullRequests.repositoryUrl, repositoryUrl),
+          deq(pullRequests.headRefName, taskBranch)
+        )
+      )
+      .limit(1);
+
+    if (!rows[0]?.identifier) return null;
+    const n = parseInt(rows[0].identifier.replace('#', ''), 10);
+    return isNaN(n) ? null : n;
+  }
+}
+
+export const prSyncScheduler = new PrSyncScheduler();
diff --git a/src/main/core/pull-requests/pr-utils.ts b/src/main/core/pull-requests/pr-utils.ts
new file mode 100644
index 0000000000..5870070833
--- /dev/null
+++ b/src/main/core/pull-requests/pr-utils.ts
@@ -0,0 +1,91 @@
+import type {
+  Label,
+  MergeableState,
+  MergeStateStatus,
+  PullRequest,
+  PullRequestCheck,
+  PullRequestStatus,
+  PullRequestUser,
+} from '@shared/pull-requests';
+import {
+  pullRequestAssignees,
+  pullRequestChecks,
+  pullRequestLabels,
+  pullRequests,
+  pullRequestUsers,
+} from '@main/db/schema';
+
+export type PrRow = typeof pullRequests.$inferSelect;
+export type PrUserRow = typeof pullRequestUsers.$inferSelect;
+export type PrLabelRow = typeof pullRequestLabels.$inferSelect;
+export type PrAssigneeRow = typeof pullRequestAssignees.$inferSelect;
+export type PrCheckRow = typeof pullRequestChecks.$inferSelect;
+
+/** Convert a raw DB pull_request_users row to the shared PullRequestUser type. */
+export function dbRowToUserRow(row: PrUserRow): PullRequestUser {
+  return {
+    userId: row.userId,
+    userName: row.userName,
+    displayName: row.displayName ?? null,
+    avatarUrl: row.avatarUrl ?? null,
+    url: row.url ?? null,
+    userUpdatedAt: row.userUpdatedAt ?? null,
+    userCreatedAt: row.userCreatedAt ?? null,
+  };
+}
+
+/** Convert a raw DB pull_request_checks row to the shared PullRequestCheck type. */
+export function dbRowToCheckRow(row: PrCheckRow): PullRequestCheck {
+  return {
+    id: row.id,
+    pullRequestUrl: row.pullRequestUrl,
+    commitSha: row.commitSha,
+    name: row.name,
+    status: row.status,
+    conclusion: row.conclusion ?? null,
+    detailsUrl: row.detailsUrl ?? null,
+    startedAt: row.startedAt ?? null,
+    completedAt: row.completedAt ?? null,
+    workflowName: row.workflowName ?? null,
+    appName: row.appName ?? null,
+    appLogoUrl: row.appLogoUrl ?? null,
+  };
+}
+
+/** Assemble the fully denormalised PullRequest view from a DB row + related data. */
+export function assemblePullRequest(
+  row: PrRow,
+  author: PrUserRow | null,
+  labels: PrLabelRow[],
+  assignees: PrUserRow[],
+  checks: PrCheckRow[] = []
+): PullRequest {
+  return {
+    url: row.url,
+    provider: row.provider,
+    repositoryUrl: row.repositoryUrl,
+    baseRefName: row.baseRefName,
+    baseRefOid: row.baseRefOid,
+    headRepositoryUrl: row.headRepositoryUrl,
+    headRefName: row.headRefName,
+    headRefOid: row.headRefOid,
+    identifier: row.identifier ?? null,
+    title: row.title,
+    description: row.description ?? null,
+    status: row.status as PullRequestStatus,
+    isDraft: Boolean(row.isDraft),
+    additions: row.additions ?? null,
+    deletions: row.deletions ?? null,
+    changedFiles: row.changedFiles ?? null,
+    commitCount: row.commitCount ?? null,
+    mergeableStatus: (row.mergeableStatus as MergeableState | null) ?? null,
+    mergeStateStatus: (row.mergeStateStatus as MergeStateStatus | null) ?? null,
+    reviewDecision: row.reviewDecision ?? null,
+    createdAt: row.pullRequestCreatedAt,
+    updatedAt: row.pullRequestUpdatedAt,
+    author: author ? dbRowToUserRow(author) : null,
+    labels: labels.map((l) => ({ name: l.name, color: l.color ?? null }) satisfies Label),
+    assignees: assignees.map(dbRowToUserRow),
+    checks: checks.map(dbRowToCheckRow),
+  };
+}
diff --git a/src/main/core/pull-requests/project-remotes-service.ts b/src/main/core/pull-requests/project-remotes-service.ts
new file mode 100644
index 0000000000..e1242d42e7
--- /dev/null
+++ b/src/main/core/pull-requests/project-remotes-service.ts
@@ -0,0 +1,48 @@
+import { and, eq, notInArray } from 'drizzle-orm';
+import type { Remote } from '@shared/git';
+import { isGitHubUrl, normalizeGitHubUrl } from '@main/core/github/services/utils';
+import { db } from '@main/db/client';
+import { projectRemotes } from '@main/db/schema';
+
+/**
+ * Upsert all git remotes for a project into the `project_remotes` table and
+ * delete any rows that are no longer present in the live remote list.
+ *
+ * Called on every task provision and whenever `.git/config` changes.
+ */
+export async function syncProjectRemotes(projectId: string, remotes: Remote[]): Promise<void> {
+  for (const r of remotes) {
+    const remoteUrl = isGitHubUrl(r.url) ? normalizeGitHubUrl(r.url) : r.url;
+    await db
+      .insert(projectRemotes)
+      .values({ projectId, remoteName: r.name, remoteUrl })
+      .onConflictDoUpdate({
+        target: [projectRemotes.projectId, projectRemotes.remoteName],
+        set: { remoteUrl },
+      });
+  }
+
+  if (remotes.length > 0) {
+    await db.delete(projectRemotes).where(
+      and(
+        eq(projectRemotes.projectId, projectId),
+        notInArray(
+          projectRemotes.remoteName,
+          remotes.map((r) => r.name)
+        )
+      )
+    );
+  } else {
+    // No remotes at all — clear all rows for this project
+    await db.delete(projectRemotes).where(eq(projectRemotes.projectId, projectId));
+  }
+}
+
+/** Return all remote URLs currently stored for a project. */
+export async function getProjectRemoteUrls(projectId: string): Promise<string[]> {
+  const rows = await db
+    .select({ remoteUrl: projectRemotes.remoteUrl })
+    .from(projectRemotes)
+    .where(eq(projectRemotes.projectId, projectId));
+  return rows.map((r) => r.remoteUrl);
+}
diff --git a/src/main/core/repository/controller.ts b/src/main/core/repository/controller.ts
new file mode 100644
index 0000000000..3be6fb47ef
--- /dev/null
+++ b/src/main/core/repository/controller.ts
@@ -0,0 +1,87 @@
+import type { BranchesPayload, LocalBranchesPayload, RemoteBranchesPayload } from '@shared/git';
+import { createRPCController } from '@shared/ipc/rpc';
+import { err, ok } from '@shared/result';
+import { capture } from '@main/lib/telemetry';
+import { projectManager } from '../projects/project-manager';
+
+export const repositoryController = createRPCController({
+  getBranches: async (projectId: string): Promise<BranchesPayload> => {
+    const project = projectManager.getProject(projectId);
+    if (!project) {
+      throw new Error('Project not found');
+    }
+    return project.repository.getBranchesPayload();
+  },
+
+  getLocalBranches: async (projectId: string): Promise<LocalBranchesPayload> => {
+    const project = projectManager.getProject(projectId);
+    if (!project) throw new Error('Project not found');
+    return project.repository.getLocalBranchesPayload();
+  },
+
+  getRemoteBranches: async (projectId: string): Promise<RemoteBranchesPayload> => {
+    const project = projectManager.getProject(projectId);
+    if (!project) throw new Error('Project not found');
+    return project.repository.getRemoteBranchesPayload();
+  },
+
+  getRemotes: async (projectId: string) => {
+    const project = projectManager.getProject(projectId);
+    if (!project) {
+      throw new Error('Project not found');
+    }
+    return project.repository.getRemotes();
+  },
+
+  addRemote: async (projectId: string, name: string, url: string) => {
+    const project = projectManager.getProject(projectId);
+    if (!project) return err({ type: 'not_found' as const });
+    try {
+      await project.repository.addRemote(name, url);
+      return ok();
+    } catch (e) {
+      return err({ type: 'git_error' as const, message: String(e) });
+    }
+  },
+
+  renameBranch: async (projectId: string, oldBranch: string, newBranch: string) => {
+    const project = projectManager.getProject(projectId);
+    if (!project) return err({ type: 'not_found' as const });
+    const result = await project.repository.renameBranch(oldBranch, newBranch);
+    if (!result.success) return err(result.error);
+    return ok({ remotePushed: result.data.remotePushed });
+  },
+
+  fetch: async (projectId: string) => {
+    const project = projectManager.getProject(projectId);
+    if (!project) return err({ type: 'not_found' as const });
+    const result = await project.fetch();
+    capture('vcs_fetch', {
+      success: result.success,
+      project_id: projectId,
+      ...(result.success ? {} : { error_type: result.error.type }),
+    });
+    if (!result.success) return err(result.error);
+    return ok();
+  },
+
+  fetchPrForReview: async (
+    projectId: string,
+    prNumber: number,
+    headRefName: string,
+    headRepositoryUrl: string,
+    isFork: boolean
+  ) => {
+    const project = projectManager.getProject(projectId);
+    if (!project) return err({ type: 'not_found' as const });
+    const result = await project.repository.fetchPrForReview(
+      prNumber,
+      headRefName,
+      headRepositoryUrl,
+      headRefName,
+      isFork
+    );
+    if (!result.success) return err(result.error);
+    return ok({ localBranch: headRefName });
+  },
+});
diff --git a/src/main/core/secrets/encrypted-app-secrets-store.ts b/src/main/core/secrets/encrypted-app-secrets-store.ts
new file mode 100644
index 0000000000..1b0953ab57
--- /dev/null
+++ b/src/main/core/secrets/encrypted-app-secrets-store.ts
@@ -0,0 +1,69 @@
+import { eq } from 'drizzle-orm';
+import { safeStorage } from 'electron';
+import { db as appDb } from '@main/db/client';
+import { appSecrets } from '@main/db/schema';
+
+export class EncryptedAppSecretsStore {
+  constructor(
+    private readonly db = appDb,
+    private readonly safeStorageApi = safeStorage,
+    private readonly platform: NodeJS.Platform = process.platform
+  ) {}
+
+  async getSecret(key: string): Promise<string | null> {
+    const rows = await this.db
+      .select({ secret: appSecrets.secret })
+      .from(appSecrets)
+      .where(eq(appSecrets.key, key))
+      .limit(1);
+
+    const secret = rows[0]?.secret;
+    if (!secret) {
+      return null;
+    }
+
+    this.assertSecureStorageAvailable();
+    return this.safeStorageApi.decryptString(Buffer.from(secret, 'base64'));
+  }
+
+  async setSecret(key: string, secret: string): Promise<void> {
+    this.assertSecureStorageAvailable();
+    const encryptedSecret = this.safeStorageApi.encryptString(secret).toString('base64');
+
+    await this.setEncryptedSecret(key, encryptedSecret);
+  }
+
+  async setEncryptedSecret(key: string, encryptedSecret: string): Promise<void> {
+    await this.db
+      .insert(appSecrets)
+      .values({
+        key: key,
+        secret: encryptedSecret,
+      })
+      .onConflictDoUpdate({ target: appSecrets.key, set: { secret: encryptedSecret } })
+      .execute();
+  }
+
+  async deleteSecret(key: string): Promise<void> {
+    await this.db.delete(appSecrets).where(eq(appSecrets.key, key));
+  }
+
+  private assertSecureStorageAvailable(): void {
+    if (!this.safeStorageApi.isEncryptionAvailable()) {
+      throw new Error('Secure secret storage is unavailable on this system.');
+    }
+
+    if (this.platform !== 'linux') {
+      return;
+    }
+
+    const backend = this.safeStorageApi.getSelectedStorageBackend?.();
+    if (backend === 'basic_text') {
+      throw new Error(
+        'Secure secret storage is unavailable: Linux safeStorage backend is basic_text.'
+      );
+    }
+  }
+}
+
+export const encryptedAppSecretsStore = new EncryptedAppSecretsStore();
diff --git a/src/main/core/settings/controller.ts b/src/main/core/settings/controller.ts
new file mode 100644
index 0000000000..7c3fafc7e5
--- /dev/null
+++ b/src/main/core/settings/controller.ts
@@ -0,0 +1,24 @@
+import { createRPCController } from '@/shared/ipc/rpc';
+import { appSettingsService, type AppSettings, type AppSettingsKey } from './settings-service';
+
+export const appSettingsController = createRPCController({
+  get: <T extends AppSettingsKey>(key: T): Promise<AppSettings[T]> => appSettingsService.get(key),
+
+  getAll: (): Promise<AppSettings> => appSettingsService.getAll(),
+
+  getWithMeta: <T extends AppSettingsKey>(
+    key: T
+  ): Promise<{
+    value: AppSettings[T];
+    defaults: AppSettings[T];
+    overrides: Partial<AppSettings[T]>;
+  }> => appSettingsService.getWithMeta(key),
+
+  update: <T extends AppSettingsKey>(key: T, value: AppSettings[T]): Promise<void> =>
+    appSettingsService.update(key, value),
+
+  reset: <T extends AppSettingsKey>(key: T): Promise<void> => appSettingsService.reset(key),
+
+  resetField: <T extends AppSettingsKey>(key: T, field: string): Promise<void> =>
+    appSettingsService.resetField(key, field as keyof AppSettings[T]),
+});
diff --git a/src/main/core/settings/override-settings.ts b/src/main/core/settings/override-settings.ts
new file mode 100644
index 0000000000..162b7793fa
--- /dev/null
+++ b/src/main/core/settings/override-settings.ts
@@ -0,0 +1,112 @@
+import { eq } from 'drizzle-orm';
+import type { ZodType } from 'zod';
+import { db } from '@main/db/client';
+import { appSettings } from '@main/db/schema';
+import { computeTrueOverrides, mergeDeep } from './utils';
+
+export class OverrideSettings<TConfig extends object> {
+  private cache: Record<string, TConfig> | null = null;
+
+  constructor(
+    private readonly storageKey: string,
+    private readonly getExternalDefaults: () => Record<string, TConfig>,
+    private readonly itemSchema: ZodType<Partial<TConfig>>
+  ) {}
+
+  private async readRawOverrides(): Promise<Record<string, Partial<TConfig>>> {
+    const [row] = await db
+      .select()
+      .from(appSettings)
+      .where(eq(appSettings.key, this.storageKey))
+      .execute();
+    if (!row) return {};
+    try {
+      return JSON.parse(row.value) as Record<string, Partial<TConfig>>;
+    } catch {
+      return {};
+    }
+  }
+
+  private async storeOverrides(overrides: Record<string, Partial<TConfig>>): Promise<void> {
+    if (Object.keys(overrides).length === 0) {
+      await db.delete(appSettings).where(eq(appSettings.key, this.storageKey)).execute();
+    } else {
+      const serialized = JSON.stringify(overrides);
+      await db
+        .insert(appSettings)
+        .values({ key: this.storageKey, value: serialized })
+        .onConflictDoUpdate({ target: appSettings.key, set: { value: serialized } })
+        .execute();
+    }
+    this.cache = null;
+  }
+
+  async getAll(): Promise<Record<string, TConfig>> {
+    if (this.cache) return this.cache;
+
+    const externalDefaults = this.getExternalDefaults();
+    const storedOverrides = await this.readRawOverrides();
+    const result: Record<string, TConfig> = {};
+    const allIds = new Set([...Object.keys(externalDefaults), ...Object.keys(storedOverrides)]);
+
+    for (const id of allIds) {
+      const def = (externalDefaults[id] ?? {}) as Record<string, unknown>;
+      const override = (storedOverrides[id] ?? {}) as Record<string, unknown>;
+      result[id] = mergeDeep(def, override) as TConfig;
+    }
+
+    this.cache = result;
+    return result;
+  }
+
+  async getItem(id: string): Promise<TConfig | undefined> {
+    const all = await this.getAll();
+    return all[id];
+  }
+
+  async getItemWithMeta(id: string): Promise<{
+    value: TConfig;
+    defaults: TConfig;
+    overrides: Partial<TConfig>;
+  } | null> {
+    const externalDefaults = this.getExternalDefaults();
+    const defaults = externalDefaults[id];
+    if (!defaults) return null;
+
+    const storedOverrides = await this.readRawOverrides();
+    const itemOverrides = (storedOverrides[id] ?? {}) as Record<string, unknown>;
+    const trueOverrides = computeTrueOverrides(
+      itemOverrides,
+      defaults as Record<string, unknown>
+    ) as Partial<TConfig>;
+    const value = mergeDeep(defaults as Record<string, unknown>, itemOverrides) as TConfig;
+
+    return { value, defaults, overrides: trueOverrides };
+  }
+
+  async updateItem(id: string, config: Partial<TConfig>): Promise<void> {
+    const externalDefaults = this.getExternalDefaults();
+    const defaults = (externalDefaults[id] ?? {}) as Record<string, unknown>;
+    const validated = this.itemSchema.parse(config) as Record<string, unknown>;
+    const delta = computeTrueOverrides(validated, defaults) as Partial<TConfig>;
+
+    const storedOverrides = await this.readRawOverrides();
+    if (Object.keys(delta).length === 0) {
+      delete storedOverrides[id];
+    } else {
+      storedOverrides[id] = delta;
+    }
+    await this.storeOverrides(storedOverrides);
+  }
+
+  async resetItem(id: string): Promise<void> {
+    const storedOverrides = await this.readRawOverrides();
+    delete storedOverrides[id];
+    await this.storeOverrides(storedOverrides);
+  }
+
+  async resetAll(): Promise<void> {
+    await db.delete(appSettings).where(eq(appSettings.key, this.storageKey)).execute();
+    this.cache = null;
+  }
+}
diff --git a/src/main/core/settings/provider-settings-controller.ts b/src/main/core/settings/provider-settings-controller.ts
new file mode 100644
index 0000000000..752539d149
--- /dev/null
+++ b/src/main/core/settings/provider-settings-controller.ts
@@ -0,0 +1,25 @@
+import { createRPCController } from '@/shared/ipc/rpc';
+import type { ProviderCustomConfig } from '@shared/app-settings';
+import { providerOverrideSettings } from './provider-settings-service';
+
+export const providerSettingsController = createRPCController({
+  getAll: (): Promise<Record<string, ProviderCustomConfig>> => providerOverrideSettings.getAll(),
+
+  getItem: (id: string): Promise<ProviderCustomConfig | undefined> =>
+    providerOverrideSettings.getItem(id),
+
+  getItemWithMeta: (
+    id: string
+  ): Promise<{
+    value: ProviderCustomConfig;
+    defaults: ProviderCustomConfig;
+    overrides: Partial<ProviderCustomConfig>;
+  } | null> => providerOverrideSettings.getItemWithMeta(id),
+
+  updateItem: (id: string, config: Partial<ProviderCustomConfig>): Promise<void> =>
+    providerOverrideSettings.updateItem(id, config),
+
+  resetItem: (id: string): Promise<void> => providerOverrideSettings.resetItem(id),
+
+  resetAll: (): Promise<void> => providerOverrideSettings.resetAll(),
+});
diff --git a/src/main/core/settings/provider-settings-service.ts b/src/main/core/settings/provider-settings-service.ts
new file mode 100644
index 0000000000..7ea7d3477f
--- /dev/null
+++ b/src/main/core/settings/provider-settings-service.ts
@@ -0,0 +1,9 @@
+import type { ProviderCustomConfig } from '@shared/app-settings';
+import { OverrideSettings } from './override-settings';
+import { providerConfigDefaults, providerCustomConfigEntrySchema } from './schema';
+
+export const providerOverrideSettings = new OverrideSettings<ProviderCustomConfig>(
+  'providerConfigs',
+  () => providerConfigDefaults as Record<string, ProviderCustomConfig>,
+  providerCustomConfigEntrySchema
+);
diff --git a/src/main/core/settings/schema.ts b/src/main/core/settings/schema.ts
new file mode 100644
index 0000000000..0880b72cc8
--- /dev/null
+++ b/src/main/core/settings/schema.ts
@@ -0,0 +1,140 @@
+import z from 'zod';
+import { AGENT_PROVIDER_IDS, AGENT_PROVIDERS } from '@shared/agent-provider-registry';
+import { openInAppIdSchema } from '@shared/openInApps';
+import { DEFAULT_AGENT_ID, DEFAULT_REVIEW_PROMPT } from './settings-registry';
+
+export const localProjectSettingsSchema = z.object({
+  defaultProjectsDirectory: z.string(),
+  defaultWorktreeDirectory: z.string(),
+  branchPrefix: z.string(),
+  pushOnCreate: z.boolean(),
+  writeAgentConfigToGitIgnore: z.boolean(),
+});
+
+export const notificationSettingsSchema = z.object({
+  enabled: z.boolean(),
+  sound: z.boolean(),
+  osNotifications: z.boolean(),
+  soundFocusMode: z.enum(['always', 'unfocused']),
+});
+
+export const taskSettingsSchema = z.object({
+  autoGenerateName: z.boolean(),
+  autoTrustWorktrees: z.boolean(),
+});
+
+export const agentAutoApproveDefaultsSchema = z
+  .partialRecord(z.enum(AGENT_PROVIDER_IDS), z.boolean())
+  .default({});
+
+export const terminalSettingsSchema = z.object({
+  fontFamily: z.string().optional(),
+  autoCopyOnSelection: z.boolean(),
+});
+
+export const themeSchema = z
+  .enum(['emlight', 'emdark'])
+  .nullable()
+  .catch(null)
+  .optional()
+  .default(null);
+
+export const defaultAgentSchema = z.optional(z.enum(AGENT_PROVIDER_IDS)).default(DEFAULT_AGENT_ID);
+
+export const reviewPromptSchema = z.string().default(DEFAULT_REVIEW_PROMPT);
+
+export const keyboardSettingsSchema = z
+  .optional(
+    z.object({
+      commandPalette: z.string().nullable().optional(),
+      settings: z.string().nullable().optional(),
+      toggleLeftSidebar: z.string().nullable().optional(),
+      toggleRightSidebar: z.string().nullable().optional(),
+      toggleTheme: z.string().nullable().optional(),
+      closeModal: z.string().nullable().optional(),
+      nextProject: z.string().nullable().optional(),
+      prevProject: z.string().nullable().optional(),
+      newTask: z.string().nullable().optional(),
+      newProject: z.string().nullable().optional(),
+      openInEditor: z.string().nullable().optional(),
+      taskViewAgents: z.string().nullable().optional(),
+      taskViewDiff: z.string().nullable().optional(),
+      taskViewEditor: z.string().nullable().optional(),
+      tabNext: z.string().nullable().optional(),
+      tabPrev: z.string().nullable().optional(),
+      tabClose: z.string().nullable().optional(),
+      newConversation: z.string().nullable().optional(),
+      newTerminal: z.string().nullable().optional(),
+      confirm: z.string().nullable().optional(),
+    })
+  )
+  .default({});
+
+export const providerCustomConfigEntrySchema = z.object({
+  cli: z.string().optional(),
+  resumeFlag: z.string().optional(),
+  defaultArgs: z.array(z.string()).optional(),
+  autoApproveFlag: z.string().optional(),
+  initialPromptFlag: z.string().optional(),
+  sessionIdFlag: z.string().optional(),
+  extraArgs: z.string().optional(),
+  env: z.record(z.string(), z.string()).optional(),
+});
+
+export const providerConfigDefaults = Object.fromEntries(
+  AGENT_PROVIDERS.filter(
+    (p) => p.cli || p.resumeFlag || p.autoApproveFlag || p.initialPromptFlag || p.defaultArgs
+  ).map((p) => [
+    p.id,
+    {
+      ...(p.cli ? { cli: p.cli } : {}),
+      ...(p.resumeFlag ? { resumeFlag: p.resumeFlag } : {}),
+      ...(p.autoApproveFlag ? { autoApproveFlag: p.autoApproveFlag } : {}),
+      ...(p.initialPromptFlag !== undefined ? { initialPromptFlag: p.initialPromptFlag } : {}),
+      ...(p.defaultArgs ? { defaultArgs: p.defaultArgs } : {}),
+      ...(p.sessionIdFlag ? { sessionIdFlag: p.sessionIdFlag } : {}),
+    },
+  ])
+);
+
+export const interfaceSettingsSchema = z.object({
+  taskHoverAction: z.enum(['delete', 'archive']),
+  autoRightSidebarBehavior: z.boolean(),
+});
+
+export const browserPreviewSettingsSchema = z.object({ enabled: z.boolean() });
+
+export const openInSettingsSchema = z.object({
+  default: openInAppIdSchema,
+  hidden: z.array(openInAppIdSchema),
+});
+
+export const APP_SETTINGS_SCHEMA_MAP = {
+  localProject: localProjectSettingsSchema,
+  tasks: taskSettingsSchema,
+  agentAutoApproveDefaults: agentAutoApproveDefaultsSchema,
+  defaultAgent: defaultAgentSchema,
+  reviewPrompt: reviewPromptSchema,
+  keyboard: keyboardSettingsSchema,
+  notifications: notificationSettingsSchema,
+  theme: themeSchema,
+  openIn: openInSettingsSchema,
+  interface: interfaceSettingsSchema,
+  terminal: terminalSettingsSchema,
+  browserPreview: browserPreviewSettingsSchema,
+} as const;
+
+export const appSettingsSchema = z.object({
+  localProject: localProjectSettingsSchema,
+  tasks: taskSettingsSchema,
+  agentAutoApproveDefaults: agentAutoApproveDefaultsSchema,
+  defaultAgent: defaultAgentSchema,
+  reviewPrompt: reviewPromptSchema,
+  keyboard: keyboardSettingsSchema,
+  notifications: notificationSettingsSchema,
+  theme: themeSchema,
+  openIn: openInSettingsSchema,
+  interface: interfaceSettingsSchema,
+  terminal: terminalSettingsSchema,
+  browserPreview: browserPreviewSettingsSchema,
+});
diff --git a/src/main/core/settings/settings-registry.ts b/src/main/core/settings/settings-registry.ts
new file mode 100644
index 0000000000..4704166e90
--- /dev/null
+++ b/src/main/core/settings/settings-registry.ts
@@ -0,0 +1,57 @@
+import { homedir } from 'node:os';
+import { join } from 'node:path';
+import type { AppSettings, AppSettingsKey } from '@shared/app-settings';
+import type { OpenInAppId } from '@shared/openInApps';
+import { getDefaultLocalWorktreeDirectory } from './worktree-defaults';
+
+export const DEFAULT_AGENT_ID = 'claude';
+export const DEFAULT_REVIEW_PROMPT =
+  'Review all changes in this worktree. Focus on correctness, regressions, edge cases, and missing tests. List concrete issues first, then note residual risks.';
+
+type SettingsDefaultsMap = {
+  [K in AppSettingsKey]: AppSettings[K] | (() => AppSettings[K]);
+};
+
+export const SETTINGS_DEFAULTS = {
+  localProject: () => ({
+    defaultProjectsDirectory: join(homedir(), 'emdash', 'repositories'),
+    defaultWorktreeDirectory: getDefaultLocalWorktreeDirectory(),
+    branchPrefix: 'emdash',
+    pushOnCreate: true,
+    writeAgentConfigToGitIgnore: true,
+  }),
+  tasks: {
+    autoGenerateName: true,
+    autoTrustWorktrees: true,
+  },
+  agentAutoApproveDefaults: {},
+  notifications: {
+    enabled: true,
+    sound: true,
+    osNotifications: true,
+    soundFocusMode: 'always' as const,
+  },
+  terminal: {
+    autoCopyOnSelection: false,
+  },
+  theme: null,
+  defaultAgent: DEFAULT_AGENT_ID,
+  reviewPrompt: DEFAULT_REVIEW_PROMPT,
+  keyboard: {},
+  openIn: {
+    default: 'terminal' as const,
+    hidden: [] as OpenInAppId[],
+  },
+  interface: {
+    taskHoverAction: 'delete' as const,
+    autoRightSidebarBehavior: false,
+  },
+  browserPreview: {
+    enabled: true,
+  },
+} satisfies SettingsDefaultsMap;
+
+export function getDefaultForKey<K extends AppSettingsKey>(key: K): AppSettings[K] {
+  const d = SETTINGS_DEFAULTS[key];
+  return (typeof d === 'function' ? (d as () => AppSettings[K])() : d) as AppSettings[K];
+}
diff --git a/src/main/core/settings/settings-service.ts b/src/main/core/settings/settings-service.ts
new file mode 100644
index 0000000000..a17365d2f6
--- /dev/null
+++ b/src/main/core/settings/settings-service.ts
@@ -0,0 +1,142 @@
+import { eq } from 'drizzle-orm';
+import { AppSettingsKeys, type AppSettings, type AppSettingsKey } from '@shared/app-settings';
+import { db } from '@main/db/client';
+import { appSettings } from '@main/db/schema';
+import { APP_SETTINGS_SCHEMA_MAP } from './schema';
+import { getDefaultForKey } from './settings-registry';
+import { computeDelta, computeTrueOverrides, isDeepEqual, isPlainObject, mergeDeep } from './utils';
+
+export type { AppSettings, AppSettingsKey } from '@shared/app-settings';
+export { AppSettingsKeys } from '@shared/app-settings';
+
+export class SettingsStore {
+  private cache: Partial<AppSettings> = {};
+
+  private async readRaw(key: AppSettingsKey): Promise<unknown> {
+    const [row] = await db.select().from(appSettings).where(eq(appSettings.key, key)).execute();
+    if (!row) return null;
+    try {
+      return JSON.parse(row.value);
+    } catch {
+      return null;
+    }
+  }
+
+  private async storeRaw(key: AppSettingsKey, value: unknown): Promise<void> {
+    const serialized = JSON.stringify(value);
+    await db
+      .insert(appSettings)
+      .values({ key, value: serialized })
+      .onConflictDoUpdate({ target: appSettings.key, set: { value: serialized } })
+      .execute();
+  }
+
+  private async deleteRow(key: AppSettingsKey): Promise<void> {
+    await db.delete(appSettings).where(eq(appSettings.key, key)).execute();
+  }
+
+  async get<K extends AppSettingsKey>(key: K): Promise<AppSettings[K]> {
+    if (key in this.cache) return this.cache[key] as AppSettings[K];
+
+    const defaults = getDefaultForKey(key);
+    const raw = await this.readRaw(key);
+
+    let value: AppSettings[K];
+    if (raw === null || raw === undefined) {
+      value = defaults;
+    } else if (isPlainObject(raw) && isPlainObject(defaults)) {
+      value = mergeDeep(defaults as Record<string, unknown>, raw) as AppSettings[K];
+    } else {
+      value = raw as AppSettings[K];
+    }
+
+    this.cache[key] = value;
+    return value;
+  }
+
+  async getWithMeta<K extends AppSettingsKey>(
+    key: K
+  ): Promise<{
+    value: AppSettings[K];
+    defaults: AppSettings[K];
+    overrides: Partial<AppSettings[K]>;
+  }> {
+    const defaults = getDefaultForKey(key);
+    const raw = await this.readRaw(key);
+
+    if (raw === null || raw === undefined) {
+      return { value: defaults, defaults, overrides: {} as Partial<AppSettings[K]> };
+    }
+
+    let value: AppSettings[K];
+    let overrides: Partial<AppSettings[K]>;
+
+    if (isPlainObject(raw) && isPlainObject(defaults)) {
+      value = mergeDeep(defaults as Record<string, unknown>, raw) as AppSettings[K];
+      overrides = computeTrueOverrides(raw, defaults as Record<string, unknown>) as Partial<
+        AppSettings[K]
+      >;
+    } else {
+      value = raw as AppSettings[K];
+      overrides = (isDeepEqual(raw, defaults) ? {} : raw) as Partial<AppSettings[K]>;
+    }
+
+    return { value, defaults, overrides };
+  }
+
+  async update<K extends AppSettingsKey>(key: K, value: AppSettings[K]): Promise<void> {
+    const validated = APP_SETTINGS_SCHEMA_MAP[key].parse(value) as AppSettings[K];
+    const defaults = getDefaultForKey(key);
+
+    if (isPlainObject(validated) && isPlainObject(defaults)) {
+      const delta = computeDelta(
+        validated as Record<string, unknown>,
+        defaults as Record<string, unknown>
+      );
+      if (Object.keys(delta).length === 0) {
+        await this.deleteRow(key);
+      } else {
+        await this.storeRaw(key, delta);
+      }
+    } else if (isDeepEqual(validated, defaults)) {
+      await this.deleteRow(key);
+    } else {
+      await this.storeRaw(key, validated);
+    }
+
+    delete this.cache[key];
+  }
+
+  async reset<K extends AppSettingsKey>(key: K): Promise<void> {
+    await this.deleteRow(key);
+    delete this.cache[key];
+  }
+
+  async resetField<K extends AppSettingsKey>(key: K, field: keyof AppSettings[K]): Promise<void> {
+    const raw = await this.readRaw(key);
+    if (!isPlainObject(raw)) return;
+
+    const delta = { ...raw };
+    delete delta[field as string];
+
+    if (Object.keys(delta).length === 0) {
+      await this.deleteRow(key);
+    } else {
+      await this.storeRaw(key, delta);
+    }
+    delete this.cache[key];
+  }
+
+  async getAll(): Promise<AppSettings> {
+    const entries = await Promise.all(
+      AppSettingsKeys.map(async (key) => [key, await this.get(key)] as const)
+    );
+    return Object.fromEntries(entries) as AppSettings;
+  }
+
+  async initialize(): Promise<void> {
+    await this.getAll();
+  }
+}
+
+export const appSettingsService = new SettingsStore();
diff --git a/src/main/core/settings/utils.ts b/src/main/core/settings/utils.ts
new file mode 100644
index 0000000000..cde998e48e
--- /dev/null
+++ b/src/main/core/settings/utils.ts
@@ -0,0 +1,53 @@
+export function isDeepEqual(a: unknown, b: unknown): boolean {
+  return JSON.stringify(a) === JSON.stringify(b);
+}
+
+export function isPlainObject(v: unknown): v is Record<string, unknown> {
+  return typeof v === 'object' && v !== null && !Array.isArray(v);
+}
+
+export function mergeDeep(
+  base: Record<string, unknown>,
+  overrides: Record<string, unknown>
+): Record<string, unknown> {
+  const result = { ...base };
+  for (const [k, v] of Object.entries(overrides)) {
+    if (v === undefined) continue;
+    const baseVal = base[k];
+    if (isPlainObject(v) && isPlainObject(baseVal)) {
+      result[k] = mergeDeep(baseVal, v);
+    } else {
+      result[k] = v;
+    }
+  }
+  return result;
+}
+
+export function computeDelta(
+  value: Record<string, unknown>,
+  defaults: Record<string, unknown>
+): Record<string, unknown> {
+  const delta: Record<string, unknown> = {};
+  for (const [k, v] of Object.entries(value)) {
+    if (!isDeepEqual(v, defaults[k])) {
+      delta[k] = v;
+    }
+  }
+  return delta;
+}
+
+// Returns only fields in `stored` that differ from `defaults`.
+// Handles legacy rows that stored the full value — fields at their default
+// value are excluded from the result (they are not "truly overridden").
+export function computeTrueOverrides(
+  stored: Record<string, unknown>,
+  defaults: Record<string, unknown>
+): Record<string, unknown> {
+  const overrides: Record<string, unknown> = {};
+  for (const [k, v] of Object.entries(stored)) {
+    if (!isDeepEqual(v, defaults[k])) {
+      overrides[k] = v;
+    }
+  }
+  return overrides;
+}
diff --git a/src/main/core/settings/worktree-defaults.ts b/src/main/core/settings/worktree-defaults.ts
new file mode 100644
index 0000000000..caddfec15c
--- /dev/null
+++ b/src/main/core/settings/worktree-defaults.ts
@@ -0,0 +1,14 @@
+import { homedir } from 'node:os';
+import path from 'node:path';
+
+export const WORKTREE_POOL_DIR_NAME = 'worktrees';
+export const LOCAL_WORKTREE_ROOT_DIR_NAME = 'emdash';
+export const SSH_PROJECT_STATE_DIR_NAME = '.emdash';
+
+export function getDefaultLocalWorktreeDirectory(homeDirectory: string = homedir()): string {
+  return path.join(homeDirectory, LOCAL_WORKTREE_ROOT_DIR_NAME, WORKTREE_POOL_DIR_NAME);
+}
+
+export function getDefaultSshWorktreeDirectory(projectPath: string): string {
+  return path.posix.join(projectPath, SSH_PROJECT_STATE_DIR_NAME, WORKTREE_POOL_DIR_NAME);
+}
diff --git a/src/main/core/shared/oauth-flow.ts b/src/main/core/shared/oauth-flow.ts
new file mode 100644
index 0000000000..45d74da5e6
--- /dev/null
+++ b/src/main/core/shared/oauth-flow.ts
@@ -0,0 +1,163 @@
+import { createHash, randomBytes } from 'crypto';
+import * as http from 'http';
+import { shell } from 'electron';
+
+export interface OAuthFlowOptions {
+  authorizeUrl: string;
+  exchangeUrl: string;
+  successRedirectUrl: string;
+  errorRedirectUrl: string;
+  extraParams?: Record<string, string>;
+  timeoutMs?: number;
+}
+
+/**
+ * Execute a full PKCE OAuth flow:
+ * 1. Generate PKCE challenge + state
+ * 2. Start ephemeral loopback HTTP server
+ * 3. Open browser to authorizeUrl with PKCE params
+ * 4. Wait for callback with code
+ * 5. Exchange code for tokens
+ *
+ * Returns the raw JSON response from the exchange endpoint.
+ * Each caller extracts what it needs.
+ */
+export async function executeOAuthFlow(
+  options: OAuthFlowOptions
+): Promise<Record<string, unknown>> {
+  const {
+    authorizeUrl,
+    exchangeUrl,
+    successRedirectUrl,
+    errorRedirectUrl,
+    extraParams,
+    timeoutMs = 300_000,
+  } = options;
+
+  const state = randomBytes(12).toString('base64url');
+  const codeVerifier = randomBytes(32).toString('base64url');
+  const codeChallenge = createHash('sha256').update(codeVerifier).digest('base64url');
+
+  const { code } = await startLoopbackServer({
+    authorizeUrl,
+    successRedirectUrl,
+    errorRedirectUrl,
+    state,
+    codeChallenge,
+    extraParams,
+    timeoutMs,
+  });
+
+  return exchangeCode(exchangeUrl, state, code, codeVerifier);
+}
+
+// ---------------------------------------------------------------------------
+// Internal helpers
+// ---------------------------------------------------------------------------
+
+interface LoopbackOptions {
+  authorizeUrl: string;
+  successRedirectUrl: string;
+  errorRedirectUrl: string;
+  state: string;
+  codeChallenge: string;
+  extraParams?: Record<string, string>;
+  timeoutMs: number;
+}
+
+function startLoopbackServer(opts: LoopbackOptions): Promise<{ code: string }> {
+  const {
+    authorizeUrl,
+    successRedirectUrl,
+    errorRedirectUrl,
+    state,
+    codeChallenge,
+    extraParams,
+    timeoutMs,
+  } = opts;
+
+  return new Promise((resolve, reject) => {
+    const server = http.createServer((req, res) => {
+      if (!req.url) {
+        res.writeHead(400).end();
+        return;
+      }
+
+      const url = new URL(req.url, `http://${req.headers.host}`);
+      if (url.pathname !== '/callback') {
+        res.writeHead(404).end();
+        return;
+      }
+
+      const returnedState = url.searchParams.get('state');
+      const code = url.searchParams.get('code');
+
+      if (returnedState !== state || !code) {
+        res.writeHead(302, { Location: errorRedirectUrl }).end();
+        reject(new Error('State mismatch or missing code in OAuth callback'));
+        setTimeout(() => server.close(), 1000);
+        return;
+      }
+
+      res.writeHead(302, { Location: successRedirectUrl }).end();
+      resolve({ code });
+      setTimeout(() => server.close(), 2000);
+    });
+
+    const timeout = setTimeout(() => {
+      server.close();
+      reject(new Error('OAuth authentication timed out'));
+    }, timeoutMs);
+
+    server.on('error', (err) => {
+      clearTimeout(timeout);
+      reject(err);
+    });
+
+    server.on('close', () => {
+      clearTimeout(timeout);
+    });
+
+    server.listen(0, '127.0.0.1', () => {
+      const port = (server.address() as { port: number }).port;
+      const redirectUri = `http://127.0.0.1:${port}/callback`;
+
+      const params = new URLSearchParams({
+        state,
+        redirect_uri: redirectUri,
+        code_challenge: codeChallenge,
+        code_challenge_method: 'S256',
+        ...extraParams,
+      });
+
+      const fullUrl = `${authorizeUrl}?${params.toString()}`;
+
+      shell.openExternal(fullUrl).catch((err) => {
+        clearTimeout(timeout);
+        server.close();
+        reject(new Error(`Failed to open browser: ${err.message}`));
+      });
+    });
+  });
+}
+
+async function exchangeCode(
+  exchangeUrl: string,
+  state: string,
+  code: string,
+  codeVerifier: string
+): Promise<Record<string, unknown>> {
+  const response = await fetch(exchangeUrl, {
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify({ state, code, code_verifier: codeVerifier }),
+    signal: AbortSignal.timeout(30_000),
+  });
+
+  if (!response.ok) {
+    const payload = (await response.json().catch(() => null)) as { error?: string } | null;
+    throw new Error(payload?.error || `Token exchange failed (${response.status})`);
+  }
+
+  return (await response.json()) as Record<string, unknown>;
+}
diff --git a/src/main/services/SkillsService.ts b/src/main/core/skills/SkillsService.ts
similarity index 96%
rename from src/main/services/SkillsService.ts
rename to src/main/core/skills/SkillsService.ts
index d42397096e..e8d7af87b8 100644
--- a/src/main/services/SkillsService.ts
+++ b/src/main/core/skills/SkillsService.ts
@@ -1,11 +1,12 @@
-import * as fs from 'fs';
-import * as path from 'path';
-import * as os from 'os';
-import * as https from 'https';
-import { log } from '../lib/logger';
-import { parseFrontmatter, isValidSkillName, generateSkillMd } from '@shared/skills/validation';
+import * as fs from 'node:fs';
+import * as https from 'node:https';
+import * as os from 'node:os';
+import * as path from 'node:path';
 import { agentTargets, skillScanPaths } from '@shared/skills/agentTargets';
-import type { CatalogSkill, CatalogIndex, DetectedAgent } from '@shared/skills/types';
+import type { CatalogIndex, CatalogSkill, DetectedAgent } from '@shared/skills/types';
+import { generateSkillMd, isValidSkillName, parseFrontmatter } from '@shared/skills/validation';
+import { log } from '@main/lib/logger';
+import bundledCatalog from './bundled-catalog.json';
 
 const SKILLS_ROOT = path.join(os.homedir(), '.agentskills');
 const EMDASH_META = path.join(SKILLS_ROOT, '.emdash');
@@ -75,7 +76,7 @@ export class SkillsService {
       // No disk cache — fall back to bundled catalog
     }
 
-    const bundled = await this.loadBundledCatalog();
+    const bundled = this.loadBundledCatalog();
     this.catalogCache = bundled;
     return this.mergeInstalledState(bundled);
   }
@@ -416,14 +417,8 @@ export class SkillsService {
 
   // --- Private helpers ---
 
-  private async loadBundledCatalog(): Promise<CatalogIndex> {
-    try {
-      // eslint-disable-next-line @typescript-eslint/no-var-requires
-      const bundled = require('./skills/bundled-catalog.json') as CatalogIndex;
-      return bundled;
-    } catch {
-      return { version: 1, lastUpdated: new Date().toISOString(), skills: [] };
-    }
+  private loadBundledCatalog(): CatalogIndex {
+    return bundledCatalog as CatalogIndex;
   }
 
   private async mergeInstalledState(catalog: CatalogIndex): Promise<CatalogIndex> {
diff --git a/src/main/services/skills/bundled-catalog.json b/src/main/core/skills/bundled-catalog.json
similarity index 100%
rename from src/main/services/skills/bundled-catalog.json
rename to src/main/core/skills/bundled-catalog.json
diff --git a/src/main/core/skills/controller.ts b/src/main/core/skills/controller.ts
new file mode 100644
index 0000000000..122fa12559
--- /dev/null
+++ b/src/main/core/skills/controller.ts
@@ -0,0 +1,75 @@
+import { createRPCController } from '@/shared/ipc/rpc';
+import { skillsService } from '@main/core/skills/SkillsService';
+import { log } from '@main/lib/logger';
+
+export const skillsController = createRPCController({
+  getCatalog: async () => {
+    try {
+      const catalog = await skillsService.getCatalogIndex();
+      return { success: true, data: catalog };
+    } catch (error) {
+      log.error('Failed to get skills catalog:', error);
+      return { success: false, error: error instanceof Error ? error.message : String(error) };
+    }
+  },
+
+  refreshCatalog: async () => {
+    try {
+      const catalog = await skillsService.refreshCatalog();
+      return { success: true, data: catalog };
+    } catch (error) {
+      log.error('Failed to refresh skills catalog:', error);
+      return { success: false, error: error instanceof Error ? error.message : String(error) };
+    }
+  },
+
+  install: async (args: { skillId: string }) => {
+    try {
+      const skill = await skillsService.installSkill(args.skillId);
+      return { success: true, data: skill };
+    } catch (error) {
+      log.error('Failed to install skill:', error);
+      return { success: false, error: error instanceof Error ? error.message : String(error) };
+    }
+  },
+
+  uninstall: async (args: { skillId: string }) => {
+    try {
+      await skillsService.uninstallSkill(args.skillId);
+      return { success: true };
+    } catch (error) {
+      log.error('Failed to uninstall skill:', error);
+      return { success: false, error: error instanceof Error ? error.message : String(error) };
+    }
+  },
+
+  getDetail: async (args: { skillId: string }) => {
+    try {
+      const skill = await skillsService.getSkillDetail(args.skillId);
+      return { success: true, data: skill };
+    } catch (error) {
+      log.error('Failed to get skill detail:', error);
+      return { success: false, error: error instanceof Error ? error.message : String(error) };
+    }
+  },
+
+  getDetectedAgents: async () => {
+    try {
+      const agents = await skillsService.getDetectedAgents();
+      return { success: true, data: agents };
+    } catch (error) {
+      log.error('Failed to detect agents:', error);
+      return { success: false, error: error instanceof Error ? error.message : String(error) };
+    }
+  },
+
+  create: async (args: { name: string; description: string; content?: string }) => {
+    try {
+      const skill = await skillsService.createSkill(args.name, args.description, args.content);
+      return { success: true, data: skill };
+    } catch (error) {
+      log.error('Failed to create skill:', error);
+      return { success: false, error: error instanceof Error ? error.message : String(error) };
+    }
+  },
+});
diff --git a/src/main/core/ssh/build-connect-config.ts b/src/main/core/ssh/build-connect-config.ts
new file mode 100644
index 0000000000..aa8ef52d7f
--- /dev/null
+++ b/src/main/core/ssh/build-connect-config.ts
@@ -0,0 +1,63 @@
+import { readFile } from 'node:fs/promises';
+import { homedir } from 'node:os';
+import type { ConnectConfig } from 'ssh2';
+import { sshCredentialService } from '@main/core/ssh/ssh-credential-service';
+import { resolveIdentityAgent } from '@main/core/ssh/sshConfigParser';
+import type { SshConnectionRow } from '@main/db/schema';
+
+/**
+ * Build an ssh2 `ConnectConfig` from a stored `SshConnectionRow`.
+ */
+export async function buildConnectConfigFromRow(
+  row: SshConnectionRow
+): Promise<ConnectConfig | undefined> {
+  const base: ConnectConfig = {
+    host: row.host,
+    port: row.port,
+    username: row.username,
+    readyTimeout: 20_000,
+    keepaliveInterval: 60_000,
+    keepaliveCountMax: 3,
+  };
+
+  switch (row.authType) {
+    case 'password': {
+      const password = await sshCredentialService.getPassword(row.id);
+      if (!password) {
+        throw new Error(`No password found for SSH connection '${row.name}' (id: ${row.id})`);
+      }
+      return { ...base, password };
+    }
+
+    case 'key': {
+      if (!row.privateKeyPath) {
+        throw new Error(`Private key path is required for SSH connection '${row.name}'`);
+      }
+      let keyPath = row.privateKeyPath;
+      if (keyPath.startsWith('~/')) {
+        keyPath = keyPath.replace('~', homedir());
+      } else if (keyPath === '~') {
+        keyPath = homedir();
+      }
+      const privateKey = await readFile(keyPath, 'utf-8');
+      const passphrase = await sshCredentialService.getPassphrase(row.id);
+      return { ...base, privateKey, ...(passphrase ? { passphrase } : {}) };
+    }
+
+    case 'agent': {
+      const identityAgent = await resolveIdentityAgent(row.host);
+      const agent = identityAgent || process.env.SSH_AUTH_SOCK;
+      if (!agent) {
+        throw new Error(
+          `SSH agent socket not found for connection '${row.name}'. ` +
+            'Ensure the SSH agent is running or use key/password auth.'
+        );
+      }
+      return { ...base, agent };
+    }
+
+    default: {
+      throw new Error(`Unsupported SSH auth type: ${(row as { authType: string }).authType}`);
+    }
+  }
+}
diff --git a/src/main/core/ssh/controller.ts b/src/main/core/ssh/controller.ts
new file mode 100644
index 0000000000..19c765e46c
--- /dev/null
+++ b/src/main/core/ssh/controller.ts
@@ -0,0 +1,237 @@
+import { randomUUID } from 'node:crypto';
+import { readFileSync } from 'node:fs';
+import { homedir } from 'node:os';
+import { eq } from 'drizzle-orm';
+import { Client } from 'ssh2';
+import { createRPCController } from '@/shared/ipc/rpc';
+import type { ConnectionState, ConnectionTestResult, FileEntry, SshConfig } from '@shared/ssh';
+import { db } from '@main/db/client';
+import { sshConnections as sshConnectionsTable, type SshConnectionInsert } from '@main/db/schema';
+import { log } from '@main/lib/logger';
+import { capture } from '@main/lib/telemetry';
+import { sshConnectionManager } from './ssh-connection-manager';
+import { sshCredentialService } from './ssh-credential-service';
+import { resolveIdentityAgent } from './utils';
+
+export const sshController = createRPCController({
+  /** List all saved SSH connections (no secrets). */
+  getConnections: async (): Promise<SshConfig[]> => {
+    const rows = await db.select().from(sshConnectionsTable);
+    return rows.map((row) => ({
+      id: row.id,
+      name: row.name,
+      host: row.host,
+      port: row.port,
+      worktreesDir: row.metadata ? JSON.parse(row.metadata).worktreesDir : undefined,
+      username: row.username,
+      authType: row.authType as 'password' | 'key' | 'agent',
+      privateKeyPath: row.privateKeyPath ?? undefined,
+      useAgent: row.useAgent === 1,
+    }));
+  },
+
+  /** Create or update an SSH connection, storing secrets in local secure storage. */
+  saveConnection: async (
+    config: Partial<Pick<SshConfig, 'id'>> &
+      Omit<SshConfig, 'id'> & { password?: string; passphrase?: string }
+  ): Promise<SshConfig> => {
+    const connectionId = config.id ?? randomUUID();
+
+    // Only update stored credentials when a non-empty value is provided.
+    // On edits, leaving a field blank means "keep the existing credential".
+    if (config.password) {
+      await sshCredentialService.storePassword(connectionId, config.password);
+    }
+    if (config.passphrase) {
+      await sshCredentialService.storePassphrase(connectionId, config.passphrase);
+    }
+
+    const { password: _p, passphrase: _pp, ...dbConfig } = config;
+
+    const metadata: Record<string, unknown> = {
+      worktreesDir: config.worktreesDir,
+    };
+
+    const insertData: SshConnectionInsert = {
+      id: connectionId,
+      name: dbConfig.name,
+      host: dbConfig.host,
+      port: dbConfig.port,
+      metadata: JSON.stringify(metadata),
+      username: dbConfig.username,
+      authType: dbConfig.authType,
+      privateKeyPath: dbConfig.privateKeyPath ?? null,
+      useAgent: dbConfig.useAgent ? 1 : 0,
+    };
+
+    await db
+      .insert(sshConnectionsTable)
+      .values(insertData)
+      .onConflictDoUpdate({
+        target: sshConnectionsTable.id,
+        set: {
+          name: insertData.name,
+          host: insertData.host,
+          port: insertData.port,
+          metadata: insertData.metadata,
+          username: insertData.username,
+          authType: insertData.authType,
+          privateKeyPath: insertData.privateKeyPath,
+          useAgent: insertData.useAgent,
+          updatedAt: new Date().toISOString(),
+        },
+      });
+
+    return { ...dbConfig, id: connectionId, worktreesDir: config.worktreesDir };
+  },
+
+  /** Delete a saved SSH connection and its stored credentials. */
+  deleteConnection: async (id: string): Promise<void> => {
+    if (sshConnectionManager.isConnected(id)) {
+      await sshConnectionManager.disconnect(id).catch((e) => {
+        log.warn('sshController.deleteConnection: error disconnecting', {
+          connectionId: id,
+          error: String(e),
+        });
+      });
+    }
+    await sshCredentialService.deleteAllCredentials(id);
+    await db.delete(sshConnectionsTable).where(eq(sshConnectionsTable.id, id));
+  },
+
+  /** Test a connection without persisting anything. */
+  testConnection: async (
+    config: SshConfig & { password?: string; passphrase?: string }
+  ): Promise<ConnectionTestResult> => {
+    return new Promise(async (resolve) => {
+      const client = new Client();
+      const debugLogs: string[] = [];
+      const startTime = Date.now();
+
+      client.on('ready', () => {
+        const latency = Date.now() - startTime;
+        client.end();
+        capture('ssh_connection_attempted', { success: true });
+        resolve({ success: true, latency, debugLogs });
+      });
+
+      client.on('error', (err: Error) => {
+        capture('ssh_connection_attempted', { success: false });
+        resolve({ success: false, error: err.message, debugLogs });
+      });
+
+      try {
+        const connectConfig: Parameters<Client['connect']>[0] = {
+          host: config.host,
+          port: config.port,
+          username: config.username,
+          readyTimeout: 10_000,
+          debug: (info: string) => debugLogs.push(info),
+        };
+
+        if (config.authType === 'password') {
+          connectConfig.password = config.password;
+        } else if (config.authType === 'key' && config.privateKeyPath) {
+          let keyPath = config.privateKeyPath;
+          if (keyPath.startsWith('~/')) keyPath = keyPath.replace('~', homedir());
+          connectConfig.privateKey = readFileSync(keyPath);
+          if (config.passphrase) connectConfig.passphrase = config.passphrase;
+        } else if (config.authType === 'agent') {
+          const identityAgent = await resolveIdentityAgent(config.host);
+          connectConfig.agent = identityAgent || process.env.SSH_AUTH_SOCK;
+        }
+
+        client.connect(connectConfig);
+      } catch (e) {
+        capture('ssh_connection_attempted', { success: false });
+        resolve({ success: false, error: (e as Error).message, debugLogs });
+      }
+    });
+  },
+
+  /** Intentionally close a connection and stop auto-reconnect. */
+  disconnect: async (connectionId: string): Promise<void> => {
+    await sshConnectionManager.disconnect(connectionId);
+  },
+
+  /** Ensure a connection is established (no-op if already connected). */
+  connect: async (connectionId: string): Promise<ConnectionState> => {
+    await sshConnectionManager.connect(connectionId);
+    return sshConnectionManager.getConnectionState(connectionId);
+  },
+
+  /** Returns whether the connection is currently live. */
+  getState: async (connectionId: string): Promise<'connected' | 'disconnected'> => {
+    return sshConnectionManager.isConnected(connectionId) ? 'connected' : 'disconnected';
+  },
+  /** Returns the current ConnectionState for every connection tracked by the manager. */
+  getConnectionState: async (): Promise<Record<string, ConnectionState>> => {
+    return sshConnectionManager.getAllConnectionStates();
+  },
+
+  /** Rename a saved SSH connection without changing any other fields. */
+  renameConnection: async (id: string, name: string): Promise<void> => {
+    const [row] = await db.select().from(sshConnectionsTable).where(eq(sshConnectionsTable.id, id));
+    if (!row) throw new Error(`SSH connection ${id} not found`);
+    await db
+      .update(sshConnectionsTable)
+      .set({ name, updatedAt: new Date().toISOString() })
+      .where(eq(sshConnectionsTable.id, id));
+  },
+
+  /** List files/directories at a remote path via SFTP. */
+  listFiles: async ({
+    connectionId,
+    path: remotePath,
+  }: {
+    connectionId: string;
+    path: string;
+  }): Promise<FileEntry[]> => {
+    let proxy = sshConnectionManager.getProxy(connectionId);
+
+    if (!proxy || !proxy.isConnected) {
+      proxy = await sshConnectionManager.connect(connectionId);
+    }
+
+    return new Promise((resolve, reject) => {
+      proxy!.client.sftp((err, sftp) => {
+        if (err) {
+          reject(new Error(`SFTP error: ${err.message}`));
+          return;
+        }
+        sftp.readdir(remotePath, (readdirErr, list) => {
+          sftp.end();
+          if (readdirErr) {
+            reject(new Error(`readdir error: ${readdirErr.message}`));
+            return;
+          }
+          const entries: FileEntry[] = list
+            .map((item) => {
+              const mode = item.attrs.mode ?? 0;
+              const isDir = (mode & 0o170000) === 0o040000;
+              const isLink = (mode & 0o170000) === 0o120000;
+              const entryType: FileEntry['type'] = isLink
+                ? 'symlink'
+                : isDir
+                  ? 'directory'
+                  : 'file';
+              const fullPath = `${remotePath.replace(/\/$/, '')}/${item.filename}`;
+              return {
+                path: fullPath,
+                name: item.filename,
+                type: entryType,
+                size: item.attrs.size ?? 0,
+                modifiedAt: new Date((item.attrs.mtime ?? 0) * 1000),
+              };
+            })
+            .sort((a, b) => {
+              if (a.type === 'directory' && b.type !== 'directory') return -1;
+              if (a.type !== 'directory' && b.type === 'directory') return 1;
+              return a.name.localeCompare(b.name);
+            });
+          resolve(entries);
+        });
+      });
+    });
+  },
+});
diff --git a/src/main/core/ssh/ssh-client-proxy.ts b/src/main/core/ssh/ssh-client-proxy.ts
new file mode 100644
index 0000000000..e58370f42c
--- /dev/null
+++ b/src/main/core/ssh/ssh-client-proxy.ts
@@ -0,0 +1,62 @@
+import type { Client } from 'ssh2';
+
+/**
+ * Stable reference to an ssh2 Client that survives reconnects.
+ *
+ * Services like SshFileSystem and SshGitService hold a SshClientProxy
+ * rather than a raw Client. SshConnectionManager calls update() each time
+ * a connection is established (including after reconnect) and invalidate()
+ * when the connection drops. Callers that access proxy.client at call time
+ * therefore always get the current live Client without needing to be
+ * rebuilt or replaced.
+ */
+export class SshClientProxy {
+  private _client: Client | null = null;
+  private _remoteEnv: Record<string, string> | null = null;
+
+  /** Called by SshConnectionManager when a connection becomes ready. */
+  update(client: Client): void {
+    this._client = client;
+  }
+
+  /**
+   * Called by SshConnectionManager after the connection is ready with the
+   * remote machine's login-shell environment. Stored here so downstream
+   * consumers (probers, providers) can use it without re-capturing per command.
+   */
+  updateRemoteEnv(env: Record<string, string>): void {
+    this._remoteEnv = env;
+  }
+
+  /** Called by SshConnectionManager when the connection drops. */
+  invalidate(): void {
+    this._client = null;
+    this._remoteEnv = null;
+  }
+
+  /**
+   * The remote machine's login-shell environment, captured once after the
+   * connection becomes ready. `null` until the capture completes or if
+   * capture failed — callers should fall back to `bash -l -c` in that case.
+   */
+  get remoteEnv(): Record<string, string> | null {
+    return this._remoteEnv;
+  }
+
+  /**
+   * The live ssh2 Client. Throws if the connection is not currently
+   * established. Callers should check isConnected first if they want to
+   * avoid throwing.
+   */
+  get client(): Client {
+    if (!this._client) {
+      throw new Error('SSH connection is not available');
+    }
+    return this._client;
+  }
+
+  /** True while an active connection is held. */
+  get isConnected(): boolean {
+    return this._client !== null;
+  }
+}
diff --git a/src/main/core/ssh/ssh-connection-manager.ts b/src/main/core/ssh/ssh-connection-manager.ts
new file mode 100644
index 0000000000..756809f527
--- /dev/null
+++ b/src/main/core/ssh/ssh-connection-manager.ts
@@ -0,0 +1,430 @@
+import { EventEmitter } from 'node:events';
+import { eq } from 'drizzle-orm';
+import { Client, type ConnectConfig } from 'ssh2';
+import { sshConnectionEventChannel } from '@shared/events/sshEvents';
+import type { ConnectionState } from '@shared/ssh';
+import { db } from '@main/db/client';
+import { sshConnections } from '@main/db/schema';
+import { events } from '@main/lib/events';
+import { log } from '@main/lib/logger';
+import { parseRemoteEnvOutput } from '@main/utils/userEnv';
+import { buildConnectConfigFromRow } from './build-connect-config';
+import { SshClientProxy } from './ssh-client-proxy';
+
+// ─── Error classes ────────────────────────────────────────────────────────────
+
+export class SshAuthError extends Error {
+  constructor(message: string) {
+    super(message);
+    this.name = 'SshAuthError';
+  }
+}
+
+export class SshTimeoutError extends Error {
+  constructor(message: string) {
+    super(message);
+    this.name = 'SshTimeoutError';
+  }
+}
+
+export class SshConnectionError extends Error {
+  constructor(message: string) {
+    super(message);
+    this.name = 'SshConnectionError';
+  }
+}
+
+// ─── Types ────────────────────────────────────────────────────────────────────
+
+export type SshConnectionEvent =
+  | { type: 'connecting'; connectionId: string }
+  | { type: 'connected'; connectionId: string; proxy: SshClientProxy }
+  | { type: 'disconnected'; connectionId: string }
+  | { type: 'reconnecting'; connectionId: string; attempt: number; delayMs: number }
+  | { type: 'reconnected'; connectionId: string; proxy: SshClientProxy }
+  | { type: 'reconnect-failed'; connectionId: string }
+  | { type: 'error'; connectionId: string; error: Error };
+
+/** Delays (ms) between successive reconnect attempts. Length = max attempts. */
+const RECONNECT_DELAYS_MS = [1_000, 2_000, 5_000, 10_000, 20_000];
+
+interface ReconnectState {
+  attempt: number;
+  timer: NodeJS.Timeout | undefined;
+}
+
+// ─── Implementation ──────────────────────────────────────────────────────────
+
+export class SshConnectionManager extends EventEmitter {
+  /** One stable proxy per connection ID — survives reconnects. */
+  private proxies: Map<string, SshClientProxy> = new Map();
+
+  private pendingConnections: Map<string, Promise<SshClientProxy>> = new Map();
+
+  /** Tracks ongoing reconnect backoff state per connection. */
+  private reconnecting: Map<string, ReconnectState> = new Map();
+
+  /**
+   * IDs for which disconnect() was called — these are excluded from
+   * auto-reconnect so an intentional teardown is never silently restarted.
+   */
+  private intentionalDisconnects: Set<string> = new Set();
+
+  // ─── Public API ──────────────────────────────────────────────────────────
+
+  /**
+   * Connect and register a client under the given ID.
+   *
+   * - Reuses an existing connection if already in the pool.
+   * - Concurrent calls for the same ID coalesce to a single attempt.
+   * - Throws SshAuthError, SshTimeoutError, or SshConnectionError on failure.
+   */
+  async connect(id: string): Promise<SshClientProxy> {
+    this.intentionalDisconnects.delete(id);
+
+    const existing = this.proxies.get(id);
+    if (existing?.isConnected) return existing;
+
+    const pending = this.pendingConnections.get(id);
+    if (pending) return await pending;
+
+    const [row] = await db.select().from(sshConnections).where(eq(sshConnections.id, id)).limit(1);
+
+    if (!row) {
+      throw new SshConnectionError(`SSH connection '${id}' not found`);
+    }
+
+    const config = await buildConnectConfigFromRow(row);
+    if (!config) {
+      throw new SshConnectionError(`SSH connection '${id}' has unsupported auth configuration`);
+    }
+    const connectionPromise = this.createConnection(id, config);
+    this.pendingConnections.set(id, connectionPromise);
+
+    try {
+      return await connectionPromise;
+    } finally {
+      this.pendingConnections.delete(id);
+    }
+  }
+
+  /** Get the stable SshClientProxy for a connection, or undefined. */
+  getProxy(id: string): SshClientProxy | undefined {
+    return this.proxies.get(id);
+  }
+
+  /** Returns true if the connection is currently live. */
+  isConnected(id: string): boolean {
+    return this.proxies.get(id)?.isConnected ?? false;
+  }
+
+  /** IDs of all connections that have a proxy (connected or reconnecting). */
+  getConnectionIds(): string[] {
+    return Array.from(this.proxies.keys());
+  }
+
+  /** Returns the current ConnectionState for a single connection ID. */
+  getConnectionState(id: string): ConnectionState {
+    if (this.proxies.get(id)?.isConnected) return 'connected';
+    if (this.reconnecting.has(id)) return 'reconnecting';
+    if (this.pendingConnections.has(id)) return 'connecting';
+    return 'disconnected';
+  }
+
+  /** Returns the current ConnectionState for every tracked connection. */
+  getAllConnectionStates(): Record<string, ConnectionState> {
+    const result: Record<string, ConnectionState> = {};
+    for (const id of this.proxies.keys()) {
+      result[id] = this.getConnectionState(id);
+    }
+    return result;
+  }
+
+  /**
+   * Gracefully close a connection and permanently stop reconnection for it.
+   * This is an intentional teardown — auto-reconnect will NOT fire afterward.
+   */
+  async disconnect(id: string): Promise<void> {
+    this.intentionalDisconnects.add(id);
+    this.cancelReconnect(id);
+
+    const proxy = this.proxies.get(id);
+    if (!proxy?.isConnected) {
+      log.warn('SshConnectionManager: disconnect called for unknown/inactive connection', {
+        connectionId: id,
+      });
+      this.proxies.delete(id);
+      return;
+    }
+
+    log.info('SshConnectionManager: disconnecting', { connectionId: id });
+
+    const client = proxy.client;
+    return new Promise<void>((resolve) => {
+      const timeout = setTimeout(() => {
+        log.warn('SshConnectionManager: disconnect timed out, forcing close', { connectionId: id });
+        proxy.invalidate();
+        this.proxies.delete(id);
+        resolve();
+      }, 5_000);
+
+      client.once('close', () => {
+        clearTimeout(timeout);
+        proxy.invalidate();
+        this.proxies.delete(id);
+        resolve();
+      });
+
+      client.end();
+    });
+  }
+
+  /** Gracefully close all connections. */
+  async disconnectAll(): Promise<void> {
+    const ids = Array.from(this.proxies.keys());
+    log.info('SshConnectionManager: disconnecting all connections', { count: ids.length });
+    await Promise.all(ids.map((id) => this.disconnect(id)));
+  }
+
+  // ─── Private ─────────────────────────────────────────────────────────────
+
+  private createConnection(id: string, config: ConnectConfig): Promise<SshClientProxy> {
+    log.info('SshConnectionManager: creating connection', {
+      connectionId: id,
+      host: config.host,
+      username: config.username,
+    });
+
+    // Ensure a stable proxy exists for this ID.
+    const proxy = this.proxies.get(id) ?? new SshClientProxy();
+    this.proxies.set(id, proxy);
+
+    const client = new Client();
+
+    return new Promise((resolve, reject) => {
+      this.emit('connection-event', {
+        type: 'connecting',
+        connectionId: id,
+      } satisfies SshConnectionEvent);
+
+      events.emit(sshConnectionEventChannel, {
+        type: 'connecting',
+        connectionId: id,
+      });
+
+      let resolved = false;
+      const resolveOnce = (p: SshClientProxy) => {
+        if (!resolved) {
+          resolved = true;
+          resolve(p);
+        }
+      };
+
+      client.on('error', (error: Error) => {
+        log.error('SshConnectionManager: connection error', {
+          connectionId: id,
+          error: error.message,
+        });
+
+        this.emit('connection-event', {
+          type: 'error',
+          connectionId: id,
+          error,
+        } satisfies SshConnectionEvent);
+
+        events.emit(sshConnectionEventChannel, {
+          type: 'error',
+          connectionId: id,
+          errorMessage: error.message,
+        });
+
+        reject(classifyError(error));
+      });
+
+      client.on('close', () => {
+        log.info('SshConnectionManager: connection closed', { connectionId: id });
+
+        // Only react if this client is still the one backing the proxy.
+        if (proxy.isConnected && proxy.client === client) {
+          proxy.invalidate();
+
+          this.emit('connection-event', {
+            type: 'disconnected',
+            connectionId: id,
+          } satisfies SshConnectionEvent);
+
+          events.emit(sshConnectionEventChannel, { type: 'disconnected', connectionId: id });
+
+          // Auto-reconnect unless this was an intentional disconnect or the
+          // initial handshake never succeeded (resolved = false still).
+          if (!this.intentionalDisconnects.has(id) && resolved) {
+            this.scheduleReconnect(id);
+          }
+        }
+      });
+
+      client.on('ready', () => {
+        log.info('SshConnectionManager: connection ready', { connectionId: id });
+
+        proxy.update(client);
+
+        // Capture the remote login-shell env once, non-blocking. Failures are
+        // warned but do not prevent the connection from being used.
+        this.captureRemoteEnv(proxy).catch((err: unknown) => {
+          log.warn('SshConnectionManager: remote env capture failed', {
+            connectionId: id,
+            error: err instanceof Error ? err.message : String(err),
+          });
+        });
+
+        const isReconnect = this.reconnecting.has(id);
+        this.cancelReconnect(id);
+
+        this.emit('connection-event', {
+          type: isReconnect ? 'reconnected' : 'connected',
+          connectionId: id,
+          proxy,
+        } satisfies SshConnectionEvent);
+
+        events.emit(sshConnectionEventChannel, {
+          type: isReconnect ? 'reconnected' : 'connected',
+          connectionId: id,
+        });
+
+        resolveOnce(proxy);
+      });
+
+      client.connect(config);
+    });
+  }
+
+  /**
+   * Runs `bash -l -c 'env'` on the remote machine and stores the result on
+   * the proxy. This is a one-shot operation per connection — callers that need
+   * the remote env before the capture completes can fall back to `bash -l -c`
+   * wrappers on individual commands.
+   */
+  private captureRemoteEnv(proxy: SshClientProxy): Promise<void> {
+    const TIMEOUT_MS = 5_000;
+    return new Promise((resolve, reject) => {
+      const timer = setTimeout(() => {
+        reject(new Error('remote env capture timed out'));
+      }, TIMEOUT_MS);
+
+      proxy.client.exec("bash -l -c 'env'", (execErr, stream) => {
+        if (execErr) {
+          clearTimeout(timer);
+          reject(execErr);
+          return;
+        }
+
+        let stdout = '';
+        stream.on('data', (chunk: Buffer) => {
+          stdout += chunk.toString('utf-8');
+        });
+        stream.on('close', () => {
+          clearTimeout(timer);
+          proxy.updateRemoteEnv(parseRemoteEnvOutput(stdout));
+          resolve();
+        });
+        stream.on('error', (err: Error) => {
+          clearTimeout(timer);
+          reject(err);
+        });
+      });
+    });
+  }
+
+  private scheduleReconnect(id: string): void {
+    const state = this.reconnecting.get(id) ?? { attempt: 0, timer: undefined };
+    const attempt = state.attempt + 1;
+
+    if (attempt > RECONNECT_DELAYS_MS.length) {
+      log.error('SshConnectionManager: max reconnect attempts reached', { connectionId: id });
+      this.reconnecting.delete(id);
+      this.emit('connection-event', {
+        type: 'reconnect-failed',
+        connectionId: id,
+      } satisfies SshConnectionEvent);
+      events.emit(sshConnectionEventChannel, { type: 'reconnect-failed', connectionId: id });
+      return;
+    }
+
+    const delayMs = RECONNECT_DELAYS_MS[attempt - 1]!;
+
+    log.info('SshConnectionManager: scheduling reconnect', {
+      connectionId: id,
+      attempt,
+      delayMs,
+    });
+
+    this.emit('connection-event', {
+      type: 'reconnecting',
+      connectionId: id,
+      attempt,
+      delayMs,
+    } satisfies SshConnectionEvent);
+
+    events.emit(sshConnectionEventChannel, {
+      type: 'reconnecting',
+      connectionId: id,
+      attempt,
+      delayMs,
+    });
+
+    const timer = setTimeout(() => {
+      if (this.intentionalDisconnects.has(id)) {
+        this.reconnecting.delete(id);
+        return;
+      }
+
+      const connectionPromise = this.connect(id);
+      this.pendingConnections.set(id, connectionPromise);
+
+      connectionPromise
+        .then(() => {
+          this.pendingConnections.delete(id);
+        })
+        .catch((error: unknown) => {
+          this.pendingConnections.delete(id);
+          // Auth failures won't resolve with retries — stop immediately.
+          if (error instanceof SshAuthError) {
+            log.error('SshConnectionManager: reconnect stopped — auth failure', {
+              connectionId: id,
+            });
+            this.reconnecting.delete(id);
+            this.emit('connection-event', {
+              type: 'reconnect-failed',
+              connectionId: id,
+            } satisfies SshConnectionEvent);
+            events.emit(sshConnectionEventChannel, { type: 'reconnect-failed', connectionId: id });
+          } else {
+            this.scheduleReconnect(id);
+          }
+        });
+    }, delayMs);
+
+    this.reconnecting.set(id, { attempt, timer });
+  }
+
+  private cancelReconnect(id: string): void {
+    const state = this.reconnecting.get(id);
+    if (state?.timer !== undefined) {
+      clearTimeout(state.timer);
+    }
+    this.reconnecting.delete(id);
+  }
+}
+
+export const sshConnectionManager = new SshConnectionManager();
+
+function classifyError(error: Error): SshAuthError | SshTimeoutError | SshConnectionError {
+  const msg = error.message.toLowerCase();
+  if (msg.includes('authentication') || msg.includes('auth') || msg.includes('permission denied')) {
+    return new SshAuthError(error.message);
+  }
+  if (msg.includes('timeout') || msg.includes('timed out')) {
+    return new SshTimeoutError(error.message);
+  }
+  return new SshConnectionError(error.message);
+}
diff --git a/src/main/core/ssh/ssh-credential-service.ts b/src/main/core/ssh/ssh-credential-service.ts
new file mode 100644
index 0000000000..53dbd76c39
--- /dev/null
+++ b/src/main/core/ssh/ssh-credential-service.ts
@@ -0,0 +1,112 @@
+import { encryptedAppSecretsStore } from '@main/core/secrets/encrypted-app-secrets-store';
+
+export class SshCredentialService {
+  private passwordSecretKey(connectionId: string): string {
+    return `ssh:${connectionId}:password`;
+  }
+
+  private passphraseSecretKey(connectionId: string): string {
+    return `ssh:${connectionId}:passphrase`;
+  }
+
+  async storePassword(connectionId: string, password: string): Promise<void> {
+    try {
+      await encryptedAppSecretsStore.setSecret(this.passwordSecretKey(connectionId), password);
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      throw new Error(`Failed to store password for connection ${connectionId}: ${message}`);
+    }
+  }
+
+  async getPassword(connectionId: string): Promise<string | null> {
+    try {
+      return await encryptedAppSecretsStore.getSecret(this.passwordSecretKey(connectionId));
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      throw new Error(`Failed to retrieve password for connection ${connectionId}: ${message}`);
+    }
+  }
+
+  async deletePassword(connectionId: string): Promise<void> {
+    try {
+      await encryptedAppSecretsStore.deleteSecret(this.passwordSecretKey(connectionId));
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      throw new Error(`Failed to delete password for connection ${connectionId}: ${message}`);
+    }
+  }
+
+  async hasPassword(connectionId: string): Promise<boolean> {
+    try {
+      const credential = await encryptedAppSecretsStore.getSecret(
+        this.passwordSecretKey(connectionId)
+      );
+      return credential !== null;
+    } catch {
+      return false;
+    }
+  }
+
+  async storePassphrase(connectionId: string, passphrase: string): Promise<void> {
+    try {
+      await encryptedAppSecretsStore.setSecret(this.passphraseSecretKey(connectionId), passphrase);
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      throw new Error(`Failed to store passphrase for connection ${connectionId}: ${message}`);
+    }
+  }
+
+  async getPassphrase(connectionId: string): Promise<string | null> {
+    try {
+      return await encryptedAppSecretsStore.getSecret(this.passphraseSecretKey(connectionId));
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      throw new Error(`Failed to retrieve passphrase for connection ${connectionId}: ${message}`);
+    }
+  }
+
+  async deletePassphrase(connectionId: string): Promise<void> {
+    try {
+      await encryptedAppSecretsStore.deleteSecret(this.passphraseSecretKey(connectionId));
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      throw new Error(`Failed to delete passphrase for connection ${connectionId}: ${message}`);
+    }
+  }
+
+  async hasPassphrase(connectionId: string): Promise<boolean> {
+    try {
+      const credential = await encryptedAppSecretsStore.getSecret(
+        this.passphraseSecretKey(connectionId)
+      );
+      return credential !== null;
+    } catch {
+      return false;
+    }
+  }
+
+  async storeCredentials(
+    connectionId: string,
+    credentials: { password?: string; passphrase?: string }
+  ): Promise<void> {
+    const operations: Promise<void>[] = [];
+    if (credentials.password) {
+      operations.push(this.storePassword(connectionId, credentials.password));
+    }
+    if (credentials.passphrase) {
+      operations.push(this.storePassphrase(connectionId, credentials.passphrase));
+    }
+    if (operations.length > 0) {
+      await Promise.all(operations);
+    }
+  }
+
+  async deleteAllCredentials(connectionId: string): Promise<void> {
+    await Promise.all([
+      this.deletePassword(connectionId).catch(() => {}),
+      this.deletePassphrase(connectionId).catch(() => {}),
+    ]);
+  }
+}
+
+export const sshCredentialService = new SshCredentialService();
diff --git a/src/main/core/ssh/sshConfigParser.ts b/src/main/core/ssh/sshConfigParser.ts
new file mode 100644
index 0000000000..a05825aaa3
--- /dev/null
+++ b/src/main/core/ssh/sshConfigParser.ts
@@ -0,0 +1,133 @@
+import { readFile } from 'node:fs/promises';
+import { homedir } from 'node:os';
+import { join } from 'node:path';
+import type { SshConfigHost } from '@shared/ssh';
+
+/**
+ * Strips surrounding quotes (single or double) from a value string.
+ */
+function stripQuotes(value: string): string {
+  if (
+    (value.startsWith('"') && value.endsWith('"')) ||
+    (value.startsWith("'") && value.endsWith("'"))
+  ) {
+    return value.slice(1, -1);
+  }
+  return value;
+}
+
+/**
+ * Expands a leading `~` or `~/` to the user's home directory.
+ */
+function expandTilde(filePath: string): string {
+  if (filePath === '~') {
+    return homedir();
+  }
+  if (filePath.startsWith('~/')) {
+    return join(homedir(), filePath.slice(2));
+  }
+  return filePath;
+}
+
+/**
+ * Parses ~/.ssh/config and returns an array of host entries.
+ * Skips wildcard host patterns (containing * or ?).
+ */
+export async function parseSshConfigFile(): Promise<SshConfigHost[]> {
+  const configPath = join(homedir(), '.ssh', 'config');
+  const content = await readFile(configPath, 'utf-8').catch(() => '');
+
+  const hosts: SshConfigHost[] = [];
+  const lines = content.split('\n');
+  let currentHost: SshConfigHost | null = null;
+
+  for (const line of lines) {
+    const trimmed = line.trim();
+
+    // Skip empty lines and comments
+    if (!trimmed || trimmed.startsWith('#')) continue;
+
+    // Match Host directive
+    const hostMatch = trimmed.match(/^Host\s+(.+)$/i);
+    if (hostMatch) {
+      // Save previous host if exists
+      if (currentHost && currentHost.host) {
+        hosts.push(currentHost);
+      }
+      // Start new host entry
+      const hostPattern = hostMatch[1].trim();
+      // Skip wildcard patterns
+      if (!hostPattern.includes('*') && !hostPattern.includes('?')) {
+        currentHost = { host: hostPattern };
+      } else {
+        currentHost = null;
+      }
+      continue;
+    }
+
+    // Match HostName
+    const hostnameMatch = trimmed.match(/^HostName\s+(.+)$/i);
+    if (hostnameMatch && currentHost) {
+      currentHost.hostname = hostnameMatch[1].trim();
+      continue;
+    }
+
+    // Match User
+    const userMatch = trimmed.match(/^User\s+(.+)$/i);
+    if (userMatch && currentHost) {
+      currentHost.user = userMatch[1].trim();
+      continue;
+    }
+
+    // Match Port
+    const portMatch = trimmed.match(/^Port\s+(\d+)$/i);
+    if (portMatch && currentHost) {
+      currentHost.port = parseInt(portMatch[1], 10);
+      continue;
+    }
+
+    // Match IdentityFile
+    const identityMatch = trimmed.match(/^IdentityFile\s+(.+)$/i);
+    if (identityMatch && currentHost) {
+      const identityFile = expandTilde(stripQuotes(identityMatch[1].trim()));
+      currentHost.identityFile = identityFile;
+      continue;
+    }
+
+    // Match IdentityAgent
+    const identityAgentMatch = trimmed.match(/^IdentityAgent\s+(.+)$/i);
+    if (identityAgentMatch && currentHost) {
+      const identityAgent = expandTilde(stripQuotes(identityAgentMatch[1].trim()));
+      currentHost.identityAgent = identityAgent;
+      continue;
+    }
+  }
+
+  // Don't forget the last host
+  if (currentHost && currentHost.host) {
+    hosts.push(currentHost);
+  }
+
+  return hosts;
+}
+
+/**
+ * Resolves the IdentityAgent socket path for a given hostname.
+ *
+ * Parses ~/.ssh/config and finds a matching host entry by checking
+ * both the Host alias and the HostName value. Returns the expanded
+ * IdentityAgent path if found, or undefined.
+ */
+export async function resolveIdentityAgent(hostname: string): Promise<string | undefined> {
+  try {
+    const hosts = await parseSshConfigFile();
+    const match = hosts.find(
+      (h) =>
+        h.host.toLowerCase() === hostname.toLowerCase() ||
+        h.hostname?.toLowerCase() === hostname.toLowerCase()
+    );
+    return match?.identityAgent;
+  } catch {
+    return undefined;
+  }
+}
diff --git a/src/main/core/ssh/utils.test.ts b/src/main/core/ssh/utils.test.ts
new file mode 100644
index 0000000000..eaafd58500
--- /dev/null
+++ b/src/main/core/ssh/utils.test.ts
@@ -0,0 +1,16 @@
+import { describe, expect, it, vi } from 'vitest';
+import type { ExecFn } from '@main/core/utils/exec';
+import { resolveRemoteHome } from './utils';
+
+describe('resolveRemoteHome', () => {
+  it('returns trimmed remote home', async () => {
+    const exec = vi.fn().mockResolvedValue({ stdout: ' /home/ubuntu \n', stderr: '' }) as ExecFn;
+    await expect(resolveRemoteHome(exec)).resolves.toBe('/home/ubuntu');
+    expect(exec).toHaveBeenCalledWith('sh', ['-c', 'printf %s "$HOME"']);
+  });
+
+  it('throws when remote home is empty', async () => {
+    const exec = vi.fn().mockResolvedValue({ stdout: '   ', stderr: '' }) as ExecFn;
+    await expect(resolveRemoteHome(exec)).rejects.toThrow('Remote home directory is empty');
+  });
+});
diff --git a/src/main/core/ssh/utils.ts b/src/main/core/ssh/utils.ts
new file mode 100644
index 0000000000..fea6897201
--- /dev/null
+++ b/src/main/core/ssh/utils.ts
@@ -0,0 +1,25 @@
+import { parseSshConfigFile } from '@main/core/ssh/sshConfigParser';
+import type { ExecFn } from '@main/core/utils/exec';
+
+export async function resolveIdentityAgent(hostname: string): Promise<string | undefined> {
+  try {
+    const hosts = await parseSshConfigFile();
+    const match = hosts.find(
+      (h) =>
+        h.host.toLowerCase() === hostname.toLowerCase() ||
+        h.hostname?.toLowerCase() === hostname.toLowerCase()
+    );
+    return match?.identityAgent;
+  } catch {
+    return undefined;
+  }
+}
+
+export async function resolveRemoteHome(exec: ExecFn): Promise<string> {
+  const { stdout } = await exec('sh', ['-c', 'printf %s "$HOME"']);
+  const home = stdout.trim();
+  if (!home) {
+    throw new Error('Remote home directory is empty');
+  }
+  return home;
+}
diff --git a/src/main/core/tasks/archiveTask.ts b/src/main/core/tasks/archiveTask.ts
new file mode 100644
index 0000000000..443c5343bf
--- /dev/null
+++ b/src/main/core/tasks/archiveTask.ts
@@ -0,0 +1,57 @@
+import { and, eq, isNull, sql } from 'drizzle-orm';
+import { projectManager } from '@main/core/projects/project-manager';
+import { db } from '@main/db/client';
+import { tasks } from '@main/db/schema';
+import { log } from '@main/lib/logger';
+import { capture } from '@main/lib/telemetry';
+
+export async function archiveTask(projectId: string, taskId: string): Promise<void> {
+  const [task] = await db.select().from(tasks).where(eq(tasks.id, taskId)).limit(1);
+  if (!task) return;
+
+  const project = projectManager.getProject(projectId);
+
+  await db
+    .update(tasks)
+    .set({
+      status: 'archived',
+      archivedAt: sql`CURRENT_TIMESTAMP`,
+      updatedAt: sql`CURRENT_TIMESTAMP`,
+      statusChangedAt: sql`CURRENT_TIMESTAMP`,
+    })
+    .where(eq(tasks.id, taskId));
+  capture('task_archived', { project_id: projectId, task_id: taskId });
+
+  if (!project) return;
+
+  void project
+    .teardownTask(taskId)
+    .then((teardownResult) => {
+      if (!teardownResult.success) {
+        log.warn('archiveTask: teardown failed', { taskId, error: teardownResult.error.message });
+      }
+    })
+    .catch((e) => {
+      log.warn('archiveTask: teardown failed', { taskId, error: String(e) });
+    });
+
+  if (task.taskBranch) {
+    const siblings = await db
+      .select({ id: tasks.id })
+      .from(tasks)
+      .where(
+        and(
+          eq(tasks.projectId, task.projectId),
+          eq(tasks.taskBranch, task.taskBranch),
+          isNull(tasks.archivedAt)
+        )
+      )
+      .limit(1);
+
+    if (siblings.length === 0) {
+      await project.removeTaskWorktree(task.taskBranch).catch((e) => {
+        log.warn('archiveTask: worktree removal failed', { taskId, error: String(e) });
+      });
+    }
+  }
+}
diff --git a/src/main/core/tasks/controller.ts b/src/main/core/tasks/controller.ts
new file mode 100644
index 0000000000..e686861276
--- /dev/null
+++ b/src/main/core/tasks/controller.ts
@@ -0,0 +1,32 @@
+import { createRPCController } from '@shared/ipc/rpc';
+import { archiveTask } from './archiveTask';
+import { createTask } from './createTask';
+import { deleteTask } from './deleteTask';
+import { generateTaskName } from './generateTaskName';
+import { getBootstrapStatus } from './getBootstrapStatus';
+import { getTasks } from './getTasks';
+import { getWorkspaceSettings } from './getWorkspaceSettings';
+import { provisionTask } from './provisionTask';
+import { renameTask } from './renameTask';
+import { restoreTask } from './restoreTask';
+import { setTaskPinned } from './setTaskPinned';
+import { teardownTask } from './teardownTask';
+import { updateLinkedIssue } from './updateLinkedIssue';
+import { updateTaskStatus } from './updateTaskStatus';
+
+export const taskController = createRPCController({
+  createTask,
+  getTasks,
+  deleteTask,
+  generateTaskName,
+  archiveTask,
+  restoreTask,
+  renameTask,
+  provisionTask,
+  teardownTask,
+  getBootstrapStatus,
+  getWorkspaceSettings,
+  updateLinkedIssue,
+  updateTaskStatus,
+  setTaskPinned,
+});
diff --git a/src/main/core/tasks/core.ts b/src/main/core/tasks/core.ts
new file mode 100644
index 0000000000..7f143e0778
--- /dev/null
+++ b/src/main/core/tasks/core.ts
@@ -0,0 +1,29 @@
+import { PullRequest } from '@shared/pull-requests';
+import { Issue, Task, TaskLifecycleStatus } from '@shared/tasks';
+import { TaskRow } from '@main/db/schema';
+import { fromStoredBranch } from './stored-branch';
+
+export function mapTaskRowToTask(
+  row: TaskRow,
+  prs: PullRequest[] = [],
+  conversations: Record<string, number> = {}
+): Task {
+  const sourceBranch = row.sourceBranch ? fromStoredBranch(row.sourceBranch) : undefined;
+  return {
+    id: row.id,
+    projectId: row.projectId,
+    name: row.name,
+    status: row.status as TaskLifecycleStatus,
+    sourceBranch,
+    taskBranch: row.taskBranch ?? undefined,
+    linkedIssue: row.linkedIssue ? (JSON.parse(row.linkedIssue) as Issue) : undefined,
+    archivedAt: row.archivedAt ?? undefined,
+    lastInteractedAt: row.lastInteractedAt ?? undefined,
+    createdAt: row.createdAt,
+    prs,
+    conversations,
+    updatedAt: row.updatedAt,
+    statusChangedAt: row.statusChangedAt,
+    isPinned: row.isPinned === 1,
+  };
+}
diff --git a/src/main/core/tasks/createTask.ts b/src/main/core/tasks/createTask.ts
new file mode 100644
index 0000000000..f12f9697d8
--- /dev/null
+++ b/src/main/core/tasks/createTask.ts
@@ -0,0 +1,257 @@
+import { sql } from 'drizzle-orm';
+import { resolveAgentAutoApprove } from '@shared/agent-auto-approve-defaults';
+import { err, ok, Result } from '@shared/result';
+import type {
+  CreateTaskError,
+  CreateTaskParams,
+  CreateTaskSuccess,
+  CreateTaskWarning,
+  TaskLifecycleStatus,
+} from '@shared/tasks';
+import { projectManager } from '@main/core/projects/project-manager';
+import { db } from '@main/db/client';
+import { tasks } from '@main/db/schema';
+import { capture } from '@main/lib/telemetry';
+import { createConversation } from '../conversations/createConversation';
+import type { ProvisionTaskError } from '../projects/project-provider';
+import { prQueryService } from '../pull-requests/pr-query-service';
+import { appSettingsService } from '../settings/settings-service';
+import { mapTaskRowToTask } from './core';
+import { resolveTaskBranchName } from './resolveTaskBranchName';
+import { toStoredBranch } from './stored-branch';
+
+function mapProvisionError(error: ProvisionTaskError): CreateTaskError {
+  switch (error.type) {
+    case 'branch-not-found':
+      return { type: 'branch-not-found', branch: error.branch };
+    case 'worktree-setup-failed':
+      return {
+        type: 'worktree-setup-failed',
+        branch: error.branch,
+        message: error.message,
+      };
+    default:
+      return { type: 'provision-failed', message: error.message };
+  }
+}
+
+export async function createTask(
+  params: CreateTaskParams
+): Promise<Result<CreateTaskSuccess, CreateTaskError>> {
+  const { strategy } = params;
+  const suffix = Math.random().toString(36).slice(2, 7);
+  const branchPrefix = (await appSettingsService.get('localProject')).branchPrefix ?? '';
+  const agentAutoApproveDefaults = await appSettingsService.get('agentAutoApproveDefaults');
+  let warning: CreateTaskWarning | undefined;
+
+  const project = projectManager.getProject(params.projectId);
+  if (!project) {
+    return err({ type: 'project-not-found' });
+  }
+  const [, configuredRemote] = await Promise.all([
+    project.repository.getRemotes(),
+    project.repository.getConfiguredRemote(),
+  ]);
+
+  // Determines what gets stored as taskBranch in the DB and how the worktree is prepared.
+  let taskBranch: string | undefined;
+  // sourceBranch stored in the DB — defaults to params.sourceBranch but overridden for PRs.
+  let dbSourceBranch = params.sourceBranch;
+
+  switch (strategy.kind) {
+    case 'new-branch': {
+      const rawBranch = strategy.taskBranch;
+      taskBranch = resolveTaskBranchName({
+        rawBranch,
+        branchPrefix,
+        suffix,
+        linkedIssue: params.linkedIssue,
+      });
+      const repoInfo = await project.repository.getRepositoryInfo();
+      if (repoInfo.isUnborn) {
+        return err({
+          type: 'initial-commit-required',
+          branch: repoInfo.currentBranch ?? params.sourceBranch.branch,
+        });
+      }
+      const createResult = await project.repository.createBranch(
+        taskBranch,
+        params.sourceBranch.branch,
+        params.sourceBranch.type === 'remote',
+        params.sourceBranch.type === 'remote' ? params.sourceBranch.remote.name : undefined
+      );
+      if (!createResult.success) {
+        return err({ type: 'branch-create-failed', branch: taskBranch, error: createResult.error });
+      }
+      if (strategy.pushBranch) {
+        const publishResult = await project.repository.publishBranch(taskBranch, configuredRemote);
+        if (!publishResult.success) {
+          warning = {
+            type: 'branch-publish-failed',
+            branch: taskBranch,
+            remote: configuredRemote,
+            error: publishResult.error,
+          };
+        }
+      }
+      break;
+    }
+
+    case 'checkout-existing': {
+      // taskBranch === sourceBranch tells the provider to use checkoutExistingBranch.
+      taskBranch = params.sourceBranch.branch;
+      break;
+    }
+
+    case 'from-pull-request': {
+      // If the head branch is already checked out in a valid worktree, skip the fetch.
+      // Git refuses to update a branch that is currently checked out, even with --force.
+      const existingWorktree = await project.getWorktreeForBranch(strategy.headBranch);
+
+      if (!existingWorktree) {
+        // Fetch the PR head — handles same-repo and fork PRs.
+        // Uses headRefName directly as the local branch name (same as `gh pr checkout`).
+        const fetchResult = await project.repository.fetchPrForReview(
+          strategy.prNumber,
+          strategy.headBranch,
+          strategy.headRepositoryUrl,
+          strategy.headBranch,
+          strategy.isFork,
+          configuredRemote
+        );
+        if (!fetchResult.success) {
+          return err({
+            type: 'pr-fetch-failed',
+            error: fetchResult.error,
+            remote: configuredRemote,
+          });
+        }
+      }
+
+      dbSourceBranch = { type: 'local', branch: strategy.headBranch };
+
+      if (strategy.taskBranch) {
+        // Create a new task branch on top of the just-fetched local head branch.
+        const rawBranch = strategy.taskBranch;
+        taskBranch = resolveTaskBranchName({
+          rawBranch,
+          branchPrefix,
+          suffix,
+        });
+        const createResult = await project.repository.createBranch(
+          taskBranch,
+          strategy.headBranch,
+          false
+        );
+        if (!createResult.success) {
+          return err({
+            type: 'branch-create-failed',
+            branch: taskBranch,
+            error: createResult.error,
+          });
+        }
+        if (strategy.pushBranch) {
+          const publishResult = await project.repository.publishBranch(
+            taskBranch,
+            configuredRemote
+          );
+          if (!publishResult.success) {
+            warning = {
+              type: 'branch-publish-failed',
+              branch: taskBranch,
+              remote: configuredRemote,
+              error: publishResult.error,
+            };
+          }
+        }
+      } else {
+        // Check out the PR head branch directly — taskBranch === sourceBranch signals
+        // the provider to use checkoutExistingBranch (local branch now exists from fetchPrForReview).
+        taskBranch = strategy.headBranch;
+      }
+      break;
+    }
+
+    case 'no-worktree': {
+      // taskBranch remains undefined → provider uses the project root directory.
+      break;
+    }
+  }
+
+  const initialStatus: TaskLifecycleStatus = params.initialStatus ?? 'in_progress';
+
+  const [taskRow] = await db
+    .insert(tasks)
+    .values({
+      id: params.id,
+      projectId: params.projectId,
+      name: params.name,
+      taskBranch,
+      status: initialStatus,
+      sourceBranch: toStoredBranch(dbSourceBranch),
+      linkedIssue: params.linkedIssue ? JSON.stringify(params.linkedIssue) : null,
+      updatedAt: sql`CURRENT_TIMESTAMP`,
+      statusChangedAt: sql`CURRENT_TIMESTAMP`,
+      lastInteractedAt: sql`CURRENT_TIMESTAMP`,
+    })
+    .returning();
+
+  let prs: Awaited<ReturnType<typeof prQueryService.getTaskPullRequests>> = [];
+  if (strategy.kind === 'from-pull-request') {
+    const capability = await prQueryService.getProjectRemoteInfo(params.projectId);
+    if (capability.status === 'ready') {
+      prs = await prQueryService.getTaskPullRequests(
+        params.projectId,
+        strategy.headBranch,
+        capability.repositoryUrl
+      );
+    }
+  }
+
+  const task = mapTaskRowToTask(taskRow, prs);
+
+  const provisionResult = await project.provisionTask(task, [], []);
+  if (!provisionResult.success) {
+    return err(mapProvisionError(provisionResult.error));
+  }
+  capture('task_provisioned', {
+    project_id: params.projectId,
+    task_id: params.id,
+  });
+
+  if (params.initialConversation) {
+    await createConversation({
+      ...params.initialConversation,
+      autoApprove: resolveAgentAutoApprove(
+        params.initialConversation.autoApprove,
+        agentAutoApproveDefaults,
+        params.initialConversation.provider
+      ),
+    });
+  }
+
+  const taskCreatedStrategy = (() => {
+    if (strategy.kind === 'from-pull-request') return 'pr';
+    if (params.linkedIssue) return 'issue';
+    if (strategy.kind === 'no-worktree') return 'blank';
+    return 'branch';
+  })();
+
+  capture('task_created', {
+    strategy: taskCreatedStrategy,
+    has_initial_prompt: Boolean(params.initialConversation?.initialPrompt?.trim()),
+    has_issue: params.linkedIssue?.provider ?? 'none',
+    provider: params.initialConversation?.provider ?? null,
+    project_id: params.projectId,
+    task_id: params.id,
+  });
+  if (params.linkedIssue) {
+    capture('issue_linked_to_task', {
+      provider: params.linkedIssue.provider,
+      project_id: params.projectId,
+      task_id: params.id,
+    });
+  }
+
+  return ok({ task, warning });
+}
diff --git a/src/main/core/tasks/deleteTask.ts b/src/main/core/tasks/deleteTask.ts
new file mode 100644
index 0000000000..3126384f53
--- /dev/null
+++ b/src/main/core/tasks/deleteTask.ts
@@ -0,0 +1,55 @@
+import { and, eq } from 'drizzle-orm';
+import { projectManager } from '@main/core/projects/project-manager';
+import { viewStateService } from '@main/core/view-state/view-state-service';
+import { db } from '@main/db/client';
+import { tasks } from '@main/db/schema';
+import { log } from '@main/lib/logger';
+import { capture } from '@main/lib/telemetry';
+
+export async function deleteTask(projectId: string, taskId: string): Promise<void> {
+  const [task] = await db.select().from(tasks).where(eq(tasks.id, taskId)).limit(1);
+  if (!task) return;
+  const sourceBranch = task.sourceBranch ?? undefined;
+
+  const project = projectManager.getProject(projectId);
+
+  if (project) {
+    const teardownResult = await project.teardownTask(taskId).catch((e) => {
+      log.warn('deleteTask: teardown failed', { taskId, error: String(e) });
+      return null;
+    });
+
+    if (teardownResult && !teardownResult.success) {
+      log.warn('deleteTask: teardown failed', { taskId, error: teardownResult.error.message });
+    }
+  }
+
+  await db.delete(tasks).where(eq(tasks.id, taskId));
+  void viewStateService.del(`task:${taskId}`);
+  capture('task_deleted', { project_id: projectId, task_id: taskId });
+
+  if (project) {
+    if (task.taskBranch) {
+      const siblings = await db
+        .select({ id: tasks.id })
+        .from(tasks)
+        .where(and(eq(tasks.projectId, task.projectId), eq(tasks.taskBranch, task.taskBranch)))
+        .limit(1);
+
+      if (siblings.length === 0) {
+        await project.removeTaskWorktree(task.taskBranch).catch((e) => {
+          log.warn('deleteTask: worktree removal failed', { taskId, error: String(e) });
+        });
+        if (sourceBranch && task.taskBranch !== sourceBranch.branch) {
+          const branchDelete = await project.repository.deleteBranch(task.taskBranch).catch((e) => {
+            log.warn('deleteTask: branch deletion failed', { taskId, error: String(e) });
+            return null;
+          });
+          if (branchDelete && !branchDelete.success) {
+            log.warn('deleteTask: branch deletion failed', { taskId, error: branchDelete.error });
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/src/main/core/tasks/generateTaskName.test.ts b/src/main/core/tasks/generateTaskName.test.ts
new file mode 100644
index 0000000000..8415623f6a
--- /dev/null
+++ b/src/main/core/tasks/generateTaskName.test.ts
@@ -0,0 +1,52 @@
+import { describe, expect, it } from 'vitest';
+import { generateTaskName } from './generateTaskName';
+
+describe('generateTaskName', () => {
+  describe('heuristic generation (with title)', () => {
+    it('generates a branch-style name from a title', () => {
+      const result = generateTaskName({ title: 'Fix the login page crash on mobile' });
+      expect(result).toBeTruthy();
+      expect(result).not.toContain('/');
+      expect(result).toMatch(/^[a-z0-9-]+$/);
+    });
+
+    it('generates from title and description', () => {
+      const result = generateTaskName({
+        title: 'Add OAuth2 support',
+        description: 'We need SSO integration for enterprise customers',
+      });
+      expect(result).toBeTruthy();
+      expect(result).toMatch(/^[a-z0-9-]+$/);
+    });
+
+    it('respects max task name length of 64', () => {
+      const result = generateTaskName({
+        title:
+          'Implement a comprehensive authentication and authorization system with OAuth2 PKCE flow and SAML support',
+      });
+      expect(result.length).toBeLessThanOrEqual(64);
+    });
+
+    it('handles issue identifiers in title', () => {
+      const result = generateTaskName({ title: 'Fix login bug #891' });
+      expect(result).toBeTruthy();
+      expect(result).toMatch(/^[a-z0-9-]+$/);
+    });
+  });
+
+  describe('random generation (no title)', () => {
+    it('generates a random friendly name when no input provided', () => {
+      const result = generateTaskName({});
+      expect(result).toBeTruthy();
+      expect(result).toMatch(/^[a-z0-9-]+$/);
+    });
+
+    it('generates different names on subsequent calls', () => {
+      const results = new Set<string>();
+      for (let i = 0; i < 5; i++) {
+        results.add(generateTaskName({}));
+      }
+      expect(results.size).toBeGreaterThanOrEqual(2);
+    });
+  });
+});
diff --git a/src/main/core/tasks/generateTaskName.ts b/src/main/core/tasks/generateTaskName.ts
new file mode 100644
index 0000000000..985d9ba4be
--- /dev/null
+++ b/src/main/core/tasks/generateTaskName.ts
@@ -0,0 +1,35 @@
+import { humanId } from 'human-id';
+import { generateBranchName } from 'nbranch';
+
+const MAX_TASK_NAME_LENGTH = 64;
+
+function sanitize(raw: string): string {
+  return raw
+    .toLowerCase()
+    .replace(/[^a-z0-9-]/g, '-')
+    .replace(/-+/g, '-')
+    .replace(/^-+|-+$/g, '')
+    .slice(0, MAX_TASK_NAME_LENGTH);
+}
+
+function generateRandom(): string {
+  return sanitize(humanId({ separator: '-', capitalize: false }));
+}
+
+function generateFromInput(title: string, description?: string): string {
+  const input = description ? `${title}\n\n${description}` : title;
+  const raw = generateBranchName(input, {
+    addRandomSuffix: false,
+    separator: '-',
+    maxLength: MAX_TASK_NAME_LENGTH,
+  });
+  return sanitize(raw);
+}
+
+export function generateTaskName(params: { title?: string; description?: string }): string {
+  const { title, description } = params;
+  if (title && title.trim().length > 0) {
+    return generateFromInput(title.trim(), description?.trim());
+  }
+  return generateRandom();
+}
diff --git a/src/main/core/tasks/getBootstrapStatus.ts b/src/main/core/tasks/getBootstrapStatus.ts
new file mode 100644
index 0000000000..c72ec86c6e
--- /dev/null
+++ b/src/main/core/tasks/getBootstrapStatus.ts
@@ -0,0 +1,15 @@
+import type { TaskBootstrapStatus } from '@shared/tasks';
+import { projectManager } from '@main/core/projects/project-manager';
+import { log } from '@main/lib/logger';
+
+export async function getBootstrapStatus(
+  projectId: string,
+  taskId: string
+): Promise<TaskBootstrapStatus> {
+  const project = projectManager.getProject(projectId);
+  if (!project) throw new Error(`Project not found: ${projectId}`);
+
+  const status = project.getTaskBootstrapStatus(taskId);
+  log.debug('getBootstrapStatus', { taskId, status: status.status });
+  return status;
+}
diff --git a/src/main/core/tasks/getTaskSettings.ts b/src/main/core/tasks/getTaskSettings.ts
new file mode 100644
index 0000000000..41d1ab025b
--- /dev/null
+++ b/src/main/core/tasks/getTaskSettings.ts
@@ -0,0 +1,21 @@
+import { workspaceKey } from '@shared/workspace-key';
+import type { ProjectSettings } from '@main/core/projects/settings/schema';
+import { getEffectiveTaskSettings } from '@main/core/projects/settings/task-settings';
+import { resolveTask, resolveWorkspace } from '@main/core/projects/utils';
+
+export async function getTaskSettings(projectId: string, taskId: string): Promise<ProjectSettings> {
+  const task = resolveTask(projectId, taskId);
+  if (!task) {
+    throw new Error(`Task ${taskId} not found or not provisioned`);
+  }
+  const wsId = workspaceKey(task.taskBranch);
+  const workspace = resolveWorkspace(projectId, wsId);
+  if (!workspace) {
+    throw new Error(`Workspace ${wsId} not found in project ${projectId}`);
+  }
+
+  return getEffectiveTaskSettings({
+    projectSettings: workspace.settings,
+    taskFs: workspace.fs,
+  });
+}
diff --git a/src/main/core/tasks/getTasks.ts b/src/main/core/tasks/getTasks.ts
new file mode 100644
index 0000000000..8b028410af
--- /dev/null
+++ b/src/main/core/tasks/getTasks.ts
@@ -0,0 +1,42 @@
+import { and, count, desc, eq, inArray } from 'drizzle-orm';
+import { Task } from '@shared/tasks';
+import { db } from '@main/db/client';
+import { conversations, tasks } from '@main/db/schema';
+import { mapTaskRowToTask } from './core';
+
+export async function getTasks(projectId?: string): Promise<Task[]> {
+  const rows = projectId
+    ? await db
+        .select()
+        .from(tasks)
+        .where(and(eq(tasks.projectId, projectId)))
+        .orderBy(desc(tasks.updatedAt))
+    : await db.select().from(tasks).orderBy(desc(tasks.updatedAt));
+
+  if (rows.length === 0) return [];
+
+  const taskIds = rows.map((r) => r.id);
+
+  const convRows = await db
+    .select({
+      taskId: conversations.taskId,
+      provider: conversations.provider,
+      count: count(),
+    })
+    .from(conversations)
+    .where(inArray(conversations.taskId, taskIds))
+    .groupBy(conversations.taskId, conversations.provider);
+
+  const convByTask = new Map<string, Record<string, number>>();
+  for (const { taskId, provider, count: c } of convRows) {
+    const rec = convByTask.get(taskId) ?? {};
+    rec[provider ?? 'unknown'] = c;
+    convByTask.set(taskId, rec);
+  }
+
+  return rows.map((row) => ({
+    ...mapTaskRowToTask(row),
+    prs: [],
+    conversations: convByTask.get(row.id) ?? {},
+  }));
+}
diff --git a/src/main/core/tasks/getWorkspaceSettings.ts b/src/main/core/tasks/getWorkspaceSettings.ts
new file mode 100644
index 0000000000..c0ac297fa6
--- /dev/null
+++ b/src/main/core/tasks/getWorkspaceSettings.ts
@@ -0,0 +1,18 @@
+import type { ProjectSettings } from '@main/core/projects/settings/schema';
+import { getEffectiveTaskSettings } from '@main/core/projects/settings/task-settings';
+import { resolveWorkspace } from '@main/core/projects/utils';
+
+export async function getWorkspaceSettings(
+  projectId: string,
+  workspaceId: string
+): Promise<ProjectSettings> {
+  const workspace = resolveWorkspace(projectId, workspaceId);
+  if (!workspace) {
+    throw new Error(`Workspace ${workspaceId} not found in project ${projectId}`);
+  }
+
+  return getEffectiveTaskSettings({
+    projectSettings: workspace.settings,
+    taskFs: workspace.fs,
+  });
+}
diff --git a/src/main/core/tasks/provisionTask.ts b/src/main/core/tasks/provisionTask.ts
new file mode 100644
index 0000000000..59e2c2ee88
--- /dev/null
+++ b/src/main/core/tasks/provisionTask.ts
@@ -0,0 +1,56 @@
+import { eq, sql } from 'drizzle-orm';
+import { workspaceKey } from '@shared/workspace-key';
+import { mapConversationRowToConversation } from '@main/core/conversations/utils';
+import { projectManager } from '@main/core/projects/project-manager';
+import { formatProvisionTaskError } from '@main/core/projects/provision-task-error';
+import { mapTerminalRowToTerminal } from '@main/core/terminals/core';
+import { db } from '@main/db/client';
+import { conversations, tasks, terminals } from '@main/db/schema';
+import { capture } from '@main/lib/telemetry';
+import { mapTaskRowToTask } from './core';
+
+export async function provisionTask(taskId: string) {
+  const [row] = await db.select().from(tasks).where(eq(tasks.id, taskId));
+  if (!row) throw new Error(`Task not found: ${taskId}`);
+
+  const task = mapTaskRowToTask(row);
+  const project = projectManager.getProject(task.projectId);
+  if (!project) throw new Error(`Project not found: ${task.projectId}`);
+
+  const existingTask = project.getTask(taskId);
+
+  if (existingTask) {
+    const wsId = workspaceKey(existingTask.taskBranch);
+    return { path: project.getWorkspace(wsId)?.path ?? '', workspaceId: wsId };
+  }
+
+  const [existingTerminals, existingConversations] = await Promise.all([
+    db
+      .select()
+      .from(terminals)
+      .where(eq(terminals.taskId, taskId))
+      .then((rows) => rows.map(mapTerminalRowToTerminal)),
+    db
+      .select()
+      .from(conversations)
+      .where(eq(conversations.taskId, taskId))
+      .then((rows) => rows.map((r) => mapConversationRowToConversation(r, true))),
+  ]);
+
+  const result = await project.provisionTask(task, existingConversations, existingTerminals);
+  if (!result.success) {
+    throw new Error(`Failed to provision task: ${formatProvisionTaskError(result.error)}`);
+  }
+
+  await db
+    .update(tasks)
+    .set({ lastInteractedAt: sql`CURRENT_TIMESTAMP` })
+    .where(eq(tasks.id, taskId));
+  capture('task_provisioned', {
+    project_id: task.projectId,
+    task_id: task.id,
+  });
+
+  const wsId = workspaceKey(task.taskBranch);
+  return { path: project.getWorkspace(wsId)?.path ?? '', workspaceId: wsId };
+}
diff --git a/src/main/core/tasks/renameTask.ts b/src/main/core/tasks/renameTask.ts
new file mode 100644
index 0000000000..fb7975b701
--- /dev/null
+++ b/src/main/core/tasks/renameTask.ts
@@ -0,0 +1,48 @@
+import { and, eq, sql } from 'drizzle-orm';
+import { projectManager } from '@main/core/projects/project-manager';
+import { db } from '@main/db/client';
+import { tasks } from '@main/db/schema';
+import { appSettingsService } from '../settings/settings-service';
+
+export async function renameTask(
+  projectId: string,
+  taskId: string,
+  newName: string
+): Promise<void> {
+  const [row] = await db.select().from(tasks).where(eq(tasks.id, taskId)).limit(1);
+  if (!row) throw new Error(`Task not found: ${taskId}`);
+
+  const project = projectManager.getProject(projectId);
+  if (!project) throw new Error(`Project not found: ${projectId}`);
+
+  const oldBranch = row.taskBranch;
+  const sourceBranch = row.sourceBranch ?? undefined;
+  let newBranch: string | null = null;
+
+  if (oldBranch) {
+    if (sourceBranch && oldBranch !== sourceBranch.branch) {
+      const siblings = await db
+        .select({ id: tasks.id })
+        .from(tasks)
+        .where(and(eq(tasks.projectId, row.projectId), eq(tasks.taskBranch, oldBranch)))
+        .limit(2);
+
+      if (siblings.length === 1) {
+        const suffix = Math.random().toString(36).slice(2, 7);
+        const branchPrefix = (await appSettingsService.get('localProject')).branchPrefix ?? '';
+        newBranch = branchPrefix ? `${branchPrefix}/${newName}-${suffix}` : `${newName}-${suffix}`;
+
+        await project.repository.renameBranch(oldBranch, newBranch);
+      }
+    }
+  }
+
+  await db
+    .update(tasks)
+    .set({
+      name: newName,
+      taskBranch: newBranch ?? row.taskBranch,
+      updatedAt: sql`CURRENT_TIMESTAMP`,
+    })
+    .where(eq(tasks.id, taskId));
+}
diff --git a/src/main/core/tasks/resolveTaskBranchName.test.ts b/src/main/core/tasks/resolveTaskBranchName.test.ts
new file mode 100644
index 0000000000..36d764d94f
--- /dev/null
+++ b/src/main/core/tasks/resolveTaskBranchName.test.ts
@@ -0,0 +1,54 @@
+import { describe, expect, it } from 'vitest';
+import { resolveTaskBranchName } from './resolveTaskBranchName';
+
+describe('resolveTaskBranchName', () => {
+  it('uses Linear branchName as-is when available', () => {
+    const branchName = resolveTaskBranchName({
+      rawBranch: 'linear-issue-branch-name-creation',
+      branchPrefix: 'emdash',
+      suffix: 'abc12',
+      linkedIssue: {
+        provider: 'linear',
+        url: 'https://linear.app/general-action/issue/GEN-626',
+        title: 'Linear issue branch name creation',
+        identifier: 'GEN-626',
+        branchName: 'jona/gen-626-linear-issue-branch-name-creation',
+      },
+    });
+
+    expect(branchName).toBe('jona/gen-626-linear-issue-branch-name-creation');
+  });
+
+  it('falls back to the existing prefixed and suffixed format when Linear branchName is absent', () => {
+    const branchName = resolveTaskBranchName({
+      rawBranch: 'linear-issue-branch-name-creation',
+      branchPrefix: 'emdash',
+      suffix: 'abc12',
+      linkedIssue: {
+        provider: 'linear',
+        url: 'https://linear.app/general-action/issue/GEN-626',
+        title: 'Linear issue branch name creation',
+        identifier: 'GEN-626',
+      },
+    });
+
+    expect(branchName).toBe('emdash/linear-issue-branch-name-creation-abc12');
+  });
+
+  it('keeps the existing format for non-Linear issues', () => {
+    const branchName = resolveTaskBranchName({
+      rawBranch: 'bugfix-login',
+      branchPrefix: 'emdash',
+      suffix: 'xyz99',
+      linkedIssue: {
+        provider: 'jira',
+        url: 'https://example.atlassian.net/browse/APP-42',
+        title: 'Fix login bug',
+        identifier: 'APP-42',
+        branchName: 'someone/app-42-fix-login-bug',
+      },
+    });
+
+    expect(branchName).toBe('emdash/bugfix-login-xyz99');
+  });
+});
diff --git a/src/main/core/tasks/resolveTaskBranchName.ts b/src/main/core/tasks/resolveTaskBranchName.ts
new file mode 100644
index 0000000000..eb35cc6843
--- /dev/null
+++ b/src/main/core/tasks/resolveTaskBranchName.ts
@@ -0,0 +1,24 @@
+import type { Issue } from '@shared/tasks';
+
+type ResolveTaskBranchNameInput = {
+  rawBranch: string;
+  branchPrefix: string;
+  suffix: string;
+  linkedIssue?: Issue;
+};
+
+export function resolveTaskBranchName({
+  rawBranch,
+  branchPrefix,
+  suffix,
+  linkedIssue,
+}: ResolveTaskBranchNameInput): string {
+  const linearBranchName =
+    linkedIssue?.provider === 'linear' ? linkedIssue.branchName?.trim() : undefined;
+
+  if (linearBranchName) {
+    return linearBranchName;
+  }
+
+  return branchPrefix ? `${branchPrefix}/${rawBranch}-${suffix}` : `${rawBranch}-${suffix}`;
+}
diff --git a/src/main/core/tasks/restoreTask.ts b/src/main/core/tasks/restoreTask.ts
new file mode 100644
index 0000000000..32c3f05a16
--- /dev/null
+++ b/src/main/core/tasks/restoreTask.ts
@@ -0,0 +1,15 @@
+import { eq, sql } from 'drizzle-orm';
+import { db } from '@main/db/client';
+import { tasks } from '@main/db/schema';
+
+export async function restoreTask(id: string): Promise<void> {
+  await db
+    .update(tasks)
+    .set({
+      archivedAt: null,
+      status: 'in_progress',
+      updatedAt: sql`CURRENT_TIMESTAMP`,
+      statusChangedAt: sql`CURRENT_TIMESTAMP`,
+    })
+    .where(eq(tasks.id, id));
+}
diff --git a/src/main/core/tasks/session-targets.ts b/src/main/core/tasks/session-targets.ts
new file mode 100644
index 0000000000..beab72edca
--- /dev/null
+++ b/src/main/core/tasks/session-targets.ts
@@ -0,0 +1,29 @@
+import { and, eq } from 'drizzle-orm';
+import { db } from '@main/db/client';
+import { conversations, terminals } from '@main/db/schema';
+
+export type TaskSessionLeafIds = {
+  conversationIds: string[];
+  terminalIds: string[];
+};
+
+export async function getTaskSessionLeafIds(
+  projectId: string,
+  taskId: string
+): Promise<TaskSessionLeafIds> {
+  const [conversationRows, terminalRows] = await Promise.all([
+    db
+      .select({ id: conversations.id })
+      .from(conversations)
+      .where(and(eq(conversations.projectId, projectId), eq(conversations.taskId, taskId))),
+    db
+      .select({ id: terminals.id })
+      .from(terminals)
+      .where(and(eq(terminals.projectId, projectId), eq(terminals.taskId, taskId))),
+  ]);
+
+  return {
+    conversationIds: conversationRows.map((row) => row.id),
+    terminalIds: terminalRows.map((row) => row.id),
+  };
+}
diff --git a/src/main/core/tasks/setTaskPinned.ts b/src/main/core/tasks/setTaskPinned.ts
new file mode 100644
index 0000000000..d27b88a9be
--- /dev/null
+++ b/src/main/core/tasks/setTaskPinned.ts
@@ -0,0 +1,16 @@
+import { eq, sql } from 'drizzle-orm';
+import { db } from '@main/db/client';
+import { tasks } from '@main/db/schema';
+
+export async function setTaskPinned(taskId: string, isPinned: boolean): Promise<void> {
+  const [row] = await db.select().from(tasks).where(eq(tasks.id, taskId)).limit(1);
+  if (!row) throw new Error(`Task not found: ${taskId}`);
+
+  await db
+    .update(tasks)
+    .set({
+      isPinned: isPinned ? 1 : 0,
+      updatedAt: sql`CURRENT_TIMESTAMP`,
+    })
+    .where(eq(tasks.id, taskId));
+}
diff --git a/src/main/core/tasks/stored-branch.test.ts b/src/main/core/tasks/stored-branch.test.ts
new file mode 100644
index 0000000000..bd02aa7654
--- /dev/null
+++ b/src/main/core/tasks/stored-branch.test.ts
@@ -0,0 +1,27 @@
+import { describe, expect, it } from 'vitest';
+import type { Branch } from '@shared/git';
+import { fromStoredBranch, toStoredBranch } from './stored-branch';
+
+describe('stored-branch', () => {
+  it('serializes and deserializes local branches', () => {
+    const branch: Branch = { type: 'local', branch: 'main' };
+    const persisted = toStoredBranch(branch);
+    expect(persisted).toEqual({ type: 'local', branch: 'main' });
+    expect(fromStoredBranch(persisted)).toEqual(branch);
+  });
+
+  it('serializes and deserializes remote branches', () => {
+    const branch: Branch = {
+      type: 'remote',
+      branch: 'main',
+      remote: { name: 'origin', url: 'git@github.com:owner/repo.git' },
+    };
+    const persisted = toStoredBranch(branch);
+    expect(persisted).toEqual({
+      type: 'remote',
+      branch: 'main',
+      remote: { name: 'origin', url: 'git@github.com:owner/repo.git' },
+    });
+    expect(fromStoredBranch(persisted)).toEqual(branch);
+  });
+});
diff --git a/src/main/core/tasks/stored-branch.ts b/src/main/core/tasks/stored-branch.ts
new file mode 100644
index 0000000000..495ab414fe
--- /dev/null
+++ b/src/main/core/tasks/stored-branch.ts
@@ -0,0 +1,16 @@
+import type { Branch } from '@shared/git';
+
+/**
+ * The persisted form of a Branch stored in SQLite.
+ * Now identical to the lean Branch type — local branches are stored without
+ * the optional `remote` field (which is fine since the field is optional).
+ */
+export type StoredBranch = Branch;
+
+export function toStoredBranch(branch: Branch): StoredBranch {
+  return branch;
+}
+
+export function fromStoredBranch(branch: StoredBranch): Branch {
+  return branch;
+}
diff --git a/src/main/core/tasks/teardownTask.ts b/src/main/core/tasks/teardownTask.ts
new file mode 100644
index 0000000000..ec32c82d22
--- /dev/null
+++ b/src/main/core/tasks/teardownTask.ts
@@ -0,0 +1,7 @@
+import { projectManager } from '../projects/project-manager';
+
+export async function teardownTask(projectId: string, taskId: string) {
+  const project = projectManager.getProject(projectId);
+  if (!project) throw new Error(`Project not found: ${projectId}`);
+  return await project.teardownTask(taskId);
+}
diff --git a/src/main/core/tasks/updateLinkedIssue.ts b/src/main/core/tasks/updateLinkedIssue.ts
new file mode 100644
index 0000000000..ff36a42ca2
--- /dev/null
+++ b/src/main/core/tasks/updateLinkedIssue.ts
@@ -0,0 +1,29 @@
+import { eq } from 'drizzle-orm';
+import { Issue } from '@shared/tasks';
+import { db } from '@main/db/client';
+import { tasks } from '@main/db/schema';
+import { capture } from '@main/lib/telemetry';
+
+export async function updateLinkedIssue(taskId: string, issue?: Issue) {
+  const [task] = await db
+    .select({ id: tasks.id, projectId: tasks.projectId })
+    .from(tasks)
+    .where(eq(tasks.id, taskId))
+    .limit(1);
+  if (!task) return;
+
+  await db
+    .update(tasks)
+    .set({
+      linkedIssue: issue ? JSON.stringify(issue) : null,
+    })
+    .where(eq(tasks.id, taskId));
+
+  if (issue) {
+    capture('issue_linked_to_task', {
+      provider: issue.provider,
+      project_id: task.projectId,
+      task_id: task.id,
+    });
+  }
+}
diff --git a/src/main/core/tasks/updateTaskStatus.ts b/src/main/core/tasks/updateTaskStatus.ts
new file mode 100644
index 0000000000..4b89ac7fc8
--- /dev/null
+++ b/src/main/core/tasks/updateTaskStatus.ts
@@ -0,0 +1,27 @@
+import { eq, sql } from 'drizzle-orm';
+import { TaskLifecycleStatus } from '@shared/tasks';
+import { db } from '@main/db/client';
+import { tasks } from '@main/db/schema';
+import { capture } from '@main/lib/telemetry';
+
+export async function updateTaskStatus(taskId: string, status: TaskLifecycleStatus): Promise<void> {
+  const [row] = await db.select().from(tasks).where(eq(tasks.id, taskId)).limit(1);
+  if (!row) throw new Error(`Task not found: ${taskId}`);
+  if (row.status === status) return;
+
+  await db
+    .update(tasks)
+    .set({
+      status,
+      updatedAt: sql`CURRENT_TIMESTAMP`,
+      statusChangedAt: sql`CURRENT_TIMESTAMP`,
+    })
+    .where(eq(tasks.id, taskId));
+
+  capture('task_status_changed', {
+    from_status: row.status as TaskLifecycleStatus,
+    to_status: status,
+    project_id: row.projectId,
+    task_id: row.id,
+  });
+}
diff --git a/src/main/core/telemetry/controller.ts b/src/main/core/telemetry/controller.ts
new file mode 100644
index 0000000000..4cacb4b649
--- /dev/null
+++ b/src/main/core/telemetry/controller.ts
@@ -0,0 +1,23 @@
+import { createRPCController } from '@shared/ipc/rpc';
+import type { TelemetryEvent } from '@shared/telemetry';
+import {
+  capture,
+  getTelemetryStatus,
+  identify,
+  setTelemetryEnabledViaUser,
+} from '@main/lib/telemetry';
+
+export const telemetryController = createRPCController({
+  capture: (args: { event: TelemetryEvent; properties?: Record<string, unknown> }) => {
+    capture(args.event, args.properties);
+  },
+  getStatus: () => {
+    return { status: getTelemetryStatus() };
+  },
+  setEnabled: (enabled: boolean) => {
+    setTelemetryEnabledViaUser(enabled);
+  },
+  identify: (username: string) => {
+    identify(username);
+  },
+});
diff --git a/src/main/core/terminals/controller.ts b/src/main/core/terminals/controller.ts
new file mode 100644
index 0000000000..8a632dac72
--- /dev/null
+++ b/src/main/core/terminals/controller.ts
@@ -0,0 +1,16 @@
+import { createRPCController } from '@shared/ipc/rpc';
+import { createTerminal } from './createTerminal';
+import { deleteTerminal } from './deleteTerminal';
+import { getAllTerminals } from './getAllTerminals';
+import { getTerminalsForTask } from './getTerminalsForTask';
+import { renameTerminal } from './renameTerminal';
+import { runLifecycleScript } from './runLifecycleScript';
+
+export const terminalsController = createRPCController({
+  getAllTerminals,
+  createTerminal,
+  deleteTerminal,
+  renameTerminal,
+  getTerminalsForTask,
+  runLifecycleScript,
+});
diff --git a/src/main/core/terminals/core.ts b/src/main/core/terminals/core.ts
new file mode 100644
index 0000000000..4446eaf27e
--- /dev/null
+++ b/src/main/core/terminals/core.ts
@@ -0,0 +1,12 @@
+import { Terminal } from '@shared/terminals';
+import { TerminalRow } from '@main/db/schema';
+
+export function mapTerminalRowToTerminal(row: TerminalRow): Terminal {
+  return {
+    id: row.id,
+    taskId: row.taskId,
+    ssh: row.ssh === 1,
+    projectId: row.projectId,
+    name: row.name,
+  };
+}
diff --git a/src/main/core/terminals/createTerminal.ts b/src/main/core/terminals/createTerminal.ts
new file mode 100644
index 0000000000..0284565b78
--- /dev/null
+++ b/src/main/core/terminals/createTerminal.ts
@@ -0,0 +1,37 @@
+import { sql } from 'drizzle-orm';
+import type { CreateTerminalParams, Terminal } from '@shared/terminals';
+import { db } from '@main/db/client';
+import { terminals } from '@main/db/schema';
+import { capture } from '@main/lib/telemetry';
+import { resolveTask } from '../projects/utils';
+import { mapTerminalRowToTerminal } from './core';
+
+export async function createTerminal(params: CreateTerminalParams): Promise<Terminal> {
+  const { id: terminalId, initialSize = { cols: 80, rows: 24 } } = params;
+
+  const [row] = await db
+    .insert(terminals)
+    .values({
+      id: terminalId,
+      projectId: params.projectId,
+      taskId: params.taskId,
+      name: params.name,
+      ssh: 0,
+      updatedAt: sql`CURRENT_TIMESTAMP`,
+    })
+    .returning();
+
+  const task = resolveTask(params.projectId, params.taskId);
+  if (!task) {
+    throw new Error('Task not found');
+  }
+
+  await task.terminals.spawnTerminal(mapTerminalRowToTerminal(row), initialSize);
+  capture('terminal_created', {
+    terminal_id: terminalId,
+    project_id: params.projectId,
+    task_id: params.taskId,
+  });
+
+  return mapTerminalRowToTerminal(row);
+}
diff --git a/src/main/core/terminals/deleteTerminal.ts b/src/main/core/terminals/deleteTerminal.ts
new file mode 100644
index 0000000000..b3f93ad9e9
--- /dev/null
+++ b/src/main/core/terminals/deleteTerminal.ts
@@ -0,0 +1,29 @@
+import { and, eq } from 'drizzle-orm';
+import { db } from '@main/db/client';
+import { terminals } from '@main/db/schema';
+import { capture } from '@main/lib/telemetry';
+import { resolveTask } from '../projects/utils';
+
+export async function deleteTerminal({
+  projectId,
+  taskId,
+  terminalId,
+}: {
+  projectId: string;
+  taskId: string;
+  terminalId: string;
+}) {
+  await db
+    .delete(terminals)
+    .where(
+      and(
+        eq(terminals.id, terminalId),
+        eq(terminals.projectId, projectId),
+        eq(terminals.taskId, taskId)
+      )
+    );
+
+  const task = resolveTask(projectId, taskId);
+  await task?.terminals.killTerminal(terminalId);
+  capture('terminal_deleted', { terminal_id: terminalId, project_id: projectId, task_id: taskId });
+}
diff --git a/src/main/core/terminals/dev-server-watcher.ts b/src/main/core/terminals/dev-server-watcher.ts
new file mode 100644
index 0000000000..afbe157044
--- /dev/null
+++ b/src/main/core/terminals/dev-server-watcher.ts
@@ -0,0 +1,126 @@
+import net from 'node:net';
+import { hostPreviewEventChannel } from '@shared/events/hostPreviewEvents';
+import { stripAnsi } from '@main/core/agent-hooks/classifiers/base';
+import { events } from '@main/lib/events';
+import type { Pty } from '../pty/pty';
+
+const PROBE_INTERVAL_MS = 1000;
+const PROBE_TIMEOUT_MS = 500;
+const PROBE_FAILURES_TO_CLOSE = 2;
+
+const URL_PATTERN = /https?:\/\/(?:localhost|127\.0\.0\.1|0\.0\.0\.0)(:\d{2,5})?(?:\/\S*)?/;
+const MAX_BUFFER = 4096;
+
+function normalizeUrl(raw: string): string {
+  return raw.replace('0.0.0.0', '127.0.0.1');
+}
+
+function parseTarget(url: string): { host: string; port: number } | null {
+  try {
+    const u = new URL(url);
+    const port = Number(u.port) || (u.protocol === 'https:' ? 443 : 80);
+    const host = u.hostname === '0.0.0.0' ? '127.0.0.1' : u.hostname;
+    return { host, port };
+  } catch {
+    return null;
+  }
+}
+
+function isPortOpen(host: string, port: number): Promise<boolean> {
+  return new Promise((resolve) => {
+    const socket = net.createConnection({ host, port });
+    socket.setTimeout(PROBE_TIMEOUT_MS);
+    socket.on('connect', () => {
+      socket.destroy();
+      resolve(true);
+    });
+    socket.on('error', () => resolve(false));
+    socket.on('timeout', () => {
+      socket.destroy();
+      resolve(false);
+    });
+  });
+}
+
+function startProbe(url: string, onClosed: () => void): () => void {
+  const target = parseTarget(url);
+  if (!target) return () => {};
+
+  let stopped = false;
+  let consecutiveFailures = 0;
+  let timer: ReturnType<typeof setTimeout>;
+
+  const tick = async () => {
+    if (stopped) return;
+    const open = await isPortOpen(target.host, target.port);
+    if (stopped) return;
+    if (open) {
+      consecutiveFailures = 0;
+    } else {
+      consecutiveFailures++;
+      if (consecutiveFailures >= PROBE_FAILURES_TO_CLOSE) {
+        stopped = true;
+        onClosed();
+        return;
+      }
+    }
+    timer = setTimeout(tick, PROBE_INTERVAL_MS);
+  };
+
+  timer = setTimeout(tick, 0);
+
+  return () => {
+    stopped = true;
+    clearTimeout(timer);
+  };
+}
+
+export function wireTerminalDevServerWatcher({
+  pty,
+  scopeId,
+  terminalId,
+  probe = true,
+}: {
+  pty: Pty;
+  scopeId: string;
+  terminalId: string;
+  /** Set to false for SSH sessions where remote ports are not locally reachable */
+  probe?: boolean;
+}): void {
+  let buffer = '';
+  let found = false;
+  let stopProbe: (() => void) | null = null;
+
+  const cleanup = () => {
+    buffer = '';
+    stopProbe?.();
+    stopProbe = null;
+    if (found) {
+      found = false;
+      events.emit(hostPreviewEventChannel, { type: 'exit', taskId: scopeId, terminalId });
+    }
+  };
+
+  pty.onExit(cleanup);
+
+  pty.onData((chunk) => {
+    if (found) return;
+
+    buffer += chunk;
+    if (buffer.length > MAX_BUFFER) {
+      buffer = buffer.slice(-MAX_BUFFER);
+    }
+
+    const clean = stripAnsi(buffer);
+    const match = clean.match(URL_PATTERN);
+    if (!match) return;
+
+    found = true;
+    const url = normalizeUrl(match[0]);
+    events.emit(hostPreviewEventChannel, { type: 'url', taskId: scopeId, terminalId, url });
+
+    if (probe) {
+      stopProbe = startProbe(url, cleanup);
+    }
+  });
+}
diff --git a/src/main/core/terminals/getAllTerminals.ts b/src/main/core/terminals/getAllTerminals.ts
new file mode 100644
index 0000000000..cfb15627ff
--- /dev/null
+++ b/src/main/core/terminals/getAllTerminals.ts
@@ -0,0 +1,14 @@
+import { eq, isNull } from 'drizzle-orm';
+import type { Terminal } from '@shared/terminals';
+import { db } from '@main/db/client';
+import { tasks, terminals } from '@main/db/schema';
+import { mapTerminalRowToTerminal } from './core';
+
+export async function getAllTerminals(): Promise<Terminal[]> {
+  const rows = await db
+    .select({ terminal: terminals })
+    .from(terminals)
+    .innerJoin(tasks, eq(terminals.taskId, tasks.id))
+    .where(isNull(tasks.archivedAt));
+  return rows.map(({ terminal }) => mapTerminalRowToTerminal(terminal));
+}
diff --git a/src/main/core/terminals/getTerminalsForTask.ts b/src/main/core/terminals/getTerminalsForTask.ts
new file mode 100644
index 0000000000..c9a4693c7b
--- /dev/null
+++ b/src/main/core/terminals/getTerminalsForTask.ts
@@ -0,0 +1,10 @@
+import { eq } from 'drizzle-orm';
+import { Terminal } from '@shared/terminals';
+import { db } from '@main/db/client';
+import { terminals } from '@main/db/schema';
+import { mapTerminalRowToTerminal } from './core';
+
+export async function getTerminalsForTask(projectId: string, taskId: string): Promise<Terminal[]> {
+  const rows = await db.select().from(terminals).where(eq(terminals.taskId, taskId));
+  return rows.map(mapTerminalRowToTerminal);
+}
diff --git a/src/main/core/terminals/impl/local-terminal-provider.ts b/src/main/core/terminals/impl/local-terminal-provider.ts
new file mode 100644
index 0000000000..028af29044
--- /dev/null
+++ b/src/main/core/terminals/impl/local-terminal-provider.ts
@@ -0,0 +1,201 @@
+import type { GeneralSessionConfig } from '@shared/general-session';
+import { makePtySessionId } from '@shared/ptySessionId';
+import { Terminal } from '@shared/terminals';
+import { spawnLocalPty } from '@main/core/pty/local-pty';
+import { Pty } from '@main/core/pty/pty';
+import { buildTerminalEnv } from '@main/core/pty/pty-env';
+import { ptySessionRegistry } from '@main/core/pty/pty-session-registry';
+import { resolveSpawnParams } from '@main/core/pty/spawn-utils';
+import { killTmuxSession, makeTmuxSessionName } from '@main/core/pty/tmux-session-name';
+import type { ExecFn } from '@main/core/utils/exec';
+import { log } from '@main/lib/logger';
+import { wireTerminalDevServerWatcher } from '../dev-server-watcher';
+import { type LifecycleScriptSpawnRequest, type TerminalProvider } from '../terminal-provider';
+
+const DEFAULT_COLS = 80;
+const DEFAULT_ROWS = 24;
+const MAX_RESPAWNS = 2;
+
+type SpawnPolicy = {
+  respawnOnExit: boolean;
+  preserveBufferOnExit: boolean;
+  watchDevServer: boolean;
+};
+
+export class LocalTerminalProvider implements TerminalProvider {
+  private sessions = new Map<string, Pty>();
+  private knownSessionIds = new Set<string>();
+  private respawnCounts = new Map<string, number>();
+  private readonly projectId: string;
+  private readonly scopeId: string;
+  private readonly taskPath: string;
+  private readonly tmux: boolean;
+  private readonly shellSetup?: string;
+  private readonly exec: ExecFn;
+  private readonly taskEnvVars: Record<string, string>;
+
+  constructor({
+    projectId,
+    scopeId,
+    taskPath,
+    tmux = false,
+    shellSetup,
+    exec,
+    taskEnvVars = {},
+  }: {
+    projectId: string;
+    scopeId: string;
+    taskPath: string;
+    tmux?: boolean;
+    shellSetup?: string;
+    exec: ExecFn;
+    taskEnvVars?: Record<string, string>;
+  }) {
+    this.projectId = projectId;
+    this.scopeId = scopeId;
+    this.taskPath = taskPath;
+    this.tmux = tmux;
+    this.shellSetup = shellSetup;
+    this.exec = exec;
+    this.taskEnvVars = taskEnvVars;
+  }
+
+  async spawnTerminal(
+    terminal: Terminal,
+    initialSize: { cols: number; rows: number } = { cols: DEFAULT_COLS, rows: DEFAULT_ROWS },
+    command?: { command: string; args: string[] }
+  ): Promise<void> {
+    return this.spawnWithPolicy(terminal, initialSize, command, {
+      respawnOnExit: true,
+      preserveBufferOnExit: false,
+      watchDevServer: true,
+    });
+  }
+
+  async spawnLifecycleScript({
+    terminal,
+    command,
+    initialSize = { cols: DEFAULT_COLS, rows: DEFAULT_ROWS },
+    respawnOnExit = false,
+    preserveBufferOnExit = true,
+    watchDevServer = false,
+  }: LifecycleScriptSpawnRequest): Promise<void> {
+    return this.spawnWithPolicy(
+      terminal,
+      initialSize,
+      { command, args: [] },
+      {
+        respawnOnExit,
+        preserveBufferOnExit,
+        watchDevServer,
+      }
+    );
+  }
+
+  private async spawnWithPolicy(
+    terminal: Terminal,
+    initialSize: { cols: number; rows: number },
+    command: { command: string; args: string[] } | undefined,
+    policy: SpawnPolicy
+  ): Promise<void> {
+    const sessionId = makePtySessionId(terminal.projectId, terminal.taskId, terminal.id);
+    this.knownSessionIds.add(sessionId);
+    if (this.sessions.has(sessionId)) return;
+
+    const cfg: GeneralSessionConfig = {
+      taskId: this.scopeId,
+      cwd: this.taskPath,
+      shellSetup: this.shellSetup,
+      tmuxSessionName: this.tmux ? makeTmuxSessionName(sessionId) : undefined,
+      command: command?.command,
+      args: command?.args,
+    };
+    const params = resolveSpawnParams('general', cfg);
+
+    const pty = spawnLocalPty({
+      id: sessionId,
+      command: params.command,
+      args: params.args,
+      cwd: this.taskPath,
+      env: { ...buildTerminalEnv(), ...this.taskEnvVars },
+      cols: initialSize.cols,
+      rows: initialSize.rows,
+    });
+
+    if (policy.watchDevServer) {
+      wireTerminalDevServerWatcher({ pty, scopeId: this.scopeId, terminalId: terminal.id });
+    }
+
+    pty.onExit(() => {
+      const shouldRespawn = policy.respawnOnExit && this.sessions.has(sessionId);
+      this.sessions.delete(sessionId);
+      if (!policy.preserveBufferOnExit) {
+        ptySessionRegistry.unregister(sessionId);
+      }
+      if (shouldRespawn && !this.tmux) {
+        const count = (this.respawnCounts.get(sessionId) ?? 0) + 1;
+        this.respawnCounts.set(sessionId, count);
+
+        if (count > MAX_RESPAWNS) {
+          log.error('LocalTerminalProvider: respawn limit reached, giving up', {
+            terminalId: terminal.id,
+            respawnCount: count,
+          });
+          this.respawnCounts.delete(sessionId);
+          return;
+        }
+
+        setTimeout(() => {
+          this.spawnWithPolicy(terminal, initialSize, command, policy).catch((e) => {
+            log.error('LocalTerminalProvider: respawn failed', {
+              terminalId: terminal.id,
+              error: String(e),
+            });
+          });
+        }, 500);
+      }
+    });
+
+    ptySessionRegistry.register(sessionId, pty, {
+      preserveBufferOnExit: policy.preserveBufferOnExit,
+    });
+    this.sessions.set(sessionId, pty);
+  }
+
+  async killTerminal(terminalId: string): Promise<void> {
+    const sessionId = makePtySessionId(this.projectId, this.scopeId, terminalId);
+    this.knownSessionIds.delete(sessionId);
+    const pty = this.sessions.get(sessionId);
+    if (pty) {
+      try {
+        pty.kill();
+      } catch {}
+      this.sessions.delete(sessionId);
+      ptySessionRegistry.unregister(sessionId);
+    }
+    if (this.tmux) {
+      await killTmuxSession(this.exec, makeTmuxSessionName(sessionId));
+    }
+  }
+
+  async destroyAll(): Promise<void> {
+    const sessionIds = Array.from(this.knownSessionIds);
+    await this.detachAll();
+    if (this.tmux) {
+      await Promise.all(
+        sessionIds.map((id) => killTmuxSession(this.exec, makeTmuxSessionName(id)))
+      );
+    }
+    this.knownSessionIds.clear();
+  }
+
+  async detachAll(): Promise<void> {
+    for (const [sessionId, pty] of this.sessions) {
+      try {
+        pty.kill();
+      } catch {}
+      ptySessionRegistry.unregister(sessionId);
+    }
+    this.sessions.clear();
+  }
+}
diff --git a/src/main/core/terminals/impl/ssh-terminal-provider.ts b/src/main/core/terminals/impl/ssh-terminal-provider.ts
new file mode 100644
index 0000000000..a40ad0675d
--- /dev/null
+++ b/src/main/core/terminals/impl/ssh-terminal-provider.ts
@@ -0,0 +1,250 @@
+import type { GeneralSessionConfig } from '@shared/general-session';
+import { makePtySessionId } from '@shared/ptySessionId';
+import { Terminal } from '@shared/terminals';
+import { Pty } from '@main/core/pty/pty';
+import { ptySessionRegistry } from '@main/core/pty/pty-session-registry';
+import { resolveSshCommand } from '@main/core/pty/spawn-utils';
+import { openSsh2Pty } from '@main/core/pty/ssh2-pty';
+import { killTmuxSession, makeTmuxSessionName } from '@main/core/pty/tmux-session-name';
+import type { SshClientProxy } from '@main/core/ssh/ssh-client-proxy';
+import {
+  type LifecycleScriptSpawnRequest,
+  type TerminalProvider,
+} from '@main/core/terminals/terminal-provider';
+import { ExecFn } from '@main/core/utils/exec';
+import { log } from '@main/lib/logger';
+import { wireTerminalDevServerWatcher } from '../dev-server-watcher';
+
+const DEFAULT_COLS = 80;
+const DEFAULT_ROWS = 24;
+const MAX_RESPAWNS = 2;
+
+type SpawnPolicy = {
+  respawnOnExit: boolean;
+  preserveBufferOnExit: boolean;
+  watchDevServer: boolean;
+  trackForRehydrate: boolean;
+};
+
+export class SshTerminalProvider implements TerminalProvider {
+  private sessions = new Map<string, Pty>();
+  private knownSessionIds = new Set<string>();
+  private respawnCounts = new Map<string, number>();
+  private terminals = new Map<string, Terminal>();
+  private readonly projectId: string;
+  private readonly scopeId: string;
+  private readonly taskPath: string;
+  private readonly taskEnvVars: Record<string, string>;
+  private readonly tmux: boolean;
+  private readonly shellSetup?: string;
+  private readonly exec: ExecFn;
+  private readonly proxy: SshClientProxy;
+
+  constructor({
+    projectId,
+    scopeId,
+    taskPath,
+    taskEnvVars = {},
+    tmux = false,
+    shellSetup,
+    exec,
+    proxy,
+  }: {
+    projectId: string;
+    scopeId: string;
+    taskPath: string;
+    taskEnvVars?: Record<string, string>;
+    tmux?: boolean;
+    shellSetup?: string;
+    exec: ExecFn;
+    proxy: SshClientProxy;
+  }) {
+    this.projectId = projectId;
+    this.scopeId = scopeId;
+    this.taskPath = taskPath;
+    this.taskEnvVars = taskEnvVars;
+    this.tmux = tmux;
+    this.shellSetup = shellSetup;
+    this.exec = exec;
+    this.proxy = proxy;
+  }
+
+  async spawnTerminal(
+    terminal: Terminal,
+    initialSize: { cols: number; rows: number } = { cols: DEFAULT_COLS, rows: DEFAULT_ROWS },
+    command?: { command: string; args: string[] }
+  ): Promise<void> {
+    return this.spawnWithPolicy(terminal, initialSize, command, {
+      respawnOnExit: true,
+      preserveBufferOnExit: false,
+      watchDevServer: true,
+      trackForRehydrate: true,
+    });
+  }
+
+  async spawnLifecycleScript({
+    terminal,
+    command,
+    initialSize = { cols: DEFAULT_COLS, rows: DEFAULT_ROWS },
+    respawnOnExit = false,
+    preserveBufferOnExit = true,
+    watchDevServer = false,
+  }: LifecycleScriptSpawnRequest): Promise<void> {
+    return this.spawnWithPolicy(
+      terminal,
+      initialSize,
+      { command, args: [] },
+      {
+        respawnOnExit,
+        preserveBufferOnExit,
+        watchDevServer,
+        trackForRehydrate: false,
+      }
+    );
+  }
+
+  private async spawnWithPolicy(
+    terminal: Terminal,
+    initialSize: { cols: number; rows: number },
+    command: { command: string; args: string[] } | undefined,
+    policy: SpawnPolicy
+  ): Promise<void> {
+    const sessionId = makePtySessionId(terminal.projectId, terminal.taskId, terminal.id);
+    this.knownSessionIds.add(sessionId);
+    if (this.sessions.has(sessionId)) return;
+    if (policy.trackForRehydrate) {
+      this.terminals.set(terminal.id, terminal);
+    }
+
+    const cfg: GeneralSessionConfig = {
+      taskId: this.scopeId,
+      cwd: this.taskPath,
+      shellSetup: this.shellSetup,
+      tmuxSessionName: this.tmux ? makeTmuxSessionName(sessionId) : undefined,
+      command: command?.command,
+      args: command?.args,
+    };
+
+    const sshCommand = resolveSshCommand('general', cfg, this.taskEnvVars);
+
+    const result = await openSsh2Pty(this.proxy.client, {
+      id: sessionId,
+      command: sshCommand,
+      cols: initialSize.cols,
+      rows: initialSize.rows,
+    });
+
+    if (!result.success) {
+      log.error('SshTerminalProvider: failed to open SSH channel', {
+        sessionId,
+        error: result.error.message,
+      });
+      return;
+    }
+    const pty = result.data;
+
+    if (policy.watchDevServer) {
+      wireTerminalDevServerWatcher({
+        pty,
+        scopeId: this.scopeId,
+        terminalId: terminal.id,
+        probe: false,
+      });
+    }
+
+    pty.onExit(() => {
+      const shouldRespawn = policy.respawnOnExit && this.sessions.has(sessionId);
+      this.sessions.delete(sessionId);
+      if (!policy.preserveBufferOnExit) {
+        ptySessionRegistry.unregister(sessionId);
+      }
+      if (shouldRespawn && !this.tmux) {
+        const count = (this.respawnCounts.get(sessionId) ?? 0) + 1;
+        this.respawnCounts.set(sessionId, count);
+
+        if (count > MAX_RESPAWNS) {
+          log.error('SshTerminalProvider: respawn limit reached, giving up', {
+            terminalId: terminal.id,
+            respawnCount: count,
+          });
+          this.respawnCounts.delete(sessionId);
+          return;
+        }
+
+        setTimeout(() => {
+          this.spawnWithPolicy(terminal, initialSize, command, policy).catch((e) => {
+            log.error('SshTerminalProvider: respawn failed', {
+              terminalId: terminal.id,
+              error: String(e),
+            });
+          });
+        }, 500);
+      }
+    });
+
+    ptySessionRegistry.register(sessionId, pty, {
+      preserveBufferOnExit: policy.preserveBufferOnExit,
+    });
+    this.sessions.set(sessionId, pty);
+  }
+
+  /**
+   * Re-spawn all terminals whose sessions are no longer active (e.g. after
+   * an SSH reconnect). Skips user-deleted terminals and terminals that are
+   * already running.
+   */
+  async rehydrate(): Promise<void> {
+    const terminals = Array.from(this.terminals.values());
+    await Promise.all(
+      terminals.map(async (terminal) => {
+        const sessionId = makePtySessionId(terminal.projectId, terminal.taskId, terminal.id);
+        if (this.sessions.has(sessionId)) return;
+        await this.spawnTerminal(terminal).catch((e) => {
+          log.error('SshTerminalProvider: rehydrate failed', {
+            terminalId: terminal.id,
+            error: String(e),
+          });
+        });
+      })
+    );
+  }
+
+  async killTerminal(terminalId: string): Promise<void> {
+    const sessionId = makePtySessionId(this.projectId, this.scopeId, terminalId);
+    this.knownSessionIds.delete(sessionId);
+    const pty = this.sessions.get(sessionId);
+    if (pty) {
+      try {
+        pty.kill();
+      } catch {}
+      this.sessions.delete(sessionId);
+      ptySessionRegistry.unregister(sessionId);
+    }
+    this.terminals.delete(terminalId);
+    if (this.tmux) {
+      await killTmuxSession(this.exec, makeTmuxSessionName(sessionId));
+    }
+  }
+
+  async destroyAll(): Promise<void> {
+    const sessionIds = Array.from(this.knownSessionIds);
+    await this.detachAll();
+    if (this.tmux) {
+      await Promise.all(
+        sessionIds.map((id) => killTmuxSession(this.exec, makeTmuxSessionName(id)))
+      );
+    }
+    this.knownSessionIds.clear();
+    this.terminals.clear();
+  }
+
+  async detachAll(): Promise<void> {
+    for (const [sessionId, pty] of this.sessions) {
+      try {
+        pty.kill();
+      } catch {}
+      ptySessionRegistry.unregister(sessionId);
+    }
+    this.sessions.clear();
+  }
+}
diff --git a/src/main/core/terminals/renameTerminal.ts b/src/main/core/terminals/renameTerminal.ts
new file mode 100644
index 0000000000..c3c5631b47
--- /dev/null
+++ b/src/main/core/terminals/renameTerminal.ts
@@ -0,0 +1,10 @@
+import { eq, sql } from 'drizzle-orm';
+import { db } from '@main/db/client';
+import { terminals } from '@main/db/schema';
+
+export async function renameTerminal(terminalId: string, name: string) {
+  await db
+    .update(terminals)
+    .set({ name, updatedAt: sql`CURRENT_TIMESTAMP` })
+    .where(eq(terminals.id, terminalId));
+}
diff --git a/src/main/core/terminals/runLifecycleScript.test.ts b/src/main/core/terminals/runLifecycleScript.test.ts
new file mode 100644
index 0000000000..493387ccdc
--- /dev/null
+++ b/src/main/core/terminals/runLifecycleScript.test.ts
@@ -0,0 +1,42 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { getEffectiveTaskSettings } from '../projects/settings/task-settings';
+import { resolveWorkspace } from '../projects/utils';
+import { runLifecycleScript } from './runLifecycleScript';
+
+vi.mock('../projects/settings/task-settings', () => ({
+  getEffectiveTaskSettings: vi.fn(),
+}));
+
+vi.mock('../projects/utils', () => ({
+  resolveWorkspace: vi.fn(),
+}));
+
+describe('runLifecycleScript', () => {
+  beforeEach(() => {
+    vi.resetAllMocks();
+  });
+
+  it('runs manual lifecycle scripts with exit so command completion closes the PTY', async () => {
+    const lifecycleRun = vi.fn(async () => {});
+    vi.mocked(resolveWorkspace).mockReturnValue({
+      settings: {},
+      fs: {},
+      lifecycleService: {
+        runLifecycleScript: lifecycleRun,
+      },
+    } as never);
+    vi.mocked(getEffectiveTaskSettings).mockResolvedValue({
+      scripts: {
+        run: 'pnpm dev',
+      },
+    } as never);
+
+    await runLifecycleScript({
+      projectId: 'project-1',
+      workspaceId: 'branch:feature',
+      type: 'run',
+    });
+
+    expect(lifecycleRun).toHaveBeenCalledWith({ type: 'run', script: 'pnpm dev' }, { exit: true });
+  });
+});
diff --git a/src/main/core/terminals/runLifecycleScript.ts b/src/main/core/terminals/runLifecycleScript.ts
new file mode 100644
index 0000000000..79797eef8e
--- /dev/null
+++ b/src/main/core/terminals/runLifecycleScript.ts
@@ -0,0 +1,23 @@
+import { getEffectiveTaskSettings } from '../projects/settings/task-settings';
+import { resolveWorkspace } from '../projects/utils';
+
+export async function runLifecycleScript({
+  projectId,
+  workspaceId,
+  type,
+}: {
+  projectId: string;
+  workspaceId: string;
+  type: 'setup' | 'run' | 'teardown';
+}) {
+  const workspace = resolveWorkspace(projectId, workspaceId);
+  if (!workspace) throw new Error('Workspace not found');
+
+  const settings = await getEffectiveTaskSettings({
+    projectSettings: workspace.settings,
+    taskFs: workspace.fs,
+  });
+  const script = settings.scripts?.[type];
+  if (!script) return;
+  await workspace.lifecycleService.runLifecycleScript({ type, script }, { exit: true });
+}
diff --git a/src/main/core/terminals/terminal-provider.ts b/src/main/core/terminals/terminal-provider.ts
new file mode 100644
index 0000000000..f656ff6b84
--- /dev/null
+++ b/src/main/core/terminals/terminal-provider.ts
@@ -0,0 +1,22 @@
+import { Terminal } from '@shared/terminals';
+
+export type LifecycleScriptSpawnRequest = {
+  terminal: Terminal;
+  command: string;
+  initialSize?: { cols: number; rows: number };
+  respawnOnExit?: boolean;
+  preserveBufferOnExit?: boolean;
+  watchDevServer?: boolean;
+};
+
+export interface TerminalProvider {
+  spawnTerminal(
+    terminal: Terminal,
+    initialSize: { cols: number; rows: number },
+    command?: { command: string; args: string[] }
+  ): Promise<void>;
+  spawnLifecycleScript(request: LifecycleScriptSpawnRequest): Promise<void>;
+  killTerminal(terminalId: string): Promise<void>;
+  destroyAll(): Promise<void>;
+  detachAll(): Promise<void>;
+}
diff --git a/src/main/core/updates/controller.ts b/src/main/core/updates/controller.ts
new file mode 100644
index 0000000000..dd86a7b9fd
--- /dev/null
+++ b/src/main/core/updates/controller.ts
@@ -0,0 +1,66 @@
+import { app, shell } from 'electron';
+import { createRPCController } from '@shared/ipc/rpc';
+import { EMDASH_RELEASES_URL } from '@shared/urls';
+import { updateService } from '@main/core/updates/update-service';
+import { formatUpdaterError } from './utils';
+
+export const updateController = createRPCController({
+  check: async () => {
+    try {
+      const result = await updateService.checkForUpdates();
+      return { success: true, result: result ?? null };
+    } catch (error) {
+      return { success: false, error: formatUpdaterError(error) };
+    }
+  },
+
+  download: async () => {
+    try {
+      await updateService.downloadUpdate();
+      return { success: true };
+    } catch (error) {
+      return { success: false, error: formatUpdaterError(error) };
+    }
+  },
+
+  quitAndInstall: async () => {
+    try {
+      updateService.quitAndInstall();
+      return { success: true };
+    } catch (error) {
+      return { success: false, error: formatUpdaterError(error) };
+    }
+  },
+
+  openLatest: async () => {
+    try {
+      await shell.openExternal(EMDASH_RELEASES_URL);
+      setTimeout(() => {
+        try {
+          app.quit();
+        } catch {}
+      }, 500);
+      return { success: true };
+    } catch (error) {
+      return { success: false, error: error instanceof Error ? error.message : String(error) };
+    }
+  },
+
+  getState: async () => {
+    try {
+      const state = updateService.getState();
+      return { success: true, data: state };
+    } catch (error) {
+      return { success: false, error: formatUpdaterError(error) };
+    }
+  },
+
+  getReleaseNotes: async () => {
+    try {
+      const notes = await updateService.fetchReleaseNotes();
+      return { success: true, data: notes };
+    } catch (error) {
+      return { success: false, error: formatUpdaterError(error) };
+    }
+  },
+});
diff --git a/src/main/core/updates/update-service.ts b/src/main/core/updates/update-service.ts
new file mode 100644
index 0000000000..9cc09ed093
--- /dev/null
+++ b/src/main/core/updates/update-service.ts
@@ -0,0 +1,351 @@
+import _electronUpdater, {
+  type ProgressInfo,
+  type UpdateInfo,
+  type Logger as UpdaterLogger,
+} from 'electron-updater';
+import { UPDATE_CHANNEL } from '@shared/app-identity';
+import {
+  updateAvailableEvent,
+  updateCheckingEvent,
+  updateDownloadedEvent,
+  updateDownloadingEvent,
+  updateErrorEvent,
+  updateInstallingEvent,
+  updateNotAvailableEvent,
+  updateProgressEvent,
+} from '@shared/events/updateEvents';
+import { resolveAppVersion } from '@main/core/app/utils';
+import { events } from '@main/lib/events';
+import { log } from '@main/lib/logger';
+import { formatUpdaterError, sanitizeUpdaterLogArgs } from './utils';
+
+const { autoUpdater } = _electronUpdater;
+
+const ALLOW_PRERELEASE = false;
+const ALLOW_DOWNGRADE = false;
+const CHECK_INTERVAL_MS = 60 * 60 * 1000; // 1 hour
+const STARTUP_DELAY_MS = 30 * 1000; // 30 seconds
+const INSTALL_RESTART_GUARD_TIMEOUT_MS = 2 * 60 * 1000;
+
+export interface UpdateState {
+  status: 'idle' | 'checking' | 'available' | 'downloading' | 'downloaded' | 'installing' | 'error';
+  lastCheck?: Date;
+  nextCheck?: Date;
+  currentVersion: string;
+  availableVersion?: string;
+  updateInfo?: UpdateInfo;
+  downloadProgress?: {
+    bytesPerSecond: number;
+    percent: number;
+    transferred: number;
+    total: number;
+  };
+  error?: string;
+  rollbackVersion?: string;
+  releaseNotes?: string;
+}
+
+class UpdateService {
+  private updateState: UpdateState;
+  private checkTimer?: NodeJS.Timeout;
+  private currentCheckPromise: Promise<UpdateInfo | null> | null = null;
+  private initialized = false;
+  private active = false;
+  private installRequested = false;
+  private installRestartGuardTimer?: NodeJS.Timeout;
+
+  constructor() {
+    this.updateState = {
+      status: 'idle',
+      currentVersion: 'unknown',
+    };
+  }
+
+  async initialize(): Promise<void> {
+    if (this.initialized) return;
+    this.initialized = true;
+
+    this.updateState.currentVersion = await resolveAppVersion();
+
+    if (import.meta.env.DEV) return;
+
+    this.setupAutoUpdater();
+    this.setupEventListeners();
+    this.active = true;
+
+    log.info('AutoUpdateService initialized', {
+      version: this.updateState.currentVersion,
+      channel: UPDATE_CHANNEL,
+    });
+
+    this.scheduleNextCheck(STARTUP_DELAY_MS);
+  }
+
+  private setupAutoUpdater(): void {
+    autoUpdater.autoDownload = false;
+    autoUpdater.autoInstallOnAppQuit = true;
+    autoUpdater.autoRunAppAfterInstall = true;
+    autoUpdater.channel = UPDATE_CHANNEL;
+    autoUpdater.allowPrerelease = ALLOW_PRERELEASE;
+    autoUpdater.allowDowngrade = ALLOW_DOWNGRADE;
+    autoUpdater.requestHeaders = { 'Cache-Control': 'no-cache' };
+
+    const updaterLogger: UpdaterLogger = {
+      info: (...args: unknown[]) => log.debug('[autoUpdater]', ...sanitizeUpdaterLogArgs(args)),
+      warn: (...args: unknown[]) => log.warn('[autoUpdater]', ...sanitizeUpdaterLogArgs(args)),
+      error: (...args: unknown[]) => log.error('[autoUpdater]', ...sanitizeUpdaterLogArgs(args)),
+    };
+    autoUpdater.logger = updaterLogger;
+  }
+
+  private setupEventListeners(): void {
+    autoUpdater.on('checking-for-update', () => {
+      this.updateState.status = 'checking';
+      this.updateState.lastCheck = new Date();
+      events.emit(updateCheckingEvent, undefined);
+    });
+
+    autoUpdater.on('update-available', (info: UpdateInfo) => {
+      this.updateState.status = 'available';
+      this.updateState.availableVersion = info.version;
+      this.updateState.updateInfo = info;
+      events.emit(updateAvailableEvent, { version: info.version, updateInfo: info });
+    });
+
+    autoUpdater.on('update-not-available', () => {
+      this.updateState.status = 'idle';
+      events.emit(updateNotAvailableEvent, undefined);
+    });
+
+    autoUpdater.on('error', (err: Error) => {
+      const errorMessage = formatUpdaterError(err);
+      log.error('Auto-updater error:', errorMessage);
+
+      if (this.updateState.status === 'installing') {
+        log.warn('Ignoring auto-updater error while install is in progress');
+        return;
+      }
+
+      const previousVersion = this.updateState.availableVersion;
+      const previousInfo = this.updateState.updateInfo;
+
+      this.updateState.status = 'error';
+      this.updateState.error = errorMessage;
+
+      if (previousVersion) {
+        this.updateState.availableVersion = previousVersion;
+        this.updateState.updateInfo = previousInfo;
+      }
+
+      events.emit(updateErrorEvent, { message: errorMessage });
+    });
+
+    autoUpdater.on('download-progress', (progressObj: ProgressInfo) => {
+      this.updateState.status = 'downloading';
+      this.updateState.downloadProgress = {
+        bytesPerSecond: progressObj.bytesPerSecond,
+        percent: progressObj.percent,
+        transferred: progressObj.transferred,
+        total: progressObj.total,
+      };
+      events.emit(updateProgressEvent, {
+        bytesPerSecond: progressObj.bytesPerSecond,
+        percent: progressObj.percent,
+        transferred: progressObj.transferred,
+        total: progressObj.total,
+      });
+    });
+
+    autoUpdater.on('update-downloaded', (info: UpdateInfo) => {
+      this.updateState.status = 'downloaded';
+      this.updateState.rollbackVersion = this.updateState.currentVersion;
+      events.emit(updateDownloadedEvent, { version: info.version });
+    });
+  }
+
+  private scheduleNextCheck(delay = CHECK_INTERVAL_MS): void {
+    if (this.checkTimer) {
+      clearTimeout(this.checkTimer);
+    }
+    this.updateState.nextCheck = new Date(Date.now() + delay);
+    this.checkTimer = setTimeout(() => {
+      this.checkForUpdates().catch((e) => {
+        log.error('Scheduled update check failed:', e);
+      });
+    }, delay);
+  }
+
+  async checkForUpdates(): Promise<UpdateInfo | null> {
+    if (!this.active) return null;
+    if (this.currentCheckPromise) return this.currentCheckPromise;
+
+    this.currentCheckPromise = this._performCheck().finally(() => {
+      this.currentCheckPromise = null;
+      this.scheduleNextCheck();
+    });
+
+    return this.currentCheckPromise;
+  }
+
+  private async _performCheck(): Promise<UpdateInfo | null> {
+    if (this.updateState.status === 'error') {
+      this.updateState.status = 'idle';
+      this.updateState.error = undefined;
+    }
+
+    log.info('Checking for updates...', {
+      channel: UPDATE_CHANNEL,
+      currentVersion: this.updateState.currentVersion,
+    });
+
+    const result = await autoUpdater.checkForUpdatesAndNotify();
+    return result?.updateInfo ?? null;
+  }
+
+  async downloadUpdate(): Promise<void> {
+    if (!this.active) throw new Error('Update service is not active');
+    if (this.updateState.status === 'error' && this.updateState.availableVersion) {
+      this.updateState.status = 'available';
+    }
+
+    if (this.updateState.status !== 'available') {
+      throw new Error(`Cannot download: status is "${this.updateState.status}", not "available"`);
+    }
+
+    if (!this.updateState.availableVersion) {
+      throw new Error('No version information available for download');
+    }
+
+    this.updateState.status = 'downloading';
+    events.emit(updateDownloadingEvent, { version: this.updateState.availableVersion });
+
+    try {
+      await autoUpdater.downloadUpdate();
+    } catch (error: unknown) {
+      const errorMessage = formatUpdaterError(error);
+      log.error('Update download failed:', errorMessage, error);
+
+      const version = this.updateState.availableVersion;
+      const info = this.updateState.updateInfo;
+
+      this.updateState.status = 'error';
+      this.updateState.error = errorMessage;
+      this.updateState.availableVersion = version;
+      this.updateState.updateInfo = info;
+
+      events.emit(updateErrorEvent, { message: errorMessage });
+      throw error;
+    }
+  }
+
+  quitAndInstall(): void {
+    if (!this.active) throw new Error('Update service is not active');
+    if (this.installRequested) {
+      log.info('quitAndInstall ignored: install already requested');
+      return;
+    }
+
+    if (this.updateState.status !== 'downloaded') {
+      throw new Error(
+        `Cannot install update: status is "${this.updateState.status}", expected "downloaded"`
+      );
+    }
+
+    this.installRequested = true;
+    this.updateState.status = 'installing';
+    events.emit(updateInstallingEvent, undefined);
+
+    log.info('Installing update', {
+      fromVersion: this.updateState.currentVersion,
+      toVersion: this.updateState.availableVersion,
+    });
+
+    const clearGuard = () => {
+      if (this.installRestartGuardTimer) {
+        clearTimeout(this.installRestartGuardTimer);
+        this.installRestartGuardTimer = undefined;
+      }
+    };
+
+    const rollback = (reason: string) => {
+      clearGuard();
+      this.installRequested = false;
+      this.updateState.status = 'downloaded';
+      if (this.updateState.availableVersion) {
+        events.emit(updateDownloadedEvent, { version: this.updateState.availableVersion });
+      }
+      log.error(reason);
+    };
+
+    this.installRestartGuardTimer = setTimeout(() => {
+      rollback('quitAndInstall timed out before app quit; allowing retry');
+    }, INSTALL_RESTART_GUARD_TIMEOUT_MS);
+
+    setTimeout(() => {
+      try {
+        autoUpdater.quitAndInstall(false, true);
+      } catch (error) {
+        rollback(`quitAndInstall threw: ${formatUpdaterError(error)}`);
+      }
+    }, 250);
+  }
+
+  async fetchReleaseNotes(): Promise<string | null> {
+    try {
+      if (!this.updateState.updateInfo) {
+        return null;
+      }
+
+      const releaseNotes = this.updateState.updateInfo.releaseNotes;
+      if (releaseNotes) {
+        const normalizedReleaseNotes =
+          typeof releaseNotes === 'string'
+            ? releaseNotes
+            : releaseNotes
+                .map((note) => note.note)
+                .filter((note): note is string => typeof note === 'string' && note.length > 0)
+                .join('\n\n');
+        if (normalizedReleaseNotes) {
+          this.updateState.releaseNotes = normalizedReleaseNotes;
+          return normalizedReleaseNotes;
+        }
+      }
+
+      const version = this.updateState.availableVersion;
+      if (!version) return null;
+
+      const response = await fetch(
+        `https://api.github.com/repos/generalaction/emdash/releases/tags/v${version}`
+      );
+
+      if (response.ok) {
+        const data = (await response.json()) as { body?: string };
+        const notes = data.body || 'No release notes available';
+        this.updateState.releaseNotes = notes;
+        return notes;
+      }
+
+      return null;
+    } catch (error) {
+      log.error('Failed to fetch release notes:', error);
+      return null;
+    }
+  }
+
+  getState(): UpdateState {
+    return { ...this.updateState };
+  }
+
+  shutdown(): void {
+    if (this.checkTimer) {
+      clearTimeout(this.checkTimer);
+      this.checkTimer = undefined;
+    }
+    if (this.installRestartGuardTimer) {
+      clearTimeout(this.installRestartGuardTimer);
+      this.installRestartGuardTimer = undefined;
+    }
+  }
+}
+
+export const updateService = new UpdateService();
diff --git a/src/main/core/updates/utils.ts b/src/main/core/updates/utils.ts
new file mode 100644
index 0000000000..42ef5465bc
--- /dev/null
+++ b/src/main/core/updates/utils.ts
@@ -0,0 +1,35 @@
+function stripMarkupAndTruncate(raw: string): string {
+  if (!raw) return 'Unknown update error';
+
+  const withoutData = raw.includes('Data:') ? raw.slice(0, raw.indexOf('Data:')) : raw;
+  const noHtml = withoutData.replace(/<!DOCTYPE html.*$/is, '').replace(/<html.*$/is, '');
+  const collapsed = noHtml.replace(/\s+/g, ' ').trim();
+  if (!collapsed) return 'Unknown update error';
+  return collapsed.length > 240 ? `${collapsed.slice(0, 240)}…` : collapsed;
+}
+
+export function formatUpdaterError(error: unknown): string {
+  const err = error as Error & {
+    statusCode?: number;
+    code?: string;
+    status?: number;
+    statusMessage?: string;
+    description?: string;
+  };
+  const status = err.statusCode || err.code || err.status;
+  const statusText = err.statusMessage || err.description;
+  if (status) {
+    const base = `Update request failed with HTTP ${status}`;
+    return statusText ? `${base}: ${stripMarkupAndTruncate(String(statusText))}` : base;
+  }
+  const message = error instanceof Error ? error.message : String(error ?? 'Unknown update error');
+  return stripMarkupAndTruncate(message);
+}
+
+export function sanitizeUpdaterLogArgs(args: unknown[]) {
+  return args.map((arg) => {
+    if (arg instanceof Error) return formatUpdaterError(arg);
+    if (typeof arg === 'string') return stripMarkupAndTruncate(arg);
+    return arg;
+  });
+}
diff --git a/src/main/core/utils/exec.ts b/src/main/core/utils/exec.ts
new file mode 100644
index 0000000000..cd586f7acc
--- /dev/null
+++ b/src/main/core/utils/exec.ts
@@ -0,0 +1,117 @@
+import { execFile } from 'node:child_process';
+import fs from 'node:fs';
+import { promisify } from 'node:util';
+import { quoteShellArg } from '../../utils/shellEscape';
+import type { SshClientProxy } from '../ssh/ssh-client-proxy';
+
+const execFileAsync = promisify(execFile);
+
+function resolveGitBin(): string {
+  const candidates = [
+    (process.env.GIT_PATH || '').trim(),
+    '/opt/homebrew/bin/git',
+    '/usr/local/bin/git',
+    '/usr/bin/git',
+  ].filter(Boolean) as string[];
+  for (const p of candidates) {
+    try {
+      if (fs.existsSync(p)) return p;
+    } catch {}
+  }
+  return 'git';
+}
+
+/** Resolved path to the `git` binary — use for `spawn` when local exec is bypassed. */
+export const GIT_EXECUTABLE = resolveGitBin();
+
+export type ExecFn = (
+  command: string,
+  args?: string[],
+  options?: { cwd?: string; timeout?: number; maxBuffer?: number }
+) => Promise<{ stdout: string; stderr: string }>;
+
+export function getLocalExec(): ExecFn {
+  return (
+    command: string,
+    args: string[] = [],
+    options: { cwd?: string; timeout?: number; maxBuffer?: number } = {}
+  ) => {
+    const bin = command === 'git' ? GIT_EXECUTABLE : command;
+    return execFileAsync(bin, args, options);
+  };
+}
+
+async function addGithubTokenHeader(
+  args: string[],
+  getToken: () => Promise<string | null>
+): Promise<string[]> {
+  const rawToken = await getToken();
+  if (!rawToken) return args;
+
+  const token = Buffer.from(`x-access-token:${rawToken}`).toString('base64');
+  if (!token) return args;
+
+  return ['-c', `http.https://github.com/.extraHeader=Authorization: Basic ${token}`, ...args];
+}
+
+export function getGitLocalExec(getToken: () => Promise<string | null>): ExecFn {
+  const baseExec = getLocalExec();
+  return async (command, args = [], options = {}) => {
+    if (command === 'git') {
+      args = await addGithubTokenHeader(args, getToken);
+    }
+    return baseExec(command, args, options);
+  };
+}
+
+export function getSshExec(proxy: SshClientProxy): ExecFn {
+  return (
+    command: string,
+    args: string[] = [],
+    { cwd }: { cwd?: string; timeout?: number; maxBuffer?: number } = {}
+  ) => {
+    const escaped = args.map(quoteShellArg).join(' ');
+    const inner = args.length ? `${command} ${escaped}` : command;
+    const withCwd = cwd ? `cd ${quoteShellArg(cwd)} && ${inner}` : inner;
+    const full = `bash -l -c ${quoteShellArg(withCwd)}`;
+
+    return new Promise((resolve, reject) => {
+      proxy.client.exec(full, (execErr, stream) => {
+        if (execErr) return reject(execErr);
+        let stdout = '';
+        let stderr = '';
+        stream.on('close', (code: number | null) => {
+          if ((code ?? 0) === 0) {
+            resolve({ stdout, stderr });
+          } else {
+            const e = Object.assign(new Error(stderr || `Process exited with code ${code}`), {
+              stdout,
+              stderr,
+            });
+            reject(e);
+          }
+        });
+        stream.on('data', (d: Buffer) => {
+          stdout += d.toString('utf-8');
+        });
+        stream.stderr.on('data', (d: Buffer) => {
+          stderr += d.toString('utf-8');
+        });
+        stream.on('error', reject);
+      });
+    });
+  };
+}
+
+export function getGitSshExec(
+  proxy: SshClientProxy,
+  getToken: () => Promise<string | null>
+): ExecFn {
+  const baseExec = getSshExec(proxy);
+  return async (command, args = [], options = {}) => {
+    if (command === 'git') {
+      args = await addGithubTokenHeader(args, getToken);
+    }
+    return baseExec(command, args, options);
+  };
+}
diff --git a/src/main/core/view-state/controller.ts b/src/main/core/view-state/controller.ts
new file mode 100644
index 0000000000..4ec2647056
--- /dev/null
+++ b/src/main/core/view-state/controller.ts
@@ -0,0 +1,11 @@
+import { createRPCController } from '@shared/ipc/rpc';
+import { viewStateService } from './view-state-service';
+
+export const viewStateController = createRPCController({
+  save: (key: string, snapshot: unknown): Promise<void> => {
+    return viewStateService.save(key, snapshot);
+  },
+  get: (key: string): Promise<unknown> => viewStateService.get(key),
+  del: (key: string): Promise<void> => viewStateService.del(key),
+  reset: (): Promise<void> => viewStateService.reset(),
+});
diff --git a/src/main/core/view-state/view-state-service.ts b/src/main/core/view-state/view-state-service.ts
new file mode 100644
index 0000000000..eb9c3d43be
--- /dev/null
+++ b/src/main/core/view-state/view-state-service.ts
@@ -0,0 +1,13 @@
+import { KV } from '@main/db/kv';
+
+const viewStateKV = new KV<Record<string, unknown>>('view-state');
+
+export const viewStateService = {
+  save: (key: string, snapshot: unknown): Promise<void> => viewStateKV.set(key, snapshot),
+
+  get: (key: string): Promise<unknown> => viewStateKV.get(key),
+
+  del: (key: string): Promise<void> => viewStateKV.del(key),
+
+  reset: (): Promise<void> => viewStateKV.clear(),
+};
diff --git a/src/main/core/workspaces/workspace-lifecycle-service.test.ts b/src/main/core/workspaces/workspace-lifecycle-service.test.ts
new file mode 100644
index 0000000000..21fb5d84c6
--- /dev/null
+++ b/src/main/core/workspaces/workspace-lifecycle-service.test.ts
@@ -0,0 +1,82 @@
+import { describe, expect, it, vi } from 'vitest';
+import { ptySessionRegistry } from '@main/core/pty/pty-session-registry';
+import type { Pty, PtyExitInfo } from '../pty/pty';
+import type { TerminalProvider } from '../terminals/terminal-provider';
+import { WorkspaceLifecycleService } from './workspace-lifecycle-service';
+
+vi.mock('@main/lib/events', () => ({
+  events: {
+    emit: vi.fn(),
+    on: vi.fn(() => vi.fn()),
+    once: vi.fn(() => vi.fn()),
+  },
+}));
+
+class FakePty implements Pty {
+  writes: string[] = [];
+  private exitHandlers: Array<(info: PtyExitInfo) => void> = [];
+
+  write(data: string): void {
+    this.writes.push(data);
+  }
+
+  resize(): void {}
+
+  kill(): void {}
+
+  onData(): void {}
+
+  onExit(handler: (info: PtyExitInfo) => void): void {
+    this.exitHandlers.push(handler);
+  }
+
+  emitExit(info: PtyExitInfo = { exitCode: 0 }): void {
+    for (const handler of this.exitHandlers) {
+      handler(info);
+    }
+  }
+}
+
+function makeTerminalProvider(): {
+  provider: TerminalProvider;
+  spawned: FakePty[];
+} {
+  const spawned: FakePty[] = [];
+  const provider: TerminalProvider = {
+    async spawnTerminal() {},
+    async spawnLifecycleScript({ terminal }) {
+      const pty = new FakePty();
+      spawned.push(pty);
+      ptySessionRegistry.register(`${terminal.projectId}:${terminal.taskId}:${terminal.id}`, pty, {
+        preserveBufferOnExit: true,
+      });
+    },
+    async killTerminal() {},
+    async destroyAll() {},
+    async detachAll() {},
+  };
+
+  return { provider, spawned };
+}
+
+describe('WorkspaceLifecycleService', () => {
+  it('respawns an interactive lifecycle shell after an exit-backed script finishes', async () => {
+    const { provider, spawned } = makeTerminalProvider();
+    const service = new WorkspaceLifecycleService({
+      projectId: 'project-1',
+      workspaceId: 'branch:feature',
+      terminals: provider,
+    });
+
+    await service.prepareLifecycleScript({ type: 'run', script: 'pnpm dev' });
+    await service.runLifecycleScript({ type: 'run', script: 'pnpm dev' }, { exit: true });
+
+    expect(spawned).toHaveLength(1);
+    expect(spawned[0].writes).toEqual(['pnpm dev; exit\n']);
+
+    spawned[0].emitExit({ exitCode: 0 });
+
+    await expect.poll(() => spawned.length).toBe(2);
+    expect(spawned[1].writes).toEqual([]);
+  });
+});
diff --git a/src/main/core/workspaces/workspace-lifecycle-service.ts b/src/main/core/workspaces/workspace-lifecycle-service.ts
new file mode 100644
index 0000000000..26d9da025e
--- /dev/null
+++ b/src/main/core/workspaces/workspace-lifecycle-service.ts
@@ -0,0 +1,137 @@
+import { ptyExitChannel } from '@shared/events/ptyEvents';
+import { makePtySessionId } from '@shared/ptySessionId';
+import { createScriptTerminalId } from '@shared/terminals';
+import { events } from '@main/lib/events';
+import { ptySessionRegistry } from '../pty/pty-session-registry';
+import type { TerminalProvider } from '../terminals/terminal-provider';
+
+const DEFAULT_COLS = 80;
+const DEFAULT_ROWS = 24;
+
+type LifecycleScript = {
+  type: 'setup' | 'run' | 'teardown';
+  script: string;
+};
+
+export class WorkspaceLifecycleService {
+  private readonly projectId: string;
+  private readonly workspaceId: string;
+  private readonly terminals: TerminalProvider;
+  private disposed = false;
+
+  constructor({
+    projectId,
+    workspaceId,
+    terminals,
+  }: {
+    projectId: string;
+    workspaceId: string;
+    terminals: TerminalProvider;
+  }) {
+    this.projectId = projectId;
+    this.workspaceId = workspaceId;
+    this.terminals = terminals;
+  }
+
+  private async resolveIds(script: LifecycleScript): Promise<{
+    terminalId: string;
+    sessionId: string;
+  }> {
+    const terminalId = await createScriptTerminalId({
+      projectId: this.projectId,
+      scopeId: this.workspaceId,
+      type: script.type,
+      script: script.script,
+    });
+    const sessionId = makePtySessionId(this.projectId, this.workspaceId, terminalId);
+    return { terminalId, sessionId };
+  }
+
+  async prepareLifecycleScript(
+    script: LifecycleScript,
+    options: { initialSize?: { cols: number; rows: number } } = {}
+  ): Promise<void> {
+    const { initialSize = { cols: DEFAULT_COLS, rows: DEFAULT_ROWS } } = options;
+    const { terminalId } = await this.resolveIds(script);
+
+    await this.terminals.spawnLifecycleScript({
+      terminal: {
+        id: terminalId,
+        projectId: this.projectId,
+        taskId: this.workspaceId,
+        name: script.type,
+      },
+      command: '',
+      initialSize,
+      respawnOnExit: false,
+      preserveBufferOnExit: true,
+      watchDevServer: script.type === 'run',
+    });
+  }
+
+  async runLifecycleScript(
+    script: LifecycleScript,
+    options: {
+      waitForExit?: boolean;
+      exit?: boolean;
+      initialSize?: { cols: number; rows: number };
+    } = {}
+  ): Promise<void> {
+    const {
+      waitForExit = false,
+      exit = false,
+      initialSize = { cols: DEFAULT_COLS, rows: DEFAULT_ROWS },
+    } = options;
+
+    const { sessionId } = await this.resolveIds(script);
+
+    if (!ptySessionRegistry.get(sessionId)) {
+      await this.prepareLifecycleScript(script, { initialSize });
+    }
+
+    const pty = ptySessionRegistry.get(sessionId);
+    if (!pty) {
+      throw new Error(
+        `Lifecycle script session unavailable for ${script.type} in workspace ${this.workspaceId}`
+      );
+    }
+
+    if (exit && !waitForExit) {
+      pty.onExit(() => {
+        if (this.disposed) return;
+        this.prepareLifecycleScript(script, { initialSize });
+      });
+    }
+
+    const exitPromise = waitForExit
+      ? new Promise<void>((resolve) => {
+          events.once(ptyExitChannel, () => resolve(), sessionId);
+        })
+      : null;
+
+    const command = exit ? `${script.script}; exit` : script.script;
+    pty.write(`${command}\n`);
+
+    if (exitPromise) {
+      await exitPromise;
+    }
+  }
+
+  async prepareAndRunLifecycleScript(
+    script: LifecycleScript,
+    options: {
+      waitForExit?: boolean;
+      exit?: boolean;
+      initialSize?: { cols: number; rows: number };
+    } = {}
+  ): Promise<void> {
+    const { initialSize = { cols: DEFAULT_COLS, rows: DEFAULT_ROWS }, ...executeOptions } = options;
+    await this.prepareLifecycleScript(script, { initialSize });
+    await this.runLifecycleScript(script, { initialSize, ...executeOptions });
+  }
+
+  async dispose(): Promise<void> {
+    this.disposed = true;
+    await this.terminals.destroyAll();
+  }
+}
diff --git a/src/main/core/workspaces/workspace-registry.test.ts b/src/main/core/workspaces/workspace-registry.test.ts
new file mode 100644
index 0000000000..66266c0333
--- /dev/null
+++ b/src/main/core/workspaces/workspace-registry.test.ts
@@ -0,0 +1,110 @@
+import { describe, expect, it, vi } from 'vitest';
+import type { Workspace } from './workspace';
+import { WorkspaceRegistry } from './workspace-registry';
+
+function makeWorkspace(id: string): {
+  workspace: Workspace;
+  dispose: ReturnType<typeof vi.fn>;
+  gitDispose: ReturnType<typeof vi.fn>;
+} {
+  const dispose = vi.fn(async () => {});
+  const gitDispose = vi.fn();
+
+  return {
+    workspace: {
+      id,
+      path: `/tmp/${id}`,
+      fs: {} as Workspace['fs'],
+      git: { dispose: gitDispose } as unknown as Workspace['git'],
+      settings: {} as Workspace['settings'],
+      lifecycleService: {
+        dispose,
+      } as unknown as Workspace['lifecycleService'],
+    },
+    dispose,
+    gitDispose,
+  };
+}
+
+describe('WorkspaceRegistry', () => {
+  it('creates once and increments ref count on repeated acquire', async () => {
+    const registry = new WorkspaceRegistry();
+    const { workspace } = makeWorkspace('branch:main');
+    const factory = vi.fn(async () => workspace);
+
+    const first = await registry.acquire('branch:main', factory);
+    const second = await registry.acquire('branch:main', factory);
+
+    expect(first).toBe(workspace);
+    expect(second).toBe(workspace);
+    expect(factory).toHaveBeenCalledTimes(1);
+    expect(registry.get('branch:main')).toBe(workspace);
+    expect(registry.refCount('branch:main')).toBe(2);
+  });
+
+  it('coalesces concurrent acquires for the same key', async () => {
+    const registry = new WorkspaceRegistry();
+    const { workspace } = makeWorkspace('branch:main');
+    let resolveFactory: ((value: Workspace) => void) | undefined;
+    const factory = vi.fn(
+      () =>
+        new Promise<Workspace>((resolve) => {
+          resolveFactory = resolve;
+        })
+    );
+
+    const first = registry.acquire('branch:main', factory);
+    const second = registry.acquire('branch:main', factory);
+
+    expect(factory).toHaveBeenCalledTimes(1);
+    resolveFactory?.(workspace);
+
+    await expect(first).resolves.toBe(workspace);
+    await expect(second).resolves.toBe(workspace);
+    expect(registry.refCount('branch:main')).toBe(2);
+  });
+
+  it('disposes workspace resources when ref count reaches zero', async () => {
+    const registry = new WorkspaceRegistry();
+    const { workspace, dispose, gitDispose } = makeWorkspace('branch:main');
+    const factory = vi.fn(async () => workspace);
+
+    await registry.acquire('branch:main', factory);
+    await registry.acquire('branch:main', factory);
+
+    await registry.release('branch:main');
+    expect(dispose).not.toHaveBeenCalled();
+    expect(gitDispose).not.toHaveBeenCalled();
+    expect(registry.refCount('branch:main')).toBe(1);
+
+    await registry.release('branch:main');
+    expect(gitDispose).toHaveBeenCalledTimes(1);
+    expect(dispose).toHaveBeenCalledTimes(1);
+    expect(registry.get('branch:main')).toBeUndefined();
+    expect(registry.refCount('branch:main')).toBe(0);
+  });
+
+  it('releaseAll disposes each workspace once and clears the registry', async () => {
+    const registry = new WorkspaceRegistry();
+    const first = makeWorkspace('branch:main');
+    const second = makeWorkspace('root:');
+
+    await registry.acquire('branch:main', async () => first.workspace);
+    await registry.acquire('branch:main', async () => first.workspace);
+    await registry.acquire('root:', async () => second.workspace);
+
+    await registry.releaseAll();
+
+    expect(first.gitDispose).toHaveBeenCalledTimes(1);
+    expect(first.dispose).toHaveBeenCalledTimes(1);
+    expect(second.gitDispose).toHaveBeenCalledTimes(1);
+    expect(second.dispose).toHaveBeenCalledTimes(1);
+    expect(registry.refCount('branch:main')).toBe(0);
+    expect(registry.refCount('root:')).toBe(0);
+  });
+
+  it('ignores release for unknown keys', async () => {
+    const registry = new WorkspaceRegistry();
+    await expect(registry.release('missing')).resolves.toBeUndefined();
+  });
+});
diff --git a/src/main/core/workspaces/workspace-registry.ts b/src/main/core/workspaces/workspace-registry.ts
new file mode 100644
index 0000000000..30d259ed5f
--- /dev/null
+++ b/src/main/core/workspaces/workspace-registry.ts
@@ -0,0 +1,79 @@
+import type { Workspace } from './workspace';
+
+type WorkspaceEntry = {
+  workspace: Workspace;
+  refCount: number;
+};
+
+export class WorkspaceRegistry {
+  private entries = new Map<string, WorkspaceEntry>();
+  private acquiring = new Map<string, Promise<Workspace>>();
+
+  async acquire(key: string, factory: () => Promise<Workspace>): Promise<Workspace> {
+    const existing = this.entries.get(key);
+    if (existing) {
+      existing.refCount += 1;
+      return existing.workspace;
+    }
+
+    const inFlight = this.acquiring.get(key);
+    if (inFlight) {
+      const workspace = await inFlight;
+      const current = this.entries.get(key);
+      if (current) current.refCount += 1;
+      return workspace;
+    }
+
+    const pending = factory()
+      .then((workspace) => {
+        this.entries.set(key, { workspace, refCount: 1 });
+        return workspace;
+      })
+      .finally(() => {
+        this.acquiring.delete(key);
+      });
+
+    this.acquiring.set(key, pending);
+    return pending;
+  }
+
+  async release(key: string): Promise<void> {
+    const entry = this.entries.get(key);
+    if (!entry) {
+      const inFlight = this.acquiring.get(key);
+      if (inFlight) {
+        await inFlight;
+        await this.release(key);
+      }
+      return;
+    }
+
+    if (entry.refCount > 1) {
+      entry.refCount -= 1;
+      return;
+    }
+
+    this.entries.delete(key);
+    entry.workspace.git.dispose();
+    await entry.workspace.lifecycleService.dispose();
+  }
+
+  get(key: string): Workspace | undefined {
+    return this.entries.get(key)?.workspace;
+  }
+
+  refCount(key: string): number {
+    return this.entries.get(key)?.refCount ?? 0;
+  }
+
+  async releaseAll(): Promise<void> {
+    const entries = Array.from(this.entries.values());
+    this.entries.clear();
+    await Promise.all(
+      entries.map(async (entry) => {
+        entry.workspace.git.dispose();
+        await entry.workspace.lifecycleService.dispose();
+      })
+    );
+  }
+}
diff --git a/src/main/core/workspaces/workspace.ts b/src/main/core/workspaces/workspace.ts
new file mode 100644
index 0000000000..4e08902c05
--- /dev/null
+++ b/src/main/core/workspaces/workspace.ts
@@ -0,0 +1,13 @@
+import type { FileSystemProvider } from '@main/core/fs/types';
+import type { WorkspaceGitProvider } from '@main/core/git/workspace-git-provider';
+import type { ProjectSettingsProvider } from '@main/core/projects/settings/schema';
+import type { WorkspaceLifecycleService } from './workspace-lifecycle-service';
+
+export interface Workspace {
+  readonly id: string;
+  readonly path: string;
+  readonly fs: FileSystemProvider;
+  readonly git: WorkspaceGitProvider;
+  readonly settings: ProjectSettingsProvider;
+  readonly lifecycleService: WorkspaceLifecycleService;
+}
diff --git a/src/main/db/client.ts b/src/main/db/client.ts
new file mode 100644
index 0000000000..fcc6f4c917
--- /dev/null
+++ b/src/main/db/client.ts
@@ -0,0 +1,12 @@
+import Database from 'better-sqlite3';
+import { drizzle } from 'drizzle-orm/better-sqlite3';
+import { resolveDatabasePath } from './path';
+import * as schema from './schema';
+
+export type AppDb = ReturnType<typeof drizzle<typeof schema>>;
+
+export const sqlite = new Database(resolveDatabasePath());
+sqlite.pragma('journal_mode = WAL');
+sqlite.pragma('busy_timeout = 5000');
+
+export const db = drizzle(sqlite, { schema });
diff --git a/src/main/db/database-file.ts b/src/main/db/database-file.ts
new file mode 100644
index 0000000000..0843a9ff2a
--- /dev/null
+++ b/src/main/db/database-file.ts
@@ -0,0 +1,50 @@
+import fs from 'node:fs';
+import { dirname, join } from 'node:path';
+import Database from 'better-sqlite3';
+import { CURRENT_DB_FILENAME, PREVIOUS_DB_FILENAME } from './default-path';
+
+function quoteSqliteString(value: string): string {
+  return `'${value.split("'").join("''")}'`;
+}
+
+export function copySqliteDatabase(sourcePath: string, destinationPath: string): void {
+  fs.mkdirSync(dirname(destinationPath), { recursive: true });
+
+  const source = new Database(sourcePath, { readonly: true, fileMustExist: true });
+  try {
+    source.pragma('busy_timeout = 5000');
+    source.exec(`VACUUM INTO ${quoteSqliteString(destinationPath)}`);
+  } finally {
+    source.close();
+  }
+}
+
+function clearCopiedAppSecrets(databasePath: string): void {
+  const copied = new Database(databasePath, { fileMustExist: true });
+  try {
+    copied.pragma('busy_timeout = 5000');
+    const hasAppSecretsTable = copied
+      .prepare("SELECT 1 FROM sqlite_master WHERE type = 'table' AND name = ? LIMIT 1")
+      .get('app_secrets');
+    if (hasAppSecretsTable) {
+      copied.exec('DELETE FROM app_secrets');
+    }
+  } finally {
+    copied.close();
+  }
+}
+
+export function resolveDefaultDatabasePath(userDataPath: string): string {
+  const currentPath = join(userDataPath, CURRENT_DB_FILENAME);
+  if (fs.existsSync(currentPath)) {
+    return currentPath;
+  }
+
+  const previousPath = join(userDataPath, PREVIOUS_DB_FILENAME);
+  if (fs.existsSync(previousPath)) {
+    copySqliteDatabase(previousPath, currentPath);
+    clearCopiedAppSecrets(currentPath);
+  }
+
+  return currentPath;
+}
diff --git a/src/main/db/default-path.ts b/src/main/db/default-path.ts
new file mode 100644
index 0000000000..e203fbda8d
--- /dev/null
+++ b/src/main/db/default-path.ts
@@ -0,0 +1,40 @@
+import { homedir } from 'node:os';
+import { join } from 'node:path';
+
+export const PREVIOUS_DB_FILENAME = 'emdash3.db';
+export const CURRENT_DB_FILENAME = 'emdash4.db';
+const USER_DATA_DIR_NAME = 'emdash';
+
+/**
+ * Returns the platform-specific default userData directory without requiring
+ * the Electron `app` module. This is pinned to the shared `emdash` directory
+ * regardless of product identity.
+ *
+ * Pass this result as `userDataPath` to `resolveDatabasePath()` when running
+ * outside of Electron (e.g. drizzle-kit CLI).
+ */
+export function resolveDefaultUserDataPath(): string {
+  const home = process.env.HOME ?? homedir();
+  const platform = process.platform;
+
+  if (platform === 'darwin') {
+    return join(home, 'Library', 'Application Support', USER_DATA_DIR_NAME);
+  }
+
+  if (platform === 'win32') {
+    const appData = process.env.APPDATA ?? join(home, 'AppData', 'Roaming');
+    return join(appData, USER_DATA_DIR_NAME);
+  }
+
+  const xdgConfig = process.env.XDG_CONFIG_HOME ?? join(home, '.config');
+  return join(xdgConfig, USER_DATA_DIR_NAME);
+}
+
+/**
+ * Returns the default database file path given a resolved userData directory.
+ * Does not check for file existence or perform any migration — suitable for
+ * contexts that only need a path (e.g. drizzle-kit config).
+ */
+export function defaultDbFilePath(userDataPath: string): string {
+  return join(userDataPath, CURRENT_DB_FILENAME);
+}
diff --git a/src/main/db/drizzleClient.ts b/src/main/db/drizzleClient.ts
index d4ef5c0c71..1bc0d1dcf4 100644
--- a/src/main/db/drizzleClient.ts
+++ b/src/main/db/drizzleClient.ts
@@ -1,227 +1,48 @@
-import type sqlite3Type from 'sqlite3';
-import {
-  type AsyncBatchRemoteCallback,
-  type RemoteCallback,
-  type SqliteRemoteDatabase,
-  drizzle,
-} from 'drizzle-orm/sqlite-proxy';
-
-import * as schema from './schema';
+import Database from 'better-sqlite3';
+import { drizzle } from 'drizzle-orm/better-sqlite3';
 import { resolveDatabasePath } from './path';
+import * as schema from './schema';
 
 type AppSchema = typeof schema;
 
-export type DrizzleDb = SqliteRemoteDatabase<AppSchema>;
-
-interface InternalClient {
-  client: DrizzleClient;
-  owned: boolean;
-}
+export type DrizzleDb = ReturnType<typeof drizzle<AppSchema>>;
 
 export interface DrizzleClient {
   db: DrizzleDb;
-  sqlite: sqlite3Type.Database;
-  close: () => Promise<void>;
+  sqlite: Database.Database;
+  close: () => void;
 }
 
 export interface CreateDrizzleClientOptions {
-  database?: sqlite3Type.Database;
+  database?: Database.Database;
   filePath?: string;
   busyTimeoutMs?: number;
-  cacheResult?: boolean;
 }
 
-let sqliteModulePromise: Promise<typeof sqlite3Type> | null = null;
-let cachedInternal: InternalClient | null = null;
-
 const DEFAULT_BUSY_TIMEOUT_MS = 5000;
 
-async function loadSqliteModule(): Promise<typeof sqlite3Type> {
-  if (!sqliteModulePromise) {
-    sqliteModulePromise = import('sqlite3').then((mod) => mod as unknown as typeof sqlite3Type);
-  }
-  return sqliteModulePromise;
-}
-
-function normalizeParams(params: unknown[] | undefined): unknown[] {
-  return Array.isArray(params) ? params : [];
-}
-
-function createCallbacks(db: sqlite3Type.Database) {
-  const runStatement = (
-    sql: string,
-    params: unknown[]
-  ): Promise<{ rows: unknown[]; lastID: number; changes: number }> =>
-    new Promise((resolve, reject) => {
-      db.run(sql, params, function (err) {
-        if (err) {
-          reject(err);
-          return;
-        }
-        resolve({
-          rows: [],
-          lastID: this.lastID,
-          changes: this.changes,
-        });
-      });
-    });
-
-  const allStatement = (sql: string, params: unknown[]): Promise<unknown[]> =>
-    new Promise((resolve, reject) => {
-      db.all(sql, params, (err, rows) => {
-        if (err) {
-          reject(err);
-          return;
-        }
-        resolve(rows);
-      });
-    });
-
-  const getStatement = (sql: string, params: unknown[]): Promise<unknown | undefined> =>
-    new Promise((resolve, reject) => {
-      db.get(sql, params, (err, row) => {
-        if (err) {
-          reject(err);
-        } else {
-          resolve(row ?? undefined);
-        }
-      });
-    });
-
-  const mapRowToValues = (row: unknown): unknown[] => {
-    if (Array.isArray(row)) {
-      return row;
-    }
-    if (row && typeof row === 'object') {
-      return Object.values(row as Record<string, unknown>);
-    }
-    return [];
-  };
-
-  const remote: RemoteCallback = async (sql, params, method) => {
-    const normalized = normalizeParams(params);
-
-    switch (method) {
-      case 'run': {
-        const result = await runStatement(sql, normalized);
-        return {
-          rows: result.rows,
-          lastID: result.lastID,
-          changes: result.changes,
-        } as any;
-      }
-      case 'all': {
-        const rows = await allStatement(sql, normalized);
-        return { rows: rows.map(mapRowToValues) } as any;
-      }
-      case 'get': {
-        const row = await getStatement(sql, normalized);
-        return {
-          rows: row === undefined ? null : mapRowToValues(row),
-        } as any;
-      }
-      case 'values': {
-        const rows = await allStatement(sql, normalized);
-        const values = rows.map((row) =>
-          Array.isArray(row) ? row : Object.values(row as Record<string, unknown>)
-        );
-        return { rows: values } as any;
-      }
-      default: {
-        throw new Error(`Unsupported sqlite method "${method}"`);
-      }
-    }
-  };
-
-  const batch: AsyncBatchRemoteCallback = async (operations) => {
-    const results: any[] = [];
-    for (const op of operations) {
-      results.push(await remote(op.sql, op.params, op.method));
-    }
-    return results;
-  };
-
-  return { remote, batch };
-}
-
-async function openDatabase(
-  filePath: string,
-  busyTimeoutMs: number
-): Promise<sqlite3Type.Database> {
-  const sqliteModule = await loadSqliteModule();
-  const db = await new Promise<sqlite3Type.Database>((resolve, reject) => {
-    const instance = new sqliteModule.Database(filePath, (err) => {
-      if (err) {
-        reject(err);
-      } else {
-        resolve(instance);
-      }
-    });
-  });
-
-  if (typeof db.configure === 'function') {
-    db.configure('busyTimeout', busyTimeoutMs);
-  }
-
+function openDatabase(filePath: string, busyTimeoutMs: number): Database.Database {
+  const db = new Database(filePath);
+  db.pragma('journal_mode = WAL');
+  db.pragma(`busy_timeout = ${busyTimeoutMs}`);
   return db;
 }
 
-export async function createDrizzleClient(
-  options: CreateDrizzleClientOptions = {}
-): Promise<DrizzleClient> {
+export function createDrizzleClient(options: CreateDrizzleClientOptions = {}): DrizzleClient {
   if (process.env.EMDASH_DISABLE_NATIVE_DB === '1') {
     throw new Error('Native SQLite database is disabled via EMDASH_DISABLE_NATIVE_DB=1');
   }
 
   const busyTimeout = options.busyTimeoutMs ?? DEFAULT_BUSY_TIMEOUT_MS;
-  const db =
-    options.database ??
-    (await openDatabase(options.filePath ?? resolveDatabasePath(), busyTimeout));
-
-  const { remote, batch } = createCallbacks(db);
-  const drizzleDb = drizzle(remote, batch, { schema });
+  const sqlite =
+    options.database ?? openDatabase(options.filePath ?? resolveDatabasePath(), busyTimeout);
+  const db = drizzle(sqlite, { schema });
 
   const client: DrizzleClient = {
-    db: drizzleDb,
-    sqlite: db,
-    close: () =>
-      new Promise((resolve, reject) => {
-        db.close((err) => {
-          if (err) {
-            reject(err);
-          } else {
-            resolve();
-          }
-        });
-      }),
+    db,
+    sqlite,
+    close: () => sqlite.close(),
   };
 
-  const shouldCache = options.cacheResult ?? (!options.database && options.filePath === undefined);
-
-  if (shouldCache) {
-    cachedInternal = {
-      client,
-      owned: !options.database,
-    };
-  }
-
   return client;
 }
-
-export async function getDrizzleClient(): Promise<DrizzleClient> {
-  if (cachedInternal) {
-    return cachedInternal.client;
-  }
-
-  return await createDrizzleClient();
-}
-
-export async function resetDrizzleClient(): Promise<void> {
-  if (!cachedInternal) return;
-
-  if (cachedInternal.owned) {
-    await cachedInternal.client.close().catch(() => {});
-  }
-
-  cachedInternal = null;
-}
diff --git a/src/main/db/initialize.ts b/src/main/db/initialize.ts
new file mode 100644
index 0000000000..a713df77ab
--- /dev/null
+++ b/src/main/db/initialize.ts
@@ -0,0 +1,64 @@
+import { createHash } from 'node:crypto';
+import type BetterSqlite3 from 'better-sqlite3';
+import journal from '@root/drizzle/meta/_journal.json';
+import { sqlite } from './client';
+
+// Vite bundles all migration SQL files at build time — no runtime path resolution needed.
+// Each value is the raw SQL string content of the file.
+const sqlFiles = import.meta.glob('@root/drizzle/*.sql', {
+  query: '?raw',
+  import: 'default',
+  eager: true,
+}) as Record<string, string>;
+
+type JournalEntry = { idx: number; when: number; tag: string; breakpoints: boolean };
+
+function runBundledMigrations(connection: BetterSqlite3.Database): void {
+  connection.exec(`
+    CREATE TABLE IF NOT EXISTS __drizzle_migrations (
+      id INTEGER PRIMARY KEY AUTOINCREMENT,
+      hash TEXT NOT NULL,
+      created_at NUMERIC
+    )
+  `);
+
+  const lastRow = connection
+    .prepare('SELECT created_at FROM __drizzle_migrations ORDER BY created_at DESC LIMIT 1')
+    .get() as { created_at: number } | undefined;
+  const lastTimestamp = lastRow?.created_at ?? 0;
+
+  connection.transaction(() => {
+    for (const entry of (journal as { entries: JournalEntry[] }).entries) {
+      if (entry.when <= lastTimestamp) continue;
+
+      const sqlKey = Object.keys(sqlFiles).find((k) => k.includes(entry.tag));
+      if (!sqlKey) throw new Error(`Missing bundled SQL for migration: ${entry.tag}`);
+
+      const sql = sqlFiles[sqlKey];
+      const hash = createHash('sha256').update(sql).digest('hex');
+
+      for (const stmt of sql.split('--> statement-breakpoint')) {
+        const trimmed = stmt.trim();
+        if (trimmed) connection.exec(trimmed);
+      }
+
+      connection
+        .prepare('INSERT INTO __drizzle_migrations (hash, created_at) VALUES (?, ?)')
+        .run(hash, entry.when);
+    }
+  })();
+}
+
+/**
+ * Runs all pending migrations against the shared SQLite connection and validates
+ * the schema contract. Call this once in main.ts before any db queries run.
+ *
+ * Throws `DatabaseSchemaMismatchError` when required columns/tables are missing
+ * after migration (e.g. the user downgraded from a newer build).
+ *
+ * Returns the raw better-sqlite3 handle so the caller can close it on shutdown.
+ */
+export async function initializeDatabase(): Promise<BetterSqlite3.Database> {
+  runBundledMigrations(sqlite);
+  return sqlite;
+}
diff --git a/src/main/db/kv.ts b/src/main/db/kv.ts
new file mode 100644
index 0000000000..0647797b70
--- /dev/null
+++ b/src/main/db/kv.ts
@@ -0,0 +1,58 @@
+import { eq, like } from 'drizzle-orm';
+import { db } from './client';
+import { kv } from './schema';
+
+export class KV<TSchema extends Record<string, unknown>> {
+  constructor(private readonly namespace: string) {}
+
+  private prefixed(key: string): string {
+    return `${this.namespace}:${key}`;
+  }
+
+  async get<K extends keyof TSchema & string>(key: K): Promise<TSchema[K] | null> {
+    const rows = await db
+      .select({ value: kv.value })
+      .from(kv)
+      .where(eq(kv.key, this.prefixed(key)))
+      .limit(1);
+
+    const raw = rows[0]?.value;
+    if (raw === undefined || raw === null) return null;
+
+    try {
+      return JSON.parse(raw) as TSchema[K];
+    } catch {
+      return null;
+    }
+  }
+
+  async set<K extends keyof TSchema & string>(key: K, value: TSchema[K]): Promise<void> {
+    try {
+      const serialised = JSON.stringify(value);
+      const now = Date.now();
+
+      await db
+        .insert(kv)
+        .values({ key: this.prefixed(key), value: serialised, updatedAt: now })
+        .onConflictDoUpdate({ target: kv.key, set: { value: serialised, updatedAt: now } });
+    } catch (e) {
+      // kv table may not exist yet during the first-run migration window
+    }
+  }
+
+  async del<K extends keyof TSchema & string>(key: K): Promise<void> {
+    try {
+      await db.delete(kv).where(eq(kv.key, this.prefixed(key)));
+    } catch {
+      // kv table may not exist yet during the first-run migration window
+    }
+  }
+
+  async clear(): Promise<void> {
+    try {
+      await db.delete(kv).where(like(kv.key, `${this.namespace}:%`));
+    } catch {
+      // kv table may not exist yet during the first-run migration window
+    }
+  }
+}
diff --git a/src/main/db/legacy-port/controller.ts b/src/main/db/legacy-port/controller.ts
new file mode 100644
index 0000000000..f98ba4ce85
--- /dev/null
+++ b/src/main/db/legacy-port/controller.ts
@@ -0,0 +1,66 @@
+import { count } from 'drizzle-orm';
+import { app } from 'electron';
+import { createRPCController } from '@shared/ipc/rpc';
+import { db } from '@main/db/client';
+import { projects, tasks } from '@main/db/schema';
+import { log } from '@main/lib/logger';
+import { legacyTableExists } from './importers/relational/helpers';
+import { openLegacyReadOnly } from './legacy-source/open-readonly';
+import { hasLegacyDatabaseFile, resolveLegacyDatabasePath } from './legacy-source/path';
+import { createDefaultLegacyPortStateStore, runLegacyPort } from './service';
+
+export const legacyPortController = createRPCController({
+  checkStatus: async () => {
+    const userDataPath = app.getPath('userData');
+    const hasLegacyDb = hasLegacyDatabaseFile(userDataPath);
+    const stateStore = await createDefaultLegacyPortStateStore();
+    const portStatus = await stateStore.getStatus();
+    const [{ value: projectCount }] = await db.select({ value: count() }).from(projects);
+    const [{ value: taskCount }] = await db.select({ value: count() }).from(tasks);
+    const hasExistingData = projectCount > 0 || taskCount > 0;
+    return { hasLegacyDb, portStatus: portStatus ?? null, hasExistingData };
+  },
+
+  getPreview: async () => {
+    const userDataPath = app.getPath('userData');
+    if (!hasLegacyDatabaseFile(userDataPath)) {
+      return { projects: 0, tasks: 0 };
+    }
+    const legacyPath = resolveLegacyDatabasePath(userDataPath);
+    let legacyDb;
+    try {
+      legacyDb = openLegacyReadOnly(legacyPath);
+      const projectCount = legacyTableExists(legacyDb, 'projects')
+        ? (legacyDb.prepare('SELECT COUNT(*) as count FROM projects').get() as { count: number })
+            .count
+        : 0;
+      const taskCount = legacyTableExists(legacyDb, 'tasks')
+        ? (legacyDb.prepare('SELECT COUNT(*) as count FROM tasks').get() as { count: number }).count
+        : 0;
+      return { projects: projectCount, tasks: taskCount };
+    } catch (error) {
+      log.warn('legacy-port controller: failed to read preview counts', {
+        error: error instanceof Error ? error.message : String(error),
+      });
+      return { projects: 0, tasks: 0 };
+    } finally {
+      legacyDb?.close();
+    }
+  },
+
+  runImport: async () => {
+    const userDataPath = app.getPath('userData');
+    try {
+      await runLegacyPort(userDataPath);
+      return { success: true };
+    } catch (error) {
+      log.error('legacy-port controller: import failed', {
+        error: error instanceof Error ? error.message : String(error),
+      });
+      return {
+        success: false,
+        error: error instanceof Error ? error.message : 'Import failed',
+      };
+    }
+  },
+});
diff --git a/src/main/db/legacy-port/importers/auth/importer.test.ts b/src/main/db/legacy-port/importers/auth/importer.test.ts
new file mode 100644
index 0000000000..b5fb36fb51
--- /dev/null
+++ b/src/main/db/legacy-port/importers/auth/importer.test.ts
@@ -0,0 +1,273 @@
+import fs from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
+import Database from 'better-sqlite3';
+import { afterEach, describe, expect, it } from 'vitest';
+import { createDrizzleClient } from '../../../drizzleClient';
+import { portLegacyAuthState } from './importer';
+
+function createAppDbWithConfigTables(): {
+  appSqlite: Database.Database;
+  appDb: ReturnType<typeof createDrizzleClient>['db'];
+} {
+  const appSqlite = new Database(':memory:');
+  appSqlite.exec(`
+    CREATE TABLE kv (
+      key TEXT PRIMARY KEY,
+      value TEXT NOT NULL,
+      updated_at INTEGER NOT NULL DEFAULT CURRENT_TIMESTAMP
+    );
+
+    CREATE TABLE app_secrets (
+      key TEXT PRIMARY KEY,
+      secret TEXT NOT NULL
+    );
+  `);
+  return {
+    appSqlite,
+    appDb: createDrizzleClient({ database: appSqlite }).db,
+  };
+}
+
+function readKv<T>(appSqlite: Database.Database, fullKey: string): T | null {
+  const row = appSqlite.prepare('SELECT value FROM kv WHERE key = ?').get(fullKey) as
+    | { value: string }
+    | undefined;
+  if (!row) return null;
+  return JSON.parse(row.value) as T;
+}
+
+function readSecret(appSqlite: Database.Database, key: string): string | null {
+  const row = appSqlite.prepare('SELECT secret FROM app_secrets WHERE key = ?').get(key) as
+    | { secret: string }
+    | undefined;
+  return row?.secret ?? null;
+}
+
+function upsertKv(
+  appSqlite: Database.Database,
+  namespace: string,
+  key: string,
+  value: unknown
+): void {
+  appSqlite
+    .prepare(
+      `
+        INSERT INTO kv (key, value, updated_at)
+        VALUES (?, ?, ?)
+        ON CONFLICT(key) DO UPDATE
+        SET value = excluded.value, updated_at = excluded.updated_at
+      `
+    )
+    .run(`${namespace}:${key}`, JSON.stringify(value), Date.now());
+}
+
+function upsertSecret(appSqlite: Database.Database, key: string, secret: string): void {
+  appSqlite
+    .prepare(
+      `
+        INSERT INTO app_secrets (key, secret)
+        VALUES (?, ?)
+        ON CONFLICT(key) DO UPDATE SET secret = excluded.secret
+      `
+    )
+    .run(key, secret);
+}
+
+describe('portLegacyAuthState', () => {
+  const tempDirs: string[] = [];
+  const openDbs: Database.Database[] = [];
+
+  afterEach(() => {
+    for (const db of openDbs.splice(0)) db.close();
+    for (const dir of tempDirs.splice(0)) {
+      fs.rmSync(dir, { recursive: true, force: true });
+    }
+  });
+
+  it('ports keychain secrets + legacy JSON files into app_secrets and kv', async () => {
+    const userDataDir = fs.mkdtempSync(path.join(os.tmpdir(), 'legacy-auth-port-'));
+    tempDirs.push(userDataDir);
+
+    fs.writeFileSync(
+      path.join(userDataDir, 'jira.json'),
+      JSON.stringify({ siteUrl: 'https://jira.example.com', email: 'me@example.com' }),
+      'utf8'
+    );
+    fs.writeFileSync(
+      path.join(userDataDir, 'forgejo.json'),
+      JSON.stringify({ siteUrl: 'https://forgejo.example.com/' }),
+      'utf8'
+    );
+    fs.writeFileSync(
+      path.join(userDataDir, 'gitlab.json'),
+      JSON.stringify({ siteUrl: 'https://gitlab.example.com/' }),
+      'utf8'
+    );
+    fs.writeFileSync(
+      path.join(userDataDir, 'emdash-account.json'),
+      JSON.stringify({
+        hasAccount: true,
+        userId: 'user-1',
+        username: 'jona',
+        avatarUrl: 'https://example.com/avatar.png',
+        email: 'jona@example.com',
+        lastValidated: '2026-04-23T12:00:00.000Z',
+      }),
+      'utf8'
+    );
+
+    const secretMap = new Map<string, string>([
+      ['emdash-github:github-token', 'gh_123'],
+      ['emdash-linear:api-token', 'lin_123'],
+      ['emdash-jira:api-token', 'jira_123'],
+      ['emdash-plain:api-token', 'plain_123'],
+      ['emdash-forgejo:forgejo-token', 'forgejo_123'],
+      ['emdash-gitlab:gitlab-token', 'gitlab_123'],
+      ['emdash-account:session-token', 'session_123'],
+      ['emdash-ssh:legacy-ssh-1:password', 'ssh_pwd_123'],
+    ]);
+
+    const { appSqlite, appDb } = createAppDbWithConfigTables();
+    openDbs.push(appSqlite);
+
+    const summary = await portLegacyAuthState(userDataDir, {
+      appDb,
+      appSqlite,
+      readLegacySecret: async (service, account) => secretMap.get(`${service}:${account}`) ?? null,
+      encryptSecret: (secret) => Buffer.from(`enc:${secret}`, 'utf8').toString('base64'),
+      legacyToAppSshConnectionId: new Map([['legacy-ssh-1', 'ssh-app-1']]),
+      writeKv: async (namespace, key, value) => {
+        upsertKv(appSqlite, namespace, key, value);
+      },
+      secretsStore: {
+        async setEncryptedSecret(key, encryptedSecret) {
+          upsertSecret(appSqlite, key, encryptedSecret);
+        },
+      },
+    });
+
+    expect(summary.importedSecrets).toEqual([
+      'github',
+      'linear',
+      'jira',
+      'plain',
+      'forgejo',
+      'gitlab',
+      'account',
+    ]);
+    expect(summary.importedSshPasswords).toBe(1);
+
+    expect(readSecret(appSqlite, 'emdash-github-token')).toBe(
+      Buffer.from('enc:gh_123', 'utf8').toString('base64')
+    );
+    expect(readSecret(appSqlite, 'emdash-account-token')).toBe(
+      Buffer.from('enc:session_123', 'utf8').toString('base64')
+    );
+    expect(readSecret(appSqlite, 'ssh:ssh-app-1:password')).toBe(
+      Buffer.from('enc:ssh_pwd_123', 'utf8').toString('base64')
+    );
+
+    expect(readKv<string>(appSqlite, 'github:tokenSource')).toBe('secure_storage');
+    expect(readKv<{ siteUrl: string; email: string }>(appSqlite, 'jira:creds')).toEqual({
+      siteUrl: 'https://jira.example.com',
+      email: 'me@example.com',
+    });
+    expect(readKv<{ instanceUrl: string }>(appSqlite, 'forgejo:connection')).toEqual({
+      instanceUrl: 'https://forgejo.example.com',
+    });
+    expect(readKv<{ instanceUrl: string }>(appSqlite, 'gitlab:connection')).toEqual({
+      instanceUrl: 'https://gitlab.example.com',
+    });
+    expect(
+      readKv<{ userId: string; username: string }>(appSqlite, 'account:profile')
+    ).toMatchObject({
+      userId: 'user-1',
+      username: 'jona',
+    });
+  });
+
+  it('skips malformed legacy config without throwing', async () => {
+    const userDataDir = fs.mkdtempSync(path.join(os.tmpdir(), 'legacy-auth-port-invalid-'));
+    tempDirs.push(userDataDir);
+
+    fs.writeFileSync(path.join(userDataDir, 'jira.json'), '{bad-json', 'utf8');
+    fs.writeFileSync(
+      path.join(userDataDir, 'emdash-account.json'),
+      JSON.stringify({ hasAccount: true, userId: '', username: '' }),
+      'utf8'
+    );
+
+    const { appSqlite, appDb } = createAppDbWithConfigTables();
+    openDbs.push(appSqlite);
+
+    const summary = await portLegacyAuthState(userDataDir, {
+      appDb,
+      appSqlite,
+      readLegacySecret: async () => null,
+      encryptSecret: (secret) => Buffer.from(secret, 'utf8').toString('base64'),
+      legacyToAppSshConnectionId: new Map([['legacy-ssh-1', 'ssh-app-1']]),
+      writeKv: async (namespace, key, value) => {
+        upsertKv(appSqlite, namespace, key, value);
+      },
+      secretsStore: {
+        async setEncryptedSecret(key, encryptedSecret) {
+          upsertSecret(appSqlite, key, encryptedSecret);
+        },
+      },
+    });
+
+    expect(summary.importedSecrets).toEqual([]);
+    expect(summary.importedKv).toEqual([]);
+    expect(summary.importedSshPasswords).toBe(0);
+    expect(summary.skipped.length).toBeGreaterThan(0);
+
+    const secretCount = (
+      appSqlite.prepare('SELECT COUNT(*) AS count FROM app_secrets').get() as {
+        count: number;
+      }
+    ).count;
+    const kvCount = (
+      appSqlite.prepare('SELECT COUNT(*) AS count FROM kv').get() as { count: number }
+    ).count;
+
+    expect(secretCount).toBe(0);
+    expect(kvCount).toBe(0);
+  });
+
+  it('does not overwrite an existing app ssh password on dedup remap', async () => {
+    const userDataDir = fs.mkdtempSync(path.join(os.tmpdir(), 'legacy-auth-port-ssh-dedup-'));
+    tempDirs.push(userDataDir);
+
+    const { appSqlite, appDb } = createAppDbWithConfigTables();
+    openDbs.push(appSqlite);
+
+    appSqlite
+      .prepare('INSERT INTO app_secrets (key, secret) VALUES (?, ?)')
+      .run('ssh:ssh-app-1:password', Buffer.from('enc:existing_pwd', 'utf8').toString('base64'));
+
+    const secretMap = new Map<string, string>([['emdash-ssh:legacy-ssh-1:password', 'legacy_pwd']]);
+
+    const summary = await portLegacyAuthState(userDataDir, {
+      appDb,
+      appSqlite,
+      readLegacySecret: async (service, account) => secretMap.get(`${service}:${account}`) ?? null,
+      encryptSecret: (secret) => Buffer.from(`enc:${secret}`, 'utf8').toString('base64'),
+      legacyToAppSshConnectionId: new Map([['legacy-ssh-1', 'ssh-app-1']]),
+      writeKv: async (namespace, key, value) => {
+        upsertKv(appSqlite, namespace, key, value);
+      },
+      secretsStore: {
+        async setEncryptedSecret(key, encryptedSecret) {
+          upsertSecret(appSqlite, key, encryptedSecret);
+        },
+      },
+    });
+
+    expect(summary.importedSshPasswords).toBe(0);
+    expect(summary.skipped).toContain('ssh.password:ssh-app-1:already-present');
+    expect(readSecret(appSqlite, 'ssh:ssh-app-1:password')).toBe(
+      Buffer.from('enc:existing_pwd', 'utf8').toString('base64')
+    );
+  });
+});
diff --git a/src/main/db/legacy-port/importers/auth/importer.ts b/src/main/db/legacy-port/importers/auth/importer.ts
new file mode 100644
index 0000000000..daf4923f58
--- /dev/null
+++ b/src/main/db/legacy-port/importers/auth/importer.ts
@@ -0,0 +1,488 @@
+import { execFile } from 'node:child_process';
+import { existsSync, readFileSync } from 'node:fs';
+import { join } from 'node:path';
+import { promisify } from 'node:util';
+import type Database from 'better-sqlite3';
+import { eq } from 'drizzle-orm';
+import { appSecrets, kv } from '@main/db/schema';
+import type { RelationalImportDb } from '../relational/types';
+
+const execFileAsync = promisify(execFile);
+
+type LegacySecretSpec = {
+  label: string;
+  legacyService: string;
+  legacyAccount: string;
+  appSecretKey: string;
+};
+
+type KvWrite = {
+  namespace: string;
+  key: string;
+  value: unknown;
+  label: string;
+};
+
+type SecretWrite = {
+  key: string;
+  encryptedSecret: string;
+  label: string;
+};
+
+type LegacyAccountProfile = {
+  hasAccount: boolean;
+  userId: string;
+  username: string;
+  avatarUrl: string;
+  email: string;
+  lastValidated: string;
+};
+
+export type LegacySecretReader = (service: string, account: string) => Promise<string | null>;
+export type LegacySecretEncryptor = (secret: string) => string | null | Promise<string | null>;
+
+export type PortLegacyAuthStateOptions = {
+  appDb: RelationalImportDb;
+  appSqlite: Database.Database;
+  legacyToAppSshConnectionId?: ReadonlyMap<string, string>;
+  readLegacySecret?: LegacySecretReader;
+  encryptSecret?: LegacySecretEncryptor;
+  writeKv?: (namespace: string, key: string, value: unknown) => Promise<void>;
+  secretsStore?: {
+    setEncryptedSecret(key: string, encryptedSecret: string): Promise<void>;
+  };
+};
+
+export type LegacyAuthPortSummary = {
+  importedSecrets: string[];
+  importedKv: string[];
+  importedSshPasswords: number;
+  skipped: string[];
+};
+
+const LEGACY_SECRET_SPECS: LegacySecretSpec[] = [
+  {
+    label: 'github',
+    legacyService: 'emdash-github',
+    legacyAccount: 'github-token',
+    appSecretKey: 'emdash-github-token',
+  },
+  {
+    label: 'linear',
+    legacyService: 'emdash-linear',
+    legacyAccount: 'api-token',
+    appSecretKey: 'emdash-linear-token',
+  },
+  {
+    label: 'jira',
+    legacyService: 'emdash-jira',
+    legacyAccount: 'api-token',
+    appSecretKey: 'emdash-jira-token',
+  },
+  {
+    label: 'plain',
+    legacyService: 'emdash-plain',
+    legacyAccount: 'api-token',
+    appSecretKey: 'emdash-plain-token',
+  },
+  {
+    label: 'forgejo',
+    legacyService: 'emdash-forgejo',
+    legacyAccount: 'forgejo-token',
+    appSecretKey: 'emdash-forgejo-token',
+  },
+  {
+    label: 'gitlab',
+    legacyService: 'emdash-gitlab',
+    legacyAccount: 'gitlab-token',
+    appSecretKey: 'emdash-gitlab-token',
+  },
+  {
+    label: 'account',
+    legacyService: 'emdash-account',
+    legacyAccount: 'session-token',
+    appSecretKey: 'emdash-account-token',
+  },
+];
+
+function hasTable(appSqlite: Database.Database, tableName: string): boolean {
+  const row = appSqlite
+    .prepare(`SELECT 1 FROM sqlite_master WHERE type = 'table' AND name = ? LIMIT 1`)
+    .get(tableName) as { 1: number } | undefined;
+  return !!row;
+}
+
+async function hasStoredSecret(appDb: RelationalImportDb, key: string): Promise<boolean> {
+  const [row] = await appDb
+    .select({ key: appSecrets.key })
+    .from(appSecrets)
+    .where(eq(appSecrets.key, key))
+    .limit(1)
+    .execute();
+  return Boolean(row);
+}
+
+function isRecord(value: unknown): value is Record<string, unknown> {
+  return typeof value === 'object' && value !== null && !Array.isArray(value);
+}
+
+function readTrimmedString(value: unknown): string | null {
+  if (typeof value !== 'string') return null;
+  const trimmed = value.trim();
+  return trimmed.length > 0 ? trimmed : null;
+}
+
+type JsonReadResult = { kind: 'missing' } | { kind: 'invalid' } | { kind: 'ok'; value: unknown };
+
+function readJsonFile(filePath: string): JsonReadResult {
+  try {
+    if (!existsSync(filePath)) return { kind: 'missing' };
+    return { kind: 'ok', value: JSON.parse(readFileSync(filePath, 'utf8')) as unknown };
+  } catch {
+    return { kind: 'invalid' };
+  }
+}
+
+function normalizeHostedInstanceUrl(instanceUrl: string): string | null {
+  const trimmed = instanceUrl.trim();
+  if (!trimmed) return null;
+
+  try {
+    const parsed = new URL(trimmed);
+    if (parsed.protocol !== 'http:' && parsed.protocol !== 'https:') {
+      return null;
+    }
+    if (parsed.search || parsed.hash) {
+      return null;
+    }
+
+    const pathname = parsed.pathname.replace(/\/+$/, '');
+    return pathname && pathname !== '/'
+      ? `${parsed.protocol}//${parsed.host}${pathname}`
+      : `${parsed.protocol}//${parsed.host}`;
+  } catch {
+    return null;
+  }
+}
+
+function parseJiraCreds(raw: unknown): { siteUrl: string; email: string } | null {
+  if (!isRecord(raw)) return null;
+  const siteUrl = readTrimmedString(raw.siteUrl);
+  const email = readTrimmedString(raw.email);
+  if (!siteUrl || !email) return null;
+  return { siteUrl, email };
+}
+
+function parseHostedConnection(raw: unknown): { instanceUrl: string } | null {
+  if (!isRecord(raw)) return null;
+
+  const siteUrl =
+    readTrimmedString(raw.instanceUrl) ??
+    readTrimmedString(raw.siteUrl) ??
+    readTrimmedString(raw.url);
+  if (!siteUrl) return null;
+
+  const instanceUrl = normalizeHostedInstanceUrl(siteUrl);
+  if (!instanceUrl) return null;
+
+  return { instanceUrl };
+}
+
+function parseLegacyAccountProfile(raw: unknown): LegacyAccountProfile | null {
+  if (!isRecord(raw)) return null;
+  if (typeof raw.hasAccount !== 'boolean') return null;
+
+  const userId = readTrimmedString(raw.userId);
+  const username = readTrimmedString(raw.username);
+  const avatarUrl = readTrimmedString(raw.avatarUrl);
+  const email = readTrimmedString(raw.email);
+  const lastValidated = readTrimmedString(raw.lastValidated) ?? new Date().toISOString();
+
+  if (!userId || !username || !avatarUrl || !email) return null;
+
+  return {
+    hasAccount: raw.hasAccount,
+    userId,
+    username,
+    avatarUrl,
+    email,
+    lastValidated,
+  };
+}
+
+async function defaultReadLegacySecret(service: string, account: string): Promise<string | null> {
+  if (process.platform === 'darwin') {
+    try {
+      const { stdout } = await execFileAsync('security', [
+        'find-generic-password',
+        '-s',
+        service,
+        '-a',
+        account,
+        '-w',
+      ]);
+      const secret = stdout.trim();
+      return secret.length > 0 ? secret : null;
+    } catch {
+      return null;
+    }
+  }
+
+  if (process.platform === 'linux') {
+    try {
+      const { stdout } = await execFileAsync('secret-tool', [
+        'lookup',
+        'service',
+        service,
+        'account',
+        account,
+      ]);
+      const secret = stdout.trim();
+      return secret.length > 0 ? secret : null;
+    } catch {
+      return null;
+    }
+  }
+
+  return null;
+}
+
+type SafeStorageLike = {
+  isEncryptionAvailable: () => boolean;
+  encryptString: (secret: string) => Buffer;
+  getSelectedStorageBackend?: () => string;
+};
+
+async function createDefaultEncryptor(): Promise<LegacySecretEncryptor | null> {
+  if (!process.versions.electron) {
+    return null;
+  }
+
+  try {
+    const electron = (await import('electron')) as { safeStorage?: SafeStorageLike };
+    const safeStorage = electron.safeStorage;
+    if (!safeStorage || !safeStorage.isEncryptionAvailable()) {
+      return null;
+    }
+
+    if (
+      process.platform === 'linux' &&
+      typeof safeStorage.getSelectedStorageBackend === 'function' &&
+      safeStorage.getSelectedStorageBackend() === 'basic_text'
+    ) {
+      return null;
+    }
+
+    return (secret: string) => safeStorage.encryptString(secret).toString('base64');
+  } catch {
+    return null;
+  }
+}
+
+function addKvWrite(
+  kvWrites: KvWrite[],
+  summary: LegacyAuthPortSummary,
+  hasKvTable: boolean,
+  write: KvWrite
+): void {
+  if (!hasKvTable) {
+    summary.skipped.push(`${write.label}:kv-table-missing`);
+    return;
+  }
+  kvWrites.push(write);
+  summary.importedKv.push(write.label);
+}
+
+export async function portLegacyAuthState(
+  userDataPath: string,
+  options: PortLegacyAuthStateOptions
+): Promise<LegacyAuthPortSummary> {
+  const { appDb, appSqlite, legacyToAppSshConnectionId } = options;
+  const summary: LegacyAuthPortSummary = {
+    importedSecrets: [],
+    importedKv: [],
+    importedSshPasswords: 0,
+    skipped: [],
+  };
+
+  const hasKvTable = hasTable(appSqlite, 'kv');
+  const hasSecretsTable = hasTable(appSqlite, 'app_secrets');
+
+  if (!hasKvTable && !hasSecretsTable) {
+    summary.skipped.push('auth-port:missing-kv-and-app-secrets-tables');
+    return summary;
+  }
+
+  const readLegacySecret = options.readLegacySecret ?? defaultReadLegacySecret;
+  const encryptSecret = options.encryptSecret ?? (await createDefaultEncryptor());
+  const writeKv =
+    options.writeKv ??
+    (async (namespace: string, key: string, value: unknown) => {
+      const namespaceKey = `${namespace}:${key}`;
+      const serialized = JSON.stringify(value);
+      const now = Date.now();
+
+      await appDb
+        .insert(kv)
+        .values({ key: namespaceKey, value: serialized, updatedAt: now })
+        .onConflictDoUpdate({
+          target: kv.key,
+          set: { value: serialized, updatedAt: now },
+        })
+        .execute();
+    });
+
+  const secretWrites: SecretWrite[] = [];
+  const kvWrites: KvWrite[] = [];
+
+  if (hasSecretsTable && encryptSecret) {
+    for (const spec of LEGACY_SECRET_SPECS) {
+      const rawSecret = await readLegacySecret(spec.legacyService, spec.legacyAccount);
+      const secret = readTrimmedString(rawSecret);
+
+      if (!secret) {
+        continue;
+      }
+
+      const encryptedSecret = await encryptSecret(secret);
+      if (!encryptedSecret) {
+        summary.skipped.push(`${spec.label}:secret-encryption-failed`);
+        continue;
+      }
+
+      secretWrites.push({ key: spec.appSecretKey, encryptedSecret, label: spec.label });
+      summary.importedSecrets.push(spec.label);
+    }
+
+    if (legacyToAppSshConnectionId && legacyToAppSshConnectionId.size > 0) {
+      const migratedTargetIds = new Set<string>();
+
+      for (const [legacyConnectionId, appConnectionId] of legacyToAppSshConnectionId.entries()) {
+        if (migratedTargetIds.has(appConnectionId)) {
+          summary.skipped.push(`ssh.password:${appConnectionId}:duplicate-target`);
+          continue;
+        }
+
+        const targetKey = `ssh:${appConnectionId}:password`;
+        if (await hasStoredSecret(appDb, targetKey)) {
+          summary.skipped.push(`ssh.password:${appConnectionId}:already-present`);
+          continue;
+        }
+
+        const rawPassword = await readLegacySecret('emdash-ssh', `${legacyConnectionId}:password`);
+        const password = readTrimmedString(rawPassword);
+        if (!password) {
+          continue;
+        }
+
+        const encryptedSecret = await encryptSecret(password);
+        if (!encryptedSecret) {
+          summary.skipped.push(`ssh.password:${appConnectionId}:secret-encryption-failed`);
+          continue;
+        }
+
+        secretWrites.push({
+          key: targetKey,
+          encryptedSecret,
+          label: `ssh.password:${appConnectionId}`,
+        });
+        migratedTargetIds.add(appConnectionId);
+        summary.importedSshPasswords += 1;
+      }
+    }
+  } else if (!hasSecretsTable) {
+    summary.skipped.push('auth-port:app-secrets-table-missing');
+  } else {
+    summary.skipped.push('auth-port:secret-encryption-unavailable');
+  }
+
+  if (summary.importedSecrets.includes('github')) {
+    addKvWrite(kvWrites, summary, hasKvTable, {
+      namespace: 'github',
+      key: 'tokenSource',
+      value: 'secure_storage',
+      label: 'github.tokenSource',
+    });
+  }
+
+  const jiraResult = readJsonFile(join(userDataPath, 'jira.json'));
+  if (jiraResult.kind === 'invalid') {
+    summary.skipped.push('jira.creds:invalid-json');
+  }
+  const jiraCreds = jiraResult.kind === 'ok' ? parseJiraCreds(jiraResult.value) : null;
+  if (jiraCreds) {
+    addKvWrite(kvWrites, summary, hasKvTable, {
+      namespace: 'jira',
+      key: 'creds',
+      value: jiraCreds,
+      label: 'jira.creds',
+    });
+  }
+
+  const forgejoResult = readJsonFile(join(userDataPath, 'forgejo.json'));
+  if (forgejoResult.kind === 'invalid') {
+    summary.skipped.push('forgejo.connection:invalid-json');
+  }
+  const forgejoConnection =
+    forgejoResult.kind === 'ok' ? parseHostedConnection(forgejoResult.value) : null;
+  if (forgejoConnection) {
+    addKvWrite(kvWrites, summary, hasKvTable, {
+      namespace: 'forgejo',
+      key: 'connection',
+      value: forgejoConnection,
+      label: 'forgejo.connection',
+    });
+  }
+
+  const gitlabResult = readJsonFile(join(userDataPath, 'gitlab.json'));
+  if (gitlabResult.kind === 'invalid') {
+    summary.skipped.push('gitlab.connection:invalid-json');
+  }
+  const gitlabConnection =
+    gitlabResult.kind === 'ok' ? parseHostedConnection(gitlabResult.value) : null;
+  if (gitlabConnection) {
+    addKvWrite(kvWrites, summary, hasKvTable, {
+      namespace: 'gitlab',
+      key: 'connection',
+      value: gitlabConnection,
+      label: 'gitlab.connection',
+    });
+  }
+
+  const accountResult = readJsonFile(join(userDataPath, 'emdash-account.json'));
+  if (accountResult.kind === 'invalid') {
+    summary.skipped.push('account.profile:invalid-json');
+  }
+  const accountProfile =
+    accountResult.kind === 'ok' ? parseLegacyAccountProfile(accountResult.value) : null;
+  if (accountProfile) {
+    addKvWrite(kvWrites, summary, hasKvTable, {
+      namespace: 'account',
+      key: 'profile',
+      value: accountProfile,
+      label: 'account.profile',
+    });
+  }
+
+  if (secretWrites.length === 0 && kvWrites.length === 0) {
+    return summary;
+  }
+
+  const secretsStore =
+    options.secretsStore ??
+    (hasSecretsTable
+      ? new (
+          await import('@main/core/secrets/encrypted-app-secrets-store')
+        ).EncryptedAppSecretsStore(appDb)
+      : null);
+
+  for (const row of secretWrites) {
+    await secretsStore?.setEncryptedSecret(row.key, row.encryptedSecret);
+  }
+
+  for (const row of kvWrites) {
+    await writeKv(row.namespace, row.key, row.value);
+  }
+
+  return summary;
+}
diff --git a/src/main/db/legacy-port/importers/relational/conversations.ts b/src/main/db/legacy-port/importers/relational/conversations.ts
new file mode 100644
index 0000000000..0ccc516280
--- /dev/null
+++ b/src/main/db/legacy-port/importers/relational/conversations.ts
@@ -0,0 +1,337 @@
+import { randomUUID } from 'node:crypto';
+import { existsSync, readFileSync } from 'node:fs';
+import { join } from 'node:path';
+import { conversations, tasks } from '@main/db/schema';
+import { log } from '@main/lib/logger';
+import {
+  isUniqueConstraintError,
+  readLegacyRows,
+  toIsoTimestamp,
+  toTrimmedString,
+} from './helpers';
+import { createPortSummary, type PortContext, type PortSummary } from './types';
+
+const LEGACY_PTY_SESSION_MAP_FILE = 'pty-session-map.json';
+const LEGACY_CLAUDE_CHAT_PREFIX = 'claude-chat-';
+const LEGACY_CLAUDE_MAIN_PREFIX = 'claude-main-';
+const LEGACY_OPTIMISTIC_TASK_PREFIX = 'optimistic-';
+const UUID_PATTERN = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
+const CONVERSATION_ID_TIMESTAMP_PATTERN = /-(\d{10,})$/;
+const MAX_OPTIMISTIC_MAIN_TIMESTAMP_DRIFT_MS = 5_000;
+
+type LegacyPtySessionMapEntry = {
+  uuid?: unknown;
+  resumeTarget?: unknown;
+};
+
+type LegacyClaudeResumeTargets = {
+  chatConversationIdToUuid: Map<string, string>;
+  mainTaskIdToUuid: Map<string, string>;
+  optimisticMainByTimestamp: Array<{ timestampMs: number; resumeUuid: string }>;
+};
+
+function isPlainRecord(value: unknown): value is Record<string, unknown> {
+  return typeof value === 'object' && value !== null && !Array.isArray(value);
+}
+
+function isValidResumeUuid(value: string): boolean {
+  return UUID_PATTERN.test(value);
+}
+
+function readLegacyClaudeResumeTargets(userDataPath?: string): LegacyClaudeResumeTargets {
+  const targets: LegacyClaudeResumeTargets = {
+    chatConversationIdToUuid: new Map<string, string>(),
+    mainTaskIdToUuid: new Map<string, string>(),
+    optimisticMainByTimestamp: [],
+  };
+
+  if (!userDataPath) return targets;
+
+  const mapPath = join(userDataPath, LEGACY_PTY_SESSION_MAP_FILE);
+  if (!existsSync(mapPath)) return targets;
+
+  let rawJson: unknown;
+  try {
+    rawJson = JSON.parse(readFileSync(mapPath, 'utf8')) as unknown;
+  } catch (error) {
+    log.warn('legacy-port: conversations: failed to parse legacy pty-session-map.json', {
+      mapPath,
+      error: error instanceof Error ? error.message : String(error),
+    });
+    return targets;
+  }
+
+  if (!isPlainRecord(rawJson)) return targets;
+
+  for (const [ptyKey, rawEntry] of Object.entries(rawJson)) {
+    if (!isPlainRecord(rawEntry)) continue;
+
+    const entry = rawEntry as LegacyPtySessionMapEntry;
+    const target =
+      toTrimmedString(entry.uuid) ??
+      toTrimmedString(entry.resumeTarget) ??
+      toTrimmedString((rawEntry as Record<string, unknown>).target);
+
+    if (!target || !isValidResumeUuid(target)) continue;
+
+    if (ptyKey.startsWith(LEGACY_CLAUDE_CHAT_PREFIX)) {
+      const legacyConversationId = toTrimmedString(ptyKey.slice(LEGACY_CLAUDE_CHAT_PREFIX.length));
+      if (legacyConversationId && !targets.chatConversationIdToUuid.has(legacyConversationId)) {
+        targets.chatConversationIdToUuid.set(legacyConversationId, target);
+      }
+      continue;
+    }
+
+    if (ptyKey.startsWith(LEGACY_CLAUDE_MAIN_PREFIX)) {
+      const legacyTaskId = toTrimmedString(ptyKey.slice(LEGACY_CLAUDE_MAIN_PREFIX.length));
+      if (legacyTaskId && !targets.mainTaskIdToUuid.has(legacyTaskId)) {
+        targets.mainTaskIdToUuid.set(legacyTaskId, target);
+
+        if (legacyTaskId.startsWith(LEGACY_OPTIMISTIC_TASK_PREFIX)) {
+          const optimisticTimestampPart = toTrimmedString(
+            legacyTaskId.slice(LEGACY_OPTIMISTIC_TASK_PREFIX.length)
+          );
+          const optimisticTimestampMs = Number.parseInt(optimisticTimestampPart ?? '', 10);
+          if (Number.isFinite(optimisticTimestampMs)) {
+            targets.optimisticMainByTimestamp.push({
+              timestampMs: optimisticTimestampMs,
+              resumeUuid: target,
+            });
+          }
+        }
+      }
+    }
+  }
+
+  targets.optimisticMainByTimestamp.sort((a, b) => a.timestampMs - b.timestampMs);
+
+  return targets;
+}
+
+function parseConversationTimestampMs(conversationId: string): number | undefined {
+  const match = conversationId.match(CONVERSATION_ID_TIMESTAMP_PATTERN);
+  if (!match) return undefined;
+  const parsed = Number.parseInt(match[1], 10);
+  return Number.isFinite(parsed) ? parsed : undefined;
+}
+
+function parseTaskIdFromConversationId(conversationId: string): string | undefined {
+  if (!conversationId.startsWith('conv-')) return undefined;
+  const timestampMatch = conversationId.match(CONVERSATION_ID_TIMESTAMP_PATTERN);
+  if (!timestampMatch) return undefined;
+
+  const prefixLength = 'conv-'.length;
+  const timestampStart = conversationId.length - timestampMatch[0].length;
+  if (timestampStart <= prefixLength) return undefined;
+
+  return toTrimmedString(conversationId.slice(prefixLength, timestampStart));
+}
+
+function findOptimisticMainResumeUuidForConversation(
+  conversationId: string,
+  targets: LegacyClaudeResumeTargets
+): string | undefined {
+  const conversationTimestampMs = parseConversationTimestampMs(conversationId);
+  if (!conversationTimestampMs || targets.optimisticMainByTimestamp.length === 0) {
+    return undefined;
+  }
+
+  let bestMatch: { distanceMs: number; resumeUuid: string } | undefined;
+  let secondBestDistanceMs: number | undefined;
+
+  for (const candidate of targets.optimisticMainByTimestamp) {
+    const distanceMs = Math.abs(candidate.timestampMs - conversationTimestampMs);
+    if (distanceMs > MAX_OPTIMISTIC_MAIN_TIMESTAMP_DRIFT_MS) continue;
+
+    if (!bestMatch || distanceMs < bestMatch.distanceMs) {
+      secondBestDistanceMs = bestMatch?.distanceMs;
+      bestMatch = { distanceMs, resumeUuid: candidate.resumeUuid };
+      continue;
+    }
+
+    if (secondBestDistanceMs === undefined || distanceMs < secondBestDistanceMs) {
+      secondBestDistanceMs = distanceMs;
+    }
+  }
+
+  if (!bestMatch) return undefined;
+
+  if (secondBestDistanceMs !== undefined && secondBestDistanceMs === bestMatch.distanceMs) {
+    return undefined;
+  }
+
+  return bestMatch.resumeUuid;
+}
+
+function pickConversationIdForInsert(params: {
+  legacyConversationId: string;
+  legacyTaskId: string;
+  legacyProvider: string | null;
+  conversationIds: Set<string>;
+  claudeResumeTargets: LegacyClaudeResumeTargets;
+}): string {
+  const {
+    legacyConversationId,
+    legacyTaskId,
+    legacyProvider,
+    conversationIds,
+    claudeResumeTargets,
+  } = params;
+
+  if (legacyProvider?.toLowerCase() !== 'claude') {
+    return legacyConversationId;
+  }
+
+  const candidateResumeUuid =
+    claudeResumeTargets.chatConversationIdToUuid.get(legacyConversationId) ??
+    claudeResumeTargets.mainTaskIdToUuid.get(legacyTaskId) ??
+    (() => {
+      const taskIdFromConversationId = parseTaskIdFromConversationId(legacyConversationId);
+      return taskIdFromConversationId
+        ? claudeResumeTargets.mainTaskIdToUuid.get(taskIdFromConversationId)
+        : undefined;
+    })() ??
+    findOptimisticMainResumeUuidForConversation(legacyConversationId, claudeResumeTargets);
+
+  if (!candidateResumeUuid || !isValidResumeUuid(candidateResumeUuid)) {
+    return legacyConversationId;
+  }
+
+  if (conversationIds.has(candidateResumeUuid)) {
+    log.warn('legacy-port: conversations: claude resume uuid collides, falling back to legacy id', {
+      legacyConversationId,
+      legacyTaskId,
+      candidateResumeUuid,
+    });
+    return legacyConversationId;
+  }
+
+  return candidateResumeUuid;
+}
+
+export async function portConversations({
+  appDb,
+  legacyDb,
+  remap,
+  mergedLegacyTaskIds,
+  userDataPath,
+}: PortContext & {
+  mergedLegacyTaskIds: Set<string>;
+  userDataPath?: string;
+}): Promise<PortSummary> {
+  const summary = createPortSummary('conversations');
+  const nowIso = new Date().toISOString();
+  const claudeResumeTargets = readLegacyClaudeResumeTargets(userDataPath);
+
+  const taskRows = await appDb
+    .select({
+      id: tasks.id,
+      projectId: tasks.projectId,
+    })
+    .from(tasks)
+    .execute();
+
+  const taskIdToProjectId = new Map<string, string>();
+  for (const row of taskRows) {
+    taskIdToProjectId.set(row.id, row.projectId);
+  }
+
+  const existingConversationRows = await appDb
+    .select({ id: conversations.id })
+    .from(conversations)
+    .execute();
+  const conversationIds = new Set<string>(existingConversationRows.map((row) => row.id));
+
+  const legacyRows = readLegacyRows(legacyDb, 'conversations', [
+    'id',
+    'task_id',
+    'title',
+    'provider',
+    'created_at',
+    'updated_at',
+  ]);
+
+  for (const row of legacyRows) {
+    summary.considered += 1;
+
+    const legacyTaskId = toTrimmedString(row.task_id);
+    const legacyConversationId = toTrimmedString(row.id);
+
+    if (!legacyTaskId || !legacyConversationId) {
+      summary.skippedInvalid += 1;
+      continue;
+    }
+
+    if (mergedLegacyTaskIds.has(legacyTaskId)) {
+      summary.skippedDedup += 1;
+      continue;
+    }
+
+    const mappedTaskId = remap.taskId.get(legacyTaskId);
+    if (!mappedTaskId) {
+      summary.skippedError += 1;
+      continue;
+    }
+
+    const mappedProjectId = taskIdToProjectId.get(mappedTaskId);
+    if (!mappedProjectId) {
+      summary.skippedError += 1;
+      continue;
+    }
+
+    const legacyProvider = toTrimmedString(row.provider) ?? null;
+    const preferredConversationId = pickConversationIdForInsert({
+      legacyConversationId,
+      legacyTaskId,
+      legacyProvider,
+      conversationIds,
+      claudeResumeTargets,
+    });
+
+    let nextConversationId = conversationIds.has(preferredConversationId)
+      ? randomUUID()
+      : preferredConversationId;
+
+    const insertValues = {
+      id: nextConversationId,
+      projectId: mappedProjectId,
+      taskId: mappedTaskId,
+      title:
+        toTrimmedString(row.title) ?? `Legacy conversation ${legacyConversationId.slice(0, 8)}`,
+      provider: legacyProvider,
+      config: null,
+      createdAt: toIsoTimestamp(row.created_at, nowIso),
+      updatedAt: toIsoTimestamp(row.updated_at, nowIso),
+    };
+
+    let inserted = false;
+
+    for (let attempt = 0; attempt < 2; attempt += 1) {
+      try {
+        insertValues.id = nextConversationId;
+        await appDb.insert(conversations).values(insertValues).execute();
+        inserted = true;
+        break;
+      } catch (error) {
+        if (attempt === 0 && isUniqueConstraintError(error, 'conversations.id')) {
+          nextConversationId = randomUUID();
+          continue;
+        }
+
+        summary.skippedError += 1;
+        log.warn('legacy-port: conversations: failed to insert row', {
+          legacyConversationId,
+          error: error instanceof Error ? error.message : String(error),
+        });
+        break;
+      }
+    }
+
+    if (!inserted) continue;
+
+    conversationIds.add(nextConversationId);
+    summary.inserted += 1;
+  }
+
+  return summary;
+}
diff --git a/src/main/db/legacy-port/importers/relational/helpers.ts b/src/main/db/legacy-port/importers/relational/helpers.ts
new file mode 100644
index 0000000000..646a599864
--- /dev/null
+++ b/src/main/db/legacy-port/importers/relational/helpers.ts
@@ -0,0 +1,82 @@
+import type Database from 'better-sqlite3';
+
+function quoteIdentifier(identifier: string): string {
+  if (!/^[A-Za-z_][A-Za-z0-9_]*$/.test(identifier)) {
+    throw new Error(`Invalid SQL identifier: ${identifier}`);
+  }
+  return `"${identifier}"`;
+}
+
+export function legacyTableExists(legacyDb: Database.Database, tableName: string): boolean {
+  const row = legacyDb
+    .prepare(`SELECT name FROM sqlite_master WHERE type = 'table' AND name = ? LIMIT 1`)
+    .get(tableName);
+  return Boolean(row);
+}
+
+function getLegacyTableColumns(legacyDb: Database.Database, tableName: string): Set<string> {
+  if (!legacyTableExists(legacyDb, tableName)) return new Set();
+
+  const rows = legacyDb.prepare(`PRAGMA table_info(${quoteIdentifier(tableName)})`).all() as Array<{
+    name: string;
+  }>;
+
+  return new Set(rows.map((row) => row.name));
+}
+
+export function readLegacyRows(
+  legacyDb: Database.Database,
+  tableName: string,
+  columns: string[]
+): Array<Record<string, unknown>> {
+  if (!legacyTableExists(legacyDb, tableName)) return [];
+
+  const tableColumns = getLegacyTableColumns(legacyDb, tableName);
+  const selectColumns = columns
+    .map((column) => {
+      const alias = quoteIdentifier(column);
+      if (tableColumns.has(column)) {
+        return `${quoteIdentifier(column)} AS ${alias}`;
+      }
+      return `NULL AS ${alias}`;
+    })
+    .join(', ');
+
+  return legacyDb
+    .prepare(`SELECT ${selectColumns} FROM ${quoteIdentifier(tableName)}`)
+    .all() as Array<Record<string, unknown>>;
+}
+
+export function toTrimmedString(value: unknown): string | undefined {
+  if (typeof value === 'string') {
+    const trimmed = value.trim();
+    return trimmed.length > 0 ? trimmed : undefined;
+  }
+
+  if (typeof value === 'number' && Number.isFinite(value)) {
+    return String(value);
+  }
+
+  return undefined;
+}
+
+export function toInteger(value: unknown): number | undefined {
+  if (typeof value === 'number' && Number.isFinite(value)) return value;
+  if (typeof value === 'string') {
+    const parsed = Number.parseInt(value, 10);
+    if (Number.isFinite(parsed)) return parsed;
+  }
+  return undefined;
+}
+
+export function toIsoTimestamp(value: unknown, fallback: string): string {
+  return toTrimmedString(value) ?? fallback;
+}
+
+export function isUniqueConstraintError(error: unknown, detail: string): boolean {
+  if (!(error instanceof Error)) return false;
+  return (
+    error.message.includes('UNIQUE constraint failed') &&
+    error.message.toLowerCase().includes(detail.toLowerCase())
+  );
+}
diff --git a/src/main/db/legacy-port/importers/relational/projects.ts b/src/main/db/legacy-port/importers/relational/projects.ts
new file mode 100644
index 0000000000..1f87848174
--- /dev/null
+++ b/src/main/db/legacy-port/importers/relational/projects.ts
@@ -0,0 +1,294 @@
+import { randomUUID } from 'node:crypto';
+import { basename } from 'node:path';
+import { eq } from 'drizzle-orm';
+import { projects, sshConnections } from '@main/db/schema';
+import { log } from '@main/lib/logger';
+import {
+  makeSshFingerprint,
+  normalizeLocalPath,
+  normalizePort,
+  normalizeRemotePath,
+} from '../../legacy-source/normalize';
+import {
+  isUniqueConstraintError,
+  readLegacyRows,
+  toInteger,
+  toIsoTimestamp,
+  toTrimmedString,
+} from './helpers';
+import { createPortSummary, type PortContext, type PortSummary } from './types';
+
+type ExistingProjectRow = {
+  id: string;
+  path: string;
+  workspaceProvider: string;
+  sshConnectionId: string | null;
+  host: string | null;
+  port: number | null;
+  username: string | null;
+};
+
+type ConnectionFingerprintRow = {
+  id: string;
+  host: string;
+  port: number;
+  username: string;
+};
+
+function localProjectKey(projectPath: string): string {
+  return `local:${normalizeLocalPath(projectPath)}`;
+}
+
+function sshProjectKey(fingerprint: string, projectPath: string): string {
+  return `ssh:${fingerprint}:${normalizeRemotePath(projectPath)}`;
+}
+
+function pickDefaultProjectName(projectPath: string, fallbackId: string): string {
+  const derived = basename(projectPath.trim());
+  return derived.length > 0 ? derived : `Legacy Project ${fallbackId.slice(0, 8)}`;
+}
+
+async function loadConnectionFingerprintById(
+  appDb: PortContext['appDb']
+): Promise<Map<string, string>> {
+  const rows = (await appDb
+    .select({
+      id: sshConnections.id,
+      host: sshConnections.host,
+      port: sshConnections.port,
+      username: sshConnections.username,
+    })
+    .from(sshConnections)
+    .execute()) as ConnectionFingerprintRow[];
+
+  const result = new Map<string, string>();
+  for (const row of rows) {
+    result.set(row.id, makeSshFingerprint(row.host, normalizePort(row.port), row.username));
+  }
+  return result;
+}
+
+export async function portProjects({ appDb, legacyDb, remap }: PortContext): Promise<PortSummary> {
+  const summary = createPortSummary('projects');
+  const nowIso = new Date().toISOString();
+
+  const existingProjectRows = (await appDb
+    .select({
+      id: projects.id,
+      path: projects.path,
+      workspaceProvider: projects.workspaceProvider,
+      sshConnectionId: projects.sshConnectionId,
+      host: sshConnections.host,
+      port: sshConnections.port,
+      username: sshConnections.username,
+    })
+    .from(projects)
+    .leftJoin(sshConnections, eq(projects.sshConnectionId, sshConnections.id))
+    .execute()) as ExistingProjectRow[];
+
+  const projectIds = new Set<string>();
+  const localKeyToProjectId = new Map<string, string>();
+  const sshKeyToProjectId = new Map<string, string>();
+
+  for (const row of existingProjectRows) {
+    projectIds.add(row.id);
+
+    if (row.workspaceProvider === 'ssh' && row.sshConnectionId && row.host && row.username) {
+      const fingerprint = makeSshFingerprint(row.host, normalizePort(row.port), row.username);
+      sshKeyToProjectId.set(sshProjectKey(fingerprint, row.path), row.id);
+      continue;
+    }
+
+    localKeyToProjectId.set(localProjectKey(row.path), row.id);
+  }
+
+  const connectionFingerprintById = await loadConnectionFingerprintById(appDb);
+
+  const legacyRows = readLegacyRows(legacyDb, 'projects', [
+    'id',
+    'name',
+    'path',
+    'base_ref',
+    'is_remote',
+    'remote_path',
+    'ssh_connection_id',
+    'created_at',
+    'updated_at',
+  ]);
+
+  for (const row of legacyRows) {
+    summary.considered += 1;
+
+    const legacyProjectId = toTrimmedString(row.id);
+    if (!legacyProjectId) {
+      summary.skippedInvalid += 1;
+      log.warn('legacy-port: projects: skipping invalid row (missing id)');
+      continue;
+    }
+
+    const isRemote = toInteger(row.is_remote) === 1;
+    const createdAt = toIsoTimestamp(row.created_at, nowIso);
+    const updatedAt = toIsoTimestamp(row.updated_at, nowIso);
+
+    let workspaceProvider: 'local' | 'ssh' = 'local';
+    let mappedSshConnectionId: string | null = null;
+    let projectPath: string | undefined;
+    let dedupKey: string | undefined;
+
+    if (isRemote) {
+      workspaceProvider = 'ssh';
+
+      const legacySshConnectionId = toTrimmedString(row.ssh_connection_id);
+      const remotePath = toTrimmedString(row.remote_path);
+      if (!legacySshConnectionId || !remotePath) {
+        summary.skippedInvalid += 1;
+        log.warn('legacy-port: projects: skipping SSH row missing remote_path/ssh_connection_id', {
+          legacyProjectId,
+        });
+        continue;
+      }
+
+      mappedSshConnectionId = remap.sshConnectionId.get(legacySshConnectionId) ?? null;
+      if (!mappedSshConnectionId) {
+        summary.skippedInvalid += 1;
+        log.warn(
+          'legacy-port: projects: skipping SSH row with unresolved ssh_connection_id remap',
+          {
+            legacyProjectId,
+            legacySshConnectionId,
+          }
+        );
+        continue;
+      }
+
+      const normalizedRemotePath = normalizeRemotePath(remotePath);
+      if (!normalizedRemotePath) {
+        summary.skippedInvalid += 1;
+        log.warn('legacy-port: projects: skipping SSH row with invalid remote_path', {
+          legacyProjectId,
+        });
+        continue;
+      }
+
+      const fingerprint = connectionFingerprintById.get(mappedSshConnectionId);
+      if (!fingerprint) {
+        summary.skippedInvalid += 1;
+        log.warn('legacy-port: projects: skipping SSH row with unknown connection fingerprint', {
+          legacyProjectId,
+          mappedSshConnectionId,
+        });
+        continue;
+      }
+
+      projectPath = remotePath;
+      dedupKey = sshProjectKey(fingerprint, normalizedRemotePath);
+
+      const existingProjectId = sshKeyToProjectId.get(dedupKey);
+      if (existingProjectId) {
+        remap.projectId.set(legacyProjectId, existingProjectId);
+        summary.skippedDedup += 1;
+        continue;
+      }
+    } else {
+      const localPath = toTrimmedString(row.path);
+      if (!localPath) {
+        summary.skippedInvalid += 1;
+        log.warn('legacy-port: projects: skipping local row with missing path', {
+          legacyProjectId,
+        });
+        continue;
+      }
+
+      projectPath = localPath;
+      dedupKey = localProjectKey(localPath);
+
+      const existingProjectId = localKeyToProjectId.get(dedupKey);
+      if (existingProjectId) {
+        remap.projectId.set(legacyProjectId, existingProjectId);
+        summary.skippedDedup += 1;
+        continue;
+      }
+    }
+
+    if (!projectPath || !dedupKey) {
+      summary.skippedInvalid += 1;
+      continue;
+    }
+
+    let nextProjectId = projectIds.has(legacyProjectId) ? randomUUID() : legacyProjectId;
+
+    const insertValues = {
+      id: nextProjectId,
+      name: toTrimmedString(row.name) ?? pickDefaultProjectName(projectPath, legacyProjectId),
+      path: projectPath,
+      workspaceProvider,
+      baseRef: toTrimmedString(row.base_ref) ?? null,
+      sshConnectionId: mappedSshConnectionId,
+      createdAt,
+      updatedAt,
+    };
+
+    let inserted = false;
+
+    for (let attempt = 0; attempt < 2; attempt += 1) {
+      try {
+        insertValues.id = nextProjectId;
+        await appDb.insert(projects).values(insertValues).execute();
+        inserted = true;
+        break;
+      } catch (error) {
+        if (attempt === 0 && isUniqueConstraintError(error, 'projects.id')) {
+          nextProjectId = randomUUID();
+          continue;
+        }
+
+        if (isUniqueConstraintError(error, 'projects.path')) {
+          const [existingByPath] = await appDb
+            .select({ id: projects.id })
+            .from(projects)
+            .where(eq(projects.path, projectPath))
+            .limit(1)
+            .execute();
+
+          if (existingByPath) {
+            remap.projectId.set(legacyProjectId, existingByPath.id);
+            summary.skippedDedup += 1;
+          } else {
+            summary.skippedError += 1;
+            log.warn('legacy-port: projects: path conflict but no surviving row found', {
+              legacyProjectId,
+              projectPath,
+            });
+          }
+          break;
+        }
+
+        summary.skippedError += 1;
+        log.warn('legacy-port: projects: failed to insert row', {
+          legacyProjectId,
+          error: error instanceof Error ? error.message : String(error),
+        });
+        break;
+      }
+    }
+
+    if (!inserted) continue;
+
+    remap.projectId.set(legacyProjectId, nextProjectId);
+    projectIds.add(nextProjectId);
+    summary.inserted += 1;
+
+    if (workspaceProvider === 'ssh') {
+      const fingerprint = mappedSshConnectionId
+        ? connectionFingerprintById.get(mappedSshConnectionId)
+        : undefined;
+      if (fingerprint) {
+        sshKeyToProjectId.set(sshProjectKey(fingerprint, projectPath), nextProjectId);
+      }
+    } else {
+      localKeyToProjectId.set(localProjectKey(projectPath), nextProjectId);
+    }
+  }
+
+  return summary;
+}
diff --git a/src/main/db/legacy-port/importers/relational/relational.test.ts b/src/main/db/legacy-port/importers/relational/relational.test.ts
new file mode 100644
index 0000000000..2057946cc7
--- /dev/null
+++ b/src/main/db/legacy-port/importers/relational/relational.test.ts
@@ -0,0 +1,625 @@
+import fs from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
+import Database from 'better-sqlite3';
+import { afterEach, describe, expect, it } from 'vitest';
+import { createDrizzleClient } from '../../../drizzleClient';
+import { portConversations } from './conversations';
+import { portProjects } from './projects';
+import { createRemapTables } from './remap';
+import { portSshConnections } from './ssh-connections';
+import { portTasks } from './tasks';
+
+function createAppDb(): {
+  appSqlite: Database.Database;
+  appDb: ReturnType<typeof createDrizzleClient>['db'];
+} {
+  const appSqlite = new Database(':memory:');
+  appSqlite.pragma('foreign_keys = ON');
+  appSqlite.exec(`
+    CREATE TABLE ssh_connections (
+      id TEXT PRIMARY KEY,
+      name TEXT NOT NULL UNIQUE,
+      host TEXT NOT NULL,
+      port INTEGER NOT NULL DEFAULT 22,
+      username TEXT NOT NULL,
+      auth_type TEXT NOT NULL DEFAULT 'agent',
+      private_key_path TEXT,
+      use_agent INTEGER NOT NULL DEFAULT 0,
+      metadata TEXT,
+      created_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
+      updated_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP
+    );
+
+    CREATE TABLE projects (
+      id TEXT PRIMARY KEY,
+      name TEXT NOT NULL,
+      path TEXT NOT NULL UNIQUE,
+      workspace_provider TEXT NOT NULL DEFAULT 'local',
+      base_ref TEXT,
+      ssh_connection_id TEXT,
+      created_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
+      updated_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP
+    );
+
+    CREATE TABLE tasks (
+      id TEXT PRIMARY KEY,
+      project_id TEXT NOT NULL REFERENCES projects(id) ON DELETE CASCADE,
+      name TEXT NOT NULL,
+      status TEXT NOT NULL,
+      source_branch TEXT,
+      task_branch TEXT,
+      linked_issue TEXT,
+      archived_at TEXT,
+      created_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
+      updated_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
+      last_interacted_at TEXT,
+      status_changed_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
+      is_pinned INTEGER NOT NULL DEFAULT 0
+    );
+
+    CREATE TABLE conversations (
+      id TEXT PRIMARY KEY,
+      project_id TEXT NOT NULL REFERENCES projects(id) ON DELETE CASCADE,
+      task_id TEXT NOT NULL REFERENCES tasks(id) ON DELETE CASCADE,
+      title TEXT NOT NULL,
+      provider TEXT,
+      config TEXT,
+      created_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
+      updated_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP
+    );
+  `);
+
+  return {
+    appSqlite,
+    appDb: createDrizzleClient({ database: appSqlite }).db,
+  };
+}
+
+function createLegacyDb(): Database.Database {
+  const db = new Database(':memory:');
+  db.exec(`
+    CREATE TABLE ssh_connections (
+      id TEXT PRIMARY KEY,
+      name TEXT,
+      host TEXT,
+      port INTEGER,
+      username TEXT,
+      auth_type TEXT,
+      private_key_path TEXT,
+      use_agent INTEGER,
+      created_at TEXT,
+      updated_at TEXT
+    );
+
+    CREATE TABLE projects (
+      id TEXT PRIMARY KEY,
+      name TEXT,
+      path TEXT,
+      base_ref TEXT,
+      is_remote INTEGER,
+      remote_path TEXT,
+      ssh_connection_id TEXT,
+      created_at TEXT,
+      updated_at TEXT
+    );
+
+    CREATE TABLE tasks (
+      id TEXT PRIMARY KEY,
+      project_id TEXT,
+      name TEXT,
+      status TEXT,
+      branch TEXT,
+      archived_at TEXT,
+      created_at TEXT,
+      updated_at TEXT
+    );
+
+    CREATE TABLE conversations (
+      id TEXT PRIMARY KEY,
+      task_id TEXT,
+      title TEXT,
+      provider TEXT,
+      created_at TEXT,
+      updated_at TEXT
+    );
+  `);
+  return db;
+}
+
+describe('legacy-port table passes', () => {
+  const openDbs: Database.Database[] = [];
+  const tempDirs: string[] = [];
+
+  afterEach(() => {
+    for (const db of openDbs.splice(0)) db.close();
+    for (const dir of tempDirs.splice(0)) {
+      fs.rmSync(dir, { recursive: true, force: true });
+    }
+  });
+
+  it('ports with dedup + remap and skips merged-task conversations', async () => {
+    const { appSqlite, appDb } = createAppDb();
+    const legacyDb = createLegacyDb();
+    openDbs.push(appSqlite, legacyDb);
+
+    appSqlite
+      .prepare(
+        `INSERT INTO ssh_connections (id, name, host, port, username) VALUES (?, ?, ?, ?, ?)`
+      )
+      .run('ssh-beta', 'prod', 'example.com', 22, 'alice');
+
+    appSqlite
+      .prepare(
+        `INSERT INTO projects (id, name, path, workspace_provider, base_ref) VALUES (?, ?, ?, ?, ?)`
+      )
+      .run('proj-beta-local', 'Beta Local', '/work/repo', 'local', 'main');
+
+    appSqlite
+      .prepare(
+        `INSERT INTO tasks (id, project_id, name, status, source_branch, task_branch) VALUES (?, ?, ?, ?, ?, ?)`
+      )
+      .run(
+        'task-beta-existing',
+        'proj-beta-local',
+        'Existing Task',
+        'todo',
+        JSON.stringify({ type: 'local', branch: 'main' }),
+        'feature/shared'
+      );
+
+    legacyDb
+      .prepare(
+        `INSERT INTO ssh_connections (id, name, host, port, username, auth_type, use_agent) VALUES (?, ?, ?, ?, ?, ?, ?)`
+      )
+      .run('ssh-legacy-1', 'legacy-prod', 'EXAMPLE.com', 22, 'alice', 'agent', 1);
+
+    legacyDb
+      .prepare(
+        `INSERT INTO projects (id, name, path, base_ref, is_remote, remote_path, ssh_connection_id) VALUES (?, ?, ?, ?, ?, ?, ?)`
+      )
+      .run('proj-legacy-local', 'Legacy Local', '/work/repo', 'main', 0, null, null);
+
+    legacyDb
+      .prepare(
+        `INSERT INTO projects (id, name, path, base_ref, is_remote, remote_path, ssh_connection_id) VALUES (?, ?, ?, ?, ?, ?, ?)`
+      )
+      .run('proj-legacy-ssh', 'Legacy SSH', '/ignored', 'main', 1, '/srv/repo', 'ssh-legacy-1');
+
+    legacyDb
+      .prepare(
+        `INSERT INTO projects (id, name, path, base_ref, is_remote, remote_path, ssh_connection_id) VALUES (?, ?, ?, ?, ?, ?, ?)`
+      )
+      .run(
+        'proj-legacy-invalid-ssh',
+        'Legacy Invalid SSH',
+        '/ignored2',
+        'main',
+        1,
+        '   ',
+        'ssh-legacy-1'
+      );
+
+    legacyDb
+      .prepare(
+        `INSERT INTO tasks (id, project_id, name, status, branch, updated_at) VALUES (?, ?, ?, ?, ?, ?)`
+      )
+      .run(
+        'task-legacy-merged',
+        'proj-legacy-local',
+        'Legacy Merged Task',
+        'idle',
+        'feature/shared',
+        '2026-01-01T12:00:00.000Z'
+      );
+
+    legacyDb
+      .prepare(
+        `INSERT INTO tasks (id, project_id, name, status, branch, updated_at) VALUES (?, ?, ?, ?, ?, ?)`
+      )
+      .run(
+        'task-legacy-new',
+        'proj-legacy-ssh',
+        'Legacy New Task',
+        'running',
+        'feature/new-legacy',
+        '2026-01-02T12:00:00.000Z'
+      );
+
+    legacyDb
+      .prepare(`INSERT INTO conversations (id, task_id, title, provider) VALUES (?, ?, ?, ?)`)
+      .run('conv-legacy-merged', 'task-legacy-merged', 'Merged conversation', 'codex');
+
+    legacyDb
+      .prepare(`INSERT INTO conversations (id, task_id, title, provider) VALUES (?, ?, ?, ?)`)
+      .run('conv-legacy-new', 'task-legacy-new', 'New conversation', 'codex');
+
+    const remap = createRemapTables();
+    const sshSummary = await portSshConnections({ appDb, legacyDb, remap });
+    const projectsSummary = await portProjects({ appDb, legacyDb, remap });
+    const taskResult = await portTasks({ appDb, legacyDb, remap });
+    const conversationsSummary = await portConversations({
+      appDb,
+      legacyDb,
+      remap,
+      mergedLegacyTaskIds: taskResult.mergedLegacyTaskIds,
+    });
+
+    expect(sshSummary.considered).toBe(1);
+    expect(sshSummary.skippedDedup).toBe(1);
+    expect(remap.sshConnectionId.get('ssh-legacy-1')).toBe('ssh-beta');
+
+    expect(projectsSummary.considered).toBe(3);
+    expect(projectsSummary.skippedDedup).toBe(1);
+    expect(projectsSummary.skippedInvalid).toBe(1);
+    expect(remap.projectId.get('proj-legacy-local')).toBe('proj-beta-local');
+
+    const mappedSshProjectId = remap.projectId.get('proj-legacy-ssh');
+    expect(mappedSshProjectId).toBeTruthy();
+
+    expect(taskResult.summary.considered).toBe(2);
+    expect(taskResult.summary.skippedDedup).toBe(1);
+    expect(remap.taskId.get('task-legacy-merged')).toBe('task-beta-existing');
+    expect(taskResult.mergedLegacyTaskIds.has('task-legacy-merged')).toBe(true);
+
+    const insertedTaskId = remap.taskId.get('task-legacy-new');
+    expect(insertedTaskId).toBeTruthy();
+
+    const insertedTask = appSqlite
+      .prepare(
+        `SELECT project_id, status, source_branch, task_branch, status_changed_at, last_interacted_at, is_pinned FROM tasks WHERE id = ?`
+      )
+      .get(insertedTaskId) as {
+      project_id: string;
+      status: string;
+      source_branch: string | null;
+      task_branch: string;
+      status_changed_at: string | null;
+      last_interacted_at: string | null;
+      is_pinned: number;
+    };
+
+    expect(insertedTask.project_id).toBe(mappedSshProjectId);
+    expect(insertedTask.status).toBe('in_progress');
+    expect(insertedTask.source_branch).toBeNull();
+    expect(insertedTask.task_branch).toBe('feature/new-legacy');
+    expect(insertedTask.status_changed_at).toBe('2026-01-02T12:00:00.000Z');
+    expect(insertedTask.last_interacted_at).toBe('2026-01-02T12:00:00.000Z');
+    expect(insertedTask.is_pinned).toBe(0);
+
+    expect(conversationsSummary.considered).toBe(2);
+    expect(conversationsSummary.skippedDedup).toBe(1);
+
+    const conversations = appSqlite
+      .prepare(`SELECT id, task_id, project_id, title FROM conversations ORDER BY id ASC`)
+      .all() as Array<{ id: string; task_id: string; project_id: string; title: string }>;
+
+    expect(conversations).toEqual([
+      {
+        id: 'conv-legacy-new',
+        task_id: insertedTaskId!,
+        project_id: mappedSshProjectId!,
+        title: 'New conversation',
+      },
+    ]);
+  });
+
+  it('imports direct legacy tasks as source-branch-only when use_worktree is false', async () => {
+    const { appSqlite, appDb } = createAppDb();
+    const legacyDb = createLegacyDb();
+    openDbs.push(appSqlite, legacyDb);
+
+    legacyDb.exec(`
+      ALTER TABLE tasks ADD COLUMN path TEXT;
+      ALTER TABLE tasks ADD COLUMN use_worktree INTEGER;
+    `);
+
+    legacyDb
+      .prepare(
+        `INSERT INTO projects (id, name, path, base_ref, is_remote, remote_path, ssh_connection_id) VALUES (?, ?, ?, ?, ?, ?, ?)`
+      )
+      .run('proj-legacy-local', 'Legacy Local', '/work/repo', 'main', 0, null, null);
+
+    const remap = createRemapTables();
+    const projectsSummary = await portProjects({ appDb, legacyDb, remap });
+    expect(projectsSummary.inserted).toBe(1);
+
+    legacyDb
+      .prepare(
+        `INSERT INTO tasks (id, project_id, name, status, branch, path, use_worktree, updated_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?)`
+      )
+      .run(
+        'task-legacy-direct',
+        'proj-legacy-local',
+        'Legacy Direct Task',
+        'idle',
+        'main',
+        '/work/repo',
+        0,
+        '2026-01-04T12:00:00.000Z'
+      );
+
+    legacyDb
+      .prepare(
+        `INSERT INTO tasks (id, project_id, name, status, branch, path, use_worktree, updated_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?)`
+      )
+      .run(
+        'task-legacy-worktree',
+        'proj-legacy-local',
+        'Legacy Worktree Task',
+        'running',
+        'feature/worktree',
+        '/work/worktrees/feature-worktree',
+        1,
+        '2026-01-05T12:00:00.000Z'
+      );
+
+    const taskResult = await portTasks({ appDb, legacyDb, remap });
+    expect(taskResult.summary.inserted).toBe(2);
+
+    const insertedTasks = appSqlite
+      .prepare(
+        `SELECT id, source_branch, task_branch FROM tasks WHERE id IN (?, ?) ORDER BY id ASC`
+      )
+      .all('task-legacy-direct', 'task-legacy-worktree') as Array<{
+      id: string;
+      source_branch: string | null;
+      task_branch: string | null;
+    }>;
+
+    expect(insertedTasks).toEqual([
+      {
+        id: 'task-legacy-direct',
+        source_branch: JSON.stringify({ type: 'local', branch: 'main' }),
+        task_branch: null,
+      },
+      {
+        id: 'task-legacy-worktree',
+        source_branch: null,
+        task_branch: 'feature/worktree',
+      },
+    ]);
+  });
+
+  it('falls back to comparing task path with project path when use_worktree is missing', async () => {
+    const { appSqlite, appDb } = createAppDb();
+    const legacyDb = createLegacyDb();
+    openDbs.push(appSqlite, legacyDb);
+
+    legacyDb.exec(`ALTER TABLE tasks ADD COLUMN path TEXT;`);
+
+    legacyDb
+      .prepare(
+        `INSERT INTO projects (id, name, path, base_ref, is_remote, remote_path, ssh_connection_id) VALUES (?, ?, ?, ?, ?, ?, ?)`
+      )
+      .run('proj-legacy-local', 'Legacy Local', '/work/repo', 'main', 0, null, null);
+
+    const remap = createRemapTables();
+    const projectsSummary = await portProjects({ appDb, legacyDb, remap });
+    expect(projectsSummary.inserted).toBe(1);
+
+    legacyDb
+      .prepare(
+        `INSERT INTO tasks (id, project_id, name, status, branch, path, updated_at) VALUES (?, ?, ?, ?, ?, ?, ?)`
+      )
+      .run(
+        'task-legacy-direct',
+        'proj-legacy-local',
+        'Legacy Direct Task',
+        'idle',
+        'develop',
+        '/work/repo',
+        '2026-01-06T12:00:00.000Z'
+      );
+
+    legacyDb
+      .prepare(
+        `INSERT INTO tasks (id, project_id, name, status, branch, path, updated_at) VALUES (?, ?, ?, ?, ?, ?, ?)`
+      )
+      .run(
+        'task-legacy-worktree',
+        'proj-legacy-local',
+        'Legacy Worktree Task',
+        'running',
+        'feature/fallback-worktree',
+        '/work/worktrees/feature-fallback-worktree',
+        '2026-01-07T12:00:00.000Z'
+      );
+
+    const taskResult = await portTasks({ appDb, legacyDb, remap });
+    expect(taskResult.summary.inserted).toBe(2);
+
+    const insertedTasks = appSqlite
+      .prepare(
+        `SELECT id, source_branch, task_branch FROM tasks WHERE id IN (?, ?) ORDER BY id ASC`
+      )
+      .all('task-legacy-direct', 'task-legacy-worktree') as Array<{
+      id: string;
+      source_branch: string | null;
+      task_branch: string | null;
+    }>;
+
+    expect(insertedTasks).toEqual([
+      {
+        id: 'task-legacy-direct',
+        source_branch: JSON.stringify({ type: 'local', branch: 'develop' }),
+        task_branch: null,
+      },
+      {
+        id: 'task-legacy-worktree',
+        source_branch: null,
+        task_branch: 'feature/fallback-worktree',
+      },
+    ]);
+  });
+
+  it('uses claude legacy resume uuid from pty-session-map and falls back to legacy id', async () => {
+    const { appSqlite, appDb } = createAppDb();
+    const legacyDb = createLegacyDb();
+    openDbs.push(appSqlite, legacyDb);
+
+    const userDataDir = fs.mkdtempSync(path.join(os.tmpdir(), 'legacy-port-conv-'));
+    tempDirs.push(userDataDir);
+
+    const mappedChatUuid = '6ba95736-36d7-401e-9ef6-01655fb9162a';
+    const mappedMainUuid = '08973564-c91f-4de8-a4df-a8f31e84c95f';
+    const collisionUuid = '7f27294f-b8bf-4d9e-b8ac-c6f3f8575970';
+    const mappedOptimisticUuid = '1a834cde-bb43-41e6-bdcf-f955a498ce96';
+
+    fs.writeFileSync(
+      path.join(userDataDir, 'pty-session-map.json'),
+      JSON.stringify({
+        'claude-chat-conv-legacy-chat': { uuid: mappedChatUuid },
+        'claude-main-task-legacy-main': { uuid: mappedMainUuid },
+        'claude-main-optimistic-1776065416593': { uuid: mappedOptimisticUuid },
+        'claude-chat-conv-legacy-invalid': { uuid: 'not-a-uuid' },
+        'claude-chat-conv-legacy-collision': { uuid: collisionUuid },
+      }),
+      'utf8'
+    );
+
+    appSqlite
+      .prepare(
+        `INSERT INTO projects (id, name, path, workspace_provider, base_ref) VALUES (?, ?, ?, ?, ?)`
+      )
+      .run('proj-existing', 'Existing Project', '/existing/repo', 'local', 'main');
+    appSqlite
+      .prepare(
+        `INSERT INTO tasks (id, project_id, name, status, source_branch, task_branch) VALUES (?, ?, ?, ?, ?, ?)`
+      )
+      .run(
+        'task-existing',
+        'proj-existing',
+        'Existing Task',
+        'todo',
+        JSON.stringify({ type: 'local', branch: 'main' }),
+        'feature/existing'
+      );
+    appSqlite
+      .prepare(
+        `INSERT INTO conversations (id, project_id, task_id, title, provider) VALUES (?, ?, ?, ?, ?)`
+      )
+      .run(collisionUuid, 'proj-existing', 'task-existing', 'Existing Conversation', 'claude');
+
+    legacyDb
+      .prepare(
+        `INSERT INTO projects (id, name, path, base_ref, is_remote, remote_path, ssh_connection_id) VALUES (?, ?, ?, ?, ?, ?, ?)`
+      )
+      .run('proj-legacy-claude', 'Legacy Claude', '/legacy/repo', 'main', 0, null, null);
+
+    legacyDb
+      .prepare(
+        `INSERT INTO tasks (id, project_id, name, status, branch, updated_at) VALUES (?, ?, ?, ?, ?, ?)`
+      )
+      .run(
+        'task-legacy-chat',
+        'proj-legacy-claude',
+        'Legacy Task Chat',
+        'running',
+        'feature/legacy-chat',
+        '2026-01-03T12:00:00.000Z'
+      );
+    legacyDb
+      .prepare(
+        `INSERT INTO tasks (id, project_id, name, status, branch, updated_at) VALUES (?, ?, ?, ?, ?, ?)`
+      )
+      .run(
+        'task-legacy-main',
+        'proj-legacy-claude',
+        'Legacy Task Main',
+        'running',
+        'feature/legacy-main',
+        '2026-01-03T12:00:00.000Z'
+      );
+    legacyDb
+      .prepare(
+        `INSERT INTO tasks (id, project_id, name, status, branch, updated_at) VALUES (?, ?, ?, ?, ?, ?)`
+      )
+      .run(
+        'task-legacy-invalid',
+        'proj-legacy-claude',
+        'Legacy Task Invalid',
+        'running',
+        'feature/legacy-invalid',
+        '2026-01-03T12:00:00.000Z'
+      );
+    legacyDb
+      .prepare(
+        `INSERT INTO tasks (id, project_id, name, status, branch, updated_at) VALUES (?, ?, ?, ?, ?, ?)`
+      )
+      .run(
+        'task-legacy-collision',
+        'proj-legacy-claude',
+        'Legacy Task Collision',
+        'running',
+        'feature/legacy-collision',
+        '2026-01-03T12:00:00.000Z'
+      );
+    legacyDb
+      .prepare(
+        `INSERT INTO tasks (id, project_id, name, status, branch, updated_at) VALUES (?, ?, ?, ?, ?, ?)`
+      )
+      .run(
+        'task-legacy-wt',
+        'proj-legacy-claude',
+        'Legacy Task WT',
+        'running',
+        'feature/legacy-wt',
+        '2026-01-03T12:00:00.000Z'
+      );
+
+    legacyDb
+      .prepare(`INSERT INTO conversations (id, task_id, title, provider) VALUES (?, ?, ?, ?)`)
+      .run('conv-legacy-chat', 'task-legacy-chat', 'Legacy Claude Chat', 'claude');
+    legacyDb
+      .prepare(`INSERT INTO conversations (id, task_id, title, provider) VALUES (?, ?, ?, ?)`)
+      .run('conv-legacy-main', 'task-legacy-main', 'Legacy Claude Main', 'claude');
+    legacyDb
+      .prepare(`INSERT INTO conversations (id, task_id, title, provider) VALUES (?, ?, ?, ?)`)
+      .run('conv-legacy-invalid', 'task-legacy-invalid', 'Legacy Claude Invalid', 'claude');
+    legacyDb
+      .prepare(`INSERT INTO conversations (id, task_id, title, provider) VALUES (?, ?, ?, ?)`)
+      .run('conv-legacy-collision', 'task-legacy-collision', 'Legacy Claude Collision', 'claude');
+    legacyDb
+      .prepare(`INSERT INTO conversations (id, task_id, title, provider) VALUES (?, ?, ?, ?)`)
+      .run(
+        'conv-wt-legacy-wt-1776065417596',
+        'task-legacy-wt',
+        'Legacy Claude Optimistic Alias',
+        'claude'
+      );
+    legacyDb
+      .prepare(`INSERT INTO conversations (id, task_id, title, provider) VALUES (?, ?, ?, ?)`)
+      .run('conv-legacy-codex', 'task-legacy-chat', 'Legacy Codex Conversation', 'codex');
+
+    const remap = createRemapTables();
+    await portSshConnections({ appDb, legacyDb, remap });
+    await portProjects({ appDb, legacyDb, remap });
+    const taskResult = await portTasks({ appDb, legacyDb, remap });
+
+    const conversationsSummary = await portConversations({
+      appDb,
+      legacyDb,
+      remap,
+      mergedLegacyTaskIds: taskResult.mergedLegacyTaskIds,
+      userDataPath: userDataDir,
+    });
+
+    expect(conversationsSummary.inserted).toBe(6);
+
+    const inserted = appSqlite
+      .prepare(
+        `SELECT id, title, provider FROM conversations WHERE title LIKE 'Legacy %' ORDER BY title ASC`
+      )
+      .all() as Array<{ id: string; title: string; provider: string | null }>;
+
+    expect(inserted).toEqual([
+      { id: mappedChatUuid, title: 'Legacy Claude Chat', provider: 'claude' },
+      { id: 'conv-legacy-collision', title: 'Legacy Claude Collision', provider: 'claude' },
+      { id: 'conv-legacy-invalid', title: 'Legacy Claude Invalid', provider: 'claude' },
+      { id: mappedMainUuid, title: 'Legacy Claude Main', provider: 'claude' },
+      { id: mappedOptimisticUuid, title: 'Legacy Claude Optimistic Alias', provider: 'claude' },
+      { id: 'conv-legacy-codex', title: 'Legacy Codex Conversation', provider: 'codex' },
+    ]);
+  });
+});
diff --git a/src/main/db/legacy-port/importers/relational/remap.ts b/src/main/db/legacy-port/importers/relational/remap.ts
new file mode 100644
index 0000000000..27f99f426f
--- /dev/null
+++ b/src/main/db/legacy-port/importers/relational/remap.ts
@@ -0,0 +1,13 @@
+export type RemapTables = {
+  sshConnectionId: Map<string, string>;
+  projectId: Map<string, string>;
+  taskId: Map<string, string>;
+};
+
+export function createRemapTables(): RemapTables {
+  return {
+    sshConnectionId: new Map(),
+    projectId: new Map(),
+    taskId: new Map(),
+  };
+}
diff --git a/src/main/db/legacy-port/importers/relational/ssh-connections.ts b/src/main/db/legacy-port/importers/relational/ssh-connections.ts
new file mode 100644
index 0000000000..ccf5dbd909
--- /dev/null
+++ b/src/main/db/legacy-port/importers/relational/ssh-connections.ts
@@ -0,0 +1,169 @@
+import { randomUUID } from 'node:crypto';
+import { sshConnections } from '@main/db/schema';
+import { log } from '@main/lib/logger';
+import {
+  makeSshFingerprint,
+  normalizeHost,
+  normalizePort,
+  normalizeUsername,
+} from '../../legacy-source/normalize';
+import {
+  isUniqueConstraintError,
+  readLegacyRows,
+  toInteger,
+  toIsoTimestamp,
+  toTrimmedString,
+} from './helpers';
+import { createPortSummary, type PortContext, type PortSummary } from './types';
+
+type ExistingSshConnection = {
+  id: string;
+  name: string;
+  host: string;
+  port: number;
+  username: string;
+};
+
+function pickUniqueConnectionName(baseName: string, usedNames: Set<string>): string {
+  const trimmedBase = baseName.trim() || 'Legacy SSH';
+  if (!usedNames.has(trimmedBase)) {
+    usedNames.add(trimmedBase);
+    return trimmedBase;
+  }
+
+  let index = 1;
+  while (true) {
+    const suffix = index === 1 ? ' (legacy)' : ` (legacy ${index})`;
+    const candidate = `${trimmedBase}${suffix}`;
+    if (!usedNames.has(candidate)) {
+      usedNames.add(candidate);
+      return candidate;
+    }
+    index += 1;
+  }
+}
+
+export async function portSshConnections({
+  appDb,
+  legacyDb,
+  remap,
+}: PortContext): Promise<PortSummary> {
+  const summary = createPortSummary('ssh_connections');
+  const nowIso = new Date().toISOString();
+
+  const existingConnections = (await appDb
+    .select({
+      id: sshConnections.id,
+      name: sshConnections.name,
+      host: sshConnections.host,
+      port: sshConnections.port,
+      username: sshConnections.username,
+    })
+    .from(sshConnections)
+    .execute()) as ExistingSshConnection[];
+
+  const fingerprintToConnectionId = new Map<string, string>();
+  const existingConnectionIds = new Set<string>();
+  const usedConnectionNames = new Set<string>();
+
+  for (const existing of existingConnections) {
+    const fingerprint = makeSshFingerprint(
+      existing.host,
+      normalizePort(existing.port),
+      existing.username
+    );
+    fingerprintToConnectionId.set(fingerprint, existing.id);
+    existingConnectionIds.add(existing.id);
+    usedConnectionNames.add(existing.name);
+  }
+
+  const legacyRows = readLegacyRows(legacyDb, 'ssh_connections', [
+    'id',
+    'name',
+    'host',
+    'port',
+    'username',
+    'auth_type',
+    'private_key_path',
+    'use_agent',
+    'created_at',
+    'updated_at',
+  ]);
+
+  for (const row of legacyRows) {
+    summary.considered += 1;
+
+    const legacyId = toTrimmedString(row.id);
+    const host = toTrimmedString(row.host);
+    const username = toTrimmedString(row.username);
+
+    if (!legacyId || !host || !username) {
+      summary.skippedInvalid += 1;
+      log.warn('legacy-port: ssh_connections: skipping invalid row (missing id/host/username)', {
+        legacyId,
+      });
+      continue;
+    }
+
+    const normalizedPort = normalizePort(toInteger(row.port));
+    const fingerprint = makeSshFingerprint(host, normalizedPort, username);
+    const existingConnectionId = fingerprintToConnectionId.get(fingerprint);
+
+    if (existingConnectionId) {
+      remap.sshConnectionId.set(legacyId, existingConnectionId);
+      summary.skippedDedup += 1;
+      continue;
+    }
+
+    let nextConnectionId = existingConnectionIds.has(legacyId) ? randomUUID() : legacyId;
+
+    const preferredName =
+      toTrimmedString(row.name) ??
+      `${normalizeUsername(username)}@${normalizeHost(host)}:${normalizedPort}`;
+
+    const insertValues = {
+      id: nextConnectionId,
+      name: pickUniqueConnectionName(preferredName, usedConnectionNames),
+      host,
+      port: normalizedPort,
+      username,
+      authType: toTrimmedString(row.auth_type) ?? 'agent',
+      privateKeyPath: toTrimmedString(row.private_key_path) ?? null,
+      useAgent: toInteger(row.use_agent) === 1 ? 1 : 0,
+      metadata: null,
+      createdAt: toIsoTimestamp(row.created_at, nowIso),
+      updatedAt: toIsoTimestamp(row.updated_at, nowIso),
+    };
+
+    let inserted = false;
+    for (let attempt = 0; attempt < 2; attempt += 1) {
+      try {
+        insertValues.id = nextConnectionId;
+        await appDb.insert(sshConnections).values(insertValues).execute();
+        inserted = true;
+        break;
+      } catch (error) {
+        if (attempt === 0 && isUniqueConstraintError(error, 'ssh_connections.id')) {
+          nextConnectionId = randomUUID();
+          continue;
+        }
+
+        summary.skippedError += 1;
+        log.warn('legacy-port: ssh_connections: failed to insert row', {
+          legacyId,
+          error: error instanceof Error ? error.message : String(error),
+        });
+        break;
+      }
+    }
+
+    if (!inserted) continue;
+
+    remap.sshConnectionId.set(legacyId, nextConnectionId);
+    fingerprintToConnectionId.set(fingerprint, nextConnectionId);
+    existingConnectionIds.add(nextConnectionId);
+    summary.inserted += 1;
+  }
+
+  return summary;
+}
diff --git a/src/main/db/legacy-port/importers/relational/tasks.ts b/src/main/db/legacy-port/importers/relational/tasks.ts
new file mode 100644
index 0000000000..b841e80b91
--- /dev/null
+++ b/src/main/db/legacy-port/importers/relational/tasks.ts
@@ -0,0 +1,203 @@
+import { randomUUID } from 'node:crypto';
+import { tasks } from '@main/db/schema';
+import { log } from '@main/lib/logger';
+import {
+  isUniqueConstraintError,
+  readLegacyRows,
+  toInteger,
+  toIsoTimestamp,
+  toTrimmedString,
+} from './helpers';
+import { createPortSummary, type PortContext, type PortSummary } from './types';
+
+export type TaskPortResult = {
+  summary: PortSummary;
+  mergedLegacyTaskIds: Set<string>;
+};
+
+function coerceTaskStatus(
+  rawStatus: string | undefined
+): 'todo' | 'in_progress' | 'review' | 'done' | 'cancelled' {
+  const normalized = rawStatus?.trim().toLowerCase();
+
+  if (normalized === 'idle') return 'todo';
+  if (normalized === 'running' || normalized === 'active') return 'in_progress';
+  if (normalized === 'review') return 'review';
+  if (normalized === 'done' || normalized === 'completed') return 'done';
+  if (normalized === 'cancelled') return 'cancelled';
+  return 'todo';
+}
+
+function inferLegacyTaskLayout(args: {
+  branch: string | undefined;
+  taskPath: string | undefined;
+  legacyProjectPath: string | undefined;
+  useWorktree: number | undefined;
+}): { sourceBranch: { type: 'local'; branch: string } | null; taskBranch: string | null } {
+  const { branch, taskPath, legacyProjectPath, useWorktree } = args;
+
+  if (!branch) return { sourceBranch: null, taskBranch: null };
+
+  if (useWorktree === 0) {
+    return {
+      sourceBranch: { type: 'local', branch },
+      taskBranch: null,
+    };
+  }
+
+  if (useWorktree === 1) {
+    return { sourceBranch: null, taskBranch: branch };
+  }
+
+  if (taskPath && legacyProjectPath && taskPath === legacyProjectPath) {
+    return {
+      sourceBranch: { type: 'local', branch },
+      taskBranch: null,
+    };
+  }
+
+  return { sourceBranch: null, taskBranch: branch };
+}
+
+export async function portTasks({ appDb, legacyDb, remap }: PortContext): Promise<TaskPortResult> {
+  const summary = createPortSummary('tasks');
+  const mergedLegacyTaskIds = new Set<string>();
+  const nowIso = new Date().toISOString();
+
+  const existingTaskRows = await appDb
+    .select({
+      id: tasks.id,
+      projectId: tasks.projectId,
+      taskBranch: tasks.taskBranch,
+    })
+    .from(tasks)
+    .execute();
+
+  const existingTaskIds = new Set<string>();
+  const branchKeyToTaskId = new Map<string, string>();
+
+  for (const row of existingTaskRows) {
+    existingTaskIds.add(row.id);
+    if (row.taskBranch) {
+      branchKeyToTaskId.set(`${row.projectId}::${row.taskBranch}`, row.id);
+    }
+  }
+
+  const legacyProjectRows = readLegacyRows(legacyDb, 'projects', ['id', 'path']);
+  const legacyProjectPathById = new Map<string, string>();
+
+  for (const row of legacyProjectRows) {
+    const legacyProjectId = toTrimmedString(row.id);
+    const legacyProjectPath = toTrimmedString(row.path);
+    if (legacyProjectId && legacyProjectPath) {
+      legacyProjectPathById.set(legacyProjectId, legacyProjectPath);
+    }
+  }
+
+  const legacyRows = readLegacyRows(legacyDb, 'tasks', [
+    'id',
+    'project_id',
+    'name',
+    'status',
+    'branch',
+    'path',
+    'use_worktree',
+    'archived_at',
+    'created_at',
+    'updated_at',
+  ]);
+
+  for (const row of legacyRows) {
+    summary.considered += 1;
+
+    const legacyTaskId = toTrimmedString(row.id);
+    const legacyProjectId = toTrimmedString(row.project_id);
+
+    if (!legacyTaskId || !legacyProjectId) {
+      summary.skippedInvalid += 1;
+      continue;
+    }
+
+    const mappedProjectId = remap.projectId.get(legacyProjectId);
+    if (!mappedProjectId) {
+      summary.skippedError += 1;
+      continue;
+    }
+
+    const branch = toTrimmedString(row.branch);
+    const taskPath = toTrimmedString(row.path);
+    const useWorktree = toInteger(row.use_worktree);
+    const legacyProjectPath = legacyProjectPathById.get(legacyProjectId);
+    const { sourceBranch, taskBranch } = inferLegacyTaskLayout({
+      branch,
+      taskPath,
+      legacyProjectPath,
+      useWorktree,
+    });
+
+    if (taskBranch) {
+      const existingTaskId = branchKeyToTaskId.get(`${mappedProjectId}::${taskBranch}`);
+      if (existingTaskId) {
+        remap.taskId.set(legacyTaskId, existingTaskId);
+        mergedLegacyTaskIds.add(legacyTaskId);
+        summary.skippedDedup += 1;
+        continue;
+      }
+    }
+
+    let nextTaskId = existingTaskIds.has(legacyTaskId) ? randomUUID() : legacyTaskId;
+
+    const updatedAt = toIsoTimestamp(row.updated_at, nowIso);
+    const createdAt = toIsoTimestamp(row.created_at, updatedAt);
+
+    const insertValues = {
+      id: nextTaskId,
+      projectId: mappedProjectId,
+      name: toTrimmedString(row.name) ?? branch ?? `Legacy Task ${legacyTaskId.slice(0, 8)}`,
+      status: coerceTaskStatus(toTrimmedString(row.status)),
+      sourceBranch,
+      taskBranch: taskBranch ?? null,
+      archivedAt: toTrimmedString(row.archived_at) ?? null,
+      createdAt,
+      updatedAt,
+      statusChangedAt: updatedAt,
+      lastInteractedAt: updatedAt,
+      isPinned: 0,
+    };
+
+    let inserted = false;
+
+    for (let attempt = 0; attempt < 2; attempt += 1) {
+      try {
+        insertValues.id = nextTaskId;
+        await appDb.insert(tasks).values(insertValues).execute();
+        inserted = true;
+        break;
+      } catch (error) {
+        if (attempt === 0 && isUniqueConstraintError(error, 'tasks.id')) {
+          nextTaskId = randomUUID();
+          continue;
+        }
+
+        summary.skippedError += 1;
+        log.warn('legacy-port: tasks: failed to insert row', {
+          legacyTaskId,
+          error: error instanceof Error ? error.message : String(error),
+        });
+        break;
+      }
+    }
+
+    if (!inserted) continue;
+
+    remap.taskId.set(legacyTaskId, nextTaskId);
+    existingTaskIds.add(nextTaskId);
+    summary.inserted += 1;
+
+    if (taskBranch) {
+      branchKeyToTaskId.set(`${mappedProjectId}::${taskBranch}`, nextTaskId);
+    }
+  }
+
+  return { summary, mergedLegacyTaskIds };
+}
diff --git a/src/main/db/legacy-port/importers/relational/types.ts b/src/main/db/legacy-port/importers/relational/types.ts
new file mode 100644
index 0000000000..1565b46f0f
--- /dev/null
+++ b/src/main/db/legacy-port/importers/relational/types.ts
@@ -0,0 +1,32 @@
+import type Database from 'better-sqlite3';
+import type { BetterSQLite3Database } from 'drizzle-orm/better-sqlite3';
+import type * as schema from '@main/db/schema';
+import type { RemapTables } from './remap';
+
+export type RelationalImportDb = BetterSQLite3Database<typeof schema>;
+
+export type PortContext = {
+  appDb: RelationalImportDb;
+  legacyDb: Database.Database;
+  remap: RemapTables;
+};
+
+export type PortSummary = {
+  table: string;
+  considered: number;
+  inserted: number;
+  skippedDedup: number;
+  skippedInvalid: number;
+  skippedError: number;
+};
+
+export function createPortSummary(table: string): PortSummary {
+  return {
+    table,
+    considered: 0,
+    inserted: 0,
+    skippedDedup: 0,
+    skippedInvalid: 0,
+    skippedError: 0,
+  };
+}
diff --git a/src/main/db/legacy-port/importers/settings/importer.test.ts b/src/main/db/legacy-port/importers/settings/importer.test.ts
new file mode 100644
index 0000000000..3cf471ff0e
--- /dev/null
+++ b/src/main/db/legacy-port/importers/settings/importer.test.ts
@@ -0,0 +1,251 @@
+import fs from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
+import Database from 'better-sqlite3';
+import { afterEach, describe, expect, it } from 'vitest';
+import type { AppSettings, AppSettingsKey } from '@shared/app-settings';
+import { getDefaultForKey } from '@main/core/settings/settings-registry';
+import { computeDelta, isDeepEqual, isPlainObject, mergeDeep } from '@main/core/settings/utils';
+import { createDrizzleClient } from '../../../drizzleClient';
+import { portLegacySettings } from './importer';
+
+function createSettingsDb(): {
+  appSqlite: Database.Database;
+  appDb: ReturnType<typeof createDrizzleClient>['db'];
+} {
+  const appSqlite = new Database(':memory:');
+  appSqlite.exec(`
+    CREATE TABLE app_settings (
+      key TEXT PRIMARY KEY,
+      value TEXT NOT NULL,
+      updated_at INTEGER NOT NULL DEFAULT CURRENT_TIMESTAMP
+    );
+  `);
+  return {
+    appSqlite,
+    appDb: createDrizzleClient({ database: appSqlite }).db,
+  };
+}
+
+function readRawSetting(appSqlite: Database.Database, key: string): unknown | null {
+  const row = appSqlite.prepare('SELECT value FROM app_settings WHERE key = ? LIMIT 1').get(key) as
+    | { value: string }
+    | undefined;
+  if (!row) return null;
+  return JSON.parse(row.value) as unknown;
+}
+
+function upsertRawSetting(appSqlite: Database.Database, key: string, value: unknown): void {
+  appSqlite
+    .prepare(
+      `
+        INSERT INTO app_settings (key, value)
+        VALUES (?, ?)
+        ON CONFLICT(key) DO UPDATE SET value = excluded.value
+      `
+    )
+    .run(key, JSON.stringify(value));
+}
+
+function deleteRawSetting(appSqlite: Database.Database, key: string): void {
+  appSqlite.prepare('DELETE FROM app_settings WHERE key = ?').run(key);
+}
+
+function createSettingsStoreStub(appSqlite: Database.Database): {
+  get<K extends AppSettingsKey>(key: K): Promise<AppSettings[K]>;
+  update<K extends AppSettingsKey>(key: K, value: AppSettings[K]): Promise<void>;
+} {
+  return {
+    async get<K extends AppSettingsKey>(key: K): Promise<AppSettings[K]> {
+      const defaults = getDefaultForKey(key);
+      const raw = readRawSetting(appSqlite, key);
+
+      if (raw === null || raw === undefined) {
+        return defaults;
+      }
+
+      if (isPlainObject(raw) && isPlainObject(defaults)) {
+        return mergeDeep(defaults as Record<string, unknown>, raw) as AppSettings[K];
+      }
+
+      return raw as AppSettings[K];
+    },
+    async update<K extends AppSettingsKey>(key: K, value: AppSettings[K]): Promise<void> {
+      const defaults = getDefaultForKey(key);
+
+      if (isPlainObject(value) && isPlainObject(defaults)) {
+        const delta = computeDelta(
+          value as Record<string, unknown>,
+          defaults as Record<string, unknown>
+        );
+
+        if (Object.keys(delta).length === 0) {
+          deleteRawSetting(appSqlite, key);
+        } else {
+          upsertRawSetting(appSqlite, key, delta);
+        }
+
+        return;
+      }
+
+      if (isDeepEqual(value, defaults)) {
+        deleteRawSetting(appSqlite, key);
+        return;
+      }
+
+      upsertRawSetting(appSqlite, key, value);
+    },
+  };
+}
+
+describe('portLegacySettings', () => {
+  const tempDirs: string[] = [];
+  const openDbs: Database.Database[] = [];
+
+  afterEach(() => {
+    for (const db of openDbs.splice(0)) db.close();
+    for (const dir of tempDirs.splice(0)) {
+      fs.rmSync(dir, { recursive: true, force: true });
+    }
+  });
+
+  it('ports only the approved mappings and preserves existing non-mapped settings', async () => {
+    const userDataDir = fs.mkdtempSync(path.join(os.tmpdir(), 'legacy-settings-port-'));
+    tempDirs.push(userDataDir);
+
+    fs.writeFileSync(
+      path.join(userDataDir, 'settings.json'),
+      JSON.stringify({
+        repository: { branchPrefix: 'legacy-prefix', pushOnCreate: false },
+        projects: { defaultDirectory: '/legacy/projects' },
+        tasks: {
+          autoGenerateName: false,
+          autoApproveByDefault: true,
+          autoTrustWorktrees: false,
+        },
+        notifications: {
+          enabled: false,
+          sound: false,
+          osNotifications: false,
+          soundFocusMode: 'unfocused',
+        },
+        defaultProvider: 'codex',
+        review: { prompt: '  Review this worktree carefully.  ' },
+        interface: {
+          autoRightSidebarBehavior: true,
+          taskHoverAction: 'archive',
+          theme: 'dark-black',
+        },
+        terminal: {
+          fontFamily: '  Fira Code  ',
+          autoCopyOnSelection: true,
+        },
+        browserPreview: { enabled: false },
+        defaultOpenInApp: 'cursor',
+        hiddenOpenInApps: ['terminal'],
+        providerConfigs: {
+          codex: { defaultArgs: '--dangerously-allow-all' },
+        },
+      }),
+      'utf8'
+    );
+
+    const { appSqlite, appDb } = createSettingsDb();
+    openDbs.push(appSqlite);
+
+    appSqlite
+      .prepare('INSERT INTO app_settings (key, value) VALUES (?, ?)')
+      .run('localProject', JSON.stringify({ defaultProjectsDirectory: '/beta/projects' }));
+    appSqlite
+      .prepare('INSERT INTO app_settings (key, value) VALUES (?, ?)')
+      .run('terminal', JSON.stringify({ autoCopyOnSelection: true }));
+    appSqlite
+      .prepare('INSERT INTO app_settings (key, value) VALUES (?, ?)')
+      .run(
+        'interface',
+        JSON.stringify({ autoRightSidebarBehavior: true, taskHoverAction: 'archive' })
+      );
+    appSqlite
+      .prepare('INSERT INTO app_settings (key, value) VALUES (?, ?)')
+      .run('openIn', JSON.stringify({ default: 'cursor', hidden: ['terminal'] }));
+    appSqlite
+      .prepare('INSERT INTO app_settings (key, value) VALUES (?, ?)')
+      .run('providerConfigs', JSON.stringify({ codex: { defaultArgs: ['--legacy-arg'] } }));
+
+    const summary = await portLegacySettings(userDataDir, {
+      appDb,
+      appSqlite,
+      settingsStore: createSettingsStoreStub(appSqlite),
+    });
+
+    expect(summary.imported).toEqual([
+      'localProject.branchPrefix',
+      'localProject.pushOnCreate',
+      'tasks.autoGenerateName',
+      'tasks.autoApproveByDefault',
+      'tasks.autoTrustWorktrees',
+      'notifications.enabled',
+      'notifications.sound',
+      'notifications.osNotifications',
+      'notifications.soundFocusMode',
+      'defaultAgent',
+      'reviewPrompt',
+      'theme',
+      'terminal.fontFamily',
+    ]);
+
+    const localProject = readRawSetting(appSqlite, 'localProject') as Record<string, unknown>;
+    expect(localProject.defaultProjectsDirectory).toBe('/beta/projects');
+    expect(localProject.branchPrefix).toBe('legacy-prefix');
+    expect(localProject.pushOnCreate).toBe(false);
+
+    expect(readRawSetting(appSqlite, 'tasks')).toEqual({
+      autoGenerateName: false,
+      autoApproveByDefault: true,
+      autoTrustWorktrees: false,
+    });
+    expect(readRawSetting(appSqlite, 'notifications')).toEqual({
+      enabled: false,
+      sound: false,
+      osNotifications: false,
+      soundFocusMode: 'unfocused',
+    });
+    expect(readRawSetting(appSqlite, 'defaultAgent')).toBe('codex');
+    expect(readRawSetting(appSqlite, 'reviewPrompt')).toBe('Review this worktree carefully.');
+    expect(readRawSetting(appSqlite, 'theme')).toBe('emdark');
+
+    const terminal = readRawSetting(appSqlite, 'terminal') as Record<string, unknown>;
+    expect(terminal.autoCopyOnSelection).toBe(true);
+    expect(terminal.fontFamily).toBe('Fira Code');
+
+    // Non-mapped keys stay untouched.
+    expect(readRawSetting(appSqlite, 'interface')).toEqual({
+      autoRightSidebarBehavior: true,
+      taskHoverAction: 'archive',
+    });
+    expect(readRawSetting(appSqlite, 'openIn')).toEqual({
+      default: 'cursor',
+      hidden: ['terminal'],
+    });
+    expect(readRawSetting(appSqlite, 'providerConfigs')).toEqual({
+      codex: { defaultArgs: ['--legacy-arg'] },
+    });
+    expect(readRawSetting(appSqlite, 'browserPreview')).toBe(null);
+  });
+
+  it('skips when settings.json is missing or invalid', async () => {
+    const userDataDir = fs.mkdtempSync(path.join(os.tmpdir(), 'legacy-settings-port-missing-'));
+    tempDirs.push(userDataDir);
+
+    const { appSqlite, appDb } = createSettingsDb();
+    openDbs.push(appSqlite);
+
+    const summary = await portLegacySettings(userDataDir, {
+      appDb,
+      appSqlite,
+      settingsStore: createSettingsStoreStub(appSqlite),
+    });
+    expect(summary.imported).toEqual([]);
+    expect(summary.skipped).toContain('settings:missing-or-invalid-json');
+  });
+});
diff --git a/src/main/db/legacy-port/importers/settings/importer.ts b/src/main/db/legacy-port/importers/settings/importer.ts
new file mode 100644
index 0000000000..64d2c8fab1
--- /dev/null
+++ b/src/main/db/legacy-port/importers/settings/importer.ts
@@ -0,0 +1,261 @@
+import { existsSync, readFileSync } from 'node:fs';
+import { join } from 'node:path';
+import type Database from 'better-sqlite3';
+import { isValidProviderId } from '@shared/agent-provider-registry';
+import type { AppSettings, AppSettingsKey } from '@shared/app-settings';
+import { getDefaultForKey } from '@main/core/settings/settings-registry';
+import { isPlainObject, mergeDeep } from '@main/core/settings/utils';
+import type { RelationalImportDb } from '../relational/types';
+
+const LEGACY_SETTINGS_FILE = 'settings.json';
+
+export type LegacySettingsPortSummary = {
+  imported: string[];
+  skipped: string[];
+};
+
+export type PortLegacySettingsOptions = {
+  appDb: RelationalImportDb;
+  appSqlite: Database.Database;
+  settingsStore?: {
+    get<K extends AppSettingsKey>(key: K): Promise<AppSettings[K]>;
+    update<K extends AppSettingsKey>(key: K, value: AppSettings[K]): Promise<void>;
+  };
+};
+
+type LegacyTheme = 'light' | 'dark' | 'dark-black' | 'system';
+
+function hasTable(appSqlite: Database.Database, tableName: string): boolean {
+  const row = appSqlite
+    .prepare(`SELECT 1 FROM sqlite_master WHERE type = 'table' AND name = ? LIMIT 1`)
+    .get(tableName) as { 1: number } | undefined;
+  return !!row;
+}
+
+function readJsonFile(filePath: string): unknown | null {
+  if (!existsSync(filePath)) return null;
+  try {
+    return JSON.parse(readFileSync(filePath, 'utf8')) as unknown;
+  } catch {
+    return null;
+  }
+}
+
+function readTrimmedString(value: unknown): string | null {
+  if (typeof value !== 'string') return null;
+  const trimmed = value.trim();
+  return trimmed.length > 0 ? trimmed : null;
+}
+
+function readBoolean(value: unknown): boolean | null {
+  return typeof value === 'boolean' ? value : null;
+}
+
+async function updateObjectSetting<K extends AppSettingsKey>(
+  settingsStore: NonNullable<PortLegacySettingsOptions['settingsStore']>,
+  key: K,
+  patch: Record<string, unknown>
+): Promise<void> {
+  if (Object.keys(patch).length === 0) return;
+
+  const defaults = getDefaultForKey(key);
+  if (!isPlainObject(defaults)) return;
+
+  const currentValue = await settingsStore.get(key);
+  const currentObject = isPlainObject(currentValue)
+    ? (currentValue as Record<string, unknown>)
+    : (defaults as Record<string, unknown>);
+  const merged = mergeDeep(currentObject, patch);
+
+  await settingsStore.update(key, merged as AppSettings[K]);
+}
+
+async function updateScalarSetting<K extends AppSettingsKey>(
+  settingsStore: NonNullable<PortLegacySettingsOptions['settingsStore']>,
+  key: K,
+  nextValue: AppSettings[K]
+): Promise<void> {
+  await settingsStore.update(key, nextValue);
+}
+
+function mapLegacyTheme(theme: unknown): AppSettings['theme'] | undefined {
+  const value = theme as LegacyTheme;
+  if (value === 'light') return 'emlight';
+  if (value === 'dark' || value === 'dark-black') return 'emdark';
+  if (value === 'system') return null;
+  return undefined;
+}
+
+export async function portLegacySettings(
+  userDataPath: string,
+  options: PortLegacySettingsOptions
+): Promise<LegacySettingsPortSummary> {
+  const { appSqlite } = options;
+
+  const summary: LegacySettingsPortSummary = {
+    imported: [],
+    skipped: [],
+  };
+
+  if (!hasTable(appSqlite, 'app_settings')) {
+    summary.skipped.push('settings:app_settings-table-missing');
+    return summary;
+  }
+
+  const settingsPath = join(userDataPath, LEGACY_SETTINGS_FILE);
+  const legacyRaw = readJsonFile(settingsPath);
+  if (legacyRaw === null) {
+    summary.skipped.push('settings:missing-or-invalid-json');
+    return summary;
+  }
+
+  if (!isPlainObject(legacyRaw)) {
+    summary.skipped.push('settings:invalid-root');
+    return summary;
+  }
+
+  const settingsStore =
+    options.settingsStore ??
+    new (await import('@main/core/settings/settings-service')).SettingsStore();
+  const repository = isPlainObject(legacyRaw.repository) ? legacyRaw.repository : null;
+  if (repository) {
+    const patch: Record<string, unknown> = {};
+
+    const branchPrefix = readTrimmedString(repository.branchPrefix);
+    if (branchPrefix) {
+      patch.branchPrefix = branchPrefix;
+      summary.imported.push('localProject.branchPrefix');
+    }
+
+    const pushOnCreate = readBoolean(repository.pushOnCreate);
+    if (pushOnCreate !== null) {
+      patch.pushOnCreate = pushOnCreate;
+      summary.imported.push('localProject.pushOnCreate');
+    }
+
+    if (Object.keys(patch).length > 0) {
+      try {
+        await updateObjectSetting(settingsStore, 'localProject', patch);
+      } catch {
+        summary.skipped.push('localProject:validation-failed');
+      }
+    }
+  }
+
+  const tasks = isPlainObject(legacyRaw.tasks) ? legacyRaw.tasks : null;
+  if (tasks) {
+    const patch: Record<string, unknown> = {};
+    const autoGenerateName = readBoolean(tasks.autoGenerateName);
+    const autoApproveByDefault = readBoolean(tasks.autoApproveByDefault);
+    const autoTrustWorktrees = readBoolean(tasks.autoTrustWorktrees);
+
+    if (autoGenerateName !== null) {
+      patch.autoGenerateName = autoGenerateName;
+      summary.imported.push('tasks.autoGenerateName');
+    }
+    if (autoApproveByDefault !== null) {
+      patch.autoApproveByDefault = autoApproveByDefault;
+      summary.imported.push('tasks.autoApproveByDefault');
+    }
+    if (autoTrustWorktrees !== null) {
+      patch.autoTrustWorktrees = autoTrustWorktrees;
+      summary.imported.push('tasks.autoTrustWorktrees');
+    }
+
+    if (Object.keys(patch).length > 0) {
+      try {
+        await updateObjectSetting(settingsStore, 'tasks', patch);
+      } catch {
+        summary.skipped.push('tasks:validation-failed');
+      }
+    }
+  }
+
+  const notifications = isPlainObject(legacyRaw.notifications) ? legacyRaw.notifications : null;
+  if (notifications) {
+    const patch: Record<string, unknown> = {};
+    const enabled = readBoolean(notifications.enabled);
+    const sound = readBoolean(notifications.sound);
+    const osNotifications = readBoolean(notifications.osNotifications);
+    const focusMode = notifications.soundFocusMode;
+
+    if (enabled !== null) {
+      patch.enabled = enabled;
+      summary.imported.push('notifications.enabled');
+    }
+    if (sound !== null) {
+      patch.sound = sound;
+      summary.imported.push('notifications.sound');
+    }
+    if (osNotifications !== null) {
+      patch.osNotifications = osNotifications;
+      summary.imported.push('notifications.osNotifications');
+    }
+    if (focusMode === 'always' || focusMode === 'unfocused') {
+      patch.soundFocusMode = focusMode;
+      summary.imported.push('notifications.soundFocusMode');
+    }
+
+    if (Object.keys(patch).length > 0) {
+      try {
+        await updateObjectSetting(settingsStore, 'notifications', patch);
+      } catch {
+        summary.skipped.push('notifications:validation-failed');
+      }
+    }
+  }
+
+  if (legacyRaw.defaultProvider !== undefined) {
+    if (isValidProviderId(legacyRaw.defaultProvider)) {
+      try {
+        await updateScalarSetting(settingsStore, 'defaultAgent', legacyRaw.defaultProvider);
+        summary.imported.push('defaultAgent');
+      } catch {
+        summary.skipped.push('defaultAgent:validation-failed');
+      }
+    } else {
+      summary.skipped.push('defaultAgent:invalid-provider');
+    }
+  }
+
+  const review = isPlainObject(legacyRaw.review) ? legacyRaw.review : null;
+  if (review) {
+    const prompt = readTrimmedString(review.prompt);
+    if (prompt) {
+      try {
+        await updateScalarSetting(settingsStore, 'reviewPrompt', prompt);
+        summary.imported.push('reviewPrompt');
+      } catch {
+        summary.skipped.push('reviewPrompt:validation-failed');
+      }
+    }
+  }
+
+  const interfaceSettings = isPlainObject(legacyRaw.interface) ? legacyRaw.interface : null;
+  if (interfaceSettings) {
+    const mappedTheme = mapLegacyTheme(interfaceSettings.theme);
+    if (mappedTheme !== undefined) {
+      try {
+        await updateScalarSetting(settingsStore, 'theme', mappedTheme);
+        summary.imported.push('theme');
+      } catch {
+        summary.skipped.push('theme:validation-failed');
+      }
+    }
+  }
+
+  const terminal = isPlainObject(legacyRaw.terminal) ? legacyRaw.terminal : null;
+  if (terminal) {
+    const fontFamily = readTrimmedString(terminal.fontFamily);
+    if (fontFamily) {
+      try {
+        await updateObjectSetting(settingsStore, 'terminal', { fontFamily });
+        summary.imported.push('terminal.fontFamily');
+      } catch {
+        summary.skipped.push('terminal:validation-failed');
+      }
+    }
+  }
+
+  return summary;
+}
diff --git a/src/main/db/legacy-port/legacy-source/normalize.ts b/src/main/db/legacy-port/legacy-source/normalize.ts
new file mode 100644
index 0000000000..8fd46f5e0c
--- /dev/null
+++ b/src/main/db/legacy-port/legacy-source/normalize.ts
@@ -0,0 +1,58 @@
+import fs from 'node:fs';
+import path from 'node:path';
+
+function stripTrailingSlashes(input: string): string {
+  if (input === '/') return input;
+  return input.replace(/[\\/]+$/, '');
+}
+
+export function normalizeLocalPath(rawPath: string): string {
+  const trimmed = rawPath.trim();
+  if (!trimmed) return '';
+
+  let resolved = trimmed;
+  try {
+    resolved = fs.realpathSync.native(trimmed);
+  } catch {
+    resolved = path.resolve(trimmed);
+  }
+
+  resolved = stripTrailingSlashes(resolved);
+  if (!resolved) return path.sep;
+
+  if (process.platform === 'darwin' || process.platform === 'win32') {
+    return resolved.toLowerCase();
+  }
+
+  return resolved;
+}
+
+export function normalizeRemotePath(rawPath: string): string {
+  const trimmed = rawPath.trim();
+  if (!trimmed) return '';
+
+  const normalized = path.posix.normalize(trimmed);
+  if (normalized === '/') return normalized;
+  return normalized.replace(/\/+$/, '');
+}
+
+export function normalizeHost(host: string): string {
+  return host.trim().toLowerCase();
+}
+
+export function normalizeUsername(username: string): string {
+  return username.trim().toLowerCase();
+}
+
+export function normalizePort(value: unknown): number {
+  if (typeof value === 'number' && Number.isFinite(value)) return value;
+  if (typeof value === 'string') {
+    const parsed = Number.parseInt(value, 10);
+    if (Number.isFinite(parsed)) return parsed;
+  }
+  return 22;
+}
+
+export function makeSshFingerprint(host: string, port: number, username: string): string {
+  return `${normalizeHost(host)}:${port}:${normalizeUsername(username)}`;
+}
diff --git a/src/main/db/legacy-port/legacy-source/open-readonly.ts b/src/main/db/legacy-port/legacy-source/open-readonly.ts
new file mode 100644
index 0000000000..ef5cbf1157
--- /dev/null
+++ b/src/main/db/legacy-port/legacy-source/open-readonly.ts
@@ -0,0 +1,9 @@
+import Database from 'better-sqlite3';
+
+export function openLegacyReadOnly(legacyPath: string): Database.Database {
+  const legacyDb = new Database(legacyPath, { readonly: true, fileMustExist: true });
+  try {
+    legacyDb.pragma('query_only = ON');
+  } catch {}
+  return legacyDb;
+}
diff --git a/src/main/db/legacy-port/legacy-source/path.ts b/src/main/db/legacy-port/legacy-source/path.ts
new file mode 100644
index 0000000000..71fd3ac52f
--- /dev/null
+++ b/src/main/db/legacy-port/legacy-source/path.ts
@@ -0,0 +1,10 @@
+import { existsSync } from 'node:fs';
+import { join } from 'node:path';
+
+export function resolveLegacyDatabasePath(userDataPath: string): string {
+  return join(userDataPath, 'emdash.db');
+}
+
+export function hasLegacyDatabaseFile(userDataPath: string): boolean {
+  return existsSync(resolveLegacyDatabasePath(userDataPath));
+}
diff --git a/src/main/db/legacy-port/manual-port-check.test.ts b/src/main/db/legacy-port/manual-port-check.test.ts
new file mode 100644
index 0000000000..3f26c082eb
--- /dev/null
+++ b/src/main/db/legacy-port/manual-port-check.test.ts
@@ -0,0 +1,103 @@
+import fs from 'node:fs';
+import path from 'node:path';
+import Database from 'better-sqlite3';
+import { describe, expect, it } from 'vitest';
+import { runLegacyPort, type LegacyPortStateStore, type LegacyPortStatus } from './service';
+
+function count(db: Database.Database, table: string): number {
+  const row = db.prepare(`SELECT COUNT(*) AS count FROM ${table}`).get() as { count: number };
+  return row.count;
+}
+
+class OneShotStateStore implements LegacyPortStateStore {
+  private status: LegacyPortStatus | null = null;
+
+  async getStatus(): Promise<LegacyPortStatus | null> {
+    return this.status;
+  }
+
+  async setStatus(status: LegacyPortStatus): Promise<void> {
+    this.status = status;
+  }
+
+  current(): LegacyPortStatus | null {
+    return this.status;
+  }
+}
+
+describe('manual legacy port verification', () => {
+  it('runs once on testRuns db files', async () => {
+    const repoRoot = process.cwd();
+    const runsDir = process.env.PORT_RUNS_DIR
+      ? path.resolve(process.env.PORT_RUNS_DIR)
+      : path.join(repoRoot, 'testRuns');
+    const appDbPath = path.join(runsDir, 'emdash3.db');
+    const legacyDbPath = path.join(runsDir, 'emdash.db');
+
+    if (!fs.existsSync(appDbPath) || !fs.existsSync(legacyDbPath)) {
+      return;
+    }
+
+    const appDb = new Database(appDbPath);
+    const legacyDb = new Database(legacyDbPath, { readonly: true });
+
+    const before = {
+      sshConnections: count(appDb, 'ssh_connections'),
+      projects: count(appDb, 'projects'),
+      tasks: count(appDb, 'tasks'),
+      conversations: count(appDb, 'conversations'),
+    };
+
+    const legacy = {
+      sshConnections: count(legacyDb, 'ssh_connections'),
+      projects: count(legacyDb, 'projects'),
+      tasks: count(legacyDb, 'tasks'),
+      conversations: count(legacyDb, 'conversations'),
+      messages: count(legacyDb, 'messages'),
+    };
+
+    const stateStore = new OneShotStateStore();
+
+    try {
+      await runLegacyPort(runsDir, { appDb, stateStore });
+
+      const after = {
+        sshConnections: count(appDb, 'ssh_connections'),
+        projects: count(appDb, 'projects'),
+        tasks: count(appDb, 'tasks'),
+        conversations: count(appDb, 'conversations'),
+      };
+
+      const delta = {
+        sshConnections: after.sshConnections - before.sshConnections,
+        projects: after.projects - before.projects,
+        tasks: after.tasks - before.tasks,
+        conversations: after.conversations - before.conversations,
+      };
+
+      const nullSourceBranchTasks = appDb
+        .prepare('SELECT COUNT(*) AS count FROM tasks WHERE source_branch IS NULL')
+        .get() as { count: number };
+
+      const result = {
+        status: stateStore.current(),
+        legacy,
+        before,
+        after,
+        delta,
+        tasksWithNullSourceBranch: nullSourceBranchTasks.count,
+      };
+
+      fs.writeFileSync(
+        path.join(runsDir, 'manual-port-result.json'),
+        JSON.stringify(result, null, 2),
+        'utf8'
+      );
+
+      expect(stateStore.current()).toBe('completed');
+    } finally {
+      appDb.close();
+      legacyDb.close();
+    }
+  });
+});
diff --git a/src/main/db/legacy-port/service.test.ts b/src/main/db/legacy-port/service.test.ts
new file mode 100644
index 0000000000..17ce1cb228
--- /dev/null
+++ b/src/main/db/legacy-port/service.test.ts
@@ -0,0 +1,230 @@
+import fs from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
+import Database from 'better-sqlite3';
+import { afterEach, describe, expect, it } from 'vitest';
+import { runLegacyPort, type LegacyPortStateStore } from './service';
+
+function createAppDb(): Database.Database {
+  const db = new Database(':memory:');
+  db.pragma('foreign_keys = ON');
+  db.exec(`
+    CREATE TABLE kv (
+      key TEXT PRIMARY KEY,
+      value TEXT NOT NULL,
+      updated_at INTEGER NOT NULL DEFAULT CURRENT_TIMESTAMP
+    );
+
+    CREATE TABLE ssh_connections (
+      id TEXT PRIMARY KEY,
+      name TEXT NOT NULL UNIQUE,
+      host TEXT NOT NULL,
+      port INTEGER NOT NULL DEFAULT 22,
+      username TEXT NOT NULL,
+      auth_type TEXT NOT NULL DEFAULT 'agent',
+      private_key_path TEXT,
+      use_agent INTEGER NOT NULL DEFAULT 0,
+      metadata TEXT,
+      created_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
+      updated_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP
+    );
+
+    CREATE TABLE projects (
+      id TEXT PRIMARY KEY,
+      name TEXT NOT NULL,
+      path TEXT NOT NULL UNIQUE,
+      workspace_provider TEXT NOT NULL DEFAULT 'local',
+      base_ref TEXT,
+      ssh_connection_id TEXT,
+      created_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
+      updated_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP
+    );
+
+    CREATE TABLE tasks (
+      id TEXT PRIMARY KEY,
+      project_id TEXT NOT NULL REFERENCES projects(id) ON DELETE CASCADE,
+      name TEXT NOT NULL,
+      status TEXT NOT NULL,
+      source_branch TEXT,
+      task_branch TEXT,
+      linked_issue TEXT,
+      archived_at TEXT,
+      created_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
+      updated_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
+      last_interacted_at TEXT,
+      status_changed_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
+      is_pinned INTEGER NOT NULL DEFAULT 0
+    );
+
+    CREATE TABLE conversations (
+      id TEXT PRIMARY KEY,
+      project_id TEXT NOT NULL REFERENCES projects(id) ON DELETE CASCADE,
+      task_id TEXT NOT NULL REFERENCES tasks(id) ON DELETE CASCADE,
+      title TEXT NOT NULL,
+      provider TEXT,
+      config TEXT,
+      created_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
+      updated_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP
+    );
+  `);
+  return db;
+}
+
+function seedLegacyDb(legacyPath: string): void {
+  const legacy = new Database(legacyPath);
+  legacy.exec(`
+    CREATE TABLE projects (
+      id TEXT PRIMARY KEY,
+      name TEXT,
+      path TEXT,
+      base_ref TEXT,
+      is_remote INTEGER,
+      remote_path TEXT,
+      ssh_connection_id TEXT,
+      created_at TEXT,
+      updated_at TEXT
+    );
+
+    CREATE TABLE tasks (
+      id TEXT PRIMARY KEY,
+      project_id TEXT,
+      name TEXT,
+      status TEXT,
+      branch TEXT,
+      archived_at TEXT,
+      created_at TEXT,
+      updated_at TEXT
+    );
+
+    CREATE TABLE conversations (
+      id TEXT PRIMARY KEY,
+      task_id TEXT,
+      title TEXT,
+      provider TEXT,
+      created_at TEXT,
+      updated_at TEXT
+    );
+  `);
+
+  legacy
+    .prepare(
+      `INSERT INTO projects (id, name, path, base_ref, is_remote, created_at, updated_at) VALUES (?, ?, ?, ?, ?, ?, ?)`
+    )
+    .run(
+      'legacy-project-1',
+      'Legacy Project',
+      '/legacy/repo',
+      'main',
+      0,
+      '2026-01-01T00:00:00.000Z',
+      '2026-01-01T00:00:00.000Z'
+    );
+
+  legacy
+    .prepare(
+      `INSERT INTO tasks (id, project_id, name, status, branch, updated_at) VALUES (?, ?, ?, ?, ?, ?)`
+    )
+    .run(
+      'legacy-task-1',
+      'legacy-project-1',
+      'Legacy Task',
+      'completed',
+      'feature/legacy-1',
+      '2026-01-01T01:00:00.000Z'
+    );
+
+  legacy
+    .prepare(`INSERT INTO conversations (id, task_id, title, provider) VALUES (?, ?, ?, ?)`)
+    .run('legacy-conv-1', 'legacy-task-1', 'Legacy conversation', 'codex');
+
+  legacy.close();
+}
+
+class InMemoryLegacyPortStateStore implements LegacyPortStateStore {
+  private status: 'completed' | 'no-legacy-file' | null = null;
+
+  async getStatus(): Promise<'completed' | 'no-legacy-file' | null> {
+    return this.status;
+  }
+
+  async setStatus(status: 'completed' | 'no-legacy-file'): Promise<void> {
+    this.status = status;
+  }
+}
+
+describe('runLegacyPort', () => {
+  const openDbs: Database.Database[] = [];
+  const tempDirs: string[] = [];
+
+  afterEach(() => {
+    for (const db of openDbs.splice(0)) db.close();
+    for (const dir of tempDirs.splice(0)) {
+      fs.rmSync(dir, { recursive: true, force: true });
+    }
+  });
+
+  it('marks no-legacy-file when emdash.db is missing', async () => {
+    const appDb = createAppDb();
+    openDbs.push(appDb);
+
+    const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'legacy-port-missing-'));
+    tempDirs.push(tmpDir);
+
+    const stateStore = new InMemoryLegacyPortStateStore();
+
+    await runLegacyPort(tmpDir, { appDb, stateStore });
+
+    expect(await stateStore.getStatus()).toBe('no-legacy-file');
+  });
+
+  it('ports once and is idempotent via state-store guard', async () => {
+    const appDb = createAppDb();
+    openDbs.push(appDb);
+
+    const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'legacy-port-once-'));
+    tempDirs.push(tmpDir);
+
+    const legacyPath = path.join(tmpDir, 'emdash.db');
+    seedLegacyDb(legacyPath);
+
+    const stateStore = new InMemoryLegacyPortStateStore();
+
+    await runLegacyPort(tmpDir, { appDb, stateStore });
+    expect(await stateStore.getStatus()).toBe('completed');
+
+    const projectsAfterFirstRun = appDb.prepare(`SELECT COUNT(*) AS count FROM projects`).get() as {
+      count: number;
+    };
+    const tasksAfterFirstRun = appDb.prepare(`SELECT COUNT(*) AS count FROM tasks`).get() as {
+      count: number;
+    };
+
+    expect(projectsAfterFirstRun.count).toBe(1);
+    expect(tasksAfterFirstRun.count).toBe(1);
+
+    const legacy = new Database(legacyPath);
+    legacy
+      .prepare(
+        `INSERT INTO projects (id, name, path, base_ref, is_remote, created_at, updated_at) VALUES (?, ?, ?, ?, ?, ?, ?)`
+      )
+      .run(
+        'legacy-project-2',
+        'Legacy Project 2',
+        '/legacy/repo-2',
+        'main',
+        0,
+        '2026-01-02T00:00:00.000Z',
+        '2026-01-02T00:00:00.000Z'
+      );
+    legacy.close();
+
+    await runLegacyPort(tmpDir, { appDb, stateStore });
+
+    const projectsAfterSecondRun = appDb
+      .prepare(`SELECT COUNT(*) AS count FROM projects`)
+      .get() as {
+      count: number;
+    };
+    expect(projectsAfterSecondRun.count).toBe(1);
+  });
+});
diff --git a/src/main/db/legacy-port/service.ts b/src/main/db/legacy-port/service.ts
new file mode 100644
index 0000000000..a631a545e0
--- /dev/null
+++ b/src/main/db/legacy-port/service.ts
@@ -0,0 +1,178 @@
+import type Database from 'better-sqlite3';
+import { drizzle } from 'drizzle-orm/better-sqlite3';
+import type { StartupDataGateStatus } from '@shared/startup-data-gate';
+import { log } from '../../lib/logger';
+import * as schema from '../schema';
+import { portLegacyAuthState } from './importers/auth/importer';
+import { portConversations } from './importers/relational/conversations';
+import { portProjects } from './importers/relational/projects';
+import { createRemapTables } from './importers/relational/remap';
+import { portSshConnections } from './importers/relational/ssh-connections';
+import { portTasks } from './importers/relational/tasks';
+import type { PortSummary } from './importers/relational/types';
+import { portLegacySettings } from './importers/settings/importer';
+import { openLegacyReadOnly } from './legacy-source/open-readonly';
+import { hasLegacyDatabaseFile, resolveLegacyDatabasePath } from './legacy-source/path';
+import { createLegacyPortStateStore } from './state-store';
+
+type LegacyPortDb = ReturnType<typeof drizzle<typeof schema>>;
+
+type AppTarget = {
+  db: LegacyPortDb;
+  sqlite: Database.Database;
+};
+
+export type LegacyPortStatus = StartupDataGateStatus;
+
+export interface LegacyPortStateStore {
+  getStatus(): Promise<LegacyPortStatus | null>;
+  setStatus(status: LegacyPortStatus): Promise<void>;
+}
+
+export type RunLegacyPortOptions = {
+  appDb?: Database.Database;
+  stateStore?: LegacyPortStateStore;
+};
+
+async function resolveAppTarget(appSqlite?: Database.Database): Promise<AppTarget> {
+  if (!appSqlite) {
+    const { db, sqlite } = await import('../client');
+    return { db, sqlite };
+  }
+
+  return {
+    db: drizzle(appSqlite, { schema }),
+    sqlite: appSqlite,
+  };
+}
+
+function logSummary(summary: PortSummary): void {
+  log.info(
+    `legacy-port: ${summary.table}: considered=${summary.considered}, inserted=${summary.inserted}, skipped_dedup=${summary.skippedDedup}, skipped_invalid=${summary.skippedInvalid}, skipped_error=${summary.skippedError}`
+  );
+}
+
+async function markStatus(
+  stateStore: LegacyPortStateStore,
+  status: 'completed' | 'no-legacy-file'
+): Promise<void> {
+  try {
+    await stateStore.setStatus(status);
+  } catch (error) {
+    log.warn('legacy-port: failed to persist status', {
+      status,
+      error: error instanceof Error ? error.message : String(error),
+    });
+  }
+}
+
+export async function createDefaultLegacyPortStateStore(): Promise<LegacyPortStateStore> {
+  return createLegacyPortStateStore();
+}
+
+export function resolveLegacyPath(userDataPath: string): string {
+  return resolveLegacyDatabasePath(userDataPath);
+}
+
+export function hasLegacyFile(userDataPath: string): boolean {
+  return hasLegacyDatabaseFile(userDataPath);
+}
+
+export async function runLegacyPort(
+  userDataPath: string,
+  options: RunLegacyPortOptions = {}
+): Promise<void> {
+  const appTarget = await resolveAppTarget(options.appDb);
+  const stateStore = options.stateStore ?? (await createDefaultLegacyPortStateStore());
+
+  try {
+    const status = await stateStore.getStatus();
+    if (status) {
+      return;
+    }
+  } catch (error) {
+    log.warn('legacy-port: failed to read status, continuing', {
+      error: error instanceof Error ? error.message : String(error),
+    });
+  }
+
+  if (!hasLegacyFile(userDataPath)) {
+    log.info('legacy-port: no legacy emdash.db found, marking complete');
+    await markStatus(stateStore, 'no-legacy-file');
+    return;
+  }
+
+  const legacyPath = resolveLegacyPath(userDataPath);
+  let legacyDb: Database.Database;
+
+  try {
+    legacyDb = openLegacyReadOnly(legacyPath);
+  } catch (error) {
+    log.warn('legacy-port: failed to open legacy db, will retry next launch', {
+      legacyPath,
+      error: error instanceof Error ? error.message : String(error),
+    });
+    return;
+  }
+
+  const start = Date.now();
+
+  try {
+    const remap = createRemapTables();
+
+    const sshSummary = await portSshConnections({ appDb: appTarget.db, legacyDb, remap });
+    const projectsSummary = await portProjects({ appDb: appTarget.db, legacyDb, remap });
+    const taskResult = await portTasks({ appDb: appTarget.db, legacyDb, remap });
+    const conversationsSummary = await portConversations({
+      appDb: appTarget.db,
+      legacyDb,
+      remap,
+      mergedLegacyTaskIds: taskResult.mergedLegacyTaskIds,
+      userDataPath,
+    });
+
+    logSummary(sshSummary);
+    logSummary(projectsSummary);
+    logSummary(taskResult.summary);
+    logSummary(conversationsSummary);
+
+    try {
+      const authSummary = await portLegacyAuthState(userDataPath, {
+        appDb: appTarget.db,
+        appSqlite: appTarget.sqlite,
+        legacyToAppSshConnectionId: remap.sshConnectionId,
+      });
+      log.info(
+        `legacy-port: auth: imported_secrets=${authSummary.importedSecrets.length}, imported_kv=${authSummary.importedKv.length}, imported_ssh_passwords=${authSummary.importedSshPasswords}, skipped=${authSummary.skipped.length}`
+      );
+    } catch (error) {
+      log.warn('legacy-port: auth: failed to port legacy credentials, continuing', {
+        error: error instanceof Error ? error.message : String(error),
+      });
+    }
+
+    try {
+      const settingsSummary = await portLegacySettings(userDataPath, {
+        appDb: appTarget.db,
+        appSqlite: appTarget.sqlite,
+      });
+      log.info(
+        `legacy-port: settings: imported=${settingsSummary.imported.length}, skipped=${settingsSummary.skipped.length}`
+      );
+    } catch (error) {
+      log.warn('legacy-port: settings: failed to port legacy settings, continuing', {
+        error: error instanceof Error ? error.message : String(error),
+      });
+    }
+
+    await markStatus(stateStore, 'completed');
+
+    log.info(`legacy-port: completed in ${Date.now() - start}ms`);
+  } catch (error) {
+    log.warn('legacy-port: aborted mid-run, will retry next launch', {
+      error: error instanceof Error ? error.message : String(error),
+    });
+  } finally {
+    legacyDb.close();
+  }
+}
diff --git a/src/main/db/legacy-port/state-store.ts b/src/main/db/legacy-port/state-store.ts
new file mode 100644
index 0000000000..39087b9f06
--- /dev/null
+++ b/src/main/db/legacy-port/state-store.ts
@@ -0,0 +1,15 @@
+import type { LegacyPortStateStore } from './service';
+
+type LegacyPortKvSchema = {
+  status: Awaited<ReturnType<LegacyPortStateStore['getStatus']>>;
+};
+
+export async function createLegacyPortStateStore(): Promise<LegacyPortStateStore> {
+  const { KV } = await import('../kv');
+  const kv = new KV<LegacyPortKvSchema>('legacyPort');
+
+  return {
+    getStatus: async () => kv.get('status'),
+    setStatus: async (status) => kv.set('status', status),
+  };
+}
diff --git a/src/main/db/path.ts b/src/main/db/path.ts
index c30bc5aa0b..52e594af7d 100644
--- a/src/main/db/path.ts
+++ b/src/main/db/path.ts
@@ -1,9 +1,7 @@
-import { existsSync, renameSync } from 'fs';
-import { dirname, join, resolve } from 'path';
+import { resolve } from 'node:path';
 import { app } from 'electron';
-
-const CURRENT_DB_FILENAME = 'emdash.db';
-const LEGACY_DB_FILENAMES = ['database.sqlite', 'orcbench.db'];
+import { resolveDefaultDatabasePath } from './database-file';
+import { CURRENT_DB_FILENAME, PREVIOUS_DB_FILENAME } from './default-path';
 
 export interface ResolveDatabasePathOptions {
   userDataPath?: string;
@@ -15,130 +13,10 @@ export function resolveDatabasePath(options: ResolveDatabasePathOptions = {}): s
     return resolve(explicitDbFile);
   }
 
-  const userDataPath = options.userDataPath ?? app.getPath('userData');
-
-  const currentPath = join(userDataPath, CURRENT_DB_FILENAME);
-  if (existsSync(currentPath)) {
-    return currentPath;
-  }
-
-  // Dev safety: prior versions sometimes resolved userData under the default Electron app
-  // (e.g. ~/Library/Application Support/Electron).
-  try {
-    const userDataParent = dirname(userDataPath);
-    const legacyDirs = ['Electron', 'emdash', 'Emdash'];
-    for (const dirName of legacyDirs) {
-      const candidateDir = join(userDataParent, dirName);
-      const candidateCurrent = join(candidateDir, CURRENT_DB_FILENAME);
-      if (existsSync(candidateCurrent)) {
-        try {
-          renameSync(candidateCurrent, currentPath);
-          return currentPath;
-        } catch {
-          return candidateCurrent;
-        }
-      }
-    }
-  } catch {
-    // best-effort only
-  }
-
-  for (const legacyName of LEGACY_DB_FILENAMES) {
-    const legacyPath = join(userDataPath, legacyName);
-    if (existsSync(legacyPath)) {
-      try {
-        renameSync(legacyPath, currentPath);
-        return currentPath;
-      } catch {
-        return legacyPath;
-      }
-    }
-  }
-
-  return currentPath;
+  return resolveDefaultDatabasePath(options.userDataPath ?? app.getPath('userData'));
 }
 
 export const databaseFilenames = {
   current: CURRENT_DB_FILENAME,
-  legacy: [...LEGACY_DB_FILENAMES],
+  previous: PREVIOUS_DB_FILENAME,
 };
-
-export function resolveMigrationsPath(): string | null {
-  const { realpathSync } = require('fs');
-  const appPath = app.getAppPath();
-  const resourcesPath = process.resourcesPath ?? appPath;
-
-  // Resolve symlinks to get actual paths (handles Homebrew, symlinks, etc.)
-  const resolveRealPath = (p: string): string | null => {
-    try {
-      return realpathSync(p);
-    } catch {
-      return null;
-    }
-  };
-
-  // Get the executable directory (handles more cases)
-  const exePath = app.getPath('exe');
-  const exeDir = dirname(exePath);
-
-  const candidates = [
-    // Standard Electron paths
-    join(appPath, 'drizzle'),
-    join(appPath, '..', 'drizzle'),
-    join(resourcesPath, 'drizzle'),
-
-    // Handle ASAR unpacked
-    join(resourcesPath, 'app.asar.unpacked', 'drizzle'),
-
-    // Handle Homebrew and other symlinked installations
-    ...(resolveRealPath(appPath)
-      ? [
-          join(resolveRealPath(appPath)!, 'drizzle'),
-          join(resolveRealPath(appPath)!, '..', 'drizzle'),
-        ]
-      : []),
-
-    // Handle macOS app bundle structure
-    join(exeDir, '..', 'Resources', 'drizzle'),
-    join(exeDir, '..', 'Resources', 'app', 'drizzle'),
-    join(exeDir, '..', 'Resources', 'app.asar.unpacked', 'drizzle'),
-
-    // Development paths
-    join(process.cwd(), 'drizzle'),
-    join(__dirname, '..', '..', '..', 'drizzle'),
-
-    // Handle translocated apps on macOS
-    ...(process.platform === 'darwin' && appPath.includes('AppTranslocation')
-      ? [join(appPath.split('AppTranslocation')[0], 'drizzle')]
-      : []),
-  ];
-
-  // Remove duplicates and try each candidate
-  const uniqueCandidates = [...new Set(candidates.filter(Boolean))];
-
-  for (const candidate of uniqueCandidates) {
-    if (existsSync(candidate)) {
-      // Verify it's actually a directory with migration files
-      try {
-        const files = require('fs').readdirSync(candidate);
-        if (files.some((f: string) => f.endsWith('.sql'))) {
-          console.log(`Found migrations at: ${candidate}`);
-          return candidate;
-        }
-      } catch {
-        // Not a valid directory, continue
-      }
-    }
-  }
-
-  // Log diagnostic information to help debug
-  console.error('Failed to find drizzle migrations folder. Searched paths:');
-  console.error('- appPath:', appPath);
-  console.error('- resourcesPath:', resourcesPath);
-  console.error('- exeDir:', exeDir);
-  console.error('- cwd:', process.cwd());
-  console.error('- __dirname:', __dirname);
-  console.error('- Candidates checked:', uniqueCandidates);
-
-  return null;
-}
diff --git a/src/main/db/schema.ts b/src/main/db/schema.ts
index 44082d0843..fb57be8235 100644
--- a/src/main/db/schema.ts
+++ b/src/main/db/schema.ts
@@ -1,5 +1,13 @@
 import { relations, sql } from 'drizzle-orm';
-import { index, integer, sqliteTable, text, uniqueIndex } from 'drizzle-orm/sqlite-core';
+import {
+  index,
+  integer,
+  primaryKey,
+  sqliteTable,
+  text,
+  uniqueIndex,
+} from 'drizzle-orm/sqlite-core';
+import type { StoredBranch } from '@main/core/tasks/stored-branch';
 
 export const sshConnections = sqliteTable(
   'ssh_connections',
@@ -12,6 +20,7 @@ export const sshConnections = sqliteTable(
     authType: text('auth_type').notNull().default('agent'), // 'password' | 'key' | 'agent'
     privateKeyPath: text('private_key_path'), // optional, for key auth
     useAgent: integer('use_agent').notNull().default(0), // boolean, 0=false, 1=true
+    metadata: text('metadata'), // JSON for additional connection-specific data
     createdAt: text('created_at')
       .notNull()
       .default(sql`CURRENT_TIMESTAMP`),
@@ -31,16 +40,11 @@ export const projects = sqliteTable(
     id: text('id').primaryKey(),
     name: text('name').notNull(),
     path: text('path').notNull(),
-    gitRemote: text('git_remote'),
-    gitBranch: text('git_branch'),
+    workspaceProvider: text('workspace_provider').notNull().default('local'), // 'local' | 'ssh'
     baseRef: text('base_ref'),
-    githubRepository: text('github_repository'),
-    githubConnected: integer('github_connected').notNull().default(0),
     sshConnectionId: text('ssh_connection_id').references(() => sshConnections.id, {
       onDelete: 'set null',
     }),
-    isRemote: integer('is_remote').notNull().default(0), // boolean, 0=false, 1=true
-    remotePath: text('remote_path'), // path on remote server
     createdAt: text('created_at')
       .notNull()
       .default(sql`CURRENT_TIMESTAMP`),
@@ -51,7 +55,34 @@ export const projects = sqliteTable(
   (table) => ({
     pathIdx: uniqueIndex('idx_projects_path').on(table.path),
     sshConnectionIdIdx: index('idx_projects_ssh_connection_id').on(table.sshConnectionId),
-    isRemoteIdx: index('idx_projects_is_remote').on(table.isRemote),
+  })
+);
+
+export const projectRemotes = sqliteTable(
+  'project_remotes',
+  {
+    projectId: text('project_id')
+      .notNull()
+      .references(() => projects.id, { onDelete: 'cascade' }),
+    remoteName: text('remote_name').notNull(),
+    remoteUrl: text('remote_url').notNull(),
+  },
+  (table) => ({
+    pk: primaryKey({ columns: [table.projectId, table.remoteName] }),
+  })
+);
+
+export const appSettings = sqliteTable(
+  'app_settings',
+  {
+    key: text('key').primaryKey(),
+    value: text('value').notNull(),
+    updatedAt: integer('updated_at')
+      .notNull()
+      .default(sql`CURRENT_TIMESTAMP`),
+  },
+  (table) => ({
+    keyIdx: uniqueIndex('idx_app_settings_key').on(table.key),
   })
 );
 
@@ -63,12 +94,10 @@ export const tasks = sqliteTable(
       .notNull()
       .references(() => projects.id, { onDelete: 'cascade' }),
     name: text('name').notNull(),
-    branch: text('branch').notNull(),
-    path: text('path').notNull(),
-    status: text('status').notNull().default('idle'),
-    agentId: text('agent_id'),
-    metadata: text('metadata'),
-    useWorktree: integer('use_worktree').notNull().default(1),
+    status: text('status').notNull(),
+    sourceBranch: text('source_branch', { mode: 'json' }).$type<StoredBranch>(),
+    taskBranch: text('task_branch'),
+    linkedIssue: text('linked_issue'),
     archivedAt: text('archived_at'), // null = active, timestamp = archived
     createdAt: text('created_at')
       .notNull()
@@ -76,25 +105,146 @@ export const tasks = sqliteTable(
     updatedAt: text('updated_at')
       .notNull()
       .default(sql`CURRENT_TIMESTAMP`),
+    lastInteractedAt: text('last_interacted_at'),
+    statusChangedAt: text('status_changed_at')
+      .notNull()
+      .default(sql`CURRENT_TIMESTAMP`),
+    isPinned: integer('is_pinned').notNull().default(0), // boolean, 0=false, 1=true
   },
   (table) => ({
     projectIdIdx: index('idx_tasks_project_id').on(table.projectId),
   })
 );
 
+export const pullRequestUsers = sqliteTable('pull_request_users', {
+  userId: text('user_id').primaryKey(),
+  userName: text('user_name').notNull(),
+  displayName: text('display_name'),
+  avatarUrl: text('avatar_url'),
+  url: text('url'),
+
+  userUpdatedAt: text('user_updated_at'),
+  userCreatedAt: text('user_created_at'),
+});
+
+export const pullRequests = sqliteTable(
+  'pull_requests',
+  {
+    url: text('url').primaryKey(),
+    provider: text('provider').notNull().default('github'),
+    repositoryUrl: text('repository_url').notNull(),
+
+    baseRefName: text('base_ref_name').notNull(),
+    baseRefOid: text('base_ref_oid').notNull(),
+
+    headRepositoryUrl: text('head_repository_url').notNull(),
+    headRefName: text('head_ref_name').notNull(),
+    headRefOid: text('head_ref_oid').notNull(),
+
+    identifier: text('identifier'), // #123 for github
+    title: text('title').notNull(),
+    description: text('description'),
+    status: text('status').notNull().default('open'),
+    isDraft: integer('is_draft'),
+
+    authorUserId: text('author_user_id').references(() => pullRequestUsers.userId, {
+      onDelete: 'set null',
+    }),
+
+    additions: integer('additions'),
+    deletions: integer('deletions'),
+    changedFiles: integer('changed_files'),
+    commitCount: integer('commit_count'),
+
+    mergeableStatus: text('mergeable_status'),
+    mergeStateStatus: text('merge_state_status'),
+    reviewDecision: text('review_decision'),
+
+    pullRequestCreatedAt: text('pull_request_created_at')
+      .notNull()
+      .default(sql`CURRENT_TIMESTAMP`),
+    pullRequestUpdatedAt: text('pull_request_updated_at')
+      .notNull()
+      .default(sql`CURRENT_TIMESTAMP`),
+  },
+  (table) => ({
+    urlIdx: uniqueIndex('idx_pull_requests_url').on(table.url),
+    repositoryUrlIdx: index('idx_pull_requests_repository_url').on(table.repositoryUrl),
+    headRepositoryUrlIdx: index('idx_pull_requests_head_repository_url').on(
+      table.headRepositoryUrl
+    ),
+  })
+);
+
+export const pullRequestLabels = sqliteTable(
+  'pull_request_labels',
+  {
+    pullRequestId: text('pull_request_id')
+      .notNull()
+      .references(() => pullRequests.url, { onDelete: 'cascade' }),
+    name: text('name').notNull(),
+    color: text('color'),
+  },
+  (table) => ({
+    pk: primaryKey({ columns: [table.pullRequestId, table.name] }),
+    nameIdx: index('idx_prl_name').on(table.name),
+  })
+);
+
+export const pullRequestAssignees = sqliteTable(
+  'pull_request_assignees',
+  {
+    pullRequestUrl: text('pull_request_url')
+      .notNull()
+      .references(() => pullRequests.url, { onDelete: 'cascade' }),
+    userId: text('user_id')
+      .notNull()
+      .references(() => pullRequestUsers.userId, { onDelete: 'cascade' }),
+  },
+  (table) => ({
+    pk: primaryKey({ columns: [table.pullRequestUrl, table.userId] }),
+    pullRequestUrlIdx: index('idx_pra_pull_request_url').on(table.pullRequestUrl),
+    userIdIdx: index('idx_pra_user_id').on(table.userId),
+  })
+);
+
+export const pullRequestChecks = sqliteTable(
+  'pull_request_checks',
+  {
+    id: text('id').primaryKey(),
+    pullRequestUrl: text('pull_request_url')
+      .notNull()
+      .references(() => pullRequests.url, { onDelete: 'cascade' }),
+    commitSha: text('commit_sha').notNull(),
+    name: text('name').notNull(),
+    status: text('status').notNull(),
+    conclusion: text('conclusion').notNull(),
+
+    detailsUrl: text('details_url'),
+    startedAt: text('started_at'),
+    completedAt: text('completed_at'),
+    workflowName: text('workflow_name'),
+    appName: text('app_name'),
+    appLogoUrl: text('app_logo_url'),
+  },
+  (table) => ({
+    pullRequestUrlIdx: index('idx_prc_pull_request_url').on(table.pullRequestUrl),
+  })
+);
+
 export const conversations = sqliteTable(
   'conversations',
   {
     id: text('id').primaryKey(),
+    projectId: text('project_id')
+      .notNull()
+      .references(() => projects.id, { onDelete: 'cascade' }),
     taskId: text('task_id')
       .notNull()
       .references(() => tasks.id, { onDelete: 'cascade' }),
     title: text('title').notNull(),
-    provider: text('provider'), // AI provider for this chat (claude, codex, qwen, etc.)
-    isActive: integer('is_active').notNull().default(0), // 1 if this is the active chat for the task
-    isMain: integer('is_main').notNull().default(0), // 1 if this is the main/primary chat (gets full persistence)
-    displayOrder: integer('display_order').notNull().default(0), // Order in the tab bar
-    metadata: text('metadata'), // JSON for additional chat-specific data
+    provider: text('provider'),
+    config: text('config'),
     createdAt: text('created_at')
       .notNull()
       .default(sql`CURRENT_TIMESTAMP`),
@@ -104,7 +254,30 @@ export const conversations = sqliteTable(
   },
   (table) => ({
     taskIdIdx: index('idx_conversations_task_id').on(table.taskId),
-    activeIdx: index('idx_conversations_active').on(table.taskId, table.isActive), // Index for quick active conversation lookup
+  })
+);
+
+export const terminals = sqliteTable(
+  'terminals',
+  {
+    id: text('id').primaryKey(),
+    projectId: text('project_id')
+      .notNull()
+      .references(() => projects.id, { onDelete: 'cascade' }),
+    taskId: text('task_id')
+      .notNull()
+      .references(() => tasks.id, { onDelete: 'cascade' }),
+    ssh: integer('ssh').notNull().default(0), // boolean, 0=false, 1=true
+    name: text('name').notNull(),
+    createdAt: text('created_at')
+      .notNull()
+      .default(sql`CURRENT_TIMESTAMP`),
+    updatedAt: text('updated_at')
+      .notNull()
+      .default(sql`CURRENT_TIMESTAMP`),
+  },
+  (table) => ({
+    taskIdIdx: index('idx_terminals_task_id').on(table.taskId),
   })
 );
 
@@ -128,30 +301,56 @@ export const messages = sqliteTable(
   })
 );
 
-export const lineComments = sqliteTable(
-  'line_comments',
+export const editorBuffers = sqliteTable(
+  'editor_buffers',
   {
-    id: text('id').primaryKey(),
-    taskId: text('task_id')
+    id: text('id').primaryKey(), // `${projectId}:${workspaceId}:${filePath}`
+    projectId: text('project_id')
       .notNull()
-      .references(() => tasks.id, { onDelete: 'cascade' }),
+      .references(() => projects.id, { onDelete: 'cascade' }),
+    workspaceId: text('workspace_id').notNull(),
     filePath: text('file_path').notNull(),
-    lineNumber: integer('line_number').notNull(),
-    lineContent: text('line_content'),
     content: text('content').notNull(),
-    createdAt: text('created_at')
-      .notNull()
-      .default(sql`CURRENT_TIMESTAMP`),
-    updatedAt: text('updated_at')
+    updatedAt: integer('updated_at').notNull(),
+  },
+  (table) => ({
+    workspaceFileIdx: index('idx_editor_buffers_workspace_file').on(
+      table.workspaceId,
+      table.filePath
+    ),
+  })
+);
+
+export const kv = sqliteTable(
+  'kv',
+  {
+    key: text('key').primaryKey(),
+    value: text('value').notNull(),
+    updatedAt: integer('updated_at')
       .notNull()
       .default(sql`CURRENT_TIMESTAMP`),
-    sentAt: text('sent_at'), // NULL = unsent, timestamp = when injected to chat
   },
   (table) => ({
-    taskFileIdx: index('idx_line_comments_task_file').on(table.taskId, table.filePath),
+    keyIdx: uniqueIndex('idx_kv_key').on(table.key),
+  })
+);
+
+export const appSecrets = sqliteTable(
+  'app_secrets',
+  {
+    key: text('key').primaryKey(),
+    secret: text('secret').notNull(),
+  },
+  (table) => ({
+    keyIdx: uniqueIndex('idx_app_secrets_key').on(table.key),
   })
 );
 
+export type KvRow = typeof kv.$inferSelect;
+export type KvInsert = typeof kv.$inferInsert;
+export type AppSecretRow = typeof appSecrets.$inferSelect;
+export type AppSecretInsert = typeof appSecrets.$inferInsert;
+
 export const sshConnectionsRelations = relations(sshConnections, ({ many }) => ({
   projects: many(projects),
 }));
@@ -170,7 +369,6 @@ export const tasksRelations = relations(tasks, ({ one, many }) => ({
     references: [projects.id],
   }),
   conversations: many(conversations),
-  lineComments: many(lineComments),
 }));
 
 export const conversationsRelations = relations(conversations, ({ one, many }) => ({
@@ -188,18 +386,12 @@ export const messagesRelations = relations(messages, ({ one }) => ({
   }),
 }));
 
-export const lineCommentsRelations = relations(lineComments, ({ one }) => ({
-  task: one(tasks, {
-    fields: [lineComments.taskId],
-    references: [tasks.id],
-  }),
-}));
-
 export type SshConnectionRow = typeof sshConnections.$inferSelect;
 export type SshConnectionInsert = typeof sshConnections.$inferInsert;
 export type ProjectRow = typeof projects.$inferSelect;
 export type TaskRow = typeof tasks.$inferSelect;
 export type ConversationRow = typeof conversations.$inferSelect;
+export type TerminalRow = typeof terminals.$inferSelect;
 export type MessageRow = typeof messages.$inferSelect;
-export type LineCommentRow = typeof lineComments.$inferSelect;
-export type LineCommentInsert = typeof lineComments.$inferInsert;
+export type EditorBufferRow = typeof editorBuffers.$inferSelect;
+export type EditorBufferInsert = typeof editorBuffers.$inferInsert;
diff --git a/src/main/db/sshRepository.ts b/src/main/db/sshRepository.ts
index 375adb72d1..aea6e27ce1 100644
--- a/src/main/db/sshRepository.ts
+++ b/src/main/db/sshRepository.ts
@@ -1,10 +1,10 @@
 import { eq } from 'drizzle-orm';
-import { getDrizzleClient } from './drizzleClient';
+import { db } from './client';
 import {
-  sshConnections,
   projects,
-  type SshConnectionRow,
+  sshConnections,
   type SshConnectionInsert,
+  type SshConnectionRow,
 } from './schema';
 
 export class SshRepository {
@@ -20,7 +20,6 @@ export class SshRepository {
   async createConnection(
     data: Omit<SshConnectionInsert, 'id' | 'createdAt' | 'updatedAt'>
   ): Promise<SshConnectionRow> {
-    const { db } = await getDrizzleClient();
     const id = `ssh_${Date.now()}_${Math.random().toString(36).substr(2, 9)}`;
 
     const result = await db
@@ -37,13 +36,11 @@ export class SshRepository {
   }
 
   async getConnection(id: string): Promise<SshConnectionRow | undefined> {
-    const { db } = await getDrizzleClient();
     const result = await db.select().from(sshConnections).where(eq(sshConnections.id, id));
     return result[0];
   }
 
   async getAllConnections(): Promise<SshConnectionRow[]> {
-    const { db } = await getDrizzleClient();
     return db.select().from(sshConnections);
   }
 
@@ -51,7 +48,6 @@ export class SshRepository {
     id: string,
     data: Partial<SshConnectionInsert>
   ): Promise<SshConnectionRow> {
-    const { db } = await getDrizzleClient();
     const result = await db
       .update(sshConnections)
       .set({
@@ -64,12 +60,10 @@ export class SshRepository {
   }
 
   async deleteConnection(id: string): Promise<void> {
-    const { db } = await getDrizzleClient();
-
     // First update any projects using this connection
     await db
       .update(projects)
-      .set({ sshConnectionId: null, isRemote: 0 })
+      .set({ sshConnectionId: null })
       .where(eq(projects.sshConnectionId, id));
 
     // Then delete the connection
@@ -77,7 +71,6 @@ export class SshRepository {
   }
 
   async getProjectsForConnection(connectionId: string): Promise<string[]> {
-    const { db } = await getDrizzleClient();
     const result = await db
       .select({ id: projects.id })
       .from(projects)
diff --git a/src/main/entry.ts b/src/main/entry.ts
deleted file mode 100644
index 7e3ec37b02..0000000000
--- a/src/main/entry.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-// Runtime entry that installs path aliases for compiled JS before loading the app.
-// This avoids '@shared/*' resolution failures in the compiled Electron main process.
-import path from 'node:path';
-
-// Ensure app name is set BEFORE any module reads app.getPath('userData').
-// In dev builds, if userData is resolved before app name is set, Electron defaults to
-// ~/Library/Application Support/Electron which leads to confusing "missing DB/migrations" behavior.
-try {
-  // eslint-disable-next-line @typescript-eslint/no-var-requires
-  const { app } = require('electron');
-  app.setName('Emdash');
-} catch {}
-
-// Install minimal path alias resolver without external deps.
-// Maps:
-//   @shared/* -> dist/main/shared/*
-//   @/*      -> dist/main/main/*
-try {
-  // eslint-disable-next-line @typescript-eslint/no-var-requires
-  const Module = require('module');
-  const base = path.join(__dirname, '..'); // dist/main
-  const sharedBase = path.join(base, 'shared');
-  const mainBase = path.join(base, 'main');
-  const orig = Module._resolveFilename;
-  Module._resolveFilename = function (request: string, parent: any, isMain: boolean, options: any) {
-    if (typeof request === 'string') {
-      if (request.startsWith('@shared/')) {
-        const mapped = path.join(sharedBase, request.slice('@shared/'.length));
-        return orig.call(this, mapped, parent, isMain, options);
-      }
-      if (request.startsWith('@/')) {
-        const mapped = path.join(mainBase, request.slice('@/'.length));
-        return orig.call(this, mapped, parent, isMain, options);
-      }
-    }
-    return orig.call(this, request, parent, isMain, options);
-  };
-} catch {}
-
-// Load the actual application bootstrap
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-require('./main');
diff --git a/src/main/errorTracking.ts b/src/main/errorTracking.ts
deleted file mode 100644
index 08e22d6e1b..0000000000
--- a/src/main/errorTracking.ts
+++ /dev/null
@@ -1,394 +0,0 @@
-import { app } from 'electron';
-import * as telemetry from './telemetry';
-import { log } from './lib/logger';
-
-/**
- * Error tracking module for comprehensive error reporting with PostHog.
- */
-
-interface ErrorContext {
-  // User context
-  github_username?: string | null;
-
-  // Operation context
-  operation?: string;
-  service?: string;
-  component?: string;
-
-  // Error classification
-  error_type?: string;
-  severity?: 'low' | 'medium' | 'high' | 'critical';
-
-  // Agent/Provider context
-  provider?: string;
-  task_id?: string;
-  workspace_id?: string;
-
-  // Project context
-  project_id?: string;
-  project_path?: string;
-
-  // Git/Worktree context
-  branch_name?: string;
-  worktree_path?: string;
-  git_operation?: string;
-
-  // Additional debugging info
-  [key: string]: any;
-}
-
-class ErrorTracking {
-  private githubUsername: string | null = null;
-  private sessionErrors: number = 0;
-  private lastErrorTimestamp: number = 0;
-
-  /**
-   * Initialize error tracking
-   */
-  async init() {
-    try {
-      this.githubUsername = await this.fetchGithubUsername();
-      if (this.githubUsername) {
-        log.info('ErrorTracking initialized with GitHub user', { username: this.githubUsername });
-      }
-    } catch {
-      // Silent fail
-    }
-  }
-
-  async captureException(error: Error | unknown, context?: ErrorContext): Promise<void> {
-    try {
-      // Rate limiting to prevent error spam
-      const now = Date.now();
-      if (now - this.lastErrorTimestamp < 100) {
-        return; // Skip if error happened within 100ms
-      }
-      this.lastErrorTimestamp = now;
-      this.sessionErrors++;
-
-      // Build error object
-      const errorObj = error instanceof Error ? error : new Error(String(error));
-      const errorMessage = errorObj.message || 'Unknown error';
-      const errorStack = errorObj.stack || '';
-
-      if (!this.githubUsername) {
-        this.githubUsername = await this.fetchGithubUsername();
-      }
-
-      // Determine severity if not provided
-      const severity = context?.severity || this.determineSeverity(errorMessage, context);
-
-      // Build comprehensive error properties following PostHog's $exception format
-      const properties: Record<string, any> = {
-        // PostHog required fields for error tracking
-        $exception_message: errorMessage.slice(0, 500), // Required by PostHog
-        $exception_type: context?.error_type || this.classifyError(errorMessage), // Required
-        $exception_stack_trace_raw: errorStack.slice(0, 2000), // Required for stack traces
-        $exception_fingerprint: `${context?.service || 'unknown'}_${context?.operation || 'unknown'}_${context?.error_type || this.classifyError(errorMessage)}`, // For grouping
-
-        // Additional context
-        severity,
-
-        // User context
-        github_username: this.githubUsername,
-
-        // Session context
-        session_errors: this.sessionErrors,
-        app_version: this.getAppVersion(),
-        electron_version: process.versions.electron,
-        platform: process.platform,
-        arch: process.arch,
-        is_dev: !app.isPackaged,
-
-        // Operation context
-        operation: context?.operation,
-        service: context?.service,
-        component: context?.component || 'main',
-
-        // Agent/Provider context
-        provider: context?.provider,
-        task_id: context?.task_id,
-        workspace_id: context?.workspace_id,
-
-        // Project context
-        project_id: context?.project_id,
-        project_path: context?.project_path,
-
-        // Git context
-        branch_name: context?.branch_name,
-        worktree_path: context?.worktree_path,
-        git_operation: context?.git_operation,
-
-        // Timestamp
-        error_timestamp: new Date().toISOString(),
-
-        // Additional custom context
-        ...this.sanitizeContext(context),
-      };
-
-      // Filter out undefined/null values
-      const cleanProperties = Object.fromEntries(
-        Object.entries(properties).filter(([_, v]) => v !== undefined && v !== null)
-      );
-
-      // Send to PostHog using proper exception tracking
-      telemetry.captureException(errorObj, cleanProperties);
-
-      // Also log locally for debugging
-      log.error('Exception captured', {
-        message: errorMessage,
-        severity,
-        operation: context?.operation,
-        service: context?.service,
-      });
-    } catch (trackingError) {
-      // Never let error tracking crash the app
-      log.warn('Failed to capture exception', { error: trackingError });
-    }
-  }
-
-  /**
-   * Capture a critical error that might affect app stability
-   */
-  async captureCriticalError(error: Error | unknown, context?: ErrorContext): Promise<void> {
-    await this.captureException(error, {
-      ...context,
-      severity: 'critical',
-    });
-  }
-
-  /**
-   * Track agent provider spawn errors
-   */
-  async captureAgentSpawnError(
-    error: Error | unknown,
-    provider: string,
-    taskId: string,
-    additionalContext?: Partial<ErrorContext>
-  ): Promise<void> {
-    await this.captureException(error, {
-      operation: 'agent_spawn',
-      service: 'ptyManager',
-      error_type: 'spawn_error',
-      severity: 'high',
-      provider,
-      task_id: taskId,
-      ...additionalContext,
-    });
-  }
-
-  /**
-   * Track project initialization errors
-   */
-  async captureProjectError(
-    error: Error | unknown,
-    operation: 'create' | 'clone' | 'open' | 'delete',
-    projectPath?: string,
-    additionalContext?: Partial<ErrorContext>
-  ): Promise<void> {
-    await this.captureException(error, {
-      operation: `project_${operation}`,
-      service: 'projectIpc',
-      error_type: 'project_error',
-      severity: operation === 'create' || operation === 'clone' ? 'high' : 'medium',
-      project_path: projectPath,
-      ...additionalContext,
-    });
-  }
-
-  /**
-   * Track worktree creation errors
-   */
-  async captureWorktreeError(
-    error: Error | unknown,
-    operation: string,
-    worktreePath?: string,
-    branchName?: string,
-    additionalContext?: Partial<ErrorContext>
-  ): Promise<void> {
-    await this.captureException(error, {
-      operation: `worktree_${operation}`,
-      service: 'WorktreeService',
-      error_type: 'worktree_error',
-      severity: 'high',
-      worktree_path: worktreePath,
-      branch_name: branchName,
-      ...additionalContext,
-    });
-  }
-
-  /**
-   * Track GitHub API errors
-   */
-  async captureGitHubError(
-    error: Error | unknown,
-    operation: string,
-    additionalContext?: Partial<ErrorContext>
-  ): Promise<void> {
-    await this.captureException(error, {
-      operation: `github_${operation}`,
-      service: 'GitHubService',
-      error_type: 'github_error',
-      severity: this.isAuthError(error) ? 'critical' : 'medium',
-      ...additionalContext,
-    });
-  }
-
-  /**
-   * Track database errors
-   */
-  async captureDatabaseError(
-    error: Error | unknown,
-    operation: string,
-    additionalContext?: Partial<ErrorContext>
-  ): Promise<void> {
-    await this.captureException(error, {
-      operation: `db_${operation}`,
-      service: 'DatabaseService',
-      error_type: 'database_error',
-      severity: 'high',
-      ...additionalContext,
-    });
-  }
-
-  /**
-   * Update GitHub username (call when user authenticates)
-   */
-  async updateGithubUsername(username: string | null) {
-    this.githubUsername = username;
-  }
-
-  // Private helper methods
-
-  private async fetchGithubUsername(): Promise<string | null> {
-    try {
-      // Lazy import to avoid circular dependencies
-      const { githubService } = require('./services/GitHubService');
-      const user = await githubService.getCurrentUser();
-      return user?.login || null;
-    } catch {
-      return null;
-    }
-  }
-
-  private getAppVersion(): string {
-    try {
-      return app.getVersion();
-    } catch {
-      return 'unknown';
-    }
-  }
-
-  private determineSeverity(
-    errorMessage: string,
-    context?: ErrorContext
-  ): ErrorContext['severity'] {
-    // Critical errors
-    if (
-      errorMessage.includes('FATAL') ||
-      errorMessage.includes('CRASH') ||
-      errorMessage.includes('out of memory') ||
-      context?.error_type === 'database_error'
-    ) {
-      return 'critical';
-    }
-
-    // High severity
-    if (
-      errorMessage.includes('spawn') ||
-      errorMessage.includes('PTY') ||
-      errorMessage.includes('worktree') ||
-      errorMessage.includes('permission denied') ||
-      context?.operation?.includes('agent_spawn')
-    ) {
-      return 'high';
-    }
-
-    // Low severity
-    if (
-      errorMessage.includes('canceled') ||
-      errorMessage.includes('aborted') ||
-      errorMessage.includes('timeout')
-    ) {
-      return 'low';
-    }
-
-    return 'medium';
-  }
-
-  private classifyError(errorMessage: string): string {
-    if (errorMessage.includes('spawn') || errorMessage.includes('PTY')) {
-      return 'spawn_error';
-    }
-    if (errorMessage.includes('git') || errorMessage.includes('worktree')) {
-      return 'git_error';
-    }
-    if (errorMessage.includes('database') || errorMessage.includes('sqlite')) {
-      return 'database_error';
-    }
-    if (errorMessage.includes('network') || errorMessage.includes('fetch')) {
-      return 'network_error';
-    }
-    if (errorMessage.includes('permission') || errorMessage.includes('EACCES')) {
-      return 'permission_error';
-    }
-    if (errorMessage.includes('not found') || errorMessage.includes('ENOENT')) {
-      return 'file_not_found';
-    }
-    return 'unknown_error';
-  }
-
-  private isAuthError(error: unknown): boolean {
-    const message = error instanceof Error ? error.message : String(error);
-    return (
-      message.includes('auth') ||
-      message.includes('unauthorized') ||
-      message.includes('401') ||
-      message.includes('403')
-    );
-  }
-
-  private sanitizeContext(context?: ErrorContext): Record<string, any> {
-    if (!context) return {};
-
-    // Remove sensitive keys and limit string lengths
-    const sanitized: Record<string, any> = {};
-    const sensitiveKeys = ['password', 'token', 'secret', 'key', 'auth'];
-
-    for (const [key, value] of Object.entries(context)) {
-      // Skip if already processed or sensitive
-      if (['severity', 'operation', 'service', 'component', 'error_type'].includes(key)) {
-        continue;
-      }
-      if (sensitiveKeys.some((sensitive) => key.toLowerCase().includes(sensitive))) {
-        continue;
-      }
-
-      // Sanitize value
-      if (typeof value === 'string') {
-        sanitized[key] = value.slice(0, 200);
-      } else if (typeof value === 'number' || typeof value === 'boolean') {
-        sanitized[key] = value;
-      } else if (value === null || value === undefined) {
-        // Skip null/undefined
-      } else {
-        // Convert objects to string with limit
-        try {
-          sanitized[key] = JSON.stringify(value).slice(0, 200);
-        } catch {
-          // Skip if can't stringify
-        }
-      }
-    }
-
-    return sanitized;
-  }
-}
-
-// Export singleton instance
-export const errorTracking = new ErrorTracking();
-
-// Export helper for backward compatibility
-export function captureException(error: Error | unknown, context?: ErrorContext) {
-  return errorTracking.captureException(error, context);
-}
diff --git a/src/main/index.ts b/src/main/index.ts
new file mode 100644
index 0000000000..fdba933579
--- /dev/null
+++ b/src/main/index.ts
@@ -0,0 +1,133 @@
+import { join } from 'node:path';
+import { app, BrowserWindow, dialog, ipcMain } from 'electron';
+import dockIcon from '@/assets/images/emdash/icon-dock.png?asset';
+import { PRODUCT_NAME } from '@shared/app-identity';
+import { registerRPCRouter } from '@shared/ipc/rpc';
+import { setupApplicationMenu } from './app/menu';
+import { registerAppScheme, setupAppProtocol } from './app/protocol';
+import { createMainWindow } from './app/window';
+import { providerTokenRegistry } from './core/account/provider-token-registry';
+import { emdashAccountService } from './core/account/services/emdash-account-service';
+import { agentHookService } from './core/agent-hooks/agent-hook-service';
+import { appService } from './core/app/service';
+import { localDependencyManager } from './core/dependencies/dependency-manager';
+import { editorBufferService } from './core/editor/editor-buffer-service';
+import { githubConnectionService } from './core/github/services/github-connection-service';
+import { projectManager } from './core/projects/project-manager';
+import { prSyncScheduler } from './core/pull-requests/pr-sync-scheduler';
+import { appSettingsService } from './core/settings/settings-service';
+import { updateService } from './core/updates/update-service';
+import { initializeDatabase } from './db/initialize';
+import { log } from './lib/logger';
+import * as telemetry from './lib/telemetry';
+import { rpcRouter } from './rpc';
+import { resolveUserEnv } from './utils/userEnv';
+
+if (process.platform === 'linux') {
+  app.commandLine.appendSwitch('ozone-platform-hint', 'auto');
+}
+
+registerAppScheme();
+
+app.setName(PRODUCT_NAME);
+app.setPath('userData', join(app.getPath('appData'), 'emdash'));
+
+app.on('second-instance', () => {
+  const win = BrowserWindow.getAllWindows()[0];
+  if (win?.isMinimized()) win.restore();
+  win?.focus();
+});
+
+if (!import.meta.env.DEV && !app.requestSingleInstanceLock()) {
+  app.quit();
+  process.exit(0);
+}
+
+if (import.meta.env.DEV) {
+  try {
+    app.dock?.setIcon(dockIcon);
+  } catch (err) {
+    log.warn('Failed to set dock icon:', err);
+  }
+}
+
+app.on('window-all-closed', () => {
+  if (process.platform !== 'darwin') {
+    app.quit();
+  }
+});
+
+app.on('activate', () => {
+  if (BrowserWindow.getAllWindows().length === 0) {
+    createMainWindow();
+  }
+});
+
+app.whenReady().then(async () => {
+  await resolveUserEnv();
+
+  try {
+    await initializeDatabase();
+    const BUFFER_STALE_MS = 7 * 24 * 60 * 60 * 1000; // 7 days
+    editorBufferService.pruneStale(BUFFER_STALE_MS).catch((e) => {
+      log.warn('Failed to prune stale editor buffers:', e);
+    });
+  } catch (error) {
+    log.error('Failed to initialize database:', error);
+    dialog.showErrorBox(
+      'Database Initialization Failed',
+      `${PRODUCT_NAME} could not start because the database failed to initialize.\n\n${error instanceof Error ? error.message : String(error)}`
+    );
+    app.quit();
+    return;
+  }
+
+  try {
+    await telemetry.init({ installSource: app.isPackaged ? 'dmg' : 'dev' });
+  } catch (e) {
+    log.warn('telemetry init failed:', e);
+  }
+
+  prSyncScheduler.initialize();
+  appService.initialize();
+  appSettingsService.initialize();
+
+  agentHookService.start().catch((e) => {
+    log.error('Failed to start agent event service:', e);
+  });
+
+  emdashAccountService.loadSessionToken().catch((e) => {
+    log.warn('Failed to load account session token:', e);
+  });
+
+  providerTokenRegistry.register('github', (token) => githubConnectionService.storeToken(token));
+
+  registerRPCRouter(rpcRouter, ipcMain);
+
+  localDependencyManager.probeAll().catch((e) => {
+    log.error('Failed to probe dependencies:', e);
+  });
+
+  setupAppProtocol(join(app.getAppPath(), 'out', 'renderer'));
+  setupApplicationMenu();
+  createMainWindow();
+
+  try {
+    await updateService.initialize();
+  } catch (error) {
+    if (app.isPackaged) {
+      log.error('Failed to initialize auto-update service:', error);
+    }
+  }
+});
+
+app.on('before-quit', () => {
+  telemetry.capture('app_closed');
+  telemetry.shutdown();
+
+  agentHookService.stop();
+  updateService.shutdown();
+  projectManager.shutdown().catch((e) => {
+    log.error('Failed to shutdown project manager:', e);
+  });
+});
diff --git a/src/main/ipc/appIpc.ts b/src/main/ipc/appIpc.ts
deleted file mode 100644
index b43c64df1a..0000000000
--- a/src/main/ipc/appIpc.ts
+++ /dev/null
@@ -1,630 +0,0 @@
-import { app, clipboard, ipcMain, shell } from 'electron';
-import { exec, execFile } from 'child_process';
-import { readFile } from 'fs/promises';
-import { join } from 'path';
-import { ensureProjectPrepared } from '../services/ProjectPrep';
-import { getAppSettings } from '../settings';
-import {
-  getAppById,
-  getResolvedLabel,
-  OPEN_IN_APPS,
-  type OpenInAppId,
-  type PlatformKey,
-} from '@shared/openInApps';
-import { databaseService } from '../services/DatabaseService';
-import { buildExternalToolEnv } from '../utils/childProcessEnv';
-import {
-  buildGhosttyRemoteExecArgs,
-  buildRemoteEditorUrl,
-  buildRemoteSshCommand,
-} from '../utils/remoteOpenIn';
-
-const UNKNOWN_VERSION = 'unknown';
-
-let cachedAppVersion: string | null = null;
-let cachedAppVersionPromise: Promise<string> | null = null;
-const FONT_CACHE_TTL_MS = 5 * 60 * 1000;
-let cachedInstalledFonts: { fonts: string[]; fetchedAt: number } | null = null;
-
-const execCommand = (
-  command: string,
-  opts?: { maxBuffer?: number; timeout?: number }
-): Promise<string> => {
-  return new Promise((resolve, reject) => {
-    exec(
-      command,
-      {
-        maxBuffer: opts?.maxBuffer ?? 8 * 1024 * 1024,
-        timeout: opts?.timeout ?? 30000,
-        env: buildExternalToolEnv(),
-      },
-      (error, stdout) => {
-        if (error) return reject(error);
-        resolve(stdout ?? '');
-      }
-    );
-  });
-};
-
-const execFileCommand = (
-  file: string,
-  args: string[],
-  opts?: { timeout?: number }
-): Promise<void> => {
-  return new Promise((resolve, reject) => {
-    execFile(
-      file,
-      args,
-      {
-        timeout: opts?.timeout ?? 30000,
-        env: buildExternalToolEnv(),
-      },
-      (error) => {
-        if (error) return reject(error);
-        resolve();
-      }
-    );
-  });
-};
-
-const escapeAppleScriptString = (value: string): string =>
-  value.replace(/\\/g, '\\\\').replace(/"/g, '\\"');
-
-const dedupeAndSortFonts = (fonts: string[]): string[] => {
-  const unique = Array.from(new Set(fonts.map((font) => font.trim()).filter(Boolean)));
-  return unique.sort((a, b) => a.localeCompare(b));
-};
-
-const listInstalledFontsMac = async (): Promise<string[]> => {
-  const stdout = await execCommand('system_profiler SPFontsDataType -json', {
-    maxBuffer: 24 * 1024 * 1024,
-    timeout: 60000,
-  });
-  const parsed = JSON.parse(stdout) as {
-    SPFontsDataType?: Array<{
-      typefaces?: Array<{ family?: string; fullname?: string }>;
-      _name?: string;
-    }>;
-  };
-  const fonts: string[] = [];
-  for (const item of parsed.SPFontsDataType ?? []) {
-    for (const typeface of item.typefaces ?? []) {
-      if (typeface.family) fonts.push(typeface.family);
-    }
-  }
-  return dedupeAndSortFonts(fonts);
-};
-
-const listInstalledFontsLinux = async (): Promise<string[]> => {
-  const stdout = await execCommand('fc-list : family', { timeout: 30000 });
-  const fonts = stdout
-    .split('\n')
-    .flatMap((line) => line.split(','))
-    .map((font) => font.trim())
-    .filter(Boolean);
-  return dedupeAndSortFonts(fonts);
-};
-
-const listInstalledFontsWindows = async (): Promise<string[]> => {
-  const script =
-    "$fonts = Get-ItemProperty -Path 'HKLM:\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Fonts';" +
-    "$props = $fonts.PSObject.Properties | Where-Object { $_.Name -notlike 'PS*' };" +
-    "$props | ForEach-Object { ($_.Name -replace '\\s*\\(.*\\)$','').Trim() }";
-  const stdout = await execCommand(`powershell -NoProfile -Command "${script}"`, {
-    timeout: 30000,
-  });
-  const fonts = stdout
-    .split('\n')
-    .map((line) => line.trim())
-    .filter(Boolean);
-  return dedupeAndSortFonts(fonts);
-};
-
-const listInstalledFonts = async (): Promise<string[]> => {
-  switch (process.platform) {
-    case 'darwin':
-      return listInstalledFontsMac();
-    case 'linux':
-      return listInstalledFontsLinux();
-    case 'win32':
-      return listInstalledFontsWindows();
-    default:
-      return [];
-  }
-};
-
-const readPackageVersion = async (packageJsonPath: string): Promise<string | null> => {
-  try {
-    const packageJson = JSON.parse(await readFile(packageJsonPath, 'utf-8'));
-    if (packageJson.name === 'emdash' && packageJson.version) {
-      return packageJson.version;
-    }
-  } catch {
-    // Ignore missing or malformed package.json; try the next path.
-  }
-  return null;
-};
-
-const resolveAppVersion = async (): Promise<string> => {
-  // In development, we need to look for package.json in the project root.
-  const isDev = !app.isPackaged || process.env.NODE_ENV === 'development';
-
-  const possiblePaths = isDev
-    ? [
-        join(__dirname, '../../../../package.json'), // from dist/main/main/ipc in dev
-        join(__dirname, '../../../package.json'), // alternative dev path
-        join(process.cwd(), 'package.json'), // current working directory
-      ]
-    : [
-        join(__dirname, '../../package.json'), // from dist/main/ipc in production
-        join(app.getAppPath(), 'package.json'), // production build
-      ];
-
-  for (const packageJsonPath of possiblePaths) {
-    const version = await readPackageVersion(packageJsonPath);
-    if (version) {
-      return version;
-    }
-  }
-
-  // In dev, never use app.getVersion() as it returns Electron version.
-  if (isDev) {
-    return UNKNOWN_VERSION;
-  }
-
-  try {
-    return app.getVersion();
-  } catch (error) {
-    void error;
-    return UNKNOWN_VERSION;
-  }
-};
-
-const getCachedAppVersion = (): Promise<string> => {
-  if (cachedAppVersion) {
-    return Promise.resolve(cachedAppVersion);
-  }
-
-  if (!cachedAppVersionPromise) {
-    cachedAppVersionPromise = resolveAppVersion().then((version) => {
-      cachedAppVersion = version;
-      return version;
-    });
-  }
-
-  return cachedAppVersionPromise;
-};
-
-export function registerAppIpc() {
-  void getCachedAppVersion();
-
-  ipcMain.handle('app:undo', async (event) => {
-    try {
-      event.sender.undo();
-      return { success: true };
-    } catch (error) {
-      return { success: false, error: error instanceof Error ? error.message : String(error) };
-    }
-  });
-
-  ipcMain.handle('app:redo', async (event) => {
-    try {
-      event.sender.redo();
-      return { success: true };
-    } catch (error) {
-      return { success: false, error: error instanceof Error ? error.message : String(error) };
-    }
-  });
-
-  ipcMain.handle('app:openExternal', async (_event, url: string) => {
-    try {
-      if (!url || typeof url !== 'string') throw new Error('Invalid URL');
-
-      // Security: Validate URL protocol to prevent local file access and dangerous protocols
-      const ALLOWED_PROTOCOLS = ['http:', 'https:'];
-      let parsedUrl: URL;
-
-      try {
-        parsedUrl = new URL(url);
-      } catch {
-        throw new Error('Invalid URL format');
-      }
-
-      if (!ALLOWED_PROTOCOLS.includes(parsedUrl.protocol)) {
-        throw new Error(
-          `Protocol "${parsedUrl.protocol}" is not allowed. Only http and https URLs are permitted.`
-        );
-      }
-
-      await shell.openExternal(url);
-      return { success: true };
-    } catch (error) {
-      return { success: false, error: error instanceof Error ? error.message : String(error) };
-    }
-  });
-
-  ipcMain.handle('app:clipboard-write-text', async (_event, text: string) => {
-    try {
-      if (typeof text !== 'string') throw new Error('Invalid clipboard text');
-      clipboard.writeText(text);
-      return { success: true };
-    } catch (error) {
-      return { success: false, error: error instanceof Error ? error.message : String(error) };
-    }
-  });
-
-  ipcMain.handle('app:paste', async (event) => {
-    try {
-      const webContents = event.sender;
-      if (!webContents) {
-        return { success: false, error: 'No webContents available' };
-      }
-      webContents.paste();
-      return { success: true };
-    } catch (error) {
-      return { success: false, error: error instanceof Error ? error.message : String(error) };
-    }
-  });
-
-  ipcMain.handle(
-    'app:openIn',
-    async (
-      _event,
-      args: {
-        app: OpenInAppId;
-        path: string;
-        isRemote?: boolean;
-        sshConnectionId?: string | null;
-      }
-    ) => {
-      const target = args?.path;
-      const appId = args?.app;
-      const isRemote = args?.isRemote || false;
-      const sshConnectionId = args?.sshConnectionId;
-
-      if (!target || typeof target !== 'string' || !appId) {
-        return { success: false, error: 'Invalid arguments' };
-      }
-      try {
-        const platform = process.platform as PlatformKey;
-        const appConfig = getAppById(appId);
-        if (!appConfig) {
-          return { success: false, error: 'Invalid app ID' };
-        }
-
-        const platformConfig = appConfig.platforms?.[platform];
-        const label = getResolvedLabel(appConfig, platform);
-        if (!platformConfig && !appConfig.alwaysAvailable) {
-          return { success: false, error: `${label} is not available on this platform.` };
-        }
-
-        // Handle remote SSH connections for supported editors and terminals
-        if (isRemote && sshConnectionId) {
-          try {
-            const connection = await databaseService.getSshConnection(sshConnectionId);
-            if (!connection) {
-              return { success: false, error: 'SSH connection not found' };
-            }
-
-            // Construct remote SSH URL or command based on the app
-            // Security: Escape all user-controlled values to prevent command injection
-            if (appId === 'vscode') {
-              // VS Code Remote SSH URL format:
-              // vscode://vscode-remote/ssh-remote+user%40hostname/path
-              const remoteUrl = buildRemoteEditorUrl(
-                'vscode',
-                connection.host,
-                connection.username,
-                target
-              );
-              await shell.openExternal(remoteUrl);
-              return { success: true };
-            } else if (appId === 'cursor') {
-              // Cursor uses its own URL scheme for remote SSH
-              const remoteUrl = buildRemoteEditorUrl(
-                'cursor',
-                connection.host,
-                connection.username,
-                target
-              );
-              await shell.openExternal(remoteUrl);
-              return { success: true };
-            } else if (appId === 'terminal' && platform === 'darwin') {
-              // macOS Terminal.app - execute SSH command
-              const sshCommand = buildRemoteSshCommand({
-                host: connection.host,
-                username: connection.username,
-                port: connection.port,
-                targetPath: target,
-              });
-              const escapedCommand = escapeAppleScriptString(sshCommand);
-
-              await execFileCommand('osascript', [
-                '-e',
-                `tell application "Terminal" to do script "${escapedCommand}"`,
-                '-e',
-                'tell application "Terminal" to activate',
-              ]);
-              return { success: true };
-            } else if (appId === 'iterm2' && platform === 'darwin') {
-              // iTerm2 - execute SSH command
-              const sshCommand = buildRemoteSshCommand({
-                host: connection.host,
-                username: connection.username,
-                port: connection.port,
-                targetPath: target,
-              });
-              const escapedCommand = escapeAppleScriptString(sshCommand);
-
-              await execFileCommand('osascript', [
-                '-e',
-                `tell application "iTerm" to create window with default profile command "${escapedCommand}"`,
-                '-e',
-                'tell application "iTerm" to activate',
-              ]);
-              return { success: true };
-            } else if (appId === 'warp' && platform === 'darwin') {
-              // Warp - use URL scheme with SSH command
-              const sshCommand = buildRemoteSshCommand({
-                host: connection.host,
-                username: connection.username,
-                port: connection.port,
-                targetPath: target,
-              });
-              await shell.openExternal(
-                `warp://action/new_window?cmd=${encodeURIComponent(sshCommand)}`
-              );
-              return { success: true };
-            } else if (appId === 'ghostty') {
-              // Ghostty - execute SSH command directly.
-              // Prefer remote login shell behavior for normal prompt/init scripts while
-              // keeping deterministic fallbacks when SHELL is missing or invalid.
-              // Compatibility note: many remote hosts don't ship xterm-ghostty terminfo.
-              // The argv builder falls back to TERM=xterm-256color only when current TERM
-              // isn't supported, keeping TUIs (e.g. ranger) working without always downgrading.
-              const ghosttyExecArgs = buildGhosttyRemoteExecArgs({
-                host: connection.host,
-                username: connection.username,
-                port: connection.port,
-                targetPath: target,
-              });
-
-              const attempts =
-                platform === 'darwin'
-                  ? [
-                      {
-                        file: 'open',
-                        args: [
-                          '-n',
-                          '-b',
-                          'com.mitchellh.ghostty',
-                          '--args',
-                          '-e',
-                          ...ghosttyExecArgs,
-                        ],
-                      },
-                      {
-                        file: 'open',
-                        args: ['-na', 'Ghostty', '--args', '-e', ...ghosttyExecArgs],
-                      },
-                      { file: 'ghostty', args: ['-e', ...ghosttyExecArgs] },
-                    ]
-                  : [{ file: 'ghostty', args: ['-e', ...ghosttyExecArgs] }];
-
-              let lastError: unknown = null;
-              for (const attempt of attempts) {
-                try {
-                  await execFileCommand(attempt.file, attempt.args);
-                  return { success: true };
-                } catch (error) {
-                  lastError = error;
-                }
-              }
-
-              if (lastError instanceof Error) throw lastError;
-              throw new Error('Unable to launch Ghostty');
-            } else if (appConfig.supportsRemote) {
-              // App claims to support remote but we don't have a handler
-              return {
-                success: false,
-                error: `Remote SSH not yet implemented for ${label}`,
-              };
-            }
-          } catch (error) {
-            return {
-              success: false,
-              error: `Failed to open remote connection: ${error instanceof Error ? error.message : String(error)}`,
-            };
-          }
-        }
-
-        const quoted = (p: string) => `'${p.replace(/'/g, "'\\''")}'`;
-
-        // Handle URL-based apps (like Warp)
-        if (platformConfig?.openUrls) {
-          for (const urlTemplate of platformConfig.openUrls) {
-            const url = urlTemplate
-              .replace('{{path_url}}', encodeURIComponent(target))
-              .replace('{{path}}', target);
-            try {
-              await shell.openExternal(url);
-              return { success: true };
-            } catch (error) {
-              void error;
-            }
-          }
-          return {
-            success: false,
-            error: `${label} is not installed or its URI scheme is not registered on this platform.`,
-          };
-        }
-
-        // Handle command-based apps
-        const commands = platformConfig?.openCommands || [];
-        let command = '';
-
-        if (commands.length > 0) {
-          command = commands
-            .map((cmd: string) => {
-              // Chain both replacements: first {{path}}, then {{path_raw}}
-              return cmd.replace('{{path}}', quoted(target)).replace('{{path_raw}}', target);
-            })
-            .join(' || ');
-        }
-
-        if (!command) {
-          return { success: false, error: 'Unsupported platform or app' };
-        }
-
-        if (appConfig.autoInstall) {
-          try {
-            const settings = getAppSettings();
-            if (settings?.projectPrep?.autoInstallOnOpenInEditor) {
-              void ensureProjectPrepared(target).catch(() => {});
-            }
-          } catch {}
-        }
-
-        await new Promise<void>((resolve, reject) => {
-          exec(command, { cwd: target, env: buildExternalToolEnv() }, (err) => {
-            if (err) return reject(err);
-            resolve();
-          });
-        });
-        return { success: true };
-      } catch (error) {
-        const appConfig = getAppById(appId);
-        const catchLabel = appConfig
-          ? getResolvedLabel(appConfig, process.platform as PlatformKey)
-          : appId;
-        return { success: false, error: `Unable to open in ${catchLabel}` };
-      }
-    }
-  );
-
-  ipcMain.handle('app:checkInstalledApps', async () => {
-    const platform = process.platform as PlatformKey;
-    const availability: Record<string, boolean> = {};
-
-    // Helper to check if a command exists
-    const checkCommand = (cmd: string): Promise<boolean> => {
-      return new Promise((resolve) => {
-        exec(`command -v ${cmd} >/dev/null 2>&1`, { env: buildExternalToolEnv() }, (error) => {
-          resolve(!error);
-        });
-      });
-    };
-
-    // Helper to check if macOS app exists by bundle ID
-    const checkMacApp = (bundleId: string): Promise<boolean> => {
-      return new Promise((resolve) => {
-        exec(
-          `mdfind "kMDItemCFBundleIdentifier == '${bundleId}'"`,
-          { env: buildExternalToolEnv() },
-          (error, stdout) => {
-            resolve(!error && stdout.trim().length > 0);
-          }
-        );
-      });
-    };
-
-    // Helper to check if macOS app exists by name
-    const checkMacAppByName = (appName: string): Promise<boolean> => {
-      return new Promise((resolve) => {
-        exec(
-          `osascript -e 'id of application "${appName}"' 2>/dev/null`,
-          { env: buildExternalToolEnv() },
-          (error) => {
-            resolve(!error);
-          }
-        );
-      });
-    };
-
-    for (const app of OPEN_IN_APPS) {
-      // Skip apps that don't have platform-specific config
-      const platformConfig = app.platforms[platform];
-      if (!platformConfig && !app.alwaysAvailable) {
-        availability[app.id] = false;
-        continue;
-      }
-
-      // Always available apps are set to true by default
-      if (app.alwaysAvailable) {
-        availability[app.id] = true;
-        continue;
-      }
-
-      try {
-        let isAvailable = false;
-
-        // Check via bundle IDs (macOS)
-        if (platformConfig?.bundleIds) {
-          for (const bundleId of platformConfig.bundleIds) {
-            if (await checkMacApp(bundleId)) {
-              isAvailable = true;
-              break;
-            }
-          }
-        }
-
-        // Check via app names (macOS)
-        if (!isAvailable && platformConfig?.appNames) {
-          for (const appName of platformConfig.appNames) {
-            if (await checkMacAppByName(appName)) {
-              isAvailable = true;
-              break;
-            }
-          }
-        }
-
-        // Check via CLI commands (all platforms)
-        if (!isAvailable && platformConfig?.checkCommands) {
-          for (const cmd of platformConfig.checkCommands) {
-            if (await checkCommand(cmd)) {
-              isAvailable = true;
-              break;
-            }
-          }
-        }
-
-        availability[app.id] = isAvailable;
-      } catch (error) {
-        console.error(`Error checking installed app ${app.id}:`, error);
-        availability[app.id] = false;
-      }
-    }
-
-    return availability;
-  });
-
-  ipcMain.handle('app:listInstalledFonts', async (_event, args?: { refresh?: boolean }) => {
-    const refresh = Boolean(args?.refresh);
-    const now = Date.now();
-    if (
-      !refresh &&
-      cachedInstalledFonts &&
-      now - cachedInstalledFonts.fetchedAt < FONT_CACHE_TTL_MS
-    ) {
-      return { success: true, fonts: cachedInstalledFonts.fonts, cached: true };
-    }
-
-    try {
-      const fonts = await listInstalledFonts();
-      cachedInstalledFonts = { fonts, fetchedAt: now };
-      return { success: true, fonts, cached: false };
-    } catch (error) {
-      return {
-        success: false,
-        error: error instanceof Error ? error.message : String(error),
-        fonts: cachedInstalledFonts?.fonts ?? [],
-        cached: Boolean(cachedInstalledFonts),
-      };
-    }
-  });
-
-  // App metadata
-  ipcMain.handle('app:getAppVersion', () => getCachedAppVersion());
-  ipcMain.handle('app:getElectronVersion', () => process.versions.electron);
-  ipcMain.handle('app:getPlatform', () => process.platform);
-}
diff --git a/src/main/ipc/browserIpc.ts b/src/main/ipc/browserIpc.ts
deleted file mode 100644
index f215cc9e5c..0000000000
--- a/src/main/ipc/browserIpc.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-import { ipcMain } from 'electron';
-import { browserViewService } from '../services/browserViewService';
-
-export function registerBrowserIpc() {
-  ipcMain.handle(
-    'browser:view:show',
-    (_e, args: { x: number; y: number; width: number; height: number; url?: string }) => {
-      const { x, y, width, height, url } = args || ({} as any);
-      browserViewService.show({ x, y, width, height }, url);
-      return { ok: true };
-    }
-  );
-  ipcMain.handle('browser:view:hide', () => {
-    browserViewService.hide();
-    return { ok: true };
-  });
-  ipcMain.handle(
-    'browser:view:setBounds',
-    (_e, args: { x: number; y: number; width: number; height: number }) => {
-      const { x, y, width, height } = args || ({} as any);
-      browserViewService.setBounds({ x, y, width, height });
-      return { ok: true };
-    }
-  );
-  ipcMain.handle('browser:view:loadURL', (_e, url: string, forceReload?: boolean) => {
-    browserViewService.loadURL(url, forceReload);
-    return { ok: true };
-  });
-  ipcMain.handle('browser:view:goBack', () => {
-    browserViewService.goBack();
-    return { ok: true };
-  });
-  ipcMain.handle('browser:view:goForward', () => {
-    browserViewService.goForward();
-    return { ok: true };
-  });
-  ipcMain.handle('browser:view:reload', () => {
-    browserViewService.reload();
-    return { ok: true };
-  });
-  ipcMain.handle('browser:view:openDevTools', () => {
-    browserViewService.openDevTools();
-    return { ok: true };
-  });
-  ipcMain.handle('browser:view:clear', () => {
-    browserViewService.clear();
-    return { ok: true };
-  });
-}
diff --git a/src/main/ipc/connectionsIpc.ts b/src/main/ipc/connectionsIpc.ts
deleted file mode 100644
index 376b1b554c..0000000000
--- a/src/main/ipc/connectionsIpc.ts
+++ /dev/null
@@ -1,83 +0,0 @@
-import { ipcMain } from 'electron';
-import { connectionsService } from '../services/ConnectionsService';
-import {
-  getProviderCustomConfig,
-  getAllProviderCustomConfigs,
-  updateProviderCustomConfig,
-  type ProviderCustomConfig,
-} from '../settings';
-
-export function registerConnectionsIpc() {
-  ipcMain.handle(
-    'providers:getStatuses',
-    async (_event, opts?: { refresh?: boolean; providers?: string[]; providerId?: string }) => {
-      const providers =
-        Array.isArray(opts?.providers) && opts.providers.length > 0
-          ? opts.providers
-          : opts?.providerId
-            ? [opts.providerId]
-            : null;
-
-      try {
-        if (opts?.refresh) {
-          if (providers && providers.length > 0) {
-            for (const id of providers) {
-              await connectionsService.checkProvider(id, 'manual');
-            }
-          } else {
-            await connectionsService.refreshAllProviderStatuses();
-          }
-        }
-        const statuses = connectionsService.getCachedProviderStatuses();
-        return { success: true, statuses };
-      } catch (error) {
-        return {
-          success: false,
-          error: error instanceof Error ? error.message : 'Unknown error',
-        };
-      }
-    }
-  );
-
-  // Get custom config for a specific provider
-  ipcMain.handle('providers:getCustomConfig', (_event, providerId: string) => {
-    try {
-      const config = getProviderCustomConfig(providerId);
-      return { success: true, config };
-    } catch (error) {
-      return {
-        success: false,
-        error: error instanceof Error ? error.message : 'Unknown error',
-      };
-    }
-  });
-
-  // Get all custom configs
-  ipcMain.handle('providers:getAllCustomConfigs', () => {
-    try {
-      const configs = getAllProviderCustomConfigs();
-      return { success: true, configs };
-    } catch (error) {
-      return {
-        success: false,
-        error: error instanceof Error ? error.message : 'Unknown error',
-      };
-    }
-  });
-
-  // Update custom config for a specific provider
-  ipcMain.handle(
-    'providers:updateCustomConfig',
-    (_event, providerId: string, config: ProviderCustomConfig | undefined) => {
-      try {
-        updateProviderCustomConfig(providerId, config);
-        return { success: true };
-      } catch (error) {
-        return {
-          success: false,
-          error: error instanceof Error ? error.message : 'Unknown error',
-        };
-      }
-    }
-  );
-}
diff --git a/src/main/ipc/dbIpc.ts b/src/main/ipc/dbIpc.ts
deleted file mode 100644
index 317bf943f1..0000000000
--- a/src/main/ipc/dbIpc.ts
+++ /dev/null
@@ -1,88 +0,0 @@
-import fs from 'node:fs';
-import path from 'node:path';
-import { databaseService } from '../services/DatabaseService';
-import type { Conversation, Message, Project, Task } from '../services/DatabaseService';
-import { createRPCController } from '../../shared/ipc/rpc';
-import { log } from '../lib/logger';
-
-export const databaseController = createRPCController({
-  getProjects: (): Promise<Project[]> => databaseService.getProjects(),
-
-  saveProject: (project: Omit<Project, 'createdAt' | 'updatedAt'>): Promise<void> =>
-    databaseService.saveProject(project),
-
-  getTasks: (projectId?: string): Promise<Task[]> => databaseService.getTasks(projectId),
-
-  saveTask: (task: Omit<Task, 'createdAt' | 'updatedAt'>): Promise<void> =>
-    databaseService.saveTask(task),
-
-  deleteProject: (projectId: string): Promise<void> => databaseService.deleteProject(projectId),
-
-  deleteTask: (taskId: string): Promise<void> => databaseService.deleteTask(taskId),
-
-  archiveTask: (taskId: string): Promise<void> => databaseService.archiveTask(taskId),
-
-  restoreTask: (taskId: string): Promise<void> => databaseService.restoreTask(taskId),
-
-  getArchivedTasks: (projectId?: string): Promise<Task[]> =>
-    databaseService.getArchivedTasks(projectId),
-
-  saveConversation: (conversation: Omit<Conversation, 'createdAt' | 'updatedAt'>): Promise<void> =>
-    databaseService.saveConversation(conversation),
-
-  getConversations: (taskId: string): Promise<Conversation[]> =>
-    databaseService.getConversations(taskId),
-
-  getOrCreateDefaultConversation: (taskId: string): Promise<Conversation> =>
-    databaseService.getOrCreateDefaultConversation(taskId),
-
-  createConversation: (args: {
-    taskId: string;
-    title: string;
-    provider?: string;
-    isMain?: boolean;
-  }): Promise<Conversation> =>
-    databaseService.createConversation(args.taskId, args.title, args.provider, args.isMain),
-
-  deleteConversation: (conversationId: string): Promise<void> =>
-    databaseService.deleteConversation(conversationId),
-
-  setActiveConversation: (args: { taskId: string; conversationId: string }): Promise<void> =>
-    databaseService.setActiveConversation(args.taskId, args.conversationId),
-
-  getActiveConversation: (taskId: string): Promise<Conversation | null> =>
-    databaseService.getActiveConversation(taskId),
-
-  reorderConversations: (args: { taskId: string; conversationIds: string[] }): Promise<void> =>
-    databaseService.reorderConversations(args.taskId, args.conversationIds),
-
-  updateConversationTitle: (args: { conversationId: string; title: string }): Promise<void> =>
-    databaseService.updateConversationTitle(args.conversationId, args.title),
-
-  saveMessage: (message: Omit<Message, 'timestamp'>): Promise<void> =>
-    databaseService.saveMessage(message),
-
-  getMessages: (conversationId: string): Promise<Message[]> =>
-    databaseService.getMessages(conversationId),
-
-  cleanupSessionDirectory: async (args: {
-    taskPath: string;
-    conversationId: string;
-  }): Promise<void> => {
-    const sessionDir = path.join(args.taskPath, '.emdash-sessions', args.conversationId);
-    if (!fs.existsSync(sessionDir)) return;
-
-    fs.rmSync(sessionDir, { recursive: true, force: true });
-    log.info('Cleaned up session directory:', sessionDir);
-
-    const parentDir = path.join(args.taskPath, '.emdash-sessions');
-    try {
-      if (fs.readdirSync(parentDir).length === 0) {
-        fs.rmdirSync(parentDir);
-        log.info('Removed empty .emdash-sessions directory');
-      }
-    } catch {
-      // Parent directory removal is best-effort
-    }
-  },
-});
diff --git a/src/main/ipc/debugIpc.ts b/src/main/ipc/debugIpc.ts
deleted file mode 100644
index e8e32c154b..0000000000
--- a/src/main/ipc/debugIpc.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { ipcMain } from 'electron';
-import { dirname } from 'path';
-import * as fs from 'fs';
-
-export function registerDebugIpc() {
-  ipcMain.handle(
-    'debug:append-log',
-    async (_, filePath: string, content: string, options: { reset?: boolean } = {}) => {
-      try {
-        if (!filePath) throw new Error('filePath is required');
-
-        const dir = dirname(filePath);
-        await fs.promises.mkdir(dir, { recursive: true });
-
-        const flag = options.reset ? 'w' : 'a';
-        await fs.promises.writeFile(filePath, content, { flag, encoding: 'utf8' });
-        return { success: true };
-      } catch (error) {
-        console.error('Failed to append debug log:', error);
-        return { success: false, error: error instanceof Error ? error.message : 'Unknown error' };
-      }
-    }
-  );
-}
diff --git a/src/main/ipc/gitIpc.ts b/src/main/ipc/gitIpc.ts
deleted file mode 100644
index e588a51eac..0000000000
--- a/src/main/ipc/gitIpc.ts
+++ /dev/null
@@ -1,2317 +0,0 @@
-import { BrowserWindow, ipcMain } from 'electron';
-import { log } from '../lib/logger';
-import { exec, execFile } from 'child_process';
-import { randomUUID } from 'node:crypto';
-import fs from 'node:fs';
-import path from 'node:path';
-import os from 'node:os';
-import { promisify } from 'util';
-import {
-  getStatus as gitGetStatus,
-  getFileDiff as gitGetFileDiff,
-  stageFile as gitStageFile,
-  stageAllFiles as gitStageAllFiles,
-  unstageFile as gitUnstageFile,
-  revertFile as gitRevertFile,
-  commit as gitCommit,
-  push as gitPush,
-  pull as gitPull,
-  getLog as gitGetLog,
-  getLatestCommit as gitGetLatestCommit,
-  getCommitFiles as gitGetCommitFiles,
-  getCommitFileDiff as gitGetCommitFileDiff,
-  softResetLastCommit as gitSoftResetLastCommit,
-} from '../services/GitService';
-import { prGenerationService } from '../services/PrGenerationService';
-import { databaseService } from '../services/DatabaseService';
-import { injectIssueFooter } from '../lib/prIssueFooter';
-import { getCreatePrBodyPlan } from '../lib/prCreateBodyPlan';
-import { patchCurrentPrBodyWithIssueFooter } from '../lib/prIssueFooterPatch';
-import { resolveRemoteProjectForWorktreePath } from '../utils/remoteProjectResolver';
-import { RemoteGitService } from '../services/RemoteGitService';
-import { sshService } from '../services/ssh/SshService';
-
-const remoteGitService = new RemoteGitService(sshService);
-
-const execAsync = promisify(exec);
-const execFileAsync = promisify(execFile);
-
-const GIT_STATUS_DEBOUNCE_MS = 500;
-const supportsRecursiveWatch = process.platform === 'darwin' || process.platform === 'win32';
-
-type GitStatusWatchEntry = {
-  watcher: fs.FSWatcher;
-  watchIds: Set<string>;
-  debounceTimer?: NodeJS.Timeout;
-};
-
-const gitStatusWatchers = new Map<string, GitStatusWatchEntry>();
-
-// Remote polling for SSH projects (replaces fs.watch)
-const REMOTE_POLL_INTERVAL_MS = 5000;
-type RemoteStatusPollEntry = {
-  intervalId: NodeJS.Timeout;
-  watchIds: Set<string>;
-  lastStatusHash: string;
-  connectionId: string;
-};
-const remoteStatusPollers = new Map<string, RemoteStatusPollEntry>();
-
-const ensureRemoteStatusPoller = (
-  taskPath: string,
-  connectionId: string
-): { success: true; watchId: string } => {
-  const watchId = randomUUID();
-  const existing = remoteStatusPollers.get(taskPath);
-  if (existing) {
-    existing.watchIds.add(watchId);
-    return { success: true, watchId };
-  }
-
-  const entry: RemoteStatusPollEntry = {
-    intervalId: setInterval(async () => {
-      try {
-        const changes = await remoteGitService.getStatusDetailed(connectionId, taskPath);
-        // Simple hash: join paths + statuses to detect changes
-        const hash = changes.map((c) => `${c.path}:${c.status}:${c.isStaged}`).join('|');
-        const poller = remoteStatusPollers.get(taskPath);
-        if (!poller) return;
-        if (hash !== poller.lastStatusHash) {
-          poller.lastStatusHash = hash;
-          broadcastGitStatusChange(taskPath);
-        }
-      } catch {
-        // Connection may have dropped — don't crash, just skip this poll
-      }
-    }, REMOTE_POLL_INTERVAL_MS),
-    watchIds: new Set([watchId]),
-    lastStatusHash: '',
-    connectionId,
-  };
-  remoteStatusPollers.set(taskPath, entry);
-  return { success: true, watchId };
-};
-
-const releaseRemoteStatusPoller = (taskPath: string, watchId?: string) => {
-  const entry = remoteStatusPollers.get(taskPath);
-  if (!entry) return { success: true as const };
-  if (watchId) {
-    entry.watchIds.delete(watchId);
-  }
-  if (entry.watchIds.size <= 0) {
-    clearInterval(entry.intervalId);
-    remoteStatusPollers.delete(taskPath);
-  }
-  return { success: true as const };
-};
-
-/**
- * Validate that a taskPath is an absolute path pointing to a real directory
- * that is a git repository. Returns an error string if invalid, or null if OK.
- */
-function validateTaskPath(taskPath: string | undefined): string | null {
-  if (!taskPath) return 'Missing taskPath';
-  if (!path.isAbsolute(taskPath)) return 'taskPath must be absolute';
-  try {
-    const stat = fs.statSync(taskPath);
-    if (!stat.isDirectory()) return 'taskPath is not a directory';
-  } catch {
-    return 'taskPath does not exist';
-  }
-  return null;
-}
-
-const broadcastGitStatusChange = (taskPath: string, error?: string) => {
-  const windows = BrowserWindow.getAllWindows();
-  windows.forEach((window) => {
-    try {
-      window.webContents.send('git:status-changed', { taskPath, error });
-    } catch (err) {
-      log.debug('[git:watch-status] failed to send status change', err);
-    }
-  });
-};
-
-const ensureGitStatusWatcher = (taskPath: string) => {
-  if (!supportsRecursiveWatch) {
-    return { success: false as const, error: 'recursive-watch-unsupported' };
-  }
-  if (!taskPath || !fs.existsSync(taskPath)) {
-    return { success: false as const, error: 'workspace-unavailable' };
-  }
-  const existing = gitStatusWatchers.get(taskPath);
-  const watchId = randomUUID();
-  if (existing) {
-    existing.watchIds.add(watchId);
-    return { success: true as const, watchId };
-  }
-  try {
-    const watcher = fs.watch(taskPath, { recursive: true }, () => {
-      const entry = gitStatusWatchers.get(taskPath);
-      if (!entry) return;
-      if (entry.debounceTimer) clearTimeout(entry.debounceTimer);
-      entry.debounceTimer = setTimeout(() => {
-        broadcastGitStatusChange(taskPath);
-      }, GIT_STATUS_DEBOUNCE_MS);
-    });
-    watcher.on('error', (error) => {
-      log.warn('[git:watch-status] watcher error', error);
-      const entry = gitStatusWatchers.get(taskPath);
-      if (entry?.debounceTimer) clearTimeout(entry.debounceTimer);
-      try {
-        entry?.watcher.close();
-      } catch {}
-      gitStatusWatchers.delete(taskPath);
-      broadcastGitStatusChange(taskPath, 'watcher-error');
-    });
-    gitStatusWatchers.set(taskPath, { watcher, watchIds: new Set([watchId]) });
-    return { success: true as const, watchId };
-  } catch (error) {
-    return {
-      success: false as const,
-      error: error instanceof Error ? error.message : 'Failed to watch workspace',
-    };
-  }
-};
-
-const releaseGitStatusWatcher = (taskPath: string, watchId?: string) => {
-  const entry = gitStatusWatchers.get(taskPath);
-  if (!entry) return { success: true as const };
-  if (watchId) {
-    entry.watchIds.delete(watchId);
-  }
-  if (entry.watchIds.size <= 0) {
-    if (entry.debounceTimer) clearTimeout(entry.debounceTimer);
-    entry.watcher.close();
-    gitStatusWatchers.delete(taskPath);
-  }
-  return { success: true as const };
-};
-
-export function registerGitIpc() {
-  function resolveGitBin(): string {
-    // Allow override via env
-    const fromEnv = (process.env.GIT_PATH || '').trim();
-    const candidates = [
-      fromEnv,
-      '/opt/homebrew/bin/git',
-      '/usr/local/bin/git',
-      '/usr/bin/git',
-    ].filter(Boolean) as string[];
-    for (const p of candidates) {
-      try {
-        if (p && fs.existsSync(p)) return p;
-      } catch {}
-    }
-    // Last resort: try /usr/bin/env git
-    return 'git';
-  }
-  const GIT = resolveGitBin();
-
-  // Helper: commit-and-push for remote SSH projects
-  async function commitAndPushRemote(
-    connectionId: string,
-    taskPath: string,
-    opts: { commitMessage: string; createBranchIfOnDefault: boolean; branchPrefix: string }
-  ): Promise<{ success: boolean; branch?: string; output?: string; error?: string }> {
-    const { commitMessage, createBranchIfOnDefault, branchPrefix } = opts;
-
-    // Verify git repo
-    const verifyResult = await remoteGitService.execGit(
-      connectionId,
-      taskPath,
-      'rev-parse --is-inside-work-tree'
-    );
-    if (verifyResult.exitCode !== 0) {
-      return { success: false, error: 'Not a git repository' };
-    }
-
-    let activeBranch = await remoteGitService.getCurrentBranch(connectionId, taskPath);
-    const defaultBranch = await remoteGitService.getDefaultBranchName(connectionId, taskPath);
-
-    // Create feature branch if on default
-    if (createBranchIfOnDefault && (!activeBranch || activeBranch === defaultBranch)) {
-      const short = Date.now().toString(36);
-      const name = `${branchPrefix}/${short}`;
-      await remoteGitService.createBranch(connectionId, taskPath, name);
-      activeBranch = name;
-    }
-
-    // Check for changes
-    const statusResult = await remoteGitService.execGit(
-      connectionId,
-      taskPath,
-      'status --porcelain --untracked-files=all'
-    );
-    const hasWorkingChanges = Boolean(statusResult.stdout?.trim());
-
-    // Read staged files
-    const readRemoteStagedFiles = async (): Promise<string[]> => {
-      const r = await remoteGitService.execGit(connectionId, taskPath, 'diff --cached --name-only');
-      return (r.stdout || '')
-        .split('\n')
-        .map((f) => f.trim())
-        .filter(Boolean);
-    };
-
-    let stagedFiles = await readRemoteStagedFiles();
-
-    // Auto-stage if nothing staged yet
-    if (hasWorkingChanges && stagedFiles.length === 0) {
-      await remoteGitService.stageAllFiles(connectionId, taskPath);
-    }
-
-    // Unstage plan mode artifacts
-    await remoteGitService.execGit(connectionId, taskPath, 'reset -q .emdash 2>/dev/null || true');
-    await remoteGitService.execGit(
-      connectionId,
-      taskPath,
-      'reset -q PLANNING.md 2>/dev/null || true'
-    );
-    await remoteGitService.execGit(
-      connectionId,
-      taskPath,
-      'reset -q planning.md 2>/dev/null || true'
-    );
-
-    stagedFiles = await readRemoteStagedFiles();
-
-    // Commit
-    if (stagedFiles.length > 0) {
-      const commitResult = await remoteGitService.commit(connectionId, taskPath, commitMessage);
-      if (commitResult.exitCode !== 0 && !/nothing to commit/i.test(commitResult.stderr || '')) {
-        return { success: false, error: commitResult.stderr || 'Commit failed' };
-      }
-    }
-
-    // Push
-    const pushResult = await remoteGitService.push(connectionId, taskPath);
-    if (pushResult.exitCode !== 0) {
-      const retryResult = await remoteGitService.push(connectionId, taskPath, activeBranch, true);
-      if (retryResult.exitCode !== 0) {
-        return { success: false, error: retryResult.stderr || 'Push failed' };
-      }
-    }
-
-    const finalStatus = await remoteGitService.execGit(connectionId, taskPath, 'status -sb');
-    return { success: true, branch: activeBranch, output: (finalStatus.stdout || '').trim() };
-  }
-
-  // Helper: get PR status for remote SSH projects
-  async function getPrStatusRemote(
-    connectionId: string,
-    taskPath: string
-  ): Promise<{ success: boolean; pr?: any; error?: string }> {
-    const queryFields = [
-      'number',
-      'url',
-      'state',
-      'isDraft',
-      'mergeStateStatus',
-      'headRefName',
-      'baseRefName',
-      'title',
-      'author',
-      'additions',
-      'deletions',
-      'changedFiles',
-    ];
-    const fieldsStr = queryFields.join(',');
-
-    const viewResult = await remoteGitService.execGh(
-      connectionId,
-      taskPath,
-      `pr view --json ${fieldsStr} -q .`
-    );
-    let data =
-      viewResult.exitCode === 0 && viewResult.stdout.trim()
-        ? JSON.parse(viewResult.stdout.trim())
-        : null;
-
-    // Fallback: find by branch name
-    if (!data) {
-      const branch = await remoteGitService.getCurrentBranch(connectionId, taskPath);
-      if (branch) {
-        const listResult = await remoteGitService.execGh(
-          connectionId,
-          taskPath,
-          `pr list --head ${quoteGhArg(branch)} --json ${fieldsStr} --limit 1`
-        );
-        if (listResult.exitCode === 0 && listResult.stdout.trim()) {
-          const listData = JSON.parse(listResult.stdout.trim());
-          if (Array.isArray(listData) && listData.length > 0) data = listData[0];
-        }
-      }
-    }
-
-    if (!data) return { success: true, pr: null };
-
-    // Compute diff stats if missing
-    const asNumber = (v: any): number | null =>
-      typeof v === 'number' && Number.isFinite(v) ? v : null;
-    if (
-      asNumber(data.additions) === null ||
-      asNumber(data.deletions) === null ||
-      asNumber(data.changedFiles) === null
-    ) {
-      const baseRef = typeof data.baseRefName === 'string' ? data.baseRefName.trim() : '';
-      const targetRef = baseRef ? `origin/${baseRef}` : '';
-      const cmd = targetRef
-        ? `diff --shortstat ${quoteGhArg(targetRef)}...HEAD`
-        : 'diff --shortstat HEAD~1..HEAD';
-      const diffResult = await remoteGitService.execGit(connectionId, taskPath, cmd);
-      if (diffResult.exitCode === 0) {
-        const m = (diffResult.stdout || '').match(
-          /(\d+)\s+files? changed(?:,\s+(\d+)\s+insertions?\(\+\))?(?:,\s+(\d+)\s+deletions?\(-\))?/
-        );
-        if (m) {
-          if (asNumber(data.changedFiles) === null && m[1]) data.changedFiles = parseInt(m[1], 10);
-          if (asNumber(data.additions) === null && m[2]) data.additions = parseInt(m[2], 10);
-          if (asNumber(data.deletions) === null && m[3]) data.deletions = parseInt(m[3], 10);
-        }
-      }
-    }
-
-    return { success: true, pr: data };
-  }
-
-  // Helper: create PR for remote SSH projects
-  async function createPrRemote(
-    connectionId: string,
-    taskPath: string,
-    opts: {
-      title?: string;
-      body?: string;
-      base?: string;
-      head?: string;
-      draft?: boolean;
-      web?: boolean;
-      fill?: boolean;
-    }
-  ): Promise<{ success: boolean; url?: string; output?: string; error?: string; code?: string }> {
-    const { title, body, base, head, draft, web, fill } = opts;
-    const outputs: string[] = [];
-
-    // Enrich body with issue footer
-    let prBody = body;
-    try {
-      const task = await databaseService.getTaskByPath(taskPath);
-      prBody = injectIssueFooter(body, task?.metadata);
-    } catch {
-      // Non-fatal
-    }
-
-    const {
-      shouldPatchFilledBody,
-      shouldUseBodyFile: _unused,
-      shouldUseFill,
-    } = getCreatePrBodyPlan({
-      fill,
-      title,
-      rawBody: body,
-      enrichedBody: prBody,
-    });
-
-    // Stage and commit pending changes
-    const statusResult = await remoteGitService.execGit(
-      connectionId,
-      taskPath,
-      'status --porcelain --untracked-files=all'
-    );
-    if (statusResult.stdout?.trim()) {
-      await remoteGitService.stageAllFiles(connectionId, taskPath);
-      const commitResult = await remoteGitService.commit(
-        connectionId,
-        taskPath,
-        'stagehand: prepare pull request'
-      );
-      if (commitResult.exitCode !== 0 && !/nothing to commit/i.test(commitResult.stderr || '')) {
-        outputs.push(commitResult.stderr || '');
-      }
-    }
-
-    // Push branch
-    const pushResult = await remoteGitService.push(connectionId, taskPath);
-    if (pushResult.exitCode !== 0) {
-      const branch = await remoteGitService.getCurrentBranch(connectionId, taskPath);
-      const retryResult = await remoteGitService.push(connectionId, taskPath, branch, true);
-      if (retryResult.exitCode !== 0) {
-        return {
-          success: false,
-          error:
-            'Failed to push branch to origin. Please check your Git remotes and authentication.',
-        };
-      }
-    }
-    outputs.push('git push: success');
-
-    // Resolve branches
-    const currentBranch = await remoteGitService.getCurrentBranch(connectionId, taskPath);
-    const defaultBranch = await remoteGitService.getDefaultBranchName(connectionId, taskPath);
-
-    // Validate commits ahead
-    const baseRef = base || defaultBranch;
-    const aheadResult = await remoteGitService.execGit(
-      connectionId,
-      taskPath,
-      `rev-list --count origin/${quoteGhArg(baseRef)}..HEAD`
-    );
-    const aheadCount = parseInt((aheadResult.stdout || '0').trim(), 10) || 0;
-    if (aheadCount <= 0) {
-      return {
-        success: false,
-        error: `No commits to create a PR. Make a commit on current branch '${currentBranch}' ahead of base '${baseRef}'.`,
-      };
-    }
-
-    // Build gh pr create command
-    const flags: string[] = [];
-    if (title) flags.push(`--title ${quoteGhArg(title)}`);
-    // Can't use --body-file on remote, use --body instead
-    if (prBody && !shouldUseFill) flags.push(`--body ${quoteGhArg(prBody)}`);
-    flags.push(`--base ${quoteGhArg(baseRef)}`);
-    if (head) {
-      flags.push(`--head ${quoteGhArg(head)}`);
-    } else if (currentBranch) {
-      flags.push(`--head ${quoteGhArg(currentBranch)}`);
-    }
-    if (draft) flags.push('--draft');
-    if (web) flags.push('--web');
-    if (shouldUseFill) flags.push('--fill');
-
-    const createResult = await remoteGitService.execGh(
-      connectionId,
-      taskPath,
-      `pr create ${flags.join(' ')}`
-    );
-
-    const combined = [createResult.stdout, createResult.stderr].filter(Boolean).join('\n').trim();
-    const urlMatch = combined.match(/https?:\/\/\S+/);
-    const url = urlMatch ? urlMatch[0] : null;
-
-    if (createResult.exitCode !== 0) {
-      const restrictionRe =
-        /Auth App access restrictions|authorized OAuth apps|third-parties is limited/i;
-      const prExistsRe = /already exists|already has.*pull request|pull request for branch/i;
-      let code: string | undefined;
-      if (restrictionRe.test(combined)) code = 'ORG_AUTH_APP_RESTRICTED';
-      else if (prExistsRe.test(combined)) code = 'PR_ALREADY_EXISTS';
-      return { success: false, error: combined, output: combined, code };
-    }
-
-    // Patch body if needed
-    if (shouldPatchFilledBody && url) {
-      try {
-        const task = await databaseService.getTaskByPath(taskPath);
-        if (task?.metadata) {
-          const editBody = injectIssueFooter(undefined, task.metadata);
-          if (editBody) {
-            await remoteGitService.execGh(
-              connectionId,
-              taskPath,
-              `pr edit --body ${quoteGhArg(editBody)}`
-            );
-          }
-        }
-      } catch {
-        // Non-fatal
-      }
-    }
-
-    const out = [...outputs, combined].filter(Boolean).join('\n');
-    return { success: true, url: url || undefined, output: out };
-  }
-
-  // Helper: merge-to-main for remote SSH projects
-  async function mergeToMainRemote(
-    connectionId: string,
-    taskPath: string
-  ): Promise<{ success: boolean; prUrl?: string; error?: string }> {
-    const currentBranch = await remoteGitService.getCurrentBranch(connectionId, taskPath);
-    const defaultBranch = await remoteGitService.getDefaultBranchName(connectionId, taskPath);
-
-    if (!currentBranch) {
-      return { success: false, error: 'Not on a branch (detached HEAD state).' };
-    }
-    if (currentBranch === defaultBranch) {
-      return {
-        success: false,
-        error: `Already on ${defaultBranch}. Create a feature branch first.`,
-      };
-    }
-
-    // Stage and commit pending changes
-    const statusResult = await remoteGitService.execGit(
-      connectionId,
-      taskPath,
-      'status --porcelain --untracked-files=all'
-    );
-    if (statusResult.stdout?.trim()) {
-      await remoteGitService.stageAllFiles(connectionId, taskPath);
-      const commitResult = await remoteGitService.commit(
-        connectionId,
-        taskPath,
-        'chore: prepare for merge to main'
-      );
-      if (commitResult.exitCode !== 0 && !/nothing to commit/i.test(commitResult.stderr || '')) {
-        throw new Error(commitResult.stderr || 'Commit failed');
-      }
-    }
-
-    // Push
-    const pushResult = await remoteGitService.push(connectionId, taskPath);
-    if (pushResult.exitCode !== 0) {
-      const retryResult = await remoteGitService.push(connectionId, taskPath, currentBranch, true);
-      if (retryResult.exitCode !== 0) {
-        throw new Error(retryResult.stderr || 'Push failed');
-      }
-    }
-
-    // Create PR
-    let prUrl = '';
-    const createResult = await remoteGitService.execGh(
-      connectionId,
-      taskPath,
-      `pr create --fill --base ${quoteGhArg(defaultBranch)}`
-    );
-    const urlMatch = (createResult.stdout || '').match(/https?:\/\/\S+/);
-    prUrl = urlMatch ? urlMatch[0] : '';
-
-    if (createResult.exitCode !== 0) {
-      if (!/already exists|already has.*pull request/i.test(createResult.stderr || '')) {
-        return { success: false, error: `Failed to create PR: ${createResult.stderr}` };
-      }
-    }
-
-    // Patch PR body with issue footer
-    try {
-      const task = await databaseService.getTaskByPath(taskPath);
-      if (task?.metadata) {
-        const footer = injectIssueFooter(undefined, task.metadata);
-        if (footer) {
-          await remoteGitService.execGh(
-            connectionId,
-            taskPath,
-            `pr edit --body ${quoteGhArg(footer)}`
-          );
-        }
-      }
-    } catch {
-      // Non-fatal
-    }
-
-    // Merge
-    const mergeResult = await remoteGitService.execGh(connectionId, taskPath, 'pr merge --merge');
-    if (mergeResult.exitCode !== 0) {
-      return {
-        success: false,
-        error: `PR created but merge failed: ${mergeResult.stderr}`,
-        prUrl,
-      };
-    }
-    return { success: true, prUrl };
-  }
-
-  // Helper: escape arguments for gh CLI commands run over SSH
-  function quoteGhArg(arg: string): string {
-    // Use the same POSIX single-quote wrapping as quoteShellArg for consistency
-    return `'${arg.replace(/'/g, "'\\''")}'`;
-  }
-
-  ipcMain.handle('git:watch-status', async (_, taskPath: string) => {
-    const remoteProject = await resolveRemoteProjectForWorktreePath(taskPath);
-    if (remoteProject) {
-      return ensureRemoteStatusPoller(taskPath, remoteProject.sshConnectionId);
-    }
-    return ensureGitStatusWatcher(taskPath);
-  });
-
-  ipcMain.handle('git:unwatch-status', async (_, taskPath: string, watchId?: string) => {
-    const remoteProject = await resolveRemoteProjectForWorktreePath(taskPath);
-    if (remoteProject) {
-      return releaseRemoteStatusPoller(taskPath, watchId);
-    }
-    return releaseGitStatusWatcher(taskPath, watchId);
-  });
-
-  // Git: Status (moved from Codex IPC)
-  ipcMain.handle('git:get-status', async (_, taskPath: string) => {
-    try {
-      const remoteProject = await resolveRemoteProjectForWorktreePath(taskPath);
-      if (remoteProject) {
-        const changes = await remoteGitService.getStatusDetailed(
-          remoteProject.sshConnectionId,
-          taskPath
-        );
-        return { success: true, changes };
-      }
-      const changes = await gitGetStatus(taskPath);
-      return { success: true, changes };
-    } catch (error) {
-      return { success: false, error: error instanceof Error ? error.message : String(error) };
-    }
-  });
-
-  // Git: Per-file diff (moved from Codex IPC)
-  ipcMain.handle('git:get-file-diff', async (_, args: { taskPath: string; filePath: string }) => {
-    try {
-      const remoteProject = await resolveRemoteProjectForWorktreePath(args.taskPath);
-      if (remoteProject) {
-        const diff = await remoteGitService.getFileDiff(
-          remoteProject.sshConnectionId,
-          args.taskPath,
-          args.filePath
-        );
-        return { success: true, diff };
-      }
-      const diff = await gitGetFileDiff(args.taskPath, args.filePath);
-      return { success: true, diff };
-    } catch (error) {
-      return { success: false, error: error instanceof Error ? error.message : String(error) };
-    }
-  });
-
-  // Git: Stage file
-  ipcMain.handle('git:stage-file', async (_, args: { taskPath: string; filePath: string }) => {
-    try {
-      log.info('Staging file:', { taskPath: args.taskPath, filePath: args.filePath });
-      const remoteProject = await resolveRemoteProjectForWorktreePath(args.taskPath);
-      if (remoteProject) {
-        await remoteGitService.stageFile(
-          remoteProject.sshConnectionId,
-          args.taskPath,
-          args.filePath
-        );
-      } else {
-        await gitStageFile(args.taskPath, args.filePath);
-      }
-      log.info('File staged successfully:', args.filePath);
-      return { success: true };
-    } catch (error) {
-      log.error('Failed to stage file:', { filePath: args.filePath, error });
-      return { success: false, error: error instanceof Error ? error.message : String(error) };
-    }
-  });
-
-  // Git: Stage all files
-  ipcMain.handle('git:stage-all-files', async (_, args: { taskPath: string }) => {
-    try {
-      log.info('Staging all files:', { taskPath: args.taskPath });
-      const remoteProject = await resolveRemoteProjectForWorktreePath(args.taskPath);
-      if (remoteProject) {
-        await remoteGitService.stageAllFiles(remoteProject.sshConnectionId, args.taskPath);
-      } else {
-        await gitStageAllFiles(args.taskPath);
-      }
-      log.info('All files staged successfully');
-      return { success: true };
-    } catch (error) {
-      log.error('Failed to stage all files:', { taskPath: args.taskPath, error });
-      return { success: false, error: error instanceof Error ? error.message : String(error) };
-    }
-  });
-
-  // Git: Unstage file
-  ipcMain.handle('git:unstage-file', async (_, args: { taskPath: string; filePath: string }) => {
-    try {
-      log.info('Unstaging file:', { taskPath: args.taskPath, filePath: args.filePath });
-      const remoteProject = await resolveRemoteProjectForWorktreePath(args.taskPath);
-      if (remoteProject) {
-        await remoteGitService.unstageFile(
-          remoteProject.sshConnectionId,
-          args.taskPath,
-          args.filePath
-        );
-      } else {
-        await gitUnstageFile(args.taskPath, args.filePath);
-      }
-      log.info('File unstaged successfully:', args.filePath);
-      return { success: true };
-    } catch (error) {
-      log.error('Failed to unstage file:', { filePath: args.filePath, error });
-      return { success: false, error: error instanceof Error ? error.message : String(error) };
-    }
-  });
-
-  // Git: Revert file
-  ipcMain.handle('git:revert-file', async (_, args: { taskPath: string; filePath: string }) => {
-    try {
-      log.info('Reverting file:', { taskPath: args.taskPath, filePath: args.filePath });
-      const remoteProject = await resolveRemoteProjectForWorktreePath(args.taskPath);
-      let result: { action: string };
-      if (remoteProject) {
-        result = await remoteGitService.revertFile(
-          remoteProject.sshConnectionId,
-          args.taskPath,
-          args.filePath
-        );
-      } else {
-        result = await gitRevertFile(args.taskPath, args.filePath);
-      }
-      log.info('File operation completed:', { filePath: args.filePath, action: result.action });
-      return { success: true, action: result.action };
-    } catch (error) {
-      log.error('Failed to revert file:', { filePath: args.filePath, error });
-      return { success: false, error: error instanceof Error ? error.message : String(error) };
-    }
-  });
-  // Git: Generate PR title and description
-  ipcMain.handle(
-    'git:generate-pr-content',
-    async (
-      _,
-      args: {
-        taskPath: string;
-        base?: string;
-      }
-    ) => {
-      const { taskPath, base = 'main' } = args || ({} as { taskPath: string; base?: string });
-      try {
-        // For remote projects, PR content generation still runs locally — it just needs
-        // the diff text. The prGenerationService can get diff data via the now-remote-aware
-        // git:get-status and git:get-file-diff handlers, or we pass the taskPath which the
-        // service uses with local git commands. For remote, we get the diff over SSH and
-        // pass it to the generation service.
-        const remoteProject = await resolveRemoteProjectForWorktreePath(taskPath);
-        if (remoteProject) {
-          const connId = remoteProject.sshConnectionId;
-          // Get diff text over SSH
-          const diffResult = await remoteGitService.execGit(
-            connId,
-            taskPath,
-            `diff --stat origin/${quoteGhArg(base)}...HEAD`
-          );
-          const logResult = await remoteGitService.execGit(
-            connId,
-            taskPath,
-            `log --oneline origin/${quoteGhArg(base)}..HEAD`
-          );
-          const diffText = (diffResult.stdout || '').trim();
-          const logText = (logResult.stdout || '').trim();
-          // Use simple title/description generation from diff summary
-          const lines = logText.split('\n').filter((l) => l.trim());
-          const generatedTitle = lines.length === 1 ? lines[0].replace(/^[a-f0-9]+ /, '') : '';
-          return {
-            success: true,
-            title: generatedTitle,
-            description: diffText ? `## Changes\n\n\`\`\`\n${diffText}\n\`\`\`` : '',
-          };
-        }
-
-        // Try to get the task to find which provider was used
-        let providerId: string | null = null;
-        try {
-          const task = await databaseService.getTaskByPath(taskPath);
-          if (task?.agentId) {
-            providerId = task.agentId;
-            log.debug('Found task provider for PR generation', { taskPath, providerId });
-          }
-        } catch (error) {
-          log.debug('Could not lookup task provider', { error });
-          // Non-fatal - continue without provider
-        }
-
-        const result = await prGenerationService.generatePrContent(taskPath, base, providerId);
-        return { success: true, ...result };
-      } catch (error) {
-        log.error('Failed to generate PR content:', error);
-        return {
-          success: false,
-          error: error instanceof Error ? error.message : String(error),
-        };
-      }
-    }
-  );
-
-  // Git: Create Pull Request via GitHub CLI
-  ipcMain.handle(
-    'git:create-pr',
-    async (
-      _,
-      args: {
-        taskPath: string;
-        title?: string;
-        body?: string;
-        base?: string;
-        head?: string;
-        draft?: boolean;
-        web?: boolean;
-        fill?: boolean;
-      }
-    ) => {
-      const { taskPath, title, body, base, head, draft, web, fill } =
-        args ||
-        ({} as {
-          taskPath: string;
-          title?: string;
-          body?: string;
-          base?: string;
-          head?: string;
-          draft?: boolean;
-          web?: boolean;
-          fill?: boolean;
-        });
-      try {
-        const remoteProject = await resolveRemoteProjectForWorktreePath(taskPath);
-        if (remoteProject) {
-          return await createPrRemote(remoteProject.sshConnectionId, taskPath, {
-            title,
-            body,
-            base,
-            head,
-            draft,
-            web,
-            fill,
-          });
-        }
-
-        const outputs: string[] = [];
-        let taskMetadata: unknown = undefined;
-        let prBody = body;
-        try {
-          const task = await databaseService.getTaskByPath(taskPath);
-          taskMetadata = task?.metadata;
-          prBody = injectIssueFooter(body, task?.metadata);
-        } catch (error) {
-          log.debug('Unable to enrich PR body with issue footer', { taskPath, error });
-        }
-        const { shouldPatchFilledBody, shouldUseBodyFile, shouldUseFill } = getCreatePrBodyPlan({
-          fill,
-          title,
-          rawBody: body,
-          enrichedBody: prBody,
-        });
-
-        // Stage and commit any pending changes
-        try {
-          const { stdout: statusOut } = await execAsync(
-            'git status --porcelain --untracked-files=all',
-            {
-              cwd: taskPath,
-            }
-          );
-          if (statusOut && statusOut.trim().length > 0) {
-            const { stdout: addOut, stderr: addErr } = await execAsync('git add -A', {
-              cwd: taskPath,
-            });
-            if (addOut?.trim()) outputs.push(addOut.trim());
-            if (addErr?.trim()) outputs.push(addErr.trim());
-
-            const commitMsg = 'stagehand: prepare pull request';
-            try {
-              const { stdout: commitOut, stderr: commitErr } = await execAsync(
-                `git commit -m ${JSON.stringify(commitMsg)}`,
-                { cwd: taskPath }
-              );
-              if (commitOut?.trim()) outputs.push(commitOut.trim());
-              if (commitErr?.trim()) outputs.push(commitErr.trim());
-            } catch (commitErr) {
-              const msg = commitErr instanceof Error ? commitErr.message : String(commitErr);
-              if (msg && /nothing to commit/i.test(msg)) {
-                outputs.push('git commit: nothing to commit');
-              } else {
-                throw commitErr;
-              }
-            }
-          }
-        } catch (stageErr) {
-          log.warn('Failed to stage/commit changes before PR:', stageErr as string);
-          // Continue; PR may still be created for existing commits
-        }
-
-        // Ensure branch is pushed to origin so PR includes latest commit
-        try {
-          await execAsync('git push', { cwd: taskPath });
-          outputs.push('git push: success');
-        } catch (pushErr) {
-          try {
-            const { stdout: branchOut } = await execAsync('git rev-parse --abbrev-ref HEAD', {
-              cwd: taskPath,
-            });
-            const branch = branchOut.trim();
-            await execAsync(`git push --set-upstream origin ${JSON.stringify(branch)}`, {
-              cwd: taskPath,
-            });
-            outputs.push(`git push --set-upstream origin ${branch}: success`);
-          } catch (pushErr2) {
-            log.error('Failed to push branch before PR:', pushErr2 as string);
-            return {
-              success: false,
-              error:
-                'Failed to push branch to origin. Please check your Git remotes and authentication.',
-            };
-          }
-        }
-
-        // Determine current branch and default base branch (fallback to main)
-        let currentBranch = '';
-        try {
-          const { stdout } = await execAsync('git branch --show-current', { cwd: taskPath });
-          currentBranch = (stdout || '').trim();
-        } catch {}
-        let defaultBranch = 'main';
-        try {
-          const { stdout } = await execAsync(
-            'gh repo view --json defaultBranchRef -q .defaultBranchRef.name',
-            { cwd: taskPath }
-          );
-          const db = (stdout || '').trim();
-          if (db) defaultBranch = db;
-        } catch {
-          try {
-            const { stdout } = await execAsync(
-              'git remote show origin | sed -n "/HEAD branch/s/.*: //p"',
-              { cwd: taskPath }
-            );
-            const db2 = (stdout || '').trim();
-            if (db2) defaultBranch = db2;
-          } catch {}
-        }
-
-        // Guard: ensure there is at least one commit ahead of base
-        try {
-          const baseRef = base || defaultBranch;
-          const { stdout: aheadOut } = await execAsync(
-            `git rev-list --count ${JSON.stringify(`origin/${baseRef}`)}..HEAD`,
-            { cwd: taskPath }
-          );
-          const aheadCount = parseInt((aheadOut || '0').trim(), 10) || 0;
-          if (aheadCount <= 0) {
-            return {
-              success: false,
-              error: `No commits to create a PR. Make a commit on 
-current branch '${currentBranch}' ahead of base '${baseRef}'.`,
-            };
-          }
-        } catch {
-          // Non-fatal; continue
-        }
-
-        // Build gh pr create command
-        const flags: string[] = [];
-        if (title) flags.push(`--title ${JSON.stringify(title)}`);
-
-        // Use temp file for body to properly handle newlines and multiline content
-        let bodyFile: string | null = null;
-        if (shouldUseBodyFile && prBody) {
-          try {
-            bodyFile = path.join(
-              os.tmpdir(),
-              `gh-pr-body-${Date.now()}-${Math.random().toString(36).substring(7)}.txt`
-            );
-            // Write body with actual newlines preserved
-            fs.writeFileSync(bodyFile, prBody, 'utf8');
-            flags.push(`--body-file ${JSON.stringify(bodyFile)}`);
-          } catch (writeError) {
-            log.warn('Failed to write body to temp file, falling back to --body flag', {
-              writeError,
-            });
-            // Fallback to direct --body flag if temp file creation fails
-            flags.push(`--body ${JSON.stringify(prBody)}`);
-          }
-        }
-
-        if (base || defaultBranch) flags.push(`--base ${JSON.stringify(base || defaultBranch)}`);
-        if (head) {
-          flags.push(`--head ${JSON.stringify(head)}`);
-        } else if (currentBranch) {
-          flags.push(`--head ${JSON.stringify(currentBranch)}`);
-        }
-        if (draft) flags.push('--draft');
-        if (web) flags.push('--web');
-        if (shouldUseFill) flags.push('--fill');
-
-        const cmd = `gh pr create ${flags.join(' ')}`.trim();
-
-        let stdout: string;
-        let stderr: string;
-        try {
-          const result = await execAsync(cmd, { cwd: taskPath });
-          stdout = result.stdout || '';
-          stderr = result.stderr || '';
-        } finally {
-          // Clean up temp file if it was created
-          if (bodyFile && fs.existsSync(bodyFile)) {
-            try {
-              fs.unlinkSync(bodyFile);
-            } catch (unlinkError) {
-              log.debug('Failed to delete temp body file', { bodyFile, unlinkError });
-            }
-          }
-        }
-        const out = [...outputs, (stdout || '').trim() || (stderr || '').trim()]
-          .filter(Boolean)
-          .join('\n');
-
-        // Try to extract PR URL from output
-        const urlMatch = out.match(/https?:\/\/\S+/);
-        const url = urlMatch ? urlMatch[0] : null;
-
-        if (shouldPatchFilledBody) {
-          try {
-            const didPatchBody = await patchCurrentPrBodyWithIssueFooter({
-              taskPath,
-              metadata: taskMetadata,
-              execFile: execFileAsync,
-              prUrl: url,
-            });
-            if (didPatchBody) {
-              outputs.push('gh pr edit --body-file: success');
-            }
-          } catch (editError) {
-            log.warn('Failed to patch PR body with issue footer after --fill create', {
-              taskPath,
-              editError,
-            });
-          }
-        }
-
-        return { success: true, url, output: out };
-      } catch (error: any) {
-        // Capture rich error info from gh/child_process
-        const errMsg = typeof error?.message === 'string' ? error.message : String(error);
-        const errStdout = typeof error?.stdout === 'string' ? error.stdout : '';
-        const errStderr = typeof error?.stderr === 'string' ? error.stderr : '';
-        const combined = [errMsg, errStdout, errStderr].filter(Boolean).join('\n').trim();
-
-        // Check for various error conditions
-        const restrictionRe =
-          /Auth App access restrictions|authorized OAuth apps|third-parties is limited/i;
-        const prExistsRe = /already exists|already has.*pull request|pull request for branch/i;
-
-        let code: string | undefined;
-        if (restrictionRe.test(combined)) {
-          code = 'ORG_AUTH_APP_RESTRICTED';
-          log.warn('GitHub org restrictions detected during PR creation');
-        } else if (prExistsRe.test(combined)) {
-          code = 'PR_ALREADY_EXISTS';
-          log.info('PR already exists for branch - push was successful');
-        } else {
-          log.error('Failed to create PR:', combined || error);
-        }
-
-        return {
-          success: false,
-          error: combined || errMsg || 'Failed to create PR',
-          output: combined,
-          code,
-        } as any;
-      }
-    }
-  );
-
-  // Git: Get PR status for current branch via GitHub CLI
-  ipcMain.handle('git:get-pr-status', async (_, args: { taskPath: string }) => {
-    const { taskPath } = args || ({} as { taskPath: string });
-    try {
-      const remoteProject = await resolveRemoteProjectForWorktreePath(taskPath);
-      if (remoteProject) {
-        return await getPrStatusRemote(remoteProject.sshConnectionId, taskPath);
-      }
-
-      // Ensure we're in a git repo
-      await execAsync('git rev-parse --is-inside-work-tree', { cwd: taskPath });
-
-      const queryFields = [
-        'number',
-        'url',
-        'state',
-        'isDraft',
-        'mergeStateStatus',
-        'headRefName',
-        'baseRefName',
-        'title',
-        'author',
-        'additions',
-        'deletions',
-        'changedFiles',
-      ];
-      const cmd = `gh pr view --json ${queryFields.join(',')} -q .`;
-      try {
-        const { stdout } = await execAsync(cmd, { cwd: taskPath });
-        const json = (stdout || '').trim();
-        let data = json ? JSON.parse(json) : null;
-
-        // Fallback: If gh pr view didn't find a PR (e.g. detached head, upstream not set, or fresh branch),
-        // try finding it by branch name via gh pr list.
-        if (!data) {
-          try {
-            const { stdout: branchOut } = await execAsync('git branch --show-current', {
-              cwd: taskPath,
-            });
-            const currentBranch = branchOut.trim();
-            if (currentBranch) {
-              const listCmd = `gh pr list --head ${JSON.stringify(currentBranch)} --json ${queryFields.join(',')} --limit 1`;
-              const { stdout: listOut } = await execAsync(listCmd, { cwd: taskPath });
-              const listJson = (listOut || '').trim();
-              const listData = listJson ? JSON.parse(listJson) : [];
-              if (listData.length > 0) {
-                data = listData[0];
-              }
-            }
-          } catch (fallbackErr) {
-            log.warn('Failed to fallback to gh pr list:', fallbackErr);
-            // Ignore fallback errors and return original null/error
-          }
-        }
-
-        if (!data) return { success: false, error: 'No PR data returned' };
-
-        // Fallback: if GH CLI didn't return diff stats, try to compute locally
-        const asNumber = (v: any): number | null =>
-          typeof v === 'number' && Number.isFinite(v)
-            ? v
-            : typeof v === 'string' && Number.isFinite(Number.parseInt(v, 10))
-              ? Number.parseInt(v, 10)
-              : null;
-
-        const hasAdd = asNumber(data?.additions) !== null;
-        const hasDel = asNumber(data?.deletions) !== null;
-        const hasFiles = asNumber(data?.changedFiles) !== null;
-
-        if (!hasAdd || !hasDel || !hasFiles) {
-          const baseRef = typeof data?.baseRefName === 'string' ? data.baseRefName.trim() : '';
-          const targetRef = baseRef ? `origin/${baseRef}` : '';
-          const shortstatCmd = targetRef
-            ? `git diff --shortstat ${JSON.stringify(targetRef)}...HEAD`
-            : 'git diff --shortstat HEAD~1..HEAD';
-          try {
-            const { stdout: diffOut } = await execAsync(shortstatCmd, { cwd: taskPath });
-            const statLine = (diffOut || '').trim();
-            const m =
-              statLine &&
-              statLine.match(
-                /(\d+)\s+files? changed(?:,\s+(\d+)\s+insertions?\(\+\))?(?:,\s+(\d+)\s+deletions?\(-\))?/
-              );
-            if (m) {
-              const [, filesStr, addStr, delStr] = m;
-              if (!hasFiles && filesStr) data.changedFiles = Number.parseInt(filesStr, 10);
-              if (!hasAdd && addStr) data.additions = Number.parseInt(addStr, 10);
-              if (!hasDel && delStr) data.deletions = Number.parseInt(delStr, 10);
-            }
-          } catch {
-            // best-effort only; ignore failures
-          }
-        }
-
-        return { success: true, pr: data };
-      } catch (err) {
-        const msg = String(err as string);
-        if (/no pull requests? found/i.test(msg) || /not found/i.test(msg)) {
-          return { success: true, pr: null };
-        }
-        return { success: false, error: msg || 'Failed to query PR status' };
-      }
-    } catch (error) {
-      return { success: false, error: error instanceof Error ? error.message : String(error) };
-    }
-  });
-
-  // Git: Merge PR via GitHub CLI
-  ipcMain.handle(
-    'git:merge-pr',
-    async (
-      _,
-      args: {
-        taskPath: string;
-        prNumber?: number;
-        strategy?: 'merge' | 'squash' | 'rebase';
-        admin?: boolean;
-      }
-    ) => {
-      const {
-        taskPath,
-        prNumber,
-        strategy = 'merge',
-        admin = false,
-      } = (args || {}) as {
-        taskPath: string;
-        prNumber?: number;
-        strategy?: 'merge' | 'squash' | 'rebase';
-        admin?: boolean;
-      };
-
-      try {
-        const remoteProject = await resolveRemoteProjectForWorktreePath(taskPath);
-        if (remoteProject) {
-          const strategyFlag =
-            strategy === 'squash' ? '--squash' : strategy === 'rebase' ? '--rebase' : '--merge';
-          const ghArgs = ['pr', 'merge'];
-          if (typeof prNumber === 'number' && Number.isFinite(prNumber))
-            ghArgs.push(String(prNumber));
-          ghArgs.push(strategyFlag);
-          if (admin) ghArgs.push('--admin');
-          const result = await remoteGitService.execGh(
-            remoteProject.sshConnectionId,
-            taskPath,
-            ghArgs.join(' ')
-          );
-          if (result.exitCode !== 0) {
-            const msg = (result.stderr || '') + (result.stdout || '');
-            if (/not installed|command not found/i.test(msg)) {
-              return { success: false, error: msg, code: 'GH_CLI_UNAVAILABLE' };
-            }
-            return { success: false, error: msg || 'Failed to merge PR' };
-          }
-          return {
-            success: true,
-            output: [result.stdout, result.stderr].filter(Boolean).join('\n').trim(),
-          };
-        }
-
-        await execFileAsync(GIT, ['rev-parse', '--is-inside-work-tree'], { cwd: taskPath });
-
-        const strategyFlag =
-          strategy === 'squash' ? '--squash' : strategy === 'rebase' ? '--rebase' : '--merge';
-
-        const ghArgs = ['pr', 'merge'];
-        if (typeof prNumber === 'number' && Number.isFinite(prNumber)) {
-          ghArgs.push(String(prNumber));
-        }
-        ghArgs.push(strategyFlag);
-        if (admin) ghArgs.push('--admin');
-
-        try {
-          const { stdout, stderr } = await execFileAsync('gh', ghArgs, { cwd: taskPath });
-          const output = [stdout, stderr].filter(Boolean).join('\n').trim();
-          return { success: true, output };
-        } catch (err) {
-          const msg = String(err as string);
-          if (/not installed|command not found/i.test(msg)) {
-            return { success: false, error: msg, code: 'GH_CLI_UNAVAILABLE' };
-          }
-          const stderr = (err as any)?.stderr;
-          const stdout = (err as any)?.stdout;
-          const combined = [stderr, stdout, msg].filter(Boolean).join('\n').trim();
-          return { success: false, error: combined || 'Failed to merge PR' };
-        }
-      } catch (error) {
-        return { success: false, error: error instanceof Error ? error.message : String(error) };
-      }
-    }
-  );
-
-  // Git: Get CI/CD check runs for current branch via GitHub CLI
-  ipcMain.handle('git:get-check-runs', async (_, args: { taskPath: string }) => {
-    const { taskPath } = args || ({} as { taskPath: string });
-    try {
-      const remoteProject = await resolveRemoteProjectForWorktreePath(taskPath);
-      if (remoteProject) {
-        const connId = remoteProject.sshConnectionId;
-        const fields = 'bucket,completedAt,description,event,link,name,startedAt,state,workflow';
-        const checksResult = await remoteGitService.execGh(
-          connId,
-          taskPath,
-          `pr checks --json ${fields}`
-        );
-        if (checksResult.exitCode !== 0) {
-          const msg = checksResult.stderr || '';
-          if (/no pull requests? found/i.test(msg) || /not found/i.test(msg)) {
-            return { success: true, checks: null };
-          }
-          if (/not installed|command not found/i.test(msg)) {
-            return { success: false, error: msg, code: 'GH_CLI_UNAVAILABLE' };
-          }
-          return { success: false, error: msg || 'Failed to query check runs' };
-        }
-        const checks = checksResult.stdout.trim() ? JSON.parse(checksResult.stdout.trim()) : [];
-
-        // Fetch html_url from API
-        try {
-          const shaResult = await remoteGitService.execGh(
-            connId,
-            taskPath,
-            "pr view --json headRefOid --jq '.headRefOid'"
-          );
-          const sha = shaResult.stdout.trim();
-          if (sha) {
-            const apiResult = await remoteGitService.execGh(
-              connId,
-              taskPath,
-              `api repos/{owner}/{repo}/commits/${sha}/check-runs --jq '.check_runs | map({name: .name, html_url: .html_url}) | .[]'`
-            );
-            const urlMap = new Map<string, string>();
-            for (const line of apiResult.stdout.trim().split('\n')) {
-              if (!line) continue;
-              try {
-                const entry = JSON.parse(line);
-                if (entry.name && entry.html_url) urlMap.set(entry.name, entry.html_url);
-              } catch {}
-            }
-            for (const check of checks) {
-              const htmlUrl = urlMap.get(check.name);
-              if (htmlUrl) check.link = htmlUrl;
-            }
-          }
-        } catch {
-          // Fall back to original link values
-        }
-
-        return { success: true, checks };
-      }
-
-      await execFileAsync(GIT, ['rev-parse', '--is-inside-work-tree'], { cwd: taskPath });
-
-      const fields = 'bucket,completedAt,description,event,link,name,startedAt,state,workflow';
-      try {
-        const { stdout } = await execFileAsync('gh', ['pr', 'checks', '--json', fields], {
-          cwd: taskPath,
-        });
-        const json = (stdout || '').trim();
-        const checks = json ? JSON.parse(json) : [];
-
-        // Fetch html_url from the GitHub API instead, which always points to the
-        // actual check run page on GitHub.
-        try {
-          const { stdout: shaOut } = await execFileAsync(
-            'gh',
-            ['pr', 'view', '--json', 'headRefOid', '--jq', '.headRefOid'],
-            { cwd: taskPath }
-          );
-          const sha = shaOut.trim();
-          if (sha) {
-            const { stdout: apiOut } = await execFileAsync(
-              'gh',
-              [
-                'api',
-                `repos/{owner}/{repo}/commits/${sha}/check-runs`,
-                '--jq',
-                '.check_runs | map({name: .name, html_url: .html_url}) | .[]',
-              ],
-              { cwd: taskPath }
-            );
-            const urlMap = new Map<string, string>();
-            for (const line of apiOut.trim().split('\n')) {
-              if (!line) continue;
-              try {
-                const entry = JSON.parse(line);
-                if (entry.name && entry.html_url) urlMap.set(entry.name, entry.html_url);
-              } catch {}
-            }
-            for (const check of checks) {
-              const htmlUrl = urlMap.get(check.name);
-              if (htmlUrl) check.link = htmlUrl;
-            }
-          }
-        } catch {
-          // Fall back to original link values if API call fails
-        }
-
-        return { success: true, checks };
-      } catch (err) {
-        const msg = String(err as string);
-        if (/no pull requests? found/i.test(msg) || /not found/i.test(msg)) {
-          return { success: true, checks: null };
-        }
-        if (/not installed|command not found/i.test(msg)) {
-          return { success: false, error: msg, code: 'GH_CLI_UNAVAILABLE' };
-        }
-        return { success: false, error: msg || 'Failed to query check runs' };
-      }
-    } catch (error) {
-      return { success: false, error: error instanceof Error ? error.message : String(error) };
-    }
-  });
-
-  // Git: Get PR comments and reviews via GitHub CLI
-  ipcMain.handle(
-    'git:get-pr-comments',
-    async (_, args: { taskPath: string; prNumber?: number }) => {
-      const { taskPath, prNumber } = args || ({} as { taskPath: string; prNumber?: number });
-      try {
-        const remoteProject = await resolveRemoteProjectForWorktreePath(taskPath);
-        if (remoteProject) {
-          const connId = remoteProject.sshConnectionId;
-          const ghViewArgs = prNumber
-            ? `pr view ${prNumber} --json comments,reviews,number`
-            : 'pr view --json comments,reviews,number';
-          const viewResult = await remoteGitService.execGh(connId, taskPath, ghViewArgs);
-          if (viewResult.exitCode !== 0) {
-            const msg = viewResult.stderr || '';
-            if (/no pull requests? found/i.test(msg) || /not found/i.test(msg)) {
-              return { success: true, comments: [], reviews: [] };
-            }
-            if (/not installed|command not found/i.test(msg)) {
-              return { success: false, error: msg, code: 'GH_CLI_UNAVAILABLE' };
-            }
-            return { success: false, error: msg || 'Failed to query PR comments' };
-          }
-          const data = viewResult.stdout.trim()
-            ? JSON.parse(viewResult.stdout.trim())
-            : { comments: [], reviews: [], number: 0 };
-          const comments = data.comments || [];
-          const reviews = data.reviews || [];
-
-          // Fetch avatar URLs via REST API
-          if (data.number) {
-            try {
-              const avatarMap = new Map<string, string>();
-              const setAvatar = (login: string, url: string) => {
-                avatarMap.set(login, url);
-                if (login.endsWith('[bot]')) avatarMap.set(login.replace(/\[bot]$/, ''), url);
-              };
-
-              const commentsApi = await remoteGitService.execGh(
-                connId,
-                taskPath,
-                `api repos/{owner}/{repo}/issues/${data.number}/comments --jq '.[] | {login: .user.login, avatar_url: .user.avatar_url}'`
-              );
-              for (const line of commentsApi.stdout.trim().split('\n')) {
-                if (!line) continue;
-                try {
-                  const entry = JSON.parse(line);
-                  if (entry.login && entry.avatar_url) setAvatar(entry.login, entry.avatar_url);
-                } catch {}
-              }
-
-              const reviewsApi = await remoteGitService.execGh(
-                connId,
-                taskPath,
-                `api repos/{owner}/{repo}/pulls/${data.number}/reviews --jq '.[] | {login: .user.login, avatar_url: .user.avatar_url}'`
-              );
-              for (const line of reviewsApi.stdout.trim().split('\n')) {
-                if (!line) continue;
-                try {
-                  const entry = JSON.parse(line);
-                  if (entry.login && entry.avatar_url) setAvatar(entry.login, entry.avatar_url);
-                } catch {}
-              }
-
-              for (const c of [...comments, ...reviews]) {
-                if (c.author?.login) {
-                  const avatarUrl = avatarMap.get(c.author.login);
-                  if (avatarUrl) c.author.avatarUrl = avatarUrl;
-                }
-              }
-            } catch {
-              // Fall back to no avatar URLs
-            }
-          }
-
-          return { success: true, comments, reviews };
-        }
-
-        await execFileAsync(GIT, ['rev-parse', '--is-inside-work-tree'], { cwd: taskPath });
-
-        try {
-          const ghArgs = ['pr', 'view'];
-          if (prNumber) ghArgs.push(String(prNumber));
-          ghArgs.push('--json', 'comments,reviews,number');
-
-          const { stdout } = await execFileAsync('gh', ghArgs, { cwd: taskPath });
-          const json = (stdout || '').trim();
-          const data = json ? JSON.parse(json) : { comments: [], reviews: [], number: 0 };
-
-          const comments = data.comments || [];
-          const reviews = data.reviews || [];
-
-          // gh pr view doesn't return avatarUrl for authors.
-          // Fetch from the REST API which includes avatar_url (works for GitHub Apps too).
-          if (data.number) {
-            try {
-              const avatarMap = new Map<string, string>();
-
-              const { stdout: commentsApi } = await execFileAsync(
-                'gh',
-                [
-                  'api',
-                  `repos/{owner}/{repo}/issues/${data.number}/comments`,
-                  '--jq',
-                  '.[] | {login: .user.login, avatar_url: .user.avatar_url}',
-                ],
-                { cwd: taskPath }
-              );
-              const setAvatar = (login: string, url: string) => {
-                avatarMap.set(login, url);
-                // REST API returns "app[bot]" while gh CLI returns "app" — store both
-                if (login.endsWith('[bot]')) avatarMap.set(login.replace(/\[bot]$/, ''), url);
-              };
-
-              for (const line of commentsApi.trim().split('\n')) {
-                if (!line) continue;
-                try {
-                  const entry = JSON.parse(line);
-                  if (entry.login && entry.avatar_url) setAvatar(entry.login, entry.avatar_url);
-                } catch {}
-              }
-
-              const { stdout: reviewsApi } = await execFileAsync(
-                'gh',
-                [
-                  'api',
-                  `repos/{owner}/{repo}/pulls/${data.number}/reviews`,
-                  '--jq',
-                  '.[] | {login: .user.login, avatar_url: .user.avatar_url}',
-                ],
-                { cwd: taskPath }
-              );
-              for (const line of reviewsApi.trim().split('\n')) {
-                if (!line) continue;
-                try {
-                  const entry = JSON.parse(line);
-                  if (entry.login && entry.avatar_url) setAvatar(entry.login, entry.avatar_url);
-                } catch {}
-              }
-
-              for (const c of [...comments, ...reviews]) {
-                if (c.author?.login) {
-                  const avatarUrl = avatarMap.get(c.author.login);
-                  if (avatarUrl) c.author.avatarUrl = avatarUrl;
-                }
-              }
-            } catch {
-              // Fall back to no avatar URLs — renderer will use GitHub fallback
-            }
-          }
-
-          return { success: true, comments, reviews };
-        } catch (err) {
-          const msg = String(err as string);
-          if (/no pull requests? found/i.test(msg) || /not found/i.test(msg)) {
-            return { success: true, comments: [], reviews: [] };
-          }
-          if (/not installed|command not found/i.test(msg)) {
-            return { success: false, error: msg, code: 'GH_CLI_UNAVAILABLE' };
-          }
-          return { success: false, error: msg || 'Failed to query PR comments' };
-        }
-      } catch (error) {
-        return { success: false, error: error instanceof Error ? error.message : String(error) };
-      }
-    }
-  );
-
-  // Git: Commit all changes and push current branch (create feature branch if on default)
-  ipcMain.handle(
-    'git:commit-and-push',
-    async (
-      _,
-      args: {
-        taskPath: string;
-        commitMessage?: string;
-        createBranchIfOnDefault?: boolean;
-        branchPrefix?: string;
-      }
-    ) => {
-      const {
-        taskPath,
-        commitMessage = 'chore: apply task changes',
-        createBranchIfOnDefault = true,
-        branchPrefix = 'orch',
-      } = (args ||
-        ({} as {
-          taskPath: string;
-          commitMessage?: string;
-          createBranchIfOnDefault?: boolean;
-          branchPrefix?: string;
-        })) as {
-        taskPath: string;
-        commitMessage?: string;
-        createBranchIfOnDefault?: boolean;
-        branchPrefix?: string;
-      };
-
-      try {
-        const remoteProject = await resolveRemoteProjectForWorktreePath(taskPath);
-
-        if (remoteProject) {
-          return await commitAndPushRemote(remoteProject.sshConnectionId, taskPath, {
-            commitMessage,
-            createBranchIfOnDefault,
-            branchPrefix,
-          });
-        }
-
-        // Ensure we're in a git repo
-        await execAsync('git rev-parse --is-inside-work-tree', { cwd: taskPath });
-
-        // Determine current branch
-        const { stdout: currentBranchOut } = await execAsync('git branch --show-current', {
-          cwd: taskPath,
-        });
-        const currentBranch = (currentBranchOut || '').trim();
-
-        // Determine default branch via gh, fallback to main/master
-        let defaultBranch = 'main';
-        try {
-          const { stdout } = await execAsync(
-            'gh repo view --json defaultBranchRef -q .defaultBranchRef.name',
-            { cwd: taskPath }
-          );
-          const db = (stdout || '').trim();
-          if (db) defaultBranch = db;
-        } catch {
-          try {
-            const { stdout } = await execAsync(
-              'git remote show origin | sed -n "/HEAD branch/s/.*: //p"',
-              { cwd: taskPath }
-            );
-            const db2 = (stdout || '').trim();
-            if (db2) defaultBranch = db2;
-          } catch {}
-        }
-
-        // Optionally create a new branch if on default
-        let activeBranch = currentBranch;
-        if (createBranchIfOnDefault && (!currentBranch || currentBranch === defaultBranch)) {
-          const short = Date.now().toString(36);
-          const name = `${branchPrefix}/${short}`;
-          await execAsync(`git checkout -b ${JSON.stringify(name)}`, { cwd: taskPath });
-          activeBranch = name;
-        }
-
-        // Stage (only if needed) and commit
-        try {
-          const { stdout: st } = await execAsync('git status --porcelain --untracked-files=all', {
-            cwd: taskPath,
-          });
-          const hasWorkingChanges = Boolean(st && st.trim().length > 0);
-
-          const readStagedFiles = async () => {
-            try {
-              const { stdout } = await execAsync('git diff --cached --name-only', {
-                cwd: taskPath,
-              });
-              return (stdout || '')
-                .split('\n')
-                .map((f) => f.trim())
-                .filter(Boolean);
-            } catch {
-              return [];
-            }
-          };
-
-          let stagedFiles = await readStagedFiles();
-
-          // Only auto-stage everything when nothing is staged yet (preserves manual staging choices)
-          if (hasWorkingChanges && stagedFiles.length === 0) {
-            await execAsync('git add -A', { cwd: taskPath });
-          }
-
-          // Never commit plan mode artifacts
-          try {
-            await execAsync('git reset -q .emdash || true', { cwd: taskPath });
-          } catch {}
-          try {
-            await execAsync('git reset -q PLANNING.md || true', { cwd: taskPath });
-          } catch {}
-          try {
-            await execAsync('git reset -q planning.md || true', { cwd: taskPath });
-          } catch {}
-
-          stagedFiles = await readStagedFiles();
-
-          if (stagedFiles.length > 0) {
-            try {
-              await execAsync(`git commit -m ${JSON.stringify(commitMessage)}`, {
-                cwd: taskPath,
-              });
-            } catch (commitErr) {
-              const msg = commitErr instanceof Error ? commitErr.message : String(commitErr);
-              if (!/nothing to commit/i.test(msg)) throw commitErr;
-            }
-          }
-        } catch (e) {
-          log.warn('Stage/commit step issue:', e instanceof Error ? e.message : String(e));
-          throw e;
-        }
-
-        // Push current branch (set upstream if needed)
-        try {
-          await execAsync('git push', { cwd: taskPath });
-        } catch (pushErr) {
-          await execAsync(`git push --set-upstream origin ${JSON.stringify(activeBranch)}`, {
-            cwd: taskPath,
-          });
-        }
-
-        const { stdout: out } = await execAsync('git status -sb', { cwd: taskPath });
-        return { success: true, branch: activeBranch, output: (out || '').trim() };
-      } catch (error) {
-        log.error('Failed to commit and push:', error);
-        const errObj = error as { stderr?: string; message?: string };
-        const errMsg = errObj?.stderr?.trim() || errObj?.message || String(error);
-        return { success: false, error: errMsg };
-      }
-    }
-  );
-
-  // Git: Get branch status (current branch, default branch, ahead/behind counts)
-  ipcMain.handle('git:get-branch-status', async (_, args: { taskPath: string }) => {
-    const { taskPath } = args || ({} as { taskPath: string });
-
-    if (!taskPath) {
-      return { success: false, error: 'Path does not exist' };
-    }
-
-    const remoteProject = await resolveRemoteProjectForWorktreePath(taskPath);
-    if (remoteProject) {
-      try {
-        const status = await remoteGitService.getBranchStatus(
-          remoteProject.sshConnectionId,
-          taskPath
-        );
-        return { success: true, ...status };
-      } catch (error) {
-        log.error(`getBranchStatus (remote): error for ${taskPath}:`, error);
-        return { success: false, error: error instanceof Error ? error.message : String(error) };
-      }
-    }
-
-    // Early exit for missing/invalid local path
-    if (!fs.existsSync(taskPath)) {
-      log.warn(`getBranchStatus: path does not exist: ${taskPath}`);
-      return { success: false, error: 'Path does not exist' };
-    }
-
-    // Check if it's a git repo - expected to fail often for non-git paths
-    try {
-      await execFileAsync(GIT, ['rev-parse', '--is-inside-work-tree'], { cwd: taskPath });
-    } catch {
-      log.warn(`getBranchStatus: not a git repository: ${taskPath}`);
-      return { success: false, error: 'Not a git repository' };
-    }
-
-    try {
-      // Current branch
-      const { stdout: currentBranchOut } = await execFileAsync(GIT, ['branch', '--show-current'], {
-        cwd: taskPath,
-      });
-      const branch = (currentBranchOut || '').trim();
-
-      // Determine default branch
-      let defaultBranch = 'main';
-      try {
-        const { stdout } = await execFileAsync(
-          'gh',
-          ['repo', 'view', '--json', 'defaultBranchRef', '-q', '.defaultBranchRef.name'],
-          { cwd: taskPath }
-        );
-        const db = (stdout || '').trim();
-        if (db) defaultBranch = db;
-      } catch {
-        try {
-          // Use symbolic-ref to resolve origin/HEAD then take the last path part
-          const { stdout } = await execFileAsync(
-            GIT,
-            ['symbolic-ref', '--short', 'refs/remotes/origin/HEAD'],
-            { cwd: taskPath }
-          );
-          const line = (stdout || '').trim();
-          const last = line.split('/').pop();
-          if (last) defaultBranch = last;
-        } catch {}
-      }
-
-      // Ahead/behind relative to upstream tracking branch
-      let ahead = 0;
-      let behind = 0;
-      try {
-        // Best case: compare against the upstream tracking branch (@{upstream})
-        const { stdout } = await execFileAsync(
-          GIT,
-          ['rev-list', '--left-right', '--count', '@{upstream}...HEAD'],
-          { cwd: taskPath }
-        );
-        const parts = (stdout || '').trim().split(/\s+/);
-        if (parts.length >= 2) {
-          behind = parseInt(parts[0] || '0', 10) || 0;
-          ahead = parseInt(parts[1] || '0', 10) || 0;
-        }
-      } catch {
-        try {
-          // Fallback: compare against origin/<current-branch>
-          const { stdout } = await execFileAsync(
-            GIT,
-            ['rev-list', '--left-right', '--count', `origin/${branch}...HEAD`],
-            { cwd: taskPath }
-          );
-          const parts = (stdout || '').trim().split(/\s+/);
-          if (parts.length >= 2) {
-            behind = parseInt(parts[0] || '0', 10) || 0;
-            ahead = parseInt(parts[1] || '0', 10) || 0;
-          }
-        } catch {
-          // No upstream — use git status as last resort
-          try {
-            const { stdout } = await execFileAsync(GIT, ['status', '-sb'], { cwd: taskPath });
-            const line = (stdout || '').split(/\n/)[0] || '';
-            const m = line.match(/ahead\s+(\d+)/i);
-            const n = line.match(/behind\s+(\d+)/i);
-            if (m) ahead = parseInt(m[1] || '0', 10) || 0;
-            if (n) behind = parseInt(n[1] || '0', 10) || 0;
-          } catch {}
-        }
-      }
-
-      // Count commits ahead of origin/<defaultBranch> (for PR visibility)
-      let aheadOfDefault = 0;
-      if (branch !== defaultBranch) {
-        try {
-          const { stdout: countOut } = await execFileAsync(
-            GIT,
-            ['rev-list', '--count', `origin/${defaultBranch}..HEAD`],
-            { cwd: taskPath }
-          );
-          aheadOfDefault = parseInt(countOut.trim(), 10) || 0;
-        } catch {
-          // origin/<defaultBranch> may not exist
-        }
-      }
-
-      return { success: true, branch, defaultBranch, ahead, behind, aheadOfDefault };
-    } catch (error) {
-      log.error(`getBranchStatus: unexpected error for ${taskPath}:`, error);
-      return { success: false, error: error instanceof Error ? error.message : String(error) };
-    }
-  });
-
-  ipcMain.handle(
-    'git:list-remote-branches',
-    async (_, args: { projectPath: string; remote?: string }) => {
-      const { projectPath, remote = 'origin' } = args || ({} as { projectPath: string });
-      if (!projectPath) {
-        return { success: false, error: 'projectPath is required' };
-      }
-
-      const remoteProject = await resolveRemoteProjectForWorktreePath(projectPath);
-      if (remoteProject) {
-        try {
-          const branches = await remoteGitService.listBranches(
-            remoteProject.sshConnectionId,
-            projectPath,
-            remote
-          );
-          return { success: true, branches };
-        } catch (error) {
-          log.error('Failed to list branches (remote):', error);
-          return { success: false, error: error instanceof Error ? error.message : String(error) };
-        }
-      }
-
-      try {
-        await execAsync('git rev-parse --is-inside-work-tree', { cwd: projectPath });
-      } catch {
-        return { success: false, error: 'Not a git repository' };
-      }
-
-      try {
-        // Check if remote exists before attempting to fetch
-        let hasRemote = false;
-        try {
-          await execFileAsync('git', ['remote', 'get-url', remote], { cwd: projectPath });
-          hasRemote = true;
-          // Remote exists, try to fetch
-          try {
-            await execFileAsync('git', ['fetch', '--prune', remote], { cwd: projectPath });
-          } catch (fetchError) {
-            log.warn('Failed to fetch remote before listing branches', fetchError);
-          }
-        } catch {
-          // Remote doesn't exist, skip fetch and will use local branches instead
-          log.debug(`Remote '${remote}' not found, will use local branches`);
-        }
-
-        let branches: Array<{ ref: string; remote: string; branch: string; label: string }> = [];
-
-        if (hasRemote) {
-          // List remote branches
-          const { stdout } = await execFileAsync(
-            'git',
-            ['for-each-ref', '--format=%(refname:short)', `refs/remotes/${remote}`],
-            { cwd: projectPath }
-          );
-
-          branches =
-            stdout
-              ?.split('\n')
-              .map((line) => line.trim())
-              .filter((line) => line.length > 0)
-              .filter((line) => !line.endsWith('/HEAD'))
-              .map((ref) => {
-                const [remoteAlias, ...rest] = ref.split('/');
-                const branch = rest.join('/') || ref;
-                return {
-                  ref,
-                  remote: remoteAlias || remote,
-                  branch,
-                  label: `${remoteAlias || remote}/${branch}`,
-                };
-              }) ?? [];
-
-          // Also include local-only branches (not on remote)
-          try {
-            const { stdout: localStdout } = await execAsync(
-              'git for-each-ref --format="%(refname:short)" refs/heads/',
-              { cwd: projectPath }
-            );
-
-            const remoteBranchNames = new Set(branches.map((b) => b.branch));
-
-            const localOnlyBranches =
-              localStdout
-                ?.split('\n')
-                .map((line) => line.trim())
-                .filter((line) => line.length > 0)
-                .filter((branch) => !remoteBranchNames.has(branch))
-                .map((branch) => ({
-                  ref: branch,
-                  remote: '',
-                  branch,
-                  label: branch,
-                })) ?? [];
-
-            branches = [...branches, ...localOnlyBranches];
-          } catch (localBranchError) {
-            log.warn('Failed to list local branches', localBranchError);
-          }
-        } else {
-          // No remote - list local branches instead
-          try {
-            const { stdout } = await execAsync(
-              'git for-each-ref --format="%(refname:short)" refs/heads/',
-              { cwd: projectPath }
-            );
-
-            branches =
-              stdout
-                ?.split('\n')
-                .map((line) => line.trim())
-                .filter((line) => line.length > 0)
-                .map((branch) => ({
-                  ref: branch,
-                  remote: '', // No remote
-                  branch,
-                  label: branch, // Just the branch name, no remote prefix
-                })) ?? [];
-          } catch (localBranchError) {
-            log.warn('Failed to list local branches', localBranchError);
-          }
-        }
-
-        return { success: true, branches };
-      } catch (error) {
-        log.error('Failed to list branches:', error);
-        return { success: false, error: error instanceof Error ? error.message : String(error) };
-      }
-    }
-  );
-
-  // Git: Merge current branch to main via GitHub (create PR + merge immediately)
-  ipcMain.handle('git:merge-to-main', async (_, args: { taskPath: string }) => {
-    const { taskPath } = args || ({} as { taskPath: string });
-
-    try {
-      const remoteProject = await resolveRemoteProjectForWorktreePath(taskPath);
-      if (remoteProject) {
-        return await mergeToMainRemote(remoteProject.sshConnectionId, taskPath);
-      }
-
-      // Get current and default branch names
-      const { stdout: currentOut } = await execAsync('git branch --show-current', {
-        cwd: taskPath,
-      });
-      const currentBranch = (currentOut || '').trim();
-
-      let defaultBranch = 'main';
-      try {
-        const { stdout } = await execAsync(
-          'gh repo view --json defaultBranchRef -q .defaultBranchRef.name',
-          { cwd: taskPath }
-        );
-        if (stdout?.trim()) defaultBranch = stdout.trim();
-      } catch {
-        // gh not available or not a GitHub repo - fall back to 'main'
-      }
-
-      // Validate: on a valid feature branch
-      if (!currentBranch) {
-        return { success: false, error: 'Not on a branch (detached HEAD state).' };
-      }
-      if (currentBranch === defaultBranch) {
-        return {
-          success: false,
-          error: `Already on ${defaultBranch}. Create a feature branch first.`,
-        };
-      }
-
-      // Stage and commit any pending changes
-      const { stdout: statusOut } = await execAsync(
-        'git status --porcelain --untracked-files=all',
-        { cwd: taskPath }
-      );
-      if (statusOut?.trim()) {
-        await execAsync('git add -A', { cwd: taskPath });
-        try {
-          await execAsync('git commit -m "chore: prepare for merge to main"', { cwd: taskPath });
-        } catch (e) {
-          const msg = String(e);
-          if (!/nothing to commit/i.test(msg)) throw e;
-        }
-      }
-
-      // Push branch (set upstream if needed)
-      try {
-        await execAsync('git push', { cwd: taskPath });
-      } catch {
-        // No upstream set - push with -u
-        await execAsync(`git push --set-upstream origin ${JSON.stringify(currentBranch)}`, {
-          cwd: taskPath,
-        });
-      }
-
-      // Create PR (or use existing)
-      let prUrl = '';
-      let prExists = false;
-      let taskMetadata: unknown = undefined;
-      try {
-        const task = await databaseService.getTaskByPath(taskPath);
-        taskMetadata = task?.metadata;
-      } catch (metadataError) {
-        log.debug('Unable to load task metadata for merge-to-main issue footer', {
-          taskPath,
-          metadataError,
-        });
-      }
-      try {
-        const prCreateArgs = ['pr', 'create', '--fill', '--base', defaultBranch];
-        const { stdout: prOut } = await execFileAsync('gh', prCreateArgs, { cwd: taskPath });
-        const urlMatch = prOut?.match(/https?:\/\/\S+/);
-        prUrl = urlMatch ? urlMatch[0] : '';
-        prExists = true;
-      } catch (e) {
-        const errMsg = (e as { stderr?: string })?.stderr || String(e);
-        if (!/already exists|already has.*pull request/i.test(errMsg)) {
-          return { success: false, error: `Failed to create PR: ${errMsg}` };
-        }
-        // PR already exists - continue to merge
-        prExists = true;
-      }
-
-      if (prExists) {
-        try {
-          await patchCurrentPrBodyWithIssueFooter({
-            taskPath,
-            metadata: taskMetadata,
-            execFile: execFileAsync,
-            prUrl,
-          });
-        } catch (editError) {
-          log.warn('Failed to patch merge-to-main PR body with issue footer', {
-            taskPath,
-            editError,
-          });
-        }
-      }
-
-      // Merge PR (branch cleanup happens when workspace is deleted)
-      try {
-        await execAsync('gh pr merge --merge', { cwd: taskPath });
-        return { success: true, prUrl };
-      } catch (e) {
-        const errMsg = (e as { stderr?: string })?.stderr || String(e);
-        return { success: false, error: `PR created but merge failed: ${errMsg}`, prUrl };
-      }
-    } catch (e) {
-      log.error('Failed to merge to main:', e);
-      return { success: false, error: (e as { message?: string })?.message || String(e) };
-    }
-  });
-
-  // Git: Rename branch (local and optionally remote)
-  ipcMain.handle(
-    'git:rename-branch',
-    async (
-      _,
-      args: {
-        repoPath: string;
-        oldBranch: string;
-        newBranch: string;
-      }
-    ) => {
-      const { repoPath, oldBranch, newBranch } = args;
-      try {
-        log.info('Renaming branch:', { repoPath, oldBranch, newBranch });
-
-        const remoteProject = await resolveRemoteProjectForWorktreePath(repoPath);
-        if (remoteProject) {
-          const result = await remoteGitService.renameBranch(
-            remoteProject.sshConnectionId,
-            repoPath,
-            oldBranch,
-            newBranch
-          );
-          return { success: true, remotePushed: result.remotePushed };
-        }
-
-        // Check remote tracking BEFORE rename (git branch -m renames config section)
-        let remotePushed = false;
-        let remoteName = 'origin';
-        try {
-          const { stdout: remoteOut } = await execFileAsync(
-            GIT,
-            ['config', '--get', `branch.${oldBranch}.remote`],
-            { cwd: repoPath }
-          );
-          if (remoteOut?.trim()) {
-            remoteName = remoteOut.trim();
-            remotePushed = true;
-          }
-        } catch {
-          // Branch wasn't tracking a remote, check if it exists on origin
-          try {
-            const { stdout: lsRemote } = await execFileAsync(
-              GIT,
-              ['ls-remote', '--heads', 'origin', oldBranch],
-              { cwd: repoPath }
-            );
-            if (lsRemote?.trim()) {
-              remotePushed = true;
-            }
-          } catch {
-            // No remote branch
-          }
-        }
-
-        // Rename local branch
-        await execFileAsync(GIT, ['branch', '-m', oldBranch, newBranch], { cwd: repoPath });
-        log.info('Local branch renamed successfully');
-
-        // If pushed to remote, delete old and push new
-        if (remotePushed) {
-          log.info('Branch was pushed to remote, updating remote...');
-          try {
-            // Delete old remote branch
-            await execFileAsync(GIT, ['push', remoteName, '--delete', oldBranch], {
-              cwd: repoPath,
-            });
-            log.info('Deleted old remote branch');
-          } catch (deleteErr) {
-            // Remote branch might not exist or already deleted
-            log.warn('Could not delete old remote branch (may not exist):', deleteErr);
-          }
-
-          // Push new branch and set upstream
-          await execFileAsync(GIT, ['push', '-u', remoteName, newBranch], { cwd: repoPath });
-          log.info('Pushed new branch to remote');
-        }
-
-        return { success: true, remotePushed };
-      } catch (error) {
-        log.error('Failed to rename branch:', error);
-        return { success: false, error: error instanceof Error ? error.message : String(error) };
-      }
-    }
-  );
-
-  ipcMain.handle('git:commit', async (_, args: { taskPath: string; message: string }) => {
-    try {
-      const pathErr = validateTaskPath(args.taskPath);
-      if (pathErr) return { success: false, error: pathErr };
-      const result = await gitCommit(args.taskPath, args.message);
-      broadcastGitStatusChange(args.taskPath);
-      return { success: true, hash: result.hash };
-    } catch (error) {
-      return { success: false, error: error instanceof Error ? error.message : String(error) };
-    }
-  });
-
-  ipcMain.handle('git:push', async (_, args: { taskPath: string }) => {
-    try {
-      const pathErr = validateTaskPath(args.taskPath);
-      if (pathErr) return { success: false, error: pathErr };
-      const result = await gitPush(args.taskPath);
-      return { success: true, output: result.output };
-    } catch (error) {
-      const errObj = error as { stderr?: string; message?: string };
-      return { success: false, error: errObj?.stderr?.trim() || errObj?.message || String(error) };
-    }
-  });
-
-  ipcMain.handle('git:pull', async (_, args: { taskPath: string }) => {
-    try {
-      const pathErr = validateTaskPath(args.taskPath);
-      if (pathErr) return { success: false, error: pathErr };
-      const result = await gitPull(args.taskPath);
-      return { success: true, output: result.output };
-    } catch (error) {
-      const errObj = error as { stderr?: string; message?: string };
-      return { success: false, error: errObj?.stderr?.trim() || errObj?.message || String(error) };
-    }
-  });
-
-  ipcMain.handle(
-    'git:get-log',
-    async (
-      _,
-      args: { taskPath: string; maxCount?: number; skip?: number; aheadCount?: number }
-    ) => {
-      try {
-        const pathErr = validateTaskPath(args.taskPath);
-        if (pathErr) return { success: false, error: pathErr };
-        const result = await gitGetLog(args.taskPath, args.maxCount, args.skip, args.aheadCount);
-        return { success: true, commits: result.commits, aheadCount: result.aheadCount };
-      } catch (error) {
-        return { success: false, error: error instanceof Error ? error.message : String(error) };
-      }
-    }
-  );
-
-  ipcMain.handle('git:get-latest-commit', async (_, args: { taskPath: string }) => {
-    try {
-      const pathErr = validateTaskPath(args.taskPath);
-      if (pathErr) return { success: false, error: pathErr };
-      const commit = await gitGetLatestCommit(args.taskPath);
-      return { success: true, commit };
-    } catch (error) {
-      return { success: false, error: error instanceof Error ? error.message : String(error) };
-    }
-  });
-
-  ipcMain.handle(
-    'git:get-commit-files',
-    async (_, args: { taskPath: string; commitHash: string }) => {
-      try {
-        const pathErr = validateTaskPath(args.taskPath);
-        if (pathErr) return { success: false, error: pathErr };
-        if (!/^[0-9a-f]{4,40}$/i.test(args.commitHash)) {
-          return { success: false, error: 'Invalid commit hash' };
-        }
-        const files = await gitGetCommitFiles(args.taskPath, args.commitHash);
-        return { success: true, files };
-      } catch (error) {
-        return { success: false, error: error instanceof Error ? error.message : String(error) };
-      }
-    }
-  );
-
-  ipcMain.handle(
-    'git:get-commit-file-diff',
-    async (_, args: { taskPath: string; commitHash: string; filePath: string }) => {
-      try {
-        const pathErr = validateTaskPath(args.taskPath);
-        if (pathErr) return { success: false, error: pathErr };
-        if (!/^[0-9a-f]{4,40}$/i.test(args.commitHash)) {
-          return { success: false, error: 'Invalid commit hash' };
-        }
-        // filePath is validated by path.resolve check in GitService.getCommitFileDiff
-        const diff = await gitGetCommitFileDiff(args.taskPath, args.commitHash, args.filePath);
-        return { success: true, diff };
-      } catch (error) {
-        return { success: false, error: error instanceof Error ? error.message : String(error) };
-      }
-    }
-  );
-
-  ipcMain.handle('git:soft-reset', async (_, args: { taskPath: string }) => {
-    try {
-      const pathErr = validateTaskPath(args.taskPath);
-      if (pathErr) return { success: false, error: pathErr };
-      const result = await gitSoftResetLastCommit(args.taskPath);
-      broadcastGitStatusChange(args.taskPath);
-      return { success: true, subject: result.subject, body: result.body };
-    } catch (error) {
-      return { success: false, error: error instanceof Error ? error.message : String(error) };
-    }
-  });
-}
diff --git a/src/main/ipc/githubIpc.ts b/src/main/ipc/githubIpc.ts
deleted file mode 100644
index dd91494a2d..0000000000
--- a/src/main/ipc/githubIpc.ts
+++ /dev/null
@@ -1,517 +0,0 @@
-import { ipcMain, app } from 'electron';
-import { log } from '../lib/logger';
-import { GitHubService } from '../services/GitHubService';
-import { worktreeService } from '../services/WorktreeService';
-import { githubCLIInstaller } from '../services/GitHubCLIInstaller';
-import { exec } from 'child_process';
-import { promisify } from 'util';
-import * as path from 'path';
-import * as fs from 'fs';
-import { homedir } from 'os';
-import { quoteShellArg } from '../utils/shellEscape';
-
-const execAsync = promisify(exec);
-const githubService = new GitHubService();
-
-const slugify = (name: string) =>
-  name
-    .toLowerCase()
-    .replace(/[^a-z0-9-]/g, '-')
-    .replace(/-+/g, '-')
-    .replace(/^-|-$/g, '');
-
-export function registerGithubIpc() {
-  ipcMain.handle('github:connect', async (_, projectPath: string) => {
-    try {
-      // Check if GitHub CLI is authenticated
-      const isAuth = await githubService.isAuthenticated();
-      if (!isAuth) {
-        return { success: false, error: 'GitHub CLI not authenticated' };
-      }
-
-      // Get repository info from GitHub CLI
-      try {
-        const { stdout } = await execAsync(
-          'gh repo view --json name,nameWithOwner,defaultBranchRef',
-          { cwd: projectPath }
-        );
-        const repoInfo = JSON.parse(stdout);
-
-        return {
-          success: true,
-          repository: repoInfo.nameWithOwner,
-          branch: repoInfo.defaultBranchRef?.name || 'main',
-        };
-      } catch (error) {
-        return {
-          success: false,
-          error: 'Repository not found on GitHub or not connected to GitHub CLI',
-        };
-      }
-    } catch (error) {
-      log.error('Failed to connect to GitHub:', error);
-      return { success: false, error: 'Failed to connect to GitHub' };
-    }
-  });
-
-  // Start Device Flow authentication with automatic background polling
-  ipcMain.handle('github:auth', async () => {
-    try {
-      return await githubService.startDeviceFlowAuth();
-    } catch (error) {
-      log.error('GitHub authentication failed:', error);
-      return { success: false, error: 'Authentication failed' };
-    }
-  });
-
-  // Cancel ongoing authentication
-  ipcMain.handle('github:auth:cancel', async () => {
-    try {
-      githubService.cancelAuth();
-      return { success: true };
-    } catch (error) {
-      log.error('Failed to cancel GitHub auth:', error);
-      return { success: false, error: 'Failed to cancel' };
-    }
-  });
-
-  ipcMain.handle('github:isAuthenticated', async () => {
-    try {
-      return await githubService.isAuthenticated();
-    } catch (error) {
-      log.error('GitHub authentication check failed:', error);
-      return false;
-    }
-  });
-
-  // GitHub status: installed + authenticated + user
-  ipcMain.handle('github:getStatus', async () => {
-    try {
-      let installed = true;
-      try {
-        await execAsync('gh --version');
-      } catch {
-        installed = false;
-      }
-
-      let authenticated = false;
-      let user: any = null;
-      if (installed) {
-        try {
-          const { stdout } = await execAsync('gh api user');
-          user = JSON.parse(stdout);
-          authenticated = true;
-        } catch {
-          authenticated = false;
-          user = null;
-        }
-      }
-
-      return { installed, authenticated, user };
-    } catch (error) {
-      log.error('GitHub status check failed:', error);
-      return { installed: false, authenticated: false };
-    }
-  });
-
-  ipcMain.handle('github:getUser', async () => {
-    try {
-      const token = await (githubService as any)['getStoredToken']();
-      if (!token) return null;
-      return await githubService.getUserInfo(token);
-    } catch (error) {
-      log.error('Failed to get user info:', error);
-      return null;
-    }
-  });
-
-  ipcMain.handle('github:getRepositories', async () => {
-    try {
-      const token = await (githubService as any)['getStoredToken']();
-      if (!token) throw new Error('Not authenticated');
-      return await githubService.getRepositories(token);
-    } catch (error) {
-      log.error('Failed to get repositories:', error);
-      return [];
-    }
-  });
-
-  ipcMain.handle('github:cloneRepository', async (_, repoUrl: string, localPath: string) => {
-    const q = (s: string) => JSON.stringify(s);
-    try {
-      // Opt-out flag for safety or debugging
-      if (process.env.EMDASH_DISABLE_CLONE_CACHE === '1') {
-        await execAsync(`git clone ${q(repoUrl)} ${q(localPath)}`);
-        return { success: true };
-      }
-
-      // Ensure parent directory exists
-      const dir = path.dirname(localPath);
-      if (!fs.existsSync(dir)) fs.mkdirSync(dir, { recursive: true });
-
-      // If already a git repo, short‑circuit
-      try {
-        if (fs.existsSync(path.join(localPath, '.git'))) return { success: true };
-      } catch {}
-
-      // Use a local bare mirror cache keyed by normalized URL
-      const cacheRoot = path.join(app.getPath('userData'), 'repo-cache');
-      if (!fs.existsSync(cacheRoot)) fs.mkdirSync(cacheRoot, { recursive: true });
-      const norm = (u: string) => u.replace(/\.git$/i, '').trim();
-      const cacheKey = require('crypto').createHash('sha1').update(norm(repoUrl)).digest('hex');
-      const mirrorPath = path.join(cacheRoot, `${cacheKey}.mirror`);
-
-      if (!fs.existsSync(mirrorPath)) {
-        await execAsync(`git clone --mirror --filter=blob:none ${q(repoUrl)} ${q(mirrorPath)}`);
-      } else {
-        try {
-          await execAsync(`git -C ${q(mirrorPath)} remote set-url origin ${q(repoUrl)}`);
-        } catch {}
-        await execAsync(`git -C ${q(mirrorPath)} remote update --prune`);
-      }
-
-      await execAsync(
-        `git clone --reference-if-able ${q(mirrorPath)} --dissociate ${q(repoUrl)} ${q(localPath)}`
-      );
-      return { success: true };
-    } catch (error) {
-      log.error('Failed to clone repository via cache:', error);
-      try {
-        await execAsync(`git clone ${q(repoUrl)} ${q(localPath)}`);
-        return { success: true };
-      } catch (e2) {
-        return { success: false, error: e2 instanceof Error ? e2.message : 'Clone failed' };
-      }
-    }
-  });
-
-  ipcMain.handle('github:logout', async () => {
-    try {
-      await githubService.logout();
-      return { success: true };
-    } catch (error) {
-      log.error('Failed to logout:', error);
-      return { success: false, error: error instanceof Error ? error.message : 'Logout failed' };
-    }
-  });
-
-  // GitHub issues: list/search/get for the repository at projectPath
-  ipcMain.handle('github:issues:list', async (_e, projectPath: string, limit?: number) => {
-    if (!projectPath) return { success: false, error: 'Project path is required' };
-    try {
-      const issues = await githubService.listIssues(projectPath, limit ?? 50);
-      return { success: true, issues };
-    } catch (error) {
-      const message = error instanceof Error ? error.message : 'Unable to list issues';
-      return { success: false, error: message };
-    }
-  });
-
-  ipcMain.handle(
-    'github:issues:search',
-    async (_e, projectPath: string, searchTerm: string, limit?: number) => {
-      if (!projectPath) return { success: false, error: 'Project path is required' };
-      if (!searchTerm || typeof searchTerm !== 'string') {
-        return { success: false, error: 'Search term is required' };
-      }
-      try {
-        const issues = await githubService.searchIssues(projectPath, searchTerm, limit ?? 20);
-        return { success: true, issues };
-      } catch (error) {
-        const message = error instanceof Error ? error.message : 'Unable to search issues';
-        return { success: false, error: message };
-      }
-    }
-  );
-
-  ipcMain.handle('github:issues:get', async (_e, projectPath: string, number: number) => {
-    if (!projectPath) return { success: false, error: 'Project path is required' };
-    if (!number || !Number.isFinite(number)) {
-      return { success: false, error: 'Issue number is required' };
-    }
-    try {
-      const issue = await githubService.getIssue(projectPath, number);
-      return { success: !!issue, issue: issue ?? undefined };
-    } catch (error) {
-      const message = error instanceof Error ? error.message : 'Unable to get issue';
-      return { success: false, error: message };
-    }
-  });
-
-  ipcMain.handle('github:listPullRequests', async (_, args: { projectPath: string }) => {
-    const projectPath = args?.projectPath;
-    if (!projectPath) {
-      return { success: false, error: 'Project path is required' };
-    }
-
-    try {
-      const prs = await githubService.getPullRequests(projectPath);
-      return { success: true, prs };
-    } catch (error) {
-      log.error('Failed to list pull requests:', error);
-      const message =
-        error instanceof Error ? error.message : 'Unable to list pull requests via GitHub CLI';
-      return { success: false, error: message };
-    }
-  });
-
-  ipcMain.handle(
-    'github:createPullRequestWorktree',
-    async (
-      _,
-      args: {
-        projectPath: string;
-        projectId: string;
-        prNumber: number;
-        prTitle?: string;
-        taskName?: string;
-        branchName?: string;
-      }
-    ) => {
-      const { projectPath, projectId, prNumber } = args || ({} as typeof args);
-
-      if (!projectPath || !projectId || !prNumber) {
-        return { success: false, error: 'Missing required parameters' };
-      }
-
-      const defaultSlug = slugify(args.prTitle || `pr-${prNumber}`) || `pr-${prNumber}`;
-      const taskName =
-        args.taskName && args.taskName.trim().length > 0
-          ? args.taskName.trim()
-          : `pr-${prNumber}-${defaultSlug}`;
-      const branchName = args.branchName || `pr/${prNumber}`;
-
-      try {
-        const currentWorktrees = await worktreeService.listWorktrees(projectPath);
-        const existing = currentWorktrees.find((wt) => wt.branch === branchName);
-
-        if (existing) {
-          return { success: true, worktree: existing, branchName, taskName: existing.name };
-        }
-
-        await githubService.ensurePullRequestBranch(projectPath, prNumber, branchName);
-
-        const worktreesDir = path.resolve(projectPath, '..', 'worktrees');
-        const slug = slugify(taskName) || `pr-${prNumber}`;
-        let worktreePath = path.join(worktreesDir, slug);
-
-        if (fs.existsSync(worktreePath)) {
-          worktreePath = path.join(worktreesDir, `${slug}-${Date.now()}`);
-        }
-
-        const worktree = await worktreeService.createWorktreeFromBranch(
-          projectPath,
-          taskName,
-          branchName,
-          projectId,
-          { worktreePath }
-        );
-
-        return { success: true, worktree, branchName, taskName };
-      } catch (error) {
-        log.error('Failed to create PR worktree:', error);
-        const message =
-          error instanceof Error ? error.message : 'Unable to create PR worktree via GitHub CLI';
-        return { success: false, error: message };
-      }
-    }
-  );
-
-  ipcMain.handle('github:checkCLIInstalled', async () => {
-    try {
-      return await githubCLIInstaller.isInstalled();
-    } catch (error) {
-      log.error('Failed to check gh CLI installation:', error);
-      return false;
-    }
-  });
-
-  ipcMain.handle('github:installCLI', async () => {
-    try {
-      return await githubCLIInstaller.install();
-    } catch (error) {
-      log.error('Failed to install gh CLI:', error);
-      return {
-        success: false,
-        error: error instanceof Error ? error.message : 'Installation failed',
-      };
-    }
-  });
-
-  ipcMain.handle('github:getOwners', async () => {
-    try {
-      const owners = await githubService.getOwners();
-      return { success: true, owners };
-    } catch (error) {
-      log.error('Failed to get owners:', error);
-      return {
-        success: false,
-        error: error instanceof Error ? error.message : 'Failed to get owners',
-      };
-    }
-  });
-
-  ipcMain.handle('github:validateRepoName', async (_, name: string, owner: string) => {
-    try {
-      // First validate format
-      const formatValidation = githubService.validateRepositoryName(name);
-      if (!formatValidation.valid) {
-        return {
-          success: true,
-          valid: false,
-          exists: false,
-          error: formatValidation.error,
-        };
-      }
-
-      // Then check if it exists
-      const exists = await githubService.checkRepositoryExists(owner, name);
-      if (exists) {
-        return {
-          success: true,
-          valid: true,
-          exists: true,
-          error: `Repository ${owner}/${name} already exists`,
-        };
-      }
-
-      return {
-        success: true,
-        valid: true,
-        exists: false,
-      };
-    } catch (error) {
-      log.error('Failed to validate repo name:', error);
-      return {
-        success: false,
-        error: error instanceof Error ? error.message : 'Validation failed',
-      };
-    }
-  });
-
-  ipcMain.handle(
-    'github:createNewProject',
-    async (
-      _,
-      params: {
-        name: string;
-        description?: string;
-        owner: string;
-        isPrivate: boolean;
-        gitignoreTemplate?: string;
-      }
-    ) => {
-      let githubRepoCreated = false;
-      let localDirCreated = false;
-      let repoUrl: string | undefined;
-      let localPath: string | undefined;
-
-      try {
-        const { name, description, owner, isPrivate, gitignoreTemplate } = params;
-
-        // Validate inputs
-        const formatValidation = githubService.validateRepositoryName(name);
-        if (!formatValidation.valid) {
-          return {
-            success: false,
-            error: formatValidation.error || 'Invalid repository name',
-          };
-        }
-
-        // Check if repo already exists
-        const exists = await githubService.checkRepositoryExists(owner, name);
-        if (exists) {
-          return {
-            success: false,
-            error: `Repository ${owner}/${name} already exists`,
-          };
-        }
-
-        // Get project directory from settings
-        const { getAppSettings } = await import('../settings');
-        const settings = getAppSettings();
-        const projectDir =
-          settings.projects?.defaultDirectory || path.join(homedir(), 'emdash-projects');
-
-        // Ensure project directory exists
-        if (!fs.existsSync(projectDir)) {
-          fs.mkdirSync(projectDir, { recursive: true });
-        }
-
-        localPath = path.join(projectDir, name);
-        if (fs.existsSync(localPath)) {
-          return {
-            success: false,
-            error: `Directory ${localPath} already exists`,
-          };
-        }
-
-        // Create GitHub repository
-        const repoInfo = await githubService.createRepository({
-          name,
-          description,
-          owner,
-          isPrivate,
-        });
-        githubRepoCreated = true;
-        repoUrl = repoInfo.url;
-
-        // Clone repository
-        const cloneResult = await githubService.cloneRepository(repoUrl, localPath);
-        if (!cloneResult.success) {
-          // Cleanup: delete GitHub repo on clone failure
-          try {
-            // Security: Use quoteShellArg to prevent command injection
-            const repoRef = `${quoteShellArg(owner)}/${quoteShellArg(name)}`;
-            await execAsync(`gh repo delete ${repoRef} --yes`, {
-              timeout: 10000,
-            });
-          } catch (cleanupError) {
-            log.warn('Failed to cleanup GitHub repo after clone failure:', cleanupError);
-          }
-          return {
-            success: false,
-            error: cloneResult.error || 'Failed to clone repository',
-          };
-        }
-        localDirCreated = true;
-
-        // Initialize project (create README, commit, push)
-        await githubService.initializeNewProject({
-          repoUrl,
-          localPath,
-          name,
-          description,
-        });
-
-        // TODO: Add .gitignore if template specified (for future enhancement)
-
-        return {
-          success: true,
-          projectPath: localPath,
-          repoUrl,
-          fullName: repoInfo.fullName,
-          defaultBranch: repoInfo.defaultBranch,
-        };
-      } catch (error) {
-        log.error('Failed to create new project:', error);
-
-        // Cleanup on failure
-        if (localDirCreated && localPath && fs.existsSync(localPath)) {
-          try {
-            fs.rmSync(localPath, { recursive: true, force: true });
-          } catch (cleanupError) {
-            log.warn('Failed to cleanup local directory:', cleanupError);
-          }
-        }
-
-        return {
-          success: false,
-          error: error instanceof Error ? error.message : 'Failed to create project',
-          githubRepoCreated, // Inform frontend about orphaned repo
-          repoUrl,
-        };
-      }
-    }
-  );
-}
diff --git a/src/main/ipc/gitlabIpc.ts b/src/main/ipc/gitlabIpc.ts
deleted file mode 100644
index 53f7454250..0000000000
--- a/src/main/ipc/gitlabIpc.ts
+++ /dev/null
@@ -1,95 +0,0 @@
-import { ipcMain } from 'electron';
-import { gitlabService } from '../services/GitLabService';
-import { log } from '../lib/logger';
-
-export function registerGitlabIpc() {
-  ipcMain.handle(
-    'gitlab:saveCredentials',
-    async (_e, args: { instanceUrl: string; token: string }) => {
-      const instanceUrl = String(args?.instanceUrl || '').trim();
-      const token = String(args?.token || '').trim();
-      if (!instanceUrl || !token) {
-        return { success: false, error: 'Instance URL and API token are required.' };
-      }
-      try {
-        return await gitlabService.saveCredentials(instanceUrl, token);
-      } catch (error) {
-        log.error('GitLab saveCredentials failed:', error);
-        return {
-          success: false,
-          error: error instanceof Error ? error.message : 'Failed to save GitLab credentials',
-        };
-      }
-    }
-  );
-
-  ipcMain.handle('gitlab:clearCredentials', async () => {
-    try {
-      return await gitlabService.clearCredentials();
-    } catch (error) {
-      log.error('GitLab clearCredentials failed:', error);
-      return {
-        success: false,
-        error: error instanceof Error ? error.message : 'Failed to clear GitLab credentials',
-      };
-    }
-  });
-
-  ipcMain.handle('gitlab:checkConnection', async () => {
-    try {
-      return await gitlabService.checkConnection();
-    } catch (error) {
-      log.error('GitLab checkConnection failed:', error);
-      return {
-        success: false,
-        error: error instanceof Error ? error.message : 'Failed to check GitLab connection',
-      };
-    }
-  });
-
-  ipcMain.handle(
-    'gitlab:initialFetch',
-    async (_e, args: { projectPath?: string; limit?: number }) => {
-      const projectPath = args?.projectPath;
-      const limit =
-        typeof args?.limit === 'number' && Number.isFinite(args.limit)
-          ? Math.max(1, Math.min(args.limit, 100))
-          : 50;
-      try {
-        return await gitlabService.initialFetch(projectPath, limit);
-      } catch (error) {
-        log.error('GitLab initialFetch failed:', error);
-        return {
-          success: false,
-          error: error instanceof Error ? error.message : 'Failed to fetch GitLab issues',
-        };
-      }
-    }
-  );
-
-  ipcMain.handle(
-    'gitlab:searchIssues',
-    async (_e, args: { projectPath?: string; searchTerm: string; limit?: number }) => {
-      const searchTerm = String(args?.searchTerm || '').trim();
-      if (!searchTerm) {
-        return { success: true, issues: [] };
-      }
-      const projectPath = args?.projectPath;
-      const limit =
-        typeof args?.limit === 'number' && Number.isFinite(args.limit)
-          ? Math.max(1, Math.min(args.limit, 100))
-          : 20;
-      try {
-        return await gitlabService.searchIssues(projectPath, searchTerm, limit);
-      } catch (error) {
-        log.error('GitLab searchIssues failed:', error);
-        return {
-          success: false,
-          error: error instanceof Error ? error.message : 'Failed to search GitLab issues',
-        };
-      }
-    }
-  );
-}
-
-export default registerGitlabIpc;
diff --git a/src/main/ipc/hostPreviewIpc.ts b/src/main/ipc/hostPreviewIpc.ts
deleted file mode 100644
index 7116d80323..0000000000
--- a/src/main/ipc/hostPreviewIpc.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-import { ipcMain, BrowserWindow } from 'electron';
-import { hostPreviewService } from '../services/hostPreviewService';
-
-export function registerHostPreviewIpc() {
-  ipcMain.handle(
-    'preview:host:start',
-    async (
-      _e,
-      args: {
-        taskId: string;
-        taskPath: string;
-        script?: string;
-        parentProjectPath?: string;
-      }
-    ) => {
-      const id = String(args?.taskId || '').trim();
-      const wp = String(args?.taskPath || '').trim();
-      if (!id || !wp) return { ok: false, error: 'taskId and taskPath are required' };
-      return hostPreviewService.start(id, wp, {
-        script: args?.script,
-        parentProjectPath: args?.parentProjectPath,
-      });
-    }
-  );
-
-  ipcMain.handle('preview:host:setup', async (_e, args: { taskId: string; taskPath: string }) => {
-    const id = String(args?.taskId || '').trim();
-    const wp = String(args?.taskPath || '').trim();
-    if (!id || !wp) return { ok: false, error: 'taskId and taskPath are required' };
-    return hostPreviewService.setup(id, wp);
-  });
-
-  ipcMain.handle('preview:host:stop', async (_e, id: string) => {
-    const wid = String(id || '').trim();
-    if (!wid) return { ok: true };
-    return hostPreviewService.stop(wid);
-  });
-
-  ipcMain.handle('preview:host:stopAll', async (_e, exceptId?: string) => {
-    const ex = typeof exceptId === 'string' ? exceptId : '';
-    return hostPreviewService.stopAll(ex);
-  });
-
-  const forward = (evt: any) => {
-    const all = BrowserWindow.getAllWindows();
-    for (const win of all) {
-      try {
-        win.webContents.send('preview:host:event', evt);
-      } catch {}
-    }
-  };
-  hostPreviewService.onEvent(forward);
-}
diff --git a/src/main/ipc/index.ts b/src/main/ipc/index.ts
deleted file mode 100644
index 6eabfdcb64..0000000000
--- a/src/main/ipc/index.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-import { registerPtyIpc } from '../services/ptyIpc';
-import { registerWorktreeIpc } from '../services/worktreeIpc';
-import { registerFsIpc } from '../services/fsIpc';
-import { registerLifecycleIpc } from '../services/lifecycleIpc';
-import { registerAppIpc } from './appIpc';
-import { registerProjectIpc } from './projectIpc';
-import { registerProjectSettingsIpc } from './projectSettingsIpc';
-import { registerGithubIpc } from './githubIpc';
-import { databaseController } from './dbIpc';
-import { registerDebugIpc } from './debugIpc';
-import { registerGitIpc } from './gitIpc';
-import { registerLinearIpc } from './linearIpc';
-import { registerConnectionsIpc } from './connectionsIpc';
-import { registerUpdateIpc } from '../services/updateIpc';
-import { registerTelemetryIpc } from './telemetryIpc';
-import { registerJiraIpc } from './jiraIpc';
-import { registerPlanLockIpc } from '../services/planLockIpc';
-import { appSettingsController } from './settingsIpc';
-import { registerHostPreviewIpc } from './hostPreviewIpc';
-import { registerBrowserIpc } from './browserIpc';
-import { registerNetIpc } from './netIpc';
-import { registerLineCommentsIpc } from './lineCommentsIpc';
-import { registerSshIpc } from './sshIpc';
-import { registerSkillsIpc } from './skillsIpc';
-import { createRPCRouter, registerRPCRouter } from '../../shared/ipc/rpc';
-import { ipcMain } from 'electron';
-import { registerGitlabIpc } from './gitlabIpc';
-
-export const rpcRouter = createRPCRouter({
-  db: databaseController,
-  appSettings: appSettingsController,
-});
-
-export type RpcRouter = typeof rpcRouter;
-
-export function registerAllIpc() {
-  // Register RPC
-  registerRPCRouter(rpcRouter, ipcMain);
-
-  // Core app/utility IPC
-  registerAppIpc();
-  registerDebugIpc();
-  registerTelemetryIpc();
-  registerUpdateIpc();
-
-  // Domain IPC
-  registerProjectIpc();
-  registerProjectSettingsIpc();
-  registerGithubIpc();
-  registerGitIpc();
-  registerHostPreviewIpc();
-  registerBrowserIpc();
-  registerNetIpc();
-  registerLineCommentsIpc();
-
-  // Existing modules
-  registerPtyIpc();
-  registerWorktreeIpc();
-  registerFsIpc();
-  registerLifecycleIpc();
-  registerLinearIpc();
-  registerConnectionsIpc();
-  registerJiraIpc();
-  registerPlanLockIpc();
-  registerSshIpc();
-  registerSkillsIpc();
-  registerGitlabIpc();
-}
diff --git a/src/main/ipc/jiraIpc.ts b/src/main/ipc/jiraIpc.ts
deleted file mode 100644
index 75fde6dc54..0000000000
--- a/src/main/ipc/jiraIpc.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import { ipcMain } from 'electron';
-import JiraService from '../services/JiraService';
-
-const jira = new JiraService();
-
-export function registerJiraIpc() {
-  ipcMain.handle(
-    'jira:saveCredentials',
-    async (_e, args: { siteUrl: string; email: string; token: string }) => {
-      const siteUrl = String(args?.siteUrl || '').trim();
-      const email = String(args?.email || '').trim();
-      const token = String(args?.token || '').trim();
-      if (!siteUrl || !email || !token) {
-        return { success: false, error: 'Site URL, email, and API token are required.' };
-      }
-      return jira.saveCredentials(siteUrl, email, token);
-    }
-  );
-
-  ipcMain.handle('jira:clearCredentials', async () => jira.clearCredentials());
-  ipcMain.handle('jira:checkConnection', async () => jira.checkConnection());
-
-  ipcMain.handle('jira:initialFetch', async (_e, limit?: number) => {
-    try {
-      const issues = await jira.initialFetch(
-        typeof limit === 'number' && Number.isFinite(limit) ? limit : 50
-      );
-      return { success: true, issues };
-    } catch (e: any) {
-      return { success: false, error: e?.message || String(e) };
-    }
-  });
-
-  ipcMain.handle('jira:searchIssues', async (_e, searchTerm: string, limit?: number) => {
-    try {
-      // Use enhanced search that supports direct key lookups
-      const issues = await jira.smartSearchIssues(searchTerm, limit ?? 20);
-      return { success: true, issues };
-    } catch (e: any) {
-      return { success: false, error: e?.message || String(e) };
-    }
-  });
-}
-
-export default registerJiraIpc;
diff --git a/src/main/ipc/lineCommentsIpc.ts b/src/main/ipc/lineCommentsIpc.ts
deleted file mode 100644
index c8b4951bf6..0000000000
--- a/src/main/ipc/lineCommentsIpc.ts
+++ /dev/null
@@ -1,77 +0,0 @@
-import { ipcMain } from 'electron';
-import { log } from '../lib/logger';
-import { databaseService } from '../services/DatabaseService';
-import { formatCommentsForAgent } from '../../shared/lineComments';
-
-export function registerLineCommentsIpc() {
-  ipcMain.handle('lineComments:create', async (_, input) => {
-    try {
-      const id = await databaseService.saveLineComment(input);
-      return { success: true, id };
-    } catch (error) {
-      log.error('Failed to create line comment:', error);
-      return { success: false, error: (error as Error).message };
-    }
-  });
-
-  ipcMain.handle('lineComments:get', async (_, args: { taskId: string; filePath?: string }) => {
-    try {
-      const comments = await databaseService.getLineComments(args.taskId, args.filePath);
-      return { success: true, comments };
-    } catch (error) {
-      log.error('Failed to get line comments:', error);
-      return { success: false, error: (error as Error).message };
-    }
-  });
-
-  ipcMain.handle('lineComments:update', async (_, input: { id: string; content: string }) => {
-    try {
-      await databaseService.updateLineComment(input.id, input.content);
-      return { success: true };
-    } catch (error) {
-      log.error('Failed to update line comment:', error);
-      return { success: false, error: (error as Error).message };
-    }
-  });
-
-  ipcMain.handle('lineComments:delete', async (_, id: string) => {
-    try {
-      await databaseService.deleteLineComment(id);
-      return { success: true };
-    } catch (error) {
-      log.error('Failed to delete line comment:', error);
-      return { success: false, error: (error as Error).message };
-    }
-  });
-
-  ipcMain.handle('lineComments:getFormatted', async (_, taskId: string) => {
-    try {
-      const comments = await databaseService.getLineComments(taskId);
-      const formatted = formatCommentsForAgent(comments);
-      return { success: true, formatted };
-    } catch (error) {
-      log.error('Failed to format line comments:', error);
-      return { success: false, error: (error as Error).message };
-    }
-  });
-
-  ipcMain.handle('lineComments:markSent', async (_, commentIds: string[]) => {
-    try {
-      await databaseService.markCommentsSent(commentIds);
-      return { success: true };
-    } catch (error) {
-      log.error('Failed to mark comments as sent:', error);
-      return { success: false, error: (error as Error).message };
-    }
-  });
-
-  ipcMain.handle('lineComments:getUnsent', async (_, taskId: string) => {
-    try {
-      const comments = await databaseService.getUnsentComments(taskId);
-      return { success: true, comments };
-    } catch (error) {
-      log.error('Failed to get unsent comments:', error);
-      return { success: false, error: (error as Error).message };
-    }
-  });
-}
diff --git a/src/main/ipc/linearIpc.ts b/src/main/ipc/linearIpc.ts
deleted file mode 100644
index fe4942749d..0000000000
--- a/src/main/ipc/linearIpc.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-import { ipcMain } from 'electron';
-import LinearService from '../services/LinearService';
-
-const linearService = new LinearService();
-
-export function registerLinearIpc() {
-  ipcMain.handle('linear:saveToken', async (_event, token: string) => {
-    if (!token || typeof token !== 'string') {
-      return { success: false, error: 'A Linear API token is required.' };
-    }
-
-    return linearService.saveToken(token);
-  });
-
-  ipcMain.handle('linear:checkConnection', async () => {
-    return linearService.checkConnection();
-  });
-
-  ipcMain.handle('linear:clearToken', async () => {
-    return linearService.clearToken();
-  });
-
-  ipcMain.handle('linear:initialFetch', async (_event, limit?: number) => {
-    try {
-      const issues = await linearService.initialFetch(
-        typeof limit === 'number' && Number.isFinite(limit) ? limit : undefined
-      );
-      return { success: true, issues };
-    } catch (error) {
-      const message =
-        error instanceof Error ? error.message : 'Unable to fetch initial Linear issues right now.';
-      return { success: false, error: message };
-    }
-  });
-
-  ipcMain.handle('linear:searchIssues', async (_event, searchTerm: string, limit?: number) => {
-    if (!searchTerm || typeof searchTerm !== 'string') {
-      return { success: false, error: 'Search term is required.' };
-    }
-
-    try {
-      const issues = await linearService.searchIssues(searchTerm, limit ?? 20);
-      return { success: true, issues };
-    } catch (error) {
-      const message =
-        error instanceof Error ? error.message : 'Unable to search Linear issues right now.';
-      return { success: false, error: message };
-    }
-  });
-}
-
-export default registerLinearIpc;
diff --git a/src/main/ipc/netIpc.ts b/src/main/ipc/netIpc.ts
deleted file mode 100644
index 7c7985f18e..0000000000
--- a/src/main/ipc/netIpc.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-import { ipcMain } from 'electron';
-import net from 'node:net';
-
-function probePort(host: string, port: number, timeoutMs = 800): Promise<boolean> {
-  return new Promise((resolve) => {
-    let done = false;
-    const socket = net.createConnection({ host, port });
-    const timer = setTimeout(
-      () => {
-        if (done) return;
-        done = true;
-        try {
-          socket.destroy();
-        } catch {}
-        resolve(false);
-      },
-      Math.max(1, timeoutMs)
-    );
-    socket.once('connect', () => {
-      if (done) return;
-      done = true;
-      clearTimeout(timer);
-      try {
-        socket.destroy();
-      } catch {}
-      resolve(true);
-    });
-    socket.once('error', () => {
-      if (done) return;
-      done = true;
-      clearTimeout(timer);
-      try {
-        socket.destroy();
-      } catch {}
-      resolve(false);
-    });
-  });
-}
-
-export function registerNetIpc() {
-  ipcMain.handle(
-    'net:probePorts',
-    async (_e, host: string, ports: number[], timeoutMs?: number) => {
-      const h = (host || 'localhost').trim() || 'localhost';
-      const ps = Array.isArray(ports) ? ports.map((p) => Number(p)).filter((p) => p > 0) : [];
-      const t = typeof timeoutMs === 'number' && timeoutMs > 0 ? timeoutMs : 800;
-      if (!ps.length) return { reachable: [] };
-      const results = await Promise.all(ps.map((p) => probePort(h, p, t)));
-      const reachable = ps.filter((_, i) => !!results[i]);
-      return { reachable };
-    }
-  );
-}
diff --git a/src/main/ipc/projectIpc.ts b/src/main/ipc/projectIpc.ts
deleted file mode 100644
index 9d6a25fd26..0000000000
--- a/src/main/ipc/projectIpc.ts
+++ /dev/null
@@ -1,204 +0,0 @@
-import { ipcMain, dialog } from 'electron';
-import { join } from 'path';
-import * as fs from 'fs';
-import { exec } from 'child_process';
-import { promisify } from 'util';
-import { getMainWindow } from '../app/window';
-import { errorTracking } from '../errorTracking';
-
-const execAsync = promisify(exec);
-const DEFAULT_REMOTE = 'origin';
-const DEFAULT_BRANCH = 'main';
-
-const normalizeRemoteName = (remote?: string | null) => {
-  if (!remote) return DEFAULT_REMOTE;
-  const trimmed = remote.trim();
-  if (!trimmed) return ''; // Empty string indicates no remote (local-only repo)
-  if (/^[A-Za-z0-9._-]+$/.test(trimmed) && !trimmed.includes('://')) {
-    return trimmed;
-  }
-  return DEFAULT_REMOTE;
-};
-
-const computeBaseRef = (remote?: string | null, branch?: string | null) => {
-  const remoteName = normalizeRemoteName(remote);
-  if (branch && branch.trim().length > 0) {
-    const trimmed = branch.trim();
-    if (trimmed.includes('/')) return trimmed;
-    // Prepend remote only if one exists
-    return remoteName ? `${remoteName}/${trimmed}` : trimmed;
-  }
-  // Default: use origin/main if remote exists, otherwise just 'main'
-  return remoteName ? `${remoteName}/${DEFAULT_BRANCH}` : DEFAULT_BRANCH;
-};
-
-const detectDefaultBranch = async (projectPath: string, remote?: string | null) => {
-  const remoteName = normalizeRemoteName(remote);
-  // If no remote, try to detect the current local branch
-  if (!remoteName) {
-    try {
-      const { stdout } = await execAsync('git branch --show-current', {
-        cwd: projectPath,
-      });
-      return stdout.trim() || null;
-    } catch {
-      return null;
-    }
-  }
-  // Try to get remote's default branch
-  try {
-    const { stdout } = await execAsync(`git remote show ${remoteName}`, {
-      cwd: projectPath,
-    });
-    const match = stdout.match(/HEAD branch:\s*(\S+)/);
-    return match ? match[1] : null;
-  } catch {
-    return null;
-  }
-};
-
-export function registerProjectIpc() {
-  ipcMain.handle('project:open', async () => {
-    try {
-      const result = await dialog.showOpenDialog(getMainWindow()!, {
-        title: 'Open Project',
-        properties: ['openDirectory'],
-        message: 'Select a project directory to open',
-      });
-
-      if (result.canceled || result.filePaths.length === 0) {
-        return { success: false, error: 'No directory selected' };
-      }
-
-      const projectPath = result.filePaths[0];
-      return { success: true, path: projectPath };
-    } catch (error) {
-      console.error('Failed to open project:', error);
-
-      // Track project open errors
-      await errorTracking.captureProjectError(error, 'open');
-
-      return { success: false, error: 'Failed to open project directory' };
-    }
-  });
-
-  ipcMain.handle(
-    'project:openFile',
-    async (_, args?: { title?: string; message?: string; filters?: Electron.FileFilter[] }) => {
-      try {
-        const result = await dialog.showOpenDialog(getMainWindow()!, {
-          title: args?.title || 'Select File',
-          properties: ['openFile'],
-          message: args?.message || 'Select a file',
-          filters: args?.filters,
-        });
-
-        if (result.canceled || result.filePaths.length === 0) {
-          return { success: false, error: 'No file selected' };
-        }
-
-        return { success: true, path: result.filePaths[0] };
-      } catch (error) {
-        console.error('Failed to open file dialog:', error);
-        return { success: false, error: 'Failed to open file selector' };
-      }
-    }
-  );
-
-  ipcMain.handle('git:getInfo', async (_, projectPath: string) => {
-    try {
-      const resolveRealPath = async (target: string) => {
-        try {
-          return await fs.promises.realpath(target);
-        } catch {
-          return target;
-        }
-      };
-
-      const resolvedProjectPath = await resolveRealPath(projectPath);
-      const gitPath = join(resolvedProjectPath, '.git');
-      const isGitRepo = fs.existsSync(gitPath);
-
-      if (!isGitRepo) {
-        return { isGitRepo: false, path: resolvedProjectPath };
-      }
-
-      // Get remote URL
-      let remote: string | null = null;
-      try {
-        const { stdout } = await execAsync('git remote get-url origin', {
-          cwd: resolvedProjectPath,
-        });
-        remote = stdout.trim();
-      } catch {}
-
-      // Get current branch
-      let branch: string | null = null;
-      try {
-        const { stdout } = await execAsync('git branch --show-current', {
-          cwd: resolvedProjectPath,
-        });
-        branch = stdout.trim();
-      } catch {}
-
-      let defaultBranch: string | null = null;
-      if (!branch) {
-        defaultBranch = await detectDefaultBranch(resolvedProjectPath, remote);
-      }
-
-      let upstream: string | null = null;
-      let aheadCount: number | null = null;
-      let behindCount: number | null = null;
-      try {
-        const { stdout } = await execAsync('git rev-parse --abbrev-ref --symbolic-full-name @{u}', {
-          cwd: resolvedProjectPath,
-        });
-        upstream = stdout.trim();
-      } catch {}
-
-      if (upstream) {
-        try {
-          const { stdout } = await execAsync('git rev-list --left-right --count HEAD...@{u}', {
-            cwd: resolvedProjectPath,
-          });
-          const [ahead, behind] = stdout.trim().split(/\s+/);
-          aheadCount = Number.parseInt(ahead, 10);
-          behindCount = Number.parseInt(behind, 10);
-        } catch {}
-      }
-
-      let rootPath: string | null = null;
-      try {
-        const { stdout } = await execAsync('git rev-parse --show-toplevel', {
-          cwd: resolvedProjectPath,
-        });
-        const trimmed = stdout.trim();
-        if (trimmed) {
-          rootPath = await resolveRealPath(trimmed);
-        }
-      } catch {}
-
-      const baseRef = computeBaseRef(remote, branch || defaultBranch);
-
-      const safeAhead =
-        typeof aheadCount === 'number' && Number.isFinite(aheadCount) ? aheadCount : undefined;
-      const safeBehind =
-        typeof behindCount === 'number' && Number.isFinite(behindCount) ? behindCount : undefined;
-
-      return {
-        isGitRepo: true,
-        remote,
-        branch,
-        baseRef,
-        upstream,
-        aheadCount: safeAhead,
-        behindCount: safeBehind,
-        path: resolvedProjectPath,
-        rootPath: rootPath || resolvedProjectPath,
-      };
-    } catch (error) {
-      console.error('Failed to get Git info:', error);
-      return { isGitRepo: false, error: 'Failed to read Git information', path: projectPath };
-    }
-  });
-}
diff --git a/src/main/ipc/projectSettingsIpc.ts b/src/main/ipc/projectSettingsIpc.ts
deleted file mode 100644
index a483effc88..0000000000
--- a/src/main/ipc/projectSettingsIpc.ts
+++ /dev/null
@@ -1,93 +0,0 @@
-import { ipcMain } from 'electron';
-import { log } from '../lib/logger';
-import { projectSettingsService } from '../services/ProjectSettingsService';
-import { worktreeService } from '../services/WorktreeService';
-
-type ProjectSettingsArgs = { projectId: string };
-type UpdateProjectSettingsArgs = { projectId: string; baseRef: string };
-
-const resolveProjectId = (input: ProjectSettingsArgs | string | undefined): string => {
-  if (!input) return '';
-  if (typeof input === 'string') return input;
-  return input.projectId;
-};
-
-export function registerProjectSettingsIpc() {
-  ipcMain.handle('projectSettings:get', async (_event, args: ProjectSettingsArgs | string) => {
-    try {
-      const projectId = resolveProjectId(args);
-      if (!projectId) {
-        throw new Error('projectId is required');
-      }
-      const settings = await projectSettingsService.getProjectSettings(projectId);
-      if (!settings) {
-        return { success: false, error: 'Project not found' };
-      }
-      return { success: true, settings };
-    } catch (error) {
-      log.error('Failed to get project settings', error);
-      return { success: false, error: error instanceof Error ? error.message : String(error) };
-    }
-  });
-
-  ipcMain.handle(
-    'projectSettings:update',
-    async (_event, args: UpdateProjectSettingsArgs | undefined) => {
-      try {
-        const projectId = args?.projectId;
-        const baseRef = args?.baseRef;
-        if (!projectId) {
-          throw new Error('projectId is required');
-        }
-        if (typeof baseRef !== 'string') {
-          throw new Error('baseRef is required');
-        }
-        const trimmed = baseRef.trim();
-        if (!trimmed) {
-          throw new Error('baseRef cannot be empty');
-        }
-        const settings = await projectSettingsService.updateProjectSettings(projectId, {
-          baseRef: trimmed,
-        });
-        return { success: true, settings };
-      } catch (error) {
-        log.error('Failed to update project settings', error);
-        return { success: false, error: error instanceof Error ? error.message : String(error) };
-      }
-    }
-  );
-
-  ipcMain.handle(
-    'projectSettings:fetchBaseRef',
-    async (
-      _event,
-      args:
-        | {
-            projectId: string;
-            projectPath: string;
-          }
-        | undefined
-    ) => {
-      try {
-        const projectId = args?.projectId;
-        const projectPath = args?.projectPath;
-        if (!projectId) {
-          throw new Error('projectId is required');
-        }
-        if (!projectPath) {
-          throw new Error('projectPath is required');
-        }
-        const info = await worktreeService.fetchLatestBaseRef(projectPath, projectId);
-        return {
-          success: true,
-          baseRef: info.fullRef,
-          remote: info.remote,
-          branch: info.branch,
-        };
-      } catch (error) {
-        log.error('Failed to fetch base branch', error);
-        return { success: false, error: error instanceof Error ? error.message : String(error) };
-      }
-    }
-  );
-}
diff --git a/src/main/ipc/settingsIpc.ts b/src/main/ipc/settingsIpc.ts
deleted file mode 100644
index 26d22a89b1..0000000000
--- a/src/main/ipc/settingsIpc.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { AppSettingsUpdate, getAppSettings, updateAppSettings } from '../settings';
-import { createRPCController } from '../../shared/ipc/rpc';
-
-export const appSettingsController = createRPCController({
-  get: async () => getAppSettings(),
-  update: (partial: AppSettingsUpdate) => updateAppSettings(partial || {}),
-});
diff --git a/src/main/ipc/skillsIpc.ts b/src/main/ipc/skillsIpc.ts
deleted file mode 100644
index a5cb63c69b..0000000000
--- a/src/main/ipc/skillsIpc.ts
+++ /dev/null
@@ -1,78 +0,0 @@
-import { ipcMain } from 'electron';
-import { skillsService } from '../services/SkillsService';
-import { log } from '../lib/logger';
-
-export function registerSkillsIpc(): void {
-  ipcMain.handle('skills:getCatalog', async () => {
-    try {
-      const catalog = await skillsService.getCatalogIndex();
-      return { success: true, data: catalog };
-    } catch (error) {
-      log.error('Failed to get skills catalog:', error);
-      return { success: false, error: error instanceof Error ? error.message : String(error) };
-    }
-  });
-
-  ipcMain.handle('skills:refreshCatalog', async () => {
-    try {
-      const catalog = await skillsService.refreshCatalog();
-      return { success: true, data: catalog };
-    } catch (error) {
-      log.error('Failed to refresh skills catalog:', error);
-      return { success: false, error: error instanceof Error ? error.message : String(error) };
-    }
-  });
-
-  ipcMain.handle('skills:install', async (_, args: { skillId: string }) => {
-    try {
-      const skill = await skillsService.installSkill(args.skillId);
-      return { success: true, data: skill };
-    } catch (error) {
-      log.error('Failed to install skill:', error);
-      return { success: false, error: error instanceof Error ? error.message : String(error) };
-    }
-  });
-
-  ipcMain.handle('skills:uninstall', async (_, args: { skillId: string }) => {
-    try {
-      await skillsService.uninstallSkill(args.skillId);
-      return { success: true };
-    } catch (error) {
-      log.error('Failed to uninstall skill:', error);
-      return { success: false, error: error instanceof Error ? error.message : String(error) };
-    }
-  });
-
-  ipcMain.handle('skills:getDetail', async (_, args: { skillId: string }) => {
-    try {
-      const skill = await skillsService.getSkillDetail(args.skillId);
-      return { success: true, data: skill };
-    } catch (error) {
-      log.error('Failed to get skill detail:', error);
-      return { success: false, error: error instanceof Error ? error.message : String(error) };
-    }
-  });
-
-  ipcMain.handle('skills:getDetectedAgents', async () => {
-    try {
-      const agents = await skillsService.getDetectedAgents();
-      return { success: true, data: agents };
-    } catch (error) {
-      log.error('Failed to detect agents:', error);
-      return { success: false, error: error instanceof Error ? error.message : String(error) };
-    }
-  });
-
-  ipcMain.handle(
-    'skills:create',
-    async (_, args: { name: string; description: string; content?: string }) => {
-      try {
-        const skill = await skillsService.createSkill(args.name, args.description, args.content);
-        return { success: true, data: skill };
-      } catch (error) {
-        log.error('Failed to create skill:', error);
-        return { success: false, error: error instanceof Error ? error.message : String(error) };
-      }
-    }
-  );
-}
diff --git a/src/main/ipc/sshIpc.ts b/src/main/ipc/sshIpc.ts
deleted file mode 100644
index 1cd643e954..0000000000
--- a/src/main/ipc/sshIpc.ts
+++ /dev/null
@@ -1,895 +0,0 @@
-import { ipcMain } from 'electron';
-import { SSH_IPC_CHANNELS } from '../../shared/ssh/types';
-import { sshService } from '../services/ssh/SshService';
-import { SshCredentialService } from '../services/ssh/SshCredentialService';
-import { SshHostKeyService } from '../services/ssh/SshHostKeyService';
-import { SshConnectionMonitor } from '../services/ssh/SshConnectionMonitor';
-import { getDrizzleClient } from '../db/drizzleClient';
-import { sshConnections as sshConnectionsTable, type SshConnectionInsert } from '../db/schema';
-import { eq, desc } from 'drizzle-orm';
-import { randomUUID } from 'crypto';
-import { quoteShellArg } from '../utils/shellEscape';
-import { parseSshConfigFile, resolveIdentityAgent } from '../utils/sshConfigParser';
-import type {
-  SshConfig,
-  ConnectionTestResult,
-  FileEntry,
-  ConnectionState,
-  SshConfigHost,
-} from '../../shared/ssh/types';
-
-// Initialize services
-const credentialService = new SshCredentialService();
-// Host key service initialized for future use (host key verification)
-const _hostKeyService = new SshHostKeyService();
-const monitor = new SshConnectionMonitor((id) => sshService.isConnected(id));
-
-// When ssh2 detects a dead connection (via keepalive) and emits `close`,
-// SshService removes it from the pool and emits `disconnected`.
-// The monitor reacts by triggering reconnect with exponential backoff.
-sshService.on('disconnected', (connectionId: string) => {
-  monitor.handleDisconnect(connectionId);
-});
-
-/**
- * Maps a database row to SshConfig
- */
-function mapRowToConfig(row: {
-  id: string;
-  name: string;
-  host: string;
-  port: number;
-  username: string;
-  authType: string;
-  privateKeyPath: string | null;
-  useAgent: number;
-}): SshConfig {
-  return {
-    id: row.id,
-    name: row.name,
-    host: row.host,
-    port: row.port,
-    username: row.username,
-    authType: row.authType as 'password' | 'key' | 'agent',
-    privateKeyPath: row.privateKeyPath ?? undefined,
-    useAgent: row.useAgent === 1,
-  };
-}
-
-/**
- * Validates that a remote path is safe to access.
- *
- * Uses a two-layer approach:
- *   1. Reject any path containing traversal sequences (even after normalization).
- *   2. Reject paths that resolve into known-sensitive directories.
- *
- * The path is resolved against '/' so that relative tricks like
- * "foo/../../etc/shadow" are caught.
- */
-function isPathSafe(remotePath: string): boolean {
-  // Must be an absolute path
-  if (!remotePath.startsWith('/')) {
-    return false;
-  }
-
-  // Normalize repeated slashes
-  const normalized = remotePath.replace(/\/+/g, '/');
-
-  // Reject any occurrence of '..' as a path component
-  // This catches ../  /..  and trailing /..
-  const segments = normalized.split('/');
-  if (segments.some((s) => s === '..')) {
-    return false;
-  }
-
-  // Block access to sensitive system directories and hidden dotfiles
-  const restrictedPrefixes = ['/etc/', '/proc/', '/sys/', '/dev/', '/boot/', '/root/'];
-  for (const prefix of restrictedPrefixes) {
-    if (normalized.startsWith(prefix) || normalized === prefix.slice(0, -1)) {
-      return false;
-    }
-  }
-
-  // Block .ssh directories anywhere in the path
-  if (segments.some((s) => s === '.ssh')) {
-    return false;
-  }
-
-  return true;
-}
-
-/**
- * Classify an SSH error into a safe, non-PII category for telemetry.
- */
-function classifySshError(err: any): string {
-  const msg = String(err?.message || err || '').toLowerCase();
-  if (msg.includes('authentication') || msg.includes('auth') || msg.includes('password')) {
-    return 'auth_failed';
-  }
-  if (msg.includes('timed out') || msg.includes('timeout')) {
-    return 'timeout';
-  }
-  if (
-    msg.includes('econnrefused') ||
-    msg.includes('enotfound') ||
-    msg.includes('enetunreach') ||
-    msg.includes('network')
-  ) {
-    return 'network';
-  }
-  if (msg.includes('key') || msg.includes('passphrase') || msg.includes('decrypt')) {
-    return 'key_error';
-  }
-  return 'unknown';
-}
-
-/**
- * Register all SSH IPC handlers
- */
-export function registerSshIpc() {
-  // Wire up reconnect handler so the monitor's reconnect event actually reconnects (HIGH #9)
-  monitor.on('reconnect', async (connectionId: string, config: SshConfig, attempt: number) => {
-    try {
-      console.log(`[sshIpc] Reconnecting ${connectionId} (attempt ${attempt})...`);
-
-      // Clean up the stale/dead connection before opening a new one
-      if (sshService.isConnected(connectionId)) {
-        await sshService.disconnect(connectionId).catch(() => {});
-      }
-
-      await sshService.connect(config);
-      monitor.updateState(connectionId, 'connected');
-      void import('../telemetry').then(({ capture }) => {
-        void capture('ssh_reconnect_attempted', { success: true });
-      });
-    } catch (err: any) {
-      console.error(
-        `[sshIpc] Reconnect attempt ${attempt} failed for ${connectionId}:`,
-        err.message
-      );
-      monitor.updateState(connectionId, 'error', err.message);
-      void import('../telemetry').then(({ capture }) => {
-        void capture('ssh_reconnect_attempted', { success: false });
-      });
-    }
-  });
-  // Test connection
-  ipcMain.handle(
-    SSH_IPC_CHANNELS.TEST_CONNECTION,
-    async (
-      _,
-      config: SshConfig & { password?: string; passphrase?: string }
-    ): Promise<ConnectionTestResult> => {
-      try {
-        const { Client } = await import('ssh2');
-        const debugLogs: string[] = [];
-        const testClient = new Client();
-
-        return new Promise(async (resolve) => {
-          const startTime = Date.now();
-
-          testClient.on('ready', () => {
-            const latency = Date.now() - startTime;
-            testClient.end();
-            resolve({ success: true, latency, debugLogs });
-          });
-
-          testClient.on('error', (err: Error) => {
-            resolve({ success: false, error: err.message, debugLogs });
-          });
-
-          testClient.on('keyboard-interactive', () => {
-            // Close the connection if keyboard-interactive auth is required
-            testClient.end();
-            resolve({
-              success: false,
-              error: 'Keyboard-interactive authentication not supported',
-              debugLogs,
-            });
-          });
-
-          const connectConfig: {
-            host: string;
-            port: number;
-            username: string;
-            readyTimeout: number;
-            password?: string;
-            privateKey?: Buffer;
-            passphrase?: string;
-            agent?: string;
-            debug?: (info: string) => void;
-          } = {
-            host: config.host,
-            port: config.port,
-            username: config.username,
-            readyTimeout: 10000,
-            debug: (info: string) => debugLogs.push(info),
-          };
-
-          if (config.authType === 'password') {
-            connectConfig.password = config.password;
-          } else if (config.authType === 'key' && config.privateKeyPath) {
-            const fs = require('fs');
-            const os = require('os');
-            try {
-              // Expand ~ to home directory
-              let keyPath = config.privateKeyPath;
-              if (keyPath.startsWith('~/')) {
-                keyPath = keyPath.replace('~', os.homedir());
-              } else if (keyPath === '~') {
-                keyPath = os.homedir();
-              }
-
-              connectConfig.privateKey = fs.readFileSync(keyPath);
-              if (config.passphrase) {
-                connectConfig.passphrase = config.passphrase;
-              }
-            } catch (err: any) {
-              resolve({
-                success: false,
-                error: `Failed to read private key: ${err.message}`,
-                debugLogs,
-              });
-              return;
-            }
-          } else if (config.authType === 'agent') {
-            const identityAgent = await resolveIdentityAgent(config.host);
-            connectConfig.agent = identityAgent || process.env.SSH_AUTH_SOCK;
-          }
-
-          testClient.connect(connectConfig);
-        });
-      } catch (err: any) {
-        console.error('[sshIpc] Test connection error:', err);
-        return { success: false, error: err.message };
-      }
-    }
-  );
-
-  // Save connection
-  ipcMain.handle(
-    SSH_IPC_CHANNELS.SAVE_CONNECTION,
-    async (
-      _,
-      config: SshConfig & { password?: string; passphrase?: string }
-    ): Promise<{ success: boolean; connection?: SshConfig; error?: string }> => {
-      try {
-        const { db } = await getDrizzleClient();
-
-        // Generate ID if not provided
-        const connectionId =
-          config.id ?? `ssh-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
-
-        // Save credentials first (secure keychain storage)
-        if (config.password) {
-          await credentialService.storePassword(connectionId, config.password);
-        }
-        if (config.passphrase) {
-          await credentialService.storePassphrase(connectionId, config.passphrase);
-        }
-
-        // Strip sensitive data before saving to DB
-        const { password: _password, passphrase: _passphrase, ...dbConfig } = config;
-
-        const insertData: SshConnectionInsert = {
-          id: connectionId,
-          name: dbConfig.name,
-          host: dbConfig.host,
-          port: dbConfig.port,
-          username: dbConfig.username,
-          authType: dbConfig.authType,
-          privateKeyPath: dbConfig.privateKeyPath,
-          useAgent: dbConfig.useAgent ? 1 : 0,
-        };
-
-        // Insert or update
-        await db
-          .insert(sshConnectionsTable)
-          .values(insertData)
-          .onConflictDoUpdate({
-            target: sshConnectionsTable.id,
-            set: {
-              name: insertData.name,
-              host: insertData.host,
-              port: insertData.port,
-              username: insertData.username,
-              authType: insertData.authType,
-              privateKeyPath: insertData.privateKeyPath,
-              useAgent: insertData.useAgent,
-              updatedAt: new Date().toISOString(),
-            },
-          });
-
-        void import('../telemetry').then(({ capture }) => {
-          void capture('ssh_connection_saved', { type: config.authType });
-        });
-
-        return {
-          success: true,
-          connection: {
-            ...dbConfig,
-            id: connectionId,
-          },
-        };
-      } catch (err: any) {
-        console.error('[sshIpc] Save connection error:', err);
-        return { success: false, error: err.message };
-      }
-    }
-  );
-
-  // Get connections
-  ipcMain.handle(
-    SSH_IPC_CHANNELS.GET_CONNECTIONS,
-    async (): Promise<{ success: boolean; connections?: SshConfig[]; error?: string }> => {
-      try {
-        const { db } = await getDrizzleClient();
-
-        const rows = await db
-          .select({
-            id: sshConnectionsTable.id,
-            name: sshConnectionsTable.name,
-            host: sshConnectionsTable.host,
-            port: sshConnectionsTable.port,
-            username: sshConnectionsTable.username,
-            authType: sshConnectionsTable.authType,
-            privateKeyPath: sshConnectionsTable.privateKeyPath,
-            useAgent: sshConnectionsTable.useAgent,
-          })
-          .from(sshConnectionsTable)
-          .orderBy(desc(sshConnectionsTable.updatedAt));
-
-        return {
-          success: true,
-          connections: rows.map(mapRowToConfig),
-        };
-      } catch (err: any) {
-        console.error('[sshIpc] Get connections error:', err);
-        return { success: false, error: err.message };
-      }
-    }
-  );
-
-  // Delete connection
-  ipcMain.handle(
-    SSH_IPC_CHANNELS.DELETE_CONNECTION,
-    async (_, id: string): Promise<{ success: boolean; error?: string }> => {
-      try {
-        // Stop monitoring BEFORE disconnecting so the monitor's
-        // handleDisconnect listener doesn't trigger a reconnect.
-        monitor.stopMonitoring(id);
-        if (sshService.isConnected(id)) {
-          try {
-            await sshService.disconnect(id);
-          } catch {
-            // Best-effort: continue with deletion even if disconnect fails
-          }
-        }
-
-        const { db } = await getDrizzleClient();
-
-        // Delete credentials
-        await credentialService.deleteAllCredentials(id);
-
-        // Delete from database
-        await db.delete(sshConnectionsTable).where(eq(sshConnectionsTable.id, id));
-
-        void import('../telemetry').then(({ capture }) => {
-          void capture('ssh_connection_deleted');
-        });
-
-        return { success: true };
-      } catch (err: any) {
-        console.error('[sshIpc] Delete connection error:', err);
-        return { success: false, error: err.message };
-      }
-    }
-  );
-
-  // Connect
-  ipcMain.handle(
-    SSH_IPC_CHANNELS.CONNECT,
-    async (
-      _,
-      arg: unknown
-    ): Promise<{ success: boolean; connectionId?: string; error?: string }> => {
-      try {
-        // Accept either a saved connection id (string) or a config object.
-        if (typeof arg === 'string') {
-          const id = arg;
-          const { db } = await getDrizzleClient();
-          const rows = await db
-            .select({
-              id: sshConnectionsTable.id,
-              name: sshConnectionsTable.name,
-              host: sshConnectionsTable.host,
-              port: sshConnectionsTable.port,
-              username: sshConnectionsTable.username,
-              authType: sshConnectionsTable.authType,
-              privateKeyPath: sshConnectionsTable.privateKeyPath,
-              useAgent: sshConnectionsTable.useAgent,
-            })
-            .from(sshConnectionsTable)
-            .where(eq(sshConnectionsTable.id, id))
-            .limit(1);
-
-          const row = rows[0];
-          if (!row) {
-            return { success: false, error: `SSH connection not found: ${id}` };
-          }
-
-          const loadedConfig = mapRowToConfig(row);
-          const connectionId = await sshService.connect(loadedConfig);
-          // startMonitoring is a no-op if already tracked; updateState
-          // is a no-op if not tracked. Call both to handle fresh connects
-          // and re-connects after the monitor gave up (state = disconnected).
-          monitor.startMonitoring(connectionId, loadedConfig);
-          monitor.updateState(connectionId, 'connected');
-          void import('../telemetry').then(({ capture }) => {
-            void capture('ssh_connect_success', { type: loadedConfig.authType });
-          });
-          return { success: true, connectionId };
-        }
-
-        if (!arg || typeof arg !== 'object') {
-          return { success: false, error: 'Invalid SSH connect request' };
-        }
-
-        const config = arg as SshConfig & { password?: string; passphrase?: string };
-        const effectiveId = config.id ?? randomUUID();
-
-        // If secrets are provided inline, store them for this id.
-        if (config.authType === 'password' && typeof config.password === 'string') {
-          await credentialService.storePassword(effectiveId, config.password);
-        }
-        if (
-          config.authType === 'key' &&
-          typeof config.passphrase === 'string' &&
-          config.passphrase
-        ) {
-          await credentialService.storePassphrase(effectiveId, config.passphrase);
-        }
-
-        // Load credentials from keychain if needed
-        let password = config.password;
-        let passphrase = config.passphrase;
-
-        if (config.authType === 'password' && !password) {
-          password = (await credentialService.getPassword(effectiveId)) ?? undefined;
-        }
-        if (config.authType === 'key' && !passphrase) {
-          passphrase = (await credentialService.getPassphrase(effectiveId)) ?? undefined;
-        }
-
-        const fullConfig = {
-          ...config,
-          id: effectiveId,
-          password,
-          passphrase,
-        };
-
-        const connectionId = await sshService.connect(fullConfig as any);
-        monitor.startMonitoring(connectionId, fullConfig as any);
-        monitor.updateState(connectionId, 'connected');
-        void import('../telemetry').then(({ capture }) => {
-          void capture('ssh_connect_success', { type: config.authType });
-        });
-        return { success: true, connectionId };
-      } catch (err: any) {
-        console.error('[sshIpc] Connection error:', err);
-        void import('../telemetry').then(({ capture }) => {
-          void capture('ssh_connect_failed', { error_type: classifySshError(err) });
-        });
-        return { success: false, error: err.message };
-      }
-    }
-  );
-
-  // Disconnect
-  ipcMain.handle(
-    SSH_IPC_CHANNELS.DISCONNECT,
-    async (_, connectionId: string): Promise<{ success: boolean; error?: string }> => {
-      try {
-        // Stop monitoring BEFORE disconnecting so the monitor's
-        // handleDisconnect listener doesn't trigger a reconnect
-        // for an intentional disconnect.
-        monitor.stopMonitoring(connectionId);
-        await sshService.disconnect(connectionId);
-        void import('../telemetry').then(({ capture }) => {
-          void capture('ssh_disconnected');
-        });
-        return { success: true };
-      } catch (err: any) {
-        console.error('[sshIpc] Disconnect error:', err);
-        return { success: false, error: err.message };
-      }
-    }
-  );
-
-  // Execute command (guarded: only allow known-safe command prefixes from renderer)
-  const ALLOWED_COMMAND_PREFIXES = [
-    'git ',
-    'ls ',
-    'pwd',
-    'cat ',
-    'head ',
-    'tail ',
-    'wc ',
-    'stat ',
-    'file ',
-    'which ',
-    'echo ',
-    'test ',
-    '[ ',
-  ];
-
-  ipcMain.handle(
-    SSH_IPC_CHANNELS.EXECUTE_COMMAND,
-    async (
-      _,
-      connectionId: string,
-      command: string,
-      cwd?: string
-    ): Promise<{
-      success: boolean;
-      stdout?: string;
-      stderr?: string;
-      exitCode?: number;
-      error?: string;
-    }> => {
-      try {
-        // Validate the command against the allowlist
-        const trimmed = command.trimStart();
-        const isAllowed = ALLOWED_COMMAND_PREFIXES.some(
-          (prefix) => trimmed === prefix.trimEnd() || trimmed.startsWith(prefix)
-        );
-        if (!isAllowed) {
-          console.warn(`[sshIpc] Blocked disallowed command: ${trimmed.slice(0, 80)}`);
-          return { success: false, error: 'Command not allowed' };
-        }
-
-        const result = await sshService.executeCommand(connectionId, command, cwd);
-        return { success: true, ...result };
-      } catch (error: any) {
-        console.error('[sshIpc] Execute command error:', error);
-        return { success: false, error: error.message };
-      }
-    }
-  );
-
-  // List files
-  ipcMain.handle(
-    SSH_IPC_CHANNELS.LIST_FILES,
-    async (
-      _,
-      connectionId: string,
-      path: string
-    ): Promise<{ success: boolean; files?: FileEntry[]; error?: string }> => {
-      try {
-        // Validate path to prevent browsing sensitive directories
-        if (!isPathSafe(path)) {
-          return { success: false, error: 'Access denied: path is restricted' };
-        }
-
-        const sftp = await sshService.getSftp(connectionId);
-
-        return new Promise((resolve) => {
-          sftp.readdir(path, (err, list) => {
-            if (err) {
-              resolve({ success: false, error: `Failed to list files: ${err.message}` });
-              return;
-            }
-
-            const entries: FileEntry[] = list.map((item) => {
-              const isDirectory = item.attrs.isDirectory();
-              const isSymlink = item.attrs.isSymbolicLink();
-
-              let type: 'file' | 'directory' | 'symlink' = 'file';
-              if (isDirectory) type = 'directory';
-              else if (isSymlink) type = 'symlink';
-
-              return {
-                path: `${path}/${item.filename}`.replace(/\/+/g, '/'),
-                name: item.filename,
-                type,
-                size: item.attrs.size,
-                modifiedAt: new Date(item.attrs.mtime * 1000),
-                permissions: item.attrs.mode?.toString(8),
-              };
-            });
-
-            resolve({ success: true, files: entries });
-          });
-        });
-      } catch (error: any) {
-        console.error('[sshIpc] List files error:', error);
-        return { success: false, error: error.message };
-      }
-    }
-  );
-
-  // Read file
-  ipcMain.handle(
-    SSH_IPC_CHANNELS.READ_FILE,
-    async (
-      _,
-      connectionId: string,
-      path: string
-    ): Promise<{ success: boolean; content?: string; error?: string }> => {
-      try {
-        // Validate path to prevent access to sensitive files
-        if (!isPathSafe(path)) {
-          return { success: false, error: 'Access denied: path is restricted' };
-        }
-
-        const sftp = await sshService.getSftp(connectionId);
-
-        return new Promise((resolve) => {
-          sftp.readFile(path, 'utf-8', (err, data) => {
-            if (err) {
-              resolve({ success: false, error: `Failed to read file: ${err.message}` });
-              return;
-            }
-            resolve({ success: true, content: data.toString() });
-          });
-        });
-      } catch (error: any) {
-        console.error('[sshIpc] Read file error:', error);
-        return { success: false, error: error.message };
-      }
-    }
-  );
-
-  // Write file
-  ipcMain.handle(
-    SSH_IPC_CHANNELS.WRITE_FILE,
-    async (
-      _,
-      connectionId: string,
-      path: string,
-      content: string
-    ): Promise<{ success: boolean; error?: string }> => {
-      try {
-        // Validate path to prevent writing to sensitive files
-        if (!isPathSafe(path)) {
-          return { success: false, error: 'Access denied: path is restricted' };
-        }
-
-        const sftp = await sshService.getSftp(connectionId);
-
-        return new Promise((resolve) => {
-          sftp.writeFile(path, content, 'utf-8', (err) => {
-            if (err) {
-              resolve({ success: false, error: `Failed to write file: ${err.message}` });
-              return;
-            }
-            resolve({ success: true });
-          });
-        });
-      } catch (error: any) {
-        console.error('[sshIpc] Write file error:', error);
-        return { success: false, error: error.message };
-      }
-    }
-  );
-
-  // Get state
-  ipcMain.handle(
-    SSH_IPC_CHANNELS.GET_STATE,
-    async (
-      _,
-      connectionId: string
-    ): Promise<{ success: boolean; state?: ConnectionState; error?: string }> => {
-      try {
-        const state = monitor.getState(connectionId);
-        return { success: true, state };
-      } catch (err: any) {
-        console.error('[sshIpc] Get state error:', err);
-        return { success: false, error: err.message };
-      }
-    }
-  );
-
-  // Get SSH config hosts from ~/.ssh/config
-  ipcMain.handle(
-    SSH_IPC_CHANNELS.GET_SSH_CONFIG,
-    async (): Promise<{ success: boolean; hosts?: SshConfigHost[]; error?: string }> => {
-      try {
-        const hosts = await parseSshConfigFile();
-        // Filter out wildcard patterns (Host *, Host ?) — not useful in host dropdowns
-        const concreteHosts = hosts.filter((h) => !h.host.includes('*') && !h.host.includes('?'));
-        return { success: true, hosts: concreteHosts };
-      } catch (err: any) {
-        console.error('[sshIpc] Get SSH config error:', err);
-        return { success: false, error: err.message };
-      }
-    }
-  );
-
-  // Get a specific SSH config host by alias
-  ipcMain.handle(
-    SSH_IPC_CHANNELS.GET_SSH_CONFIG_HOST,
-    async (
-      _,
-      hostAlias: string
-    ): Promise<{ success: boolean; host?: SshConfigHost; error?: string }> => {
-      try {
-        if (!hostAlias || typeof hostAlias !== 'string') {
-          return { success: false, error: 'Host alias is required' };
-        }
-
-        const hosts = await parseSshConfigFile();
-        const host = hosts
-          .filter((h) => !h.host.includes('*') && !h.host.includes('?'))
-          .find((h) => h.host.toLowerCase() === hostAlias.toLowerCase());
-
-        if (!host) {
-          return { success: false, error: `Host alias not found: ${hostAlias}` };
-        }
-
-        return { success: true, host };
-      } catch (err: any) {
-        console.error('[sshIpc] Get SSH config host error:', err);
-        return { success: false, error: err.message };
-      }
-    }
-  );
-
-  // Check if a remote path is a git repository
-  ipcMain.handle(
-    SSH_IPC_CHANNELS.CHECK_IS_GIT_REPO,
-    async (
-      _,
-      connectionId: string,
-      remotePath: string
-    ): Promise<{ success: boolean; isGitRepo?: boolean; error?: string }> => {
-      try {
-        if (!remotePath || !remotePath.startsWith('/')) {
-          return { success: false, error: 'An absolute remote path is required' };
-        }
-        if (!isPathSafe(remotePath)) {
-          return { success: false, error: 'Access denied: path is restricted' };
-        }
-
-        const result = await sshService.executeCommand(
-          connectionId,
-          `git -C ${quoteShellArg(remotePath)} rev-parse --is-inside-work-tree 2>/dev/null`
-        );
-        const isGitRepo = result.exitCode === 0 && result.stdout.trim() === 'true';
-        return { success: true, isGitRepo };
-      } catch (err: any) {
-        console.error('[sshIpc] Check git repo error:', err);
-        return { success: false, error: err.message };
-      }
-    }
-  );
-
-  // Initialize a new git repository on the remote machine
-  ipcMain.handle(
-    SSH_IPC_CHANNELS.INIT_REPO,
-    async (
-      _,
-      connectionId: string,
-      parentPath: string,
-      repoName: string
-    ): Promise<{ success: boolean; path?: string; error?: string }> => {
-      try {
-        if (!parentPath || !parentPath.startsWith('/')) {
-          return { success: false, error: 'An absolute parent path is required' };
-        }
-        if (!isPathSafe(parentPath)) {
-          return { success: false, error: 'Access denied: path is restricted' };
-        }
-        // Validate repo name: alphanumeric, hyphens, underscores, dots
-        if (!repoName || !/^[a-zA-Z0-9][a-zA-Z0-9._-]*$/.test(repoName)) {
-          return {
-            success: false,
-            error:
-              'Invalid repository name. Use letters, numbers, hyphens, underscores, and dots. Must start with a letter or number.',
-          };
-        }
-
-        const repoPath = `${parentPath.replace(/\/+$/, '')}/${repoName}`;
-        if (!isPathSafe(repoPath)) {
-          return { success: false, error: 'Access denied: target path is restricted' };
-        }
-
-        // Check if directory already exists
-        const checkResult = await sshService.executeCommand(
-          connectionId,
-          `test -d ${quoteShellArg(repoPath)} && echo exists || echo absent`
-        );
-        if (checkResult.stdout.trim() === 'exists') {
-          return { success: false, error: `Directory already exists: ${repoPath}` };
-        }
-
-        // Create directory and initialize git repo
-        const initResult = await sshService.executeCommand(
-          connectionId,
-          `mkdir -p ${quoteShellArg(repoPath)} && git -C ${quoteShellArg(repoPath)} init`
-        );
-        if (initResult.exitCode !== 0) {
-          return {
-            success: false,
-            error: `Failed to initialize repository: ${initResult.stderr || initResult.stdout}`,
-          };
-        }
-
-        void import('../telemetry').then(({ capture }) => {
-          void capture('ssh_repo_init');
-        });
-
-        return { success: true, path: repoPath };
-      } catch (err: any) {
-        console.error('[sshIpc] Init repo error:', err);
-        return { success: false, error: err.message };
-      }
-    }
-  );
-
-  // Clone a repository on the remote machine
-  ipcMain.handle(
-    SSH_IPC_CHANNELS.CLONE_REPO,
-    async (
-      _,
-      connectionId: string,
-      repoUrl: string,
-      targetPath: string
-    ): Promise<{ success: boolean; path?: string; error?: string }> => {
-      try {
-        if (!repoUrl || typeof repoUrl !== 'string') {
-          return { success: false, error: 'Repository URL is required' };
-        }
-        // Validate URL format
-        const urlPatterns = [/^https?:\/\/.+/i, /^git@.+:.+/i, /^ssh:\/\/.+/i];
-        if (!urlPatterns.some((p) => p.test(repoUrl.trim()))) {
-          return {
-            success: false,
-            error: 'Invalid repository URL. Use https://, git@, or ssh:// format.',
-          };
-        }
-
-        if (!targetPath || !targetPath.startsWith('/')) {
-          return { success: false, error: 'An absolute target path is required' };
-        }
-        if (!isPathSafe(targetPath)) {
-          return { success: false, error: 'Access denied: path is restricted' };
-        }
-
-        // Check if target already exists
-        const checkResult = await sshService.executeCommand(
-          connectionId,
-          `test -e ${quoteShellArg(targetPath)} && echo exists || echo absent`
-        );
-        if (checkResult.stdout.trim() === 'exists') {
-          return { success: false, error: `Target path already exists: ${targetPath}` };
-        }
-
-        // Ensure parent directory exists
-        const parentDir = targetPath.replace(/\/[^/]+\/?$/, '') || '/';
-        await sshService.executeCommand(connectionId, `mkdir -p ${quoteShellArg(parentDir)}`);
-
-        // Clone the repository
-        const cloneResult = await sshService.executeCommand(
-          connectionId,
-          `git clone ${quoteShellArg(repoUrl.trim())} ${quoteShellArg(targetPath)}`
-        );
-        if (cloneResult.exitCode !== 0) {
-          return {
-            success: false,
-            error: `Clone failed: ${cloneResult.stderr || cloneResult.stdout}`,
-          };
-        }
-
-        void import('../telemetry').then(({ capture }) => {
-          void capture('ssh_repo_clone');
-        });
-
-        return { success: true, path: targetPath };
-      } catch (err: any) {
-        console.error('[sshIpc] Clone repo error:', err);
-        return { success: false, error: err.message };
-      }
-    }
-  );
-}
diff --git a/src/main/ipc/telemetryIpc.ts b/src/main/ipc/telemetryIpc.ts
deleted file mode 100644
index 89e046aca9..0000000000
--- a/src/main/ipc/telemetryIpc.ts
+++ /dev/null
@@ -1,158 +0,0 @@
-import { ipcMain } from 'electron';
-import {
-  capture,
-  captureException,
-  isTelemetryEnabled,
-  getTelemetryStatus,
-  setTelemetryEnabledViaUser,
-  setOnboardingSeen,
-} from '../telemetry';
-
-// Events allowed from renderer process
-// Main process-only events (app_started, app_closed, app_window_focused, github_connection_triggered,
-// github_connected, task_snapshot, app_session, agent_run_start, agent_run_finish) should NOT be here
-const RENDERER_ALLOWED_EVENTS = new Set([
-  // Error tracking
-  '$exception', // PostHog error tracking format
-  // Legacy
-  'feature_used',
-  'error',
-  // Project management
-  'project_add_clicked',
-  'project_open_clicked',
-  'project_added_success',
-  'project_deleted',
-  'project_view_opened',
-  // Task management
-  'task_created',
-  'task_deleted',
-  'task_provider_switched',
-  'task_custom_named',
-  'task_advanced_options_opened',
-  // Terminal (Right Sidebar)
-  'terminal_entered',
-  'terminal_command_executed',
-  'terminal_new_terminal_created',
-  'terminal_deleted',
-  // Changes (Right Sidebar)
-  'changes_viewed',
-  // Plan mode
-  'plan_mode_enabled',
-  'plan_mode_disabled',
-  // Git & Pull Requests
-  'pr_created',
-  'pr_creation_failed',
-  'pr_viewed',
-  // Linear integration
-  'linear_connected',
-  'linear_disconnected',
-  'linear_issues_searched',
-  'linear_issue_selected',
-  // Jira integration
-  'jira_connected',
-  'jira_disconnected',
-  'jira_issues_searched',
-  'jira_issue_selected',
-  // Container & Dev Environment
-  'container_connect_clicked',
-  'container_connect_success',
-  'container_connect_failed',
-  // ToolBar Section
-  'toolbar_feedback_clicked',
-  'toolbar_left_sidebar_clicked',
-  'toolbar_right_sidebar_clicked',
-  'toolbar_settings_clicked',
-  'toolbar_open_in_menu_clicked',
-  'toolbar_open_in_selected',
-  'toolbar_kanban_toggled',
-  // Browser Preview
-  'browser_preview_opened',
-  'browser_preview_closed',
-  'browser_preview_url_navigated',
-  // Skills
-  'skills_view_opened',
-  'skill_installed',
-  'skill_uninstalled',
-  'skill_created',
-  'skill_detail_viewed',
-  // Remote Server / SSH
-  'remote_project_modal_opened',
-  'remote_project_connection_tested',
-  'remote_project_created',
-  'ssh_settings_opened',
-  // GitHub issues
-  'github_issues_searched',
-  'github_issue_selected',
-  // GitLab integration
-  'gitlab_connected',
-  'gitlab_disconnected',
-  'gitlab_issues_searched',
-  'gitlab_issue_selected',
-  // Task with issue
-  'task_created_with_issue',
-  // Settings & Preferences
-  'settings_tab_viewed',
-  'theme_changed',
-  'telemetry_toggled',
-  'notification_settings_changed',
-  'default_provider_changed',
-]);
-
-export function registerTelemetryIpc() {
-  ipcMain.handle('telemetry:capture', async (_event, args: { event: string; properties?: any }) => {
-    try {
-      if (!isTelemetryEnabled()) return { success: false, disabled: true };
-      const ev = String(args?.event || '') as any;
-      if (!RENDERER_ALLOWED_EVENTS.has(ev)) {
-        return { success: false, error: 'event_not_allowed' };
-      }
-      const props =
-        args?.properties && typeof args.properties === 'object' ? args.properties : undefined;
-
-      // Handle $exception events specially for PostHog error tracking
-      if (ev === '$exception') {
-        // Extract error details from properties
-        const errorMessage = props?.$exception_message || 'Unknown error';
-        const error = new Error(errorMessage);
-        error.stack = props?.$exception_stack_trace_raw || '';
-        error.name = props?.$exception_type || 'Error';
-
-        // Call captureException with the error and additional properties
-        captureException(error, props);
-      } else {
-        // Regular telemetry events
-        capture(ev, props);
-      }
-
-      return { success: true };
-    } catch (e: any) {
-      return { success: false, error: e?.message || 'capture_failed' };
-    }
-  });
-
-  ipcMain.handle('telemetry:get-status', async () => {
-    try {
-      return { success: true, status: getTelemetryStatus() };
-    } catch (e: any) {
-      return { success: false, error: e?.message || 'status_failed' };
-    }
-  });
-
-  ipcMain.handle('telemetry:set-enabled', async (_event, enabled: boolean) => {
-    try {
-      setTelemetryEnabledViaUser(Boolean(enabled));
-      return { success: true, status: getTelemetryStatus() };
-    } catch (e: any) {
-      return { success: false, error: e?.message || 'update_failed' };
-    }
-  });
-
-  ipcMain.handle('telemetry:set-onboarding-seen', async (_event, flag: boolean) => {
-    try {
-      setOnboardingSeen(Boolean(flag));
-      return { success: true, status: getTelemetryStatus() };
-    } catch (e: any) {
-      return { success: false, error: e?.message || 'update_failed' };
-    }
-  });
-}
diff --git a/src/main/lib/events.ts b/src/main/lib/events.ts
new file mode 100644
index 0000000000..b9172d36df
--- /dev/null
+++ b/src/main/lib/events.ts
@@ -0,0 +1,23 @@
+import { ipcMain } from 'electron';
+import { createEventEmitter, type EmitterAdapter } from '@shared/ipc/events';
+import { getMainWindow } from '@main/app/window';
+
+function createMainAdapter(): EmitterAdapter {
+  return {
+    emit: (eventName: string, data: unknown, topic?: string) => {
+      const channel = topic ? `${eventName}.${topic}` : eventName;
+      const win = getMainWindow();
+      if (win && !win.isDestroyed()) {
+        win.webContents.send(channel, data);
+      }
+    },
+    on: (eventName: string, cb: (data: unknown) => void, topic?: string) => {
+      const channel = topic ? `${eventName}.${topic}` : eventName;
+      const handler = (_e: Electron.IpcMainEvent, data: unknown) => cb(data);
+      ipcMain.on(channel, handler);
+      return () => ipcMain.removeListener(channel, handler);
+    },
+  };
+}
+
+export const events = createEventEmitter(createMainAdapter());
diff --git a/src/main/lib/logger.ts b/src/main/lib/logger.ts
index c6e55e853b..ffad11dca6 100644
--- a/src/main/lib/logger.ts
+++ b/src/main/lib/logger.ts
@@ -1,39 +1,6 @@
-type Level = 'debug' | 'info' | 'warn' | 'error';
+import { createLogger } from '@shared/logger';
 
-function envLevel(): Level {
-  const hasDebugFlag = process.argv.includes('--debug-logs') || process.argv.includes('--dev');
-  if (hasDebugFlag) return 'debug';
-  return 'warn';
-}
-
-function enabled(target: Level, current: Level): boolean {
-  const order: Record<Level, number> = { debug: 10, info: 20, warn: 30, error: 40 };
-  return order[target] >= order[current];
-}
-
-const current = envLevel();
-
-export const log = {
-  debug: (...args: any[]) => {
-    if (enabled('debug', current)) {
-      // eslint-disable-next-line no-console
-      console.debug(...args);
-    }
-  },
-  info: (...args: any[]) => {
-    if (enabled('info', current)) {
-      // eslint-disable-next-line no-console
-      console.info(...args);
-    }
-  },
-  warn: (...args: any[]) => {
-    if (enabled('warn', current)) {
-      // eslint-disable-next-line no-console
-      console.warn(...args);
-    }
-  },
-  error: (...args: any[]) => {
-    // eslint-disable-next-line no-console
-    console.error(...args);
-  },
-};
+export const log = createLogger({
+  envLevel: process.env.LOG_LEVEL,
+  debugFlag: process.argv.includes('--debug-logs'),
+});
diff --git a/src/main/lib/prCreateBodyPlan.ts b/src/main/lib/prCreateBodyPlan.ts
deleted file mode 100644
index ca53e9477c..0000000000
--- a/src/main/lib/prCreateBodyPlan.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-type CreatePrBodyPlanArgs = {
-  fill?: boolean;
-  title?: string;
-  rawBody?: string;
-  enrichedBody?: string;
-};
-
-export type CreatePrBodyPlan = {
-  shouldPatchFilledBody: boolean;
-  shouldUseBodyFile: boolean;
-  shouldUseFill: boolean;
-};
-
-export function getCreatePrBodyPlan(args: CreatePrBodyPlanArgs): CreatePrBodyPlan {
-  const { fill, title, rawBody, enrichedBody } = args;
-
-  // When fill is requested with no explicit body, footer-only content must be
-  // applied after creation so gh can keep its fill-generated body.
-  const shouldPatchFilledBody = Boolean(fill && !rawBody && enrichedBody);
-  const shouldUseBodyFile = Boolean(enrichedBody && !shouldPatchFilledBody);
-
-  // Use fill when caller requested it and either:
-  // - we need to patch footer after gh generates body, or
-  // - title/body are missing and gh should infer them.
-  const shouldUseFill = Boolean(fill && (shouldPatchFilledBody || !title || !enrichedBody));
-
-  return { shouldPatchFilledBody, shouldUseBodyFile, shouldUseFill };
-}
diff --git a/src/main/lib/prIssueFooter.ts b/src/main/lib/prIssueFooter.ts
deleted file mode 100644
index 0bac2c442c..0000000000
--- a/src/main/lib/prIssueFooter.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-const START_MARKER = '<!-- emdash-issue-footer:start -->';
-const END_MARKER = '<!-- emdash-issue-footer:end -->';
-
-const ISSUE_FOOTER_BLOCK_RE =
-  /\n?<!-- emdash-issue-footer:start -->[\s\S]*?<!-- emdash-issue-footer:end -->\n?/g;
-
-function stripInjectedIssueFooter(body: string): string {
-  return body.replace(ISSUE_FOOTER_BLOCK_RE, '').trimEnd();
-}
-
-function getFixesLines(metadata: unknown): string[] {
-  if (!metadata || typeof metadata !== 'object') {
-    return [];
-  }
-
-  const md = metadata as {
-    githubIssue?: { number?: number | string | null } | null;
-    linearIssue?: { identifier?: string | null } | null;
-  };
-
-  const lines: string[] = [];
-
-  const ghNumberRaw = md.githubIssue?.number;
-  const ghNumber =
-    typeof ghNumberRaw === 'number'
-      ? ghNumberRaw
-      : typeof ghNumberRaw === 'string'
-        ? Number.parseInt(ghNumberRaw, 10)
-        : NaN;
-  if (Number.isFinite(ghNumber) && ghNumber > 0) {
-    lines.push(`Fixes #${ghNumber}`);
-  }
-
-  const linearIdentifier =
-    typeof md.linearIssue?.identifier === 'string' ? md.linearIssue.identifier.trim() : '';
-  if (linearIdentifier) {
-    lines.push(`Fixes ${linearIdentifier}`);
-  }
-
-  return Array.from(new Set(lines));
-}
-
-export function injectIssueFooter(body: string | undefined, metadata: unknown): string | undefined {
-  const cleaned = stripInjectedIssueFooter(typeof body === 'string' ? body : '');
-  const lines = getFixesLines(metadata);
-
-  if (lines.length === 0) {
-    const trimmed = cleaned.trim();
-    return trimmed.length > 0 ? trimmed : undefined;
-  }
-
-  const footerBlock = [START_MARKER, ...lines, END_MARKER].join('\n');
-  const separator = cleaned.trim().length > 0 ? '\n\n' : '';
-  const combined = `${cleaned}${separator}${footerBlock}`.trim();
-  return combined.length > 0 ? combined : undefined;
-}
diff --git a/src/main/lib/prIssueFooterPatch.ts b/src/main/lib/prIssueFooterPatch.ts
deleted file mode 100644
index 7ba8b2891e..0000000000
--- a/src/main/lib/prIssueFooterPatch.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-import fs from 'node:fs';
-import os from 'node:os';
-import path from 'node:path';
-import { injectIssueFooter } from './prIssueFooter';
-
-type ExecFileResult = {
-  stdout?: string | Buffer;
-};
-
-type ExecFileLike = (
-  file: string,
-  args: string[],
-  options: { cwd: string }
-) => Promise<ExecFileResult>;
-
-type PatchPrIssueFooterArgs = {
-  taskPath: string;
-  metadata: unknown;
-  execFile: ExecFileLike;
-  prUrl?: string | null;
-};
-
-function normalizeBodyForComparison(body: string): string {
-  return body.replace(/\r\n/g, '\n').trimEnd();
-}
-
-export async function patchCurrentPrBodyWithIssueFooter({
-  taskPath,
-  metadata,
-  execFile,
-  prUrl,
-}: PatchPrIssueFooterArgs): Promise<boolean> {
-  const existingBody = await execFile('gh', ['pr', 'view', '--json', 'body', '-q', '.body'], {
-    cwd: taskPath,
-  });
-  const existingBodyText = String(existingBody.stdout || '');
-  const mergedBody = injectIssueFooter(existingBodyText, metadata);
-  if (!mergedBody) {
-    return false;
-  }
-  if (normalizeBodyForComparison(mergedBody) === normalizeBodyForComparison(existingBodyText)) {
-    return false;
-  }
-
-  const bodyFile = path.join(
-    os.tmpdir(),
-    `gh-pr-edit-body-${Date.now()}-${Math.random().toString(36).substring(7)}.txt`
-  );
-
-  try {
-    fs.writeFileSync(bodyFile, mergedBody, 'utf8');
-    const editArgs = ['pr', 'edit'];
-    if (prUrl) {
-      editArgs.push(prUrl);
-    }
-    editArgs.push('--body-file', bodyFile);
-    await execFile('gh', editArgs, { cwd: taskPath });
-    return true;
-  } finally {
-    if (fs.existsSync(bodyFile)) {
-      try {
-        fs.unlinkSync(bodyFile);
-      } catch {
-        // Ignore cleanup errors; caller should not fail due to temp-file deletion.
-      }
-    }
-  }
-}
diff --git a/src/main/lib/rate-limiter.ts b/src/main/lib/rate-limiter.ts
new file mode 100644
index 0000000000..b077647d97
--- /dev/null
+++ b/src/main/lib/rate-limiter.ts
@@ -0,0 +1,44 @@
+/**
+ * Token-bucket rate limiter.
+ *
+ * Tokens refill at `refillRate` per second up to `capacity`.
+ * Each `acquire()` call consumes one token; if none are available the call
+ * waits until one becomes available.
+ */
+export class RateLimiter {
+  private tokens: number;
+  private lastRefill: number;
+
+  constructor(
+    private readonly capacity: number,
+    private readonly refillRate: number
+  ) {
+    this.tokens = capacity;
+    this.lastRefill = Date.now();
+  }
+
+  async acquire(): Promise<void> {
+    this._refill();
+
+    if (this.tokens >= 1) {
+      this.tokens -= 1;
+      return;
+    }
+
+    // Calculate wait time until one token is available
+    const waitMs = Math.ceil(((1 - this.tokens) / this.refillRate) * 1000);
+    await new Promise<void>((resolve) => setTimeout(resolve, waitMs));
+    this._refill();
+    this.tokens = Math.max(0, this.tokens - 1);
+  }
+
+  private _refill(): void {
+    const now = Date.now();
+    const elapsed = (now - this.lastRefill) / 1000;
+    this.tokens = Math.min(this.capacity, this.tokens + elapsed * this.refillRate);
+    this.lastRefill = now;
+  }
+}
+
+/** Shared rate limiter for GitHub API calls: burst of 20, sustained 10/sec. */
+export const githubRateLimiter = new RateLimiter(20, 10);
diff --git a/src/main/lib/retry.ts b/src/main/lib/retry.ts
new file mode 100644
index 0000000000..15236c4c70
--- /dev/null
+++ b/src/main/lib/retry.ts
@@ -0,0 +1,54 @@
+import { log } from './logger';
+
+export type RetryOptions = {
+  /** Maximum number of attempts (default: 3). */
+  maxAttempts?: number;
+  /** Initial delay in ms before the first retry (default: 1000). */
+  initialDelayMs?: number;
+  /** Maximum delay in ms between retries (default: 30_000). */
+  maxDelayMs?: number;
+  /** When provided, aborts retrying immediately when the signal is triggered. */
+  signal?: AbortSignal;
+};
+
+/**
+ * Retry `fn` with exponential backoff.
+ *
+ * Only retries on rate-limit (429) or server errors (5xx).
+ * Client errors (4xx except 429) are re-thrown immediately.
+ */
+export async function withRetry<T>(fn: () => Promise<T>, opts?: RetryOptions): Promise<T> {
+  const { maxAttempts = 3, initialDelayMs = 1_000, maxDelayMs = 30_000 } = opts ?? {};
+
+  let attempt = 0;
+  let delay = initialDelayMs;
+
+  for (;;) {
+    try {
+      return await fn();
+    } catch (err: unknown) {
+      attempt++;
+
+      const status = (err as { status?: number })?.status;
+      const isRetryable = status === undefined || status === 429 || status >= 500;
+
+      if (!isRetryable || attempt >= maxAttempts || opts?.signal?.aborted) {
+        throw err;
+      }
+
+      log.warn('withRetry: retrying after error', { attempt, status, delay });
+      await new Promise<void>((resolve, reject) => {
+        const id = setTimeout(resolve, delay);
+        opts?.signal?.addEventListener(
+          'abort',
+          () => {
+            clearTimeout(id);
+            reject(err);
+          },
+          { once: true }
+        );
+      });
+      delay = Math.min(delay * 2, maxDelayMs);
+    }
+  }
+}
diff --git a/src/main/lib/telemetry.ts b/src/main/lib/telemetry.ts
new file mode 100644
index 0000000000..e65c735ac5
--- /dev/null
+++ b/src/main/lib/telemetry.ts
@@ -0,0 +1,454 @@
+import { randomUUID } from 'node:crypto';
+import { readFileSync } from 'node:fs';
+import { join } from 'node:path';
+import { app } from 'electron';
+import type { TelemetryEnvelope, TelemetryEvent, TelemetryProperties } from '@shared/telemetry';
+import { KV } from '@main/db/kv';
+
+// Production-only: appConfig.json is injected into dist/main/ by the release pipeline.
+const appConfig: { posthogHost?: string; posthogKey?: string } = (() => {
+  if (!import.meta.env.PROD) return {};
+  try {
+    const raw = readFileSync(join(__dirname, 'appConfig.json'), 'utf-8');
+    return JSON.parse(raw) as { posthogHost?: string; posthogKey?: string };
+  } catch {
+    return {};
+  }
+})();
+
+interface InitOptions {
+  installSource?: string;
+}
+
+// ---------------------------------------------------------------------------
+// Module-level state
+// ---------------------------------------------------------------------------
+
+let enabled = true;
+let apiKey: string | undefined;
+let host: string | undefined;
+let instanceId: string | undefined;
+let installSource: string | undefined;
+let userOptOut: boolean | undefined;
+let onboardingSeen = false;
+let sessionId: string | undefined;
+let lastActiveDate: string | undefined;
+let cachedGithubUsername: string | null = null;
+let cachedAccountId: string | null = null;
+let heartbeatInterval: ReturnType<typeof setInterval> | undefined;
+
+const libName = 'emdash';
+
+type TelemetryKVSchema = {
+  instanceId: string;
+  enabled: string;
+  onboardingSeen: string;
+  lastActiveDate: string;
+  githubUsername: string;
+  accountId: string;
+  lastSessionId: string;
+  lastHeartbeatTs: string;
+};
+
+const telemetryKV = new KV<TelemetryKVSchema>('telemetry');
+const isViteDevBuild = import.meta.env.DEV;
+
+function getVersionSafe(): string {
+  try {
+    return app.getVersion();
+  } catch {
+    return 'unknown';
+  }
+}
+
+function isEnabled(): boolean {
+  return (
+    !isViteDevBuild &&
+    enabled === true &&
+    userOptOut !== true &&
+    !!apiKey &&
+    !!host &&
+    typeof instanceId === 'string' &&
+    instanceId.length > 0
+  );
+}
+
+function getBaseProps() {
+  return {
+    schema_version: 1,
+    app_version: getVersionSafe(),
+    source: 'desktop_app',
+    electron_version: process.versions.electron,
+    platform: process.platform,
+    arch: process.arch,
+    is_dev: !app.isPackaged,
+    install_source: installSource ?? (app.isPackaged ? 'dmg' : 'dev'),
+    $lib: libName,
+    ...(cachedGithubUsername ? { github_username: cachedGithubUsername } : {}),
+    ...(cachedAccountId ? { account_id: cachedAccountId } : {}),
+  };
+}
+
+/**
+ * Sanitize event properties to prevent PII leakage.
+ * Simple allowlist approach: only allow safe property names and primitive types.
+ */
+function sanitizeEventAndProps(_event: TelemetryEvent, props: Record<string, unknown> | undefined) {
+  const sanitized: Record<string, unknown> = {};
+
+  const allowedProps = new Set([
+    'active_view',
+    'active_main_panel',
+    'active_right_panel',
+    'focused_region',
+    'view',
+    'from_view',
+    'to_view',
+    'main_panel',
+    'right_panel',
+    'trigger',
+    'event_ts_ms',
+    'session_id',
+    'project_id',
+    'task_id',
+    'conversation_id',
+    'side',
+    'region',
+    'panel',
+    'from_status',
+    'to_status',
+    'has_issue',
+    'is_first_in_task',
+    'is_draft',
+    'exit_code',
+    'setting',
+    'severity',
+    'component',
+    'action',
+    'user_action',
+    'operation',
+    'endpoint',
+    'session_errors',
+    'error_timestamp',
+    'schema_version',
+    'provider',
+    'source',
+    'has_initial_prompt',
+    'state',
+    'success',
+    'error_type',
+    'github_username',
+    'account_id',
+    'enabled',
+    'app',
+    'applied_migrations_bucket',
+    'recovered',
+    'date',
+    'timezone',
+    'scope',
+    'strategy',
+    'conflicts',
+    'count',
+    'terminal_id',
+    'was_crash',
+    'type',
+  ]);
+  const passthroughProps = new Set([
+    '$exception_message',
+    '$exception_type',
+    '$exception_stack_trace_raw',
+    '$exception_fingerprint',
+  ]);
+
+  if (props) {
+    for (const [key, value] of Object.entries(props)) {
+      if (!allowedProps.has(key) && !passthroughProps.has(key)) continue;
+
+      if (typeof value === 'string') {
+        const maxLength = passthroughProps.has(key) ? 2_000 : 100;
+        sanitized[key] = value.trim().slice(0, maxLength);
+      } else if (typeof value === 'number') {
+        if (key === 'event_ts_ms') {
+          sanitized[key] = Math.max(0, Math.min(Math.trunc(value), 9_999_999_999_999));
+        } else {
+          sanitized[key] = Math.max(-1_000_000, Math.min(value, 1_000_000));
+        }
+      } else if (typeof value === 'boolean') {
+        sanitized[key] = value;
+      } else if (value === null) {
+        sanitized[key] = null;
+      }
+    }
+  }
+
+  return sanitized;
+}
+
+function normalizeHost(h: string | undefined): string | undefined {
+  if (!h) return undefined;
+  let s = String(h).trim();
+  if (!/^https?:\/\//i.test(s)) {
+    s = 'https://' + s;
+  }
+  return s.replace(/\/+$/, '');
+}
+
+// ---------------------------------------------------------------------------
+// PostHog transport
+// ---------------------------------------------------------------------------
+
+async function posthogCapture(
+  event: TelemetryEvent,
+  properties?: Record<string, unknown>
+): Promise<void> {
+  if (!isEnabled()) return;
+  try {
+    const u = (host ?? '').replace(/\/$/, '') + '/capture/';
+    const body = {
+      api_key: apiKey,
+      event,
+      properties: {
+        distinct_id: instanceId,
+        ...getBaseProps(),
+        ...sanitizeEventAndProps(event, properties),
+      },
+    };
+    await fetch(u, {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify(body),
+    }).catch(() => undefined);
+  } catch {
+    // swallow errors; telemetry must never crash the app
+  }
+}
+
+async function posthogIdentify(username: string, accountId?: string): Promise<void> {
+  if (!isEnabled() || !username) return;
+  try {
+    const u = (host ?? '').replace(/\/$/, '') + '/capture/';
+    const body = {
+      api_key: apiKey,
+      event: '$identify',
+      properties: {
+        distinct_id: instanceId,
+        $set: {
+          github_username: username,
+          ...(accountId ? { account_id: accountId } : {}),
+          ...getBaseProps(),
+        },
+      },
+    };
+    await fetch(u, {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify(body),
+    }).catch(() => undefined);
+  } catch {
+    // swallow errors; telemetry must never crash the app
+  }
+}
+
+// ---------------------------------------------------------------------------
+// Daily active user
+// ---------------------------------------------------------------------------
+
+async function checkDailyActiveUser(): Promise<void> {
+  if (!isEnabled()) return;
+  try {
+    const today = new Date().toISOString().split('T')[0]!;
+    if (lastActiveDate === today) return;
+
+    void posthogCapture('daily_active_user', {
+      date: today,
+      timezone: Intl.DateTimeFormat().resolvedOptions().timeZone || 'unknown',
+    });
+
+    lastActiveDate = today;
+    telemetryKV.set('lastActiveDate', today);
+  } catch {
+    // Never let telemetry errors crash the app
+  }
+}
+
+// ---------------------------------------------------------------------------
+// Public API
+// ---------------------------------------------------------------------------
+
+export async function init(options?: InitOptions): Promise<void> {
+  const env = process.env;
+  const enabledEnv = (env.TELEMETRY_ENABLED ?? 'true').toString().toLowerCase();
+  enabled = !isViteDevBuild && enabledEnv !== 'false' && enabledEnv !== '0' && enabledEnv !== 'no';
+  apiKey =
+    env.POSTHOG_PROJECT_API_KEY || (appConfig?.posthogKey as string | undefined) || undefined;
+  host = normalizeHost(
+    env.POSTHOG_HOST || (appConfig?.posthogHost as string | undefined) || undefined
+  );
+  installSource = options?.installSource || env.INSTALL_SOURCE || undefined;
+  sessionId = randomUUID();
+
+  // Load persisted state from SQLite KV (all reads are non-blocking best-effort)
+  let storedInstanceId: string | null = null;
+  let storedEnabled: string | null = null;
+  let storedOnboarding: string | null = null;
+  let storedActiveDate: string | null = null;
+  let storedGithubUsername: string | null = null;
+  let storedAccountId: string | null = null;
+  let storedLastSessionId: string | null = null;
+  let storedLastHeartbeatTs: string | null = null;
+  try {
+    [
+      storedInstanceId,
+      storedEnabled,
+      storedOnboarding,
+      storedActiveDate,
+      storedGithubUsername,
+      storedAccountId,
+      storedLastSessionId,
+      storedLastHeartbeatTs,
+    ] = await Promise.all([
+      telemetryKV.get('instanceId'),
+      telemetryKV.get('enabled'),
+      telemetryKV.get('onboardingSeen'),
+      telemetryKV.get('lastActiveDate'),
+      telemetryKV.get('githubUsername'),
+      telemetryKV.get('accountId'),
+      telemetryKV.get('lastSessionId'),
+      telemetryKV.get('lastHeartbeatTs'),
+    ]);
+  } catch {
+    // KV unavailable during startup (e.g. DB migration not yet applied) — use in-memory defaults
+  }
+
+  instanceId = storedInstanceId ?? (randomUUID().toString() as string);
+  if (!storedInstanceId) {
+    telemetryKV.set('instanceId', instanceId);
+  }
+
+  userOptOut = storedEnabled === 'false' ? true : undefined;
+  onboardingSeen = storedOnboarding === 'true';
+  lastActiveDate = storedActiveDate ?? undefined;
+  cachedGithubUsername = storedGithubUsername ?? null;
+  cachedAccountId = storedAccountId ?? null;
+  if (cachedGithubUsername) {
+    void posthogIdentify(cachedGithubUsername, cachedAccountId ?? undefined);
+  }
+
+  // Detect unclean exit from the previous session: if we have a recorded session ID
+  // that was never cleared by a clean shutdown, emit a synthetic app_closed so that
+  // session duration queries remain accurate.
+  if (storedLastSessionId && storedLastHeartbeatTs) {
+    const lastHeartbeatMs = Date.parse(storedLastHeartbeatTs);
+    if (!Number.isNaN(lastHeartbeatMs)) {
+      void posthogCapture('app_closed', {
+        was_crash: true,
+        event_ts_ms: lastHeartbeatMs,
+        session_id: storedLastSessionId,
+      });
+    }
+  }
+  // Record the current session ID so the next startup can detect a crash.
+  // sessionId is guaranteed non-undefined at this point (set to randomUUID() above).
+  void telemetryKV.set('lastSessionId', sessionId!);
+
+  void posthogCapture('app_started');
+  void checkDailyActiveUser();
+
+  // Heartbeat: write lastHeartbeatTs to KV every 60 s so crash recovery can
+  // estimate session duration without firing any PostHog events.
+  heartbeatInterval = setInterval(() => {
+    telemetryKV.set('lastHeartbeatTs', new Date().toISOString());
+  }, 60_000);
+}
+
+/**
+ * Associate the current anonymous session with a known identity. Call this
+ * whenever authentication succeeds — pass the GitHub username and, optionally,
+ * the emdash account ID so both are linked in PostHog.
+ */
+export function identify(username: string, accountId?: string): void {
+  if (!username) return;
+  cachedGithubUsername = username;
+  void telemetryKV.set('githubUsername', username);
+  if (accountId) {
+    cachedAccountId = accountId;
+    void telemetryKV.set('accountId', accountId);
+  }
+  void posthogIdentify(username, accountId ?? cachedAccountId ?? undefined);
+}
+
+export function capture<E extends TelemetryEvent>(
+  event: E,
+  properties?: TelemetryProperties<E> | Record<string, unknown>
+): void {
+  const captureSessionId = sessionId ?? randomUUID();
+  sessionId = captureSessionId;
+  const envelope: TelemetryEnvelope = {
+    event_ts_ms: Date.now(),
+    session_id: captureSessionId,
+  };
+  void posthogCapture(event, {
+    ...(properties as Record<string, unknown> | undefined),
+    ...envelope,
+  });
+}
+
+/**
+ * Capture an exception for PostHog error tracking.
+ */
+export function captureException(
+  error: Error | unknown,
+  additionalProperties?: Record<string, unknown>
+): void {
+  if (!isEnabled()) return;
+
+  const errorObj = error instanceof Error ? error : new Error(String(error));
+
+  void posthogCapture('$exception', {
+    $exception_message: errorObj.message || 'Unknown error',
+    $exception_type: errorObj.name || 'Error',
+    $exception_stack_trace_raw: errorObj.stack || '',
+    ...additionalProperties,
+  });
+}
+
+export function shutdown(): void {
+  // Stop the heartbeat interval.
+  if (heartbeatInterval !== undefined) {
+    clearInterval(heartbeatInterval);
+    heartbeatInterval = undefined;
+  }
+  // Clear the stored session ID so the next startup knows this was a clean exit
+  // and won't emit a synthetic crash app_closed event.
+  void telemetryKV.del('lastSessionId');
+  void telemetryKV.del('lastHeartbeatTs');
+}
+
+export function isTelemetryEnabled(): boolean {
+  return isEnabled();
+}
+
+export function getTelemetryStatus() {
+  return {
+    enabled: isEnabled(),
+    envDisabled: isViteDevBuild || !enabled,
+    userOptOut: userOptOut === true,
+    hasKeyAndHost: !!apiKey && !!host,
+    onboardingSeen,
+    session_id: sessionId ?? null,
+  };
+}
+
+export function setTelemetryEnabledViaUser(enabledFlag: boolean): void {
+  userOptOut = !enabledFlag;
+  telemetryKV.set('enabled', String(enabledFlag));
+}
+
+export function setOnboardingSeen(flag: boolean): void {
+  onboardingSeen = Boolean(flag);
+  telemetryKV.set('onboardingSeen', String(onboardingSeen));
+}
+
+export async function checkAndReportDailyActiveUser(): Promise<void> {
+  return checkDailyActiveUser();
+}
diff --git a/src/main/lib/telemetryHelpers.ts b/src/main/lib/telemetryHelpers.ts
deleted file mode 100644
index d641eb7466..0000000000
--- a/src/main/lib/telemetryHelpers.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { capture } from '../telemetry';
-
-/**
- * Capture telemetry event with timing duration.
- * Automatically clamps duration to reasonable bounds and includes it in properties.
- */
-export async function captureWithTiming<T>(
-  event: string,
-  operation: () => Promise<T> | T,
-  additionalProps?: Record<string, any>
-): Promise<T> {
-  const start = Date.now();
-  try {
-    const result = await operation();
-    const duration = Date.now() - start;
-    void capture(event as any, {
-      ...additionalProps,
-      duration_ms: duration,
-    });
-    return result;
-  } catch (error) {
-    const duration = Date.now() - start;
-    void capture(event as any, {
-      ...additionalProps,
-      duration_ms: duration,
-    });
-    throw error;
-  }
-}
diff --git a/src/main/lib/updaterError.ts b/src/main/lib/updaterError.ts
deleted file mode 100644
index 2bd4ec0478..0000000000
--- a/src/main/lib/updaterError.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-// Utilities to keep updater errors/logs concise and scrub HTML bodies.
-export function stripMarkupAndTruncate(raw: string): string {
-  if (!raw) return 'Unknown update error';
-
-  const withoutData = raw.includes('Data:') ? raw.slice(0, raw.indexOf('Data:')) : raw;
-  const noHtml = withoutData.replace(/<!DOCTYPE html.*$/is, '').replace(/<html.*$/is, '');
-  const collapsed = noHtml.replace(/\s+/g, ' ').trim();
-  if (!collapsed) return 'Unknown update error';
-  return collapsed.length > 240 ? `${collapsed.slice(0, 240)}…` : collapsed;
-}
-
-export function formatUpdaterError(error: any): string {
-  const status = error?.statusCode || error?.code || error?.status;
-  const statusText = error?.statusMessage || error?.description;
-  if (status) {
-    const base = `Update request failed with HTTP ${status}`;
-    return statusText ? `${base}: ${stripMarkupAndTruncate(String(statusText))}` : base;
-  }
-  const message = error instanceof Error ? error.message : String(error ?? 'Unknown update error');
-  return stripMarkupAndTruncate(message);
-}
-
-export function sanitizeUpdaterLogArgs(args: any[]) {
-  return args.map((arg) => {
-    if (arg instanceof Error) return formatUpdaterError(arg);
-    if (typeof arg === 'string') return stripMarkupAndTruncate(arg);
-    return arg;
-  });
-}
diff --git a/src/main/main.ts b/src/main/main.ts
deleted file mode 100644
index acb34d5c3f..0000000000
--- a/src/main/main.ts
+++ /dev/null
@@ -1,362 +0,0 @@
-// Load .env FIRST before any imports that might use it
-// Use explicit path to ensure .env is loaded from project root
-try {
-  const path = require('path');
-  const envPath = path.join(__dirname, '..', '..', '.env');
-  require('dotenv').config({ path: envPath });
-} catch (error) {
-  // dotenv is optional - no error if .env doesn't exist
-}
-
-import { app, BrowserWindow, dialog } from 'electron';
-import { initializeShellEnvironment } from './utils/shellEnv';
-// Ensure PATH matches the user's shell when launched from Finder (macOS)
-// so Homebrew/NPM global binaries like `gh` and `codex` are found.
-try {
-  // Lazy import to avoid bundler complaints if not present on other platforms
-  // eslint-disable-next-line @typescript-eslint/no-var-requires
-  const fixPath = require('fix-path');
-  if (typeof fixPath === 'function') fixPath();
-} catch {
-  // no-op if fix-path isn't available at runtime
-}
-
-if (process.platform === 'darwin') {
-  const extras = ['/opt/homebrew/bin', '/usr/local/bin', '/opt/homebrew/sbin', '/usr/local/sbin'];
-  const cur = process.env.PATH || '';
-  const parts = cur.split(':').filter(Boolean);
-  for (const p of extras) {
-    if (!parts.includes(p)) parts.unshift(p);
-  }
-  process.env.PATH = parts.join(':');
-
-  // As a last resort, ask the user's login shell for PATH and merge it in.
-  try {
-    const { execSync } = require('child_process');
-    const shell = process.env.SHELL || '/bin/zsh';
-    const loginPath = execSync(`${shell} -ilc 'echo -n $PATH'`, { encoding: 'utf8' });
-    if (loginPath) {
-      // Shell noise (nvm messages, ASCII art, motd) gets captured in stdout.
-      // Split by both : and \n so noise fused with the first real path entry
-      // (e.g. "nvm output\n/usr/local/bin") is correctly separated.
-      const allEntries = (loginPath + ':' + process.env.PATH).split(/[:\n]/).filter(Boolean);
-      const validEntries = allEntries.filter((p: string) => p.startsWith('/'));
-      const merged = new Set(validEntries);
-      process.env.PATH = Array.from(merged).join(':');
-    }
-  } catch {}
-}
-
-if (process.platform === 'linux') {
-  try {
-    const os = require('os');
-    const path = require('path');
-    const homeDir = os.homedir();
-    const extras = [
-      path.join(homeDir, '.nvm/versions/node', process.version, 'bin'),
-      path.join(homeDir, '.npm-global/bin'),
-      path.join(homeDir, '.local/bin'),
-      '/usr/local/bin',
-    ];
-    const cur = process.env.PATH || '';
-    const parts = cur.split(':').filter(Boolean);
-    for (const p of extras) {
-      if (!parts.includes(p)) parts.unshift(p);
-    }
-    process.env.PATH = parts.join(':');
-
-    try {
-      const { execSync } = require('child_process');
-      const shell = process.env.SHELL || '/bin/bash';
-      const loginPath = execSync(`${shell} -ilc 'echo -n $PATH'`, {
-        encoding: 'utf8',
-      });
-      if (loginPath) {
-        // Shell noise (nvm messages, ASCII art, motd) gets captured in stdout.
-        // Split by both : and \n so noise fused with the first real path entry
-        // (e.g. "nvm output\n/usr/local/bin") is correctly separated.
-        const allEntries = (loginPath + ':' + process.env.PATH).split(/[:\n]/).filter(Boolean);
-        const validEntries = allEntries.filter((p: string) => p.startsWith('/'));
-        const merged = new Set(validEntries);
-        process.env.PATH = Array.from(merged).join(':');
-      }
-    } catch {}
-  } catch {}
-}
-
-// Enable automatic Wayland/X11 detection on Linux.
-// Uses native Wayland when available, falls back to X11 (XWayland) otherwise.
-// Must be called before app.whenReady().
-if (process.platform === 'linux') {
-  app.commandLine.appendSwitch('ozone-platform-hint', 'auto');
-}
-
-if (process.platform === 'win32') {
-  // Ensure npm global binaries are in PATH for Windows
-  const npmPath = require('path').join(process.env.APPDATA || '', 'npm');
-  const cur = process.env.PATH || '';
-  const parts = cur.split(';').filter(Boolean);
-  if (npmPath && !parts.includes(npmPath)) {
-    parts.unshift(npmPath);
-    process.env.PATH = parts.join(';');
-  }
-}
-
-// Detect SSH_AUTH_SOCK from user's shell environment
-// This is necessary because GUI-launched apps don't inherit shell env vars
-try {
-  initializeShellEnvironment();
-} catch (error) {
-  // Silent fail - SSH agent auth will fail if user tries to use it
-  console.log('[main] Failed to initialize shell environment:', error);
-}
-
-import { createMainWindow } from './app/window';
-import { registerAppLifecycle } from './app/lifecycle';
-import { setupApplicationMenu } from './app/menu';
-import { registerAllIpc } from './ipc';
-import { databaseService, DatabaseSchemaMismatchError } from './services/DatabaseService';
-import { connectionsService } from './services/ConnectionsService';
-import { autoUpdateService } from './services/AutoUpdateService';
-import { worktreePoolService } from './services/WorktreePoolService';
-import { sshService } from './services/ssh/SshService';
-import { taskLifecycleService } from './services/TaskLifecycleService';
-import { agentEventService } from './services/AgentEventService';
-import * as telemetry from './telemetry';
-import { errorTracking } from './errorTracking';
-import { join } from 'path';
-import { rmSync } from 'node:fs';
-
-// Set app name for macOS dock and menu bar
-app.setName('Emdash');
-
-// Prevent multiple instances in production (e.g. user clicks icon while auto-updater is restarting).
-// Skip in dev so dev server can run alongside the packaged app.
-const isDev = !app.isPackaged || process.argv.includes('--dev');
-if (!isDev) {
-  const gotTheLock = app.requestSingleInstanceLock();
-  if (!gotTheLock) {
-    app.quit();
-    // Must also exit the process; app.quit() alone still runs the rest of this module
-    // before the event loop drains, which would register unnecessary listeners and timers.
-    process.exit(0);
-  }
-}
-
-app.on('second-instance', () => {
-  const win = BrowserWindow.getAllWindows()[0];
-  if (win) {
-    if (win.isMinimized()) win.restore();
-    win.focus();
-  }
-});
-
-// Set dock icon on macOS in development mode
-if (process.platform === 'darwin' && !app.isPackaged) {
-  const iconPath = join(
-    __dirname,
-    '..',
-    '..',
-    '..',
-    'src',
-    'assets',
-    'images',
-    'emdash',
-    'icon-dock.png'
-  );
-  try {
-    app.dock.setIcon(iconPath);
-  } catch (err) {
-    console.warn('Failed to set dock icon:', err);
-  }
-}
-
-// App bootstrap
-app.whenReady().then(async () => {
-  const resetLocalDatabase = async (dbPath: string) => {
-    await databaseService.close().catch(() => {});
-    for (const filePath of [dbPath, `${dbPath}-wal`, `${dbPath}-shm`]) {
-      rmSync(filePath, { force: true });
-    }
-  };
-
-  // Initialize database
-  let dbInitOk = false;
-  let dbInitErrorType: string | undefined;
-  try {
-    await databaseService.initialize();
-    dbInitOk = true;
-  } catch (error) {
-    const err = error as unknown;
-    const asObj = typeof err === 'object' && err !== null ? (err as Record<string, unknown>) : null;
-    const code = asObj && typeof asObj.code === 'string' ? asObj.code : undefined;
-    const name = asObj && typeof asObj.name === 'string' ? asObj.name : undefined;
-    dbInitErrorType = code || name || 'unknown';
-    console.error('Failed to initialize database:', error);
-
-    if (err instanceof DatabaseSchemaMismatchError) {
-      const missing = err.missingInvariants.map((item) => `• ${item}`).join('\n');
-      const result = await dialog.showMessageBox({
-        type: 'error',
-        title: 'Local Data Reset Required',
-        message: 'Emdash cannot start because your local database schema is incompatible.',
-        detail: [
-          'Required schema entries are missing:',
-          missing || '• unknown invariant',
-          '',
-          `Database path: ${err.dbPath}`,
-          '',
-          'Choose "Reset Local Data and Relaunch" to delete local Emdash data and start fresh.',
-          'This only removes local app data (projects, tasks, conversations). Repository files are not deleted.',
-        ].join('\n'),
-        buttons: ['Reset Local Data and Relaunch', 'Quit'],
-        defaultId: 0,
-        cancelId: 1,
-        noLink: true,
-      });
-
-      if (result.response === 0) {
-        try {
-          await resetLocalDatabase(err.dbPath);
-          app.relaunch();
-          app.exit(0);
-          return;
-        } catch (resetError) {
-          console.error('Failed to reset local database:', resetError);
-          dialog.showErrorBox(
-            'Database Reset Failed',
-            `Unable to delete local database at:\n${err.dbPath}\n\n${resetError instanceof Error ? resetError.message : String(resetError)}`
-          );
-        }
-      }
-
-      app.quit();
-      return;
-    }
-
-    if (err instanceof Error && err.message.includes('migrations folder')) {
-      dialog.showErrorBox(
-        'Database Initialization Failed',
-        'Unable to initialize the application database.\n\n' +
-          'This may be due to:\n' +
-          '• Running from Downloads or DMG (move to Applications)\n' +
-          '• Homebrew installation issues (try direct download)\n' +
-          '• Incomplete installation\n\n' +
-          'Please try:\n' +
-          '1. Move Emdash to Applications folder\n' +
-          '2. Download directly from GitHub releases\n' +
-          '3. Check console for detailed error information'
-      );
-    }
-  }
-
-  // Initialize telemetry (privacy-first, with optional GitHub username)
-  await telemetry.init({ installSource: app.isPackaged ? 'dmg' : 'dev' });
-
-  // Initialize error tracking
-  await errorTracking.init();
-
-  try {
-    const summary = databaseService.getLastMigrationSummary();
-    const toBucket = (n: number) => (n === 0 ? '0' : n === 1 ? '1' : n <= 3 ? '2-3' : '>3');
-    telemetry.capture('db_setup', {
-      outcome: dbInitOk ? 'success' : 'failure',
-      ...(dbInitOk
-        ? {
-            applied_migrations: summary?.appliedCount ?? 0,
-            applied_migrations_bucket: toBucket(summary?.appliedCount ?? 0),
-            recovered: summary?.recovered === true,
-          }
-        : {
-            error_type: dbInitErrorType ?? 'unknown',
-          }),
-    });
-  } catch {
-    // telemetry must never crash the app
-  }
-
-  // Best-effort: capture a coarse snapshot of project/task counts (no names/paths)
-  let localProjectPathsForReserveCleanup: string[] = [];
-  try {
-    const [projects, tasks] = await Promise.all([
-      databaseService.getProjects(),
-      databaseService.getTasks(),
-    ]);
-    localProjectPathsForReserveCleanup = projects
-      .filter((project) => !project.isRemote)
-      .map((project) => project.path);
-    const projectCount = projects.length;
-    const taskCount = tasks.length;
-    const toBucket = (n: number) =>
-      n === 0 ? '0' : n <= 2 ? '1-2' : n <= 5 ? '3-5' : n <= 10 ? '6-10' : '>10';
-    telemetry.capture('task_snapshot', {
-      project_count: projectCount,
-      project_count_bucket: toBucket(projectCount),
-      task_count: taskCount,
-      task_count_bucket: toBucket(taskCount),
-    } as any);
-  } catch {
-    // ignore errors — telemetry is best-effort only
-  }
-
-  // Start agent event HTTP server (receives hook callbacks from CLI agents)
-  try {
-    await agentEventService.start();
-  } catch (error) {
-    console.warn('Failed to start agent event service:', error);
-  }
-
-  // Register IPC handlers
-  registerAllIpc();
-
-  // Clean up any orphaned reserve worktrees from previous sessions
-  worktreePoolService.cleanupOrphanedReserves(localProjectPathsForReserveCleanup).catch((error) => {
-    console.warn('Failed to cleanup orphaned reserves:', error);
-  });
-
-  // Warm provider installation cache
-  try {
-    await connectionsService.initProviderStatusCache();
-  } catch {
-    // best-effort; ignore failures
-  }
-
-  // Set up native application menu (Settings, Edit, View, Window)
-  setupApplicationMenu();
-
-  // Create main window
-  createMainWindow();
-
-  // Initialize auto-update service after window is created
-  try {
-    await autoUpdateService.initialize();
-  } catch (error) {
-    if (app.isPackaged) {
-      console.error('Failed to initialize auto-update service:', error);
-    }
-  }
-});
-
-// App lifecycle handlers
-registerAppLifecycle();
-
-// Graceful shutdown telemetry event
-app.on('before-quit', () => {
-  // Session summary with duration (no identifiers)
-  telemetry.capture('app_session');
-  telemetry.capture('app_closed');
-  telemetry.shutdown();
-
-  // Cleanup auto-update service
-  autoUpdateService.shutdown();
-  // Stop agent event HTTP server
-  agentEventService.stop();
-  // Stop any lifecycle run scripts so they do not outlive the app process.
-  taskLifecycleService.shutdown();
-
-  // Cleanup reserve worktrees (fire and forget - don't block quit)
-  worktreePoolService.cleanup().catch(() => {});
-
-  // Disconnect all SSH connections to avoid orphaned sessions on remote hosts
-  sshService.disconnectAll().catch(() => {});
-});
diff --git a/src/main/preload.ts b/src/main/preload.ts
deleted file mode 100644
index 4454b6ca64..0000000000
--- a/src/main/preload.ts
+++ /dev/null
@@ -1,1130 +0,0 @@
-import { contextBridge, ipcRenderer } from 'electron';
-import type { TerminalSnapshotPayload } from './types/terminalSnapshot';
-import type { OpenInAppId } from '../shared/openInApps';
-import type { AgentEvent } from '../shared/agentEvents';
-
-// Keep preload self-contained: sandboxed preload cannot reliably require local runtime modules.
-const LIFECYCLE_EVENT_CHANNEL = 'lifecycle:event';
-const GIT_STATUS_CHANGED_CHANNEL = 'git:status-changed';
-
-const gitStatusChangedListeners = new Set<(data: { taskPath: string; error?: string }) => void>();
-let gitStatusBridgeAttached = false;
-
-function attachGitStatusBridgeOnce() {
-  if (gitStatusBridgeAttached) return;
-  gitStatusBridgeAttached = true;
-  ipcRenderer.on(
-    GIT_STATUS_CHANGED_CHANNEL,
-    (_: Electron.IpcRendererEvent, data: { taskPath: string; error?: string }) => {
-      for (const listener of gitStatusChangedListeners) {
-        try {
-          listener(data);
-        } catch {}
-      }
-    }
-  );
-}
-
-// Expose protected methods that allow the renderer process to use
-// the ipcRenderer without exposing the entire object
-contextBridge.exposeInMainWorld('electronAPI', {
-  // Generic invoke for the typed RPC client (createRPCClient)
-  invoke: (channel: string, ...args: unknown[]) => ipcRenderer.invoke(channel, ...args),
-
-  // App info
-  getAppVersion: () => ipcRenderer.invoke('app:getAppVersion'),
-  getElectronVersion: () => ipcRenderer.invoke('app:getElectronVersion'),
-  getPlatform: () => ipcRenderer.invoke('app:getPlatform'),
-  listInstalledFonts: (args?: { refresh?: boolean }) =>
-    ipcRenderer.invoke('app:listInstalledFonts', args),
-  undo: () => ipcRenderer.invoke('app:undo'),
-  redo: () => ipcRenderer.invoke('app:redo'),
-  // Updater
-  checkForUpdates: () => ipcRenderer.invoke('update:check'),
-  downloadUpdate: () => ipcRenderer.invoke('update:download'),
-  quitAndInstallUpdate: () => ipcRenderer.invoke('update:quit-and-install'),
-  openLatestDownload: () => ipcRenderer.invoke('update:open-latest'),
-  // Enhanced update methods
-  getUpdateState: () => ipcRenderer.invoke('update:get-state'),
-  getUpdateSettings: () => ipcRenderer.invoke('update:get-settings'),
-  updateUpdateSettings: (settings: any) => ipcRenderer.invoke('update:update-settings', settings),
-  getReleaseNotes: () => ipcRenderer.invoke('update:get-release-notes'),
-  checkForUpdatesNow: () => ipcRenderer.invoke('update:check-now'),
-  onUpdateEvent: (listener: (data: { type: string; payload?: any }) => void) => {
-    const pairs: Array<[string, string]> = [
-      ['update:checking', 'checking'],
-      ['update:available', 'available'],
-      ['update:not-available', 'not-available'],
-      ['update:error', 'error'],
-      ['update:downloading', 'downloading'],
-      ['update:download-progress', 'download-progress'],
-      ['update:downloaded', 'downloaded'],
-      ['update:installing', 'installing'],
-    ];
-    const handlers: Array<() => void> = [];
-    for (const [channel, type] of pairs) {
-      const wrapped = (_: Electron.IpcRendererEvent, payload: any) => listener({ type, payload });
-      ipcRenderer.on(channel, wrapped);
-      handlers.push(() => ipcRenderer.removeListener(channel, wrapped));
-    }
-    return () => handlers.forEach((off) => off());
-  },
-
-  // Open a path in a specific app
-  openIn: (args: { app: OpenInAppId; path: string }) => ipcRenderer.invoke('app:openIn', args),
-
-  // Check which apps are installed
-  checkInstalledApps: () =>
-    ipcRenderer.invoke('app:checkInstalledApps') as Promise<Record<OpenInAppId, boolean>>,
-
-  // PTY management
-  ptyStart: (opts: {
-    id: string;
-    cwd?: string;
-    remote?: { connectionId: string };
-    shell?: string;
-    env?: Record<string, string>;
-    cols?: number;
-    rows?: number;
-    autoApprove?: boolean;
-    initialPrompt?: string;
-  }) => ipcRenderer.invoke('pty:start', opts),
-  ptyInput: (args: { id: string; data: string }) => ipcRenderer.send('pty:input', args),
-  ptyResize: (args: { id: string; cols: number; rows: number }) =>
-    ipcRenderer.send('pty:resize', args),
-  ptyKill: (id: string) => ipcRenderer.send('pty:kill', { id }),
-  ptyKillTmux: (id: string) =>
-    ipcRenderer.invoke('pty:killTmux', { id }) as Promise<{ ok: boolean; error?: string }>,
-
-  // Direct PTY spawn (no shell wrapper, bypasses shell config loading)
-  ptyStartDirect: (opts: {
-    id: string;
-    providerId: string;
-    cwd: string;
-    remote?: { connectionId: string };
-    cols?: number;
-    rows?: number;
-    autoApprove?: boolean;
-    initialPrompt?: string;
-    clickTime?: number;
-    env?: Record<string, string>;
-    resume?: boolean;
-  }) => ipcRenderer.invoke('pty:startDirect', opts),
-
-  ptyScpToRemote: (args: { connectionId: string; localPaths: string[] }) =>
-    ipcRenderer.invoke('pty:scp-to-remote', args),
-
-  onPtyData: (id: string, listener: (data: string) => void) => {
-    const channel = `pty:data:${id}`;
-    const wrapped = (_: Electron.IpcRendererEvent, data: string) => listener(data);
-    ipcRenderer.on(channel, wrapped);
-    return () => ipcRenderer.removeListener(channel, wrapped);
-  },
-  ptyGetSnapshot: (args: { id: string }) => ipcRenderer.invoke('pty:snapshot:get', args),
-  ptySaveSnapshot: (args: { id: string; payload: TerminalSnapshotPayload }) =>
-    ipcRenderer.invoke('pty:snapshot:save', args),
-  ptyClearSnapshot: (args: { id: string }) => ipcRenderer.invoke('pty:snapshot:clear', args),
-  onPtyExit: (id: string, listener: (info: { exitCode: number; signal?: number }) => void) => {
-    const channel = `pty:exit:${id}`;
-    const wrapped = (_: Electron.IpcRendererEvent, info: { exitCode: number; signal?: number }) =>
-      listener(info);
-    ipcRenderer.on(channel, wrapped);
-    return () => ipcRenderer.removeListener(channel, wrapped);
-  },
-  onPtyStarted: (listener: (data: { id: string }) => void) => {
-    const channel = 'pty:started';
-    const wrapped = (_: Electron.IpcRendererEvent, data: { id: string }) => listener(data);
-    ipcRenderer.on(channel, wrapped);
-    return () => ipcRenderer.removeListener(channel, wrapped);
-  },
-  onAgentEvent: (listener: (event: AgentEvent, meta: { appFocused: boolean }) => void) => {
-    const channel = 'agent:event';
-    const wrapped = (
-      _: Electron.IpcRendererEvent,
-      data: AgentEvent,
-      meta: { appFocused: boolean }
-    ) => listener(data, meta);
-    ipcRenderer.on(channel, wrapped);
-    return () => ipcRenderer.removeListener(channel, wrapped);
-  },
-  onNotificationFocusTask: (listener: (taskId: string) => void) => {
-    const channel = 'notification:focus-task';
-    const wrapped = (_: Electron.IpcRendererEvent, taskId: string) => listener(taskId);
-    ipcRenderer.on(channel, wrapped);
-    return () => ipcRenderer.removeListener(channel, wrapped);
-  },
-  terminalGetTheme: () => ipcRenderer.invoke('terminal:getTheme'),
-
-  // Menu events (main → renderer)
-  onMenuOpenSettings: (listener: () => void) => {
-    const channel = 'menu:open-settings';
-    const wrapped = () => listener();
-    ipcRenderer.on(channel, wrapped);
-    return () => ipcRenderer.removeListener(channel, wrapped);
-  },
-  onMenuCheckForUpdates: (listener: () => void) => {
-    const channel = 'menu:check-for-updates';
-    const wrapped = () => listener();
-    ipcRenderer.on(channel, wrapped);
-    return () => ipcRenderer.removeListener(channel, wrapped);
-  },
-  onMenuUndo: (listener: () => void) => {
-    const channel = 'menu:undo';
-    const wrapped = () => listener();
-    ipcRenderer.on(channel, wrapped);
-    return () => ipcRenderer.removeListener(channel, wrapped);
-  },
-  onMenuRedo: (listener: () => void) => {
-    const channel = 'menu:redo';
-    const wrapped = () => listener();
-    ipcRenderer.on(channel, wrapped);
-    return () => ipcRenderer.removeListener(channel, wrapped);
-  },
-  onMenuCloseTab: (listener: () => void) => {
-    const channel = 'menu:close-tab';
-    const wrapped = () => listener();
-    ipcRenderer.on(channel, wrapped);
-    return () => ipcRenderer.removeListener(channel, wrapped);
-  },
-
-  // Worktree management
-  worktreeCreate: (args: {
-    projectPath: string;
-    taskName: string;
-    projectId: string;
-    baseRef?: string;
-  }) => ipcRenderer.invoke('worktree:create', args),
-  worktreeList: (args: { projectPath: string }) => ipcRenderer.invoke('worktree:list', args),
-  worktreeRemove: (args: {
-    projectPath: string;
-    worktreeId: string;
-    worktreePath?: string;
-    branch?: string;
-    taskName?: string;
-  }) => ipcRenderer.invoke('worktree:remove', args),
-  worktreeStatus: (args: { worktreePath: string }) => ipcRenderer.invoke('worktree:status', args),
-  worktreeMerge: (args: { projectPath: string; worktreeId: string }) =>
-    ipcRenderer.invoke('worktree:merge', args),
-  worktreeGet: (args: { worktreeId: string }) => ipcRenderer.invoke('worktree:get', args),
-  worktreeGetAll: () => ipcRenderer.invoke('worktree:getAll'),
-
-  // Worktree pool (reserve) management for instant task creation
-  worktreeEnsureReserve: (args: { projectId: string; projectPath: string; baseRef?: string }) =>
-    ipcRenderer.invoke('worktree:ensureReserve', args),
-  worktreeHasReserve: (args: { projectId: string }) =>
-    ipcRenderer.invoke('worktree:hasReserve', args),
-  worktreeClaimReserve: (args: {
-    projectId: string;
-    projectPath: string;
-    taskName: string;
-    baseRef?: string;
-  }) => ipcRenderer.invoke('worktree:claimReserve', args),
-  worktreeClaimReserveAndSaveTask: (args: {
-    projectId: string;
-    projectPath: string;
-    taskName: string;
-    baseRef?: string;
-    task: {
-      projectId: string;
-      name: string;
-      status: 'active' | 'idle' | 'running';
-      agentId?: string | null;
-      metadata?: any;
-      useWorktree?: boolean;
-    };
-  }) => ipcRenderer.invoke('worktree:claimReserveAndSaveTask', args),
-  worktreeRemoveReserve: (args: { projectId: string; projectPath?: string; isRemote?: boolean }) =>
-    ipcRenderer.invoke('worktree:removeReserve', args),
-
-  // Lifecycle scripts
-  lifecycleGetScript: (args: { projectPath: string; phase: 'setup' | 'run' | 'teardown' }) =>
-    ipcRenderer.invoke('lifecycle:getScript', args),
-  lifecycleSetup: (args: { taskId: string; taskPath: string; projectPath: string }) =>
-    ipcRenderer.invoke('lifecycle:setup', args),
-  lifecycleRunStart: (args: { taskId: string; taskPath: string; projectPath: string }) =>
-    ipcRenderer.invoke('lifecycle:run:start', args),
-  lifecycleRunStop: (args: { taskId: string }) => ipcRenderer.invoke('lifecycle:run:stop', args),
-  lifecycleTeardown: (args: { taskId: string; taskPath: string; projectPath: string }) =>
-    ipcRenderer.invoke('lifecycle:teardown', args),
-  lifecycleGetState: (args: { taskId: string }) => ipcRenderer.invoke('lifecycle:getState', args),
-  lifecycleGetLogs: (args: { taskId: string }) => ipcRenderer.invoke('lifecycle:getLogs', args),
-  lifecycleClearTask: (args: { taskId: string }) => ipcRenderer.invoke('lifecycle:clearTask', args),
-  onLifecycleEvent: (listener: (data: any) => void) => {
-    const wrapped = (_: Electron.IpcRendererEvent, data: any) => listener(data);
-    ipcRenderer.on(LIFECYCLE_EVENT_CHANNEL, wrapped);
-    return () => ipcRenderer.removeListener(LIFECYCLE_EVENT_CHANNEL, wrapped);
-  },
-
-  // Filesystem helpers
-  fsList: (
-    root: string,
-    opts?: {
-      includeDirs?: boolean;
-      maxEntries?: number;
-      timeBudgetMs?: number;
-      connectionId?: string;
-      remotePath?: string;
-      recursive?: boolean;
-    }
-  ) => ipcRenderer.invoke('fs:list', { root, ...(opts || {}) }),
-  fsRead: (
-    root: string,
-    relPath: string,
-    maxBytes?: number,
-    remote?: { connectionId: string; remotePath: string }
-  ) => ipcRenderer.invoke('fs:read', { root, relPath, maxBytes, ...remote }),
-  fsReadImage: (
-    root: string,
-    relPath: string,
-    remote?: { connectionId: string; remotePath: string }
-  ) => ipcRenderer.invoke('fs:read-image', { root, relPath, ...remote }),
-  fsSearchContent: (
-    root: string,
-    query: string,
-    options?: {
-      caseSensitive?: boolean;
-      maxResults?: number;
-      fileExtensions?: string[];
-    },
-    remote?: { connectionId: string; remotePath: string }
-  ) => ipcRenderer.invoke('fs:searchContent', { root, query, options, ...remote }),
-  fsWriteFile: (
-    root: string,
-    relPath: string,
-    content: string,
-    mkdirs?: boolean,
-    remote?: { connectionId: string; remotePath: string }
-  ) => ipcRenderer.invoke('fs:write', { root, relPath, content, mkdirs, ...remote }),
-  fsRemove: (
-    root: string,
-    relPath: string,
-    remote?: { connectionId: string; remotePath: string }
-  ) => ipcRenderer.invoke('fs:remove', { root, relPath, ...remote }),
-  getProjectConfig: (projectPath: string) =>
-    ipcRenderer.invoke('fs:getProjectConfig', { projectPath }),
-  saveProjectConfig: (projectPath: string, content: string) =>
-    ipcRenderer.invoke('fs:saveProjectConfig', { projectPath, content }),
-  // Attachments
-  saveAttachment: (args: { taskPath: string; srcPath: string; subdir?: string }) =>
-    ipcRenderer.invoke('fs:save-attachment', args),
-
-  // Project management
-  openProject: () => ipcRenderer.invoke('project:open'),
-  openFile: (args?: { title?: string; message?: string; filters?: Electron.FileFilter[] }) =>
-    ipcRenderer.invoke('project:openFile', args),
-  getProjectSettings: (projectId: string) =>
-    ipcRenderer.invoke('projectSettings:get', { projectId }),
-  updateProjectSettings: (args: { projectId: string; baseRef: string }) =>
-    ipcRenderer.invoke('projectSettings:update', args),
-  fetchProjectBaseRef: (args: { projectId: string; projectPath: string }) =>
-    ipcRenderer.invoke('projectSettings:fetchBaseRef', args),
-  getGitInfo: (projectPath: string) => ipcRenderer.invoke('git:getInfo', projectPath),
-  getGitStatus: (taskPath: string) => ipcRenderer.invoke('git:get-status', taskPath),
-  watchGitStatus: (taskPath: string) => ipcRenderer.invoke('git:watch-status', taskPath),
-  unwatchGitStatus: (taskPath: string, watchId?: string) =>
-    ipcRenderer.invoke('git:unwatch-status', taskPath, watchId),
-  onGitStatusChanged: (listener: (data: { taskPath: string; error?: string }) => void) => {
-    attachGitStatusBridgeOnce();
-    gitStatusChangedListeners.add(listener);
-    return () => {
-      gitStatusChangedListeners.delete(listener);
-    };
-  },
-  getFileDiff: (args: { taskPath: string; filePath: string }) =>
-    ipcRenderer.invoke('git:get-file-diff', args),
-  stageFile: (args: { taskPath: string; filePath: string }) =>
-    ipcRenderer.invoke('git:stage-file', args),
-  stageAllFiles: (args: { taskPath: string }) => ipcRenderer.invoke('git:stage-all-files', args),
-  unstageFile: (args: { taskPath: string; filePath: string }) =>
-    ipcRenderer.invoke('git:unstage-file', args),
-  revertFile: (args: { taskPath: string; filePath: string }) =>
-    ipcRenderer.invoke('git:revert-file', args),
-  gitCommit: (args: { taskPath: string; message: string }) =>
-    ipcRenderer.invoke('git:commit', args),
-  gitPush: (args: { taskPath: string }) => ipcRenderer.invoke('git:push', args),
-  gitPull: (args: { taskPath: string }) => ipcRenderer.invoke('git:pull', args),
-  gitGetLog: (args: { taskPath: string; maxCount?: number; skip?: number }) =>
-    ipcRenderer.invoke('git:get-log', args),
-  gitGetLatestCommit: (args: { taskPath: string }) =>
-    ipcRenderer.invoke('git:get-latest-commit', args),
-  gitGetCommitFiles: (args: { taskPath: string; commitHash: string }) =>
-    ipcRenderer.invoke('git:get-commit-files', args),
-  gitGetCommitFileDiff: (args: { taskPath: string; commitHash: string; filePath: string }) =>
-    ipcRenderer.invoke('git:get-commit-file-diff', args),
-  gitSoftReset: (args: { taskPath: string }) => ipcRenderer.invoke('git:soft-reset', args),
-  gitCommitAndPush: (args: {
-    taskPath: string;
-    commitMessage?: string;
-    createBranchIfOnDefault?: boolean;
-    branchPrefix?: string;
-  }) => ipcRenderer.invoke('git:commit-and-push', args),
-  generatePrContent: (args: { taskPath: string; base?: string }) =>
-    ipcRenderer.invoke('git:generate-pr-content', args),
-  createPullRequest: (args: {
-    taskPath: string;
-    title?: string;
-    body?: string;
-    base?: string;
-    head?: string;
-    draft?: boolean;
-    web?: boolean;
-    fill?: boolean;
-  }) => ipcRenderer.invoke('git:create-pr', args),
-  mergeToMain: (args: { taskPath: string }) => ipcRenderer.invoke('git:merge-to-main', args),
-  mergePr: (args: {
-    taskPath: string;
-    prNumber?: number;
-    strategy?: 'merge' | 'squash' | 'rebase';
-    admin?: boolean;
-  }) => ipcRenderer.invoke('git:merge-pr', args),
-  getPrStatus: (args: { taskPath: string }) => ipcRenderer.invoke('git:get-pr-status', args),
-  getCheckRuns: (args: { taskPath: string }) => ipcRenderer.invoke('git:get-check-runs', args),
-  getPrComments: (args: { taskPath: string; prNumber?: number }) =>
-    ipcRenderer.invoke('git:get-pr-comments', args),
-  getBranchStatus: (args: { taskPath: string }) =>
-    ipcRenderer.invoke('git:get-branch-status', args),
-  renameBranch: (args: { repoPath: string; oldBranch: string; newBranch: string }) =>
-    ipcRenderer.invoke('git:rename-branch', args),
-  listRemoteBranches: (args: { projectPath: string; remote?: string }) =>
-    ipcRenderer.invoke('git:list-remote-branches', args),
-  openExternal: (url: string) => ipcRenderer.invoke('app:openExternal', url),
-  clipboardWriteText: (text: string) => ipcRenderer.invoke('app:clipboard-write-text', text),
-  paste: () => ipcRenderer.invoke('app:paste'),
-  // Telemetry (minimal, anonymous)
-  captureTelemetry: (event: string, properties?: Record<string, any>) =>
-    ipcRenderer.invoke('telemetry:capture', { event, properties }),
-  getTelemetryStatus: () => ipcRenderer.invoke('telemetry:get-status'),
-  setTelemetryEnabled: (enabled: boolean) => ipcRenderer.invoke('telemetry:set-enabled', enabled),
-  setOnboardingSeen: (flag: boolean) => ipcRenderer.invoke('telemetry:set-onboarding-seen', flag),
-  connectToGitHub: (projectPath: string) => ipcRenderer.invoke('github:connect', projectPath),
-
-  // GitHub integration
-  githubAuth: () => ipcRenderer.invoke('github:auth'),
-  githubCancelAuth: () => ipcRenderer.invoke('github:auth:cancel'),
-
-  // GitHub auth event listeners
-  onGithubAuthDeviceCode: (
-    callback: (data: {
-      userCode: string;
-      verificationUri: string;
-      expiresIn: number;
-      interval: number;
-    }) => void
-  ) => {
-    const listener = (_: any, data: any) => callback(data);
-    ipcRenderer.on('github:auth:device-code', listener);
-    return () => ipcRenderer.removeListener('github:auth:device-code', listener);
-  },
-  onGithubAuthPolling: (callback: (data: { status: string }) => void) => {
-    const listener = (_: any, data: any) => callback(data);
-    ipcRenderer.on('github:auth:polling', listener);
-    return () => ipcRenderer.removeListener('github:auth:polling', listener);
-  },
-  onGithubAuthSlowDown: (callback: (data: { newInterval: number }) => void) => {
-    const listener = (_: any, data: any) => callback(data);
-    ipcRenderer.on('github:auth:slow-down', listener);
-    return () => ipcRenderer.removeListener('github:auth:slow-down', listener);
-  },
-  onGithubAuthSuccess: (callback: (data: { token: string; user: any }) => void) => {
-    const listener = (_: any, data: any) => callback(data);
-    ipcRenderer.on('github:auth:success', listener);
-    return () => ipcRenderer.removeListener('github:auth:success', listener);
-  },
-  onGithubAuthError: (callback: (data: { error: string; message: string }) => void) => {
-    const listener = (_: any, data: any) => callback(data);
-    ipcRenderer.on('github:auth:error', listener);
-    return () => ipcRenderer.removeListener('github:auth:error', listener);
-  },
-  onGithubAuthCancelled: (callback: () => void) => {
-    const listener = () => callback();
-    ipcRenderer.on('github:auth:cancelled', listener);
-    return () => ipcRenderer.removeListener('github:auth:cancelled', listener);
-  },
-  onGithubAuthUserUpdated: (callback: (data: { user: any }) => void) => {
-    const listener = (_: any, data: any) => callback(data);
-    ipcRenderer.on('github:auth:user-updated', listener);
-    return () => ipcRenderer.removeListener('github:auth:user-updated', listener);
-  },
-
-  githubIsAuthenticated: () => ipcRenderer.invoke('github:isAuthenticated'),
-  githubGetStatus: () => ipcRenderer.invoke('github:getStatus'),
-  githubGetUser: () => ipcRenderer.invoke('github:getUser'),
-  githubGetRepositories: () => ipcRenderer.invoke('github:getRepositories'),
-  githubCloneRepository: (repoUrl: string, localPath: string) =>
-    ipcRenderer.invoke('github:cloneRepository', repoUrl, localPath),
-  githubGetOwners: () => ipcRenderer.invoke('github:getOwners'),
-  githubValidateRepoName: (name: string, owner: string) =>
-    ipcRenderer.invoke('github:validateRepoName', name, owner),
-  githubCreateNewProject: (params: {
-    name: string;
-    description?: string;
-    owner: string;
-    isPrivate: boolean;
-    gitignoreTemplate?: string;
-  }) => ipcRenderer.invoke('github:createNewProject', params),
-  githubListPullRequests: (projectPath: string) =>
-    ipcRenderer.invoke('github:listPullRequests', { projectPath }),
-  githubCreatePullRequestWorktree: (args: {
-    projectPath: string;
-    projectId: string;
-    prNumber: number;
-    prTitle?: string;
-    taskName?: string;
-    branchName?: string;
-  }) => ipcRenderer.invoke('github:createPullRequestWorktree', args),
-  githubLogout: () => ipcRenderer.invoke('github:logout'),
-  githubCheckCLIInstalled: () => ipcRenderer.invoke('github:checkCLIInstalled'),
-  githubInstallCLI: () => ipcRenderer.invoke('github:installCLI'),
-  // GitHub issues
-  githubIssuesList: (projectPath: string, limit?: number) =>
-    ipcRenderer.invoke('github:issues:list', projectPath, limit),
-  githubIssuesSearch: (projectPath: string, searchTerm: string, limit?: number) =>
-    ipcRenderer.invoke('github:issues:search', projectPath, searchTerm, limit),
-  githubIssueGet: (projectPath: string, number: number) =>
-    ipcRenderer.invoke('github:issues:get', projectPath, number),
-  // Linear integration
-  linearSaveToken: (token: string) => ipcRenderer.invoke('linear:saveToken', token),
-  linearCheckConnection: () => ipcRenderer.invoke('linear:checkConnection'),
-  linearClearToken: () => ipcRenderer.invoke('linear:clearToken'),
-  linearInitialFetch: (limit?: number) => ipcRenderer.invoke('linear:initialFetch', limit),
-  linearSearchIssues: (searchTerm: string, limit?: number) =>
-    ipcRenderer.invoke('linear:searchIssues', searchTerm, limit),
-  // Jira integration
-  jiraSaveCredentials: (args: { siteUrl: string; email: string; token: string }) =>
-    ipcRenderer.invoke('jira:saveCredentials', args),
-  jiraClearCredentials: () => ipcRenderer.invoke('jira:clearCredentials'),
-  jiraCheckConnection: () => ipcRenderer.invoke('jira:checkConnection'),
-  jiraInitialFetch: (limit?: number) => ipcRenderer.invoke('jira:initialFetch', limit),
-  jiraSearchIssues: (searchTerm: string, limit?: number) =>
-    ipcRenderer.invoke('jira:searchIssues', searchTerm, limit),
-  // GitLab integration
-  gitlabSaveCredentials: (args: { instanceUrl: string; token: string }) =>
-    ipcRenderer.invoke('gitlab:saveCredentials', args),
-  gitlabClearCredentials: () => ipcRenderer.invoke('gitlab:clearCredentials'),
-  gitlabCheckConnection: () => ipcRenderer.invoke('gitlab:checkConnection'),
-  gitlabInitialFetch: (projectPath: string, limit?: number) =>
-    ipcRenderer.invoke('gitlab:initialFetch', { projectPath, limit }),
-  gitlabSearchIssues: (projectPath: string, searchTerm: string, limit?: number) =>
-    ipcRenderer.invoke('gitlab:searchIssues', { projectPath, searchTerm, limit }),
-  getProviderStatuses: (opts?: { refresh?: boolean; providers?: string[]; providerId?: string }) =>
-    ipcRenderer.invoke('providers:getStatuses', opts ?? {}),
-  getProviderCustomConfig: (providerId: string) =>
-    ipcRenderer.invoke('providers:getCustomConfig', providerId),
-  getAllProviderCustomConfigs: () => ipcRenderer.invoke('providers:getAllCustomConfigs'),
-  updateProviderCustomConfig: (providerId: string, config: any) =>
-    ipcRenderer.invoke('providers:updateCustomConfig', providerId, config),
-
-  // Line comments management
-  lineCommentsCreate: (input: any) => ipcRenderer.invoke('lineComments:create', input),
-  lineCommentsGet: (args: { taskId: string; filePath?: string }) =>
-    ipcRenderer.invoke('lineComments:get', args),
-  lineCommentsUpdate: (input: { id: string; content: string }) =>
-    ipcRenderer.invoke('lineComments:update', input),
-  lineCommentsDelete: (id: string) => ipcRenderer.invoke('lineComments:delete', id),
-  lineCommentsGetFormatted: (taskId: string) =>
-    ipcRenderer.invoke('lineComments:getFormatted', taskId),
-  lineCommentsMarkSent: (commentIds: string[]) =>
-    ipcRenderer.invoke('lineComments:markSent', commentIds),
-  lineCommentsGetUnsent: (taskId: string) => ipcRenderer.invoke('lineComments:getUnsent', taskId),
-
-  // Debug helpers
-  debugAppendLog: (filePath: string, content: string, options?: { reset?: boolean }) =>
-    ipcRenderer.invoke('debug:append-log', filePath, content, options ?? {}),
-
-  // PlanMode strict lock
-  planApplyLock: (taskPath: string) => ipcRenderer.invoke('plan:lock', taskPath),
-  planReleaseLock: (taskPath: string) => ipcRenderer.invoke('plan:unlock', taskPath),
-  onPlanEvent: (
-    listener: (data: {
-      type: 'write_blocked' | 'remove_blocked';
-      root: string;
-      relPath: string;
-      code?: string;
-      message?: string;
-    }) => void
-  ) => {
-    const channel = 'plan:event';
-    const wrapped = (_: Electron.IpcRendererEvent, data: any) => listener(data);
-    ipcRenderer.on(channel, wrapped);
-    return () => ipcRenderer.removeListener(channel, wrapped);
-  },
-
-  onProviderStatusUpdated: (listener: (data: { providerId: string; status: any }) => void) => {
-    const channel = 'provider:status-updated';
-    const wrapped = (_: Electron.IpcRendererEvent, data: any) => listener(data);
-    ipcRenderer.on(channel, wrapped);
-    return () => ipcRenderer.removeListener(channel, wrapped);
-  },
-
-  // Host preview (non-container)
-  hostPreviewStart: (args: {
-    taskId: string;
-    taskPath: string;
-    script?: string;
-    parentProjectPath?: string;
-  }) => ipcRenderer.invoke('preview:host:start', args),
-  hostPreviewSetup: (args: { taskId: string; taskPath: string }) =>
-    ipcRenderer.invoke('preview:host:setup', args),
-  hostPreviewStop: (taskId: string) => ipcRenderer.invoke('preview:host:stop', taskId),
-  hostPreviewStopAll: (exceptId?: string) => ipcRenderer.invoke('preview:host:stopAll', exceptId),
-  onHostPreviewEvent: (listener: (data: any) => void) => {
-    const channel = 'preview:host:event';
-    const wrapped = (_: Electron.IpcRendererEvent, data: any) => listener(data);
-    ipcRenderer.on(channel, wrapped);
-    return () => ipcRenderer.removeListener(channel, wrapped);
-  },
-
-  // Main-managed browser (WebContentsView)
-  browserShow: (bounds: { x: number; y: number; width: number; height: number }, url?: string) =>
-    ipcRenderer.invoke('browser:view:show', { ...bounds, url }),
-  browserHide: () => ipcRenderer.invoke('browser:view:hide'),
-  browserSetBounds: (bounds: { x: number; y: number; width: number; height: number }) =>
-    ipcRenderer.invoke('browser:view:setBounds', bounds),
-  browserLoadURL: (url: string, forceReload?: boolean) =>
-    ipcRenderer.invoke('browser:view:loadURL', url, forceReload),
-  browserGoBack: () => ipcRenderer.invoke('browser:view:goBack'),
-  browserGoForward: () => ipcRenderer.invoke('browser:view:goForward'),
-  browserReload: () => ipcRenderer.invoke('browser:view:reload'),
-  browserOpenDevTools: () => ipcRenderer.invoke('browser:view:openDevTools'),
-  browserClear: () => ipcRenderer.invoke('browser:view:clear'),
-  onBrowserViewEvent: (listener: (data: any) => void) => {
-    const channel = 'browser:view:event';
-    const wrapped = (_: Electron.IpcRendererEvent, data: any) => listener(data);
-    ipcRenderer.on(channel, wrapped);
-    return () => ipcRenderer.removeListener(channel, wrapped);
-  },
-
-  // Lightweight TCP probe for localhost ports to avoid noisy fetches
-  netProbePorts: (host: string, ports: number[], timeoutMs?: number) =>
-    ipcRenderer.invoke('net:probePorts', host, ports, timeoutMs),
-
-  // SSH operations (unwrap { success, ... } IPC responses)
-  sshTestConnection: (config: any) => ipcRenderer.invoke('ssh:testConnection', config),
-  sshSaveConnection: async (config: any) => {
-    const res = await ipcRenderer.invoke('ssh:saveConnection', config);
-    if (res && typeof res === 'object' && 'success' in res && !res.success) {
-      throw new Error((res as any).error || 'Failed to save SSH connection');
-    }
-    return (res as any).connection;
-  },
-  sshGetConnections: async () => {
-    const res = await ipcRenderer.invoke('ssh:getConnections');
-    if (res && typeof res === 'object' && 'success' in res && !res.success) {
-      throw new Error((res as any).error || 'Failed to load SSH connections');
-    }
-    return (res as any).connections || [];
-  },
-  sshDeleteConnection: async (id: string) => {
-    const res = await ipcRenderer.invoke('ssh:deleteConnection', id);
-    if (res && typeof res === 'object' && 'success' in res && !res.success) {
-      throw new Error((res as any).error || 'Failed to delete SSH connection');
-    }
-  },
-  sshConnect: async (arg: any) => {
-    const res = await ipcRenderer.invoke('ssh:connect', arg);
-    if (res && typeof res === 'object' && 'success' in res) {
-      if (!res.success) {
-        throw new Error((res as any).error || 'SSH connect failed');
-      }
-      return (res as any).connectionId as string;
-    }
-    return res as string;
-  },
-  sshDisconnect: async (connectionId: string) => {
-    const res = await ipcRenderer.invoke('ssh:disconnect', connectionId);
-    if (res && typeof res === 'object' && 'success' in res && !res.success) {
-      throw new Error((res as any).error || 'SSH disconnect failed');
-    }
-  },
-  sshExecuteCommand: async (connectionId: string, command: string, cwd?: string) => {
-    const res = await ipcRenderer.invoke('ssh:executeCommand', connectionId, command, cwd);
-    if (res && typeof res === 'object' && 'success' in res && !res.success) {
-      throw new Error((res as any).error || 'SSH command failed');
-    }
-    return {
-      stdout: (res as any).stdout || '',
-      stderr: (res as any).stderr || '',
-      exitCode: (res as any).exitCode ?? -1,
-    };
-  },
-  sshListFiles: async (connectionId: string, path: string) => {
-    const res = await ipcRenderer.invoke('ssh:listFiles', connectionId, path);
-    if (res && typeof res === 'object' && 'success' in res && !res.success) {
-      throw new Error((res as any).error || 'SSH list files failed');
-    }
-    return (res as any).files || [];
-  },
-  sshReadFile: async (connectionId: string, path: string) => {
-    const res = await ipcRenderer.invoke('ssh:readFile', connectionId, path);
-    if (res && typeof res === 'object' && 'success' in res && !res.success) {
-      throw new Error((res as any).error || 'SSH read file failed');
-    }
-    return (res as any).content || '';
-  },
-  sshWriteFile: async (connectionId: string, path: string, content: string) => {
-    const res = await ipcRenderer.invoke('ssh:writeFile', connectionId, path, content);
-    if (res && typeof res === 'object' && 'success' in res && !res.success) {
-      throw new Error((res as any).error || 'SSH write file failed');
-    }
-  },
-  sshGetState: async (connectionId: string) => {
-    const res = await ipcRenderer.invoke('ssh:getState', connectionId);
-    if (res && typeof res === 'object' && 'success' in res && !res.success) {
-      throw new Error((res as any).error || 'SSH get state failed');
-    }
-    return (res as any).state;
-  },
-  sshGetConfig: () => ipcRenderer.invoke('ssh:getSshConfig'),
-  sshGetSshConfigHost: (hostAlias: string) => ipcRenderer.invoke('ssh:getSshConfigHost', hostAlias),
-  sshCheckIsGitRepo: async (connectionId: string, remotePath: string) => {
-    const res = await ipcRenderer.invoke('ssh:checkIsGitRepo', connectionId, remotePath);
-    if (res && typeof res === 'object' && 'success' in res && !res.success) {
-      throw new Error((res as any).error || 'SSH check git repo failed');
-    }
-    return (res as any).isGitRepo as boolean;
-  },
-  sshInitRepo: async (connectionId: string, parentPath: string, repoName: string) => {
-    const res = await ipcRenderer.invoke('ssh:initRepo', connectionId, parentPath, repoName);
-    if (res && typeof res === 'object' && 'success' in res && !res.success) {
-      throw new Error((res as any).error || 'SSH init repo failed');
-    }
-    return (res as any).path as string;
-  },
-  sshCloneRepo: async (connectionId: string, repoUrl: string, targetPath: string) => {
-    const res = await ipcRenderer.invoke('ssh:cloneRepo', connectionId, repoUrl, targetPath);
-    if (res && typeof res === 'object' && 'success' in res && !res.success) {
-      throw new Error((res as any).error || 'SSH clone repo failed');
-    }
-    return (res as any).path as string;
-  },
-
-  // Skills management
-  skillsGetCatalog: () => ipcRenderer.invoke('skills:getCatalog'),
-  skillsRefreshCatalog: () => ipcRenderer.invoke('skills:refreshCatalog'),
-  skillsInstall: (args: { skillId: string }) => ipcRenderer.invoke('skills:install', args),
-  skillsUninstall: (args: { skillId: string }) => ipcRenderer.invoke('skills:uninstall', args),
-  skillsGetDetail: (args: { skillId: string }) => ipcRenderer.invoke('skills:getDetail', args),
-  skillsGetDetectedAgents: () => ipcRenderer.invoke('skills:getDetectedAgents'),
-  skillsCreate: (args: { name: string; description: string }) =>
-    ipcRenderer.invoke('skills:create', args),
-});
-
-// Type definitions for the exposed API
-export interface ElectronAPI {
-  // App info
-  getVersion: () => Promise<string>;
-  getPlatform: () => Promise<string>;
-  clipboardWriteText: (text: string) => Promise<{ success: boolean; error?: string }>;
-  paste: () => Promise<{ success: boolean; error?: string }>;
-  listInstalledFonts: (args?: {
-    refresh?: boolean;
-  }) => Promise<{ success: boolean; fonts?: string[]; cached?: boolean; error?: string }>;
-  // Updater
-  checkForUpdates: () => Promise<{ success: boolean; result?: any; error?: string }>;
-  downloadUpdate: () => Promise<{ success: boolean; error?: string }>;
-  quitAndInstallUpdate: () => Promise<{ success: boolean; error?: string }>;
-  openLatestDownload: () => Promise<{ success: boolean; error?: string }>;
-  onUpdateEvent: (listener: (data: { type: string; payload?: any }) => void) => () => void;
-
-  // Telemetry (minimal, anonymous)
-  captureTelemetry: (
-    event: string,
-    properties?: Record<string, any>
-  ) => Promise<{ success: boolean; error?: string; disabled?: boolean }>;
-  getTelemetryStatus: () => Promise<{
-    success: boolean;
-    status?: {
-      enabled: boolean;
-      envDisabled: boolean;
-      userOptOut: boolean;
-      hasKeyAndHost: boolean;
-    };
-    error?: string;
-  }>;
-  setTelemetryEnabled: (
-    enabled: boolean
-  ) => Promise<{ success: boolean; status?: any; error?: string }>;
-
-  // PTY management
-  ptyStart: (opts: {
-    id: string;
-    cwd?: string;
-    shell?: string;
-    env?: Record<string, string>;
-    cols?: number;
-    rows?: number;
-    autoApprove?: boolean;
-    initialPrompt?: string;
-  }) => Promise<{ ok: boolean; error?: string }>;
-  ptyInput: (args: { id: string; data: string }) => void;
-  ptyResize: (args: { id: string; cols: number; rows: number }) => void;
-  ptyKill: (id: string) => void;
-  onPtyData: (id: string, listener: (data: string) => void) => () => void;
-  ptyGetSnapshot: (args: { id: string }) => Promise<{
-    ok: boolean;
-    snapshot?: any;
-    error?: string;
-  }>;
-  ptySaveSnapshot: (args: {
-    id: string;
-    payload: TerminalSnapshotPayload;
-  }) => Promise<{ ok: boolean; error?: string }>;
-  ptyClearSnapshot: (args: { id: string }) => Promise<{ ok: boolean }>;
-  onPtyExit: (
-    id: string,
-    listener: (info: { exitCode: number; signal?: number }) => void
-  ) => () => void;
-  // Worktree management
-  worktreeCreate: (args: {
-    projectPath: string;
-    taskName: string;
-    projectId: string;
-    baseRef?: string;
-  }) => Promise<{ success: boolean; worktree?: any; error?: string }>;
-  worktreeList: (args: {
-    projectPath: string;
-  }) => Promise<{ success: boolean; worktrees?: any[]; error?: string }>;
-  worktreeRemove: (args: {
-    projectPath: string;
-    worktreeId: string;
-    worktreePath?: string;
-    branch?: string;
-    taskName?: string;
-  }) => Promise<{ success: boolean; error?: string }>;
-  worktreeStatus: (args: {
-    worktreePath: string;
-  }) => Promise<{ success: boolean; status?: any; error?: string }>;
-  worktreeMerge: (args: {
-    projectPath: string;
-    worktreeId: string;
-  }) => Promise<{ success: boolean; error?: string }>;
-  worktreeGet: (args: {
-    worktreeId: string;
-  }) => Promise<{ success: boolean; worktree?: any; error?: string }>;
-  worktreeGetAll: () => Promise<{ success: boolean; worktrees?: any[]; error?: string }>;
-  // Worktree pool (reserve) management for instant task creation
-  worktreeEnsureReserve: (args: {
-    projectId: string;
-    projectPath: string;
-    baseRef?: string;
-  }) => Promise<{ success: boolean; error?: string }>;
-  worktreeHasReserve: (args: {
-    projectId: string;
-  }) => Promise<{ success: boolean; hasReserve?: boolean; error?: string }>;
-  worktreeClaimReserve: (args: {
-    projectId: string;
-    projectPath: string;
-    taskName: string;
-    baseRef?: string;
-  }) => Promise<{
-    success: boolean;
-    worktree?: any;
-    needsBaseRefSwitch?: boolean;
-    error?: string;
-  }>;
-  worktreeClaimReserveAndSaveTask: (args: {
-    projectId: string;
-    projectPath: string;
-    taskName: string;
-    baseRef?: string;
-    task: {
-      projectId: string;
-      name: string;
-      status: 'active' | 'idle' | 'running';
-      agentId?: string | null;
-      metadata?: any;
-      useWorktree?: boolean;
-    };
-  }) => Promise<{
-    success: boolean;
-    worktree?: any;
-    task?: any;
-    needsBaseRefSwitch?: boolean;
-    error?: string;
-  }>;
-  worktreeRemoveReserve: (args: {
-    projectId: string;
-  }) => Promise<{ success: boolean; error?: string }>;
-
-  // Lifecycle scripts
-  lifecycleGetScript: (args: {
-    projectPath: string;
-    phase: 'setup' | 'run' | 'teardown';
-  }) => Promise<{ success: boolean; script?: string | null; error?: string }>;
-  lifecycleSetup: (args: {
-    taskId: string;
-    taskPath: string;
-    projectPath: string;
-  }) => Promise<{ success: boolean; skipped?: boolean; error?: string }>;
-  lifecycleRunStart: (args: {
-    taskId: string;
-    taskPath: string;
-    projectPath: string;
-  }) => Promise<{ success: boolean; skipped?: boolean; error?: string }>;
-  lifecycleRunStop: (args: {
-    taskId: string;
-  }) => Promise<{ success: boolean; skipped?: boolean; error?: string }>;
-  lifecycleTeardown: (args: {
-    taskId: string;
-    taskPath: string;
-    projectPath: string;
-  }) => Promise<{ success: boolean; skipped?: boolean; error?: string }>;
-  lifecycleGetState: (args: { taskId: string }) => Promise<{
-    success: boolean;
-    state?: {
-      taskId: string;
-      setup: {
-        status: 'idle' | 'running' | 'succeeded' | 'failed';
-        startedAt?: string;
-        finishedAt?: string;
-        exitCode?: number | null;
-        error?: string | null;
-      };
-      run: {
-        status: 'idle' | 'running' | 'succeeded' | 'failed';
-        startedAt?: string;
-        finishedAt?: string;
-        exitCode?: number | null;
-        error?: string | null;
-        pid?: number | null;
-      };
-      teardown: {
-        status: 'idle' | 'running' | 'succeeded' | 'failed';
-        startedAt?: string;
-        finishedAt?: string;
-        exitCode?: number | null;
-        error?: string | null;
-      };
-    };
-    error?: string;
-  }>;
-  lifecycleClearTask: (args: { taskId: string }) => Promise<{ success: boolean; error?: string }>;
-  onLifecycleEvent: (listener: (data: any) => void) => () => void;
-
-  // Project management
-  openProject: () => Promise<{ success: boolean; path?: string; error?: string }>;
-  getGitInfo: (projectPath: string) => Promise<{
-    isGitRepo: boolean;
-    remote?: string;
-    branch?: string;
-    baseRef?: string;
-    upstream?: string;
-    aheadCount?: number;
-    behindCount?: number;
-    path?: string;
-    rootPath?: string;
-    error?: string;
-  }>;
-  getGitStatus: (taskPath: string) => Promise<{
-    success: boolean;
-    changes?: Array<{
-      path: string;
-      status: string;
-      additions: number;
-      deletions: number;
-      diff?: string;
-    }>;
-    error?: string;
-  }>;
-  watchGitStatus: (taskPath: string) => Promise<{
-    success: boolean;
-    watchId?: string;
-    error?: string;
-  }>;
-  unwatchGitStatus: (
-    taskPath: string,
-    watchId?: string
-  ) => Promise<{
-    success: boolean;
-    error?: string;
-  }>;
-  onGitStatusChanged: (
-    listener: (data: { taskPath: string; error?: string }) => void
-  ) => () => void;
-  getFileDiff: (args: { taskPath: string; filePath: string }) => Promise<{
-    success: boolean;
-    diff?: { lines: Array<{ left?: string; right?: string; type: 'context' | 'add' | 'del' }> };
-    error?: string;
-  }>;
-  gitCommitAndPush: (args: {
-    taskPath: string;
-    commitMessage?: string;
-    createBranchIfOnDefault?: boolean;
-    branchPrefix?: string;
-  }) => Promise<{ success: boolean; branch?: string; output?: string; error?: string }>;
-  createPullRequest: (args: {
-    taskPath: string;
-    title?: string;
-    body?: string;
-    base?: string;
-    head?: string;
-    draft?: boolean;
-    web?: boolean;
-    fill?: boolean;
-  }) => Promise<{ success: boolean; url?: string; output?: string; error?: string }>;
-  connectToGitHub: (
-    projectPath: string
-  ) => Promise<{ success: boolean; repository?: string; branch?: string; error?: string }>;
-
-  // Filesystem helpers
-  fsList: (
-    root: string,
-    opts?: {
-      includeDirs?: boolean;
-      maxEntries?: number;
-      timeBudgetMs?: number;
-      connectionId?: string;
-      remotePath?: string;
-    }
-  ) => Promise<{
-    success: boolean;
-    items?: Array<{ path: string; type: 'file' | 'dir' }>;
-    error?: string;
-    canceled?: boolean;
-    truncated?: boolean;
-    reason?: string;
-    durationMs?: number;
-  }>;
-  fsRead: (
-    root: string,
-    relPath: string,
-    maxBytes?: number,
-    remote?: { connectionId: string; remotePath: string }
-  ) => Promise<{
-    success: boolean;
-    path?: string;
-    size?: number;
-    truncated?: boolean;
-    content?: string;
-    error?: string;
-  }>;
-
-  // GitHub integration
-  githubAuth: () => Promise<{
-    success: boolean;
-    device_code?: string;
-    user_code?: string;
-    verification_uri?: string;
-    expires_in?: number;
-    interval?: number;
-    error?: string;
-  }>;
-  githubCancelAuth: () => Promise<{ success: boolean; error?: string }>;
-
-  // GitHub auth event listeners (return cleanup function)
-  onGithubAuthDeviceCode: (
-    callback: (data: {
-      userCode: string;
-      verificationUri: string;
-      expiresIn: number;
-      interval: number;
-    }) => void
-  ) => () => void;
-  onGithubAuthPolling: (callback: (data: { status: string }) => void) => () => void;
-  onGithubAuthSlowDown: (callback: (data: { newInterval: number }) => void) => () => void;
-  onGithubAuthSuccess: (callback: (data: { token: string; user: any }) => void) => () => void;
-  onGithubAuthError: (callback: (data: { error: string; message: string }) => void) => () => void;
-  onGithubAuthCancelled: (callback: () => void) => () => void;
-  onGithubAuthUserUpdated: (callback: (data: { user: any }) => void) => () => void;
-
-  githubIsAuthenticated: () => Promise<boolean>;
-  githubGetStatus: () => Promise<{ installed: boolean; authenticated: boolean; user?: any }>;
-  githubGetUser: () => Promise<any>;
-  githubGetRepositories: () => Promise<any[]>;
-  githubCloneRepository: (
-    repoUrl: string,
-    localPath: string
-  ) => Promise<{ success: boolean; error?: string }>;
-  githubListPullRequests: (
-    projectPath: string
-  ) => Promise<{ success: boolean; prs?: any[]; error?: string }>;
-  githubCreatePullRequestWorktree: (args: {
-    projectPath: string;
-    projectId: string;
-    prNumber: number;
-    prTitle?: string;
-    taskName?: string;
-    branchName?: string;
-  }) => Promise<{
-    success: boolean;
-    worktree?: any;
-    branchName?: string;
-    taskName?: string;
-    error?: string;
-  }>;
-  githubLogout: () => Promise<void>;
-  githubCheckCLIInstalled: () => Promise<boolean>;
-  githubInstallCLI: () => Promise<{ success: boolean; error?: string }>;
-
-  // Host preview (non-container)
-  hostPreviewStart: (args: {
-    taskId: string;
-    taskPath: string;
-    script?: string;
-    parentProjectPath?: string;
-  }) => Promise<{ ok: boolean; error?: string }>;
-  hostPreviewSetup: (args: {
-    taskId: string;
-    taskPath: string;
-  }) => Promise<{ ok: boolean; error?: string }>;
-  hostPreviewStop: (taskId: string) => Promise<{ ok: boolean }>;
-  onHostPreviewEvent: (
-    listener: (data: { type: 'url'; taskId: string; url: string }) => void
-  ) => () => void;
-
-  // Main-managed browser (WebContentsView)
-  browserShow: (
-    bounds: { x: number; y: number; width: number; height: number },
-    url?: string
-  ) => Promise<{ ok: boolean }>;
-  browserHide: () => Promise<{ ok: boolean }>;
-  browserSetBounds: (bounds: {
-    x: number;
-    y: number;
-    width: number;
-    height: number;
-  }) => Promise<{ ok: boolean }>;
-  browserLoadURL: (url: string) => Promise<{ ok: boolean }>;
-  browserGoBack: () => Promise<{ ok: boolean }>;
-  browserGoForward: () => Promise<{ ok: boolean }>;
-  browserReload: () => Promise<{ ok: boolean }>;
-  browserOpenDevTools: () => Promise<{ ok: boolean }>;
-  onBrowserViewEvent: (listener: (data: any) => void) => () => void;
-
-  // TCP probe (no HTTP requests)
-  netProbePorts: (
-    host: string,
-    ports: number[],
-    timeoutMs?: number
-  ) => Promise<{ reachable: number[] }>;
-
-  // SSH operations
-  sshTestConnection: (
-    config: any
-  ) => Promise<{ success: boolean; latency?: number; error?: string }>;
-  sshSaveConnection: (config: any) => Promise<any>;
-  sshGetConnections: () => Promise<any[]>;
-  sshDeleteConnection: (id: string) => Promise<void>;
-  sshConnect: (arg: any) => Promise<string>;
-  sshDisconnect: (connectionId: string) => Promise<void>;
-  sshExecuteCommand: (
-    connectionId: string,
-    command: string,
-    cwd?: string
-  ) => Promise<{
-    stdout: string;
-    stderr: string;
-    exitCode: number;
-  }>;
-  sshListFiles: (connectionId: string, path: string) => Promise<any[]>;
-  sshReadFile: (connectionId: string, path: string) => Promise<string>;
-  sshWriteFile: (connectionId: string, path: string, content: string) => Promise<void>;
-  sshGetState: (connectionId: string) => Promise<any>;
-  sshGetConfig: () => Promise<{ success: boolean; hosts?: any[]; error?: string }>;
-}
-
-declare global {
-  interface Window {
-    electronAPI: ElectronAPI;
-  }
-}
diff --git a/src/main/rpc.ts b/src/main/rpc.ts
new file mode 100644
index 0000000000..6202860475
--- /dev/null
+++ b/src/main/rpc.ts
@@ -0,0 +1,64 @@
+import { createRPCRouter } from '../shared/ipc/rpc';
+import { accountController } from './core/account/controller';
+import { appController } from './core/app/controller';
+import { conversationController } from './core/conversations/controller';
+import { dependenciesController } from './core/dependencies/controller';
+import { editorBufferController } from './core/editor/controller';
+import { forgejoController } from './core/forgejo/controller';
+import { filesController } from './core/fs/controller';
+import { gitController } from './core/git/controller';
+import { githubController } from './core/github/controller';
+import { gitlabController } from './core/gitlab/controller';
+import { issueController } from './core/issues/controller';
+import { jiraController } from './core/jira/controller';
+import { linearController } from './core/linear/controller';
+import { mcpController } from './core/mcp/controller';
+import { plainController } from './core/plain/controller';
+import { projectController } from './core/projects/controller';
+import { ptyController } from './core/pty/controller';
+import { pullRequestController } from './core/pull-requests/controller';
+import { repositoryController } from './core/repository/controller';
+import { appSettingsController } from './core/settings/controller';
+import { providerSettingsController } from './core/settings/provider-settings-controller';
+import { skillsController } from './core/skills/controller';
+import { sshController } from './core/ssh/controller';
+import { taskController } from './core/tasks/controller';
+import { telemetryController } from './core/telemetry/controller';
+import { terminalsController } from './core/terminals/controller';
+import { updateController } from './core/updates/controller';
+import { viewStateController } from './core/view-state/controller';
+import { legacyPortController } from './db/legacy-port/controller';
+
+export const rpcRouter = createRPCRouter({
+  account: accountController,
+  legacyPort: legacyPortController,
+  app: appController,
+  appSettings: appSettingsController,
+  providerSettings: providerSettingsController,
+  repository: repositoryController,
+  fs: filesController,
+  update: updateController,
+  pty: ptyController,
+  forgejo: forgejoController,
+  github: githubController,
+  gitlab: gitlabController,
+  issues: issueController,
+  jira: jiraController,
+  linear: linearController,
+  plain: plainController,
+  skills: skillsController,
+  ssh: sshController,
+  projects: projectController,
+  tasks: taskController,
+  conversations: conversationController,
+  terminals: terminalsController,
+  git: gitController,
+  dependencies: dependenciesController,
+  mcp: mcpController,
+  editorBuffer: editorBufferController,
+  telemetry: telemetryController,
+  pullRequests: pullRequestController,
+  viewState: viewStateController,
+});
+
+export type RpcRouter = typeof rpcRouter;
diff --git a/src/main/services/AgentEventService.ts b/src/main/services/AgentEventService.ts
deleted file mode 100644
index 1a893ae399..0000000000
--- a/src/main/services/AgentEventService.ts
+++ /dev/null
@@ -1,207 +0,0 @@
-import http from 'http';
-import crypto from 'crypto';
-import { BrowserWindow, Notification } from 'electron';
-import { log } from '../lib/logger';
-import { parsePtyId, isMainPty } from '@shared/ptyId';
-import { getMainWindow } from '../app/window';
-import { getProvider } from '@shared/providers/registry';
-import type { ProviderId } from '@shared/providers/registry';
-import type { AgentEvent } from '@shared/agentEvents';
-import { getAppSettings } from '../settings';
-
-class AgentEventService {
-  private server: http.Server | null = null;
-  private port = 0;
-  private token = '';
-
-  async start(): Promise<void> {
-    if (this.server) return;
-
-    this.token = crypto.randomUUID();
-
-    this.server = http.createServer((req, res) => {
-      if (req.method !== 'POST' || req.url !== '/hook') {
-        res.writeHead(404);
-        res.end();
-        return;
-      }
-
-      const authToken = req.headers['x-emdash-token'];
-      if (authToken !== this.token) {
-        log.warn('AgentEventService: rejected request with invalid token');
-        res.writeHead(403);
-        res.end();
-        return;
-      }
-
-      let body = '';
-      req.on('data', (chunk: Buffer) => {
-        body += chunk.toString();
-        // Guard against oversized payloads
-        if (body.length > 1_000_000) {
-          req.destroy();
-        }
-      });
-
-      req.on('end', async () => {
-        try {
-          // ptyId and event type come from headers (not body) so the
-          // payload can be piped from stdin via `curl -d @-` without
-          // any shell interpolation of its contents.
-          const ptyId = String(req.headers['x-emdash-pty-id'] || '');
-          const type = String(req.headers['x-emdash-event-type'] || '');
-
-          if (!ptyId || !type) {
-            log.warn('AgentEventService: malformed request — missing ptyId or type headers');
-            res.writeHead(400);
-            res.end();
-            return;
-          }
-
-          const parsed = parsePtyId(ptyId);
-          if (!parsed) {
-            log.warn('AgentEventService: unrecognised ptyId', { ptyId });
-            res.writeHead(400);
-            res.end();
-            return;
-          }
-
-          // Body is the raw Claude Code hook payload JSON
-          const raw = body ? JSON.parse(body) : {};
-
-          // Normalize snake_case fields from provider hooks to camelCase
-          const normalizedPayload = {
-            ...raw,
-            notificationType: raw.notification_type ?? raw.notificationType,
-            lastAssistantMessage: raw.last_assistant_message ?? raw.lastAssistantMessage,
-          };
-          delete normalizedPayload.notification_type;
-          delete normalizedPayload.last_assistant_message;
-
-          const event: AgentEvent = {
-            type: type as AgentEvent['type'],
-            ptyId,
-            taskId: parsed.suffix,
-            providerId: parsed.providerId,
-            timestamp: Date.now(),
-            payload: normalizedPayload,
-          };
-
-          const windows = BrowserWindow.getAllWindows();
-          const appFocused = windows.some((w) => !w.isDestroyed() && w.isFocused());
-
-          await this.maybeShowOsNotification(event, appFocused);
-
-          for (const win of windows) {
-            try {
-              if (!win.isDestroyed() && !win.webContents.isDestroyed()) {
-                win.webContents.send('agent:event', event, { appFocused });
-              }
-            } catch {
-              // Window may have been destroyed between check and send
-            }
-          }
-
-          res.writeHead(200);
-          res.end();
-        } catch (err) {
-          log.warn('AgentEventService: failed to parse request body', { error: String(err) });
-          res.writeHead(400);
-          res.end();
-        }
-      });
-    });
-
-    return new Promise<void>((resolve, reject) => {
-      this.server!.listen(0, '127.0.0.1', () => {
-        const addr = this.server!.address();
-        if (addr && typeof addr === 'object') {
-          this.port = addr.port;
-        }
-        log.info('AgentEventService: started', { port: this.port });
-        resolve();
-      });
-      this.server!.on('error', (err) => {
-        log.error('AgentEventService: failed to start', { error: String(err) });
-        reject(err);
-      });
-    });
-  }
-
-  private async maybeShowOsNotification(event: AgentEvent, appFocused: boolean): Promise<void> {
-    try {
-      const settings = getAppSettings();
-      if (!settings.notifications?.enabled) return;
-      if (!settings.notifications?.osNotifications) return;
-      if (appFocused) return;
-      if (!Notification.isSupported()) return;
-
-      const providerName = getProvider(event.providerId as ProviderId)?.name ?? event.providerId;
-
-      const isMain = isMainPty(event.ptyId);
-      let taskName: string | null = null;
-      if (isMain) {
-        const { databaseService } = await import('./DatabaseService');
-        const task = await databaseService.getTaskById(event.taskId);
-        if (task?.name) taskName = task.name;
-      }
-
-      const titleSuffix = taskName ? ` — ${taskName}` : '';
-
-      const addClickHandler = (notification: Notification) => {
-        notification.on('click', () => {
-          const win = getMainWindow();
-          if (win && !win.isDestroyed()) {
-            if (win.isMinimized()) win.restore();
-            win.show();
-            win.focus();
-            if (isMain) {
-              win.webContents.send('notification:focus-task', event.taskId);
-            }
-          }
-        });
-      };
-
-      if (event.type === 'stop') {
-        const notification = new Notification({
-          title: `${providerName}${titleSuffix}`,
-          body: 'Your agent has finished working',
-          silent: true,
-        });
-        addClickHandler(notification);
-        notification.show();
-      } else if (event.type === 'notification') {
-        const nt = event.payload.notificationType;
-        if (nt === 'permission_prompt' || nt === 'idle_prompt' || nt === 'elicitation_dialog') {
-          const notification = new Notification({
-            title: `${providerName}${titleSuffix}`,
-            body: 'Your agent is waiting for input',
-            silent: true,
-          });
-          addClickHandler(notification);
-          notification.show();
-        }
-      }
-    } catch (error) {
-      log.warn('AgentEventService: failed to show OS notification', { error: String(error) });
-    }
-  }
-
-  stop(): void {
-    if (this.server) {
-      this.server.close();
-      this.server = null;
-      this.port = 0;
-    }
-  }
-
-  getPort(): number {
-    return this.port;
-  }
-
-  getToken(): string {
-    return this.token;
-  }
-}
-
-export const agentEventService = new AgentEventService();
diff --git a/src/main/services/AutoUpdateService.ts b/src/main/services/AutoUpdateService.ts
deleted file mode 100644
index 27bf94cb8e..0000000000
--- a/src/main/services/AutoUpdateService.ts
+++ /dev/null
@@ -1,622 +0,0 @@
-import { app, BrowserWindow } from 'electron';
-import { autoUpdater, UpdateInfo } from 'electron-updater';
-import { log } from '../lib/logger';
-import { formatUpdaterError, sanitizeUpdaterLogArgs } from '../lib/updaterError';
-
-// Update check intervals (in milliseconds)
-const UPDATE_CHECK_INTERVALS = {
-  startup: 5 * 60 * 1000, // 5 minutes after startup
-  periodic: 4 * 60 * 60 * 1000, // Every 4 hours
-  manual: 0, // Immediate for manual checks
-} as const;
-const INSTALL_RESTART_GUARD_TIMEOUT_MS = 2 * 60 * 1000;
-
-// Update channels for staged rollouts
-export enum UpdateChannel {
-  STABLE = 'stable',
-  BETA = 'beta',
-  ALPHA = 'alpha',
-  NIGHTLY = 'nightly',
-}
-
-// Enhanced update state with more details
-export interface UpdateState {
-  status: 'idle' | 'checking' | 'available' | 'downloading' | 'downloaded' | 'installing' | 'error';
-  lastCheck?: Date;
-  nextCheck?: Date;
-  currentVersion: string;
-  availableVersion?: string;
-  updateInfo?: UpdateInfo;
-  downloadProgress?: {
-    bytesPerSecond: number;
-    percent: number;
-    transferred: number;
-    total: number;
-    remainingTime?: number;
-  };
-  error?: string;
-  rollbackVersion?: string;
-  releaseNotes?: string;
-  channel: UpdateChannel;
-}
-
-// Settings interface
-export interface UpdateSettings {
-  autoCheck: boolean;
-  autoDownload: boolean;
-  checkInterval: number;
-  channel: UpdateChannel;
-  allowPrerelease: boolean;
-  allowDowngrade: boolean;
-}
-
-class AutoUpdateService {
-  private updateState: UpdateState;
-  private checkTimer?: NodeJS.Timeout;
-  private settings: UpdateSettings;
-  private initialized = false;
-  private lastNotifiedVersion?: string;
-  private downloadStartTime?: number;
-  private installRequested = false;
-  private installRestartGuardTimer?: NodeJS.Timeout;
-
-  constructor() {
-    const appVersion = this.getAppVersion();
-
-    this.updateState = {
-      status: 'idle',
-      currentVersion: appVersion,
-      channel: UpdateChannel.STABLE,
-    };
-
-    this.settings = {
-      autoCheck: true,
-      autoDownload: false, // Always false by default - user must opt-in to download
-      checkInterval: UPDATE_CHECK_INTERVALS.periodic,
-      channel: UpdateChannel.STABLE,
-      allowPrerelease: false,
-      allowDowngrade: false,
-    };
-
-    // Don't setup autoUpdater in constructor - wait for initialize()
-  }
-
-  private getAppVersion(): string {
-    try {
-      const { readFileSync } = require('fs');
-      const { join } = require('path');
-
-      // In development, look for package.json in project root
-      const isDev = !app.isPackaged || process.env.NODE_ENV === 'development';
-
-      const possiblePaths = isDev
-        ? [
-            join(__dirname, '../../../../package.json'), // from dist/main/main/services
-            join(__dirname, '../../../package.json'),
-            join(process.cwd(), 'package.json'),
-          ]
-        : [join(app.getAppPath(), 'package.json')];
-
-      for (const path of possiblePaths) {
-        try {
-          const packageJson = JSON.parse(readFileSync(path, 'utf-8'));
-          if (packageJson.name === 'emdash' && packageJson.version) {
-            return packageJson.version;
-          }
-        } catch {
-          continue;
-        }
-      }
-
-      // Fallback: hardcoded version for dev
-      return '0.3.46';
-    } catch {
-      return '0.3.46';
-    }
-  }
-
-  /**
-   * Initialize the auto-update service
-   */
-  async initialize(): Promise<void> {
-    if (this.initialized) return;
-
-    // Skip auto-updates in development - always
-    const isDev = !app.isPackaged || process.env.NODE_ENV === 'development';
-    if (isDev) {
-      // Silent in dev - no logs
-      this.initialized = true;
-      return;
-    }
-
-    this.initialized = true;
-
-    // Setup and configure autoUpdater only for production
-    this.setupAutoUpdater();
-
-    // Load settings from database
-    await this.loadSettings();
-
-    // Configure auto-updater based on settings
-    this.applySettings();
-
-    // Setup event listeners
-    this.setupEventListeners();
-
-    // Schedule initial update check after startup delay
-    if (this.settings.autoCheck) {
-      this.scheduleUpdateCheck(UPDATE_CHECK_INTERVALS.startup);
-    }
-
-    log.info('AutoUpdateService initialized', {
-      version: this.updateState.currentVersion,
-      channel: this.settings.channel,
-      autoCheck: this.settings.autoCheck,
-      autoDownload: this.settings.autoDownload,
-    });
-  }
-
-  /**
-   * Setup electron-updater configuration
-   */
-  private setupAutoUpdater(): void {
-    // Basic configuration
-    autoUpdater.autoDownload = false; // We'll manage downloads manually
-    autoUpdater.autoInstallOnAppQuit = true;
-    autoUpdater.autoRunAppAfterInstall = true;
-
-    // Ensure we always get the latest version info, bypassing caches
-    autoUpdater.requestHeaders = { 'Cache-Control': 'no-cache' };
-
-    // Custom logger for production
-    autoUpdater.logger = {
-      info: (...args: any[]) => log.debug('[autoUpdater]', ...sanitizeUpdaterLogArgs(args)),
-      warn: (...args: any[]) => log.warn('[autoUpdater]', ...sanitizeUpdaterLogArgs(args)),
-      error: (...args: any[]) => log.error('[autoUpdater]', ...sanitizeUpdaterLogArgs(args)),
-    } as any;
-  }
-
-  /**
-   * Setup event listeners for auto-updater
-   */
-  private setupEventListeners(): void {
-    autoUpdater.on('checking-for-update', () => {
-      this.updateState.status = 'checking';
-      this.updateState.lastCheck = new Date();
-      this.notifyWindows('checking');
-    });
-
-    autoUpdater.on('update-available', (info: UpdateInfo) => {
-      this.updateState.status = 'available';
-      this.updateState.availableVersion = info.version;
-      this.updateState.updateInfo = info;
-      this.notifyWindows('available', info);
-
-      // Auto-download if enabled and not already notified about this version
-      if (this.settings.autoDownload && info.version !== this.lastNotifiedVersion) {
-        this.lastNotifiedVersion = info.version;
-        setTimeout(() => this.downloadUpdate(), 2000); // Small delay for UI to update
-      }
-    });
-
-    autoUpdater.on('update-not-available', (info: UpdateInfo) => {
-      this.updateState.status = 'idle';
-      this.scheduleNextCheck();
-      this.notifyWindows('not-available', info);
-    });
-
-    autoUpdater.on('error', (err: Error) => {
-      const errorMessage = formatUpdaterError(err);
-      log.error('Auto-updater error:', errorMessage);
-
-      // Don't let stale errors clobber an active install
-      if (this.updateState.status === 'installing') {
-        log.warn('Ignoring auto-updater error while install is in progress');
-        return;
-      }
-
-      // Preserve update info if we have it
-      const previousVersion = this.updateState.availableVersion;
-      const previousInfo = this.updateState.updateInfo;
-
-      this.updateState.status = 'error';
-      this.updateState.error = errorMessage;
-
-      // Keep the update info so user can retry
-      if (previousVersion) {
-        this.updateState.availableVersion = previousVersion;
-        this.updateState.updateInfo = previousInfo;
-      }
-
-      this.notifyWindows('error', { message: errorMessage });
-
-      // Don't automatically retry on error - let user decide
-    });
-
-    autoUpdater.on('download-progress', (progressObj: any) => {
-      this.updateState.status = 'downloading';
-
-      // Calculate remaining time
-      const now = Date.now();
-      let remainingTime: number | undefined;
-      if (this.downloadStartTime && progressObj.bytesPerSecond > 0) {
-        const elapsedSeconds = (now - this.downloadStartTime) / 1000;
-        const totalSeconds = progressObj.total / progressObj.bytesPerSecond;
-        remainingTime = Math.max(0, totalSeconds - elapsedSeconds);
-      }
-
-      this.updateState.downloadProgress = {
-        bytesPerSecond: progressObj.bytesPerSecond,
-        percent: progressObj.percent,
-        transferred: progressObj.transferred,
-        total: progressObj.total,
-        remainingTime,
-      };
-
-      this.notifyWindows('download-progress', progressObj);
-    });
-
-    autoUpdater.on('update-downloaded', (info: UpdateInfo) => {
-      this.updateState.status = 'downloaded';
-      this.downloadStartTime = undefined;
-      this.notifyWindows('downloaded', info);
-
-      // Store rollback info
-      this.updateState.rollbackVersion = this.updateState.currentVersion;
-    });
-  }
-
-  /**
-   * Load settings from environment variables
-   */
-  private async loadSettings(): Promise<void> {
-    try {
-      // Load from environment variables (settings persist in memory during session)
-      const envChannel = process.env.EMDASH_UPDATE_CHANNEL;
-      if (envChannel && Object.values(UpdateChannel).includes(envChannel as UpdateChannel)) {
-        this.settings.channel = envChannel as UpdateChannel;
-      }
-
-      const envAutoCheck = process.env.EMDASH_AUTO_CHECK_UPDATES;
-      if (envAutoCheck === 'false') {
-        this.settings.autoCheck = false;
-      }
-
-      const envAutoDownload = process.env.EMDASH_AUTO_DOWNLOAD_UPDATES;
-      if (envAutoDownload === 'true') {
-        this.settings.autoDownload = true;
-      }
-    } catch (error) {
-      log.error('Failed to load update settings:', error);
-    }
-  }
-
-  /**
-   * Apply current settings to auto-updater
-   */
-  private applySettings(): void {
-    // Set update channel
-    if (this.settings.channel !== UpdateChannel.STABLE) {
-      autoUpdater.channel = this.settings.channel;
-    }
-
-    // Set prerelease flag
-    autoUpdater.allowPrerelease = this.settings.allowPrerelease;
-
-    // Set downgrade flag
-    autoUpdater.allowDowngrade = this.settings.allowDowngrade;
-  }
-
-  /**
-   * Schedule an update check
-   */
-  private scheduleUpdateCheck(delay: number): void {
-    // Clear existing timer
-    if (this.checkTimer) {
-      clearTimeout(this.checkTimer);
-    }
-
-    if (delay > 0) {
-      this.updateState.nextCheck = new Date(Date.now() + delay);
-      this.checkTimer = setTimeout(() => {
-        this.checkForUpdates(true); // Silent check
-      }, delay);
-    } else {
-      this.checkForUpdates(false); // Immediate check
-    }
-  }
-
-  /**
-   * Schedule the next periodic check
-   */
-  private scheduleNextCheck(): void {
-    if (this.settings.autoCheck) {
-      this.scheduleUpdateCheck(this.settings.checkInterval);
-    }
-  }
-
-  /**
-   * Check for updates
-   */
-  async checkForUpdates(silent = false): Promise<UpdateInfo | null> {
-    try {
-      // Skip in development - always
-      const isDev = !app.isPackaged || process.env.NODE_ENV === 'development';
-      if (isDev) {
-        return null;
-      }
-
-      // Clear error state when checking again
-      if (this.updateState.status === 'error') {
-        this.updateState.status = 'idle';
-        this.updateState.error = undefined;
-      }
-
-      log.info('Checking for updates...', {
-        channel: this.settings.channel,
-        currentVersion: this.updateState.currentVersion,
-      });
-
-      const result = await autoUpdater.checkForUpdatesAndNotify();
-
-      // Schedule next check
-      this.scheduleNextCheck();
-
-      return result?.updateInfo || null;
-    } catch (error: any) {
-      const errorMessage = formatUpdaterError(error);
-      log.error('Update check failed:', errorMessage, error);
-      this.updateState.status = 'error';
-      this.updateState.error = errorMessage;
-
-      if (!silent) {
-        this.notifyWindows('error', { message: errorMessage });
-      }
-
-      // Schedule retry
-      this.scheduleNextCheck();
-
-      return null;
-    }
-  }
-
-  /**
-   * Download the available update
-   */
-  async downloadUpdate(): Promise<void> {
-    try {
-      // If we're in error state but have update info, we can retry
-      if (this.updateState.status === 'error' && this.updateState.availableVersion) {
-        this.updateState.status = 'available';
-      }
-
-      if (this.updateState.status !== 'available') {
-        throw new Error(`Cannot download: status is "${this.updateState.status}", not "available"`);
-      }
-
-      if (!this.updateState.availableVersion) {
-        throw new Error('No version information available for download');
-      }
-
-      this.downloadStartTime = Date.now();
-
-      // Notify UI that download is starting
-      this.updateState.status = 'downloading';
-      this.notifyWindows('downloading', { version: this.updateState.availableVersion });
-
-      await autoUpdater.downloadUpdate();
-    } catch (error: any) {
-      const errorMessage = formatUpdaterError(error);
-      log.error('Update download failed:', errorMessage, error);
-
-      // Keep the version info for retry
-      const version = this.updateState.availableVersion;
-      const info = this.updateState.updateInfo;
-
-      this.updateState.status = 'error';
-      this.updateState.error = errorMessage;
-      this.updateState.availableVersion = version;
-      this.updateState.updateInfo = info;
-
-      this.downloadStartTime = undefined;
-      this.notifyWindows('error', { message: errorMessage });
-      throw error; // Re-throw to ensure it's caught by IPC handler
-    }
-  }
-
-  /**
-   * Install the downloaded update and restart
-   */
-  quitAndInstall(): void {
-    if (this.installRequested) {
-      log.info('quitAndInstall ignored: install already requested');
-      return;
-    }
-
-    if (this.updateState.status !== 'downloaded') {
-      throw new Error(
-        `Cannot install update: status is "${this.updateState.status}", expected "downloaded"`
-      );
-    }
-
-    this.installRequested = true;
-    this.updateState.status = 'installing';
-    this.notifyWindows('installing');
-
-    // Save current state for potential rollback
-    this.saveRollbackInfo();
-
-    const clearGuard = () => {
-      if (this.installRestartGuardTimer) {
-        clearTimeout(this.installRestartGuardTimer);
-        this.installRestartGuardTimer = undefined;
-      }
-    };
-
-    const rollback = (reason: string) => {
-      clearGuard();
-      this.installRequested = false;
-      this.updateState.status = 'downloaded';
-      this.notifyWindows('downloaded', this.updateState.updateInfo);
-      log.error(reason);
-    };
-
-    // If the app hasn't quit after 2 minutes, roll back so the user can retry
-    this.installRestartGuardTimer = setTimeout(() => {
-      rollback('quitAndInstall timed out before app quit; allowing retry');
-    }, INSTALL_RESTART_GUARD_TIMEOUT_MS);
-
-    // Small delay to ensure UI can respond
-    setTimeout(() => {
-      try {
-        autoUpdater.quitAndInstall(false, true);
-      } catch (error) {
-        rollback(`quitAndInstall threw: ${formatUpdaterError(error)}`);
-      }
-    }, 250);
-  }
-
-  /**
-   * Save rollback information
-   */
-  private saveRollbackInfo(): void {
-    try {
-      // Log rollback information for debugging purposes
-      log.info('Saving rollback info:', {
-        fromVersion: this.updateState.currentVersion,
-        toVersion: this.updateState.availableVersion,
-      });
-    } catch (error) {
-      log.error('Failed to save rollback info:', error);
-    }
-  }
-
-  /**
-   * Fetch release notes for the available update
-   */
-  async fetchReleaseNotes(): Promise<string | null> {
-    try {
-      if (!this.updateState.updateInfo) {
-        return null;
-      }
-
-      // Try to get from updateInfo first
-      const releaseNotes = (this.updateState.updateInfo as any).releaseNotes;
-      if (releaseNotes) {
-        this.updateState.releaseNotes = releaseNotes;
-        return releaseNotes;
-      }
-
-      // Otherwise fetch from GitHub API
-      const version = this.updateState.availableVersion;
-      if (!version) return null;
-
-      const response = await fetch(
-        `https://api.github.com/repos/generalaction/emdash/releases/tags/v${version}`
-      );
-
-      if (response.ok) {
-        const data = (await response.json()) as { body?: string };
-        const notes = data.body || 'No release notes available';
-        this.updateState.releaseNotes = notes;
-        return notes;
-      }
-
-      return null;
-    } catch (error) {
-      log.error('Failed to fetch release notes:', error);
-      return null;
-    }
-  }
-
-  /**
-   * Update user settings
-   */
-  async updateSettings(newSettings: Partial<UpdateSettings>): Promise<void> {
-    this.settings = { ...this.settings, ...newSettings };
-
-    // Apply new settings
-    this.applySettings();
-
-    // Settings persist in memory for the current session
-    // Reschedule checks if needed
-    if (this.settings.autoCheck) {
-      this.scheduleNextCheck();
-    } else if (this.checkTimer) {
-      clearTimeout(this.checkTimer);
-      this.checkTimer = undefined;
-    }
-
-    log.info('Update settings changed:', this.settings);
-  }
-
-  /**
-   * Get current update state
-   */
-  getState(): UpdateState {
-    return { ...this.updateState };
-  }
-
-  /**
-   * Get current settings
-   */
-  getSettings(): UpdateSettings {
-    return { ...this.settings };
-  }
-
-  /**
-   * Notify all windows about update events
-   */
-  private notifyWindows(event: string, payload?: any): void {
-    const channel = `update:${event}`;
-    for (const win of BrowserWindow.getAllWindows()) {
-      try {
-        win.webContents.send(channel, payload);
-      } catch {
-        // Window might be destroyed
-      }
-    }
-  }
-
-  /**
-   * Format bytes to human readable string
-   */
-  formatBytes(bytes: number): string {
-    const units = ['B', 'KB', 'MB', 'GB'];
-    let size = bytes;
-    let unitIndex = 0;
-
-    while (size >= 1024 && unitIndex < units.length - 1) {
-      size /= 1024;
-      unitIndex++;
-    }
-
-    return `${size.toFixed(1)} ${units[unitIndex]}`;
-  }
-
-  /**
-   * Format time to human readable string
-   */
-  formatTime(seconds: number): string {
-    if (seconds < 60) return `${Math.round(seconds)}s`;
-    if (seconds < 3600) return `${Math.round(seconds / 60)}m`;
-    return `${Math.round(seconds / 3600)}h ${Math.round((seconds % 3600) / 60)}m`;
-  }
-
-  /**
-   * Cleanup on shutdown
-   */
-  shutdown(): void {
-    if (this.checkTimer) {
-      clearTimeout(this.checkTimer);
-      this.checkTimer = undefined;
-    }
-    if (this.installRestartGuardTimer) {
-      clearTimeout(this.installRestartGuardTimer);
-      this.installRestartGuardTimer = undefined;
-    }
-  }
-}
-
-// Export singleton instance
-export const autoUpdateService = new AutoUpdateService();
diff --git a/src/main/services/ClaudeConfigService.ts b/src/main/services/ClaudeConfigService.ts
deleted file mode 100644
index d4753960f2..0000000000
--- a/src/main/services/ClaudeConfigService.ts
+++ /dev/null
@@ -1,75 +0,0 @@
-import { existsSync, readFileSync, writeFileSync, renameSync, unlinkSync } from 'fs';
-import { join, resolve } from 'path';
-import { homedir } from 'os';
-import { randomUUID } from 'crypto';
-import { log } from '../lib/logger';
-import { getAppSettings } from '../settings';
-
-function getClaudeConfigPath(): string {
-  return join(homedir(), '.claude.json');
-}
-
-/**
- * Auto-trust a worktree directory for Claude Code if the setting is enabled.
- * No-op for non-Claude providers.
- */
-export function maybeAutoTrustForClaude(providerId: string, cwd?: string): void {
-  if (!cwd) return;
-  if (providerId !== 'claude') return;
-  if (!getAppSettings().tasks?.autoTrustWorktrees) return;
-  ensureClaudeTrust(cwd);
-}
-
-/**
- * Ensure that Claude Code trusts the given worktree directory by writing
- * the trust entry into ~/.claude.json. Idempotent and non-fatal — errors
- * are logged but never propagated so PTY spawning is never blocked.
- */
-export function ensureClaudeTrust(worktreePath: string): void {
-  try {
-    const configPath = getClaudeConfigPath();
-    const resolvedPath = resolve(worktreePath);
-    let config: Record<string, any> = {};
-
-    if (existsSync(configPath)) {
-      const raw = readFileSync(configPath, 'utf8');
-      config = JSON.parse(raw);
-    }
-
-    if (!config.projects || typeof config.projects !== 'object' || Array.isArray(config.projects)) {
-      config.projects = {};
-    }
-
-    const existing = config.projects[resolvedPath];
-    if (
-      existing &&
-      existing.hasTrustDialogAccepted === true &&
-      existing.hasCompletedProjectOnboarding === true
-    ) {
-      return; // Already trusted
-    }
-
-    config.projects[resolvedPath] = {
-      ...existing,
-      hasTrustDialogAccepted: true,
-      hasCompletedProjectOnboarding: true,
-    };
-
-    // Atomic write: write to temp file then rename
-    const tmpPath = configPath + '.' + randomUUID() + '.tmp';
-    try {
-      writeFileSync(tmpPath, JSON.stringify(config, null, 2), 'utf8');
-      renameSync(tmpPath, configPath);
-    } catch (writeErr) {
-      try {
-        unlinkSync(tmpPath);
-      } catch {}
-      throw writeErr;
-    }
-  } catch (err) {
-    log.warn('ClaudeConfigService: failed to write trust entry', {
-      path: worktreePath,
-      error: String((err as Error)?.message || err),
-    });
-  }
-}
diff --git a/src/main/services/ClaudeHookService.ts b/src/main/services/ClaudeHookService.ts
deleted file mode 100644
index a797d095e9..0000000000
--- a/src/main/services/ClaudeHookService.ts
+++ /dev/null
@@ -1,83 +0,0 @@
-import fs from 'fs';
-import path from 'path';
-import { log } from '../lib/logger';
-
-export class ClaudeHookService {
-  /**
-   * Build the curl command used in Claude Code hook entries.
-   *
-   * The command pipes stdin directly to curl via `-d @-` to avoid any shell
-   * expansion of the payload (which can contain $, backticks, etc. in
-   * AI-generated text). The ptyId and event type are sent as HTTP headers
-   * instead of being embedded in the JSON body.
-   */
-  static makeHookCommand(type: string): string {
-    return (
-      'curl -sf -X POST ' +
-      '-H "Content-Type: application/json" ' +
-      '-H "X-Emdash-Token: $EMDASH_HOOK_TOKEN" ' +
-      `-H "X-Emdash-Pty-Id: $EMDASH_PTY_ID" ` +
-      `-H "X-Emdash-Event-Type: ${type}" ` +
-      '-d @- ' +
-      '"http://127.0.0.1:$EMDASH_HOOK_PORT/hook" || true'
-    );
-  }
-
-  /**
-   * Merge emdash hook entries into an existing settings object.
-   * Strips old emdash entries (identified by the EMDASH_HOOK_PORT marker),
-   * preserves user-defined hooks, and appends fresh Notification + Stop entries.
-   * Returns the mutated object.
-   */
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  static mergeHookEntries(existing: Record<string, any>): Record<string, any> {
-    const hooks = existing.hooks || {};
-
-    for (const eventType of ['Notification', 'Stop'] as const) {
-      const prev: unknown[] = Array.isArray(hooks[eventType]) ? hooks[eventType] : [];
-      const userEntries = prev.filter(
-        (entry: any) => !JSON.stringify(entry).includes('EMDASH_HOOK_PORT')
-      );
-      userEntries.push({
-        hooks: [
-          { type: 'command', command: ClaudeHookService.makeHookCommand(eventType.toLowerCase()) },
-        ],
-      });
-      hooks[eventType] = userEntries;
-    }
-
-    existing.hooks = hooks;
-    return existing;
-  }
-
-  static writeHookConfig(worktreePath: string): void {
-    const claudeDir = path.join(worktreePath, '.claude');
-    const settingsPath = path.join(claudeDir, 'settings.local.json');
-
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    let existing: Record<string, any> = {};
-    try {
-      const content = fs.readFileSync(settingsPath, 'utf-8');
-      existing = JSON.parse(content);
-    } catch {
-      // File doesn't exist or isn't valid JSON — start fresh
-    }
-
-    try {
-      fs.mkdirSync(claudeDir, { recursive: true });
-    } catch {
-      // May already exist
-    }
-
-    ClaudeHookService.mergeHookEntries(existing);
-
-    try {
-      fs.writeFileSync(settingsPath, JSON.stringify(existing, null, 2) + '\n');
-    } catch (err) {
-      log.warn('ClaudeHookService: failed to write hook config', {
-        path: settingsPath,
-        error: String(err),
-      });
-    }
-  }
-}
diff --git a/src/main/services/ConnectionsService.ts b/src/main/services/ConnectionsService.ts
deleted file mode 100644
index 40c001e56c..0000000000
--- a/src/main/services/ConnectionsService.ts
+++ /dev/null
@@ -1,419 +0,0 @@
-import { spawn, execFileSync } from 'child_process';
-import { BrowserWindow } from 'electron';
-import { providerStatusCache, type ProviderStatus } from './providerStatusCache';
-import { listDetectableProviders, type ProviderDefinition } from '@shared/providers/registry';
-import { log } from '../lib/logger';
-
-export type CliStatusCode = 'connected' | 'missing' | 'needs_key' | 'error';
-
-export interface CliProviderStatus {
-  id: string;
-  name: string;
-  status: CliStatusCode;
-  version?: string | null;
-  message?: string | null;
-  docUrl?: string | null;
-  command?: string | null;
-  installCommand?: string | null;
-}
-
-type CliDefinition = ProviderDefinition & {
-  commands: string[];
-  args: string[];
-  statusResolver?: (result: CommandResult) => CliStatusCode;
-  messageResolver?: (result: CommandResult) => string | null;
-};
-
-interface CommandResult {
-  command: string;
-  success: boolean;
-  error?: Error;
-  stdout: string;
-  stderr: string;
-  status: number | null;
-  version: string | null;
-  resolvedPath: string | null;
-  timedOut?: boolean;
-  timeoutMs?: number;
-}
-
-const truncate = (input: string, max = 400): string =>
-  input && input.length > max ? `${input.slice(0, max)}…` : input;
-
-const DEFAULT_TIMEOUT_MS = 3000;
-
-const quoteForCmdExe = (input: string): string => {
-  if (input.length === 0) return '""';
-  if (!/[\s"^&|<>()%!]/.test(input)) return input;
-  return `"${input
-    .replace(/%/g, '%%')
-    .replace(/!/g, '^!')
-    .replace(/(["^&|<>()])/g, '^$1')}"`;
-};
-
-export const CLI_DEFINITIONS: CliDefinition[] = listDetectableProviders().map((provider) => ({
-  id: provider.id,
-  name: provider.name,
-  commands: provider.commands ?? [],
-  args: provider.versionArgs ?? ['--version'],
-  docUrl: provider.docUrl,
-  installCommand: provider.installCommand,
-  detectable: provider.detectable,
-}));
-
-class ConnectionsService {
-  private initialized = false;
-  private timeoutRetryPending = new Set<string>();
-  private timeoutRetryTimers = new Map<string, NodeJS.Timeout>();
-
-  private clearTimeoutRetry(providerId: string) {
-    const pendingTimer = this.timeoutRetryTimers.get(providerId);
-    if (pendingTimer) {
-      clearTimeout(pendingTimer);
-      this.timeoutRetryTimers.delete(providerId);
-    }
-    this.timeoutRetryPending.delete(providerId);
-  }
-
-  async initProviderStatusCache() {
-    if (this.initialized) return;
-    this.initialized = true;
-    await providerStatusCache.load();
-
-    // Check all providers and log a summary
-    await Promise.all(CLI_DEFINITIONS.map((def) => this.checkProvider(def.id, 'bootstrap')));
-
-    const statuses = providerStatusCache.getAll();
-    const connected = CLI_DEFINITIONS.filter((d) => statuses[d.id]?.installed).map((d) => d.id);
-    const notInstalled = CLI_DEFINITIONS.filter((d) => !statuses[d.id]?.installed).map((d) => d.id);
-
-    log.info(
-      `Providers: connected (${connected.join(', ') || 'none'}) | not installed (${notInstalled.join(', ') || 'none'})`
-    );
-  }
-
-  getCachedProviderStatuses(): Record<string, ProviderStatus> {
-    return providerStatusCache.getAll();
-  }
-
-  async checkProvider(
-    providerId: string,
-    reason: 'bootstrap' | 'manual' | 'timeout-retry' = 'manual',
-    opts?: { timeoutMs?: number; allowRetry?: boolean }
-  ) {
-    const def = CLI_DEFINITIONS.find((d) => d.id === providerId);
-    if (!def) return;
-
-    if (reason !== 'timeout-retry' && this.timeoutRetryPending.has(providerId)) {
-      // Cancel any pending timeout-based retry when a fresh check is requested.
-      this.clearTimeoutRetry(providerId);
-    }
-
-    const timeoutMs = opts?.timeoutMs ?? DEFAULT_TIMEOUT_MS;
-    const commandResult = await this.tryCommands(def, timeoutMs);
-    const statusCode = await this.resolveStatus(def, commandResult);
-    this.cacheStatus(def.id, commandResult, statusCode);
-
-    // Only log verbose details for actual errors (not just "not installed")
-    const isActualError =
-      (statusCode === 'error' || statusCode === 'needs_key') && commandResult.resolvedPath !== null; // binary was found but something went wrong
-
-    if (isActualError) {
-      log.warn('provider:error', {
-        providerId: def.id,
-        status: statusCode,
-        command: commandResult.command,
-        resolvedPath: commandResult.resolvedPath,
-        exitStatus: commandResult.status,
-        stderr: commandResult.stderr ? truncate(commandResult.stderr) : null,
-        stdout: commandResult.stdout ? truncate(commandResult.stdout) : null,
-        error: commandResult.error
-          ? String(commandResult.error?.message || commandResult.error)
-          : null,
-      });
-    }
-
-    const shouldRetryTimeout =
-      commandResult.timedOut &&
-      (commandResult.resolvedPath || commandResult.stdout) &&
-      opts?.allowRetry !== false;
-    if (shouldRetryTimeout && !this.timeoutRetryPending.has(providerId)) {
-      this.timeoutRetryPending.add(providerId);
-      const retryDelayMs = 1500;
-      const retryTimeoutMs = Math.max(timeoutMs * 2, 12000);
-      const retryTimer = setTimeout(() => {
-        this.timeoutRetryTimers.delete(providerId);
-        void this.checkProvider(providerId, 'timeout-retry', {
-          timeoutMs: retryTimeoutMs,
-          allowRetry: false,
-        }).finally(() => this.timeoutRetryPending.delete(providerId));
-      }, retryDelayMs);
-      this.timeoutRetryTimers.set(providerId, retryTimer);
-    }
-  }
-
-  async refreshAllProviderStatuses(): Promise<Record<string, ProviderStatus>> {
-    log.info('provider:refreshAll:start');
-    await Promise.all(
-      CLI_DEFINITIONS.map((definition) => this.checkProvider(definition.id, 'manual'))
-    );
-    log.info('provider:refreshAll:done');
-    return this.getCachedProviderStatuses();
-  }
-
-  private async resolveStatus(def: CliDefinition, result: CommandResult): Promise<CliStatusCode> {
-    if (def.statusResolver) {
-      return def.statusResolver(result);
-    }
-
-    if (result.success) {
-      return 'connected';
-    }
-
-    if (result.resolvedPath) {
-      return 'connected';
-    }
-
-    if (result.timedOut && result.stdout) {
-      return 'connected';
-    }
-
-    if (result.status !== null && !result.timedOut && (result.stdout || result.stderr)) {
-      return 'connected';
-    }
-
-    return result.error ? 'error' : 'missing';
-  }
-
-  private resolveMessage(
-    def: CliDefinition,
-    result: CommandResult,
-    status: CliStatusCode
-  ): string | null {
-    if (def.id === 'codex') {
-      return status === 'connected'
-        ? null
-        : 'Codex CLI not detected. Install @openai/codex to enable Codex agents.';
-    }
-
-    if (def.messageResolver) {
-      return def.messageResolver(result);
-    }
-
-    if (status === 'missing') {
-      return `${def.name} was not found in PATH.`;
-    }
-
-    if (status === 'error') {
-      if (result.stderr.trim()) {
-        return result.stderr.trim();
-      }
-      if (result.stdout.trim()) {
-        return result.stdout.trim();
-      }
-      if (result.error) {
-        return result.error.message;
-      }
-    }
-
-    return null;
-  }
-
-  private async tryCommands(def: CliDefinition, timeoutMs: number): Promise<CommandResult> {
-    for (const command of def.commands) {
-      const result = await this.runCommand(command, def.args ?? ['--version'], timeoutMs);
-      if (result.success) {
-        return result;
-      }
-
-      // If the command exists but returned a non-zero status, still return result for diagnostics
-      if (result.error && (result.error as NodeJS.ErrnoException).code !== 'ENOENT') {
-        return result;
-      }
-    }
-
-    const lastCommand = def.commands[def.commands.length - 1];
-    return this.runCommandViaShell(lastCommand, def.args ?? ['--version'], timeoutMs);
-  }
-
-  /** Run a command through the user's login shell as a fallback for detection. */
-  private async runCommandViaShell(
-    command: string,
-    args: string[],
-    timeoutMs: number
-  ): Promise<CommandResult> {
-    const shell = process.env.SHELL || (process.platform === 'win32' ? 'cmd.exe' : '/bin/sh');
-    const fullCmd = [command, ...args].join(' ');
-    const shellArgs = process.platform === 'win32' ? ['/c', fullCmd] : ['-lc', fullCmd];
-    const result = await this.runCommand(shell, shellArgs, timeoutMs);
-
-    if (result.status === 127) {
-      return {
-        ...result,
-        command,
-        success: false,
-        resolvedPath: null,
-        status: null,
-        error: new Error(`${command}: command not found (shell fallback)`),
-      };
-    }
-
-    return { ...result, command };
-  }
-
-  private async runCommand(
-    command: string,
-    args: string[],
-    timeoutMs: number
-  ): Promise<CommandResult> {
-    const resolvedPath = this.resolveCommandPath(command);
-    return new Promise((resolve) => {
-      try {
-        const executable = resolvedPath || command;
-        const lowerExecutable = executable.toLowerCase();
-        const shouldUseCmdExe =
-          process.platform === 'win32' &&
-          (lowerExecutable.endsWith('.cmd') || lowerExecutable.endsWith('.bat'));
-
-        const child = shouldUseCmdExe
-          ? spawn(process.env.ComSpec || 'cmd.exe', [
-              '/d',
-              '/s',
-              '/c',
-              [executable, ...args].map(quoteForCmdExe).join(' '),
-            ])
-          : spawn(command, args);
-
-        let stdout = '';
-        let stderr = '';
-        let didTimeout = false;
-
-        // timeout for version checks (some CLIs can start slowly)
-        const timeoutId = setTimeout(() => {
-          didTimeout = true;
-          child.kill();
-        }, timeoutMs);
-
-        child.stdout?.on('data', (data) => {
-          stdout += data.toString();
-        });
-
-        child.stderr?.on('data', (data) => {
-          stderr += data.toString();
-        });
-
-        child.on('error', (error) => {
-          clearTimeout(timeoutId);
-          log.warn('provider:command-spawn-error', {
-            command,
-            executable,
-            resolvedPath,
-            error: error?.message || String(error),
-          });
-          resolve({
-            command,
-            success: false,
-            error,
-            stdout: stdout || '',
-            stderr: stderr || '',
-            status: null,
-            version: null,
-            resolvedPath,
-            timedOut: didTimeout,
-            timeoutMs,
-          });
-        });
-
-        child.on('close', (code) => {
-          clearTimeout(timeoutId);
-
-          const success = !didTimeout && code === 0;
-          const version = this.extractVersion(stdout) || this.extractVersion(stderr);
-
-          if (!success) {
-            log.warn('provider:command-exit-failed', {
-              command,
-              executable,
-              resolvedPath,
-              status: code,
-              timedOut: didTimeout,
-              stderr: stderr ? truncate(stderr) : null,
-              stdout: stdout ? truncate(stdout) : null,
-            });
-          }
-
-          resolve({
-            command,
-            success,
-            error: didTimeout ? new Error('Command timeout') : undefined,
-            stdout,
-            stderr,
-            status: code,
-            version,
-            resolvedPath,
-            timedOut: didTimeout,
-            timeoutMs,
-          });
-        });
-      } catch (error) {
-        resolve({
-          command,
-          success: false,
-          error: error as Error,
-          stdout: '',
-          stderr: '',
-          status: null,
-          version: null,
-          resolvedPath,
-          timedOut: false,
-          timeoutMs,
-        });
-      }
-    });
-  }
-
-  private extractVersion(output: string): string | null {
-    if (!output) return null;
-    const matches = output.match(/\d+\.\d+(\.\d+)?/);
-    return matches ? matches[0] : null;
-  }
-
-  private resolveCommandPath(command: string): string | null {
-    const resolver = process.platform === 'win32' ? 'where' : 'which';
-    try {
-      const result = execFileSync(resolver, [command], { encoding: 'utf8' });
-      const lines = result
-        .split(/\r?\n/)
-        .map((l) => l.trim())
-        .filter(Boolean);
-      return lines[0] ?? null;
-    } catch {
-      return null;
-    }
-  }
-
-  private cacheStatus(providerId: string, result: CommandResult, statusCode: CliStatusCode) {
-    const installed = statusCode === 'connected';
-    const status: ProviderStatus = {
-      installed,
-      path: result.resolvedPath,
-      version: result.version,
-      lastChecked: Date.now(),
-    };
-    providerStatusCache.set(providerId, status);
-    this.emitStatusUpdate(providerId, status);
-  }
-
-  private emitStatusUpdate(providerId: string, status: ProviderStatus) {
-    const payload = { providerId, status };
-    BrowserWindow.getAllWindows().forEach((win) => {
-      try {
-        win.webContents.send('provider:status-updated', payload);
-      } catch {
-        // ignore send errors
-      }
-    });
-  }
-}
-
-export const connectionsService = new ConnectionsService();
diff --git a/src/main/services/DatabaseService.ts b/src/main/services/DatabaseService.ts
deleted file mode 100644
index 53a15799fe..0000000000
--- a/src/main/services/DatabaseService.ts
+++ /dev/null
@@ -1,1271 +0,0 @@
-import type sqlite3Type from 'sqlite3';
-import { and, asc, desc, eq, inArray, isNull, ne, or, sql } from 'drizzle-orm';
-import { readMigrationFiles } from 'drizzle-orm/migrator';
-import { resolveDatabasePath, resolveMigrationsPath } from '../db/path';
-import { getDrizzleClient } from '../db/drizzleClient';
-import { errorTracking } from '../errorTracking';
-import {
-  projects as projectsTable,
-  tasks as tasksTable,
-  conversations as conversationsTable,
-  messages as messagesTable,
-  lineComments as lineCommentsTable,
-  sshConnections as sshConnectionsTable,
-  type ProjectRow,
-  type TaskRow,
-  type ConversationRow,
-  type MessageRow,
-  type LineCommentRow,
-  type LineCommentInsert,
-  type SshConnectionRow,
-  type SshConnectionInsert,
-} from '../db/schema';
-
-export interface Project {
-  id: string;
-  name: string;
-  path: string;
-  // Remote project fields (optional for backward compatibility)
-  isRemote?: boolean;
-  sshConnectionId?: string | null;
-  remotePath?: string | null;
-  gitInfo: {
-    isGitRepo: boolean;
-    remote?: string;
-    branch?: string;
-    baseRef?: string;
-  };
-  githubInfo?: {
-    repository: string;
-    connected: boolean;
-  };
-  createdAt: string;
-  updatedAt: string;
-}
-
-export interface Task {
-  id: string;
-  projectId: string;
-  name: string;
-  branch: string;
-  path: string;
-  status: 'active' | 'idle' | 'running';
-  agentId?: string | null;
-  metadata?: any;
-  useWorktree?: boolean;
-  archivedAt?: string | null;
-  createdAt: string;
-  updatedAt: string;
-}
-
-export interface Conversation {
-  id: string;
-  taskId: string;
-  title: string;
-  provider?: string | null;
-  isActive?: boolean;
-  isMain?: boolean;
-  displayOrder?: number;
-  metadata?: string | null;
-  createdAt: string;
-  updatedAt: string;
-}
-
-export interface Message {
-  id: string;
-  conversationId: string;
-  content: string;
-  sender: 'user' | 'agent';
-  timestamp: string;
-  metadata?: string; // JSON string for additional data
-}
-
-export interface MigrationSummary {
-  appliedCount: number;
-  totalMigrations: number;
-  recovered: boolean;
-}
-
-export class DatabaseSchemaMismatchError extends Error {
-  readonly code = 'DB_SCHEMA_MISMATCH';
-  readonly dbPath: string;
-  readonly missingInvariants: string[];
-
-  constructor(dbPath: string, missingInvariants: string[]) {
-    const suffix = missingInvariants.length > 0 ? ` (${missingInvariants.join(', ')})` : '';
-    super(`Database schema mismatch${suffix}`);
-    this.name = 'DatabaseSchemaMismatchError';
-    this.dbPath = dbPath;
-    this.missingInvariants = missingInvariants;
-  }
-}
-
-export class DatabaseService {
-  private static migrationsApplied = false;
-  private db: sqlite3Type.Database | null = null;
-  private sqlite3: typeof sqlite3Type | null = null;
-  private dbPath: string;
-  private disabled: boolean = false;
-  private lastMigrationSummary: MigrationSummary | null = null;
-
-  constructor() {
-    if (process.env.EMDASH_DISABLE_NATIVE_DB === '1') {
-      this.disabled = true;
-    }
-    this.dbPath = resolveDatabasePath();
-  }
-
-  async initialize(): Promise<void> {
-    if (this.disabled) return Promise.resolve();
-    if (!this.sqlite3) {
-      try {
-        // Dynamic import to avoid loading native module at startup
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-        // @ts-ignore
-        this.sqlite3 = (await import('sqlite3')) as unknown as typeof sqlite3Type;
-      } catch (e) {
-        // Track critical database initialization error
-        await errorTracking.captureDatabaseError(e, 'initialize_sqlite3_import');
-        return Promise.reject(e);
-      }
-    }
-    return new Promise((resolve, reject) => {
-      this.db = new this.sqlite3!.Database(this.dbPath, async (err) => {
-        if (err) {
-          // Track critical database connection error
-          await errorTracking.captureDatabaseError(err, 'initialize_connection', {
-            db_path: this.dbPath,
-          });
-          reject(err);
-          return;
-        }
-
-        this.ensureMigrations()
-          .then(async () => {
-            await this.validateSchemaContract();
-            resolve();
-          })
-          .catch(async (initError) => {
-            const operation =
-              initError instanceof DatabaseSchemaMismatchError
-                ? 'initialize_schema_contract'
-                : 'initialize_migrations';
-            await errorTracking.captureDatabaseError(initError, operation, {
-              db_path: this.dbPath,
-            });
-            reject(initError);
-          });
-      });
-    });
-  }
-
-  getLastMigrationSummary(): MigrationSummary | null {
-    return this.lastMigrationSummary;
-  }
-
-  async saveProject(project: Omit<Project, 'createdAt' | 'updatedAt'>): Promise<void> {
-    if (this.disabled) return;
-    const { db } = await getDrizzleClient();
-    const gitRemote = project.gitInfo.remote ?? null;
-    const gitBranch = project.gitInfo.branch ?? null;
-    const baseRef = this.computeBaseRef(
-      project.gitInfo.baseRef,
-      project.gitInfo.remote,
-      project.gitInfo.branch
-    );
-    const githubRepository = project.githubInfo?.repository ?? null;
-    const githubConnected = project.githubInfo?.connected ? 1 : 0;
-
-    // Clean up stale rows that would conflict on id or path but not both.
-    // This prevents unique constraint errors when re-adding a deleted project.
-    await db
-      .delete(projectsTable)
-      .where(
-        or(
-          and(eq(projectsTable.id, project.id), ne(projectsTable.path, project.path)),
-          and(eq(projectsTable.path, project.path), ne(projectsTable.id, project.id))
-        )
-      );
-
-    await db
-      .insert(projectsTable)
-      .values({
-        id: project.id,
-        name: project.name,
-        path: project.path,
-        gitRemote,
-        gitBranch,
-        baseRef: baseRef ?? null,
-        githubRepository,
-        githubConnected,
-        sshConnectionId: project.sshConnectionId ?? null,
-        isRemote: project.isRemote ? 1 : 0,
-        remotePath: project.remotePath ?? null,
-        updatedAt: sql`CURRENT_TIMESTAMP`,
-      })
-      .onConflictDoUpdate({
-        target: projectsTable.path,
-        set: {
-          name: project.name,
-          gitRemote,
-          gitBranch,
-          baseRef: baseRef ?? null,
-          githubRepository,
-          githubConnected,
-          sshConnectionId: project.sshConnectionId ?? null,
-          isRemote: project.isRemote ? 1 : 0,
-          remotePath: project.remotePath ?? null,
-          updatedAt: sql`CURRENT_TIMESTAMP`,
-        },
-      });
-  }
-
-  async getProjects(): Promise<Project[]> {
-    if (this.disabled) return [];
-    const { db } = await getDrizzleClient();
-    const rows = await db.select().from(projectsTable).orderBy(desc(projectsTable.updatedAt));
-    return rows.map((row) => this.mapDrizzleProjectRow(row));
-  }
-
-  async getProjectById(projectId: string): Promise<Project | null> {
-    if (this.disabled) return null;
-    if (!projectId) {
-      throw new Error('projectId is required');
-    }
-    const { db } = await getDrizzleClient();
-    const rows = await db
-      .select()
-      .from(projectsTable)
-      .where(eq(projectsTable.id, projectId))
-      .limit(1);
-
-    if (rows.length === 0) {
-      return null;
-    }
-
-    return this.mapDrizzleProjectRow(rows[0]);
-  }
-
-  async updateProjectBaseRef(projectId: string, nextBaseRef: string): Promise<Project | null> {
-    if (this.disabled) return null;
-    if (!projectId) {
-      throw new Error('projectId is required');
-    }
-    const trimmed = typeof nextBaseRef === 'string' ? nextBaseRef.trim() : '';
-    if (!trimmed) {
-      throw new Error('baseRef cannot be empty');
-    }
-
-    const { db } = await getDrizzleClient();
-    const rows = await db
-      .select({
-        id: projectsTable.id,
-        gitRemote: projectsTable.gitRemote,
-        gitBranch: projectsTable.gitBranch,
-      })
-      .from(projectsTable)
-      .where(eq(projectsTable.id, projectId))
-      .limit(1);
-
-    if (rows.length === 0) {
-      throw new Error(`Project not found: ${projectId}`);
-    }
-
-    const source = rows[0];
-    const normalized = this.computeBaseRef(trimmed, source.gitRemote, source.gitBranch);
-
-    await db
-      .update(projectsTable)
-      .set({
-        baseRef: normalized,
-        updatedAt: sql`CURRENT_TIMESTAMP`,
-      })
-      .where(eq(projectsTable.id, projectId));
-
-    return this.getProjectById(projectId);
-  }
-
-  async saveTask(task: Omit<Task, 'createdAt' | 'updatedAt'>): Promise<void> {
-    if (this.disabled) return;
-    const metadataValue =
-      typeof task.metadata === 'string'
-        ? task.metadata
-        : task.metadata
-          ? JSON.stringify(task.metadata)
-          : null;
-    const { db } = await getDrizzleClient();
-    await db
-      .insert(tasksTable)
-      .values({
-        id: task.id,
-        projectId: task.projectId,
-        name: task.name,
-        branch: task.branch,
-        path: task.path,
-        status: task.status,
-        agentId: task.agentId ?? null,
-        metadata: metadataValue,
-        useWorktree: task.useWorktree !== false ? 1 : 0,
-        updatedAt: sql`CURRENT_TIMESTAMP`,
-      })
-      .onConflictDoUpdate({
-        target: tasksTable.id,
-        set: {
-          projectId: task.projectId,
-          name: task.name,
-          branch: task.branch,
-          path: task.path,
-          status: task.status,
-          agentId: task.agentId ?? null,
-          metadata: metadataValue,
-          useWorktree: task.useWorktree !== false ? 1 : 0,
-          updatedAt: sql`CURRENT_TIMESTAMP`,
-        },
-      });
-  }
-
-  async getTasks(projectId?: string): Promise<Task[]> {
-    if (this.disabled) return [];
-    const { db } = await getDrizzleClient();
-
-    // Filter out archived tasks by default
-    const rows: TaskRow[] = projectId
-      ? await db
-          .select()
-          .from(tasksTable)
-          .where(and(eq(tasksTable.projectId, projectId), isNull(tasksTable.archivedAt)))
-          .orderBy(desc(tasksTable.updatedAt))
-      : await db
-          .select()
-          .from(tasksTable)
-          .where(isNull(tasksTable.archivedAt))
-          .orderBy(desc(tasksTable.updatedAt));
-    return rows.map((row) => this.mapDrizzleTaskRow(row));
-  }
-
-  async getArchivedTasks(projectId?: string): Promise<Task[]> {
-    if (this.disabled) return [];
-    const { db } = await getDrizzleClient();
-
-    const rows: TaskRow[] = projectId
-      ? await db
-          .select()
-          .from(tasksTable)
-          .where(
-            and(eq(tasksTable.projectId, projectId), sql`${tasksTable.archivedAt} IS NOT NULL`)
-          )
-          .orderBy(desc(tasksTable.archivedAt))
-      : await db
-          .select()
-          .from(tasksTable)
-          .where(sql`${tasksTable.archivedAt} IS NOT NULL`)
-          .orderBy(desc(tasksTable.archivedAt));
-    return rows.map((row) => this.mapDrizzleTaskRow(row));
-  }
-
-  async archiveTask(taskId: string): Promise<void> {
-    if (this.disabled) return;
-    const { db } = await getDrizzleClient();
-    await db
-      .update(tasksTable)
-      .set({
-        archivedAt: new Date().toISOString(),
-        status: 'idle', // Reset status since PTY processes are killed on archive
-        updatedAt: sql`CURRENT_TIMESTAMP`,
-      })
-      .where(eq(tasksTable.id, taskId));
-  }
-
-  async restoreTask(taskId: string): Promise<void> {
-    if (this.disabled) return;
-    const { db } = await getDrizzleClient();
-    await db
-      .update(tasksTable)
-      .set({
-        archivedAt: null,
-        updatedAt: sql`CURRENT_TIMESTAMP`,
-      })
-      .where(eq(tasksTable.id, taskId));
-  }
-
-  async getTaskByPath(taskPath: string): Promise<Task | null> {
-    if (this.disabled) return null;
-    const { db } = await getDrizzleClient();
-
-    const rows = await db.select().from(tasksTable).where(eq(tasksTable.path, taskPath)).limit(1);
-
-    if (rows.length === 0) return null;
-    return this.mapDrizzleTaskRow(rows[0]);
-  }
-
-  async getTaskById(taskId: string): Promise<Task | null> {
-    if (this.disabled) return null;
-    if (!taskId) return null;
-    const { db } = await getDrizzleClient();
-    const rows = await db.select().from(tasksTable).where(eq(tasksTable.id, taskId)).limit(1);
-    if (rows.length === 0) return null;
-    return this.mapDrizzleTaskRow(rows[0]);
-  }
-
-  async deleteProject(projectId: string): Promise<void> {
-    if (this.disabled) return;
-    const { db } = await getDrizzleClient();
-    await db.delete(projectsTable).where(eq(projectsTable.id, projectId));
-  }
-
-  async deleteTask(taskId: string): Promise<void> {
-    if (this.disabled) return;
-    const { db } = await getDrizzleClient();
-    await db.delete(tasksTable).where(eq(tasksTable.id, taskId));
-  }
-
-  // Conversation management methods
-  async saveConversation(
-    conversation: Omit<Conversation, 'createdAt' | 'updatedAt'>
-  ): Promise<void> {
-    const { db } = await getDrizzleClient();
-    await db
-      .insert(conversationsTable)
-      .values({
-        id: conversation.id,
-        taskId: conversation.taskId,
-        title: conversation.title,
-        provider: conversation.provider ?? null,
-        isActive: conversation.isActive ? 1 : 0,
-        isMain: conversation.isMain ? 1 : 0,
-        displayOrder: conversation.displayOrder ?? 0,
-        metadata: conversation.metadata ?? null,
-        updatedAt: sql`CURRENT_TIMESTAMP`,
-      })
-      .onConflictDoUpdate({
-        target: conversationsTable.id,
-        set: {
-          title: conversation.title,
-          provider: conversation.provider ?? null,
-          isActive: conversation.isActive ? 1 : 0,
-          isMain: conversation.isMain ? 1 : 0,
-          displayOrder: conversation.displayOrder ?? 0,
-          metadata: conversation.metadata ?? null,
-          updatedAt: sql`CURRENT_TIMESTAMP`,
-        },
-      });
-  }
-
-  async getConversations(taskId: string): Promise<Conversation[]> {
-    if (this.disabled) return [];
-    const { db } = await getDrizzleClient();
-    const rows = await db
-      .select()
-      .from(conversationsTable)
-      .where(eq(conversationsTable.taskId, taskId))
-      .orderBy(asc(conversationsTable.displayOrder), desc(conversationsTable.updatedAt));
-    return rows.map((row) => this.mapDrizzleConversationRow(row));
-  }
-
-  async getOrCreateDefaultConversation(taskId: string): Promise<Conversation> {
-    if (this.disabled) {
-      return {
-        id: `conv-${taskId}-default`,
-        taskId,
-        title: 'Default Conversation',
-        isMain: true,
-        createdAt: new Date().toISOString(),
-        updatedAt: new Date().toISOString(),
-      };
-    }
-    const { db } = await getDrizzleClient();
-
-    const existingRows = await db
-      .select()
-      .from(conversationsTable)
-      .where(eq(conversationsTable.taskId, taskId))
-      .orderBy(asc(conversationsTable.createdAt))
-      .limit(1);
-
-    if (existingRows.length > 0) {
-      return this.mapDrizzleConversationRow(existingRows[0]);
-    }
-
-    const conversationId = `conv-${taskId}-${Date.now()}`;
-    await this.saveConversation({
-      id: conversationId,
-      taskId,
-      title: 'Default Conversation',
-      isMain: true,
-      isActive: true,
-    });
-
-    const [createdRow] = await db
-      .select()
-      .from(conversationsTable)
-      .where(eq(conversationsTable.id, conversationId))
-      .limit(1);
-
-    if (createdRow) {
-      return this.mapDrizzleConversationRow(createdRow);
-    }
-
-    return {
-      id: conversationId,
-      taskId,
-      title: 'Default Conversation',
-      createdAt: new Date().toISOString(),
-      updatedAt: new Date().toISOString(),
-    };
-  }
-
-  // Message management methods
-  async saveMessage(message: Omit<Message, 'timestamp'>): Promise<void> {
-    if (this.disabled) return;
-    const metadataValue =
-      typeof message.metadata === 'string'
-        ? message.metadata
-        : message.metadata
-          ? JSON.stringify(message.metadata)
-          : null;
-    const { db } = await getDrizzleClient();
-    await db.transaction(async (tx) => {
-      await tx
-        .insert(messagesTable)
-        .values({
-          id: message.id,
-          conversationId: message.conversationId,
-          content: message.content,
-          sender: message.sender,
-          metadata: metadataValue,
-          timestamp: sql`CURRENT_TIMESTAMP`,
-        })
-        .onConflictDoNothing()
-        .run();
-
-      await tx
-        .update(conversationsTable)
-        .set({ updatedAt: sql`CURRENT_TIMESTAMP` })
-        .where(eq(conversationsTable.id, message.conversationId))
-        .run();
-    });
-  }
-
-  async getMessages(conversationId: string): Promise<Message[]> {
-    if (this.disabled) return [];
-    const { db } = await getDrizzleClient();
-    const rows = await db
-      .select()
-      .from(messagesTable)
-      .where(eq(messagesTable.conversationId, conversationId))
-      .orderBy(asc(messagesTable.timestamp));
-    return rows.map((row) => this.mapDrizzleMessageRow(row));
-  }
-
-  async deleteConversation(conversationId: string): Promise<void> {
-    if (this.disabled) return;
-    const { db } = await getDrizzleClient();
-    await db.delete(conversationsTable).where(eq(conversationsTable.id, conversationId));
-  }
-
-  // New multi-chat methods
-  async createConversation(
-    taskId: string,
-    title: string,
-    provider?: string,
-    isMain?: boolean
-  ): Promise<Conversation> {
-    if (this.disabled) {
-      return {
-        id: `conv-${taskId}-${Date.now()}`,
-        taskId,
-        title,
-        provider: provider ?? null,
-        isActive: true,
-        isMain: isMain ?? false,
-        displayOrder: 0,
-        metadata: null,
-        createdAt: new Date().toISOString(),
-        updatedAt: new Date().toISOString(),
-      };
-    }
-
-    const { db } = await getDrizzleClient();
-
-    // Get the next display order
-    const existingConversations = await db
-      .select()
-      .from(conversationsTable)
-      .where(eq(conversationsTable.taskId, taskId));
-
-    const maxOrder = Math.max(...existingConversations.map((c) => c.displayOrder || 0), -1);
-
-    // Check if this should be the main conversation
-    // If explicitly set as main, check if one already exists
-    if (isMain === true) {
-      const hasMain = existingConversations.some((c) => c.isMain === 1);
-      if (hasMain) {
-        isMain = false; // Don't allow multiple main conversations
-      }
-    } else if (isMain === undefined) {
-      // If not specified, make it main only if it's the first conversation
-      isMain = existingConversations.length === 0;
-    }
-
-    // Deactivate other conversations
-    await db
-      .update(conversationsTable)
-      .set({ isActive: 0 })
-      .where(eq(conversationsTable.taskId, taskId));
-
-    // Create the new conversation
-    const conversationId = `conv_${Date.now()}_${Math.random().toString(36).substr(2, 9)}`;
-    const newConversation = {
-      id: conversationId,
-      taskId,
-      title,
-      provider: provider ?? null,
-      isActive: true,
-      isMain: isMain ?? false,
-      displayOrder: maxOrder + 1,
-    };
-
-    await this.saveConversation(newConversation);
-
-    // Fetch the created conversation
-    const [createdRow] = await db
-      .select()
-      .from(conversationsTable)
-      .where(eq(conversationsTable.id, conversationId))
-      .limit(1);
-
-    return this.mapDrizzleConversationRow(createdRow);
-  }
-
-  async setActiveConversation(taskId: string, conversationId: string): Promise<void> {
-    if (this.disabled) return;
-    const { db } = await getDrizzleClient();
-
-    await db.transaction(async (tx) => {
-      // Deactivate all conversations for this task
-      await tx
-        .update(conversationsTable)
-        .set({ isActive: 0 })
-        .where(eq(conversationsTable.taskId, taskId));
-
-      // Activate the selected one
-      await tx
-        .update(conversationsTable)
-        .set({ isActive: 1, updatedAt: sql`CURRENT_TIMESTAMP` })
-        .where(eq(conversationsTable.id, conversationId));
-    });
-  }
-
-  async getActiveConversation(taskId: string): Promise<Conversation | null> {
-    if (this.disabled) return null;
-    const { db } = await getDrizzleClient();
-
-    const results = await db
-      .select()
-      .from(conversationsTable)
-      .where(and(eq(conversationsTable.taskId, taskId), eq(conversationsTable.isActive, 1)))
-      .limit(1);
-
-    return results[0] ? this.mapDrizzleConversationRow(results[0]) : null;
-  }
-
-  async reorderConversations(taskId: string, conversationIds: string[]): Promise<void> {
-    if (this.disabled) return;
-    const { db } = await getDrizzleClient();
-
-    await db.transaction(async (tx) => {
-      for (let i = 0; i < conversationIds.length; i++) {
-        await tx
-          .update(conversationsTable)
-          .set({ displayOrder: i })
-          .where(eq(conversationsTable.id, conversationIds[i]));
-      }
-    });
-  }
-
-  async updateConversationTitle(conversationId: string, title: string): Promise<void> {
-    if (this.disabled) return;
-    const { db } = await getDrizzleClient();
-
-    await db
-      .update(conversationsTable)
-      .set({ title, updatedAt: sql`CURRENT_TIMESTAMP` })
-      .where(eq(conversationsTable.id, conversationId));
-  }
-
-  // Line comment management methods
-  async saveLineComment(
-    input: Omit<LineCommentInsert, 'id' | 'createdAt' | 'updatedAt'>
-  ): Promise<string> {
-    if (this.disabled) return '';
-    const id = `comment-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
-    const { db } = await getDrizzleClient();
-    await db.insert(lineCommentsTable).values({
-      id,
-      taskId: input.taskId,
-      filePath: input.filePath,
-      lineNumber: input.lineNumber,
-      lineContent: input.lineContent ?? null,
-      content: input.content,
-      updatedAt: sql`CURRENT_TIMESTAMP`,
-    });
-    return id;
-  }
-
-  async getLineComments(taskId: string, filePath?: string): Promise<LineCommentRow[]> {
-    if (this.disabled) return [];
-    const { db } = await getDrizzleClient();
-
-    if (filePath) {
-      const rows = await db
-        .select()
-        .from(lineCommentsTable)
-        .where(
-          sql`${lineCommentsTable.taskId} = ${taskId} AND ${lineCommentsTable.filePath} = ${filePath}`
-        )
-        .orderBy(asc(lineCommentsTable.lineNumber));
-      return rows;
-    }
-
-    const rows = await db
-      .select()
-      .from(lineCommentsTable)
-      .where(eq(lineCommentsTable.taskId, taskId))
-      .orderBy(asc(lineCommentsTable.lineNumber));
-    return rows;
-  }
-
-  async updateLineComment(id: string, content: string): Promise<void> {
-    if (this.disabled) return;
-    const { db } = await getDrizzleClient();
-    await db
-      .update(lineCommentsTable)
-      .set({
-        content,
-        updatedAt: sql`CURRENT_TIMESTAMP`,
-      })
-      .where(eq(lineCommentsTable.id, id));
-  }
-
-  async deleteLineComment(id: string): Promise<void> {
-    if (this.disabled) return;
-    const { db } = await getDrizzleClient();
-    await db.delete(lineCommentsTable).where(eq(lineCommentsTable.id, id));
-  }
-
-  async markCommentsSent(commentIds: string[]): Promise<void> {
-    if (this.disabled || commentIds.length === 0) return;
-    const { db } = await getDrizzleClient();
-    const now = new Date().toISOString();
-    await db
-      .update(lineCommentsTable)
-      .set({ sentAt: now })
-      .where(inArray(lineCommentsTable.id, commentIds));
-  }
-
-  async getUnsentComments(taskId: string): Promise<LineCommentRow[]> {
-    if (this.disabled) return [];
-    const { db } = await getDrizzleClient();
-    const rows = await db
-      .select()
-      .from(lineCommentsTable)
-      .where(and(eq(lineCommentsTable.taskId, taskId), isNull(lineCommentsTable.sentAt)))
-      .orderBy(asc(lineCommentsTable.filePath), asc(lineCommentsTable.lineNumber));
-    return rows;
-  }
-
-  // SSH connection management methods
-  async saveSshConnection(
-    connection: Omit<SshConnectionInsert, 'id' | 'createdAt' | 'updatedAt'> & { id?: string }
-  ): Promise<SshConnectionRow> {
-    if (this.disabled) {
-      throw new Error('Database is disabled');
-    }
-    const { db } = await getDrizzleClient();
-
-    const id = connection.id ?? `ssh_${Date.now()}_${Math.random().toString(36).substr(2, 9)}`;
-    const now = new Date().toISOString();
-
-    const result = await db
-      .insert(sshConnectionsTable)
-      .values({
-        ...connection,
-        id,
-        createdAt: now,
-        updatedAt: now,
-      })
-      .onConflictDoUpdate({
-        target: sshConnectionsTable.id,
-        set: {
-          name: connection.name,
-          host: connection.host,
-          port: connection.port,
-          username: connection.username,
-          authType: connection.authType,
-          privateKeyPath: connection.privateKeyPath ?? null,
-          useAgent: connection.useAgent,
-          updatedAt: now,
-        },
-      })
-      .returning();
-
-    return result[0];
-  }
-
-  async getSshConnections(): Promise<SshConnectionRow[]> {
-    if (this.disabled) return [];
-    const { db } = await getDrizzleClient();
-    return db.select().from(sshConnectionsTable).orderBy(sshConnectionsTable.name);
-  }
-
-  async getSshConnection(id: string): Promise<SshConnectionRow | null> {
-    if (this.disabled) return null;
-    const { db } = await getDrizzleClient();
-    const rows = await db
-      .select()
-      .from(sshConnectionsTable)
-      .where(eq(sshConnectionsTable.id, id))
-      .limit(1);
-    return rows.length > 0 ? rows[0] : null;
-  }
-
-  async deleteSshConnection(id: string): Promise<void> {
-    if (this.disabled) return;
-    const { db } = await getDrizzleClient();
-
-    // First update any projects using this connection
-    await db
-      .update(projectsTable)
-      .set({ sshConnectionId: null, isRemote: 0 })
-      .where(eq(projectsTable.sshConnectionId, id));
-
-    // Then delete the connection
-    await db.delete(sshConnectionsTable).where(eq(sshConnectionsTable.id, id));
-  }
-
-  private computeBaseRef(
-    preferred?: string | null,
-    remote?: string | null,
-    branch?: string | null
-  ): string {
-    const remoteName = this.getRemoteAlias(remote);
-    const normalize = (value?: string | null): string | undefined => {
-      if (!value) return undefined;
-      const trimmed = value.trim();
-      if (!trimmed || trimmed.includes('://')) return undefined;
-
-      if (trimmed.includes('/')) {
-        const [head, ...rest] = trimmed.split('/');
-        const branchPart = rest.join('/').replace(/^\/+/, '');
-        if (head && branchPart) {
-          return `${head}/${branchPart}`;
-        }
-        if (!head && branchPart) {
-          // Leading slash - prepend remote if available
-          return remoteName ? `${remoteName}/${branchPart}` : branchPart;
-        }
-        return undefined;
-      }
-
-      // Plain branch name - prepend remote only if one exists
-      const suffix = trimmed.replace(/^\/+/, '');
-      return remoteName ? `${remoteName}/${suffix}` : suffix;
-    };
-
-    // Default: use origin/main if remote exists, otherwise just 'main'
-    const defaultBranch = remoteName
-      ? `${remoteName}/${this.defaultBranchName()}`
-      : this.defaultBranchName();
-    return normalize(preferred) ?? normalize(branch) ?? defaultBranch;
-  }
-
-  private defaultRemoteName(): string {
-    return 'origin';
-  }
-
-  private getRemoteAlias(remote?: string | null): string {
-    if (!remote) return this.defaultRemoteName();
-    const trimmed = remote.trim();
-    if (!trimmed) return ''; // Empty string indicates no remote (local-only repo)
-    if (/^[A-Za-z0-9._-]+$/.test(trimmed) && !trimmed.includes('://')) {
-      return trimmed;
-    }
-    return this.defaultRemoteName();
-  }
-
-  private defaultBranchName(): string {
-    return 'main';
-  }
-
-  private mapDrizzleProjectRow(row: ProjectRow): Project {
-    return {
-      id: row.id,
-      name: row.name,
-      path: row.path,
-      isRemote: row.isRemote === 1,
-      sshConnectionId: row.sshConnectionId ?? null,
-      remotePath: row.remotePath ?? null,
-      gitInfo: {
-        isGitRepo: !!(row.gitRemote || row.gitBranch),
-        remote: row.gitRemote ?? undefined,
-        branch: row.gitBranch ?? undefined,
-        baseRef: this.computeBaseRef(row.baseRef, row.gitRemote, row.gitBranch),
-      },
-      githubInfo: row.githubRepository
-        ? {
-            repository: row.githubRepository,
-            connected: !!row.githubConnected,
-          }
-        : undefined,
-      createdAt: row.createdAt,
-      updatedAt: row.updatedAt,
-    };
-  }
-
-  private mapDrizzleTaskRow(row: TaskRow): Task {
-    return {
-      id: row.id,
-      projectId: row.projectId,
-      name: row.name,
-      branch: row.branch,
-      path: row.path,
-      status: (row.status as Task['status']) ?? 'idle',
-      agentId: row.agentId ?? null,
-      metadata:
-        typeof row.metadata === 'string' && row.metadata.length > 0
-          ? this.parseTaskMetadata(row.metadata, row.id)
-          : null,
-      useWorktree: row.useWorktree === 1,
-      archivedAt: row.archivedAt ?? null,
-      createdAt: row.createdAt,
-      updatedAt: row.updatedAt,
-    };
-  }
-
-  private mapDrizzleConversationRow(row: ConversationRow): Conversation {
-    return {
-      id: row.id,
-      taskId: row.taskId,
-      title: row.title,
-      provider: row.provider ?? null,
-      isActive: row.isActive === 1,
-      // For backward compatibility: treat missing isMain as true (assume first/only conversation is main)
-      isMain: row.isMain !== undefined ? row.isMain === 1 : true,
-      displayOrder: row.displayOrder ?? 0,
-      metadata: row.metadata ?? null,
-      createdAt: row.createdAt,
-      updatedAt: row.updatedAt,
-    };
-  }
-
-  private mapDrizzleMessageRow(row: MessageRow): Message {
-    return {
-      id: row.id,
-      conversationId: row.conversationId,
-      content: row.content,
-      sender: row.sender as Message['sender'],
-      timestamp: row.timestamp,
-      metadata: row.metadata ?? undefined,
-    };
-  }
-
-  private parseTaskMetadata(serialized: string, taskId: string): any {
-    try {
-      return JSON.parse(serialized);
-    } catch (error) {
-      console.warn(`Failed to parse task metadata for ${taskId}`, error);
-      return null;
-    }
-  }
-
-  async close(): Promise<void> {
-    if (this.disabled || !this.db) return;
-
-    return new Promise((resolve, reject) => {
-      this.db!.close((err) => {
-        if (err) {
-          reject(err);
-        } else {
-          resolve();
-        }
-      });
-    });
-  }
-
-  private async ensureMigrations(): Promise<void> {
-    if (this.disabled) return;
-    if (!this.db) throw new Error('Database not initialized');
-    if (DatabaseService.migrationsApplied) return;
-
-    const migrationsPath = resolveMigrationsPath();
-    if (!migrationsPath) {
-      // Provide a detailed error message for debugging
-      const errorMsg = [
-        'Failed to locate database migrations folder.',
-        'This can happen when:',
-        '1. The app was installed via Homebrew (try downloading directly from GitHub)',
-        '2. The app is running from Downloads/DMG (move it to Applications)',
-        '3. The installation is incomplete or corrupted',
-        '4. Security software is blocking file access',
-        '',
-        'To fix: Try downloading and installing Emdash directly from:',
-        'https://github.com/generalaction/emdash/releases',
-        '',
-      ].join('\n');
-
-      throw new Error(errorMsg);
-    }
-
-    // We run schema migrations with foreign_keys disabled.
-    // Many dev DBs were created with foreign_keys=OFF, so legacy data can contain orphans.
-    // Enabling FK enforcement mid-migration can cause schema transitions (table rebuilds) to fail.
-    await this.execSql('PRAGMA foreign_keys=OFF;');
-    try {
-      // IMPORTANT:
-      // Drizzle's built-in migrator for sqlite-proxy decides what to run based on the latest
-      // `created_at` timestamp in __drizzle_migrations. If a migration is added later but has an
-      // earlier timestamp than the latest applied migration, Drizzle will skip it forever.
-      //
-      // To make migrations robust for dev DBs (and for any DB that may have extra migrations),
-      // we apply migrations by missing hash instead of timestamp ordering.
-      const migrations = readMigrationFiles({ migrationsFolder: migrationsPath });
-      const tagByWhen = await this.tryLoadMigrationTagByWhen(migrationsPath);
-
-      await this.execSql(`
-        CREATE TABLE IF NOT EXISTS "__drizzle_migrations" (
-          id SERIAL PRIMARY KEY,
-          hash text NOT NULL,
-          created_at numeric
-        )
-      `);
-
-      const appliedRows = await this.allSql<{ hash: string }>(
-        `SELECT hash FROM "__drizzle_migrations"`
-      );
-      const applied = new Set(appliedRows.map((r) => r.hash));
-
-      // Recovery: if a previous run partially applied the workspace->task migration, finish it.
-      // Symptom: `tasks` exists, `conversations` still has `workspace_id`, and `__new_conversations` exists.
-      let recovered = false;
-      if (
-        (await this.tableExists('tasks')) &&
-        (await this.tableExists('conversations')) &&
-        (await this.tableExists('__new_conversations')) &&
-        (await this.tableHasColumn('conversations', 'workspace_id')) &&
-        !(await this.tableHasColumn('conversations', 'task_id'))
-      ) {
-        // Populate new conversations table from the old one (FK enforcement is OFF, so orphans won't block)
-        await this.execSql(`
-          INSERT INTO "__new_conversations"("id", "task_id", "title", "created_at", "updated_at")
-          SELECT "id", "workspace_id", "title", "created_at", "updated_at" FROM "conversations"
-        `);
-        await this.execSql(`DROP TABLE "conversations";`);
-        await this.execSql(`ALTER TABLE "__new_conversations" RENAME TO "conversations";`);
-        await this.execSql(
-          `CREATE INDEX IF NOT EXISTS "idx_conversations_task_id" ON "conversations" ("task_id");`
-        );
-
-        // Mark the workspace->task migration as applied (even if it wasn't tracked).
-        // This prevents the hash-based runner from attempting to re-run it against a partially-migrated DB.
-        await this.ensureMigrationMarkedApplied(
-          migrationsPath,
-          applied,
-          '0002_lyrical_impossible_man'
-        );
-        recovered = true;
-      }
-
-      let appliedCount = 0;
-      for (const migration of migrations) {
-        if (applied.has(migration.hash)) continue;
-
-        const tag = tagByWhen?.get(migration.folderMillis);
-        // If the DB already reflects the workspace->task rename (e.g. user manually fixed their DB)
-        // but the migration hash wasn't recorded, mark it as applied and move on.
-        if (
-          tag === '0002_lyrical_impossible_man' &&
-          (await this.tableExists('tasks')) &&
-          !(await this.tableExists('workspaces')) &&
-          (await this.tableExists('conversations')) &&
-          (await this.tableHasColumn('conversations', 'task_id'))
-        ) {
-          await this.execSql(
-            `INSERT INTO "__drizzle_migrations" ("hash", "created_at") VALUES('${migration.hash}', '${migration.folderMillis}')`
-          );
-          applied.add(migration.hash);
-          continue;
-        }
-
-        // Execute each statement chunk (drizzle-kit uses '--> statement-breakpoint')
-        for (const statement of migration.sql) {
-          // We manage FK enforcement ourselves during migrations.
-          const trimmed = statement.trim().toUpperCase();
-          if (trimmed.startsWith('PRAGMA FOREIGN_KEYS=')) continue;
-          await this.execSql(statement);
-        }
-
-        // Record as applied (same schema as Drizzle uses)
-        await this.execSql(
-          `INSERT INTO "__drizzle_migrations" ("hash", "created_at") VALUES('${migration.hash}', '${migration.folderMillis}')`
-        );
-
-        applied.add(migration.hash);
-        appliedCount += 1;
-      }
-
-      this.lastMigrationSummary = {
-        appliedCount,
-        totalMigrations: migrations.length,
-        recovered,
-      };
-
-      DatabaseService.migrationsApplied = true;
-    } finally {
-      // Restore FK enforcement for normal operation (and ensure it's re-enabled on failure).
-      await this.execSql('PRAGMA foreign_keys=ON;');
-    }
-  }
-
-  private async validateSchemaContract(): Promise<void> {
-    if (this.disabled) return;
-
-    const missingInvariants: string[] = [];
-
-    if (!(await this.tableHasColumn('projects', 'base_ref'))) {
-      missingInvariants.push('projects.base_ref');
-    }
-    if (!(await this.tableExists('tasks'))) {
-      missingInvariants.push('tasks table');
-    }
-    if (!(await this.tableHasColumn('conversations', 'task_id'))) {
-      missingInvariants.push('conversations.task_id');
-    }
-
-    if (missingInvariants.length > 0) {
-      throw new DatabaseSchemaMismatchError(this.dbPath, missingInvariants);
-    }
-  }
-
-  private async tryLoadMigrationTagByWhen(
-    migrationsFolder: string
-  ): Promise<Map<number, string> | null> {
-    try {
-      // eslint-disable-next-line @typescript-eslint/no-var-requires
-      const fs = require('node:fs');
-      // eslint-disable-next-line @typescript-eslint/no-var-requires
-      const path = require('node:path');
-      const journalPath = path.join(migrationsFolder, 'meta', '_journal.json');
-      if (!fs.existsSync(journalPath)) return null;
-      const parsed: unknown = JSON.parse(fs.readFileSync(journalPath, 'utf8'));
-      if (!parsed || typeof parsed !== 'object') return null;
-      const entries = (parsed as { entries?: unknown }).entries;
-      if (!Array.isArray(entries)) return null;
-
-      const map = new Map<number, string>();
-      for (const e of entries) {
-        if (!e || typeof e !== 'object') continue;
-        const when = (e as { when?: unknown }).when;
-        const tag = (e as { tag?: unknown }).tag;
-        if (typeof when === 'number' && typeof tag === 'string') {
-          map.set(when, tag);
-        }
-      }
-      return map;
-    } catch {
-      return null;
-    }
-  }
-
-  private async ensureMigrationMarkedApplied(
-    migrationsFolder: string,
-    applied: Set<string>,
-    tag: string
-  ): Promise<void> {
-    // Only mark if the SQL file + journal entry exist.
-    // eslint-disable-next-line @typescript-eslint/no-var-requires
-    const fs = require('node:fs');
-    // eslint-disable-next-line @typescript-eslint/no-var-requires
-    const path = require('node:path');
-    // eslint-disable-next-line @typescript-eslint/no-var-requires
-    const crypto = require('node:crypto');
-
-    const journalPath = path.join(migrationsFolder, 'meta', '_journal.json');
-    if (!fs.existsSync(journalPath)) return;
-    const journalParsed: unknown = JSON.parse(fs.readFileSync(journalPath, 'utf8'));
-    const entries = (journalParsed as { entries?: unknown }).entries;
-    if (!Array.isArray(entries)) return;
-    const entry = entries.find((e) => {
-      if (!e || typeof e !== 'object') return false;
-      return (e as { tag?: unknown }).tag === tag;
-    }) as { when?: unknown } | undefined;
-    if (!entry) return;
-
-    const sqlPath = path.join(migrationsFolder, `${tag}.sql`);
-    if (!fs.existsSync(sqlPath)) return;
-    const contents = fs.readFileSync(sqlPath, 'utf8');
-    const hash = crypto.createHash('sha256').update(contents).digest('hex');
-
-    if (applied.has(hash)) return;
-    const createdAt = typeof entry.when === 'number' ? entry.when : Date.now();
-    await this.execSql(
-      `INSERT INTO "__drizzle_migrations" ("hash", "created_at") VALUES('${hash}', '${createdAt}')`
-    );
-    applied.add(hash);
-  }
-
-  private async tableExists(name: string): Promise<boolean> {
-    const rows = await this.allSql<{ name: string }>(
-      `SELECT name FROM sqlite_master WHERE type='table' AND name='${name.replace(/'/g, "''")}' LIMIT 1`
-    );
-    return rows.length > 0;
-  }
-
-  private async tableHasColumn(tableName: string, columnName: string): Promise<boolean> {
-    if (!(await this.tableExists(tableName))) return false;
-    const rows = await this.allSql<{ name: string }>(
-      `PRAGMA table_info("${tableName.replace(/"/g, '""')}")`
-    );
-    return rows.some((r) => r.name === columnName);
-  }
-
-  private async allSql<T = any>(query: string): Promise<T[]> {
-    if (!this.db) throw new Error('Database not initialized');
-    const trimmed = query.trim();
-    if (!trimmed) return [];
-
-    return await new Promise<T[]>((resolve, reject) => {
-      this.db!.all(trimmed, (err, rows) => {
-        if (err) {
-          reject(err);
-        } else {
-          resolve((rows ?? []) as T[]);
-        }
-      });
-    });
-  }
-
-  private async execSql(statement: string): Promise<void> {
-    if (!this.db) throw new Error('Database not initialized');
-    const trimmed = statement.trim();
-    if (!trimmed) return;
-
-    await new Promise<void>((resolve, reject) => {
-      this.db!.exec(trimmed, (err) => {
-        if (err) {
-          // Handle idempotent migration cases - skip if schema already matches
-          const msg = err.message ?? '';
-          if (msg.includes('duplicate column name') || msg.includes('already exists')) {
-            // Schema change already applied, continue
-            resolve();
-            return;
-          }
-          reject(err);
-        } else {
-          resolve();
-        }
-      });
-    });
-  }
-}
-
-export const databaseService = new DatabaseService();
diff --git a/src/main/services/GitHubCLIInstaller.ts b/src/main/services/GitHubCLIInstaller.ts
deleted file mode 100644
index ac47d7c938..0000000000
--- a/src/main/services/GitHubCLIInstaller.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-import { exec } from 'child_process';
-import { promisify } from 'util';
-import * as os from 'os';
-
-const execAsync = promisify(exec);
-
-export class GitHubCLIInstaller {
-  /**
-   * Check if gh CLI is installed
-   */
-  async isInstalled(): Promise<boolean> {
-    try {
-      await execAsync('gh --version');
-      return true;
-    } catch {
-      return false;
-    }
-  }
-
-  /**
-   * Attempt to install gh CLI automatically
-   */
-  async install(): Promise<{ success: boolean; error?: string }> {
-    const platform = os.platform();
-
-    try {
-      switch (platform) {
-        case 'darwin': // macOS
-          return await this.installMacOS();
-        case 'linux':
-          return await this.installLinux();
-        case 'win32':
-          return await this.installWindows();
-        default:
-          return { success: false, error: `Unsupported platform: ${platform}` };
-      }
-    } catch (error) {
-      console.error('Failed to install gh CLI:', error);
-      return {
-        success: false,
-        error: error instanceof Error ? error.message : 'Installation failed',
-      };
-    }
-  }
-
-  private async installMacOS(): Promise<{ success: boolean; error?: string }> {
-    try {
-      // Check if Homebrew is installed
-      await execAsync('which brew');
-
-      // Install gh using Homebrew
-      await execAsync('brew install gh');
-      return { success: true };
-    } catch (error) {
-      return {
-        success: false,
-        error: 'Homebrew not found. Please install from https://brew.sh/ first.',
-      };
-    }
-  }
-
-  private async installLinux(): Promise<{ success: boolean; error?: string }> {
-    try {
-      // Try apt (Debian/Ubuntu)
-      await execAsync('sudo apt update && sudo apt install -y gh');
-      return { success: true };
-    } catch {
-      return {
-        success: false,
-        error: 'Could not install gh CLI. Please install manually: https://cli.github.com/',
-      };
-    }
-  }
-
-  private async installWindows(): Promise<{ success: boolean; error?: string }> {
-    try {
-      // Try winget
-      await execAsync('winget install GitHub.cli');
-      return { success: true };
-    } catch {
-      return {
-        success: false,
-        error: 'Could not install gh CLI. Please install manually: https://cli.github.com/',
-      };
-    }
-  }
-}
-
-export const githubCLIInstaller = new GitHubCLIInstaller();
diff --git a/src/main/services/GitHubService.ts b/src/main/services/GitHubService.ts
deleted file mode 100644
index 33a87dbe84..0000000000
--- a/src/main/services/GitHubService.ts
+++ /dev/null
@@ -1,1126 +0,0 @@
-import { exec, spawn } from 'child_process';
-import { promisify } from 'util';
-import * as path from 'path';
-import * as fs from 'fs';
-import { GITHUB_CONFIG } from '../config/github.config';
-import { getMainWindow } from '../app/window';
-import { errorTracking } from '../errorTracking';
-import { sortByUpdatedAtDesc } from '../utils/issueSorting';
-
-const execAsync = promisify(exec);
-
-export interface GitHubUser {
-  id: number;
-  login: string;
-  name: string;
-  email: string;
-  avatar_url: string;
-}
-
-export interface GitHubRepo {
-  id: number;
-  name: string;
-  full_name: string;
-  description: string | null;
-  html_url: string;
-  clone_url: string;
-  ssh_url: string;
-  default_branch: string;
-  private: boolean;
-  updated_at: string | null;
-  language: string | null;
-  stargazers_count: number;
-  forks_count: number;
-}
-
-export interface GitHubPullRequest {
-  number: number;
-  title: string;
-  headRefName: string;
-  baseRefName: string;
-  url: string;
-  isDraft?: boolean;
-  updatedAt?: string | null;
-  headRefOid?: string;
-  author?: {
-    login?: string;
-    name?: string;
-  } | null;
-  headRepositoryOwner?: {
-    login?: string;
-  } | null;
-  headRepository?: {
-    name?: string;
-    nameWithOwner?: string;
-    url?: string;
-  } | null;
-}
-
-export interface AuthResult {
-  success: boolean;
-  token?: string;
-  user?: GitHubUser;
-  error?: string;
-}
-
-export interface DeviceCodeResult {
-  success: boolean;
-  device_code?: string;
-  user_code?: string;
-  verification_uri?: string;
-  expires_in?: number;
-  interval?: number;
-  error?: string;
-}
-
-export class GitHubService {
-  private readonly SERVICE_NAME = 'emdash-github';
-  private readonly ACCOUNT_NAME = 'github-token';
-
-  // Polling state management
-  private isPolling = false;
-  private pollingInterval: NodeJS.Timeout | null = null;
-  private currentDeviceCode: string | null = null;
-  private currentInterval = 5;
-
-  /**
-   * Authenticate with GitHub using Device Flow
-   * Returns device code info for the UI to display to the user
-   */
-  async authenticate(): Promise<DeviceCodeResult | AuthResult> {
-    return await this.requestDeviceCode();
-  }
-
-  /**
-   * Start Device Flow authentication with automatic background polling
-   * Emits events to renderer for UI updates
-   * Returns immediately with device code info
-   */
-  async startDeviceFlowAuth(): Promise<DeviceCodeResult> {
-    // Stop any existing polling
-    this.stopPolling();
-
-    // Request device code
-    const deviceCodeResult = await this.requestDeviceCode();
-
-    if (!deviceCodeResult.success || !deviceCodeResult.device_code) {
-      // Emit error to renderer
-      const mainWindow = getMainWindow();
-      if (mainWindow) {
-        mainWindow.webContents.send('github:auth:error', {
-          error: deviceCodeResult.error || 'Failed to request device code',
-        });
-      }
-      return deviceCodeResult;
-    }
-
-    // Store device code and interval
-    this.currentDeviceCode = deviceCodeResult.device_code;
-    this.currentInterval = deviceCodeResult.interval || 5;
-    this.isPolling = true;
-
-    // Give renderer time to mount modal and subscribe to events
-    // Then emit device code for display
-    setTimeout(() => {
-      const mainWindow = getMainWindow();
-      if (mainWindow) {
-        mainWindow.webContents.send('github:auth:device-code', {
-          userCode: deviceCodeResult.user_code,
-          verificationUri: deviceCodeResult.verification_uri,
-          expiresIn: deviceCodeResult.expires_in,
-          interval: this.currentInterval,
-        });
-      }
-    }, 100); // 100ms delay to ensure modal is mounted
-
-    // Start background polling
-    this.startBackgroundPolling(deviceCodeResult.expires_in || 900);
-
-    return deviceCodeResult;
-  }
-
-  /**
-   * Start background polling loop
-   */
-  private startBackgroundPolling(expiresIn: number): void {
-    if (!this.currentDeviceCode) return;
-
-    const startTime = Date.now();
-    const expiresAt = startTime + expiresIn * 1000;
-
-    const poll = async () => {
-      if (!this.isPolling || !this.currentDeviceCode) {
-        this.stopPolling();
-        return;
-      }
-
-      // Check if expired
-      if (Date.now() >= expiresAt) {
-        this.stopPolling();
-        const mainWindow = getMainWindow();
-        if (mainWindow) {
-          mainWindow.webContents.send('github:auth:error', {
-            error: 'expired_token',
-            message: 'Authorization code expired. Please try again.',
-          });
-        }
-        return;
-      }
-
-      try {
-        const result = await this.pollDeviceToken(this.currentDeviceCode, this.currentInterval);
-
-        if (result.success && result.token) {
-          // Success! Emit immediately
-          this.stopPolling();
-
-          // Update error tracking with GitHub username
-          if (result.user?.login) {
-            await errorTracking.updateGithubUsername(result.user.login);
-          }
-
-          const mainWindow = getMainWindow();
-          if (mainWindow) {
-            mainWindow.webContents.send('github:auth:success', {
-              token: result.token,
-              user: result.user || undefined,
-            });
-          }
-        } else if (result.error) {
-          const mainWindow = getMainWindow();
-
-          if (result.error === 'authorization_pending') {
-            // Still waiting - emit polling status
-            if (mainWindow) {
-              mainWindow.webContents.send('github:auth:polling', {
-                status: 'waiting',
-              });
-            }
-          } else if (result.error === 'slow_down') {
-            // GitHub wants us to slow down
-            this.currentInterval += 5;
-            if (mainWindow) {
-              mainWindow.webContents.send('github:auth:slow-down', {
-                newInterval: this.currentInterval,
-              });
-            }
-
-            // Restart interval with new timing
-            if (this.pollingInterval) {
-              clearInterval(this.pollingInterval);
-              this.pollingInterval = setInterval(poll, this.currentInterval * 1000);
-            }
-          } else if (result.error === 'expired_token') {
-            // Code expired
-            this.stopPolling();
-            if (mainWindow) {
-              mainWindow.webContents.send('github:auth:error', {
-                error: 'expired_token',
-                message: 'Authorization code expired. Please try again.',
-              });
-            }
-          } else if (result.error === 'access_denied') {
-            // User denied
-            this.stopPolling();
-            if (mainWindow) {
-              mainWindow.webContents.send('github:auth:error', {
-                error: 'access_denied',
-                message: 'Authorization was cancelled.',
-              });
-            }
-          } else {
-            // Unknown error
-            this.stopPolling();
-            if (mainWindow) {
-              mainWindow.webContents.send('github:auth:error', {
-                error: result.error,
-                message: `Authentication failed: ${result.error}`,
-              });
-            }
-          }
-        }
-      } catch (error) {
-        console.error('Polling error:', error);
-
-        // Track polling errors
-        await errorTracking.captureGitHubError(error, 'poll_device_code');
-
-        const mainWindow = getMainWindow();
-        if (mainWindow) {
-          mainWindow.webContents.send('github:auth:error', {
-            error: 'network_error',
-            message: 'Network error during authentication. Please try again.',
-          });
-        }
-        this.stopPolling();
-      }
-    };
-
-    // Start polling with initial interval
-    setTimeout(poll, this.currentInterval * 1000);
-    this.pollingInterval = setInterval(poll, this.currentInterval * 1000);
-  }
-
-  /**
-   * Stop the background polling
-   */
-  stopPolling(): void {
-    this.isPolling = false;
-    if (this.pollingInterval) {
-      clearInterval(this.pollingInterval);
-      this.pollingInterval = null;
-    }
-    this.currentDeviceCode = null;
-    this.currentInterval = 5;
-  }
-
-  /**
-   * Cancel the authentication flow
-   */
-  cancelAuth(): void {
-    this.stopPolling();
-    const mainWindow = getMainWindow();
-    if (mainWindow) {
-      mainWindow.webContents.send('github:auth:cancelled', {});
-    }
-  }
-
-  /**
-   * Request a device code from GitHub for Device Flow authentication
-   */
-  async requestDeviceCode(): Promise<DeviceCodeResult> {
-    try {
-      const response = await fetch('https://github.com/login/device/code', {
-        method: 'POST',
-        headers: {
-          Accept: 'application/json',
-          'Content-Type': 'application/json',
-        },
-        body: JSON.stringify({
-          client_id: GITHUB_CONFIG.clientId,
-          scope: GITHUB_CONFIG.scopes.join(' '),
-        }),
-      });
-
-      const data = (await response.json()) as {
-        device_code?: string;
-        user_code?: string;
-        verification_uri?: string;
-        expires_in?: number;
-        interval?: number;
-        error?: string;
-        error_description?: string;
-      };
-
-      if (data.device_code && data.user_code && data.verification_uri) {
-        // Don't auto-open here - let the UI control when to open browser
-        return {
-          success: true,
-          device_code: data.device_code,
-          user_code: data.user_code,
-          verification_uri: data.verification_uri,
-          expires_in: data.expires_in || 900,
-          interval: data.interval || 5,
-        };
-      } else {
-        return {
-          success: false,
-          error: data.error_description || 'Failed to request device code',
-        };
-      }
-    } catch (error) {
-      console.error('Device code request failed:', error);
-      return {
-        success: false,
-        error: 'Network error while requesting device code',
-      };
-    }
-  }
-
-  /**
-   * Poll for access token using device code
-   * Should be called repeatedly until success or error
-   */
-  async pollDeviceToken(deviceCode: string, _interval: number = 5): Promise<AuthResult> {
-    try {
-      const response = await fetch('https://github.com/login/oauth/access_token', {
-        method: 'POST',
-        headers: {
-          Accept: 'application/json',
-          'Content-Type': 'application/json',
-        },
-        body: JSON.stringify({
-          client_id: GITHUB_CONFIG.clientId,
-          device_code: deviceCode,
-          grant_type: 'urn:ietf:params:oauth:grant-type:device_code',
-        }),
-      });
-
-      const data = (await response.json()) as {
-        access_token?: string;
-        token_type?: string;
-        scope?: string;
-        error?: string;
-        error_description?: string;
-      };
-
-      if (data.access_token) {
-        // We get the token, now fetch user info immediately before returning success
-        // This ensures the UI has the correct username without a race condition
-        const token = data.access_token;
-        const user = await this.getUserInfo(token);
-
-        // Store token and authenticate gh CLI BEFORE returning success.
-        // This must complete synchronously (awaited) so that when the renderer
-        // receives the success event and checks `gh api user`, the CLI is
-        // already authenticated. Previously these were deferred via setImmediate,
-        // causing a race where the status check ran before gh CLI auth finished.
-        try {
-          await this.storeToken(token);
-        } catch (error) {
-          console.warn('Failed to store token:', error);
-        }
-
-        try {
-          await this.authenticateGHCLI(token);
-        } catch {
-          // Silent fail - gh CLI might not be installed
-        }
-
-        const mainWindow = getMainWindow();
-        if (user && mainWindow) {
-          mainWindow.webContents.send('github:auth:user-updated', {
-            user: user,
-          });
-        }
-
-        return {
-          success: true,
-          token: token,
-          user: user || undefined,
-        };
-      } else if (data.error) {
-        // Return error to caller - they decide how to handle
-        return {
-          success: false,
-          error: data.error,
-        };
-      } else {
-        return {
-          success: false,
-          error: 'Unknown error during token polling',
-        };
-      }
-    } catch (error) {
-      console.error('Token polling failed:', error);
-      return {
-        success: false,
-        error: 'Network error during token polling',
-      };
-    }
-  }
-
-  /**
-   * Authenticate gh CLI with the OAuth token
-   */
-  private async authenticateGHCLI(token: string): Promise<void> {
-    try {
-      // Check if gh CLI is installed first
-      await execAsync('gh --version');
-
-      // Security: Authenticate gh CLI with token via stdin (not shell interpolation)
-      // This prevents command injection if token contains shell metacharacters
-      await new Promise<void>((resolve, reject) => {
-        const child = spawn('gh', ['auth', 'login', '--with-token'], {
-          stdio: ['pipe', 'pipe', 'pipe'],
-        });
-
-        child.on('close', (code) => {
-          if (code === 0) {
-            resolve();
-          } else {
-            reject(new Error(`gh auth login failed with code ${code}`));
-          }
-        });
-
-        child.on('error', reject);
-
-        // Write token to stdin and close it
-        child.stdin.write(token);
-        child.stdin.end();
-      });
-    } catch (error) {
-      console.warn('Could not authenticate gh CLI (may not be installed):', error);
-      // Don't throw - OAuth still succeeded even if gh CLI isn't available
-    }
-  }
-
-  /**
-   * Execute gh command with automatic re-auth on failure
-   */
-  private async execGH(
-    command: string,
-    options?: any
-  ): Promise<{ stdout: string; stderr: string }> {
-    try {
-      const result = await execAsync(command, { encoding: 'utf8', ...options });
-      return {
-        stdout: String(result.stdout),
-        stderr: String(result.stderr),
-      };
-    } catch (error: any) {
-      // Check if it's an auth error
-      if (error.message && error.message.includes('not authenticated')) {
-        // Try to re-authenticate gh CLI with stored token
-        const token = await this.getStoredToken();
-        if (token) {
-          await this.authenticateGHCLI(token);
-
-          // Retry the command
-          const result = await execAsync(command, { encoding: 'utf8', ...options });
-          return {
-            stdout: String(result.stdout),
-            stderr: String(result.stderr),
-          };
-        }
-      }
-      throw error;
-    }
-  }
-
-  /**
-   * List open GitHub issues for the current repo (cwd = projectPath)
-   */
-  async listIssues(
-    projectPath: string,
-    limit: number = 50
-  ): Promise<
-    Array<{
-      number: number;
-      title: string;
-      url?: string;
-      state?: string;
-      updatedAt?: string | null;
-      assignees?: Array<{ login?: string; name?: string }>;
-      labels?: Array<{ name?: string }>;
-    }>
-  > {
-    const safeLimit = Math.min(Math.max(Number(limit) || 50, 1), 200);
-    try {
-      const fields = ['number', 'title', 'url', 'state', 'updatedAt', 'assignees', 'labels'];
-      const { stdout } = await this.execGH(
-        `gh issue list --state open --limit ${safeLimit} --json ${fields.join(',')}`,
-        { cwd: projectPath }
-      );
-      const list = JSON.parse(stdout || '[]');
-      if (!Array.isArray(list)) return [];
-      return sortByUpdatedAtDesc(list);
-    } catch (error) {
-      console.error('Failed to list GitHub issues:', error);
-      return []; // Return empty array instead of throwing
-    }
-  }
-
-  /** Search open issues in current repo */
-  async searchIssues(
-    projectPath: string,
-    searchTerm: string,
-    limit: number = 20
-  ): Promise<
-    Array<{
-      number: number;
-      title: string;
-      url?: string;
-      state?: string;
-      updatedAt?: string | null;
-      assignees?: Array<{ login?: string; name?: string }>;
-      labels?: Array<{ name?: string }>;
-    }>
-  > {
-    const safeLimit = Math.min(Math.max(Number(limit) || 20, 1), 200);
-    const term = String(searchTerm || '').trim();
-    if (!term) return [];
-
-    try {
-      const fields = ['number', 'title', 'url', 'state', 'updatedAt', 'assignees', 'labels'];
-      const { stdout } = await this.execGH(
-        `gh issue list --state open --search ${JSON.stringify(term)} --limit ${safeLimit} --json ${fields.join(',')}`,
-        { cwd: projectPath }
-      );
-      const list = JSON.parse(stdout || '[]');
-      if (!Array.isArray(list)) return [];
-      return sortByUpdatedAtDesc(list);
-    } catch (error) {
-      // Surface empty results rather than failing hard on weird queries
-      return [];
-    }
-  }
-
-  /** Get a single issue with body for enrichment */
-  async getIssue(
-    projectPath: string,
-    number: number
-  ): Promise<{
-    number: number;
-    title?: string;
-    body?: string;
-    url?: string;
-    state?: string;
-    updatedAt?: string | null;
-    assignees?: Array<{ login?: string; name?: string }>;
-    labels?: Array<{ name?: string }>;
-  } | null> {
-    try {
-      const fields = [
-        'number',
-        'title',
-        'body',
-        'url',
-        'state',
-        'updatedAt',
-        'assignees',
-        'labels',
-      ];
-      const { stdout } = await this.execGH(
-        `gh issue view ${JSON.stringify(String(number))} --json ${fields.join(',')}`,
-        { cwd: projectPath }
-      );
-      const data = JSON.parse(stdout || 'null');
-      if (!data || typeof data !== 'object') return null;
-      return data;
-    } catch (error) {
-      console.error('Failed to view GitHub issue:', error);
-      return null;
-    }
-  }
-
-  /**
-   * Authenticate with GitHub using Personal Access Token
-   */
-  async authenticateWithToken(token: string): Promise<AuthResult> {
-    try {
-      // Test the token by getting user info
-      const user = await this.getUserInfo(token);
-
-      if (user) {
-        // Store token securely
-        await this.storeToken(token);
-
-        // Update error tracking with GitHub username
-        if (user.login) {
-          await errorTracking.updateGithubUsername(user.login);
-        }
-
-        return { success: true, token, user };
-      }
-
-      return { success: false, error: 'Invalid token' };
-    } catch (error) {
-      console.error('Token authentication failed:', error);
-      return {
-        success: false,
-        error: 'Invalid token or network error',
-      };
-    }
-  }
-
-  /**
-   * Check if user is authenticated
-   */
-  async isAuthenticated(): Promise<boolean> {
-    try {
-      // First check if gh CLI is authenticated system-wide
-      const isGHAuth = await this.isGHCLIAuthenticated();
-      if (isGHAuth) {
-        return true;
-      }
-
-      // Fall back to checking stored token
-      const token = await this.getStoredToken();
-
-      if (!token) {
-        // No stored token, user needs to authenticate
-        return false;
-      }
-
-      // Test the token by making a simple API call
-      const user = await this.getUserInfo(token);
-      return !!user;
-    } catch (error) {
-      console.error('Authentication check failed:', error);
-      return false;
-    }
-  }
-
-  /**
-   * Check if gh CLI is authenticated system-wide
-   */
-  private async isGHCLIAuthenticated(): Promise<boolean> {
-    try {
-      // gh auth status exits with 0 if authenticated, non-zero otherwise
-      await execAsync('gh auth status');
-      return true;
-    } catch (error) {
-      // Not authenticated or gh CLI not installed
-      return false;
-    }
-  }
-
-  /**
-   * Get user information using GitHub API or CLI
-   */
-  async getUserInfo(token: string): Promise<GitHubUser | null> {
-    try {
-      let userData;
-      if (token) {
-        const response = await fetch('https://api.github.com/user', {
-          headers: {
-            Authorization: `Bearer ${token}`,
-            Accept: 'application/vnd.github.v3+json',
-            'X-GitHub-Api-Version': '2022-11-28',
-          },
-        });
-
-        if (!response.ok) {
-          throw new Error(`GitHub API error: ${response.statusText}`);
-        }
-
-        userData = await response.json();
-      } else {
-        // Use gh CLI to get user info as fallback
-        const { stdout } = await this.execGH('gh api user');
-        userData = JSON.parse(stdout);
-      }
-
-      return {
-        id: userData.id,
-        login: userData.login,
-        name: userData.name || userData.login,
-        email: userData.email || '',
-        avatar_url: userData.avatar_url,
-      };
-    } catch (error) {
-      console.error('Failed to get user info:', error);
-      return null;
-    }
-  }
-
-  /**
-   * Get current authenticated user information
-   * This is a convenience method that doesn't require a token parameter
-   */
-  async getCurrentUser(): Promise<GitHubUser | null> {
-    try {
-      // Check if authenticated first
-      const isAuth = await this.isAuthenticated();
-      if (!isAuth) {
-        return null;
-      }
-
-      // Get user info using the existing method
-      // Note: The token parameter is ignored in getUserInfo since it uses gh CLI
-      return await this.getUserInfo('');
-    } catch (error) {
-      console.error('Failed to get current user:', error);
-      return null;
-    }
-  }
-
-  /**
-   * Get user's repositories using GitHub CLI
-   */
-  async getRepositories(_token: string): Promise<GitHubRepo[]> {
-    try {
-      // Use gh CLI to get repositories with correct field names
-      const { stdout } = await this.execGH(
-        'gh repo list --limit 100 --json name,nameWithOwner,description,url,defaultBranchRef,isPrivate,updatedAt,primaryLanguage,stargazerCount,forkCount'
-      );
-      const repos = JSON.parse(stdout);
-
-      return repos.map((repo: any) => ({
-        id: Math.random(), // gh CLI doesn't provide ID, so we generate one
-        name: repo.name,
-        full_name: repo.nameWithOwner,
-        description: repo.description,
-        html_url: repo.url,
-        clone_url: `https://github.com/${repo.nameWithOwner}.git`,
-        ssh_url: `git@github.com:${repo.nameWithOwner}.git`,
-        default_branch: repo.defaultBranchRef?.name || 'main',
-        private: repo.isPrivate,
-        updated_at: repo.updatedAt,
-        language: repo.primaryLanguage?.name || null,
-        stargazers_count: repo.stargazerCount || 0,
-        forks_count: repo.forkCount || 0,
-      }));
-    } catch (error) {
-      console.error('Failed to fetch repositories:', error);
-      throw error;
-    }
-  }
-
-  /**
-   * List open pull requests for the repository located at projectPath.
-   */
-  async getPullRequests(projectPath: string): Promise<GitHubPullRequest[]> {
-    try {
-      const fields = [
-        'number',
-        'title',
-        'headRefName',
-        'baseRefName',
-        'url',
-        'isDraft',
-        'updatedAt',
-        'headRefOid',
-        'author',
-        'headRepositoryOwner',
-        'headRepository',
-      ];
-      const { stdout } = await this.execGH(`gh pr list --state open --json ${fields.join(',')}`, {
-        cwd: projectPath,
-      });
-      const list = JSON.parse(stdout || '[]');
-
-      if (!Array.isArray(list)) return [];
-
-      return list.map((item: any) => ({
-        number: item?.number,
-        title: item?.title || `PR #${item?.number ?? 'unknown'}`,
-        headRefName: item?.headRefName || '',
-        baseRefName: item?.baseRefName || '',
-        url: item?.url || '',
-        isDraft: item?.isDraft ?? false,
-        updatedAt: item?.updatedAt || null,
-        headRefOid: item?.headRefOid || undefined,
-        author: item?.author || null,
-        headRepositoryOwner: item?.headRepositoryOwner || null,
-        headRepository: item?.headRepository || null,
-      }));
-    } catch (error) {
-      console.error('Failed to list pull requests:', error);
-      throw error;
-    }
-  }
-
-  /**
-   * Ensure a local branch exists for the given pull request by delegating to gh CLI.
-   * Returns the branch name that now tracks the PR.
-   */
-  async ensurePullRequestBranch(
-    projectPath: string,
-    prNumber: number,
-    branchName: string
-  ): Promise<string> {
-    const safeBranch = branchName || `pr/${prNumber}`;
-    let previousRef: string | null = null;
-
-    try {
-      const { stdout } = await execAsync('git rev-parse --abbrev-ref HEAD', {
-        cwd: projectPath,
-      });
-      const current = (stdout || '').trim();
-      if (current) previousRef = current;
-    } catch {
-      previousRef = null;
-    }
-
-    try {
-      await this.execGH(
-        `gh pr checkout ${JSON.stringify(String(prNumber))} --branch ${JSON.stringify(safeBranch)} --force`,
-        { cwd: projectPath }
-      );
-    } catch (error) {
-      console.error('Failed to checkout pull request branch via gh:', error);
-      throw error;
-    } finally {
-      if (previousRef && previousRef !== safeBranch) {
-        try {
-          await execAsync(`git checkout ${JSON.stringify(previousRef)}`, { cwd: projectPath });
-        } catch (switchErr) {
-          console.warn('Failed to restore previous branch after PR checkout:', switchErr);
-        }
-      }
-    }
-
-    return safeBranch;
-  }
-
-  /**
-   * Validate repository name format
-   */
-  validateRepositoryName(name: string): { valid: boolean; error?: string } {
-    if (!name || name.trim().length === 0) {
-      return { valid: false, error: 'Repository name is required' };
-    }
-
-    const trimmed = name.trim();
-
-    // Check length
-    if (trimmed.length > 100) {
-      return { valid: false, error: 'Repository name must be 100 characters or less' };
-    }
-
-    // Check for valid characters (alphanumeric, hyphens, underscores, dots)
-    // GitHub allows: a-z, A-Z, 0-9, -, _, .
-    if (!/^[a-zA-Z0-9._-]+$/.test(trimmed)) {
-      return {
-        valid: false,
-        error: 'Repository name can only contain letters, numbers, hyphens, underscores, and dots',
-      };
-    }
-
-    // Cannot start or end with hyphen, dot, or underscore
-    if (/^[-._]|[-._]$/.test(trimmed)) {
-      return {
-        valid: false,
-        error: 'Repository name cannot start or end with a hyphen, dot, or underscore',
-      };
-    }
-
-    // Cannot be all dots
-    if (/^\.+$/.test(trimmed)) {
-      return { valid: false, error: 'Repository name cannot be all dots' };
-    }
-
-    // Reserved names (basic ones, GitHub has more)
-    const reserved = [
-      'con',
-      'prn',
-      'aux',
-      'nul',
-      'com1',
-      'com2',
-      'com3',
-      'com4',
-      'com5',
-      'com6',
-      'com7',
-      'com8',
-      'com9',
-      'lpt1',
-      'lpt2',
-      'lpt3',
-      'lpt4',
-      'lpt5',
-      'lpt6',
-      'lpt7',
-      'lpt8',
-      'lpt9',
-    ];
-    if (reserved.includes(trimmed.toLowerCase())) {
-      return { valid: false, error: 'Repository name is reserved' };
-    }
-
-    return { valid: true };
-  }
-
-  /**
-   * Check if a repository exists for the given owner and name
-   */
-  async checkRepositoryExists(owner: string, name: string): Promise<boolean> {
-    try {
-      await this.execGH(`gh repo view ${owner}/${name}`);
-      return true;
-    } catch {
-      return false;
-    }
-  }
-
-  /**
-   * Get available owners (user + organizations)
-   */
-  async getOwners(): Promise<Array<{ login: string; type: 'User' | 'Organization' }>> {
-    try {
-      // Get current user
-      const { stdout: userStdout } = await this.execGH('gh api user');
-      const user = JSON.parse(userStdout);
-
-      const owners: Array<{ login: string; type: 'User' | 'Organization' }> = [
-        { login: user.login, type: 'User' },
-      ];
-
-      // Get organizations
-      try {
-        const { stdout: orgsStdout } = await this.execGH('gh api user/orgs');
-        const orgs = JSON.parse(orgsStdout);
-        if (Array.isArray(orgs)) {
-          for (const org of orgs) {
-            owners.push({ login: org.login, type: 'Organization' });
-          }
-        }
-      } catch (error) {
-        // If orgs fetch fails, just continue with user only
-        console.warn('Failed to fetch organizations:', error);
-      }
-
-      return owners;
-    } catch (error) {
-      console.error('Failed to get owners:', error);
-      throw error;
-    }
-  }
-
-  /**
-   * Create a new GitHub repository
-   */
-  async createRepository(params: {
-    name: string;
-    description?: string;
-    owner: string;
-    isPrivate: boolean;
-  }): Promise<{ url: string; defaultBranch: string; fullName: string }> {
-    try {
-      const { name, description, owner, isPrivate } = params;
-
-      // Build gh repo create command
-      const visibilityFlag = isPrivate ? '--private' : '--public';
-      let command = `gh repo create ${owner}/${name} ${visibilityFlag} --confirm`;
-
-      if (description && description.trim()) {
-        // Escape description for shell
-        const desc = JSON.stringify(description.trim());
-        command += ` --description ${desc}`;
-      }
-
-      await this.execGH(command);
-
-      // Get repository details
-      const { stdout } = await this.execGH(
-        `gh repo view ${owner}/${name} --json name,nameWithOwner,url,defaultBranchRef`
-      );
-      const repoInfo = JSON.parse(stdout);
-
-      return {
-        url: repoInfo.url || `https://github.com/${repoInfo.nameWithOwner}`,
-        defaultBranch: repoInfo.defaultBranchRef?.name || 'main',
-        fullName: repoInfo.nameWithOwner || `${owner}/${name}`,
-      };
-    } catch (error) {
-      console.error('Failed to create repository:', error);
-      throw error;
-    }
-  }
-
-  /**
-   * Initialize a new project with initial files and commit
-   */
-  async initializeNewProject(params: {
-    repoUrl: string;
-    localPath: string;
-    name: string;
-    description?: string;
-  }): Promise<void> {
-    const { repoUrl, localPath, name, description } = params;
-
-    try {
-      // Ensure the directory exists (clone should have created it, but just in case)
-      if (!fs.existsSync(localPath)) {
-        throw new Error('Local path does not exist after clone');
-      }
-
-      // Create README.md
-      const readmePath = path.join(localPath, 'README.md');
-      const readmeContent = description ? `# ${name}\n\n${description}\n` : `# ${name}\n`;
-      fs.writeFileSync(readmePath, readmeContent, 'utf8');
-
-      // Initialize git, add files, commit, and push
-      const execOptions = { cwd: localPath };
-
-      // Add and commit
-      await execAsync('git add README.md', execOptions);
-      await execAsync('git commit -m "Initial commit"', execOptions);
-
-      // Push to origin
-      await execAsync('git push -u origin main', execOptions).catch(async () => {
-        // If main branch doesn't exist, try master
-        try {
-          await execAsync('git push -u origin master', execOptions);
-        } catch {
-          // If both fail, let the error propagate
-          throw new Error('Failed to push to remote repository');
-        }
-      });
-    } catch (error) {
-      console.error('Failed to initialize new project:', error);
-      throw error;
-    }
-  }
-
-  /**
-   * Clone a repository to local task directory
-   */
-  async cloneRepository(
-    repoUrl: string,
-    localPath: string
-  ): Promise<{ success: boolean; error?: string }> {
-    try {
-      // Ensure the local path directory exists
-      const dir = path.dirname(localPath);
-      if (!fs.existsSync(dir)) {
-        fs.mkdirSync(dir, { recursive: true });
-      }
-
-      // Clone the repository
-      await execAsync(`git clone "${repoUrl}" "${localPath}"`);
-
-      return { success: true };
-    } catch (error) {
-      console.error('Failed to clone repository:', error);
-      return {
-        success: false,
-        error: error instanceof Error ? error.message : 'Clone failed',
-      };
-    }
-  }
-
-  /**
-   * Logout and clear stored token
-   */
-  async logout(): Promise<void> {
-    // Run both operations in parallel since they're independent
-    await Promise.allSettled([
-      // Logout from gh CLI
-      execAsync('echo Y | gh auth logout --hostname github.com').catch((error) => {
-        console.warn('Failed to logout from gh CLI (may not be installed or logged in):', error);
-      }),
-      // Clear keychain token
-      (async () => {
-        try {
-          const keytar = await import('keytar');
-          await keytar.deletePassword(this.SERVICE_NAME, this.ACCOUNT_NAME);
-        } catch (error) {
-          console.error('Failed to clear keychain token:', error);
-        }
-      })(),
-    ]);
-  }
-
-  /**
-   * Store authentication token securely
-   */
-  private async storeToken(token: string): Promise<void> {
-    try {
-      const keytar = await import('keytar');
-      await keytar.setPassword(this.SERVICE_NAME, this.ACCOUNT_NAME, token);
-    } catch (error) {
-      console.error('Failed to store token:', error);
-      throw error;
-    }
-  }
-
-  /**
-   * Retrieve stored authentication token
-   */
-  private async getStoredToken(): Promise<string | null> {
-    try {
-      const keytar = await import('keytar');
-      return await keytar.getPassword(this.SERVICE_NAME, this.ACCOUNT_NAME);
-    } catch (error) {
-      console.error('Failed to retrieve token:', error);
-      return null;
-    }
-  }
-}
-
-// Export singleton instance
-export const githubService = new GitHubService();
diff --git a/src/main/services/GitLabService.ts b/src/main/services/GitLabService.ts
deleted file mode 100644
index f2b8868968..0000000000
--- a/src/main/services/GitLabService.ts
+++ /dev/null
@@ -1,342 +0,0 @@
-import { existsSync, readFileSync, unlinkSync, writeFileSync } from 'fs';
-import { join } from 'path';
-import { app } from 'electron';
-import { promisify } from 'util';
-import { exec } from 'child_process';
-
-const execAsync = promisify(exec);
-
-interface GitLabIssueSummary {
-  id: number;
-  iid: number; // project-scoped issue number
-  title: string;
-  description?: string | null;
-  web_url?: string | null;
-  state?: string | null; // "opened" | "closed"
-  project?: { name: string } | null;
-  assignee?: { name: string; username: string } | null;
-  labels?: string[] | null;
-  updated_at?: string | null;
-}
-
-type GitLabCreds = {
-  siteUrl: string;
-};
-
-export class GitLabService {
-  private readonly SERVICE_NAME = 'emdash-gitlab';
-  private readonly ACCOUNT_NAME = 'gitlab-token';
-  private readonly CONF_FILE = join(app.getPath('userData'), 'gitlab.json');
-
-  async saveCredentials(
-    siteUrl: string,
-    token: string
-  ): Promise<{ success: boolean; error?: string }> {
-    try {
-      siteUrl = siteUrl.trim();
-      token = token.trim();
-      if (siteUrl.length == 0 || token.length == 0) {
-        return { success: false, error: 'Instance URL and token are required' };
-      }
-      const regex = /^https?:\/\/([a-zA-Z0-9-]+\.)+[a-zA-Z]{2,}(:\d{1,5})?\/?$/;
-      if (!regex.test(siteUrl)) {
-        return { success: false, error: 'Invalid URL format' };
-      }
-      if (siteUrl[siteUrl.length - 1] == '/') {
-        siteUrl = siteUrl.substring(0, siteUrl.length - 1);
-      }
-
-      const keytar = await import('keytar');
-      await keytar.setPassword(this.SERVICE_NAME, this.ACCOUNT_NAME, token);
-      this.writeCreds({ siteUrl: siteUrl });
-      return { success: true };
-    } catch (e: any) {
-      return { success: false, error: e?.message };
-    }
-  }
-
-  async clearCredentials(): Promise<{ success: boolean; error?: string }> {
-    try {
-      const keytar = await import('keytar');
-      await keytar.deletePassword(this.SERVICE_NAME, this.ACCOUNT_NAME);
-      if (existsSync(this.CONF_FILE)) {
-        unlinkSync(this.CONF_FILE);
-      }
-      return { success: true };
-    } catch (e: any) {
-      return { success: false, error: e?.message };
-    }
-  }
-
-  async checkConnection(): Promise<{ success: boolean; error?: string }> {
-    try {
-      const { siteUrl, token } = await this.requireAuth();
-      const user = await this.getUserInfo(siteUrl, token);
-      if (!user.success) {
-        return { success: false, error: user.error };
-      }
-      return { success: true };
-    } catch (e: any) {
-      return { success: false, error: e?.message };
-    }
-  }
-
-  async initialFetch(
-    projectPath?: string,
-    limit: number = 10
-  ): Promise<{ success: boolean; issues?: GitLabIssueSummary[]; error?: string }> {
-    try {
-      const { siteUrl, token } = await this.requireAuth();
-      if (!siteUrl || !token) {
-        return { success: false, error: 'Gitlab is not configured' };
-      }
-      if (!projectPath) {
-        return { success: false, error: 'Project path is required' };
-      }
-      const { success, id, error } = await this.resolveProjectId(projectPath);
-      if (!success) {
-        return { success: false, error: error };
-      }
-      if (!id) {
-        return { success: false, error: 'Unable to resolve project ID' };
-      }
-      const issues = await this.fetchIssues(id, limit);
-      return { success: true, issues: issues };
-    } catch (e: any) {
-      return { success: false, error: e?.message };
-    }
-  }
-
-  async searchIssues(
-    projectPath: string | undefined,
-    searchTerm: string,
-    limit: number = 10
-  ): Promise<{ success: boolean; issues?: GitLabIssueSummary[]; error?: string }> {
-    try {
-      if (!searchTerm || !searchTerm.trim()) {
-        return { success: true, issues: [] };
-      }
-      const { siteUrl, token } = await this.requireAuth();
-      if (!siteUrl || !token) {
-        return { success: false, error: 'GitLab is not configured' };
-      }
-      if (!projectPath) {
-        return { success: false, error: 'Project path is required' };
-      }
-      const { success, id, error } = await this.resolveProjectId(projectPath);
-      if (!success) {
-        return { success: false, error };
-      }
-      if (!id) {
-        return { success: false, error: 'Unable to resolve project ID' };
-      }
-      const url = new URL(`${siteUrl}/api/v4/projects/${encodeURIComponent(id)}/issues`);
-      url.searchParams.set('search', searchTerm.trim());
-      url.searchParams.set('in', 'title,description');
-      url.searchParams.set('per_page', String(limit));
-      url.searchParams.set('order_by', 'updated_at');
-      url.searchParams.set('sort', 'desc');
-      const response = await this.doRequest(url, token, 'GET');
-      if (!response.ok) {
-        return { success: false, error: 'Failed to search GitLab issues' };
-      }
-      const data = (await response.json()) as any[];
-      return { success: true, issues: this.normalizeIssues(data) };
-    } catch (e: any) {
-      return { success: false, error: e?.message };
-    }
-  }
-
-  private async resolveProjectId(
-    projectPath: string
-  ): Promise<{ success: boolean; id?: string; error?: string }> {
-    try {
-      const { siteUrl } = await this.requireAuth();
-      const instanceHost = new URL(siteUrl).hostname.toLowerCase();
-
-      const { stdout } = await this.execCmd('git remote get-url origin', {
-        cwd: projectPath,
-      });
-      const remoteUrl = stdout.trim();
-      if (!remoteUrl) {
-        return { success: false, error: 'No remote URL found for origin' };
-      }
-
-      let remoteHost: string | undefined;
-      let slug: string | undefined;
-
-      if (remoteUrl.startsWith('git@')) {
-        // SSH: git@gitlab.com:group/subgroup/project.git
-        const hostMatch = remoteUrl.match(/^git@([^:]+):/);
-        if (hostMatch) {
-          remoteHost = hostMatch[1].toLowerCase();
-        }
-        const slugMatch = remoteUrl.match(/:(.*?)(\.git)?$/);
-        if (slugMatch && slugMatch[1]) {
-          slug = slugMatch[1];
-        }
-      } else if (remoteUrl.startsWith('https://') || remoteUrl.startsWith('http://')) {
-        // HTTPS: https://<host>/group/subgroup/project.git
-        const parsed = new URL(remoteUrl);
-        remoteHost = parsed.hostname.toLowerCase();
-        slug = parsed.pathname.replace(/^\//, '').replace(/\.git$/, '');
-      }
-
-      if (remoteHost && remoteHost !== instanceHost) {
-        return {
-          success: false,
-          error: `Git remote host "${remoteHost}" does not match configured GitLab instance "${instanceHost}". Check your GitLab settings or configure a project path override.`,
-        };
-      }
-
-      if (!slug) {
-        return { success: false, error: 'Unable to extract GitLab project slug from remote URL' };
-      }
-      slug = encodeURIComponent(slug.trim());
-      const { id } = await this.getProjectId(slug);
-      return { success: true, id: id };
-    } catch (e: any) {
-      return { success: false, error: 'Unable to resolve project ID' };
-    }
-  }
-
-  private async fetchIssues(projectId: string, limit: number = 10): Promise<any[]> {
-    try {
-      const { siteUrl, token } = await this.requireAuth();
-      if (!siteUrl || !token) {
-        throw new Error('Gitlab is not configured');
-      }
-      const url = new URL(
-        `${siteUrl}/api/v4/projects/${projectId}/issues?state=opened&order_by=updated_at&sort=desc&per_page=${limit}`
-      );
-      const response = await this.doRequest(url, token, 'GET');
-      if (!response.ok) {
-        throw new Error('could not fetch issues');
-      }
-      const data = (await response.json()) as any[];
-      return this.normalizeIssues(data);
-    } catch (e: any) {
-      throw e;
-    }
-  }
-
-  private normalizeIssues(issues: any[]): GitLabIssueSummary[] {
-    return issues.map((issue) => ({
-      id: issue.id,
-      iid: issue.iid,
-      title: issue.title,
-      description: issue.description,
-      web_url: issue.web_url,
-      state: issue.state,
-      project: issue.project,
-      assignee: issue.assignee,
-      labels: issue.labels,
-      updated_at: issue.updated_at,
-    }));
-  }
-
-  private async execCmd(cmd: string, options?: any): Promise<{ stdout: string; stderr: string }> {
-    try {
-      const result = await execAsync(cmd, { encoding: 'utf8', ...options });
-      return {
-        stdout: result.stdout.toString(),
-        stderr: result.stderr.toString(),
-      };
-    } catch (e: any) {
-      throw e;
-    }
-  }
-
-  private async getProjectId(projectSlug: string): Promise<{ id: string }> {
-    try {
-      const { siteUrl, token } = await this.requireAuth();
-      const url = new URL(`${siteUrl}/api/v4/projects/${projectSlug}`);
-      const res = await this.doRequest(url, token, 'GET');
-      if (!res.ok) {
-        throw new Error('Failed to fetch project Id');
-      }
-      const data: any = await res.json();
-      if (!data['id']) {
-        throw new Error('Error while retriving the Id');
-      }
-      return { id: data['id'] };
-    } catch (e: any) {
-      throw e;
-    }
-  }
-
-  private async doRequest(
-    url: URL,
-    token: string,
-    method: 'GET' | 'POST',
-    payload?: string,
-    extraHeaders?: Record<string, string>
-  ): Promise<Response> {
-    return fetch(url.toString(), {
-      method,
-      headers: {
-        'PRIVATE-TOKEN': token,
-        ...(extraHeaders || {}),
-      },
-      body: method === 'POST' ? payload : undefined,
-    });
-  }
-
-  private async requireAuth(): Promise<{ siteUrl: string; token: string }> {
-    try {
-      const creds = this.readCreds();
-      if (!creds) {
-        throw new Error('Invalid credential files');
-      }
-      const keytar = await import('keytar');
-      const token = await keytar.getPassword(this.SERVICE_NAME, this.ACCOUNT_NAME);
-      if (!token) {
-        throw new Error('Token does not set');
-      }
-      return { siteUrl: creds.siteUrl, token: token };
-    } catch (e: any) {
-      throw new Error(e?.message);
-    }
-  }
-
-  private async getUserInfo(
-    siteUrl: string,
-    token: string
-  ): Promise<{ success: boolean; error?: string; user?: any }> {
-    try {
-      const url = new URL(`${siteUrl}/api/v4/user`);
-      const response = await this.doRequest(url, token, 'GET');
-      if (!response.ok) {
-        return { success: false, error: 'Failed to get user info' };
-      }
-      const user = await response.json();
-      return { success: true, user: user };
-    } catch (e: any) {
-      return { success: false, error: e?.message };
-    }
-  }
-
-  private writeCreds(creds: GitLabCreds) {
-    try {
-      const { siteUrl } = creds;
-      const obj: any = { siteUrl };
-      writeFileSync(this.CONF_FILE, JSON.stringify(obj), 'utf8');
-    } catch (error) {
-      console.error('Failed to write GitLab credentials:', error);
-    }
-  }
-
-  private readCreds(): GitLabCreds | null {
-    try {
-      if (!existsSync(this.CONF_FILE)) return null;
-      const raw = readFileSync(this.CONF_FILE, 'utf8');
-      const obj = JSON.parse(raw);
-      return { siteUrl: obj.siteUrl };
-    } catch (error) {
-      console.error('Failed to read GitLab credentials:', error);
-      return null;
-    }
-  }
-}
-
-export const gitlabService = new GitLabService();
diff --git a/src/main/services/GitService.ts b/src/main/services/GitService.ts
deleted file mode 100644
index 530663ec10..0000000000
--- a/src/main/services/GitService.ts
+++ /dev/null
@@ -1,704 +0,0 @@
-import { execFile } from 'child_process';
-import { promisify } from 'util';
-import * as fs from 'fs';
-import * as path from 'path';
-import {
-  parseDiffLines,
-  stripTrailingNewline,
-  MAX_DIFF_CONTENT_BYTES,
-  MAX_DIFF_OUTPUT_BYTES,
-} from '../utils/diffParser';
-import type { DiffLine, DiffResult } from '../utils/diffParser';
-
-const execFileAsync = promisify(execFile);
-const MAX_UNTRACKED_LINECOUNT_BYTES = 512 * 1024;
-
-async function countFileNewlinesCapped(filePath: string, maxBytes: number): Promise<number | null> {
-  let stat: fs.Stats;
-  try {
-    stat = await fs.promises.stat(filePath);
-  } catch {
-    return null;
-  }
-
-  if (!stat.isFile() || stat.size > maxBytes) {
-    return null;
-  }
-
-  return await new Promise<number | null>((resolve) => {
-    let count = 0;
-    const stream = fs.createReadStream(filePath);
-    stream.on('data', (chunk: string | Buffer) => {
-      const buffer = typeof chunk === 'string' ? Buffer.from(chunk) : chunk;
-      for (let i = 0; i < buffer.length; i++) {
-        if (buffer[i] === 0x0a) count++;
-      }
-    });
-    stream.on('error', () => resolve(null));
-    stream.on('end', () => resolve(count));
-  });
-}
-
-async function readFileTextCapped(filePath: string, maxBytes: number): Promise<string | null> {
-  let stat: fs.Stats;
-  try {
-    stat = await fs.promises.stat(filePath);
-  } catch {
-    return null;
-  }
-
-  if (!stat.isFile() || stat.size > maxBytes) {
-    return null;
-  }
-
-  try {
-    return await fs.promises.readFile(filePath, 'utf8');
-  } catch {
-    return null;
-  }
-}
-
-export type GitChange = {
-  path: string;
-  status: string;
-  additions: number;
-  deletions: number;
-  isStaged: boolean;
-};
-
-export async function getStatus(taskPath: string): Promise<GitChange[]> {
-  try {
-    await execFileAsync('git', ['rev-parse', '--is-inside-work-tree'], {
-      cwd: taskPath,
-    });
-  } catch {
-    return [];
-  }
-
-  const { stdout: statusOutput } = await execFileAsync(
-    'git',
-    ['status', '--porcelain', '--untracked-files=all'],
-    {
-      cwd: taskPath,
-    }
-  );
-
-  if (!statusOutput.trim()) return [];
-
-  const statusLines = statusOutput
-    .split('\n')
-    .map((l) => l.replace(/\r$/, ''))
-    .filter((l) => l.length > 0);
-
-  // Parse status lines into file entries
-  const entries: Array<{
-    filePath: string;
-    status: string;
-    statusCode: string;
-    isStaged: boolean;
-  }> = [];
-
-  for (const line of statusLines) {
-    const statusCode = line.substring(0, 2);
-    let filePath = line.substring(3);
-    if (statusCode.includes('R') && filePath.includes('->')) {
-      const parts = filePath.split('->');
-      filePath = parts[parts.length - 1].trim();
-    }
-
-    let status = 'modified';
-    if (statusCode.includes('A') || statusCode.includes('?')) status = 'added';
-    else if (statusCode.includes('D')) status = 'deleted';
-    else if (statusCode.includes('R')) status = 'renamed';
-    else if (statusCode.includes('M')) status = 'modified';
-
-    const isStaged = statusCode[0] !== ' ' && statusCode[0] !== '?';
-    entries.push({ filePath, status, statusCode, isStaged });
-  }
-
-  // Batch: run ONE staged numstat and ONE unstaged numstat for ALL files at once and parse the file
-  // into a map of file paths to their additions and deletions
-  // Map { filePath: { add: number, del: number } }
-  // Resolve git's rename notation to the new (destination) file path.
-  // Formats: "old.ts => new.ts" or "src/{Old => New}.tsx"
-  const resolveRenamePath = (file: string): string => {
-    if (!file.includes(' => ')) return file;
-    // In-place rename with braces: "src/{Old => New}.tsx"
-    if (file.includes('{')) {
-      return file.replace(/\{[^}]+ => ([^}]+)\}/g, '$1').replace(/\/\//g, '/');
-    }
-    // Full rename: "old.ts => new.ts"
-    return file.split(' => ').pop()!.trim();
-  };
-
-  const parseNumstatMap = (stdout: string): Map<string, { add: number; del: number }> => {
-    const map = new Map<string, { add: number; del: number }>();
-    if (!stdout || !stdout.trim()) return map;
-    for (const line of stdout.trim().split('\n')) {
-      if (!line.trim()) continue;
-      const parts = line.split('\t');
-      if (parts.length >= 3) {
-        const add = parts[0] === '-' ? 0 : parseInt(parts[0], 10) || 0;
-        const del = parts[1] === '-' ? 0 : parseInt(parts[1], 10) || 0;
-        const file = resolveRenamePath(parts.slice(2).join('\t'));
-        const existing = map.get(file);
-        if (existing) {
-          existing.add += add;
-          existing.del += del;
-        } else {
-          map.set(file, { add, del });
-        }
-      }
-    }
-    return map;
-  };
-
-  const [stagedResult, unstagedResult] = await Promise.all([
-    execFileAsync('git', ['diff', '--numstat', '--cached'], { cwd: taskPath }).catch(() => ({
-      stdout: '',
-      stderr: '',
-    })),
-    execFileAsync('git', ['diff', '--numstat'], { cwd: taskPath }).catch(() => ({
-      stdout: '',
-      stderr: '',
-    })),
-  ]);
-
-  const stagedMap = parseNumstatMap(stagedResult.stdout);
-  const unstagedMap = parseNumstatMap(unstagedResult.stdout);
-
-  // Count lines for untracked files in parallel
-  const untrackedEntries = entries.filter(
-    (e) => e.statusCode.includes('?') && !stagedMap.has(e.filePath) && !unstagedMap.has(e.filePath)
-  );
-  const untrackedCounts = await Promise.all(
-    untrackedEntries.map((e) =>
-      countFileNewlinesCapped(path.join(taskPath, e.filePath), MAX_UNTRACKED_LINECOUNT_BYTES)
-    )
-  );
-  const untrackedMap = new Map<string, number>();
-  untrackedEntries.forEach((e, i) => {
-    if (typeof untrackedCounts[i] === 'number') {
-      untrackedMap.set(e.filePath, untrackedCounts[i]!);
-    }
-  });
-
-  // Assemble results
-  const changes: GitChange[] = entries.map((e) => {
-    const staged = stagedMap.get(e.filePath);
-    const unstaged = unstagedMap.get(e.filePath);
-    let additions = (staged?.add ?? 0) + (unstaged?.add ?? 0);
-    const deletions = (staged?.del ?? 0) + (unstaged?.del ?? 0);
-
-    if (additions === 0 && deletions === 0 && untrackedMap.has(e.filePath)) {
-      additions = untrackedMap.get(e.filePath)!;
-    }
-
-    return {
-      path: e.filePath,
-      status: e.status,
-      additions,
-      deletions,
-      isStaged: e.isStaged,
-    };
-  });
-
-  return changes;
-}
-
-export async function stageFile(taskPath: string, filePath: string): Promise<void> {
-  await execFileAsync('git', ['add', '--', filePath], { cwd: taskPath });
-}
-
-export async function stageAllFiles(taskPath: string): Promise<void> {
-  await execFileAsync('git', ['add', '-A'], { cwd: taskPath });
-}
-
-export async function unstageFile(taskPath: string, filePath: string): Promise<void> {
-  try {
-    await execFileAsync('git', ['reset', 'HEAD', '--', filePath], { cwd: taskPath });
-  } catch {
-    // HEAD may not exist (no commits yet) — use rm --cached instead
-    await execFileAsync('git', ['rm', '--cached', '--', filePath], { cwd: taskPath });
-  }
-}
-
-export async function revertFile(
-  taskPath: string,
-  filePath: string
-): Promise<{ action: 'unstaged' | 'reverted' }> {
-  // Validate filePath doesn't escape the worktree
-  const absPath = path.resolve(taskPath, filePath);
-  const resolvedTaskPath = path.resolve(taskPath);
-  if (!absPath.startsWith(resolvedTaskPath + path.sep) && absPath !== resolvedTaskPath) {
-    throw new Error('File path is outside the worktree');
-  }
-
-  // Check if file is tracked in git (exists in HEAD)
-  let fileExistsInHead = false;
-  try {
-    await execFileAsync('git', ['cat-file', '-e', `HEAD:${filePath}`], { cwd: taskPath });
-    fileExistsInHead = true;
-  } catch {
-    // File doesn't exist in HEAD (it's a new/untracked file), delete it
-    if (fs.existsSync(absPath)) {
-      fs.unlinkSync(absPath);
-    }
-    return { action: 'reverted' };
-  }
-
-  // File exists in HEAD, revert it
-  if (fileExistsInHead) {
-    try {
-      await execFileAsync('git', ['checkout', 'HEAD', '--', filePath], { cwd: taskPath });
-    } catch (error) {
-      // If checkout fails, don't delete the file - throw the error instead
-      throw new Error(
-        `Failed to revert file: ${error instanceof Error ? error.message : String(error)}`
-      );
-    }
-  }
-  return { action: 'reverted' };
-}
-
-export async function getFileDiff(taskPath: string, filePath: string): Promise<DiffResult> {
-  const absPath = path.resolve(taskPath, filePath);
-  const resolvedTaskPath = path.resolve(taskPath);
-  if (!absPath.startsWith(resolvedTaskPath + path.sep) && absPath !== resolvedTaskPath) {
-    throw new Error('File path is outside the worktree');
-  }
-
-  // Helper: fetch content at HEAD with size guard
-  const getOriginalContent = async (): Promise<string | undefined> => {
-    try {
-      const { stdout } = await execFileAsync('git', ['show', `HEAD:${filePath}`], {
-        cwd: taskPath,
-        maxBuffer: MAX_DIFF_CONTENT_BYTES,
-      });
-      return stripTrailingNewline(stdout);
-    } catch {
-      return undefined;
-    }
-  };
-
-  // Helper: read current file from disk with size guard
-  const getModifiedContent = async (): Promise<string | undefined> => {
-    const content = await readFileTextCapped(path.join(taskPath, filePath), MAX_DIFF_CONTENT_BYTES);
-    return content !== null ? stripTrailingNewline(content) : undefined;
-  };
-
-  // Step 1: Run git diff
-  let diffStdout: string | undefined;
-  try {
-    const { stdout } = await execFileAsync(
-      'git',
-      ['diff', '--no-color', '--unified=2000', 'HEAD', '--', filePath],
-      { cwd: taskPath, maxBuffer: MAX_DIFF_OUTPUT_BYTES }
-    );
-    diffStdout = stdout;
-  } catch {
-    // git diff failed (no HEAD, untracked file, etc.) — fall through to content-only path
-  }
-
-  // Step 2: Parse diff and check binary
-  if (diffStdout !== undefined) {
-    const { lines, isBinary } = parseDiffLines(diffStdout);
-
-    if (isBinary) {
-      return { lines: [], isBinary: true };
-    }
-
-    // Step 3: Fetch content (only for non-binary)
-    const [originalContent, modifiedContent] = await Promise.all([
-      getOriginalContent(),
-      getModifiedContent(),
-    ]);
-
-    // Step 4: Handle empty diff (untracked or deleted file that git reports as empty diff)
-    if (lines.length === 0) {
-      if (modifiedContent !== undefined) {
-        return {
-          lines: modifiedContent.split('\n').map((l) => ({ right: l, type: 'add' as const })),
-          modifiedContent,
-        };
-      }
-      if (originalContent !== undefined) {
-        return {
-          lines: originalContent.split('\n').map((l) => ({ left: l, type: 'del' as const })),
-          originalContent,
-        };
-      }
-      return { lines: [] };
-    }
-
-    return { lines, originalContent, modifiedContent };
-  }
-
-  // Fallback: git diff failed — try content-only approach
-  const [originalContent, modifiedContent] = await Promise.all([
-    getOriginalContent(),
-    getModifiedContent(),
-  ]);
-
-  if (modifiedContent !== undefined) {
-    return {
-      lines: modifiedContent.split('\n').map((l) => ({ right: l, type: 'add' as const })),
-      originalContent,
-      modifiedContent,
-    };
-  }
-  if (originalContent !== undefined) {
-    return {
-      lines: originalContent.split('\n').map((l) => ({ left: l, type: 'del' as const })),
-      originalContent,
-    };
-  }
-  return { lines: [] };
-}
-
-/** Commit staged files (no push). Returns the commit hash. */
-export async function commit(taskPath: string, message: string): Promise<{ hash: string }> {
-  if (!message || !message.trim()) {
-    throw new Error('Commit message cannot be empty');
-  }
-  await execFileAsync('git', ['commit', '-m', message], { cwd: taskPath });
-  const { stdout } = await execFileAsync('git', ['rev-parse', 'HEAD'], { cwd: taskPath });
-  return { hash: stdout.trim() };
-}
-
-/** Push current branch to origin. Sets upstream if needed. */
-export async function push(taskPath: string): Promise<{ output: string }> {
-  try {
-    const { stdout } = await execFileAsync('git', ['push'], { cwd: taskPath });
-    return { output: stdout.trim() };
-  } catch (error: unknown) {
-    const stderr = (error as { stderr?: string })?.stderr || '';
-    // Only fallback to --set-upstream if git tells us there's no upstream
-    if (stderr.includes('has no upstream branch') || stderr.includes('no upstream configured')) {
-      const { stdout: branch } = await execFileAsync('git', ['branch', '--show-current'], {
-        cwd: taskPath,
-      });
-      const { stdout } = await execFileAsync(
-        'git',
-        ['push', '--set-upstream', 'origin', branch.trim()],
-        { cwd: taskPath }
-      );
-      return { output: stdout.trim() };
-    }
-    throw error;
-  }
-}
-
-/** Pull from remote. */
-export async function pull(taskPath: string): Promise<{ output: string }> {
-  const { stdout } = await execFileAsync('git', ['pull'], { cwd: taskPath });
-  return { output: stdout.trim() };
-}
-
-/** Get commit log for the current branch. */
-export async function getLog(
-  taskPath: string,
-  maxCount: number = 50,
-  skip: number = 0,
-  knownAheadCount?: number
-): Promise<{
-  commits: Array<{
-    hash: string;
-    subject: string;
-    body: string;
-    author: string;
-    date: string;
-    isPushed: boolean;
-    tags: string[];
-  }>;
-  aheadCount: number;
-}> {
-  // Use caller-provided aheadCount for pagination consistency, otherwise compute it.
-  // Strategy: try upstream tracking branch first, then origin/<branch>, then origin/HEAD.
-  // If none work, assume all commits are pushed (aheadCount = 0).
-  let aheadCount = knownAheadCount ?? -1;
-  if (aheadCount < 0) {
-    aheadCount = 0;
-    try {
-      // Best case: branch has an upstream tracking ref
-      const { stdout: countOut } = await execFileAsync(
-        'git',
-        ['rev-list', '--count', '@{upstream}..HEAD'],
-        { cwd: taskPath }
-      );
-      aheadCount = parseInt(countOut.trim(), 10) || 0;
-    } catch {
-      try {
-        // Fallback: compare against origin/<current-branch>
-        const { stdout: branchOut } = await execFileAsync(
-          'git',
-          ['rev-parse', '--abbrev-ref', 'HEAD'],
-          { cwd: taskPath }
-        );
-        const currentBranch = branchOut.trim();
-        const { stdout: countOut } = await execFileAsync(
-          'git',
-          ['rev-list', '--count', `origin/${currentBranch}..HEAD`],
-          { cwd: taskPath }
-        );
-        aheadCount = parseInt(countOut.trim(), 10) || 0;
-      } catch {
-        try {
-          // Last resort: compare against origin/HEAD (default branch)
-          const { stdout: defaultBranchOut } = await execFileAsync(
-            'git',
-            ['symbolic-ref', '--short', 'refs/remotes/origin/HEAD'],
-            { cwd: taskPath }
-          );
-          const defaultBranch = defaultBranchOut.trim();
-          const { stdout: countOut } = await execFileAsync(
-            'git',
-            ['rev-list', '--count', `${defaultBranch}..HEAD`],
-            { cwd: taskPath }
-          );
-          aheadCount = parseInt(countOut.trim(), 10) || 0;
-        } catch {
-          // Cannot determine remote state (no remote, detached HEAD, offline, etc.)
-          // Default to 0 ahead so all commits show as pushed. This avoids false "unpushed"
-          // indicators when there's genuinely no remote to compare against.
-          aheadCount = 0;
-        }
-      }
-    }
-  }
-
-  const FIELD_SEP = '---FIELD_SEP---';
-  const RECORD_SEP = '---RECORD_SEP---';
-  const format = `${RECORD_SEP}%H${FIELD_SEP}%s${FIELD_SEP}%an${FIELD_SEP}%aI${FIELD_SEP}%D${FIELD_SEP}%b`;
-  const { stdout } = await execFileAsync(
-    'git',
-    ['log', `--max-count=${maxCount}`, `--skip=${skip}`, `--pretty=format:${format}`, '--'],
-    { cwd: taskPath }
-  );
-
-  if (!stdout.trim()) return { commits: [], aheadCount };
-
-  const commits = stdout
-    .split(RECORD_SEP)
-    .filter((entry) => entry.trim())
-    .map((entry, index) => {
-      const parts = entry.trim().split(FIELD_SEP);
-      // %D outputs ref decorations like "tag: v0.4.2, origin/main, HEAD -> main"
-      const refs = parts[4] || '';
-      const tags = refs
-        .split(',')
-        .map((r) => r.trim())
-        .filter((r) => r.startsWith('tag: '))
-        .map((r) => r.slice(5));
-      return {
-        hash: parts[0] || '',
-        subject: parts[1] || '',
-        body: (parts[5] || '').trim(),
-        author: parts[2] || '',
-        date: parts[3] || '',
-        isPushed: skip + index >= aheadCount,
-        tags,
-      };
-    });
-
-  return { commits, aheadCount };
-}
-
-/** Get the latest commit info (subject + body). */
-export async function getLatestCommit(
-  taskPath: string
-): Promise<{ hash: string; subject: string; body: string; isPushed: boolean } | null> {
-  const { commits } = await getLog(taskPath, 1);
-  return commits[0] || null;
-}
-
-/** Get files changed in a specific commit. */
-export async function getCommitFiles(
-  taskPath: string,
-  commitHash: string
-): Promise<Array<{ path: string; status: string; additions: number; deletions: number }>> {
-  // Use --root to handle initial commits (no parent) and
-  // -m --first-parent to handle merge commits (compare against first parent only)
-  const { stdout } = await execFileAsync(
-    'git',
-    [
-      'diff-tree',
-      '--root',
-      '--no-commit-id',
-      '-r',
-      '-m',
-      '--first-parent',
-      '--numstat',
-      commitHash,
-    ],
-    { cwd: taskPath }
-  );
-
-  const { stdout: nameStatus } = await execFileAsync(
-    'git',
-    [
-      'diff-tree',
-      '--root',
-      '--no-commit-id',
-      '-r',
-      '-m',
-      '--first-parent',
-      '--name-status',
-      commitHash,
-    ],
-    { cwd: taskPath }
-  );
-
-  const statLines = stdout.trim().split('\n').filter(Boolean);
-  const statusLines = nameStatus.trim().split('\n').filter(Boolean);
-
-  const statusMap = new Map<string, string>();
-  for (const line of statusLines) {
-    const [code, ...pathParts] = line.split('\t');
-    const filePath = pathParts[pathParts.length - 1] || '';
-    const status =
-      code === 'A'
-        ? 'added'
-        : code === 'D'
-          ? 'deleted'
-          : code?.startsWith('R')
-            ? 'renamed'
-            : 'modified';
-    statusMap.set(filePath, status);
-  }
-
-  return statLines.map((line) => {
-    const [addStr, delStr, ...pathParts] = line.split('\t');
-    const filePath = pathParts.join('\t');
-    return {
-      path: filePath,
-      status: statusMap.get(filePath) || 'modified',
-      additions: addStr === '-' ? 0 : parseInt(addStr || '0', 10) || 0,
-      deletions: delStr === '-' ? 0 : parseInt(delStr || '0', 10) || 0,
-    };
-  });
-}
-
-/** Get diff for a specific file in a specific commit. */
-export async function getCommitFileDiff(
-  taskPath: string,
-  commitHash: string,
-  filePath: string
-): Promise<DiffResult> {
-  const absPath = path.resolve(taskPath, filePath);
-  const resolvedTaskPath = path.resolve(taskPath);
-  if (!absPath.startsWith(resolvedTaskPath + path.sep) && absPath !== resolvedTaskPath) {
-    throw new Error('File path is outside the worktree');
-  }
-
-  // Helper: fetch content at a given ref with size guard
-  const getContentAt = async (ref: string): Promise<string | undefined> => {
-    try {
-      const { stdout } = await execFileAsync('git', ['show', `${ref}:${filePath}`], {
-        cwd: taskPath,
-        maxBuffer: MAX_DIFF_CONTENT_BYTES,
-      });
-      return stripTrailingNewline(stdout);
-    } catch {
-      return undefined;
-    }
-  };
-
-  // Check if this is a root commit (no parent)
-  let hasParent = true;
-  try {
-    await execFileAsync('git', ['rev-parse', '--verify', `${commitHash}~1`], { cwd: taskPath });
-  } catch {
-    hasParent = false;
-  }
-
-  if (!hasParent) {
-    const modifiedContent = await getContentAt(commitHash);
-    if (modifiedContent === undefined) {
-      return { lines: [] };
-    }
-    if (modifiedContent === '') {
-      return { lines: [], modifiedContent };
-    }
-    return {
-      lines: modifiedContent.split('\n').map((l) => ({ right: l, type: 'add' as const })),
-      modifiedContent,
-    };
-  }
-
-  // Run diff
-  let diffStdout: string | undefined;
-  try {
-    const { stdout } = await execFileAsync(
-      'git',
-      ['diff', '--no-color', '--unified=2000', `${commitHash}~1`, commitHash, '--', filePath],
-      { cwd: taskPath, maxBuffer: MAX_DIFF_OUTPUT_BYTES }
-    );
-    diffStdout = stdout;
-  } catch {
-    // diff too large or git error — fall through to content-only path
-  }
-
-  let diffLines: DiffLine[] = [];
-  if (diffStdout !== undefined) {
-    const { lines, isBinary } = parseDiffLines(diffStdout);
-    if (isBinary) {
-      return { lines: [], isBinary: true };
-    }
-    diffLines = lines;
-  }
-
-  // Fetch content AFTER binary check to avoid fetching binary blobs
-  const [originalContent, modifiedContent] = await Promise.all([
-    getContentAt(`${commitHash}~1`),
-    getContentAt(commitHash),
-  ]);
-
-  if (diffLines.length > 0) return { lines: diffLines, originalContent, modifiedContent };
-
-  // Fallback: diff failed or empty — determine from content
-  if (modifiedContent !== undefined && modifiedContent !== '') {
-    return {
-      lines: modifiedContent.split('\n').map((l) => ({ right: l, type: 'add' as const })),
-      originalContent,
-      modifiedContent,
-    };
-  }
-  if (originalContent !== undefined) {
-    return {
-      lines: originalContent.split('\n').map((l) => ({ left: l, type: 'del' as const })),
-      originalContent,
-      modifiedContent,
-    };
-  }
-  return { lines: [], originalContent, modifiedContent };
-}
-
-/** Soft-reset the latest commit. Returns the commit message that was reset. */
-export async function softResetLastCommit(
-  taskPath: string
-): Promise<{ subject: string; body: string }> {
-  // Check if HEAD~1 exists (i.e., this isn't the initial commit)
-  try {
-    await execFileAsync('git', ['rev-parse', '--verify', 'HEAD~1'], { cwd: taskPath });
-  } catch {
-    throw new Error('Cannot undo the initial commit');
-  }
-
-  // Check if the commit has been pushed (safety guard — UI also hides the button)
-  const { commits: log } = await getLog(taskPath, 1);
-  if (log[0]?.isPushed) {
-    throw new Error('Cannot undo a commit that has already been pushed');
-  }
-
-  const { stdout: subject } = await execFileAsync('git', ['log', '-1', '--pretty=format:%s'], {
-    cwd: taskPath,
-  });
-  const { stdout: body } = await execFileAsync('git', ['log', '-1', '--pretty=format:%b'], {
-    cwd: taskPath,
-  });
-
-  await execFileAsync('git', ['reset', '--soft', 'HEAD~1'], { cwd: taskPath });
-
-  return { subject: subject.trim(), body: body.trim() };
-}
diff --git a/src/main/services/JiraService.ts b/src/main/services/JiraService.ts
deleted file mode 100644
index 1a532373c1..0000000000
--- a/src/main/services/JiraService.ts
+++ /dev/null
@@ -1,373 +0,0 @@
-import { request } from 'node:https';
-import { URL } from 'node:url';
-import { app } from 'electron';
-import { existsSync, readFileSync, writeFileSync, unlinkSync } from 'node:fs';
-import { join } from 'node:path';
-import { sortByUpdatedAtDesc } from '../utils/issueSorting';
-
-type JiraCreds = { siteUrl: string; email: string };
-
-function encodeBasic(email: string, token: string) {
-  const raw = `${email}:${token}`;
-  return Buffer.from(raw).toString('base64');
-}
-
-export interface JiraConnectionStatus {
-  connected: boolean;
-  accountId?: string;
-  displayName?: string;
-  siteUrl?: string;
-  error?: string;
-}
-
-export default class JiraService {
-  private readonly SERVICE = 'emdash-jira';
-  private readonly ACCOUNT = 'api-token';
-  private readonly CONF_FILE = join(app.getPath('userData'), 'jira.json');
-  private projectKeys: string[] = [];
-
-  private readCreds(): JiraCreds | null {
-    try {
-      if (!existsSync(this.CONF_FILE)) return null;
-      const raw = readFileSync(this.CONF_FILE, 'utf8');
-      const obj = JSON.parse(raw);
-      const siteUrl = String(obj?.siteUrl || '').trim();
-      const email = String(obj?.email || '').trim();
-      if (!siteUrl || !email) return null;
-      return { siteUrl, email };
-    } catch {
-      return null;
-    }
-  }
-
-  private writeCreds(creds: JiraCreds) {
-    const { siteUrl, email } = creds;
-    const obj: any = { siteUrl, email };
-    writeFileSync(this.CONF_FILE, JSON.stringify(obj), 'utf8');
-  }
-
-  async saveCredentials(
-    siteUrl: string,
-    email: string,
-    token: string
-  ): Promise<{
-    success: boolean;
-    displayName?: string;
-    error?: string;
-  }> {
-    try {
-      const me = await this.getMyself(siteUrl, email, token);
-      const keytar = await import('keytar');
-      await keytar.setPassword(this.SERVICE, this.ACCOUNT, token);
-      this.writeCreds({ siteUrl, email });
-      // Track connection
-      void import('../telemetry').then(({ capture }) => {
-        void capture('jira_connected');
-      });
-      return { success: true, displayName: me?.displayName };
-    } catch (e: any) {
-      return { success: false, error: e?.message || String(e) };
-    }
-  }
-
-  async clearCredentials(): Promise<{ success: boolean; error?: string }> {
-    try {
-      const keytar = await import('keytar');
-      this.projectKeys = [];
-      try {
-        await keytar.deletePassword(this.SERVICE, this.ACCOUNT);
-      } catch {}
-      try {
-        if (existsSync(this.CONF_FILE)) unlinkSync(this.CONF_FILE);
-      } catch {}
-      // Track disconnection
-      void import('../telemetry').then(({ capture }) => {
-        void capture('jira_disconnected');
-      });
-      return { success: true };
-    } catch (e: any) {
-      return { success: false, error: e?.message || String(e) };
-    }
-  }
-
-  async checkConnection(): Promise<JiraConnectionStatus> {
-    try {
-      const creds = this.readCreds();
-      if (!creds) return { connected: false };
-      const keytar = await import('keytar');
-      const token = await keytar.getPassword(this.SERVICE, this.ACCOUNT);
-      if (!token) return { connected: false };
-      const me = await this.getMyself(creds.siteUrl, creds.email, token);
-      this.fetchProjectKeys(creds.siteUrl, creds.email, token)
-        .then((keys) => {
-          this.projectKeys = keys;
-        })
-        .catch(() => {});
-      return {
-        connected: true,
-        accountId: me?.accountId,
-        displayName: me?.displayName,
-        siteUrl: creds.siteUrl,
-      };
-    } catch (e: any) {
-      return { connected: false, error: e?.message || String(e) };
-    }
-  }
-
-  async initialFetch(limit = 50): Promise<any[]> {
-    const { siteUrl, email, token } = await this.requireAuth();
-    const jqlCandidates: string[] = [];
-    // Pragmatic fallbacks that typically work with limited permissions
-    jqlCandidates.push(
-      'assignee = currentUser() ORDER BY updated DESC',
-      'reporter = currentUser() ORDER BY updated DESC',
-      'ORDER BY updated DESC'
-    );
-
-    for (const jql of jqlCandidates) {
-      try {
-        const issues = await this.searchRaw(siteUrl, email, token, jql, limit);
-        if (issues.length > 0) return sortByUpdatedAtDesc(this.normalizeIssues(siteUrl, issues));
-      } catch {
-        // Try next candidate if this one is forbidden or failed
-      }
-    }
-    // Final fallback: use issue picker to get recent/history issues, then hydrate via GET /issue/{key}
-    try {
-      const keys = await this.getRecentIssueKeys(siteUrl, email, token, limit);
-      if (keys.length > 0) {
-        const results: any[] = [];
-        for (const key of keys.slice(0, limit)) {
-          try {
-            const issue = await this.getIssueByKey(siteUrl, email, token, key);
-            if (issue) results.push(issue);
-          } catch {
-            // skip individual failures
-          }
-        }
-        if (results.length > 0) return sortByUpdatedAtDesc(this.normalizeIssues(siteUrl, results));
-      }
-    } catch {
-      // ignore
-    }
-    return [];
-  }
-
-  async searchIssues(searchTerm: string, limit = 20): Promise<any[]> {
-    const term = (searchTerm || '').trim();
-    if (!term) return [];
-    const { siteUrl, email, token } = await this.requireAuth();
-    const sanitized = term.replace(/\"/g, '\\\"');
-    const inner = `text ~ \"${sanitized}\" OR key = ${term}`;
-    const jql = inner;
-    const data = await this.searchRaw(siteUrl, email, token, jql, limit);
-    return sortByUpdatedAtDesc(this.normalizeIssues(siteUrl, data));
-  }
-
-  private async requireAuth(): Promise<{ siteUrl: string; email: string; token: string }> {
-    const creds = this.readCreds();
-    if (!creds) throw new Error('Jira credentials not set.');
-    const keytar = await import('keytar');
-    const token = await keytar.getPassword(this.SERVICE, this.ACCOUNT);
-    if (!token) throw new Error('Jira token not found.');
-    return { ...creds, token };
-  }
-
-  private async getMyself(siteUrl: string, email: string, token: string): Promise<any> {
-    const url = new URL('/rest/api/3/myself', siteUrl);
-    const body = await this.doGet(url, email, token);
-    const data = JSON.parse(body || '{}');
-    if (!data || data.errorMessages) {
-      throw new Error('Failed to verify Jira token.');
-    }
-    return data;
-  }
-
-  private async searchRaw(
-    siteUrl: string,
-    email: string,
-    token: string,
-    jql: string,
-    limit: number
-  ) {
-    const url = new URL('/rest/api/3/search', siteUrl);
-    const payload = JSON.stringify({
-      jql,
-      maxResults: Math.min(Math.max(limit, 1), 100),
-      fields: ['summary', 'description', 'updated', 'project', 'status', 'assignee'],
-    });
-    const body = await this.doRequest(url, email, token, 'POST', payload, {
-      'Content-Type': 'application/json',
-    });
-    const data = JSON.parse(body || '{}');
-    return Array.isArray(data?.issues) ? data.issues : [];
-  }
-
-  private async doGet(url: URL, email: string, token: string): Promise<string> {
-    return this.doRequest(url, email, token, 'GET');
-  }
-
-  private async doRequest(
-    url: URL,
-    email: string,
-    token: string,
-    method: 'GET' | 'POST',
-    payload?: string,
-    extraHeaders?: Record<string, string>
-  ): Promise<string> {
-    const auth = encodeBasic(email, token);
-    return await new Promise<string>((resolve, reject) => {
-      const req = request(
-        {
-          hostname: url.hostname,
-          path: url.pathname + url.search,
-          protocol: url.protocol,
-          method,
-          headers: {
-            Authorization: `Basic ${auth}`,
-            Accept: 'application/json',
-            ...(extraHeaders || {}),
-          },
-        },
-        (res) => {
-          let data = '';
-          res.on('data', (chunk) => (data += chunk));
-          res.on('end', () => {
-            if (res.statusCode && res.statusCode >= 400) {
-              const snippet = data?.slice(0, 200) || '';
-              return reject(
-                new Error(`Jira API error ${res.statusCode}${snippet ? `: ${snippet}` : ''}`)
-              );
-            }
-            resolve(data);
-          });
-        }
-      );
-      req.on('error', reject);
-      if (payload && method === 'POST') {
-        req.write(payload);
-      }
-      req.end();
-    });
-  }
-
-  // Enhanced search that supports direct issue-key lookups and robust quoting
-  async smartSearchIssues(searchTerm: string, limit = 20): Promise<any[]> {
-    const term = (searchTerm || '').trim();
-    if (!term) return [];
-    const { siteUrl, email, token } = await this.requireAuth();
-
-    const looksLikeKey = /^[A-Za-z][A-Za-z0-9_]*-\d+$/.test(term);
-    if (looksLikeKey) {
-      const keyUpper = term.toUpperCase();
-      try {
-        const issue = await this.getIssueByKey(siteUrl, email, token, keyUpper);
-        if (issue) return sortByUpdatedAtDesc(this.normalizeIssues(siteUrl, [issue]));
-      } catch {
-        // If direct fetch fails (404/403/etc.), falling back to JQL search below
-      }
-    }
-
-    // Build JQL safely (escape quotes in term)
-    const sanitized = term.replace(/"/g, '\\"');
-    const extraKey = looksLikeKey ? ` OR issueKey = ${term.toUpperCase()}` : '';
-    const isNumeric = /^\d+$/.test(term);
-    const keyClause =
-      isNumeric && this.projectKeys.length
-        ? ` OR key IN (${this.projectKeys.map((p) => `"${p}-${term}"`).join(',')})`
-        : '';
-    const jql = `text ~ "${sanitized}"${extraKey}${keyClause}`;
-    const data = await this.searchRaw(siteUrl, email, token, jql, limit);
-    return sortByUpdatedAtDesc(this.normalizeIssues(siteUrl, data));
-  }
-
-  private async fetchProjectKeys(siteUrl: string, email: string, token: string): Promise<string[]> {
-    try {
-      const url = new URL('/rest/api/3/project', siteUrl);
-      const body = await this.doGet(url, email, token);
-      const data = JSON.parse(body || '[]');
-      if (!Array.isArray(data)) return [];
-      return data.map((p: any) => String(p?.key || '')).filter(Boolean);
-    } catch {
-      return [];
-    }
-  }
-
-  private async getIssueByKey(
-    siteUrl: string,
-    email: string,
-    token: string,
-    key: string
-  ): Promise<any | null> {
-    const url = new URL(`/rest/api/3/issue/${encodeURIComponent(key)}`, siteUrl);
-    url.searchParams.set('fields', 'summary,description,updated,project,status,assignee');
-    const body = await this.doGet(url, email, token);
-    const data = JSON.parse(body || '{}');
-    if (!data || data.errorMessages) return null;
-    return data;
-  }
-
-  private async getRecentIssueKeys(
-    siteUrl: string,
-    email: string,
-    token: string,
-    limit: number
-  ): Promise<string[]> {
-    // Jira issue picker provides recent/history issue suggestions
-    const url = new URL('/rest/api/3/issue/picker', siteUrl);
-    url.searchParams.set('query', '');
-    url.searchParams.set('currentJQL', '');
-    const body = await this.doGet(url, email, token);
-    const data = JSON.parse(body || '{}');
-    const keys: string[] = [];
-    const sections = Array.isArray(data?.sections) ? data.sections : [];
-    for (const sec of sections) {
-      const issues = Array.isArray(sec?.issues) ? sec.issues : [];
-      for (const it of issues) {
-        const k = String(it?.key || '').trim();
-        if (k && !keys.includes(k)) keys.push(k);
-        if (keys.length >= limit) break;
-      }
-      if (keys.length >= limit) break;
-    }
-    return keys;
-  }
-
-  private static flattenAdf(node: any): string {
-    if (!node) return '';
-    if (typeof node === 'string') return node;
-    if (node.type === 'text') return node.text || '';
-    if (Array.isArray(node.content)) {
-      const parts = node.content.map((c: any) => JiraService.flattenAdf(c));
-      // Add newlines between block-level nodes (paragraphs, headings, etc.)
-      if (['doc', 'bulletList', 'orderedList'].includes(node.type)) {
-        return parts.join('\n');
-      }
-      if (['paragraph', 'heading', 'listItem'].includes(node.type)) {
-        return parts.join('');
-      }
-      return parts.join('');
-    }
-    return '';
-  }
-
-  private normalizeIssues(siteUrl: string, rawIssues: any[]): any[] {
-    const base = siteUrl.replace(/\/$/, '');
-    return (rawIssues || []).map((it) => {
-      const fields = it?.fields || {};
-      return {
-        id: String(it?.id || it?.key || ''),
-        key: String(it?.key || ''),
-        summary: String(fields?.summary || ''),
-        description: fields?.description ? JiraService.flattenAdf(fields.description) : null,
-        url: `${base}/browse/${it?.key}`,
-        status: fields?.status ? { name: fields.status.name } : null,
-        project: fields?.project ? { key: fields.project.key, name: fields.project.name } : null,
-        assignee: fields?.assignee
-          ? { displayName: fields.assignee.displayName, name: fields.assignee.name }
-          : null,
-        updatedAt: fields?.updated || null,
-      };
-    });
-  }
-}
diff --git a/src/main/services/LifecycleScriptsService.ts b/src/main/services/LifecycleScriptsService.ts
deleted file mode 100644
index 9d11c754b0..0000000000
--- a/src/main/services/LifecycleScriptsService.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-import fs from 'fs';
-import path from 'path';
-import { log } from '../lib/logger';
-import type { LifecyclePhase, LifecycleScriptConfig } from '@shared/lifecycle';
-
-export interface EmdashConfig {
-  preservePatterns?: string[];
-  scripts?: LifecycleScriptConfig;
-  shellSetup?: string;
-  tmux?: boolean;
-}
-
-/**
- * Manages lifecycle scripts for worktrees.
- * Scripts are configured in .emdash.json at the project root.
- */
-class LifecycleScriptsService {
-  /**
-   * Read .emdash.json config from project root
-   */
-  readConfig(projectPath: string): EmdashConfig | null {
-    try {
-      const configPath = path.join(projectPath, '.emdash.json');
-      if (!fs.existsSync(configPath)) {
-        return null;
-      }
-      const content = fs.readFileSync(configPath, 'utf8');
-      return JSON.parse(content) as EmdashConfig;
-    } catch (error) {
-      log.warn('Failed to read .emdash.json', { projectPath, error });
-      return null;
-    }
-  }
-
-  /**
-   * Get a specific lifecycle script command if configured.
-   */
-  getScript(projectPath: string, phase: LifecyclePhase): string | null {
-    const config = this.readConfig(projectPath);
-    const scripts = config?.scripts;
-    const script = scripts?.[phase];
-    return typeof script === 'string' && script.trim().length > 0 ? script.trim() : null;
-  }
-
-  /**
-   * Get the shell setup command if configured in .emdash.json.
-   * Runs inside every PTY (agent and plain terminal) before the shell starts.
-   */
-  getShellSetup(projectPath: string): string | null {
-    const config = this.readConfig(projectPath);
-    const shellSetup = config?.shellSetup;
-    return typeof shellSetup === 'string' && shellSetup.trim().length > 0
-      ? shellSetup.trim()
-      : null;
-  }
-
-  /**
-   * Check if tmux wrapping is enabled for this project in .emdash.json.
-   * When true, agent PTY sessions are wrapped in named tmux sessions
-   * for persistence and resumability.
-   */
-  getTmuxEnabled(projectPath: string): boolean {
-    const config = this.readConfig(projectPath);
-    return config?.tmux === true;
-  }
-}
-
-export const lifecycleScriptsService = new LifecycleScriptsService();
diff --git a/src/main/services/LinearService.ts b/src/main/services/LinearService.ts
deleted file mode 100644
index 01b04218bd..0000000000
--- a/src/main/services/LinearService.ts
+++ /dev/null
@@ -1,287 +0,0 @@
-import { request } from 'node:https';
-import { URL } from 'node:url';
-import { sortByUpdatedAtDesc } from '../utils/issueSorting';
-
-const LINEAR_API_URL = 'https://api.linear.app/graphql';
-
-export interface LinearViewer {
-  name?: string | null;
-  displayName?: string | null;
-  organization?: {
-    name?: string | null;
-  } | null;
-}
-
-export interface LinearConnectionStatus {
-  connected: boolean;
-  workspaceName?: string;
-  viewer?: LinearViewer;
-  error?: string;
-}
-
-interface GraphQLResponse<T> {
-  data?: T;
-  errors?: Array<{ message: string }>;
-}
-
-export class LinearService {
-  private readonly SERVICE_NAME = 'emdash-linear';
-  private readonly ACCOUNT_NAME = 'api-token';
-
-  async saveToken(
-    token: string
-  ): Promise<{ success: boolean; workspaceName?: string; error?: string }> {
-    try {
-      const viewer = await this.fetchViewer(token);
-      await this.storeToken(token);
-      // Track connection
-      void import('../telemetry').then(({ capture }) => {
-        void capture('linear_connected');
-      });
-      return {
-        success: true,
-        workspaceName: viewer?.organization?.name ?? viewer?.displayName ?? undefined,
-      };
-    } catch (error) {
-      const message =
-        error instanceof Error
-          ? error.message
-          : 'Failed to validate Linear token. Please try again.';
-      return { success: false, error: message };
-    }
-  }
-
-  async clearToken(): Promise<{ success: boolean; error?: string }> {
-    try {
-      const keytar = await import('keytar');
-      await keytar.deletePassword(this.SERVICE_NAME, this.ACCOUNT_NAME);
-      // Track disconnection
-      void import('../telemetry').then(({ capture }) => {
-        void capture('linear_disconnected');
-      });
-      return { success: true };
-    } catch (error) {
-      console.error('Failed to clear Linear token:', error);
-      return {
-        success: false,
-        error: 'Unable to remove Linear token from keychain.',
-      };
-    }
-  }
-
-  async checkConnection(): Promise<LinearConnectionStatus> {
-    try {
-      const token = await this.getStoredToken();
-      if (!token) {
-        return { connected: false };
-      }
-
-      const viewer = await this.fetchViewer(token);
-      return {
-        connected: true,
-        workspaceName: viewer?.organization?.name ?? viewer?.displayName ?? undefined,
-        viewer,
-      };
-    } catch (error) {
-      const message =
-        error instanceof Error ? error.message : 'Failed to verify Linear connection.';
-      return { connected: false, error: message };
-    }
-  }
-
-  async initialFetch(limit = 50): Promise<any[]> {
-    const token = await this.getStoredToken();
-    if (!token) {
-      throw new Error('Linear token not set. Connect Linear in settings first.');
-    }
-
-    const sanitizedLimit = Math.min(Math.max(limit, 1), 200);
-
-    // Use server-side filter to exclude completed/canceled issues so we get a full
-    // page of open issues instead of fetching N and discarding closed ones.
-    const query = `
-      query ListIssues($limit: Int!) {
-        issues(
-          first: $limit,
-          orderBy: updatedAt,
-          filter: { state: { type: { nin: ["completed", "cancelled"] } } }
-        ) {
-          nodes {
-            id
-            identifier
-            title
-            description
-            url
-            state { name type color }
-            team { name key }
-            project { name }
-            assignee { displayName name }
-            updatedAt
-          }
-        }
-      }
-    `;
-
-    const response = await this.graphql<{ issues: { nodes: any[] } }>(token, query, {
-      limit: sanitizedLimit,
-    });
-
-    return sortByUpdatedAtDesc(response?.issues?.nodes ?? []);
-  }
-
-  async searchIssues(searchTerm: string, limit = 20): Promise<any[]> {
-    const token = await this.getStoredToken();
-    if (!token) {
-      throw new Error('Linear token not set. Connect Linear in settings first.');
-    }
-
-    if (!searchTerm.trim()) {
-      return [];
-    }
-
-    const sanitizedLimit = Math.min(Math.max(limit, 1), 200);
-
-    // Use Linear's server-side searchIssues query for full-text search across all issues
-    const searchQuery = `
-      query SearchIssues($term: String!, $limit: Int!) {
-        searchIssues(term: $term, first: $limit) {
-          nodes {
-            id
-            identifier
-            title
-            description
-            url
-            state { name type color }
-            team { name key }
-            project { name }
-            assignee { displayName name }
-            updatedAt
-          }
-        }
-      }
-    `;
-
-    try {
-      const searchResponse = await this.graphql<{ searchIssues: { nodes: any[] } }>(
-        token,
-        searchQuery,
-        {
-          term: searchTerm.trim(),
-          limit: sanitizedLimit,
-        }
-      );
-
-      return sortByUpdatedAtDesc(searchResponse?.searchIssues?.nodes ?? []);
-    } catch (error) {
-      console.error('[Linear] searchIssues error:', error);
-      return [];
-    }
-  }
-
-  private async fetchViewer(token: string): Promise<LinearViewer> {
-    const query = `
-      query ViewerInfo {
-        viewer {
-          name
-          displayName
-          organization {
-            name
-          }
-        }
-      }
-    `;
-
-    const data = await this.graphql<{ viewer: LinearViewer }>(token, query);
-    if (!data?.viewer) {
-      throw new Error('Unable to retrieve Linear account information.');
-    }
-    return data.viewer;
-  }
-
-  private async graphql<T>(
-    token: string,
-    query: string,
-    variables?: Record<string, unknown>
-  ): Promise<T> {
-    const body = JSON.stringify({ query, variables });
-
-    const requestPromise = new Promise<GraphQLResponse<T>>((resolve, reject) => {
-      const url = new URL(LINEAR_API_URL);
-
-      const req = request(
-        {
-          hostname: url.hostname,
-          path: url.pathname,
-          method: 'POST',
-          headers: {
-            'Content-Type': 'application/json',
-            Authorization: token,
-            'Content-Length': Buffer.byteLength(body).toString(),
-          },
-        },
-        (res) => {
-          let data = '';
-
-          res.on('data', (chunk) => {
-            data += chunk;
-          });
-
-          res.on('end', () => {
-            try {
-              const parsed = JSON.parse(data) as GraphQLResponse<T>;
-              resolve(parsed);
-            } catch (error) {
-              reject(error);
-            }
-          });
-        }
-      );
-
-      req.on('error', (error) => {
-        reject(error);
-      });
-
-      req.write(body);
-      req.end();
-    });
-
-    const result = await requestPromise;
-
-    if (result.errors?.length) {
-      throw new Error(result.errors.map((err) => err.message).join('\n'));
-    }
-
-    if (!result.data) {
-      throw new Error('Linear API returned no data.');
-    }
-
-    return result.data;
-  }
-
-  private async storeToken(token: string): Promise<void> {
-    const clean = token.trim();
-    if (!clean) {
-      throw new Error('Linear token cannot be empty.');
-    }
-
-    try {
-      const keytar = await import('keytar');
-      await keytar.setPassword(this.SERVICE_NAME, this.ACCOUNT_NAME, clean);
-    } catch (error) {
-      console.error('Failed to store Linear token:', error);
-      throw new Error('Unable to store Linear token securely.');
-    }
-  }
-
-  private async getStoredToken(): Promise<string | null> {
-    try {
-      const keytar = await import('keytar');
-      return await keytar.getPassword(this.SERVICE_NAME, this.ACCOUNT_NAME);
-    } catch (error) {
-      console.error('Failed to read Linear token from keychain:', error);
-      return null;
-    }
-  }
-}
-
-export default LinearService;
diff --git a/src/main/services/PrGenerationService.ts b/src/main/services/PrGenerationService.ts
deleted file mode 100644
index 448f68a977..0000000000
--- a/src/main/services/PrGenerationService.ts
+++ /dev/null
@@ -1,701 +0,0 @@
-import { execFile, spawn } from 'child_process';
-import { promisify } from 'util';
-import { log } from '../lib/logger';
-import { getProvider, PROVIDER_IDS, type ProviderId } from '../../shared/providers/registry';
-
-const execFileAsync = promisify(execFile);
-
-export interface GeneratedPrContent {
-  title: string;
-  description: string;
-}
-
-/**
- * Generates PR title and description using available CLI agents or fallback heuristics
- */
-export class PrGenerationService {
-  /**
-   * Generate PR title and description based on git changes
-   * @param taskPath - Path to the task
-   * @param baseBranch - Base branch to compare against (default: 'main')
-   * @param preferredProviderId - Optional provider ID to use first (e.g., from task.agentId)
-   */
-  async generatePrContent(
-    taskPath: string,
-    baseBranch: string = 'main',
-    preferredProviderId?: string | null
-  ): Promise<GeneratedPrContent> {
-    try {
-      // Get git diff and commit messages
-      const { diff, commits, changedFiles } = await this.getGitContext(taskPath, baseBranch);
-
-      if (!diff && commits.length === 0) {
-        return this.generateFallbackContent(changedFiles);
-      }
-
-      // Build ordered list of providers to try: preferred → claude → remaining
-      const attempted = new Set<ProviderId>();
-      const tryOrder: ProviderId[] = [];
-
-      if (preferredProviderId && this.isValidProviderId(preferredProviderId)) {
-        tryOrder.push(preferredProviderId as ProviderId);
-      }
-      tryOrder.push('claude');
-      for (const id of PROVIDER_IDS) {
-        tryOrder.push(id);
-      }
-
-      for (const providerId of tryOrder) {
-        if (attempted.has(providerId)) continue;
-        attempted.add(providerId);
-
-        try {
-          const result = await this.generateWithProvider(providerId, taskPath, diff, commits);
-          if (result) {
-            log.info(`Generated PR content with ${providerId}`);
-            return {
-              title: result.title,
-              description: this.normalizeMarkdown(result.description),
-            };
-          }
-        } catch (error) {
-          log.debug(`Provider ${providerId} generation failed, trying next`, { error });
-        }
-      }
-
-      // Fallback to heuristic-based generation
-      return this.generateHeuristicContent(diff, commits, changedFiles);
-    } catch (error) {
-      log.error('Failed to generate PR content', { error });
-      return this.generateFallbackContent([]);
-    }
-  }
-
-  /**
-   * Get git context (diff, commits, changed files) for PR generation
-   */
-  private async getGitContext(
-    taskPath: string,
-    baseBranch: string
-  ): Promise<{ diff: string; commits: string[]; changedFiles: string[] }> {
-    let diff = '';
-    let commits: string[] = [];
-    let changedFiles: string[] = [];
-
-    try {
-      // Fetch remote to ensure we have latest state (prevents comparing against stale local branches)
-      // This is critical: if local main is behind remote, we'd incorrectly include others' commits
-      // Only fetch if remote exists
-      try {
-        await execFileAsync('git', ['remote', 'get-url', 'origin'], { cwd: taskPath });
-        // Remote exists, try to fetch
-        try {
-          await execFileAsync('git', ['fetch', 'origin', '--quiet'], { cwd: taskPath });
-        } catch (fetchError) {
-          log.debug('Failed to fetch remote, continuing with existing refs', { fetchError });
-        }
-      } catch {
-        // Remote doesn't exist, skip fetch
-        log.debug('Remote origin not found, skipping fetch');
-      }
-
-      // Always prefer remote branch to avoid stale local branch issues
-      let baseBranchRef = baseBranch;
-      let baseBranchExists = false;
-
-      // First try remote branch (most reliable - always up to date)
-      try {
-        await execFileAsync('git', ['rev-parse', '--verify', `origin/${baseBranch}`], {
-          cwd: taskPath,
-        });
-        baseBranchExists = true;
-        baseBranchRef = `origin/${baseBranch}`;
-      } catch {
-        // Fall back to local branch only if remote doesn't exist
-        try {
-          await execFileAsync('git', ['rev-parse', '--verify', baseBranch], { cwd: taskPath });
-          baseBranchExists = true;
-          baseBranchRef = baseBranch;
-        } catch {
-          // Base branch doesn't exist, will use working directory diff
-        }
-      }
-
-      if (baseBranchExists) {
-        // Get diff between base branch and current HEAD (committed changes)
-        try {
-          const { stdout: diffOut } = await execFileAsync(
-            'git',
-            ['diff', `${baseBranchRef}...HEAD`, '--stat'],
-            { cwd: taskPath, maxBuffer: 10 * 1024 * 1024 }
-          );
-          diff = diffOut || '';
-
-          // Get list of changed files from commits
-          const { stdout: filesOut } = await execFileAsync(
-            'git',
-            ['diff', '--name-only', `${baseBranchRef}...HEAD`],
-            { cwd: taskPath }
-          );
-          const committedFiles = (filesOut || '')
-            .split('\n')
-            .map((f) => f.trim())
-            .filter(Boolean);
-          changedFiles.push(...committedFiles);
-
-          // Get commit messages
-          const { stdout: commitsOut } = await execFileAsync(
-            'git',
-            ['log', `${baseBranchRef}..HEAD`, '--pretty=format:%s'],
-            { cwd: taskPath }
-          );
-          commits = (commitsOut || '')
-            .split('\n')
-            .map((c) => c.trim())
-            .filter(Boolean);
-        } catch (error) {
-          log.debug('Failed to get diff/commits from base branch', { error });
-        }
-      }
-
-      // Also include uncommitted changes (working directory) to capture all changes
-      // This ensures PR description includes changes that will be committed
-      try {
-        const { stdout: workingDiff } = await execFileAsync('git', ['diff', '--stat'], {
-          cwd: taskPath,
-          maxBuffer: 10 * 1024 * 1024,
-        });
-        const workingDiffText = workingDiff || '';
-
-        // If we have both committed and uncommitted changes, combine them
-        if (workingDiffText && diff) {
-          // Combine diff stats (working directory changes will be added)
-          diff = `${diff}\n${workingDiffText}`;
-        } else if (workingDiffText && !diff) {
-          // Only uncommitted changes
-          diff = workingDiffText;
-        }
-
-        // Get uncommitted changed files and merge with committed files
-        const { stdout: filesOut } = await execFileAsync('git', ['diff', '--name-only'], {
-          cwd: taskPath,
-        });
-        const uncommittedFiles = (filesOut || '')
-          .split('\n')
-          .map((f) => f.trim())
-          .filter(Boolean);
-
-        // Merge file lists, avoiding duplicates
-        const allFiles = new Set([...changedFiles, ...uncommittedFiles]);
-        changedFiles = Array.from(allFiles);
-      } catch (error) {
-        log.debug('Failed to get working directory diff', { error });
-      }
-
-      // Fallback: if we still have no diff or commits, try staged changes
-      if (commits.length === 0 && diff.length === 0) {
-        try {
-          const { stdout: stagedDiff } = await execFileAsync(
-            'git',
-            ['diff', '--cached', '--stat'],
-            { cwd: taskPath, maxBuffer: 10 * 1024 * 1024 }
-          );
-          if (stagedDiff) {
-            diff = stagedDiff;
-            const { stdout: filesOut } = await execFileAsync(
-              'git',
-              ['diff', '--cached', '--name-only'],
-              { cwd: taskPath }
-            );
-            changedFiles = (filesOut || '')
-              .split('\n')
-              .map((f) => f.trim())
-              .filter(Boolean);
-          }
-        } catch {}
-      }
-    } catch (error) {
-      log.warn('Failed to get git context', { error });
-    }
-
-    return { diff, commits, changedFiles };
-  }
-
-  /**
-   * Check if a provider can be used for non-interactive PR generation.
-   * Returns false for providers that require TUI keystroke injection,
-   * have no CLI binary, or can't accept a prompt via CLI args.
-   */
-  private canUseForPrGeneration(providerId: ProviderId): boolean {
-    const provider = getProvider(providerId);
-    if (!provider) return false;
-    if (!provider.cli) return false;
-    if (provider.useKeystrokeInjection) return false;
-    if (provider.initialPromptFlag === undefined) return false;
-    return true;
-  }
-
-  /**
-   * Generate PR content using a CLI provider.
-   * Retries once on parse failure (exit code 0 but malformed output).
-   */
-  private async generateWithProvider(
-    providerId: ProviderId,
-    taskPath: string,
-    diff: string,
-    commits: string[]
-  ): Promise<GeneratedPrContent | null> {
-    if (!this.canUseForPrGeneration(providerId)) {
-      return null;
-    }
-
-    const provider = getProvider(providerId);
-    const cliCommand = provider!.cli!;
-
-    // Check if provider CLI is available
-    try {
-      await execFileAsync(cliCommand, provider!.versionArgs || ['--version'], {
-        cwd: taskPath,
-      });
-    } catch {
-      log.debug(`Provider ${providerId} CLI not available`);
-      return null;
-    }
-
-    // Build prompt for PR generation
-    const prompt = this.buildPrGenerationPrompt(diff, commits);
-
-    // Try up to 2 times: retry once if the process succeeded but JSON parsing failed
-    for (let attempt = 0; attempt < 2; attempt++) {
-      const { result, shouldRetry } = await this.spawnProvider(
-        providerId,
-        cliCommand,
-        provider,
-        taskPath,
-        prompt
-      );
-      if (result) return result;
-      if (!shouldRetry) break;
-      log.debug(`Retrying provider ${providerId} (attempt ${attempt + 2}/2) after parse failure`);
-    }
-
-    return null;
-  }
-
-  /**
-   * Spawn a provider CLI process and collect its output.
-   * Returns the parsed result (if any) and whether a retry is worthwhile.
-   */
-  private spawnProvider(
-    providerId: ProviderId,
-    cliCommand: string,
-    provider: ReturnType<typeof getProvider>,
-    taskPath: string,
-    prompt: string
-  ): Promise<{ result: GeneratedPrContent | null; shouldRetry: boolean }> {
-    return new Promise((resolve) => {
-      const timeout = 60000;
-      let stdout = '';
-      let stderr = '';
-      let resolved = false;
-
-      const done = (result: GeneratedPrContent | null, shouldRetry: boolean) => {
-        if (resolved) return;
-        resolved = true;
-        resolve({ result, shouldRetry });
-      };
-
-      // Build command arguments — Claude Code gets special `-p` (print) mode
-      const args: string[] = [];
-      const isClaudeProvider = providerId === 'claude';
-
-      if (isClaudeProvider) {
-        // Use -p (print/non-interactive) mode with structured JSON output.
-        // This eliminates ANSI escapes, progress indicators, and TUI noise.
-        args.push('-p', prompt, '--output-format', 'json');
-        if (provider!.autoApproveFlag) {
-          args.push(provider!.autoApproveFlag);
-        }
-      } else {
-        if (provider!.defaultArgs?.length) {
-          args.push(...provider!.defaultArgs);
-        }
-        if (provider!.autoApproveFlag) {
-          args.push(provider!.autoApproveFlag);
-        }
-      }
-
-      // Handle prompt for non-Claude providers using the same logic as ptyManager.buildProviderCliArgs():
-      // - initialPromptFlag: '' → positional arg (push prompt directly)
-      // - initialPromptFlag: '-i' / '-t' / etc. → push flag then prompt
-      // - initialPromptFlag: undefined → provider can't accept a prompt (already filtered by canUseForPrGeneration)
-      if (!isClaudeProvider && provider!.initialPromptFlag !== undefined) {
-        if (provider!.initialPromptFlag) {
-          args.push(provider!.initialPromptFlag);
-        }
-        args.push(prompt);
-      }
-
-      // Spawn the provider CLI
-      const child = spawn(cliCommand, args, {
-        cwd: taskPath,
-        stdio: ['pipe', 'pipe', 'pipe'],
-        env: {
-          ...process.env,
-          TERM: 'xterm-256color',
-          COLORTERM: 'truecolor',
-        },
-      });
-
-      // Set timeout
-      const timeoutId = setTimeout(() => {
-        try {
-          child.kill('SIGTERM');
-        } catch {}
-        log.debug(`Provider ${providerId} invocation timed out`);
-        done(null, false); // Don't retry on timeout
-      }, timeout);
-
-      // Collect stdout
-      if (child.stdout) {
-        child.stdout.on('data', (data: Buffer) => {
-          stdout += data.toString('utf8');
-        });
-      }
-
-      // Collect stderr (for debugging)
-      if (child.stderr) {
-        child.stderr.on('data', (data: Buffer) => {
-          stderr += data.toString('utf8');
-        });
-      }
-
-      // Handle process exit
-      child.on('exit', (code: number | null, signal: NodeJS.Signals | null) => {
-        clearTimeout(timeoutId);
-
-        if (code !== 0 && code !== null) {
-          log.debug(`Provider ${providerId} exited with code ${code}`, { stderr });
-          done(null, false); // Don't retry on non-zero exit
-          return;
-        }
-
-        if (signal) {
-          log.debug(`Provider ${providerId} killed by signal ${signal}`);
-          done(null, false);
-          return;
-        }
-
-        // Try to parse the response
-        const result = this.parseProviderResponse(stdout);
-        if (result) {
-          log.info(`Successfully generated PR content with ${providerId}`);
-          done(result, false);
-        } else {
-          log.debug(`Failed to parse response from ${providerId}`, { stdout, stderr });
-          done(null, true); // Retry — process succeeded but parsing failed
-        }
-      });
-
-      // Handle errors
-      child.on('error', (error: Error) => {
-        clearTimeout(timeoutId);
-        log.debug(`Failed to spawn ${providerId}`, { error });
-        done(null, false); // Don't retry on spawn failure
-      });
-
-      // Close stdin — all providers receive prompts via CLI args, not stdin
-      if (child.stdin) {
-        child.stdin.end();
-      }
-    });
-  }
-
-  /**
-   * Build prompt for PR generation
-   */
-  private buildPrGenerationPrompt(diff: string, commits: string[]): string {
-    const commitContext =
-      commits.length > 0 ? `\n\nCommits:\n${commits.map((c) => `- ${c}`).join('\n')}` : '';
-    const diffContext = diff
-      ? `\n\nDiff summary:\n${diff.substring(0, 2000)}${diff.length > 2000 ? '...' : ''}`
-      : '';
-
-    return `Generate a concise PR title and description based on these changes:
-
-${commitContext}${diffContext}
-
-Respond with ONLY valid JSON — no markdown fences, no preamble, no explanation. Your entire response must be exactly one JSON object:
-{
-  "title": "A concise PR title (max 72 chars, use conventional commit format if applicable)",
-  "description": "A well-structured markdown description using proper markdown formatting. Use ## for section headers, - or * for lists, \`code\` for inline code, and proper line breaks.\n\nUse actual newlines (\\n in JSON) for line breaks, not literal \\n text. Keep it straightforward and to the point."
-}`;
-  }
-
-  /**
-   * Strip ANSI escape sequences from a string
-   */
-  private stripAnsi(text: string): string {
-    // Covers CSI sequences, OSC sequences, and other common escape codes
-    // eslint-disable-next-line no-control-regex
-    return text.replace(
-      /\x1b\[[0-9;]*[a-zA-Z]|\x1b\].*?(?:\x07|\x1b\\)|\x1b[^[(\x1b]*?[a-zA-Z]/g,
-      ''
-    );
-  }
-
-  /**
-   * Parse provider response into PR content.
-   *
-   * Multi-step extraction:
-   * 1. Strip ANSI escape sequences
-   * 2. If output is a Claude --output-format json envelope, extract the result field
-   * 3. Strip markdown code fences
-   * 4. Try to find a JSON object containing both "title" and "description" keys
-   * 5. Fall back to greedy match
-   */
-  private parseProviderResponse(response: string): GeneratedPrContent | null {
-    try {
-      // Step 1: Strip ANSI escape sequences
-      let text = this.stripAnsi(response);
-
-      // Step 2: If this is a Claude --output-format json envelope, extract the result field
-      try {
-        const envelope = JSON.parse(text);
-        if (envelope && typeof envelope.result === 'string') {
-          text = envelope.result;
-        }
-      } catch {
-        // Not a valid JSON envelope — continue with raw text
-      }
-
-      // Step 3: Strip markdown code fences (```json ... ``` or ``` ... ```)
-      text = text.replace(/```(?:json)?\s*\n?([\s\S]*?)\n?\s*```/g, '$1');
-
-      // Step 4: Try to find a JSON object containing both "title" and "description"
-      const specificMatch = text.match(/\{[^{}]*"title"[^{}]*"description"[^{}]*\}/s);
-      // Also try reversed key order
-      const reversedMatch = specificMatch
-        ? null
-        : text.match(/\{[^{}]*"description"[^{}]*"title"[^{}]*\}/s);
-      const jsonStr = specificMatch?.[0] ?? reversedMatch?.[0];
-
-      // Step 5: Fall back to greedy match only if specific match failed
-      const fallbackStr = jsonStr ?? text.match(/\{[\s\S]*\}/)?.[0];
-
-      if (fallbackStr) {
-        const parsed = JSON.parse(fallbackStr);
-        if (parsed.title && parsed.description) {
-          let description = String(parsed.description);
-
-          // Handle multiple newline escape scenarios:
-          // 1. Literal backslash-n sequences (from double-escaped JSON like "\\n")
-          if (description.includes('\\n')) {
-            description = description.replace(/\\n/g, '\n');
-          }
-          // 2. Double-backslash newlines
-          description = description.replace(/\\\\n/g, '\n');
-
-          description = description.trim();
-
-          return {
-            title: parsed.title.trim(),
-            description,
-          };
-        }
-      }
-    } catch (error) {
-      log.debug('Failed to parse provider response', { error, response });
-    }
-    return null;
-  }
-
-  /**
-   * Generate PR content using heuristics based on commits and files
-   */
-  private generateHeuristicContent(
-    diff: string,
-    commits: string[],
-    changedFiles: string[]
-  ): GeneratedPrContent {
-    // Use first commit message as title if available (best case)
-    let title = 'chore: update code';
-    if (commits.length > 0) {
-      // Use the most recent commit message as title
-      title = commits[0];
-
-      // Clean up common prefixes that might not be needed in PR title
-      title = title.replace(
-        /^(feat|fix|chore|docs|style|refactor|test|perf|ci|build|revert):\s*/i,
-        ''
-      );
-
-      // Ensure title is not too long (GitHub PR title limit is ~72 chars)
-      if (title.length > 72) {
-        title = title.substring(0, 69) + '...';
-      }
-
-      // Re-add conventional commit prefix if it was there
-      const firstCommit = commits[0];
-      const prefixMatch = firstCommit.match(
-        /^(feat|fix|chore|docs|style|refactor|test|perf|ci|build|revert):/i
-      );
-      if (prefixMatch && !title.startsWith(prefixMatch[1])) {
-        title = `${prefixMatch[1]}: ${title}`;
-      }
-    } else if (changedFiles.length > 0) {
-      // Generate title from file changes when no commits available
-      const mainFile = changedFiles[0];
-      const fileParts = mainFile.split('/');
-      const fileName = fileParts[fileParts.length - 1];
-      const baseName = fileName.replace(/\.[^.]*$/, ''); // Remove extension
-
-      // Analyze file patterns to infer intent
-      if (fileName.match(/test|spec/i)) {
-        title = 'test: add tests';
-      } else if (fileName.match(/fix|bug|error/i)) {
-        title = 'fix: resolve issue';
-      } else if (fileName.match(/feat|feature|add/i)) {
-        title = 'feat: add feature';
-      } else if (baseName.match(/^[A-Z]/)) {
-        // Capitalized files often indicate new components/features
-        title = `feat: add ${baseName}`;
-      } else {
-        title = `chore: update ${baseName || fileName}`;
-      }
-    }
-
-    // Generate description from commits and files
-    const descriptionParts: string[] = [];
-
-    // Extract diff stats first
-    let fileCount = 0;
-    let insertions = 0;
-    let deletions = 0;
-    if (diff) {
-      const statsMatch = diff.match(
-        /(\d+)\s+files? changed(?:,\s+(\d+)\s+insertions?\(\+\))?(?:,\s+(\d+)\s+deletions?\(-\))?/
-      );
-      if (statsMatch) {
-        fileCount = parseInt(statsMatch[1] || '0', 10) || 0;
-        insertions = parseInt(statsMatch[2] || '0', 10) || 0;
-        deletions = parseInt(statsMatch[3] || '0', 10) || 0;
-      }
-    }
-    // Fallback to changedFiles length if no diff stats
-    if (fileCount === 0 && changedFiles.length > 0) {
-      fileCount = changedFiles.length;
-    }
-
-    // Add commits section if available
-    if (commits.length > 0) {
-      descriptionParts.push('## Changes');
-      commits.forEach((commit) => {
-        descriptionParts.push(`- ${commit}`);
-      });
-    }
-
-    // Add files section - only show if more than 1 file or if we have detailed stats
-    if (changedFiles.length > 0) {
-      if (changedFiles.length === 1 && fileCount === 1) {
-        // Single file: include it inline with summary
-        descriptionParts.push('\n## Summary');
-        descriptionParts.push(`- Updated \`${changedFiles[0]}\``);
-        if (insertions > 0 || deletions > 0) {
-          const changes: string[] = [];
-          if (insertions > 0) changes.push(`+${insertions}`);
-          if (deletions > 0) changes.push(`-${deletions}`);
-          if (changes.length > 0) {
-            descriptionParts.push(`- ${changes.join(', ')} lines`);
-          }
-        }
-      } else {
-        // Multiple files: show list
-        descriptionParts.push('\n## Files Changed');
-        changedFiles.slice(0, 20).forEach((file) => {
-          descriptionParts.push(`- \`${file}\``);
-        });
-        if (changedFiles.length > 20) {
-          descriptionParts.push(`\n... and ${changedFiles.length - 20} more files`);
-        }
-
-        // Add summary stats if available
-        if (fileCount > 0 || insertions > 0 || deletions > 0) {
-          descriptionParts.push('\n## Summary');
-          if (fileCount > 0) {
-            descriptionParts.push(`- ${fileCount} file${fileCount !== 1 ? 's' : ''} changed`);
-          }
-          if (insertions > 0 || deletions > 0) {
-            const changes: string[] = [];
-            if (insertions > 0) changes.push(`+${insertions}`);
-            if (deletions > 0) changes.push(`-${deletions}`);
-            descriptionParts.push(`- ${changes.join(', ')} lines`);
-          }
-        }
-      }
-    } else if (fileCount > 0 || insertions > 0 || deletions > 0) {
-      // No file list but we have stats
-      descriptionParts.push('\n## Summary');
-      if (fileCount > 0) {
-        descriptionParts.push(`- ${fileCount} file${fileCount !== 1 ? 's' : ''} changed`);
-      }
-      if (insertions > 0 || deletions > 0) {
-        const changes: string[] = [];
-        if (insertions > 0) changes.push(`+${insertions}`);
-        if (deletions > 0) changes.push(`-${deletions}`);
-        descriptionParts.push(`- ${changes.join(', ')} lines`);
-      }
-    }
-
-    const description = descriptionParts.join('\n') || 'No description available.';
-
-    return { title, description };
-  }
-
-  /**
-   * Generate fallback content when no context is available
-   */
-  private generateFallbackContent(changedFiles: string[]): GeneratedPrContent {
-    const title =
-      changedFiles.length > 0
-        ? `chore: update ${changedFiles[0].split('/').pop() || 'files'}`
-        : 'chore: update code';
-
-    const description =
-      changedFiles.length > 0
-        ? `Updated ${changedFiles.length} file${changedFiles.length !== 1 ? 's' : ''}.`
-        : 'No changes detected.';
-
-    return { title, description };
-  }
-
-  /**
-   * Normalize markdown formatting to ensure proper structure
-   */
-  private normalizeMarkdown(text: string): string {
-    if (!text) return text;
-
-    // Ensure headers have proper spacing (double newline before headers)
-    let normalized = text.replace(/\n(##+ )/g, '\n\n$1');
-
-    // Remove excessive blank lines (more than 2 consecutive)
-    normalized = normalized.replace(/\n{3,}/g, '\n\n');
-
-    // Trim trailing whitespace on each line but preserve intentional spacing
-    normalized = normalized
-      .split('\n')
-      .map((line) => line.trimEnd())
-      .join('\n');
-
-    return normalized.trim();
-  }
-
-  /**
-   * Check if a string is a valid provider ID
-   */
-  private isValidProviderId(id: string): id is ProviderId {
-    return PROVIDER_IDS.includes(id as ProviderId);
-  }
-}
-
-export const prGenerationService = new PrGenerationService();
diff --git a/src/main/services/ProjectPrep.ts b/src/main/services/ProjectPrep.ts
deleted file mode 100644
index 5ed378c15e..0000000000
--- a/src/main/services/ProjectPrep.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-import { existsSync } from 'fs';
-import { join } from 'path';
-import { spawn } from 'child_process';
-
-function pickNodeInstallCmd(target: string): string[] {
-  // Prefer package manager based on lockfile presence
-  if (existsSync(join(target, 'pnpm-lock.yaml'))) {
-    return ['pnpm install --frozen-lockfile', 'pnpm install'];
-  }
-  if (existsSync(join(target, 'yarn.lock'))) {
-    // Support modern Yarn (Berry) and classic Yarn
-    return ['yarn install --immutable', 'yarn install --frozen-lockfile', 'yarn install'];
-  }
-  if (existsSync(join(target, 'bun.lockb'))) {
-    return ['bun install'];
-  }
-  if (existsSync(join(target, 'package-lock.json'))) {
-    return ['npm ci', 'npm install'];
-  }
-  return ['npm install'];
-}
-
-function runInBackground(cmd: string | string[], cwd: string) {
-  const command = Array.isArray(cmd) ? cmd.filter(Boolean).join(' || ') : cmd;
-  const child = spawn(command, {
-    cwd,
-    shell: true,
-    stdio: 'ignore',
-    windowsHide: true,
-    detached: process.platform !== 'win32',
-  });
-  // Avoid unhandled errors from bubbling; ignore failures silently
-  child.on('error', () => {});
-  child.unref?.();
-}
-
-/**
- * Best-effort dependency prep for common project types.
- * Non-blocking; spawns installs in background if needed.
- */
-export async function ensureProjectPrepared(targetPath: string) {
-  try {
-    // Node projects: if package.json exists and node_modules missing, install deps
-    const isNode = existsSync(join(targetPath, 'package.json'));
-    const hasNodeModules = existsSync(join(targetPath, 'node_modules'));
-    if (isNode && !hasNodeModules) {
-      const cmds = pickNodeInstallCmd(targetPath);
-      runInBackground(cmds, targetPath);
-    }
-
-    // Optional: we could add Python prep here later if desired
-  } catch {
-    // ignore
-  }
-}
diff --git a/src/main/services/ProjectSettingsService.ts b/src/main/services/ProjectSettingsService.ts
deleted file mode 100644
index fcbcad3b30..0000000000
--- a/src/main/services/ProjectSettingsService.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-import type { Project } from './DatabaseService';
-import { databaseService } from './DatabaseService';
-
-export interface ProjectSettings {
-  projectId: string;
-  name: string;
-  path: string;
-  gitRemote?: string;
-  gitBranch?: string;
-  baseRef?: string;
-}
-
-class ProjectSettingsService {
-  async getProjectSettings(projectId: string): Promise<ProjectSettings | null> {
-    if (!projectId) {
-      throw new Error('projectId is required');
-    }
-    const project = await databaseService.getProjectById(projectId);
-    if (!project) {
-      return null;
-    }
-    return this.toSettings(project);
-  }
-
-  async updateProjectSettings(
-    projectId: string,
-    settings: { baseRef?: string }
-  ): Promise<ProjectSettings> {
-    if (!projectId) {
-      throw new Error('projectId is required');
-    }
-    const nextBaseRef = settings?.baseRef;
-    if (typeof nextBaseRef !== 'string') {
-      throw new Error('baseRef is required');
-    }
-
-    const project = await databaseService.updateProjectBaseRef(projectId, nextBaseRef);
-    if (!project) {
-      throw new Error('Project not found');
-    }
-    return this.toSettings(project);
-  }
-
-  private toSettings(project: Project): ProjectSettings {
-    return {
-      projectId: project.id,
-      name: project.name,
-      path: project.path,
-      gitRemote: project.gitInfo.remote,
-      gitBranch: project.gitInfo.branch,
-      baseRef: project.gitInfo.baseRef,
-    };
-  }
-}
-
-export const projectSettingsService = new ProjectSettingsService();
diff --git a/src/main/services/RemoteGitService.ts b/src/main/services/RemoteGitService.ts
deleted file mode 100644
index a45a2ebf8f..0000000000
--- a/src/main/services/RemoteGitService.ts
+++ /dev/null
@@ -1,836 +0,0 @@
-import { SshService } from './ssh/SshService';
-import type { ExecResult } from '../../shared/ssh/types';
-import { quoteShellArg } from '../utils/shellEscape';
-import type { GitChange } from './GitService';
-import { parseDiffLines, stripTrailingNewline, MAX_DIFF_CONTENT_BYTES } from '../utils/diffParser';
-import type { DiffLine, DiffResult } from '../utils/diffParser';
-
-export interface WorktreeInfo {
-  path: string;
-  branch: string;
-  isMain: boolean;
-}
-
-export interface GitStatusFile {
-  status: string;
-  path: string;
-}
-
-export interface GitStatus {
-  branch: string;
-  isClean: boolean;
-  files: GitStatusFile[];
-}
-
-export class RemoteGitService {
-  constructor(private sshService: SshService) {}
-
-  private normalizeRemotePath(p: string): string {
-    // Remote paths should use forward slashes.
-    return p.replace(/\\/g, '/').replace(/\/+$/g, '');
-  }
-
-  async getStatus(connectionId: string, worktreePath: string): Promise<GitStatus> {
-    const result = await this.sshService.executeCommand(
-      connectionId,
-      'git status --porcelain -b',
-      worktreePath
-    );
-
-    if (result.exitCode !== 0) {
-      throw new Error(`Git status failed: ${result.stderr}`);
-    }
-
-    const lines = result.stdout.split('\n');
-    const branchLine = lines[0];
-    const files = lines.slice(1).filter((l) => l.trim());
-
-    const branchMatch = branchLine.match(/^## (.+?)(?:\...|$)/);
-    const branch = branchMatch ? branchMatch[1] : 'unknown';
-
-    return {
-      branch,
-      isClean: files.length === 0,
-      files: files.map((line) => ({
-        status: line.substring(0, 2).trim(),
-        path: line.substring(3),
-      })),
-    };
-  }
-
-  async getDefaultBranch(connectionId: string, projectPath: string): Promise<string> {
-    const normalizedProjectPath = this.normalizeRemotePath(projectPath);
-
-    // Try to get the current branch
-    const currentBranchResult = await this.sshService.executeCommand(
-      connectionId,
-      'git rev-parse --abbrev-ref HEAD',
-      normalizedProjectPath
-    );
-
-    if (
-      currentBranchResult.exitCode === 0 &&
-      currentBranchResult.stdout.trim() &&
-      currentBranchResult.stdout.trim() !== 'HEAD'
-    ) {
-      return currentBranchResult.stdout.trim();
-    }
-
-    // Fallback: check common default branch names
-    const commonBranches = ['main', 'master', 'develop', 'trunk'];
-    for (const branch of commonBranches) {
-      const checkResult = await this.sshService.executeCommand(
-        connectionId,
-        `git rev-parse --verify ${quoteShellArg(branch)} 2>/dev/null`,
-        normalizedProjectPath
-      );
-      if (checkResult.exitCode === 0) {
-        return branch;
-      }
-    }
-
-    return 'HEAD';
-  }
-
-  async createWorktree(
-    connectionId: string,
-    projectPath: string,
-    taskName: string,
-    baseRef?: string
-  ): Promise<WorktreeInfo> {
-    const normalizedProjectPath = this.normalizeRemotePath(projectPath);
-    const slug = taskName
-      .toLowerCase()
-      .replace(/[^a-z0-9-]/g, '-')
-      .replace(/-+/g, '-')
-      .replace(/^-|-$/g, '');
-    const worktreeName = `${slug || 'task'}-${Date.now()}`;
-    const relWorktreePath = `.emdash/worktrees/${worktreeName}`;
-    const worktreePath = `${normalizedProjectPath}/${relWorktreePath}`.replace(/\/+/g, '/');
-
-    // Create worktrees directory (relative so we avoid quoting issues)
-    await this.sshService.executeCommand(
-      connectionId,
-      'mkdir -p .emdash/worktrees',
-      normalizedProjectPath
-    );
-
-    // Auto-detect default branch if baseRef is not provided or is invalid
-    let base = (baseRef || '').trim();
-
-    // If no base provided, use auto-detection
-    if (!base) {
-      base = await this.getDefaultBranch(connectionId, normalizedProjectPath);
-    } else {
-      // Always verify the provided branch exists, regardless of what it is
-      const verifyResult = await this.sshService.executeCommand(
-        connectionId,
-        `git rev-parse --verify ${quoteShellArg(base)} 2>/dev/null`,
-        normalizedProjectPath
-      );
-
-      if (verifyResult.exitCode !== 0) {
-        // Branch doesn't exist, auto-detect the actual default branch
-        base = await this.getDefaultBranch(connectionId, normalizedProjectPath);
-      }
-    }
-
-    if (!base) {
-      base = 'HEAD';
-    }
-
-    const result = await this.sshService.executeCommand(
-      connectionId,
-      `git worktree add ${quoteShellArg(relWorktreePath)} -b ${quoteShellArg(worktreeName)} ${quoteShellArg(
-        base
-      )}`,
-      normalizedProjectPath
-    );
-
-    if (result.exitCode !== 0) {
-      throw new Error(`Failed to create worktree: ${result.stderr}`);
-    }
-
-    return {
-      path: worktreePath,
-      branch: worktreeName,
-      isMain: false,
-    };
-  }
-
-  async removeWorktree(
-    connectionId: string,
-    projectPath: string,
-    worktreePath: string
-  ): Promise<void> {
-    const normalizedProjectPath = this.normalizeRemotePath(projectPath);
-    const normalizedWorktreePath = this.normalizeRemotePath(worktreePath);
-    const result = await this.sshService.executeCommand(
-      connectionId,
-      `git worktree remove ${quoteShellArg(normalizedWorktreePath)} --force`,
-      normalizedProjectPath
-    );
-
-    if (result.exitCode !== 0) {
-      throw new Error(`Failed to remove worktree: ${result.stderr}`);
-    }
-  }
-
-  async listWorktrees(connectionId: string, projectPath: string): Promise<WorktreeInfo[]> {
-    const normalizedProjectPath = this.normalizeRemotePath(projectPath);
-    const result = await this.sshService.executeCommand(
-      connectionId,
-      'git worktree list --porcelain',
-      normalizedProjectPath
-    );
-
-    if (result.exitCode !== 0) {
-      throw new Error(`Failed to list worktrees: ${result.stderr}`);
-    }
-
-    // Porcelain output is blocks separated by blank lines.
-    // Each block begins with: worktree <path>
-    // Optional: branch <ref>
-    // Optional: detached
-    const blocks = result.stdout
-      .split(/\n\s*\n/g)
-      .map((b) => b.trim())
-      .filter(Boolean);
-
-    const out: WorktreeInfo[] = [];
-    for (const block of blocks) {
-      const lines = block.split('\n').map((l) => l.trim());
-      const wtLine = lines.find((l) => l.startsWith('worktree '));
-      if (!wtLine) continue;
-      const wtPath = wtLine.slice('worktree '.length).trim();
-      const branchLine = lines.find((l) => l.startsWith('branch '));
-      const branchRef = branchLine ? branchLine.slice('branch '.length).trim() : '';
-      const branch = branchRef.replace(/^refs\/heads\//, '') || 'HEAD';
-      const isMain = this.normalizeRemotePath(wtPath) === normalizedProjectPath;
-      out.push({ path: wtPath, branch, isMain });
-    }
-    return out;
-  }
-
-  async getWorktreeStatus(
-    connectionId: string,
-    worktreePath: string
-  ): Promise<{
-    hasChanges: boolean;
-    stagedFiles: string[];
-    unstagedFiles: string[];
-    untrackedFiles: string[];
-  }> {
-    const normalizedWorktreePath = this.normalizeRemotePath(worktreePath);
-    const result = await this.sshService.executeCommand(
-      connectionId,
-      'git status --porcelain --untracked-files=all',
-      normalizedWorktreePath
-    );
-
-    if (result.exitCode !== 0) {
-      throw new Error(`Git status failed: ${result.stderr}`);
-    }
-
-    const stagedFiles: string[] = [];
-    const unstagedFiles: string[] = [];
-    const untrackedFiles: string[] = [];
-    const lines = (result.stdout || '')
-      .trim()
-      .split('\n')
-      .filter((l) => l.length > 0);
-
-    for (const line of lines) {
-      const status = line.substring(0, 2);
-      const file = line.substring(3);
-      if (status.includes('A') || status.includes('M') || status.includes('D')) {
-        stagedFiles.push(file);
-      }
-      if (status[1] === 'M' || status[1] === 'D') {
-        unstagedFiles.push(file);
-      }
-      if (status.includes('??')) {
-        untrackedFiles.push(file);
-      }
-    }
-
-    return {
-      hasChanges: stagedFiles.length > 0 || unstagedFiles.length > 0 || untrackedFiles.length > 0,
-      stagedFiles,
-      unstagedFiles,
-      untrackedFiles,
-    };
-  }
-
-  async getBranchList(connectionId: string, projectPath: string): Promise<string[]> {
-    const result = await this.sshService.executeCommand(
-      connectionId,
-      'git branch -a --format="%(refname:short)"',
-      this.normalizeRemotePath(projectPath)
-    );
-
-    if (result.exitCode !== 0) {
-      return [];
-    }
-
-    return result.stdout.split('\n').filter((b) => b.trim());
-  }
-
-  async commit(
-    connectionId: string,
-    worktreePath: string,
-    message: string,
-    files?: string[]
-  ): Promise<ExecResult> {
-    let command = 'git commit';
-
-    if (files && files.length > 0) {
-      const fileList = files.map((f) => quoteShellArg(f)).join(' ');
-      command = `git add ${fileList} && ${command}`;
-    }
-
-    command += ` -m ${quoteShellArg(message)}`;
-
-    return this.sshService.executeCommand(
-      connectionId,
-      command,
-      this.normalizeRemotePath(worktreePath)
-    );
-  }
-
-  // ---------------------------------------------------------------------------
-  // Git operations for IPC parity with local GitService
-  // ---------------------------------------------------------------------------
-
-  /**
-   * Detailed git status matching the shape returned by local GitService.getStatus().
-   * Parses porcelain output, numstat diffs, and untracked file line counts.
-   */
-  async getStatusDetailed(connectionId: string, worktreePath: string): Promise<GitChange[]> {
-    const cwd = this.normalizeRemotePath(worktreePath);
-
-    // Verify git repo
-    const verifyResult = await this.sshService.executeCommand(
-      connectionId,
-      'git rev-parse --is-inside-work-tree',
-      cwd
-    );
-    if (verifyResult.exitCode !== 0) {
-      return [];
-    }
-
-    // Get porcelain status
-    const statusResult = await this.sshService.executeCommand(
-      connectionId,
-      'git status --porcelain --untracked-files=all',
-      cwd
-    );
-    if (statusResult.exitCode !== 0) {
-      throw new Error(`Git status failed: ${statusResult.stderr}`);
-    }
-
-    const statusOutput = statusResult.stdout;
-    if (!statusOutput.trim()) return [];
-
-    const statusLines = statusOutput
-      .split('\n')
-      .map((l) => l.replace(/\r$/, ''))
-      .filter((l) => l.length > 0);
-
-    // Batch-fetch numstat for staged and unstaged changes (one SSH call each, not per-file)
-    const [stagedNumstat, unstagedNumstat] = await Promise.all([
-      this.sshService.executeCommand(connectionId, 'git diff --numstat --cached', cwd),
-      this.sshService.executeCommand(connectionId, 'git diff --numstat', cwd),
-    ]);
-
-    const parseNumstat = (stdout: string): Map<string, { add: number; del: number }> => {
-      const map = new Map<string, { add: number; del: number }>();
-      for (const line of stdout.split('\n').filter((l) => l.trim())) {
-        const parts = line.split('\t');
-        if (parts.length >= 3) {
-          const add = parts[0] === '-' ? 0 : parseInt(parts[0], 10) || 0;
-          const del = parts[1] === '-' ? 0 : parseInt(parts[1], 10) || 0;
-          map.set(parts[2], { add, del });
-        }
-      }
-      return map;
-    };
-
-    const stagedStats = parseNumstat(stagedNumstat.stdout || '');
-    const unstagedStats = parseNumstat(unstagedNumstat.stdout || '');
-
-    // Collect untracked file paths so we can batch their line counts
-    const untrackedPaths: string[] = [];
-
-    const changes: GitChange[] = [];
-    for (const line of statusLines) {
-      const statusCode = line.substring(0, 2);
-      let filePath = line.substring(3);
-      if (statusCode.includes('R') && filePath.includes('->')) {
-        const parts = filePath.split('->');
-        filePath = parts[parts.length - 1].trim();
-      }
-
-      let status = 'modified';
-      if (statusCode.includes('A') || statusCode.includes('?')) status = 'added';
-      else if (statusCode.includes('D')) status = 'deleted';
-      else if (statusCode.includes('R')) status = 'renamed';
-      else if (statusCode.includes('M')) status = 'modified';
-
-      const isStaged = statusCode[0] !== ' ' && statusCode[0] !== '?';
-
-      const staged = stagedStats.get(filePath);
-      const unstaged = unstagedStats.get(filePath);
-      const additions = (staged?.add ?? 0) + (unstaged?.add ?? 0);
-      const deletions = (staged?.del ?? 0) + (unstaged?.del ?? 0);
-
-      if (additions === 0 && deletions === 0 && statusCode.includes('?')) {
-        untrackedPaths.push(filePath);
-      }
-
-      changes.push({ path: filePath, status, additions, deletions, isStaged });
-    }
-
-    // Batch line-count for untracked files (skip files > 512KB)
-    if (untrackedPaths.length > 0) {
-      const escaped = untrackedPaths.map((f) => quoteShellArg(f)).join(' ');
-      // For each file: if <= 512KB, count newlines; otherwise print -1
-      const script =
-        `for f in ${escaped}; do ` +
-        `s=$(stat -c%s "$f" 2>/dev/null || stat -f%z "$f" 2>/dev/null); ` +
-        `if [ "$s" -le ${MAX_DIFF_CONTENT_BYTES} ] 2>/dev/null; then ` +
-        `wc -l < "$f" 2>/dev/null || echo -1; ` +
-        `else echo -1; fi; done`;
-      const countResult = await this.sshService.executeCommand(connectionId, script, cwd);
-      if (countResult.exitCode === 0) {
-        const counts = countResult.stdout
-          .split('\n')
-          .map((l) => l.trim())
-          .filter((l) => l.length > 0);
-        for (let i = 0; i < untrackedPaths.length && i < counts.length; i++) {
-          const count = parseInt(counts[i], 10);
-          if (count >= 0) {
-            const change = changes.find((c) => c.path === untrackedPaths[i]);
-            if (change) change.additions = count;
-          }
-        }
-      }
-    }
-
-    return changes;
-  }
-
-  /**
-   * Per-file diff matching the shape returned by local GitService.getFileDiff().
-   * Uses a diff-first pattern: run git diff, check for binary, then fetch content only if non-binary.
-   */
-  async getFileDiff(
-    connectionId: string,
-    worktreePath: string,
-    filePath: string
-  ): Promise<DiffResult> {
-    const cwd = this.normalizeRemotePath(worktreePath);
-
-    // Step 1: Run git diff
-    const diffResult = await this.sshService.executeCommand(
-      connectionId,
-      `git diff --no-color --unified=2000 HEAD -- ${quoteShellArg(filePath)}`,
-      cwd
-    );
-
-    // Step 2: Parse and check binary
-    let diffLines: DiffLine[] = [];
-    if (diffResult.exitCode === 0 && diffResult.stdout.trim()) {
-      const { lines, isBinary } = parseDiffLines(diffResult.stdout);
-      if (isBinary) {
-        return { lines: [], isBinary: true };
-      }
-      diffLines = lines;
-    }
-
-    // Step 3: Fetch content ONCE (non-binary only, covers both diff-success and fallback paths)
-    const [showResult, catResult] = await Promise.all([
-      this.sshService.executeCommand(
-        connectionId,
-        `s=$(git cat-file -s HEAD:${quoteShellArg(filePath)} 2>/dev/null); ` +
-          `if [ "$s" -le ${MAX_DIFF_CONTENT_BYTES} ] 2>/dev/null; then git show HEAD:${quoteShellArg(filePath)}; ` +
-          `else echo "__EMDASH_TOO_LARGE__"; fi`,
-        cwd
-      ),
-      this.sshService.executeCommand(
-        connectionId,
-        `s=$(stat -c%s ${quoteShellArg(filePath)} 2>/dev/null || stat -f%z ${quoteShellArg(filePath)} 2>/dev/null); ` +
-          `if [ "$s" -le ${MAX_DIFF_CONTENT_BYTES} ] 2>/dev/null; then cat ${quoteShellArg(filePath)}; else echo "__EMDASH_TOO_LARGE__"; fi`,
-        cwd
-      ),
-    ]);
-
-    const rawOriginal =
-      showResult.exitCode === 0 ? stripTrailingNewline(showResult.stdout) : undefined;
-    const originalContent = rawOriginal === '__EMDASH_TOO_LARGE__' ? undefined : rawOriginal;
-
-    const rawModified =
-      catResult.exitCode === 0 ? stripTrailingNewline(catResult.stdout) : undefined;
-    const modifiedContent = rawModified === '__EMDASH_TOO_LARGE__' ? undefined : rawModified;
-
-    // Step 4: Return based on what we have
-    if (diffLines.length > 0) return { lines: diffLines, originalContent, modifiedContent };
-
-    // Fallback: empty diff or diff failed — determine untracked/deleted from content
-    if (modifiedContent !== undefined) {
-      return {
-        lines: modifiedContent.split('\n').map((l) => ({ right: l, type: 'add' as const })),
-        modifiedContent,
-      };
-    }
-    if (originalContent !== undefined) {
-      return {
-        lines: originalContent.split('\n').map((l) => ({ left: l, type: 'del' as const })),
-        originalContent,
-      };
-    }
-    return { lines: [] };
-  }
-
-  async stageFile(connectionId: string, worktreePath: string, filePath: string): Promise<void> {
-    const cwd = this.normalizeRemotePath(worktreePath);
-    const result = await this.sshService.executeCommand(
-      connectionId,
-      `git add -- ${quoteShellArg(filePath)}`,
-      cwd
-    );
-    if (result.exitCode !== 0) {
-      throw new Error(`Failed to stage file: ${result.stderr}`);
-    }
-  }
-
-  async stageAllFiles(connectionId: string, worktreePath: string): Promise<void> {
-    const cwd = this.normalizeRemotePath(worktreePath);
-    const result = await this.sshService.executeCommand(connectionId, 'git add -A', cwd);
-    if (result.exitCode !== 0) {
-      throw new Error(`Failed to stage all files: ${result.stderr}`);
-    }
-  }
-
-  async unstageFile(connectionId: string, worktreePath: string, filePath: string): Promise<void> {
-    const cwd = this.normalizeRemotePath(worktreePath);
-    const result = await this.sshService.executeCommand(
-      connectionId,
-      `git reset HEAD -- ${quoteShellArg(filePath)}`,
-      cwd
-    );
-    if (result.exitCode !== 0) {
-      throw new Error(`Failed to unstage file: ${result.stderr}`);
-    }
-  }
-
-  async revertFile(
-    connectionId: string,
-    worktreePath: string,
-    filePath: string
-  ): Promise<{ action: 'reverted' }> {
-    const cwd = this.normalizeRemotePath(worktreePath);
-
-    // Check if file exists in HEAD
-    const catFileResult = await this.sshService.executeCommand(
-      connectionId,
-      `git cat-file -e HEAD:${quoteShellArg(filePath)}`,
-      cwd
-    );
-
-    if (catFileResult.exitCode !== 0) {
-      // File doesn't exist in HEAD — it's untracked. Delete it.
-      await this.sshService.executeCommand(
-        connectionId,
-        `rm -f -- ${quoteShellArg(filePath)}`,
-        cwd
-      );
-      return { action: 'reverted' };
-    }
-
-    // File exists in HEAD — revert it
-    const checkoutResult = await this.sshService.executeCommand(
-      connectionId,
-      `git checkout HEAD -- ${quoteShellArg(filePath)}`,
-      cwd
-    );
-    if (checkoutResult.exitCode !== 0) {
-      throw new Error(`Failed to revert file: ${checkoutResult.stderr}`);
-    }
-    return { action: 'reverted' };
-  }
-
-  // ---------------------------------------------------------------------------
-  // Commit, push, and branch operations
-  // ---------------------------------------------------------------------------
-
-  async getCurrentBranch(connectionId: string, worktreePath: string): Promise<string> {
-    const cwd = this.normalizeRemotePath(worktreePath);
-    const result = await this.sshService.executeCommand(
-      connectionId,
-      'git branch --show-current',
-      cwd
-    );
-    return (result.stdout || '').trim();
-  }
-
-  /**
-   * Detect the default branch name using the remote HEAD or common conventions.
-   * Unlike getDefaultBranch(), this specifically queries origin's default (not current branch).
-   */
-  async getDefaultBranchName(connectionId: string, worktreePath: string): Promise<string> {
-    const cwd = this.normalizeRemotePath(worktreePath);
-
-    // Try gh CLI first
-    const ghResult = await this.sshService.executeCommand(
-      connectionId,
-      'gh repo view --json defaultBranchRef -q .defaultBranchRef.name 2>/dev/null',
-      cwd
-    );
-    if (ghResult.exitCode === 0 && ghResult.stdout.trim()) {
-      return ghResult.stdout.trim();
-    }
-
-    // Fallback: parse git remote show origin
-    const remoteResult = await this.sshService.executeCommand(
-      connectionId,
-      'git remote show origin 2>/dev/null | sed -n "/HEAD branch/s/.*: //p"',
-      cwd
-    );
-    if (remoteResult.exitCode === 0 && remoteResult.stdout.trim()) {
-      return remoteResult.stdout.trim();
-    }
-
-    // Fallback: symbolic-ref
-    const symrefResult = await this.sshService.executeCommand(
-      connectionId,
-      'git symbolic-ref --short refs/remotes/origin/HEAD 2>/dev/null',
-      cwd
-    );
-    if (symrefResult.exitCode === 0 && symrefResult.stdout.trim()) {
-      const parts = symrefResult.stdout.trim().split('/');
-      return parts[parts.length - 1];
-    }
-
-    return 'main';
-  }
-
-  async createBranch(connectionId: string, worktreePath: string, name: string): Promise<void> {
-    const cwd = this.normalizeRemotePath(worktreePath);
-    const result = await this.sshService.executeCommand(
-      connectionId,
-      `git checkout -b ${quoteShellArg(name)}`,
-      cwd
-    );
-    if (result.exitCode !== 0) {
-      throw new Error(`Failed to create branch: ${result.stderr}`);
-    }
-  }
-
-  async push(
-    connectionId: string,
-    worktreePath: string,
-    branch?: string,
-    setUpstream?: boolean
-  ): Promise<ExecResult> {
-    const cwd = this.normalizeRemotePath(worktreePath);
-    let cmd = 'git push';
-    if (setUpstream && branch) {
-      cmd = `git push --set-upstream origin ${quoteShellArg(branch)}`;
-    }
-    return this.sshService.executeCommand(connectionId, cmd, cwd);
-  }
-
-  async getBranchStatus(
-    connectionId: string,
-    worktreePath: string
-  ): Promise<{ branch: string; defaultBranch: string; ahead: number; behind: number }> {
-    const cwd = this.normalizeRemotePath(worktreePath);
-
-    const branch = await this.getCurrentBranch(connectionId, worktreePath);
-    const defaultBranch = await this.getDefaultBranchName(connectionId, worktreePath);
-
-    let ahead = 0;
-    let behind = 0;
-    const revListResult = await this.sshService.executeCommand(
-      connectionId,
-      `git rev-list --left-right --count origin/${quoteShellArg(defaultBranch)}...HEAD 2>/dev/null`,
-      cwd
-    );
-    if (revListResult.exitCode === 0) {
-      const parts = (revListResult.stdout || '').trim().split(/\s+/);
-      if (parts.length >= 2) {
-        behind = parseInt(parts[0] || '0', 10) || 0;
-        ahead = parseInt(parts[1] || '0', 10) || 0;
-      }
-    } else {
-      // Fallback: parse git status -sb
-      const statusResult = await this.sshService.executeCommand(
-        connectionId,
-        'git status -sb',
-        cwd
-      );
-      if (statusResult.exitCode === 0) {
-        const line = (statusResult.stdout || '').split('\n')[0] || '';
-        const aheadMatch = line.match(/ahead\s+(\d+)/i);
-        const behindMatch = line.match(/behind\s+(\d+)/i);
-        if (aheadMatch) ahead = parseInt(aheadMatch[1], 10) || 0;
-        if (behindMatch) behind = parseInt(behindMatch[1], 10) || 0;
-      }
-    }
-
-    return { branch, defaultBranch, ahead, behind };
-  }
-
-  async listBranches(
-    connectionId: string,
-    projectPath: string,
-    remote = 'origin'
-  ): Promise<Array<{ ref: string; remote: string; branch: string; label: string }>> {
-    const cwd = this.normalizeRemotePath(projectPath);
-
-    // Check if remote exists
-    let hasRemote = false;
-    const remoteCheck = await this.sshService.executeCommand(
-      connectionId,
-      `git remote get-url ${quoteShellArg(remote)} 2>/dev/null`,
-      cwd
-    );
-    if (remoteCheck.exitCode === 0) {
-      hasRemote = true;
-      // Try to fetch (non-fatal)
-      await this.sshService.executeCommand(
-        connectionId,
-        `git fetch --prune ${quoteShellArg(remote)} 2>/dev/null`,
-        cwd
-      );
-    }
-
-    let branches: Array<{ ref: string; remote: string; branch: string; label: string }> = [];
-
-    if (hasRemote) {
-      const { stdout } = await this.sshService.executeCommand(
-        connectionId,
-        `git for-each-ref --format="%(refname:short)" refs/remotes/${quoteShellArg(remote)}`,
-        cwd
-      );
-      branches = (stdout || '')
-        .split('\n')
-        .map((l) => l.trim())
-        .filter((l) => l.length > 0 && !l.endsWith('/HEAD'))
-        .map((ref) => {
-          const [remoteAlias, ...rest] = ref.split('/');
-          const branch = rest.join('/') || ref;
-          return {
-            ref,
-            remote: remoteAlias || remote,
-            branch,
-            label: `${remoteAlias || remote}/${branch}`,
-          };
-        });
-
-      // Include local-only branches
-      const localResult = await this.sshService.executeCommand(
-        connectionId,
-        'git for-each-ref --format="%(refname:short)" refs/heads/',
-        cwd
-      );
-      const remoteBranchNames = new Set(branches.map((b) => b.branch));
-      const localOnly = (localResult.stdout || '')
-        .split('\n')
-        .map((l) => l.trim())
-        .filter((l) => l.length > 0 && !remoteBranchNames.has(l))
-        .map((branch) => ({ ref: branch, remote: '', branch, label: branch }));
-      branches = [...branches, ...localOnly];
-    } else {
-      const localResult = await this.sshService.executeCommand(
-        connectionId,
-        'git for-each-ref --format="%(refname:short)" refs/heads/',
-        cwd
-      );
-      branches = (localResult.stdout || '')
-        .split('\n')
-        .map((l) => l.trim())
-        .filter((l) => l.length > 0)
-        .map((branch) => ({ ref: branch, remote: '', branch, label: branch }));
-    }
-
-    return branches;
-  }
-
-  async renameBranch(
-    connectionId: string,
-    repoPath: string,
-    oldBranch: string,
-    newBranch: string
-  ): Promise<{ remotePushed: boolean }> {
-    const cwd = this.normalizeRemotePath(repoPath);
-
-    // Check remote tracking before rename
-    let remotePushed = false;
-    let remoteName = 'origin';
-    const configResult = await this.sshService.executeCommand(
-      connectionId,
-      `git config --get branch.${quoteShellArg(oldBranch)}.remote 2>/dev/null`,
-      cwd
-    );
-    if (configResult.exitCode === 0 && configResult.stdout.trim()) {
-      remoteName = configResult.stdout.trim();
-      remotePushed = true;
-    } else {
-      const lsResult = await this.sshService.executeCommand(
-        connectionId,
-        `git ls-remote --heads origin ${quoteShellArg(oldBranch)} 2>/dev/null`,
-        cwd
-      );
-      if (lsResult.exitCode === 0 && lsResult.stdout.trim()) {
-        remotePushed = true;
-      }
-    }
-
-    // Rename local branch
-    const renameResult = await this.sshService.executeCommand(
-      connectionId,
-      `git branch -m ${quoteShellArg(oldBranch)} ${quoteShellArg(newBranch)}`,
-      cwd
-    );
-    if (renameResult.exitCode !== 0) {
-      throw new Error(`Failed to rename branch: ${renameResult.stderr}`);
-    }
-
-    // Update remote if needed
-    if (remotePushed) {
-      // Delete old remote branch (non-fatal)
-      await this.sshService.executeCommand(
-        connectionId,
-        `git push ${quoteShellArg(remoteName)} --delete ${quoteShellArg(oldBranch)} 2>/dev/null`,
-        cwd
-      );
-      // Push new branch
-      const pushResult = await this.sshService.executeCommand(
-        connectionId,
-        `git push -u ${quoteShellArg(remoteName)} ${quoteShellArg(newBranch)}`,
-        cwd
-      );
-      if (pushResult.exitCode !== 0) {
-        throw new Error(`Failed to push renamed branch: ${pushResult.stderr}`);
-      }
-    }
-
-    return { remotePushed };
-  }
-
-  // ---------------------------------------------------------------------------
-  // GitHub CLI operations (run gh commands over SSH)
-  // ---------------------------------------------------------------------------
-
-  async execGh(connectionId: string, worktreePath: string, ghArgs: string): Promise<ExecResult> {
-    const cwd = this.normalizeRemotePath(worktreePath);
-    return this.sshService.executeCommand(connectionId, `gh ${ghArgs}`, cwd);
-  }
-
-  async execGit(connectionId: string, worktreePath: string, gitArgs: string): Promise<ExecResult> {
-    const cwd = this.normalizeRemotePath(worktreePath);
-    return this.sshService.executeCommand(connectionId, `git ${gitArgs}`, cwd);
-  }
-}
diff --git a/src/main/services/RemotePtyService.ts b/src/main/services/RemotePtyService.ts
deleted file mode 100644
index 854f25c8c7..0000000000
--- a/src/main/services/RemotePtyService.ts
+++ /dev/null
@@ -1,200 +0,0 @@
-import { EventEmitter } from 'events';
-import { SshService } from './ssh/SshService';
-import { quoteShellArg, isValidEnvVarName } from '../utils/shellEscape';
-
-export interface RemotePtyOptions {
-  id: string;
-  connectionId: string;
-  cwd: string;
-  shell: string;
-  autoApprove?: boolean;
-  initialPrompt?: string;
-  env?: Record<string, string>;
-}
-
-export interface RemotePty {
-  id: string;
-  write(data: string): void;
-  resize(cols: number, rows: number): void;
-  kill(): void;
-  onData(callback: (data: string) => void): void;
-  onExit(callback: (code: number) => void): void;
-}
-
-/**
- * Allowlist of shells that can be launched as remote PTYs.
- * Only absolute paths to well-known shells are permitted.
- */
-const ALLOWED_SHELLS = new Set([
-  '/bin/bash',
-  '/bin/sh',
-  '/bin/zsh',
-  '/usr/bin/bash',
-  '/usr/bin/zsh',
-  '/usr/bin/fish',
-  '/usr/local/bin/bash',
-  '/usr/local/bin/zsh',
-  '/usr/local/bin/fish',
-]);
-
-/**
- * Service for managing remote PTY (pseudo-terminal) sessions over SSH.
- *
- * This service allows running interactive shell sessions on remote machines,
- * including AI agent CLIs like Codex, Claude, etc. It provides:
- * - Interactive shell sessions via ssh2
- * - Environment variable support
- * - Working directory configuration
- * - Auto-approve flag support for agents
- * - Proper cleanup on exit
- */
-export class RemotePtyService extends EventEmitter {
-  private ptys: Map<string, RemotePty> = new Map();
-
-  constructor(private sshService: SshService) {
-    super();
-  }
-
-  /**
-   * Starts a new remote PTY session on an established SSH connection.
-   *
-   * @param options - Configuration for the remote PTY session
-   * @returns The created RemotePty instance
-   * @throws Error if connection not found or shell creation fails
-   */
-  async startRemotePty(options: RemotePtyOptions): Promise<RemotePty> {
-    const connection = this.sshService.getConnection(options.connectionId);
-    if (!connection) {
-      throw new Error(`Connection ${options.connectionId} not found`);
-    }
-
-    const client = connection.client;
-
-    return new Promise((resolve, reject) => {
-      client.shell((err, stream) => {
-        if (err) {
-          reject(err);
-          return;
-        }
-
-        // Build command with environment and cwd
-        // Validate env var keys to prevent injection (CRITICAL #1)
-        const envEntries = Object.entries(options.env || {}).filter(([k]) => {
-          if (!isValidEnvVarName(k)) {
-            console.warn(`[RemotePtyService] Skipping invalid env var name: ${k}`);
-            return false;
-          }
-          return true;
-        });
-        const envVars = envEntries.map(([k, v]) => `export ${k}=${quoteShellArg(v)}`).join(' && ');
-
-        const cdCommand = options.cwd ? `cd ${quoteShellArg(options.cwd)}` : '';
-        const autoApproveFlag = options.autoApprove ? ' --full-auto' : '';
-
-        // Validate shell against allowlist (HIGH #5)
-        const shellBinary = options.shell.split(/\s+/)[0];
-        if (!ALLOWED_SHELLS.has(shellBinary)) {
-          reject(
-            new Error(
-              `Shell not allowed: ${shellBinary}. Allowed: ${[...ALLOWED_SHELLS].join(', ')}`
-            )
-          );
-          return;
-        }
-
-        const fullCommand = [envVars, cdCommand, `${options.shell}${autoApproveFlag}`]
-          .filter(Boolean)
-          .join(' && ');
-
-        // Send initial command
-        stream.write(fullCommand + '\n');
-
-        // Send initial prompt if provided
-        if (options.initialPrompt) {
-          setTimeout(() => {
-            stream.write(options.initialPrompt + '\n');
-          }, 500);
-        }
-
-        const pty: RemotePty = {
-          id: options.id,
-          write: (data: string) => stream.write(data),
-          // ssh2 expects rows, cols, height, width
-          resize: (cols: number, rows: number) => stream.setWindow(rows, cols, 0, 0),
-          kill: () => stream.close(),
-          onData: (callback) => stream.on('data', (data: Buffer) => callback(data.toString())),
-          onExit: (callback) => stream.on('close', () => callback(0)),
-        };
-
-        this.ptys.set(options.id, pty);
-
-        stream.on('close', () => {
-          this.ptys.delete(options.id);
-          this.emit('exit', options.id);
-        });
-
-        resolve(pty);
-      });
-    });
-  }
-
-  /**
-   * Writes data to a remote PTY session.
-   *
-   * @param ptyId - ID of the PTY session
-   * @param data - Data to write
-   */
-  write(ptyId: string, data: string): void {
-    const pty = this.ptys.get(ptyId);
-    if (pty) {
-      pty.write(data);
-    }
-  }
-
-  /**
-   * Resizes a remote PTY session.
-   *
-   * @param ptyId - ID of the PTY session
-   * @param cols - Number of columns
-   * @param rows - Number of rows
-   */
-  resize(ptyId: string, cols: number, rows: number): void {
-    const pty = this.ptys.get(ptyId);
-    if (pty) {
-      pty.resize(cols, rows);
-    }
-  }
-
-  /**
-   * Kills a remote PTY session.
-   *
-   * @param ptyId - ID of the PTY session
-   */
-  kill(ptyId: string): void {
-    const pty = this.ptys.get(ptyId);
-    if (pty) {
-      pty.kill();
-      this.ptys.delete(ptyId);
-    }
-  }
-
-  /**
-   * Gets a PTY session by ID.
-   *
-   * @param ptyId - ID of the PTY session
-   * @returns The RemotePty instance or undefined
-   */
-  getPty(ptyId: string): RemotePty | undefined {
-    return this.ptys.get(ptyId);
-  }
-
-  /**
-   * Checks if a PTY session exists.
-   *
-   * @param ptyId - ID of the PTY session
-   * @returns true if the PTY exists
-   */
-  hasPty(ptyId: string): boolean {
-    return this.ptys.has(ptyId);
-  }
-}
diff --git a/src/main/services/RepositoryManager.ts b/src/main/services/RepositoryManager.ts
deleted file mode 100644
index ccd9d8f5b8..0000000000
--- a/src/main/services/RepositoryManager.ts
+++ /dev/null
@@ -1,88 +0,0 @@
-import { exec } from 'child_process';
-import { promisify } from 'util';
-
-const execAsync = promisify(exec);
-
-export interface Repo {
-  id: string;
-  path: string;
-  origin: string;
-  defaultBranch: string;
-  lastActivity?: string;
-  changes?: {
-    added: number;
-    removed: number;
-  };
-}
-
-export class RepositoryManager {
-  private repos: Map<string, Repo> = new Map();
-
-  async scanRepositories(): Promise<Repo[]> {
-    // Need to implement actual repository scanning
-    // For now, return empty array
-    return [];
-  }
-
-  async addRepository(path: string): Promise<Repo> {
-    try {
-      // Validate that the path is a git repository
-      const { stdout } = await execAsync(`cd "${path}" && git rev-parse --is-inside-work-tree`);
-
-      if (stdout.trim() !== 'true') {
-        throw new Error('Not a git repository');
-      }
-
-      // Get repository info
-      const [origin, defaultBranch] = await Promise.all([
-        this.getOrigin(path),
-        this.getDefaultBranch(path),
-      ]);
-
-      const repo: Repo = {
-        id: this.generateId(),
-        path,
-        origin,
-        defaultBranch,
-        lastActivity: new Date().toISOString(),
-      };
-
-      this.repos.set(repo.id, repo);
-      return repo;
-    } catch (error) {
-      throw new Error(`Failed to add repository: ${error}`);
-    }
-  }
-
-  private async getOrigin(path: string): Promise<string> {
-    try {
-      const { stdout } = await execAsync(`cd "${path}" && git remote get-url origin`);
-      return stdout.trim();
-    } catch {
-      return 'No origin';
-    }
-  }
-
-  private async getDefaultBranch(path: string): Promise<string> {
-    try {
-      const { stdout } = await execAsync(
-        `cd "${path}" && git symbolic-ref refs/remotes/origin/HEAD | sed 's@^refs/remotes/origin/@@'`
-      );
-      return stdout.trim() || 'main';
-    } catch {
-      return 'main';
-    }
-  }
-
-  private generateId(): string {
-    return Math.random().toString(36).substr(2, 9);
-  }
-
-  getRepository(id: string): Repo | undefined {
-    return this.repos.get(id);
-  }
-
-  getAllRepositories(): Repo[] {
-    return Array.from(this.repos.values());
-  }
-}
diff --git a/src/main/services/TaskLifecycleService.ts b/src/main/services/TaskLifecycleService.ts
deleted file mode 100644
index 7f0479184b..0000000000
--- a/src/main/services/TaskLifecycleService.ts
+++ /dev/null
@@ -1,563 +0,0 @@
-import { EventEmitter } from 'node:events';
-import { spawn, type ChildProcess } from 'node:child_process';
-import path from 'node:path';
-import { promisify } from 'node:util';
-import { lifecycleScriptsService } from './LifecycleScriptsService';
-import {
-  type LifecycleEvent,
-  type LifecycleLogs,
-  type LifecyclePhase,
-  type LifecyclePhaseState,
-  type TaskLifecycleState,
-  MAX_LIFECYCLE_LOG_LINES,
-  formatLifecycleLogLine,
-} from '@shared/lifecycle';
-import { getTaskEnvVars } from '@shared/task/envVars';
-import { log } from '../lib/logger';
-import { execFile } from 'node:child_process';
-
-const execFileAsync = promisify(execFile);
-
-type LifecycleResult = {
-  ok: boolean;
-  skipped?: boolean;
-  error?: string;
-};
-
-class TaskLifecycleService extends EventEmitter {
-  private states = new Map<string, TaskLifecycleState>();
-  private logBuffers = new Map<string, LifecycleLogs>();
-  private runProcesses = new Map<string, ChildProcess>();
-  private finiteProcesses = new Map<string, Set<ChildProcess>>();
-  private runStartInflight = new Map<string, Promise<LifecycleResult>>();
-  private setupInflight = new Map<string, Promise<LifecycleResult>>();
-  private teardownInflight = new Map<string, Promise<LifecycleResult>>();
-  private stopIntents = new Set<string>();
-
-  private nowIso(): string {
-    return new Date().toISOString();
-  }
-
-  private inflightKey(taskId: string, taskPath: string): string {
-    return `${taskId}::${taskPath}`;
-  }
-
-  private killProcessTree(proc: ChildProcess, signal: NodeJS.Signals): void {
-    const pid = proc.pid;
-    if (!pid) return;
-
-    if (process.platform === 'win32') {
-      const args = ['/PID', String(pid), '/T'];
-      if (signal === 'SIGKILL') {
-        args.push('/F');
-      }
-      const killer = spawn('taskkill', args, { stdio: 'ignore' });
-      killer.unref();
-      return;
-    }
-
-    try {
-      // Detached shell commands run as their own process group.
-      process.kill(-pid, signal);
-    } catch {
-      proc.kill(signal);
-    }
-  }
-
-  private trackFiniteProcess(taskId: string, proc: ChildProcess): () => void {
-    const set = this.finiteProcesses.get(taskId) ?? new Set<ChildProcess>();
-    set.add(proc);
-    this.finiteProcesses.set(taskId, set);
-    return () => {
-      const current = this.finiteProcesses.get(taskId);
-      if (!current) return;
-      current.delete(proc);
-      if (current.size === 0) {
-        this.finiteProcesses.delete(taskId);
-      }
-    };
-  }
-
-  private async resolveDefaultBranch(projectPath: string): Promise<string> {
-    try {
-      const { stdout } = await execFileAsync(
-        'git',
-        ['symbolic-ref', '--short', 'refs/remotes/origin/HEAD'],
-        { cwd: projectPath }
-      );
-      const ref = stdout.trim();
-      if (ref) {
-        return ref.replace(/^origin\//, '');
-      }
-    } catch {}
-
-    try {
-      const { stdout } = await execFileAsync('git', ['rev-parse', '--abbrev-ref', 'HEAD'], {
-        cwd: projectPath,
-      });
-      const branch = stdout.trim();
-      if (branch && branch !== 'HEAD') {
-        return branch;
-      }
-    } catch {}
-
-    return 'main';
-  }
-
-  private async buildLifecycleEnv(
-    taskId: string,
-    taskPath: string,
-    projectPath: string,
-    taskName?: string
-  ): Promise<NodeJS.ProcessEnv> {
-    const defaultBranch = await this.resolveDefaultBranch(projectPath);
-    taskName = taskName || path.basename(taskPath) || taskId;
-    const taskEnv = getTaskEnvVars({
-      taskId,
-      taskName,
-      taskPath,
-      projectPath,
-      defaultBranch,
-      portSeed: taskPath || taskId,
-    });
-    return { ...process.env, ...taskEnv };
-  }
-
-  private createPhaseState(): LifecyclePhaseState {
-    return { status: 'idle', error: null, exitCode: null };
-  }
-
-  private defaultState(taskId: string): TaskLifecycleState {
-    return {
-      taskId,
-      setup: this.createPhaseState(),
-      run: { ...this.createPhaseState(), pid: null },
-      teardown: this.createPhaseState(),
-    };
-  }
-
-  private ensureState(taskId: string): TaskLifecycleState {
-    const existing = this.states.get(taskId);
-    if (existing) return existing;
-    const state = this.defaultState(taskId);
-    this.states.set(taskId, state);
-    return state;
-  }
-
-  private ensureLogBuffer(taskId: string): LifecycleLogs {
-    const existing = this.logBuffers.get(taskId);
-    if (existing) return existing;
-    const buf: LifecycleLogs = { setup: [], run: [], teardown: [] };
-    this.logBuffers.set(taskId, buf);
-    return buf;
-  }
-
-  private appendLog(taskId: string, phase: LifecyclePhase, line: string): void {
-    const buf = this.ensureLogBuffer(taskId);
-    const arr = buf[phase];
-    arr.push(line);
-    if (arr.length > MAX_LIFECYCLE_LOG_LINES) {
-      arr.splice(0, arr.length - MAX_LIFECYCLE_LOG_LINES);
-    }
-  }
-
-  private emitLifecycleEvent(
-    taskId: string,
-    phase: LifecyclePhase,
-    status: LifecycleEvent['status'],
-    extras?: Partial<LifecycleEvent>
-  ): void {
-    const evt: LifecycleEvent = {
-      taskId,
-      phase,
-      status,
-      timestamp: this.nowIso(),
-      ...(extras || {}),
-    };
-
-    // Buffer log lines so they survive task switches in the renderer
-    const line = formatLifecycleLogLine(phase, status, extras);
-    if (line !== null) {
-      this.appendLog(taskId, phase, line);
-    }
-
-    this.emit('event', evt);
-  }
-
-  private runFinite(
-    taskId: string,
-    taskPath: string,
-    projectPath: string,
-    phase: Extract<LifecyclePhase, 'setup' | 'teardown'>,
-    taskName?: string
-  ): Promise<LifecycleResult> {
-    const script = lifecycleScriptsService.getScript(projectPath, phase);
-    if (!script) return Promise.resolve({ ok: true, skipped: true });
-
-    const state = this.ensureState(taskId);
-    state[phase] = {
-      status: 'running',
-      startedAt: this.nowIso(),
-      finishedAt: undefined,
-      exitCode: null,
-      error: null,
-    };
-    this.emitLifecycleEvent(taskId, phase, 'starting');
-
-    return new Promise<LifecycleResult>((resolve) => {
-      void (async () => {
-        let settled = false;
-        const finish = (result: LifecycleResult, nextState: LifecyclePhaseState): void => {
-          if (settled) return;
-          settled = true;
-          state[phase] = nextState;
-          resolve(result);
-        };
-        try {
-          const env = await this.buildLifecycleEnv(taskId, taskPath, projectPath, taskName);
-          const child = spawn(script, {
-            cwd: taskPath,
-            shell: true,
-            env,
-            detached: true,
-          });
-          const untrackFinite = this.trackFiniteProcess(taskId, child);
-          const onData = (buf: Buffer) => {
-            const line = buf.toString();
-            this.emitLifecycleEvent(taskId, phase, 'line', { line });
-          };
-          child.stdout?.on('data', onData);
-          child.stderr?.on('data', onData);
-          child.on('error', (error) => {
-            untrackFinite();
-            const message = error?.message || String(error);
-            this.emitLifecycleEvent(taskId, phase, 'error', { error: message });
-            finish(
-              { ok: false, error: message },
-              {
-                ...state[phase],
-                status: 'failed',
-                finishedAt: this.nowIso(),
-                error: message,
-              }
-            );
-          });
-          child.on('exit', (code) => {
-            untrackFinite();
-            const ok = code === 0;
-            this.emitLifecycleEvent(taskId, phase, ok ? 'done' : 'error', {
-              exitCode: code,
-              ...(ok ? {} : { error: `Exited with code ${String(code)}` }),
-            });
-            finish(ok ? { ok: true } : { ok: false, error: `Exited with code ${String(code)}` }, {
-              ...state[phase],
-              status: ok ? 'succeeded' : 'failed',
-              finishedAt: this.nowIso(),
-              exitCode: code,
-              error: ok ? null : `Exited with code ${String(code)}`,
-            });
-          });
-        } catch (error) {
-          const message = error instanceof Error ? error.message : String(error);
-          this.emitLifecycleEvent(taskId, phase, 'error', { error: message });
-          finish(
-            { ok: false, error: message },
-            {
-              ...state[phase],
-              status: 'failed',
-              finishedAt: this.nowIso(),
-              error: message,
-            }
-          );
-        }
-      })();
-    });
-  }
-
-  async runSetup(
-    taskId: string,
-    taskPath: string,
-    projectPath: string,
-    taskName?: string
-  ): Promise<LifecycleResult> {
-    const key = this.inflightKey(taskId, taskPath);
-    if (this.setupInflight.has(key)) {
-      return this.setupInflight.get(key)!;
-    }
-    const run = this.runFinite(taskId, taskPath, projectPath, 'setup', taskName).finally(() => {
-      this.setupInflight.delete(key);
-    });
-    this.setupInflight.set(key, run);
-    return run;
-  }
-
-  async startRun(
-    taskId: string,
-    taskPath: string,
-    projectPath: string,
-    taskName?: string
-  ): Promise<LifecycleResult> {
-    const inflight = this.runStartInflight.get(taskId);
-    if (inflight) return inflight;
-
-    const run = this.startRunInternal(taskId, taskPath, projectPath, taskName).finally(() => {
-      if (this.runStartInflight.get(taskId) === run) {
-        this.runStartInflight.delete(taskId);
-      }
-    });
-    this.runStartInflight.set(taskId, run);
-    return run;
-  }
-
-  private async startRunInternal(
-    taskId: string,
-    taskPath: string,
-    projectPath: string,
-    taskName?: string
-  ): Promise<LifecycleResult> {
-    const setupScript = lifecycleScriptsService.getScript(projectPath, 'setup');
-    if (setupScript) {
-      const setupStatus = this.ensureState(taskId).setup.status;
-      if (setupStatus === 'running') {
-        return { ok: false, error: 'Setup is still running' };
-      }
-      if (setupStatus === 'failed') {
-        return { ok: false, error: 'Setup failed. Fix setup before starting run' };
-      }
-      if (setupStatus !== 'succeeded') {
-        return { ok: false, error: 'Setup has not completed yet' };
-      }
-    }
-
-    const script = lifecycleScriptsService.getScript(projectPath, 'run');
-    if (!script) return { ok: true, skipped: true };
-
-    const existing = this.runProcesses.get(taskId);
-    if (existing && existing.exitCode === null && !existing.killed) {
-      return { ok: true, skipped: true };
-    }
-
-    const state = this.ensureState(taskId);
-    state.run = {
-      status: 'running',
-      startedAt: this.nowIso(),
-      finishedAt: undefined,
-      exitCode: null,
-      error: null,
-      pid: null,
-    };
-    this.emitLifecycleEvent(taskId, 'run', 'starting');
-
-    try {
-      const env = await this.buildLifecycleEnv(taskId, taskPath, projectPath, taskName);
-      const child = spawn(script, {
-        cwd: taskPath,
-        shell: true,
-        env,
-        detached: true,
-      });
-      this.runProcesses.set(taskId, child);
-      state.run.pid = child.pid ?? null;
-
-      const onData = (buf: Buffer) => {
-        const line = buf.toString();
-        this.emitLifecycleEvent(taskId, 'run', 'line', { line });
-      };
-      child.stdout?.on('data', onData);
-      child.stderr?.on('data', onData);
-      child.on('error', (error) => {
-        if (this.runProcesses.get(taskId) !== child) return;
-        this.runProcesses.delete(taskId);
-        this.stopIntents.delete(taskId);
-        const message = error?.message || String(error);
-        const cur = this.ensureState(taskId);
-        cur.run = {
-          ...cur.run,
-          status: 'failed',
-          finishedAt: this.nowIso(),
-          error: message,
-        };
-        this.emitLifecycleEvent(taskId, 'run', 'error', { error: message });
-      });
-      child.on('exit', (code) => {
-        if (this.runProcesses.get(taskId) !== child) return;
-        this.runProcesses.delete(taskId);
-        const wasStopped = this.stopIntents.has(taskId);
-        this.stopIntents.delete(taskId);
-        const cur = this.ensureState(taskId);
-        cur.run = {
-          ...cur.run,
-          status: wasStopped ? 'idle' : code === 0 ? 'succeeded' : 'failed',
-          finishedAt: this.nowIso(),
-          exitCode: code,
-          pid: null,
-          error: wasStopped || code === 0 ? null : `Exited with code ${String(code)}`,
-        };
-        this.emitLifecycleEvent(taskId, 'run', 'exit', { exitCode: code });
-      });
-
-      return { ok: true };
-    } catch (error) {
-      const message = error instanceof Error ? error.message : String(error);
-      state.run = {
-        ...state.run,
-        status: 'failed',
-        finishedAt: this.nowIso(),
-        error: message,
-        pid: null,
-      };
-      this.emitLifecycleEvent(taskId, 'run', 'error', { error: message });
-      return { ok: false, error: message };
-    }
-  }
-
-  stopRun(taskId: string): LifecycleResult {
-    const proc = this.runProcesses.get(taskId);
-    if (!proc) return { ok: true, skipped: true };
-
-    this.stopIntents.add(taskId);
-    try {
-      this.killProcessTree(proc, 'SIGTERM');
-      setTimeout(() => {
-        const current = this.runProcesses.get(taskId);
-        if (!current || current !== proc) return;
-        this.killProcessTree(proc, 'SIGKILL');
-      }, 8_000);
-      return { ok: true };
-    } catch (error) {
-      this.stopIntents.delete(taskId);
-      const message = error instanceof Error ? error.message : String(error);
-      const cur = this.ensureState(taskId);
-      cur.run = {
-        ...cur.run,
-        status: 'failed',
-        finishedAt: this.nowIso(),
-        error: message,
-      };
-      log.warn('Failed to stop run process', { taskId, error: message });
-      return { ok: false, error: message };
-    }
-  }
-
-  async runTeardown(
-    taskId: string,
-    taskPath: string,
-    projectPath: string,
-    taskName?: string
-  ): Promise<LifecycleResult> {
-    const key = this.inflightKey(taskId, taskPath);
-    if (this.teardownInflight.has(key)) {
-      return this.teardownInflight.get(key)!;
-    }
-    const run = (async () => {
-      // Serialize teardown behind setup for this task/worktree key.
-      const setupRun = this.setupInflight.get(key);
-      if (setupRun) {
-        await setupRun.catch(() => {});
-      }
-
-      // Ensure a managed run process is stopped before teardown starts.
-      const existingRun = this.runProcesses.get(taskId);
-      if (existingRun) {
-        this.stopRun(taskId);
-        await new Promise<void>((resolve) => {
-          let done = false;
-          const finish = () => {
-            if (done) return;
-            done = true;
-            resolve();
-          };
-          const timer = setTimeout(() => {
-            log.warn('Timed out waiting for run process to exit before teardown', { taskId });
-            finish();
-          }, 10_000);
-          existingRun.once('exit', () => {
-            clearTimeout(timer);
-            finish();
-          });
-        });
-      }
-      return this.runFinite(taskId, taskPath, projectPath, 'teardown', taskName);
-    })().finally(() => {
-      this.teardownInflight.delete(key);
-    });
-    this.teardownInflight.set(key, run);
-    return run;
-  }
-
-  getState(taskId: string): TaskLifecycleState {
-    return this.ensureState(taskId);
-  }
-
-  getLogs(taskId: string): LifecycleLogs {
-    const buf = this.logBuffers.get(taskId);
-    return buf
-      ? { setup: [...buf.setup], run: [...buf.run], teardown: [...buf.teardown] }
-      : { setup: [], run: [], teardown: [] };
-  }
-
-  clearTask(taskId: string): void {
-    this.states.delete(taskId);
-    this.logBuffers.delete(taskId);
-    this.stopIntents.delete(taskId);
-    this.runStartInflight.delete(taskId);
-
-    const prefix = `${taskId}::`;
-    for (const key of this.setupInflight.keys()) {
-      if (key.startsWith(prefix)) {
-        this.setupInflight.delete(key);
-      }
-    }
-    for (const key of this.teardownInflight.keys()) {
-      if (key.startsWith(prefix)) {
-        this.teardownInflight.delete(key);
-      }
-    }
-
-    const proc = this.runProcesses.get(taskId);
-    if (proc) {
-      try {
-        this.killProcessTree(proc, 'SIGTERM');
-      } catch {}
-      this.runProcesses.delete(taskId);
-    }
-
-    const finite = this.finiteProcesses.get(taskId);
-    if (finite) {
-      for (const child of finite) {
-        try {
-          this.killProcessTree(child, 'SIGTERM');
-        } catch {}
-      }
-      this.finiteProcesses.delete(taskId);
-    }
-  }
-
-  shutdown(): void {
-    for (const [taskId, proc] of this.runProcesses.entries()) {
-      try {
-        this.stopIntents.add(taskId);
-        this.killProcessTree(proc, 'SIGTERM');
-      } catch {}
-    }
-    for (const procs of this.finiteProcesses.values()) {
-      for (const proc of procs) {
-        try {
-          this.killProcessTree(proc, 'SIGTERM');
-        } catch {}
-      }
-    }
-    this.runProcesses.clear();
-    this.finiteProcesses.clear();
-    this.runStartInflight.clear();
-    this.setupInflight.clear();
-    this.teardownInflight.clear();
-  }
-
-  onEvent(listener: (evt: LifecycleEvent) => void): () => void {
-    this.on('event', listener);
-    return () => this.off('event', listener);
-  }
-}
-
-export const taskLifecycleService = new TaskLifecycleService();
diff --git a/src/main/services/TerminalConfigParser.ts b/src/main/services/TerminalConfigParser.ts
deleted file mode 100644
index c5bb039289..0000000000
--- a/src/main/services/TerminalConfigParser.ts
+++ /dev/null
@@ -1,837 +0,0 @@
-import { existsSync, readFileSync } from 'fs';
-import { homedir } from 'os';
-import { join } from 'path';
-import { execSync } from 'child_process';
-import { log } from '../lib/logger';
-
-export interface TerminalTheme {
-  background?: string;
-  foreground?: string;
-  cursor?: string;
-  cursorAccent?: string;
-  selectionBackground?: string;
-  black?: string;
-  red?: string;
-  green?: string;
-  yellow?: string;
-  blue?: string;
-  magenta?: string;
-  cyan?: string;
-  white?: string;
-  brightBlack?: string;
-  brightRed?: string;
-  brightGreen?: string;
-  brightYellow?: string;
-  brightBlue?: string;
-  brightMagenta?: string;
-  brightCyan?: string;
-  brightWhite?: string;
-  fontFamily?: string;
-  fontSize?: number;
-}
-
-export interface TerminalConfig {
-  terminal: string;
-  theme: TerminalTheme;
-}
-
-/**
- * Detect the user's preferred terminal emulator and extract its theme configuration.
- * Supports: iTerm2, Terminal.app, Alacritty, Ghostty, Kitty
- */
-export function detectAndLoadTerminalConfig(): TerminalConfig | null {
-  if (process.platform === 'darwin') {
-    return detectMacOSTerminal();
-  } else if (process.platform === 'win32') {
-    return detectWindowsTerminal();
-  } else if (process.platform === 'linux') {
-    return detectLinuxTerminal();
-  }
-  return null;
-}
-
-function detectMacOSTerminal(): TerminalConfig | null {
-  // Check iTerm2 first (most popular)
-  const iterm2Config = loadiTerm2Config();
-  if (iterm2Config) {
-    log.debug('terminalConfig:detected', { terminal: 'iTerm2' });
-    return iterm2Config;
-  }
-
-  // Check Terminal.app
-  const terminalAppConfig = loadTerminalAppConfig();
-  if (terminalAppConfig) {
-    log.debug('terminalConfig:detected', { terminal: 'Terminal.app' });
-    return terminalAppConfig;
-  }
-
-  // Check Alacritty
-  const alacrittyConfig = loadAlacrittyConfig();
-  if (alacrittyConfig) {
-    log.debug('terminalConfig:detected', { terminal: 'Alacritty' });
-    return alacrittyConfig;
-  }
-
-  // Check Ghostty
-  const ghosttyConfig = loadGhosttyConfig();
-  if (ghosttyConfig) {
-    log.debug('terminalConfig:detected', { terminal: 'Ghostty' });
-    return ghosttyConfig;
-  }
-
-  // Check Kitty
-  const kittyConfig = loadKittyConfig();
-  if (kittyConfig) {
-    log.debug('terminalConfig:detected', { terminal: 'Kitty' });
-    return kittyConfig;
-  }
-
-  return null;
-}
-
-function detectWindowsTerminal(): TerminalConfig | null {
-  // Windows Terminal stores config in JSON at:
-  // %LOCALAPPDATA%\Packages\Microsoft.WindowsTerminal_8wekyb3d8bbwe\LocalState\settings.json
-  try {
-    const localAppData = process.env.LOCALAPPDATA;
-    if (!localAppData) return null;
-
-    const settingsPath = join(
-      localAppData,
-      'Packages',
-      'Microsoft.WindowsTerminal_8wekyb3d8bbwe',
-      'LocalState',
-      'settings.json'
-    );
-
-    if (existsSync(settingsPath)) {
-      const config = loadWindowsTerminalConfig(settingsPath);
-      if (config) {
-        log.debug('terminalConfig:detected', { terminal: 'Windows Terminal' });
-        return config;
-      }
-    }
-  } catch (error) {
-    log.warn('terminalConfig:windowsTerminal:readFailed', { error });
-  }
-
-  return null;
-}
-
-function detectLinuxTerminal(): TerminalConfig | null {
-  // Check common Linux terminals
-  const alacrittyConfig = loadAlacrittyConfig();
-  if (alacrittyConfig) {
-    log.debug('terminalConfig:detected', { terminal: 'Alacritty' });
-    return alacrittyConfig;
-  }
-
-  const kittyConfig = loadKittyConfig();
-  if (kittyConfig) {
-    log.debug('terminalConfig:detected', { terminal: 'Kitty' });
-    return kittyConfig;
-  }
-
-  const ghosttyConfig = loadGhosttyConfig();
-  if (ghosttyConfig) {
-    log.debug('terminalConfig:detected', { terminal: 'Ghostty' });
-    return ghosttyConfig;
-  }
-
-  // GNOME Terminal uses dconf, which is harder to parse
-  // We could use dconf read, but it's complex
-
-  return null;
-}
-
-/**
- * Load iTerm2 configuration from plist file.
- * iTerm2 stores preferences at: ~/Library/Preferences/com.googlecode.iterm2.plist
- */
-function loadiTerm2Config(): TerminalConfig | null {
-  try {
-    const plistPath = join(homedir(), 'Library', 'Preferences', 'com.googlecode.iterm2.plist');
-    if (!existsSync(plistPath)) {
-      return null;
-    }
-
-    // Use plutil to convert plist to JSON (macOS built-in)
-    let jsonContent: string;
-    try {
-      jsonContent = execSync(`plutil -convert json -o - "${plistPath}"`, {
-        encoding: 'utf8',
-        maxBuffer: 10 * 1024 * 1024, // 10MB
-      });
-    } catch {
-      // If plutil fails, try reading as XML plist
-      return loadiTerm2ConfigXML(plistPath);
-    }
-
-    let plist: any;
-    try {
-      plist = JSON.parse(jsonContent);
-    } catch (error) {
-      // Silently ignore plist parsing errors - the file may contain non-standard objects
-      return null;
-    }
-
-    // iTerm2 stores color schemes in "New Bookmarks" -> "Color Presets"
-    // We need to find the default profile's color scheme
-    const newBookmarks = plist['New Bookmarks'] || [];
-    const defaultProfile = Array.isArray(newBookmarks)
-      ? newBookmarks.find((p: any) => p['Default Bookmark'] === 'Yes') || newBookmarks[0]
-      : newBookmarks;
-
-    if (!defaultProfile) {
-      return null;
-    }
-
-    const colorPresetName =
-      defaultProfile['Color Preset Name'] || defaultProfile['Custom Color Preset'];
-    if (!colorPresetName) {
-      return null;
-    }
-
-    // Find the color preset
-    const customColorPresets = plist['Custom Color Presets'] || {};
-    const preset = customColorPresets[colorPresetName] || {};
-
-    // Extract colors
-    const theme: TerminalTheme = {};
-
-    // Background and foreground
-    if (preset['Background Color']) {
-      theme.background = parseiTerm2Color(preset['Background Color']);
-    }
-    if (preset['Foreground Color']) {
-      theme.foreground = parseiTerm2Color(preset['Foreground Color']);
-    }
-    if (preset['Cursor Color']) {
-      theme.cursor = parseiTerm2Color(preset['Cursor Color']);
-    }
-    if (preset['Selection Color']) {
-      theme.selectionBackground = parseiTerm2Color(preset['Selection Color']);
-    }
-
-    // ANSI colors
-    const ansiColors = [
-      'Ansi 0 Color',
-      'Ansi 1 Color',
-      'Ansi 2 Color',
-      'Ansi 3 Color',
-      'Ansi 4 Color',
-      'Ansi 5 Color',
-      'Ansi 6 Color',
-      'Ansi 7 Color',
-      'Ansi 8 Color',
-      'Ansi 9 Color',
-      'Ansi 10 Color',
-      'Ansi 11 Color',
-      'Ansi 12 Color',
-      'Ansi 13 Color',
-      'Ansi 14 Color',
-      'Ansi 15 Color',
-    ];
-
-    const colorMap: Record<string, keyof TerminalTheme> = {
-      'Ansi 0 Color': 'black',
-      'Ansi 1 Color': 'red',
-      'Ansi 2 Color': 'green',
-      'Ansi 3 Color': 'yellow',
-      'Ansi 4 Color': 'blue',
-      'Ansi 5 Color': 'magenta',
-      'Ansi 6 Color': 'cyan',
-      'Ansi 7 Color': 'white',
-      'Ansi 8 Color': 'brightBlack',
-      'Ansi 9 Color': 'brightRed',
-      'Ansi 10 Color': 'brightGreen',
-      'Ansi 11 Color': 'brightYellow',
-      'Ansi 12 Color': 'brightBlue',
-      'Ansi 13 Color': 'brightMagenta',
-      'Ansi 14 Color': 'brightCyan',
-      'Ansi 15 Color': 'brightWhite',
-    };
-
-    for (const ansiKey of ansiColors) {
-      if (preset[ansiKey]) {
-        const colorKey = colorMap[ansiKey];
-        if (colorKey) {
-          const parsedColor = parseiTerm2Color(preset[ansiKey]);
-          if (parsedColor) {
-            (theme as any)[colorKey] = parsedColor;
-          }
-        }
-      }
-    }
-
-    // Font
-    if (defaultProfile['Normal Font']) {
-      const fontMatch = String(defaultProfile['Normal Font']).match(/^(.+?)\s+(\d+)$/);
-      if (fontMatch) {
-        theme.fontFamily = fontMatch[1];
-        theme.fontSize = parseInt(fontMatch[2], 10);
-      }
-    }
-
-    return {
-      terminal: 'iTerm2',
-      theme,
-    };
-  } catch (error) {
-    log.warn('terminalConfig:iTerm2:parseFailed', { error });
-    return null;
-  }
-}
-
-/**
- * Fallback: Try to parse iTerm2 plist as XML
- */
-function loadiTerm2ConfigXML(plistPath: string): TerminalConfig | null {
-  try {
-    const xmlContent = readFileSync(plistPath, 'utf8');
-    // Simple XML parsing for color values
-    // This is a basic implementation - could be improved
-    const colorRegex =
-      /<key>([^<]+)<\/key>\s*<dict>[\s\S]*?<key>Red Component<\/key>\s*<real>([\d.]+)<\/real>[\s\S]*?<key>Green Component<\/key>\s*<real>([\d.]+)<\/real>[\s\S]*?<key>Blue Component<\/key>\s*<real>([\d.]+)<\/real>/g;
-    // This is complex - for now, return null and rely on JSON conversion
-    return null;
-  } catch {
-    return null;
-  }
-}
-
-/**
- * Parse iTerm2 color format (NSColor with Red/Green/Blue/Alpha components)
- */
-function parseiTerm2Color(colorObj: any): string | undefined {
-  if (typeof colorObj === 'string') {
-    // Already a hex string
-    return colorObj;
-  }
-
-  if (colorObj && typeof colorObj === 'object') {
-    // NSColor format: { "Red Component": 0.5, "Green Component": 0.5, "Blue Component": 0.5, "Alpha Component": 1.0 }
-    const r = Math.round((colorObj['Red Component'] || 0) * 255);
-    const g = Math.round((colorObj['Green Component'] || 0) * 255);
-    const b = Math.round((colorObj['Blue Component'] || 0) * 255);
-    return `#${r.toString(16).padStart(2, '0')}${g.toString(16).padStart(2, '0')}${b.toString(16).padStart(2, '0')}`;
-  }
-
-  return undefined;
-}
-
-/**
- * Load Terminal.app configuration
- */
-function loadTerminalAppConfig(): TerminalConfig | null {
-  try {
-    const plistPath = join(homedir(), 'Library', 'Preferences', 'com.apple.Terminal.plist');
-    if (!existsSync(plistPath)) {
-      return null;
-    }
-
-    let jsonContent: string;
-    try {
-      jsonContent = execSync(`plutil -convert json -o - "${plistPath}"`, {
-        encoding: 'utf8',
-        maxBuffer: 10 * 1024 * 1024,
-      });
-    } catch {
-      return null;
-    }
-
-    let plist: any;
-    try {
-      plist = JSON.parse(jsonContent);
-    } catch (error) {
-      // Silently ignore plist parsing errors - the file may contain non-standard objects
-      return null;
-    }
-    const windowSettings = plist['Window Settings'] || {};
-    const defaultProfile = plist['Default Window Settings'] || 'Basic';
-
-    const profile = windowSettings[defaultProfile];
-    if (!profile) {
-      return null;
-    }
-
-    const theme: TerminalTheme = {};
-
-    if (profile['BackgroundColor']) {
-      theme.background = parseiTerm2Color(profile['BackgroundColor']);
-    }
-    if (profile['TextColor']) {
-      theme.foreground = parseiTerm2Color(profile['TextColor']);
-    }
-    if (profile['CursorColor']) {
-      theme.cursor = parseiTerm2Color(profile['CursorColor']);
-    }
-
-    // Terminal.app uses similar ANSI color structure
-    const colorMap: Record<string, keyof TerminalTheme> = {
-      ANSIBlackColor: 'black',
-      ANSIRedColor: 'red',
-      ANSIGreenColor: 'green',
-      ANSIYellowColor: 'yellow',
-      ANSIBlueColor: 'blue',
-      ANSIMagentaColor: 'magenta',
-      ANSICyanColor: 'cyan',
-      ANSIWhiteColor: 'white',
-      ANSIBrightBlackColor: 'brightBlack',
-      ANSIBrightRedColor: 'brightRed',
-      ANSIBrightGreenColor: 'brightGreen',
-      ANSIBrightYellowColor: 'brightYellow',
-      ANSIBrightBlueColor: 'brightBlue',
-      ANSIBrightMagentaColor: 'brightMagenta',
-      ANSIBrightCyanColor: 'brightCyan',
-      ANSIBrightWhiteColor: 'brightWhite',
-    };
-
-    for (const [key, themeKey] of Object.entries(colorMap)) {
-      if (profile[key]) {
-        const parsedColor = parseiTerm2Color(profile[key]);
-        if (parsedColor) {
-          (theme as any)[themeKey] = parsedColor;
-        }
-      }
-    }
-
-    if (profile['Font']) {
-      const fontMatch = String(profile['Font']).match(/^(.+?)\s+(\d+)$/);
-      if (fontMatch) {
-        theme.fontFamily = fontMatch[1];
-        theme.fontSize = parseInt(fontMatch[2], 10);
-      }
-    }
-
-    return {
-      terminal: 'Terminal.app',
-      theme,
-    };
-  } catch (error) {
-    log.warn('terminalConfig:TerminalApp:parseFailed', { error });
-    return null;
-  }
-}
-
-/**
- * Load Alacritty configuration (TOML format)
- */
-function loadAlacrittyConfig(): TerminalConfig | null {
-  try {
-    const configPath = join(homedir(), '.config', 'alacritty', 'alacritty.toml');
-    if (!existsSync(configPath)) {
-      // Try YAML format (older versions)
-      const yamlPath = join(homedir(), '.config', 'alacritty', 'alacritty.yml');
-      if (existsSync(yamlPath)) {
-        return loadAlacrittyYAML(yamlPath);
-      }
-      return null;
-    }
-
-    const content = readFileSync(configPath, 'utf8');
-    return parseAlacrittyTOML(content);
-  } catch (error) {
-    log.warn('terminalConfig:Alacritty:parseFailed', { error });
-    return null;
-  }
-}
-
-/**
- * Parse Alacritty TOML config (simplified parser)
- */
-function parseAlacrittyTOML(content: string): TerminalConfig | null {
-  const theme: TerminalTheme = {};
-
-  // Simple TOML parsing - extract colors section
-  const colorsMatch = content.match(/\[colors\]\s*([\s\S]*?)(?=\[|$)/);
-  if (!colorsMatch) {
-    return null;
-  }
-
-  const colorsSection = colorsMatch[1];
-
-  // Parse background/foreground
-  const bgMatch = colorsSection.match(/background\s*=\s*['"]([^'"]+)['"]/);
-  if (bgMatch) {
-    theme.background = bgMatch[1];
-  }
-
-  const fgMatch = colorsSection.match(/foreground\s*=\s*['"]([^'"]+)['"]/);
-  if (fgMatch) {
-    theme.foreground = fgMatch[1];
-  }
-
-  // Parse cursor
-  const cursorMatch = colorsSection.match(/cursor\s*=\s*['"]([^'"]+)['"]/);
-  if (cursorMatch) {
-    theme.cursor = cursorMatch[1];
-  }
-
-  // Parse ANSI colors (simplified - Alacritty uses nested structure)
-  const ansiColors = ['black', 'red', 'green', 'yellow', 'blue', 'magenta', 'cyan', 'white'];
-  const brightColors = [
-    'bright_black',
-    'bright_red',
-    'bright_green',
-    'bright_yellow',
-    'bright_blue',
-    'bright_magenta',
-    'bright_cyan',
-    'bright_white',
-  ];
-
-  const colorMap: Record<string, keyof TerminalTheme> = {
-    black: 'black',
-    red: 'red',
-    green: 'green',
-    yellow: 'yellow',
-    blue: 'blue',
-    magenta: 'magenta',
-    cyan: 'cyan',
-    white: 'white',
-    bright_black: 'brightBlack',
-    bright_red: 'brightRed',
-    bright_green: 'brightGreen',
-    bright_yellow: 'brightYellow',
-    bright_blue: 'brightBlue',
-    bright_magenta: 'brightMagenta',
-    bright_cyan: 'brightCyan',
-    bright_white: 'brightWhite',
-  };
-
-  for (const [alacrittyKey, themeKey] of Object.entries(colorMap)) {
-    const regex = new RegExp(`${alacrittyKey.replace('_', '[-_]')}\\s*=\\s*['"]([^'"]+)['"]`, 'i');
-    const match = colorsSection.match(regex);
-    if (match && match[1]) {
-      (theme as any)[themeKey] = match[1];
-    }
-  }
-
-  // Parse font
-  const fontMatch = content.match(/\[font\]\s*([\s\S]*?)(?=\[|$)/);
-  if (fontMatch) {
-    const fontSection = fontMatch[1];
-    const familyMatch = fontSection.match(/normal\s*=\s*\{[\s\S]*?family\s*=\s*['"]([^'"]+)['"]/);
-    const sizeMatch = fontSection.match(/size\s*=\s*(\d+)/);
-    if (familyMatch) {
-      theme.fontFamily = familyMatch[1];
-    }
-    if (sizeMatch) {
-      theme.fontSize = parseInt(sizeMatch[1], 10);
-    }
-  }
-
-  return {
-    terminal: 'Alacritty',
-    theme,
-  };
-}
-
-/**
- * Parse Alacritty YAML config (simplified)
- */
-function loadAlacrittyYAML(yamlPath: string): TerminalConfig | null {
-  try {
-    const content = readFileSync(yamlPath, 'utf8');
-    // Very basic YAML parsing for colors
-    // For production, consider using a YAML parser library
-    const theme: TerminalTheme = {};
-
-    // Extract basic colors (simplified regex-based parsing)
-    const bgMatch = content.match(/background:\s*['"]?([^'"]+)['"]?/);
-    if (bgMatch) {
-      theme.background = bgMatch[1];
-    }
-
-    const fgMatch = content.match(/foreground:\s*['"]?([^'"]+)['"]?/);
-    if (fgMatch) {
-      theme.foreground = fgMatch[1];
-    }
-
-    return {
-      terminal: 'Alacritty',
-      theme,
-    };
-  } catch {
-    return null;
-  }
-}
-
-/**
- * Load Ghostty configuration
- */
-function loadGhosttyConfig(): TerminalConfig | null {
-  try {
-    const configPath = join(homedir(), '.config', 'ghostty', 'config');
-    if (!existsSync(configPath)) {
-      return null;
-    }
-
-    const content = readFileSync(configPath, 'utf8');
-    return parseGhosttyConfig(content);
-  } catch (error) {
-    log.warn('terminalConfig:Ghostty:parseFailed', { error });
-    return null;
-  }
-}
-
-/**
- * Parse Ghostty config (key = value format)
- */
-function parseGhosttyConfig(content: string): TerminalConfig | null {
-  const theme: TerminalTheme = {};
-
-  // Ghostty uses simple key = value format
-  const lines = content.split('\n');
-  for (const line of lines) {
-    const trimmed = line.trim();
-    if (trimmed.startsWith('#') || !trimmed.includes('=')) {
-      continue;
-    }
-
-    const [key, ...valueParts] = trimmed.split('=');
-    const value = valueParts
-      .join('=')
-      .trim()
-      .replace(/^["']|["']$/g, '');
-
-    switch (key.trim()) {
-      case 'background':
-        theme.background = value;
-        break;
-      case 'foreground':
-        theme.foreground = value;
-        break;
-      case 'cursor':
-        theme.cursor = value;
-        break;
-      case 'color0':
-        theme.black = value;
-        break;
-      case 'color1':
-        theme.red = value;
-        break;
-      case 'color2':
-        theme.green = value;
-        break;
-      case 'color3':
-        theme.yellow = value;
-        break;
-      case 'color4':
-        theme.blue = value;
-        break;
-      case 'color5':
-        theme.magenta = value;
-        break;
-      case 'color6':
-        theme.cyan = value;
-        break;
-      case 'color7':
-        theme.white = value;
-        break;
-      case 'color8':
-        theme.brightBlack = value;
-        break;
-      case 'color9':
-        theme.brightRed = value;
-        break;
-      case 'color10':
-        theme.brightGreen = value;
-        break;
-      case 'color11':
-        theme.brightYellow = value;
-        break;
-      case 'color12':
-        theme.brightBlue = value;
-        break;
-      case 'color13':
-        theme.brightMagenta = value;
-        break;
-      case 'color14':
-        theme.brightCyan = value;
-        break;
-      case 'color15':
-        theme.brightWhite = value;
-        break;
-      case 'font':
-        theme.fontFamily = value;
-        break;
-      case 'font-size':
-        theme.fontSize = parseInt(value, 10);
-        break;
-    }
-  }
-
-  return {
-    terminal: 'Ghostty',
-    theme,
-  };
-}
-
-/**
- * Load Kitty configuration
- */
-function loadKittyConfig(): TerminalConfig | null {
-  try {
-    const configPath = join(homedir(), '.config', 'kitty', 'kitty.conf');
-    if (!existsSync(configPath)) {
-      return null;
-    }
-
-    const content = readFileSync(configPath, 'utf8');
-    return parseKittyConfig(content);
-  } catch (error) {
-    log.warn('terminalConfig:Kitty:parseFailed', { error });
-    return null;
-  }
-}
-
-/**
- * Parse Kitty config (similar to Ghostty format)
- */
-function parseKittyConfig(content: string): TerminalConfig | null {
-  const theme: TerminalTheme = {};
-
-  const lines = content.split('\n');
-  for (const line of lines) {
-    const trimmed = line.trim();
-    if (trimmed.startsWith('#') || !trimmed.includes(' ')) {
-      continue;
-    }
-
-    const [key, ...valueParts] = trimmed.split(/\s+/);
-    const value = valueParts.join(' ').trim();
-
-    switch (key) {
-      case 'background':
-        theme.background = value;
-        break;
-      case 'foreground':
-        theme.foreground = value;
-        break;
-      case 'cursor':
-        theme.cursor = value;
-        break;
-      case 'color0':
-        theme.black = value;
-        break;
-      case 'color1':
-        theme.red = value;
-        break;
-      case 'color2':
-        theme.green = value;
-        break;
-      case 'color3':
-        theme.yellow = value;
-        break;
-      case 'color4':
-        theme.blue = value;
-        break;
-      case 'color5':
-        theme.magenta = value;
-        break;
-      case 'color6':
-        theme.cyan = value;
-        break;
-      case 'color7':
-        theme.white = value;
-        break;
-      case 'color8':
-        theme.brightBlack = value;
-        break;
-      case 'color9':
-        theme.brightRed = value;
-        break;
-      case 'color10':
-        theme.brightGreen = value;
-        break;
-      case 'color11':
-        theme.brightYellow = value;
-        break;
-      case 'color12':
-        theme.brightBlue = value;
-        break;
-      case 'color13':
-        theme.brightMagenta = value;
-        break;
-      case 'color14':
-        theme.brightCyan = value;
-        break;
-      case 'color15':
-        theme.brightWhite = value;
-        break;
-      case 'font_family':
-        theme.fontFamily = value;
-        break;
-      case 'font_size':
-        theme.fontSize = parseInt(value, 10);
-        break;
-    }
-  }
-
-  return {
-    terminal: 'Kitty',
-    theme,
-  };
-}
-
-/**
- * Load Windows Terminal configuration
- */
-function loadWindowsTerminalConfig(settingsPath: string): TerminalConfig | null {
-  try {
-    const content = readFileSync(settingsPath, 'utf8');
-    const config = JSON.parse(content);
-
-    // Windows Terminal stores profiles in "profiles.list"
-    const profiles = config.profiles?.list || [];
-    const defaultProfile = profiles.find((p: any) => p.default === true) || profiles[0];
-
-    if (!defaultProfile) {
-      return null;
-    }
-
-    const theme: TerminalTheme = {};
-
-    // Windows Terminal uses color schemes
-    const colorSchemeName = defaultProfile.colorScheme;
-    if (colorSchemeName && config.schemes) {
-      const scheme = config.schemes.find((s: any) => s.name === colorSchemeName);
-      if (scheme) {
-        theme.background = scheme.background;
-        theme.foreground = scheme.foreground;
-        theme.black = scheme.black;
-        theme.red = scheme.red;
-        theme.green = scheme.green;
-        theme.yellow = scheme.yellow;
-        theme.blue = scheme.blue;
-        theme.magenta = scheme.magenta;
-        theme.cyan = scheme.cyan;
-        theme.white = scheme.white;
-        theme.brightBlack = scheme.brightBlack;
-        theme.brightRed = scheme.brightRed;
-        theme.brightGreen = scheme.brightGreen;
-        theme.brightYellow = scheme.brightYellow;
-        theme.brightBlue = scheme.brightBlue;
-        theme.brightMagenta = scheme.brightMagenta;
-        theme.brightCyan = scheme.brightCyan;
-        theme.brightWhite = scheme.brightWhite;
-      }
-    }
-
-    // Font
-    if (defaultProfile.font) {
-      theme.fontFamily = defaultProfile.font.face;
-      theme.fontSize = defaultProfile.font.size;
-    }
-
-    return {
-      terminal: 'Windows Terminal',
-      theme,
-    };
-  } catch (error) {
-    log.warn('terminalConfig:WindowsTerminal:parseFailed', { error });
-    return null;
-  }
-}
diff --git a/src/main/services/TerminalSnapshotService.ts b/src/main/services/TerminalSnapshotService.ts
deleted file mode 100644
index 7f67196c0e..0000000000
--- a/src/main/services/TerminalSnapshotService.ts
+++ /dev/null
@@ -1,164 +0,0 @@
-import fs from 'fs';
-import path from 'path';
-import { app } from 'electron';
-import { log } from '../lib/logger';
-import type { TerminalSnapshotPayload } from '../types/terminalSnapshot';
-import { TERMINAL_SNAPSHOT_VERSION } from '../types/terminalSnapshot';
-
-interface StoredSnapshot extends TerminalSnapshotPayload {
-  bytes: number;
-}
-
-const MAX_SNAPSHOT_BYTES = 8 * 1024 * 1024;
-const MAX_TOTAL_BYTES = 64 * 1024 * 1024;
-
-function resolveBaseDir(): string {
-  const override = process.env.EMDASH_TERMINAL_SNAPSHOT_DIR;
-  if (override && override.trim().length > 0) {
-    return path.resolve(override);
-  }
-  try {
-    return path.join(app.getPath('userData'), 'terminal-snapshots');
-  } catch (error) {
-    log.warn('terminalSnapshotService: unable to resolve userData path, using cwd fallback', {
-      error,
-    });
-    return path.join(process.cwd(), '.emdash-terminal-snapshots');
-  }
-}
-
-const BASE_DIR = resolveBaseDir();
-
-function snapshotPath(id: string): string {
-  const safe = id.replace(/[^a-zA-Z0-9._-]/g, '_');
-  return path.join(BASE_DIR, `${safe}.json`);
-}
-
-async function ensureDir(): Promise<void> {
-  await fs.promises.mkdir(BASE_DIR, { recursive: true });
-}
-
-async function readSnapshotFile(filePath: string): Promise<StoredSnapshot | null> {
-  let raw: string;
-  try {
-    raw = await fs.promises.readFile(filePath, 'utf8');
-  } catch (error) {
-    if ((error as NodeJS.ErrnoException)?.code !== 'ENOENT') {
-      log.warn('terminalSnapshotService: failed to read snapshot', { filePath, error });
-    }
-    return null;
-  }
-
-  try {
-    const parsed = JSON.parse(raw) as TerminalSnapshotPayload;
-    if (parsed.version !== TERMINAL_SNAPSHOT_VERSION) {
-      return null;
-    }
-    const bytes = Buffer.byteLength(raw, 'utf8');
-    return { ...parsed, bytes };
-  } catch (error) {
-    log.warn('terminalSnapshotService: invalid snapshot JSON', {
-      filePath,
-      error,
-      bytes: Buffer.byteLength(raw, 'utf8'),
-    });
-    return null;
-  }
-}
-
-async function removeFile(filePath: string): Promise<void> {
-  try {
-    await fs.promises.unlink(filePath);
-  } catch (error) {
-    if ((error as NodeJS.ErrnoException)?.code !== 'ENOENT') {
-      log.warn('terminalSnapshotService: failed to delete snapshot', { filePath, error });
-    }
-  }
-}
-
-async function listSnapshots(): Promise<
-  Array<{ id: string; path: string; stats: StoredSnapshot }>
-> {
-  try {
-    const entries = await fs.promises.readdir(BASE_DIR);
-    const result: Array<{ id: string; path: string; stats: StoredSnapshot }> = [];
-    for (const entry of entries) {
-      if (!entry.endsWith('.json')) continue;
-      const filePath = path.join(BASE_DIR, entry);
-      const stats = await readSnapshotFile(filePath);
-      if (stats) {
-        const id = entry.replace(/\.json$/, '');
-        result.push({ id, path: filePath, stats });
-      }
-    }
-    return result;
-  } catch (error) {
-    if ((error as NodeJS.ErrnoException)?.code === 'ENOENT') return [];
-    log.warn('terminalSnapshotService: failed to list snapshots', { error });
-    return [];
-  }
-}
-
-class TerminalSnapshotService {
-  async getSnapshot(id: string): Promise<TerminalSnapshotPayload | null> {
-    const record = await readSnapshotFile(snapshotPath(id));
-    return record ? { ...record } : null;
-  }
-
-  async saveSnapshot(
-    id: string,
-    payload: TerminalSnapshotPayload
-  ): Promise<{ ok: boolean; error?: string }> {
-    try {
-      if (payload.version !== TERMINAL_SNAPSHOT_VERSION) {
-        return { ok: false, error: 'Unsupported snapshot version' };
-      }
-
-      const json = JSON.stringify(payload);
-      const bytes = Buffer.byteLength(json, 'utf8');
-      if (bytes > MAX_SNAPSHOT_BYTES) {
-        return { ok: false, error: 'Snapshot size exceeds per-task limit' };
-      }
-
-      await ensureDir();
-      await fs.promises.writeFile(snapshotPath(id), json, 'utf8');
-      await this.pruneIfNeeded(id);
-      return { ok: true };
-    } catch (error) {
-      log.error('terminalSnapshotService: failed to save snapshot', { id, error });
-      return { ok: false, error: (error as Error)?.message ?? String(error) };
-    }
-  }
-
-  async deleteSnapshot(id: string): Promise<void> {
-    await removeFile(snapshotPath(id));
-  }
-
-  private async pruneIfNeeded(recentId: string): Promise<void> {
-    const records = await listSnapshots();
-    if (records.length === 0) return;
-
-    let total = records.reduce((sum, rec) => sum + rec.stats.bytes, 0);
-    if (total <= MAX_TOTAL_BYTES) return;
-    // Sort by oldest first, prefer to keep the most recent snapshot we just wrote
-    const ordered = records
-      .filter((rec) => rec.id !== recentId)
-      .sort((a, b) => Date.parse(a.stats.createdAt) - Date.parse(b.stats.createdAt));
-
-    for (const entry of ordered) {
-      if (total <= MAX_TOTAL_BYTES) break;
-      await removeFile(entry.path);
-      total -= entry.stats.bytes;
-    }
-
-    // As a last resort, keep only the recent snapshot
-    if (total > MAX_TOTAL_BYTES) {
-      for (const entry of records) {
-        if (entry.id === recentId) continue;
-        await removeFile(entry.path);
-      }
-    }
-  }
-}
-
-export const terminalSnapshotService = new TerminalSnapshotService();
diff --git a/src/main/services/WorktreePoolService.ts b/src/main/services/WorktreePoolService.ts
deleted file mode 100644
index 267bb1a31e..0000000000
--- a/src/main/services/WorktreePoolService.ts
+++ /dev/null
@@ -1,663 +0,0 @@
-import { execFile } from 'child_process';
-import { promisify } from 'util';
-import path from 'path';
-import fs from 'fs';
-import crypto from 'crypto';
-import { log } from '../lib/logger';
-import { worktreeService, type WorktreeInfo } from './WorktreeService';
-
-const execFileAsync = promisify(execFile);
-
-interface ReserveWorktree {
-  id: string;
-  path: string;
-  branch: string;
-  projectId: string;
-  projectPath: string;
-  baseRef: string;
-  createdAt: string;
-}
-
-interface ClaimResult {
-  worktree: WorktreeInfo;
-  needsBaseRefSwitch: boolean;
-}
-
-/**
- * WorktreePoolService maintains a pool of pre-created "reserve" worktrees
- * that can be instantly claimed when users create new tasks.
- *
- * This eliminates the 3-7 second wait for worktree creation by:
- * 1. Pre-creating reserve worktrees in the background when projects are opened
- * 2. Instantly renaming reserves when tasks are created
- * 3. Replenishing the pool in the background after claims
- */
-export class WorktreePoolService {
-  // Keyed by `${projectId}::${baseRef}` to keep reserves base-ref specific.
-  private reserves = new Map<string, ReserveWorktree>();
-  private creationInProgress = new Set<string>();
-  private readonly RESERVE_PREFIX = '_reserve';
-  // Reserves older than this are considered stale and will be recreated
-  // 30 minutes is reasonable since users don't create tasks that frequently
-  private readonly MAX_RESERVE_AGE_MS = 30 * 60 * 1000; // 30 minutes
-
-  /** Generate a unique hash for reserve identification */
-  private generateReserveHash(): string {
-    const bytes = crypto.randomBytes(4);
-    return bytes.readUIntBE(0, 4).toString(36).slice(0, 6).padStart(6, '0');
-  }
-
-  /** Get the reserve worktree path for a project */
-  private getReservePath(projectPath: string, hash: string): string {
-    return path.join(projectPath, '..', `worktrees/${this.RESERVE_PREFIX}-${hash}`);
-  }
-
-  /** Get the reserve branch name */
-  private getReserveBranch(hash: string): string {
-    return `${this.RESERVE_PREFIX}/${hash}`;
-  }
-
-  private normalizeBaseRef(baseRef?: string): string {
-    const trimmed = (baseRef || '').trim();
-    return trimmed.length > 0 ? trimmed : 'HEAD';
-  }
-
-  private getReserveKey(projectId: string, baseRef?: string): string {
-    return `${projectId}::${this.normalizeBaseRef(baseRef)}`;
-  }
-
-  private async refreshRefsForReserveCreation(
-    projectPath: string,
-    projectId: string
-  ): Promise<void> {
-    try {
-      await execFileAsync('git', ['fetch', '--all', '--prune'], {
-        cwd: projectPath,
-        timeout: 15000,
-      });
-    } catch (error) {
-      log.warn('WorktreePool: Failed to refresh refs during reserve creation', {
-        projectId,
-        error,
-      });
-    }
-  }
-
-  /**
-   * Resolve HEAD or bare branch names to their remote tracking counterpart.
-   * After `refreshRefsForReserveCreation` fetches all refs, this ensures the
-   * worktree is created from the freshly-fetched remote ref rather than a
-   * potentially stale local branch.
-   */
-  private async resolveToRemoteRef(projectPath: string, baseRef: string): Promise<string> {
-    // Already a remote tracking ref — use as-is
-    if (baseRef.startsWith('origin/')) return baseRef;
-
-    try {
-      const branchName =
-        baseRef === 'HEAD'
-          ? (
-              await execFileAsync('git', ['symbolic-ref', '--short', 'HEAD'], {
-                cwd: projectPath,
-              })
-            ).stdout.trim()
-          : baseRef;
-
-      // Verify the remote tracking ref exists (it should after fetch --all)
-      await execFileAsync('git', ['rev-parse', '--verify', `refs/remotes/origin/${branchName}`], {
-        cwd: projectPath,
-      });
-      return `origin/${branchName}`;
-    } catch {
-      return baseRef; // Fallback to original if resolution fails
-    }
-  }
-
-  /** Generate stable ID from path */
-  private stableIdFromPath(worktreePath: string): string {
-    const abs = path.resolve(worktreePath);
-    const h = crypto.createHash('sha1').update(abs).digest('hex').slice(0, 12);
-    return `wt-${h}`;
-  }
-
-  /** Check if a reserve is stale (too old to be useful) */
-  private isReserveStale(reserve: ReserveWorktree): boolean {
-    const age = Date.now() - new Date(reserve.createdAt).getTime();
-    return age > this.MAX_RESERVE_AGE_MS;
-  }
-
-  /** Check if a fresh reserve exists for a project */
-  hasReserve(projectId: string): boolean {
-    for (const [key, reserve] of this.reserves.entries()) {
-      if (!key.startsWith(`${projectId}::`)) continue;
-      if (this.isReserveStale(reserve)) {
-        this.reserves.delete(key);
-        this.cleanupReserve(reserve).catch(() => {});
-        continue;
-      }
-      return true;
-    }
-    return false;
-  }
-
-  /** Get the reserve for a project (if any) */
-  getReserve(projectId: string): ReserveWorktree | undefined {
-    for (const [key, reserve] of this.reserves.entries()) {
-      if (!key.startsWith(`${projectId}::`)) continue;
-      if (this.isReserveStale(reserve)) {
-        this.reserves.delete(key);
-        this.cleanupReserve(reserve).catch(() => {});
-        continue;
-      }
-      return reserve;
-    }
-    return undefined;
-  }
-
-  /**
-   * Ensure a reserve worktree exists for a project.
-   * Creates one in the background if not present.
-   */
-  async ensureReserve(projectId: string, projectPath: string, baseRef?: string): Promise<void> {
-    const reserveKey = this.getReserveKey(projectId, baseRef);
-
-    // Creation already in progress
-    if (this.creationInProgress.has(reserveKey)) {
-      return;
-    }
-
-    // Check existing reserve
-    const existing = this.reserves.get(reserveKey);
-    if (existing) {
-      if (!this.isReserveStale(existing)) {
-        return; // Fresh reserve exists
-      }
-      // Stale reserve - clean it up and create fresh one
-      this.reserves.delete(reserveKey);
-      this.cleanupReserve(existing).catch(() => {});
-    }
-
-    // Start background creation
-    this.creationInProgress.add(reserveKey);
-
-    try {
-      await this.createReserve(projectId, projectPath, this.normalizeBaseRef(baseRef));
-    } catch (error) {
-      log.warn('WorktreePool: Failed to create reserve', { projectId, baseRef, error });
-    } finally {
-      this.creationInProgress.delete(reserveKey);
-    }
-  }
-
-  /**
-   * Create a reserve worktree for a project
-   */
-  private async createReserve(
-    projectId: string,
-    projectPath: string,
-    baseRef: string
-  ): Promise<void> {
-    const hash = this.generateReserveHash();
-    const reservePath = this.getReservePath(projectPath, hash);
-    const reserveBranch = this.getReserveBranch(hash);
-
-    // Ensure worktrees directory exists
-    const worktreesDir = path.dirname(reservePath);
-    if (!fs.existsSync(worktreesDir)) {
-      fs.mkdirSync(worktreesDir, { recursive: true });
-    }
-
-    // Keep reserve refs fresh in the background so claim remains instant.
-    await this.refreshRefsForReserveCreation(projectPath, projectId);
-
-    // Resolve HEAD/local refs to remote tracking refs (freshly fetched)
-    // so the worktree is created from up-to-date code, not a stale local branch.
-    const resolvedRef = await this.resolveToRemoteRef(projectPath, baseRef);
-
-    // Create the worktree with --no-track to prevent auto-tracking base ref
-    // Tracking is set explicitly via push --set-upstream when the reserve is claimed
-    await execFileAsync(
-      'git',
-      ['worktree', 'add', '--no-track', '-b', reserveBranch, reservePath, resolvedRef],
-      {
-        cwd: projectPath,
-      }
-    );
-
-    const reserveId = this.stableIdFromPath(reservePath);
-    const reserve: ReserveWorktree = {
-      id: reserveId,
-      path: reservePath,
-      branch: reserveBranch,
-      projectId,
-      projectPath,
-      baseRef,
-      createdAt: new Date().toISOString(),
-    };
-
-    this.reserves.set(this.getReserveKey(projectId, baseRef), reserve);
-  }
-
-  /**
-   * Claim a reserve worktree for a new task.
-   * Renames the reserve to match the task name and returns it instantly.
-   */
-  async claimReserve(
-    projectId: string,
-    projectPath: string,
-    taskName: string,
-    requestedBaseRef?: string
-  ): Promise<ClaimResult | null> {
-    const resolvedBaseRef = this.normalizeBaseRef(requestedBaseRef);
-    const reserveKey = this.getReserveKey(projectId, resolvedBaseRef);
-    const reserve = this.reserves.get(reserveKey);
-    if (!reserve) {
-      this.replenishReserve(projectId, projectPath, resolvedBaseRef);
-      return null;
-    }
-
-    // Check if reserve is stale (too old)
-    if (this.isReserveStale(reserve)) {
-      // Remove stale reserve and clean it up in background
-      this.reserves.delete(reserveKey);
-      this.cleanupReserve(reserve).catch(() => {});
-      // Start creating a fresh reserve for next time
-      this.replenishReserve(projectId, projectPath, resolvedBaseRef);
-      return null; // Caller will use fallback (sync creation)
-    }
-
-    // Remove from pool immediately to prevent double-claims
-    this.reserves.delete(reserveKey);
-
-    try {
-      const result = await this.transformReserve(reserve, taskName);
-
-      // Start background replenishment
-      this.replenishReserve(projectId, projectPath, resolvedBaseRef);
-
-      return result;
-    } catch (error) {
-      log.error('WorktreePool: Failed to claim reserve', { projectId, taskName, error });
-      // Try to clean up the reserve on failure
-      this.cleanupReserve(reserve).catch(() => {});
-      return null;
-    }
-  }
-
-  /**
-   * Transform a reserve worktree into a task worktree
-   */
-  private async transformReserve(reserve: ReserveWorktree, taskName: string): Promise<ClaimResult> {
-    const { getAppSettings } = await import('../settings');
-    const settings = getAppSettings();
-    const prefix = settings?.repository?.branchPrefix || 'emdash';
-
-    // Generate new names
-    const sluggedName = this.slugify(taskName);
-    const hash = this.generateShortHash();
-    const newBranch = `${prefix}/${sluggedName}-${hash}`;
-    const newPath = path.join(reserve.projectPath, '..', `worktrees/${sluggedName}-${hash}`);
-    const newId = this.stableIdFromPath(newPath);
-
-    // Move the worktree (instant operation)
-    await execFileAsync('git', ['worktree', 'move', reserve.path, newPath], {
-      cwd: reserve.projectPath,
-    });
-
-    // Update reserve path so cleanup uses correct location if we fail later
-    reserve.path = newPath;
-
-    // Rename the branch (instant operation)
-    await execFileAsync('git', ['branch', '-m', reserve.branch, newBranch], {
-      cwd: newPath,
-    });
-
-    // Preserve project-specific gitignored files from project to worktree
-    try {
-      await worktreeService.preserveProjectFilesToWorktree(reserve.projectPath, newPath);
-    } catch (preserveErr) {
-      log.warn('WorktreePool: Failed to preserve files', { error: preserveErr });
-    }
-
-    // Push branch to remote in background (non-blocking)
-    this.pushBranchAsync(newPath, newBranch, settings);
-
-    const worktree: WorktreeInfo = {
-      id: newId,
-      name: taskName,
-      branch: newBranch,
-      path: newPath,
-      projectId: reserve.projectId,
-      status: 'active',
-      createdAt: new Date().toISOString(),
-    };
-
-    // Register with worktreeService
-    worktreeService.registerWorktree(worktree);
-
-    return { worktree, needsBaseRefSwitch: false };
-  }
-
-  /** Replenish reserve in background after claiming */
-  private replenishReserve(projectId: string, projectPath: string, baseRef?: string): void {
-    // Fire and forget
-    this.ensureReserve(projectId, projectPath, baseRef).catch((error) => {
-      log.warn('WorktreePool: Failed to replenish reserve', { projectId, error });
-    });
-  }
-
-  /** Push branch to remote asynchronously */
-  private async pushBranchAsync(
-    worktreePath: string,
-    branchName: string,
-    settings: any
-  ): Promise<void> {
-    if (settings?.repository?.pushOnCreate === false) {
-      return;
-    }
-
-    try {
-      // Get remote name
-      const { stdout: remotesOut } = await execFileAsync('git', ['remote'], {
-        cwd: worktreePath,
-      });
-      const remotes = remotesOut.trim().split('\n').filter(Boolean);
-      const remote = remotes.includes('origin') ? 'origin' : remotes[0];
-
-      if (!remote) {
-        return;
-      }
-
-      await execFileAsync('git', ['push', '--set-upstream', remote, branchName], {
-        cwd: worktreePath,
-        timeout: 60000,
-      });
-    } catch {
-      // Push failures are non-critical, ignore silently
-    }
-  }
-
-  /** Cleanup a reserve worktree */
-  private async cleanupReserve(reserve: ReserveWorktree): Promise<void> {
-    try {
-      await execFileAsync('git', ['worktree', 'remove', '--force', reserve.path], {
-        cwd: reserve.projectPath,
-      });
-    } catch {
-      // Worktree might already be gone; continue and try branch cleanup.
-    }
-
-    try {
-      // Also delete the branch
-      await execFileAsync('git', ['branch', '-D', reserve.branch], {
-        cwd: reserve.projectPath,
-      });
-    } catch {
-      // Cleanup failures are non-critical
-    }
-  }
-
-  /** Remove reserve for a project (e.g., when project is removed) */
-  async removeReserve(projectId: string, projectPath?: string): Promise<void> {
-    const reservesForProject = Array.from(this.reserves.entries()).filter(([key]) =>
-      key.startsWith(`${projectId}::`)
-    );
-    const resolvedProjectPath = projectPath || reservesForProject[0]?.[1].projectPath;
-
-    await Promise.all(
-      reservesForProject.map(async ([key, reserve]) => {
-        this.reserves.delete(key);
-        await this.cleanupReserve(reserve);
-      })
-    );
-
-    if (!resolvedProjectPath) {
-      return;
-    }
-
-    await this.cleanupReserveArtifactsForProject(resolvedProjectPath);
-  }
-
-  private async cleanupReserveArtifactsForProject(projectPath: string): Promise<void> {
-    const normalizedProjectPath = path.resolve(projectPath);
-    const reserveBranches = await this.listReserveBranches(normalizedProjectPath);
-    const remainingBranches = new Set(reserveBranches);
-
-    for (const reserve of this.findReserveDirectoriesForProject(
-      normalizedProjectPath,
-      remainingBranches
-    )) {
-      try {
-        await execFileAsync('git', ['worktree', 'remove', '--force', reserve.path], {
-          cwd: normalizedProjectPath,
-        });
-      } catch {
-        // Best effort: if git cleanup fails, remove directory directly.
-        try {
-          fs.rmSync(reserve.path, { recursive: true, force: true });
-        } catch {
-          // Ignore secondary cleanup failure.
-        }
-      }
-
-      if (reserve.branch) {
-        await this.deleteBranch(normalizedProjectPath, reserve.branch);
-        remainingBranches.delete(reserve.branch);
-      }
-    }
-
-    // Clean up any remaining reserve branches even if the worktree directory is already gone.
-    for (const branch of remainingBranches) {
-      await this.deleteBranch(normalizedProjectPath, branch);
-    }
-  }
-
-  private findReserveDirectoriesForProject(
-    projectPath: string,
-    reserveBranches: Set<string>
-  ): Array<{ path: string; branch: string | null }> {
-    const worktreesDir = path.join(projectPath, '..', 'worktrees');
-    if (!fs.existsSync(worktreesDir)) {
-      return [];
-    }
-
-    const result: Array<{ path: string; branch: string | null }> = [];
-    try {
-      const entries = fs.readdirSync(worktreesDir, { withFileTypes: true });
-      for (const entry of entries) {
-        if (!entry.isDirectory() || !entry.name.startsWith(`${this.RESERVE_PREFIX}-`)) {
-          continue;
-        }
-
-        const reservePath = path.join(worktreesDir, entry.name);
-        const ownerPath = this.getMainRepoPathFromWorktree(reservePath);
-        const branch = this.getReserveBranchFromDirectoryName(entry.name);
-        const ownsReserve = ownerPath ? path.resolve(ownerPath) === projectPath : false;
-        const branchBelongsToProject = branch ? reserveBranches.has(branch) : false;
-
-        if (!ownsReserve && !branchBelongsToProject) {
-          continue;
-        }
-
-        result.push({ path: reservePath, branch });
-      }
-    } catch {
-      // Ignore unreadable worktrees directory.
-    }
-
-    return result;
-  }
-
-  private getReserveBranchFromDirectoryName(name: string): string | null {
-    const branchMatch = name.match(/^_reserve-(.+)$/);
-    if (!branchMatch) return null;
-    return `_reserve/${branchMatch[1]}`;
-  }
-
-  private async listReserveBranches(projectPath: string): Promise<string[]> {
-    try {
-      const { stdout } = await execFileAsync(
-        'git',
-        ['for-each-ref', '--format=%(refname:short)', `refs/heads/${this.RESERVE_PREFIX}`],
-        { cwd: projectPath }
-      );
-      return stdout
-        .trim()
-        .split('\n')
-        .map((line) => line.trim())
-        .filter((line) => line.startsWith(`${this.RESERVE_PREFIX}/`));
-    } catch {
-      return [];
-    }
-  }
-
-  private async deleteBranch(projectPath: string, branchName: string): Promise<void> {
-    try {
-      await execFileAsync('git', ['branch', '-D', branchName], { cwd: projectPath });
-    } catch {
-      // Branch may not exist or still be attached to a worktree.
-    }
-  }
-
-  private getMainRepoPathFromWorktree(worktreePath: string): string | null {
-    const gitDirPath = path.join(worktreePath, '.git');
-    if (!fs.existsSync(gitDirPath)) {
-      return null;
-    }
-
-    try {
-      const gitDirContent = fs.readFileSync(gitDirPath, 'utf8');
-      const match = gitDirContent.match(/gitdir:\s*(.+)/);
-      if (!match) {
-        return null;
-      }
-
-      const gitWorktreePath = match[1].trim();
-      const resolvedGitWorktreePath = path.isAbsolute(gitWorktreePath)
-        ? gitWorktreePath
-        : path.resolve(worktreePath, gitWorktreePath);
-      const mainRepoPath = resolvedGitWorktreePath.replace(
-        /[\\\\/]\.git[\\\\/]worktrees[\\\\/].*$/,
-        ''
-      );
-      if (mainRepoPath !== resolvedGitWorktreePath) {
-        return mainRepoPath;
-      }
-
-      // Fallback for unexpected gitdir layouts.
-      return resolvedGitWorktreePath.replace(/[\\\\/]\.git$/, '');
-    } catch {
-      return null;
-    }
-  }
-
-  /** Cleanup all reserves (e.g., on app shutdown) */
-  async cleanup(): Promise<void> {
-    for (const [projectId, reserve] of this.reserves) {
-      try {
-        await this.cleanupReserve(reserve);
-      } catch (error) {
-        log.warn('WorktreePool: Failed to cleanup reserve on shutdown', { projectId, error });
-      }
-    }
-    this.reserves.clear();
-  }
-
-  /**
-   * Clean up orphaned reserve worktrees from previous sessions.
-   * Called on app startup to handle reserves left behind from crashes or forced quits.
-   * Runs in background and doesn't block app startup.
-   */
-  async cleanupOrphanedReserves(projectPaths: string[] = []): Promise<void> {
-    // Small delay to not compete with critical startup tasks
-    await new Promise((resolve) => setTimeout(resolve, 2000));
-
-    // Find all worktree directories that might contain reserves
-    const homedir = require('os').homedir();
-    const projectWorktreeDirs = projectPaths.map((projectPath) =>
-      path.join(projectPath, '..', 'worktrees')
-    );
-    const possibleWorktreeDirs = [
-      ...projectWorktreeDirs,
-      path.join(homedir, 'cursor', 'worktrees'),
-      path.join(homedir, 'Documents', 'worktrees'),
-      path.join(homedir, 'Projects', 'worktrees'),
-      path.join(homedir, 'code', 'worktrees'),
-      path.join(homedir, 'dev', 'worktrees'),
-    ];
-    const uniqueWorktreeDirs = [...new Set(possibleWorktreeDirs.map((dir) => path.resolve(dir)))];
-
-    // Collect all orphaned reserves first (fast sync scan)
-    const orphanedReserves: { path: string; name: string }[] = [];
-    for (const worktreesDir of uniqueWorktreeDirs) {
-      if (!fs.existsSync(worktreesDir)) continue;
-      try {
-        const entries = fs.readdirSync(worktreesDir, { withFileTypes: true });
-        for (const entry of entries) {
-          if (entry.isDirectory() && entry.name.startsWith(this.RESERVE_PREFIX)) {
-            orphanedReserves.push({
-              path: path.join(worktreesDir, entry.name),
-              name: entry.name,
-            });
-          }
-        }
-      } catch {
-        // Ignore unreadable directories
-      }
-    }
-
-    if (orphanedReserves.length === 0) {
-      return;
-    }
-
-    // Clean up all reserves in parallel (silently)
-    await Promise.allSettled(
-      orphanedReserves.map((reserve) => this.cleanupOrphanedReserve(reserve.path, reserve.name))
-    );
-  }
-
-  /** Clean up a single orphaned reserve */
-  private async cleanupOrphanedReserve(reservePath: string, name: string): Promise<boolean> {
-    try {
-      // Try to find the parent git repo to properly remove the worktree
-      const mainRepoPath = this.getMainRepoPathFromWorktree(reservePath);
-      if (mainRepoPath && fs.existsSync(mainRepoPath)) {
-        // Remove worktree via git
-        await execFileAsync('git', ['worktree', 'remove', '--force', reservePath], {
-          cwd: mainRepoPath,
-        });
-
-        // Try to remove the reserve branch
-        const branchName = this.getReserveBranchFromDirectoryName(name);
-        if (branchName) {
-          await this.deleteBranch(mainRepoPath, branchName);
-        }
-
-        return true;
-      }
-
-      // Fallback: just remove the directory
-      fs.rmSync(reservePath, { recursive: true, force: true });
-      return true;
-    } catch {
-      return false;
-    }
-  }
-
-  /** Slugify task name */
-  private slugify(name: string): string {
-    return name
-      .toLowerCase()
-      .replace(/[^a-z0-9-]/g, '-')
-      .replace(/-+/g, '-')
-      .replace(/^-|-$/g, '');
-  }
-
-  /** Generate short hash */
-  private generateShortHash(): string {
-    const bytes = crypto.randomBytes(3);
-    return bytes.readUIntBE(0, 3).toString(36).slice(0, 3).padStart(3, '0');
-  }
-}
-
-export const worktreePoolService = new WorktreePoolService();
diff --git a/src/main/services/WorktreeService.ts b/src/main/services/WorktreeService.ts
deleted file mode 100644
index 2ae09511d8..0000000000
--- a/src/main/services/WorktreeService.ts
+++ /dev/null
@@ -1,1253 +0,0 @@
-import { execFile } from 'child_process';
-import { log } from '../lib/logger';
-import { promisify } from 'util';
-import path from 'path';
-import fs from 'fs';
-import crypto from 'crypto';
-import { projectSettingsService } from './ProjectSettingsService';
-import { minimatch } from 'minimatch';
-import { errorTracking } from '../errorTracking';
-
-type BaseRefInfo = { remote: string; branch: string; fullRef: string };
-
-const execFileAsync = promisify(execFile);
-
-export interface WorktreeInfo {
-  id: string;
-  name: string;
-  branch: string;
-  path: string;
-  projectId: string;
-  status: 'active' | 'paused' | 'completed' | 'error';
-  createdAt: string;
-  lastActivity?: string;
-}
-
-export interface PreserveResult {
-  copied: string[];
-  skipped: string[];
-}
-
-/** Default patterns for files to preserve when creating worktrees */
-const DEFAULT_PRESERVE_PATTERNS = [
-  '.env',
-  '.env.keys',
-  '.env.local',
-  '.env.*.local',
-  '.envrc',
-  'docker-compose.override.yml',
-];
-
-/** Default path segments to exclude from preservation */
-const DEFAULT_EXCLUDE_PATTERNS = [
-  'node_modules',
-  '.git',
-  'vendor',
-  '.cache',
-  'dist',
-  'build',
-  '.next',
-  '.nuxt',
-  '__pycache__',
-  '.venv',
-  'venv',
-];
-
-/** Project-level config stored in .emdash.json */
-interface EmdashConfig {
-  preservePatterns?: string[];
-}
-
-export class WorktreeService {
-  private worktrees = new Map<string, WorktreeInfo>();
-
-  private async cleanupWorktreeDirectory(pathToRemove: string, projectPath: string): Promise<void> {
-    if (!fs.existsSync(pathToRemove)) {
-      return;
-    }
-
-    const normalizedPathToRemove = path.resolve(pathToRemove);
-    const normalizedProjectPath = path.resolve(projectPath);
-
-    if (normalizedPathToRemove === normalizedProjectPath) {
-      log.error(`CRITICAL: Prevented filesystem removal of main repository! Path: ${pathToRemove}`);
-      return;
-    }
-
-    const isLikelyWorktree =
-      pathToRemove.includes('/worktrees/') ||
-      pathToRemove.includes('\\worktrees\\') ||
-      pathToRemove.includes('/.conductor/') ||
-      pathToRemove.includes('\\.conductor\\') ||
-      pathToRemove.includes('/.cursor/worktrees/') ||
-      pathToRemove.includes('\\.cursor\\worktrees\\');
-
-    if (!isLikelyWorktree) {
-      log.warn(
-        `Path doesn't appear to be a worktree directory, skipping filesystem removal: ${pathToRemove}`
-      );
-      return;
-    }
-
-    try {
-      await fs.promises.rm(pathToRemove, { recursive: true, force: true });
-    } catch (rmErr: any) {
-      if (rmErr && (rmErr.code === 'EACCES' || rmErr.code === 'EPERM')) {
-        try {
-          if (process.platform === 'win32') {
-            await execFileAsync('cmd', ['/c', 'attrib', '-R', '/S', '/D', pathToRemove + '\\*']);
-          } else {
-            await execFileAsync('chmod', ['-R', 'u+w', pathToRemove]);
-          }
-        } catch (permErr) {
-          log.warn('Failed to adjust permissions for worktree cleanup:', permErr);
-        }
-        try {
-          await fs.promises.rm(pathToRemove, { recursive: true, force: true });
-        } catch (retryErr) {
-          log.warn('Failed to cleanup worktree directory after permission fix:', retryErr);
-        }
-      } else {
-        log.warn('Failed to cleanup worktree directory:', rmErr);
-      }
-    }
-  }
-
-  /**
-   * Read .emdash.json config from project root
-   */
-  private readProjectConfig(projectPath: string): EmdashConfig | null {
-    try {
-      const configPath = path.join(projectPath, '.emdash.json');
-      if (!fs.existsSync(configPath)) {
-        return null;
-      }
-      const content = fs.readFileSync(configPath, 'utf8');
-      return JSON.parse(content) as EmdashConfig;
-    } catch {
-      return null;
-    }
-  }
-
-  /**
-   * Get preserve patterns for a project (config or defaults)
-   */
-  private getPreservePatterns(projectPath: string): string[] {
-    const config = this.readProjectConfig(projectPath);
-    if (config?.preservePatterns && Array.isArray(config.preservePatterns)) {
-      return config.preservePatterns;
-    }
-    return DEFAULT_PRESERVE_PATTERNS;
-  }
-
-  /**
-   * Preserve project files into a worktree using project config (or defaults).
-   */
-  async preserveProjectFilesToWorktree(
-    projectPath: string,
-    worktreePath: string
-  ): Promise<PreserveResult> {
-    const patterns = this.getPreservePatterns(projectPath);
-    return this.preserveFilesToWorktree(projectPath, worktreePath, patterns);
-  }
-
-  /** Slugify task name to make it shell-safe */
-  private slugify(name: string): string {
-    return name
-      .toLowerCase()
-      .replace(/[^a-z0-9-]/g, '-')
-      .replace(/-+/g, '-')
-      .replace(/^-|-$/g, '');
-  }
-
-  /** Generate a short 3-char alphanumeric hash for branch uniqueness */
-  private generateShortHash(): string {
-    const bytes = crypto.randomBytes(3);
-    return bytes.readUIntBE(0, 3).toString(36).slice(0, 3).padStart(3, '0');
-  }
-
-  /** Generate a stable ID from the absolute worktree path */
-  private stableIdFromPath(worktreePath: string): string {
-    const abs = path.resolve(worktreePath);
-    const h = crypto.createHash('sha1').update(abs).digest('hex').slice(0, 12);
-    return `wt-${h}`;
-  }
-
-  /**
-   * Create a new Git worktree for an agent task
-   */
-  async createWorktree(
-    projectPath: string,
-    taskName: string,
-    projectId: string,
-    baseRef?: string
-  ): Promise<WorktreeInfo> {
-    // Declare variables outside try block for access in catch block
-    let branchName: string | undefined;
-    let worktreePath: string | undefined;
-    const sluggedName = this.slugify(taskName);
-    const hash = this.generateShortHash();
-
-    try {
-      const { getAppSettings } = await import('../settings');
-      const settings = getAppSettings();
-      const prefix = settings?.repository?.branchPrefix || 'emdash';
-      branchName = this.sanitizeBranchName(`${prefix}/${sluggedName}-${hash}`);
-      worktreePath = path.join(projectPath, '..', `worktrees/${sluggedName}-${hash}`);
-      const worktreeId = this.stableIdFromPath(worktreePath);
-
-      log.info(`Creating worktree: ${branchName} -> ${worktreePath}`);
-
-      // Check if worktree path already exists
-      if (fs.existsSync(worktreePath)) {
-        throw new Error(`Worktree directory already exists: ${worktreePath}`);
-      }
-
-      // Ensure worktrees directory exists
-      const worktreesDir = path.dirname(worktreePath);
-      if (!fs.existsSync(worktreesDir)) {
-        fs.mkdirSync(worktreesDir, { recursive: true });
-      }
-
-      // Use provided baseRef override or resolve from project settings
-      let baseRefInfo: BaseRefInfo;
-      if (baseRef) {
-        const parsed = await this.parseBaseRef(baseRef, projectPath);
-        if (parsed) {
-          baseRefInfo = parsed;
-        } else {
-          // If parsing failed, fall back to project settings
-          log.warn(
-            `Failed to parse provided baseRef '${baseRef}', falling back to project settings`
-          );
-          baseRefInfo = await this.resolveProjectBaseRef(projectPath, projectId);
-        }
-      } else {
-        baseRefInfo = await this.resolveProjectBaseRef(projectPath, projectId);
-      }
-      const fetchedBaseRef = await this.fetchBaseRefWithFallback(
-        projectPath,
-        projectId,
-        baseRefInfo
-      );
-
-      // Create the worktree with --no-track to prevent auto-tracking base ref
-      // Tracking is set explicitly via push --set-upstream after creation
-      const { stdout, stderr } = await execFileAsync(
-        'git',
-        ['worktree', 'add', '--no-track', '-b', branchName, worktreePath, fetchedBaseRef.fullRef],
-        { cwd: projectPath }
-      );
-
-      log.debug('Git worktree stdout:', stdout);
-      log.debug('Git worktree stderr:', stderr);
-
-      // Verify the worktree was actually created
-      if (!fs.existsSync(worktreePath)) {
-        throw new Error(`Worktree directory was not created: ${worktreePath}`);
-      }
-
-      // Preserve .env and other gitignored config files from source to worktree
-      try {
-        await this.preserveProjectFilesToWorktree(projectPath, worktreePath);
-      } catch (preserveErr) {
-        log.warn('Failed to preserve files to worktree (continuing):', preserveErr);
-      }
-
-      await this.logWorktreeSyncStatus(projectPath, worktreePath, fetchedBaseRef);
-
-      const worktreeInfo: WorktreeInfo = {
-        id: worktreeId,
-        name: taskName,
-        branch: branchName,
-        path: worktreePath,
-        projectId,
-        status: 'active',
-        createdAt: new Date().toISOString(),
-      };
-
-      this.worktrees.set(worktreeInfo.id, worktreeInfo);
-
-      log.info(`Created worktree: ${taskName} -> ${branchName}`);
-
-      // Push the new branch to origin and set upstream so PRs work out of the box
-      // Only if a remote exists
-      if (settings?.repository?.pushOnCreate !== false && fetchedBaseRef.remote) {
-        try {
-          await execFileAsync(
-            'git',
-            ['push', '--set-upstream', fetchedBaseRef.remote, branchName],
-            {
-              cwd: worktreePath,
-            }
-          );
-          log.info(
-            `Pushed branch ${branchName} to ${fetchedBaseRef.remote} with upstream tracking`
-          );
-        } catch (pushErr) {
-          log.warn('Initial push of worktree branch failed:', pushErr as any);
-          // Don't fail worktree creation if push fails - user can push manually later
-        }
-      } else if (!fetchedBaseRef.remote) {
-        log.info(
-          `Skipping push for worktree branch ${branchName} - no remote configured (local-only repo)`
-        );
-      }
-
-      return worktreeInfo;
-    } catch (error) {
-      log.error('Failed to create worktree:', error);
-      const message = error instanceof Error ? error.message : String(error);
-
-      // Track worktree creation errors
-      await errorTracking.captureWorktreeError(error, 'create', worktreePath, branchName, {
-        project_id: projectId,
-        project_path: projectPath,
-        task_name: taskName,
-        hash: hash,
-      });
-
-      throw new Error(message || 'Failed to create worktree');
-    }
-  }
-
-  async fetchLatestBaseRef(projectPath: string, projectId: string): Promise<BaseRefInfo> {
-    const baseRefInfo = await this.resolveProjectBaseRef(projectPath, projectId);
-    const fetched = await this.fetchBaseRefWithFallback(projectPath, projectId, baseRefInfo);
-    return fetched;
-  }
-
-  /**
-   * List all worktrees for a project
-   */
-  async listWorktrees(projectPath: string): Promise<WorktreeInfo[]> {
-    try {
-      const { stdout } = await execFileAsync('git', ['worktree', 'list'], {
-        cwd: projectPath,
-      });
-
-      const worktrees: WorktreeInfo[] = [];
-      const lines = stdout.trim().split('\n');
-      // Compute managed prefixes based on configured prefix
-      let managedPrefixes: string[] = ['emdash', 'agent', 'pr', 'orch'];
-      try {
-        const { getAppSettings } = await import('../settings');
-        const settings = getAppSettings();
-        const p = settings?.repository?.branchPrefix;
-        if (p) managedPrefixes = Array.from(new Set([p, ...managedPrefixes]));
-      } catch {}
-
-      for (const line of lines) {
-        if (line.includes('[') && line.includes(']')) {
-          const parts = line.split(/\s+/);
-          const worktreePath = parts[0];
-          const branchMatch = line.match(/\[([^\]]+)\]/);
-          const branch = branchMatch ? branchMatch[1] : 'unknown';
-
-          const managedBranch = managedPrefixes.some((pf) => {
-            return (
-              branch.startsWith(pf + '/') ||
-              branch.startsWith(pf + '-') ||
-              branch.startsWith(pf + '_') ||
-              branch.startsWith(pf + '.') ||
-              branch === pf
-            );
-          });
-
-          if (!managedBranch) {
-            const tracked = Array.from(this.worktrees.values()).find(
-              (wt) => wt.path === worktreePath
-            );
-            if (!tracked) continue;
-          }
-
-          const existing = Array.from(this.worktrees.values()).find(
-            (wt) => wt.path === worktreePath
-          );
-
-          worktrees.push(
-            existing ?? {
-              id: this.stableIdFromPath(worktreePath),
-              name: path.basename(worktreePath),
-              branch,
-              path: worktreePath,
-              projectId: path.basename(projectPath),
-              status: 'active',
-              createdAt: new Date().toISOString(),
-            }
-          );
-        }
-      }
-
-      return worktrees;
-    } catch (error) {
-      log.error('Failed to list worktrees:', error);
-      return [];
-    }
-  }
-
-  /** Sanitize branch name to ensure it's a valid Git ref */
-  private sanitizeBranchName(name: string): string {
-    let n = name
-      .replace(/\s+/g, '-')
-      .replace(/[^A-Za-z0-9._\/-]+/g, '-')
-      .replace(/-+/g, '-')
-      .replace(/\/+/g, '/');
-    n = n.replace(/^[./-]+/, '').replace(/[./-]+$/, '');
-    if (!n || n === 'HEAD') {
-      n = `emdash/${this.slugify('task')}-${this.generateShortHash()}`;
-    }
-    return n;
-  }
-
-  /** Remove a worktree */
-  async removeWorktree(
-    projectPath: string,
-    worktreeId: string,
-    worktreePath?: string,
-    branch?: string
-  ): Promise<void> {
-    try {
-      const worktree = this.worktrees.get(worktreeId);
-
-      const pathToRemove = worktree?.path ?? worktreePath;
-      const branchToDelete = worktree?.branch ?? branch;
-
-      if (!pathToRemove) {
-        throw new Error('Worktree path not provided');
-      }
-
-      // CRITICAL SAFETY CHECK: Prevent removing the main repository
-      // Check if the path to remove is the same as the project path (main repo)
-      const normalizedPathToRemove = path.resolve(pathToRemove);
-      const normalizedProjectPath = path.resolve(projectPath);
-
-      if (normalizedPathToRemove === normalizedProjectPath) {
-        log.error(
-          `CRITICAL: Attempted to remove main repository! Path: ${pathToRemove}, Project: ${projectPath}`
-        );
-        throw new Error('Cannot remove main repository - this is not a worktree');
-      }
-
-      // Additional safety: Check if this is actually a worktree using git worktree list
-      try {
-        const { stdout } = await execFileAsync('git', ['worktree', 'list', '--porcelain'], {
-          cwd: projectPath,
-        });
-
-        // Parse the output to find if pathToRemove is a worktree
-        const lines = stdout.split('\n');
-        let isWorktree = false;
-        let isMainWorktree = false;
-
-        for (let i = 0; i < lines.length; i++) {
-          if (lines[i].startsWith('worktree ')) {
-            const wtPath = lines[i].substring(9); // Remove "worktree " prefix
-            const normalizedWtPath = path.resolve(wtPath);
-
-            if (normalizedWtPath === normalizedPathToRemove) {
-              // Check if this is the main worktree (bare repos have no main worktree)
-              const nextLine = lines[i + 1];
-              if (nextLine && nextLine === 'bare') {
-                isMainWorktree = true;
-              } else if (i === 0) {
-                // First worktree in the list is usually the main worktree
-                isMainWorktree = true;
-              }
-              isWorktree = true;
-              break;
-            }
-          }
-        }
-
-        if (isMainWorktree) {
-          log.error(`CRITICAL: Attempted to remove main worktree! Path: ${pathToRemove}`);
-          throw new Error('Cannot remove main worktree');
-        }
-
-        if (!isWorktree) {
-          log.warn(`Path is not a git worktree, skipping removal: ${pathToRemove}`);
-          // Don't throw error, just return - the path might not exist or might be a task without worktree
-          return;
-        }
-      } catch (checkError) {
-        log.warn('Could not verify worktree status, proceeding with caution:', checkError);
-        // If we can't verify, at least we've checked it's not the main project path above
-      }
-
-      // Remove the worktree directory via git first
-      try {
-        // Use --force to remove even when there are untracked/modified files
-        await execFileAsync('git', ['worktree', 'remove', '--force', pathToRemove], {
-          cwd: projectPath,
-        });
-      } catch (gitError) {
-        console.warn('git worktree remove failed, attempting filesystem cleanup', gitError);
-      }
-
-      // Best-effort prune to clear any stale worktree metadata that can keep a branch "checked out"
-      try {
-        await execFileAsync('git', ['worktree', 'prune', '--verbose'], { cwd: projectPath });
-      } catch (pruneErr) {
-        console.warn('git worktree prune failed (continuing):', pruneErr);
-      }
-
-      // Ensure directory is removed even if git command failed
-      void this.cleanupWorktreeDirectory(pathToRemove, projectPath);
-
-      if (branchToDelete) {
-        const tryDeleteBranch = async () =>
-          await execFileAsync('git', ['branch', '-D', branchToDelete!], { cwd: projectPath });
-        try {
-          await tryDeleteBranch();
-        } catch (branchError: any) {
-          const msg = String(branchError?.stderr || branchError?.message || branchError);
-          // If git thinks the branch is still checked out in a (now removed) worktree,
-          // prune and retry once more.
-          if (/checked out at /.test(msg)) {
-            try {
-              await execFileAsync('git', ['worktree', 'prune', '--verbose'], { cwd: projectPath });
-              await tryDeleteBranch();
-            } catch (retryErr) {
-              console.warn(`Failed to delete branch ${branchToDelete} after prune:`, retryErr);
-            }
-          } else {
-            console.warn(`Failed to delete branch ${branchToDelete}:`, branchError);
-          }
-        }
-
-        // Only try to delete remote branch if a remote exists
-        const remoteAlias = 'origin';
-        const hasRemote = await this.hasRemote(projectPath, remoteAlias);
-        if (hasRemote) {
-          let remoteBranchName = branchToDelete;
-          if (branchToDelete.startsWith('origin/')) {
-            remoteBranchName = branchToDelete.replace(/^origin\//, '');
-          }
-          try {
-            await execFileAsync('git', ['push', remoteAlias, '--delete', remoteBranchName], {
-              cwd: projectPath,
-            });
-            log.info(`Deleted remote branch ${remoteAlias}/${remoteBranchName}`);
-          } catch (remoteError: any) {
-            const msg = String(remoteError?.stderr || remoteError?.message || remoteError);
-            if (
-              /remote ref does not exist/i.test(msg) ||
-              /unknown revision/i.test(msg) ||
-              /not found/i.test(msg)
-            ) {
-              log.info(`Remote branch ${remoteAlias}/${remoteBranchName} already absent`);
-            } else {
-              log.warn(
-                `Failed to delete remote branch ${remoteAlias}/${remoteBranchName}:`,
-                remoteError
-              );
-            }
-          }
-        } else {
-          log.info(`Skipping remote branch deletion - no remote configured (local-only repo)`);
-        }
-      }
-
-      if (worktree) {
-        this.worktrees.delete(worktreeId);
-        log.info(`Removed worktree: ${worktree.name}`);
-      } else {
-        log.info(`Removed worktree ${worktreeId}`);
-      }
-    } catch (error) {
-      log.error('Failed to remove worktree:', error);
-      throw new Error(`Failed to remove worktree: ${error}`);
-    }
-  }
-
-  /**
-   * Get worktree status and changes
-   */
-  async getWorktreeStatus(worktreePath: string): Promise<{
-    hasChanges: boolean;
-    stagedFiles: string[];
-    unstagedFiles: string[];
-    untrackedFiles: string[];
-  }> {
-    try {
-      const { stdout: status } = await execFileAsync(
-        'git',
-        ['status', '--porcelain', '--untracked-files=all'],
-        {
-          cwd: worktreePath,
-        }
-      );
-
-      const stagedFiles: string[] = [];
-      const unstagedFiles: string[] = [];
-      const untrackedFiles: string[] = [];
-
-      const lines = status
-        .trim()
-        .split('\n')
-        .filter((line) => line.length > 0);
-
-      for (const line of lines) {
-        const status = line.substring(0, 2);
-        const file = line.substring(3);
-
-        if (status.includes('A') || status.includes('M') || status.includes('D')) {
-          stagedFiles.push(file);
-        }
-        if (status.includes('M') || status.includes('D')) {
-          unstagedFiles.push(file);
-        }
-        if (status.includes('??')) {
-          untrackedFiles.push(file);
-        }
-      }
-
-      return {
-        hasChanges: stagedFiles.length > 0 || unstagedFiles.length > 0 || untrackedFiles.length > 0,
-        stagedFiles,
-        unstagedFiles,
-        untrackedFiles,
-      };
-    } catch (error) {
-      log.error('Failed to get worktree status:', error);
-      return {
-        hasChanges: false,
-        stagedFiles: [],
-        unstagedFiles: [],
-        untrackedFiles: [],
-      };
-    }
-  }
-
-  /**
-   * Get the default branch of a repository
-   */
-  private async getDefaultBranch(projectPath: string): Promise<string> {
-    // Check if origin remote exists first
-    const hasOrigin = await this.hasRemote(projectPath, 'origin');
-    if (!hasOrigin) {
-      // No remote - try to get current branch
-      try {
-        const { stdout } = await execFileAsync('git', ['branch', '--show-current'], {
-          cwd: projectPath,
-        });
-        const current = stdout.trim();
-        if (current) return current;
-      } catch {
-        // Fallback to 'main'
-      }
-      return 'main';
-    }
-
-    // Has remote - try to get its default branch
-    try {
-      const { stdout } = await execFileAsync('git', ['remote', 'show', 'origin'], {
-        cwd: projectPath,
-      });
-      const match = stdout.match(/HEAD branch:\s*(\S+)/);
-      return match ? match[1] : 'main';
-    } catch {
-      return 'main';
-    }
-  }
-
-  private async parseBaseRef(
-    ref?: string | null,
-    projectPath?: string
-  ): Promise<BaseRefInfo | null> {
-    if (!ref) return null;
-    const cleaned = ref
-      .trim()
-      .replace(/^refs\/remotes\//, '')
-      .replace(/^remotes\//, '');
-    if (!cleaned) return null;
-
-    // Check if this looks like a remote/branch ref
-    const slashIndex = cleaned.indexOf('/');
-    if (slashIndex > 0) {
-      const potentialRemote = cleaned.substring(0, slashIndex);
-      const branch = cleaned.substring(slashIndex + 1);
-
-      if (branch) {
-        // Verify if potentialRemote is actually a git remote
-        if (projectPath) {
-          try {
-            const { stdout } = await execFileAsync('git', ['remote'], { cwd: projectPath });
-            const remotes = (stdout || '').trim().split('\n').filter(Boolean);
-            if (remotes.includes(potentialRemote)) {
-              return { remote: potentialRemote, branch, fullRef: cleaned };
-            }
-            // Not a valid remote, fall through to treat as local branch
-          } catch {
-            // Can't check remotes, assume it's a remote ref
-            return { remote: potentialRemote, branch, fullRef: cleaned };
-          }
-        } else {
-          // No projectPath to verify, assume it's a remote ref
-          return { remote: potentialRemote, branch, fullRef: cleaned };
-        }
-      }
-    }
-
-    // Treat as a local branch (no remote prefix)
-    return { remote: '', branch: cleaned, fullRef: cleaned };
-  }
-
-  private async resolveProjectBaseRef(
-    projectPath: string,
-    projectId: string
-  ): Promise<BaseRefInfo> {
-    const settings = await projectSettingsService.getProjectSettings(projectId);
-    if (!settings) {
-      throw new Error(
-        'Project settings not found. Please re-open the project in Emdash and try again.'
-      );
-    }
-
-    const parsed = await this.parseBaseRef(settings.baseRef, projectPath);
-    if (parsed) {
-      return parsed;
-    }
-
-    // If parseBaseRef returned null, it might be a local branch name
-    // Check if the baseRef exists as a local branch
-    if (settings.baseRef) {
-      try {
-        const { stdout } = await execFileAsync(
-          'git',
-          ['rev-parse', '--verify', `refs/heads/${settings.baseRef}`],
-          { cwd: projectPath }
-        );
-        if (stdout?.trim()) {
-          // It's a valid local branch - check if we have a remote
-          const hasOrigin = await this.hasRemote(projectPath, 'origin');
-          if (hasOrigin) {
-            return {
-              remote: 'origin',
-              branch: settings.baseRef,
-              fullRef: `origin/${settings.baseRef}`,
-            };
-          } else {
-            // Local-only repo
-            return {
-              remote: '',
-              branch: settings.baseRef,
-              fullRef: settings.baseRef,
-            };
-          }
-        }
-      } catch {
-        // Not a local branch, continue to fallback
-      }
-    }
-
-    // Check if we have a remote
-    const hasOrigin = await this.hasRemote(projectPath, 'origin');
-    const fallbackBranch =
-      settings.gitBranch?.trim() && !settings.gitBranch.includes(' ')
-        ? settings.gitBranch.trim()
-        : await this.getDefaultBranch(projectPath);
-    const branch = fallbackBranch || 'main';
-
-    if (hasOrigin) {
-      return {
-        remote: 'origin',
-        branch,
-        fullRef: `origin/${branch}`,
-      };
-    } else {
-      // Local-only repo
-      return {
-        remote: '',
-        branch,
-        fullRef: branch,
-      };
-    }
-  }
-
-  private async buildDefaultBaseRef(projectPath: string): Promise<BaseRefInfo> {
-    const hasOrigin = await this.hasRemote(projectPath, 'origin');
-    const branch = await this.getDefaultBranch(projectPath);
-    const cleanBranch = branch?.trim() || 'main';
-
-    if (hasOrigin) {
-      return { remote: 'origin', branch: cleanBranch, fullRef: `origin/${cleanBranch}` };
-    } else {
-      // Local-only repo
-      return { remote: '', branch: cleanBranch, fullRef: cleanBranch };
-    }
-  }
-
-  private extractErrorMessage(error: any): string {
-    if (!error) return '';
-    const parts: Array<string | undefined> = [];
-    if (typeof error.message === 'string') parts.push(error.message);
-    if (typeof error.stderr === 'string') parts.push(error.stderr);
-    if (typeof error.stdout === 'string') parts.push(error.stdout);
-    return parts.filter(Boolean).join(' ').trim();
-  }
-
-  private isMissingRemoteRefError(error: any): boolean {
-    const msg = this.extractErrorMessage(error).toLowerCase();
-    if (!msg) return false;
-    return (
-      msg.includes("couldn't find remote ref") ||
-      msg.includes('could not find remote ref') ||
-      msg.includes('remote ref does not exist') ||
-      msg.includes('fatal: the remote end hung up unexpectedly') ||
-      msg.includes('no such ref was fetched')
-    );
-  }
-
-  private async fetchBaseRefWithFallback(
-    projectPath: string,
-    projectId: string,
-    target: BaseRefInfo
-  ): Promise<BaseRefInfo> {
-    // Check if remote exists - if not, this is a local-only repo
-    const hasRemote = await this.hasRemote(projectPath, target.remote);
-
-    if (!hasRemote) {
-      log.info(`No remote '${target.remote}' found, using local branch ${target.branch}`);
-      // Verify the local branch exists
-      try {
-        await execFileAsync('git', ['rev-parse', '--verify', target.branch], {
-          cwd: projectPath,
-        });
-        // Return target with just the branch name (no remote prefix)
-        return {
-          remote: '',
-          branch: target.branch,
-          fullRef: target.branch,
-        };
-      } catch (error: any) {
-        if (
-          error?.code === 'ENAMETOOLONG' ||
-          error?.code === 'ENOENT' ||
-          error?.code === 'EACCES'
-        ) {
-          throw new Error(`Git failed to run (${error.code}). Check app logs for details.`);
-        }
-        throw new Error(`Local branch '${target.branch}' does not exist. Please create it first.`);
-      }
-    }
-
-    // Remote exists, proceed with fetch
-    try {
-      await execFileAsync('git', ['fetch', target.remote, target.branch], {
-        cwd: projectPath,
-      });
-      log.info(`Fetched latest ${target.fullRef} for worktree creation`);
-      return target;
-    } catch (error) {
-      log.warn(`Failed to fetch ${target.fullRef}`, error);
-      if (!this.isMissingRemoteRefError(error)) {
-        const message = this.extractErrorMessage(error) || 'Unknown git fetch error';
-        throw new Error(`Failed to fetch ${target.fullRef}: ${message}`);
-      }
-
-      // Attempt fallback to default branch
-      const fallback = await this.buildDefaultBaseRef(projectPath);
-      if (fallback.fullRef === target.fullRef) {
-        const message = this.extractErrorMessage(error) || 'Unknown git fetch error';
-        throw new Error(`Failed to fetch ${target.fullRef}: ${message}`);
-      }
-
-      // Check if fallback remote exists before fetching
-      const hasFallbackRemote = await this.hasRemote(projectPath, fallback.remote);
-      if (!hasFallbackRemote) {
-        throw new Error(
-          `Failed to fetch ${target.fullRef} and fallback remote '${fallback.remote}' does not exist`
-        );
-      }
-
-      try {
-        await execFileAsync('git', ['fetch', fallback.remote, fallback.branch], {
-          cwd: projectPath,
-        });
-        log.info(`Fetched fallback ${fallback.fullRef} after missing base ref`);
-
-        try {
-          await projectSettingsService.updateProjectSettings(projectId, {
-            baseRef: fallback.fullRef,
-          });
-          log.info(`Updated project ${projectId} baseRef to fallback ${fallback.fullRef}`);
-        } catch (persistError) {
-          log.warn('Failed to persist fallback baseRef', persistError);
-        }
-
-        return fallback;
-      } catch (fallbackError) {
-        const msg = this.extractErrorMessage(fallbackError) || 'Unknown git fetch error';
-        throw new Error(
-          `Failed to fetch base branch. Tried ${target.fullRef} and ${fallback.fullRef}. ${msg} Please verify the branch exists on the remote.`
-        );
-      }
-    }
-  }
-
-  /**
-   * Check if a git remote exists in the repository
-   */
-  private async hasRemote(projectPath: string, remoteName: string): Promise<boolean> {
-    if (!remoteName) return false;
-    try {
-      await execFileAsync('git', ['remote', 'get-url', remoteName], {
-        cwd: projectPath,
-      });
-      return true;
-    } catch (error: any) {
-      if (error?.code === 'ENAMETOOLONG' || error?.code === 'ENOENT' || error?.code === 'EACCES') {
-        throw error;
-      }
-      return false;
-    }
-  }
-
-  /**
-   * Merge worktree changes back to main branch
-   */
-  async mergeWorktreeChanges(projectPath: string, worktreeId: string): Promise<void> {
-    try {
-      const worktree = this.worktrees.get(worktreeId);
-      if (!worktree) {
-        throw new Error('Worktree not found');
-      }
-
-      const defaultBranch = await this.getDefaultBranch(projectPath);
-
-      // Switch to default branch
-      await execFileAsync('git', ['checkout', defaultBranch], { cwd: projectPath });
-
-      // Merge the worktree branch
-      await execFileAsync('git', ['merge', worktree.branch], { cwd: projectPath });
-
-      // Remove the worktree
-      await this.removeWorktree(projectPath, worktreeId);
-
-      log.info(`Merged worktree changes: ${worktree.name}`);
-    } catch (error) {
-      log.error('Failed to merge worktree changes:', error);
-      throw new Error(`Failed to merge worktree changes: ${error}`);
-    }
-  }
-
-  /**
-   * Get worktree by ID
-   */
-  getWorktree(worktreeId: string): WorktreeInfo | undefined {
-    return this.worktrees.get(worktreeId);
-  }
-
-  /**
-   * Get all worktrees
-   */
-  getAllWorktrees(): WorktreeInfo[] {
-    return Array.from(this.worktrees.values());
-  }
-
-  /**
-   * Build scoped git pathspecs from preserve patterns.
-   * We query both the raw pattern and a recursive variant to preserve existing
-   * basename-matching behavior for nested files.
-   */
-  private buildIgnoredPathspecs(patterns: string[]): string[] {
-    const pathspecs = new Set<string>();
-
-    for (const rawPattern of patterns) {
-      const pattern = rawPattern.trim().replace(/\\/g, '/').replace(/^\.\//, '');
-      if (!pattern) {
-        continue;
-      }
-
-      pathspecs.add(pattern);
-      if (!pattern.startsWith('**/')) {
-        pathspecs.add(`**/${pattern}`);
-      }
-    }
-
-    return Array.from(pathspecs);
-  }
-
-  /**
-   * Get ignored and non-ignored untracked files that match preserve patterns.
-   */
-  private async getPreserveCandidateFiles(dir: string, patterns: string[]): Promise<string[]> {
-    const pathspecs = this.buildIgnoredPathspecs(patterns);
-    if (pathspecs.length === 0) {
-      return [];
-    }
-
-    try {
-      const [ignoredResult, untrackedResult] = await Promise.all([
-        execFileAsync(
-          'git',
-          ['ls-files', '--others', '--ignored', '--exclude-standard', '--', ...pathspecs],
-          {
-            cwd: dir,
-            maxBuffer: 10 * 1024 * 1024,
-          }
-        ),
-        execFileAsync('git', ['ls-files', '--others', '--exclude-standard', '--', ...pathspecs], {
-          cwd: dir,
-          maxBuffer: 10 * 1024 * 1024,
-        }),
-      ]);
-
-      const ignoredFiles = (ignoredResult.stdout || '')
-        .trim()
-        .split('\n')
-        .filter((line) => line.length > 0);
-      const untrackedFiles = (untrackedResult.stdout || '')
-        .trim()
-        .split('\n')
-        .filter((line) => line.length > 0);
-
-      return Array.from(new Set([...ignoredFiles, ...untrackedFiles]));
-    } catch (error) {
-      log.debug('Failed to list preserve candidate files:', error);
-      return [];
-    }
-  }
-
-  /**
-   * Check if a file path matches any of the preserve patterns
-   */
-  private matchesPreservePattern(filePath: string, patterns: string[]): boolean {
-    const fileName = path.basename(filePath);
-
-    for (const pattern of patterns) {
-      // Match against filename
-      if (minimatch(fileName, pattern, { dot: true })) {
-        return true;
-      }
-      // Match against full path
-      if (minimatch(filePath, pattern, { dot: true })) {
-        return true;
-      }
-      // Match against full path with ** prefix for nested matches
-      if (minimatch(filePath, `**/${pattern}`, { dot: true })) {
-        return true;
-      }
-    }
-
-    return false;
-  }
-
-  /**
-   * Check if a file path contains any excluded path segments
-   */
-  private isExcludedPath(filePath: string, excludePatterns: string[]): boolean {
-    if (excludePatterns.length === 0) {
-      return false;
-    }
-
-    // git ls-files always returns paths with forward slashes regardless of OS
-    const parts = filePath.split('/');
-    for (const part of parts) {
-      if (excludePatterns.includes(part)) {
-        return true;
-      }
-    }
-
-    return false;
-  }
-
-  /**
-   * Copy a file safely, skipping if destination already exists
-   */
-  private async copyFileExclusive(
-    sourcePath: string,
-    destPath: string
-  ): Promise<'copied' | 'skipped' | 'error'> {
-    try {
-      // Check if destination already exists
-      if (fs.existsSync(destPath)) {
-        return 'skipped';
-      }
-
-      // Ensure destination directory exists
-      const destDir = path.dirname(destPath);
-      if (!fs.existsSync(destDir)) {
-        fs.mkdirSync(destDir, { recursive: true });
-      }
-
-      // Copy file preserving mode
-      const content = fs.readFileSync(sourcePath);
-      const stat = fs.statSync(sourcePath);
-      fs.writeFileSync(destPath, content, { mode: stat.mode });
-
-      return 'copied';
-    } catch (error) {
-      log.debug(`Failed to copy ${sourcePath} to ${destPath}:`, error);
-      return 'error';
-    }
-  }
-
-  /**
-   * Preserve local files (typically ignored or untracked) from source to destination worktree.
-   * Only copies files that match the preserve patterns and don't exist in destination.
-   */
-  async preserveFilesToWorktree(
-    sourceDir: string,
-    destDir: string,
-    patterns: string[] = DEFAULT_PRESERVE_PATTERNS,
-    excludePatterns: string[] = DEFAULT_EXCLUDE_PATTERNS
-  ): Promise<PreserveResult> {
-    const result: PreserveResult = { copied: [], skipped: [] };
-
-    if (patterns.length === 0) {
-      return result;
-    }
-
-    // Get local files matching preserve patterns from source directory
-    const sourceFiles = await this.getPreserveCandidateFiles(sourceDir, patterns);
-
-    if (sourceFiles.length === 0) {
-      log.debug('No preserve candidate files found in source directory');
-      return result;
-    }
-
-    // Filter files that match patterns and aren't excluded
-    const filesToCopy: string[] = [];
-    for (const file of sourceFiles) {
-      if (this.isExcludedPath(file, excludePatterns)) {
-        continue;
-      }
-
-      if (this.matchesPreservePattern(file, patterns)) {
-        filesToCopy.push(file);
-      }
-    }
-
-    if (filesToCopy.length === 0) {
-      log.debug('No files matched preserve patterns');
-      return result;
-    }
-
-    log.info(`Preserving ${filesToCopy.length} file(s) to worktree: ${filesToCopy.join(', ')}`);
-
-    // Copy each file
-    for (const file of filesToCopy) {
-      const sourcePath = path.join(sourceDir, file);
-      const destPath = path.join(destDir, file);
-
-      // Verify source file exists
-      if (!fs.existsSync(sourcePath)) {
-        log.debug(`Source file does not exist, skipping: ${sourcePath}`);
-        continue;
-      }
-
-      const copyResult = await this.copyFileExclusive(sourcePath, destPath);
-
-      if (copyResult === 'copied') {
-        result.copied.push(file);
-        log.debug(`Copied: ${file}`);
-      } else if (copyResult === 'skipped') {
-        result.skipped.push(file);
-        log.debug(`Skipped (already exists): ${file}`);
-      }
-    }
-
-    if (result.copied.length > 0) {
-      log.info(`Preserved ${result.copied.length} file(s) to worktree`);
-    }
-
-    return result;
-  }
-
-  private async logWorktreeSyncStatus(
-    projectPath: string,
-    worktreePath: string,
-    baseRef: BaseRefInfo
-  ): Promise<void> {
-    try {
-      const [{ stdout: remoteOut }, { stdout: worktreeOut }] = await Promise.all([
-        execFileAsync('git', ['rev-parse', baseRef.fullRef], { cwd: projectPath }),
-        execFileAsync('git', ['rev-parse', 'HEAD'], { cwd: worktreePath }),
-      ]);
-      const remoteSha = (remoteOut || '').trim();
-      const worktreeSha = (worktreeOut || '').trim();
-      if (!remoteSha || !worktreeSha) return;
-      if (remoteSha === worktreeSha) {
-        log.debug(`Worktree ${worktreePath} matches ${baseRef.fullRef} @ ${remoteSha}`);
-      } else {
-        log.warn(
-          `Worktree ${worktreePath} diverged from ${baseRef.fullRef} immediately after creation`,
-          { remoteSha, worktreeSha, baseRef: baseRef.fullRef }
-        );
-      }
-    } catch (error) {
-      log.debug('Unable to verify worktree head against remote', error);
-    }
-  }
-
-  async createWorktreeFromBranch(
-    projectPath: string,
-    taskName: string,
-    branchName: string,
-    projectId: string,
-    options?: { worktreePath?: string }
-  ): Promise<WorktreeInfo> {
-    const normalizedName = taskName || branchName.replace(/\//g, '-');
-    const sluggedName = this.slugify(normalizedName) || 'task';
-    const targetPath =
-      options?.worktreePath ||
-      path.join(projectPath, '..', `worktrees/${sluggedName}-${Date.now()}`);
-    const worktreePath = path.resolve(targetPath);
-
-    if (fs.existsSync(worktreePath)) {
-      throw new Error(`Worktree directory already exists: ${worktreePath}`);
-    }
-
-    const worktreesDir = path.dirname(worktreePath);
-    if (!fs.existsSync(worktreesDir)) {
-      fs.mkdirSync(worktreesDir, { recursive: true });
-    }
-
-    try {
-      await execFileAsync('git', ['worktree', 'add', worktreePath, branchName], {
-        cwd: projectPath,
-      });
-    } catch (error) {
-      throw new Error(
-        `Failed to create worktree for branch ${branchName}: ${error instanceof Error ? error.message : String(error)}`
-      );
-    }
-
-    if (!fs.existsSync(worktreePath)) {
-      throw new Error(`Worktree directory was not created: ${worktreePath}`);
-    }
-
-    // Preserve .env and other gitignored config files from source to worktree
-    try {
-      await this.preserveProjectFilesToWorktree(projectPath, worktreePath);
-    } catch (preserveErr) {
-      log.warn('Failed to preserve files to worktree (continuing):', preserveErr);
-    }
-
-    const worktreeInfo: WorktreeInfo = {
-      id: this.stableIdFromPath(worktreePath),
-      name: normalizedName,
-      branch: branchName,
-      path: worktreePath,
-      projectId,
-      status: 'active',
-      createdAt: new Date().toISOString(),
-    };
-
-    this.worktrees.set(worktreeInfo.id, worktreeInfo);
-
-    return worktreeInfo;
-  }
-
-  /**
-   * Register a worktree created externally (e.g., by WorktreePoolService)
-   */
-  registerWorktree(worktree: WorktreeInfo): void {
-    this.worktrees.set(worktree.id, worktree);
-  }
-}
-
-export const worktreeService = new WorktreeService();
diff --git a/src/main/services/__tests__/RemoteGitService.test.ts b/src/main/services/__tests__/RemoteGitService.test.ts
deleted file mode 100644
index 7da1aa1f08..0000000000
--- a/src/main/services/__tests__/RemoteGitService.test.ts
+++ /dev/null
@@ -1,1015 +0,0 @@
-import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
-import { RemoteGitService, WorktreeInfo, GitStatus } from '../RemoteGitService';
-import { SshService } from '../ssh/SshService';
-import { ExecResult } from '../../../shared/ssh/types';
-
-// Mock SshService
-const mockExecuteCommand = vi.fn();
-const mockConnect = vi.fn();
-const mockDisconnect = vi.fn();
-
-vi.mock('../ssh/SshService', () => ({
-  SshService: vi.fn().mockImplementation(() => ({
-    executeCommand: mockExecuteCommand,
-    connect: mockConnect,
-    disconnect: mockDisconnect,
-  })),
-}));
-
-describe('RemoteGitService', () => {
-  let service: RemoteGitService;
-  let mockSshService: SshService;
-
-  beforeEach(() => {
-    vi.clearAllMocks();
-    mockSshService = new SshService();
-    service = new RemoteGitService(mockSshService);
-  });
-
-  describe('getStatus', () => {
-    it('should parse clean repository status', async () => {
-      mockExecuteCommand.mockResolvedValue({
-        stdout: '## main...origin/main\n',
-        stderr: '',
-        exitCode: 0,
-      } as ExecResult);
-
-      const result = await service.getStatus('conn-1', '/home/user/project');
-
-      expect(result.branch).toBe('main');
-      expect(result.isClean).toBe(true);
-      expect(result.files).toHaveLength(0);
-      expect(mockExecuteCommand).toHaveBeenCalledWith(
-        'conn-1',
-        'git status --porcelain -b',
-        '/home/user/project'
-      );
-    });
-
-    it('should parse repository with uncommitted changes', async () => {
-      mockExecuteCommand.mockResolvedValue({
-        stdout: '## feature-branch\n M modified.ts\n?? untracked.txt\nA  staged.js',
-        stderr: '',
-        exitCode: 0,
-      } as ExecResult);
-
-      const result = await service.getStatus('conn-1', '/home/user/project');
-
-      expect(result.branch).toBe('feature-branch');
-      expect(result.isClean).toBe(false);
-      expect(result.files).toHaveLength(3);
-      expect(result.files).toContainEqual({ status: 'M', path: 'modified.ts' });
-      expect(result.files).toContainEqual({ status: '??', path: 'untracked.txt' });
-      expect(result.files).toContainEqual({ status: 'A', path: 'staged.js' });
-    });
-
-    it('should handle ahead/behind status', async () => {
-      mockExecuteCommand.mockResolvedValue({
-        stdout: '## main...origin/main [ahead 2, behind 1]\n',
-        stderr: '',
-        exitCode: 0,
-      } as ExecResult);
-
-      const result = await service.getStatus('conn-1', '/home/user/project');
-
-      expect(result.branch).toBe('main');
-    });
-
-    it('should handle detached HEAD', async () => {
-      mockExecuteCommand.mockResolvedValue({
-        stdout: '## HEAD (no branch)\n M file.txt',
-        stderr: '',
-        exitCode: 0,
-      } as ExecResult);
-
-      const result = await service.getStatus('conn-1', '/home/user/project');
-
-      expect(result.branch).toBe('HEAD (no branch)');
-    });
-
-    it('should throw error when git status fails', async () => {
-      mockExecuteCommand.mockResolvedValue({
-        stdout: '',
-        stderr: 'fatal: not a git repository',
-        exitCode: 128,
-      } as ExecResult);
-
-      await expect(service.getStatus('conn-1', '/home/user/project')).rejects.toThrow(
-        'Git status failed: fatal: not a git repository'
-      );
-    });
-
-    it('should handle unknown branch format', async () => {
-      mockExecuteCommand.mockResolvedValue({
-        stdout: '##\n',
-        stderr: '',
-        exitCode: 0,
-      } as ExecResult);
-
-      const result = await service.getStatus('conn-1', '/home/user/project');
-
-      expect(result.branch).toBe('unknown');
-    });
-  });
-
-  describe('createWorktree', () => {
-    beforeEach(() => {
-      vi.useFakeTimers();
-      vi.setSystemTime(new Date('2024-01-15T10:30:00Z'));
-    });
-
-    afterEach(() => {
-      vi.useRealTimers();
-    });
-
-    it('should create worktree with default base ref', async () => {
-      mockExecuteCommand.mockResolvedValue({
-        stdout: "Preparing worktree (new branch 'task-name-1705314600000')\n",
-        stderr: '',
-        exitCode: 0,
-      } as ExecResult);
-
-      const result = await service.createWorktree('conn-1', '/home/user/project', 'task name');
-
-      expect(mockExecuteCommand).toHaveBeenCalledWith(
-        'conn-1',
-        'mkdir -p .emdash/worktrees',
-        '/home/user/project'
-      );
-      // When no baseRef is provided, getDefaultBranch is called first (git rev-parse),
-      // then git worktree add is called
-      expect(mockExecuteCommand).toHaveBeenCalledWith(
-        'conn-1',
-        expect.stringContaining('git worktree add'),
-        '/home/user/project'
-      );
-      expect(result.branch).toContain('task-name');
-      expect(result.isMain).toBe(false);
-      expect(result.path).toContain('.emdash/worktrees');
-    });
-
-    it('should create worktree with custom base ref', async () => {
-      mockExecuteCommand.mockResolvedValue({
-        stdout: '',
-        stderr: '',
-        exitCode: 0,
-      } as ExecResult);
-
-      const result = await service.createWorktree(
-        'conn-1',
-        '/home/user/project',
-        'feature-task',
-        'origin/develop'
-      );
-
-      expect(mockExecuteCommand).toHaveBeenNthCalledWith(
-        2,
-        'conn-1',
-        expect.stringContaining('origin/develop'),
-        '/home/user/project'
-      );
-    });
-
-    it('should sanitize task name for branch', async () => {
-      mockExecuteCommand.mockResolvedValue({
-        stdout: '',
-        stderr: '',
-        exitCode: 0,
-      } as ExecResult);
-
-      const result = await service.createWorktree(
-        'conn-1',
-        '/home/user/project',
-        'task with spaces & symbols!@#'
-      );
-
-      expect(result.branch).toMatch(/^task-with-spaces-/);
-      expect(result.branch).not.toContain(' ');
-      expect(result.branch).not.toContain('&');
-      expect(result.branch).not.toContain('!');
-      expect(result.branch).not.toContain('@');
-      expect(result.branch).not.toContain('#');
-    });
-
-    it('should throw error when worktree creation fails', async () => {
-      mockExecuteCommand
-        .mockResolvedValueOnce({ stdout: '', stderr: '', exitCode: 0 } as ExecResult) // mkdir succeeds
-        .mockResolvedValueOnce({ stdout: 'main', stderr: '', exitCode: 0 } as ExecResult) // getDefaultBranch (git rev-parse)
-        .mockResolvedValueOnce({
-          stdout: '',
-          stderr: 'fatal: A branch named \"test\" already exists',
-          exitCode: 128,
-        } as ExecResult); // git worktree add fails
-
-      await expect(service.createWorktree('conn-1', '/home/user/project', 'test')).rejects.toThrow(
-        'Failed to create worktree: fatal: A branch named'
-      );
-    });
-
-    it('should construct correct worktree path', async () => {
-      mockExecuteCommand.mockResolvedValue({
-        stdout: '',
-        stderr: '',
-        exitCode: 0,
-      } as ExecResult);
-
-      const result = await service.createWorktree(
-        'conn-1',
-        '/home/user/repos/myproject',
-        'test-task'
-      );
-
-      expect(result.path).toContain('/.emdash/worktrees/');
-      expect(result.path).toContain('test-task');
-    });
-  });
-
-  describe('removeWorktree', () => {
-    it('should remove worktree successfully', async () => {
-      mockExecuteCommand.mockResolvedValue({
-        stdout: '',
-        stderr: '',
-        exitCode: 0,
-      } as ExecResult);
-
-      await service.removeWorktree(
-        'conn-1',
-        '/home/user/project',
-        '/home/user/project/.emdash/worktrees/test-123'
-      );
-
-      expect(mockExecuteCommand).toHaveBeenCalledWith(
-        'conn-1',
-        "git worktree remove '/home/user/project/.emdash/worktrees/test-123' --force",
-        '/home/user/project'
-      );
-    });
-
-    it('should throw error when removal fails', async () => {
-      mockExecuteCommand.mockResolvedValue({
-        stdout: '',
-        stderr: 'fatal: not a valid worktree',
-        exitCode: 128,
-      } as ExecResult);
-
-      await expect(
-        service.removeWorktree('conn-1', '/home/user/project', '/invalid/path')
-      ).rejects.toThrow('Failed to remove worktree: fatal: not a valid worktree');
-    });
-
-    it('should handle paths with spaces', async () => {
-      mockExecuteCommand.mockResolvedValue({
-        stdout: '',
-        stderr: '',
-        exitCode: 0,
-      } as ExecResult);
-
-      await service.removeWorktree(
-        'conn-1',
-        '/home/user/my project',
-        '/home/user/my project/.emdash/worktrees/test'
-      );
-
-      expect(mockExecuteCommand).toHaveBeenCalledWith(
-        'conn-1',
-        "git worktree remove '/home/user/my project/.emdash/worktrees/test' --force",
-        '/home/user/my project'
-      );
-    });
-  });
-
-  describe('getBranchList', () => {
-    it('should return list of branches', async () => {
-      mockExecuteCommand.mockResolvedValue({
-        stdout: 'main\ndevelop\nfeature/new-thing\n* current-branch\n  remotes/origin/main\n',
-        stderr: '',
-        exitCode: 0,
-      } as ExecResult);
-
-      const result = await service.getBranchList('conn-1', '/home/user/project');
-
-      expect(result).toHaveLength(5);
-      expect(result).toContain('main');
-      expect(result).toContain('develop');
-      expect(result).toContain('feature/new-thing');
-      expect(result).toContain('* current-branch');
-      expect(result).toContain('  remotes/origin/main');
-    });
-
-    it('should return empty array when git command fails', async () => {
-      mockExecuteCommand.mockResolvedValue({
-        stdout: '',
-        stderr: 'fatal: not a git repository',
-        exitCode: 128,
-      } as ExecResult);
-
-      const result = await service.getBranchList('conn-1', '/home/user/project');
-
-      expect(result).toEqual([]);
-    });
-
-    it('should filter out empty lines', async () => {
-      mockExecuteCommand.mockResolvedValue({
-        stdout: 'main\n\ndevelop\n\n',
-        stderr: '',
-        exitCode: 0,
-      } as ExecResult);
-
-      const result = await service.getBranchList('conn-1', '/home/user/project');
-
-      expect(result).toHaveLength(2);
-      expect(result).toContain('main');
-      expect(result).toContain('develop');
-    });
-  });
-
-  describe('commit', () => {
-    it('should commit with message', async () => {
-      mockExecuteCommand.mockResolvedValue({
-        stdout: '[main abc1234] Test commit\n 1 file changed, 1 insertion(+)\n',
-        stderr: '',
-        exitCode: 0,
-      } as ExecResult);
-
-      const result = await service.commit('conn-1', '/home/user/project', 'Test commit');
-
-      expect(mockExecuteCommand).toHaveBeenCalledWith(
-        'conn-1',
-        "git commit -m 'Test commit'",
-        '/home/user/project'
-      );
-      expect(result.exitCode).toBe(0);
-    });
-
-    it('should stage and commit specific files', async () => {
-      mockExecuteCommand.mockResolvedValue({
-        stdout: '[main abc1234] Commit specific files\n',
-        stderr: '',
-        exitCode: 0,
-      } as ExecResult);
-
-      const result = await service.commit('conn-1', '/home/user/project', 'Commit specific files', [
-        'file1.ts',
-        'file2.ts',
-      ]);
-
-      expect(mockExecuteCommand).toHaveBeenCalledWith(
-        'conn-1',
-        "git add 'file1.ts' 'file2.ts' && git commit -m 'Commit specific files'",
-        '/home/user/project'
-      );
-    });
-
-    it('should escape quotes in commit message', async () => {
-      mockExecuteCommand.mockResolvedValue({
-        stdout: '',
-        stderr: '',
-        exitCode: 0,
-      } as ExecResult);
-
-      await service.commit('conn-1', '/home/user/project', 'Fix bug in "authentication" module');
-
-      expect(mockExecuteCommand).toHaveBeenCalledWith(
-        'conn-1',
-        'git commit -m \'Fix bug in "authentication" module\'',
-        '/home/user/project'
-      );
-    });
-
-    it('should handle multiline commit messages', async () => {
-      mockExecuteCommand.mockResolvedValue({
-        stdout: '',
-        stderr: '',
-        exitCode: 0,
-      } as ExecResult);
-
-      await service.commit('conn-1', '/home/user/project', 'First line\n\nSecond paragraph');
-
-      // The message should be properly escaped
-      expect(mockExecuteCommand).toHaveBeenCalledWith(
-        'conn-1',
-        expect.stringContaining('git commit'),
-        '/home/user/project'
-      );
-    });
-
-    it('should handle empty files array', async () => {
-      mockExecuteCommand.mockResolvedValue({
-        stdout: '',
-        stderr: '',
-        exitCode: 0,
-      } as ExecResult);
-
-      await service.commit('conn-1', '/home/user/project', 'Commit message', []);
-
-      expect(mockExecuteCommand).toHaveBeenCalledWith(
-        'conn-1',
-        "git commit -m 'Commit message'",
-        '/home/user/project'
-      );
-    });
-
-    it('should handle commit failure', async () => {
-      mockExecuteCommand.mockResolvedValue({
-        stdout: '',
-        stderr: 'nothing to commit, working tree clean',
-        exitCode: 1,
-      } as ExecResult);
-
-      const result = await service.commit('conn-1', '/home/user/project', 'Empty commit');
-
-      expect(result.exitCode).toBe(1);
-      expect(result.stderr).toBe('nothing to commit, working tree clean');
-    });
-
-    it('should commit files with special characters in names', async () => {
-      mockExecuteCommand.mockResolvedValue({
-        stdout: '',
-        stderr: '',
-        exitCode: 0,
-      } as ExecResult);
-
-      await service.commit('conn-1', '/home/user/project', 'Special files', [
-        'file with spaces.ts',
-      ]);
-
-      expect(mockExecuteCommand).toHaveBeenCalledWith(
-        'conn-1',
-        expect.stringContaining("git add 'file with spaces.ts'"),
-        '/home/user/project'
-      );
-    });
-  });
-
-  describe('getStatusDetailed', () => {
-    it('should return empty array for non-git directory', async () => {
-      mockExecuteCommand.mockResolvedValue({
-        stdout: '',
-        stderr: 'fatal: not a git repository',
-        exitCode: 128,
-      } as ExecResult);
-
-      const result = await service.getStatusDetailed('conn-1', '/home/user/project');
-      expect(result).toEqual([]);
-    });
-
-    it('should return empty array for clean repo', async () => {
-      mockExecuteCommand
-        .mockResolvedValueOnce({ stdout: 'true', stderr: '', exitCode: 0 } as ExecResult) // rev-parse
-        .mockResolvedValueOnce({ stdout: '', stderr: '', exitCode: 0 } as ExecResult); // status
-
-      const result = await service.getStatusDetailed('conn-1', '/home/user/project');
-      expect(result).toEqual([]);
-    });
-
-    it('should parse status with additions/deletions from numstat', async () => {
-      mockExecuteCommand
-        .mockResolvedValueOnce({ stdout: 'true', stderr: '', exitCode: 0 } as ExecResult) // rev-parse
-        .mockResolvedValueOnce({
-          stdout: ' M src/app.ts\nA  src/new.ts\n?? untracked.txt\n',
-          stderr: '',
-          exitCode: 0,
-        } as ExecResult) // status
-        .mockResolvedValueOnce({
-          stdout: '5\t2\tsrc/new.ts\n',
-          stderr: '',
-          exitCode: 0,
-        } as ExecResult) // numstat --cached
-        .mockResolvedValueOnce({
-          stdout: '10\t3\tsrc/app.ts\n',
-          stderr: '',
-          exitCode: 0,
-        } as ExecResult); // numstat (unstaged)
-
-      const result = await service.getStatusDetailed('conn-1', '/home/user/project');
-
-      expect(result).toHaveLength(3);
-
-      const appTs = result.find((c) => c.path === 'src/app.ts');
-      expect(appTs).toBeDefined();
-      expect(appTs!.status).toBe('modified');
-      expect(appTs!.additions).toBe(10);
-      expect(appTs!.deletions).toBe(3);
-      expect(appTs!.isStaged).toBe(false);
-
-      const newTs = result.find((c) => c.path === 'src/new.ts');
-      expect(newTs).toBeDefined();
-      expect(newTs!.status).toBe('added');
-      expect(newTs!.isStaged).toBe(true);
-      expect(newTs!.additions).toBe(5);
-      expect(newTs!.deletions).toBe(2);
-
-      const untracked = result.find((c) => c.path === 'untracked.txt');
-      expect(untracked).toBeDefined();
-      expect(untracked!.status).toBe('added');
-      expect(untracked!.isStaged).toBe(false);
-    });
-
-    it('should batch line-count for untracked files', async () => {
-      mockExecuteCommand
-        .mockResolvedValueOnce({ stdout: 'true', stderr: '', exitCode: 0 } as ExecResult) // rev-parse
-        .mockResolvedValueOnce({
-          stdout: '?? file1.txt\n?? file2.txt\n',
-          stderr: '',
-          exitCode: 0,
-        } as ExecResult) // status
-        .mockResolvedValueOnce({ stdout: '', stderr: '', exitCode: 0 } as ExecResult) // numstat --cached
-        .mockResolvedValueOnce({ stdout: '', stderr: '', exitCode: 0 } as ExecResult) // numstat
-        .mockResolvedValueOnce({
-          stdout: '42\n100\n',
-          stderr: '',
-          exitCode: 0,
-        } as ExecResult); // wc -l batch
-
-      const result = await service.getStatusDetailed('conn-1', '/home/user/project');
-
-      expect(result).toHaveLength(2);
-      expect(result[0].additions).toBe(42);
-      expect(result[1].additions).toBe(100);
-    });
-
-    it('should handle renamed files', async () => {
-      mockExecuteCommand
-        .mockResolvedValueOnce({ stdout: 'true', stderr: '', exitCode: 0 } as ExecResult)
-        .mockResolvedValueOnce({
-          stdout: 'R  old.ts -> new.ts\n',
-          stderr: '',
-          exitCode: 0,
-        } as ExecResult)
-        .mockResolvedValueOnce({ stdout: '', stderr: '', exitCode: 0 } as ExecResult)
-        .mockResolvedValueOnce({ stdout: '', stderr: '', exitCode: 0 } as ExecResult);
-
-      const result = await service.getStatusDetailed('conn-1', '/home/user/project');
-
-      expect(result).toHaveLength(1);
-      expect(result[0].path).toBe('new.ts');
-      expect(result[0].status).toBe('renamed');
-      expect(result[0].isStaged).toBe(true);
-    });
-  });
-
-  describe('getFileDiff', () => {
-    it('should parse unified diff output', async () => {
-      mockExecuteCommand
-        .mockResolvedValueOnce({
-          stdout:
-            'diff --git a/file.ts b/file.ts\nindex abc..def 100644\n--- a/file.ts\n+++ b/file.ts\n@@ -1,3 +1,3 @@\n hello\n-old line\n+new line\n world\n',
-          stderr: '',
-          exitCode: 0,
-        } as ExecResult) // git diff
-        .mockResolvedValueOnce({
-          stdout: 'hello\nold line\nworld\n',
-          stderr: '',
-          exitCode: 0,
-        } as ExecResult) // git show HEAD:file
-        .mockResolvedValueOnce({
-          stdout: 'hello\nnew line\nworld\n',
-          stderr: '',
-          exitCode: 0,
-        } as ExecResult); // cat file
-
-      const result = await service.getFileDiff('conn-1', '/home/user/project', 'file.ts');
-
-      expect(result.lines).toHaveLength(4);
-      expect(result.lines[0]).toEqual({ left: 'hello', right: 'hello', type: 'context' });
-      expect(result.lines[1]).toEqual({ left: 'old line', type: 'del' });
-      expect(result.lines[2]).toEqual({ right: 'new line', type: 'add' });
-      expect(result.lines[3]).toEqual({ left: 'world', right: 'world', type: 'context' });
-      expect(result.originalContent).toBe('hello\nold line\nworld');
-      expect(result.modifiedContent).toBe('hello\nnew line\nworld');
-    });
-
-    it('should handle untracked file (no diff, read content)', async () => {
-      mockExecuteCommand
-        .mockResolvedValueOnce({ stdout: '', stderr: '', exitCode: 0 } as ExecResult)
-        .mockResolvedValueOnce({ stdout: '', stderr: 'not found', exitCode: 128 } as ExecResult)
-        .mockResolvedValueOnce({
-          stdout: 'line1\nline2\nline3\n',
-          stderr: '',
-          exitCode: 0,
-        } as ExecResult); // cat fallback
-
-      const result = await service.getFileDiff('conn-1', '/home/user/project', 'newfile.txt');
-
-      expect(result.lines).toHaveLength(3);
-      expect(result.lines[0]).toEqual({ right: 'line1', type: 'add' });
-      expect(result.lines[1]).toEqual({ right: 'line2', type: 'add' });
-      expect(result.lines[2]).toEqual({ right: 'line3', type: 'add' });
-      expect(result.originalContent).toBeUndefined();
-      expect(result.modifiedContent).toBe('line1\nline2\nline3');
-    });
-
-    it('should handle deleted file with realistic diff output', async () => {
-      mockExecuteCommand
-        .mockResolvedValueOnce({
-          stdout:
-            'diff --git a/deleted.txt b/deleted.txt\ndeleted file mode 100644\nindex abc1234..0000000\n--- a/deleted.txt\n+++ /dev/null\n@@ -1,2 +0,0 @@\n-old content\n-was here\n',
-          stderr: '',
-          exitCode: 0,
-        } as ExecResult) // git diff
-        .mockResolvedValueOnce({
-          stdout: 'old content\nwas here\n',
-          stderr: '',
-          exitCode: 0,
-        } as ExecResult) // git show HEAD:file
-        .mockResolvedValueOnce({
-          stdout: '',
-          stderr: 'No such file or directory',
-          exitCode: 1,
-        } as ExecResult); // cat fails — file not on disk
-
-      const result = await service.getFileDiff('conn-1', '/home/user/project', 'deleted.txt');
-
-      expect(result.lines).toHaveLength(2);
-      expect(result.lines[0]).toEqual({ left: 'old content', type: 'del' });
-      expect(result.lines[1]).toEqual({ left: 'was here', type: 'del' });
-      expect(result.originalContent).toBe('old content\nwas here');
-      expect(result.modifiedContent).toBeUndefined();
-    });
-
-    it('should return empty lines when all fallbacks fail', async () => {
-      mockExecuteCommand
-        .mockResolvedValueOnce({ stdout: '', stderr: '', exitCode: 0 } as ExecResult) // git diff (parallel)
-        .mockResolvedValueOnce({ stdout: '', stderr: '', exitCode: 1 } as ExecResult) // git show HEAD:file (parallel)
-        .mockResolvedValueOnce({ stdout: '', stderr: '', exitCode: 1 } as ExecResult); // cat fallback
-
-      const result = await service.getFileDiff('conn-1', '/home/user/project', 'ghost.txt');
-      expect(result.lines).toEqual([]);
-      expect(result.originalContent).toBeUndefined();
-      expect(result.modifiedContent).toBeUndefined();
-    });
-
-    it('should handle staged new file (git show HEAD fails, diff and cat succeed)', async () => {
-      mockExecuteCommand
-        .mockResolvedValueOnce({
-          stdout:
-            'diff --git a/newfile.ts b/newfile.ts\nnew file mode 100644\nindex 0000000..abc1234\n--- /dev/null\n+++ b/newfile.ts\n@@ -0,0 +1,2 @@\n+line one\n+line two\n',
-          stderr: '',
-          exitCode: 0,
-        } as ExecResult) // git diff
-        .mockResolvedValueOnce({
-          stdout: '',
-          stderr: 'fatal: Path does not exist',
-          exitCode: 128,
-        } as ExecResult) // git show HEAD:file (fails — file not in HEAD)
-        .mockResolvedValueOnce({
-          stdout: 'line one\nline two\n',
-          stderr: '',
-          exitCode: 0,
-        } as ExecResult); // cat file
-
-      const result = await service.getFileDiff('conn-1', '/home/user/project', 'newfile.ts');
-
-      expect(result.lines).toHaveLength(2);
-      expect(result.lines[0]).toEqual({ right: 'line one', type: 'add' });
-      expect(result.lines[1]).toEqual({ right: 'line two', type: 'add' });
-      expect(result.originalContent).toBeUndefined();
-      expect(result.modifiedContent).toBe('line one\nline two');
-    });
-
-    it('should skip "No newline at end of file" markers', async () => {
-      mockExecuteCommand
-        .mockResolvedValueOnce({
-          stdout:
-            'diff --git a/file.ts b/file.ts\nindex abc1234..def5678 100644\n--- a/file.ts\n+++ b/file.ts\n@@ -1,2 +1,2 @@\n hello\n-old line\n\\ No newline at end of file\n+new line\n\\ No newline at end of file\n',
-          stderr: '',
-          exitCode: 0,
-        } as ExecResult) // git diff
-        .mockResolvedValueOnce({
-          stdout: 'hello\nold line',
-          stderr: '',
-          exitCode: 0,
-        } as ExecResult) // git show HEAD:file (no trailing newline)
-        .mockResolvedValueOnce({
-          stdout: 'hello\nnew line',
-          stderr: '',
-          exitCode: 0,
-        } as ExecResult); // cat file (no trailing newline)
-
-      const result = await service.getFileDiff('conn-1', '/home/user/project', 'file.ts');
-
-      expect(result.lines).toHaveLength(3);
-      expect(result.lines[0]).toEqual({ left: 'hello', right: 'hello', type: 'context' });
-      expect(result.lines[1]).toEqual({ left: 'old line', type: 'del' });
-      expect(result.lines[2]).toEqual({ right: 'new line', type: 'add' });
-      expect(result.originalContent).toBe('hello\nold line');
-      expect(result.modifiedContent).toBe('hello\nnew line');
-    });
-
-    it('should detect binary files and return empty lines with isBinary flag', async () => {
-      mockExecuteCommand.mockResolvedValueOnce({
-        stdout:
-          'diff --git a/image.png b/image.png\nindex abc1234..def5678 100644\nBinary files a/image.png and b/image.png differ\n',
-        stderr: '',
-        exitCode: 0,
-      } as ExecResult); // git diff only — no content fetch for binary
-
-      const result = await service.getFileDiff('conn-1', '/home/user/project', 'image.png');
-
-      expect(result.lines).toEqual([]);
-      expect(result.isBinary).toBe(true);
-      // Verify no additional SSH calls were made for content
-      expect(mockExecuteCommand).toHaveBeenCalledTimes(1);
-    });
-  });
-
-  describe('stageFile', () => {
-    it('should stage a file via git add', async () => {
-      mockExecuteCommand.mockResolvedValue({ stdout: '', stderr: '', exitCode: 0 } as ExecResult);
-
-      await service.stageFile('conn-1', '/home/user/project', 'src/app.ts');
-
-      expect(mockExecuteCommand).toHaveBeenCalledWith(
-        'conn-1',
-        "git add -- 'src/app.ts'",
-        '/home/user/project'
-      );
-    });
-
-    it('should throw on failure', async () => {
-      mockExecuteCommand.mockResolvedValue({
-        stdout: '',
-        stderr: 'fatal: pathspec not found',
-        exitCode: 128,
-      } as ExecResult);
-
-      await expect(
-        service.stageFile('conn-1', '/home/user/project', 'nonexistent.ts')
-      ).rejects.toThrow('Failed to stage file');
-    });
-
-    it('should escape special characters in file path', async () => {
-      mockExecuteCommand.mockResolvedValue({ stdout: '', stderr: '', exitCode: 0 } as ExecResult);
-
-      await service.stageFile('conn-1', '/home/user/project', "file with spaces & 'quotes'.ts");
-
-      expect(mockExecuteCommand).toHaveBeenCalledWith(
-        'conn-1',
-        expect.stringContaining('git add --'),
-        '/home/user/project'
-      );
-    });
-  });
-
-  describe('stageAllFiles', () => {
-    it('should run git add -A', async () => {
-      mockExecuteCommand.mockResolvedValue({ stdout: '', stderr: '', exitCode: 0 } as ExecResult);
-
-      await service.stageAllFiles('conn-1', '/home/user/project');
-
-      expect(mockExecuteCommand).toHaveBeenCalledWith('conn-1', 'git add -A', '/home/user/project');
-    });
-  });
-
-  describe('unstageFile', () => {
-    it('should run git reset HEAD', async () => {
-      mockExecuteCommand.mockResolvedValue({ stdout: '', stderr: '', exitCode: 0 } as ExecResult);
-
-      await service.unstageFile('conn-1', '/home/user/project', 'src/app.ts');
-
-      expect(mockExecuteCommand).toHaveBeenCalledWith(
-        'conn-1',
-        "git reset HEAD -- 'src/app.ts'",
-        '/home/user/project'
-      );
-    });
-  });
-
-  describe('revertFile', () => {
-    it('should delete untracked file when not in HEAD', async () => {
-      mockExecuteCommand
-        .mockResolvedValueOnce({
-          stdout: '',
-          stderr: 'fatal: Not a valid object name',
-          exitCode: 128,
-        } as ExecResult) // cat-file -e fails
-        .mockResolvedValueOnce({ stdout: '', stderr: '', exitCode: 0 } as ExecResult); // rm -f
-
-      const result = await service.revertFile('conn-1', '/home/user/project', 'newfile.txt');
-
-      expect(result.action).toBe('reverted');
-      expect(mockExecuteCommand).toHaveBeenCalledWith(
-        'conn-1',
-        "rm -f -- 'newfile.txt'",
-        '/home/user/project'
-      );
-    });
-
-    it('should checkout from HEAD for tracked file', async () => {
-      mockExecuteCommand
-        .mockResolvedValueOnce({ stdout: '', stderr: '', exitCode: 0 } as ExecResult) // cat-file -e succeeds
-        .mockResolvedValueOnce({ stdout: '', stderr: '', exitCode: 0 } as ExecResult); // checkout HEAD
-
-      const result = await service.revertFile('conn-1', '/home/user/project', 'existing.ts');
-
-      expect(result.action).toBe('reverted');
-      expect(mockExecuteCommand).toHaveBeenCalledWith(
-        'conn-1',
-        "git checkout HEAD -- 'existing.ts'",
-        '/home/user/project'
-      );
-    });
-
-    it('should throw when checkout fails', async () => {
-      mockExecuteCommand
-        .mockResolvedValueOnce({ stdout: '', stderr: '', exitCode: 0 } as ExecResult) // cat-file
-        .mockResolvedValueOnce({
-          stdout: '',
-          stderr: 'error: pathspec did not match',
-          exitCode: 1,
-        } as ExecResult); // checkout fails
-
-      await expect(service.revertFile('conn-1', '/home/user/project', 'broken.ts')).rejects.toThrow(
-        'Failed to revert file'
-      );
-    });
-  });
-
-  describe('getCurrentBranch', () => {
-    it('should return current branch name', async () => {
-      mockExecuteCommand.mockResolvedValue({
-        stdout: 'feature/my-branch\n',
-        stderr: '',
-        exitCode: 0,
-      } as ExecResult);
-
-      const result = await service.getCurrentBranch('conn-1', '/home/user/project');
-      expect(result).toBe('feature/my-branch');
-    });
-
-    it('should return empty string for detached HEAD', async () => {
-      mockExecuteCommand.mockResolvedValue({
-        stdout: '\n',
-        stderr: '',
-        exitCode: 0,
-      } as ExecResult);
-
-      const result = await service.getCurrentBranch('conn-1', '/home/user/project');
-      expect(result).toBe('');
-    });
-  });
-
-  describe('push', () => {
-    it('should run git push', async () => {
-      mockExecuteCommand.mockResolvedValue({
-        stdout: 'Everything up-to-date',
-        stderr: '',
-        exitCode: 0,
-      } as ExecResult);
-
-      const result = await service.push('conn-1', '/home/user/project');
-
-      expect(mockExecuteCommand).toHaveBeenCalledWith('conn-1', 'git push', '/home/user/project');
-      expect(result.exitCode).toBe(0);
-    });
-
-    it('should set upstream when requested', async () => {
-      mockExecuteCommand.mockResolvedValue({ stdout: '', stderr: '', exitCode: 0 } as ExecResult);
-
-      await service.push('conn-1', '/home/user/project', 'feature-branch', true);
-
-      expect(mockExecuteCommand).toHaveBeenCalledWith(
-        'conn-1',
-        "git push --set-upstream origin 'feature-branch'",
-        '/home/user/project'
-      );
-    });
-  });
-
-  describe('getBranchStatus', () => {
-    it('should return branch status with ahead/behind', async () => {
-      mockExecuteCommand
-        .mockResolvedValueOnce({
-          stdout: 'feature-branch\n',
-          stderr: '',
-          exitCode: 0,
-        } as ExecResult) // branch --show-current
-        .mockResolvedValueOnce({ stdout: '', stderr: '', exitCode: 1 } as ExecResult) // gh fails
-        .mockResolvedValueOnce({ stdout: 'main\n', stderr: '', exitCode: 0 } as ExecResult) // remote show origin
-        .mockResolvedValueOnce({
-          stdout: '3\t5\n',
-          stderr: '',
-          exitCode: 0,
-        } as ExecResult); // rev-list
-
-      const result = await service.getBranchStatus('conn-1', '/home/user/project');
-
-      expect(result.branch).toBe('feature-branch');
-      expect(result.defaultBranch).toBe('main');
-      expect(result.behind).toBe(3);
-      expect(result.ahead).toBe(5);
-    });
-  });
-
-  describe('renameBranch', () => {
-    it('should rename local branch', async () => {
-      mockExecuteCommand
-        .mockResolvedValueOnce({ stdout: '', stderr: '', exitCode: 1 } as ExecResult) // no remote tracking
-        .mockResolvedValueOnce({ stdout: '', stderr: '', exitCode: 1 } as ExecResult) // ls-remote empty
-        .mockResolvedValueOnce({ stdout: '', stderr: '', exitCode: 0 } as ExecResult); // branch -m
-
-      const result = await service.renameBranch(
-        'conn-1',
-        '/home/user/project',
-        'old-name',
-        'new-name'
-      );
-
-      expect(result.remotePushed).toBe(false);
-      expect(mockExecuteCommand).toHaveBeenCalledWith(
-        'conn-1',
-        "git branch -m 'old-name' 'new-name'",
-        '/home/user/project'
-      );
-    });
-
-    it('should update remote when branch was pushed', async () => {
-      mockExecuteCommand
-        .mockResolvedValueOnce({
-          stdout: 'origin\n',
-          stderr: '',
-          exitCode: 0,
-        } as ExecResult) // remote tracking
-        .mockResolvedValueOnce({ stdout: '', stderr: '', exitCode: 0 } as ExecResult) // branch -m
-        .mockResolvedValueOnce({ stdout: '', stderr: '', exitCode: 0 } as ExecResult) // push --delete
-        .mockResolvedValueOnce({ stdout: '', stderr: '', exitCode: 0 } as ExecResult); // push -u
-
-      const result = await service.renameBranch(
-        'conn-1',
-        '/home/user/project',
-        'old-name',
-        'new-name'
-      );
-
-      expect(result.remotePushed).toBe(true);
-    });
-  });
-
-  describe('execGh and execGit', () => {
-    it('should run gh commands with correct cwd', async () => {
-      mockExecuteCommand.mockResolvedValue({ stdout: '{}', stderr: '', exitCode: 0 } as ExecResult);
-
-      await service.execGh('conn-1', '/home/user/project', 'pr view --json number');
-
-      expect(mockExecuteCommand).toHaveBeenCalledWith(
-        'conn-1',
-        'gh pr view --json number',
-        '/home/user/project'
-      );
-    });
-
-    it('should run git commands with correct cwd', async () => {
-      mockExecuteCommand.mockResolvedValue({ stdout: '', stderr: '', exitCode: 0 } as ExecResult);
-
-      await service.execGit('conn-1', '/home/user/project', 'status -sb');
-
-      expect(mockExecuteCommand).toHaveBeenCalledWith(
-        'conn-1',
-        'git status -sb',
-        '/home/user/project'
-      );
-    });
-  });
-
-  describe('integration scenarios', () => {
-    it('should handle full workflow: create, check status, commit, remove', async () => {
-      // Create worktree
-      mockExecuteCommand
-        .mockResolvedValueOnce({ stdout: '', stderr: '', exitCode: 0 } as ExecResult) // mkdir
-        .mockResolvedValueOnce({ stdout: '', stderr: '', exitCode: 0 } as ExecResult); // worktree add
-
-      const worktree = await service.createWorktree('conn-1', '/home/user/project', 'feature');
-
-      // Check status (clean)
-      mockExecuteCommand.mockResolvedValue({
-        stdout: `## ${worktree.branch}\n`,
-        stderr: '',
-        exitCode: 0,
-      } as ExecResult);
-
-      const status = await service.getStatus('conn-1', worktree.path);
-      expect(status.isClean).toBe(true);
-
-      // Commit
-      mockExecuteCommand.mockResolvedValue({
-        stdout: `[${worktree.branch} abc1234] Initial commit\n`,
-        stderr: '',
-        exitCode: 0,
-      } as ExecResult);
-
-      const commitResult = await service.commit('conn-1', worktree.path, 'Initial commit');
-      expect(commitResult.exitCode).toBe(0);
-
-      // Remove worktree
-      mockExecuteCommand.mockResolvedValue({
-        stdout: '',
-        stderr: '',
-        exitCode: 0,
-      } as ExecResult);
-
-      await expect(
-        service.removeWorktree('conn-1', '/home/user/project', worktree.path)
-      ).resolves.not.toThrow();
-    });
-  });
-});
diff --git a/src/main/services/browserViewService.ts b/src/main/services/browserViewService.ts
deleted file mode 100644
index 0a5b260ae1..0000000000
--- a/src/main/services/browserViewService.ts
+++ /dev/null
@@ -1,235 +0,0 @@
-import { BrowserWindow, WebContentsView } from 'electron';
-import { getMainWindow } from '../app/window';
-
-class BrowserViewService {
-  private view: WebContentsView | null = null;
-  private visible = false;
-  private emitToRenderers(evt: any) {
-    try {
-      const wins = BrowserWindow.getAllWindows();
-      for (const w of wins) {
-        try {
-          w.webContents.send('browser:view:event', evt);
-        } catch {}
-      }
-    } catch {}
-  }
-
-  ensureView(win?: BrowserWindow): WebContentsView | null {
-    const w = win || getMainWindow() || undefined;
-    if (!w) return null;
-    if (!this.view) {
-      this.view = new WebContentsView({
-        webPreferences: {
-          contextIsolation: true,
-          nodeIntegration: false,
-        },
-      });
-      w.contentView.addChildView(this.view);
-      try {
-        this.view.webContents.setWindowOpenHandler?.(() => ({ action: 'deny' }) as any);
-      } catch {}
-      try {
-        this.view.webContents.on('did-finish-load', () =>
-          this.emitToRenderers({ type: 'did-finish-load' })
-        );
-        this.view.webContents.on('did-fail-load', (_ev, errorCode, errorDescription) =>
-          this.emitToRenderers({ type: 'did-fail-load', errorCode, errorDescription })
-        );
-        this.view.webContents.on('did-start-navigation', (_ev, url) =>
-          this.emitToRenderers({ type: 'did-start-navigation', url })
-        );
-      } catch {}
-      this.visible = true;
-    }
-    return this.view;
-  }
-
-  // Clear the current URL when switching worktrees
-  clear() {
-    if (!this.view) return;
-    try {
-      // Load about:blank to clear the current page
-      this.view.webContents.loadURL('about:blank');
-    } catch {}
-  }
-
-  private bringToFront(win: BrowserWindow) {
-    if (!this.view) return;
-    try {
-      // Remove and re-add the view to bring it to the front
-      // In Electron, views added later are rendered on top
-      win.contentView.removeChildView(this.view);
-      win.contentView.addChildView(this.view);
-    } catch {}
-  }
-
-  show(bounds: Electron.Rectangle, url?: string) {
-    const win = getMainWindow() || undefined;
-    if (!win) return;
-
-    const v = this.ensureView(win);
-    if (!v) return;
-
-    // Ensure bounds are valid (width and height must be > 0)
-    if (bounds.width <= 0 || bounds.height <= 0) {
-      return;
-    }
-
-    // Bring view to front to ensure it renders above other content
-    this.bringToFront(win);
-
-    // Set bounds first to ensure view is positioned correctly
-    v.setBounds(bounds);
-
-    try {
-      // Keep rendering even when not focused/visible previously
-      v.webContents.setBackgroundThrottling?.(false as any);
-    } catch {}
-
-    // Load URL immediately when provided
-    if (url) {
-      try {
-        const current = (() => {
-          try {
-            return v.webContents.getURL();
-          } catch {
-            return '';
-          }
-        })();
-        // Normalize URLs for comparison (remove trailing slashes, etc.)
-        const normalizeUrl = (u: string) => u.replace(/\/$/, '').toLowerCase();
-        const normalizedCurrent = current ? normalizeUrl(current) : '';
-        const normalizedUrl = normalizeUrl(url);
-
-        if (!current || normalizedCurrent !== normalizedUrl) {
-          // Load URL immediately - don't delay
-          try {
-            v.webContents.loadURL(url);
-          } catch (e) {
-            // If immediate load fails, try again after a short delay
-            setTimeout(() => {
-              try {
-                v.webContents.loadURL(url);
-              } catch {}
-            }, 50);
-          }
-        }
-      } catch {}
-    }
-
-    // Ensure view is visible and focused
-    try {
-      v.webContents.focus();
-    } catch {}
-
-    // Force bounds update after a short delay to ensure view is positioned correctly
-    // This helps with timing issues where the container might not be fully laid out yet
-    try {
-      setTimeout(() => {
-        try {
-          const updatedBounds = { ...bounds };
-          // Re-validate bounds before setting
-          if (updatedBounds.width > 0 && updatedBounds.height > 0) {
-            v.setBounds(updatedBounds);
-            // Bring to front again after bounds update
-            this.bringToFront(win);
-            // Ensure URL is still loaded after bounds update
-            if (url) {
-              try {
-                const current = v.webContents.getURL();
-                const normalizeUrl = (u: string) => u.replace(/\/$/, '').toLowerCase();
-                if (!current || normalizeUrl(current) !== normalizeUrl(url)) {
-                  v.webContents.loadURL(url);
-                }
-              } catch {}
-            }
-            // Force focus again after bounds update
-            v.webContents.focus();
-          }
-        } catch {}
-      }, 50);
-    } catch {}
-
-    this.visible = true;
-  }
-
-  hide() {
-    if (!this.view) return;
-    try {
-      this.view.setBounds({ x: -10000, y: -10000, width: 1, height: 1 });
-    } catch {}
-    this.visible = false;
-  }
-
-  setBounds(bounds: Electron.Rectangle) {
-    if (!this.view) return;
-    try {
-      this.view.setBounds(bounds);
-    } catch {}
-  }
-
-  loadURL(url: string, forceReload = false) {
-    // Don't load empty or invalid URLs
-    if (!url || typeof url !== 'string' || url.trim() === '') {
-      return;
-    }
-
-    const v = this.ensureView();
-    if (!v) return;
-    try {
-      // Normalize URL for comparison
-      const normalizeUrl = (u: string) => u.replace(/\/$/, '').toLowerCase();
-      const current = (() => {
-        try {
-          return v.webContents.getURL();
-        } catch {
-          return '';
-        }
-      })();
-      // Load if URL is different or if forceReload is true
-      if (forceReload || !current || normalizeUrl(current) !== normalizeUrl(url)) {
-        // Ensure view is visible before loading
-        const win = getMainWindow();
-        if (win && this.visible) {
-          this.bringToFront(win);
-        }
-        v.webContents.loadURL(url);
-        // Focus after loading to ensure it's active
-        setTimeout(() => {
-          try {
-            v.webContents.focus();
-          } catch {}
-        }, 50);
-      }
-    } catch {}
-  }
-
-  goBack() {
-    try {
-      this.view?.webContents.goBack();
-    } catch {}
-  }
-  goForward() {
-    try {
-      this.view?.webContents.goForward();
-    } catch {}
-  }
-  reload() {
-    try {
-      this.view?.webContents.reload();
-    } catch {}
-  }
-
-  openDevTools() {
-    try {
-      this.view?.webContents.openDevTools({ mode: 'detach' });
-    } catch {}
-  }
-
-  isVisible(): boolean {
-    return this.visible;
-  }
-}
-
-export const browserViewService = new BrowserViewService();
diff --git a/src/main/services/fs/FileSystemFactory.ts b/src/main/services/fs/FileSystemFactory.ts
deleted file mode 100644
index 581619a67c..0000000000
--- a/src/main/services/fs/FileSystemFactory.ts
+++ /dev/null
@@ -1,101 +0,0 @@
-/**
- * FileSystem Factory
- * Creates appropriate IFileSystem implementation based on project configuration
- */
-
-import { IFileSystem } from './types';
-import { LocalFileSystem } from './LocalFileSystem';
-import { RemoteFileSystem } from './RemoteFileSystem';
-import { SshService } from '../ssh/SshService';
-import { ProjectRow } from '../../db/schema';
-
-interface FileSystemCache {
-  [key: string]: IFileSystem;
-}
-
-export class FileSystemFactory {
-  private static cache: FileSystemCache = {};
-  private static sshService: SshService | null = null;
-
-  /**
-   * Initialize the factory with SSH service
-   */
-  static initialize(sshService: SshService): void {
-    this.sshService = sshService;
-  }
-
-  /**
-   * Create filesystem for a project
-   */
-  static create(project: ProjectRow): IFileSystem {
-    const cacheKey = project.id;
-
-    // Return cached instance if available
-    if (this.cache[cacheKey]) {
-      return this.cache[cacheKey];
-    }
-
-    let fs: IFileSystem;
-
-    if (project.isRemote && project.sshConnectionId) {
-      if (!this.sshService) {
-        throw new Error('SSH service not initialized');
-      }
-
-      if (!project.remotePath) {
-        throw new Error('Remote project missing remotePath');
-      }
-
-      fs = new RemoteFileSystem(this.sshService, project.sshConnectionId, project.remotePath);
-    } else {
-      fs = new LocalFileSystem(project.path);
-    }
-
-    // Cache the instance
-    this.cache[cacheKey] = fs;
-    return fs;
-  }
-
-  /**
-   * Get filesystem for a project (alias for create)
-   */
-  static get(project: ProjectRow): IFileSystem {
-    return this.create(project);
-  }
-
-  /**
-   * Clear cache for a specific project
-   */
-  static clearCache(projectId: string): void {
-    delete this.cache[projectId];
-  }
-
-  /**
-   * Clear all cached filesystems
-   */
-  static clearAllCache(): void {
-    this.cache = {};
-  }
-
-  /**
-   * Check if project uses remote filesystem
-   */
-  static isRemote(project: ProjectRow): boolean {
-    return !!project.isRemote;
-  }
-
-  /**
-   * Get connection ID for remote project
-   */
-  static getConnectionId(project: ProjectRow): string | null {
-    return project.sshConnectionId || null;
-  }
-
-  /**
-   * Dispose factory and clear all resources
-   */
-  static dispose(): void {
-    this.clearAllCache();
-    this.sshService = null;
-  }
-}
diff --git a/src/main/services/fs/LocalFileSystem.ts b/src/main/services/fs/LocalFileSystem.ts
deleted file mode 100644
index 578dced443..0000000000
--- a/src/main/services/fs/LocalFileSystem.ts
+++ /dev/null
@@ -1,597 +0,0 @@
-/**
- * Local FileSystem implementation
- * Wraps Node.js fs operations for local disk access with security and performance features
- */
-
-import { promises as fs, createReadStream } from 'fs';
-import type { Stats } from 'fs';
-import { join, resolve, relative, dirname, extname, sep } from 'path';
-import { createInterface } from 'readline';
-import {
-  IFileSystem,
-  FileListResult,
-  ReadResult,
-  WriteResult,
-  SearchResult,
-  ListOptions,
-  SearchOptions,
-  FileEntry,
-  SearchMatch,
-  FileSystemError,
-  FileSystemErrorCodes,
-} from './types';
-import { GitIgnoreParser } from '../../utils/gitIgnore';
-
-// Binary file extensions to skip during search
-const BINARY_EXTENSIONS = new Set([
-  '.exe',
-  '.dll',
-  '.so',
-  '.dylib',
-  '.bin',
-  '.jpg',
-  '.jpeg',
-  '.png',
-  '.gif',
-  '.bmp',
-  '.ico',
-  '.svg',
-  '.mp3',
-  '.mp4',
-  '.avi',
-  '.mov',
-  '.wmv',
-  '.flv',
-  '.webm',
-  '.zip',
-  '.tar',
-  '.gz',
-  '.bz2',
-  '.7z',
-  '.rar',
-  '.pdf',
-  '.doc',
-  '.docx',
-  '.xls',
-  '.xlsx',
-  '.ppt',
-  '.pptx',
-  '.woff',
-  '.woff2',
-  '.ttf',
-  '.otf',
-  '.eot',
-  '.wasm',
-  '.class',
-  '.jar',
-  '.pyc',
-  '.o',
-  '.a',
-]);
-
-// Directories to skip during search
-const SEARCH_IGNORES = new Set([
-  'node_modules',
-  '.git',
-  '.svn',
-  '.hg',
-  'dist',
-  'build',
-  '.next',
-  '.nuxt',
-  'coverage',
-  '.cache',
-  '.parcel-cache',
-]);
-
-// Allowed image extensions for readImage
-const ALLOWED_IMAGE_EXTENSIONS = new Set([
-  '.png',
-  '.jpg',
-  '.jpeg',
-  '.gif',
-  '.webp',
-  '.svg',
-  '.bmp',
-  '.ico',
-]);
-
-// MIME types for images
-const IMAGE_MIME_TYPES: Record<string, string> = {
-  '.png': 'image/png',
-  '.jpg': 'image/jpeg',
-  '.jpeg': 'image/jpeg',
-  '.gif': 'image/gif',
-  '.webp': 'image/webp',
-  '.svg': 'image/svg+xml',
-  '.bmp': 'image/bmp',
-  '.ico': 'image/x-icon',
-};
-
-export class LocalFileSystem implements IFileSystem {
-  constructor(private projectPath: string) {
-    if (!projectPath) {
-      throw new FileSystemError('Project path is required', FileSystemErrorCodes.INVALID_PATH);
-    }
-    this.projectPath = resolve(projectPath);
-  }
-
-  /**
-   * Resolve and validate a relative path, ensuring it doesn't escape the project root
-   */
-  private resolvePath(relPath: string): string {
-    // Normalize the path and resolve it against project root
-    const normalizedRelPath = relPath.replace(/\\/g, '/').replace(/^\//, '');
-    const fullPath = resolve(join(this.projectPath, normalizedRelPath));
-
-    // Security: ensure path is within projectPath (handle trailing separator edge cases)
-    const projectPathWithSep = this.projectPath.endsWith(sep)
-      ? this.projectPath
-      : this.projectPath + sep;
-    const fullPathWithSep = fullPath.endsWith(sep) ? fullPath : fullPath + sep;
-
-    if (!fullPathWithSep.startsWith(projectPathWithSep) && fullPath !== this.projectPath) {
-      throw new FileSystemError(
-        `Path traversal detected: ${relPath}`,
-        FileSystemErrorCodes.PATH_ESCAPE,
-        relPath
-      );
-    }
-
-    return fullPath;
-  }
-
-  /**
-   * Get relative path from absolute path
-   */
-  private relPath(fullPath: string): string {
-    return relative(this.projectPath, fullPath);
-  }
-
-  /**
-   * Check if a path should be ignored during search
-   */
-  private shouldIgnore(name: string): boolean {
-    return SEARCH_IGNORES.has(name);
-  }
-
-  /**
-   * Check if file is binary by extension
-   */
-  private isBinaryFile(filePath: string): boolean {
-    const ext = extname(filePath).toLowerCase();
-    return BINARY_EXTENSIONS.has(ext);
-  }
-
-  /**
-   * Convert fs.Stats to FileEntry
-   */
-  private statToEntry(fullPath: string, stat: Stats): FileEntry {
-    const relPath = this.relPath(fullPath);
-    return {
-      path: relPath,
-      type: stat.isDirectory() ? 'dir' : 'file',
-      size: stat.size,
-      mtime: stat.mtime,
-      ctime: stat.ctime,
-      mode: stat.mode,
-    };
-  }
-
-  async list(path: string = '', options: ListOptions = {}): Promise<FileListResult> {
-    const startTime = Date.now();
-    const fullPath = this.resolvePath(path);
-    const entries: FileEntry[] = [];
-    const maxEntries = options.maxEntries || 10000;
-    const timeBudgetMs = options.timeBudgetMs || 30000;
-
-    let truncated = false;
-    let truncateReason: 'maxEntries' | 'timeBudget' | undefined;
-
-    const listDir = async (dirPath: string, recursive: boolean) => {
-      // Check time budget
-      if (Date.now() - startTime > timeBudgetMs) {
-        truncated = true;
-        truncateReason = 'timeBudget';
-        return;
-      }
-
-      // Check entry limit
-      if (entries.length >= maxEntries) {
-        truncated = true;
-        truncateReason = 'maxEntries';
-        return;
-      }
-
-      let items;
-      try {
-        items = await fs.readdir(dirPath, { withFileTypes: true });
-      } catch (err) {
-        // Skip directories we can't read
-        return;
-      }
-
-      for (const item of items) {
-        // Check time budget periodically
-        if (entries.length % 100 === 0 && Date.now() - startTime > timeBudgetMs) {
-          truncated = true;
-          truncateReason = 'timeBudget';
-          return;
-        }
-
-        // Skip hidden files if not included
-        if (!options.includeHidden && item.name.startsWith('.')) {
-          continue;
-        }
-
-        // Skip ignored directories
-        if (this.shouldIgnore(item.name)) {
-          continue;
-        }
-
-        const itemPath = join(dirPath, item.name);
-
-        try {
-          const stat = await fs.stat(itemPath);
-          const entry: FileEntry = {
-            path: this.relPath(itemPath),
-            type: item.isDirectory() ? 'dir' : 'file',
-            size: stat.size,
-            mtime: stat.mtime,
-            ctime: stat.ctime,
-            mode: stat.mode,
-          };
-
-          // Apply filter if specified
-          if (options.filter) {
-            const filterRegex = new RegExp(options.filter);
-            if (!filterRegex.test(item.name)) {
-              continue;
-            }
-          }
-
-          entries.push(entry);
-
-          // Check entry limit
-          if (entries.length >= maxEntries) {
-            truncated = true;
-            truncateReason = 'maxEntries';
-            return;
-          }
-
-          // Recurse into subdirectories
-          if (recursive && item.isDirectory()) {
-            await listDir(itemPath, true);
-          }
-        } catch {
-          // Skip entries we can't stat
-        }
-      }
-    };
-
-    await listDir(fullPath, options.recursive || false);
-
-    return {
-      entries,
-      total: entries.length,
-      truncated,
-      truncateReason,
-      durationMs: Date.now() - startTime,
-    };
-  }
-
-  async read(path: string, maxBytes: number = 200 * 1024): Promise<ReadResult> {
-    const fullPath = this.resolvePath(path);
-
-    let stat;
-    try {
-      stat = await fs.stat(fullPath);
-    } catch (err) {
-      throw new FileSystemError(`File not found: ${path}`, FileSystemErrorCodes.NOT_FOUND, path);
-    }
-
-    if (stat.isDirectory()) {
-      throw new FileSystemError(
-        `Path is a directory: ${path}`,
-        FileSystemErrorCodes.IS_DIRECTORY,
-        path
-      );
-    }
-
-    // Handle large files with truncation
-    if (stat.size > maxBytes) {
-      const fd = await fs.open(fullPath, 'r');
-      try {
-        const buffer = Buffer.alloc(maxBytes);
-        await fd.read(buffer, 0, maxBytes, 0);
-
-        return {
-          content: buffer.toString('utf-8'),
-          truncated: true,
-          totalSize: stat.size,
-        };
-      } finally {
-        await fd.close();
-      }
-    }
-
-    const content = await fs.readFile(fullPath, 'utf-8');
-    return {
-      content,
-      truncated: false,
-      totalSize: stat.size,
-    };
-  }
-
-  async write(path: string, content: string): Promise<WriteResult> {
-    const fullPath = this.resolvePath(path);
-
-    // Ensure directory exists
-    const dir = dirname(fullPath);
-    try {
-      await fs.mkdir(dir, { recursive: true });
-    } catch (err) {
-      throw new FileSystemError(
-        `Failed to create directory: ${dir}`,
-        FileSystemErrorCodes.PERMISSION_DENIED,
-        path
-      );
-    }
-
-    try {
-      await fs.writeFile(fullPath, content, 'utf-8');
-    } catch (err) {
-      throw new FileSystemError(
-        `Failed to write file: ${path}`,
-        FileSystemErrorCodes.PERMISSION_DENIED,
-        path
-      );
-    }
-
-    const stat = await fs.stat(fullPath);
-    return {
-      success: true,
-      bytesWritten: stat.size,
-    };
-  }
-
-  async exists(path: string): Promise<boolean> {
-    try {
-      await fs.access(this.resolvePath(path));
-      return true;
-    } catch {
-      return false;
-    }
-  }
-
-  async stat(path: string): Promise<FileEntry | null> {
-    try {
-      const fullPath = this.resolvePath(path);
-      const stat = await fs.stat(fullPath);
-      return this.statToEntry(fullPath, stat);
-    } catch {
-      return null;
-    }
-  }
-
-  async search(query: string, options: SearchOptions = {}): Promise<SearchResult> {
-    const pattern = options.pattern || query;
-    const startTime = Date.now();
-    const matches: SearchMatch[] = [];
-    const maxResults = options.maxResults || 10000;
-    const fileExtensions = options.fileExtensions;
-    const caseSensitive = options.caseSensitive ?? false;
-
-    let filesSearched = 0;
-    let truncated = false;
-
-    const searchRegex = caseSensitive
-      ? new RegExp(pattern.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'))
-      : new RegExp(pattern.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'), 'i');
-
-    let gitIgnore: GitIgnoreParser | undefined;
-    try {
-      const gitIgnorePath = join(this.projectPath, '.gitignore');
-      const content = await fs.readFile(gitIgnorePath, 'utf-8');
-      gitIgnore = new GitIgnoreParser(content);
-    } catch {
-      // Ignore error reading .gitignore
-    }
-
-    const searchDir = async (dirPath: string) => {
-      let items;
-      try {
-        items = await fs.readdir(dirPath, { withFileTypes: true });
-      } catch {
-        return;
-      }
-
-      for (const item of items) {
-        if (matches.length >= maxResults) {
-          truncated = true;
-          return;
-        }
-
-        const itemPath = join(dirPath, item.name);
-
-        if (item.isDirectory()) {
-          const relPath = this.relPath(itemPath);
-          if (gitIgnore && gitIgnore.ignores(relPath)) {
-            continue;
-          }
-
-          if (!this.shouldIgnore(item.name) && !item.name.startsWith('.')) {
-            await searchDir(itemPath);
-          }
-        } else if (item.isFile()) {
-          // Skip binary files
-          if (this.isBinaryFile(itemPath)) {
-            continue;
-          }
-
-          // Check file extension filter
-          if (fileExtensions && fileExtensions.length > 0) {
-            const ext = extname(item.name).toLowerCase();
-            if (
-              !fileExtensions.some((e) => ext === e.toLowerCase() || ext === `.${e.toLowerCase()}`)
-            ) {
-              continue;
-            }
-          }
-
-          // Check file pattern if specified
-          if (options.filePattern) {
-            const filePatternRegex = new RegExp(options.filePattern.replace(/\*/g, '.*'));
-            if (!filePatternRegex.test(item.name)) {
-              continue;
-            }
-          }
-
-          filesSearched++;
-
-          try {
-            const fileStream = createReadStream(itemPath, { encoding: 'utf-8' });
-            const rl = createInterface({
-              input: fileStream,
-              crlfDelay: Infinity,
-            });
-
-            let lineNum = 0;
-            for await (const line of rl) {
-              lineNum++;
-
-              // Check for null bytes (binary file indicator)
-              if (line.includes('\0')) {
-                fileStream.destroy();
-                break;
-              }
-
-              const matchResult = caseSensitive
-                ? line.includes(pattern)
-                : line.toLowerCase().includes(pattern.toLowerCase());
-
-              if (matchResult) {
-                const column =
-                  (caseSensitive
-                    ? line.indexOf(pattern)
-                    : line.toLowerCase().indexOf(pattern.toLowerCase())) + 1;
-
-                matches.push({
-                  filePath: this.relPath(itemPath),
-                  line: lineNum,
-                  column,
-                  content: line.trim(),
-                  preview: line.trim().substring(0, 200),
-                });
-
-                if (matches.length >= maxResults) {
-                  fileStream.destroy();
-                  truncated = true;
-                  return;
-                }
-              }
-            }
-          } catch {
-            // Skip files that can't be read
-          }
-        }
-      }
-    };
-
-    await searchDir(this.projectPath);
-
-    return {
-      matches,
-      total: matches.length,
-      truncated,
-      filesSearched,
-    };
-  }
-
-  async remove(path: string): Promise<{ success: boolean; error?: string }> {
-    const fullPath = this.resolvePath(path);
-
-    let stat;
-    try {
-      stat = await fs.stat(fullPath);
-    } catch {
-      return { success: false, error: `File not found: ${path}` };
-    }
-
-    if (stat.isDirectory()) {
-      return { success: false, error: `Path is a directory: ${path}` };
-    }
-
-    try {
-      await fs.unlink(fullPath);
-      return { success: true };
-    } catch (err: any) {
-      // Attempt chmod retry on permission error
-      if (err.code === 'EACCES' || err.code === 'EPERM') {
-        try {
-          await fs.chmod(fullPath, 0o666);
-          await fs.unlink(fullPath);
-          return { success: true };
-        } catch {
-          return { success: false, error: `Permission denied: ${path}` };
-        }
-      }
-      return { success: false, error: err.message };
-    }
-  }
-
-  async readImage(path: string): Promise<{
-    success: boolean;
-    dataUrl?: string;
-    mimeType?: string;
-    size?: number;
-    error?: string;
-  }> {
-    const fullPath = this.resolvePath(path);
-
-    // Check file extension
-    const ext = extname(path).toLowerCase();
-    if (!ALLOWED_IMAGE_EXTENSIONS.has(ext)) {
-      return {
-        success: false,
-        error: `Unsupported image format: ${ext}. Allowed: ${Array.from(ALLOWED_IMAGE_EXTENSIONS).join(', ')}`,
-      };
-    }
-
-    let stat;
-    try {
-      stat = await fs.stat(fullPath);
-    } catch {
-      return { success: false, error: `Image not found: ${path}` };
-    }
-
-    if (stat.isDirectory()) {
-      return { success: false, error: `Path is a directory: ${path}` };
-    }
-
-    // Size limit for images (10MB)
-    const MAX_IMAGE_SIZE = 10 * 1024 * 1024;
-    if (stat.size > MAX_IMAGE_SIZE) {
-      return {
-        success: false,
-        error: `Image too large: ${stat.size} bytes (max ${MAX_IMAGE_SIZE})`,
-      };
-    }
-
-    try {
-      const buffer = await fs.readFile(fullPath);
-      const base64 = buffer.toString('base64');
-      const mimeType = IMAGE_MIME_TYPES[ext] || 'application/octet-stream';
-      const dataUrl = `data:${mimeType};base64,${base64}`;
-
-      return {
-        success: true,
-        dataUrl,
-        mimeType,
-        size: stat.size,
-      };
-    } catch (err: any) {
-      return { success: false, error: err.message };
-    }
-  }
-}
diff --git a/src/main/services/fs/RemoteFileSystem.ts b/src/main/services/fs/RemoteFileSystem.ts
deleted file mode 100644
index 1f05359487..0000000000
--- a/src/main/services/fs/RemoteFileSystem.ts
+++ /dev/null
@@ -1,806 +0,0 @@
-/**
- * Remote FileSystem implementation
- * Uses SFTP over SSH for remote filesystem operations
- */
-
-import { SFTPWrapper } from 'ssh2';
-import {
-  IFileSystem,
-  FileListResult,
-  ReadResult,
-  WriteResult,
-  SearchResult,
-  ListOptions,
-  SearchOptions,
-  FileEntry,
-  FileSystemError,
-  FileSystemErrorCodes,
-} from './types';
-import { SshService } from '../ssh/SshService';
-import { quoteShellArg } from '../../utils/shellEscape';
-
-/**
- * Allowed image extensions for readImage
- */
-const ALLOWED_IMAGE_EXTENSIONS = ['.png', '.jpg', '.jpeg', '.gif', '.webp', '.svg', '.bmp', '.ico'];
-
-/**
- * Maximum file size for reading (100MB to prevent memory issues)
- */
-const MAX_READ_SIZE = 100 * 1024 * 1024;
-
-/**
- * Default max bytes for read operations
- */
-const DEFAULT_MAX_BYTES = 200 * 1024;
-
-/**
- * RemoteFileSystem implements IFileSystem using SFTP over SSH.
- * Provides path traversal protection and proper error handling.
- */
-export class RemoteFileSystem implements IFileSystem {
-  constructor(
-    private sshService: SshService,
-    private connectionId: string,
-    private remotePath: string
-  ) {
-    if (!sshService) {
-      throw new FileSystemError('SSH service is required', FileSystemErrorCodes.CONNECTION_ERROR);
-    }
-    if (!connectionId) {
-      throw new FileSystemError('Connection ID is required', FileSystemErrorCodes.CONNECTION_ERROR);
-    }
-    if (!remotePath) {
-      throw new FileSystemError('Remote path is required', FileSystemErrorCodes.INVALID_PATH);
-    }
-    // Normalize remote path to use forward slashes
-    this.remotePath = remotePath.replace(/\\/g, '/');
-  }
-
-  /**
-   * List directory contents via SFTP
-   */
-  async list(path: string = '', options?: ListOptions): Promise<FileListResult> {
-    const startTime = Date.now();
-    const fullPath = this.resolveRemotePath(path);
-    const sftp = await this.sshService.getSftp(this.connectionId);
-
-    return new Promise((resolve, reject) => {
-      sftp.readdir(fullPath, (err, list) => {
-        if (err) {
-          reject(this.mapSftpError(err, fullPath));
-          return;
-        }
-
-        const entries: FileEntry[] = [];
-        const seen = new Set<string>();
-
-        for (const item of list) {
-          // Skip hidden files if not included
-          if (!options?.includeHidden && item.filename.startsWith('.')) {
-            continue;
-          }
-
-          // Apply filter if provided
-          if (options?.filter) {
-            const filterRegex = new RegExp(options.filter);
-            if (!filterRegex.test(item.filename)) {
-              continue;
-            }
-          }
-
-          const entryPath = this.relativePath(`${fullPath}/${item.filename}`);
-          if (seen.has(entryPath)) {
-            continue;
-          }
-          seen.add(entryPath);
-
-          const entry: FileEntry = {
-            path: entryPath,
-            type: item.attrs.isDirectory() ? 'dir' : 'file',
-            size: item.attrs.size,
-            mtime: new Date(item.attrs.mtime * 1000),
-            ctime: new Date(item.attrs.atime * 1000),
-            mode: item.attrs.mode,
-          };
-
-          entries.push(entry);
-
-          // Handle recursive listing
-          if (options?.recursive && item.attrs.isDirectory()) {
-            // Note: Recursive listing is async and needs special handling
-            // For now, we note that full recursive support requires additional implementation
-          }
-        }
-
-        // Sort entries: directories first, then files, both alphabetically
-        entries.sort((a, b) => {
-          if (a.type === b.type) {
-            return a.path.localeCompare(b.path);
-          }
-          return a.type === 'dir' ? -1 : 1;
-        });
-
-        let result = entries;
-        let truncated = false;
-        let truncateReason: 'maxEntries' | 'timeBudget' | undefined;
-
-        // Apply maxEntries limit
-        if (options?.maxEntries && entries.length > options.maxEntries) {
-          result = entries.slice(0, options.maxEntries);
-          truncated = true;
-          truncateReason = 'maxEntries';
-        }
-
-        // Apply time budget
-        const durationMs = Date.now() - startTime;
-        if (options?.timeBudgetMs && durationMs > options.timeBudgetMs) {
-          truncated = true;
-          truncateReason = 'timeBudget';
-        }
-
-        resolve({
-          entries: result,
-          total: entries.length,
-          truncated,
-          truncateReason,
-          durationMs,
-        });
-      });
-    });
-  }
-
-  /**
-   * Read file contents via SFTP
-   * Handles large files by respecting maxBytes limit
-   */
-  async read(path: string, maxBytes: number = DEFAULT_MAX_BYTES): Promise<ReadResult> {
-    const fullPath = this.resolveRemotePath(path);
-    const sftp = await this.sshService.getSftp(this.connectionId);
-
-    return new Promise((resolve, reject) => {
-      sftp.open(fullPath, 'r', (err, handle) => {
-        if (err) {
-          reject(this.mapSftpError(err, fullPath));
-          return;
-        }
-
-        sftp.fstat(handle, (statErr, stats) => {
-          if (statErr) {
-            sftp.close(handle, () => {});
-            reject(this.mapSftpError(statErr, fullPath));
-            return;
-          }
-
-          // Check if it's a directory
-          if (stats.isDirectory()) {
-            sftp.close(handle, () => {});
-            reject(
-              new FileSystemError(
-                `Path is a directory: ${path}`,
-                FileSystemErrorCodes.IS_DIRECTORY,
-                path
-              )
-            );
-            return;
-          }
-
-          const fileSize = stats.size;
-          const readSize = Math.min(fileSize, maxBytes, MAX_READ_SIZE);
-          const buffer = Buffer.alloc(readSize);
-
-          sftp.read(handle, buffer, 0, readSize, 0, (readErr, bytesRead) => {
-            sftp.close(handle, () => {});
-
-            if (readErr) {
-              reject(this.mapSftpError(readErr, fullPath));
-              return;
-            }
-
-            // Convert buffer to string, handling only the bytes actually read
-            const content = buffer.subarray(0, bytesRead).toString('utf-8');
-
-            resolve({
-              content,
-              truncated: fileSize > maxBytes,
-              totalSize: fileSize,
-            });
-          });
-        });
-      });
-    });
-  }
-
-  /**
-   * Write file contents via SFTP
-   * Creates parent directories recursively if needed
-   */
-  async write(path: string, content: string): Promise<WriteResult> {
-    const fullPath = this.resolveRemotePath(path);
-    const sftp = await this.sshService.getSftp(this.connectionId);
-
-    // Ensure parent directory exists
-    const lastSlash = fullPath.lastIndexOf('/');
-    if (lastSlash > 0) {
-      const parentDir = fullPath.substring(0, lastSlash);
-      await this.ensureRemoteDir(sftp, parentDir);
-    }
-
-    return new Promise((resolve, reject) => {
-      sftp.open(fullPath, 'w', (err, handle) => {
-        if (err) {
-          reject(this.mapSftpError(err, fullPath));
-          return;
-        }
-
-        const buffer = Buffer.from(content, 'utf-8');
-
-        sftp.write(handle, buffer, 0, buffer.length, 0, (writeErr) => {
-          sftp.close(handle, (closeErr) => {
-            if (writeErr) {
-              reject(this.mapSftpError(writeErr, fullPath));
-              return;
-            }
-
-            if (closeErr) {
-              reject(this.mapSftpError(closeErr, fullPath));
-              return;
-            }
-
-            resolve({
-              success: true,
-              bytesWritten: buffer.length,
-            });
-          });
-        });
-      });
-    });
-  }
-
-  /**
-   * Recursively list all files and directories via SSH find (single round-trip).
-   * Returns items in the same {path, type} format used by the local fs:list handler.
-   */
-  async listRecursive(options?: { includeDirs?: boolean; maxEntries?: number }): Promise<{
-    items: Array<{ path: string; type: 'file' | 'dir' }>;
-    truncated: boolean;
-  }> {
-    const includeDirs = options?.includeDirs ?? true;
-    const maxEntries = options?.maxEntries ?? 5000;
-
-    // Directories to prune from the listing
-    const pruneNames = [
-      '.git',
-      'node_modules',
-      'dist',
-      'build',
-      '.next',
-      'out',
-      '.turbo',
-      'coverage',
-      '.nyc_output',
-      '.cache',
-      'tmp',
-      'temp',
-      '__pycache__',
-      '.pytest_cache',
-      'venv',
-      '.venv',
-      'target',
-      '.terraform',
-      '.serverless',
-      'vendor',
-      'bower_components',
-      'worktrees',
-      '.worktrees',
-      '.DS_Store',
-    ];
-
-    // Build prune clause for find (names are hardcoded, but escape for safety)
-    const pruneExpr = pruneNames.map((name) => `-name ${quoteShellArg(name)}`).join(' -o ');
-
-    // Build find command: prune ignored dirs, print files (and optionally dirs)
-    const typeFilter = includeDirs ? '' : '-type f';
-    const command = [
-      `find ${quoteShellArg(this.remotePath)}`,
-      `\\( ${pruneExpr} \\) -prune -o`,
-      typeFilter ? `${typeFilter} -print` : '-print',
-      `2>/dev/null`,
-      `| head -n ${maxEntries + 1}`,
-    ]
-      .filter(Boolean)
-      .join(' ');
-
-    try {
-      const result = await this.sshService.executeCommand(this.connectionId, command);
-
-      const lines = result.stdout.split('\n').filter((line) => line.trim());
-
-      // Check if we exceeded maxEntries (we asked for maxEntries+1 to detect truncation)
-      const truncated = lines.length > maxEntries;
-      const effectiveLines = truncated ? lines.slice(0, maxEntries) : lines;
-
-      const items: Array<{ path: string; type: 'file' | 'dir' }> = [];
-
-      for (const line of effectiveLines) {
-        const trimmed = line.trim();
-        if (!trimmed) continue;
-
-        // Skip the root path itself
-        if (trimmed === this.remotePath || trimmed === this.remotePath + '/') continue;
-
-        const relPath = this.relativePath(trimmed);
-        if (!relPath) continue;
-
-        // Determine type: find outputs directories with trailing / when using -print,
-        // but standard find doesn't. We'll use a heuristic: if any other entry starts
-        // with this path + '/', it's a directory. For efficiency, detect trailing slash.
-        const isDir = trimmed.endsWith('/');
-        const cleanRel = relPath.replace(/\/$/, '');
-
-        if (!cleanRel) continue;
-
-        items.push({
-          path: cleanRel,
-          type: isDir ? 'dir' : 'file',
-        });
-      }
-
-      // Since `find` doesn't always indicate directories clearly with just -print,
-      // we do a second pass: any path that is a prefix of another path is a directory.
-      const pathSet = new Set(items.map((i) => i.path));
-      for (const item of items) {
-        if (item.type === 'file') {
-          // Check if any other path starts with this path + '/'
-          const prefix = item.path + '/';
-          for (const otherPath of pathSet) {
-            if (otherPath.startsWith(prefix)) {
-              item.type = 'dir';
-              break;
-            }
-          }
-        }
-      }
-
-      // Filter out dirs if not requested
-      const finalItems = includeDirs ? items : items.filter((i) => i.type === 'file');
-
-      return { items: finalItems, truncated };
-    } catch {
-      return { items: [], truncated: false };
-    }
-  }
-
-  /**
-   * Check if a path exists via SFTP
-   */
-  async exists(path: string): Promise<boolean> {
-    try {
-      const entry = await this.stat(path);
-      return entry !== null;
-    } catch {
-      return false;
-    }
-  }
-
-  /**
-   * Get file/directory metadata via SFTP
-   */
-  async stat(path: string): Promise<FileEntry | null> {
-    const fullPath = this.resolveRemotePath(path);
-    const sftp = await this.sshService.getSftp(this.connectionId);
-
-    return new Promise((resolve, reject) => {
-      sftp.stat(fullPath, (err, stats) => {
-        if (err) {
-          // Check if file doesn't exist
-          const anyErr = err as any;
-          if (anyErr?.message?.includes('No such file') || anyErr?.code === 2) {
-            resolve(null);
-            return;
-          }
-          reject(this.mapSftpError(err, fullPath));
-          return;
-        }
-
-        resolve({
-          path,
-          type: stats.isDirectory() ? 'dir' : 'file',
-          size: stats.size,
-          mtime: new Date(stats.mtime * 1000),
-          ctime: new Date(stats.atime * 1000),
-          mode: stats.mode,
-        });
-      });
-    });
-  }
-
-  /**
-   * Search for content in files via SSH exec (grep)
-   * Uses grep on the remote host for better performance on large codebases
-   */
-  async search(query: string, options?: SearchOptions): Promise<SearchResult> {
-    const searchPattern = options?.pattern || query;
-    const basePath = this.remotePath;
-    const maxResults = options?.maxResults || 10000;
-    const caseFlag = options?.caseSensitive ? '' : '-i';
-
-    // Build grep command with shell-safe escaping
-    const escapedPattern = quoteShellArg(searchPattern);
-
-    // Build file extension filter if provided
-    let includeFilter = '';
-    if (options?.fileExtensions && options.fileExtensions.length > 0) {
-      const extensions = options.fileExtensions.map((ext) =>
-        ext.startsWith('.') ? ext : `.${ext}`
-      );
-      includeFilter = extensions.map((e) => `--include=${quoteShellArg(`*${e}`)}`).join(' ');
-    }
-
-    // Use grep recursively with line numbers
-    const command = `grep -rn ${caseFlag} ${includeFilter} -e ${escapedPattern} ${quoteShellArg(basePath)} 2>/dev/null | head -n ${maxResults}`;
-
-    try {
-      const result = await this.sshService.executeCommand(this.connectionId, command);
-
-      // If grep returns non-zero exit but no stderr, it just means no matches
-      if (result.exitCode !== 0 && result.exitCode !== 1) {
-        // grep exit code 1 means no matches found, which is fine
-        return { matches: [], total: 0, filesSearched: 0 };
-      }
-
-      const matches: import('./types').SearchMatch[] = [];
-      const lines = result.stdout.split('\n').filter((line) => line.trim());
-      const seenFiles = new Set<string>();
-
-      for (const line of lines) {
-        // Parse grep output format: path:line:content
-        const firstColon = line.indexOf(':');
-        if (firstColon === -1) continue;
-
-        const filePath = line.substring(0, firstColon);
-        const rest = line.substring(firstColon + 1);
-
-        const secondColon = rest.indexOf(':');
-        if (secondColon === -1) continue;
-
-        const lineNum = parseInt(rest.substring(0, secondColon), 10);
-        const content = rest.substring(secondColon + 1);
-
-        if (isNaN(lineNum)) continue;
-
-        const relPath = this.relativePath(filePath);
-
-        // Apply file pattern filter if provided
-        if (options?.filePattern) {
-          const patternRegex = new RegExp(options.filePattern);
-          if (!patternRegex.test(relPath)) {
-            continue;
-          }
-        }
-
-        seenFiles.add(filePath);
-
-        // Find column by searching for the pattern in the content
-        const searchPat = options?.caseSensitive ? searchPattern : searchPattern.toLowerCase();
-        const column = content.indexOf(searchPat) + 1;
-
-        matches.push({
-          filePath: relPath,
-          line: lineNum,
-          column: column > 0 ? column : 1,
-          content: content.trim(),
-          preview: content.trim(),
-        });
-      }
-
-      return {
-        matches,
-        total: matches.length,
-        truncated: lines.length >= maxResults,
-        filesSearched: seenFiles.size,
-      };
-    } catch (error) {
-      // If command execution fails, return empty results
-      return { matches: [], total: 0, filesSearched: 0 };
-    }
-  }
-
-  /**
-   * Remove a file via SFTP
-   * For directories, uses SSH exec with rm -rf
-   */
-  async remove(path: string): Promise<{ success: boolean; error?: string }> {
-    const fullPath = this.resolveRemotePath(path);
-
-    try {
-      const entry = await this.stat(path);
-
-      if (!entry) {
-        return { success: false, error: `File not found: ${path}` };
-      }
-
-      const sftp = await this.sshService.getSftp(this.connectionId);
-
-      if (entry.type === 'dir') {
-        // For directories, use SSH exec to recursively remove
-        const command = `rm -rf ${quoteShellArg(fullPath)}`;
-        const result = await this.sshService.executeCommand(this.connectionId, command);
-
-        if (result.exitCode !== 0) {
-          return { success: false, error: result.stderr || 'Failed to remove directory' };
-        }
-      } else {
-        // For files, use SFTP unlink
-        return new Promise((resolve) => {
-          sftp.unlink(fullPath, (err) => {
-            if (err) {
-              resolve({ success: false, error: err.message });
-            } else {
-              resolve({ success: true });
-            }
-          });
-        });
-      }
-
-      return { success: true };
-    } catch (error) {
-      const message = error instanceof Error ? error.message : String(error);
-      return { success: false, error: message };
-    }
-  }
-
-  /**
-   * Read image file as base64 data URL via SFTP
-   */
-  async readImage(path: string): Promise<{
-    success: boolean;
-    dataUrl?: string;
-    mimeType?: string;
-    size?: number;
-    error?: string;
-  }> {
-    // Check file extension
-    const ext = path.toLowerCase().substring(path.lastIndexOf('.'));
-    if (!ALLOWED_IMAGE_EXTENSIONS.includes(ext)) {
-      return {
-        success: false,
-        error: `Unsupported image format: ${ext}`,
-      };
-    }
-
-    const fullPath = this.resolveRemotePath(path);
-    const sftp = await this.sshService.getSftp(this.connectionId);
-
-    return new Promise((resolve, reject) => {
-      sftp.open(fullPath, 'r', (err, handle) => {
-        if (err) {
-          reject(this.mapSftpError(err, fullPath));
-          return;
-        }
-
-        sftp.fstat(handle, (statErr, stats) => {
-          if (statErr) {
-            sftp.close(handle, () => {});
-            reject(this.mapSftpError(statErr, fullPath));
-            return;
-          }
-
-          // Check file size limit (5MB for images)
-          const maxImageSize = 5 * 1024 * 1024;
-          if (stats.size > maxImageSize) {
-            sftp.close(handle, () => {});
-            resolve({
-              success: false,
-              error: `Image too large: ${stats.size} bytes (max ${maxImageSize})`,
-            });
-            return;
-          }
-
-          const buffer = Buffer.alloc(stats.size);
-
-          sftp.read(handle, buffer, 0, stats.size, 0, (readErr) => {
-            sftp.close(handle, () => {});
-
-            if (readErr) {
-              reject(this.mapSftpError(readErr, fullPath));
-              return;
-            }
-
-            // Determine MIME type from extension
-            const mimeTypes: Record<string, string> = {
-              '.png': 'image/png',
-              '.jpg': 'image/jpeg',
-              '.jpeg': 'image/jpeg',
-              '.gif': 'image/gif',
-              '.webp': 'image/webp',
-              '.svg': 'image/svg+xml',
-              '.bmp': 'image/bmp',
-              '.ico': 'image/x-icon',
-            };
-            const mimeType = mimeTypes[ext] || 'application/octet-stream';
-
-            // Convert to base64
-            const base64 = buffer.toString('base64');
-            const dataUrl = `data:${mimeType};base64,${base64}`;
-
-            resolve({
-              success: true,
-              dataUrl,
-              mimeType,
-              size: stats.size,
-            });
-          });
-        });
-      });
-    });
-  }
-
-  /**
-   * Ensure connection is active, reconnect if needed
-   * Note: Actual reconnection logic is handled by SshService
-   */
-  private async ensureConnected(): Promise<void> {
-    const connections = this.sshService.listConnections();
-    if (!connections.includes(this.connectionId)) {
-      throw new FileSystemError(
-        'SSH connection not found',
-        FileSystemErrorCodes.CONNECTION_ERROR,
-        this.connectionId
-      );
-    }
-  }
-
-  /**
-   * Build absolute remote path from relative path
-   * Provides path traversal protection
-   */
-  private resolveRemotePath(relPath: string): string {
-    // Normalize path separators to forward slashes
-    const normalized = relPath.replace(/\\/g, '/');
-
-    // Handle absolute paths (should not escape base)
-    if (normalized.startsWith('/')) {
-      const resolved = normalized;
-      // Security: ensure resolved path is within remotePath base
-      if (!this.isWithinBase(resolved)) {
-        throw new FileSystemError(
-          'Path traversal detected: path escapes base directory',
-          FileSystemErrorCodes.PATH_ESCAPE,
-          relPath
-        );
-      }
-      return resolved;
-    }
-
-    // Join with base path
-    const fullPath = `${this.remotePath}/${normalized}`.replace(/\/+/g, '/');
-
-    // Security: ensure path is within basePath
-    if (!this.isWithinBase(fullPath)) {
-      throw new FileSystemError(
-        'Path traversal detected: path escapes base directory',
-        FileSystemErrorCodes.PATH_ESCAPE,
-        relPath
-      );
-    }
-
-    return fullPath;
-  }
-
-  /**
-   * Check if a path is within the base directory
-   */
-  private isWithinBase(fullPath: string): boolean {
-    // Normalize both paths
-    const normalizedPath = fullPath.replace(/\/+/g, '/').replace(/\/$/, '');
-    const normalizedBase = this.remotePath.replace(/\/+/g, '/').replace(/\/$/, '');
-
-    // Path must start with base path
-    return normalizedPath === normalizedBase || normalizedPath.startsWith(`${normalizedBase}/`);
-  }
-
-  /**
-   * Get relative path from full remote path
-   */
-  private relativePath(fullPath: string): string {
-    const normalized = fullPath.replace(/\\/g, '/');
-    const normalizedBase = this.remotePath.replace(/\\/g, '/');
-
-    if (normalized === normalizedBase) {
-      return '';
-    }
-
-    const prefix = `${normalizedBase}/`;
-    if (normalized.startsWith(prefix)) {
-      return normalized.substring(prefix.length);
-    }
-
-    return normalized;
-  }
-
-  /**
-   * Recursively ensure a remote directory exists
-   */
-  private async ensureRemoteDir(sftp: SFTPWrapper, dirPath: string): Promise<void> {
-    return new Promise((resolve, reject) => {
-      sftp.mkdir(dirPath, (err) => {
-        if (!err) {
-          // Directory created successfully
-          resolve();
-          return;
-        }
-
-        // Check if directory already exists
-        if (err.message?.includes('already exists') || err.message?.includes('File exists')) {
-          resolve();
-          return;
-        }
-
-        // Try to create parent directory recursively
-        const parentPath = dirPath.substring(0, dirPath.lastIndexOf('/'));
-        if (parentPath && parentPath !== dirPath && parentPath.length >= this.remotePath.length) {
-          this.ensureRemoteDir(sftp, parentPath)
-            .then(() => this.ensureRemoteDir(sftp, dirPath))
-            .then(resolve)
-            .catch(reject);
-        } else {
-          reject(this.mapSftpError(err, dirPath));
-        }
-      });
-    });
-  }
-
-  /**
-   * Map SFTP error codes to FileSystemError
-   */
-  private mapSftpError(error: unknown, path?: string): FileSystemError {
-    const anyErr = error as any;
-    const message = typeof anyErr?.message === 'string' ? anyErr.message : String(error);
-    const code = anyErr?.code;
-
-    // Map common SFTP error codes
-    if (code === 2 || message.includes('No such file')) {
-      return new FileSystemError(
-        `File or directory not found: ${path || message}`,
-        FileSystemErrorCodes.NOT_FOUND,
-        path
-      );
-    }
-
-    if (code === 3 || message.includes('Permission denied')) {
-      return new FileSystemError(
-        `Permission denied: ${path || message}`,
-        FileSystemErrorCodes.PERMISSION_DENIED,
-        path
-      );
-    }
-
-    if (message.includes('is a directory')) {
-      return new FileSystemError(
-        `Path is a directory: ${path || message}`,
-        FileSystemErrorCodes.IS_DIRECTORY,
-        path
-      );
-    }
-
-    if (message.includes('Not a directory')) {
-      return new FileSystemError(
-        `Path is not a directory: ${path || message}`,
-        FileSystemErrorCodes.NOT_DIRECTORY,
-        path
-      );
-    }
-
-    if (message.includes('connection') || message.includes('Connection')) {
-      return new FileSystemError(
-        `Connection error: ${message}`,
-        FileSystemErrorCodes.CONNECTION_ERROR,
-        path
-      );
-    }
-
-    // Default to unknown error
-    return new FileSystemError(`Filesystem error: ${message}`, FileSystemErrorCodes.UNKNOWN, path);
-  }
-}
diff --git a/src/main/services/fs/__tests__/LocalFileSystem.test.ts b/src/main/services/fs/__tests__/LocalFileSystem.test.ts
deleted file mode 100644
index 6a9f4c2f6c..0000000000
--- a/src/main/services/fs/__tests__/LocalFileSystem.test.ts
+++ /dev/null
@@ -1,523 +0,0 @@
-import { describe, it, expect, beforeEach, afterEach } from 'vitest';
-import fs from 'fs';
-import path from 'path';
-import os from 'os';
-import { LocalFileSystem } from '../LocalFileSystem';
-import { FileSystemError, FileSystemErrorCodes } from '../types';
-
-describe('LocalFileSystem', () => {
-  let tempDir: string;
-  let fsService: LocalFileSystem;
-
-  beforeEach(() => {
-    tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'fs-test-'));
-    fsService = new LocalFileSystem(tempDir);
-  });
-
-  afterEach(() => {
-    fs.rmSync(tempDir, { recursive: true, force: true });
-  });
-
-  describe('constructor', () => {
-    it('should throw error when project path is empty', () => {
-      expect(() => new LocalFileSystem('')).toThrow(FileSystemError);
-      expect(() => new LocalFileSystem('')).toThrow('Project path is required');
-    });
-
-    it('should resolve project path', () => {
-      const relativePath = 'relative/project';
-      const service = new LocalFileSystem(relativePath);
-      expect(service).toBeDefined();
-    });
-  });
-
-  describe('list', () => {
-    it('should list files in directory', async () => {
-      fs.writeFileSync(path.join(tempDir, 'file1.txt'), 'content1');
-      fs.writeFileSync(path.join(tempDir, 'file2.txt'), 'content2');
-      fs.mkdirSync(path.join(tempDir, 'subdir'));
-
-      const result = await fsService.list('');
-
-      expect(result.entries).toHaveLength(3);
-      expect(result.entries.some((e) => e.path === 'file1.txt' && e.type === 'file')).toBe(true);
-      expect(result.entries.some((e) => e.path === 'file2.txt' && e.type === 'file')).toBe(true);
-      expect(result.entries.some((e) => e.path === 'subdir' && e.type === 'dir')).toBe(true);
-    });
-
-    it('should list files in subdirectory', async () => {
-      const subdir = path.join(tempDir, 'subdir');
-      fs.mkdirSync(subdir);
-      fs.writeFileSync(path.join(subdir, 'nested.txt'), 'nested content');
-
-      const result = await fsService.list('subdir');
-
-      expect(result.entries).toHaveLength(1);
-      expect(result.entries[0].path).toBe('subdir/nested.txt');
-    });
-
-    it('should list recursively', async () => {
-      fs.mkdirSync(path.join(tempDir, 'level1'));
-      fs.writeFileSync(path.join(tempDir, 'level1/file1.txt'), 'content1');
-      fs.mkdirSync(path.join(tempDir, 'level1/level2'));
-      fs.writeFileSync(path.join(tempDir, 'level1/level2/file2.txt'), 'content2');
-
-      const result = await fsService.list('', { recursive: true });
-
-      expect(result.entries.some((e) => e.path === 'level1')).toBe(true);
-      expect(result.entries.some((e) => e.path === 'level1/file1.txt')).toBe(true);
-      expect(result.entries.some((e) => e.path === 'level1/level2')).toBe(true);
-      expect(result.entries.some((e) => e.path === 'level1/level2/file2.txt')).toBe(true);
-    });
-
-    it('should exclude hidden files by default', async () => {
-      fs.writeFileSync(path.join(tempDir, 'visible.txt'), 'content');
-      fs.writeFileSync(path.join(tempDir, '.hidden'), 'hidden content');
-
-      const result = await fsService.list('');
-
-      expect(result.entries.some((e) => e.path === 'visible.txt')).toBe(true);
-      expect(result.entries.some((e) => e.path === '.hidden')).toBe(false);
-    });
-
-    it('should include hidden files when specified', async () => {
-      fs.writeFileSync(path.join(tempDir, 'visible.txt'), 'content');
-      fs.writeFileSync(path.join(tempDir, '.hidden'), 'hidden content');
-
-      const result = await fsService.list('', { includeHidden: true });
-
-      expect(result.entries.some((e) => e.path === '.hidden')).toBe(true);
-    });
-
-    it('should apply filter pattern', async () => {
-      fs.writeFileSync(path.join(tempDir, 'test.ts'), 'typescript');
-      fs.writeFileSync(path.join(tempDir, 'test.js'), 'javascript');
-      fs.writeFileSync(path.join(tempDir, 'readme.md'), 'markdown');
-
-      const result = await fsService.list('', { filter: '.*\\.ts$' });
-
-      expect(result.entries).toHaveLength(1);
-      expect(result.entries[0].path).toBe('test.ts');
-    });
-
-    it('should truncate when maxEntries reached', async () => {
-      for (let i = 0; i < 10; i++) {
-        fs.writeFileSync(path.join(tempDir, `file${i}.txt`), 'content');
-      }
-
-      const result = await fsService.list('', { maxEntries: 5 });
-
-      expect(result.total).toBe(5);
-      expect(result.truncated).toBe(true);
-      expect(result.truncateReason).toBe('maxEntries');
-    });
-
-    it('should truncate when time budget exceeded', async () => {
-      // Create many files to ensure time budget is exceeded
-      for (let i = 0; i < 1000; i++) {
-        fs.writeFileSync(path.join(tempDir, `file${i}.txt`), 'content');
-      }
-
-      const result = await fsService.list('', { recursive: true, timeBudgetMs: 1 });
-
-      expect(result.truncated).toBe(true);
-      expect(result.truncateReason).toBe('timeBudget');
-    });
-
-    it('should include file metadata', async () => {
-      const filePath = path.join(tempDir, 'test.txt');
-      fs.writeFileSync(filePath, 'test content');
-
-      const result = await fsService.list('');
-
-      expect(result.entries[0].size).toBe(12);
-      expect(result.entries[0].mtime).toBeInstanceOf(Date);
-      expect(result.entries[0].mode).toBeDefined();
-    });
-  });
-
-  describe('read', () => {
-    it('should read file content', async () => {
-      fs.writeFileSync(path.join(tempDir, 'test.txt'), 'Hello, World!');
-
-      const result = await fsService.read('test.txt');
-
-      expect(result.content).toBe('Hello, World!');
-      expect(result.truncated).toBe(false);
-      expect(result.totalSize).toBe(13);
-    });
-
-    it('should throw error when file not found', async () => {
-      await expect(fsService.read('nonexistent.txt')).rejects.toThrow(FileSystemError);
-      await expect(fsService.read('nonexistent.txt')).rejects.toThrow('File not found');
-    });
-
-    it('should throw error when path is directory', async () => {
-      fs.mkdirSync(path.join(tempDir, 'subdir'));
-
-      await expect(fsService.read('subdir')).rejects.toThrow(FileSystemError);
-      await expect(fsService.read('subdir')).rejects.toThrow('Path is a directory');
-    });
-
-    it('should truncate large files', async () => {
-      const largeContent = 'x'.repeat(300 * 1024); // 300KB
-      fs.writeFileSync(path.join(tempDir, 'large.txt'), largeContent);
-
-      const result = await fsService.read('large.txt', 200 * 1024);
-
-      expect(result.truncated).toBe(true);
-      expect(result.content.length).toBe(200 * 1024);
-      expect(result.totalSize).toBe(300 * 1024);
-    });
-
-    it('should not truncate files under maxBytes', async () => {
-      const content = 'Small content';
-      fs.writeFileSync(path.join(tempDir, 'small.txt'), content);
-
-      const result = await fsService.read('small.txt', 200 * 1024);
-
-      expect(result.truncated).toBe(false);
-      expect(result.content).toBe(content);
-    });
-  });
-
-  describe('write', () => {
-    it('should write file content', async () => {
-      const result = await fsService.write('newfile.txt', 'New content');
-
-      expect(result.success).toBe(true);
-      expect(fs.readFileSync(path.join(tempDir, 'newfile.txt'), 'utf-8')).toBe('New content');
-    });
-
-    it('should create parent directories', async () => {
-      const result = await fsService.write('nested/deep/file.txt', 'Deep content');
-
-      expect(result.success).toBe(true);
-      expect(fs.existsSync(path.join(tempDir, 'nested/deep/file.txt'))).toBe(true);
-    });
-
-    it('should return bytes written', async () => {
-      const content = 'Test content';
-      const result = await fsService.write('test.txt', content);
-
-      expect(result.bytesWritten).toBe(Buffer.byteLength(content, 'utf-8'));
-    });
-
-    it('should throw error when cannot create directory', async () => {
-      // Make tempDir read-only (on Unix systems)
-      if (process.platform !== 'win32') {
-        fs.chmodSync(tempDir, 0o555);
-
-        try {
-          await expect(fsService.write('readonly/test.txt', 'content')).rejects.toThrow(
-            FileSystemError
-          );
-        } finally {
-          fs.chmodSync(tempDir, 0o755);
-        }
-      }
-    });
-  });
-
-  describe('exists', () => {
-    it('should return true for existing file', async () => {
-      fs.writeFileSync(path.join(tempDir, 'exists.txt'), 'content');
-
-      const result = await fsService.exists('exists.txt');
-
-      expect(result).toBe(true);
-    });
-
-    it('should return true for existing directory', async () => {
-      fs.mkdirSync(path.join(tempDir, 'subdir'));
-
-      const result = await fsService.exists('subdir');
-
-      expect(result).toBe(true);
-    });
-
-    it('should return false for non-existent path', async () => {
-      const result = await fsService.exists('nonexistent.txt');
-
-      expect(result).toBe(false);
-    });
-  });
-
-  describe('stat', () => {
-    it('should return file entry for file', async () => {
-      fs.writeFileSync(path.join(tempDir, 'test.txt'), 'content');
-
-      const result = await fsService.stat('test.txt');
-
-      expect(result).not.toBeNull();
-      expect(result?.path).toBe('test.txt');
-      expect(result?.type).toBe('file');
-      expect(result?.size).toBe(7);
-    });
-
-    it('should return file entry for directory', async () => {
-      fs.mkdirSync(path.join(tempDir, 'subdir'));
-
-      const result = await fsService.stat('subdir');
-
-      expect(result).not.toBeNull();
-      expect(result?.path).toBe('subdir');
-      expect(result?.type).toBe('dir');
-    });
-
-    it('should return null for non-existent path', async () => {
-      const result = await fsService.stat('nonexistent.txt');
-
-      expect(result).toBeNull();
-    });
-  });
-
-  describe('search', () => {
-    beforeEach(() => {
-      fs.writeFileSync(path.join(tempDir, 'file1.ts'), 'const foo = "bar";\nfunction test() {}');
-      fs.writeFileSync(path.join(tempDir, 'file2.ts'), 'let x = 1;\nconst foo = 2;');
-      fs.writeFileSync(path.join(tempDir, 'readme.md'), '# README\nThis is documentation');
-
-      const subdir = path.join(tempDir, 'src');
-      fs.mkdirSync(subdir);
-      fs.writeFileSync(path.join(subdir, 'main.ts'), 'function main() {\n  console.log(foo);\n}');
-    });
-
-    it('should find matches in files', async () => {
-      const result = await fsService.search('foo');
-
-      expect(result.total).toBeGreaterThan(0);
-      expect(result.matches.some((m) => m.filePath === 'file1.ts')).toBe(true);
-      expect(result.matches.some((m) => m.filePath === 'file2.ts')).toBe(true);
-      expect(result.matches.some((m) => m.filePath === 'src/main.ts')).toBe(true);
-    });
-
-    it('should return match details', async () => {
-      const result = await fsService.search('foo');
-
-      const match = result.matches.find((m) => m.filePath === 'file1.ts');
-      expect(match).toBeDefined();
-      expect(match?.line).toBe(1);
-      expect(match?.column).toBeGreaterThan(0);
-      expect(match?.content).toContain('foo');
-    });
-
-    it('should respect maxResults', async () => {
-      const result = await fsService.search('foo', { maxResults: 2 });
-
-      expect(result.total).toBe(2);
-      expect(result.truncated).toBe(true);
-    });
-
-    it('should filter by file extensions', async () => {
-      const result = await fsService.search('foo', { fileExtensions: ['.ts'] });
-
-      expect(result.matches.every((m) => m.filePath.endsWith('.ts'))).toBe(true);
-    });
-
-    it('should filter by file pattern', async () => {
-      const result = await fsService.search('foo', { filePattern: '*.md' });
-
-      expect(result.total).toBe(0);
-    });
-
-    it('should be case-insensitive by default', async () => {
-      const result1 = await fsService.search('FOO');
-      const result2 = await fsService.search('foo');
-
-      expect(result1.total).toBe(result2.total);
-    });
-
-    it('should respect caseSensitive option', async () => {
-      const result = await fsService.search('FOO', { caseSensitive: true });
-
-      expect(result.total).toBe(0);
-    });
-
-    it('should skip binary files', async () => {
-      // Create a "binary" file with null bytes
-      fs.writeFileSync(path.join(tempDir, 'binary.bin'), Buffer.from([0x00, 0x01, 0x02, 0x03]));
-
-      const result = await fsService.search('\x00');
-
-      expect(result.matches).toHaveLength(0);
-    });
-
-    it('should skip ignored directories', async () => {
-      const nodeModules = path.join(tempDir, 'node_modules');
-      fs.mkdirSync(nodeModules);
-      fs.writeFileSync(path.join(nodeModules, 'test.ts'), 'const foo = "ignored";');
-
-      const result = await fsService.search('foo');
-
-      expect(result.matches.some((m) => m.filePath.includes('node_modules'))).toBe(false);
-    });
-
-    it('should track files searched', async () => {
-      const result = await fsService.search('foo');
-
-      expect(result.filesSearched).toBeGreaterThan(0);
-    });
-  });
-
-  describe('remove', () => {
-    it('should remove file', async () => {
-      fs.writeFileSync(path.join(tempDir, 'delete.txt'), 'content');
-
-      const result = await fsService.remove('delete.txt');
-
-      expect(result.success).toBe(true);
-      expect(fs.existsSync(path.join(tempDir, 'delete.txt'))).toBe(false);
-    });
-
-    it('should fail when file not found', async () => {
-      const result = await fsService.remove('nonexistent.txt');
-
-      expect(result.success).toBe(false);
-      expect(result.error).toContain('File not found');
-    });
-
-    it('should fail when path is directory', async () => {
-      fs.mkdirSync(path.join(tempDir, 'subdir'));
-
-      const result = await fsService.remove('subdir');
-
-      expect(result.success).toBe(false);
-      expect(result.error).toContain('directory');
-    });
-
-    it('should retry with chmod on permission error', async () => {
-      if (process.platform !== 'win32') {
-        const filePath = path.join(tempDir, 'readonly.txt');
-        fs.writeFileSync(filePath, 'content');
-        fs.chmodSync(filePath, 0o444);
-
-        try {
-          const result = await fsService.remove('readonly.txt');
-          expect(result.success).toBe(true);
-        } finally {
-          // Restore permissions for cleanup
-          try {
-            fs.chmodSync(filePath, 0o666);
-          } catch {
-            // Ignore
-          }
-        }
-      }
-    });
-  });
-
-  describe('readImage', () => {
-    it('should read image as data URL', async () => {
-      // Create a minimal valid PNG file (1x1 transparent pixel)
-      const pngBuffer = Buffer.from(
-        'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mP8z8BQDwAEhQGAhKmMIQAAAABJRU5ErkJggg==',
-        'base64'
-      );
-      fs.writeFileSync(path.join(tempDir, 'test.png'), pngBuffer);
-
-      const result = await fsService.readImage('test.png');
-
-      expect(result.success).toBe(true);
-      expect(result.dataUrl).toMatch(/^data:image\/png;base64,/);
-      expect(result.mimeType).toBe('image/png');
-      expect(result.size).toBe(pngBuffer.length);
-    });
-
-    it('should reject unsupported image formats', async () => {
-      // bmp is not in the allowed list
-      fs.writeFileSync(path.join(tempDir, 'test.xyz'), 'fake-data');
-
-      const result = await fsService.readImage('test.xyz');
-
-      expect(result.success).toBe(false);
-      expect(result.error).toContain('Unsupported image format');
-    });
-
-    it('should fail when image not found', async () => {
-      const result = await fsService.readImage('nonexistent.png');
-
-      expect(result.success).toBe(false);
-      expect(result.error).toContain('not found');
-    });
-
-    it('should fail when path is directory', async () => {
-      fs.mkdirSync(path.join(tempDir, 'images'));
-
-      // Directories don't have extensions, so this will fail with unsupported format
-      // or directory error depending on implementation order
-      const result = await fsService.readImage('images');
-
-      expect(result.success).toBe(false);
-    });
-
-    it('should reject oversized images', async () => {
-      // Create a fake large "image" file
-      const largeBuffer = Buffer.alloc(11 * 1024 * 1024); // 11MB
-      fs.writeFileSync(path.join(tempDir, 'large.png'), largeBuffer);
-
-      const result = await fsService.readImage('large.png');
-
-      expect(result.success).toBe(false);
-      expect(result.error).toContain('too large');
-    });
-  });
-
-  describe('path traversal protection', () => {
-    it('should block absolute path traversal', async () => {
-      // Absolute paths get normalized by resolvePath
-      await expect(fsService.read('/etc/passwd')).rejects.toThrow();
-    });
-
-    it('should block relative path traversal', async () => {
-      await expect(fsService.read('../package.json')).rejects.toThrow();
-    });
-
-    it('should block nested path traversal', async () => {
-      fs.mkdirSync(path.join(tempDir, 'subdir'));
-      fs.writeFileSync(path.join(tempDir, 'subdir/file.txt'), 'content');
-
-      await expect(fsService.read('subdir/../../../etc/passwd')).rejects.toThrow();
-    });
-
-    it('should normalize paths with double slashes', async () => {
-      fs.writeFileSync(path.join(tempDir, 'test.txt'), 'content');
-
-      const result = await fsService.read('//test.txt');
-
-      expect(result.content).toBe('content');
-    });
-
-    it('should allow valid subpaths', async () => {
-      fs.mkdirSync(path.join(tempDir, 'valid'));
-      fs.mkdirSync(path.join(tempDir, 'valid/nested'));
-      fs.writeFileSync(path.join(tempDir, 'valid/nested/file.txt'), 'content');
-
-      const result = await fsService.read('valid/nested/file.txt');
-
-      expect(result.content).toBe('content');
-    });
-  });
-
-  describe('large file handling', () => {
-    it('should handle files larger than default maxBytes', async () => {
-      const largeContent = 'x'.repeat(500 * 1024); // 500KB
-      fs.writeFileSync(path.join(tempDir, 'large.txt'), largeContent);
-
-      const result = await fsService.read('large.txt');
-
-      expect(result.truncated).toBe(true);
-      expect(result.content.length).toBe(200 * 1024); // Default limit
-    });
-
-    it('should handle custom maxBytes limit', async () => {
-      const content = 'x'.repeat(100);
-      fs.writeFileSync(path.join(tempDir, 'medium.txt'), content);
-
-      const result = await fsService.read('medium.txt', 50);
-
-      expect(result.truncated).toBe(true);
-      expect(result.content.length).toBe(50);
-    });
-  });
-});
diff --git a/src/main/services/fs/index.ts b/src/main/services/fs/index.ts
deleted file mode 100644
index 11ab2db6df..0000000000
--- a/src/main/services/fs/index.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- * Filesystem Abstraction Layer
- *
- * Provides unified interface for local and remote (SSH/SFTP) filesystem operations.
- * This module is part of Wave 1 (interfaces and structure).
- *
- * Wave 2 will implement:
- * - LocalFileSystem: wrapping existing fsIpc functionality
- * - RemoteFileSystem: SFTP-based implementation using ssh2
- * - FileSystemFactory: factory pattern for creating appropriate FS instances
- *
- * Usage:
- *   import { FileSystemFactory, IFileSystem } from './services/fs';
- *
- *   const fs: IFileSystem = FileSystemFactory.create(project);
- *   const result = await fs.read('src/index.ts');
- */
-
-// Types and interfaces
-export type {
-  IFileSystem,
-  FileEntry,
-  ListOptions,
-  FileListResult,
-  ReadResult,
-  WriteResult,
-  SearchOptions,
-  SearchResult,
-  SearchMatch,
-} from './types';
-
-export { FileSystemError, FileSystemErrorCodes } from './types';
-
-// Implementations (stubs in Wave 1)
-export { LocalFileSystem } from './LocalFileSystem';
-export { RemoteFileSystem } from './RemoteFileSystem';
-export { FileSystemFactory } from './FileSystemFactory';
diff --git a/src/main/services/fs/types.ts b/src/main/services/fs/types.ts
deleted file mode 100644
index a34047fe2d..0000000000
--- a/src/main/services/fs/types.ts
+++ /dev/null
@@ -1,227 +0,0 @@
-/**
- * Filesystem abstraction layer types
- * Provides unified interface for local and remote (SSH/SFTP) filesystem operations
- */
-
-/**
- * File entry metadata returned by filesystem operations
- */
-export interface FileEntry {
-  /** Relative path from the project root */
-  path: string;
-  /** Entry type - file or directory */
-  type: 'file' | 'dir';
-  /** File size in bytes (files only) */
-  size?: number;
-  /** Last modification time */
-  mtime?: Date;
-  /** Creation time */
-  ctime?: Date;
-  /** File permissions (Unix mode) */
-  mode?: number;
-}
-
-/**
- * Options for listing directory contents
- */
-export interface ListOptions {
-  /** Include entries from subdirectories recursively */
-  recursive?: boolean;
-  /** Include hidden files (starting with .) */
-  includeHidden?: boolean;
-  /** Filter pattern (glob or regex, implementation-dependent) */
-  filter?: string;
-  /** Maximum number of entries to return */
-  maxEntries?: number;
-  /** Time budget in milliseconds */
-  timeBudgetMs?: number;
-}
-
-/**
- * Result of a list operation
- */
-export interface FileListResult {
-  /** File and directory entries */
-  entries: FileEntry[];
-  /** Total number of entries found (may be more than entries.length if truncated) */
-  total: number;
-  /** Whether the result was truncated due to limits */
-  truncated?: boolean;
-  /** Reason for truncation if applicable */
-  truncateReason?: 'maxEntries' | 'timeBudget';
-  /** Duration of the operation in milliseconds */
-  durationMs?: number;
-}
-
-/**
- * Result of a file read operation
- */
-export interface ReadResult {
-  /** File content as string */
-  content: string;
-  /** Whether the content was truncated due to maxBytes limit */
-  truncated: boolean;
-  /** Total file size in bytes */
-  totalSize: number;
-}
-
-/**
- * Result of a file write operation
- */
-export interface WriteResult {
-  /** Whether the write was successful */
-  success: boolean;
-  /** Number of bytes written */
-  bytesWritten: number;
-  /** Error message if unsuccessful */
-  error?: string;
-}
-
-/**
- * Options for search operations
- */
-export interface SearchOptions {
-  /**
-   * Optional override pattern. If omitted, the `query` argument to `IFileSystem.search()` is used.
-   */
-  pattern?: string;
-  /** Optional file pattern filter (e.g., "*.ts") */
-  filePattern?: string;
-  /** Maximum number of results to return */
-  maxResults?: number;
-  /** Case-sensitive search */
-  caseSensitive?: boolean;
-  /** File extensions to include */
-  fileExtensions?: string[];
-}
-
-/**
- * Result of a search operation
- */
-export interface SearchResult {
-  /** Search matches found */
-  matches: SearchMatch[];
-  /** Total number of matches */
-  total: number;
-  /** Whether results were truncated */
-  truncated?: boolean;
-  /** Number of files searched */
-  filesSearched?: number;
-}
-
-/**
- * Individual search match
- */
-export interface SearchMatch {
-  /** Path to the file containing the match */
-  filePath: string;
-  /** Line number (1-based) */
-  line: number;
-  /** Column number (1-based) */
-  column: number;
-  /** Match text */
-  content: string;
-  /** Preview with context */
-  preview?: string;
-}
-
-/**
- * Filesystem interface abstraction
- * Implementations: LocalFileSystem (local disk), RemoteFileSystem (SFTP over SSH)
- */
-export interface IFileSystem {
-  /**
-   * List directory contents
-   * @param path - Directory path relative to project root
-   * @param options - Listing options
-   * @returns Promise resolving to file list result
-   */
-  list(path: string, options?: ListOptions): Promise<FileListResult>;
-
-  /**
-   * Read file contents
-   * @param path - File path relative to project root
-   * @param maxBytes - Maximum bytes to read (default: 200KB)
-   * @returns Promise resolving to read result
-   */
-  read(path: string, maxBytes?: number): Promise<ReadResult>;
-
-  /**
-   * Write file contents
-   * @param path - File path relative to project root
-   * @param content - Content to write
-   * @returns Promise resolving to write result
-   */
-  write(path: string, content: string): Promise<WriteResult>;
-
-  /**
-   * Check if a path exists
-   * @param path - Path to check relative to project root
-   * @returns Promise resolving to true if exists
-   */
-  exists(path: string): Promise<boolean>;
-
-  /**
-   * Get file/directory metadata
-   * @param path - Path to stat relative to project root
-   * @returns Promise resolving to file entry or null if not found
-   */
-  stat(path: string): Promise<FileEntry | null>;
-
-  /**
-   * Search for content in files
-   * @param query - Search query string
-   * @param options - Search options
-   * @returns Promise resolving to search results
-   */
-  search(query: string, options?: SearchOptions): Promise<SearchResult>;
-
-  /**
-   * Remove a file
-   * @param path - File path relative to project root
-   * @returns Promise resolving to success status
-   */
-  remove?(path: string): Promise<{ success: boolean; error?: string }>;
-
-  /**
-   * Read image file as base64 data URL
-   * @param path - Image file path relative to project root
-   * @returns Promise resolving to image data
-   */
-  readImage?(path: string): Promise<{
-    success: boolean;
-    dataUrl?: string;
-    mimeType?: string;
-    size?: number;
-    error?: string;
-  }>;
-}
-
-/**
- * Base error class for filesystem operations
- */
-export class FileSystemError extends Error {
-  constructor(
-    message: string,
-    public readonly code: string,
-    public readonly path?: string
-  ) {
-    super(message);
-    this.name = 'FileSystemError';
-  }
-}
-
-/**
- * Error codes for filesystem operations
- */
-export const FileSystemErrorCodes = {
-  PATH_ESCAPE: 'PATH_ESCAPE',
-  NOT_FOUND: 'NOT_FOUND',
-  IS_DIRECTORY: 'IS_DIRECTORY',
-  NOT_DIRECTORY: 'NOT_DIRECTORY',
-  PERMISSION_DENIED: 'PERMISSION_DENIED',
-  INVALID_PATH: 'INVALID_PATH',
-  CONNECTION_ERROR: 'CONNECTION_ERROR',
-  TIMEOUT: 'TIMEOUT',
-  UNKNOWN: 'UNKNOWN',
-} as const;
diff --git a/src/main/services/fsIpc.ts b/src/main/services/fsIpc.ts
deleted file mode 100644
index 71b26107c0..0000000000
--- a/src/main/services/fsIpc.ts
+++ /dev/null
@@ -1,882 +0,0 @@
-import { ipcMain, shell } from 'electron';
-import * as fs from 'fs';
-import * as path from 'path';
-import { Worker } from 'worker_threads';
-import { FsListWorkerResponse } from '../types/fsListWorker';
-import { DEFAULT_IGNORES } from '../utils/fsIgnores';
-import { safeStat } from '../utils/safeStat';
-import { sshService } from './ssh/SshService';
-import { RemoteFileSystem } from './fs/RemoteFileSystem';
-import { GitIgnoreParser } from '../utils/gitIgnore';
-
-const DEFAULT_EMDASH_CONFIG = `{
-  "preservePatterns": [
-    ".env",
-    ".env.keys",
-    ".env.local",
-    ".env.*.local",
-    ".envrc",
-    "docker-compose.override.yml"
-  ],
-  "scripts": {
-    "setup": "",
-    "run": "",
-    "teardown": ""
-  }
-}
-`;
-
-type RemoteParams = {
-  connectionId?: string;
-  remotePath?: string;
-};
-
-function isRemoteRequest(args: RemoteParams): args is { connectionId: string; remotePath: string } {
-  return Boolean(args.connectionId && args.remotePath);
-}
-
-function createRemoteFs(args: { connectionId: string; remotePath: string }): RemoteFileSystem {
-  return new RemoteFileSystem(sshService, args.connectionId, args.remotePath);
-}
-
-type ListArgs = {
-  root: string;
-  includeDirs?: boolean;
-  recursive?: boolean;
-  maxEntries?: number;
-  timeBudgetMs?: number;
-} & RemoteParams;
-
-type ListWorkerState = {
-  worker: Worker;
-  requestId: number;
-  canceled: boolean;
-};
-
-const listWorkersBySender = new Map<number, ListWorkerState>();
-const DEFAULT_TIME_BUDGET_MS = 2000;
-const MIN_TIME_BUDGET_MS = 250;
-const MAX_TIME_BUDGET_MS = 10000;
-const MAX_FILES_TO_SEARCH = 10000;
-const DEFAULT_BATCH_SIZE = 250;
-
-// Centralized configuration/constants for attachments
-const ALLOWED_IMAGE_EXTENSIONS = new Set<string>([
-  '.png',
-  '.jpg',
-  '.jpeg',
-  '.gif',
-  '.webp',
-  '.bmp',
-  '.svg',
-]);
-const DEFAULT_ATTACHMENTS_SUBDIR = 'attachments' as const;
-
-export function registerFsIpc(): void {
-  function emitPlanEvent(payload: any) {
-    try {
-      const { BrowserWindow } = require('electron');
-      for (const win of BrowserWindow.getAllWindows()) {
-        try {
-          win.webContents.send('plan:event', payload);
-        } catch {}
-      }
-    } catch {}
-  }
-  ipcMain.handle('fs:list', async (_event, args: ListArgs) => {
-    try {
-      // --- Remote path: delegate to RemoteFileSystem ---
-      if (isRemoteRequest(args)) {
-        try {
-          const rfs = createRemoteFs(args);
-          const maxEntries = Math.min(Math.max(args.maxEntries ?? 5000, 100), MAX_FILES_TO_SEARCH);
-          const result = await rfs.listRecursive({
-            includeDirs: args.includeDirs ?? true,
-            maxEntries,
-          });
-          return {
-            success: true,
-            items: result.items,
-            truncated: result.truncated,
-            reason: result.truncated ? 'maxEntries' : undefined,
-          };
-        } catch (error) {
-          console.error('fs:list remote failed:', error);
-          return { success: false, error: 'Failed to list remote files' };
-        }
-      }
-
-      // --- Local path ---
-      const root = args.root;
-      const includeDirs = args.includeDirs ?? true;
-      const maxEntries = Math.min(Math.max(args.maxEntries ?? 5000, 100), MAX_FILES_TO_SEARCH);
-      const timeBudgetMs = Math.min(
-        Math.max(args.timeBudgetMs ?? DEFAULT_TIME_BUDGET_MS, MIN_TIME_BUDGET_MS),
-        MAX_TIME_BUDGET_MS
-      );
-      if (!root || !fs.existsSync(root)) {
-        return { success: false, error: 'Invalid root path' };
-      }
-
-      const senderId = _event.sender.id;
-      const prev = listWorkersBySender.get(senderId);
-      if (prev) {
-        prev.canceled = true;
-        prev.worker.terminate().catch(() => {});
-      }
-
-      const requestId = (prev?.requestId ?? 0) + 1;
-      const workerPath = path.join(__dirname, '..', 'workers', 'fsListWorker.js');
-      const worker = new Worker(workerPath);
-      const state: ListWorkerState = { worker, requestId, canceled: false };
-      listWorkersBySender.set(senderId, state);
-
-      const result = await new Promise<FsListWorkerResponse>((resolve, reject) => {
-        const cleanup = () => {
-          worker.removeAllListeners('message');
-          worker.removeAllListeners('error');
-          worker.removeAllListeners('exit');
-        };
-
-        worker.once('message', (message) => {
-          cleanup();
-          worker.terminate().catch(() => {});
-          resolve(message as FsListWorkerResponse);
-        });
-        worker.once('error', (error) => {
-          cleanup();
-          reject(error);
-        });
-        worker.once('exit', (code) => {
-          cleanup();
-          if (state.canceled) {
-            resolve({ taskId: requestId, ok: false, error: 'Canceled' });
-            return;
-          }
-          if (code === 0) {
-            resolve({
-              taskId: requestId,
-              ok: false,
-              error: 'Worker exited before responding',
-            });
-            return;
-          }
-          reject(new Error(`fs:list worker exited with code ${code}`));
-        });
-
-        worker.postMessage({
-          taskId: requestId,
-          root,
-          includeDirs,
-          recursive: args.recursive !== false, // Default to true if not specified
-          maxEntries,
-          timeBudgetMs,
-          batchSize: DEFAULT_BATCH_SIZE,
-        });
-      });
-
-      const latest = listWorkersBySender.get(senderId);
-      if (!latest || latest.requestId !== requestId || state.canceled) {
-        return { success: true, canceled: true };
-      }
-
-      listWorkersBySender.delete(senderId);
-
-      if (!result.ok) {
-        if (result.error === 'Canceled') return { success: true, canceled: true };
-        return { success: false, error: result.error };
-      }
-
-      return {
-        success: true,
-        items: result.items,
-        truncated: result.truncated,
-        reason: result.reason,
-        durationMs: result.durationMs,
-      };
-    } catch (error) {
-      console.error('fs:list failed:', error);
-      return { success: false, error: 'Failed to list files' };
-    }
-  });
-
-  ipcMain.handle(
-    'fs:read',
-    async (_event, args: { root: string; relPath: string; maxBytes?: number } & RemoteParams) => {
-      try {
-        // --- Remote path ---
-        if (isRemoteRequest(args)) {
-          try {
-            const rfs = createRemoteFs(args);
-            const maxBytes = Math.min(Math.max(args.maxBytes ?? 200 * 1024, 1024), 5 * 1024 * 1024);
-            const result = await rfs.read(args.relPath, maxBytes);
-            return {
-              success: true,
-              path: args.relPath,
-              size: result.totalSize,
-              truncated: result.truncated,
-              content: result.content,
-            };
-          } catch (error) {
-            console.error('fs:read remote failed:', error);
-            return { success: false, error: 'Failed to read remote file' };
-          }
-        }
-
-        // --- Local path ---
-        const { root, relPath } = args;
-        const maxBytes = Math.min(Math.max(args.maxBytes ?? 200 * 1024, 1024), 5 * 1024 * 1024);
-        if (!root || !fs.existsSync(root)) return { success: false, error: 'Invalid root path' };
-        if (!relPath) return { success: false, error: 'Invalid relPath' };
-
-        // Resolve and ensure within root
-        const abs = path.resolve(root, relPath);
-        const normRoot = path.resolve(root) + path.sep;
-        if (!abs.startsWith(normRoot)) return { success: false, error: 'Path escapes root' };
-
-        const st = safeStat(abs);
-        if (!st) return { success: false, error: 'Not found' };
-        if (st.isDirectory()) return { success: false, error: 'Is a directory' };
-
-        const size = st.size;
-        let truncated = false;
-        let content: string;
-        const fd = fs.openSync(abs, 'r');
-        try {
-          const bytesToRead = Math.min(size, maxBytes);
-          const buf = Buffer.alloc(bytesToRead);
-          fs.readSync(fd, buf, 0, bytesToRead, 0);
-          content = buf.toString('utf8');
-          truncated = size > bytesToRead;
-        } finally {
-          fs.closeSync(fd);
-        }
-
-        return { success: true, path: relPath, size, truncated, content };
-      } catch (error) {
-        console.error('fs:read failed:', error);
-        return { success: false, error: 'Failed to read file' };
-      }
-    }
-  );
-
-  // Read image file as base64
-  ipcMain.handle(
-    'fs:read-image',
-    async (_event, args: { root: string; relPath: string } & RemoteParams) => {
-      try {
-        // --- Remote path ---
-        if (isRemoteRequest(args)) {
-          try {
-            const rfs = createRemoteFs(args);
-            const result = await rfs.readImage(args.relPath);
-            return result;
-          } catch (error) {
-            console.error('fs:read-image remote failed:', error);
-            return { success: false, error: 'Failed to read remote image' };
-          }
-        }
-
-        // --- Local path ---
-        const { root, relPath } = args;
-        if (!root || !fs.existsSync(root)) return { success: false, error: 'Invalid root path' };
-        if (!relPath) return { success: false, error: 'Invalid relPath' };
-
-        // Resolve and ensure within root
-        const abs = path.resolve(root, relPath);
-        const normRoot = path.resolve(root) + path.sep;
-        if (!abs.startsWith(normRoot)) return { success: false, error: 'Path escapes root' };
-
-        const st = safeStat(abs);
-        if (!st) return { success: false, error: 'Not found' };
-        if (st.isDirectory()) return { success: false, error: 'Is a directory' };
-
-        // Check if it's an allowed image type
-        const ext = path.extname(relPath).toLowerCase();
-        if (!ALLOWED_IMAGE_EXTENSIONS.has(ext)) {
-          return { success: false, error: 'Not an image file' };
-        }
-
-        // Read file as base64
-        const buffer = fs.readFileSync(abs);
-        const base64 = buffer.toString('base64');
-
-        // Determine MIME type
-        let mimeType = 'image/';
-        switch (ext) {
-          case '.svg':
-            mimeType += 'svg+xml';
-            break;
-          case '.jpg':
-          case '.jpeg':
-            mimeType += 'jpeg';
-            break;
-          default:
-            mimeType += ext.substring(1); // Remove the dot
-        }
-
-        return {
-          success: true,
-          dataUrl: `data:${mimeType};base64,${base64}`,
-          mimeType,
-          size: st.size,
-        };
-      } catch (error) {
-        console.error('fs:read-image failed:', error);
-        return { success: false, error: 'Failed to read image' };
-      }
-    }
-  );
-
-  // Constants for search functionality
-  const SEARCH_PREVIEW_CONTEXT_LENGTH = 30;
-  const DEFAULT_MAX_SEARCH_RESULTS = 10000; // Increased for comprehensive search results
-  const MAX_FILE_SIZE = 2 * 1024 * 1024; // 2MB max file size
-  const MAX_SEARCH_FILES = 20000; // Increased to search more files
-  const BINARY_CHECK_BYTES = 512; // Check first 512 bytes for binary content (faster)
-
-  // Extended ignore patterns for performance
-  const SEARCH_IGNORES = new Set([
-    ...DEFAULT_IGNORES,
-    '.vscode',
-    '.idea',
-    'coverage',
-    '__pycache__',
-    '.pytest_cache',
-    'venv',
-    '.venv',
-    'target',
-    '.terraform',
-    '.serverless',
-    'vendor',
-    'bower_components',
-    '.turbo',
-    'worktrees',
-    '.worktrees',
-  ]);
-
-  // Binary file extensions to skip (blacklist approach)
-  const BINARY_EXTENSIONS = new Set([
-    '.png',
-    '.jpg',
-    '.jpeg',
-    '.gif',
-    '.bmp',
-    '.ico',
-    '.svg',
-    '.pdf',
-    '.zip',
-    '.tar',
-    '.gz',
-    '.rar',
-    '.7z',
-    '.exe',
-    '.dll',
-    '.so',
-    '.dylib',
-    '.a',
-    '.o',
-    '.mp3',
-    '.mp4',
-    '.avi',
-    '.mov',
-    '.wav',
-    '.flac',
-    '.ttf',
-    '.otf',
-    '.woff',
-    '.woff2',
-    '.eot',
-    '.pyc',
-    '.pyo',
-    '.class',
-    '.jar',
-    '.war',
-    '.node',
-    '.wasm',
-    '.map',
-    '.DS_Store',
-    '.lock',
-  ]);
-
-  // Check if file is likely binary
-  const isBinaryFile = (filePath: string): boolean => {
-    // First check extension
-    const ext = path.extname(filePath).toLowerCase();
-    if (BINARY_EXTENSIONS.has(ext)) return true;
-
-    try {
-      const fd = fs.openSync(filePath, 'r');
-      const buffer = Buffer.alloc(BINARY_CHECK_BYTES);
-      const bytesRead = fs.readSync(fd, buffer, 0, BINARY_CHECK_BYTES, 0);
-      fs.closeSync(fd);
-
-      // Check for null bytes (common in binary files)
-      for (let i = 0; i < bytesRead; i++) {
-        if (buffer[i] === 0) return true;
-      }
-
-      // Check if mostly non-printable characters
-      let nonPrintable = 0;
-      for (let i = 0; i < Math.min(bytesRead, 512); i++) {
-        const byte = buffer[i];
-        if (byte < 32 && byte !== 9 && byte !== 10 && byte !== 13) {
-          nonPrintable++;
-        }
-      }
-
-      // If more than 30% non-printable, likely binary
-      return nonPrintable > bytesRead * 0.3;
-    } catch {
-      return false; // Assume text if we can't read it, let the search handle the error
-    }
-  };
-
-  // Search for content in files - OPTIMIZED VERSION
-  ipcMain.handle(
-    'fs:searchContent',
-    async (
-      _event,
-      args: {
-        root: string;
-        query: string;
-        options?: { caseSensitive?: boolean; maxResults?: number; fileExtensions?: string[] };
-      } & RemoteParams
-    ) => {
-      try {
-        // --- Remote path: delegate to RemoteFileSystem.search ---
-        if (isRemoteRequest(args)) {
-          try {
-            const rfs = createRemoteFs(args);
-            const { query, options = {} } = args;
-            const {
-              caseSensitive = false,
-              maxResults = DEFAULT_MAX_SEARCH_RESULTS,
-              fileExtensions = [],
-            } = options;
-
-            const searchResult = await rfs.search(query, {
-              caseSensitive,
-              maxResults,
-              fileExtensions,
-            });
-
-            // Group flat SearchMatch[] by file to match the renderer's expected format
-            const groupedMap = new Map<
-              string,
-              Array<{ line: number; column: number; text: string; preview: string }>
-            >();
-            for (const match of searchResult.matches) {
-              const file = match.filePath;
-              if (!groupedMap.has(file)) {
-                groupedMap.set(file, []);
-              }
-              groupedMap.get(file)!.push({
-                line: match.line,
-                column: match.column,
-                text: match.content,
-                preview: match.preview || match.content,
-              });
-            }
-
-            const results = Array.from(groupedMap.entries()).map(([file, matches]) => ({
-              file,
-              matches,
-            }));
-
-            return { success: true, results };
-          } catch (error) {
-            console.error('fs:searchContent remote failed:', error);
-            return { success: false, error: 'Failed to search remote files' };
-          }
-        }
-
-        // --- Local path ---
-        const { root, query, options = {} } = args;
-        const {
-          caseSensitive = false,
-          maxResults = DEFAULT_MAX_SEARCH_RESULTS,
-          fileExtensions = [],
-        } = options;
-
-        if (!root || !fs.existsSync(root)) return { success: false, error: 'Invalid root path' };
-        if (!query || query.length < 2)
-          return { success: false, error: 'Query too short (min 2 chars)' };
-
-        let gitIgnore: GitIgnoreParser | undefined;
-        try {
-          const gitIgnorePath = path.join(root, '.gitignore');
-          const content = await fs.promises.readFile(gitIgnorePath, 'utf8');
-          gitIgnore = new GitIgnoreParser(content);
-        } catch {
-          // Ignore error reading .gitignore
-        }
-
-        const results: Array<{
-          file: string;
-          matches: Array<{
-            line: number;
-            column: number;
-            text: string;
-            preview: string;
-          }>;
-        }> = [];
-
-        let totalMatches = 0;
-        let filesSearched = 0;
-        const searchQuery = caseSensitive ? query : query.toLowerCase();
-
-        // Helper function to check if file should be searched
-        const shouldSearchFile = (filePath: string, stat: fs.Stats): boolean => {
-          // Skip large files
-          if (stat.size > MAX_FILE_SIZE) return false;
-
-          const ext = path.extname(filePath).toLowerCase();
-
-          // Skip known binary extensions (but allow files without extensions)
-          if (ext && BINARY_EXTENSIONS.has(ext)) return false;
-
-          // If user specified extensions, use those
-          if (fileExtensions.length > 0) {
-            return fileExtensions.some((e) => {
-              const normalizedExt = e.toLowerCase().startsWith('.')
-                ? e.toLowerCase()
-                : '.' + e.toLowerCase();
-              return ext === normalizedExt;
-            });
-          }
-
-          // Otherwise search all non-binary files
-          return true;
-        };
-
-        // Optimized async file search
-        const searchInFile = async (filePath: string): Promise<void> => {
-          if (totalMatches >= maxResults || filesSearched >= MAX_SEARCH_FILES) return;
-
-          try {
-            filesSearched++;
-
-            // Check if binary file first
-            if (isBinaryFile(filePath)) return;
-
-            // Read file in chunks for better memory usage
-            const content = await fs.promises.readFile(filePath, 'utf8');
-
-            // Quick check if query exists at all (much faster)
-            const contentToSearch = caseSensitive ? content : content.toLowerCase();
-            if (!contentToSearch.includes(searchQuery)) return;
-
-            // Only split lines if we found something
-            const lines = content.split('\n');
-            const fileMatches: (typeof results)[0]['matches'] = [];
-
-            for (let lineNum = 0; lineNum < lines.length && totalMatches < maxResults; lineNum++) {
-              const line = lines[lineNum];
-              const searchLine = caseSensitive ? line : line.toLowerCase();
-
-              if (!searchLine.includes(searchQuery)) continue; // Quick skip
-
-              let columnIndex = searchLine.indexOf(searchQuery);
-              while (columnIndex !== -1 && totalMatches < maxResults) {
-                // Create preview with context
-                const previewStart = Math.max(0, columnIndex - SEARCH_PREVIEW_CONTEXT_LENGTH);
-                const previewEnd = Math.min(
-                  line.length,
-                  columnIndex + query.length + SEARCH_PREVIEW_CONTEXT_LENGTH
-                );
-                let preview = line.substring(previewStart, previewEnd).trim();
-
-                // Add ellipsis if truncated
-                if (previewStart > 0) preview = '...' + preview;
-                if (previewEnd < line.length) preview = preview + '...';
-
-                fileMatches.push({
-                  line: lineNum + 1,
-                  column: columnIndex + 1,
-                  text: line.substring(columnIndex, columnIndex + query.length),
-                  preview: preview,
-                });
-
-                totalMatches++;
-                columnIndex = searchLine.indexOf(searchQuery, columnIndex + 1);
-              }
-            }
-
-            if (fileMatches.length > 0) {
-              const relativePath = path.relative(root, filePath);
-              results.push({
-                file: relativePath,
-                matches: fileMatches,
-              });
-            }
-          } catch (err) {
-            // Skip files we can't read
-          }
-        };
-
-        // Collect files first, then search in parallel
-        const collectFiles = async (dirPath: string, files: string[] = []): Promise<string[]> => {
-          if (files.length >= MAX_SEARCH_FILES) return files;
-
-          try {
-            const entries = await fs.promises.readdir(dirPath, { withFileTypes: true });
-
-            for (const entry of entries) {
-              if (files.length >= MAX_SEARCH_FILES) break;
-
-              const fullPath = path.join(dirPath, entry.name);
-
-              if (entry.isDirectory()) {
-                const relPath = path.relative(root, fullPath);
-                if (gitIgnore && (gitIgnore.ignores(relPath) || gitIgnore.ignores(relPath + '/'))) {
-                  continue;
-                }
-
-                if (!SEARCH_IGNORES.has(entry.name)) {
-                  await collectFiles(fullPath, files);
-                }
-              } else if (entry.isFile()) {
-                try {
-                  const stat = await fs.promises.stat(fullPath);
-                  if (shouldSearchFile(fullPath, stat)) {
-                    files.push(fullPath);
-                  }
-                } catch {}
-              }
-            }
-          } catch {}
-
-          return files;
-        };
-
-        // Collect files and search them in batches
-        const files = await collectFiles(root);
-
-        // Process files in parallel batches for speed
-        const BATCH_SIZE = 10;
-        for (let i = 0; i < files.length && totalMatches < maxResults; i += BATCH_SIZE) {
-          const batch = files.slice(i, i + BATCH_SIZE);
-          await Promise.all(batch.map((file) => searchInFile(file)));
-        }
-
-        return { success: true, results };
-      } catch (error) {
-        console.error('fs:searchContent failed:', error);
-        return { success: false, error: 'Failed to search files' };
-      }
-    }
-  );
-
-  // Save an attachment (e.g., image) into a task-managed folder
-  ipcMain.handle(
-    'fs:save-attachment',
-    async (_event, args: { taskPath: string; srcPath: string; subdir?: string }) => {
-      try {
-        const { taskPath, srcPath } = args;
-        if (!taskPath || !fs.existsSync(taskPath))
-          return { success: false, error: 'Invalid taskPath' };
-        if (!srcPath || !fs.existsSync(srcPath))
-          return { success: false, error: 'Invalid srcPath' };
-
-        const ext = path.extname(srcPath).toLowerCase();
-        if (!ALLOWED_IMAGE_EXTENSIONS.has(ext)) {
-          return { success: false, error: 'Unsupported attachment type' };
-        }
-
-        const baseDir = path.join(taskPath, '.emdash', args.subdir || DEFAULT_ATTACHMENTS_SUBDIR);
-        fs.mkdirSync(baseDir, { recursive: true });
-
-        const baseName = path.basename(srcPath);
-        let destName = baseName;
-        let counter = 1;
-        let destAbs = path.join(baseDir, destName);
-        while (fs.existsSync(destAbs)) {
-          const name = path.basename(baseName, ext);
-          destName = `${name}-${counter}${ext}`;
-          destAbs = path.join(baseDir, destName);
-          counter++;
-        }
-
-        fs.copyFileSync(srcPath, destAbs);
-
-        const relFromTask = path.relative(taskPath, destAbs);
-        return {
-          success: true,
-          absPath: destAbs,
-          relPath: relFromTask,
-          fileName: destName,
-        };
-      } catch (error) {
-        console.error('fs:save-attachment failed:', error);
-        return { success: false, error: 'Failed to save attachment' };
-      }
-    }
-  );
-
-  // Write a file relative to a root (creates parent directories)
-  ipcMain.handle(
-    'fs:write',
-    async (
-      _event,
-      args: { root: string; relPath: string; content: string; mkdirs?: boolean } & RemoteParams
-    ) => {
-      try {
-        // --- Remote path ---
-        if (isRemoteRequest(args)) {
-          try {
-            const rfs = createRemoteFs(args);
-            const result = await rfs.write(args.relPath, args.content);
-            return { success: result.success };
-          } catch (error) {
-            console.error('fs:write remote failed:', error);
-            return { success: false, error: 'Failed to write remote file' };
-          }
-        }
-
-        // --- Local path ---
-        const { root, relPath, content, mkdirs = true } = args;
-        if (!root || !fs.existsSync(root)) return { success: false, error: 'Invalid root path' };
-        if (!relPath) return { success: false, error: 'Invalid relPath' };
-
-        const abs = path.resolve(root, relPath);
-        const normRoot = path.resolve(root) + path.sep;
-        if (!abs.startsWith(normRoot)) return { success: false, error: 'Path escapes root' };
-
-        const dir = path.dirname(abs);
-        if (mkdirs) fs.mkdirSync(dir, { recursive: true });
-        try {
-          fs.writeFileSync(abs, content, 'utf8');
-        } catch (e: any) {
-          // Surface permission issues to renderer (Plan Mode lock likely)
-          if ((e?.code || '').toUpperCase() === 'EACCES') {
-            emitPlanEvent({
-              type: 'write_blocked',
-              root,
-              relPath,
-              code: e?.code,
-              message: e?.message || String(e),
-            });
-          }
-          throw e;
-        }
-        return { success: true };
-      } catch (error) {
-        console.error('fs:write failed:', error);
-        return { success: false, error: 'Failed to write file' };
-      }
-    }
-  );
-
-  // Remove a file relative to a root
-  ipcMain.handle(
-    'fs:remove',
-    async (_event, args: { root: string; relPath: string } & RemoteParams) => {
-      try {
-        // --- Remote path ---
-        if (isRemoteRequest(args)) {
-          try {
-            const rfs = createRemoteFs(args);
-            return await rfs.remove(args.relPath);
-          } catch (error) {
-            console.error('fs:remove remote failed:', error);
-            return { success: false, error: 'Failed to remove remote file' };
-          }
-        }
-
-        // --- Local path ---
-        const { root, relPath } = args;
-        if (!root || !fs.existsSync(root)) return { success: false, error: 'Invalid root path' };
-        if (!relPath) return { success: false, error: 'Invalid relPath' };
-        const abs = path.resolve(root, relPath);
-        const normRoot = path.resolve(root) + path.sep;
-        if (!abs.startsWith(normRoot)) return { success: false, error: 'Path escapes root' };
-        if (!fs.existsSync(abs)) return { success: true };
-        const st = safeStat(abs);
-        if (st && st.isDirectory()) return { success: false, error: 'Is a directory' };
-        try {
-          fs.unlinkSync(abs);
-        } catch (e: any) {
-          // Try to relax permissions and retry (useful after a plan lock)
-          try {
-            const dir = path.dirname(abs);
-            const dst = safeStat(dir);
-            if (dst) fs.chmodSync(dir, (dst.mode & 0o7777) | 0o222);
-          } catch {}
-          try {
-            const fst = safeStat(abs);
-            if (fst) fs.chmodSync(abs, (fst.mode & 0o7777) | 0o222);
-          } catch {}
-          try {
-            fs.unlinkSync(abs);
-          } catch (e2: any) {
-            if ((e2?.code || '').toUpperCase() === 'EACCES') {
-              emitPlanEvent({
-                type: 'remove_blocked',
-                root,
-                relPath,
-                code: e2?.code,
-                message: e2?.message || String(e2),
-              });
-            }
-            throw e2;
-          }
-        }
-        return { success: true };
-      } catch (error) {
-        console.error('fs:remove failed:', error);
-        return { success: false, error: 'Failed to remove file' };
-      }
-    }
-  );
-
-  // Get .emdash.json config file content (create with defaults if missing)
-  ipcMain.handle('fs:getProjectConfig', async (_event, args: { projectPath: string }) => {
-    try {
-      const { projectPath } = args;
-      if (!projectPath || !fs.existsSync(projectPath)) {
-        return { success: false, error: 'Invalid project path' };
-      }
-
-      const configPath = path.join(projectPath, '.emdash.json');
-
-      // Create with defaults if missing
-      if (!fs.existsSync(configPath)) {
-        fs.writeFileSync(configPath, DEFAULT_EMDASH_CONFIG, 'utf8');
-      }
-
-      const content = fs.readFileSync(configPath, 'utf8');
-      return { success: true, path: configPath, content };
-    } catch (error) {
-      console.error('fs:getProjectConfig failed:', error);
-      return { success: false, error: 'Failed to read config file' };
-    }
-  });
-
-  // Save .emdash.json config file content
-  ipcMain.handle(
-    'fs:saveProjectConfig',
-    async (_event, args: { projectPath: string; content: string }) => {
-      try {
-        const { projectPath, content } = args;
-        if (!projectPath || !fs.existsSync(projectPath)) {
-          return { success: false, error: 'Invalid project path' };
-        }
-
-        // Validate JSON before saving
-        try {
-          JSON.parse(content);
-        } catch {
-          return { success: false, error: 'Invalid JSON format' };
-        }
-
-        const configPath = path.join(projectPath, '.emdash.json');
-        fs.writeFileSync(configPath, content, 'utf8');
-        return { success: true, path: configPath };
-      } catch (error) {
-        console.error('fs:saveProjectConfig failed:', error);
-        return { success: false, error: 'Failed to save config file' };
-      }
-    }
-  );
-}
diff --git a/src/main/services/hostPreviewService.ts b/src/main/services/hostPreviewService.ts
deleted file mode 100644
index adf5c97332..0000000000
--- a/src/main/services/hostPreviewService.ts
+++ /dev/null
@@ -1,490 +0,0 @@
-import { EventEmitter } from 'node:events';
-import { spawn, ChildProcessWithoutNullStreams } from 'node:child_process';
-import net from 'node:net';
-import fs from 'node:fs';
-import path from 'node:path';
-import { log } from '../lib/logger';
-
-export type HostPreviewEvent = {
-  type: 'url' | 'setup' | 'exit';
-  taskId: string;
-  url?: string;
-  status?: 'starting' | 'line' | 'done' | 'error';
-  line?: string;
-};
-
-function detectPackageManager(dir: string): 'pnpm' | 'yarn' | 'npm' {
-  try {
-    if (fs.existsSync(path.join(dir, 'pnpm-lock.yaml'))) return 'pnpm';
-    if (fs.existsSync(path.join(dir, 'yarn.lock'))) return 'yarn';
-    return 'npm';
-  } catch {
-    return 'npm';
-  }
-}
-
-function normalizeUrl(u: string): string {
-  try {
-    const re = /(https?:\/\/(?:localhost|127\.0\.0\.1|0\.0\.0\.0|\[::1\]):\d{2,5}(?:\/\S*)?)/i;
-    const m = u.match(re);
-    if (!m) return '';
-    const url = new URL(m[1].replace('0.0.0.0', 'localhost'));
-    url.hostname = 'localhost';
-    return url.toString();
-  } catch {
-    return '';
-  }
-}
-
-class HostPreviewService extends EventEmitter {
-  private procs = new Map<string, ChildProcessWithoutNullStreams>();
-  private procCwds = new Map<string, string>(); // Track cwd for each taskId
-
-  async setup(taskId: string, taskPath: string): Promise<{ ok: boolean; error?: string }> {
-    const cwd = path.resolve(taskPath);
-    const pm = detectPackageManager(cwd);
-    const cmd = pm;
-    // Prefer clean install for npm when lockfile exists
-    const hasPkgLock = fs.existsSync(path.join(cwd, 'package-lock.json'));
-    const args = pm === 'npm' ? (hasPkgLock ? ['ci'] : ['install']) : ['install'];
-    try {
-      const child = spawn(cmd, args, {
-        cwd,
-        shell: true,
-        env: { ...process.env, BROWSER: 'none' },
-      });
-      this.emit('event', { type: 'setup', taskId, status: 'starting' } as HostPreviewEvent);
-      const onData = (buf: Buffer) => {
-        const line = buf.toString();
-        this.emit('event', {
-          type: 'setup',
-          taskId,
-          status: 'line',
-          line,
-        } as HostPreviewEvent);
-      };
-      child.stdout.on('data', onData);
-      child.stderr.on('data', onData);
-      await new Promise<void>((resolve, reject) => {
-        child.on('exit', (code) => {
-          if (code === 0) resolve();
-          else reject(new Error(`install exited with ${code}`));
-        });
-        child.on('error', reject);
-      });
-      this.emit('event', { type: 'setup', taskId, status: 'done' } as HostPreviewEvent);
-      return { ok: true };
-    } catch (e: any) {
-      this.emit('event', {
-        type: 'setup',
-        taskId,
-        status: 'error',
-        line: e?.message || String(e),
-      } as HostPreviewEvent);
-      return { ok: false, error: e?.message || String(e) };
-    }
-  }
-
-  private async pickAvailablePort(preferred: number[], host = '127.0.0.1'): Promise<number> {
-    const tryPort = (port: number) =>
-      new Promise<boolean>((resolve) => {
-        const server = net.createServer();
-        server.once('error', () => resolve(false));
-        server.listen(port, host, () => {
-          try {
-            server.close(() => resolve(true));
-          } catch {
-            resolve(false);
-          }
-        });
-      });
-    for (const p of preferred) {
-      if (await tryPort(p)) return p;
-    }
-    const ephemeral = await new Promise<number>((resolve) => {
-      const server = net.createServer();
-      server.listen(0, host, () => {
-        const addr = server.address();
-        const port = typeof addr === 'object' && addr ? addr.port : 0;
-        try {
-          server.close(() => resolve(port || 5173));
-        } catch {
-          resolve(5173);
-        }
-      });
-      server.once('error', () => resolve(5173));
-    });
-    return ephemeral || 5173;
-  }
-
-  async start(
-    taskId: string,
-    taskPath: string,
-    opts?: { script?: string; parentProjectPath?: string }
-  ): Promise<{ ok: boolean; error?: string }> {
-    const cwd = path.resolve(taskPath);
-
-    // Log the resolved path to help debug worktree issues
-    log.info?.('[hostPreview] start', {
-      taskId,
-      taskPath,
-      resolvedCwd: cwd,
-      cwdExists: fs.existsSync(cwd),
-      hasPackageJson: fs.existsSync(path.join(cwd, 'package.json')),
-    });
-
-    // Check if process already exists for this taskId
-    const existingProc = this.procs.get(taskId);
-    const existingCwd = this.procCwds.get(taskId);
-
-    // If process exists, verify it's running from the correct directory
-    if (existingProc) {
-      // Check if process is still running
-      try {
-        // On Unix, signal 0 checks if process exists
-        existingProc.kill(0);
-        // Process is still running - check if cwd matches
-        if (existingCwd && path.resolve(existingCwd) === cwd) {
-          log.info?.('[hostPreview] reusing existing process', {
-            taskId,
-            cwd: existingCwd,
-          });
-          return { ok: true };
-        } else {
-          // Process exists but is running from wrong directory - stop it
-          log.info?.('[hostPreview] stopping process with wrong cwd', {
-            taskId,
-            oldCwd: existingCwd,
-            newCwd: cwd,
-          });
-          try {
-            existingProc.kill();
-          } catch {}
-          this.procs.delete(taskId);
-          this.procCwds.delete(taskId);
-        }
-      } catch {
-        // Process has exited - clean up
-        this.procs.delete(taskId);
-        this.procCwds.delete(taskId);
-      }
-    }
-
-    const pm = detectPackageManager(cwd);
-    // Preflight: if the task lacks node_modules but the parent has it, try linking
-    try {
-      const parent = (opts?.parentProjectPath || '').trim();
-      if (parent) {
-        const wsNm = path.join(cwd, 'node_modules');
-        const parentNm = path.join(parent, 'node_modules');
-        const wsExists = fs.existsSync(wsNm);
-        const parentExists = fs.existsSync(parentNm);
-        if (!wsExists && parentExists) {
-          try {
-            const linkType = process.platform === 'win32' ? 'junction' : 'dir';
-            fs.symlinkSync(parentNm, wsNm, linkType as any);
-            log.info?.('[hostPreview] linked node_modules', {
-              taskId,
-              wsNm,
-              parentNm,
-              linkType,
-            });
-          } catch (e) {
-            log.warn?.(
-              '[hostPreview] failed to link node_modules; will rely on install if needed',
-              e
-            );
-          }
-        }
-      }
-    } catch {}
-    const pkgPath = path.join(cwd, 'package.json');
-    let script = 'dev';
-    if (opts?.script && typeof opts.script === 'string' && opts.script.trim()) {
-      script = opts.script.trim();
-    } else {
-      try {
-        const raw = fs.readFileSync(pkgPath, 'utf8');
-        const pkg = JSON.parse(raw);
-        const scripts = (pkg && pkg.scripts) || {};
-        const prefs = ['dev', 'start', 'serve', 'preview'];
-        for (const k of prefs) {
-          if (typeof scripts[k] === 'string') {
-            script = k;
-            break;
-          }
-        }
-      } catch {}
-    }
-    const cmd = pm;
-    const args: string[] = pm === 'npm' ? ['run', script] : [script];
-    const env = { ...process.env } as Record<string, string>;
-
-    // Auto-install if package.json exists and node_modules is missing
-    try {
-      const hasPkg = fs.existsSync(pkgPath);
-      const hasNm = fs.existsSync(path.join(cwd, 'node_modules'));
-      if (hasPkg && !hasNm) {
-        const hasLock = fs.existsSync(path.join(cwd, 'package-lock.json'));
-        const installArgs = pm === 'npm' ? (hasLock ? ['ci'] : ['install']) : ['install'];
-        const inst = spawn(pm, installArgs, {
-          cwd,
-          shell: true,
-          env: { ...process.env, BROWSER: 'none' },
-        });
-        this.emit('event', { type: 'setup', taskId, status: 'starting' } as HostPreviewEvent);
-        const onData = (buf: Buffer) => {
-          try {
-            this.emit('event', {
-              type: 'setup',
-              taskId,
-              status: 'line',
-              line: buf.toString(),
-            } as HostPreviewEvent);
-          } catch {}
-        };
-        inst.stdout.on('data', onData);
-        inst.stderr.on('data', onData);
-        await new Promise<void>((resolve, reject) => {
-          inst.on('exit', (code) => {
-            code === 0 ? resolve() : reject(new Error(`install exited with ${code}`));
-          });
-          inst.on('error', reject);
-        });
-        this.emit('event', { type: 'setup', taskId, status: 'done' } as HostPreviewEvent);
-      }
-    } catch {}
-
-    // Choose a free port (avoid 3000)
-    const preferred = [5173, 5174, 3001, 3002, 8080, 4200, 5500, 7000];
-    let forcedPort = await this.pickAvailablePort(preferred);
-    if (!env.PORT) env.PORT = String(forcedPort);
-    if (!env.VITE_PORT) env.VITE_PORT = env.PORT;
-    if (!env.BROWSER) env.BROWSER = 'none';
-
-    // Add CLI flags for common frameworks based on scripts and dependencies
-    try {
-      const raw = fs.readFileSync(pkgPath, 'utf8');
-      const pkg = JSON.parse(raw);
-      const scripts = (pkg && pkg.scripts) || {};
-      const deps = { ...(pkg.dependencies || {}), ...(pkg.devDependencies || {}) } as Record<
-        string,
-        string
-      >;
-      const scriptCmd = String(scripts[script] || '').toLowerCase();
-      const looksLikeNext = scriptCmd.includes('next') || 'next' in deps;
-      const looksLikeVite = scriptCmd.includes('vite') || 'vite' in deps;
-      const looksLikeWebpack =
-        scriptCmd.includes('webpack-dev-server') || 'webpack-dev-server' in deps;
-      const looksLikeAngular =
-        /(^|\s)ng(\s|$)/.test(scriptCmd) || scriptCmd.includes('angular') || '@angular/cli' in deps;
-      const extra: string[] = [];
-      if (looksLikeNext) extra.push('-p', String(forcedPort));
-      else if (looksLikeVite || looksLikeWebpack || looksLikeAngular)
-        extra.push('--port', String(forcedPort));
-      if (extra.length) {
-        if (pm === 'npm') args.push('--', ...extra);
-        else args.push(...extra);
-      }
-      log.info?.('[hostPreview] start', {
-        taskId,
-        cwd,
-        pm,
-        cmd,
-        args,
-        script,
-        port: forcedPort,
-      });
-    } catch {
-      log.info?.('[hostPreview] start', {
-        taskId,
-        cwd,
-        pm,
-        cmd,
-        args,
-        script,
-        port: forcedPort,
-      });
-    }
-
-    const tryStart = async (maxRetries = 3): Promise<{ ok: boolean; error?: string }> => {
-      try {
-        const child = spawn(cmd, args, { cwd, env, shell: true });
-        this.procs.set(taskId, child);
-        this.procCwds.set(taskId, cwd); // Store the cwd for this process
-
-        let urlEmitted = false;
-        let sawAddrInUse = false;
-        let candidateUrl: string | null = null;
-        const startedAt = Date.now();
-
-        const emitSetupLine = (line: string) => {
-          try {
-            this.emit('event', {
-              type: 'setup',
-              taskId,
-              status: 'line',
-              line,
-            } as HostPreviewEvent);
-          } catch {}
-        };
-
-        // Helper to probe and emit URL only when server is actually reachable
-        const probeAndEmitUrl = async (urlToProbe: string) => {
-          if (urlEmitted) return;
-          try {
-            const parsed = new URL(urlToProbe);
-            const host = parsed.hostname || 'localhost';
-            const port = Number(parsed.port || 0);
-            if (!port) return;
-
-            // Quick TCP probe to verify server is ready
-            const socket = net.createConnection({ host, port }, () => {
-              try {
-                socket.destroy();
-              } catch {}
-              if (!urlEmitted) {
-                urlEmitted = true;
-                try {
-                  this.emit('event', {
-                    type: 'url',
-                    taskId,
-                    url: urlToProbe,
-                  } as HostPreviewEvent);
-                } catch {}
-              }
-            });
-            socket.on('error', () => {
-              try {
-                socket.destroy();
-              } catch {}
-            });
-          } catch {}
-        };
-
-        const onData = (buf: Buffer) => {
-          const line = buf.toString();
-          emitSetupLine(line);
-          if (/EADDRINUSE|address\s+already\s+in\s+use/i.test(line)) sawAddrInUse = true;
-          const url = normalizeUrl(line);
-          if (url && !urlEmitted) {
-            // Store candidate URL and probe before emitting
-            candidateUrl = url;
-            // Probe immediately when URL is found in logs
-            probeAndEmitUrl(url);
-          }
-        };
-        child.stdout.on('data', onData);
-        child.stderr.on('data', onData);
-
-        // Probe periodically; if reachable and not emitted from logs, synthesize URL
-        const host = 'localhost';
-        const probeInterval = setInterval(() => {
-          if (urlEmitted) return;
-          // If we have a candidate URL from logs, probe that first
-          if (candidateUrl) {
-            probeAndEmitUrl(candidateUrl);
-            return;
-          }
-          // Otherwise, probe the expected port
-          const socket = net.createConnection(
-            { host, port: Number(env.PORT) || forcedPort },
-            () => {
-              try {
-                socket.destroy();
-              } catch {}
-              if (!urlEmitted) {
-                urlEmitted = true;
-                try {
-                  this.emit('event', {
-                    type: 'url',
-                    taskId,
-                    url: `http://localhost:${Number(env.PORT) || forcedPort}`,
-                  } as HostPreviewEvent);
-                } catch {}
-              }
-            }
-          );
-          socket.on('error', () => {
-            try {
-              socket.destroy();
-            } catch {}
-          });
-        }, 800);
-
-        child.on('exit', async () => {
-          clearInterval(probeInterval);
-          this.procs.delete(taskId);
-          this.procCwds.delete(taskId); // Clean up cwd tracking
-          const runtimeMs = Date.now() - startedAt;
-          const quickFail = runtimeMs < 4000; // exited very quickly
-          if (!urlEmitted && (sawAddrInUse || quickFail) && maxRetries > 0) {
-            // pick next free port and retry
-            const exclude = new Set<number>([Number(env.PORT) || forcedPort]);
-            const nextList = preferred.filter((p) => !exclude.has(p));
-            forcedPort = await this.pickAvailablePort(nextList.length ? nextList : preferred);
-            env.PORT = String(forcedPort);
-            env.VITE_PORT = env.PORT;
-            // rewrite CLI flags
-            const idx = args.lastIndexOf('-p');
-            const idxPort = args.lastIndexOf('--port');
-            if (idx >= 0 && idx + 1 < args.length) args[idx + 1] = String(forcedPort);
-            else if (idxPort >= 0 && idxPort + 1 < args.length)
-              args[idxPort + 1] = String(forcedPort);
-            else if (pm === 'npm') args.push('--', '-p', String(forcedPort));
-            else args.push('-p', String(forcedPort));
-            log.info?.('[hostPreview] retry on new port', {
-              taskId,
-              port: forcedPort,
-              retriesLeft: maxRetries - 1,
-            });
-            await tryStart(maxRetries - 1);
-            return;
-          }
-          try {
-            this.emit('event', { type: 'exit', taskId } as HostPreviewEvent);
-          } catch {}
-        });
-        return { ok: true };
-      } catch (e: any) {
-        log.error('[hostPreview] failed to start', e);
-        return { ok: false, error: e?.message || String(e) };
-      }
-    };
-
-    return await tryStart(3);
-  }
-
-  stop(taskId: string): { ok: boolean } {
-    const p = this.procs.get(taskId);
-    if (!p) return { ok: true };
-    try {
-      p.kill();
-    } catch {}
-    this.procs.delete(taskId);
-    this.procCwds.delete(taskId); // Clean up cwd tracking
-    return { ok: true };
-  }
-
-  stopAll(exceptId?: string | null): { ok: boolean; stopped: string[] } {
-    const stopped: string[] = [];
-    const except = (exceptId || '').trim();
-    for (const [id, proc] of this.procs.entries()) {
-      if (except && id === except) continue;
-      try {
-        proc.kill();
-      } catch {}
-      this.procs.delete(id);
-      this.procCwds.delete(id); // Clean up cwd tracking
-      stopped.push(id);
-    }
-    return { ok: true, stopped };
-  }
-
-  onEvent(listener: (evt: HostPreviewEvent) => void): () => void {
-    this.on('event', listener);
-    return () => this.off('event', listener);
-  }
-}
-
-export const hostPreviewService = new HostPreviewService();
diff --git a/src/main/services/iconService.ts b/src/main/services/iconService.ts
deleted file mode 100644
index 1c0ebba00c..0000000000
--- a/src/main/services/iconService.ts
+++ /dev/null
@@ -1,178 +0,0 @@
-import { app } from 'electron';
-import fs from 'node:fs';
-import path from 'node:path';
-import https from 'node:https';
-
-function toSlug(name: string): string {
-  return name
-    .trim()
-    .toLowerCase()
-    .replace(/[^a-z0-9]+/g, '-');
-}
-
-function bufferToDataUrl(buf: Buffer, contentType: string): string {
-  const ct = contentType.toLowerCase();
-  const mime = ct.startsWith('image/') ? ct : 'image/x-icon';
-  return `data:${mime};base64,${buf.toString('base64')}`;
-}
-
-function readFileAsDataUrl(abs: string): string | null {
-  try {
-    const data = fs.readFileSync(abs);
-    const ext = path.extname(abs).toLowerCase();
-    const mime =
-      ext === '.svg'
-        ? 'image/svg+xml'
-        : ext === '.png'
-          ? 'image/png'
-          : ext === '.jpg' || ext === '.jpeg'
-            ? 'image/jpeg'
-            : ext === '.ico'
-              ? 'image/x-icon'
-              : 'application/octet-stream';
-    return bufferToDataUrl(data, mime);
-  } catch {
-    return null;
-  }
-}
-
-function getKnownDomain(service: string): string | null {
-  const n = service.trim().toLowerCase();
-  const map: Record<string, string> = {
-    postgres: 'postgresql.org',
-    postgresql: 'postgresql.org',
-    redis: 'redis.io',
-    minio: 'min.io',
-    clickhouse: 'clickhouse.com',
-    nginx: 'nginx.org',
-    mysql: 'mysql.com',
-    mariadb: 'mariadb.org',
-    mongo: 'mongodb.com',
-    mongodb: 'mongodb.com',
-    rabbitmq: 'rabbitmq.com',
-    kafka: 'apache.org',
-    zookeeper: 'apache.org',
-  };
-  return map[n] ?? null;
-}
-
-function allowlisted(domain: string): boolean {
-  const allow = new Set([
-    'postgresql.org',
-    'redis.io',
-    'min.io',
-    'clickhouse.com',
-    'nginx.org',
-    'mysql.com',
-    'mariadb.org',
-    'mongodb.com',
-    'rabbitmq.com',
-    'apache.org',
-  ]);
-  return allow.has(domain);
-}
-
-async function fetchHttps(
-  url: string,
-  maxBytes = 200_000
-): Promise<{ data: Buffer; contentType: string } | null> {
-  return new Promise((resolve) => {
-    try {
-      https
-        .get(url, (res) => {
-          const status = res.statusCode || 0;
-          const loc = res.headers.location;
-          if (status >= 300 && status < 400 && loc && /^https:\/\//i.test(loc)) {
-            https
-              .get(loc, (res2) => {
-                pipeResp(res2);
-              })
-              .on('error', () => resolve(null));
-            return;
-          }
-          pipeResp(res);
-
-          function pipeResp(r: typeof res) {
-            const ct = String(r.headers['content-type'] || '').toLowerCase();
-            if (!ct.startsWith('image/')) {
-              resolve(null);
-              r.resume();
-              return;
-            }
-            const chunks: Buffer[] = [];
-            let bytes = 0;
-            r.on('data', (chunk: Buffer) => {
-              bytes += chunk.length;
-              if (bytes > maxBytes) {
-                resolve(null);
-                r.destroy();
-                return;
-              }
-              chunks.push(chunk);
-            });
-            r.on('end', () => {
-              resolve({ data: Buffer.concat(chunks), contentType: ct });
-            });
-            r.on('error', () => resolve(null));
-          }
-        })
-        .on('error', () => resolve(null));
-    } catch {
-      resolve(null);
-    }
-  });
-}
-
-export async function resolveServiceIcon(opts: {
-  service: string;
-  taskPath?: string;
-  allowNetwork?: boolean;
-}): Promise<{ ok: true; dataUrl: string } | { ok: false }> {
-  const service = opts.service?.trim();
-  if (!service) return { ok: false };
-  const slug = toSlug(service);
-
-  // 1) Task overrides
-  if (opts.taskPath) {
-    const p = path.join(opts.taskPath, '.emdash', 'service-icons');
-    const candidates = ['.svg', '.png', '.jpg', '.jpeg', '.ico'].map((ext) =>
-      path.join(p, `${slug}${ext}`)
-    );
-    for (const abs of candidates) {
-      if (fs.existsSync(abs)) {
-        const dataUrl = readFileAsDataUrl(abs);
-        if (dataUrl) return { ok: true, dataUrl };
-      }
-    }
-  }
-
-  // 2) Cache under userData
-  const cacheDir = path.join(app.getPath('userData'), 'icons');
-  try {
-    fs.mkdirSync(cacheDir, { recursive: true });
-  } catch {}
-  const cacheFile = path.join(cacheDir, `${slug}.ico`);
-  if (fs.existsSync(cacheFile)) {
-    const dataUrl = readFileAsDataUrl(cacheFile);
-    if (dataUrl) return { ok: true, dataUrl };
-  }
-
-  // 3) Optional network fetch to allowlisted domains only
-  if (opts.allowNetwork) {
-    const domain = getKnownDomain(service);
-    if (domain && allowlisted(domain)) {
-      const ddgUrl = `https://icons.duckduckgo.com/ip3/${domain}.ico`;
-      const directUrl = `https://${domain}/favicon.ico`;
-      const fetched = (await fetchHttps(ddgUrl)) || (await fetchHttps(directUrl));
-      if (fetched) {
-        try {
-          fs.writeFileSync(cacheFile, fetched.data);
-        } catch {}
-        const dataUrl = bufferToDataUrl(fetched.data, fetched.contentType);
-        return { ok: true, dataUrl };
-      }
-    }
-  }
-
-  return { ok: false };
-}
diff --git a/src/main/services/lifecycleIpc.ts b/src/main/services/lifecycleIpc.ts
deleted file mode 100644
index 92922d559a..0000000000
--- a/src/main/services/lifecycleIpc.ts
+++ /dev/null
@@ -1,159 +0,0 @@
-import { BrowserWindow, ipcMain } from 'electron';
-import { lifecycleScriptsService } from './LifecycleScriptsService';
-import { log } from '../lib/logger';
-import { LIFECYCLE_EVENT_CHANNEL, LIFECYCLE_PHASES } from '@shared/lifecycle';
-import { taskLifecycleService } from './TaskLifecycleService';
-
-export function registerLifecycleIpc(): void {
-  // Get a specific lifecycle phase script for a project
-  ipcMain.handle(
-    'lifecycle:getScript',
-    async (
-      _event,
-      args: {
-        projectPath: string;
-        phase: string;
-      }
-    ) => {
-      try {
-        if (!LIFECYCLE_PHASES.includes(args.phase as (typeof LIFECYCLE_PHASES)[number])) {
-          return { success: false, error: `Invalid lifecycle phase: ${args.phase}` };
-        }
-        const phase = args.phase as (typeof LIFECYCLE_PHASES)[number];
-        const script = lifecycleScriptsService.getScript(args.projectPath, phase);
-        return { success: true, script };
-      } catch (error) {
-        log.error('Failed to get lifecycle script:', error);
-        return { success: false, error: (error as Error).message };
-      }
-    }
-  );
-
-  ipcMain.handle(
-    'lifecycle:setup',
-    async (
-      _event,
-      args: {
-        taskId: string;
-        taskPath: string;
-        projectPath: string;
-        taskName?: string;
-      }
-    ) => {
-      try {
-        const result = await taskLifecycleService.runSetup(
-          args.taskId,
-          args.taskPath,
-          args.projectPath,
-          args.taskName
-        );
-        return { success: result.ok, ...result };
-      } catch (error) {
-        log.error('Failed to run setup lifecycle phase:', error);
-        return { success: false, error: (error as Error).message };
-      }
-    }
-  );
-
-  ipcMain.handle(
-    'lifecycle:run:start',
-    async (
-      _event,
-      args: {
-        taskId: string;
-        taskPath: string;
-        projectPath: string;
-        taskName?: string;
-      }
-    ) => {
-      try {
-        const result = await taskLifecycleService.startRun(
-          args.taskId,
-          args.taskPath,
-          args.projectPath,
-          args.taskName
-        );
-        return { success: result.ok, ...result };
-      } catch (error) {
-        log.error('Failed to start run lifecycle phase:', error);
-        return { success: false, error: (error as Error).message };
-      }
-    }
-  );
-
-  ipcMain.handle('lifecycle:run:stop', async (_event, args: { taskId: string }) => {
-    try {
-      const result = taskLifecycleService.stopRun(args.taskId);
-      return { success: result.ok, ...result };
-    } catch (error) {
-      log.error('Failed to stop run lifecycle phase:', error);
-      return { success: false, error: (error as Error).message };
-    }
-  });
-
-  ipcMain.handle(
-    'lifecycle:teardown',
-    async (
-      _event,
-      args: {
-        taskId: string;
-        taskPath: string;
-        projectPath: string;
-        taskName?: string;
-      }
-    ) => {
-      try {
-        const result = await taskLifecycleService.runTeardown(
-          args.taskId,
-          args.taskPath,
-          args.projectPath,
-          args.taskName
-        );
-        return { success: result.ok, ...result };
-      } catch (error) {
-        log.error('Failed to run teardown lifecycle phase:', error);
-        return { success: false, error: (error as Error).message };
-      }
-    }
-  );
-
-  ipcMain.handle('lifecycle:getState', async (_event, args: { taskId: string }) => {
-    try {
-      const state = taskLifecycleService.getState(args.taskId);
-      return { success: true, state };
-    } catch (error) {
-      log.error('Failed to get lifecycle state:', error);
-      return { success: false, error: (error as Error).message };
-    }
-  });
-
-  ipcMain.handle('lifecycle:getLogs', async (_event, args: { taskId: string }) => {
-    try {
-      const logs = taskLifecycleService.getLogs(args.taskId);
-      return { success: true, logs };
-    } catch (error) {
-      log.error('Failed to get lifecycle logs:', error);
-      return { success: false, error: (error as Error).message };
-    }
-  });
-
-  ipcMain.handle('lifecycle:clearTask', async (_event, args: { taskId: string }) => {
-    try {
-      taskLifecycleService.clearTask(args.taskId);
-      return { success: true };
-    } catch (error) {
-      log.error('Failed to clear lifecycle state for task:', error);
-      return { success: false, error: (error as Error).message };
-    }
-  });
-
-  const forward = (evt: any) => {
-    const all = BrowserWindow.getAllWindows();
-    for (const win of all) {
-      try {
-        win.webContents.send(LIFECYCLE_EVENT_CHANNEL, evt);
-      } catch {}
-    }
-  };
-  taskLifecycleService.onEvent(forward);
-}
diff --git a/src/main/services/planLockIpc.ts b/src/main/services/planLockIpc.ts
deleted file mode 100644
index 55c2d6b11f..0000000000
--- a/src/main/services/planLockIpc.ts
+++ /dev/null
@@ -1,147 +0,0 @@
-import { ipcMain } from 'electron';
-import * as fs from 'fs';
-import * as path from 'path';
-
-function isWindows() {
-  return process.platform === 'win32';
-}
-
-function isSymlink(p: string) {
-  try {
-    const st = fs.lstatSync(p);
-    return st.isSymbolicLink();
-  } catch {
-    return false;
-  }
-}
-
-type Entry = { p: string; m: number };
-
-function collectPaths(root: string) {
-  const result: string[] = [];
-  const stack = ['.'];
-  while (stack.length) {
-    const rel = stack.pop()!;
-    const abs = path.join(root, rel);
-    if (isSymlink(abs)) continue;
-    let st: fs.Stats;
-    try {
-      st = fs.statSync(abs);
-    } catch {
-      continue;
-    }
-    if (st.isDirectory()) {
-      // Skip our internal folder so we can write logs/policies
-      if (rel === '.emdash' || rel.startsWith('.emdash' + path.sep)) continue;
-      result.push(rel);
-      let entries: string[] = [];
-      try {
-        entries = fs.readdirSync(abs);
-      } catch {
-        continue;
-      }
-      for (const e of entries) {
-        const nextRel = rel === '.' ? e : path.join(rel, e);
-        stack.push(nextRel);
-      }
-    } else if (st.isFile()) {
-      result.push(rel);
-    }
-  }
-  return result;
-}
-
-function chmodNoWrite(mode: number, isDir: boolean): number {
-  const noWrite = mode & ~0o222; // clear write bits
-  if (isDir) {
-    // Ensure traverse bits present
-    return (noWrite | 0o111) & 0o7777;
-  }
-  return noWrite & 0o7777;
-}
-
-function applyLock(root: string): { success: boolean; changed: number; error?: string } {
-  try {
-    const entries = collectPaths(root);
-    const state: Entry[] = [];
-    let changed = 0;
-    for (const rel of entries) {
-      const abs = path.join(root, rel);
-      let st: fs.Stats;
-      try {
-        st = fs.statSync(abs);
-      } catch {
-        continue;
-      }
-      const isDir = st.isDirectory();
-      const prevMode = st.mode & 0o7777;
-      const nextMode = chmodNoWrite(prevMode, isDir);
-      if (nextMode !== prevMode) {
-        try {
-          fs.chmodSync(abs, nextMode);
-          state.push({ p: rel, m: prevMode });
-          changed++;
-        } catch {}
-      }
-    }
-    // Persist lock state
-    const baseDir = path.join(root, '.emdash');
-    try {
-      fs.mkdirSync(baseDir, { recursive: true });
-    } catch {}
-    const statePath = path.join(baseDir, '.planlock.json');
-    try {
-      fs.writeFileSync(statePath, JSON.stringify(state), 'utf8');
-    } catch {}
-    return { success: true, changed };
-  } catch (e: any) {
-    return { success: false, changed: 0, error: e?.message || String(e) };
-  }
-}
-
-function releaseLock(root: string): { success: boolean; restored: number; error?: string } {
-  try {
-    const statePath = path.join(root, '.emdash', '.planlock.json');
-    if (!fs.existsSync(statePath)) return { success: true, restored: 0 };
-    let raw = '';
-    try {
-      raw = fs.readFileSync(statePath, 'utf8');
-    } catch {}
-    let entries: Entry[] = [];
-    try {
-      entries = JSON.parse(raw || '[]');
-    } catch {}
-    let restored = 0;
-    for (const ent of entries) {
-      try {
-        const abs = path.join(root, ent.p);
-        fs.chmodSync(abs, ent.m);
-        restored++;
-      } catch {}
-    }
-    // Cleanup state file
-    try {
-      fs.unlinkSync(statePath);
-    } catch {}
-    return { success: true, restored };
-  } catch (e: any) {
-    return { success: false, restored: 0, error: e?.message || String(e) };
-  }
-}
-
-export function registerPlanLockIpc(): void {
-  ipcMain.handle('plan:lock', async (_e, taskPath: string) => {
-    if (isWindows()) {
-      // Best-effort: still attempt chmod; ACL hardening could be added with icacls in a future pass
-      return applyLock(taskPath);
-    }
-    return applyLock(taskPath);
-  });
-
-  ipcMain.handle('plan:unlock', async (_e, taskPath: string) => {
-    if (isWindows()) {
-      return releaseLock(taskPath);
-    }
-    return releaseLock(taskPath);
-  });
-}
diff --git a/src/main/services/providerStatusCache.ts b/src/main/services/providerStatusCache.ts
deleted file mode 100644
index 007ee9f276..0000000000
--- a/src/main/services/providerStatusCache.ts
+++ /dev/null
@@ -1,90 +0,0 @@
-import fs from 'fs/promises';
-import path from 'path';
-import { app } from 'electron';
-import { log } from '../lib/logger';
-
-export interface ProviderStatus {
-  installed: boolean;
-  path?: string | null;
-  version?: string | null;
-  lastChecked: number;
-}
-
-type ProviderStatusMap = Record<string, ProviderStatus>;
-
-export class ProviderStatusCache {
-  private cache: ProviderStatusMap = {};
-  private filePath: string | null = null;
-  private persistPromise: Promise<void> | null = null;
-  private pendingPersist = false;
-
-  constructor() {
-    // lazily resolved in load/persist to avoid app readiness issues
-  }
-
-  async load(): Promise<void> {
-    if (!this.filePath) {
-      this.filePath = path.join(app.getPath('userData'), 'provider-status-cache.json');
-    }
-    if (!this.filePath) return;
-    try {
-      const content = await fs.readFile(this.filePath, 'utf8');
-      const parsed = JSON.parse(content);
-      if (parsed && typeof parsed === 'object') {
-        this.cache = parsed as ProviderStatusMap;
-      }
-    } catch {
-      this.cache = {};
-    }
-  }
-
-  getAll(): ProviderStatusMap {
-    return { ...this.cache };
-  }
-
-  get(providerId: string): ProviderStatus | undefined {
-    return this.cache[providerId];
-  }
-
-  set(providerId: string, status: ProviderStatus): void {
-    this.cache = {
-      ...this.cache,
-      [providerId]: status,
-    };
-    this.persist();
-  }
-
-  private persist() {
-    if (!this.filePath) {
-      this.filePath = path.join(app.getPath('userData'), 'provider-status-cache.json');
-    }
-    if (!this.filePath) return;
-
-    if (this.persistPromise) {
-      this.pendingPersist = true;
-      return;
-    }
-    const write = () => {
-      const payload = JSON.stringify(this.cache, null, 2);
-      this.persistPromise = fs
-        .writeFile(this.filePath as string, payload, 'utf8')
-        .catch((error) => {
-          log.warn('providerStatusCache:persist failed', {
-            filePath: this.filePath,
-            error: error?.message || String(error),
-          });
-        })
-        .finally(() => {
-          this.persistPromise = null;
-          const shouldRetry = this.pendingPersist;
-          this.pendingPersist = false;
-          if (shouldRetry) {
-            setTimeout(() => this.persist(), 250);
-          }
-        });
-    };
-    write();
-  }
-}
-
-export const providerStatusCache = new ProviderStatusCache();
diff --git a/src/main/services/ptyIpc.ts b/src/main/services/ptyIpc.ts
deleted file mode 100644
index df8b4b4c62..0000000000
--- a/src/main/services/ptyIpc.ts
+++ /dev/null
@@ -1,1209 +0,0 @@
-import { app, ipcMain, WebContents, BrowserWindow } from 'electron';
-import {
-  startPty,
-  writePty,
-  resizePty,
-  killPty,
-  getPty,
-  getPtyKind,
-  startDirectPty,
-  startSshPty,
-  removePtyRecord,
-  setOnDirectCliExit,
-  parseShellArgs,
-  buildProviderCliArgs,
-  resolveProviderCommandConfig,
-  killTmuxSession,
-  getTmuxSessionName,
-  getPtyTmuxSessionName,
-} from './ptyManager';
-import { log } from '../lib/logger';
-import { terminalSnapshotService } from './TerminalSnapshotService';
-import { errorTracking } from '../errorTracking';
-import type { TerminalSnapshotPayload } from '../types/terminalSnapshot';
-import * as telemetry from '../telemetry';
-import { PROVIDER_IDS, getProvider, type ProviderId } from '../../shared/providers/registry';
-import { parsePtyId, isChatPty } from '../../shared/ptyId';
-import { detectAndLoadTerminalConfig } from './TerminalConfigParser';
-import { ClaudeHookService } from './ClaudeHookService';
-import { databaseService } from './DatabaseService';
-import { lifecycleScriptsService } from './LifecycleScriptsService';
-import { maybeAutoTrustForClaude } from './ClaudeConfigService';
-import { getDrizzleClient } from '../db/drizzleClient';
-import { sshConnections as sshConnectionsTable } from '../db/schema';
-import { eq } from 'drizzle-orm';
-import { execFile } from 'child_process';
-import { createHash, randomUUID } from 'crypto';
-import path from 'path';
-import { quoteShellArg } from '../utils/shellEscape';
-import { agentEventService } from './AgentEventService';
-
-const owners = new Map<string, WebContents>();
-const listeners = new Set<string>();
-const providerPtyTimers = new Map<string, number>();
-// Map PTY IDs to provider IDs for multi-agent tracking
-const ptyProviderMap = new Map<string, ProviderId>();
-// Prevent duplicate finish handling when cleanup and onExit race for the same PTY.
-const finalizedPtys = new Set<string>();
-// Track WebContents that have a 'destroyed' listener to avoid duplicates
-const wcDestroyedListeners = new Set<number>();
-let isAppQuitting = false;
-
-type FinishCause = 'process_exit' | 'app_quit' | 'owner_destroyed' | 'manual_kill';
-
-// Buffer PTY output to reduce IPC overhead (helps SSH feel less laggy)
-const ptyDataBuffers = new Map<string, string>();
-const ptyDataTimers = new Map<string, NodeJS.Timeout>();
-const PTY_DATA_FLUSH_MS = 16;
-
-// Guard IPC sends to prevent crashes when WebContents is destroyed
-function safeSendToOwner(id: string, channel: string, payload: unknown): boolean {
-  const wc = owners.get(id);
-  if (!wc) return false;
-  try {
-    if (typeof wc.isDestroyed === 'function' && wc.isDestroyed()) return false;
-    wc.send(channel, payload);
-    return true;
-  } catch (err) {
-    log.warn('ptyIpc:safeSendFailed', {
-      id,
-      channel,
-      error: String((err as Error)?.message || err),
-    });
-    return false;
-  }
-}
-
-function flushPtyData(id: string): void {
-  const buf = ptyDataBuffers.get(id);
-  if (!buf) return;
-  ptyDataBuffers.delete(id);
-  safeSendToOwner(id, `pty:data:${id}`, buf);
-}
-
-function clearPtyData(id: string): void {
-  const t = ptyDataTimers.get(id);
-  if (t) {
-    clearTimeout(t);
-    ptyDataTimers.delete(id);
-  }
-  ptyDataBuffers.delete(id);
-}
-
-function bufferedSendPtyData(id: string, chunk: string): void {
-  const prev = ptyDataBuffers.get(id) || '';
-  ptyDataBuffers.set(id, prev + chunk);
-  if (ptyDataTimers.has(id)) return;
-  const t = setTimeout(() => {
-    ptyDataTimers.delete(id);
-    flushPtyData(id);
-  }, PTY_DATA_FLUSH_MS);
-  ptyDataTimers.set(id, t);
-}
-
-/**
- * Deterministic port in the ephemeral range (49152–65535) derived from ptyId.
- * Used for the reverse SSH tunnel so the remote hook can reach the local
- * AgentEventService.
- */
-function pickReverseTunnelPort(ptyId: string): number {
-  const hash = createHash('sha256').update(ptyId).digest();
-  const value = hash.readUInt16BE(0); // 0–65535
-  return 49152 + (value % (65535 - 49152 + 1));
-}
-
-/**
- * Write `.claude/settings.local.json` on the remote with Notification and Stop
- * hook entries, merging with any existing content (same logic as
- * `ClaudeHookService.writeHookConfig` locally).
- *
- * Uses two ssh exec calls: one to read the existing file, one to write the
- * merged result.  This avoids terminal line-buffer corruption and preserves
- * user-defined settings and hooks.
- */
-async function writeRemoteHookConfig(
-  sshArgs: string[],
-  sshTarget: string,
-  cwd: string
-): Promise<void> {
-  const dir = `${cwd}/.claude`;
-  const filePath = `${dir}/settings.local.json`;
-
-  // Read existing config (if any) from the remote
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  let existing: Record<string, any> = {};
-  try {
-    const { stdout } = await execFileAsync('ssh', [
-      ...sshArgs,
-      sshTarget,
-      `cat ${quoteShellArg(filePath)} 2>/dev/null || echo '{}'`,
-    ]);
-    existing = JSON.parse(stdout.trim());
-  } catch {
-    // File doesn't exist, isn't valid JSON, or ssh failed — start fresh
-  }
-
-  ClaudeHookService.mergeHookEntries(existing);
-
-  const json = JSON.stringify(existing, null, 2);
-  await execFileAsync('ssh', [
-    ...sshArgs,
-    sshTarget,
-    `mkdir -p ${quoteShellArg(dir)} && printf '%s\\n' ${quoteShellArg(json)} > ${quoteShellArg(filePath)}`,
-  ]);
-}
-
-function buildRemoteInitKeystrokes(args: {
-  cwd?: string;
-  provider?: { cli: string; cmd: string; installCommand?: string };
-  tmux?: { sessionName: string };
-  preProviderCommands?: string[];
-}): string {
-  const lines: string[] = [];
-  if (args.cwd) {
-    // Keep this line shell-agnostic (works in zsh/bash/fish); avoid POSIX `||` which fish doesn't support.
-    // If `cd` fails, the shell will print its own error message.
-    lines.push(`cd ${quoteShellArg(args.cwd)}`);
-  }
-
-  // Insert any pre-provider setup commands (e.g. export statements for hook env vars)
-  if (args.preProviderCommands?.length) {
-    lines.push(...args.preProviderCommands);
-  }
-
-  if (args.provider) {
-    const cli = args.provider.cli;
-    const install = args.provider.installCommand ? ` Install: ${args.provider.installCommand}` : '';
-    const msg = `emdash: ${cli} not found on remote.${install}`;
-    const providerCmd = args.provider.cmd;
-
-    if (args.tmux) {
-      // When tmux is enabled, wrap the provider command in a named tmux session.
-      // tmux new-session -As creates-or-attaches in one command.
-      // Falls back to running without tmux if tmux isn't installed on the remote.
-      const tmuxName = quoteShellArg(args.tmux.sessionName);
-      const shScript = `if command -v ${quoteShellArg(cli)} >/dev/null 2>&1; then if command -v tmux >/dev/null 2>&1; then exec tmux new-session -As ${tmuxName} -- sh -c ${quoteShellArg(providerCmd)}; else printf '%s\\n' 'emdash: tmux not found on remote, running without session persistence'; exec ${providerCmd}; fi; else printf '%s\\n' ${quoteShellArg(
-        msg
-      )}; fi`;
-      lines.push(`sh -c ${quoteShellArg(shScript)}`);
-    } else {
-      const shScript = `if command -v ${quoteShellArg(cli)} >/dev/null 2>&1; then exec ${providerCmd}; else printf '%s\\n' ${quoteShellArg(
-        msg
-      )}; fi`;
-      lines.push(`sh -c ${quoteShellArg(shScript)}`);
-    }
-  }
-
-  return lines.length ? `${lines.join('\n')}\n` : '';
-}
-
-async function resolveSshInvocation(
-  connectionId: string
-): Promise<{ target: string; args: string[] }> {
-  // If created from ssh config selection, prefer using the alias so OpenSSH config
-  // (ProxyJump, UseKeychain, etc.) is honored by system ssh.
-  if (connectionId.startsWith('ssh-config:')) {
-    const raw = connectionId.slice('ssh-config:'.length);
-    let alias = raw;
-    try {
-      // New scheme uses encodeURIComponent.
-      if (/%[0-9A-Fa-f]{2}/.test(raw)) {
-        alias = decodeURIComponent(raw);
-      }
-    } catch {
-      alias = raw;
-    }
-    if (alias) {
-      return { target: alias, args: [] };
-    }
-  }
-
-  const { db } = await getDrizzleClient();
-  const rows = await db
-    .select({
-      id: sshConnectionsTable.id,
-      host: sshConnectionsTable.host,
-      port: sshConnectionsTable.port,
-      username: sshConnectionsTable.username,
-      privateKeyPath: sshConnectionsTable.privateKeyPath,
-    })
-    .from(sshConnectionsTable)
-    .where(eq(sshConnectionsTable.id, connectionId))
-    .limit(1);
-
-  const row = rows[0];
-  if (!row) {
-    throw new Error(`SSH connection not found: ${connectionId}`);
-  }
-
-  const args: string[] = [];
-  if (row.port && row.port !== 22) {
-    args.push('-p', String(row.port));
-  }
-  if (row.privateKeyPath) {
-    args.push('-i', row.privateKeyPath);
-  }
-
-  const target = row.username ? `${row.username}@${row.host}` : row.host;
-  return { target, args };
-}
-
-function buildRemoteProviderInvocation(args: {
-  providerId: string;
-  autoApprove?: boolean;
-  initialPrompt?: string;
-  resume?: boolean;
-}): { cli: string; cmd: string; installCommand?: string } {
-  const { providerId, autoApprove, initialPrompt, resume } = args;
-  const fallbackProvider = getProvider(providerId as ProviderId);
-  const resolvedConfig = resolveProviderCommandConfig(providerId);
-  const provider = resolvedConfig?.provider ?? fallbackProvider;
-
-  const cliCommand = (
-    resolvedConfig?.cli ||
-    fallbackProvider?.cli ||
-    providerId.toLowerCase()
-  ).trim();
-  const parsedCliParts = parseShellArgs(cliCommand);
-  const cliCommandParts = parsedCliParts.length > 0 ? parsedCliParts : [cliCommand];
-  const cliCheckCommand = cliCommandParts[0];
-
-  const cliArgs = buildProviderCliArgs({
-    resume,
-    resumeFlag: resolvedConfig?.resumeFlag ?? fallbackProvider?.resumeFlag,
-    defaultArgs: resolvedConfig?.defaultArgs ?? fallbackProvider?.defaultArgs,
-    extraArgs: resolvedConfig?.extraArgs,
-    autoApprove,
-    autoApproveFlag: resolvedConfig?.autoApproveFlag ?? fallbackProvider?.autoApproveFlag,
-    initialPrompt,
-    initialPromptFlag: resolvedConfig?.initialPromptFlag ?? fallbackProvider?.initialPromptFlag,
-    useKeystrokeInjection: provider?.useKeystrokeInjection,
-  });
-
-  const cmdParts = [...cliCommandParts, ...cliArgs];
-  const cmd = cmdParts.map(quoteShellArg).join(' ');
-
-  return { cli: cliCheckCommand, cmd, installCommand: provider?.installCommand };
-}
-
-/** Convert SSH args to SCP-compatible args (e.g. `-p` port → `-P` port). */
-function buildScpArgs(sshArgs: string[]): string[] {
-  const scpArgs: string[] = [];
-  for (let i = 0; i < sshArgs.length; i++) {
-    if (sshArgs[i] === '-p' && i + 1 < sshArgs.length) {
-      // scp uses -P (uppercase) for port
-      scpArgs.push('-P', sshArgs[i + 1]);
-      i++;
-    } else if (
-      (sshArgs[i] === '-i' || sshArgs[i] === '-o' || sshArgs[i] === '-F') &&
-      i + 1 < sshArgs.length
-    ) {
-      scpArgs.push(sshArgs[i], sshArgs[i + 1]);
-      i++;
-    }
-  }
-  return scpArgs;
-}
-
-function execFileAsync(cmd: string, args: string[]): Promise<{ stdout: string; stderr: string }> {
-  return new Promise((resolve, reject) => {
-    execFile(cmd, args, { timeout: 30_000 }, (error, stdout, stderr) => {
-      if (error) {
-        reject(new Error(`${cmd} failed: ${stderr || error.message}`));
-      } else {
-        resolve({ stdout, stderr });
-      }
-    });
-  });
-}
-
-async function resolveShellSetup(cwd: string): Promise<string | undefined> {
-  // Committed .emdash.json lives in the worktree itself
-  const fromCwd = lifecycleScriptsService.getShellSetup(cwd);
-  if (fromCwd) return fromCwd;
-  // Uncommitted .emdash.json only exists in the project root — look it up via DB
-  try {
-    const task = await databaseService.getTaskByPath(cwd);
-    const project = task ? await databaseService.getProjectById(task.projectId) : null;
-    if (project?.path) return lifecycleScriptsService.getShellSetup(project.path) ?? undefined;
-  } catch {}
-  return undefined;
-}
-
-async function resolveTmuxEnabled(cwd: string): Promise<boolean> {
-  if (lifecycleScriptsService.getTmuxEnabled(cwd)) return true;
-  try {
-    const task = await databaseService.getTaskByPath(cwd);
-    const project = task ? await databaseService.getProjectById(task.projectId) : null;
-    if (project?.path) return lifecycleScriptsService.getTmuxEnabled(project.path);
-  } catch {}
-  return false;
-}
-
-export function registerPtyIpc(): void {
-  // When a direct-spawned CLI exits, spawn a shell so user can continue working
-  setOnDirectCliExit(async (id: string, cwd: string) => {
-    const wc = owners.get(id);
-    if (!wc) return;
-
-    try {
-      // Spawn a shell in the same terminal
-      const proc = await startPty({
-        id,
-        cwd,
-        cols: 120,
-        rows: 32,
-      });
-
-      if (!proc) {
-        log.warn('ptyIpc: Failed to spawn shell after CLI exit', { id });
-        killPty(id); // Clean up dead PTY record
-        return;
-      }
-
-      // Re-attach listeners for the new shell process
-      listeners.delete(id); // Clear old listener registration
-      if (!listeners.has(id)) {
-        proc.onData((data) => {
-          bufferedSendPtyData(id, data);
-        });
-
-        proc.onExit(({ exitCode, signal }) => {
-          flushPtyData(id);
-          clearPtyData(id);
-          safeSendToOwner(id, `pty:exit:${id}`, { exitCode, signal });
-          owners.delete(id);
-          listeners.delete(id);
-          removePtyRecord(id);
-        });
-        listeners.add(id);
-      }
-
-      // Notify renderer that shell is ready (reuse pty:started so existing listener handles it)
-      if (!wc.isDestroyed()) {
-        wc.send('pty:started', { id });
-      }
-    } catch (err) {
-      log.error('ptyIpc: Error spawning shell after CLI exit', { id, error: err });
-      killPty(id); // Clean up dead PTY record
-    }
-  });
-
-  ipcMain.handle(
-    'pty:start',
-    async (
-      event,
-      args: {
-        id: string;
-        cwd?: string;
-        remote?: { connectionId: string };
-        shell?: string;
-        env?: Record<string, string>;
-        cols?: number;
-        rows?: number;
-        autoApprove?: boolean;
-        initialPrompt?: string;
-        skipResume?: boolean;
-      }
-    ) => {
-      const ptyStartTime = performance.now();
-      if (process.env.EMDASH_DISABLE_PTY === '1') {
-        return { ok: false, error: 'PTY disabled via EMDASH_DISABLE_PTY=1' };
-      }
-      try {
-        const { id, cwd, remote, shell, env, cols, rows, autoApprove, initialPrompt, skipResume } =
-          args;
-        const existing = getPty(id);
-
-        // Remote PTY routing: run an interactive ssh session in a local PTY.
-        if (remote?.connectionId) {
-          const wc = event.sender;
-          owners.set(id, wc);
-
-          if (existing) {
-            const kind = getPtyKind(id);
-            if (kind === 'ssh') {
-              return { ok: true, reused: true };
-            }
-            // Replace an existing local PTY with an SSH-backed PTY.
-            try {
-              killPty(id);
-            } catch {}
-            listeners.delete(id);
-          }
-
-          const ssh = await resolveSshInvocation(remote.connectionId);
-          const proc = startSshPty({
-            id,
-            target: ssh.target,
-            sshArgs: ssh.args,
-            cols,
-            rows,
-            env,
-          });
-
-          if (!listeners.has(id)) {
-            proc.onData((data) => {
-              bufferedSendPtyData(id, data);
-            });
-            proc.onExit(({ exitCode, signal }) => {
-              flushPtyData(id);
-              clearPtyData(id);
-              safeSendToOwner(id, `pty:exit:${id}`, { exitCode, signal });
-              owners.delete(id);
-              listeners.delete(id);
-              removePtyRecord(id);
-            });
-            listeners.add(id);
-          }
-
-          // Resolve tmux config from local project settings
-          const remoteTmux = cwd ? await resolveTmuxEnabled(cwd) : false;
-          const remoteTmuxOpt = remoteTmux ? { sessionName: getTmuxSessionName(id) } : undefined;
-
-          const remoteInit = buildRemoteInitKeystrokes({ cwd, tmux: remoteTmuxOpt });
-          if (remoteInit) {
-            proc.write(remoteInit);
-          }
-
-          try {
-            const windows = BrowserWindow.getAllWindows();
-            windows.forEach((w: any) => w.webContents.send('pty:started', { id }));
-          } catch {}
-
-          return { ok: true, tmux: remoteTmux };
-        }
-
-        // Determine if we should skip resume
-        let shouldSkipResume = skipResume;
-
-        // Check if this is an additional (non-main) chat
-        const isAdditionalChat = isChatPty(id);
-
-        if (isAdditionalChat) {
-          // Additional chats can resume if the provider supports per-session
-          // isolation (via sessionIdFlag), since each chat gets its own
-          // session UUID. Without session isolation, always start fresh to
-          // avoid all chats sharing the provider's directory-scoped state.
-          const parsed = parsePtyId(id);
-          const chatProvider = parsed ? getProvider(parsed.providerId) : null;
-          if (!chatProvider?.sessionIdFlag) {
-            shouldSkipResume = true;
-          }
-          // Otherwise keep shouldSkipResume from the renderer (undefined or
-          // explicitly set), which is based on whether a snapshot exists.
-        } else if (shouldSkipResume === undefined) {
-          // For main chats, check if this is a first-time start
-          // For Claude and similar providers, check if a session directory exists
-          if (cwd && shell) {
-            try {
-              const fs = require('fs');
-              const path = require('path');
-              const os = require('os');
-              const crypto = require('crypto');
-
-              // Check if this is Claude by looking at the shell
-              const isClaudeOrSimilar = shell.includes('claude') || shell.includes('aider');
-
-              if (isClaudeOrSimilar) {
-                // Claude stores sessions in ~/.claude/projects/ with various naming schemes
-                // Check both hash-based and path-based directory names
-                const cwdHash = crypto.createHash('sha256').update(cwd).digest('hex').slice(0, 16);
-                const claudeHashDir = path.join(os.homedir(), '.claude', 'projects', cwdHash);
-
-                // Also check for path-based directory name (Claude's actual format)
-                // Replace path separators with hyphens for the directory name
-                const pathBasedName = cwd.replace(/\//g, '-');
-                const claudePathDir = path.join(os.homedir(), '.claude', 'projects', pathBasedName);
-
-                // Check if any Claude session directory exists for this working directory
-                const projectsDir = path.join(os.homedir(), '.claude', 'projects');
-                let sessionExists = false;
-
-                // Check if the hash-based directory exists
-                sessionExists = fs.existsSync(claudeHashDir);
-
-                // If not, check for path-based directory
-                if (!sessionExists) {
-                  sessionExists = fs.existsSync(claudePathDir);
-                }
-
-                // If still not found, scan the projects directory for any matching directory
-                if (!sessionExists && fs.existsSync(projectsDir)) {
-                  try {
-                    const dirs = fs.readdirSync(projectsDir);
-                    // Check if any directory contains part of the working directory path
-                    const cwdParts = cwd.split('/').filter((p) => p.length > 0);
-                    const lastParts = cwdParts.slice(-3).join('-'); // Use last 3 parts of path
-                    sessionExists = dirs.some((dir: string) => dir.includes(lastParts));
-                  } catch {
-                    // Ignore scan errors
-                  }
-                }
-
-                // Skip resume if no session directory exists (new task)
-                shouldSkipResume = !sessionExists;
-              } else {
-                // For other providers, default to not skipping (allow resume if supported)
-                shouldSkipResume = false;
-              }
-            } catch (e) {
-              // On error, default to not skipping
-              shouldSkipResume = false;
-            }
-          } else {
-            // If no cwd or shell, default to not skipping
-            shouldSkipResume = false;
-          }
-        } else {
-          // Use the explicitly provided value
-          shouldSkipResume = shouldSkipResume || false;
-        }
-
-        const parsedPty = parsePtyId(id);
-        if (parsedPty) maybeAutoTrustForClaude(parsedPty.providerId, cwd);
-
-        const shellSetup = cwd ? await resolveShellSetup(cwd) : undefined;
-        const tmux = cwd ? await resolveTmuxEnabled(cwd) : false;
-
-        const proc =
-          existing ??
-          (await startPty({
-            id,
-            cwd,
-            shell,
-            env,
-            cols,
-            rows,
-            autoApprove,
-            initialPrompt,
-            skipResume: shouldSkipResume,
-            shellSetup,
-            tmux,
-          }));
-        const wc = event.sender;
-        owners.set(id, wc);
-
-        // Attach data/exit listeners once per PTY id
-        if (!listeners.has(id)) {
-          proc.onData((data) => {
-            bufferedSendPtyData(id, data);
-          });
-
-          proc.onExit(({ exitCode, signal }) => {
-            flushPtyData(id);
-            clearPtyData(id);
-            // Check if this PTY is still active (not replaced by a newer instance)
-            if (getPty(id) !== proc) {
-              return;
-            }
-            safeSendToOwner(id, `pty:exit:${id}`, { exitCode, signal });
-            maybeMarkProviderFinish(
-              id,
-              exitCode,
-              signal,
-              isAppQuitting ? 'app_quit' : 'process_exit'
-            );
-            owners.delete(id);
-            listeners.delete(id);
-            removePtyRecord(id);
-          });
-
-          listeners.add(id);
-        }
-
-        // Clean up all PTYs owned by this WebContents when it's destroyed
-        // Only register once per WebContents to avoid MaxListenersExceededWarning
-        if (!wcDestroyedListeners.has(wc.id)) {
-          wcDestroyedListeners.add(wc.id);
-          wc.once('destroyed', () => {
-            wcDestroyedListeners.delete(wc.id);
-            // Clean up all PTYs owned by this WebContents
-            for (const [ptyId, owner] of owners.entries()) {
-              if (owner === wc) {
-                try {
-                  maybeMarkProviderFinish(
-                    ptyId,
-                    null,
-                    undefined,
-                    isAppQuitting ? 'app_quit' : 'owner_destroyed'
-                  );
-                  killPty(ptyId);
-                } catch {}
-                owners.delete(ptyId);
-                listeners.delete(ptyId);
-              }
-            }
-          });
-        }
-
-        // Track agent start even when reusing PTY (happens after shell respawn)
-        // This ensures subsequent agent runs in the same task are tracked
-        maybeMarkProviderStart(id);
-
-        // Signal that PTY is ready
-        try {
-          const windows = BrowserWindow.getAllWindows();
-          windows.forEach((w) => {
-            try {
-              if (!w.webContents.isDestroyed()) {
-                w.webContents.send('pty:started', { id });
-              }
-            } catch {}
-          });
-        } catch {}
-
-        return { ok: true, tmux };
-      } catch (err: any) {
-        log.error('pty:start FAIL', {
-          id: args.id,
-          cwd: args.cwd,
-          shell: args.shell,
-          error: err?.message || err,
-        });
-
-        // Track PTY start errors
-        const parsed = parseProviderPty(args.id);
-        await errorTracking.captureAgentSpawnError(
-          err,
-          parsed?.providerId || args.shell || 'unknown',
-          parsed?.taskId || args.id,
-          {
-            cwd: args.cwd,
-            autoApprove: args.autoApprove,
-            hasInitialPrompt: !!args.initialPrompt,
-          }
-        );
-
-        return { ok: false, error: String(err?.message || err) };
-      }
-    }
-  );
-
-  ipcMain.on('pty:input', (_event, args: { id: string; data: string }) => {
-    try {
-      writePty(args.id, args.data);
-
-      // Track prompts sent to agents (not shell terminals)
-      // Only count Enter key presses for known agent PTYs
-      if (args.data === '\r' || args.data === '\n') {
-        // Check if this PTY is associated with an agent
-        const providerId = ptyProviderMap.get(args.id) || parseProviderPty(args.id)?.providerId;
-
-        if (providerId) {
-          // This is an agent terminal, track the prompt
-          telemetry.capture('agent_prompt_sent', {
-            provider: providerId,
-          });
-        }
-      }
-    } catch (e) {
-      log.error('pty:input error', { id: args.id, error: e });
-    }
-  });
-
-  ipcMain.on('pty:resize', (_event, args: { id: string; cols: number; rows: number }) => {
-    try {
-      resizePty(args.id, args.cols, args.rows);
-    } catch (e) {
-      log.error('pty:resize error', { id: args.id, cols: args.cols, rows: args.rows, error: e });
-    }
-  });
-
-  ipcMain.on('pty:kill', (_event, args: { id: string }) => {
-    try {
-      // Ensure telemetry timers are cleared even on manual kill
-      maybeMarkProviderFinish(args.id, null, undefined, 'manual_kill');
-      // Kill associated tmux session if this PTY was tmux-wrapped
-      if (getPtyTmuxSessionName(args.id)) {
-        killTmuxSession(args.id);
-      }
-      killPty(args.id);
-      owners.delete(args.id);
-      listeners.delete(args.id);
-    } catch (e) {
-      log.error('pty:kill error', { id: args.id, error: e });
-    }
-  });
-
-  // Kill a tmux session by PTY ID (used during task deletion cleanup)
-  ipcMain.handle('pty:killTmux', async (_event, args: { id: string }) => {
-    try {
-      killTmuxSession(args.id);
-      return { ok: true };
-    } catch (e) {
-      log.error('pty:killTmux error', { id: args.id, error: e });
-      return { ok: false, error: String(e) };
-    }
-  });
-
-  ipcMain.handle('pty:snapshot:get', async (_event, args: { id: string }) => {
-    try {
-      const snapshot = await terminalSnapshotService.getSnapshot(args.id);
-      return { ok: true, snapshot };
-    } catch (error: any) {
-      log.error('pty:snapshot:get failed', { id: args.id, error });
-      return { ok: false, error: error?.message || String(error) };
-    }
-  });
-
-  ipcMain.handle(
-    'pty:snapshot:save',
-    async (_event, args: { id: string; payload: TerminalSnapshotPayload }) => {
-      const { id, payload } = args;
-      const result = await terminalSnapshotService.saveSnapshot(id, payload);
-      if (!result.ok) {
-        log.warn('pty:snapshot:save failed', { id, error: result.error });
-      }
-      return result;
-    }
-  );
-
-  ipcMain.handle('pty:snapshot:clear', async (_event, args: { id: string }) => {
-    await terminalSnapshotService.deleteSnapshot(args.id);
-    return { ok: true };
-  });
-
-  ipcMain.handle('terminal:getTheme', async () => {
-    try {
-      const config = detectAndLoadTerminalConfig();
-      if (config) {
-        return { ok: true, config };
-      }
-      return { ok: false, error: 'No terminal configuration found' };
-    } catch (error: any) {
-      log.error('terminal:getTheme failed', { error });
-      return { ok: false, error: error?.message || String(error) };
-    }
-  });
-
-  // SCP file transfer to SSH remote (for file drop on SSH terminals)
-  ipcMain.handle(
-    'pty:scp-to-remote',
-    async (
-      _event,
-      args: { connectionId: string; localPaths: string[] }
-    ): Promise<{ success: boolean; remotePaths?: string[]; error?: string }> => {
-      try {
-        const ssh = await resolveSshInvocation(args.connectionId);
-        const scpArgs = buildScpArgs(ssh.args);
-        const remoteDir = '/tmp/emdash-images';
-
-        // Ensure remote directory exists
-        await execFileAsync('ssh', [...ssh.args, ssh.target, `mkdir -p ${remoteDir}`]);
-
-        // Transfer each file individually so UUID-prefixed names avoid collisions
-        // (batching into one scp call would lose uniqueness for same-named files)
-        const remotePaths: string[] = [];
-        for (const localPath of args.localPaths) {
-          const remoteName = `${randomUUID()}-${path.basename(localPath)}`;
-          const remotePath = `${remoteDir}/${remoteName}`;
-          await execFileAsync('scp', [...scpArgs, localPath, `${ssh.target}:${remotePath}`]);
-          remotePaths.push(remotePath);
-        }
-
-        return { success: true, remotePaths };
-      } catch (err: any) {
-        log.error('pty:scp-to-remote failed', {
-          connectionId: args.connectionId,
-          error: err?.message || err,
-        });
-        return { success: false, error: String(err?.message || err) };
-      }
-    }
-  );
-
-  // Start a PTY by spawning CLI directly (no shell wrapper)
-  // This is faster but falls back to shell-based spawn if CLI path unknown
-  ipcMain.handle(
-    'pty:startDirect',
-    async (
-      event,
-      args: {
-        id: string;
-        providerId: string;
-        cwd: string;
-        remote?: { connectionId: string };
-        cols?: number;
-        rows?: number;
-        autoApprove?: boolean;
-        initialPrompt?: string;
-        env?: Record<string, string>;
-        resume?: boolean;
-      }
-    ) => {
-      if (process.env.EMDASH_DISABLE_PTY === '1') {
-        return { ok: false, error: 'PTY disabled via EMDASH_DISABLE_PTY=1' };
-      }
-
-      try {
-        const { id, providerId, cwd, remote, cols, rows, autoApprove, initialPrompt, env, resume } =
-          args;
-        const existing = getPty(id);
-
-        if (remote?.connectionId) {
-          const wc = event.sender;
-          owners.set(id, wc);
-
-          if (existing) {
-            const kind = getPtyKind(id);
-            if (kind === 'ssh') {
-              return { ok: true, reused: true };
-            }
-            try {
-              killPty(id);
-            } catch {}
-            listeners.delete(id);
-          }
-
-          const ssh = await resolveSshInvocation(remote.connectionId);
-          const remoteProvider = buildRemoteProviderInvocation({
-            providerId,
-            autoApprove,
-            initialPrompt,
-            resume,
-          });
-
-          const resolvedConfig = resolveProviderCommandConfig(providerId);
-          const mergedEnv = resolvedConfig?.env ? { ...resolvedConfig.env, ...env } : env;
-
-          // Set up reverse SSH tunnel for hook events if the local hook
-          // server is running. This lets the remote agent call back to
-          // the local AgentEventService via the tunnel.
-          const preProviderCommands: string[] = [];
-          const hookPort = agentEventService.getPort();
-          if (hookPort > 0) {
-            const remotePort = pickReverseTunnelPort(id);
-
-            // For Claude, write hook config on the remote via ssh exec
-            // (not keystroke injection — long JSON lines get corrupted by
-            // terminal line-buffer limits when typed into the PTY).
-            // Done before pushing -R so the exec connection doesn't
-            // unnecessarily bind the reverse tunnel port.
-            if (providerId === 'claude' && cwd) {
-              try {
-                await writeRemoteHookConfig(ssh.args, ssh.target, cwd);
-              } catch (err: any) {
-                log.warn('ptyIpc:startDirect failed to write remote hook config', {
-                  id,
-                  error: err?.message || String(err),
-                });
-              }
-            }
-
-            ssh.args.push('-R', `127.0.0.1:${remotePort}:127.0.0.1:${hookPort}`);
-
-            preProviderCommands.push(
-              `export EMDASH_HOOK_PORT=${quoteShellArg(String(remotePort))}`,
-              `export EMDASH_HOOK_TOKEN=${quoteShellArg(agentEventService.getToken())}`,
-              `export EMDASH_PTY_ID=${quoteShellArg(id)}`
-            );
-          }
-
-          const proc = startSshPty({
-            id,
-            target: ssh.target,
-            sshArgs: ssh.args,
-            cols,
-            rows,
-            env: mergedEnv,
-          });
-
-          if (!listeners.has(id)) {
-            proc.onData((data) => {
-              bufferedSendPtyData(id, data);
-            });
-            proc.onExit(({ exitCode, signal }) => {
-              flushPtyData(id);
-              clearPtyData(id);
-              safeSendToOwner(id, `pty:exit:${id}`, { exitCode, signal });
-              maybeMarkProviderFinish(id, exitCode, signal, 'process_exit');
-              owners.delete(id);
-              listeners.delete(id);
-              removePtyRecord(id);
-            });
-            listeners.add(id);
-          }
-
-          // Resolve tmux config from local project settings
-          const remoteTmux = cwd ? await resolveTmuxEnabled(cwd) : false;
-          const tmuxOpt = remoteTmux ? { sessionName: getTmuxSessionName(id) } : undefined;
-
-          const remoteInit = buildRemoteInitKeystrokes({
-            cwd,
-            provider: remoteProvider,
-            tmux: tmuxOpt,
-            preProviderCommands: preProviderCommands.length ? preProviderCommands : undefined,
-          });
-          if (remoteInit) {
-            proc.write(remoteInit);
-          }
-
-          maybeMarkProviderStart(id);
-          try {
-            const windows = BrowserWindow.getAllWindows();
-            windows.forEach((w: any) => w.webContents.send('pty:started', { id }));
-          } catch {}
-
-          return { ok: true, tmux: remoteTmux };
-        }
-
-        if (existing) {
-          const wc = event.sender;
-          owners.set(id, wc);
-          // Still track agent start even when reusing PTY (happens after shell respawn)
-          maybeMarkProviderStart(id, providerId as ProviderId);
-          return { ok: true, reused: true };
-        }
-
-        // For additional chats without per-session isolation, never resume —
-        // they'd share the provider's directory-scoped session with other chats.
-        let effectiveResume = resume;
-        if (isChatPty(id)) {
-          const chatProvider = getProvider(providerId as ProviderId);
-          if (!chatProvider?.sessionIdFlag) {
-            effectiveResume = false;
-          }
-        }
-
-        maybeAutoTrustForClaude(providerId, cwd);
-
-        const shellSetup = await resolveShellSetup(cwd);
-        const tmux = await resolveTmuxEnabled(cwd);
-
-        // Write Claude Code hook config so it calls back to Emdash on events
-        if (providerId === 'claude') {
-          try {
-            ClaudeHookService.writeHookConfig(cwd);
-          } catch (err) {
-            log.warn('pty:startDirect - failed to write Claude hook config', {
-              error: String(err),
-            });
-          }
-        }
-
-        // Try direct spawn first; skip if shellSetup or tmux requires a shell wrapper
-        const directProc =
-          shellSetup || tmux
-            ? null
-            : startDirectPty({
-                id,
-                providerId,
-                cwd,
-                cols,
-                rows,
-                autoApprove,
-                initialPrompt,
-                env,
-                resume: effectiveResume,
-                tmux,
-              });
-
-        // Fall back to shell-based spawn when direct spawn is unavailable or shellSetup/tmux is set
-        let usedFallback = false;
-        let proc: import('node-pty').IPty;
-        if (directProc) {
-          proc = directProc;
-        } else {
-          const provider = getProvider(providerId as ProviderId);
-          if (!provider?.cli) {
-            return { ok: false, error: `CLI path not found for provider: ${providerId}` };
-          }
-          if (!shellSetup && !tmux)
-            log.info('pty:startDirect - falling back to shell spawn', { id, providerId });
-          proc = await startPty({
-            id,
-            cwd,
-            shell: provider.cli,
-            cols,
-            rows,
-            autoApprove,
-            initialPrompt,
-            env,
-            skipResume: !resume,
-            shellSetup,
-            tmux,
-          });
-          usedFallback = true;
-        }
-
-        const wc = event.sender;
-        owners.set(id, wc);
-
-        if (!listeners.has(id)) {
-          proc.onData((data) => {
-            bufferedSendPtyData(id, data);
-          });
-
-          proc.onExit(({ exitCode, signal }) => {
-            flushPtyData(id);
-            clearPtyData(id);
-            maybeMarkProviderFinish(
-              id,
-              exitCode,
-              signal,
-              isAppQuitting ? 'app_quit' : 'process_exit'
-            );
-            // Direct-spawn CLIs can be replaced immediately by a fallback shell after exit.
-            // If this PTY has already been replaced, skip cleanup so we don't delete the new PTY record.
-            const current = getPty(id);
-            if (current && current !== proc) {
-              return;
-            }
-            safeSendToOwner(id, `pty:exit:${id}`, { exitCode, signal });
-            // For direct spawn: keep owner (shell respawn reuses it), delete listeners (shell respawn re-adds)
-            // For fallback: clean up owner since no shell respawn happens
-            if (usedFallback) {
-              owners.delete(id);
-            }
-            listeners.delete(id);
-            removePtyRecord(id);
-          });
-          listeners.add(id);
-        }
-
-        // Clean up all PTYs owned by this WebContents when it's destroyed
-        // Only register once per WebContents to avoid MaxListenersExceededWarning
-        if (!wcDestroyedListeners.has(wc.id)) {
-          wcDestroyedListeners.add(wc.id);
-          wc.once('destroyed', () => {
-            wcDestroyedListeners.delete(wc.id);
-            for (const [ptyId, owner] of owners.entries()) {
-              if (owner === wc) {
-                try {
-                  maybeMarkProviderFinish(
-                    ptyId,
-                    null,
-                    undefined,
-                    isAppQuitting ? 'app_quit' : 'owner_destroyed'
-                  );
-                  killPty(ptyId);
-                } catch {}
-                owners.delete(ptyId);
-                listeners.delete(ptyId);
-              }
-            }
-          });
-        }
-
-        maybeMarkProviderStart(id, providerId as ProviderId);
-
-        try {
-          const windows = BrowserWindow.getAllWindows();
-          windows.forEach((w: any) => w.webContents.send('pty:started', { id }));
-        } catch {}
-
-        return { ok: true, tmux };
-      } catch (err: any) {
-        log.error('pty:startDirect FAIL', { id: args.id, error: err?.message || err });
-        return { ok: false, error: String(err?.message || err) };
-      }
-    }
-  );
-}
-
-function parseProviderPty(id: string): {
-  providerId: ProviderId;
-  taskId: string;
-} | null {
-  const parsed = parsePtyId(id);
-  if (!parsed) return null;
-  return { providerId: parsed.providerId, taskId: parsed.suffix };
-}
-
-function providerRunKey(providerId: ProviderId, taskId: string) {
-  return `${providerId}:${taskId}`;
-}
-
-function maybeMarkProviderStart(id: string, providerId?: ProviderId) {
-  finalizedPtys.delete(id);
-
-  // First check if we have a direct provider ID (for multi-agent mode)
-  if (providerId && PROVIDER_IDS.includes(providerId)) {
-    ptyProviderMap.set(id, providerId);
-    const key = `${providerId}:${id}`;
-    if (providerPtyTimers.has(key)) return;
-    providerPtyTimers.set(key, Date.now());
-    telemetry.capture('agent_run_start', { provider: providerId });
-    return;
-  }
-
-  // Check if we have a stored mapping (for subsequent calls)
-  const storedProvider = ptyProviderMap.get(id);
-  if (storedProvider) {
-    const key = `${storedProvider}:${id}`;
-    if (providerPtyTimers.has(key)) return;
-    providerPtyTimers.set(key, Date.now());
-    telemetry.capture('agent_run_start', { provider: storedProvider });
-    return;
-  }
-
-  // Fall back to parsing the ID (single-agent mode)
-  const parsed = parseProviderPty(id);
-  if (!parsed) return;
-  const key = providerRunKey(parsed.providerId, parsed.taskId);
-  if (providerPtyTimers.has(key)) return;
-  providerPtyTimers.set(key, Date.now());
-  telemetry.capture('agent_run_start', { provider: parsed.providerId });
-}
-
-function maybeMarkProviderFinish(
-  id: string,
-  exitCode: number | null | undefined,
-  signal: number | undefined,
-  cause: FinishCause
-) {
-  if (finalizedPtys.has(id)) return;
-  finalizedPtys.add(id);
-
-  let providerId: ProviderId | undefined;
-  let key: string;
-
-  // First check if we have a stored mapping (multi-agent mode)
-  const storedProvider = ptyProviderMap.get(id);
-  if (storedProvider) {
-    providerId = storedProvider;
-    key = `${storedProvider}:${id}`;
-  } else {
-    // Fall back to parsing the ID (single-agent mode)
-    const parsed = parseProviderPty(id);
-    if (!parsed) return;
-    providerId = parsed.providerId;
-    key = providerRunKey(parsed.providerId, parsed.taskId);
-  }
-
-  const started = providerPtyTimers.get(key);
-  providerPtyTimers.delete(key);
-
-  // Clean up the provider mapping
-  ptyProviderMap.delete(id);
-
-  // No valid exit code means the process was killed during cleanup, not a real completion
-  if (typeof exitCode !== 'number') return;
-
-  const duration = started ? Math.max(0, Date.now() - started) : undefined;
-  const wasSignaled = signal !== undefined && signal !== null;
-  const outcome = exitCode !== 0 && !wasSignaled ? 'error' : 'ok';
-
-  telemetry.capture('agent_run_finish', {
-    provider: providerId,
-    outcome,
-    duration_ms: duration,
-  });
-}
-
-// Kill all PTYs on app shutdown to prevent crash loop
-try {
-  app.on('before-quit', () => {
-    isAppQuitting = true;
-    for (const id of Array.from(owners.keys())) {
-      try {
-        // Ensure telemetry timers are cleared on app quit
-        maybeMarkProviderFinish(id, null, undefined, 'app_quit');
-        killPty(id);
-      } catch {}
-    }
-    owners.clear();
-    listeners.clear();
-  });
-} catch {}
diff --git a/src/main/services/ptyManager.ts b/src/main/services/ptyManager.ts
deleted file mode 100644
index 5c1ac34387..0000000000
--- a/src/main/services/ptyManager.ts
+++ /dev/null
@@ -1,1371 +0,0 @@
-import os from 'os';
-import fs from 'fs';
-import path from 'path';
-import crypto from 'crypto';
-import type { IPty } from 'node-pty';
-import { log } from '../lib/logger';
-import { PROVIDERS, type ProviderDefinition } from '@shared/providers/registry';
-import { parsePtyId } from '@shared/ptyId';
-import { providerStatusCache } from './providerStatusCache';
-import { errorTracking } from '../errorTracking';
-import { getProviderCustomConfig } from '../settings';
-import { agentEventService } from './AgentEventService';
-
-/**
- * Environment variables to pass through for agent authentication.
- * These are passed to CLI tools during direct spawn (which skips shell config).
- */
-const AGENT_ENV_VARS = [
-  'AMP_API_KEY',
-  'ANTHROPIC_API_KEY',
-  'AUTOHAND_API_KEY',
-  'AUGMENT_SESSION_AUTH',
-  'AWS_ACCESS_KEY_ID',
-  'AWS_DEFAULT_REGION',
-  'AWS_PROFILE',
-  'AWS_REGION',
-  'AWS_SECRET_ACCESS_KEY',
-  'AWS_SESSION_TOKEN',
-  'AZURE_OPENAI_API_ENDPOINT',
-  'AZURE_OPENAI_API_KEY',
-  'AZURE_OPENAI_KEY',
-  'CODEBUFF_API_KEY',
-  'COPILOT_CLI_TOKEN',
-  'CURSOR_API_KEY',
-  'DASHSCOPE_API_KEY',
-  'FACTORY_API_KEY',
-  'GEMINI_API_KEY',
-  'GH_TOKEN',
-  'GITHUB_TOKEN',
-  'GOOGLE_API_KEY',
-  'GOOGLE_APPLICATION_CREDENTIALS',
-  'GOOGLE_CLOUD_LOCATION',
-  'GOOGLE_CLOUD_PROJECT',
-  'HTTP_PROXY',
-  'HTTPS_PROXY',
-  'KIMI_API_KEY',
-  'MISTRAL_API_KEY',
-  'MOONSHOT_API_KEY',
-  'NO_PROXY',
-  'OPENAI_API_KEY',
-  'OPENAI_BASE_URL',
-];
-
-type PtyRecord = {
-  id: string;
-  proc: IPty;
-  cwd?: string; // Working directory (for respawning shell after CLI exit)
-  isDirectSpawn?: boolean; // Whether this was a direct CLI spawn
-  kind?: 'local' | 'ssh';
-  cols?: number;
-  rows?: number;
-  tmuxSessionName?: string; // Set when session is wrapped in tmux
-};
-
-const ptys = new Map<string, PtyRecord>();
-const MIN_PTY_COLS = 2;
-const MIN_PTY_ROWS = 1;
-
-function getWindowsEssentialEnv(): Record<string, string> {
-  const home = os.homedir();
-  return {
-    PATH: process.env.PATH || process.env.Path || '',
-    PATHEXT: process.env.PATHEXT || '.COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JS;.JSE;.WSF;.WSH;.MSC',
-    SystemRoot: process.env.SystemRoot || 'C:\\Windows',
-    ComSpec: process.env.ComSpec || 'C:\\Windows\\System32\\cmd.exe',
-    TEMP: process.env.TEMP || process.env.TMP || '',
-    TMP: process.env.TMP || process.env.TEMP || '',
-    USERPROFILE: process.env.USERPROFILE || home,
-    APPDATA: process.env.APPDATA || '',
-    LOCALAPPDATA: process.env.LOCALAPPDATA || '',
-    HOMEDRIVE: process.env.HOMEDRIVE || '',
-    HOMEPATH: process.env.HOMEPATH || '',
-    USERNAME: process.env.USERNAME || os.userInfo().username,
-    // Program file paths needed by .NET, NuGet, MSBuild, and other tools
-    ProgramFiles: process.env.ProgramFiles || 'C:\\Program Files',
-    'ProgramFiles(x86)': process.env['ProgramFiles(x86)'] || 'C:\\Program Files (x86)',
-    ProgramData: process.env.ProgramData || 'C:\\ProgramData',
-    CommonProgramFiles: process.env.CommonProgramFiles || 'C:\\Program Files\\Common Files',
-    'CommonProgramFiles(x86)':
-      process.env['CommonProgramFiles(x86)'] || 'C:\\Program Files (x86)\\Common Files',
-    ProgramW6432: process.env.ProgramW6432 || 'C:\\Program Files',
-    CommonProgramW6432: process.env.CommonProgramW6432 || 'C:\\Program Files\\Common Files',
-  };
-}
-
-// Display/desktop env vars needed for GUI operations from within PTY sessions.
-const DISPLAY_ENV_VARS = [
-  'DISPLAY', // X11 display server
-  'XAUTHORITY', // X11 auth cookie (often at non-standard path on Wayland+GNOME)
-  'WAYLAND_DISPLAY', // Wayland compositor socket
-  'XDG_RUNTIME_DIR', // Contains Wayland/D-Bus sockets (e.g. /run/user/1000)
-  'XDG_CURRENT_DESKTOP', // Used by xdg-open for DE detection (e.g. "GNOME")
-  'XDG_SESSION_TYPE', // Used by browsers/toolkits to select X11 vs Wayland
-  'XDG_DATA_DIRS', // .desktop file search paths; includes snap/flatpak dirs set by session
-  'DBUS_SESSION_BUS_ADDRESS', // Needed by gio open and desktop portals
-] as const;
-
-function getDisplayEnv(): Record<string, string> {
-  const env: Record<string, string> = {};
-  for (const key of DISPLAY_ENV_VARS) {
-    if (process.env[key]) {
-      env[key] = process.env[key] as string;
-    }
-  }
-  return env;
-}
-
-// --- Tmux session helpers ---
-
-/**
- * Derive a deterministic tmux session name from a PTY ID.
- * Sanitizes to characters allowed by tmux (alphanumeric, `-`, `_`, `.`).
- */
-export function getTmuxSessionName(ptyId: string): string {
-  // PTY ID format: {providerId}-main-{taskId} or {providerId}-chat-{conversationId}
-  // Prefix with "emdash-" and sanitize
-  const sanitized = ptyId.replace(/[^a-zA-Z0-9._-]/g, '-');
-  return `emdash-${sanitized}`;
-}
-
-/**
- * Kill a tmux session by PTY ID. Fire-and-forget — ignores errors
- * for non-existent sessions (e.g., tmux not installed or session already dead).
- */
-export function killTmuxSession(ptyId: string): void {
-  const sessionName = getTmuxSessionName(ptyId);
-  try {
-    const { execFile } = require('child_process');
-    execFile('tmux', ['kill-session', '-t', sessionName], { timeout: 5000 }, (err: any) => {
-      if (!err) {
-        log.info('ptyManager:tmux - killed session', { sessionName });
-      }
-      // Ignore errors — session may not exist or tmux not installed
-    });
-  } catch {
-    // Ignore
-  }
-}
-
-// TODO: Remote tmux cleanup will be handled by the workspace provider teardown script.
-// The PTY record doesn't currently store SSH target/args, so we can't shell out
-// `ssh <target> tmux kill-session` from here. When workspace providers land, the
-// teardown script is the right place for this.
-
-function resolveWindowsPtySpawn(
-  command: string,
-  args: string[]
-): { command: string; args: string[] } {
-  if (process.platform !== 'win32') return { command, args };
-
-  const quoteForCmdExe = (input: string): string => {
-    if (input.length === 0) return '""';
-    if (!/[\s"^&|<>()%!]/.test(input)) return input;
-    return `"${input
-      .replace(/%/g, '%%')
-      .replace(/!/g, '^!')
-      .replace(/(["^&|<>()])/g, '^$1')}"`;
-  };
-
-  const ext = path.extname(command).toLowerCase();
-  if (ext === '.cmd' || ext === '.bat') {
-    const comspec = process.env.ComSpec || 'C:\\Windows\\System32\\cmd.exe';
-    const fullCommandString = [command, ...args].map(quoteForCmdExe).join(' ');
-    return { command: comspec, args: ['/d', '/s', '/c', fullCommandString] };
-  }
-  if (ext === '.ps1') {
-    return {
-      command: 'powershell.exe',
-      args: ['-NoProfile', '-ExecutionPolicy', 'Bypass', '-File', command, ...args],
-    };
-  }
-
-  return { command, args };
-}
-
-/**
- * Generate a deterministic UUID from an arbitrary string.
- * Uses SHA-256 and formats 16 bytes as a UUID v4-compatible string
- * (with version and variant bits set per RFC 4122).
- */
-function deterministicUuid(input: string): string {
-  const hash = crypto.createHash('sha256').update(input).digest();
-  // Set version 4 bits
-  hash[6] = (hash[6] & 0x0f) | 0x40;
-  // Set variant bits
-  hash[8] = (hash[8] & 0x3f) | 0x80;
-  const hex = hash.toString('hex').slice(0, 32);
-  return `${hex.slice(0, 8)}-${hex.slice(8, 12)}-${hex.slice(12, 16)}-${hex.slice(16, 20)}-${hex.slice(20, 32)}`;
-}
-
-// ---------------------------------------------------------------------------
-// Persistent session-ID map
-//
-// Tracks which PTY IDs have already been started with --session-id so we
-// know whether to create a new session or resume an existing one.
-//
-//   First start  → no entry  → --session-id <uuid>  (create)
-//   Restart      → entry     → --resume <uuid>      (resume)
-// ---------------------------------------------------------------------------
-type SessionEntry = { uuid: string; cwd: string };
-
-let _sessionMapPath: string | null = null;
-let _sessionMap: Record<string, SessionEntry> | null = null;
-
-/** @internal Exported for testing. Sets session map path and clears the cache. */
-export function _resetSessionMapForTest(mapPath: string): void {
-  _sessionMapPath = mapPath;
-  _sessionMap = null;
-}
-
-function sessionMapPath(): string {
-  if (!_sessionMapPath) {
-    // eslint-disable-next-line @typescript-eslint/no-var-requires
-    const { app } = require('electron');
-    _sessionMapPath = path.join(app.getPath('userData'), 'pty-session-map.json');
-  }
-  return _sessionMapPath;
-}
-
-function loadSessionMap(): Record<string, SessionEntry> {
-  if (_sessionMap) return _sessionMap;
-  try {
-    _sessionMap = JSON.parse(fs.readFileSync(sessionMapPath(), 'utf-8'));
-  } catch {
-    _sessionMap = {};
-  }
-  return _sessionMap!;
-}
-
-/** Check if the session map has entries for other chats of the same provider in the same cwd. */
-function hasOtherSameProviderSessions(ptyId: string, providerId: string, cwd: string): boolean {
-  const map = loadSessionMap();
-  const prefix = `${providerId}-`;
-  return Object.entries(map).some(
-    ([key, entry]) => key.startsWith(prefix) && key !== ptyId && entry.cwd === cwd
-  );
-}
-
-function markSessionCreated(ptyId: string, uuid: string, cwd: string): void {
-  const map = loadSessionMap();
-  map[ptyId] = { uuid, cwd };
-  try {
-    fs.writeFileSync(sessionMapPath(), JSON.stringify(map));
-  } catch (e) {
-    log.warn('ptyManager: failed to persist session map', e);
-  }
-}
-
-function removeSessionId(ptyId: string): void {
-  const map = loadSessionMap();
-  delete map[ptyId];
-  try {
-    fs.writeFileSync(sessionMapPath(), JSON.stringify(map));
-  } catch (e) {
-    log.warn('ptyManager: failed to persist session map after removal', e);
-  }
-}
-
-function claudeSessionFileExists(uuid: string, cwd: string): boolean {
-  try {
-    const encoded = cwd.replace(/[:\\/]/g, '-');
-    const sessionFile = path.join(os.homedir(), '.claude', 'projects', encoded, `${uuid}.jsonl`);
-    return fs.existsSync(sessionFile);
-  } catch {
-    return false;
-  }
-}
-
-/**
- * Discover the existing Claude session ID for a working directory by scanning
- * Claude Code's local project storage (~/.claude/projects/<encoded-path>/).
- *
- * Claude stores each conversation as a <uuid>.jsonl file. We pick the most
- * recently modified file whose UUID is NOT already claimed by another chat
- * in our session map. This lets us seamlessly adopt an existing session
- * when transitioning the main chat to session-isolated mode, so no history
- * is lost.
- */
-function discoverExistingClaudeSession(cwd: string, excludeUuids: Set<string>): string | null {
-  try {
-    // Claude encodes project paths by replacing path separators; on Windows also strip ':'.
-    const encoded = cwd.replace(/[:\\/]/g, '-');
-    const projectDir = path.join(os.homedir(), '.claude', 'projects', encoded);
-
-    if (!fs.existsSync(projectDir)) return null;
-
-    const entries = fs.readdirSync(projectDir).filter((f) => f.endsWith('.jsonl'));
-    if (entries.length === 0) return null;
-
-    // Sort by modification time, newest first
-    const sorted = entries
-      .map((f) => ({
-        uuid: f.replace('.jsonl', ''),
-        mtime: fs.statSync(path.join(projectDir, f)).mtimeMs,
-      }))
-      .sort((a, b) => b.mtime - a.mtime);
-
-    // Return the most recent session not claimed by another chat
-    for (const entry of sorted) {
-      if (!excludeUuids.has(entry.uuid)) {
-        return entry.uuid;
-      }
-    }
-    return null;
-  } catch (e) {
-    log.warn('ptyManager: failed to discover existing Claude session', e);
-    return null;
-  }
-}
-
-/** Collect all session UUIDs from the map that belong to a given provider in the same cwd, excluding one PTY. */
-function getOtherSessionUuids(ptyId: string, providerId: string, cwd: string): Set<string> {
-  const map = loadSessionMap();
-  const prefix = `${providerId}-`;
-  const uuids = new Set<string>();
-  for (const [key, entry] of Object.entries(map)) {
-    if (key.startsWith(prefix) && key !== ptyId && entry.cwd === cwd) {
-      uuids.add(entry.uuid);
-    }
-  }
-  return uuids;
-}
-
-/**
- * Build session-isolation CLI args for a provider that supports sessionIdFlag.
- *
- * Decision tree:
- *   1. Known session in map        → --resume <uuid>
- *   2. Additional chat (new)       → --session-id <uuid>  (create)
- *   3. Multi-chat transition       → --session-id <discovered-uuid>  (adopt existing)
- *   4. First-time main chat        → --session-id <uuid>  (create, proactive)
- *   5. Existing single-chat resume → (no isolation, caller uses generic -c -r)
- *
- * Returns true if session isolation args were added.
- */
-export function applySessionIsolation(
-  cliArgs: string[],
-  provider: ProviderDefinition,
-  id: string,
-  cwd: string,
-  isResume: boolean
-): boolean {
-  if (!provider.sessionIdFlag) return false;
-
-  const parsed = parsePtyId(id);
-  if (!parsed) return false;
-
-  const sessionUuid = deterministicUuid(parsed.suffix);
-  const isAdditionalChat = parsed.kind === 'chat';
-
-  const entry = loadSessionMap()[id];
-  const knownSession = entry?.uuid;
-  if (knownSession) {
-    // For Claude, validate the session still exists on disk before resuming.
-    // Also treat cwd mismatch as stale — the session belongs to a different
-    // project context and Claude would look in the wrong directory.
-    if (provider.id === 'claude') {
-      const isStale = entry.cwd !== cwd || !claudeSessionFileExists(knownSession, cwd);
-      if (isStale) {
-        log.warn('ptyManager: stale session detected, creating new session', {
-          ptyId: id,
-          staleUuid: knownSession,
-        });
-        removeSessionId(id);
-        // Fall through — the decision tree below will create a new session
-        // or the caller will use generic resume flags
-      } else {
-        cliArgs.push('--resume', knownSession);
-        return true;
-      }
-    } else {
-      cliArgs.push('--resume', knownSession);
-      return true;
-    }
-  }
-
-  if (isAdditionalChat) {
-    cliArgs.push(provider.sessionIdFlag, sessionUuid);
-    markSessionCreated(id, sessionUuid, cwd);
-    return true;
-  }
-
-  if (hasOtherSameProviderSessions(id, parsed.providerId, cwd)) {
-    // Main chat transitioning to multi-chat mode. Try to discover its
-    // existing session from Claude's local storage and adopt it.
-    const otherUuids = getOtherSessionUuids(id, parsed.providerId, cwd);
-    const existingSession = discoverExistingClaudeSession(cwd, otherUuids);
-    if (existingSession) {
-      cliArgs.push(provider.sessionIdFlag, existingSession);
-      markSessionCreated(id, existingSession, cwd);
-    } else {
-      cliArgs.push(provider.sessionIdFlag, sessionUuid);
-      markSessionCreated(id, sessionUuid, cwd);
-    }
-    return true;
-  }
-
-  if (!isResume) {
-    // First-time creation — proactively assign a session ID so we can
-    // reliably resume later if more chats of this provider are added.
-    cliArgs.push(provider.sessionIdFlag, sessionUuid);
-    markSessionCreated(id, sessionUuid, cwd);
-    return true;
-  }
-
-  return false;
-}
-
-/**
- * Parse a shell-style argument string into an array of arguments.
- * Handles single quotes, double quotes, and escape characters.
- *
- * Examples:
- *   '--flag1 --flag2' → ['--flag1', '--flag2']
- *   '--message "hello world"' → ['--message', 'hello world']
- *   "--path '/my dir/file'" → ['--path', '/my dir/file']
- *   '--arg "say \"hi\""' → ['--arg', 'say "hi"']
- */
-export function parseShellArgs(input: string): string[] {
-  const args: string[] = [];
-  let current = '';
-  let inSingleQuote = false;
-  let inDoubleQuote = false;
-  let escape = false;
-
-  for (let i = 0; i < input.length; i++) {
-    const char = input[i];
-
-    if (escape) {
-      // Handle escaped character
-      current += char;
-      escape = false;
-      continue;
-    }
-
-    if (char === '\\') {
-      if (process.platform === 'win32') {
-        // Preserve backslashes for Windows paths. Only treat \" inside double-quotes as an escape.
-        const next = input[i + 1];
-        if (inDoubleQuote && next === '"') {
-          escape = true;
-          continue;
-        }
-      } else if (!inSingleQuote) {
-        // POSIX-style backslash escapes next character (except inside single quotes)
-        escape = true;
-        continue;
-      }
-    }
-
-    if (char === "'" && !inDoubleQuote) {
-      // Toggle single quote mode
-      inSingleQuote = !inSingleQuote;
-      continue;
-    }
-
-    if (char === '"' && !inSingleQuote) {
-      // Toggle double quote mode
-      inDoubleQuote = !inDoubleQuote;
-      continue;
-    }
-
-    if (char === ' ' && !inSingleQuote && !inDoubleQuote) {
-      // Space outside quotes - end of argument
-      if (current.length > 0) {
-        args.push(current);
-        current = '';
-      }
-      continue;
-    }
-
-    current += char;
-  }
-
-  // Handle trailing backslash: include it literally
-  if (escape) {
-    current += '\\';
-  }
-
-  // Warn on unclosed quotes (still push what we have)
-  if (inSingleQuote || inDoubleQuote) {
-    log.warn('parseShellArgs: unclosed quote in input', { input });
-  }
-
-  // Don't forget the last argument
-  if (current.length > 0) {
-    args.push(current);
-  }
-
-  return args;
-}
-
-export type ResolvedProviderCommandConfig = {
-  provider: ProviderDefinition;
-  cli: string;
-  resumeFlag?: string;
-  defaultArgs?: string[];
-  autoApproveFlag?: string;
-  initialPromptFlag?: string;
-  extraArgs?: string[];
-  env?: Record<string, string>;
-};
-
-type ProviderCliArgsOptions = {
-  resume?: boolean;
-  resumeFlag?: string;
-  defaultArgs?: string[];
-  extraArgs?: string[];
-  autoApprove?: boolean;
-  autoApproveFlag?: string;
-  initialPrompt?: string;
-  initialPromptFlag?: string;
-  useKeystrokeInjection?: boolean;
-};
-
-export function resolveProviderCommandConfig(
-  providerId: string
-): ResolvedProviderCommandConfig | null {
-  const provider = PROVIDERS.find((p) => p.id === providerId);
-  if (!provider) return null;
-
-  const customConfig = getProviderCustomConfig(provider.id);
-
-  const extraArgs =
-    customConfig?.extraArgs !== undefined && customConfig.extraArgs.trim() !== ''
-      ? parseShellArgs(customConfig.extraArgs.trim())
-      : undefined;
-
-  let env: Record<string, string> | undefined;
-  if (customConfig?.env && typeof customConfig.env === 'object') {
-    env = {};
-    for (const [k, v] of Object.entries(customConfig.env)) {
-      if (typeof v === 'string' && /^[A-Za-z_][A-Za-z0-9_]*$/.test(k)) {
-        env[k] = v;
-      }
-    }
-    if (Object.keys(env).length === 0) env = undefined;
-  }
-
-  return {
-    provider,
-    cli:
-      customConfig?.cli !== undefined && customConfig.cli !== ''
-        ? customConfig.cli
-        : provider.cli || providerId.toLowerCase(),
-    resumeFlag:
-      customConfig?.resumeFlag !== undefined ? customConfig.resumeFlag : provider.resumeFlag,
-    defaultArgs:
-      customConfig?.defaultArgs !== undefined
-        ? parseShellArgs(customConfig.defaultArgs)
-        : provider.defaultArgs,
-    autoApproveFlag:
-      customConfig?.autoApproveFlag !== undefined
-        ? customConfig.autoApproveFlag
-        : provider.autoApproveFlag,
-    initialPromptFlag:
-      customConfig?.initialPromptFlag !== undefined
-        ? customConfig.initialPromptFlag
-        : provider.initialPromptFlag,
-    extraArgs,
-    env,
-  };
-}
-
-export function buildProviderCliArgs(options: ProviderCliArgsOptions): string[] {
-  const args: string[] = [];
-
-  if (options.resume && options.resumeFlag) {
-    args.push(...parseShellArgs(options.resumeFlag));
-  }
-
-  if (options.defaultArgs?.length) {
-    args.push(...options.defaultArgs);
-  }
-
-  if (options.autoApprove && options.autoApproveFlag) {
-    args.push(...parseShellArgs(options.autoApproveFlag));
-  }
-
-  if (
-    options.initialPromptFlag !== undefined &&
-    !options.useKeystrokeInjection &&
-    options.initialPrompt?.trim()
-  ) {
-    if (options.initialPromptFlag) {
-      args.push(...parseShellArgs(options.initialPromptFlag));
-    }
-    args.push(options.initialPrompt.trim());
-  }
-
-  if (options.extraArgs?.length) {
-    args.push(...options.extraArgs);
-  }
-
-  return args;
-}
-
-const resolvedCommandPathCache = new Map<string, string | null>();
-
-function resolveCommandPath(command: string): string | null {
-  const trimmed = command.trim();
-  if (!trimmed) return null;
-
-  const pathLike =
-    trimmed.includes('/') ||
-    trimmed.includes('\\') ||
-    trimmed.startsWith('.') ||
-    /^[A-Za-z]:/.test(trimmed);
-
-  const isExecutableFile = (candidate: string): boolean => {
-    try {
-      const stat = fs.statSync(candidate);
-      if (!stat.isFile()) return false;
-      if (process.platform === 'win32') return true;
-      fs.accessSync(candidate, fs.constants.X_OK);
-      return true;
-    } catch {
-      return false;
-    }
-  };
-
-  const appendWindowsExecutableExts = (base: string): string[] => {
-    if (process.platform !== 'win32') return [base];
-
-    if (path.extname(base)) return [base];
-
-    const pathExt = process.env.PATHEXT || '.COM;.EXE;.BAT;.CMD';
-    const exts = pathExt
-      .split(';')
-      .map((ext) => ext.trim())
-      .filter(Boolean);
-    return [base, ...exts.map((ext) => `${base}${ext.toLowerCase()}`)];
-  };
-
-  const resolveFromCandidates = (bases: string[], makeAbsolute: boolean): string | null => {
-    for (const base of bases) {
-      const candidates = appendWindowsExecutableExts(base);
-      for (const candidate of candidates) {
-        const target = makeAbsolute ? path.resolve(candidate) : candidate;
-        if (isExecutableFile(target)) {
-          return target;
-        }
-      }
-    }
-    return null;
-  };
-
-  if (pathLike) {
-    return resolveFromCandidates([trimmed], true);
-  }
-
-  const pathEnv = process.env.PATH;
-  if (!pathEnv) return null;
-
-  const pathDirs = pathEnv.split(path.delimiter).filter(Boolean);
-  const pathCandidates = pathDirs.map((dir) => path.join(dir, trimmed));
-  return resolveFromCandidates(pathCandidates, false);
-}
-
-export function parseCustomCliForDirectSpawn(input: string): string[] {
-  const trimmed = input.trim();
-  if (!trimmed) return [];
-
-  if (process.platform !== 'win32') {
-    return parseShellArgs(trimmed);
-  }
-
-  // Preserve backslashes for Windows absolute/UNC paths.
-  if ((/^[A-Za-z]:\\/.test(trimmed) || /^\\\\/.test(trimmed)) && !/\s/.test(trimmed)) {
-    return [trimmed];
-  }
-
-  // Handle quoted absolute paths with spaces, e.g. "C:\Program Files\tool\tool.cmd"
-  const quotedAbsolutePath = trimmed.match(/^"([A-Za-z]:\\[^"]+)"$/);
-  if (quotedAbsolutePath) {
-    return [quotedAbsolutePath[1]];
-  }
-  const singleQuotedAbsolutePath = trimmed.match(/^'([A-Za-z]:\\[^']+)'$/);
-  if (singleQuotedAbsolutePath) {
-    return [singleQuotedAbsolutePath[1]];
-  }
-
-  return parseShellArgs(trimmed);
-}
-
-function resolveCommandPathCached(command: string): string | null {
-  if (resolvedCommandPathCache.has(command)) {
-    return resolvedCommandPathCache.get(command) ?? null;
-  }
-  const resolved = resolveCommandPath(command);
-  resolvedCommandPathCache.set(command, resolved);
-  return resolved;
-}
-
-function needsShellResolution(command: string): boolean {
-  return /[|&;<>()$`]/.test(command);
-}
-
-// Callback to spawn shell after direct CLI exits (set by ptyIpc)
-let onDirectCliExitCallback: ((id: string, cwd: string) => void) | null = null;
-
-export function setOnDirectCliExit(callback: (id: string, cwd: string) => void): void {
-  onDirectCliExitCallback = callback;
-}
-
-function escapeShSingleQuoted(value: string): string {
-  // Safe for embedding into a single-quoted POSIX shell string.
-  return `'${value.replace(/'/g, "'\\''")}'`;
-}
-
-/**
- * Spawn an interactive SSH session in a PTY.
- *
- * This uses the system `ssh` binary so user SSH config features (e.g. ProxyJump,
- * UseKeychain on macOS) work as expected.
- */
-export function startSshPty(options: {
-  id: string;
-  target: string; // alias or user@host
-  sshArgs?: string[]; // extra ssh args like -p, -i
-  remoteInitCommand?: string; // if provided, executed by remote shell
-  cols?: number;
-  rows?: number;
-  env?: Record<string, string>;
-}): IPty {
-  if (process.env.EMDASH_DISABLE_PTY === '1') {
-    throw new Error('PTY disabled via EMDASH_DISABLE_PTY=1');
-  }
-
-  const { id, target, sshArgs = [], remoteInitCommand, cols = 120, rows = 32, env } = options;
-
-  // Lazy load native module
-  let pty: typeof import('node-pty');
-  try {
-    pty = require('node-pty');
-  } catch (e: any) {
-    throw new Error(`PTY unavailable: ${e?.message || String(e)}`);
-  }
-
-  // Build a minimal environment; include SSH_AUTH_SOCK so agent works.
-  const useEnv: Record<string, string> = {
-    TERM: 'xterm-256color',
-    COLORTERM: 'truecolor',
-    TERM_PROGRAM: 'emdash',
-    HOME: process.env.HOME || os.homedir(),
-    USER: process.env.USER || os.userInfo().username,
-    PATH: process.env.PATH || process.env.Path || '',
-    ...(process.env.LANG && { LANG: process.env.LANG }),
-    ...(process.env.TMPDIR && { TMPDIR: process.env.TMPDIR }),
-    ...getDisplayEnv(),
-    ...(process.env.SSH_AUTH_SOCK && { SSH_AUTH_SOCK: process.env.SSH_AUTH_SOCK }),
-    ...(process.platform === 'win32' ? getWindowsEssentialEnv() : {}),
-  };
-
-  // Pass through agent authentication env vars (same allowlist as direct spawn)
-  for (const key of AGENT_ENV_VARS) {
-    if (process.env[key]) {
-      useEnv[key] = process.env[key] as string;
-    }
-  }
-
-  if (env) {
-    for (const [key, value] of Object.entries(env)) {
-      if (!key.startsWith('EMDASH_')) continue;
-      if (typeof value === 'string') {
-        useEnv[key] = value;
-      }
-    }
-  }
-
-  const args: string[] = ['-tt', ...sshArgs, target];
-  if (typeof remoteInitCommand === 'string' && remoteInitCommand.trim().length > 0) {
-    // Pass as a single remote command argument; ssh will execute it via the remote user's shell.
-    args.push(remoteInitCommand);
-  }
-
-  const proc = pty.spawn('ssh', args, {
-    name: 'xterm-256color',
-    cols,
-    rows,
-    cwd: process.env.HOME || os.homedir(),
-    env: useEnv,
-  });
-
-  ptys.set(id, { id, proc, kind: 'ssh', cols, rows });
-  return proc;
-}
-
-/**
- * Spawn a CLI directly without a shell wrapper.
- * This is faster because it skips shell config loading (oh-my-zsh, nvm, etc.)
- *
- * Returns null if the CLI path is not known (not in providerStatusCache)
- * or when CLI config requires shell parsing.
- */
-export function startDirectPty(options: {
-  id: string;
-  providerId: string;
-  cwd: string;
-  cols?: number;
-  rows?: number;
-  autoApprove?: boolean;
-  initialPrompt?: string;
-  env?: Record<string, string>;
-  resume?: boolean;
-  tmux?: boolean;
-}): IPty | null {
-  if (process.env.EMDASH_DISABLE_PTY === '1') {
-    throw new Error('PTY disabled via EMDASH_DISABLE_PTY=1');
-  }
-
-  // Tmux wrapping requires a shell — fall back to startPty() which handles tmux.
-  if (options.tmux) {
-    log.info('ptyManager:directSpawn - tmux enabled, falling back to shell spawn', {
-      id: options.id,
-    });
-    return null;
-  }
-
-  const {
-    id,
-    providerId,
-    cwd,
-    cols = 120,
-    rows = 32,
-    autoApprove,
-    initialPrompt,
-    env,
-    resume,
-  } = options;
-
-  const resolvedConfig = resolveProviderCommandConfig(providerId);
-  const provider = resolvedConfig?.provider;
-
-  // Get the CLI path from cache
-  const status = providerStatusCache.get(providerId);
-  if (!status?.installed || !status?.path) {
-    log.warn('ptyManager:directSpawn - CLI path not found', { providerId });
-    return null;
-  }
-
-  let cliPath = status.path;
-
-  // Direct spawn requires an executable path. If custom CLI is an alias or shell
-  // expression, fall back to shell mode.
-  if (provider && resolvedConfig && resolvedConfig.cli !== provider.cli) {
-    const cliParts = parseCustomCliForDirectSpawn(resolvedConfig.cli);
-    if (cliParts.length !== 1) {
-      log.info('ptyManager:directSpawn - custom CLI needs shell parsing, using fallback', {
-        providerId,
-        cli: resolvedConfig.cli,
-      });
-      return null;
-    }
-
-    const customCommand = cliParts[0];
-    if (needsShellResolution(customCommand)) {
-      log.info('ptyManager:directSpawn - custom CLI requires shell resolution, using fallback', {
-        providerId,
-        cli: resolvedConfig.cli,
-      });
-      return null;
-    }
-
-    const resolvedCustomPath = resolveCommandPathCached(customCommand);
-    if (!resolvedCustomPath) {
-      log.info('ptyManager:directSpawn - custom CLI not directly executable, using fallback', {
-        providerId,
-        cli: resolvedConfig.cli,
-      });
-      return null;
-    }
-
-    cliPath = resolvedCustomPath;
-  }
-
-  // Build CLI arguments
-  const cliArgs: string[] = [];
-
-  if (provider && resolvedConfig) {
-    // Session isolation for multi-chat scenarios.
-    // See applySessionIsolation() for the full decision tree.
-    const usedSessionIsolation = applySessionIsolation(cliArgs, provider, id, cwd, !!resume);
-
-    cliArgs.push(
-      ...buildProviderCliArgs({
-        resume: !usedSessionIsolation && !!resume,
-        resumeFlag: resolvedConfig.resumeFlag,
-        defaultArgs: resolvedConfig.defaultArgs,
-        extraArgs: resolvedConfig.extraArgs,
-        autoApprove,
-        autoApproveFlag: resolvedConfig.autoApproveFlag,
-        initialPrompt,
-        initialPromptFlag: resolvedConfig.initialPromptFlag,
-        useKeystrokeInjection: provider.useKeystrokeInjection,
-      })
-    );
-  }
-
-  // Build minimal environment - just what the CLI needs
-  const useEnv: Record<string, string> = {
-    TERM: 'xterm-256color',
-    COLORTERM: 'truecolor',
-    TERM_PROGRAM: 'emdash',
-    HOME: process.env.HOME || os.homedir(),
-    USER: process.env.USER || os.userInfo().username,
-    // Include PATH so CLI can find its dependencies
-    PATH: process.env.PATH || process.env.Path || '',
-    ...(process.env.LANG && { LANG: process.env.LANG }),
-    ...(process.env.TMPDIR && { TMPDIR: process.env.TMPDIR }),
-    ...getDisplayEnv(),
-    ...(process.env.SSH_AUTH_SOCK && { SSH_AUTH_SOCK: process.env.SSH_AUTH_SOCK }),
-    ...(process.platform === 'win32' ? getWindowsEssentialEnv() : {}),
-  };
-
-  // Pass through agent authentication env vars
-  for (const key of AGENT_ENV_VARS) {
-    if (process.env[key]) {
-      useEnv[key] = process.env[key];
-    }
-  }
-
-  if (resolvedConfig?.env) {
-    for (const [key, value] of Object.entries(resolvedConfig.env)) {
-      if (/^[A-Za-z_][A-Za-z0-9_]*$/.test(key) && typeof value === 'string') {
-        useEnv[key] = value;
-      }
-    }
-  }
-
-  if (env) {
-    for (const [key, value] of Object.entries(env)) {
-      if (!key.startsWith('EMDASH_')) continue;
-      if (typeof value === 'string') {
-        useEnv[key] = value;
-      }
-    }
-  }
-
-  // Pass agent event hook env vars so CLI hooks can call back to Emdash
-  const hookPort = agentEventService.getPort();
-  if (hookPort > 0) {
-    useEnv['EMDASH_HOOK_PORT'] = String(hookPort);
-    useEnv['EMDASH_PTY_ID'] = id;
-    useEnv['EMDASH_HOOK_TOKEN'] = agentEventService.getToken();
-  }
-
-  // Lazy load native module
-  let pty: typeof import('node-pty');
-  try {
-    pty = require('node-pty');
-  } catch (e: any) {
-    throw new Error(`PTY unavailable: ${e?.message || String(e)}`);
-  }
-
-  const spawnSpec = resolveWindowsPtySpawn(cliPath, cliArgs);
-  const proc = pty.spawn(spawnSpec.command, spawnSpec.args, {
-    name: 'xterm-256color',
-    cols,
-    rows,
-    cwd,
-    env: useEnv,
-  });
-
-  // Store record with cwd for shell respawn after CLI exits
-  ptys.set(id, { id, proc, cwd, isDirectSpawn: true, kind: 'local', cols, rows });
-
-  // When CLI exits, spawn a shell so user can continue working
-  proc.onExit(() => {
-    const rec = ptys.get(id);
-    if (rec?.isDirectSpawn && rec.cwd && onDirectCliExitCallback) {
-      // Spawn shell immediately after CLI exits
-      onDirectCliExitCallback(id, rec.cwd);
-    }
-  });
-
-  return proc;
-}
-
-function getDefaultShell(): string {
-  if (process.platform === 'win32') {
-    // Prefer ComSpec (usually cmd.exe) or fallback to PowerShell
-    return process.env.ComSpec || 'C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe';
-  }
-  return process.env.SHELL || '/bin/bash';
-}
-
-export async function startPty(options: {
-  id: string;
-  cwd?: string;
-  shell?: string;
-  env?: NodeJS.ProcessEnv;
-  cols?: number;
-  rows?: number;
-  autoApprove?: boolean;
-  initialPrompt?: string;
-  skipResume?: boolean;
-  shellSetup?: string;
-  tmux?: boolean;
-}): Promise<IPty> {
-  if (process.env.EMDASH_DISABLE_PTY === '1') {
-    throw new Error('PTY disabled via EMDASH_DISABLE_PTY=1');
-  }
-  const {
-    id,
-    cwd,
-    shell,
-    env,
-    cols = 80,
-    rows = 24,
-    autoApprove,
-    initialPrompt,
-    skipResume,
-    shellSetup,
-    tmux,
-  } = options;
-
-  const defaultShell = getDefaultShell();
-  let useShell = shell || defaultShell;
-  const useCwd = cwd || process.cwd() || os.homedir();
-
-  // Build a clean environment instead of inheriting process.env wholesale.
-  //
-  // WHY: When Emdash runs as an AppImage on Linux (or other packaged Electron apps),
-  // the parent process.env contains packaging artifacts like PYTHONHOME, APPDIR,
-  // APPIMAGE, etc. These variables can break user tools, especially Python virtual
-  // environments which fail with "Could not find platform independent libraries"
-  // when PYTHONHOME points to the AppImage's bundled Python.
-  //
-  // SOLUTION: Only pass through essential variables and let login shells (-il)
-  // rebuild the environment from the user's shell configuration files
-  // (.profile, .bashrc, .zshrc, etc.). This is how `sudo -i`, `ssh`, and other
-  // tools create clean user environments.
-  //
-  // See: https://github.com/generalaction/emdash/issues/485
-  const useEnv: Record<string, string> = {
-    TERM: 'xterm-256color',
-    COLORTERM: 'truecolor',
-    TERM_PROGRAM: 'emdash',
-    HOME: process.env.HOME || os.homedir(),
-    USER: process.env.USER || os.userInfo().username,
-    SHELL: process.env.SHELL || defaultShell,
-    ...(process.platform === 'win32' ? getWindowsEssentialEnv() : {}),
-    ...(process.env.LANG && { LANG: process.env.LANG }),
-    ...(process.env.TMPDIR && { TMPDIR: process.env.TMPDIR }),
-    ...(process.env.DISPLAY && { DISPLAY: process.env.DISPLAY }),
-    ...getDisplayEnv(),
-    ...(process.env.SSH_AUTH_SOCK && { SSH_AUTH_SOCK: process.env.SSH_AUTH_SOCK }),
-    ...(env || {}),
-  };
-
-  // Pass agent event hook env vars so CLI hooks can call back to Emdash
-  const hookPort = agentEventService.getPort();
-  if (hookPort > 0) {
-    useEnv['EMDASH_HOOK_PORT'] = String(hookPort);
-    useEnv['EMDASH_PTY_ID'] = id;
-    useEnv['EMDASH_HOOK_TOKEN'] = agentEventService.getToken();
-  }
-
-  // On Windows, resolve shell command to full path for node-pty
-  if (process.platform === 'win32' && shell && !shell.includes('\\') && !shell.includes('/')) {
-    try {
-      // eslint-disable-next-line @typescript-eslint/no-var-requires
-      const { execSync } = require('child_process');
-
-      // Try .cmd first (npm globals are typically .cmd files)
-      let resolved = '';
-      try {
-        resolved = execSync(`where ${shell}.cmd`, { encoding: 'utf8' })
-          .trim()
-          .split('\n')[0]
-          .replace(/\r/g, '')
-          .trim();
-      } catch {
-        // If .cmd doesn't exist, try without extension
-        resolved = execSync(`where ${shell}`, { encoding: 'utf8' })
-          .trim()
-          .split('\n')[0]
-          .replace(/\r/g, '')
-          .trim();
-      }
-
-      // Ensure we have an executable extension
-      if (resolved && !resolved.match(/\.(exe|cmd|bat)$/i)) {
-        // If no executable extension, try appending .cmd
-        const cmdPath = resolved + '.cmd';
-        try {
-          // eslint-disable-next-line @typescript-eslint/no-var-requires
-          const fs = require('fs');
-          if (fs.existsSync(cmdPath)) {
-            resolved = cmdPath;
-          }
-        } catch {
-          // Ignore fs errors
-        }
-      }
-
-      if (resolved) {
-        useShell = resolved;
-      }
-    } catch {
-      // Fall back to original shell name
-    }
-  }
-
-  // Lazy load native module at call time to prevent startup crashes
-  // eslint-disable-next-line @typescript-eslint/no-var-requires
-  let pty: typeof import('node-pty');
-  try {
-    pty = require('node-pty');
-  } catch (e: any) {
-    throw new Error(`PTY unavailable: ${e?.message || String(e)}`);
-  }
-
-  // Provide sensible defaults for interactive shells so they render prompts.
-  // For provider CLIs, spawn the user's shell and run the provider command via -c,
-  // then exec back into the shell to allow users to stay in a normal prompt after exiting the agent.
-  const args: string[] = [];
-  if (process.platform !== 'win32') {
-    try {
-      const base = String(useShell).split('/').pop() || '';
-      const baseLower = base.toLowerCase();
-      const provider = PROVIDERS.find((p) => p.cli === baseLower);
-
-      if (provider) {
-        const resolvedConfig = resolveProviderCommandConfig(provider.id);
-        const resolvedCli = resolvedConfig?.cli || provider.cli || baseLower;
-
-        // Build the provider command with flags
-        const cliArgs: string[] = [];
-
-        // Session isolation — see applySessionIsolation() for the full decision tree.
-        const usedSessionIsolation = applySessionIsolation(
-          cliArgs,
-          provider,
-          id,
-          useCwd,
-          !skipResume
-        );
-
-        cliArgs.push(
-          ...buildProviderCliArgs({
-            resume: !usedSessionIsolation && !skipResume,
-            resumeFlag: resolvedConfig?.resumeFlag,
-            defaultArgs: resolvedConfig?.defaultArgs,
-            extraArgs: resolvedConfig?.extraArgs,
-            autoApprove,
-            autoApproveFlag: resolvedConfig?.autoApproveFlag,
-            initialPrompt,
-            initialPromptFlag: resolvedConfig?.initialPromptFlag,
-            useKeystrokeInjection: provider.useKeystrokeInjection,
-          })
-        );
-
-        if (resolvedConfig?.env) {
-          for (const [k, v] of Object.entries(resolvedConfig.env)) {
-            if (/^[A-Za-z_][A-Za-z0-9_]*$/.test(k) && typeof v === 'string') {
-              useEnv[k] = v;
-            }
-          }
-        }
-
-        const cliCommand = resolvedCli;
-        const commandString =
-          cliArgs.length > 0
-            ? `${cliCommand} ${cliArgs
-                .map((arg) =>
-                  /[\s'"\\$`\n\r\t]/.test(arg) ? `'${arg.replace(/'/g, "'\\''")}'` : arg
-                )
-                .join(' ')}`
-            : cliCommand;
-
-        const shellBase = (defaultShell.split('/').pop() || '').toLowerCase();
-
-        // After the provider exits, exec back into the user's shell (login+interactive)
-        const resumeShell =
-          shellBase === 'fish'
-            ? `'${defaultShell.replace(/'/g, "'\\''")}' -i -l`
-            : `'${defaultShell.replace(/'/g, "'\\''")}' -il`;
-        const chainCommand = shellSetup
-          ? `${shellSetup} && ${commandString}; exec ${resumeShell}`
-          : `${commandString}; exec ${resumeShell}`;
-
-        // Always use the default shell for the -c command to avoid re-detecting provider CLI
-        useShell = defaultShell;
-        if (shellBase === 'zsh') args.push('-lic', chainCommand);
-        else if (shellBase === 'bash') args.push('-lic', chainCommand);
-        else if (shellBase === 'fish') args.push('-l', '-i', '-c', chainCommand);
-        else if (shellBase === 'sh') args.push('-lc', chainCommand);
-        else args.push('-c', chainCommand); // Fallback for other shells
-      } else {
-        // For normal shells, use login + interactive to load user configs
-        if (shellSetup) {
-          const resumeShell =
-            baseLower === 'fish'
-              ? `'${useShell.replace(/'/g, "'\\''")}' -i -l`
-              : `'${useShell.replace(/'/g, "'\\''")}' -il`;
-          if (baseLower === 'fish') {
-            args.push('-l', '-i', '-c', `${shellSetup}; exec ${resumeShell}`);
-          } else {
-            const cFlag = baseLower === 'sh' ? '-lc' : '-lic';
-            args.push(cFlag, `${shellSetup}; exec ${resumeShell}`);
-          }
-        } else {
-          if (baseLower === 'fish') {
-            args.push('-i', '-l');
-          } else {
-            args.push(
-              baseLower === 'zsh' || baseLower === 'bash' || baseLower === 'sh' ? '-il' : '-i'
-            );
-          }
-        }
-      }
-    } catch {}
-  }
-
-  // When tmux is enabled, wrap the spawn in a tmux session.
-  // tmux new-session -As <name> creates or attaches to a named session.
-  // The inner shell command (with the agent CLI) runs inside tmux.
-  let tmuxSessionName: string | undefined;
-  let spawnCommand = useShell;
-  let spawnArgs = args;
-
-  if (tmux && process.platform !== 'win32') {
-    let tmuxAvailable = false;
-    try {
-      const { execFileSync } = require('child_process');
-      execFileSync('tmux', ['-V'], { timeout: 3000, stdio: 'ignore' });
-      tmuxAvailable = true;
-    } catch {
-      log.warn('ptyManager:tmux - tmux not found, falling back to unwrapped spawn', { id });
-    }
-
-    if (tmuxAvailable) {
-      tmuxSessionName = getTmuxSessionName(id);
-      // Build: tmux new-session -As <name> -- <shell> <args...>
-      spawnCommand = 'tmux';
-      spawnArgs = ['new-session', '-As', tmuxSessionName, '--', useShell, ...args];
-      log.info('ptyManager:tmux - wrapping in tmux session', { id, tmuxSessionName });
-    }
-  }
-
-  let proc: IPty;
-  try {
-    const spawnSpec = resolveWindowsPtySpawn(spawnCommand, spawnArgs);
-    proc = pty.spawn(spawnSpec.command, spawnSpec.args, {
-      name: 'xterm-256color',
-      cols,
-      rows,
-      cwd: useCwd,
-      env: useEnv,
-    });
-  } catch (err: any) {
-    // Track initial spawn error
-    const provider = args.find((arg) => PROVIDERS.some((p) => p.cli === arg));
-    await errorTracking.captureAgentSpawnError(err, shell || 'unknown', id, {
-      cwd: useCwd,
-      args: args.join(' '),
-      provider: provider || undefined,
-    });
-
-    try {
-      const fallbackShell = getDefaultShell();
-      proc = pty.spawn(fallbackShell, [], {
-        name: 'xterm-256color',
-        cols,
-        rows,
-        cwd: useCwd,
-        env: useEnv,
-      });
-    } catch (err2: any) {
-      // Track the fallback spawn error as critical
-      await errorTracking.captureCriticalError(err2, {
-        operation: 'pty_spawn_fallback',
-        service: 'ptyManager',
-        error_type: 'spawn_error',
-        shell: getDefaultShell(),
-        original_error: err?.message,
-      });
-      throw new Error(`PTY spawn failed: ${err2?.message || err?.message || String(err2 || err)}`);
-    }
-  }
-
-  ptys.set(id, { id, proc, kind: 'local', cols, rows, tmuxSessionName });
-  return proc;
-}
-
-export function writePty(id: string, data: string): void {
-  const rec = ptys.get(id);
-  if (!rec) {
-    return;
-  }
-  rec.proc.write(data);
-}
-
-export function resizePty(id: string, cols: number, rows: number): void {
-  const rec = ptys.get(id);
-  if (!rec) {
-    return;
-  }
-  const normalizedCols = Number.isFinite(cols) ? Math.max(MIN_PTY_COLS, Math.floor(cols)) : 0;
-  const normalizedRows = Number.isFinite(rows) ? Math.max(MIN_PTY_ROWS, Math.floor(rows)) : 0;
-  if (normalizedCols <= 0 || normalizedRows <= 0) return;
-  if (rec.cols === normalizedCols && rec.rows === normalizedRows) return;
-  try {
-    rec.proc.resize(normalizedCols, normalizedRows);
-    rec.cols = normalizedCols;
-    rec.rows = normalizedRows;
-  } catch (error: any) {
-    if (
-      error &&
-      (error.code === 'EBADF' ||
-        /EBADF/.test(String(error)) ||
-        /Napi::Error/.test(String(error)) ||
-        /ENOTTY/.test(String(error)) ||
-        /ioctl\(2\) failed/.test(String(error)) ||
-        error.message?.includes('not open'))
-    ) {
-      // Expected during shutdown - PTY already exited
-      return;
-    }
-    log.error('ptyManager:resizeFailed', {
-      id,
-      cols: normalizedCols,
-      rows: normalizedRows,
-      error: String(error),
-    });
-  }
-}
-
-export function killPty(id: string): void {
-  const rec = ptys.get(id);
-  if (!rec) {
-    return;
-  }
-  try {
-    rec.proc.kill();
-  } finally {
-    ptys.delete(id);
-  }
-}
-
-export function removePtyRecord(id: string): void {
-  ptys.delete(id);
-}
-
-export function hasPty(id: string): boolean {
-  return ptys.has(id);
-}
-
-export function getPty(id: string): IPty | undefined {
-  return ptys.get(id)?.proc;
-}
-
-export function getPtyKind(id: string): 'local' | 'ssh' | undefined {
-  return ptys.get(id)?.kind;
-}
-
-export function getPtyTmuxSessionName(id: string): string | undefined {
-  return ptys.get(id)?.tmuxSessionName;
-}
diff --git a/src/main/services/ssh/SshConnectionMonitor.ts b/src/main/services/ssh/SshConnectionMonitor.ts
deleted file mode 100644
index 71f6808692..0000000000
--- a/src/main/services/ssh/SshConnectionMonitor.ts
+++ /dev/null
@@ -1,392 +0,0 @@
-import { EventEmitter } from 'events';
-import { ConnectionState, SshConfig } from '../../../shared/ssh/types';
-import { ConnectionMetrics } from './types';
-
-/**
- * Extended metrics with monitoring state
- */
-interface MonitoredConnection {
-  connectionId: string;
-  state: ConnectionState;
-  config: SshConfig;
-  metrics: ConnectionMetrics;
-  reconnectAttempts: number;
-  lastError?: string;
-}
-
-/**
- * Callback that checks whether a connection is still alive in the real
- * connection pool (e.g. SshService.isConnected).
- */
-export type ConnectionChecker = (connectionId: string) => boolean;
-
-/**
- * Events emitted by SshConnectionMonitor:
- * - 'stateChange': (connectionId: string, state: ConnectionState, error?: string) => void
- * - 'healthCheck': (connectionId: string, isHealthy: boolean, latencyMs: number) => void
- * - 'reconnect': (connectionId: string, config: SshConfig, attempt: number) => void
- * - 'reconnectFailed': (connectionId: string, error: string) => void
- * - 'metrics': (connectionId: string, metrics: ConnectionMetrics) => void
- */
-
-/**
- * Service for monitoring SSH connection health and metrics.
- *
- * Instead of maintaining its own ping timer (which was never wired up and
- * caused phantom reconnect loops), the monitor now delegates liveness
- * checks to a `connectionChecker` callback — typically
- * `SshService.isConnected()`. ssh2's built-in keepalive
- * (`keepaliveInterval` / `keepaliveCountMax`) handles the actual TCP
- * liveness; when the connection drops, ssh2 emits `close` which removes
- * the connection from the pool and SshService emits `disconnected`.
- *
- * The monitor reacts to that signal (via `handleDisconnect`) and triggers
- * reconnect with exponential backoff. The periodic health check is now a
- * safety net that detects pool removal the monitor didn't hear about.
- */
-export class SshConnectionMonitor extends EventEmitter {
-  private connections: Map<string, MonitoredConnection> = new Map();
-  private checkInterval?: NodeJS.Timeout;
-  private readonly DEFAULT_INTERVAL_MS = 30000; // 30 seconds
-  private readonly MAX_RECONNECT_ATTEMPTS = 3;
-  private readonly RECONNECT_BACKOFF_MS = [1000, 5000, 15000]; // Exponential backoff delays
-  private connectionChecker: ConnectionChecker;
-
-  constructor(connectionChecker?: ConnectionChecker) {
-    super();
-    // Default: always report alive (no-op). Caller should provide a real checker.
-    this.connectionChecker = connectionChecker ?? (() => true);
-  }
-
-  /**
-   * Starts monitoring a connection.
-   * @param connectionId - ID of the connection to monitor
-   * @param config - SSH configuration for potential reconnection
-   */
-  startMonitoring(connectionId: string, config: SshConfig): void {
-    // Don't duplicate monitoring
-    if (this.connections.has(connectionId)) {
-      return;
-    }
-
-    const now = new Date();
-    const monitored: MonitoredConnection = {
-      connectionId,
-      state: 'connected',
-      config,
-      metrics: {
-        connectionId,
-        bytesSent: 0,
-        bytesReceived: 0,
-        latencyMs: 0,
-        lastPingAt: now,
-      },
-      reconnectAttempts: 0,
-    };
-
-    this.connections.set(connectionId, monitored);
-    this.emit('stateChange', connectionId, 'connected');
-
-    // Start health checks if not already running
-    if (!this.checkInterval) {
-      this.startHealthChecks();
-    }
-  }
-
-  /**
-   * Stops monitoring a connection.
-   * @param connectionId - ID of the connection to stop monitoring
-   */
-  stopMonitoring(connectionId: string): void {
-    const monitored = this.connections.get(connectionId);
-    if (!monitored) {
-      return;
-    }
-
-    // Emit disconnected state before removing
-    if (monitored.state !== 'disconnected') {
-      this.emit('stateChange', connectionId, 'disconnected');
-    }
-
-    this.connections.delete(connectionId);
-
-    // Stop health checks if no more connections
-    if (this.connections.size === 0) {
-      this.stopHealthChecks();
-    }
-  }
-
-  /**
-   * Called when SshService reports a real disconnect (ssh2 `close` event).
-   * Triggers reconnect with backoff if the connection is still being monitored.
-   */
-  handleDisconnect(connectionId: string): void {
-    const monitored = this.connections.get(connectionId);
-    if (!monitored) {
-      return;
-    }
-
-    // Ignore if already reconnecting or disconnected
-    if (monitored.state === 'connecting' || monitored.state === 'disconnected') {
-      return;
-    }
-
-    this.updateState(connectionId, 'error', 'Connection lost');
-    this.attemptReconnect(connectionId);
-  }
-
-  /**
-   * Updates the connection state.
-   * @param connectionId - ID of the connection
-   * @param state - New connection state
-   * @param error - Optional error message
-   */
-  updateState(connectionId: string, state: ConnectionState, error?: string): void {
-    const monitored = this.connections.get(connectionId);
-    if (!monitored) {
-      return;
-    }
-
-    const previousState = monitored.state;
-    monitored.state = state;
-
-    if (error) {
-      monitored.lastError = error;
-    }
-
-    // Reset reconnect attempts on successful connection
-    if (state === 'connected' && previousState !== 'connected') {
-      monitored.reconnectAttempts = 0;
-      monitored.lastError = undefined;
-    }
-
-    this.emit('stateChange', connectionId, state, error);
-  }
-
-  /**
-   * Gets the current connection state.
-   * @param connectionId - ID of the connection
-   * @returns Current connection state or 'disconnected' if not monitored
-   */
-  getState(connectionId: string): ConnectionState {
-    const monitored = this.connections.get(connectionId);
-    return monitored?.state ?? 'disconnected';
-  }
-
-  /**
-   * Updates metrics for a connection.
-   * @param connectionId - ID of the connection
-   * @param metrics - Partial metrics to update
-   */
-  updateMetrics(connectionId: string, metrics: Partial<ConnectionMetrics>): void {
-    const monitored = this.connections.get(connectionId);
-    if (!monitored) {
-      return;
-    }
-
-    const updatedMetrics = { ...monitored.metrics, ...metrics };
-    monitored.metrics = updatedMetrics;
-
-    this.emit('metrics', connectionId, updatedMetrics);
-  }
-
-  /**
-   * Gets current metrics for a connection.
-   * @param connectionId - ID of the connection
-   * @returns Current metrics or null if not monitoring
-   */
-  getMetrics(connectionId: string): ConnectionMetrics | null {
-    const monitored = this.connections.get(connectionId);
-    return monitored?.metrics ?? null;
-  }
-
-  /**
-   * Starts periodic health checks for all monitored connections.
-   * @param intervalMs - Check interval in milliseconds (default: 30 seconds)
-   */
-  startHealthChecks(intervalMs: number = this.DEFAULT_INTERVAL_MS): void {
-    this.stopHealthChecks();
-    this.checkInterval = setInterval(() => {
-      this.performHealthChecks();
-    }, intervalMs);
-  }
-
-  /**
-   * Stops periodic health checks.
-   */
-  stopHealthChecks(): void {
-    if (this.checkInterval) {
-      clearInterval(this.checkInterval);
-      this.checkInterval = undefined;
-    }
-  }
-
-  /**
-   * Checks if a connection is healthy by querying the real connection pool.
-   * @param connectionId - ID of the connection
-   * @returns True if connection is healthy
-   */
-  async isHealthy(connectionId: string): Promise<boolean> {
-    const monitored = this.connections.get(connectionId);
-    if (!monitored) {
-      return false;
-    }
-
-    if (monitored.state !== 'connected') {
-      return false;
-    }
-
-    return this.connectionChecker(connectionId);
-  }
-
-  /**
-   * Gets all monitored connection IDs and their states.
-   * @returns Array of connection ID and state pairs
-   */
-  getAllStates(): Array<{ connectionId: string; state: ConnectionState }> {
-    return Array.from(this.connections.entries()).map(([id, monitored]) => ({
-      connectionId: id,
-      state: monitored.state,
-    }));
-  }
-
-  /**
-   * Gets the configuration for a monitored connection.
-   * Used for reconnection attempts.
-   * @param connectionId - ID of the connection
-   * @returns SSH configuration or null if not monitored
-   */
-  getConfig(connectionId: string): SshConfig | null {
-    const monitored = this.connections.get(connectionId);
-    return monitored?.config ?? null;
-  }
-
-  /**
-   * Gets detailed connection info including metrics and state.
-   * @param connectionId - ID of the connection
-   * @returns Detailed connection info or null if not monitored
-   */
-  getConnectionInfo(connectionId: string): {
-    state: ConnectionState;
-    metrics: ConnectionMetrics;
-    reconnectAttempts: number;
-    lastError?: string;
-  } | null {
-    const monitored = this.connections.get(connectionId);
-    if (!monitored) {
-      return null;
-    }
-
-    return {
-      state: monitored.state,
-      metrics: { ...monitored.metrics },
-      reconnectAttempts: monitored.reconnectAttempts,
-      lastError: monitored.lastError,
-    };
-  }
-
-  /**
-   * Disposes of the monitor and cleans up all resources.
-   * Stops health checks, clears all connections, and removes all listeners.
-   */
-  dispose(): void {
-    this.stopHealthChecks();
-
-    // Emit disconnected for all monitored connections
-    for (const [connectionId, monitored] of this.connections) {
-      if (monitored.state !== 'disconnected') {
-        this.emit('stateChange', connectionId, 'disconnected', 'Monitor disposed');
-      }
-    }
-
-    this.connections.clear();
-    this.removeAllListeners();
-  }
-
-  /**
-   * Performs health checks on all monitored connections.
-   * Called periodically by the health check interval.
-   *
-   * Instead of relying on a lastPingAt timer (which was never updated),
-   * this now queries the real connection pool via connectionChecker.
-   * ssh2's keepalive handles TCP liveness; we just verify the connection
-   * is still in the pool.
-   */
-  private performHealthChecks(): void {
-    for (const [connectionId, monitored] of this.connections) {
-      // Skip connections that are already connecting or reconnecting
-      if (monitored.state === 'connecting') {
-        continue;
-      }
-
-      // Skip connections that are already disconnected
-      if (monitored.state === 'disconnected') {
-        continue;
-      }
-
-      const isAlive = this.connectionChecker(connectionId);
-      this.emit('healthCheck', connectionId, isAlive, monitored.metrics.latencyMs);
-
-      // If the monitor thinks it's connected but the pool says otherwise,
-      // the connection was dropped (e.g. ssh2 close event happened but
-      // the monitor's handleDisconnect was somehow missed). Trigger reconnect.
-      if (!isAlive && monitored.state === 'connected') {
-        this.updateState(connectionId, 'error', 'Connection no longer in pool');
-        this.attemptReconnect(connectionId);
-      }
-    }
-  }
-
-  /**
-   * Attempts to reconnect a connection with exponential backoff.
-   * @param connectionId - ID of the connection to reconnect
-   */
-  private async attemptReconnect(connectionId: string): Promise<void> {
-    const monitored = this.connections.get(connectionId);
-    if (!monitored) {
-      return;
-    }
-
-    // Check if we've exceeded max reconnection attempts
-    if (monitored.reconnectAttempts >= this.MAX_RECONNECT_ATTEMPTS) {
-      const error = `Max reconnection attempts (${this.MAX_RECONNECT_ATTEMPTS}) reached`;
-      this.updateState(connectionId, 'disconnected', error);
-      this.emit('reconnectFailed', connectionId, error);
-      return;
-    }
-
-    // Increment attempt counter
-    monitored.reconnectAttempts++;
-
-    // Calculate backoff delay
-    const delayIndex = Math.min(
-      monitored.reconnectAttempts - 1,
-      this.RECONNECT_BACKOFF_MS.length - 1
-    );
-    const delay = this.RECONNECT_BACKOFF_MS[delayIndex];
-
-    // Update state to connecting
-    this.updateState(connectionId, 'connecting');
-
-    // Wait for backoff delay before emitting reconnect event
-    await this.sleep(delay);
-
-    // Re-check that connection is still being monitored and still needs reconnection
-    const current = this.connections.get(connectionId);
-    if (!current || current.state !== 'connecting') {
-      return;
-    }
-
-    // Emit reconnect event for the service to handle
-    this.emit('reconnect', connectionId, monitored.config, monitored.reconnectAttempts);
-  }
-
-  /**
-   * Utility method for async delay.
-   * @param ms - Milliseconds to sleep
-   * @returns Promise that resolves after the delay
-   */
-  private sleep(ms: number): Promise<void> {
-    return new Promise((resolve) => setTimeout(resolve, ms));
-  }
-}
diff --git a/src/main/services/ssh/SshCredentialService.ts b/src/main/services/ssh/SshCredentialService.ts
deleted file mode 100644
index fed78b9cd1..0000000000
--- a/src/main/services/ssh/SshCredentialService.ts
+++ /dev/null
@@ -1,167 +0,0 @@
-import keytar from 'keytar';
-
-const SERVICE_NAME = 'emdash-ssh';
-
-/**
- * Service for managing SSH credentials securely.
- * Uses system keychain for password and passphrase storage via keytar.
- */
-export class SshCredentialService {
-  /**
-   * Store password for a connection
-   * @param connectionId - Unique identifier for the connection
-   * @param password - Password to store
-   * @throws Error if storage fails
-   */
-  async storePassword(connectionId: string, password: string): Promise<void> {
-    try {
-      await keytar.setPassword(SERVICE_NAME, `${connectionId}:password`, password);
-    } catch (error) {
-      const message = error instanceof Error ? error.message : String(error);
-      throw new Error(`Failed to store password for connection ${connectionId}: ${message}`);
-    }
-  }
-
-  /**
-   * Retrieve password for a connection
-   * @param connectionId - Unique identifier for the connection
-   * @returns The stored password or null if not found
-   * @throws Error if retrieval fails
-   */
-  async getPassword(connectionId: string): Promise<string | null> {
-    try {
-      const credential = await keytar.getPassword(SERVICE_NAME, `${connectionId}:password`);
-      return credential;
-    } catch (error) {
-      const message = error instanceof Error ? error.message : String(error);
-      throw new Error(`Failed to retrieve password for connection ${connectionId}: ${message}`);
-    }
-  }
-
-  /**
-   * Delete stored password
-   * @param connectionId - Unique identifier for the connection
-   * @throws Error if deletion fails
-   */
-  async deletePassword(connectionId: string): Promise<void> {
-    try {
-      await keytar.deletePassword(SERVICE_NAME, `${connectionId}:password`);
-    } catch (error) {
-      const message = error instanceof Error ? error.message : String(error);
-      throw new Error(`Failed to delete password for connection ${connectionId}: ${message}`);
-    }
-  }
-
-  /**
-   * Checks if a password exists in the keychain.
-   * @param connectionId - Unique identifier for the connection
-   * @returns True if password exists
-   */
-  async hasPassword(connectionId: string): Promise<boolean> {
-    try {
-      const credential = await keytar.getPassword(SERVICE_NAME, `${connectionId}:password`);
-      return credential !== null;
-    } catch {
-      return false;
-    }
-  }
-
-  /**
-   * Store passphrase for a private key
-   * @param connectionId - Unique identifier for the connection
-   * @param passphrase - Passphrase to store
-   * @throws Error if storage fails
-   */
-  async storePassphrase(connectionId: string, passphrase: string): Promise<void> {
-    try {
-      await keytar.setPassword(SERVICE_NAME, `${connectionId}:passphrase`, passphrase);
-    } catch (error) {
-      const message = error instanceof Error ? error.message : String(error);
-      throw new Error(`Failed to store passphrase for connection ${connectionId}: ${message}`);
-    }
-  }
-
-  /**
-   * Retrieve passphrase for a private key
-   * @param connectionId - Unique identifier for the connection
-   * @returns The stored passphrase or null if not found
-   * @throws Error if retrieval fails
-   */
-  async getPassphrase(connectionId: string): Promise<string | null> {
-    try {
-      const credential = await keytar.getPassword(SERVICE_NAME, `${connectionId}:passphrase`);
-      return credential;
-    } catch (error) {
-      const message = error instanceof Error ? error.message : String(error);
-      throw new Error(`Failed to retrieve passphrase for connection ${connectionId}: ${message}`);
-    }
-  }
-
-  /**
-   * Delete stored passphrase
-   * @param connectionId - Unique identifier for the connection
-   * @throws Error if deletion fails
-   */
-  async deletePassphrase(connectionId: string): Promise<void> {
-    try {
-      await keytar.deletePassword(SERVICE_NAME, `${connectionId}:passphrase`);
-    } catch (error) {
-      const message = error instanceof Error ? error.message : String(error);
-      throw new Error(`Failed to delete passphrase for connection ${connectionId}: ${message}`);
-    }
-  }
-
-  /**
-   * Checks if a passphrase exists in the keychain.
-   * @param connectionId - Unique identifier for the connection
-   * @returns True if passphrase exists
-   */
-  async hasPassphrase(connectionId: string): Promise<boolean> {
-    try {
-      const credential = await keytar.getPassword(SERVICE_NAME, `${connectionId}:passphrase`);
-      return credential !== null;
-    } catch {
-      return false;
-    }
-  }
-
-  /**
-   * Store both password and passphrase in one call
-   * @param connectionId - Unique identifier for the connection
-   * @param credentials - Object containing optional password and passphrase
-   * @throws Error if any storage operation fails
-   */
-  async storeCredentials(
-    connectionId: string,
-    credentials: { password?: string; passphrase?: string }
-  ): Promise<void> {
-    const operations: Promise<void>[] = [];
-
-    if (credentials.password) {
-      operations.push(this.storePassword(connectionId, credentials.password));
-    }
-    if (credentials.passphrase) {
-      operations.push(this.storePassphrase(connectionId, credentials.passphrase));
-    }
-
-    if (operations.length > 0) {
-      await Promise.all(operations);
-    }
-  }
-
-  /**
-   * Delete all credentials for a connection
-   * @param connectionId - Unique identifier for the connection
-   * @throws Error if any deletion operation fails
-   */
-  async deleteAllCredentials(connectionId: string): Promise<void> {
-    await Promise.all([
-      this.deletePassword(connectionId).catch(() => {
-        // Ignore errors for individual deletions
-      }),
-      this.deletePassphrase(connectionId).catch(() => {
-        // Ignore errors for individual deletions
-      }),
-    ]);
-  }
-}
diff --git a/src/main/services/ssh/SshHostKeyService.ts b/src/main/services/ssh/SshHostKeyService.ts
deleted file mode 100644
index 036cc24abc..0000000000
--- a/src/main/services/ssh/SshHostKeyService.ts
+++ /dev/null
@@ -1,290 +0,0 @@
-import { createHash } from 'crypto';
-import { readFile, writeFile, appendFile, access } from 'fs/promises';
-import { homedir } from 'os';
-import { join } from 'path';
-import { HostKeyInfo } from '../../../shared/ssh/types';
-import { HostKeyEntry } from './types';
-
-const KNOWN_HOSTS_PATH = join(homedir(), '.ssh', 'known_hosts');
-
-/**
- * Structured representation of a stored host key.
- * Preserves the algorithm so we can round-trip to known_hosts without data loss.
- */
-interface StoredHostKey {
-  algorithm: string;
-  keyBase64: string;
-}
-
-/**
- * Service for managing SSH host key verification.
- * Stores and validates host fingerprints for security.
- */
-export class SshHostKeyService {
-  private knownHosts: Map<string, StoredHostKey> = new Map();
-  private initialized = false;
-
-  /**
-   * Initialize by loading known_hosts file
-   */
-  async initialize(): Promise<void> {
-    if (this.initialized) return;
-
-    try {
-      await access(KNOWN_HOSTS_PATH);
-      const content = await readFile(KNOWN_HOSTS_PATH, 'utf-8');
-      this.parseKnownHosts(content);
-      this.initialized = true;
-    } catch (err) {
-      // File doesn't exist or can't be read, start with empty
-      this.initialized = true;
-    }
-  }
-
-  /**
-   * Parse known_hosts content into memory.
-   * Format: <host> <algorithm> <base64-key>
-   */
-  private parseKnownHosts(content: string): void {
-    const lines = content.split('\n');
-    for (const line of lines) {
-      const trimmed = line.trim();
-      if (!trimmed || trimmed.startsWith('#')) continue;
-
-      const parts = trimmed.split(' ');
-      if (parts.length >= 3) {
-        const host = parts[0];
-        const algorithm = parts[1];
-        const keyBase64 = parts.slice(2).join(' ');
-        this.knownHosts.set(host, { algorithm, keyBase64 });
-      }
-    }
-  }
-
-  /**
-   * Get fingerprint for a host key
-   */
-  getFingerprint(key: Buffer): string {
-    const hash = createHash('sha256').update(key).digest('base64');
-    return `SHA256:${hash}`;
-  }
-
-  /**
-   * Verifies a host's key against known hosts.
-   * @param host - Hostname or IP address
-   * @param port - SSH port
-   * @param keyType - Type of host key (e.g., 'rsa', 'ed25519')
-   * @param fingerprint - Host key fingerprint
-   * @returns Verification result: 'known', 'new', or 'changed'
-   */
-  async verifyHostKey(
-    host: string,
-    port: number,
-    keyType: string,
-    fingerprint: string
-  ): Promise<'known' | 'new' | 'changed'> {
-    await this.initialize();
-
-    const hostPort = port === 22 ? host : `[${host}]:${port}`;
-    const stored = this.knownHosts.get(hostPort) || this.knownHosts.get(host);
-
-    if (!stored) {
-      return 'new';
-    }
-
-    // Compare fingerprints instead of raw keys for this interface
-    const knownFingerprint = this.getFingerprint(Buffer.from(stored.keyBase64, 'base64'));
-    if (knownFingerprint === fingerprint) {
-      return 'known';
-    }
-
-    return 'changed';
-  }
-
-  /**
-   * Check if host key is known with direct key buffer comparison.
-   * Returns 'valid' | 'invalid' | 'unknown'.
-   */
-  async verifyHostKeyBuffer(
-    host: string,
-    port: number,
-    key: Buffer
-  ): Promise<'valid' | 'invalid' | 'unknown'> {
-    await this.initialize();
-
-    const hostPort = port === 22 ? host : `[${host}]:${port}`;
-    const stored = this.knownHosts.get(hostPort) || this.knownHosts.get(host);
-
-    if (!stored) {
-      return 'unknown';
-    }
-
-    const keyBase64 = key.toString('base64');
-    if (stored.keyBase64 === keyBase64) {
-      return 'valid';
-    }
-
-    return 'invalid';
-  }
-
-  /**
-   * Adds or updates a host key in the known hosts store.
-   * @param host - Hostname or IP address
-   * @param port - SSH port
-   * @param keyType - Type of host key
-   * @param fingerprint - Host key fingerprint
-   */
-  async addHostKey(
-    host: string,
-    port: number,
-    keyType: string,
-    fingerprint: string
-  ): Promise<void> {
-    await this.initialize();
-
-    const hostPort = port === 22 ? host : `[${host}]:${port}`;
-    // Store fingerprint with algorithm so we can persist correctly
-    this.knownHosts.set(hostPort, { algorithm: keyType || 'ssh-ed25519', keyBase64: fingerprint });
-
-    // Rewrite entire file to ensure consistency
-    await this.persistKnownHosts();
-  }
-
-  /**
-   * Add a host to known_hosts with raw key buffer.
-   * @param host - Hostname or IP address
-   * @param port - SSH port
-   * @param key - Raw host key buffer
-   * @param algorithm - Key algorithm (default: 'ssh-ed25519')
-   */
-  async addKnownHost(
-    host: string,
-    port: number,
-    key: Buffer,
-    algorithm: string = 'ssh-ed25519'
-  ): Promise<void> {
-    await this.initialize();
-
-    const hostPort = port === 22 ? host : `[${host}]:${port}`;
-    const keyBase64 = key.toString('base64');
-    const entry = `${hostPort} ${algorithm} ${keyBase64}\n`;
-
-    this.knownHosts.set(hostPort, { algorithm, keyBase64 });
-
-    try {
-      await appendFile(KNOWN_HOSTS_PATH, entry);
-    } catch (err) {
-      throw new Error(`Failed to write to known_hosts: ${err}`);
-    }
-  }
-
-  /**
-   * Removes a host from the known hosts store.
-   * @param host - Hostname or IP address
-   * @param port - SSH port
-   */
-  async removeHostKey(host: string, port: number): Promise<void> {
-    await this.initialize();
-
-    const hostPort = port === 22 ? host : `[${host}]:${port}`;
-    this.knownHosts.delete(hostPort);
-    this.knownHosts.delete(host);
-
-    await this.persistKnownHosts();
-  }
-
-  /**
-   * Remove a host from known_hosts (alias for removeHostKey).
-   * @param host - Hostname or IP address
-   * @param port - SSH port
-   */
-  async removeKnownHost(host: string, port: number): Promise<void> {
-    return this.removeHostKey(host, port);
-  }
-
-  /**
-   * Gets all known hosts.
-   * @returns Array of host key entries
-   */
-  async getKnownHosts(): Promise<HostKeyEntry[]> {
-    await this.initialize();
-
-    const entries: HostKeyEntry[] = [];
-    for (const [hostPort, stored] of this.knownHosts) {
-      // Parse host and port from the key format
-      let host: string;
-      let port: number;
-
-      if (hostPort.startsWith('[') && hostPort.includes(']:')) {
-        const match = hostPort.match(/^\[(.*)\]:(\d+)$/);
-        if (match) {
-          host = match[1];
-          port = parseInt(match[2], 10);
-        } else {
-          host = hostPort;
-          port = 22;
-        }
-      } else {
-        host = hostPort;
-        port = 22;
-      }
-
-      entries.push({
-        host,
-        port,
-        keyType: stored.algorithm,
-        fingerprint: this.getFingerprint(Buffer.from(stored.keyBase64, 'base64')),
-        verifiedAt: new Date(),
-      });
-    }
-
-    return entries;
-  }
-
-  /**
-   * Checks if a host is known.
-   * @param host - Hostname or IP address
-   * @param port - SSH port
-   * @returns True if host is known
-   */
-  async isHostKnown(host: string, port: number): Promise<boolean> {
-    await this.initialize();
-
-    const hostPort = port === 22 ? host : `[${host}]:${port}`;
-    return this.knownHosts.has(hostPort) || this.knownHosts.has(host);
-  }
-
-  /**
-   * Get host key info for display
-   * @param host - Hostname or IP address
-   * @param port - SSH port
-   * @param key - Raw host key buffer
-   * @param algorithm - Key algorithm
-   * @returns HostKeyInfo object
-   */
-  getHostKeyInfo(host: string, port: number, key: Buffer, algorithm: string): HostKeyInfo {
-    return {
-      host,
-      port,
-      fingerprint: this.getFingerprint(key),
-      algorithm,
-      key,
-    };
-  }
-
-  /**
-   * Persist known hosts to the known_hosts file.
-   */
-  private async persistKnownHosts(): Promise<void> {
-    const entries: string[] = [];
-    for (const [hostPort, stored] of this.knownHosts) {
-      entries.push(`${hostPort} ${stored.algorithm} ${stored.keyBase64}`);
-    }
-
-    try {
-      await writeFile(KNOWN_HOSTS_PATH, entries.join('\n') + (entries.length > 0 ? '\n' : ''));
-    } catch (err) {
-      throw new Error(`Failed to write to known_hosts: ${err}`);
-    }
-  }
-}
diff --git a/src/main/services/ssh/SshService.ts b/src/main/services/ssh/SshService.ts
deleted file mode 100644
index 60ccd1f24e..0000000000
--- a/src/main/services/ssh/SshService.ts
+++ /dev/null
@@ -1,419 +0,0 @@
-import { EventEmitter } from 'events';
-import { Client, SFTPWrapper, ConnectConfig } from 'ssh2';
-import { SshConfig, ExecResult } from '../../../shared/ssh/types';
-import { Connection, ConnectionPool } from './types';
-import { SshCredentialService } from './SshCredentialService';
-import { quoteShellArg } from '../../utils/shellEscape';
-import { readFile } from 'fs/promises';
-import { randomUUID } from 'crypto';
-import { homedir } from 'os';
-import { resolveIdentityAgent } from '../../utils/sshConfigParser';
-
-/** Maximum number of concurrent SSH connections allowed in the pool. */
-const MAX_CONNECTIONS = 10;
-
-/** Threshold (fraction of MAX_CONNECTIONS) at which a warning is logged. */
-const POOL_WARNING_THRESHOLD = 0.8;
-
-/**
- * Main SSH service for managing SSH connections, executing commands,
- * and handling SFTP operations.
- *
- * Extends EventEmitter to emit connection events:
- * - 'connected': When a connection is successfully established
- * - 'error': When a connection error occurs
- * - 'disconnected': When a connection is closed
- */
-export class SshService extends EventEmitter {
-  private connections: ConnectionPool = {};
-  private pendingConnections: Map<string, Promise<string>> = new Map();
-  private credentialService: SshCredentialService;
-
-  constructor(credentialService?: SshCredentialService) {
-    super();
-    this.credentialService = credentialService ?? new SshCredentialService();
-  }
-
-  /**
-   * Establishes a new SSH connection.
-   *
-   * Guards against duplicate connections:
-   * - If a connection with this ID already exists and is alive, returns immediately.
-   * - If a connection attempt for this ID is already in flight, coalesces onto
-   *   the existing promise instead of opening a second TCP socket.
-   * - Enforces a global MAX_CONNECTIONS limit to prevent resource exhaustion.
-   *
-   * @param config - SSH connection configuration
-   * @returns Connection ID for future operations
-   */
-  async connect(config: SshConfig): Promise<string> {
-    const connectionId = config.id ?? randomUUID();
-
-    // 1. If already connected, reuse the existing connection
-    if (this.connections[connectionId]) {
-      return connectionId;
-    }
-
-    // 2. If a connection attempt is already in flight, coalesce
-    const pending = this.pendingConnections.get(connectionId);
-    if (pending) {
-      return pending;
-    }
-
-    // 3. Enforce connection pool limit
-    const poolSize = Object.keys(this.connections).length + this.pendingConnections.size;
-    if (poolSize >= MAX_CONNECTIONS) {
-      throw new Error(
-        `SSH connection pool limit reached (${MAX_CONNECTIONS}). ` +
-          'Disconnect unused connections before opening new ones.'
-      );
-    }
-    if (poolSize >= MAX_CONNECTIONS * POOL_WARNING_THRESHOLD) {
-      console.warn(
-        `[SshService] Connection pool at ${poolSize}/${MAX_CONNECTIONS} — approaching limit`
-      );
-    }
-
-    // 4. Create the connection and track the in-flight promise
-    const connectionPromise = this.createConnection(connectionId, config);
-    this.pendingConnections.set(connectionId, connectionPromise);
-
-    try {
-      const result = await connectionPromise;
-      return result;
-    } finally {
-      this.pendingConnections.delete(connectionId);
-    }
-  }
-
-  /**
-   * Internal: opens a new SSH connection and registers it in the pool.
-   */
-  private createConnection(connectionId: string, config: SshConfig): Promise<string> {
-    const client = new Client();
-
-    return new Promise((resolve, reject) => {
-      // Handle connection errors
-      client.on('error', (err: Error) => {
-        reject(err);
-      });
-
-      // Handle connection close
-      client.on('close', () => {
-        // Only clean up if this client is still the one stored in the pool.
-        // A stale client's close event must not remove a newer connection
-        // that was established under the same connectionId.
-        if (this.connections[connectionId]?.client === client) {
-          delete this.connections[connectionId];
-          this.emit('disconnected', connectionId);
-        }
-      });
-
-      // Handle successful connection
-      client.on('ready', () => {
-        const connection: Connection = {
-          id: connectionId,
-          config,
-          client,
-          connectedAt: new Date(),
-          lastActivity: new Date(),
-        };
-
-        this.connections[connectionId] = connection;
-        this.emit('connected', connectionId);
-        resolve(connectionId);
-      });
-
-      // Build connection config
-      this.buildConnectConfig(connectionId, config)
-        .then((connectConfig) => {
-          client.connect(connectConfig);
-        })
-        .catch((err) => {
-          // Never emit the special EventEmitter 'error' event unless
-          // someone is explicitly listening; otherwise Node will throw
-          // ERR_UNHANDLED_ERROR and can abort IPC replies.
-          if (this.listenerCount('error') > 0) {
-            this.emit('error', connectionId, err);
-          }
-          reject(err);
-        });
-    });
-  }
-
-  /**
-   * Builds the ssh2 ConnectConfig from our SshConfig
-   */
-  private async buildConnectConfig(
-    connectionId: string,
-    config: SshConfig
-  ): Promise<ConnectConfig> {
-    const connectConfig: ConnectConfig = {
-      host: config.host,
-      port: config.port,
-      username: config.username,
-      readyTimeout: 20000,
-      keepaliveInterval: 60000,
-      keepaliveCountMax: 3,
-    };
-
-    switch (config.authType) {
-      case 'password': {
-        const inlinePassword = (config as any).password as string | undefined;
-        const password = inlinePassword ?? (await this.credentialService.getPassword(connectionId));
-        if (!password) {
-          throw new Error(`No password found for connection ${connectionId}`);
-        }
-        connectConfig.password = password;
-        break;
-      }
-
-      case 'key': {
-        if (!config.privateKeyPath) {
-          throw new Error('Private key path is required for key authentication');
-        }
-        try {
-          // Expand ~ to home directory
-          let keyPath = config.privateKeyPath;
-          if (keyPath.startsWith('~/')) {
-            keyPath = keyPath.replace('~', homedir());
-          } else if (keyPath === '~') {
-            keyPath = homedir();
-          }
-
-          const privateKey = await readFile(keyPath, 'utf-8');
-          connectConfig.privateKey = privateKey;
-
-          // Check for passphrase
-          const inlinePassphrase = (config as any).passphrase as string | undefined;
-          const passphrase =
-            inlinePassphrase ?? (await this.credentialService.getPassphrase(connectionId));
-          if (passphrase) {
-            connectConfig.passphrase = passphrase;
-          }
-        } catch (err) {
-          const message = err instanceof Error ? err.message : String(err);
-          throw new Error(`Failed to read private key: ${message}`);
-        }
-        break;
-      }
-
-      case 'agent': {
-        const identityAgent = await resolveIdentityAgent(config.host);
-        const agentSocket = identityAgent || process.env.SSH_AUTH_SOCK;
-        if (!agentSocket) {
-          throw new Error(
-            'SSH agent authentication failed: no agent socket found. ' +
-              'This typically happens when:\n' +
-              '1. The SSH agent is not running (try running "eval $(ssh-agent -s)" in your terminal)\n' +
-              '2. The app was launched from the GUI (Finder/Dock) instead of a terminal\n' +
-              '3. The SSH agent socket path could not be auto-detected\n\n' +
-              'Workarounds:\n' +
-              '• Add IdentityAgent to this host in ~/.ssh/config (e.g. for 1Password)\n' +
-              '• Launch Emdash from your terminal where SSH agent is already configured\n' +
-              '• Use SSH key authentication instead of agent authentication\n' +
-              '• Ensure your SSH agent is running and your keys are added (ssh-add -l)'
-          );
-        }
-        connectConfig.agent = agentSocket;
-        break;
-      }
-
-      default: {
-        throw new Error(`Unsupported authentication type: ${config.authType}`);
-      }
-    }
-
-    return connectConfig;
-  }
-
-  /**
-   * Disconnects an existing SSH connection.
-   * @param connectionId - ID of the connection to close
-   */
-  async disconnect(connectionId: string): Promise<void> {
-    const connection = this.connections[connectionId];
-    if (!connection) {
-      return; // Already disconnected or never existed
-    }
-
-    // Close SFTP session if open, waiting for close to complete
-    if (connection.sftp) {
-      try {
-        await new Promise<void>((resolve) => {
-          const sftp = connection.sftp!;
-          const timeout = setTimeout(() => resolve(), 2000); // 2s safety timeout
-          sftp.once('close', () => {
-            clearTimeout(timeout);
-            resolve();
-          });
-          sftp.end();
-        });
-      } catch {
-        // Ignore errors during SFTP close
-      }
-      connection.sftp = undefined;
-    }
-
-    // Close SSH client
-    connection.client.end();
-
-    // Remove from pool
-    delete this.connections[connectionId];
-
-    // Emit disconnected event
-    this.emit('disconnected', connectionId);
-  }
-
-  /**
-   * Executes a command on the remote host.
-   * @param connectionId - ID of the active connection
-   * @param command - Command to execute
-   * @param cwd - Optional working directory
-   * @returns Command execution result
-   */
-  async executeCommand(connectionId: string, command: string, cwd?: string): Promise<ExecResult> {
-    const connection = this.connections[connectionId];
-    if (!connection) {
-      throw new Error(`Connection ${connectionId} not found`);
-    }
-
-    // Update last activity
-    connection.lastActivity = new Date();
-
-    // Build the command with optional cwd, wrapped in a login shell so that
-    // ~/.ssh/config, ~/.gitconfig, and other user-level configuration files
-    // are available (ssh2's client.exec() uses a non-login shell by default).
-    const innerCommand = cwd ? `cd ${quoteShellArg(cwd)} && ${command}` : command;
-    const fullCommand = `bash -l -c ${quoteShellArg(innerCommand)}`;
-
-    return new Promise((resolve, reject) => {
-      connection.client.exec(fullCommand, (err, stream) => {
-        if (err) {
-          reject(err);
-          return;
-        }
-
-        let stdout = '';
-        let stderr = '';
-        stream.on('close', (code: number | null) => {
-          // ssh2 reports `code` as null when a signal terminates the process.
-          // Keep ExecResult.exitCode as a number for simpler downstream typing.
-          const exitCode = code ?? -1;
-          resolve({
-            stdout: stdout.trim(),
-            stderr: stderr.trim(),
-            exitCode,
-          });
-        });
-
-        stream.on('data', (data: Buffer) => {
-          stdout += data.toString('utf-8');
-        });
-
-        stream.stderr.on('data', (data: Buffer) => {
-          stderr += data.toString('utf-8');
-        });
-
-        stream.on('error', (streamErr: Error) => {
-          reject(streamErr);
-        });
-      });
-    });
-  }
-
-  /**
-   * Gets an SFTP session for file operations.
-   * @param connectionId - ID of the active connection
-   * @returns SFTP wrapper instance
-   */
-  async getSftp(connectionId: string): Promise<SFTPWrapper> {
-    const connection = this.connections[connectionId];
-    if (!connection) {
-      throw new Error(`Connection ${connectionId} not found`);
-    }
-
-    // Return cached SFTP if available
-    if (connection.sftp) {
-      connection.lastActivity = new Date();
-      return connection.sftp;
-    }
-
-    // Create new SFTP session
-    return new Promise((resolve, reject) => {
-      connection.client.sftp((err, sftp) => {
-        if (err) {
-          reject(err);
-          return;
-        }
-
-        connection.sftp = sftp;
-        connection.lastActivity = new Date();
-        resolve(sftp);
-      });
-    });
-  }
-
-  /**
-   * Gets connection info for a specific connection.
-   * @param connectionId - ID of the connection
-   * @returns Connection object or undefined if not found
-   */
-  getConnection(connectionId: string): Connection | undefined {
-    return this.connections[connectionId];
-  }
-
-  /**
-   * Gets all active connections.
-   * @returns Array of connection objects
-   */
-  getAllConnections(): Connection[] {
-    return Object.values(this.connections);
-  }
-
-  /**
-   * Checks if a connection is currently connected.
-   * @param connectionId - ID of the connection
-   * @returns True if connected
-   */
-  isConnected(connectionId: string): boolean {
-    return connectionId in this.connections;
-  }
-
-  /**
-   * Lists all active connection IDs.
-   * @returns Array of connection IDs
-   */
-  listConnections(): string[] {
-    return Object.keys(this.connections);
-  }
-
-  /**
-   * Gets connection info for a specific connection.
-   * @param connectionId - ID of the connection
-   */
-  getConnectionInfo(connectionId: string): { connectedAt: Date; lastActivity: Date } | null {
-    const conn = this.connections[connectionId];
-    if (!conn) return null;
-    return {
-      connectedAt: conn.connectedAt,
-      lastActivity: conn.lastActivity,
-    };
-  }
-
-  /**
-   * Disconnects all active connections.
-   * Useful for cleanup on shutdown.
-   */
-  async disconnectAll(): Promise<void> {
-    const disconnectPromises = Object.keys(this.connections).map((id) =>
-      this.disconnect(id).catch(() => {
-        // Ignore errors during bulk disconnect
-      })
-    );
-    await Promise.all(disconnectPromises);
-  }
-}
-
-/** Module-level singleton — all main-process code should import this. */
-export const sshService = new SshService();
diff --git a/src/main/services/ssh/__tests__/SshCredentialService.test.ts b/src/main/services/ssh/__tests__/SshCredentialService.test.ts
deleted file mode 100644
index 106cb87278..0000000000
--- a/src/main/services/ssh/__tests__/SshCredentialService.test.ts
+++ /dev/null
@@ -1,327 +0,0 @@
-import { describe, it, expect, beforeEach, vi, Mock } from 'vitest';
-import { SshCredentialService } from '../SshCredentialService';
-
-// Mock keytar with hoisting-safe pattern
-const mockSetPassword = vi.fn().mockResolvedValue(undefined);
-const mockGetPassword = vi.fn().mockResolvedValue(null);
-const mockDeletePassword = vi.fn().mockResolvedValue(undefined);
-
-vi.mock('keytar', () => {
-  return {
-    setPassword: (...args: any[]) => mockSetPassword(...args),
-    getPassword: (...args: any[]) => mockGetPassword(...args),
-    deletePassword: (...args: any[]) => mockDeletePassword(...args),
-    default: {
-      setPassword: (...args: any[]) => mockSetPassword(...args),
-      getPassword: (...args: any[]) => mockGetPassword(...args),
-      deletePassword: (...args: any[]) => mockDeletePassword(...args),
-    },
-  };
-});
-
-describe('SshCredentialService', () => {
-  let service: SshCredentialService;
-
-  beforeEach(() => {
-    vi.clearAllMocks();
-    // Reset default mock implementations
-    mockSetPassword.mockResolvedValue(undefined);
-    mockGetPassword.mockResolvedValue(null);
-    mockDeletePassword.mockResolvedValue(undefined);
-    service = new SshCredentialService();
-  });
-
-  describe('password operations', () => {
-    it('should store password in keychain', async () => {
-      await service.storePassword('conn-1', 'secretpassword');
-
-      expect(mockSetPassword).toHaveBeenCalledWith(
-        'emdash-ssh',
-        'conn-1:password',
-        'secretpassword'
-      );
-    });
-
-    it('should retrieve password from keychain', async () => {
-      mockGetPassword.mockResolvedValue('secretpassword');
-
-      const result = await service.getPassword('conn-1');
-
-      expect(mockGetPassword).toHaveBeenCalledWith('emdash-ssh', 'conn-1:password');
-      expect(result).toBe('secretpassword');
-    });
-
-    it('should return null when password not found', async () => {
-      mockGetPassword.mockResolvedValue(null);
-
-      const result = await service.getPassword('conn-1');
-
-      expect(result).toBeNull();
-    });
-
-    it('should delete password from keychain', async () => {
-      await service.deletePassword('conn-1');
-
-      expect(mockDeletePassword).toHaveBeenCalledWith('emdash-ssh', 'conn-1:password');
-    });
-
-    it('should check if password exists', async () => {
-      mockGetPassword.mockResolvedValue('secretpassword');
-
-      const result = await service.hasPassword('conn-1');
-
-      expect(result).toBe(true);
-      expect(mockGetPassword).toHaveBeenCalledWith('emdash-ssh', 'conn-1:password');
-    });
-
-    it('should return false when password does not exist', async () => {
-      mockGetPassword.mockResolvedValue(null);
-
-      const result = await service.hasPassword('conn-1');
-
-      expect(result).toBe(false);
-    });
-
-    it('should throw error when store password fails', async () => {
-      mockSetPassword.mockRejectedValue(new Error('Keychain locked'));
-
-      await expect(service.storePassword('conn-1', 'password')).rejects.toThrow(
-        'Failed to store password for connection conn-1: Keychain locked'
-      );
-    });
-
-    it('should throw error when get password fails', async () => {
-      mockGetPassword.mockRejectedValue(new Error('Access denied'));
-
-      await expect(service.getPassword('conn-1')).rejects.toThrow(
-        'Failed to retrieve password for connection conn-1: Access denied'
-      );
-    });
-
-    it('should throw error when delete password fails', async () => {
-      mockDeletePassword.mockRejectedValue(new Error('Keychain error'));
-
-      await expect(service.deletePassword('conn-1')).rejects.toThrow(
-        'Failed to delete password for connection conn-1: Keychain error'
-      );
-    });
-
-    it('should return false for hasPassword when keytar throws', async () => {
-      mockGetPassword.mockRejectedValue(new Error('Keychain error'));
-
-      const result = await service.hasPassword('conn-1');
-
-      expect(result).toBe(false);
-    });
-  });
-
-  describe('passphrase operations', () => {
-    it('should store passphrase in keychain', async () => {
-      mockSetPassword.mockResolvedValue(undefined);
-
-      await service.storePassphrase('conn-1', 'my-passphrase');
-
-      expect(mockSetPassword).toHaveBeenCalledWith(
-        'emdash-ssh',
-        'conn-1:passphrase',
-        'my-passphrase'
-      );
-    });
-
-    it('should retrieve passphrase from keychain', async () => {
-      mockGetPassword.mockResolvedValue('my-passphrase');
-
-      const result = await service.getPassphrase('conn-1');
-
-      expect(mockGetPassword).toHaveBeenCalledWith('emdash-ssh', 'conn-1:passphrase');
-      expect(result).toBe('my-passphrase');
-    });
-
-    it('should return null when passphrase not found', async () => {
-      mockGetPassword.mockResolvedValue(null);
-
-      const result = await service.getPassphrase('conn-1');
-
-      expect(result).toBeNull();
-    });
-
-    it('should delete passphrase from keychain', async () => {
-      mockDeletePassword.mockResolvedValue(undefined);
-
-      await service.deletePassphrase('conn-1');
-
-      expect(mockDeletePassword).toHaveBeenCalledWith('emdash-ssh', 'conn-1:passphrase');
-    });
-
-    it('should check if passphrase exists', async () => {
-      mockGetPassword.mockResolvedValue('my-passphrase');
-
-      const result = await service.hasPassphrase('conn-1');
-
-      expect(result).toBe(true);
-      expect(mockGetPassword).toHaveBeenCalledWith('emdash-ssh', 'conn-1:passphrase');
-    });
-
-    it('should return false when passphrase does not exist', async () => {
-      mockGetPassword.mockResolvedValue(null);
-
-      const result = await service.hasPassphrase('conn-1');
-
-      expect(result).toBe(false);
-    });
-
-    it('should throw error when store passphrase fails', async () => {
-      mockSetPassword.mockRejectedValue(new Error('Keychain locked'));
-
-      await expect(service.storePassphrase('conn-1', 'passphrase')).rejects.toThrow(
-        'Failed to store passphrase for connection conn-1: Keychain locked'
-      );
-    });
-
-    it('should throw error when get passphrase fails', async () => {
-      mockGetPassword.mockRejectedValue(new Error('Access denied'));
-
-      await expect(service.getPassphrase('conn-1')).rejects.toThrow(
-        'Failed to retrieve passphrase for connection conn-1: Access denied'
-      );
-    });
-
-    it('should throw error when delete passphrase fails', async () => {
-      mockDeletePassword.mockRejectedValue(new Error('Keychain error'));
-
-      await expect(service.deletePassphrase('conn-1')).rejects.toThrow(
-        'Failed to delete passphrase for connection conn-1: Keychain error'
-      );
-    });
-
-    it('should return false for hasPassphrase when keytar throws', async () => {
-      mockGetPassword.mockRejectedValue(new Error('Keychain error'));
-
-      const result = await service.hasPassphrase('conn-1');
-
-      expect(result).toBe(false);
-    });
-  });
-
-  describe('bulk operations', () => {
-    it('should store both password and passphrase', async () => {
-      mockSetPassword.mockResolvedValue(undefined);
-
-      await service.storeCredentials('conn-1', {
-        password: 'secretpassword',
-        passphrase: 'my-passphrase',
-      });
-
-      expect(mockSetPassword).toHaveBeenCalledTimes(2);
-      expect(mockSetPassword).toHaveBeenCalledWith(
-        'emdash-ssh',
-        'conn-1:password',
-        'secretpassword'
-      );
-      expect(mockSetPassword).toHaveBeenCalledWith(
-        'emdash-ssh',
-        'conn-1:passphrase',
-        'my-passphrase'
-      );
-    });
-
-    it('should store only password when passphrase not provided', async () => {
-      mockSetPassword.mockResolvedValue(undefined);
-
-      await service.storeCredentials('conn-1', {
-        password: 'secretpassword',
-      });
-
-      expect(mockSetPassword).toHaveBeenCalledTimes(1);
-      expect(mockSetPassword).toHaveBeenCalledWith(
-        'emdash-ssh',
-        'conn-1:password',
-        'secretpassword'
-      );
-    });
-
-    it('should store only passphrase when password not provided', async () => {
-      mockSetPassword.mockResolvedValue(undefined);
-
-      await service.storeCredentials('conn-1', {
-        passphrase: 'my-passphrase',
-      });
-
-      expect(mockSetPassword).toHaveBeenCalledTimes(1);
-      expect(mockSetPassword).toHaveBeenCalledWith(
-        'emdash-ssh',
-        'conn-1:passphrase',
-        'my-passphrase'
-      );
-    });
-
-    it('should do nothing when no credentials provided', async () => {
-      await service.storeCredentials('conn-1', {});
-
-      expect(mockSetPassword).not.toHaveBeenCalled();
-    });
-
-    it('should delete all credentials', async () => {
-      mockDeletePassword.mockResolvedValue(undefined);
-
-      await service.deleteAllCredentials('conn-1');
-
-      expect(mockDeletePassword).toHaveBeenCalledTimes(2);
-      expect(mockDeletePassword).toHaveBeenCalledWith('emdash-ssh', 'conn-1:password');
-      expect(mockDeletePassword).toHaveBeenCalledWith('emdash-ssh', 'conn-1:passphrase');
-    });
-
-    it('should not fail when deleting non-existent credentials', async () => {
-      mockDeletePassword.mockRejectedValue(new Error('Not found'));
-
-      // Should not throw
-      await expect(service.deleteAllCredentials('conn-1')).resolves.not.toThrow();
-    });
-
-    it('should continue deleting when one credential fails', async () => {
-      mockDeletePassword
-        .mockRejectedValueOnce(new Error('Password not found'))
-        .mockResolvedValueOnce(undefined);
-
-      await service.deleteAllCredentials('conn-1');
-
-      expect(mockDeletePassword).toHaveBeenCalledTimes(2);
-    });
-  });
-
-  describe('service namespacing', () => {
-    it('should use correct service name for all operations', async () => {
-      mockSetPassword.mockResolvedValue(undefined);
-
-      await service.storePassword('conn-1', 'pass');
-      await service.storePassphrase('conn-1', 'phrase');
-
-      const calls = mockSetPassword.mock.calls;
-      expect(calls.every((call) => call[0] === 'emdash-ssh')).toBe(true);
-    });
-
-    it('should use correct key format for password', async () => {
-      mockSetPassword.mockResolvedValue(undefined);
-
-      await service.storePassword('my-connection', 'password');
-
-      expect(mockSetPassword).toHaveBeenCalledWith(
-        'emdash-ssh',
-        'my-connection:password',
-        'password'
-      );
-    });
-
-    it('should use correct key format for passphrase', async () => {
-      mockSetPassword.mockResolvedValue(undefined);
-
-      await service.storePassphrase('my-connection', 'passphrase');
-
-      expect(mockSetPassword).toHaveBeenCalledWith(
-        'emdash-ssh',
-        'my-connection:passphrase',
-        'passphrase'
-      );
-    });
-  });
-});
diff --git a/src/main/services/ssh/__tests__/SshHostKeyService.test.ts b/src/main/services/ssh/__tests__/SshHostKeyService.test.ts
deleted file mode 100644
index 45a0a9de78..0000000000
--- a/src/main/services/ssh/__tests__/SshHostKeyService.test.ts
+++ /dev/null
@@ -1,395 +0,0 @@
-import { describe, it, expect, beforeEach, vi, Mock } from 'vitest';
-import { createHash } from 'crypto';
-import { SshHostKeyService } from '../SshHostKeyService';
-
-// Mock fs/promises with hoisting-safe pattern
-vi.mock('fs/promises', () => {
-  return {
-    readFile: vi.fn(),
-    writeFile: vi.fn(),
-    appendFile: vi.fn(),
-    access: vi.fn(),
-  };
-});
-
-// Mock os
-vi.mock('os', () => ({
-  homedir: vi.fn().mockReturnValue('/home/testuser'),
-}));
-
-// Import after mocking
-import { readFile, writeFile, appendFile, access } from 'fs/promises';
-
-describe('SshHostKeyService', () => {
-  let service: SshHostKeyService;
-
-  beforeEach(() => {
-    vi.clearAllMocks();
-    service = new SshHostKeyService();
-  });
-
-  describe('initialization', () => {
-    it('should initialize with empty known_hosts if file does not exist', async () => {
-      (access as Mock).mockRejectedValue(new Error('File not found'));
-
-      await service.initialize();
-      const hosts = await service.getKnownHosts();
-
-      expect(hosts).toEqual([]);
-      expect(access).toHaveBeenCalledWith('/home/testuser/.ssh/known_hosts');
-    });
-
-    it('should parse existing known_hosts file', async () => {
-      const knownHostsContent = `
-# This is a comment
-host1.example.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDIhz2GK/XCUj4i6Q5yQJNL1MXMY0RxzPV2QrBqfHrDq
-[host2.example.com]:2222 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCx
-
-host3.example.com ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBM1
-      `;
-
-      (access as Mock).mockResolvedValue(undefined);
-      (readFile as Mock).mockResolvedValue(knownHostsContent);
-
-      await service.initialize();
-      const hosts = await service.getKnownHosts();
-
-      expect(hosts).toHaveLength(3);
-      expect(hosts.some((h) => h.host === 'host1.example.com')).toBe(true);
-      expect(hosts.some((h) => h.host === 'host2.example.com' && h.port === 2222)).toBe(true);
-    });
-
-    it('should skip re-initialization', async () => {
-      (access as Mock).mockRejectedValue(new Error('File not found'));
-
-      await service.initialize();
-      await service.initialize();
-
-      expect(access).toHaveBeenCalledTimes(1);
-    });
-  });
-
-  describe('fingerprint generation', () => {
-    it('should generate SHA256 fingerprint', () => {
-      const keyBuffer = Buffer.from('test-key-data');
-      const fingerprint = service.getFingerprint(keyBuffer);
-
-      const expectedHash = createHash('sha256').update(keyBuffer).digest('base64');
-      expect(fingerprint).toBe(`SHA256:${expectedHash}`);
-    });
-
-    it('should generate different fingerprints for different keys', () => {
-      const key1 = Buffer.from('key-one');
-      const key2 = Buffer.from('key-two');
-
-      const fp1 = service.getFingerprint(key1);
-      const fp2 = service.getFingerprint(key2);
-
-      expect(fp1).not.toBe(fp2);
-    });
-
-    it('should generate consistent fingerprints for same key', () => {
-      const key = Buffer.from('test-key');
-
-      const fp1 = service.getFingerprint(key);
-      const fp2 = service.getFingerprint(key);
-
-      expect(fp1).toBe(fp2);
-    });
-  });
-
-  describe('host key verification', () => {
-    it('should return new for unknown host', async () => {
-      (access as Mock).mockRejectedValue(new Error('File not found'));
-
-      const result = await service.verifyHostKey(
-        'unknown.host.com',
-        22,
-        'ssh-ed25519',
-        'SHA256:abc123'
-      );
-
-      expect(result).toBe('new');
-    });
-
-    it('should return known for matching fingerprint', async () => {
-      const keyBuffer = Buffer.from('known-key-data');
-      const fingerprint = service.getFingerprint(keyBuffer);
-      const keyBase64 = keyBuffer.toString('base64');
-
-      (access as Mock).mockResolvedValue(undefined);
-      (readFile as Mock).mockResolvedValue(`known.host.com ssh-ed25519 ${keyBase64}`);
-
-      const result = await service.verifyHostKey('known.host.com', 22, 'ssh-ed25519', fingerprint);
-
-      expect(result).toBe('known');
-    });
-
-    it('should return changed for non-matching fingerprint', async () => {
-      const keyBuffer = Buffer.from('original-key-data');
-      const keyBase64 = keyBuffer.toString('base64');
-
-      (access as Mock).mockResolvedValue(undefined);
-      (readFile as Mock).mockResolvedValue(`changed.host.com ssh-ed25519 ${keyBase64}`);
-
-      const result = await service.verifyHostKey(
-        'changed.host.com',
-        22,
-        'ssh-ed25519',
-        'SHA256:differentfingerprint'
-      );
-
-      expect(result).toBe('changed');
-    });
-
-    it('should handle non-standard port format', async () => {
-      const keyBuffer = Buffer.from('port-key-data');
-      const fingerprint = service.getFingerprint(keyBuffer);
-      const keyBase64 = keyBuffer.toString('base64');
-
-      (access as Mock).mockResolvedValue(undefined);
-      (readFile as Mock).mockResolvedValue(`[port.host.com]:2222 ssh-ed25519 ${keyBase64}`);
-
-      const result = await service.verifyHostKey('port.host.com', 2222, 'ssh-ed25519', fingerprint);
-
-      expect(result).toBe('known');
-    });
-  });
-
-  describe('verifyHostKeyBuffer', () => {
-    it('should return unknown for unknown host', async () => {
-      (access as Mock).mockRejectedValue(new Error('File not found'));
-
-      const keyBuffer = Buffer.from('new-key');
-      const result = await service.verifyHostKeyBuffer('unknown.host.com', 22, keyBuffer);
-
-      expect(result).toBe('unknown');
-    });
-
-    it('should return valid for matching key buffer', async () => {
-      const keyBuffer = Buffer.from('matching-key-data');
-      const keyBase64 = keyBuffer.toString('base64');
-
-      (access as Mock).mockResolvedValue(undefined);
-      (readFile as Mock).mockResolvedValue(`valid.host.com ssh-ed25519 ${keyBase64}`);
-
-      const result = await service.verifyHostKeyBuffer('valid.host.com', 22, keyBuffer);
-
-      expect(result).toBe('valid');
-    });
-
-    it('should return invalid for non-matching key buffer', async () => {
-      const originalKey = Buffer.from('original-key').toString('base64');
-
-      (access as Mock).mockResolvedValue(undefined);
-      (readFile as Mock).mockResolvedValue(`invalid.host.com ssh-ed25519 ${originalKey}`);
-
-      const differentKey = Buffer.from('different-key');
-      const result = await service.verifyHostKeyBuffer('invalid.host.com', 22, differentKey);
-
-      expect(result).toBe('invalid');
-    });
-  });
-
-  describe('addHostKey', () => {
-    it('should add host key with standard port', async () => {
-      (access as Mock).mockRejectedValue(new Error('File not found'));
-
-      await service.addHostKey('new.host.com', 22, 'ssh-ed25519', 'SHA256:abc123def456');
-
-      expect(writeFile).toHaveBeenCalledWith(
-        '/home/testuser/.ssh/known_hosts',
-        'new.host.com ssh-ed25519 SHA256:abc123def456\n'
-      );
-    });
-
-    it('should add host key with non-standard port', async () => {
-      (access as Mock).mockRejectedValue(new Error('File not found'));
-
-      await service.addHostKey('new.host.com', 2222, 'ssh-ed25519', 'SHA256:abc123def456');
-
-      expect(writeFile).toHaveBeenCalledWith(
-        '/home/testuser/.ssh/known_hosts',
-        '[new.host.com]:2222 ssh-ed25519 SHA256:abc123def456\n'
-      );
-    });
-
-    it('should update existing host key', async () => {
-      (access as Mock).mockResolvedValue(undefined);
-      (readFile as Mock).mockResolvedValue('old.host.com ssh-ed25519 oldkey\n');
-
-      await service.addHostKey('old.host.com', 22, 'ssh-ed25519', 'new-fingerprint');
-
-      expect(writeFile).toHaveBeenCalledWith(
-        '/home/testuser/.ssh/known_hosts',
-        'old.host.com ssh-ed25519 new-fingerprint\n'
-      );
-    });
-  });
-
-  describe('addKnownHost', () => {
-    it('should append host with raw key buffer', async () => {
-      (access as Mock).mockRejectedValue(new Error('File not found'));
-
-      const keyBuffer = Buffer.from('raw-key-data');
-      await service.addKnownHost('raw.host.com', 22, keyBuffer, 'ssh-ed25519');
-
-      const expectedEntry = 'raw.host.com ssh-ed25519 cmF3LWtleS1kYXRh\n';
-      expect(appendFile).toHaveBeenCalledWith('/home/testuser/.ssh/known_hosts', expectedEntry);
-    });
-
-    it('should use default algorithm when not specified', async () => {
-      (access as Mock).mockRejectedValue(new Error('File not found'));
-
-      const keyBuffer = Buffer.from('key-data');
-      await service.addKnownHost('default.algo.com', 22, keyBuffer);
-
-      expect(appendFile).toHaveBeenCalledWith(
-        '/home/testuser/.ssh/known_hosts',
-        expect.stringContaining('ssh-ed25519')
-      );
-    });
-
-    it('should throw error when append fails', async () => {
-      (access as Mock).mockRejectedValue(new Error('File not found'));
-      (appendFile as Mock).mockRejectedValue(new Error('Permission denied'));
-
-      const keyBuffer = Buffer.from('key-data');
-      await expect(service.addKnownHost('fail.host.com', 22, keyBuffer)).rejects.toThrow(
-        'Failed to write to known_hosts'
-      );
-    });
-  });
-
-  describe('removeHostKey', () => {
-    it('should remove host with standard port', async () => {
-      (access as Mock).mockResolvedValue(undefined);
-      (readFile as Mock).mockResolvedValue(
-        `remove.host.com ssh-ed25519 key1\nother.host.com ssh-ed25519 key2\n`
-      );
-
-      await service.removeHostKey('remove.host.com', 22);
-
-      expect(writeFile).toHaveBeenCalledWith(
-        '/home/testuser/.ssh/known_hosts',
-        'other.host.com ssh-ed25519 key2\n'
-      );
-    });
-
-    it('should remove host with non-standard port', async () => {
-      (access as Mock).mockResolvedValue(undefined);
-      (readFile as Mock).mockResolvedValue(
-        `[remove.host.com]:2222 ssh-ed25519 key1\nother.host.com ssh-ed25519 key2\n`
-      );
-
-      await service.removeHostKey('remove.host.com', 2222);
-
-      expect(writeFile).toHaveBeenCalledWith(
-        '/home/testuser/.ssh/known_hosts',
-        'other.host.com ssh-ed25519 key2\n'
-      );
-    });
-
-    it('should remove both host and host:port entries', async () => {
-      (access as Mock).mockResolvedValue(undefined);
-      (readFile as Mock).mockResolvedValue(
-        `remove.host.com ssh-ed25519 key1\n[remove.host.com]:2222 ssh-ed25519 key2\n`
-      );
-
-      await service.removeHostKey('remove.host.com', 2222);
-
-      const writeCall = (writeFile as Mock).mock.calls[0];
-      expect(writeCall[1]).not.toContain('remove.host.com');
-    });
-  });
-
-  describe('removeKnownHost', () => {
-    it('should be alias for removeHostKey', async () => {
-      (access as Mock).mockResolvedValue(undefined);
-      (readFile as Mock).mockResolvedValue('alias.host.com ssh-ed25519 key\n');
-
-      await service.removeKnownHost('alias.host.com', 22);
-
-      expect(writeFile).toHaveBeenCalled();
-    });
-  });
-
-  describe('getKnownHosts', () => {
-    it('should return all known hosts with metadata', async () => {
-      const keyBuffer = Buffer.from('test-key-data');
-      const keyBase64 = keyBuffer.toString('base64');
-      const expectedFingerprint = service.getFingerprint(keyBuffer);
-
-      (access as Mock).mockResolvedValue(undefined);
-      (readFile as Mock).mockResolvedValue(
-        `host1.example.com ssh-ed25519 ${keyBase64}\n[host2.example.com]:2222 ssh-rsa ${keyBase64}`
-      );
-
-      const hosts = await service.getKnownHosts();
-
-      expect(hosts).toHaveLength(2);
-      expect(hosts[0]).toMatchObject({
-        host: 'host1.example.com',
-        port: 22,
-        keyType: 'ssh-ed25519',
-        fingerprint: expectedFingerprint,
-      });
-      expect(hosts[0].verifiedAt).toBeInstanceOf(Date);
-    });
-
-    it('should parse host:port format correctly', async () => {
-      (access as Mock).mockResolvedValue(undefined);
-      (readFile as Mock).mockResolvedValue('[complex.host.com]:2222 ssh-ed25519 keydata');
-
-      const hosts = await service.getKnownHosts();
-
-      expect(hosts[0]).toMatchObject({
-        host: 'complex.host.com',
-        port: 2222,
-      });
-    });
-  });
-
-  describe('isHostKnown', () => {
-    it('should return true for known host', async () => {
-      (access as Mock).mockResolvedValue(undefined);
-      (readFile as Mock).mockResolvedValue('known.host.com ssh-ed25519 key\n');
-
-      const result = await service.isHostKnown('known.host.com', 22);
-
-      expect(result).toBe(true);
-    });
-
-    it('should return false for unknown host', async () => {
-      (access as Mock).mockResolvedValue(undefined);
-      (readFile as Mock).mockResolvedValue('known.host.com ssh-ed25519 key\n');
-
-      const result = await service.isHostKnown('unknown.host.com', 22);
-
-      expect(result).toBe(false);
-    });
-
-    it('should check both host and host:port formats', async () => {
-      (access as Mock).mockResolvedValue(undefined);
-      (readFile as Mock).mockResolvedValue('[port.host.com]:2222 ssh-ed25519 key\n');
-
-      expect(await service.isHostKnown('port.host.com', 2222)).toBe(true);
-      expect(await service.isHostKnown('port.host.com', 22)).toBe(false);
-    });
-  });
-
-  describe('getHostKeyInfo', () => {
-    it('should return host key info object', () => {
-      const keyBuffer = Buffer.from('test-key-data');
-      const info = service.getHostKeyInfo('info.host.com', 22, keyBuffer, 'ssh-ed25519');
-
-      expect(info).toMatchObject({
-        host: 'info.host.com',
-        port: 22,
-        algorithm: 'ssh-ed25519',
-        key: keyBuffer,
-      });
-      expect(info.fingerprint).toMatch(/^SHA256:/);
-    });
-  });
-});
diff --git a/src/main/services/ssh/__tests__/SshService.test.ts b/src/main/services/ssh/__tests__/SshService.test.ts
deleted file mode 100644
index 4375ed956a..0000000000
--- a/src/main/services/ssh/__tests__/SshService.test.ts
+++ /dev/null
@@ -1,491 +0,0 @@
-import { describe, it, expect, beforeEach, vi, Mock } from 'vitest';
-import { SshService } from '../SshService';
-import { SshCredentialService } from '../SshCredentialService';
-import { SshConfig } from '../../../../shared/ssh/types';
-
-// Mock ssh2 Client
-const mockClientInstance = {
-  on: vi.fn(),
-  connect: vi.fn(),
-  end: vi.fn(),
-  exec: vi.fn(),
-  sftp: vi.fn(),
-};
-
-vi.mock('ssh2', () => ({
-  Client: vi.fn().mockImplementation(() => mockClientInstance),
-}));
-
-// Mock fs/promises
-vi.mock('fs/promises', () => ({
-  readFile: vi.fn(),
-}));
-
-// Mock crypto
-vi.mock('crypto', () => ({
-  randomUUID: vi.fn().mockReturnValue('test-uuid-123'),
-}));
-
-// Prevent keytar/native module loading through SshService's module-level singleton.
-vi.mock('../SshCredentialService', () => ({
-  SshCredentialService: class MockSshCredentialService {
-    getPassword = vi.fn();
-    getPassphrase = vi.fn();
-    storePassword = vi.fn();
-    storePassphrase = vi.fn();
-  },
-}));
-
-describe('SshService', () => {
-  let service: SshService;
-  let mockCredentialService: {
-    getPassword: Mock;
-    getPassphrase: Mock;
-    storePassword: Mock;
-    storePassphrase: Mock;
-  };
-
-  beforeEach(() => {
-    vi.clearAllMocks();
-    mockCredentialService = {
-      getPassword: vi.fn(),
-      getPassphrase: vi.fn(),
-      storePassword: vi.fn(),
-      storePassphrase: vi.fn(),
-    };
-    service = new SshService(mockCredentialService as unknown as SshCredentialService);
-  });
-
-  describe('buildConnectConfig - via connect method', () => {
-    it('should build correct config for password authentication', async () => {
-      const config: SshConfig = {
-        id: 'conn-1',
-        name: 'Test Connection',
-        host: 'example.com',
-        port: 22,
-        username: 'testuser',
-        authType: 'password',
-      };
-
-      mockCredentialService.getPassword.mockResolvedValue('testpassword');
-
-      // Capture the connect config
-      let capturedConfig: any;
-      mockClientInstance.connect.mockImplementation((cfg: any) => {
-        capturedConfig = cfg;
-        // Simulate successful connection
-        const readyHandler = mockClientInstance.on.mock.calls.find(
-          (call: any) => call[0] === 'ready'
-        )?.[1];
-        if (readyHandler) {
-          setTimeout(() => readyHandler(), 0);
-        }
-      });
-
-      await service.connect(config);
-
-      expect(capturedConfig).toMatchObject({
-        host: 'example.com',
-        port: 22,
-        username: 'testuser',
-        password: 'testpassword',
-        readyTimeout: 20000,
-        keepaliveInterval: 60000,
-        keepaliveCountMax: 3,
-      });
-    });
-
-    it('should build correct config for key authentication', async () => {
-      const { readFile } = await import('fs/promises');
-      (readFile as Mock).mockResolvedValue('-----BEGIN OPENSSH PRIVATE KEY-----');
-
-      const config: SshConfig = {
-        id: 'conn-2',
-        name: 'Key Connection',
-        host: 'example.com',
-        port: 22,
-        username: 'testuser',
-        authType: 'key',
-        privateKeyPath: '/home/user/.ssh/id_rsa',
-      };
-
-      mockCredentialService.getPassphrase.mockResolvedValue(null);
-
-      let capturedConfig: any;
-      mockClientInstance.connect.mockImplementation((cfg: any) => {
-        capturedConfig = cfg;
-        const readyHandler = mockClientInstance.on.mock.calls.find(
-          (call: any) => call[0] === 'ready'
-        )?.[1];
-        if (readyHandler) {
-          setTimeout(() => readyHandler(), 0);
-        }
-      });
-
-      await service.connect(config);
-
-      expect(readFile).toHaveBeenCalledWith('/home/user/.ssh/id_rsa', 'utf-8');
-      expect(capturedConfig).toMatchObject({
-        host: 'example.com',
-        privateKey: '-----BEGIN OPENSSH PRIVATE KEY-----',
-      });
-    });
-
-    it('should include passphrase for encrypted key', async () => {
-      const { readFile } = await import('fs/promises');
-      (readFile as Mock).mockResolvedValue('-----BEGIN OPENSSH PRIVATE KEY-----');
-
-      const config: SshConfig = {
-        id: 'conn-3',
-        name: 'Encrypted Key',
-        host: 'example.com',
-        port: 22,
-        username: 'testuser',
-        authType: 'key',
-        privateKeyPath: '/home/user/.ssh/id_rsa',
-      };
-
-      mockCredentialService.getPassphrase.mockResolvedValue('keypassphrase');
-
-      let capturedConfig: any;
-      mockClientInstance.connect.mockImplementation((cfg: any) => {
-        capturedConfig = cfg;
-        const readyHandler = mockClientInstance.on.mock.calls.find(
-          (call: any) => call[0] === 'ready'
-        )?.[1];
-        if (readyHandler) {
-          setTimeout(() => readyHandler(), 0);
-        }
-      });
-
-      await service.connect(config);
-
-      expect(capturedConfig).toMatchObject({
-        privateKey: '-----BEGIN OPENSSH PRIVATE KEY-----',
-        passphrase: 'keypassphrase',
-      });
-    });
-
-    it('should build correct config for agent authentication', async () => {
-      const originalEnv = process.env.SSH_AUTH_SOCK;
-      process.env.SSH_AUTH_SOCK = '/tmp/ssh-agent.sock';
-
-      const config: SshConfig = {
-        id: 'conn-4',
-        name: 'Agent Connection',
-        host: 'example.com',
-        port: 22,
-        username: 'testuser',
-        authType: 'agent',
-      };
-
-      let capturedConfig: any;
-      mockClientInstance.connect.mockImplementation((cfg: any) => {
-        capturedConfig = cfg;
-        const readyHandler = mockClientInstance.on.mock.calls.find(
-          (call: any) => call[0] === 'ready'
-        )?.[1];
-        if (readyHandler) {
-          setTimeout(() => readyHandler(), 0);
-        }
-      });
-
-      await service.connect(config);
-
-      expect(capturedConfig).toMatchObject({
-        agent: '/tmp/ssh-agent.sock',
-      });
-
-      process.env.SSH_AUTH_SOCK = originalEnv;
-    });
-  });
-
-  describe('authentication error handling', () => {
-    it('should throw error when agent socket is not set', async () => {
-      const originalEnv = process.env.SSH_AUTH_SOCK;
-      delete process.env.SSH_AUTH_SOCK;
-
-      const config: SshConfig = {
-        id: 'conn-5',
-        name: 'Agent Connection',
-        host: 'example.com',
-        port: 22,
-        username: 'testuser',
-        authType: 'agent',
-      };
-
-      // Suppress error event
-      service.on('error', () => {});
-
-      await expect(service.connect(config)).rejects.toThrow(/SSH agent authentication failed/);
-
-      process.env.SSH_AUTH_SOCK = originalEnv;
-    });
-
-    it('should throw error when password is not found', async () => {
-      const config: SshConfig = {
-        id: 'conn-6',
-        name: 'Password Connection',
-        host: 'example.com',
-        port: 22,
-        username: 'testuser',
-        authType: 'password',
-      };
-
-      mockCredentialService.getPassword.mockResolvedValue(null);
-      service.on('error', () => {});
-
-      await expect(service.connect(config)).rejects.toThrow(
-        'No password found for connection conn-6'
-      );
-    });
-
-    it('should throw error when private key path is missing', async () => {
-      const config: SshConfig = {
-        id: 'conn-7',
-        name: 'Key Connection',
-        host: 'example.com',
-        port: 22,
-        username: 'testuser',
-        authType: 'key',
-      };
-
-      service.on('error', () => {});
-
-      await expect(service.connect(config)).rejects.toThrow(
-        'Private key path is required for key authentication'
-      );
-    });
-
-    it('should throw error when private key file cannot be read', async () => {
-      const { readFile } = await import('fs/promises');
-      (readFile as Mock).mockRejectedValue(new Error('Permission denied'));
-
-      const config: SshConfig = {
-        id: 'conn-8',
-        name: 'Key Connection',
-        host: 'example.com',
-        port: 22,
-        username: 'testuser',
-        authType: 'key',
-        privateKeyPath: '/home/user/.ssh/id_rsa',
-      };
-
-      service.on('error', () => {});
-
-      await expect(service.connect(config)).rejects.toThrow(
-        'Failed to read private key: Permission denied'
-      );
-    });
-  });
-
-  describe('connection management', () => {
-    it('should generate UUID when id is not provided', async () => {
-      const config: SshConfig = {
-        name: 'Test Connection',
-        host: 'example.com',
-        port: 22,
-        username: 'testuser',
-        authType: 'password',
-      };
-
-      mockCredentialService.getPassword.mockResolvedValue('testpassword');
-      mockClientInstance.connect.mockImplementation((cfg: any) => {
-        const readyHandler = mockClientInstance.on.mock.calls.find(
-          (call: any) => call[0] === 'ready'
-        )?.[1];
-        if (readyHandler) {
-          setTimeout(() => readyHandler(), 0);
-        }
-      });
-
-      const connectionId = await service.connect(config);
-
-      expect(connectionId).toBe('test-uuid-123');
-    });
-
-    it('should track connection state', async () => {
-      const config: SshConfig = {
-        id: 'conn-9',
-        name: 'Test Connection',
-        host: 'example.com',
-        port: 22,
-        username: 'testuser',
-        authType: 'password',
-      };
-
-      mockCredentialService.getPassword.mockResolvedValue('testpassword');
-      mockClientInstance.connect.mockImplementation((cfg: any) => {
-        const readyHandler = mockClientInstance.on.mock.calls.find(
-          (call: any) => call[0] === 'ready'
-        )?.[1];
-        if (readyHandler) {
-          setTimeout(() => readyHandler(), 0);
-        }
-      });
-
-      expect(service.isConnected('conn-9')).toBe(false);
-      await service.connect(config);
-      expect(service.isConnected('conn-9')).toBe(true);
-    });
-
-    it('should list connections', async () => {
-      const config1: SshConfig = {
-        id: 'conn-a',
-        name: 'Connection A',
-        host: 'host-a.com',
-        port: 22,
-        username: 'user-a',
-        authType: 'password',
-      };
-
-      const config2: SshConfig = {
-        id: 'conn-b',
-        name: 'Connection B',
-        host: 'host-b.com',
-        port: 22,
-        username: 'user-b',
-        authType: 'password',
-      };
-
-      mockCredentialService.getPassword.mockResolvedValue('testpassword');
-
-      // Setup mock to capture and trigger ready handlers
-      const readyHandlers: Array<() => void> = [];
-      mockClientInstance.on.mockImplementation(
-        (event: string, handler: (...args: any[]) => void) => {
-          if (event === 'ready') {
-            readyHandlers.push(handler as () => void);
-          }
-          return mockClientInstance;
-        }
-      );
-
-      mockClientInstance.connect.mockImplementation(() => {
-        // Trigger the last registered ready handler
-        const handler = readyHandlers[readyHandlers.length - 1];
-        if (handler) {
-          setTimeout(() => handler(), 0);
-        }
-      });
-
-      await service.connect(config1);
-      await service.connect(config2);
-
-      const connections = service.listConnections();
-      expect(connections).toContain('conn-a');
-      expect(connections).toContain('conn-b');
-    });
-
-    it('should get connection info', async () => {
-      const config: SshConfig = {
-        id: 'conn-20',
-        name: 'Test Connection',
-        host: 'example.com',
-        port: 22,
-        username: 'testuser',
-        authType: 'password',
-      };
-
-      mockCredentialService.getPassword.mockResolvedValue('testpassword');
-      mockClientInstance.connect.mockImplementation((cfg: any) => {
-        const readyHandler = mockClientInstance.on.mock.calls.find(
-          (call: any) => call[0] === 'ready'
-        )?.[1];
-        if (readyHandler) {
-          setTimeout(() => readyHandler(), 0);
-        }
-      });
-
-      await service.connect(config);
-
-      const info = service.getConnectionInfo('conn-20');
-      expect(info).not.toBeNull();
-      expect(info?.connectedAt).toBeInstanceOf(Date);
-      expect(info?.lastActivity).toBeInstanceOf(Date);
-    });
-
-    it('should return null for non-existent connection info', async () => {
-      const info = service.getConnectionInfo('non-existent');
-      expect(info).toBeNull();
-    });
-
-    it('should get all connections', async () => {
-      const config: SshConfig = {
-        id: 'conn-21',
-        name: 'Test Connection',
-        host: 'example.com',
-        port: 22,
-        username: 'testuser',
-        authType: 'password',
-      };
-
-      mockCredentialService.getPassword.mockResolvedValue('testpassword');
-      mockClientInstance.connect.mockImplementation((cfg: any) => {
-        const readyHandler = mockClientInstance.on.mock.calls.find(
-          (call: any) => call[0] === 'ready'
-        )?.[1];
-        if (readyHandler) {
-          setTimeout(() => readyHandler(), 0);
-        }
-      });
-
-      await service.connect(config);
-
-      const connections = service.getAllConnections();
-      expect(connections).toHaveLength(1);
-      expect(connections[0].id).toBe('conn-21');
-    });
-
-    it('should handle disconnect for non-existent connection', async () => {
-      await service.disconnect('non-existent');
-      expect(mockClientInstance.end).not.toHaveBeenCalled();
-    });
-  });
-
-  describe('escapeShellArg', () => {
-    it('should escape single quotes in shell arguments', async () => {
-      const config: SshConfig = {
-        id: 'conn-esc',
-        name: 'Test',
-        host: 'example.com',
-        port: 22,
-        username: 'user',
-        authType: 'password',
-      };
-
-      mockCredentialService.getPassword.mockResolvedValue('password');
-
-      // Use exec to test escapeShellArg indirectly
-      const { EventEmitter } = await import('events');
-      const mockStream = new EventEmitter();
-      (mockStream as any).stderr = new EventEmitter();
-
-      mockClientInstance.connect.mockImplementation((cfg: any) => {
-        const readyHandler = mockClientInstance.on.mock.calls.find(
-          (call: any) => call[0] === 'ready'
-        )?.[1];
-        if (readyHandler) {
-          setTimeout(() => readyHandler(), 0);
-        }
-      });
-
-      mockClientInstance.exec.mockImplementation(
-        (command: string, callback: (err: Error | null, stream: any) => void) => {
-          callback(null, mockStream);
-          setTimeout(() => {
-            mockStream.emit('close', 0);
-          }, 0);
-        }
-      );
-
-      await service.connect(config);
-      await service.executeCommand('conn-esc', 'ls', "/path/with'quotes");
-
-      // Verify the command was escaped
-      const execCall = mockClientInstance.exec.mock.calls[0];
-      expect(execCall[0]).toContain("'");
-      expect(execCall[0]).toContain("'\\''");
-    });
-  });
-});
diff --git a/src/main/services/ssh/index.ts b/src/main/services/ssh/index.ts
deleted file mode 100644
index 5391e8afee..0000000000
--- a/src/main/services/ssh/index.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-// SSH Services - Wave 1 Foundation
-// Main exports for SSH functionality
-
-export { SshService } from './SshService';
-export { SshCredentialService } from './SshCredentialService';
-export { SshHostKeyService } from './SshHostKeyService';
-export { SshConnectionMonitor } from './SshConnectionMonitor';
-export type { ExecResult } from '../../../shared/ssh/types';
-export type { Connection, ConnectionPool, HostKeyEntry, ConnectionMetrics } from './types';
diff --git a/src/main/services/ssh/types.ts b/src/main/services/ssh/types.ts
deleted file mode 100644
index 8dd788db1a..0000000000
--- a/src/main/services/ssh/types.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import { Client, SFTPWrapper } from 'ssh2';
-import { SshConfig } from '../../../shared/ssh/types';
-
-export interface Connection {
-  id: string;
-  config: SshConfig;
-  client: Client;
-  sftp?: SFTPWrapper;
-  connectedAt: Date;
-  lastActivity: Date;
-}
-
-export interface ConnectionPool {
-  [connectionId: string]: Connection;
-}
-
-export interface HostKeyEntry {
-  host: string;
-  port: number;
-  keyType: string;
-  fingerprint: string;
-  verifiedAt: Date;
-}
-
-export interface ConnectionMetrics {
-  connectionId: string;
-  bytesSent: number;
-  bytesReceived: number;
-  latencyMs: number;
-  lastPingAt?: Date;
-}
diff --git a/src/main/services/updateIpc.ts b/src/main/services/updateIpc.ts
deleted file mode 100644
index 9f328df707..0000000000
--- a/src/main/services/updateIpc.ts
+++ /dev/null
@@ -1,145 +0,0 @@
-import { app, ipcMain } from 'electron';
-import { formatUpdaterError } from '../lib/updaterError';
-import { autoUpdateService } from './AutoUpdateService';
-
-const DEV_HINT_CHECK = 'Updates are disabled in development.';
-const DEV_HINT_DOWNLOAD = 'Cannot download updates in development.';
-
-// Skip all auto-updater setup in development
-const isDev = !app.isPackaged || process.env.NODE_ENV === 'development';
-
-// Fallback: open latest download link in browser for manual install
-function getLatestDownloadUrl(): string {
-  const platform = process.platform;
-  const arch = process.arch === 'arm64' ? 'arm64' : 'x64';
-  const baseUrl = 'https://github.com/generalaction/emdash/releases/latest/download';
-
-  switch (platform) {
-    case 'darwin':
-      return `${baseUrl}/emdash-${arch}.dmg`;
-    case 'linux':
-      // For Linux, prefer AppImage (more universal)
-      return `${baseUrl}/emdash-x86_64.AppImage`;
-    case 'win32':
-      // For Windows, prefer the installer exe (NSIS)
-      return `${baseUrl}/emdash-x64.exe`;
-    default:
-      // Fallback to releases page
-      return 'https://github.com/generalaction/emdash/releases/latest';
-  }
-}
-
-export function registerUpdateIpc() {
-  // AutoUpdateService handles all initialization and event listeners
-
-  ipcMain.handle('update:check', async () => {
-    try {
-      // Always skip in dev mode - no exceptions
-      if (isDev) {
-        return {
-          success: false,
-          error: DEV_HINT_CHECK,
-          devDisabled: true,
-        } as any;
-      }
-      // Delegate to AutoUpdateService to avoid race conditions
-      const result = await autoUpdateService.checkForUpdates(false);
-      return { success: true, result: result ?? null };
-    } catch (error) {
-      return { success: false, error: formatUpdaterError(error) };
-    }
-  });
-
-  ipcMain.handle('update:download', async () => {
-    try {
-      // Always skip in dev mode - no exceptions
-      if (isDev) {
-        return {
-          success: false,
-          error: DEV_HINT_DOWNLOAD,
-          devDisabled: true,
-        } as any;
-      }
-      // Delegate to AutoUpdateService to avoid race conditions
-      await autoUpdateService.downloadUpdate();
-      return { success: true };
-    } catch (error) {
-      return { success: false, error: formatUpdaterError(error) };
-    }
-  });
-
-  ipcMain.handle('update:quit-and-install', async () => {
-    try {
-      // Delegate to AutoUpdateService which handles rollback info
-      autoUpdateService.quitAndInstall();
-      return { success: true };
-    } catch (error) {
-      return { success: false, error: formatUpdaterError(error) };
-    }
-  });
-
-  ipcMain.handle('update:open-latest', async () => {
-    try {
-      const { shell } = require('electron');
-      await shell.openExternal(getLatestDownloadUrl());
-      // Gracefully quit after opening the external download link so the user can install
-      setTimeout(() => {
-        try {
-          app.quit();
-        } catch {}
-      }, 500);
-      return { success: true };
-    } catch (error) {
-      return { success: false, error: error instanceof Error ? error.message : String(error) };
-    }
-  });
-
-  // Expose app version for simple comparisons on renderer
-  ipcMain.handle('update:get-version', () => app.getVersion());
-
-  // Enhanced IPC handlers for AutoUpdateService
-  ipcMain.handle('update:get-state', async () => {
-    try {
-      const state = autoUpdateService.getState();
-      return { success: true, data: state };
-    } catch (error) {
-      return { success: false, error: formatUpdaterError(error) };
-    }
-  });
-
-  ipcMain.handle('update:get-settings', async () => {
-    try {
-      const settings = autoUpdateService.getSettings();
-      return { success: true, data: settings };
-    } catch (error) {
-      return { success: false, error: formatUpdaterError(error) };
-    }
-  });
-
-  ipcMain.handle('update:update-settings', async (_event, settings: any) => {
-    try {
-      await autoUpdateService.updateSettings(settings);
-      return { success: true };
-    } catch (error) {
-      return { success: false, error: formatUpdaterError(error) };
-    }
-  });
-
-  ipcMain.handle('update:get-release-notes', async () => {
-    try {
-      const notes = await autoUpdateService.fetchReleaseNotes();
-      return { success: true, data: notes };
-    } catch (error) {
-      return { success: false, error: formatUpdaterError(error) };
-    }
-  });
-
-  ipcMain.handle('update:check-now', async () => {
-    try {
-      const result = await autoUpdateService.checkForUpdates(false);
-      return { success: true, data: result };
-    } catch (error) {
-      return { success: false, error: formatUpdaterError(error) };
-    }
-  });
-}
diff --git a/src/main/services/worktreeIpc.ts b/src/main/services/worktreeIpc.ts
deleted file mode 100644
index 92fa09edd1..0000000000
--- a/src/main/services/worktreeIpc.ts
+++ /dev/null
@@ -1,448 +0,0 @@
-import { ipcMain } from 'electron';
-import { worktreeService } from './WorktreeService';
-import { worktreePoolService } from './WorktreePoolService';
-import { databaseService, type Project } from './DatabaseService';
-import { getDrizzleClient } from '../db/drizzleClient';
-import { projects as projectsTable } from '../db/schema';
-import { eq } from 'drizzle-orm';
-import crypto from 'crypto';
-import { RemoteGitService } from './RemoteGitService';
-import { sshService } from './ssh/SshService';
-import { log } from '../lib/logger';
-import { quoteShellArg } from '../utils/shellEscape';
-import {
-  isRemoteProject,
-  resolveRemoteProjectForWorktreePath,
-} from '../utils/remoteProjectResolver';
-
-const remoteGitService = new RemoteGitService(sshService);
-
-function stableIdFromRemotePath(worktreePath: string): string {
-  const h = crypto.createHash('sha1').update(worktreePath).digest('hex').slice(0, 12);
-  return `wt-${h}`;
-}
-
-async function resolveProjectByIdOrPath(args: {
-  projectId?: string;
-  projectPath?: string;
-}): Promise<Project | null> {
-  if (args.projectId) {
-    return databaseService.getProjectById(args.projectId);
-  }
-  if (args.projectPath) {
-    const { db } = await getDrizzleClient();
-    const rows = await db
-      .select({ id: projectsTable.id })
-      .from(projectsTable)
-      .where(eq(projectsTable.path, args.projectPath))
-      .limit(1);
-    if (rows.length > 0) {
-      return databaseService.getProjectById(rows[0].id);
-    }
-  }
-  return null;
-}
-
-// isRemoteProject and resolveRemoteProjectForWorktreePath imported from ../utils/remoteProjectResolver
-
-export function registerWorktreeIpc(): void {
-  // Create a new worktree
-  ipcMain.handle(
-    'worktree:create',
-    async (
-      event,
-      args: {
-        projectPath: string;
-        taskName: string;
-        projectId: string;
-        baseRef?: string;
-      }
-    ) => {
-      try {
-        const project = await resolveProjectByIdOrPath({
-          projectId: args.projectId,
-          projectPath: args.projectPath,
-        });
-
-        if (isRemoteProject(project)) {
-          const baseRef = args.baseRef ?? project.gitInfo.baseRef;
-          log.info('worktree:create (remote)', {
-            projectId: project.id,
-            remotePath: project.remotePath,
-          });
-          const remote = await remoteGitService.createWorktree(
-            project.sshConnectionId,
-            project.remotePath,
-            args.taskName,
-            baseRef
-          );
-          const worktree = {
-            id: stableIdFromRemotePath(remote.path),
-            name: args.taskName,
-            branch: remote.branch,
-            path: remote.path,
-            projectId: project.id,
-            status: 'active' as const,
-            createdAt: new Date().toISOString(),
-          };
-          return { success: true, worktree };
-        }
-
-        const worktree = await worktreeService.createWorktree(
-          args.projectPath,
-          args.taskName,
-          args.projectId,
-          args.baseRef
-        );
-        return { success: true, worktree };
-      } catch (error) {
-        console.error('Failed to create worktree:', error);
-        return { success: false, error: (error as Error).message };
-      }
-    }
-  );
-
-  // List worktrees for a project
-  ipcMain.handle('worktree:list', async (event, args: { projectPath: string }) => {
-    try {
-      const project = await resolveProjectByIdOrPath({ projectPath: args.projectPath });
-      if (isRemoteProject(project)) {
-        const remoteWorktrees = await remoteGitService.listWorktrees(
-          project.sshConnectionId,
-          project.remotePath
-        );
-        const worktrees = remoteWorktrees.map((wt) => {
-          const name = wt.path.split('/').filter(Boolean).pop() || wt.path;
-          return {
-            id: stableIdFromRemotePath(wt.path),
-            name,
-            branch: wt.branch,
-            path: wt.path,
-            projectId: project.id,
-            status: 'active' as const,
-            createdAt: new Date().toISOString(),
-          };
-        });
-        return { success: true, worktrees };
-      }
-
-      const worktrees = await worktreeService.listWorktrees(args.projectPath);
-      return { success: true, worktrees };
-    } catch (error) {
-      console.error('Failed to list worktrees:', error);
-      return { success: false, error: (error as Error).message };
-    }
-  });
-
-  // Remove a worktree
-  ipcMain.handle(
-    'worktree:remove',
-    async (
-      event,
-      args: {
-        projectPath: string;
-        worktreeId: string;
-        worktreePath?: string;
-        branch?: string;
-      }
-    ) => {
-      try {
-        const project = await resolveProjectByIdOrPath({ projectPath: args.projectPath });
-        if (isRemoteProject(project)) {
-          const pathToRemove = args.worktreePath;
-          if (!pathToRemove) {
-            throw new Error('worktreePath is required for remote worktree removal');
-          }
-          log.info('worktree:remove (remote)', {
-            projectId: project.id,
-            remotePath: project.remotePath,
-            worktreePath: pathToRemove,
-          });
-          await remoteGitService.removeWorktree(
-            project.sshConnectionId,
-            project.remotePath,
-            pathToRemove
-          );
-          // Best-effort prune to clear stale metadata.
-          try {
-            await sshService.executeCommand(
-              project.sshConnectionId,
-              'git worktree prune --verbose',
-              project.remotePath
-            );
-          } catch {}
-          if (args.branch) {
-            try {
-              await sshService.executeCommand(
-                project.sshConnectionId,
-                `git branch -D ${quoteShellArg(args.branch)}`,
-                project.remotePath
-              );
-            } catch {}
-          }
-          return { success: true };
-        }
-
-        await worktreeService.removeWorktree(
-          args.projectPath,
-          args.worktreeId,
-          args.worktreePath,
-          args.branch
-        );
-        return { success: true };
-      } catch (error) {
-        console.error('Failed to remove worktree:', error);
-        return { success: false, error: (error as Error).message };
-      }
-    }
-  );
-
-  // Get worktree status
-  ipcMain.handle('worktree:status', async (event, args: { worktreePath: string }) => {
-    try {
-      const remoteProject = await resolveRemoteProjectForWorktreePath(args.worktreePath);
-      if (remoteProject) {
-        const status = await remoteGitService.getWorktreeStatus(
-          remoteProject.sshConnectionId,
-          args.worktreePath
-        );
-        return { success: true, status };
-      }
-
-      const status = await worktreeService.getWorktreeStatus(args.worktreePath);
-      return { success: true, status };
-    } catch (error) {
-      console.error('Failed to get worktree status:', error);
-      return { success: false, error: (error as Error).message };
-    }
-  });
-
-  // Merge worktree changes
-  ipcMain.handle(
-    'worktree:merge',
-    async (
-      event,
-      args: {
-        projectPath: string;
-        worktreeId: string;
-      }
-    ) => {
-      try {
-        const project = await resolveProjectByIdOrPath({ projectPath: args.projectPath });
-        if (isRemoteProject(project)) {
-          return { success: false, error: 'Remote worktree merge is not supported yet' };
-        }
-        await worktreeService.mergeWorktreeChanges(args.projectPath, args.worktreeId);
-        return { success: true };
-      } catch (error) {
-        console.error('Failed to merge worktree changes:', error);
-        return { success: false, error: (error as Error).message };
-      }
-    }
-  );
-
-  // Get worktree by ID
-  ipcMain.handle('worktree:get', async (event, args: { worktreeId: string }) => {
-    try {
-      const worktree = worktreeService.getWorktree(args.worktreeId);
-      return { success: true, worktree };
-    } catch (error) {
-      console.error('Failed to get worktree:', error);
-      return { success: false, error: (error as Error).message };
-    }
-  });
-
-  // Get all worktrees
-  ipcMain.handle('worktree:getAll', async () => {
-    try {
-      const worktrees = worktreeService.getAllWorktrees();
-      return { success: true, worktrees };
-    } catch (error) {
-      console.error('Failed to get all worktrees:', error);
-      return { success: false, error: (error as Error).message };
-    }
-  });
-
-  // Ensure a reserve worktree exists for a project (background operation)
-  ipcMain.handle(
-    'worktree:ensureReserve',
-    async (
-      event,
-      args: {
-        projectId: string;
-        projectPath: string;
-        baseRef?: string;
-      }
-    ) => {
-      try {
-        const project = await resolveProjectByIdOrPath({
-          projectId: args.projectId,
-          projectPath: args.projectPath,
-        });
-        if (isRemoteProject(project)) {
-          // Remote worktree pooling is not supported (avoid local mkdir on remote paths).
-          return { success: true };
-        }
-        // Fire and forget - don't await, just start the process
-        worktreePoolService.ensureReserve(args.projectId, args.projectPath, args.baseRef);
-        return { success: true };
-      } catch (error) {
-        console.error('Failed to ensure reserve:', error);
-        return { success: false, error: (error as Error).message };
-      }
-    }
-  );
-
-  // Check if a reserve is available for a project
-  ipcMain.handle('worktree:hasReserve', async (event, args: { projectId: string }) => {
-    try {
-      const project = await resolveProjectByIdOrPath({ projectId: args.projectId });
-      if (isRemoteProject(project)) {
-        return { success: true, hasReserve: false };
-      }
-      const hasReserve = worktreePoolService.hasReserve(args.projectId);
-      return { success: true, hasReserve };
-    } catch (error) {
-      console.error('Failed to check reserve:', error);
-      return { success: false, error: (error as Error).message };
-    }
-  });
-
-  // Claim a reserve worktree for a new task (instant operation)
-  ipcMain.handle(
-    'worktree:claimReserve',
-    async (
-      event,
-      args: {
-        projectId: string;
-        projectPath: string;
-        taskName: string;
-        baseRef?: string;
-      }
-    ) => {
-      try {
-        const project = await resolveProjectByIdOrPath({
-          projectId: args.projectId,
-          projectPath: args.projectPath,
-        });
-        if (isRemoteProject(project)) {
-          return { success: false, error: 'Remote worktree pooling is not supported yet' };
-        }
-        const result = await worktreePoolService.claimReserve(
-          args.projectId,
-          args.projectPath,
-          args.taskName,
-          args.baseRef
-        );
-        if (result) {
-          return {
-            success: true,
-            worktree: result.worktree,
-            needsBaseRefSwitch: result.needsBaseRefSwitch,
-          };
-        }
-        return { success: false, error: 'No reserve available' };
-      } catch (error) {
-        console.error('Failed to claim reserve:', error);
-        return { success: false, error: (error as Error).message };
-      }
-    }
-  );
-
-  // Claim a reserve and persist the task in one IPC round-trip.
-  ipcMain.handle(
-    'worktree:claimReserveAndSaveTask',
-    async (
-      event,
-      args: {
-        projectId: string;
-        projectPath: string;
-        taskName: string;
-        baseRef?: string;
-        task: {
-          projectId: string;
-          name: string;
-          status: 'active' | 'idle' | 'running';
-          agentId?: string | null;
-          metadata?: any;
-          useWorktree?: boolean;
-        };
-      }
-    ) => {
-      try {
-        const project = await resolveProjectByIdOrPath({
-          projectId: args.projectId,
-          projectPath: args.projectPath,
-        });
-        if (isRemoteProject(project)) {
-          return { success: false, error: 'Remote worktree pooling is not supported yet' };
-        }
-
-        const claim = await worktreePoolService.claimReserve(
-          args.projectId,
-          args.projectPath,
-          args.taskName,
-          args.baseRef
-        );
-        if (!claim) {
-          return { success: false, error: 'No reserve available' };
-        }
-
-        const persistedTask = {
-          id: claim.worktree.id,
-          projectId: args.projectId,
-          name: args.taskName,
-          branch: claim.worktree.branch,
-          path: claim.worktree.path,
-          status: args.task.status,
-          agentId: args.task.agentId ?? null,
-          metadata: args.task.metadata ?? null,
-          useWorktree: args.task.useWorktree !== false,
-        };
-
-        await databaseService.saveTask(persistedTask);
-
-        return {
-          success: true,
-          worktree: claim.worktree,
-          task: persistedTask,
-          needsBaseRefSwitch: claim.needsBaseRefSwitch,
-        };
-      } catch (error) {
-        console.error('Failed to claim reserve and save task:', error);
-        return { success: false, error: (error as Error).message };
-      }
-    }
-  );
-
-  // Remove reserve for a project (cleanup)
-  ipcMain.handle(
-    'worktree:removeReserve',
-    async (event, args: { projectId: string; projectPath?: string; isRemote?: boolean }) => {
-      try {
-        if (args.isRemote) {
-          return { success: true };
-        }
-
-        let projectPath = args.projectPath;
-        if (!projectPath) {
-          const project = await resolveProjectByIdOrPath({ projectId: args.projectId });
-          if (!project) {
-            await worktreePoolService.removeReserve(args.projectId);
-            return { success: true };
-          }
-          if (isRemoteProject(project)) {
-            return { success: true };
-          }
-          projectPath = project.path;
-        }
-
-        await worktreePoolService.removeReserve(args.projectId, projectPath);
-        return { success: true };
-      } catch (error) {
-        console.error('Failed to remove reserve:', error);
-        return { success: false, error: (error as Error).message };
-      }
-    }
-  );
-}
diff --git a/src/main/settings.ts b/src/main/settings.ts
deleted file mode 100644
index b4957b068a..0000000000
--- a/src/main/settings.ts
+++ /dev/null
@@ -1,607 +0,0 @@
-import { app } from 'electron';
-import { existsSync, readFileSync, writeFileSync, mkdirSync } from 'node:fs';
-import { dirname, join } from 'node:path';
-import { homedir } from 'node:os';
-import type { ProviderId } from '@shared/providers/registry';
-import { isValidProviderId } from '@shared/providers/registry';
-import { isValidOpenInAppId, type OpenInAppId } from '@shared/openInApps';
-
-export type DeepPartial<T> = {
-  [K in keyof T]?: NonNullable<T[K]> extends object ? DeepPartial<NonNullable<T[K]>> : T[K];
-};
-
-export type AppSettingsUpdate = DeepPartial<AppSettings>;
-
-const DEFAULT_PROVIDER_ID: ProviderId = 'claude';
-const IS_MAC = process.platform === 'darwin';
-
-export interface RepositorySettings {
-  branchPrefix: string; // e.g., 'emdash'
-  pushOnCreate: boolean;
-}
-
-export type ShortcutModifier =
-  | 'cmd'
-  | 'ctrl'
-  | 'shift'
-  | 'alt'
-  | 'option'
-  | 'cmd+shift'
-  | 'ctrl+shift';
-
-export interface ShortcutBinding {
-  key: string;
-  modifier: ShortcutModifier;
-}
-
-export interface KeyboardSettings {
-  commandPalette?: ShortcutBinding;
-  settings?: ShortcutBinding;
-  toggleLeftSidebar?: ShortcutBinding;
-  toggleRightSidebar?: ShortcutBinding;
-  toggleTheme?: ShortcutBinding;
-  toggleKanban?: ShortcutBinding;
-  toggleEditor?: ShortcutBinding;
-  closeModal?: ShortcutBinding;
-  nextProject?: ShortcutBinding;
-  prevProject?: ShortcutBinding;
-  newTask?: ShortcutBinding;
-  nextAgent?: ShortcutBinding;
-  prevAgent?: ShortcutBinding;
-}
-
-export interface InterfaceSettings {
-  autoRightSidebarBehavior?: boolean;
-  theme?: 'light' | 'dark' | 'dark-black' | 'system';
-  taskHoverAction?: 'delete' | 'archive';
-}
-
-/**
- * Custom configuration for a CLI provider.
- * All fields are optional - if undefined, the default from registry.ts is used.
- * If set to empty string, the flag is disabled.
- */
-export interface ProviderCustomConfig {
-  cli?: string;
-  resumeFlag?: string;
-  defaultArgs?: string;
-  autoApproveFlag?: string;
-  initialPromptFlag?: string;
-  extraArgs?: string;
-  env?: Record<string, string>;
-}
-
-export type ProviderCustomConfigs = Record<string, ProviderCustomConfig>;
-
-export interface AppSettings {
-  repository: RepositorySettings;
-  projectPrep: {
-    autoInstallOnOpenInEditor: boolean;
-  };
-  browserPreview?: {
-    enabled: boolean;
-    engine: 'chromium';
-  };
-  notifications?: {
-    enabled: boolean;
-    sound: boolean;
-    osNotifications: boolean;
-    soundFocusMode: 'always' | 'unfocused';
-  };
-  mcp?: {
-    context7?: {
-      enabled: boolean;
-      installHintsDismissed?: Record<string, boolean>;
-    };
-  };
-  defaultProvider?: ProviderId;
-  tasks?: {
-    autoGenerateName: boolean;
-    autoApproveByDefault: boolean;
-    autoTrustWorktrees: boolean;
-  };
-  projects?: {
-    defaultDirectory: string;
-  };
-  keyboard?: KeyboardSettings;
-  interface?: InterfaceSettings;
-  providerConfigs?: ProviderCustomConfigs;
-  terminal?: {
-    fontFamily: string;
-    autoCopyOnSelection: boolean;
-  };
-  defaultOpenInApp?: OpenInAppId;
-  hiddenOpenInApps?: OpenInAppId[];
-}
-
-function getPlatformTaskSwitchDefaults(): { next: ShortcutBinding; prev: ShortcutBinding } {
-  if (IS_MAC) {
-    return {
-      next: { key: ']', modifier: 'cmd' },
-      prev: { key: '[', modifier: 'cmd' },
-    };
-  }
-
-  return {
-    next: { key: 'Tab', modifier: 'ctrl' },
-    prev: { key: 'Tab', modifier: 'ctrl+shift' },
-  };
-}
-
-const TASK_SWITCH_DEFAULTS = getPlatformTaskSwitchDefaults();
-
-const DEFAULT_SETTINGS: AppSettings = {
-  repository: {
-    branchPrefix: 'emdash',
-    pushOnCreate: true,
-  },
-  projectPrep: {
-    autoInstallOnOpenInEditor: true,
-  },
-  browserPreview: {
-    enabled: true,
-    engine: 'chromium',
-  },
-  notifications: {
-    enabled: true,
-    sound: true,
-    osNotifications: true,
-    soundFocusMode: 'always',
-  },
-  mcp: {
-    context7: {
-      enabled: false,
-      installHintsDismissed: {},
-    },
-  },
-  defaultProvider: DEFAULT_PROVIDER_ID,
-  tasks: {
-    autoGenerateName: true,
-    autoApproveByDefault: false,
-    autoTrustWorktrees: true,
-  },
-  projects: {
-    defaultDirectory: join(homedir(), 'emdash-projects'),
-  },
-  keyboard: {
-    commandPalette: { key: 'k', modifier: 'cmd' },
-    settings: { key: ',', modifier: 'cmd' },
-    toggleLeftSidebar: { key: 'b', modifier: 'cmd' },
-    toggleRightSidebar: { key: '.', modifier: 'cmd' },
-    toggleTheme: { key: 't', modifier: 'cmd' },
-    toggleKanban: { key: 'p', modifier: 'cmd' },
-    toggleEditor: { key: 'e', modifier: 'cmd' },
-    nextProject: TASK_SWITCH_DEFAULTS.next,
-    prevProject: TASK_SWITCH_DEFAULTS.prev,
-    newTask: { key: 'n', modifier: 'cmd' },
-    nextAgent: { key: 'k', modifier: 'cmd+shift' },
-    prevAgent: { key: 'j', modifier: 'cmd+shift' },
-  },
-  interface: {
-    autoRightSidebarBehavior: false,
-    theme: 'system',
-    taskHoverAction: 'delete',
-  },
-  providerConfigs: {},
-  terminal: {
-    fontFamily: '',
-    autoCopyOnSelection: false,
-  },
-  defaultOpenInApp: 'terminal',
-  hiddenOpenInApps: [],
-};
-
-function getSettingsPath(): string {
-  const dir = app.getPath('userData');
-  return join(dir, 'settings.json');
-}
-
-function deepMerge<T extends Record<string, any>>(base: T, partial?: Partial<T>): T {
-  if (!partial) return base;
-  const out: any = Array.isArray(base) ? [...(base as any)] : { ...base };
-  for (const [k, v] of Object.entries(partial)) {
-    if (v && typeof v === 'object' && !Array.isArray(v)) {
-      out[k] = deepMerge((base as any)[k] ?? {}, v as any);
-    } else if (v !== undefined) {
-      out[k] = v;
-    }
-  }
-  return out as T;
-}
-
-let cached: AppSettings | null = null;
-
-function normalizeShortcutKey(value: unknown): string | null {
-  if (typeof value !== 'string') return null;
-  const trimmed = value.trim();
-  if (!trimmed) return null;
-
-  const lower = trimmed.toLowerCase();
-  if (lower === 'esc' || lower === 'escape') return 'Escape';
-  if (lower === 'tab') return 'Tab';
-  if (lower === 'arrowleft' || lower === 'left') return 'ArrowLeft';
-  if (lower === 'arrowright' || lower === 'right') return 'ArrowRight';
-  if (lower === 'arrowup' || lower === 'up') return 'ArrowUp';
-  if (lower === 'arrowdown' || lower === 'down') return 'ArrowDown';
-
-  // Allow single printable, non-whitespace characters.
-  if (trimmed.length === 1 && /\S/u.test(trimmed)) {
-    return trimmed.toLowerCase();
-  }
-
-  return null;
-}
-
-function normalizeShortcutModifier(value: unknown, fallback: ShortcutModifier): ShortcutModifier {
-  if (typeof value !== 'string') return fallback;
-
-  const normalized = value.toLowerCase().replace(/\s+/g, '');
-  const aliases: Record<string, ShortcutModifier> = {
-    cmd: 'cmd',
-    command: 'cmd',
-    meta: 'cmd',
-    ctrl: 'ctrl',
-    control: 'ctrl',
-    shift: 'shift',
-    alt: 'alt',
-    option: 'option',
-    opt: 'option',
-    'cmd+shift': 'cmd+shift',
-    'shift+cmd': 'cmd+shift',
-    'command+shift': 'cmd+shift',
-    'shift+command': 'cmd+shift',
-    'meta+shift': 'cmd+shift',
-    'shift+meta': 'cmd+shift',
-    'ctrl+shift': 'ctrl+shift',
-    'shift+ctrl': 'ctrl+shift',
-    'control+shift': 'ctrl+shift',
-    'shift+control': 'ctrl+shift',
-  };
-
-  return aliases[normalized] ?? fallback;
-}
-
-function isBinding(binding: ShortcutBinding, modifier: ShortcutModifier, key: string): boolean {
-  return binding.modifier === modifier && binding.key === key;
-}
-
-function assertNoKeyboardShortcutConflicts(keyboard?: KeyboardSettings): void {
-  if (!keyboard) return;
-
-  const seen = new Map<string, string>();
-
-  for (const [shortcutName, binding] of Object.entries(keyboard)) {
-    if (!binding?.key || !binding?.modifier) continue;
-
-    const normalizedKey = binding.key.toLowerCase();
-    const signature = `${binding.modifier}:${normalizedKey}`;
-    const conflictWith = seen.get(signature);
-
-    if (conflictWith) {
-      throw new Error(
-        `Keyboard shortcut conflict: "${shortcutName}" duplicates "${conflictWith}".`
-      );
-    }
-
-    seen.set(signature, shortcutName);
-  }
-}
-
-/**
- * Load application settings from disk with sane defaults.
- */
-export function getAppSettings(): AppSettings {
-  try {
-    if (cached) return cached;
-    const file = getSettingsPath();
-    if (existsSync(file)) {
-      const raw = readFileSync(file, 'utf8');
-      const parsed = JSON.parse(raw);
-      cached = normalizeSettings(deepMerge(DEFAULT_SETTINGS, parsed));
-      return cached;
-    }
-  } catch {
-    // ignore read/parse errors, fall through to defaults
-  }
-  cached = { ...DEFAULT_SETTINGS };
-  return cached;
-}
-
-/**
- * Update settings and persist to disk. Partial updates are deeply merged.
- */
-export function updateAppSettings(partial: AppSettingsUpdate): AppSettings {
-  const current = getAppSettings();
-  const merged = deepMerge(current, partial as Partial<AppSettings>);
-  const next = normalizeSettings(merged);
-  if (partial.keyboard) {
-    assertNoKeyboardShortcutConflicts(next.keyboard);
-  }
-  persistSettings(next);
-  cached = next;
-  return next;
-}
-
-export function persistSettings(settings: AppSettings) {
-  try {
-    const file = getSettingsPath();
-    const dir = dirname(file);
-    if (!existsSync(dir)) mkdirSync(dir, { recursive: true });
-    writeFileSync(file, JSON.stringify(settings, null, 2), 'utf8');
-  } catch {}
-}
-
-/**
- * Coerce and validate settings for robustness and forward-compatibility.
- */
-export function normalizeSettings(input: AppSettings): AppSettings {
-  const out: AppSettings = {
-    repository: {
-      branchPrefix: DEFAULT_SETTINGS.repository.branchPrefix,
-      pushOnCreate: DEFAULT_SETTINGS.repository.pushOnCreate,
-    },
-    projectPrep: {
-      autoInstallOnOpenInEditor: DEFAULT_SETTINGS.projectPrep.autoInstallOnOpenInEditor,
-    },
-    browserPreview: {
-      enabled: DEFAULT_SETTINGS.browserPreview!.enabled,
-      engine: DEFAULT_SETTINGS.browserPreview!.engine,
-    },
-    notifications: {
-      enabled: DEFAULT_SETTINGS.notifications!.enabled,
-      sound: DEFAULT_SETTINGS.notifications!.sound,
-      osNotifications: DEFAULT_SETTINGS.notifications!.osNotifications,
-      soundFocusMode: DEFAULT_SETTINGS.notifications!.soundFocusMode,
-    },
-    mcp: {
-      context7: {
-        enabled: DEFAULT_SETTINGS.mcp!.context7!.enabled,
-        installHintsDismissed: {},
-      },
-    },
-  };
-
-  // Repository
-  const repo = input?.repository ?? DEFAULT_SETTINGS.repository;
-  let prefix = String(repo?.branchPrefix ?? DEFAULT_SETTINGS.repository.branchPrefix);
-  prefix = prefix.trim().replace(/\/+$/, ''); // remove trailing slashes
-  if (!prefix) prefix = DEFAULT_SETTINGS.repository.branchPrefix;
-  if (prefix.length > 50) prefix = prefix.slice(0, 50);
-  const push = Boolean(repo?.pushOnCreate ?? DEFAULT_SETTINGS.repository.pushOnCreate);
-
-  out.repository.branchPrefix = prefix;
-  out.repository.pushOnCreate = push;
-  // Project prep
-  const prep = (input as any)?.projectPrep || {};
-  out.projectPrep.autoInstallOnOpenInEditor = Boolean(
-    prep?.autoInstallOnOpenInEditor ?? DEFAULT_SETTINGS.projectPrep.autoInstallOnOpenInEditor
-  );
-
-  const bp = (input as any)?.browserPreview || {};
-  out.browserPreview = {
-    enabled: Boolean(bp?.enabled ?? DEFAULT_SETTINGS.browserPreview!.enabled),
-    engine: 'chromium',
-  };
-
-  const notif = (input as any)?.notifications || {};
-  const rawFocusMode = notif?.soundFocusMode;
-  out.notifications = {
-    enabled: Boolean(notif?.enabled ?? DEFAULT_SETTINGS.notifications!.enabled),
-    sound: Boolean(notif?.sound ?? DEFAULT_SETTINGS.notifications!.sound),
-    osNotifications: Boolean(
-      notif?.osNotifications ?? DEFAULT_SETTINGS.notifications!.osNotifications
-    ),
-    soundFocusMode:
-      rawFocusMode === 'always' || rawFocusMode === 'unfocused'
-        ? rawFocusMode
-        : DEFAULT_SETTINGS.notifications!.soundFocusMode,
-  };
-
-  // MCP
-  const mcp = (input as any)?.mcp || {};
-  const c7 = mcp?.context7 || {};
-  out.mcp = {
-    context7: {
-      enabled: Boolean(c7?.enabled ?? DEFAULT_SETTINGS.mcp!.context7!.enabled),
-      installHintsDismissed:
-        c7?.installHintsDismissed && typeof c7.installHintsDismissed === 'object'
-          ? { ...c7.installHintsDismissed }
-          : {},
-    },
-  };
-
-  // Default provider
-  const defaultProvider = (input as any)?.defaultProvider;
-  out.defaultProvider = isValidProviderId(defaultProvider)
-    ? defaultProvider
-    : DEFAULT_SETTINGS.defaultProvider!;
-
-  // Tasks
-  const tasks = (input as any)?.tasks || {};
-  out.tasks = {
-    autoGenerateName: Boolean(tasks?.autoGenerateName ?? DEFAULT_SETTINGS.tasks!.autoGenerateName),
-    autoApproveByDefault: Boolean(
-      tasks?.autoApproveByDefault ?? DEFAULT_SETTINGS.tasks!.autoApproveByDefault
-    ),
-    autoTrustWorktrees: Boolean(
-      tasks?.autoTrustWorktrees ?? DEFAULT_SETTINGS.tasks!.autoTrustWorktrees
-    ),
-  };
-
-  // Projects
-  const projects = (input as any)?.projects || {};
-  let defaultDir = String(
-    projects?.defaultDirectory ?? DEFAULT_SETTINGS.projects!.defaultDirectory
-  ).trim();
-  if (!defaultDir) {
-    defaultDir = DEFAULT_SETTINGS.projects!.defaultDirectory;
-  }
-  // Resolve ~ to home directory if present
-  if (defaultDir.startsWith('~')) {
-    defaultDir = join(homedir(), defaultDir.slice(1));
-  }
-  out.projects = {
-    defaultDirectory: defaultDir,
-  };
-
-  // Keyboard
-  const keyboard = (input as any)?.keyboard || {};
-  const normalizeBinding = (binding: any, defaultBinding: ShortcutBinding): ShortcutBinding => {
-    if (!binding || typeof binding !== 'object') return defaultBinding;
-    const key = normalizeShortcutKey(binding.key) ?? defaultBinding.key;
-    const modifier = normalizeShortcutModifier(binding.modifier, defaultBinding.modifier);
-    return { key, modifier };
-  };
-  out.keyboard = {
-    commandPalette: normalizeBinding(
-      keyboard.commandPalette,
-      DEFAULT_SETTINGS.keyboard!.commandPalette!
-    ),
-    settings: normalizeBinding(keyboard.settings, DEFAULT_SETTINGS.keyboard!.settings!),
-    toggleLeftSidebar: normalizeBinding(
-      keyboard.toggleLeftSidebar,
-      DEFAULT_SETTINGS.keyboard!.toggleLeftSidebar!
-    ),
-    toggleRightSidebar: normalizeBinding(
-      keyboard.toggleRightSidebar,
-      DEFAULT_SETTINGS.keyboard!.toggleRightSidebar!
-    ),
-    toggleTheme: normalizeBinding(keyboard.toggleTheme, DEFAULT_SETTINGS.keyboard!.toggleTheme!),
-    toggleKanban: normalizeBinding(keyboard.toggleKanban, DEFAULT_SETTINGS.keyboard!.toggleKanban!),
-    toggleEditor: normalizeBinding(keyboard.toggleEditor, DEFAULT_SETTINGS.keyboard!.toggleEditor!),
-    nextProject: normalizeBinding(keyboard.nextProject, DEFAULT_SETTINGS.keyboard!.nextProject!),
-    prevProject: normalizeBinding(keyboard.prevProject, DEFAULT_SETTINGS.keyboard!.prevProject!),
-    newTask: normalizeBinding(keyboard.newTask, DEFAULT_SETTINGS.keyboard!.newTask!),
-    nextAgent: normalizeBinding(keyboard.nextAgent, DEFAULT_SETTINGS.keyboard!.nextAgent!),
-    prevAgent: normalizeBinding(keyboard.prevAgent, DEFAULT_SETTINGS.keyboard!.prevAgent!),
-  };
-  const platformTaskDefaults = getPlatformTaskSwitchDefaults();
-  const isLegacyArrowPair =
-    isBinding(out.keyboard.nextProject!, 'cmd', 'ArrowRight') &&
-    isBinding(out.keyboard.prevProject!, 'cmd', 'ArrowLeft');
-  const isLegacyTabPair =
-    isBinding(out.keyboard.nextProject!, 'ctrl', 'Tab') &&
-    isBinding(out.keyboard.prevProject!, 'ctrl+shift', 'Tab');
-  if (isLegacyArrowPair || (IS_MAC && isLegacyTabPair)) {
-    out.keyboard.nextProject = platformTaskDefaults.next;
-    out.keyboard.prevProject = platformTaskDefaults.prev;
-  }
-
-  // Interface
-  const iface = (input as any)?.interface || {};
-  out.interface = {
-    autoRightSidebarBehavior: Boolean(
-      iface?.autoRightSidebarBehavior ?? DEFAULT_SETTINGS.interface!.autoRightSidebarBehavior
-    ),
-    theme: ['light', 'dark', 'dark-black', 'system'].includes(iface?.theme)
-      ? iface.theme
-      : DEFAULT_SETTINGS.interface!.theme,
-    taskHoverAction: iface?.taskHoverAction === 'archive' ? 'archive' : 'delete',
-  };
-
-  // Provider custom configs
-  const providerConfigs = (input as any)?.providerConfigs || {};
-  out.providerConfigs = {};
-  if (providerConfigs && typeof providerConfigs === 'object') {
-    for (const [providerId, config] of Object.entries(providerConfigs)) {
-      if (config && typeof config === 'object') {
-        const c = config as Record<string, unknown>;
-        let env: Record<string, string> | undefined;
-        if (c.env && typeof c.env === 'object') {
-          env = {};
-          for (const [k, v] of Object.entries(c.env)) {
-            if (
-              typeof k === 'string' &&
-              typeof v === 'string' &&
-              /^[A-Za-z_][A-Za-z0-9_]*$/.test(k)
-            ) {
-              env[k] = v;
-            }
-          }
-          if (Object.keys(env).length === 0) env = undefined;
-        }
-        out.providerConfigs[providerId] = {
-          ...(typeof c.cli === 'string' ? { cli: c.cli } : {}),
-          ...(typeof c.resumeFlag === 'string' ? { resumeFlag: c.resumeFlag } : {}),
-          ...(typeof c.defaultArgs === 'string' ? { defaultArgs: c.defaultArgs } : {}),
-          ...(typeof c.autoApproveFlag === 'string' ? { autoApproveFlag: c.autoApproveFlag } : {}),
-          ...(typeof c.initialPromptFlag === 'string'
-            ? { initialPromptFlag: c.initialPromptFlag }
-            : {}),
-          ...(typeof c.extraArgs === 'string' ? { extraArgs: c.extraArgs } : {}),
-          ...(env ? { env } : {}),
-        };
-      }
-    }
-  }
-
-  // Terminal
-  const term = (input as any)?.terminal || {};
-  const fontFamily = String(term?.fontFamily ?? '').trim();
-  const autoCopyOnSelection = Boolean(term?.autoCopyOnSelection ?? false);
-  out.terminal = { fontFamily, autoCopyOnSelection };
-
-  // Default Open In App
-  const defaultOpenInApp = (input as any)?.defaultOpenInApp;
-  out.defaultOpenInApp = isValidOpenInAppId(defaultOpenInApp)
-    ? defaultOpenInApp
-    : DEFAULT_SETTINGS.defaultOpenInApp!;
-
-  // Hidden Open In Apps
-  const rawHidden = (input as any)?.hiddenOpenInApps;
-  if (Array.isArray(rawHidden)) {
-    const validated = rawHidden.filter(isValidOpenInAppId);
-    out.hiddenOpenInApps = [...new Set(validated)];
-  } else {
-    out.hiddenOpenInApps = [];
-  }
-
-  return out;
-}
-
-/**
- * Get custom configuration for a specific provider.
- * Returns a shallow copy to prevent cache corruption from external mutations.
- */
-export function getProviderCustomConfig(providerId: string): ProviderCustomConfig | undefined {
-  const settings = getAppSettings();
-  const config = settings.providerConfigs?.[providerId];
-  return config ? { ...config } : undefined;
-}
-
-/**
- * Get all provider custom configurations.
- * Returns a deep copy to prevent cache corruption from external mutations.
- */
-export function getAllProviderCustomConfigs(): ProviderCustomConfigs {
-  const settings = getAppSettings();
-  const configs = settings.providerConfigs ?? {};
-  // Return deep copy to prevent cache corruption
-  return Object.fromEntries(Object.entries(configs).map(([key, value]) => [key, { ...value }]));
-}
-
-/**
- * Update custom configuration for a specific provider.
- * Pass undefined to remove the custom config and use defaults.
- */
-export function updateProviderCustomConfig(
-  providerId: string,
-  config: ProviderCustomConfig | undefined
-): void {
-  const settings = getAppSettings();
-  const currentConfigs = settings.providerConfigs ?? {};
-
-  if (config === undefined) {
-    // Remove the config
-    const { [providerId]: _, ...rest } = currentConfigs;
-    updateAppSettings({ providerConfigs: rest });
-  } else {
-    // Update/add the config
-    updateAppSettings({
-      providerConfigs: {
-        ...currentConfigs,
-        [providerId]: config,
-      },
-    });
-  }
-}
diff --git a/src/main/telemetry.ts b/src/main/telemetry.ts
deleted file mode 100644
index 97a0398717..0000000000
--- a/src/main/telemetry.ts
+++ /dev/null
@@ -1,604 +0,0 @@
-import { app } from 'electron';
-// Optional build-time defaults for distribution bundles
-// Resolve robustly across dev and packaged layouts.
-let appConfig: { posthogHost?: string; posthogKey?: string } = {};
-import { existsSync, readFileSync, writeFileSync } from 'fs';
-import { join } from 'path';
-
-function loadAppConfig(): { posthogHost?: string; posthogKey?: string } {
-  try {
-    const dir = __dirname; // e.g., dist/main/main in dev builds
-    const candidates = [
-      join(dir, 'appConfig.json'), // dist/main/main/appConfig.json
-      join(dir, '..', 'appConfig.json'), // dist/main/appConfig.json (CI injection path)
-    ];
-    for (const p of candidates) {
-      if (existsSync(p)) {
-        const raw = readFileSync(p, 'utf8');
-        return JSON.parse(raw);
-      }
-    }
-  } catch {
-    // fall through
-  }
-  return {};
-}
-appConfig = loadAppConfig();
-
-type TelemetryEvent =
-  // App lifecycle
-  | 'app_started'
-  | 'app_closed'
-  | 'app_window_focused' // when a user return back to the app after being away
-  | 'github_connection_triggered' // when a user presses the GitHub connection button in the app (with state if gh cli already installed or not)
-  | 'github_connected' // when a user connects to their GitHub account
-  // Project management
-  | 'project_add_clicked' // left sidebar button to add projects
-  | 'project_open_clicked' // button in the center to open Projects (Home View)
-  | 'project_create_clicked' // button in the center to create a new project (Home View)
-  | 'project_clone_clicked' // button in the center to clone a project from GitHub (Home View)
-  | 'project_create_success' // when a project is successfully created from the homepage
-  | 'project_clone_success' // when a project is successfully cloned from the homepage
-  | 'project_added_success' // when a project is added successfully (both entrypoint buttons)
-  | 'project_deleted'
-  | 'project_view_opened' // when a user opens a project and see the Task overview in main screen (not the sidebar)
-  // Task management
-  | 'task_created' // when a new task is created (track) (with all attributes, if initial prompt is used (but dont store the initial prompt itself))
-  | 'task_deleted' // when a task is deleted
-  | 'task_provider_switched' // when a task is switched to a different provider
-  | 'task_custom_named' // when a task is given a custom name instead of the default generated one
-  | 'task_advanced_options_opened' // when task advanced options are opened
-  // Terminal (Right Sidebar)
-  | 'terminal_entered' //when a user enters the terminal (right sidebar) with his mouse
-  | 'terminal_command_executed' //when a user executes a command in the terminal
-  | 'terminal_new_terminal_created'
-  | 'terminal_deleted'
-  // Changes (Right Sidebar)
-  | 'changes_viewed' // when a user clicks on one file to view their changes
-  // Plan mode
-  | 'plan_mode_enabled'
-  | 'plan_mode_disabled'
-  // Git & Pull Requests
-  | 'pr_created'
-  | 'pr_creation_failed'
-  | 'pr_viewed'
-  // Linear integration
-  | 'linear_connected'
-  | 'linear_disconnected'
-  | 'linear_issues_searched' // when creating a new task and the Linear issue search is opened
-  | 'linear_issue_selected' // when a user selects a Linear issue to create a new task (no need to send task, just selecting issue)
-  // Jira integration
-  | 'jira_connected'
-  | 'jira_disconnected'
-  | 'jira_issues_searched'
-  | 'jira_issue_selected'
-  // Container & Dev Environment
-  | 'container_connect_clicked'
-  | 'container_connect_success'
-  | 'container_connect_failed'
-  // ToolBar Section
-  | 'toolbar_feedback_clicked' // when a user clicks on the feedback button in the toolbar
-  | 'toolbar_left_sidebar_clicked' // when a user clicks on the left sidebar button in the toolbar (attribute for new state (open or closed))
-  | 'toolbar_right_sidebar_clicked' // when a user clicks on the right sidebar button in the toolbar (attribute for new state (open or closed))
-  | 'toolbar_settings_clicked' // when a user clicks on the settings button in the toolbar
-  | 'toolbar_open_in_menu_clicked' // when a user clicks on the "Open in" menu button (attribute for new state (open or closed))
-  | 'toolbar_open_in_selected' // when a user selects an app from the "Open in" menu (attribute: OpenInAppId)
-  | 'toolbar_kanban_toggled' // when a user toggles the Kanban view (attribute for new state (open or closed))
-  // Browser Preview
-  | 'browser_preview_opened'
-  | 'browser_preview_closed'
-  | 'browser_preview_url_navigated' // when a user navigates to a new URL in the browser preview
-  // Settings & Preferences
-  | 'settings_tab_viewed' // when a user opens the settings (Settings View) (attribute for which tab is opened)
-  | 'theme_changed'
-  | 'telemetry_toggled'
-  | 'notification_settings_changed'
-  | 'default_provider_changed' // attribute for which provider is selected
-  // Skills
-  | 'skills_view_opened'
-  | 'skill_installed'
-  | 'skill_uninstalled'
-  | 'skill_created'
-  | 'skill_detail_viewed'
-  // Remote Server / SSH
-  | 'remote_project_modal_opened'
-  | 'remote_project_connection_tested'
-  | 'remote_project_created'
-  | 'ssh_connection_saved'
-  | 'ssh_repo_init'
-  | 'ssh_repo_clone'
-  | 'ssh_connection_deleted'
-  | 'ssh_connect_success'
-  | 'ssh_connect_failed'
-  | 'ssh_disconnected'
-  | 'ssh_reconnect_attempted'
-  | 'ssh_settings_opened'
-  // GitHub issues
-  | 'github_issues_searched'
-  | 'github_issue_selected'
-  // GitLab integration
-  | 'gitlab_connected'
-  | 'gitlab_disconnected'
-  | 'gitlab_issues_searched'
-  | 'gitlab_issue_selected'
-  // Task with issue
-  | 'task_created_with_issue'
-  // Legacy/aggregate events
-  | 'feature_used'
-  | 'error'
-  // Aggregates (privacy-safe)
-  | 'task_snapshot'
-  // Session summary (duration only)
-  | 'app_session'
-  // Agent usage (provider-level only)
-  | 'agent_run_start'
-  | 'agent_run_finish'
-  | 'agent_prompt_sent'
-  // DB setup (privacy-safe)
-  | 'db_setup'
-  // Daily active user tracking
-  | 'daily_active_user';
-
-interface InitOptions {
-  installSource?: string;
-}
-
-let enabled = true;
-let apiKey: string | undefined;
-let host: string | undefined;
-let instanceId: string | undefined;
-let installSource: string | undefined;
-let userOptOut: boolean | undefined;
-let onboardingSeen: boolean = false;
-let sessionStartMs: number = Date.now();
-let lastActiveDate: string | undefined;
-let cachedGithubUsername: string | null = null;
-
-const libName = 'emdash';
-
-function getVersionSafe(): string {
-  try {
-    return app.getVersion();
-  } catch {
-    return 'unknown';
-  }
-}
-
-function getInstanceIdPath(): string {
-  const dir = app.getPath('userData');
-  return join(dir, 'telemetry.json');
-}
-
-function loadOrCreateState(): {
-  instanceId: string;
-  enabledOverride?: boolean;
-  onboardingSeen?: boolean;
-  lastActiveDate?: string;
-} {
-  try {
-    const file = getInstanceIdPath();
-    if (existsSync(file)) {
-      const raw = readFileSync(file, 'utf8');
-      const parsed = JSON.parse(raw);
-      if (parsed && typeof parsed.instanceId === 'string' && parsed.instanceId.length > 0) {
-        const enabledOverride =
-          typeof parsed.enabled === 'boolean' ? (parsed.enabled as boolean) : undefined;
-        const onboardingSeen =
-          typeof parsed.onboardingSeen === 'boolean' ? (parsed.onboardingSeen as boolean) : false;
-        const lastActiveDate =
-          typeof parsed.lastActiveDate === 'string' ? (parsed.lastActiveDate as string) : undefined;
-        return {
-          instanceId: parsed.instanceId as string,
-          enabledOverride,
-          onboardingSeen,
-          lastActiveDate,
-        };
-      }
-    }
-  } catch {
-    // fall through to create
-  }
-  const newId = cryptoRandomId();
-  try {
-    writeFileSync(getInstanceIdPath(), JSON.stringify({ instanceId: newId }, null, 2), 'utf8');
-  } catch {
-    // ignore
-  }
-  return { instanceId: newId };
-}
-
-function cryptoRandomId(): string {
-  try {
-    const { randomUUID } = require('crypto');
-    return randomUUID();
-  } catch {
-    // Very old Node fallback; not expected in Electron 28+
-    return Math.random().toString(36).slice(2) + Date.now().toString(36);
-  }
-}
-
-function isEnabled(): boolean {
-  return (
-    enabled === true &&
-    userOptOut !== true &&
-    !!apiKey &&
-    !!host &&
-    typeof instanceId === 'string' &&
-    instanceId.length > 0
-  );
-}
-
-function getBaseProps() {
-  return {
-    app_version: getVersionSafe(),
-    electron_version: process.versions.electron,
-    platform: process.platform,
-    arch: process.arch,
-    is_dev: !app.isPackaged,
-    install_source: installSource ?? (app.isPackaged ? 'dmg' : 'dev'),
-    $lib: libName,
-    ...(cachedGithubUsername ? { github_username: cachedGithubUsername } : {}),
-  };
-}
-
-/**
- * Sanitize event properties to prevent PII leakage.
- * Simple allowlist approach: only allow safe property names and primitive types.
- */
-function sanitizeEventAndProps(event: TelemetryEvent, props: Record<string, any> | undefined) {
-  const sanitized: Record<string, any> = {};
-
-  // Simple allowlist of safe properties
-  const allowedProps = new Set([
-    'provider',
-    'source',
-    'tab',
-    'theme',
-    'trigger',
-    'has_initial_prompt',
-    'custom_name',
-    'state',
-    'success',
-    'error_type',
-    'gh_cli_installed',
-    'github_username',
-    'feature',
-    'type',
-    'enabled',
-    'sound',
-    'app',
-    'duration_ms',
-    'session_duration_ms',
-    'outcome',
-    'applied_migrations',
-    'applied_migrations_bucket',
-    'recovered',
-    'task_count',
-    'task_count_bucket',
-    'project_count',
-    'project_count_bucket',
-    'date',
-    'timezone',
-    'scope',
-  ]);
-
-  if (props) {
-    for (const [key, value] of Object.entries(props)) {
-      // Only process allowed property names
-      if (!allowedProps.has(key)) continue;
-
-      // Only allow primitive types
-      if (typeof value === 'string') {
-        // Trim and limit string length to prevent abuse
-        sanitized[key] = value.trim().slice(0, 100);
-      } else if (typeof value === 'number') {
-        // Clamp numbers to reasonable range
-        sanitized[key] = Math.max(0, Math.min(value, 1000000));
-      } else if (typeof value === 'boolean') {
-        sanitized[key] = value;
-      }
-    }
-  }
-
-  return sanitized;
-}
-
-/**
- * Fetch the current GitHub username if the user is authenticated.
- * Returns null if not authenticated or if there's an error.
- */
-async function getGithubUsername(): Promise<string | null> {
-  try {
-    // Lazy import to avoid circular dependencies
-    const { githubService } = require('./services/GitHubService');
-    const user = await githubService.getCurrentUser();
-    return user?.login || null;
-  } catch {
-    // Silently fail if GitHub is not authenticated or there's an error
-    return null;
-  }
-}
-
-async function posthogCapture(
-  event: TelemetryEvent,
-  properties?: Record<string, any>
-): Promise<void> {
-  if (!isEnabled()) return;
-  try {
-    // Use global fetch if available (Node 18+/Electron 28+)
-    const f: any = (globalThis as any).fetch;
-    if (!f) return;
-    const u = (host || '').replace(/\/$/, '') + '/capture/';
-    const body = {
-      api_key: apiKey,
-      event,
-      properties: {
-        distinct_id: instanceId,
-        ...getBaseProps(),
-        ...sanitizeEventAndProps(event, properties),
-      },
-    };
-    await f(u, {
-      method: 'POST',
-      headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify(body),
-    }).catch(() => undefined);
-  } catch {
-    // swallow errors; telemetry must never crash the app
-  }
-}
-
-/**
- * PostHog identify call to associate the instanceId with GitHub username.
- * This creates a user profile in PostHog.
- */
-async function posthogIdentify(username: string): Promise<void> {
-  if (!isEnabled() || !username) return;
-  try {
-    const f: any = (globalThis as any).fetch;
-    if (!f) return;
-    const u = (host || '').replace(/\/$/, '') + '/capture/';
-    const body = {
-      api_key: apiKey,
-      event: '$identify',
-      properties: {
-        distinct_id: instanceId,
-        $set: {
-          github_username: username,
-          ...getBaseProps(),
-        },
-      },
-    };
-    await f(u, {
-      method: 'POST',
-      headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify(body),
-    }).catch(() => undefined);
-  } catch {
-    // swallow errors; telemetry must never crash the app
-  }
-}
-
-export async function init(options?: InitOptions) {
-  const env = process.env;
-  const enabledEnv = (env.TELEMETRY_ENABLED ?? 'true').toString().toLowerCase();
-  enabled = enabledEnv !== 'false' && enabledEnv !== '0' && enabledEnv !== 'no';
-  apiKey =
-    env.POSTHOG_PROJECT_API_KEY || (appConfig?.posthogKey as string | undefined) || undefined;
-  host = normalizeHost(
-    env.POSTHOG_HOST || (appConfig?.posthogHost as string | undefined) || undefined
-  );
-  installSource = options?.installSource || env.INSTALL_SOURCE || undefined;
-
-  const state = loadOrCreateState();
-  instanceId = state.instanceId;
-  sessionStartMs = Date.now();
-  // If enabledOverride is explicitly false, user opted out; otherwise leave undefined
-  userOptOut =
-    typeof state.enabledOverride === 'boolean' ? state.enabledOverride === false : undefined;
-  onboardingSeen = state.onboardingSeen === true;
-  lastActiveDate = state.lastActiveDate;
-
-  // Fetch GitHub username if available and cache for all future events
-  cachedGithubUsername = await getGithubUsername();
-
-  // If we have a GitHub username, identify the user in PostHog
-  if (cachedGithubUsername) {
-    void posthogIdentify(cachedGithubUsername);
-  }
-
-  // Fire lifecycle start (github_username is now included via getBaseProps)
-  void posthogCapture('app_started');
-
-  // Check for daily active user (fires event if it's a new day)
-  checkDailyActiveUser();
-}
-
-/**
- * Refresh the cached GitHub username. Call this when the user connects
- * their GitHub account so all subsequent events include the username.
- */
-export async function refreshGithubUsername(): Promise<void> {
-  cachedGithubUsername = await getGithubUsername();
-  if (cachedGithubUsername) {
-    void posthogIdentify(cachedGithubUsername);
-  }
-}
-
-export function capture(event: TelemetryEvent, properties?: Record<string, any>) {
-  if (event === 'app_session') {
-    const dur = Math.max(0, Date.now() - (sessionStartMs || Date.now()));
-    void posthogCapture(event, { session_duration_ms: dur });
-    return;
-  }
-  void posthogCapture(event, properties);
-}
-
-/**
- * Capture an exception for PostHog error tracking.
- * This sends a properly formatted $exception event as required by PostHog.
- *
- * @param error - The error object or error message
- * @param additionalProperties - Additional context properties
- */
-export function captureException(
-  error: Error | unknown,
-  additionalProperties?: Record<string, any>
-) {
-  if (!isEnabled()) return;
-
-  // Build error object
-  const errorObj = error instanceof Error ? error : new Error(String(error));
-  const errorMessage = errorObj.message || 'Unknown error';
-  const errorStack = errorObj.stack || '';
-
-  // Build PostHog $exception event properties
-  const properties: Record<string, any> = {
-    // Required fields for PostHog error tracking
-    $exception_message: errorMessage,
-    $exception_type: errorObj.name || 'Error',
-    $exception_stack_trace_raw: errorStack,
-
-    // Merge additional properties
-    ...additionalProperties,
-  };
-
-  // Send as $exception event (required for PostHog error tracking)
-  void posthogCapture('$exception' as any, properties);
-}
-
-export function shutdown() {
-  // No-op for now (no batching). Left for future posthog-node integration.
-}
-
-export function isTelemetryEnabled(): boolean {
-  return isEnabled();
-}
-
-export function getTelemetryStatus() {
-  return {
-    enabled: isEnabled(),
-    envDisabled: !enabled,
-    userOptOut: userOptOut === true,
-    hasKeyAndHost: !!apiKey && !!host,
-    onboardingSeen,
-  };
-}
-
-export function setTelemetryEnabledViaUser(enabledFlag: boolean) {
-  userOptOut = !enabledFlag;
-  // Persist alongside instanceId
-  try {
-    const file = getInstanceIdPath();
-    let state: any = {};
-    if (existsSync(file)) {
-      try {
-        state = JSON.parse(readFileSync(file, 'utf8')) || {};
-      } catch {
-        state = {};
-      }
-    }
-    state.instanceId = instanceId || state.instanceId || cryptoRandomId();
-    state.enabled = enabledFlag; // store explicit preference
-    state.updatedAt = new Date().toISOString();
-    writeFileSync(file, JSON.stringify(state, null, 2), 'utf8');
-  } catch {
-    // ignore
-  }
-}
-
-function persistState(state: {
-  instanceId: string;
-  enabledOverride?: boolean;
-  onboardingSeen?: boolean;
-  lastActiveDate?: string;
-}) {
-  try {
-    const existing = existsSync(getInstanceIdPath())
-      ? JSON.parse(readFileSync(getInstanceIdPath(), 'utf8'))
-      : {};
-    const merged = {
-      ...existing,
-      instanceId: state.instanceId,
-      enabled:
-        typeof state.enabledOverride === 'boolean' ? state.enabledOverride : existing.enabled,
-      onboardingSeen:
-        typeof state.onboardingSeen === 'boolean' ? state.onboardingSeen : existing.onboardingSeen,
-      lastActiveDate:
-        typeof state.lastActiveDate === 'string' ? state.lastActiveDate : existing.lastActiveDate,
-      createdAt: existing.createdAt || new Date().toISOString(),
-      updatedAt: new Date().toISOString(),
-    };
-    writeFileSync(getInstanceIdPath(), JSON.stringify(merged, null, 2), 'utf8');
-  } catch {
-    // ignore
-  }
-}
-
-function normalizeHost(h: string | undefined): string | undefined {
-  if (!h) return undefined;
-  let s = String(h).trim();
-  if (!/^https?:\/\//i.test(s)) {
-    s = 'https://' + s;
-  }
-  return s.replace(/\/+$/, '');
-}
-
-/**
- * Check if this is a new day of activity and fire daily_active_user event if so.
- * This ensures we accurately track DAU even when the app stays open for extended periods.
- */
-async function checkDailyActiveUser(): Promise<void> {
-  // Skip if telemetry is disabled
-  if (!isEnabled()) return;
-
-  try {
-    const today = new Date().toISOString().split('T')[0]; // YYYY-MM-DD format
-
-    // If we haven't tracked a date yet or it's a new day, fire the event
-    if (!lastActiveDate || lastActiveDate !== today) {
-      // Refresh cached GitHub username (user may have connected since init)
-      cachedGithubUsername = await getGithubUsername();
-
-      // Fire the daily active user event (github_username included via getBaseProps)
-      void posthogCapture('daily_active_user', {
-        date: today,
-        timezone: Intl.DateTimeFormat().resolvedOptions().timeZone || 'unknown',
-      });
-
-      // Update the last active date in memory
-      lastActiveDate = today;
-
-      // Persist the new date to storage
-      persistState({
-        instanceId: instanceId || cryptoRandomId(),
-        enabledOverride: userOptOut === undefined ? undefined : !userOptOut,
-        onboardingSeen,
-        lastActiveDate: today,
-      });
-    }
-  } catch (error) {
-    // Never let telemetry errors crash the app
-    // Optionally log for debugging: console.error('DAU tracking error:', error);
-  }
-}
-
-/**
- * Export for use in window focus events
- */
-export async function checkAndReportDailyActiveUser(): Promise<void> {
-  return checkDailyActiveUser();
-}
-
-export function setOnboardingSeen(flag: boolean) {
-  onboardingSeen = Boolean(flag);
-  try {
-    persistState({
-      instanceId: instanceId || cryptoRandomId(),
-      onboardingSeen,
-      enabledOverride: userOptOut === undefined ? undefined : !userOptOut,
-    });
-  } catch {
-    // ignore
-  }
-}
diff --git a/src/main/tsconfig.json b/src/main/tsconfig.json
deleted file mode 100644
index ea2fa1def8..0000000000
--- a/src/main/tsconfig.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "extends": "../../tsconfig.main.json"
-}
diff --git a/src/main/types/fsListWorker.ts b/src/main/types/fsListWorker.ts
deleted file mode 100644
index f7b6ab6596..0000000000
--- a/src/main/types/fsListWorker.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-export type FsListItem = {
-  path: string;
-  type: 'file' | 'dir';
-};
-
-export type FsListWorkerResponse =
-  | {
-      taskId: number;
-      ok: true;
-      items: FsListItem[];
-      truncated: boolean;
-      reason?: 'maxEntries' | 'timeBudget';
-      durationMs: number;
-    }
-  | {
-      taskId: number;
-      ok: false;
-      error: string;
-    };
diff --git a/src/main/types/terminalSnapshot.ts b/src/main/types/terminalSnapshot.ts
deleted file mode 100644
index 3458bdf914..0000000000
--- a/src/main/types/terminalSnapshot.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-export interface TerminalSnapshotPayload {
-  version: 1;
-  createdAt: string;
-  cols: number;
-  rows: number;
-  data: string;
-  stats?: Record<string, unknown>;
-}
-
-export const TERMINAL_SNAPSHOT_VERSION = 1 as const;
diff --git a/src/main/utils/__tests__/childProcessEnv.test.ts b/src/main/utils/__tests__/childProcessEnv.test.ts
deleted file mode 100644
index 2e72bd5a21..0000000000
--- a/src/main/utils/__tests__/childProcessEnv.test.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-import { describe, expect, it } from 'vitest';
-import { buildExternalToolEnv } from '../childProcessEnv';
-
-describe('buildExternalToolEnv', () => {
-  it('removes AppImage-only keys and strips mount paths from PATH-like vars', () => {
-    const env = buildExternalToolEnv({
-      APPDIR: '/tmp/.mount_emdashAbCd',
-      APPIMAGE: '/home/user/emdash.AppImage',
-      ARGV0: 'AppRun',
-      CHROME_DESKTOP: 'emdash.desktop',
-      GSETTINGS_SCHEMA_DIR: '/tmp/.mount_emdashAbCd/usr/share/glib-2.0/schemas',
-      OWD: '/tmp',
-      PATH: '/usr/local/bin:/tmp/.mount_emdashAbCd/usr/bin:/usr/bin',
-      LD_LIBRARY_PATH: '/tmp/.mount_emdashAbCd/usr/lib:/usr/local/cuda/lib64',
-      XDG_DATA_DIRS: '/tmp/.mount_emdashAbCd/usr/share:/usr/share',
-      HOME: '/home/user',
-      USER: 'user',
-      KEEP_ME: 'yes',
-    });
-
-    expect(env.APPDIR).toBeUndefined();
-    expect(env.APPIMAGE).toBeUndefined();
-    expect(env.ARGV0).toBeUndefined();
-    expect(env.CHROME_DESKTOP).toBeUndefined();
-    expect(env.GSETTINGS_SCHEMA_DIR).toBeUndefined();
-    expect(env.OWD).toBeUndefined();
-
-    expect(env.PATH).toBe('/usr/local/bin:/usr/bin');
-    expect(env.LD_LIBRARY_PATH).toBe('/usr/local/cuda/lib64');
-    expect(env.XDG_DATA_DIRS).toBe('/usr/share');
-
-    expect(env.HOME).toBe('/home/user');
-    expect(env.USER).toBe('user');
-    expect(env.KEEP_ME).toBe('yes');
-  });
-
-  it('removes Python vars only when they point into AppImage mount paths', () => {
-    const stripped = buildExternalToolEnv({
-      APPDIR: '/tmp/.mount_emdashZZ',
-      PYTHONHOME: '/tmp/.mount_emdashZZ/usr',
-      PYTHONPATH: '/tmp/.mount_emdashZZ/usr/lib/python3.11',
-    });
-
-    expect(stripped.PYTHONHOME).toBeUndefined();
-    expect(stripped.PYTHONPATH).toBeUndefined();
-
-    const kept = buildExternalToolEnv({
-      PYTHONHOME: '/opt/python',
-      PYTHONPATH: '/opt/python/lib',
-    });
-
-    expect(kept.PYTHONHOME).toBe('/opt/python');
-    expect(kept.PYTHONPATH).toBe('/opt/python/lib');
-  });
-});
diff --git a/src/main/utils/__tests__/diffParser.test.ts b/src/main/utils/__tests__/diffParser.test.ts
deleted file mode 100644
index 31a0a2d5b8..0000000000
--- a/src/main/utils/__tests__/diffParser.test.ts
+++ /dev/null
@@ -1,123 +0,0 @@
-import { describe, it, expect } from 'vitest';
-import {
-  parseDiffLines,
-  stripTrailingNewline,
-  MAX_DIFF_CONTENT_BYTES,
-  MAX_DIFF_OUTPUT_BYTES,
-} from '../diffParser';
-
-describe('parseDiffLines', () => {
-  it('should parse a standard unified diff', () => {
-    const stdout =
-      'diff --git a/file.ts b/file.ts\n' +
-      'index abc..def 100644\n' +
-      '--- a/file.ts\n' +
-      '+++ b/file.ts\n' +
-      '@@ -1,3 +1,3 @@\n' +
-      ' hello\n' +
-      '-old line\n' +
-      '+new line\n' +
-      ' world\n';
-
-    const { lines, isBinary } = parseDiffLines(stdout);
-
-    expect(isBinary).toBe(false);
-    expect(lines).toEqual([
-      { left: 'hello', right: 'hello', type: 'context' },
-      { left: 'old line', type: 'del' },
-      { right: 'new line', type: 'add' },
-      { left: 'world', right: 'world', type: 'context' },
-    ]);
-  });
-
-  it('should skip all extended diff headers', () => {
-    const stdout =
-      'diff --git a/file.ts b/file.ts\n' +
-      'new file mode 100644\n' +
-      'old file mode 100755\n' +
-      'deleted file mode 100644\n' +
-      'similarity index 95%\n' +
-      'rename from old.ts\n' +
-      'rename to new.ts\n' +
-      'index abc..def 100644\n' +
-      '--- a/file.ts\n' +
-      '+++ b/file.ts\n' +
-      '@@ -1 +1 @@\n' +
-      '+content\n';
-
-    const { lines } = parseDiffLines(stdout);
-    expect(lines).toEqual([{ right: 'content', type: 'add' }]);
-  });
-
-  it('should skip "No newline at end of file" markers', () => {
-    const stdout =
-      'diff --git a/f b/f\n' +
-      '--- a/f\n' +
-      '+++ b/f\n' +
-      '@@ -1 +1 @@\n' +
-      '-old\n' +
-      '\\ No newline at end of file\n' +
-      '+new\n' +
-      '\\ No newline at end of file\n';
-
-    const { lines } = parseDiffLines(stdout);
-    expect(lines).toEqual([
-      { left: 'old', type: 'del' },
-      { right: 'new', type: 'add' },
-    ]);
-  });
-
-  it('should detect binary files', () => {
-    const stdout =
-      'diff --git a/img.png b/img.png\n' +
-      'index abc..def 100644\n' +
-      'Binary files a/img.png and b/img.png differ\n';
-
-    const { lines, isBinary } = parseDiffLines(stdout);
-    expect(isBinary).toBe(true);
-    expect(lines).toEqual([]);
-  });
-
-  it('should return empty for empty input', () => {
-    const { lines, isBinary } = parseDiffLines('');
-    expect(lines).toEqual([]);
-    expect(isBinary).toBe(false);
-  });
-
-  it('should treat unrecognized prefix lines as context with full line', () => {
-    const { lines } = parseDiffLines('some unexpected line\n');
-    expect(lines).toEqual([
-      { left: 'some unexpected line', right: 'some unexpected line', type: 'context' },
-    ]);
-  });
-});
-
-describe('stripTrailingNewline', () => {
-  it('should strip one trailing newline', () => {
-    expect(stripTrailingNewline('hello\n')).toBe('hello');
-  });
-
-  it('should strip only one trailing newline', () => {
-    expect(stripTrailingNewline('hello\n\n')).toBe('hello\n');
-  });
-
-  it('should return unchanged if no trailing newline', () => {
-    expect(stripTrailingNewline('hello')).toBe('hello');
-  });
-
-  it('should handle empty string', () => {
-    expect(stripTrailingNewline('')).toBe('');
-  });
-});
-
-describe('MAX_DIFF_CONTENT_BYTES', () => {
-  it('should be 512KB', () => {
-    expect(MAX_DIFF_CONTENT_BYTES).toBe(512 * 1024);
-  });
-});
-
-describe('MAX_DIFF_OUTPUT_BYTES', () => {
-  it('should be 10MB', () => {
-    expect(MAX_DIFF_OUTPUT_BYTES).toBe(10 * 1024 * 1024);
-  });
-});
diff --git a/src/main/utils/__tests__/issueSorting.test.ts b/src/main/utils/__tests__/issueSorting.test.ts
deleted file mode 100644
index 4aac783f26..0000000000
--- a/src/main/utils/__tests__/issueSorting.test.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import { describe, expect, it } from 'vitest';
-import { sortByUpdatedAtDesc, updatedAtToTimestamp } from '../issueSorting';
-
-describe('updatedAtToTimestamp', () => {
-  it('returns 0 for missing or invalid timestamps', () => {
-    expect(updatedAtToTimestamp()).toBe(0);
-    expect(updatedAtToTimestamp(null)).toBe(0);
-    expect(updatedAtToTimestamp('not-a-date')).toBe(0);
-  });
-
-  it('parses valid ISO timestamps', () => {
-    expect(updatedAtToTimestamp('2026-03-04T10:30:00.000Z')).toBe(1772620200000);
-  });
-});
-
-describe('sortByUpdatedAtDesc', () => {
-  it('sorts most recent updatedAt first', () => {
-    const issues = [
-      { id: 'old', updatedAt: '2026-03-01T00:00:00.000Z' },
-      { id: 'newest', updatedAt: '2026-03-04T00:00:00.000Z' },
-      { id: 'mid', updatedAt: '2026-03-02T00:00:00.000Z' },
-    ];
-
-    const sorted = sortByUpdatedAtDesc(issues);
-    expect(sorted.map((issue) => issue.id)).toEqual(['newest', 'mid', 'old']);
-  });
-
-  it('pushes missing or invalid updatedAt to the end', () => {
-    const issues = [
-      { id: 'missing', updatedAt: null },
-      { id: 'valid', updatedAt: '2026-03-04T00:00:00.000Z' },
-      { id: 'invalid', updatedAt: 'bogus' },
-    ];
-
-    const sorted = sortByUpdatedAtDesc(issues);
-    expect(sorted[0]?.id).toBe('valid');
-    expect(new Set(sorted.slice(1).map((issue) => issue.id))).toEqual(
-      new Set(['missing', 'invalid'])
-    );
-  });
-});
diff --git a/src/main/utils/__tests__/remoteOpenIn.test.ts b/src/main/utils/__tests__/remoteOpenIn.test.ts
deleted file mode 100644
index 1bc8374371..0000000000
--- a/src/main/utils/__tests__/remoteOpenIn.test.ts
+++ /dev/null
@@ -1,117 +0,0 @@
-import { describe, expect, it } from 'vitest';
-import {
-  buildGhosttyRemoteExecArgs,
-  buildRemoteEditorUrl,
-  buildRemoteSshCommand,
-  buildRemoteSshAuthority,
-  buildRemoteTerminalShellCommand,
-} from '../remoteOpenIn';
-
-describe('buildRemoteSshAuthority', () => {
-  it('prepends username when host has no user component', () => {
-    expect(buildRemoteSshAuthority('example.internal', 'azureuser')).toBe(
-      'azureuser@example.internal'
-    );
-  });
-
-  it('preserves host when username is already embedded', () => {
-    expect(buildRemoteSshAuthority('existing@example.internal', 'azureuser')).toBe(
-      'existing@example.internal'
-    );
-  });
-});
-
-describe('buildRemoteEditorUrl', () => {
-  it('builds cursor remote URL with encoded user@host authority', () => {
-    expect(
-      buildRemoteEditorUrl('cursor', 'example.internal', 'azureuser', '/home/azureuser/src')
-    ).toBe('cursor://vscode-remote/ssh-remote+azureuser%40example.internal/home/azureuser/src');
-  });
-
-  it('normalizes relative target paths with a leading slash', () => {
-    expect(buildRemoteEditorUrl('vscode', 'example.internal', 'azureuser', 'workspace')).toBe(
-      'vscode://vscode-remote/ssh-remote+azureuser%40example.internal/workspace'
-    );
-  });
-});
-
-describe('buildGhosttyRemoteExecArgs', () => {
-  const expectedRemoteShellCommand =
-    `cd '/home/azureuser/pro/smv/.emdash/worktrees/task one' && ` +
-    '(if command -v infocmp >/dev/null 2>&1 && [ -n "${TERM:-}" ] && infocmp "${TERM}" >/dev/null 2>&1; then :; else export TERM=xterm-256color; fi) && ' +
-    '(exec "${SHELL:-/bin/bash}" || exec /bin/bash || exec /bin/sh)';
-
-  it('builds shared remote shell bootstrap command', () => {
-    expect(
-      buildRemoteTerminalShellCommand('/home/azureuser/pro/smv/.emdash/worktrees/task one')
-    ).toBe(expectedRemoteShellCommand);
-  });
-
-  it('builds ssh argv tokens for Ghostty -e', () => {
-    expect(
-      buildGhosttyRemoteExecArgs({
-        host: 'example.internal',
-        username: 'azureuser',
-        port: 22,
-        targetPath: '/home/azureuser/pro/smv/.emdash/worktrees/task one',
-      })
-    ).toEqual([
-      'ssh',
-      'azureuser@example.internal',
-      '-o',
-      'ControlMaster=no',
-      '-o',
-      'ControlPath=none',
-      '-p',
-      '22',
-      '-t',
-      expectedRemoteShellCommand,
-    ]);
-  });
-
-  it('preserves existing user@host authority', () => {
-    expect(
-      buildGhosttyRemoteExecArgs({
-        host: 'ops@example.internal',
-        username: 'ignored-user',
-        port: '2202',
-        targetPath: '/tmp/x',
-      })
-    ).toEqual([
-      'ssh',
-      'ops@example.internal',
-      '-o',
-      'ControlMaster=no',
-      '-o',
-      'ControlPath=none',
-      '-p',
-      '2202',
-      '-t',
-      `cd '/tmp/x' && (if command -v infocmp >/dev/null 2>&1 && [ -n "\${TERM:-}" ] && infocmp "\${TERM}" >/dev/null 2>&1; then :; else export TERM=xterm-256color; fi) && (exec "\${SHELL:-/bin/bash}" || exec /bin/bash || exec /bin/sh)`,
-    ]);
-  });
-
-  it('builds quoted ssh command string for shell-based launchers', () => {
-    expect(
-      buildRemoteSshCommand({
-        host: 'example.internal',
-        username: 'azureuser',
-        port: 22,
-        targetPath: '/home/azureuser/pro/smv/.emdash/worktrees/task one',
-      })
-    ).toBe(
-      `ssh 'azureuser@example.internal' -o 'ControlMaster=no' -o 'ControlPath=none' -p '22' -t '${expectedRemoteShellCommand.replace(/'/g, `'\\''`)}'`
-    );
-  });
-
-  it('preserves existing user@host authority in shell command string', () => {
-    expect(
-      buildRemoteSshCommand({
-        host: 'ops@example.internal',
-        username: 'ignored-user',
-        port: 22,
-        targetPath: '/tmp/x',
-      })
-    ).toContain(`ssh 'ops@example.internal'`);
-  });
-});
diff --git a/src/main/utils/__tests__/shellEnv.test.ts b/src/main/utils/__tests__/shellEnv.test.ts
deleted file mode 100644
index 9df732bdec..0000000000
--- a/src/main/utils/__tests__/shellEnv.test.ts
+++ /dev/null
@@ -1,164 +0,0 @@
-import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
-import { getShellEnvVar, detectSshAuthSock, initializeShellEnvironment } from '../shellEnv';
-
-// Mock child_process
-vi.mock('child_process', () => ({
-  execSync: vi.fn(),
-}));
-
-// Mock fs
-vi.mock('fs', () => ({
-  statSync: vi.fn(),
-  readdirSync: vi.fn(),
-}));
-
-import { execSync } from 'child_process';
-import { statSync, readdirSync } from 'fs';
-
-const mockedExecSync = vi.mocked(execSync);
-const mockedStatSync = vi.mocked(statSync);
-const mockedReaddirSync = vi.mocked(readdirSync);
-
-describe('shellEnv', () => {
-  const originalEnv = process.env;
-
-  beforeEach(() => {
-    // Reset process.env
-    process.env = { ...originalEnv };
-    vi.resetAllMocks();
-  });
-
-  afterEach(() => {
-    process.env = originalEnv;
-  });
-
-  describe('getShellEnvVar', () => {
-    it('should return environment variable from shell', () => {
-      mockedExecSync.mockReturnValue('/path/to/socket');
-
-      const result = getShellEnvVar('SSH_AUTH_SOCK');
-
-      expect(result).toBe('/path/to/socket');
-      expect(mockedExecSync).toHaveBeenCalledWith(
-        expect.stringContaining('printenv SSH_AUTH_SOCK'),
-        expect.objectContaining({ encoding: 'utf8', timeout: 5000 })
-      );
-    });
-
-    it('should return undefined when variable is empty', () => {
-      mockedExecSync.mockReturnValue('');
-
-      const result = getShellEnvVar('SSH_AUTH_SOCK');
-
-      expect(result).toBeUndefined();
-    });
-
-    it('should return undefined when shell command fails', () => {
-      mockedExecSync.mockImplementation(() => {
-        throw new Error('Command failed');
-      });
-
-      const result = getShellEnvVar('SSH_AUTH_SOCK');
-
-      expect(result).toBeUndefined();
-    });
-  });
-
-  describe('detectSshAuthSock', () => {
-    it('should return existing SSH_AUTH_SOCK if already set', () => {
-      process.env.SSH_AUTH_SOCK = '/existing/socket';
-      // On macOS, launchctl is tried first but may fail
-      mockedExecSync.mockImplementation(() => {
-        throw new Error('launchctl failed');
-      });
-
-      const result = detectSshAuthSock();
-
-      expect(result).toBe('/existing/socket');
-    });
-
-    it('should detect SSH_AUTH_SOCK when not in process.env', () => {
-      delete process.env.SSH_AUTH_SOCK;
-      mockedExecSync.mockReturnValue('/shell/detected/socket');
-
-      const result = detectSshAuthSock();
-
-      expect(result).toBe('/shell/detected/socket');
-    });
-
-    it('should check common locations as fallback', () => {
-      delete process.env.SSH_AUTH_SOCK;
-      mockedExecSync.mockImplementation(() => {
-        throw new Error('Shell detection failed');
-      });
-
-      // Mock readdirSync to simulate finding a socket
-      mockedReaddirSync.mockImplementation((dirPath) => {
-        const pathStr = dirPath.toString();
-        if (pathStr.includes('com.apple.launchd')) {
-          return ['Listeners'] as any;
-        }
-        return [] as any;
-      });
-
-      // Mock statSync to indicate it's a socket
-      mockedStatSync.mockReturnValue({ isSocket: () => true } as any);
-
-      const result = detectSshAuthSock();
-
-      // Should find the socket in launchd directory
-      expect(result).toBeTruthy();
-    });
-
-    it.skipIf(process.platform !== 'darwin')(
-      'should prefer launchctl value over process.env on macOS',
-      () => {
-        process.env.SSH_AUTH_SOCK = '/private/tmp/com.apple.launchd.XXX/Listeners';
-        mockedExecSync.mockReturnValue(
-          '/Users/test/Library/Group Containers/2BUA8C4S2C.com.1password/t/agent.sock\n'
-        );
-
-        const result = detectSshAuthSock();
-
-        expect(result).toBe(
-          '/Users/test/Library/Group Containers/2BUA8C4S2C.com.1password/t/agent.sock'
-        );
-      }
-    );
-
-    it('should return undefined when no socket is found', () => {
-      delete process.env.SSH_AUTH_SOCK;
-      mockedExecSync.mockImplementation(() => {
-        throw new Error('Shell detection failed');
-      });
-      mockedReaddirSync.mockImplementation(() => [] as any);
-
-      const result = detectSshAuthSock();
-
-      expect(result).toBeUndefined();
-    });
-  });
-
-  describe('initializeShellEnvironment', () => {
-    it('should set process.env.SSH_AUTH_SOCK when socket is detected', () => {
-      delete process.env.SSH_AUTH_SOCK;
-      mockedExecSync.mockReturnValue('/detected/socket');
-
-      initializeShellEnvironment();
-
-      expect(process.env.SSH_AUTH_SOCK).toBe('/detected/socket');
-    });
-
-    it('should fall back to existing SSH_AUTH_SOCK when launchctl fails', () => {
-      process.env.SSH_AUTH_SOCK = '/existing/socket';
-      // On macOS, launchctl is tried first but may fail
-      mockedExecSync.mockImplementation(() => {
-        throw new Error('launchctl failed');
-      });
-
-      initializeShellEnvironment();
-
-      expect(process.env.SSH_AUTH_SOCK).toBe('/existing/socket');
-    });
-  });
-});
diff --git a/src/main/utils/dev.ts b/src/main/utils/dev.ts
deleted file mode 100644
index 05c5f60b40..0000000000
--- a/src/main/utils/dev.ts
+++ /dev/null
@@ -1 +0,0 @@
-export const isDev = process.env.NODE_ENV === 'development' || process.argv.includes('--dev');
diff --git a/src/main/utils/diffParser.ts b/src/main/utils/diffParser.ts
deleted file mode 100644
index 053aae0bc4..0000000000
--- a/src/main/utils/diffParser.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-/** Maximum bytes for fetching file content in diffs. */
-export const MAX_DIFF_CONTENT_BYTES = 512 * 1024;
-
-/** Maximum bytes for `git diff` output (larger than content limit due to headers/context). */
-export const MAX_DIFF_OUTPUT_BYTES = 10 * 1024 * 1024;
-
-/** Headers emitted by `git diff` that should be skipped when parsing hunks. */
-const DIFF_HEADER_PREFIXES = [
-  'diff ',
-  'index ',
-  '--- ',
-  '+++ ',
-  '@@',
-  'new file mode',
-  'old file mode',
-  'deleted file mode',
-  'similarity index',
-  'rename from',
-  'rename to',
-  'Binary files',
-];
-
-export type DiffLine = { left?: string; right?: string; type: 'context' | 'add' | 'del' };
-
-export interface DiffResult {
-  lines: DiffLine[];
-  isBinary?: boolean;
-  originalContent?: string;
-  modifiedContent?: string;
-}
-
-/** Strip exactly one trailing newline, if present. */
-export function stripTrailingNewline(s: string): string {
-  return s.endsWith('\n') ? s.slice(0, -1) : s;
-}
-
-/** Parse raw `git diff` output into structured diff lines, skipping headers. */
-export function parseDiffLines(stdout: string): { lines: DiffLine[]; isBinary: boolean } {
-  const result: DiffLine[] = [];
-  for (const line of stdout.split('\n')) {
-    if (!line) continue;
-    if (DIFF_HEADER_PREFIXES.some((p) => line.startsWith(p))) continue;
-    const prefix = line[0];
-    const content = line.slice(1);
-    if (prefix === '\\') continue;
-    if (prefix === ' ') result.push({ left: content, right: content, type: 'context' });
-    else if (prefix === '-') result.push({ left: content, type: 'del' });
-    else if (prefix === '+') result.push({ right: content, type: 'add' });
-    else result.push({ left: line, right: line, type: 'context' });
-  }
-  const isBinary = result.length === 0 && stdout.includes('Binary files');
-  return { lines: result, isBinary };
-}
diff --git a/src/main/utils/externalLinks.ts b/src/main/utils/externalLinks.ts
index 879845d3eb..07da2d5343 100644
--- a/src/main/utils/externalLinks.ts
+++ b/src/main/utils/externalLinks.ts
@@ -1,7 +1,7 @@
 import { BrowserWindow, shell } from 'electron';
 
 /**
- * Ensure any external HTTP(S) links open in the user’s default browser
+ * Ensure any external HTTP(S) links open in the user's default browser
  * rather than inside the Electron window. Keeps app navigation scoped
  * to our renderer while preserving expected link behavior.
  */
@@ -9,7 +9,7 @@ export function registerExternalLinkHandlers(win: BrowserWindow, isDev: boolean)
   const wc = win.webContents;
 
   const isInternalAppUrl = (url: string) => {
-    if (isDev) return url.startsWith('http://localhost:3000');
+    if (isDev) return url.startsWith(process.env.ELECTRON_RENDERER_URL!);
     return url.startsWith('file://') || /^http:\/\/(127\.0\.0\.1|localhost):\d+(?:\/|$)/i.test(url);
   };
 
diff --git a/src/main/utils/fsIgnores.ts b/src/main/utils/fsIgnores.ts
deleted file mode 100644
index 3335bd1d1f..0000000000
--- a/src/main/utils/fsIgnores.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-export const DEFAULT_IGNORES = new Set([
-  '.git',
-  'dist',
-  'build',
-  'out',
-  '.next',
-  '.nuxt',
-  '.cache',
-  'coverage',
-  '.DS_Store',
-]);
diff --git a/src/main/utils/gitIgnore.ts b/src/main/utils/gitIgnore.ts
deleted file mode 100644
index 77d9b60614..0000000000
--- a/src/main/utils/gitIgnore.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import ignore from 'ignore';
-
-export class GitIgnoreParser {
-  // Use any because strict typing of the ignore package might vary, but logically it's an Ignore object
-  private ig: any;
-
-  constructor(content: string) {
-    this.ig = ignore().add(content);
-  }
-
-  public ignores(path: string): boolean {
-    // The ignore package uses relative paths.
-    // If the path ends with / it might treat it as dir, but our path input from fsListWorker typically doesn't have trailing slash.
-    // 'ignore' usually handles 'node_modules' correctly matching directory.
-    return this.ig.ignores(path);
-  }
-}
diff --git a/src/main/utils/issueSorting.ts b/src/main/utils/issueSorting.ts
deleted file mode 100644
index a42dff3379..0000000000
--- a/src/main/utils/issueSorting.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-export interface HasUpdatedAt {
-  updatedAt?: string | null;
-}
-
-export function updatedAtToTimestamp(updatedAt?: string | null): number {
-  if (!updatedAt) {
-    return 0;
-  }
-
-  const parsed = Date.parse(updatedAt);
-  return Number.isFinite(parsed) ? parsed : 0;
-}
-
-export function sortByUpdatedAtDesc<T extends HasUpdatedAt>(items: T[]): T[] {
-  return [...items].sort((a, b) => {
-    return updatedAtToTimestamp(b.updatedAt) - updatedAtToTimestamp(a.updatedAt);
-  });
-}
diff --git a/src/main/utils/remoteProjectResolver.ts b/src/main/utils/remoteProjectResolver.ts
deleted file mode 100644
index ec23bd93d2..0000000000
--- a/src/main/utils/remoteProjectResolver.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { databaseService, type Project } from '../services/DatabaseService';
-
-export type RemoteProject = Project & { sshConnectionId: string; remotePath: string };
-
-export function isRemoteProject(project: Project | null): project is RemoteProject {
-  return !!(
-    project &&
-    project.isRemote &&
-    typeof project.sshConnectionId === 'string' &&
-    project.sshConnectionId.length > 0 &&
-    typeof project.remotePath === 'string' &&
-    project.remotePath.length > 0
-  );
-}
-
-export async function resolveRemoteProjectForWorktreePath(
-  worktreePath: string
-): Promise<RemoteProject | null> {
-  const all = await databaseService.getProjects();
-  // Pick the longest matching remotePath prefix.
-  const candidates = all
-    .filter((p) => isRemoteProject(p))
-    .filter((p) => worktreePath.startsWith(p.remotePath.replace(/\/+$/g, '') + '/'))
-    .sort((a, b) => b.remotePath.length - a.remotePath.length);
-  return candidates[0] ?? null;
-}
diff --git a/src/main/utils/safeStat.ts b/src/main/utils/safeStat.ts
deleted file mode 100644
index 0fbc4bb648..0000000000
--- a/src/main/utils/safeStat.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import * as fs from 'fs';
-
-export function safeStat(pathname: string): fs.Stats | null {
-  try {
-    return fs.statSync(pathname);
-  } catch {
-    return null;
-  }
-}
diff --git a/src/main/utils/shellEnv.ts b/src/main/utils/shellEnv.ts
index bfd8970b3c..77a795cfc9 100644
--- a/src/main/utils/shellEnv.ts
+++ b/src/main/utils/shellEnv.ts
@@ -1,47 +1,12 @@
 /**
- * Utility functions for detecting shell environment variables
- * when the Electron app is launched from the GUI (not from terminal).
+ * Utilities for detecting the SSH agent socket when the app is launched
+ * from a GUI and may not have inherited it from the user's shell session.
  */
 
 import { execSync } from 'child_process';
 import * as fs from 'fs';
-import * as path from 'path';
 import * as os from 'os';
-
-/**
- * Gets an environment variable from the user's login shell.
- * This is useful when the app is launched from GUI and doesn't
- * inherit the shell's environment.
- *
- * @param varName - Name of the environment variable to retrieve
- * @returns The value of the environment variable, or undefined if not found
- */
-export function getShellEnvVar(varName: string): string | undefined {
-  try {
-    if (!/^[A-Z0-9_]+$/.test(varName)) {
-      return undefined;
-    }
-    const shell = process.env.SHELL || (process.platform === 'darwin' ? '/bin/zsh' : '/bin/bash');
-
-    // -i = interactive, -l = login shell (sources .zshrc/.bash_profile)
-    const result = execSync(`${shell} -ilc 'printenv ${varName} || true'`, {
-      encoding: 'utf8',
-      timeout: 5000,
-      env: {
-        ...process.env,
-        // Prevent oh-my-zsh plugins from breaking output
-        DISABLE_AUTO_UPDATE: 'true',
-        ZSH_TMUX_AUTOSTART: 'false',
-        ZSH_TMUX_AUTOSTARTED: 'true',
-      },
-    });
-
-    const value = result.trim();
-    return value || undefined;
-  } catch {
-    return undefined;
-  }
-}
+import * as path from 'path';
 
 /**
  * Common SSH agent socket locations to check as fallback
@@ -122,16 +87,23 @@ function expandGlob(pattern: string): string[] {
 
 /**
  * Detects the SSH_AUTH_SOCK environment variable.
- * First checks if it's already set, then tries to detect from shell,
- * and finally checks common socket locations.
+ *
+ * In normal operation, resolveUserEnv() (called at startup) will have already
+ * merged SSH_AUTH_SOCK from the login shell into process.env, so the first
+ * check here returns immediately. The remaining steps are fallbacks for
+ * environments where resolveUserEnv() timed out, was skipped (AppImage, CI),
+ * or the user's shell simply doesn't export SSH_AUTH_SOCK (e.g. custom
+ * socket managers like 1Password).
  *
  * @returns The path to the SSH agent socket, or undefined if not found
  */
 export function detectSshAuthSock(): string | undefined {
-  // On macOS, check launchctl first — it reflects the user's explicit override
-  // (e.g. `launchctl setenv SSH_AUTH_SOCK /path/to/1password/agent.sock`)
-  // which may differ from the process.env value inherited from the default
-  // Apple SSH agent when launched from Finder/Dock.
+  // Fast path — set by resolveUserEnv() at startup in the common case.
+  if (process.env.SSH_AUTH_SOCK) {
+    return process.env.SSH_AUTH_SOCK;
+  }
+
+  // macOS launchd (fast, no shell spawn)
   if (process.platform === 'darwin') {
     try {
       const result = execSync('launchctl getenv SSH_AUTH_SOCK', {
@@ -143,21 +115,10 @@ export function detectSshAuthSock(): string | undefined {
         return socket;
       }
     } catch {
-      // launchctl detection failed, continue
+      // launchctl detection failed
     }
   }
 
-  // If already set in environment, use it
-  if (process.env.SSH_AUTH_SOCK) {
-    return process.env.SSH_AUTH_SOCK;
-  }
-
-  // Try to detect from user's login shell (sources .zshrc/.bash_profile)
-  const shellValue = getShellEnvVar('SSH_AUTH_SOCK');
-  if (shellValue) {
-    return shellValue;
-  }
-
   // Check common socket locations as fallback
   for (const location of COMMON_SSH_AGENT_LOCATIONS) {
     try {
@@ -178,17 +139,3 @@ export function detectSshAuthSock(): string | undefined {
 
   return undefined;
 }
-
-/**
- * Initializes shell environment detection and sets process.env variables.
- * Should be called early in the main process before app is ready.
- */
-export function initializeShellEnvironment(): void {
-  const sshAuthSock = detectSshAuthSock();
-  if (sshAuthSock) {
-    process.env.SSH_AUTH_SOCK = sshAuthSock;
-    console.log('[shellEnv] Detected SSH_AUTH_SOCK:', sshAuthSock);
-  } else {
-    console.log('[shellEnv] SSH_AUTH_SOCK not detected');
-  }
-}
diff --git a/src/main/utils/sshConfigParser.ts b/src/main/utils/sshConfigParser.ts
deleted file mode 100644
index 0b73b387c9..0000000000
--- a/src/main/utils/sshConfigParser.ts
+++ /dev/null
@@ -1,151 +0,0 @@
-import { readFile } from 'fs/promises';
-import { homedir } from 'os';
-import { join } from 'path';
-import type { SshConfigHost } from '../../shared/ssh/types';
-
-/**
- * Strips surrounding quotes (single or double) from a value string.
- */
-function stripQuotes(value: string): string {
-  if (
-    (value.startsWith('"') && value.endsWith('"')) ||
-    (value.startsWith("'") && value.endsWith("'"))
-  ) {
-    return value.slice(1, -1);
-  }
-  return value;
-}
-
-/**
- * Expands a leading `~` or `~/` to the user's home directory.
- */
-function expandTilde(filePath: string): string {
-  if (filePath === '~') {
-    return homedir();
-  }
-  if (filePath.startsWith('~/')) {
-    return join(homedir(), filePath.slice(2));
-  }
-  return filePath;
-}
-
-/**
- * Parses ~/.ssh/config and returns an array of host entries,
- * including wildcard patterns (Host *, Host ?).
- */
-export async function parseSshConfigFile(): Promise<SshConfigHost[]> {
-  const configPath = join(homedir(), '.ssh', 'config');
-  const content = await readFile(configPath, 'utf-8').catch(() => '');
-
-  const hosts: SshConfigHost[] = [];
-  const lines = content.split('\n');
-  let currentHost: SshConfigHost | null = null;
-
-  for (const line of lines) {
-    const trimmed = line.trim();
-
-    // Skip empty lines and comments
-    if (!trimmed || trimmed.startsWith('#')) continue;
-
-    // Match Host directive
-    const hostMatch = trimmed.match(/^Host\s+(.+)$/i);
-    if (hostMatch) {
-      // Save previous host if exists
-      if (currentHost && currentHost.host) {
-        hosts.push(currentHost);
-      }
-      // Start new host entry
-      const hostPattern = hostMatch[1].trim();
-      currentHost = { host: hostPattern };
-      continue;
-    }
-
-    // Match HostName
-    const hostnameMatch = trimmed.match(/^HostName\s+(.+)$/i);
-    if (hostnameMatch && currentHost) {
-      currentHost.hostname = hostnameMatch[1].trim();
-      continue;
-    }
-
-    // Match User
-    const userMatch = trimmed.match(/^User\s+(.+)$/i);
-    if (userMatch && currentHost) {
-      currentHost.user = userMatch[1].trim();
-      continue;
-    }
-
-    // Match Port
-    const portMatch = trimmed.match(/^Port\s+(\d+)$/i);
-    if (portMatch && currentHost) {
-      currentHost.port = parseInt(portMatch[1], 10);
-      continue;
-    }
-
-    // Match IdentityFile
-    const identityMatch = trimmed.match(/^IdentityFile\s+(.+)$/i);
-    if (identityMatch && currentHost) {
-      const identityFile = expandTilde(stripQuotes(identityMatch[1].trim()));
-      currentHost.identityFile = identityFile;
-      continue;
-    }
-
-    // Match IdentityAgent
-    const identityAgentMatch = trimmed.match(/^IdentityAgent\s+(.+)$/i);
-    if (identityAgentMatch && currentHost) {
-      const identityAgent = expandTilde(stripQuotes(identityAgentMatch[1].trim()));
-      currentHost.identityAgent = identityAgent;
-      continue;
-    }
-  }
-
-  // Don't forget the last host
-  if (currentHost && currentHost.host) {
-    hosts.push(currentHost);
-  }
-
-  return hosts;
-}
-
-/**
- * Resolves the IdentityAgent socket path for a given hostname.
- *
- * Parses ~/.ssh/config and finds a matching host entry by checking
- * both the Host alias and the HostName value. Returns the expanded
- * IdentityAgent path if found, or undefined.
- */
-export async function resolveIdentityAgent(hostname: string): Promise<string | undefined> {
-  try {
-    const hosts = await parseSshConfigFile();
-
-    // Look for a specific (non-wildcard) host match first
-    const specificMatch = hosts.find(
-      (h) =>
-        !h.host.includes('*') &&
-        !h.host.includes('?') &&
-        (h.host.toLowerCase() === hostname.toLowerCase() ||
-          h.hostname?.toLowerCase() === hostname.toLowerCase())
-    );
-    if (specificMatch?.identityAgent) {
-      return normalizeIdentityAgent(specificMatch.identityAgent);
-    }
-
-    // Fall back to Host * (wildcard default), matching OpenSSH behavior
-    const wildcardMatch = hosts.find((h) => h.host === '*');
-    return normalizeIdentityAgent(wildcardMatch?.identityAgent);
-  } catch {
-    return undefined;
-  }
-}
-
-/**
- * Normalizes an IdentityAgent value.
- * OpenSSH treats "SSH_AUTH_SOCK" as "use the env var" and "none" as
- * "disable agent auth". Both should return undefined so the caller
- * falls back to process.env.SSH_AUTH_SOCK or skips agent auth.
- */
-function normalizeIdentityAgent(value: string | undefined): string | undefined {
-  if (!value || value === 'SSH_AUTH_SOCK' || value.toLowerCase() === 'none') {
-    return undefined;
-  }
-  return value;
-}
diff --git a/src/main/utils/userEnv.test.ts b/src/main/utils/userEnv.test.ts
new file mode 100644
index 0000000000..4bdb3004e3
--- /dev/null
+++ b/src/main/utils/userEnv.test.ts
@@ -0,0 +1,33 @@
+import fs from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
+import { afterEach, describe, expect, it } from 'vitest';
+import { ensureUserBinDirsInPath } from './userEnv';
+
+const originalPath = process.env.PATH;
+
+afterEach(() => {
+  process.env.PATH = originalPath;
+});
+
+describe('ensureUserBinDirsInPath', () => {
+  it('prepends existing user bin directories to process PATH', () => {
+    const dir = fs.mkdtempSync(path.join(os.tmpdir(), 'emdash-user-bin-'));
+    process.env.PATH = '/usr/bin';
+
+    const added = ensureUserBinDirsInPath([dir]);
+
+    expect(added).toEqual([dir]);
+    expect(process.env.PATH?.split(path.delimiter).slice(0, 2)).toEqual([dir, '/usr/bin']);
+  });
+
+  it('does not duplicate existing path entries', () => {
+    const dir = fs.mkdtempSync(path.join(os.tmpdir(), 'emdash-user-bin-'));
+    process.env.PATH = [dir, '/usr/bin'].join(path.delimiter);
+
+    const added = ensureUserBinDirsInPath([dir]);
+
+    expect(added).toEqual([]);
+    expect(process.env.PATH).toBe([dir, '/usr/bin'].join(path.delimiter));
+  });
+});
diff --git a/src/main/utils/userEnv.ts b/src/main/utils/userEnv.ts
new file mode 100644
index 0000000000..3b7230bab3
--- /dev/null
+++ b/src/main/utils/userEnv.ts
@@ -0,0 +1,146 @@
+import { execSync } from 'node:child_process';
+import fs from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
+import { log } from '@main/lib/logger';
+
+/**
+ * Keys that must never be overwritten from the shell env capture.
+ *
+ * - AppImage runtime vars would corrupt child-process environments when
+ *   running from a Linux AppImage bundle.
+ * - Electron-specific vars must retain the values Electron set at boot.
+ * - NODE_ENV is set by the build toolchain and must not be overridden.
+ */
+const PRESERVE_KEYS = new Set([
+  // AppImage
+  'APPDIR',
+  'APPIMAGE',
+  'ARGV0',
+  'CHROME_DESKTOP',
+  'GSETTINGS_SCHEMA_DIR',
+  'OWD',
+  // Electron
+  'ELECTRON_RUN_AS_NODE',
+  'ELECTRON_NO_ATTACH_CONSOLE',
+  'ELECTRON_ENABLE_LOGGING',
+  'ELECTRON_ENABLE_STACK_DUMPING',
+  // Build toolchain
+  'NODE_ENV',
+]);
+
+const USER_BIN_DIRS = [path.join(os.homedir(), '.local', 'bin')];
+
+function pathEntryExists(entry: string): boolean {
+  try {
+    return fs.statSync(entry).isDirectory();
+  } catch {
+    return false;
+  }
+}
+
+function parseEnvOutput(raw: string): Record<string, string> {
+  const result: Record<string, string> = {};
+  for (const line of raw.split('\n')) {
+    const eq = line.indexOf('=');
+    if (eq === -1) continue;
+    const key = line.slice(0, eq).trim();
+    const value = line.slice(eq + 1);
+    if (key && /^[A-Za-z_]\w*$/.test(key)) {
+      result[key] = value;
+    }
+  }
+  return result;
+}
+
+function mergePath(shellPath: string, currentPath: string): string {
+  const sep = process.platform === 'win32' ? ';' : ':';
+  const shellEntries = shellPath.split(sep).filter(Boolean);
+  const currentEntries = currentPath.split(sep).filter(Boolean);
+
+  // Shell entries first (user's full PATH), then any Electron-only entries not in shell PATH
+  const seen = new Set(shellEntries);
+  const extra = currentEntries.filter((p) => !seen.has(p));
+  return [...shellEntries, ...extra].join(sep);
+}
+
+export function ensureUserBinDirsInPath(candidates: string[] = USER_BIN_DIRS): string[] {
+  const currentPath = process.env.PATH ?? '';
+  const entries = currentPath.split(path.delimiter).filter(Boolean);
+  const existing = new Set(entries);
+  const additions = candidates.filter(
+    (candidate) => pathEntryExists(candidate) && !existing.has(candidate)
+  );
+
+  if (additions.length === 0) {
+    return [];
+  }
+
+  process.env.PATH = [...additions, ...entries].join(path.delimiter);
+  return additions;
+}
+
+/**
+ * Spawns `$SHELL -ilc 'env'` with a 5 s timeout. On any error (timeout,
+ * missing shell, restricted environment) the function logs a warning and
+ * returns — the app continues with whatever `process.env` already contains.
+ *
+ * After this call returns, all subsequent consumers that inherit `process.env`
+ * (execFile, PTY env builders, dependency prober, etc.) automatically see the
+ * full PATH, SSH_AUTH_SOCK, and other variables the user's shell init sets.
+ */
+export async function resolveUserEnv(): Promise<void> {
+  if (process.platform === 'win32') {
+    // Windows PATH is managed differently; no login-shell capture needed.
+    return;
+  }
+
+  const shell = process.env.SHELL ?? (process.platform === 'darwin' ? '/bin/zsh' : '/bin/bash');
+
+  try {
+    const raw = execSync(`${shell} -ilc 'env'`, {
+      encoding: 'utf8',
+      timeout: 5_000,
+      env: {
+        ...process.env,
+        // Prevent oh-my-zsh and tmux plugins from producing extra output or
+        // blocking the env capture.
+        DISABLE_AUTO_UPDATE: 'true',
+        ZSH_TMUX_AUTOSTART: 'false',
+        ZSH_TMUX_AUTOSTARTED: 'true',
+      },
+    });
+
+    const shellEnv = parseEnvOutput(raw);
+
+    for (const [key, value] of Object.entries(shellEnv)) {
+      if (PRESERVE_KEYS.has(key)) continue;
+
+      if (key === 'PATH') {
+        const current = process.env.PATH ?? '';
+        process.env.PATH = mergePath(value, current);
+      } else {
+        process.env[key] = value;
+      }
+    }
+
+    log.info('[userEnv] Resolved login-shell env', {
+      shell,
+      pathEntries: process.env.PATH?.split(':').length ?? 0,
+    });
+  } catch (err: unknown) {
+    const message = err instanceof Error ? err.message : String(err);
+    log.warn('[userEnv] Failed to resolve login-shell env, falling back to process.env', {
+      shell,
+      error: message,
+    });
+  }
+}
+
+/**
+ * Parses a remote `env` command output into a key→value map.
+ * Exported for use by the SSH connection manager.
+ */
+export function parseRemoteEnvOutput(raw: string): Record<string, string> {
+  return parseEnvOutput(raw);
+}
diff --git a/src/main/workers/fsListWorker.ts b/src/main/workers/fsListWorker.ts
deleted file mode 100644
index 49f005aa44..0000000000
--- a/src/main/workers/fsListWorker.ts
+++ /dev/null
@@ -1,119 +0,0 @@
-import { parentPort } from 'worker_threads';
-import * as fs from 'fs';
-import * as path from 'path';
-import { FsListItem, FsListWorkerResponse } from '../types/fsListWorker';
-import { DEFAULT_IGNORES } from '../utils/fsIgnores';
-import { safeStat } from '../utils/safeStat';
-
-type ListWorkerRequest = {
-  taskId: number;
-  root: string;
-  includeDirs: boolean;
-  recursive?: boolean;
-  maxEntries: number;
-  timeBudgetMs: number;
-  batchSize: number;
-};
-
-const yieldImmediate = () => new Promise<void>((resolve) => setImmediate(resolve));
-
-async function listFiles(request: ListWorkerRequest): Promise<FsListWorkerResponse> {
-  const items: FsListItem[] = [];
-  const stack: string[] = ['.'];
-  const start = Date.now();
-  const deadline = start + request.timeBudgetMs;
-  let truncated = false;
-  let reason: 'maxEntries' | 'timeBudget' | undefined;
-  let visited = 0;
-
-  while (stack.length > 0) {
-    if (items.length >= request.maxEntries) {
-      truncated = true;
-      reason = 'maxEntries';
-      break;
-    }
-    if (Date.now() >= deadline) {
-      truncated = true;
-      reason = 'timeBudget';
-      break;
-    }
-
-    const rel = stack.pop() as string;
-    const abs = path.join(request.root, rel);
-
-    const stat = safeStat(abs);
-    if (!stat) continue;
-
-    if (stat.isDirectory()) {
-      const name = path.basename(abs);
-      if (rel !== '.' && DEFAULT_IGNORES.has(name)) continue;
-
-      if (rel !== '.' && request.includeDirs) {
-        items.push({ path: rel, type: 'dir' });
-        if (items.length >= request.maxEntries) {
-          truncated = true;
-          reason = 'maxEntries';
-          break;
-        }
-      }
-
-      // If not recursive and we are deeper than root, don't scan children
-      if (request.recursive === false && rel !== '.') {
-        continue;
-      }
-
-      let entries: string[] = [];
-      try {
-        entries = fs.readdirSync(abs);
-      } catch {
-        continue;
-      }
-
-      for (let i = entries.length - 1; i >= 0; i--) {
-        const entry = entries[i];
-        if (DEFAULT_IGNORES.has(entry)) continue;
-        const nextRel = rel === '.' ? entry : path.join(rel, entry);
-        stack.push(nextRel);
-      }
-    } else if (stat.isFile()) {
-      items.push({ path: rel, type: 'file' });
-      if (items.length >= request.maxEntries) {
-        truncated = true;
-        reason = 'maxEntries';
-        break;
-      }
-    }
-
-    visited += 1;
-    if (visited % request.batchSize === 0) {
-      await yieldImmediate();
-    }
-  }
-
-  return {
-    taskId: request.taskId,
-    ok: true,
-    items,
-    truncated,
-    reason,
-    durationMs: Date.now() - start,
-  };
-}
-
-if (!parentPort) {
-  throw new Error('fsListWorker must be run as a worker thread');
-}
-
-parentPort.on('message', async (request: ListWorkerRequest) => {
-  try {
-    const result = await listFiles(request);
-    parentPort?.postMessage(result);
-  } catch (error) {
-    const message = error instanceof Error ? error.message : 'Unknown error';
-    parentPort?.postMessage({
-      taskId: request.taskId,
-      ok: false,
-      error: message,
-    });
-  }
-});
diff --git a/src/preload/index.ts b/src/preload/index.ts
new file mode 100644
index 0000000000..763cd01dec
--- /dev/null
+++ b/src/preload/index.ts
@@ -0,0 +1,21 @@
+import { contextBridge, ipcRenderer, webUtils } from 'electron';
+
+// Expose protected methods that allow the renderer process to use
+contextBridge.exposeInMainWorld('electronAPI', {
+  // Generic invoke for the typed RPC client (createRPCClient)
+  invoke: (channel: string, ...args: unknown[]) => ipcRenderer.invoke(channel, ...args),
+  // Generic event bridge for the typesafe event emitter (createEventEmitter)
+  eventSend: (channel: string, data: unknown) => ipcRenderer.send(channel, data),
+  eventOn: (channel: string, cb: (data: unknown) => void) => {
+    const wrapped = (_: Electron.IpcRendererEvent, data: unknown) => cb(data);
+    ipcRenderer.on(channel, wrapped);
+    return () => ipcRenderer.removeListener(channel, wrapped);
+  },
+  getPathForFile: (file: File) => {
+    try {
+      return webUtils.getPathForFile(file);
+    } catch {
+      return '';
+    }
+  },
+});
diff --git a/src/renderer/App.tsx b/src/renderer/App.tsx
index f7889a59b8..d8a70a7acc 100644
--- a/src/renderer/App.tsx
+++ b/src/renderer/App.tsx
@@ -1,52 +1,102 @@
-import { ThemeProvider } from './components/ThemeProvider';
-import ErrorBoundary from './components/ErrorBoundary';
-import { WelcomeScreen } from './views/Welcome';
-import { Workspace } from './views/Workspace';
-import { useLocalStorage } from './hooks/useLocalStorage';
-import { FIRST_LAUNCH_KEY } from './constants/layout';
-import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
-import { AppSettingsProvider } from './contexts/AppSettingsProvider';
-import { AppContextProvider } from './contexts/AppContextProvider';
-import { GithubContextProvider } from './contexts/GithubContextProvider';
-import { ProjectManagementProvider } from './contexts/ProjectManagementProvider';
-import { TaskManagementProvider } from './contexts/TaskManagementContext';
-import { ModalProvider } from './contexts/ModalProvider';
-
-const queryClient = new QueryClient();
+import { QueryClientProvider } from '@tanstack/react-query';
+import { useEffect, useState } from 'react';
+import { WelcomeScreen } from './app/welcome';
+import { Workspace } from './app/workspace';
+import { IntegrationsProvider } from './features/integrations/integrations-provider';
+import { Onboarding } from './features/onboarding/onboarding';
+import { useAccountSession } from './lib/hooks/useAccount';
+import { useLegacyPortStatus } from './lib/hooks/useLegacyPort';
+import { WorkspaceLayoutContextProvider } from './lib/layout/layout-provider';
+import { WorkspaceViewProvider } from './lib/layout/provider';
+import { ModalProvider } from './lib/modal/modal-provider';
+import { GithubContextProvider } from './lib/providers/github-context-provider';
+import { ThemeProvider } from './lib/providers/theme-provider';
+import { TerminalPoolProvider } from './lib/pty/pty-pool-provider';
+import { queryClient } from './lib/query-client';
+import { RightSidebarProvider } from './lib/ui/right-sidebar';
+import { TooltipProvider } from './lib/ui/tooltip';
 
-export function App() {
-  const [isFirstLaunch, setIsFirstLaunch] = useLocalStorage<boolean | number>(
-    FIRST_LAUNCH_KEY,
-    true
+export const HAS_SEEN_ONBOARDING = 'emdash:has-seen-onboarding:v1';
+
+type AppView = 'onboarding' | 'welcome' | 'workspace';
+type OnboardingStep = 'sign-in' | 'import';
+
+function AppContent() {
+  const [view, setView] = useState<AppView>(() =>
+    localStorage.getItem(HAS_SEEN_ONBOARDING) === 'true' ? 'workspace' : 'onboarding'
   );
 
-  const renderContent = () => {
-    // Handle legacy string value '1' from old implementation
-    const isFirstLaunchBool = isFirstLaunch === true || isFirstLaunch === 1;
+  const { data: session, isLoading: sessionLoading } = useAccountSession();
+  const { data: legacyStatus, isLoading: legacyLoading } = useLegacyPortStatus();
+
+  const isLoading = sessionLoading || legacyLoading;
+
+  // Computed once when queries first resolve while in onboarding. Never updated
+  // after that so query refetches mid-onboarding (e.g. legacyPortStatus after
+  // import completes) cannot shrink the step list and unmount active step components.
+  const [frozenSteps, setFrozenSteps] = useState<OnboardingStep[] | null>(null);
+
+  useEffect(() => {
+    if (!isLoading && view === 'onboarding' && frozenSteps === null) {
+      const computed: OnboardingStep[] = [];
+      if (!session?.isSignedIn) computed.push('sign-in');
+      const needsImport =
+        legacyStatus?.hasLegacyDb &&
+        legacyStatus.portStatus !== 'completed' &&
+        legacyStatus.portStatus !== 'no-legacy-file' &&
+        !legacyStatus.hasExistingData;
+      if (needsImport) computed.push('import');
+      setFrozenSteps(computed);
+    }
+  }, [view, isLoading, frozenSteps, session, legacyStatus]);
+
+  const stepsNeeded = frozenSteps ?? [];
+
+  const handleOnboardingComplete = () => {
+    localStorage.setItem(HAS_SEEN_ONBOARDING, 'true');
+    setView('welcome');
+  };
 
-    if (isFirstLaunchBool) {
-      return <WelcomeScreen onGetStarted={() => setIsFirstLaunch(false)} />;
+  const renderContent = () => {
+    if (isLoading || (view === 'onboarding' && frozenSteps === null)) {
+      return null;
+    }
+    if (view === 'onboarding' && stepsNeeded.length > 0) {
+      return <Onboarding steps={stepsNeeded} onComplete={handleOnboardingComplete} />;
     }
-    return <Workspace />;
+    return (
+      <>
+        <Workspace />
+        {view === 'welcome' && <WelcomeScreen onGetStarted={() => window.location.reload()} />}
+      </>
+    );
   };
 
   return (
-    <QueryClientProvider client={queryClient}>
+    <TooltipProvider delay={300}>
       <ModalProvider>
-        <AppContextProvider>
-          <GithubContextProvider>
-            <ProjectManagementProvider>
-              <TaskManagementProvider>
-                <AppSettingsProvider>
-                  <ThemeProvider>
-                    <ErrorBoundary>{renderContent()}</ErrorBoundary>
-                  </ThemeProvider>
-                </AppSettingsProvider>
-              </TaskManagementProvider>
-            </ProjectManagementProvider>
-          </GithubContextProvider>
-        </AppContextProvider>
+        <WorkspaceLayoutContextProvider>
+          <TerminalPoolProvider>
+            <GithubContextProvider>
+              <IntegrationsProvider>
+                <WorkspaceViewProvider>
+                  <RightSidebarProvider>
+                    <ThemeProvider>{renderContent()}</ThemeProvider>
+                  </RightSidebarProvider>
+                </WorkspaceViewProvider>
+              </IntegrationsProvider>
+            </GithubContextProvider>
+          </TerminalPoolProvider>
+        </WorkspaceLayoutContextProvider>
       </ModalProvider>
+    </TooltipProvider>
+  );
+}
+
+export function App() {
+  return (
+    <QueryClientProvider client={queryClient}>
+      <AppContent />
     </QueryClientProvider>
   );
 }
diff --git a/src/renderer/lib/PendingInjectionManager.ts b/src/renderer/_legacy/PendingInjectionManager.ts
similarity index 93%
rename from src/renderer/lib/PendingInjectionManager.ts
rename to src/renderer/_legacy/PendingInjectionManager.ts
index 92f82bd842..23bb00cb45 100644
--- a/src/renderer/lib/PendingInjectionManager.ts
+++ b/src/renderer/_legacy/PendingInjectionManager.ts
@@ -1,3 +1,5 @@
+import { log } from '@renderer/lib/logger';
+
 /**
  * PendingInjectionManager - Singleton for managing text to be prepended to the next terminal input
  *
@@ -55,7 +57,7 @@ class PendingInjectionManagerSingleton {
       try {
         callback();
       } catch (e) {
-        console.error('PendingInjectionManager: callback error', e);
+        log.error('PendingInjectionManager: callback error', e);
       }
     }
   }
@@ -86,7 +88,7 @@ class PendingInjectionManagerSingleton {
       try {
         listener();
       } catch (e) {
-        console.error('PendingInjectionManager: listener error', e);
+        log.error('PendingInjectionManager: listener error', e);
       }
     }
   }
diff --git a/src/renderer/_legacy/errorTracking.ts b/src/renderer/_legacy/errorTracking.ts
new file mode 100644
index 0000000000..33545df052
--- /dev/null
+++ b/src/renderer/_legacy/errorTracking.ts
@@ -0,0 +1,337 @@
+import type { TelemetryEventProperties } from '@shared/telemetry';
+import { log } from '@renderer/utils/logger';
+import { captureTelemetry } from '../utils/telemetryClient';
+
+interface ErrorContext {
+  // Component/UI context
+  component?: string;
+  action?: string;
+
+  // User interaction context
+  user_action?: string;
+
+  // Operation context
+  operation?: string;
+  endpoint?: string;
+
+  // Error classification
+  error_type?: string;
+  severity?: 'low' | 'medium' | 'high' | 'critical';
+
+  // Task/Project context
+  task_id?: string;
+  project_id?: string;
+  provider?: string;
+
+  // Additional debugging info
+  [key: string]: any;
+}
+
+class RendererErrorTracking {
+  private sessionErrors: number = 0;
+  private lastErrorTimestamp: number = 0;
+
+  /**
+   * Capture an exception in the renderer process
+   */
+  captureException(error: Error | unknown, context?: ErrorContext): void {
+    try {
+      // Rate limiting
+      const now = Date.now();
+      if (now - this.lastErrorTimestamp < 100) {
+        return; // Skip if error happened within 100ms
+      }
+      this.lastErrorTimestamp = now;
+      this.sessionErrors++;
+
+      // Build error object
+      const errorObj = error instanceof Error ? error : new Error(String(error));
+      const errorMessage = errorObj.message || 'Unknown error';
+      const errorStack = errorObj.stack || '';
+
+      // Determine severity if not provided
+      const severity = context?.severity || this.determineSeverity(errorMessage, context);
+
+      // Build error properties following PostHog's $exception format
+      const properties: Record<string, any> = {
+        // PostHog required fields for error tracking
+        $exception_message: errorMessage.slice(0, 500),
+        $exception_type: context?.error_type || this.classifyError(errorMessage),
+        $exception_stack_trace_raw: errorStack.slice(0, 2000),
+        $exception_fingerprint: `${context?.component || 'renderer'}_${context?.operation || context?.action || 'unknown'}_${this.classifyError(errorMessage)}`,
+
+        // Additional context
+        severity,
+
+        // Component/UI context
+        component: context?.component || 'renderer',
+        action: context?.action,
+        user_action: context?.user_action,
+
+        // Operation context
+        operation: context?.operation,
+        endpoint: context?.endpoint,
+
+        // Task/Project context
+        task_id: context?.task_id,
+        project_id: context?.project_id,
+        provider: context?.provider,
+
+        // Session info
+        session_errors: this.sessionErrors,
+        error_timestamp: new Date().toISOString(),
+
+        // Browser info
+        user_agent: navigator.userAgent,
+        viewport: `${window.innerWidth}x${window.innerHeight}`,
+
+        // Additional custom context
+        ...this.sanitizeContext(context),
+      };
+
+      // Filter out undefined/null values
+      const cleanProperties = Object.fromEntries(
+        Object.entries(properties).filter(([_, v]) => v !== undefined && v !== null)
+      ) as TelemetryEventProperties['$exception'];
+
+      // Send to main process as $exception event (required for PostHog error tracking)
+      this.sendToMainProcess('$exception', cleanProperties);
+
+      // Also log to console for debugging
+      log.error('[ErrorTracking]', errorMessage, {
+        severity,
+        component: context?.component,
+        action: context?.action,
+      });
+    } catch (trackingError) {
+      // Never let error tracking crash the renderer
+      log.warn('Failed to capture exception:', trackingError);
+    }
+  }
+
+  /**
+   * Capture a critical error that might affect app stability
+   */
+  captureCriticalError(error: Error | unknown, context?: ErrorContext): void {
+    this.captureException(error, {
+      ...context,
+      severity: 'critical',
+    });
+  }
+
+  /**
+   * Track API/network errors
+   */
+  captureApiError(
+    error: Error | unknown,
+    endpoint: string,
+    operation: string,
+    additionalContext?: Partial<ErrorContext>
+  ): void {
+    this.captureException(error, {
+      error_type: 'api_error',
+      severity: 'medium',
+      endpoint,
+      operation,
+      ...additionalContext,
+    });
+  }
+
+  /**
+   * Track component render errors
+   */
+  captureComponentError(
+    error: Error | unknown,
+    componentName: string,
+    additionalContext?: Partial<ErrorContext>
+  ): void {
+    this.captureException(error, {
+      error_type: 'render_error',
+      severity: 'high',
+      component: componentName,
+      ...additionalContext,
+    });
+  }
+
+  /**
+   * Track user action errors
+   */
+  captureUserActionError(
+    error: Error | unknown,
+    action: string,
+    additionalContext?: Partial<ErrorContext>
+  ): void {
+    this.captureException(error, {
+      error_type: 'user_action_error',
+      severity: 'medium',
+      user_action: action,
+      ...additionalContext,
+    });
+  }
+
+  // Private helper methods
+
+  private sendToMainProcess(
+    event: '$exception',
+    properties: TelemetryEventProperties['$exception']
+  ): void {
+    captureTelemetry(event, properties);
+  }
+
+  private determineSeverity(
+    errorMessage: string,
+    context?: ErrorContext
+  ): ErrorContext['severity'] {
+    // Critical errors
+    if (
+      errorMessage.includes('FATAL') ||
+      errorMessage.includes('CRASH') ||
+      errorMessage.includes('Maximum update depth exceeded') ||
+      context?.error_type === 'render_error'
+    ) {
+      return 'critical';
+    }
+
+    // High severity
+    if (
+      errorMessage.includes('Cannot read') ||
+      errorMessage.includes('Cannot access') ||
+      errorMessage.includes('is not defined') ||
+      errorMessage.includes('Network request failed')
+    ) {
+      return 'high';
+    }
+
+    // Low severity
+    if (
+      errorMessage.includes('canceled') ||
+      errorMessage.includes('aborted') ||
+      errorMessage.includes('ResizeObserver')
+    ) {
+      return 'low';
+    }
+
+    return 'medium';
+  }
+
+  private classifyError(errorMessage: string): string {
+    if (
+      errorMessage.includes('fetch') ||
+      errorMessage.includes('network') ||
+      errorMessage.includes('API')
+    ) {
+      return 'network_error';
+    }
+    if (
+      errorMessage.includes('render') ||
+      errorMessage.includes('component') ||
+      errorMessage.includes('React')
+    ) {
+      return 'render_error';
+    }
+    if (
+      errorMessage.includes('TypeError') ||
+      errorMessage.includes('undefined') ||
+      errorMessage.includes('null')
+    ) {
+      return 'type_error';
+    }
+    if (errorMessage.includes('ReferenceError')) {
+      return 'reference_error';
+    }
+    if (errorMessage.includes('SyntaxError')) {
+      return 'syntax_error';
+    }
+    return 'unknown_error';
+  }
+
+  private sanitizeContext(context?: ErrorContext): Record<string, any> {
+    if (!context) return {};
+
+    const sanitized: Record<string, any> = {};
+    const sensitiveKeys = ['password', 'token', 'secret', 'key', 'auth'];
+    const skipKeys = [
+      'severity',
+      'component',
+      'action',
+      'user_action',
+      'operation',
+      'endpoint',
+      'error_type',
+    ];
+
+    for (const [key, value] of Object.entries(context)) {
+      // Skip already processed or sensitive keys
+      if (skipKeys.includes(key)) continue;
+      if (sensitiveKeys.some((sensitive) => key.toLowerCase().includes(sensitive))) continue;
+
+      // Sanitize value
+      if (typeof value === 'string') {
+        sanitized[key] = value.slice(0, 200);
+      } else if (typeof value === 'number' || typeof value === 'boolean') {
+        sanitized[key] = value;
+      } else if (value === null || value === undefined) {
+        // Skip null/undefined
+      } else {
+        // Convert objects to string with limit
+        try {
+          sanitized[key] = JSON.stringify(value).slice(0, 200);
+        } catch {
+          // Skip if can't stringify
+        }
+      }
+    }
+
+    return sanitized;
+  }
+}
+
+// Export singleton instance
+export const errorTracking = new RendererErrorTracking();
+
+// Export convenience functions
+export function captureException(error: Error | unknown, context?: ErrorContext) {
+  errorTracking.captureException(error, context);
+}
+
+export function captureApiError(
+  error: Error | unknown,
+  endpoint: string,
+  operation: string,
+  context?: Partial<ErrorContext>
+) {
+  errorTracking.captureApiError(error, endpoint, operation, context);
+}
+
+export function captureComponentError(
+  error: Error | unknown,
+  componentName: string,
+  context?: Partial<ErrorContext>
+) {
+  errorTracking.captureComponentError(error, componentName, context);
+}
+
+// Set up global error handlers
+if (typeof window !== 'undefined') {
+  // Catch unhandled errors
+  window.addEventListener('error', (event) => {
+    errorTracking.captureException(event.error || new Error(event.message), {
+      error_type: 'unhandled_error',
+      severity: 'critical',
+      component: 'global',
+      filename: event.filename,
+      lineno: event.lineno,
+      colno: event.colno,
+    });
+  });
+
+  // Catch unhandled promise rejections
+  window.addEventListener('unhandledrejection', (event) => {
+    errorTracking.captureException(event.reason || new Error('Unhandled Promise Rejection'), {
+      error_type: 'unhandled_rejection',
+      severity: 'high',
+      component: 'global',
+      promise: event.promise,
+    });
+  });
+}
diff --git a/src/renderer/lib/planRules.ts b/src/renderer/_legacy/planRules.ts
similarity index 100%
rename from src/renderer/lib/planRules.ts
rename to src/renderer/_legacy/planRules.ts
diff --git a/src/renderer/hooks/useIsMonochrome.ts b/src/renderer/_legacy/useIsMonochrome.ts
similarity index 97%
rename from src/renderer/hooks/useIsMonochrome.ts
rename to src/renderer/_legacy/useIsMonochrome.ts
index 1d730bb736..499db6b315 100644
--- a/src/renderer/hooks/useIsMonochrome.ts
+++ b/src/renderer/_legacy/useIsMonochrome.ts
@@ -1,4 +1,4 @@
-import { useState, useEffect, useRef } from 'react';
+import { useEffect, useRef, useState } from 'react';
 
 const SAMPLE_SIZE = 32;
 const COLOR_THRESHOLD = 30;
diff --git a/src/renderer/hooks/useTerminalSelection.ts b/src/renderer/_legacy/useTerminalSelection.ts
similarity index 98%
rename from src/renderer/hooks/useTerminalSelection.ts
rename to src/renderer/_legacy/useTerminalSelection.ts
index dce162221d..2ecdc3c65a 100644
--- a/src/renderer/hooks/useTerminalSelection.ts
+++ b/src/renderer/_legacy/useTerminalSelection.ts
@@ -1,4 +1,4 @@
-import { useState, useEffect, useRef, useCallback } from 'react';
+import { useCallback, useEffect, useRef, useState } from 'react';
 
 type SelectedMode = 'task' | 'global' | 'lifecycle';
 type LifecyclePhase = 'setup' | 'run' | 'teardown';
diff --git a/src/renderer/app/home-view.tsx b/src/renderer/app/home-view.tsx
new file mode 100644
index 0000000000..523ba5c4fd
--- /dev/null
+++ b/src/renderer/app/home-view.tsx
@@ -0,0 +1,113 @@
+import { FolderOpen, Github, Plus, Server, type LucideIcon } from 'lucide-react';
+import emdashLogoWhite from '@/assets/images/emdash/emdash_logo_white.svg';
+import emdashLogo from '@/assets/images/emdash/emdash_logo.svg';
+import { Titlebar } from '@renderer/lib/components/titlebar/Titlebar';
+import { useTheme } from '@renderer/lib/hooks/useTheme';
+import { useShowModal } from '@renderer/lib/modal/modal-provider';
+
+const PROJECT_ACTIONS = [
+  {
+    label: 'Open project',
+    icon: FolderOpen,
+    modalArgs: { strategy: 'local', mode: 'pick' },
+  },
+  {
+    label: 'Create New Project',
+    icon: Plus,
+    modalArgs: { strategy: 'local', mode: 'new' },
+  },
+  {
+    label: 'Clone from GitHub',
+    icon: Github,
+    modalArgs: { strategy: 'local', mode: 'clone' },
+  },
+  {
+    label: 'Add Remote Project',
+    icon: Server,
+    modalArgs: { strategy: 'ssh', mode: 'pick' },
+  },
+] as const;
+
+export function HomeTitlebar() {
+  return <Titlebar />;
+}
+
+export function HomeMainPanel() {
+  const { effectiveTheme } = useTheme();
+  const showAddProjectModal = useShowModal('addProjectModal');
+
+  return (
+    <div className="flex h-full flex-col overflow-y-auto bg-background text-foreground">
+      <div className="container mx-auto flex min-h-full max-w-6xl flex-1 flex-col justify-center px-8 py-8">
+        <div className="mb-3 text-center">
+          <div className="mb-3 flex items-center justify-center">
+            <div className="logo-shimmer-container">
+              <img
+                key={effectiveTheme}
+                src={effectiveTheme === 'emdark' ? emdashLogoWhite : emdashLogo}
+                alt="Emdash"
+                className="logo-shimmer-image"
+              />
+              <span
+                className="logo-shimmer-overlay"
+                aria-hidden="true"
+                style={{
+                  WebkitMaskImage: `url(${effectiveTheme === 'emdark' ? emdashLogoWhite : emdashLogo})`,
+                  maskImage: `url(${effectiveTheme === 'emdark' ? emdashLogoWhite : emdashLogo})`,
+                  WebkitMaskRepeat: 'no-repeat',
+                  maskRepeat: 'no-repeat',
+                  WebkitMaskSize: 'contain',
+                  maskSize: 'contain',
+                  WebkitMaskPosition: 'center',
+                  maskPosition: 'center',
+                }}
+              />
+            </div>
+          </div>
+          <p className="whitespace-nowrap text-xs text-muted-foreground">
+            Agentic Development Environment
+          </p>
+        </div>
+        <div className="mx-auto mt-4 grid w-full max-w-[600px] grid-cols-2 gap-2 sm:grid-cols-[repeat(4,minmax(132px,1fr))]">
+          {PROJECT_ACTIONS.map((action) => (
+            <HomeProjectAction
+              key={action.label}
+              label={action.label}
+              icon={action.icon}
+              onClick={() => showAddProjectModal(action.modalArgs)}
+            />
+          ))}
+        </div>
+      </div>
+    </div>
+  );
+}
+
+function HomeProjectAction({
+  label,
+  icon: Icon,
+  onClick,
+}: {
+  label: string;
+  icon: LucideIcon;
+  onClick: () => void;
+}) {
+  return (
+    <button
+      type="button"
+      aria-label={label}
+      onClick={onClick}
+      className="group flex h-[68px] w-full flex-col items-start rounded-md border border-border/80 bg-background px-3.5 py-3 text-left shadow-sm transition-all hover:border-border-1 hover:bg-background-1 hover:shadow-md focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 focus-visible:ring-offset-background"
+    >
+      <Icon className="size-4 text-foreground-muted transition-colors group-hover:text-foreground" />
+      <span className="mt-auto whitespace-nowrap pt-4 text-[11px] font-semibold leading-none tracking-normal text-foreground">
+        {label}
+      </span>
+    </button>
+  );
+}
+
+export const homeView = {
+  TitlebarSlot: HomeTitlebar,
+  MainPanel: HomeMainPanel,
+};
diff --git a/src/renderer/app/modal-registry.ts b/src/renderer/app/modal-registry.ts
new file mode 100644
index 0000000000..c4d40e9730
--- /dev/null
+++ b/src/renderer/app/modal-registry.ts
@@ -0,0 +1,49 @@
+import { IntegrationSetupModal } from '@renderer/features/integrations/integration-setup-modal';
+import { McpModal } from '@renderer/features/mcp/components/McpModal';
+import { AddProjectModal } from '@renderer/features/projects/components/add-project-modal/add-project-modal';
+import { CreateSkillModal } from '@renderer/features/skills/components/CreateSkillModal';
+import { AddRemoteModal } from '@renderer/features/tasks/add-remote-modal';
+import { CreateConversationModal } from '@renderer/features/tasks/conversations/create-conversation-modal';
+import { CreateTaskModal } from '@renderer/features/tasks/create-task-modal/create-task-modal';
+import { CreatePrModal } from '@renderer/features/tasks/diff-view/changes-panel/components/pr-entry/create-pr-modal';
+import { ConflictDialog } from '@renderer/features/tasks/editor/conflict-dialog';
+import { RenameTaskModal } from '@renderer/features/tasks/rename-task-modal';
+import { AddSshConnModal } from '@renderer/lib/components/add-ssh-conn-modal';
+import { ChangeProjectConnectionModal } from '@renderer/lib/components/change-project-connection-modal';
+import { ConfirmActionDialog } from '@renderer/lib/components/confirm-action-dialog';
+import { FeedbackModal } from '@renderer/lib/components/feedback-modal/feedback-modal';
+import { GithubDeviceFlowModalOverlay } from '@renderer/lib/components/github-device-flow-modal';
+import { ModalComponent } from '@renderer/lib/modal/modal-provider';
+
+export type ModalSize = 'xs' | 'sm' | 'md' | 'lg';
+
+export type ModalRegistryEntry = {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  component: ModalComponent<any, any>;
+  size?: ModalSize;
+};
+
+export function createModal<TProps, TResult>(
+  component: ModalComponent<TProps, TResult>,
+  config: Omit<ModalRegistryEntry, 'component'> = {}
+): ModalRegistryEntry {
+  return { component, ...config };
+}
+
+export const modalRegistry = {
+  taskModal: createModal(CreateTaskModal),
+  addProjectModal: createModal(AddProjectModal),
+  addSshConnModal: createModal(AddSshConnModal),
+  changeProjectConnectionModal: createModal(ChangeProjectConnectionModal, { size: 'sm' }),
+  githubDeviceFlowModal: createModal(GithubDeviceFlowModalOverlay, { size: 'md' }),
+  confirmActionModal: createModal(ConfirmActionDialog, { size: 'xs' }),
+  createConversationModal: createModal(CreateConversationModal),
+  feedbackModal: createModal(FeedbackModal),
+  mcpServerModal: createModal(McpModal),
+  createSkillModal: createModal(CreateSkillModal),
+  conflictDialog: createModal(ConflictDialog, { size: 'sm' }),
+  createPrModal: createModal(CreatePrModal, { size: 'md' }),
+  renameTaskModal: createModal(RenameTaskModal, { size: 'xs' }),
+  integrationSetupModal: createModal(IntegrationSetupModal, { size: 'md' }),
+  addRemoteModal: createModal(AddRemoteModal),
+} satisfies Record<string, ModalRegistryEntry>;
diff --git a/src/renderer/app/view-registry.ts b/src/renderer/app/view-registry.ts
new file mode 100644
index 0000000000..1fe7b8c1e3
--- /dev/null
+++ b/src/renderer/app/view-registry.ts
@@ -0,0 +1,35 @@
+import type { ComponentType, ReactNode } from 'react';
+import { homeView } from '@renderer/app/home-view';
+import { mcpView } from '@renderer/features/mcp/mcp-view';
+import { projectView } from '@renderer/features/projects/view';
+import { settingsView } from '@renderer/features/settings/settings-view';
+import { skillsView } from '@renderer/features/skills/skills-view';
+import { taskView } from '@renderer/features/tasks/view';
+
+// Define views here so we can use them in the navigate function
+export const views = {
+  home: homeView,
+  skills: skillsView,
+  mcp: mcpView,
+  project: projectView,
+  task: taskView,
+  settings: settingsView,
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+} satisfies Record<string, ViewDefinition<any>>;
+
+export type ViewDefinition<TParams extends object = Record<never, never>> = {
+  WrapView?: ComponentType<{ children: ReactNode } & TParams>;
+  TitlebarSlot?: ComponentType;
+  MainPanel: ComponentType;
+  RightPanel?: ComponentType;
+};
+
+type Views = typeof views;
+
+export type ViewId = keyof Views;
+
+export type WrapParams<TId extends ViewId> = Views[TId] extends {
+  WrapView: ComponentType<infer P>;
+}
+  ? Omit<P, 'children'>
+  : Record<never, never>;
diff --git a/src/renderer/app/welcome.tsx b/src/renderer/app/welcome.tsx
new file mode 100644
index 0000000000..22928dbdc7
--- /dev/null
+++ b/src/renderer/app/welcome.tsx
@@ -0,0 +1,93 @@
+import { motion, type Variants } from 'framer-motion';
+import IconLight from '@/assets/images/emdash/icon-light.png';
+import YTBanner from '@/assets/images/ytbanner.png';
+import { useTheme } from '@renderer/lib/hooks/useTheme';
+import { Button } from '@renderer/lib/ui/button';
+
+interface WelcomeScreenProps {
+  onGetStarted: () => void;
+}
+
+export function WelcomeScreen({ onGetStarted }: WelcomeScreenProps) {
+  const { effectiveTheme } = useTheme();
+
+  const containerVariants: Variants = {
+    hidden: { opacity: 0 },
+    visible: {
+      opacity: 1,
+      transition: {
+        staggerChildren: 0.3,
+        delayChildren: 0.7,
+      },
+    },
+  };
+
+  const itemVariants: Variants = {
+    hidden: { opacity: 0, y: 20 },
+    visible: {
+      opacity: 1,
+      y: 0,
+      transition: {
+        duration: 0.9,
+        ease: [0.25, 0.1, 0.25, 1] as [number, number, number, number], // Properly typed cubic-bezier
+      },
+    },
+  };
+
+  return (
+    <div className="fixed inset-0 z-50 flex items-center justify-center bg-background">
+      <div className="absolute bottom-0 left-0 right-0 h-3/5">
+        <div
+          className="absolute inset-0 opacity-40"
+          style={{
+            backgroundImage: `url(${YTBanner})`,
+            backgroundSize: 'cover',
+            backgroundPosition: 'center top',
+            maskImage:
+              'linear-gradient(to bottom, transparent 0%, transparent 30%, rgba(0,0,0,0.4) 60%, rgba(0,0,0,0.8) 100%)',
+            WebkitMaskImage:
+              'linear-gradient(to bottom, transparent 0%, transparent 30%, rgba(0,0,0,0.4) 60%, rgba(0,0,0,0.8) 100%)',
+          }}
+        />
+      </div>
+
+      <motion.div
+        className="relative z-10 flex flex-col items-center justify-center space-y-4 p-8"
+        variants={containerVariants}
+        initial="hidden"
+        animate="visible"
+      >
+        <motion.div
+          className="rounded-md border border-border/40 bg-white p-1.5 shadow-lg shadow-black/5 ring-1 ring-black/5 dark:shadow-white/5 dark:ring-white/10"
+          variants={itemVariants}
+        >
+          <img src={IconLight} alt="Emdash" className="h-12 w-12 rounded-sm" />
+        </motion.div>
+
+        <motion.h1
+          className="text-lg font-semibold tracking-tight text-foreground"
+          variants={itemVariants}
+        >
+          Welcome.
+        </motion.h1>
+
+        <motion.div
+          variants={itemVariants}
+          whileHover={{ scale: 1.02 }}
+          whileTap={{ scale: 0.97 }}
+          transition={{ duration: 0.1, ease: 'easeInOut' }}
+        >
+          <Button
+            onClick={onGetStarted}
+            size="sm"
+            className={
+              effectiveTheme === 'emdark' ? 'bg-gray-200 text-gray-900 hover:bg-gray-300' : ''
+            }
+          >
+            Start shipping
+          </Button>
+        </motion.div>
+      </motion.div>
+    </div>
+  );
+}
diff --git a/src/renderer/app/workspace.tsx b/src/renderer/app/workspace.tsx
new file mode 100644
index 0000000000..a84856a543
--- /dev/null
+++ b/src/renderer/app/workspace.tsx
@@ -0,0 +1,45 @@
+import { LeftSidebar } from '@renderer/features/sidebar/left-sidebar';
+import { AppKeyboardShortcuts } from '@renderer/lib/components/app-keyboard-shortcuts';
+import { useTheme } from '@renderer/lib/hooks/useTheme';
+import {
+  useViewLayoutOverride,
+  useWorkspaceSlots,
+  useWorkspaceWrapParams,
+} from '@renderer/lib/layout/navigation-provider';
+import { WorkspaceContentLayout, WorkspaceLayout } from '@renderer/lib/layout/workspace-layout';
+import { ModalRenderer } from '@renderer/lib/modal/modal-renderer';
+import { Toaster } from '@renderer/lib/ui/toaster';
+
+export function Workspace() {
+  useTheme();
+  const { WrapView } = useWorkspaceSlots();
+  const { wrapParams } = useWorkspaceWrapParams();
+  return (
+    <>
+      <AppKeyboardShortcuts />
+      <WorkspaceLayout
+        leftSidebar={<LeftSidebar />}
+        mainContent={
+          <WrapView {...wrapParams}>
+            <ModalRenderer />
+            <WorkspaceViewContent />
+          </WrapView>
+        }
+      />
+      <Toaster />
+    </>
+  );
+}
+
+function WorkspaceViewContent() {
+  const { TitlebarSlot, MainPanel, RightPanel } = useWorkspaceSlots();
+  const { hideRightPanel } = useViewLayoutOverride();
+  const EffectiveRightPanel = hideRightPanel ? null : RightPanel;
+  return (
+    <WorkspaceContentLayout
+      titlebarSlot={<TitlebarSlot />}
+      mainPanel={<MainPanel />}
+      rightPanel={EffectiveRightPanel ? <EffectiveRightPanel /> : null}
+    />
+  );
+}
diff --git a/src/renderer/components/AgentDropdown.tsx b/src/renderer/components/AgentDropdown.tsx
deleted file mode 100644
index debddbbea5..0000000000
--- a/src/renderer/components/AgentDropdown.tsx
+++ /dev/null
@@ -1,57 +0,0 @@
-import React from 'react';
-import { Select, SelectTrigger, SelectValue, SelectContent, SelectItem } from './ui/select';
-import { type Agent } from '../types';
-import { agentConfig } from '../lib/agentConfig';
-import AgentLogo from './AgentLogo';
-
-interface AgentDropdownProps {
-  value: Agent;
-  onChange: (agent: Agent) => void;
-  installedAgents: string[];
-  disabledAgents?: string[];
-  className?: string;
-}
-
-export const AgentDropdown: React.FC<AgentDropdownProps> = ({
-  value,
-  onChange,
-  installedAgents,
-  disabledAgents = [],
-  className = '',
-}) => {
-  const installedSet = new Set(installedAgents);
-  return (
-    <Select value={value} onValueChange={(v) => onChange(v as Agent)}>
-      <SelectTrigger className={`h-9 w-full border-none bg-muted ${className}`}>
-        <SelectValue placeholder="Select agent" />
-      </SelectTrigger>
-      <SelectContent side="top" className="z-[120]">
-        {Object.entries(agentConfig)
-          .filter(([key]) => installedSet.has(key))
-          .map(([key, config]) => {
-            const isDisabled = disabledAgents.includes(key);
-            return (
-              <SelectItem key={key} value={key} disabled={isDisabled}>
-                <div className="flex items-center gap-2">
-                  <AgentLogo
-                    logo={config.logo}
-                    alt={config.alt}
-                    isSvg={config.isSvg}
-                    invertInDark={config.invertInDark}
-                    className="h-4 w-4 rounded-sm"
-                    grayscale={isDisabled}
-                  />
-                  <span className={isDisabled ? 'text-muted-foreground' : ''}>
-                    {config.name}
-                    {isDisabled && <span className="ml-1 text-xs">(in use)</span>}
-                  </span>
-                </div>
-              </SelectItem>
-            );
-          })}
-      </SelectContent>
-    </Select>
-  );
-};
-
-export default AgentDropdown;
diff --git a/src/renderer/components/AgentInfoCard.tsx b/src/renderer/components/AgentInfoCard.tsx
deleted file mode 100644
index bc2a0ee03e..0000000000
--- a/src/renderer/components/AgentInfoCard.tsx
+++ /dev/null
@@ -1,254 +0,0 @@
-import React, { useEffect, useRef, useState } from 'react';
-import { type UiAgent } from '@/providers/meta';
-import { agentAssets } from '@/providers/assets';
-import AgentLogo from './AgentLogo';
-import { ArrowUpRight, Check, Copy } from 'lucide-react';
-import { Button } from './ui/button';
-import { getDocUrlForProvider, getInstallCommandForProvider } from '@shared/providers/registry';
-
-export type AgentInfo = {
-  title: string;
-  description?: string;
-  knowledgeCutoff?: string;
-  hostingNote?: string;
-  image?: string;
-  installCommand?: string;
-};
-
-export const agentInfo: Record<UiAgent, AgentInfo> = {
-  codex: {
-    title: 'Codex',
-    description:
-      'CLI that connects to OpenAI models for project-aware code assistance and terminal workflows.',
-  },
-  claude: {
-    title: 'Claude Code',
-    description:
-      'CLI that uses Anthropic Claude for code edits, explanations, and structured refactors in the terminal.',
-  },
-  qwen: {
-    title: 'Qwen Code',
-    description:
-      "Command-line interface to Alibaba's Qwen Code models for coding assistance and code completion.",
-  },
-  droid: {
-    title: 'Droid',
-    description: "Factory AI's agent CLI for running multi-step coding tasks from the terminal.",
-  },
-  gemini: {
-    title: 'Gemini',
-    description:
-      'CLI that uses Google Gemini models to assist with coding, reasoning, and command-line tasks.',
-  },
-  cursor: {
-    title: 'Cursor',
-    description:
-      "Cursor's agent CLI; provides editor-style, project-aware assistance from the shell.",
-  },
-  copilot: {
-    title: 'GitHub Copilot',
-    description:
-      'GitHub Copilot CLI brings Copilot prompts to the terminal for code, shell, and search help.',
-  },
-  amp: {
-    title: 'Amp',
-    description:
-      'Amp Code CLI for agentic coding sessions against your repository from the terminal.',
-  },
-  opencode: {
-    title: 'OpenCode',
-    description:
-      'OpenCode CLI that interfaces with models for code generation and edits from the shell.',
-  },
-  charm: {
-    title: 'Charm',
-    description: 'Charm Crush agent CLI providing terminal-first AI assistance for coding tasks.',
-  },
-  auggie: {
-    title: 'Auggie',
-    description:
-      'Augment Code CLI to run an agent against your repository for code changes and reviews.',
-  },
-  goose: {
-    title: 'Goose',
-    description: 'Goose CLI that routes tasks to tools and models for coding workflows.',
-  },
-  kimi: {
-    title: 'Kimi',
-    description:
-      'Kimi CLI by Moonshot AI - a shell-like coding agent with raw shell execution, Zsh integration, ACP and MCP support (technical preview).',
-    hostingNote: 'macOS/Linux only; first run on macOS may take ~10s due to security checks.',
-  },
-  kilocode: {
-    title: 'Kilocode',
-    description:
-      'Kilo AI coding assistant with multiple modes (architect, code, debug, ask, orchestrator). Supports hundreds of models with bring-your-own-keys for OpenRouter and AI gateways. Features keyboard-first navigation and checkpoint management.',
-  },
-  kiro: {
-    title: 'Kiro',
-    description:
-      'Kiro CLI by Amazon Web Services - interactive, terminal-first AI development assistant with MCP integrations and workflow automation.',
-  },
-  rovo: {
-    title: 'Rovo Dev',
-    description:
-      "Atlassian's Rovo Dev CLI brings an AI assistant to your terminal, integrated with Jira, Confluence, and Bitbucket via the Atlassian Command Line Interface (ACLI).",
-  },
-  cline: {
-    title: 'Cline',
-    description:
-      'Cline CLI runs AI coding agents directly in your terminal. Supports multiple model providers, runs multiple instances simultaneously for parallel development, and integrates into existing shell workflows.',
-  },
-  continue: {
-    title: 'Continue',
-    description:
-      'Continue CLI (cn) is a modular coding agent for the command line. Features battle-tested agent loop, customizable models and rules, MCP tool support, and both interactive and headless modes for automation.',
-  },
-  codebuff: {
-    title: 'Codebuff',
-    description:
-      'Codebuff is an AI coding agent that helps you with coding tasks. Install globally and start using it in your project directory to get AI-powered coding assistance.',
-  },
-  mistral: {
-    title: 'Mistral Vibe',
-    description:
-      'Mistral AI command-line coding assistant powered by Devstral. Provides conversational interface to your codebase with file manipulation, code search, version control, and execution tools.',
-  },
-  pi: {
-    title: 'Pi',
-    description:
-      'Minimal terminal coding agent by Mario Zechner. Supports 15+ providers and hundreds of models, tree-structured sessions, and TypeScript extensions for custom tools and sub-agents.',
-  },
-  autohand: {
-    title: 'Autohand Code',
-    description:
-      'Terminal coding agent with auto-commit, dry-run previews, community skills, and headless CI/CD mode. Supports multiple LLM providers and unrestricted auto-approve for hands-free operation.',
-  },
-};
-
-type Props = {
-  id: UiAgent;
-};
-
-export const AgentInfoCard: React.FC<Props> = ({ id }) => {
-  const info = agentInfo[id];
-  const asset = agentAssets[id];
-  const logo = asset.logo;
-  const brand = asset.name;
-  const installCommand =
-    info.installCommand ?? getInstallCommandForProvider(id) ?? 'npm install -g @openai/codex';
-  const [copied, setCopied] = useState(false);
-  const copyResetRef = useRef<number | null>(null);
-
-  useEffect(() => {
-    return () => {
-      if (copyResetRef.current !== null) {
-        window.clearTimeout(copyResetRef.current);
-      }
-    };
-  }, []);
-
-  const handleCopyClick = async () => {
-    if (typeof navigator === 'undefined' || !navigator.clipboard) {
-      return;
-    }
-    const { clipboard } = navigator;
-    if (typeof clipboard.writeText !== 'function') {
-      return;
-    }
-    try {
-      await clipboard.writeText(installCommand);
-      setCopied(true);
-      if (copyResetRef.current !== null) {
-        window.clearTimeout(copyResetRef.current);
-      }
-      copyResetRef.current = window.setTimeout(() => {
-        setCopied(false);
-        copyResetRef.current = null;
-      }, 2000);
-    } catch (error) {
-      console.error('Failed to copy install command', error);
-      setCopied(false);
-    }
-  };
-
-  const CopyIndicatorIcon = copied ? Check : Copy;
-  return (
-    <div className="w-80 max-w-[20rem] rounded-lg bg-background p-3 text-foreground shadow-sm">
-      <div className="mb-2 flex items-center gap-2">
-        {logo ? (
-          <AgentLogo
-            logo={logo}
-            alt={brand}
-            isSvg={asset.isSvg}
-            invertInDark={asset.invertInDark}
-            className="h-5 w-5 rounded-sm"
-          />
-        ) : null}
-        <div className="flex items-baseline gap-1 text-sm leading-none">
-          <span className="text-muted-foreground">{brand}</span>
-          <span className="text-muted-foreground">/</span>
-          <strong className="font-semibold text-foreground">{info.title}</strong>
-        </div>
-      </div>
-      {info.description ? (
-        <p className="mb-2 text-xs text-muted-foreground">{info.description}</p>
-      ) : null}
-      {getDocUrlForProvider(id) ? (
-        <div className="mb-2">
-          <a
-            href={getDocUrlForProvider(id) ?? ''}
-            target="_blank"
-            rel="noreferrer noopener"
-            className="inline-flex items-center gap-1 rounded-md border px-2 py-1 text-xs text-foreground hover:underline"
-          >
-            <span>Docs</span>
-            <ArrowUpRight className="h-3.5 w-3.5" aria-hidden="true" />
-          </a>
-        </div>
-      ) : null}
-      <div className="mb-2">
-        <a
-          href="https://artificialanalysis.ai/insights/coding-agents-comparison"
-          target="_blank"
-          rel="noreferrer noopener"
-          className="inline-flex items-center gap-1 rounded-md border px-2 py-1 text-xs text-foreground hover:underline"
-        >
-          <span>Compare agents</span>
-          <ArrowUpRight className="h-3.5 w-3.5" aria-hidden="true" />
-        </a>
-      </div>
-      <div className="mb-2 flex h-7 items-center justify-between rounded-md border px-2 text-xs text-foreground">
-        <code className="max-w-[calc(100%-2.5rem)] truncate font-mono text-tiny leading-none">
-          {installCommand}
-        </code>
-        <Button
-          variant="ghost"
-          size="icon-sm"
-          onClick={() => {
-            void handleCopyClick();
-          }}
-          className="ml-2 text-muted-foreground"
-          aria-label={`Copy install command for ${info.title}`}
-          title={copied ? 'Copied' : 'Copy command'}
-        >
-          <CopyIndicatorIcon className="h-3.5 w-3.5" aria-hidden="true" />
-        </Button>
-      </div>
-      {info.knowledgeCutoff || info.hostingNote ? (
-        <div className="mt-2 space-y-1">
-          {info.knowledgeCutoff ? (
-            <div className="text-tiny text-muted-foreground">
-              Knowledge cutoff: {info.knowledgeCutoff}
-            </div>
-          ) : null}
-          {info.hostingNote ? (
-            <div className="text-tiny text-muted-foreground">{info.hostingNote}</div>
-          ) : null}
-        </div>
-      ) : null}
-    </div>
-  );
-};
-
-export default AgentInfoCard;
diff --git a/src/renderer/components/AgentLogo.tsx b/src/renderer/components/AgentLogo.tsx
deleted file mode 100644
index 9cb253db09..0000000000
--- a/src/renderer/components/AgentLogo.tsx
+++ /dev/null
@@ -1,53 +0,0 @@
-import React from 'react';
-import { useTheme } from '../hooks/useTheme';
-
-interface AgentLogoProps {
-  logo: string;
-  alt: string;
-  isSvg?: boolean;
-  invertInDark?: boolean;
-  className?: string;
-  grayscale?: boolean;
-}
-
-/** Renders an agent logo — handles both raw SVG strings and image URLs with theme awareness. */
-const AgentLogo: React.FC<AgentLogoProps> = ({
-  logo,
-  alt,
-  isSvg,
-  invertInDark,
-  className = 'h-4 w-4',
-  grayscale,
-}) => {
-  const { effectiveTheme } = useTheme();
-  const isDark = effectiveTheme === 'dark' || effectiveTheme === 'dark-black';
-
-  const resolvedIsSvg = isSvg ?? logo.trimStart().startsWith('<svg');
-
-  if (resolvedIsSvg) {
-    const processed = isDark
-      ? logo
-          .replace(/\bfill="[^"]*"/g, 'fill="currentColor"')
-          .replace(/\bstroke="[^"]*"/g, 'stroke="currentColor"')
-      : logo;
-
-    return (
-      <span
-        role="img"
-        aria-label={alt}
-        className={`inline-flex shrink-0 items-center justify-center [&_svg]:h-full [&_svg]:w-full [&_svg]:shrink-0 ${isDark ? 'text-primary' : ''} ${grayscale ? 'grayscale' : ''} ${className}`}
-        dangerouslySetInnerHTML={{ __html: processed }}
-      />
-    );
-  }
-
-  return (
-    <img
-      src={logo}
-      alt={alt}
-      className={`shrink-0 object-contain ${invertInDark ? 'dark:invert' : ''} ${grayscale ? 'grayscale' : ''} ${className}`}
-    />
-  );
-};
-
-export default AgentLogo;
diff --git a/src/renderer/components/AgentRow.tsx b/src/renderer/components/AgentRow.tsx
deleted file mode 100644
index 78f86c855c..0000000000
--- a/src/renderer/components/AgentRow.tsx
+++ /dev/null
@@ -1,30 +0,0 @@
-import React from 'react';
-import type { LucideIcon } from 'lucide-react';
-
-interface AgentRowProps {
-  icon: LucideIcon;
-  label: string;
-  detail?: string | null;
-  middle: React.ReactNode;
-  right: React.ReactNode;
-}
-
-const AgentRow: React.FC<AgentRowProps> = ({ icon: Icon, label, detail, middle, right }) => {
-  return (
-    <div className="grid grid-cols-12 items-center gap-4 rounded-xl border border-border/60 bg-background px-4 py-3 transition hover:bg-muted/40">
-      <div className="col-span-12 flex items-center gap-3 sm:col-span-4">
-        <span className="flex h-10 w-10 items-center justify-center rounded-full bg-muted text-muted-foreground">
-          <Icon className="h-5 w-5" aria-hidden="true" />
-        </span>
-        <div className="min-w-0">
-          <p className="truncate text-sm font-medium text-foreground">{label}</p>
-          {detail ? <p className="truncate text-xs text-muted-foreground">{detail}</p> : null}
-        </div>
-      </div>
-      <div className="col-span-12 sm:col-span-5">{middle}</div>
-      <div className="col-span-12 flex items-center justify-end gap-2 sm:col-span-3">{right}</div>
-    </div>
-  );
-};
-
-export default AgentRow;
diff --git a/src/renderer/components/AgentSelector.tsx b/src/renderer/components/AgentSelector.tsx
deleted file mode 100644
index 4aee42ef02..0000000000
--- a/src/renderer/components/AgentSelector.tsx
+++ /dev/null
@@ -1,157 +0,0 @@
-import React, { useState } from 'react';
-import { Select, SelectTrigger, SelectValue, SelectContent, SelectItem } from './ui/select';
-import { TooltipProvider, Tooltip, TooltipTrigger, TooltipContent } from './ui/tooltip';
-import { AgentInfoCard } from './AgentInfoCard';
-import RoutingInfoCard from './RoutingInfoCard';
-import { Workflow } from 'lucide-react';
-import { Badge } from './ui/badge';
-import type { UiAgent } from '@/providers/meta';
-import { type Agent } from '../types';
-import { agentConfig } from '../lib/agentConfig';
-import AgentLogo from './AgentLogo';
-
-interface AgentSelectorProps {
-  value: Agent;
-  onChange: (agent: Agent) => void;
-  disabled?: boolean;
-  className?: string;
-}
-
-export const AgentSelector: React.FC<AgentSelectorProps> = ({
-  value,
-  onChange,
-  disabled = false,
-  className = '',
-}) => {
-  return (
-    <div className={`relative block w-[12rem] min-w-0 ${className}`}>
-      <Select
-        value={value}
-        onValueChange={(v) => {
-          if (!disabled) {
-            onChange(v as Agent);
-          }
-        }}
-        disabled={disabled}
-      >
-        {disabled ? (
-          <TooltipProvider delayDuration={250}>
-            <Tooltip>
-              <TooltipTrigger asChild>
-                <SelectTrigger
-                  aria-disabled
-                  className={`w-full ${disabled ? 'cursor-not-allowed opacity-60' : ''}`}
-                >
-                  <SelectValue placeholder="Select agent" />
-                </SelectTrigger>
-              </TooltipTrigger>
-              <TooltipContent>
-                <p>Agent is locked for this conversation.</p>
-              </TooltipContent>
-            </Tooltip>
-          </TooltipProvider>
-        ) : (
-          <SelectTrigger className="w-full">
-            <SelectValue placeholder="Select agent" />
-          </SelectTrigger>
-        )}
-        <SelectContent side="top" className="z-[120]">
-          <TooltipProvider delayDuration={150}>
-            {Object.entries(agentConfig).map(([key, config]) => (
-              <TooltipRow key={key} id={key as UiAgent}>
-                <SelectItem value={key}>
-                  <div className="flex items-center gap-2">
-                    <AgentLogo
-                      logo={config.logo}
-                      alt={config.alt}
-                      isSvg={config.isSvg}
-                      invertInDark={config.invertInDark}
-                      className="h-4 w-4 rounded-sm"
-                    />
-                    <span>{config.name}</span>
-                  </div>
-                </SelectItem>
-              </TooltipRow>
-            ))}
-            {false && (
-              <RoutingTooltipRow>
-                <SelectItem
-                  value="__routing__"
-                  onSelect={(e) => {
-                    e.preventDefault();
-                    e.stopPropagation();
-                  }}
-                >
-                  <div
-                    className="flex cursor-not-allowed items-center gap-2 opacity-70"
-                    aria-disabled
-                  >
-                    <Workflow className="h-4 w-4 text-foreground/70" aria-hidden="true" />
-                    <span className="mr-2">Routing</span>
-                    <Badge className="ml-1 text-micro">Soon</Badge>
-                  </div>
-                </SelectItem>
-              </RoutingTooltipRow>
-            )}
-          </TooltipProvider>
-        </SelectContent>
-      </Select>
-    </div>
-  );
-};
-
-const TooltipRow: React.FC<{ id: UiAgent; children: React.ReactElement }> = ({ id, children }) => {
-  const [open, setOpen] = useState(false);
-  return (
-    <Tooltip open={open}>
-      <TooltipTrigger asChild>
-        {React.cloneElement(children, {
-          onMouseEnter: () => setOpen(true),
-          onMouseLeave: () => setOpen(false),
-          onPointerEnter: () => setOpen(true),
-          onPointerLeave: () => setOpen(false),
-        })}
-      </TooltipTrigger>
-      <TooltipContent
-        side="right"
-        align="start"
-        className="border-foreground/20 bg-background p-0 text-foreground"
-        onMouseEnter={() => setOpen(true)}
-        onMouseLeave={() => setOpen(false)}
-        onPointerEnter={() => setOpen(true)}
-        onPointerLeave={() => setOpen(false)}
-      >
-        <AgentInfoCard id={id} />
-      </TooltipContent>
-    </Tooltip>
-  );
-};
-
-export default AgentSelector;
-
-export const RoutingTooltipRow: React.FC<{ children: React.ReactElement }> = ({ children }) => {
-  const [open, setOpen] = useState(false);
-  return (
-    <Tooltip open={open}>
-      <TooltipTrigger asChild>
-        {React.cloneElement(children, {
-          onMouseEnter: () => setOpen(true),
-          onMouseLeave: () => setOpen(false),
-          onPointerEnter: () => setOpen(true),
-          onPointerLeave: () => setOpen(false),
-        })}
-      </TooltipTrigger>
-      <TooltipContent
-        side="right"
-        align="start"
-        className="border-foreground/20 bg-background p-0 text-foreground"
-        onMouseEnter={() => setOpen(true)}
-        onMouseLeave={() => setOpen(false)}
-        onPointerEnter={() => setOpen(true)}
-        onPointerLeave={() => setOpen(false)}
-      >
-        <RoutingInfoCard />
-      </TooltipContent>
-    </Tooltip>
-  );
-};
diff --git a/src/renderer/components/AppKeyboardShortcuts.tsx b/src/renderer/components/AppKeyboardShortcuts.tsx
deleted file mode 100644
index 30f45d540a..0000000000
--- a/src/renderer/components/AppKeyboardShortcuts.tsx
+++ /dev/null
@@ -1,96 +0,0 @@
-import React from 'react';
-import { useSidebar } from '../components/ui/sidebar';
-import { useRightSidebar } from '../components/ui/right-sidebar';
-import { useTheme } from '../hooks/useTheme';
-import { useKeyboardShortcuts } from '../hooks/useKeyboardShortcuts';
-import { useKeyboardSettings } from '../contexts/KeyboardSettingsContext';
-import { useTaskManagementContext } from '../contexts/TaskManagementContext';
-
-export interface AppKeyboardShortcutsProps {
-  showCommandPalette: boolean;
-  showSettings: boolean;
-  showBrowser: boolean;
-  showDiffViewer: boolean;
-  showEditor: boolean;
-  showKanban: boolean;
-  handleToggleCommandPalette: () => void;
-  handleOpenSettings: () => void;
-  handleCloseCommandPalette: () => void;
-  handleCloseSettings: () => void;
-  handleCloseBrowser: () => void;
-  handleCloseDiffViewer: () => void;
-  handleCloseEditor: () => void;
-  handleCloseKanban: () => void;
-  handleToggleKanban: () => void;
-  handleToggleEditor: () => void;
-  handleOpenInEditor: () => void;
-}
-
-const AppKeyboardShortcuts: React.FC<AppKeyboardShortcutsProps> = ({
-  showCommandPalette,
-  showSettings,
-  showBrowser,
-  showDiffViewer,
-  showEditor,
-  showKanban,
-  handleToggleCommandPalette,
-  handleOpenSettings,
-  handleCloseCommandPalette,
-  handleCloseSettings,
-  handleCloseBrowser,
-  handleCloseDiffViewer,
-  handleCloseEditor,
-  handleCloseKanban,
-  handleToggleKanban,
-  handleToggleEditor,
-  handleOpenInEditor,
-}) => {
-  const { toggle: toggleLeftSidebar } = useSidebar();
-  const { toggle: toggleRightSidebar } = useRightSidebar();
-  const { toggleTheme } = useTheme();
-  const { settings: keyboardSettings } = useKeyboardSettings();
-  const { handleNextTask, handlePrevTask, handleNewTask } = useTaskManagementContext();
-
-  useKeyboardShortcuts({
-    onToggleCommandPalette: handleToggleCommandPalette,
-    onOpenSettings: handleOpenSettings,
-    onToggleLeftSidebar: toggleLeftSidebar,
-    onToggleRightSidebar: toggleRightSidebar,
-    onToggleTheme: toggleTheme,
-    onToggleKanban: handleToggleKanban,
-    onToggleEditor: handleToggleEditor,
-    onNextProject: handleNextTask,
-    onPrevProject: handlePrevTask,
-    onNewTask: handleNewTask,
-    onNextAgent: () =>
-      window.dispatchEvent(
-        new CustomEvent('emdash:switch-agent', { detail: { direction: 'next' } })
-      ),
-    onPrevAgent: () =>
-      window.dispatchEvent(
-        new CustomEvent('emdash:switch-agent', { detail: { direction: 'prev' } })
-      ),
-    onOpenInEditor: handleOpenInEditor,
-    onCloseModal: (
-      [
-        [showCommandPalette, handleCloseCommandPalette],
-        [showSettings, handleCloseSettings],
-        [showBrowser, handleCloseBrowser],
-        [showDiffViewer, handleCloseDiffViewer],
-        [showEditor, handleCloseEditor],
-        [showKanban, handleCloseKanban],
-      ] as const
-    ).find(([open]) => open)?.[1],
-    isCommandPaletteOpen: showCommandPalette,
-    isSettingsOpen: showSettings,
-    isBrowserOpen: showBrowser,
-    isDiffViewerOpen: showDiffViewer,
-    isEditorOpen: showEditor,
-    isKanbanOpen: showKanban,
-    customKeyboardSettings: keyboardSettings ?? undefined,
-  });
-
-  return null;
-};
-
-export default AppKeyboardShortcuts;
diff --git a/src/renderer/components/BaseBranchControls.tsx b/src/renderer/components/BaseBranchControls.tsx
deleted file mode 100644
index fe7bedecd0..0000000000
--- a/src/renderer/components/BaseBranchControls.tsx
+++ /dev/null
@@ -1,56 +0,0 @@
-import React from 'react';
-import BranchSelect, { type BranchOption } from './BranchSelect';
-import { Button } from './ui/button';
-import { GitBranch, Settings2 } from 'lucide-react';
-
-interface BaseBranchControlsProps {
-  baseBranch?: string;
-  branchOptions: BranchOption[];
-  isLoadingBranches: boolean;
-  isSavingBaseBranch: boolean;
-  onBaseBranchChange: (value: string) => void;
-  onOpenConfig?: () => void;
-}
-
-const BaseBranchControls: React.FC<BaseBranchControlsProps> = ({
-  baseBranch,
-  branchOptions,
-  isLoadingBranches,
-  isSavingBaseBranch,
-  onBaseBranchChange,
-  onOpenConfig,
-}) => {
-  const placeholder = isLoadingBranches
-    ? 'Loading...'
-    : branchOptions.length === 0
-      ? 'No branches found'
-      : 'Select a base branch';
-
-  return (
-    <div className="flex items-center gap-3">
-      <BranchSelect
-        value={baseBranch}
-        onValueChange={onBaseBranchChange}
-        options={branchOptions}
-        disabled={isSavingBaseBranch}
-        isLoading={isLoadingBranches}
-        placeholder={placeholder}
-        variant="default"
-        icon={<GitBranch className="h-3.5 w-3.5 shrink-0 text-muted-foreground" />}
-      />
-      <Button
-        type="button"
-        variant="outline"
-        size="sm"
-        className="h-8 gap-1.5 px-3 text-xs"
-        onClick={onOpenConfig}
-        disabled={!onOpenConfig}
-      >
-        <Settings2 className="h-3.5 w-3.5" />
-        Configuration
-      </Button>
-    </div>
-  );
-};
-
-export default BaseBranchControls;
diff --git a/src/renderer/components/BranchSelect.tsx b/src/renderer/components/BranchSelect.tsx
deleted file mode 100644
index 3a71fa1e12..0000000000
--- a/src/renderer/components/BranchSelect.tsx
+++ /dev/null
@@ -1,174 +0,0 @@
-import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
-import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from './ui/select';
-import { ScrollArea } from './ui/scroll-area';
-import { Input } from './ui/input';
-
-export type BranchOption = {
-  value: string;
-  label: string;
-};
-
-/**
- * Pick best default: preferredValue if valid, else origin/main > main > first option.
- */
-export function pickDefaultBranch(
-  options: BranchOption[],
-  preferredValue?: string
-): string | undefined {
-  if (options.length === 0) return undefined;
-
-  if (preferredValue && options.some((opt) => opt.value === preferredValue)) {
-    return preferredValue;
-  }
-
-  const defaults = ['origin/main', 'main', 'origin/master', 'master'];
-  for (const branch of defaults) {
-    if (options.some((opt) => opt.value === branch)) return branch;
-  }
-
-  return options[0].value;
-}
-
-type BranchSelectVariant = 'default' | 'ghost';
-
-interface BranchSelectProps {
-  value?: string;
-  onValueChange: (value: string) => void;
-  options: BranchOption[];
-  disabled?: boolean;
-  isLoading?: boolean;
-  placeholder?: string;
-  variant?: BranchSelectVariant;
-  onOpenChange?: (open: boolean) => void;
-  icon?: React.ReactNode;
-}
-
-const ROW_HEIGHT = 32;
-const MAX_LIST_HEIGHT = 256;
-const EMPTY_BRANCH_VALUE = '__branch_select_empty__';
-
-const BranchSelect: React.FC<BranchSelectProps> = ({
-  value,
-  onValueChange,
-  options,
-  disabled = false,
-  isLoading = false,
-  placeholder,
-  variant = 'default',
-  onOpenChange,
-  icon,
-}) => {
-  const [open, setOpen] = useState(false);
-  const [searchTerm, setSearchTerm] = useState('');
-  const searchInputRef = useRef<HTMLInputElement | null>(null);
-
-  const navigationKeys = useMemo(
-    () => new Set(['ArrowUp', 'ArrowDown', 'PageUp', 'PageDown', 'Home', 'End', 'Enter', 'Escape']),
-    []
-  );
-
-  const filteredOptions = useMemo(() => {
-    if (!searchTerm.trim()) return options;
-    const query = searchTerm.trim().toLowerCase();
-    return options.filter((option) => option.label.toLowerCase().includes(query));
-  }, [options, searchTerm]);
-
-  const displayedOptions = useMemo(() => {
-    if (!value) return filteredOptions;
-    const hasSelection = filteredOptions.some((option) => option.value === value);
-    if (hasSelection) return filteredOptions;
-    const selectedOption = options.find((option) => option.value === value);
-    if (!selectedOption) return filteredOptions;
-    return [selectedOption, ...filteredOptions];
-  }, [filteredOptions, options, value]);
-
-  const estimatedListHeight = Math.min(
-    MAX_LIST_HEIGHT,
-    Math.max(displayedOptions.length, 1) * ROW_HEIGHT
-  );
-
-  // Focus search input when dropdown opens
-  useEffect(() => {
-    if (open) {
-      requestAnimationFrame(() => searchInputRef.current?.focus());
-    } else {
-      setSearchTerm('');
-    }
-  }, [open]);
-
-  const handleOpenChange = useCallback(
-    (nextOpen: boolean) => {
-      setOpen(nextOpen);
-      onOpenChange?.(nextOpen);
-    },
-    [onOpenChange]
-  );
-
-  const defaultPlaceholder = isLoading ? 'Loading...' : 'Select branch';
-  const triggerPlaceholder = placeholder ?? defaultPlaceholder;
-  const hasKnownSelection = Boolean(value && options.some((option) => option.value === value));
-  const selectedValue = hasKnownSelection ? (value as string) : EMPTY_BRANCH_VALUE;
-
-  const triggerClassName =
-    variant === 'ghost'
-      ? 'h-auto border-none bg-transparent p-0 text-xs text-muted-foreground shadow-none hover:text-foreground focus:ring-0 [&>svg]:ml-0.5 [&>svg]:h-3 [&>svg]:w-3'
-      : 'h-8 w-full gap-2 px-3 text-xs font-medium shadow-none sm:w-auto';
-
-  return (
-    <Select
-      value={selectedValue}
-      onValueChange={onValueChange}
-      disabled={disabled || isLoading || options.length === 0}
-      open={open}
-      onOpenChange={handleOpenChange}
-    >
-      <SelectTrigger className={triggerClassName}>
-        {icon}
-        <SelectValue placeholder={triggerPlaceholder} />
-      </SelectTrigger>
-      <SelectContent
-        className="[&>[data-radix-select-scroll-down-button]]:hidden [&>[data-radix-select-scroll-up-button]]:hidden"
-        style={{ minWidth: '320px' }}
-      >
-        <SelectItem value={EMPTY_BRANCH_VALUE} disabled className="hidden">
-          {triggerPlaceholder}
-        </SelectItem>
-        <div className="px-2 pb-2 pt-2" onPointerDown={(event) => event.stopPropagation()}>
-          <Input
-            ref={searchInputRef}
-            value={searchTerm}
-            onChange={(event) => setSearchTerm(event.currentTarget.value)}
-            onKeyDown={(event) => {
-              if (!navigationKeys.has(event.key)) {
-                event.stopPropagation();
-              }
-            }}
-            placeholder="Search branches"
-            className="bg-popover px-2 py-1 text-sm"
-          />
-        </div>
-        <ScrollArea
-          className="w-full"
-          style={{
-            height: `${estimatedListHeight}px`,
-            maxHeight: `${MAX_LIST_HEIGHT}px`,
-          }}
-        >
-          <div className="space-y-0 pr-3">
-            {displayedOptions.length > 0 ? (
-              displayedOptions.map((option) => (
-                <SelectItem key={option.value} value={option.value}>
-                  {option.label}
-                </SelectItem>
-              ))
-            ) : (
-              <div className="px-3 py-2 text-xs text-muted-foreground">No matching branches</div>
-            )}
-          </div>
-        </ScrollArea>
-      </SelectContent>
-    </Select>
-  );
-};
-
-export default BranchSelect;
diff --git a/src/renderer/components/BrowserPane.tsx b/src/renderer/components/BrowserPane.tsx
deleted file mode 100644
index 0255740aa1..0000000000
--- a/src/renderer/components/BrowserPane.tsx
+++ /dev/null
@@ -1,597 +0,0 @@
-import React from 'react';
-import { X, ArrowLeft, ArrowRight, ExternalLink, RotateCw } from 'lucide-react';
-import { useBrowser } from '@/providers/BrowserProvider';
-import { cn } from '@/lib/utils';
-import { Input } from './ui/input';
-import { Spinner } from './ui/spinner';
-import { Button } from './ui/button';
-import { setLastUrl, setRunning } from '@/lib/previewStorage';
-import { PROBE_TIMEOUT_MS, SPINNER_MAX_MS, isAppPort } from '@/lib/previewNetwork';
-
-const clamp = (n: number, min: number, max: number) => Math.max(min, Math.min(max, n));
-
-const HANDLE_PX = 6;
-const BOUNDS_CHANGE_THRESHOLD = 2;
-const HIDE_DEBOUNCE_MS = 50;
-const URL_LOAD_DELAY_MS = 50;
-const BOUNDS_UPDATE_DELAY_MS = 100;
-const PROBE_RETRY_DELAY_MS = 500;
-const MAX_LOG_LINES = 8;
-const WIDTH_PCT_MIN = 5;
-const WIDTH_PCT_MAX = 96;
-const DEFAULT_PREVIEW_URLS = [
-  'http://localhost:5173',
-  'http://localhost:3000',
-  'http://localhost:8080',
-];
-
-const BrowserPane: React.FC<{
-  taskId?: string | null;
-  taskPath?: string | null;
-  overlayActive?: boolean;
-}> = ({ taskId, overlayActive = false }) => {
-  const {
-    isOpen,
-    url,
-    widthPct,
-    setWidthPct,
-    close,
-    navigate,
-    clearUrl,
-    busy,
-    showSpinner,
-    hideSpinner,
-  } = useBrowser();
-  const [address, setAddress] = React.useState<string>('');
-  const [lines, setLines] = React.useState<string[]>([]);
-  const [dragging, setDragging] = React.useState<boolean>(false);
-  const widthPctRef = React.useRef<number>(widthPct);
-  React.useEffect(() => {
-    widthPctRef.current = widthPct;
-  }, [widthPct]);
-  const [failed, setFailed] = React.useState<boolean>(false);
-  const [overlayRaised, setOverlayRaised] = React.useState<boolean>(false);
-  const paneVisible = isOpen && !overlayActive && !overlayRaised;
-
-  // Listen for global overlay events (e.g., feedback modal) and hide preview when active
-  React.useEffect(() => {
-    const onOverlay = (e: any) => {
-      try {
-        setOverlayRaised(Boolean(e?.detail?.open));
-      } catch {}
-    };
-    window.addEventListener('emdash:overlay:changed', onOverlay as any);
-    return () => window.removeEventListener('emdash:overlay:changed', onOverlay as any);
-  }, []);
-
-  React.useEffect(() => {
-    if (typeof url === 'string') setAddress(url);
-  }, [url]);
-
-  const prevTaskIdRef = React.useRef<string | null>(null);
-  const lastTaskUrlRef = React.useRef<string | null>(null);
-  React.useEffect(() => {
-    const prev = prevTaskIdRef.current;
-    const cur = (taskId || '').trim() || null;
-
-    if (prev && cur && prev !== cur) {
-      try {
-        // Clear and hide browser view immediately when switching worktrees
-        (window as any).electronAPI?.browserClear?.();
-        (window as any).electronAPI?.browserHide?.();
-        setRunning(prev, false);
-        // Reset task URL tracking to force reload
-        lastTaskUrlRef.current = null;
-      } catch {}
-    }
-
-    try {
-      // Stop all other preview servers except the new current (if any)
-      (window as any).electronAPI?.hostPreviewStopAll?.(cur || '');
-    } catch {}
-
-    if (prev !== cur) {
-      try {
-        clearUrl();
-        hideSpinner();
-        setFailed(false);
-        setLines([]);
-      } catch {}
-    }
-
-    prevTaskIdRef.current = cur;
-  }, [taskId, clearUrl, hideSpinner]);
-
-  React.useEffect(() => {
-    const off = (window as any).electronAPI?.onHostPreviewEvent?.((data: any) => {
-      try {
-        if (!data || !taskId || data.taskId !== taskId) return;
-        if (data.type === 'setup') {
-          if (data.status === 'line' && data.line) {
-            setLines((prev) => {
-              const next = [...prev, String(data.line).trim()].slice(-MAX_LOG_LINES);
-              return next;
-            });
-          }
-          if (data.status === 'error') {
-            hideSpinner();
-          }
-        }
-        if (data.type === 'url' && data.url) {
-          // CRITICAL: Only process URL events for the current taskId
-          // This ensures we don't load URLs from other worktrees
-          if (!taskId || data.taskId !== taskId) {
-            return;
-          }
-          setFailed(false);
-          const appPort = Number(window.location.port || 0);
-          if (isAppPort(String(data.url), appPort)) return;
-          showSpinner();
-          navigate(String(data.url));
-          try {
-            setLastUrl(String(taskId), String(data.url));
-          } catch {}
-        }
-        if (data.type === 'exit') {
-          try {
-            setRunning(String(taskId), false);
-          } catch {}
-          hideSpinner();
-        }
-      } catch {}
-    });
-    return () => {
-      try {
-        off?.();
-      } catch {}
-    };
-  }, [taskId, navigate, showSpinner, hideSpinner]);
-
-  // Verify URL reachability with TCP probe (30s grace window for slow compilers)
-  React.useEffect(() => {
-    let cancelled = false;
-    const urlString = (url || '').trim();
-    if (!urlString) {
-      setFailed(false);
-      return;
-    }
-    (async () => {
-      try {
-        const parsed = new URL(urlString);
-        const host = parsed.hostname || 'localhost';
-        const port = Number(parsed.port || 0);
-        if (!port) {
-          setFailed(false);
-          return;
-        }
-        const deadline = Date.now() + SPINNER_MAX_MS;
-        let isReachable = false;
-        while (!cancelled && Date.now() < deadline) {
-          try {
-            const res = await (window as any).electronAPI?.netProbePorts?.(
-              host,
-              [port],
-              PROBE_TIMEOUT_MS
-            );
-            isReachable = !!(res && Array.isArray(res.reachable) && res.reachable.length > 0);
-            if (isReachable) break;
-          } catch {}
-          await new Promise((r) => setTimeout(r, PROBE_RETRY_DELAY_MS));
-        }
-        if (!cancelled) {
-          if (isReachable) {
-            hideSpinner();
-          } else {
-            setFailed(true);
-          }
-        }
-      } catch {
-        if (!cancelled) {
-          setFailed(true);
-        }
-      }
-    })();
-    return () => {
-      cancelled = true;
-    };
-  }, [url, showSpinner, hideSpinner]);
-
-  const handleRetry = React.useCallback(() => {
-    if (!url) return;
-    showSpinner();
-    try {
-      (window as any).electronAPI?.browserReload?.();
-    } catch {}
-  }, [url, showSpinner]);
-
-  // Browser view is managed in main process (WebContentsView) via IPC
-  // This component reports bounds and coordinates navigation
-  const containerRef = React.useRef<HTMLDivElement | null>(null);
-  const computeBounds = React.useCallback(() => {
-    const el = containerRef.current;
-    if (!el) return null;
-    const rect = el.getBoundingClientRect();
-    const x = Math.round(rect.left + HANDLE_PX);
-    const y = Math.round(rect.top);
-    const w = Math.max(1, Math.round(rect.width - HANDLE_PX));
-    const h = Math.max(1, Math.round(rect.height));
-    return { x, y, width: w, height: h };
-  }, []);
-
-  const lastBoundsRef = React.useRef<{
-    x: number;
-    y: number;
-    width: number;
-    height: number;
-  } | null>(null);
-
-  const hasBoundsChanged = React.useCallback(
-    (newBounds: { x: number; y: number; width: number; height: number }) => {
-      if (!lastBoundsRef.current) return true;
-      const old = lastBoundsRef.current;
-      return (
-        Math.abs(old.x - newBounds.x) > BOUNDS_CHANGE_THRESHOLD ||
-        Math.abs(old.y - newBounds.y) > BOUNDS_CHANGE_THRESHOLD ||
-        Math.abs(old.width - newBounds.width) > BOUNDS_CHANGE_THRESHOLD ||
-        Math.abs(old.height - newBounds.height) > BOUNDS_CHANGE_THRESHOLD
-      );
-    },
-    []
-  );
-
-  const visibilityTimeoutRef = React.useRef<NodeJS.Timeout | null>(null);
-  React.useEffect(() => {
-    if (visibilityTimeoutRef.current) {
-      clearTimeout(visibilityTimeoutRef.current);
-      visibilityTimeoutRef.current = null;
-    }
-
-    const shouldShow = paneVisible && !!url && !!taskId;
-
-    if (!shouldShow) {
-      visibilityTimeoutRef.current = setTimeout(() => {
-        try {
-          (window as any).electronAPI?.browserHide?.();
-          lastBoundsRef.current = null;
-        } catch {}
-        visibilityTimeoutRef.current = null;
-      }, HIDE_DEBOUNCE_MS);
-      return;
-    }
-
-    requestAnimationFrame(() => {
-      const bounds = computeBounds();
-      if (bounds && bounds.width > 0 && bounds.height > 0) {
-        if (hasBoundsChanged(bounds)) {
-          lastBoundsRef.current = bounds;
-          try {
-            (window as any).electronAPI?.browserShow?.(bounds, url || undefined);
-            setTimeout(() => {
-              const updatedBounds = computeBounds();
-              if (updatedBounds && updatedBounds.width > 0 && updatedBounds.height > 0) {
-                if (hasBoundsChanged(updatedBounds)) {
-                  lastBoundsRef.current = updatedBounds;
-                  try {
-                    (window as any).electronAPI?.browserSetBounds?.(updatedBounds);
-                  } catch {}
-                }
-              }
-            }, BOUNDS_UPDATE_DELAY_MS);
-          } catch {}
-        }
-      }
-    });
-
-    const onResize = () => {
-      const bounds = computeBounds();
-      if (bounds && shouldShow && bounds.width > 0 && bounds.height > 0) {
-        if (hasBoundsChanged(bounds)) {
-          lastBoundsRef.current = bounds;
-          try {
-            (window as any).electronAPI?.browserSetBounds?.(bounds);
-          } catch {}
-        }
-      }
-    };
-    window.addEventListener('resize', onResize);
-    const ResizeObserverClass = (window as any).ResizeObserver;
-    const resizeObserver = ResizeObserverClass ? new ResizeObserverClass(() => onResize()) : null;
-    if (resizeObserver && containerRef.current) resizeObserver.observe(containerRef.current);
-
-    return () => {
-      if (visibilityTimeoutRef.current) {
-        clearTimeout(visibilityTimeoutRef.current);
-        visibilityTimeoutRef.current = null;
-      }
-      try {
-        (window as any).electronAPI?.browserHide?.();
-      } catch {}
-      window.removeEventListener('resize', onResize);
-      try {
-        resizeObserver?.disconnect?.();
-      } catch {}
-    };
-  }, [paneVisible, url, computeBounds, hasBoundsChanged, taskId]);
-
-  React.useEffect(() => {
-    if (isOpen && !url) setAddress('');
-  }, [isOpen, url]);
-
-  const lastUrlRef = React.useRef<string | null>(null);
-  const lastTaskIdRef2 = React.useRef<string | null | undefined>(null);
-  React.useEffect(() => {
-    if (taskId !== lastTaskIdRef2.current) {
-      lastUrlRef.current = null;
-      lastTaskIdRef2.current = taskId || null;
-      lastTaskUrlRef.current = null;
-    }
-
-    if (paneVisible && url && taskId) {
-      const taskUrlKey = `${taskId}:${url}`;
-      // Force reload if task changed or URL changed
-      const isTaskChange = lastTaskUrlRef.current === null;
-      if (lastTaskUrlRef.current !== taskUrlKey || lastUrlRef.current !== url) {
-        lastUrlRef.current = url;
-        lastTaskUrlRef.current = taskUrlKey;
-
-        try {
-          (window as any).electronAPI?.browserClear?.();
-        } catch {}
-
-        const timeoutId = setTimeout(() => {
-          try {
-            // Force reload when task changes to ensure fresh content
-            (window as any).electronAPI?.browserLoadURL?.(url, isTaskChange);
-          } catch {}
-        }, URL_LOAD_DELAY_MS);
-        return () => clearTimeout(timeoutId);
-      }
-    }
-  }, [paneVisible, url, taskId]);
-
-  React.useEffect(() => {
-    let dragging = false;
-    let pointerId: number | null = null;
-    let startX = 0;
-    let startPct = widthPctRef.current;
-    const handle = document.getElementById('emdash-browser-drag');
-    if (!handle) return;
-
-    const onPointerDown = (e: PointerEvent) => {
-      dragging = true;
-      pointerId = e.pointerId;
-      try {
-        (e.target as Element).setPointerCapture?.(e.pointerId);
-      } catch {}
-      setDragging(true);
-      startX = e.clientX;
-      startPct = widthPctRef.current;
-      document.body.style.cursor = 'col-resize';
-      e.preventDefault();
-    };
-    const onPointerMove = (e: PointerEvent) => {
-      if (!dragging) return;
-      const dx = startX - e.clientX;
-      const viewportWidth = Math.max(1, window.innerWidth);
-      const deltaPct = (dx / viewportWidth) * 100;
-      setWidthPct(clamp(startPct + deltaPct, WIDTH_PCT_MIN, WIDTH_PCT_MAX));
-      e.preventDefault();
-    };
-    const onPointerUp = (e: PointerEvent) => {
-      if (!dragging) return;
-      dragging = false;
-      try {
-        if (pointerId != null) handle.releasePointerCapture?.(pointerId);
-      } catch {}
-      pointerId = null;
-      setDragging(false);
-      document.body.style.cursor = '';
-      e.preventDefault();
-    };
-
-    handle.addEventListener('pointerdown', onPointerDown);
-    window.addEventListener('pointermove', onPointerMove, { passive: false });
-    window.addEventListener('pointerup', onPointerUp, { passive: false });
-    return () => {
-      handle.removeEventListener('pointerdown', onPointerDown);
-      window.removeEventListener('pointermove', onPointerMove as any);
-      window.removeEventListener('pointerup', onPointerUp as any);
-      setDragging(false);
-      document.body.style.cursor = '';
-    };
-  }, [setWidthPct]);
-
-  const { goBack, goForward } = useBrowser();
-
-  const handleRefresh = React.useCallback(() => {
-    if (!url) return;
-    try {
-      // Clear and reload to force fresh content
-      (window as any).electronAPI?.browserClear?.();
-      setTimeout(() => {
-        try {
-          (window as any).electronAPI?.browserLoadURL?.(url, true);
-        } catch {}
-      }, 100);
-    } catch {}
-  }, [url]);
-
-  const handleClose = React.useCallback(async () => {
-    void import('../lib/telemetryClient').then(({ captureTelemetry }) => {
-      captureTelemetry('browser_preview_closed');
-    });
-    try {
-      const id = (taskId || '').trim();
-      if (id) (window as any).electronAPI?.hostPreviewStop?.(id);
-    } catch {}
-    try {
-      (window as any).electronAPI?.browserHide?.();
-    } catch {}
-    try {
-      clearUrl();
-    } catch {}
-    setFailed(false);
-    close();
-  }, [taskId, clearUrl, close]);
-
-  return (
-    <div
-      className={cn(
-        'fixed bottom-0 left-0 right-0 z-[70] overflow-hidden',
-        paneVisible ? 'pointer-events-auto' : 'pointer-events-none'
-      )}
-      // Offset below the app titlebar so the pane’s toolbar is visible
-      style={{ top: 'var(--tb, 36px)' }}
-      aria-hidden={!paneVisible}
-    >
-      <div
-        className="absolute right-0 top-0 h-full border-l border-border bg-background shadow-xl"
-        style={{
-          width: `${widthPct}%`,
-          transform: paneVisible ? 'translateX(0)' : 'translateX(100%)',
-          transition: 'transform 220ms cubic-bezier(0.22,1,0.36,1), opacity 220ms',
-          opacity: paneVisible ? 1 : 0,
-          display: 'flex',
-          flexDirection: 'column',
-          zIndex: 10,
-        }}
-      >
-        <div className="flex flex-shrink-0 items-center gap-1 border-b border-border bg-muted px-2 dark:bg-background">
-          <Button
-            variant="ghost"
-            size="icon-sm"
-            onClick={() => goBack()}
-            disabled
-            title="Back"
-            aria-label="Back"
-          >
-            <ArrowLeft className="h-4 w-4" />
-          </Button>
-          <Button
-            variant="ghost"
-            size="icon-sm"
-            onClick={() => goForward()}
-            disabled
-            title="Forward"
-            aria-label="Forward"
-          >
-            <ArrowRight className="h-4 w-4" />
-          </Button>
-          {url && (
-            <Button
-              variant="ghost"
-              size="icon-sm"
-              onClick={handleRefresh}
-              title="Refresh"
-              aria-label="Refresh"
-            >
-              <RotateCw className="h-4 w-4" />
-            </Button>
-          )}
-          <form
-            className="mx-2 flex min-w-0 flex-1"
-            onSubmit={(e) => {
-              e.preventDefault();
-              let next = address.trim();
-              if (!/^https?:\/\//i.test(next)) next = `http://${next}`;
-              navigate(next);
-            }}
-          >
-            <Input
-              className="h-7 min-w-0 flex-1 px-2 py-1 text-xs"
-              value={address ?? ''}
-              onChange={(e) => setAddress(e.target.value)}
-              placeholder="Enter URL (e.g. http://localhost:5173)"
-            />
-          </form>
-          {!url ? (
-            <div className="hidden items-center gap-1.5 sm:flex">
-              {DEFAULT_PREVIEW_URLS.map((previewUrl) => (
-                <button
-                  key={previewUrl}
-                  type="button"
-                  className="inline-flex items-center rounded border border-border px-2 py-1 text-[11px] text-muted-foreground hover:bg-muted"
-                  onClick={() => navigate(previewUrl)}
-                >
-                  {previewUrl.replace('http://', '')}
-                </button>
-              ))}
-            </div>
-          ) : null}
-          <button
-            className="inline-flex h-6 items-center gap-1 rounded border border-border px-2 text-xs hover:bg-muted"
-            title="Open in system browser"
-            onClick={() => address && window.electronAPI.openExternal(address)}
-          >
-            <ExternalLink className="h-3.5 w-3.5" />
-          </button>
-          <Button
-            variant="ghost"
-            size="icon-sm"
-            className="ml-1"
-            onClick={handleClose}
-            title="Close"
-            aria-label="Close"
-          >
-            <X className="h-4 w-4" />
-          </Button>
-        </div>
-        {!busy && url && lines.length > 0 && (
-          <div className="flex flex-shrink-0 items-center gap-2 border-b border-border bg-muted/30 px-2 py-1 text-xs">
-            <span className="font-medium">Task Preview</span>
-            <div className="ml-auto inline-flex items-center gap-2 text-muted-foreground">
-              {lines.length ? (
-                <span className="max-w-[360px] truncate">{lines[lines.length - 1]}</span>
-              ) : null}
-            </div>
-          </div>
-        )}
-
-        <div className="relative min-h-0 flex-1" style={{ minHeight: 0 }}>
-          <div
-            id="emdash-browser-drag"
-            className="absolute left-0 top-0 z-[200] h-full w-[6px] cursor-col-resize hover:bg-border/60"
-          />
-          <div ref={containerRef} className="h-full w-full bg-white dark:bg-background" />
-          {dragging ? (
-            <div
-              className="absolute inset-0 z-[180] cursor-col-resize"
-              style={{ background: 'transparent' }}
-            />
-          ) : null}
-          {busy && !url ? (
-            <div className="pointer-events-none absolute inset-0 z-20 flex items-center justify-center">
-              <div className="flex items-center gap-3 rounded-xl border border-border/70 bg-background/95 px-4 py-3 text-sm text-muted-foreground shadow-sm backdrop-blur-[1px]">
-                <Spinner size="md" />
-                <div className="leading-tight">
-                  <div className="font-medium text-foreground">Loading preview…</div>
-                  <div className="text-xs text-muted-foreground/80">Starting dev server</div>
-                </div>
-              </div>
-            </div>
-          ) : null}
-          {url && failed && !busy ? (
-            <div className="pointer-events-auto absolute inset-0 z-20 flex items-center justify-center bg-background/80 backdrop-blur-[1px]">
-              <div className="flex flex-col items-center gap-3 rounded-xl border border-border/70 bg-background/95 px-4 py-3 text-sm text-muted-foreground shadow-sm">
-                <div className="text-center leading-tight">
-                  <div className="font-medium text-foreground">Preview unavailable</div>
-                  <div className="mt-1 text-xs text-muted-foreground/80">
-                    Server at {url} is not reachable
-                  </div>
-                </div>
-                <button
-                  onClick={handleRetry}
-                  className="mt-2 rounded border border-border bg-background px-3 py-1.5 text-xs hover:bg-muted"
-                >
-                  Retry
-                </button>
-              </div>
-            </div>
-          ) : null}
-        </div>
-      </div>
-    </div>
-  );
-};
-
-export default BrowserPane;
diff --git a/src/renderer/components/BrowserPreviewSettingsCard.tsx b/src/renderer/components/BrowserPreviewSettingsCard.tsx
deleted file mode 100644
index 218884a03b..0000000000
--- a/src/renderer/components/BrowserPreviewSettingsCard.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import React from 'react';
-import { Switch } from './ui/switch';
-import { useAppSettings } from '@/contexts/AppSettingsProvider';
-
-export default function BrowserPreviewSettingsCard() {
-  const { settings, updateSettings, isLoading, isSaving } = useAppSettings();
-
-  return (
-    <div className="flex items-center justify-between gap-4">
-      <div className="flex flex-1 flex-col gap-0.5">
-        <span className="text-sm font-medium text-foreground">Show localhost links in browser</span>
-        <span className="text-sm text-muted-foreground">
-          Preview UI changes using the built-in browser view.
-        </span>
-      </div>
-      <Switch
-        checked={settings?.browserPreview?.enabled ?? true}
-        disabled={isLoading || isSaving}
-        onCheckedChange={(next) => updateSettings({ browserPreview: { enabled: next } })}
-      />
-    </div>
-  );
-}
diff --git a/src/renderer/components/ChatInterface.tsx b/src/renderer/components/ChatInterface.tsx
deleted file mode 100644
index 1a13bccf63..0000000000
--- a/src/renderer/components/ChatInterface.tsx
+++ /dev/null
@@ -1,1160 +0,0 @@
-import React, { useEffect, useState, useMemo, useCallback, useRef } from 'react';
-import { Plus, X } from 'lucide-react';
-import { useToast } from '../hooks/use-toast';
-import { useTheme } from '../hooks/useTheme';
-import { TerminalPane } from './TerminalPane';
-import InstallBanner from './InstallBanner';
-import { cn } from '@/lib/utils';
-import { agentMeta } from '../providers/meta';
-import { agentConfig } from '../lib/agentConfig';
-import AgentLogo from './AgentLogo';
-import TaskContextBadges from './TaskContextBadges';
-import { Spinner } from './ui/spinner';
-import { useInitialPromptInjection } from '../hooks/useInitialPromptInjection';
-import { useTaskComments } from '../hooks/useLineComments';
-import { type Agent } from '../types';
-import { Task } from '../types/chat';
-import { useTaskTerminals } from '@/lib/taskTerminalsStore';
-import { activityStore } from '@/lib/activityStore';
-import { rpc } from '@/lib/rpc';
-import { getInstallCommandForProvider } from '@shared/providers/registry';
-import { useAutoScrollOnTaskSwitch } from '@/hooks/useAutoScrollOnTaskSwitch';
-import { TaskScopeProvider } from './TaskScopeContext';
-import { CreateChatModal } from './CreateChatModal';
-import { type Conversation } from '../../main/services/DatabaseService';
-import { terminalSessionRegistry } from '../terminal/SessionRegistry';
-import { getTaskEnvVars } from '@shared/task/envVars';
-import { makePtyId } from '@shared/ptyId';
-import { generateTaskName } from '../lib/branchNameGenerator';
-import { ensureUniqueTaskName } from '../lib/taskNames';
-import type { Project } from '../types/app';
-
-declare const window: Window & {
-  electronAPI: {
-    saveMessage: (message: any) => Promise<{ success: boolean; error?: string }>;
-  };
-};
-
-interface Props {
-  task: Task;
-  project?: Project | null;
-  projectName: string;
-  projectPath?: string | null;
-  projectRemoteConnectionId?: string | null;
-  projectRemotePath?: string | null;
-  defaultBranch?: string | null;
-  className?: string;
-  initialAgent?: Agent;
-  onTaskInterfaceReady?: () => void;
-  onRenameTask?: (project: Project, task: Task, newName: string) => Promise<void>;
-}
-
-const ChatInterface: React.FC<Props> = ({
-  task,
-  project,
-  projectName: _projectName,
-  projectPath,
-  projectRemoteConnectionId,
-  projectRemotePath: _projectRemotePath,
-  defaultBranch,
-  className,
-  initialAgent,
-  onTaskInterfaceReady,
-  onRenameTask,
-}) => {
-  const { effectiveTheme } = useTheme();
-  const { toast } = useToast();
-  const [isAgentInstalled, setIsAgentInstalled] = useState<boolean | null>(null);
-  const [agentStatuses, setAgentStatuses] = useState<
-    Record<string, { installed?: boolean; path?: string | null; version?: string | null }>
-  >({});
-  const [agent, setAgent] = useState<Agent>(initialAgent || 'claude');
-  const currentAgentStatus = agentStatuses[agent];
-  const [cliStartError, setCliStartError] = useState<string | null>(null);
-
-  // Multi-chat state
-  const [conversations, setConversations] = useState<Conversation[]>([]);
-  const [activeConversationId, setActiveConversationId] = useState<string | null>(null);
-  const [conversationsLoaded, setConversationsLoaded] = useState(false);
-  const [showCreateChatModal, setShowCreateChatModal] = useState(false);
-  const [busyByConversationId, setBusyByConversationId] = useState<Record<string, boolean>>({});
-  const tabsContainerRef = useRef<HTMLDivElement>(null);
-  const [tabsOverflow, setTabsOverflow] = useState(false);
-
-  const mainConversationId = useMemo(
-    () => conversations.find((c) => c.isMain)?.id ?? null,
-    [conversations]
-  );
-
-  // Update terminal ID to include conversation ID and agent - unique per conversation
-  const terminalId = useMemo(() => {
-    // Find the active conversation to check if it's the main one
-    const activeConversation = conversations.find((c) => c.id === activeConversationId);
-
-    if (activeConversation?.isMain) {
-      // Main conversations use task-based ID for backward compatibility
-      // This ensures terminal sessions persist correctly
-      return makePtyId(agent, 'main', task.id);
-    } else if (activeConversationId) {
-      // Additional conversations use conversation-specific ID
-      return makePtyId(agent, 'chat', activeConversationId);
-    }
-    // Fallback to main format if no active conversation
-    return makePtyId(agent, 'main', task.id);
-  }, [activeConversationId, agent, task.id, conversations]);
-
-  // Claude needs consistent working directory to maintain session state
-  const terminalCwd = useMemo(() => {
-    return task.path;
-  }, [task.path]);
-
-  const taskEnv = useMemo(() => {
-    if (!projectPath) return undefined;
-    return getTaskEnvVars({
-      taskId: task.id,
-      taskName: task.name,
-      taskPath: task.path,
-      projectPath,
-      defaultBranch: defaultBranch || undefined,
-    });
-  }, [task.id, task.name, task.path, projectPath, defaultBranch]);
-
-  const installedAgents = useMemo(
-    () =>
-      Object.entries(agentStatuses)
-        .filter(([, status]) => status.installed === true)
-        .map(([id]) => id),
-    [agentStatuses]
-  );
-  const sortedConversations = useMemo(
-    () =>
-      [...conversations].sort((a, b) => {
-        // Sort by display order or creation time to maintain consistent order
-        if (a.displayOrder !== undefined && b.displayOrder !== undefined) {
-          return a.displayOrder - b.displayOrder;
-        }
-        return new Date(a.createdAt).getTime() - new Date(b.createdAt).getTime();
-      }),
-    [conversations]
-  );
-
-  const { activeTerminalId } = useTaskTerminals(task.id, task.path);
-
-  // Line comments for agent context injection
-  const { formatted: commentsContext } = useTaskComments(task.id);
-
-  // Auto-scroll to bottom when this task becomes active
-  useAutoScrollOnTaskSwitch(true, task.id);
-
-  const readySignaledTaskIdRef = useRef<string | null>(null);
-  useEffect(() => {
-    const el = tabsContainerRef.current;
-    if (!el) return;
-    const check = () => setTabsOverflow(el.scrollWidth > el.clientWidth);
-    check();
-    const ro = new ResizeObserver(check);
-    ro.observe(el);
-    return () => ro.disconnect();
-  }, [conversations.length]);
-
-  useEffect(() => {
-    if (!onTaskInterfaceReady) return;
-    if (readySignaledTaskIdRef.current === task.id) return;
-    readySignaledTaskIdRef.current = task.id;
-    onTaskInterfaceReady();
-  }, [task.id, onTaskInterfaceReady]);
-
-  // Load conversations when task changes
-  useEffect(() => {
-    const loadConversations = async () => {
-      setConversationsLoaded(false);
-      const loadedConversations = await rpc.db.getConversations(task.id);
-
-      if (loadedConversations.length > 0) {
-        setConversations(loadedConversations);
-
-        // Set active conversation
-        const active = loadedConversations.find((c: Conversation) => c.isActive);
-        if (active) {
-          setActiveConversationId(active.id);
-          // Update agent to match the active conversation
-          if (active.provider) {
-            setAgent(active.provider as Agent);
-          }
-        } else {
-          // Fallback to first conversation
-          const firstConv = loadedConversations[0];
-          setActiveConversationId(firstConv.id);
-          // Update agent to match the first conversation
-          if (firstConv.provider) {
-            setAgent(firstConv.provider as Agent);
-          }
-          await rpc.db.setActiveConversation({
-            taskId: task.id,
-            conversationId: firstConv.id,
-          });
-        }
-        setConversationsLoaded(true);
-      } else {
-        // No conversations exist - create default for backward compatibility
-        // This ensures existing tasks always have at least one conversation
-        // (preserves pre-multi-chat behavior)
-        const defaultConversation = await rpc.db.getOrCreateDefaultConversation(task.id);
-        if (defaultConversation) {
-          // For backward compatibility: use task.agentId if available, otherwise use current agent
-          // This preserves the original agent choice for tasks created before multi-chat
-          const taskAgent = task.agentId || agent;
-          const conversationWithAgent = {
-            ...defaultConversation,
-            provider: taskAgent,
-            isMain: true,
-            isActive: true,
-          };
-          setConversations([conversationWithAgent]);
-          setActiveConversationId(defaultConversation.id);
-
-          // Update the agent state to match
-          setAgent(taskAgent as Agent);
-
-          // Save the agent to the conversation
-          await rpc.db.saveConversation(conversationWithAgent);
-          setConversationsLoaded(true);
-        }
-      }
-    };
-
-    loadConversations();
-  }, [task.id, task.agentId]); // provider is intentionally not included as a dependency
-
-  // Activity indicators per conversation tab (main PTY uses `task.id`, chat PTYs use `conversation.id`).
-  useEffect(() => {
-    let cancelled = false;
-    const unsubs: Array<() => void> = [];
-    const conversationIds = new Set(conversations.map((c) => c.id));
-
-    setBusyByConversationId((prev) => {
-      const next: Record<string, boolean> = {};
-      for (const id of conversationIds) next[id] = prev[id] ?? false;
-      return next;
-    });
-
-    if (mainConversationId) {
-      unsubs.push(
-        activityStore.subscribe(task.id, (busy) => {
-          if (cancelled) return;
-          setBusyByConversationId((prev) => {
-            if (prev[mainConversationId] === busy) return prev;
-            return { ...prev, [mainConversationId]: busy };
-          });
-        })
-      );
-    }
-
-    for (const conv of conversations) {
-      if (conv.isMain) continue;
-      const conversationId = conv.id;
-      unsubs.push(
-        activityStore.subscribe(
-          conversationId,
-          (busy) => {
-            if (cancelled) return;
-            setBusyByConversationId((prev) => {
-              if (prev[conversationId] === busy) return prev;
-              return { ...prev, [conversationId]: busy };
-            });
-          },
-          { kinds: ['chat'] }
-        )
-      );
-    }
-
-    return () => {
-      cancelled = true;
-      try {
-        for (const off of unsubs) off?.();
-      } catch {}
-    };
-  }, [task.id, conversations, mainConversationId]);
-
-  // Ref to control terminal focus imperatively if needed
-  const terminalRef = useRef<{ focus: () => void }>(null);
-
-  // Auto-focus terminal when switching to this task
-  useEffect(() => {
-    if (!conversationsLoaded) return;
-    // Small delay to ensure terminal is mounted and attached
-    const timer = setTimeout(() => {
-      const session = terminalSessionRegistry.getSession(terminalId);
-      if (session) {
-        session.focus();
-      }
-    }, 100);
-    return () => clearTimeout(timer);
-  }, [task.id, terminalId, conversationsLoaded]);
-
-  // Focus terminal when this task becomes active (for already-mounted terminals)
-  useEffect(() => {
-    // Small delay to ensure terminal is visible after tab switch
-    const timer = setTimeout(() => {
-      terminalRef.current?.focus();
-    }, 50);
-    return () => clearTimeout(timer);
-  }, [task.id]);
-
-  useEffect(() => {
-    let mounted = true;
-    let timer: ReturnType<typeof setTimeout> | null = null;
-    const handleWindowFocus = () => {
-      timer = setTimeout(() => {
-        timer = null;
-        if (!mounted) return;
-        const session = terminalSessionRegistry.getSession(terminalId);
-        if (session) session.focus();
-      }, 0);
-    };
-    window.addEventListener('focus', handleWindowFocus);
-    return () => {
-      mounted = false;
-      if (timer !== null) clearTimeout(timer);
-      window.removeEventListener('focus', handleWindowFocus);
-    };
-  }, [terminalId]);
-
-  useEffect(() => {
-    const meta = agentMeta[agent];
-    if (!meta?.terminalOnly || !meta.autoStartCommand) return;
-
-    const onceKey = `cli:autoStart:${terminalId}`;
-    try {
-      if (localStorage.getItem(onceKey) === '1') return;
-    } catch {}
-
-    const send = () => {
-      try {
-        (window as any).electronAPI?.ptyInput?.({
-          id: terminalId,
-          data: `${meta.autoStartCommand}\n`,
-        });
-        try {
-          localStorage.setItem(onceKey, '1');
-        } catch {}
-      } catch {}
-    };
-
-    const api: any = (window as any).electronAPI;
-    let off: (() => void) | null = null;
-    try {
-      off = api?.onPtyStarted?.((info: { id: string }) => {
-        if (info?.id === terminalId) send();
-      });
-    } catch {}
-
-    const t = setTimeout(send, 1200);
-
-    return () => {
-      try {
-        off?.();
-      } catch {}
-      clearTimeout(t);
-    };
-  }, [agent, terminalId]);
-
-  useEffect(() => {
-    setCliStartError(null);
-  }, [task.id]);
-
-  const runInstallCommand = useCallback(
-    (cmd: string) => {
-      const api: any = (window as any).electronAPI;
-      const targetId = activeTerminalId;
-      if (!targetId) return;
-
-      const send = () => {
-        try {
-          api?.ptyInput?.({ id: targetId, data: `${cmd}\n` });
-          return true;
-        } catch (error) {
-          console.error('Failed to run install command', error);
-          return false;
-        }
-      };
-
-      // Best effort immediate send
-      const ok = send();
-
-      // Listen for PTY start in case the terminal was still spinning up
-      const off = api?.onPtyStarted?.((info: { id: string }) => {
-        if (info?.id !== targetId) return;
-        send();
-        try {
-          off?.();
-        } catch {}
-      });
-
-      // If immediate send worked, remove listener
-      if (ok) {
-        try {
-          off?.();
-        } catch {}
-      }
-    },
-    [activeTerminalId]
-  );
-
-  // On task change, restore last-selected agent (including Droid).
-  // If a locked agent exists (including Droid), prefer locked.
-  useEffect(() => {
-    try {
-      const lastKey = `agent:last:${task.id}`;
-      const last = window.localStorage.getItem(lastKey) as Agent | null;
-
-      if (initialAgent) {
-        setAgent(initialAgent);
-      } else {
-        const validAgents: Agent[] = [
-          'codex',
-          'claude',
-          'qwen',
-          'droid',
-          'gemini',
-          'cursor',
-          'copilot',
-          'amp',
-          'opencode',
-          'charm',
-          'auggie',
-          'goose',
-          'kimi',
-          'kilocode',
-          'kiro',
-          'rovo',
-          'cline',
-          'continue',
-          'codebuff',
-          'mistral',
-        ];
-        if (last && (validAgents as string[]).includes(last)) {
-          setAgent(last as Agent);
-        } else {
-          setAgent('codex');
-        }
-      }
-    } catch {
-      setAgent(initialAgent || 'codex');
-    }
-  }, [task.id, initialAgent]);
-
-  // Chat management handlers
-  const handleCreateChat = useCallback(
-    async (title: string, newAgent: string) => {
-      try {
-        // Don't dispose the current terminal - each chat has its own independent session
-
-        const newConversation = await rpc.db.createConversation({
-          taskId: task.id,
-          title,
-          provider: newAgent,
-          isMain: false, // Additional chats are never main
-        });
-
-        // Reload conversations from DB
-        const dbConversations = await rpc.db.getConversations(task.id);
-        const dbIds = new Set(dbConversations.map((c: Conversation) => c.id));
-        const missingFromDb = conversations.filter((c) => !dbIds.has(c.id));
-        if (missingFromDb.length > 0) {
-          // Re-persist conversations that only existed in React state
-          for (const missing of missingFromDb) {
-            await rpc.db.saveConversation({ ...missing, isActive: false });
-          }
-          const retryConversations = await rpc.db.getConversations(task.id);
-          setConversations(retryConversations);
-        } else {
-          setConversations(dbConversations);
-        }
-        setActiveConversationId(newConversation.id);
-        setAgent(newAgent as Agent);
-        try {
-          window.dispatchEvent(
-            new CustomEvent('emdash:conversations-changed', { detail: { taskId: task.id } })
-          );
-        } catch {}
-      } catch (error) {
-        console.error('Exception creating conversation:', error);
-        toast({
-          title: 'Error',
-          description: error instanceof Error ? error.message : 'Failed to create chat',
-          variant: 'destructive',
-        });
-      }
-    },
-    [task.id, toast, conversations]
-  );
-
-  const handleCreateNewChat = useCallback(() => {
-    setShowCreateChatModal(true);
-  }, []);
-
-  const handleSwitchChat = useCallback(
-    async (conversationId: string) => {
-      // Don't dispose terminals - just switch between them
-      // Each chat maintains its own persistent terminal session
-
-      await rpc.db.setActiveConversation({
-        taskId: task.id,
-        conversationId,
-      });
-      setActiveConversationId(conversationId);
-
-      // Update provider based on conversation
-      const conv = conversations.find((c) => c.id === conversationId);
-      if (conv?.provider) {
-        setAgent(conv.provider as Agent);
-      }
-    },
-    [task.id, conversations]
-  );
-
-  const handleCloseChat = useCallback(
-    async (conversationId: string) => {
-      if (conversations.length <= 1) {
-        toast({
-          title: 'Cannot Close',
-          description: 'Cannot close the last chat',
-          variant: 'destructive',
-        });
-        return;
-      }
-
-      // Dispose the terminal for this chat
-      const convToDelete = conversations.find((c) => c.id === conversationId);
-      const convAgent = (convToDelete?.provider || agent) as Agent;
-      const terminalToDispose = makePtyId(convAgent, 'chat', conversationId);
-      terminalSessionRegistry.dispose(terminalToDispose);
-
-      await rpc.db.deleteConversation(conversationId);
-
-      // Reload conversations
-      const updatedConversations = await rpc.db.getConversations(task.id);
-      setConversations(updatedConversations);
-      // Switch to another chat if we deleted the active one
-      if (conversationId === activeConversationId && updatedConversations.length > 0) {
-        const newActive = updatedConversations[0];
-        await rpc.db.setActiveConversation({
-          taskId: task.id,
-          conversationId: newActive.id,
-        });
-        setActiveConversationId(newActive.id);
-        // Update provider if needed
-        if (newActive.provider) {
-          setAgent(newActive.provider as Agent);
-        }
-      }
-
-      try {
-        window.dispatchEvent(
-          new CustomEvent('emdash:conversations-changed', { detail: { taskId: task.id } })
-        );
-      } catch {}
-    },
-    [conversations, agent, task.id, activeConversationId, toast]
-  );
-
-  // Persist last-selected agent per task (including Droid)
-  useEffect(() => {
-    try {
-      window.localStorage.setItem(`agent:last:${task.id}`, agent);
-    } catch {}
-  }, [agent, task.id]);
-
-  // Track agent switching
-  const prevAgentRef = React.useRef<Agent | null>(null);
-  useEffect(() => {
-    if (prevAgentRef.current && prevAgentRef.current !== agent) {
-      void (async () => {
-        const { captureTelemetry } = await import('../lib/telemetryClient');
-        captureTelemetry('task_agent_switched', { agent });
-      })();
-    }
-    prevAgentRef.current = agent;
-  }, [agent]);
-
-  useEffect(() => {
-    const installed = currentAgentStatus?.installed === true;
-    setIsAgentInstalled(installed);
-  }, [agent, currentAgentStatus]);
-
-  useEffect(() => {
-    let cancelled = false;
-    let refreshCheckRequested = false;
-    const api: any = (window as any).electronAPI;
-
-    const applyStatuses = (statuses: Record<string, any> | undefined | null) => {
-      if (!statuses) return;
-      setAgentStatuses(statuses);
-      if (cancelled) return;
-      const installed = statuses?.[agent]?.installed === true;
-      setIsAgentInstalled(installed);
-    };
-
-    const maybeRefreshAgentStatus = async (statuses?: Record<string, any> | undefined | null) => {
-      if (cancelled || refreshCheckRequested) return;
-      if (!api?.getProviderStatuses) return;
-
-      const status = statuses?.[agent];
-      const hasEntry = Boolean(status);
-      const isInstalled = status?.installed === true;
-      const lastChecked =
-        typeof status?.lastChecked === 'number' && Number.isFinite(status.lastChecked)
-          ? status.lastChecked
-          : 0;
-      const isStale = !lastChecked || Date.now() - lastChecked > 5 * 60 * 1000;
-
-      if (hasEntry && isInstalled && !isStale) return;
-
-      refreshCheckRequested = true;
-      try {
-        const refreshed = await api.getProviderStatuses({ refresh: true, providers: [agent] });
-        if (cancelled) return;
-        if (refreshed?.success) {
-          applyStatuses(refreshed.statuses ?? {});
-        }
-      } catch (error) {
-        console.error('Agent status refresh failed', error);
-      }
-    };
-
-    const load = async () => {
-      if (!api?.getProviderStatuses) {
-        setIsAgentInstalled(false);
-        return;
-      }
-      try {
-        const res = await api.getProviderStatuses();
-        if (cancelled) return;
-        if (res?.success) {
-          applyStatuses(res.statuses ?? {});
-          void maybeRefreshAgentStatus(res.statuses);
-        } else {
-          setIsAgentInstalled(false);
-        }
-      } catch (error) {
-        if (!cancelled) setIsAgentInstalled(false);
-        console.error('Agent status load failed', error);
-      }
-    };
-
-    const off =
-      api?.onProviderStatusUpdated?.((payload: { providerId: string; status: any }) => {
-        if (!payload?.providerId) return;
-        setAgentStatuses((prev) => {
-          const next = { ...prev, [payload.providerId]: payload.status };
-          return next;
-        });
-        if (payload.providerId === agent) {
-          setIsAgentInstalled(payload.status?.installed === true);
-        }
-      }) || null;
-
-    void load();
-
-    return () => {
-      cancelled = true;
-      off?.();
-    };
-  }, [agent]);
-
-  // Switch active chat/agent via global shortcuts (Cmd+Shift+J/K)
-  useEffect(() => {
-    const handleAgentSwitch = (event: Event) => {
-      const customEvent = event as CustomEvent<{ direction: 'next' | 'prev' }>;
-      if (conversations.length <= 1) return;
-      const direction = customEvent.detail?.direction;
-      if (!direction) return;
-
-      const currentIndex = conversations.findIndex((c) => c.id === activeConversationId);
-      if (currentIndex === -1) return;
-
-      let newIndex: number;
-      if (direction === 'prev') {
-        newIndex = currentIndex <= 0 ? conversations.length - 1 : currentIndex - 1;
-      } else {
-        newIndex = (currentIndex + 1) % conversations.length;
-      }
-
-      const newConversation = conversations[newIndex];
-      if (newConversation) {
-        handleSwitchChat(newConversation.id);
-      }
-    };
-
-    window.addEventListener('emdash:switch-agent', handleAgentSwitch);
-    return () => {
-      window.removeEventListener('emdash:switch-agent', handleAgentSwitch);
-    };
-  }, [conversations, activeConversationId, handleSwitchChat]);
-
-  // Close active chat tab on Cmd+W
-  useEffect(() => {
-    const handleCloseActiveChat = () => {
-      if (activeConversationId) {
-        handleCloseChat(activeConversationId);
-      }
-    };
-    window.addEventListener('emdash:close-active-chat', handleCloseActiveChat);
-    return () => window.removeEventListener('emdash:close-active-chat', handleCloseActiveChat);
-  }, [activeConversationId, handleCloseChat]);
-
-  const isTerminal = agentMeta[agent]?.terminalOnly === true;
-  const autoApproveEnabled =
-    Boolean(task.metadata?.autoApprove) && Boolean(agentMeta[agent]?.autoApproveFlag);
-
-  const isMainConversation = activeConversationId === mainConversationId;
-
-  const initialInjection = useMemo(() => {
-    if (!isTerminal) return null;
-    // Only inject into the main conversation — secondary chats should not
-    // receive the task's initial prompt or linked issue context.
-    if (!isMainConversation) return null;
-    const md = task.metadata || null;
-    const p = (md?.initialPrompt || '').trim();
-    if (p) return p;
-    const issue = md?.linearIssue;
-    if (issue) {
-      const parts: string[] = [];
-      const line1 = `Linked Linear issue: ${issue.identifier}${issue.title ? ` — ${issue.title}` : ''}`;
-      parts.push(line1);
-      const details: string[] = [];
-      if (issue.state?.name) details.push(`State: ${issue.state.name}`);
-      if (issue.assignee?.displayName || issue.assignee?.name)
-        details.push(`Assignee: ${issue.assignee?.displayName || issue.assignee?.name}`);
-      if (issue.team?.key) details.push(`Team: ${issue.team.key}`);
-      if (issue.project?.name) details.push(`Project: ${issue.project.name}`);
-      if (details.length) parts.push(`Details: ${details.join(' • ')}`);
-      if (issue.url) parts.push(`URL: ${issue.url}`);
-      const desc = (issue as any)?.description;
-      if (typeof desc === 'string' && desc.trim()) {
-        const trimmed = desc.trim();
-        const max = 1500;
-        const body = trimmed.length > max ? trimmed.slice(0, max) + '\n…' : trimmed;
-        parts.push('', 'Issue Description:', body);
-      }
-      const linearContent = parts.join('\n');
-      // Prepend comments if any
-      if (commentsContext) {
-        return `The user has left the following comments on the code changes:\n\n${commentsContext}\n\n${linearContent}`;
-      }
-      return linearContent;
-    }
-
-    const gh = (md as any)?.githubIssue as
-      | {
-          number: number;
-          title?: string;
-          url?: string;
-          state?: string;
-          assignees?: any[];
-          labels?: any[];
-          body?: string;
-        }
-      | undefined;
-    if (gh) {
-      const parts: string[] = [];
-      const line1 = `Linked GitHub issue: #${gh.number}${gh.title ? ` — ${gh.title}` : ''}`;
-      parts.push(line1);
-      const details: string[] = [];
-      if (gh.state) details.push(`State: ${gh.state}`);
-      try {
-        const as = Array.isArray(gh.assignees)
-          ? gh.assignees
-              .map((a: any) => a?.name || a?.login)
-              .filter(Boolean)
-              .join(', ')
-          : '';
-        if (as) details.push(`Assignees: ${as}`);
-      } catch {}
-      try {
-        const ls = Array.isArray(gh.labels)
-          ? gh.labels
-              .map((l: any) => l?.name)
-              .filter(Boolean)
-              .join(', ')
-          : '';
-        if (ls) details.push(`Labels: ${ls}`);
-      } catch {}
-      if (details.length) parts.push(`Details: ${details.join(' • ')}`);
-      if (gh.url) parts.push(`URL: ${gh.url}`);
-      const body = typeof gh.body === 'string' ? gh.body.trim() : '';
-      if (body) {
-        const max = 1500;
-        const clipped = body.length > max ? body.slice(0, max) + '\n…' : body;
-        parts.push('', 'Issue Description:', clipped);
-      }
-      const ghContent = parts.join('\n');
-      // Prepend comments if any
-      if (commentsContext) {
-        return `The user has left the following comments on the code changes:\n\n${commentsContext}\n\n${ghContent}`;
-      }
-      return ghContent;
-    }
-
-    const j = md?.jiraIssue as any;
-    if (j) {
-      const lines: string[] = [];
-      const l1 = `Linked Jira issue: ${j.key}${j.summary ? ` — ${j.summary}` : ''}`;
-      lines.push(l1);
-      const details: string[] = [];
-      if (j.status?.name) details.push(`Status: ${j.status.name}`);
-      if (j.assignee?.displayName || j.assignee?.name)
-        details.push(`Assignee: ${j.assignee?.displayName || j.assignee?.name}`);
-      if (j.project?.key) details.push(`Project: ${j.project.key}`);
-      if (details.length) lines.push(`Details: ${details.join(' • ')}`);
-      if (j.url) lines.push(`URL: ${j.url}`);
-      const desc = typeof j.description === 'string' ? j.description.trim() : '';
-      if (desc) {
-        const max = 1500;
-        const clipped = desc.length > max ? desc.slice(0, max) + '\n…' : desc;
-        lines.push('', 'Issue Description:', clipped);
-      }
-      const jiraContent = lines.join('\n');
-      // Prepend comments if any
-      if (commentsContext) {
-        return `The user has left the following comments on the code changes:\n\n${commentsContext}\n\n${jiraContent}`;
-      }
-      return jiraContent;
-    }
-
-    // If we have comments but no other context, return just the comments
-    if (commentsContext) {
-      return `The user has left the following comments on the code changes:\n\n${commentsContext}`;
-    }
-
-    return null;
-  }, [isTerminal, isMainConversation, task.metadata, commentsContext]);
-
-  // Only use keystroke injection for agents WITHOUT CLI flag support,
-  // or agents that explicitly opt into it (useKeystrokeInjection: true).
-  // Agents with initialPromptFlag use CLI arg injection via TerminalPane instead.
-  useInitialPromptInjection({
-    taskId: task.id,
-    providerId: agent,
-    prompt: initialInjection,
-    enabled:
-      isTerminal &&
-      (agentMeta[agent]?.initialPromptFlag === undefined ||
-        agentMeta[agent]?.useKeystrokeInjection === true),
-  });
-
-  // Ensure an agent is stored for this task so fallbacks can subscribe immediately
-  useEffect(() => {
-    try {
-      localStorage.setItem(`taskAgent:${task.id}`, agent);
-    } catch {}
-  }, [agent, task.id]);
-
-  // Auto-rename task from first terminal message (only if name was auto-generated)
-  const handleFirstMessage = useCallback(
-    (message: string) => {
-      if (!project || !onRenameTask) return;
-      // Only rename if this task's name was auto-generated
-      if (!task.metadata?.nameGenerated) return;
-      // Skip multi-agent tasks
-      if (task.metadata?.multiAgent?.enabled) return;
-
-      const generated = generateTaskName(message);
-      if (!generated) return;
-
-      const existingNames = (project.tasks || []).map((t) => t.name);
-      const uniqueName = ensureUniqueTaskName(generated, existingNames);
-      void onRenameTask(project, task, uniqueName);
-    },
-    [project, task, onRenameTask]
-  );
-
-  // Whether to enable first-message capture for this task
-  const shouldCaptureFirstMessage = !!(
-    task.metadata?.nameGenerated &&
-    !task.metadata?.multiAgent?.enabled &&
-    project &&
-    onRenameTask
-  );
-
-  if (!isTerminal) {
-    return null;
-  }
-
-  return (
-    <TaskScopeProvider value={{ taskId: task.id, taskPath: task.path }}>
-      <div
-        className={`flex h-full flex-col ${effectiveTheme === 'dark-black' ? 'bg-black' : 'bg-card'} ${className}`}
-      >
-        <CreateChatModal
-          isOpen={showCreateChatModal}
-          onClose={() => setShowCreateChatModal(false)}
-          onCreateChat={handleCreateChat}
-          installedAgents={installedAgents}
-        />
-
-        <div className="flex min-h-0 flex-1 flex-col">
-          <div className="px-6 pt-4">
-            <div className="mx-auto max-w-4xl space-y-2">
-              <div className="flex items-center gap-2">
-                <div
-                  ref={tabsContainerRef}
-                  className={cn(
-                    'flex min-w-0 items-center gap-2 overflow-x-auto [scrollbar-width:none] [&::-webkit-scrollbar]:hidden',
-                    tabsOverflow &&
-                      '[mask-image:linear-gradient(to_right,black_calc(100%_-_16px),transparent)]'
-                  )}
-                >
-                  {sortedConversations.map((conv, index) => {
-                    const isActive = conv.id === activeConversationId;
-                    const convAgent = conv.provider || agent;
-                    const config = agentConfig[convAgent as Agent];
-                    const agentName = config?.name || convAgent;
-                    const isBusy = busyByConversationId[conv.id] === true;
-
-                    // Count how many chats use the same agent up to this point
-                    const sameAgentCount = sortedConversations
-                      .slice(0, index + 1)
-                      .filter((c) => (c.provider || agent) === convAgent).length;
-                    const showNumber =
-                      sortedConversations.filter((c) => (c.provider || agent) === convAgent)
-                        .length > 1;
-
-                    return (
-                      <button
-                        key={conv.id}
-                        onClick={() => handleSwitchChat(conv.id)}
-                        aria-current={isActive ? 'page' : undefined}
-                        className={cn(
-                          'inline-flex h-7 flex-shrink-0 items-center gap-1.5 rounded-md border border-border px-2.5 text-xs font-medium transition-colors',
-                          'ring-offset-background focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2',
-                          isActive
-                            ? 'bg-background text-foreground shadow-sm'
-                            : 'bg-muted text-muted-foreground hover:bg-muted/80 hover:text-foreground'
-                        )}
-                        title={`${agentName}${showNumber ? ` (${sameAgentCount})` : ''}`}
-                      >
-                        {config?.logo && (
-                          <AgentLogo
-                            logo={config.logo}
-                            alt={config.alt}
-                            isSvg={config.isSvg}
-                            invertInDark={config.invertInDark}
-                            className="h-3.5 w-3.5 flex-shrink-0"
-                          />
-                        )}
-                        <span className="max-w-[10rem] truncate">
-                          {agentName}
-                          {showNumber && <span className="ml-1 opacity-60">{sameAgentCount}</span>}
-                        </span>
-                        {isBusy && conversations.length > 1 ? (
-                          <Spinner
-                            size="sm"
-                            className={cn(
-                              'h-3 w-3 flex-shrink-0',
-                              isActive ? 'text-foreground' : 'text-muted-foreground'
-                            )}
-                          />
-                        ) : null}
-                        {conversations.length > 1 && (
-                          <span
-                            role="button"
-                            tabIndex={0}
-                            onClick={(e) => {
-                              e.stopPropagation();
-                              handleCloseChat(conv.id);
-                            }}
-                            onKeyDown={(e) => {
-                              if (e.key === 'Enter' || e.key === ' ') {
-                                e.preventDefault();
-                                e.stopPropagation();
-                                handleCloseChat(conv.id);
-                              }
-                            }}
-                            className="ml-1 rounded hover:bg-background/20"
-                            title="Close chat"
-                          >
-                            <X className="h-3 w-3" />
-                          </span>
-                        )}
-                      </button>
-                    );
-                  })}
-                </div>
-                <button
-                  onClick={handleCreateNewChat}
-                  className="inline-flex h-7 w-7 flex-shrink-0 items-center justify-center rounded-md border border-border bg-muted transition-colors hover:bg-muted/80"
-                  title="New Chat"
-                >
-                  <Plus className="h-3.5 w-3.5" />
-                </button>
-                <div className="ml-auto flex flex-shrink-0 items-center gap-2">
-                  {(task.metadata?.linearIssue ||
-                    task.metadata?.githubIssue ||
-                    task.metadata?.jiraIssue) && (
-                    <TaskContextBadges
-                      taskId={task.id}
-                      linearIssue={task.metadata?.linearIssue || null}
-                      githubIssue={task.metadata?.githubIssue || null}
-                      jiraIssue={task.metadata?.jiraIssue || null}
-                    />
-                  )}
-                  {autoApproveEnabled && (
-                    <span
-                      className="inline-flex h-7 select-none items-center gap-1.5 rounded-md border border-border bg-muted px-2.5 text-xs font-medium text-foreground"
-                      title="Auto-approve enabled"
-                    >
-                      <span className="h-1.5 w-1.5 rounded-full bg-orange-500" />
-                      Auto-approve
-                    </span>
-                  )}
-                </div>
-              </div>
-              {(() => {
-                if (isAgentInstalled === false) {
-                  return (
-                    <InstallBanner
-                      agent={agent as any}
-                      terminalId={terminalId}
-                      installCommand={getInstallCommandForProvider(agent as any)}
-                      onRunInstall={runInstallCommand}
-                      onOpenExternal={(url) => window.electronAPI.openExternal(url)}
-                      mode="missing"
-                    />
-                  );
-                }
-                if (cliStartError) {
-                  return (
-                    <InstallBanner
-                      agent={agent as any}
-                      terminalId={terminalId}
-                      installCommand={null}
-                      onRunInstall={runInstallCommand}
-                      onOpenExternal={(url) => window.electronAPI.openExternal(url)}
-                      mode="start_failed"
-                      details={cliStartError}
-                    />
-                  );
-                }
-                return null;
-              })()}
-            </div>
-          </div>
-          <div className="mt-4 min-h-0 flex-1 px-6">
-            <div
-              className={`mx-auto h-full max-w-4xl overflow-hidden rounded-md ${
-                agent === 'charm'
-                  ? effectiveTheme === 'dark-black'
-                    ? 'bg-black'
-                    : effectiveTheme === 'dark'
-                      ? 'bg-card'
-                      : 'bg-white'
-                  : agent === 'mistral'
-                    ? effectiveTheme === 'dark' || effectiveTheme === 'dark-black'
-                      ? effectiveTheme === 'dark-black'
-                        ? 'bg-[#141820]'
-                        : 'bg-[#202938]'
-                      : 'bg-white'
-                    : ''
-              }`}
-            >
-              {/* Wait for conversations to load to ensure stable terminalId */}
-              {conversationsLoaded && (
-                <TerminalPane
-                  ref={terminalRef}
-                  id={terminalId}
-                  cwd={terminalCwd}
-                  remote={
-                    projectRemoteConnectionId
-                      ? { connectionId: projectRemoteConnectionId }
-                      : undefined
-                  }
-                  providerId={agent}
-                  autoApprove={autoApproveEnabled}
-                  env={taskEnv}
-                  keepAlive={true}
-                  mapShiftEnterToCtrlJ
-                  disableSnapshots={false}
-                  onActivity={() => {
-                    try {
-                      window.localStorage.setItem(`agent:locked:${task.id}`, agent);
-                    } catch {}
-                  }}
-                  onStartError={(message) => {
-                    setCliStartError(message);
-                  }}
-                  onStartSuccess={() => {
-                    setCliStartError(null);
-                    // Mark initial injection as sent so it won't re-run on restart
-                    if (initialInjection && !task.metadata?.initialInjectionSent) {
-                      void rpc.db.saveTask({
-                        ...task,
-                        metadata: {
-                          ...task.metadata,
-                          initialInjectionSent: true,
-                        },
-                      });
-                    }
-                  }}
-                  variant={
-                    effectiveTheme === 'dark' || effectiveTheme === 'dark-black' ? 'dark' : 'light'
-                  }
-                  themeOverride={
-                    agent === 'charm'
-                      ? {
-                          background:
-                            effectiveTheme === 'dark-black'
-                              ? '#0a0a0a'
-                              : effectiveTheme === 'dark'
-                                ? '#1f2937'
-                                : '#ffffff',
-                          selectionBackground: 'rgba(96, 165, 250, 0.35)',
-                          selectionForeground: effectiveTheme === 'light' ? '#0f172a' : '#f9fafb',
-                        }
-                      : agent === 'mistral'
-                        ? {
-                            background:
-                              effectiveTheme === 'dark-black'
-                                ? '#141820'
-                                : effectiveTheme === 'dark'
-                                  ? '#202938'
-                                  : '#ffffff',
-                            selectionBackground: 'rgba(96, 165, 250, 0.35)',
-                            selectionForeground: effectiveTheme === 'light' ? '#0f172a' : '#f9fafb',
-                          }
-                        : effectiveTheme === 'dark-black'
-                          ? {
-                              background: '#000000',
-                              selectionBackground: 'rgba(96, 165, 250, 0.35)',
-                              selectionForeground: '#f9fafb',
-                            }
-                          : undefined
-                  }
-                  contentFilter={
-                    agent === 'charm' &&
-                    effectiveTheme !== 'dark' &&
-                    effectiveTheme !== 'dark-black'
-                      ? 'invert(1) hue-rotate(180deg) brightness(1.1) contrast(1.05)'
-                      : undefined
-                  }
-                  initialPrompt={
-                    agentMeta[agent]?.initialPromptFlag !== undefined &&
-                    !agentMeta[agent]?.useKeystrokeInjection &&
-                    !task.metadata?.initialInjectionSent
-                      ? (initialInjection ?? undefined)
-                      : undefined
-                  }
-                  onFirstMessage={shouldCaptureFirstMessage ? handleFirstMessage : undefined}
-                  className="h-full w-full"
-                />
-              )}
-            </div>
-          </div>
-        </div>
-      </div>
-    </TaskScopeProvider>
-  );
-};
-
-export default ChatInterface;
diff --git a/src/renderer/components/ChatTabs.tsx b/src/renderer/components/ChatTabs.tsx
deleted file mode 100644
index f62681a47d..0000000000
--- a/src/renderer/components/ChatTabs.tsx
+++ /dev/null
@@ -1,122 +0,0 @@
-import React, { useState } from 'react';
-import { X, Edit2 } from 'lucide-react';
-import { cn } from '@/lib/utils';
-import { agentConfig } from '../lib/agentConfig';
-import AgentLogo from './AgentLogo';
-import type { Agent } from '../types';
-
-interface ChatTab {
-  id: string;
-  title: string;
-  provider?: string | null;
-  isActive: boolean;
-  messageCount?: number;
-}
-
-interface ChatTabsProps {
-  tabs: ChatTab[];
-  activeTabId: string | null;
-  onTabClick: (tabId: string) => void;
-  onCloseTab: (tabId: string) => void;
-  onRenameTab: (tabId: string, newTitle: string) => void;
-  onDuplicateTab?: (tabId: string) => void;
-}
-
-export function ChatTabs({
-  tabs,
-  activeTabId,
-  onTabClick,
-  onCloseTab,
-  onRenameTab,
-}: ChatTabsProps) {
-  const [draggedTab, setDraggedTab] = useState<string | null>(null);
-
-  const handleDragStart = (e: React.DragEvent, tabId: string) => {
-    setDraggedTab(tabId);
-    e.dataTransfer.effectAllowed = 'move';
-  };
-
-  const handleDragOver = (e: React.DragEvent) => {
-    e.preventDefault();
-    e.dataTransfer.dropEffect = 'move';
-  };
-
-  const handleDrop = (e: React.DragEvent, targetTabId: string) => {
-    e.preventDefault();
-    if (draggedTab && draggedTab !== targetTabId) {
-      // TODO: Implement reordering logic
-      // Will reorder ${draggedTab} to position of ${targetTabId}
-    }
-    setDraggedTab(null);
-  };
-
-  const handleRename = (tabId: string, currentTitle: string) => {
-    const newTitle = prompt('Rename chat:', currentTitle);
-    if (newTitle && newTitle.trim() && newTitle !== currentTitle) {
-      onRenameTab(tabId, newTitle.trim());
-    }
-  };
-
-  return (
-    <div className="flex items-center gap-1 overflow-x-auto border-b bg-background/95 px-2 py-1 backdrop-blur">
-      {tabs.map((tab) => {
-        const config = tab.provider ? agentConfig[tab.provider as Agent] : null;
-        return (
-          <div
-            key={tab.id}
-            draggable
-            onDragStart={(e) => handleDragStart(e, tab.id)}
-            onDragOver={handleDragOver}
-            onDrop={(e) => handleDrop(e, tab.id)}
-            className={cn(
-              'group flex cursor-pointer items-center gap-2 rounded-md px-3 py-1.5',
-              'min-w-[120px] max-w-[200px] flex-shrink-0 transition-colors',
-              'hover:bg-muted/80',
-              tab.id === activeTabId && 'bg-primary text-primary-foreground hover:bg-primary/90'
-            )}
-            onClick={() => onTabClick(tab.id)}
-          >
-            {config && (
-              <AgentLogo
-                logo={config.logo}
-                alt={config.alt}
-                isSvg={config.isSvg}
-                invertInDark={config.invertInDark}
-                className="h-4 w-4 flex-shrink-0"
-              />
-            )}
-            <span className="flex-1 truncate text-sm font-medium" title={tab.title}>
-              {tab.title}
-            </span>
-
-            <div className="flex items-center gap-0.5 opacity-0 transition-opacity group-hover:opacity-100">
-              <button
-                onClick={(e) => {
-                  e.stopPropagation();
-                  handleRename(tab.id, tab.title);
-                }}
-                className="rounded p-0.5 hover:bg-background/20"
-                title="Rename chat"
-              >
-                <Edit2 className="h-3 w-3" />
-              </button>
-
-              {tabs.length > 1 && (
-                <button
-                  onClick={(e) => {
-                    e.stopPropagation();
-                    onCloseTab(tab.id);
-                  }}
-                  className="rounded p-0.5 hover:bg-background/20"
-                  title="Close chat"
-                >
-                  <X className="h-3 w-3" />
-                </button>
-              )}
-            </div>
-          </div>
-        );
-      })}
-    </div>
-  );
-}
diff --git a/src/renderer/components/CheckRunsList.tsx b/src/renderer/components/CheckRunsList.tsx
deleted file mode 100644
index 1917eb3237..0000000000
--- a/src/renderer/components/CheckRunsList.tsx
+++ /dev/null
@@ -1,120 +0,0 @@
-import { CheckCircle2, XCircle, Loader2, MinusCircle, ExternalLink } from 'lucide-react';
-import githubIcon from '../../assets/images/github.png';
-import type { CheckRunsStatus, CheckRun, CheckRunBucket } from '../lib/checkRunStatus';
-import { formatCheckDuration } from '../lib/checkRunStatus';
-import { Badge } from './ui/badge';
-
-function BucketIcon({ bucket }: { bucket: CheckRunBucket }) {
-  switch (bucket) {
-    case 'pass':
-      return <CheckCircle2 className="h-3.5 w-3.5 text-emerald-500" />;
-    case 'fail':
-      return <XCircle className="h-3.5 w-3.5 text-red-500" />;
-    case 'pending':
-      return <span className="inline-block h-3.5 w-3.5 rounded-full bg-amber-500" />;
-    case 'skipping':
-    case 'cancel':
-      return <MinusCircle className="h-3.5 w-3.5 text-muted-foreground/60" />;
-  }
-}
-
-function CheckRunItem({ check }: { check: CheckRun }) {
-  const duration = formatCheckDuration(check.startedAt, check.completedAt);
-
-  return (
-    <div className="flex items-center gap-2 px-4 py-2.5">
-      <span className="shrink-0">
-        <BucketIcon bucket={check.bucket} />
-      </span>
-      <img src={githubIcon} alt="" className="h-3.5 w-3.5 shrink-0 dark:invert" />
-      <div className="min-w-0 flex-1">
-        <div className="truncate text-sm text-foreground">{check.name}</div>
-        {check.workflow && (
-          <div className="truncate text-xs text-muted-foreground">{check.workflow}</div>
-        )}
-      </div>
-      <div className="flex shrink-0 items-center gap-2">
-        {duration && <span className="text-xs text-muted-foreground">{duration}</span>}
-        {check.link && (
-          <button
-            type="button"
-            className="text-muted-foreground transition-colors hover:text-foreground"
-            title="Open in GitHub"
-            onClick={() => check.link && window.electronAPI?.openExternal?.(check.link)}
-          >
-            <ExternalLink className="h-3.5 w-3.5" />
-          </button>
-        )}
-      </div>
-    </div>
-  );
-}
-
-interface ChecksPanelProps {
-  status: CheckRunsStatus | null;
-  isLoading: boolean;
-  hasPr: boolean;
-  hideSummary?: boolean;
-}
-
-export function ChecksPanel({ status, isLoading, hasPr, hideSummary }: ChecksPanelProps) {
-  if (!hasPr) {
-    return (
-      <div className="flex flex-1 items-center justify-center p-6 text-center">
-        <p className="text-sm text-muted-foreground">No PR exists for this branch.</p>
-      </div>
-    );
-  }
-
-  if (isLoading && !status) {
-    return (
-      <div className="flex flex-1 items-center justify-center p-6">
-        <Loader2 className="h-5 w-5 animate-spin text-muted-foreground" />
-      </div>
-    );
-  }
-
-  if (!status || !status.checks || status.checks.length === 0) {
-    return (
-      <div className="flex flex-1 items-center justify-center p-6 text-center">
-        <div>
-          <p className="text-sm text-muted-foreground">No CI checks found for this repository</p>
-        </div>
-      </div>
-    );
-  }
-
-  const { summary } = status;
-
-  return (
-    <div className="flex flex-col">
-      {!hideSummary && (
-        <div className="flex items-center gap-1.5 border-b border-border px-4 py-2">
-          {summary.passed > 0 && (
-            <Badge variant="outline">
-              <CheckCircle2 className="h-3 w-3 text-emerald-500" />
-              {summary.passed} passed
-            </Badge>
-          )}
-          {summary.failed > 0 && (
-            <Badge variant="outline">
-              <XCircle className="h-3 w-3 text-red-500" />
-              {summary.failed} failed
-            </Badge>
-          )}
-          {summary.pending > 0 && (
-            <Badge variant="outline">
-              <Loader2 className="h-3 w-3 animate-spin" />
-              {summary.pending} pending
-            </Badge>
-          )}
-        </div>
-      )}
-      <div className="min-h-0 flex-1 overflow-y-auto">
-        {status.checks.map((check, i) => (
-          <CheckRunItem key={`${check.name}-${i}`} check={check} />
-        ))}
-      </div>
-    </div>
-  );
-}
diff --git a/src/renderer/components/CliAgentsList.tsx b/src/renderer/components/CliAgentsList.tsx
deleted file mode 100644
index 0b5a9dd0e4..0000000000
--- a/src/renderer/components/CliAgentsList.tsx
+++ /dev/null
@@ -1,124 +0,0 @@
-import React, { useMemo, useState } from 'react';
-import { Settings2, Sparkles } from 'lucide-react';
-import IntegrationRow from './IntegrationRow';
-import CustomCommandModal from './CustomCommandModal';
-import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from './ui/tooltip';
-import { CliAgentStatus } from '../types/connections';
-import { PROVIDERS } from '@shared/providers/registry';
-import { agentAssets } from '@/providers/assets';
-
-interface CliAgentsListProps {
-  agents: CliAgentStatus[];
-  isLoading: boolean;
-  error?: string | null;
-}
-
-export const BASE_CLI_AGENTS: CliAgentStatus[] = PROVIDERS.filter(
-  (provider) => provider.detectable !== false
-).map((provider) => ({
-  id: provider.id,
-  name: provider.name,
-  status: 'missing' as const,
-  docUrl: provider.docUrl ?? null,
-  installCommand: provider.installCommand ?? null,
-}));
-
-const ICON_BUTTON =
-  'rounded-md p-1.5 text-muted-foreground transition hover:bg-muted/40 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 focus-visible:ring-offset-background';
-
-const renderAgentRow = (agent: CliAgentStatus, onSettingsClick: (id: string) => void) => {
-  const logo = agentAssets[agent.id as keyof typeof agentAssets]?.logo;
-
-  const handleNameClick =
-    agent.docUrl && window?.electronAPI?.openExternal
-      ? async () => {
-          try {
-            await window.electronAPI.openExternal(agent.docUrl!);
-          } catch (openError) {
-            console.error(`Failed to open ${agent.name} docs:`, openError);
-          }
-        }
-      : undefined;
-
-  const isDetected = agent.status === 'connected';
-  const indicatorClass = isDetected ? 'bg-emerald-500' : 'bg-muted-foreground/50';
-  const statusLabel = isDetected ? 'Detected' : 'Not detected';
-
-  return (
-    <IntegrationRow
-      key={agent.id}
-      logoSrc={logo}
-      icon={
-        logo ? undefined : (
-          <Sparkles className="h-3.5 w-3.5 text-muted-foreground" aria-hidden="true" />
-        )
-      }
-      name={agent.name}
-      onNameClick={handleNameClick}
-      status={agent.status}
-      statusLabel={statusLabel}
-      showStatusPill={false}
-      installCommand={agent.installCommand}
-      middle={
-        <span className="flex items-center gap-2 text-sm text-muted-foreground">
-          <span className={`h-1.5 w-1.5 rounded-full ${indicatorClass}`} />
-          {statusLabel}
-        </span>
-      }
-      rightExtra={
-        isDetected ? (
-          <TooltipProvider delayDuration={150}>
-            <Tooltip>
-              <TooltipTrigger asChild>
-                <button
-                  type="button"
-                  onClick={() => onSettingsClick(agent.id)}
-                  className={ICON_BUTTON}
-                  aria-label={`${agent.name} execution settings`}
-                >
-                  <Settings2 className="h-4 w-4" aria-hidden="true" />
-                </button>
-              </TooltipTrigger>
-              <TooltipContent side="top" className="text-xs">
-                Execution settings
-              </TooltipContent>
-            </Tooltip>
-          </TooltipProvider>
-        ) : null
-      }
-    />
-  );
-};
-
-export const CliAgentsList: React.FC<CliAgentsListProps> = (props) => {
-  const [customModalAgentId, setCustomModalAgentId] = useState<string | null>(null);
-
-  const sortedAgents = useMemo(() => {
-    const source = props.agents.length ? props.agents : BASE_CLI_AGENTS;
-    return [...source].sort((a, b) => {
-      if (a.status === 'connected' && b.status !== 'connected') return -1;
-      if (b.status === 'connected' && a.status !== 'connected') return 1;
-      return a.name.localeCompare(b.name);
-    });
-  }, [props.agents]);
-
-  return (
-    <div className="space-y-3">
-      {props.error ? (
-        <div className="rounded-md border border-red-200/70 bg-red-500/10 px-3 py-2 text-xs text-red-600 dark:border-red-500/40 dark:text-red-400">
-          {props.error}
-        </div>
-      ) : null}
-
-      <div className="space-y-2">
-        {sortedAgents.map((agent) => renderAgentRow(agent, setCustomModalAgentId))}
-      </div>
-
-      <CustomCommandModal
-        isOpen={customModalAgentId !== null}
-        onClose={() => setCustomModalAgentId(null)}
-        providerId={customModalAgentId ?? ''}
-      />
-    </div>
-  );
-};
diff --git a/src/renderer/components/CloneFromUrlModal.tsx b/src/renderer/components/CloneFromUrlModal.tsx
deleted file mode 100644
index 5bb069ccec..0000000000
--- a/src/renderer/components/CloneFromUrlModal.tsx
+++ /dev/null
@@ -1,268 +0,0 @@
-import React, { useCallback, useEffect, useState } from 'react';
-import { Button } from './ui/button';
-import { DialogContent, DialogHeader, DialogTitle } from './ui/dialog';
-import { Input } from './ui/input';
-import { Label } from './ui/label';
-import { Spinner } from './ui/spinner';
-import { Separator } from './ui/separator';
-import { rpc } from '@/lib/rpc';
-
-interface CloneFromUrlModalProps {
-  onClose: () => void;
-  onSuccess: (projectPath: string) => void;
-}
-
-export const CloneFromUrlModal: React.FC<CloneFromUrlModalProps> = ({ onClose, onSuccess }) => {
-  const [repoUrl, setRepoUrl] = useState('');
-  const [directoryName, setDirectoryName] = useState('');
-  const [isCloning, setIsCloning] = useState(false);
-  const [error, setError] = useState<string | null>(null);
-  const [progress, setProgress] = useState<string>('');
-  const [touched, setTouched] = useState(false);
-
-  // Clean URL by removing hash, query params, and trailing slashes
-  const cleanUrl = useCallback((url: string): string => {
-    return url
-      .trim()
-      .replace(/#.*$/, '') // Remove hash/fragment
-      .replace(/\?.*$/, '') // Remove query parameters
-      .replace(/\/+$/, ''); // Remove trailing slashes
-  }, []);
-
-  // Parse repo name from URL for directory name suggestion
-  useEffect(() => {
-    if (!repoUrl.trim()) {
-      setDirectoryName('');
-      return;
-    }
-
-    try {
-      const cleanedUrl = cleanUrl(repoUrl);
-      // Try to extract repo name from various URL formats
-      let repoName = '';
-
-      // Handle https://host/owner/repo.git or https://host/owner/repo
-      const httpsMatch = cleanedUrl.match(/^https?:\/\/[^/]+\/([^/]+)\/([^/]+?)(?:\.git)?\/?$/i);
-      if (httpsMatch) {
-        repoName = httpsMatch[2];
-      } else {
-        // Handle git@github.com:owner/repo.git
-        const sshMatch = cleanedUrl.match(/:([^/]+)\/([^/]+?)(?:\.git)?$/);
-        if (sshMatch) {
-          repoName = sshMatch[2];
-        } else {
-          // Handle ssh://git@host/path/to/repo.git
-          const sshUrlMatch = cleanedUrl.match(/\/([^/]+?)(?:\.git)?\/?$/);
-          if (sshUrlMatch) {
-            repoName = sshUrlMatch[1];
-          } else {
-            // Fallback: take last segment after splitting by / or :
-            const segments = cleanedUrl.split(/[/:]/).filter(Boolean);
-            if (segments.length > 0) {
-              repoName = segments[segments.length - 1].replace(/\.git$/, '');
-            }
-          }
-        }
-      }
-
-      if (repoName && !directoryName) {
-        setDirectoryName(repoName);
-      }
-    } catch (e) {
-      // Ignore parsing errors
-    }
-  }, [repoUrl, directoryName, cleanUrl]);
-
-  // Reset form on mount
-  useEffect(() => {
-    setRepoUrl('');
-    setDirectoryName('');
-    setError(null);
-    setProgress('');
-    setTouched(false);
-  }, []);
-
-  const validateUrl = (url: string): { valid: boolean; error?: string } => {
-    const cleaned = cleanUrl(url);
-    if (!cleaned) {
-      return { valid: false, error: 'Repository URL is required' };
-    }
-
-    const trimmed = cleaned;
-
-    // Check for common Git URL patterns
-    const patterns = [
-      /^https?:\/\/.+/i, // https:// or http://
-      /^git@.+:.+/i, // git@host:path
-      /^ssh:\/\/.+/i, // ssh://
-    ];
-
-    const isValid = patterns.some((pattern) => pattern.test(trimmed));
-    if (!isValid) {
-      return {
-        valid: false,
-        error: 'Please enter a valid Git URL (https://, git@, or ssh://)',
-      };
-    }
-
-    return { valid: true };
-  };
-
-  const handleSubmit = useCallback(
-    async (e: React.FormEvent) => {
-      e.preventDefault();
-      setTouched(true);
-      setError(null);
-
-      const cleanedUrl = cleanUrl(repoUrl);
-      const validation = validateUrl(cleanedUrl);
-      if (!validation.valid) {
-        setError(validation.error || 'Invalid URL');
-        return;
-      }
-
-      if (!directoryName.trim()) {
-        setError('Directory name is required');
-        return;
-      }
-
-      setIsCloning(true);
-      setProgress('Cloning repository...');
-
-      try {
-        // Get default directory from settings
-        const settings = await rpc.appSettings.get();
-        const defaultDir = settings?.projects?.defaultDirectory
-          ? settings.projects.defaultDirectory
-          : '~/emdash-projects';
-        const localPath = `${defaultDir}/${directoryName.trim()}`;
-
-        setProgress(`Cloning to ${localPath}...`);
-
-        const cloneResult = await window.electronAPI.githubCloneRepository(cleanedUrl, localPath);
-
-        if (!cloneResult.success) {
-          throw new Error(cloneResult.error || 'Failed to clone repository');
-        }
-
-        setProgress('Repository cloned successfully');
-        await new Promise((resolve) => setTimeout(resolve, 500)); // Brief pause for UX
-
-        onSuccess(localPath);
-        onClose();
-      } catch (err) {
-        const errorMessage = err instanceof Error ? err.message : 'Failed to clone repository';
-        setError(errorMessage);
-        setProgress('');
-      } finally {
-        setIsCloning(false);
-      }
-    },
-    [repoUrl, directoryName, onSuccess, onClose]
-  );
-
-  return (
-    <DialogContent
-      className="max-w-md"
-      onInteractOutside={(e) => {
-        if (isCloning) e.preventDefault();
-      }}
-      onEscapeKeyDown={(e) => {
-        if (isCloning) e.preventDefault();
-      }}
-    >
-      <DialogHeader>
-        <DialogTitle>Clone from URL</DialogTitle>
-      </DialogHeader>
-
-      <Separator />
-
-      {isCloning && progress ? (
-        <div className="space-y-4 py-4">
-          <div className="flex items-center gap-3">
-            <Spinner size="sm" />
-            <div className="flex-1">
-              <p className="text-sm font-medium">{progress}</p>
-              <p className="text-xs text-muted-foreground">This may take a few moments...</p>
-            </div>
-          </div>
-        </div>
-      ) : (
-        <form onSubmit={handleSubmit} className="space-y-4">
-          <div className="mt-2">
-            <Label htmlFor="repo-url" className="mb-2 block">
-              Repository URL *
-            </Label>
-            <Input
-              id="repo-url"
-              value={repoUrl}
-              onChange={(e) => setRepoUrl(e.target.value)}
-              onBlur={() => setTouched(true)}
-              placeholder="https://github.com/owner/repo.git or any Git URL"
-              className={`w-full ${
-                touched && error
-                  ? 'border-destructive focus-visible:border-destructive focus-visible:ring-destructive'
-                  : ''
-              }`}
-              aria-invalid={touched && !!error}
-              disabled={isCloning}
-              autoFocus
-            />
-            {touched && error && !repoUrl.trim() && (
-              <p className="mt-1 text-xs text-destructive">{error}</p>
-            )}
-          </div>
-
-          <div>
-            <Label htmlFor="directory-name" className="mb-2 block">
-              Directory name *
-            </Label>
-            <Input
-              id="directory-name"
-              value={directoryName}
-              onChange={(e) => setDirectoryName(e.target.value)}
-              placeholder="my-project"
-              disabled={isCloning}
-              className="w-full"
-            />
-            <p className="mt-1 pl-0.5 text-[10px] text-muted-foreground">
-              Local directory name (auto-detected from URL)
-            </p>
-          </div>
-
-          {error && repoUrl.trim() && (
-            <div className="rounded-md bg-destructive/10 p-3 text-sm text-destructive">
-              {error.split('\n').map((line, i) => (
-                <p key={i}>{line}</p>
-              ))}
-            </div>
-          )}
-
-          <div className="flex justify-end gap-2">
-            <Button type="button" variant="outline" onClick={onClose} disabled={isCloning}>
-              Cancel
-            </Button>
-            <Button
-              type="submit"
-              disabled={
-                !cleanUrl(repoUrl) ||
-                !directoryName.trim() ||
-                isCloning ||
-                (touched && !validateUrl(cleanUrl(repoUrl)).valid)
-              }
-            >
-              {isCloning ? (
-                <>
-                  <Spinner size="sm" className="mr-2" />
-                  Cloning...
-                </>
-              ) : (
-                'Clone Repository'
-              )}
-            </Button>
-          </div>
-        </form>
-      )}
-    </DialogContent>
-  );
-};
diff --git a/src/renderer/components/CommandPalette.tsx b/src/renderer/components/CommandPalette.tsx
deleted file mode 100644
index d2835abc6e..0000000000
--- a/src/renderer/components/CommandPalette.tsx
+++ /dev/null
@@ -1,444 +0,0 @@
-import React, { useCallback, useEffect, useMemo, useState } from 'react';
-import { createPortal } from 'react-dom';
-import { AnimatePresence, motion, useReducedMotion } from 'motion/react';
-import { Command } from 'cmdk';
-import {
-  Search,
-  FolderOpen,
-  Home,
-  Settings,
-  Keyboard,
-  PanelLeft,
-  PanelRight,
-  GitBranch,
-  CornerDownLeft,
-  ArrowUp,
-  ArrowDown,
-  ArrowBigUp,
-  Command as CommandIcon,
-  Option,
-  Palette,
-} from 'lucide-react';
-import {
-  APP_SHORTCUTS,
-  normalizeShortcutKey,
-  type ShortcutSettingsKey,
-} from '../hooks/useKeyboardShortcuts';
-import type { ShortcutModifier } from '../types/shortcuts';
-import { useKeyboardSettings } from '../contexts/KeyboardSettingsContext';
-
-interface CommandPaletteProps {
-  isOpen: boolean;
-  onClose: () => void;
-  projects?: Array<{
-    id: string;
-    name: string;
-    path: string;
-    tasks?: Array<{
-      id: string;
-      name: string;
-      branch: string;
-    }>;
-  }>;
-  onSelectProject?: (projectId: string) => void;
-  onSelectTask?: (projectId: string, taskId: string) => void;
-  onOpenSettings?: () => void;
-  onOpenKeyboardShortcuts?: () => void;
-  onToggleLeftSidebar?: () => void;
-  onToggleRightSidebar?: () => void;
-  onToggleTheme?: () => void;
-  onGoHome?: () => void;
-  onOpenProject?: () => void;
-}
-
-type CommandItem = {
-  id: string;
-  label: string;
-  description?: string;
-  icon: React.ReactNode;
-  group: string;
-  keywords?: string[];
-  shortcut?: {
-    key: string;
-    modifier?: ShortcutModifier;
-  };
-  onSelect: () => void;
-};
-
-const CommandPalette: React.FC<CommandPaletteProps> = ({
-  isOpen,
-  onClose,
-  projects = [],
-  onSelectProject,
-  onSelectTask,
-  onOpenSettings,
-  onOpenKeyboardShortcuts,
-  onToggleLeftSidebar,
-  onToggleRightSidebar,
-  onToggleTheme,
-  onGoHome,
-  onOpenProject,
-}) => {
-  const [search, setSearch] = useState('');
-  const { getShortcut } = useKeyboardSettings();
-  const shouldReduceMotion = useReducedMotion();
-
-  const getEffectiveShortcut = useCallback(
-    (
-      settingsKey: ShortcutSettingsKey,
-      fallback: { key: string; modifier?: ShortcutModifier }
-    ): { key: string; modifier?: ShortcutModifier } => {
-      const binding = getShortcut(settingsKey);
-      if (binding.key && binding.modifier) {
-        return { key: normalizeShortcutKey(binding.key), modifier: binding.modifier };
-      }
-      return { key: normalizeShortcutKey(fallback.key), modifier: fallback.modifier };
-    },
-    [getShortcut]
-  );
-
-  const handleClose = useCallback(() => {
-    setSearch(''); // Reset search on close
-    onClose();
-  }, [onClose]);
-
-  // Window-level capture handler to intercept Escape before xterm processes it
-  useEffect(() => {
-    if (!isOpen) return;
-
-    const handleEscapeCapture = (event: KeyboardEvent) => {
-      if (event.key === 'Escape') {
-        event.preventDefault();
-        event.stopImmediatePropagation();
-        handleClose();
-      }
-    };
-
-    // Use capture phase at window level to intercept before xterm
-    window.addEventListener('keydown', handleEscapeCapture, true);
-    return () => window.removeEventListener('keydown', handleEscapeCapture, true);
-  }, [isOpen, handleClose]);
-
-  const runCommand = useCallback(
-    (command: () => void) => {
-      handleClose();
-      setTimeout(() => command(), 50);
-    },
-    [handleClose]
-  );
-
-  // Build command items
-  const commands = useMemo<CommandItem[]>(() => {
-    const items: CommandItem[] = [];
-
-    // Navigation commands
-    if (onGoHome) {
-      items.push({
-        id: 'nav-home',
-        label: 'Go Home',
-        description: 'Return to home screen',
-        icon: <Home className="h-4 w-4" />,
-        group: 'Navigation',
-        keywords: ['home', 'start', 'main'],
-        onSelect: () => runCommand(onGoHome),
-      });
-    }
-
-    if (onOpenProject) {
-      items.push({
-        id: 'nav-open-project',
-        label: 'Open Project',
-        description: 'Open a new project folder',
-        icon: <FolderOpen className="h-4 w-4" />,
-        group: 'Navigation',
-        keywords: ['open', 'folder', 'project', 'new'],
-        onSelect: () => runCommand(onOpenProject),
-      });
-    }
-
-    // Settings command
-    if (onOpenSettings) {
-      items.push({
-        id: 'nav-settings',
-        label: 'Open Settings',
-        description: APP_SHORTCUTS.SETTINGS.description,
-        icon: <Settings className="h-4 w-4" />,
-        group: 'Navigation',
-        keywords: ['settings', 'preferences', 'config'],
-        shortcut: getEffectiveShortcut('settings', APP_SHORTCUTS.SETTINGS),
-        onSelect: () => runCommand(onOpenSettings),
-      });
-    }
-
-    if (onOpenKeyboardShortcuts) {
-      items.push({
-        id: 'nav-keyboard-shortcuts',
-        label: 'Keyboard Shortcuts',
-        description: 'Customize app shortcuts',
-        icon: <Keyboard className="h-4 w-4" />,
-        group: 'Navigation',
-        keywords: ['keyboard', 'shortcuts', 'keybind', 'hotkey'],
-        onSelect: () => runCommand(onOpenKeyboardShortcuts),
-      });
-    }
-
-    // Toggle commands
-    if (onToggleLeftSidebar) {
-      items.push({
-        id: 'toggle-left',
-        label: 'Toggle Left Sidebar',
-        description: APP_SHORTCUTS.TOGGLE_LEFT_SIDEBAR.description,
-        icon: <PanelLeft className="h-4 w-4" />,
-        group: 'Toggles',
-        keywords: ['sidebar', 'panel', 'left', 'toggle'],
-        shortcut: getEffectiveShortcut('toggleLeftSidebar', APP_SHORTCUTS.TOGGLE_LEFT_SIDEBAR),
-        onSelect: () => runCommand(onToggleLeftSidebar),
-      });
-    }
-
-    if (onToggleRightSidebar) {
-      items.push({
-        id: 'toggle-right',
-        label: 'Toggle Right Sidebar',
-        description: APP_SHORTCUTS.TOGGLE_RIGHT_SIDEBAR.description,
-        icon: <PanelRight className="h-4 w-4" />,
-        group: 'Toggles',
-        keywords: ['sidebar', 'panel', 'right', 'toggle'],
-        shortcut: getEffectiveShortcut('toggleRightSidebar', APP_SHORTCUTS.TOGGLE_RIGHT_SIDEBAR),
-        onSelect: () => runCommand(onToggleRightSidebar),
-      });
-    }
-
-    if (onToggleTheme) {
-      items.push({
-        id: 'toggle-theme',
-        label: 'Toggle Theme',
-        description: APP_SHORTCUTS.TOGGLE_THEME.description,
-        icon: <Palette className="h-4 w-4" />,
-        group: 'Toggles',
-        keywords: ['theme', 'dark', 'light', 'mode', 'toggle'],
-        shortcut: getEffectiveShortcut('toggleTheme', APP_SHORTCUTS.TOGGLE_THEME),
-        onSelect: () => runCommand(onToggleTheme),
-      });
-    }
-
-    // Project commands
-    projects.forEach((project) => {
-      if (onSelectProject) {
-        items.push({
-          id: `project-${project.id}`,
-          label: project.name,
-          description: project.path,
-          icon: <FolderOpen className="h-4 w-4" />,
-          group: 'Projects',
-          keywords: ['project', project.name.toLowerCase(), project.path.toLowerCase()],
-          onSelect: () => runCommand(() => onSelectProject(project.id)),
-        });
-      }
-
-      // Task commands
-      if (project.tasks && onSelectTask) {
-        project.tasks.forEach((task) => {
-          items.push({
-            id: `task-${project.id}-${task.id}`,
-            label: task.name,
-            description: `${project.name} • ${task.branch}`,
-            icon: <GitBranch className="h-4 w-4" />,
-            group: 'Tasks',
-            keywords: [
-              'task',
-              task.name.toLowerCase(),
-              task.branch.toLowerCase(),
-              project.name.toLowerCase(),
-            ],
-            onSelect: () => runCommand(() => onSelectTask(project.id, task.id)),
-          });
-        });
-      }
-    });
-
-    return items;
-  }, [
-    getEffectiveShortcut,
-    projects,
-    onGoHome,
-    onOpenProject,
-    onOpenSettings,
-    onOpenKeyboardShortcuts,
-    onSelectProject,
-    onSelectTask,
-    onToggleLeftSidebar,
-    onToggleRightSidebar,
-    onToggleTheme,
-    runCommand,
-  ]);
-
-  // Group commands
-  const groupedCommands = useMemo(() => {
-    const groups = new Map<string, CommandItem[]>();
-    commands.forEach((cmd) => {
-      const group = groups.get(cmd.group) || [];
-      group.push(cmd);
-      groups.set(cmd.group, group);
-    });
-    return groups;
-  }, [commands]);
-
-  const groupOrder = ['Navigation', 'Toggles', 'Projects', 'Tasks'];
-
-  const formatShortcutKey = useCallback((value: string) => {
-    const key = normalizeShortcutKey(value);
-    if (key === 'ArrowLeft') return '←';
-    if (key === 'ArrowRight') return '→';
-    if (key === 'ArrowUp') return '↑';
-    if (key === 'ArrowDown') return '↓';
-    if (key === 'Escape') return 'Esc';
-    if (key === 'Tab') return 'Tab';
-    return key.toUpperCase();
-  }, []);
-
-  return createPortal(
-    <AnimatePresence>
-      {isOpen && (
-        <motion.div
-          role="dialog"
-          aria-modal="true"
-          aria-label="Command palette"
-          className="fixed inset-0 z-[130] flex items-start justify-center bg-black/60 pt-[15vh] backdrop-blur-sm"
-          initial={shouldReduceMotion ? false : { opacity: 0 }}
-          animate={{ opacity: 1 }}
-          exit={shouldReduceMotion ? { opacity: 1 } : { opacity: 0 }}
-          transition={shouldReduceMotion ? { duration: 0 } : { duration: 0.12, ease: 'easeOut' }}
-          onClick={handleClose}
-        >
-          <motion.div
-            onClick={(event) => event.stopPropagation()}
-            onKeyDown={(event) => event.stopPropagation()}
-            initial={shouldReduceMotion ? false : { opacity: 0, y: -8, scale: 0.995 }}
-            animate={{ opacity: 1, y: 0, scale: 1 }}
-            exit={
-              shouldReduceMotion
-                ? { opacity: 1, y: 0, scale: 1 }
-                : { opacity: 0, y: -6, scale: 0.995 }
-            }
-            transition={
-              shouldReduceMotion ? { duration: 0 } : { duration: 0.18, ease: [0.22, 1, 0.36, 1] }
-            }
-            className="mx-4 w-full max-w-2xl overflow-hidden rounded-2xl border border-border/50 bg-background shadow-2xl"
-          >
-            <Command
-              shouldFilter={true}
-              className="[&_[cmdk-group-heading]]:px-3 [&_[cmdk-group-heading]]:py-2 [&_[cmdk-group-heading]]:text-xs [&_[cmdk-group-heading]]:font-medium [&_[cmdk-group-heading]]:uppercase [&_[cmdk-group-heading]]:tracking-wider [&_[cmdk-group-heading]]:text-muted-foreground [&_[cmdk-group]]:px-2 [&_[cmdk-group]]:pb-2 [&_[cmdk-input-wrapper]_svg]:h-5 [&_[cmdk-input-wrapper]_svg]:w-5 [&_[cmdk-input]]:h-12 [&_[cmdk-item]]:px-3 [&_[cmdk-item]]:py-3 [&_[cmdk-item]_svg]:h-4 [&_[cmdk-item]_svg]:w-4"
-            >
-              <div className="flex items-center border-b border-border/60 px-4">
-                <Search className="mr-3 h-4 w-4 shrink-0 text-muted-foreground" />
-                <Command.Input
-                  value={search}
-                  onValueChange={setSearch}
-                  placeholder="Search commands, projects, tasks..."
-                  className="flex h-12 w-full rounded-md bg-transparent text-sm text-foreground outline-none placeholder:text-muted-foreground disabled:cursor-not-allowed disabled:opacity-50"
-                  autoFocus
-                />
-              </div>
-
-              <Command.List className="max-h-[400px] overflow-y-auto overflow-x-hidden p-2">
-                <Command.Empty className="py-8 text-center text-sm text-muted-foreground">
-                  No results found.
-                </Command.Empty>
-
-                {groupOrder.map((groupName) => {
-                  const groupItems = groupedCommands.get(groupName);
-                  if (!groupItems || groupItems.length === 0) return null;
-
-                  return (
-                    <Command.Group key={groupName} heading={groupName}>
-                      {groupItems.map((item) => (
-                        <Command.Item
-                          key={item.id}
-                          value={`${item.label} ${item.description || ''} ${item.keywords?.join(' ') || ''}`}
-                          onSelect={() => item.onSelect()}
-                          className="relative flex cursor-pointer select-none items-center gap-3 rounded-lg px-3 py-3 text-sm outline-none transition-colors hover:bg-accent hover:text-accent-foreground aria-selected:bg-accent aria-selected:text-accent-foreground data-[selected=true]:bg-accent data-[selected=true]:text-accent-foreground"
-                        >
-                          <div className="flex h-8 w-8 items-center justify-center rounded-md bg-muted text-muted-foreground">
-                            {item.icon}
-                          </div>
-                          <div className="min-w-0 flex-1">
-                            <div className="truncate font-medium">{item.label}</div>
-                            {item.description && (
-                              <div className="truncate text-xs text-muted-foreground">
-                                {item.description}
-                              </div>
-                            )}
-                          </div>
-                          {item.shortcut && (
-                            <div className="ml-auto flex items-center gap-1 text-xs text-muted-foreground">
-                              {item.shortcut.modifier === 'cmd' && (
-                                <CommandIcon className="h-3 w-3" />
-                              )}
-                              {item.shortcut.modifier === 'ctrl' && (
-                                <span className="font-medium">Ctrl</span>
-                              )}
-                              {item.shortcut.modifier === 'cmd+shift' && (
-                                <>
-                                  <CommandIcon className="h-3 w-3" />
-                                  <ArrowBigUp className="h-3 w-3" />
-                                </>
-                              )}
-                              {item.shortcut.modifier === 'shift' && (
-                                <ArrowBigUp className="h-3 w-3" />
-                              )}
-                              {item.shortcut.modifier === 'ctrl+shift' && (
-                                <>
-                                  <span className="font-medium">Ctrl</span>
-                                  <ArrowBigUp className="h-3 w-3" />
-                                </>
-                              )}
-                              {(item.shortcut.modifier === 'option' ||
-                                item.shortcut.modifier === 'alt') && <Option className="h-3 w-3" />}
-                              <span className="font-medium">
-                                {formatShortcutKey(item.shortcut.key)}
-                              </span>
-                            </div>
-                          )}
-                        </Command.Item>
-                      ))}
-                    </Command.Group>
-                  );
-                })}
-              </Command.List>
-
-              <div className="flex items-center justify-between border-t border-border/60 bg-muted/20 px-4 py-3">
-                <div className="flex items-center gap-4">
-                  <div className="flex items-center gap-2 text-xs text-muted-foreground">
-                    <span>Select</span>
-                    <div className="flex items-center gap-1 rounded border border-border/60 bg-background px-1.5 py-0.5">
-                      <CornerDownLeft className="h-3 w-3" />
-                    </div>
-                  </div>
-                  <div className="h-4 w-px bg-border/60" />
-                  <div className="flex items-center gap-2 text-xs text-muted-foreground">
-                    <span>Close</span>
-                    <div className="flex items-center gap-1 rounded border border-border/60 bg-background px-1.5 py-0.5">
-                      <span className="text-xs">ESC</span>
-                    </div>
-                  </div>
-                </div>
-
-                <div className="flex items-center gap-2 text-xs text-muted-foreground">
-                  <span>Navigate</span>
-                  <div className="flex items-center gap-1 rounded border border-border/60 bg-background px-1.5 py-0.5">
-                    <ArrowUp className="h-3 w-3" />
-                    <ArrowDown className="h-3 w-3" />
-                  </div>
-                </div>
-              </div>
-            </Command>
-          </motion.div>
-        </motion.div>
-      )}
-    </AnimatePresence>,
-    document.body
-  );
-};
-
-export default CommandPalette;
diff --git a/src/renderer/components/CommandPaletteWrapper.tsx b/src/renderer/components/CommandPaletteWrapper.tsx
deleted file mode 100644
index 104cee2132..0000000000
--- a/src/renderer/components/CommandPaletteWrapper.tsx
+++ /dev/null
@@ -1,59 +0,0 @@
-import React from 'react';
-import CommandPalette from '../components/CommandPalette';
-import { useSidebar } from '../components/ui/sidebar';
-import { useRightSidebar } from '../components/ui/right-sidebar';
-import { useTheme } from '../hooks/useTheme';
-import type { Task } from '../types/app';
-import { useProjectManagementContext } from '../contexts/ProjectManagementProvider';
-import { useTaskManagementContext } from '../contexts/TaskManagementContext';
-
-export interface CommandPaletteWrapperProps {
-  isOpen: boolean;
-  onClose: () => void;
-  handleGoHome: () => void;
-  handleOpenSettings: () => void;
-  handleOpenKeyboardShortcuts: () => void;
-}
-
-const CommandPaletteWrapper: React.FC<CommandPaletteWrapperProps> = ({
-  isOpen,
-  onClose,
-  handleGoHome,
-  handleOpenSettings,
-  handleOpenKeyboardShortcuts,
-}) => {
-  const { toggle: toggleLeftSidebar } = useSidebar();
-  const { toggle: toggleRightSidebar } = useRightSidebar();
-  const { toggleTheme } = useTheme();
-  const { projects, handleSelectProject, handleOpenProject } = useProjectManagementContext();
-  const { handleSelectTask } = useTaskManagementContext();
-
-  return (
-    <CommandPalette
-      isOpen={isOpen}
-      onClose={onClose}
-      projects={projects as any}
-      onSelectProject={(projectId) => {
-        const project = projects.find((p) => p.id === projectId);
-        if (project) handleSelectProject(project);
-      }}
-      onSelectTask={(projectId, taskId) => {
-        const project = projects.find((p) => p.id === projectId);
-        const task = project?.tasks?.find((w: Task) => w.id === taskId);
-        if (project && task) {
-          handleSelectProject(project);
-          handleSelectTask(task);
-        }
-      }}
-      onOpenSettings={handleOpenSettings}
-      onOpenKeyboardShortcuts={handleOpenKeyboardShortcuts}
-      onToggleLeftSidebar={toggleLeftSidebar}
-      onToggleRightSidebar={toggleRightSidebar}
-      onToggleTheme={toggleTheme}
-      onGoHome={handleGoHome}
-      onOpenProject={handleOpenProject}
-    />
-  );
-};
-
-export default CommandPaletteWrapper;
diff --git a/src/renderer/components/CommentsPopover.tsx b/src/renderer/components/CommentsPopover.tsx
deleted file mode 100644
index ca84face80..0000000000
--- a/src/renderer/components/CommentsPopover.tsx
+++ /dev/null
@@ -1,230 +0,0 @@
-import React, { useMemo, useRef, useState } from 'react';
-import { Popover, PopoverTrigger, PopoverContent } from './ui/popover';
-import { Button } from './ui/button';
-import { Checkbox } from './ui/checkbox';
-import { ScrollArea } from './ui/scroll-area';
-import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from './ui/tooltip';
-import { useTaskScope } from './TaskScopeContext';
-import { usePendingInjection } from '../hooks/usePendingInjection';
-import { useTaskComments } from '../hooks/useLineComments';
-import { formatCommentsForAgent } from '../lib/formatCommentsForAgent';
-import type { LineComment } from '../types/electron-api';
-
-interface CommentsPopoverProps {
-  taskId?: string;
-  children: React.ReactNode;
-  tooltipContent?: string;
-  tooltipDelay?: number;
-  onOpenChange?: (open: boolean) => void;
-  onSelectedCountChange?: (count: number) => void;
-}
-
-export function CommentsPopover({
-  taskId,
-  children,
-  tooltipContent,
-  tooltipDelay = 300,
-  onOpenChange,
-  onSelectedCountChange,
-}: CommentsPopoverProps) {
-  const { taskId: scopedTaskId } = useTaskScope();
-  const resolvedTaskId = taskId ?? scopedTaskId ?? '';
-  const { unsentComments, markSent, refresh } = useTaskComments(resolvedTaskId);
-  const { setPending, clear, onInjectionUsed } = usePendingInjection();
-  const [open, setOpen] = useState(false);
-  const [selectedIds, setSelectedIds] = useState<Set<string>>(new Set());
-  const pendingIdsRef = useRef<string[]>([]);
-  const hasCustomSelectionRef = useRef(false);
-  const lastUnsentIdsRef = useRef<Set<string>>(new Set());
-
-  const emitSelectedCount = React.useCallback(
-    (next: Set<string>) => {
-      onSelectedCountChange?.(next.size);
-    },
-    [onSelectedCountChange]
-  );
-
-  React.useEffect(() => {
-    hasCustomSelectionRef.current = false;
-    lastUnsentIdsRef.current = new Set();
-    pendingIdsRef.current = [];
-    setSelectedIds(new Set());
-    setOpen(false);
-    clear();
-    onSelectedCountChange?.(0);
-  }, [clear, onSelectedCountChange, resolvedTaskId]);
-
-  const handleOpenChange = (nextOpen: boolean) => {
-    setOpen(nextOpen);
-    if (nextOpen && resolvedTaskId) {
-      void refresh();
-    }
-    onOpenChange?.(nextOpen);
-  };
-
-  React.useEffect(() => {
-    if (!resolvedTaskId) return;
-    const nextIds = new Set(unsentComments.map((comment) => comment.id));
-    setSelectedIds((prev) => {
-      if (!hasCustomSelectionRef.current) {
-        const next = new Set(nextIds);
-        emitSelectedCount(next);
-        return next;
-      }
-      const next = new Set(Array.from(prev).filter((id) => nextIds.has(id)));
-      for (const id of nextIds) {
-        if (!lastUnsentIdsRef.current.has(id)) {
-          next.add(id);
-        }
-      }
-      emitSelectedCount(next);
-      return next;
-    });
-    lastUnsentIdsRef.current = nextIds;
-  }, [emitSelectedCount, resolvedTaskId, unsentComments]);
-
-  const handleSelectedChange = React.useCallback(
-    (next: Set<string>) => {
-      hasCustomSelectionRef.current = true;
-      setSelectedIds(next);
-      emitSelectedCount(next);
-    },
-    [emitSelectedCount]
-  );
-
-  React.useEffect(() => {
-    if (!resolvedTaskId) return;
-    const selectedComments = unsentComments.filter((comment) => selectedIds.has(comment.id));
-
-    if (selectedComments.length === 0) {
-      pendingIdsRef.current = [];
-      clear();
-      return;
-    }
-
-    const formatted = formatCommentsForAgent(selectedComments, {
-      includeIntro: false,
-      leadingNewline: true,
-    });
-    if (!formatted) {
-      pendingIdsRef.current = [];
-      clear();
-      return;
-    }
-
-    pendingIdsRef.current = selectedComments.map((comment) => comment.id);
-    setPending(formatted);
-  }, [clear, selectedIds, setPending, unsentComments, resolvedTaskId]);
-
-  React.useEffect(() => {
-    return onInjectionUsed(() => {
-      const sentIds = pendingIdsRef.current;
-      if (sentIds.length === 0) return;
-      pendingIdsRef.current = [];
-      void markSent(sentIds);
-    });
-  }, [markSent, onInjectionUsed]);
-
-  const groupedComments = useMemo(() => {
-    const groups = new Map<string, LineComment[]>();
-    for (const c of unsentComments) {
-      const existing = groups.get(c.filePath) ?? [];
-      existing.push(c);
-      groups.set(c.filePath, existing);
-    }
-    return groups;
-  }, [unsentComments]);
-
-  const allSelected = unsentComments.length > 0 && selectedIds.size === unsentComments.length;
-  const toggleSelectAll = () => {
-    if (allSelected) {
-      handleSelectedChange(new Set());
-    } else {
-      handleSelectedChange(new Set(unsentComments.map((c) => c.id)));
-    }
-  };
-
-  return (
-    <Popover open={open} onOpenChange={handleOpenChange}>
-      {tooltipContent ? (
-        <TooltipProvider delayDuration={tooltipDelay}>
-          <Tooltip>
-            <TooltipTrigger asChild>
-              <PopoverTrigger asChild>{children}</PopoverTrigger>
-            </TooltipTrigger>
-            <TooltipContent side="bottom" className="text-xs">
-              {tooltipContent}
-            </TooltipContent>
-          </Tooltip>
-        </TooltipProvider>
-      ) : (
-        <PopoverTrigger asChild>{children}</PopoverTrigger>
-      )}
-      <PopoverContent className="w-[min(460px,92vw)] p-0" align="start">
-        <div className="flex items-center justify-between border-b px-4 py-3">
-          <div className="flex flex-col">
-            <span className="text-sm font-semibold">Review comments</span>
-            <span className="text-xs text-muted-foreground">
-              {unsentComments.length} unsent • {selectedIds.size} selected
-            </span>
-          </div>
-          <div className="flex items-center gap-3">
-            <Button variant="ghost" size="sm" className="h-7 text-xs" onClick={toggleSelectAll}>
-              {allSelected ? 'Deselect All' : 'Select All'}
-            </Button>
-          </div>
-        </div>
-
-        <ScrollArea className="max-h-[360px]">
-          <div className="divide-y">
-            {Array.from(groupedComments.entries()).map(([filePath, fileComments]) => (
-              <div key={filePath} className="py-2">
-                <div
-                  className="truncate px-4 pb-1 text-xs font-medium text-muted-foreground"
-                  title={filePath}
-                >
-                  {filePath}
-                </div>
-                <div className="space-y-1">
-                  {fileComments.map((comment) => (
-                    <label
-                      key={comment.id}
-                      className="flex cursor-pointer items-start gap-2 px-4 py-2 transition-colors hover:bg-muted/40"
-                    >
-                      <Checkbox
-                        checked={selectedIds.has(comment.id)}
-                        onCheckedChange={(checked) => {
-                          const next = new Set(selectedIds);
-                          if (checked === true) {
-                            next.add(comment.id);
-                          } else {
-                            next.delete(comment.id);
-                          }
-                          handleSelectedChange(next);
-                        }}
-                        className="mt-0.5"
-                      />
-                      <div className="min-w-0 flex-1">
-                        <div className="text-xs text-muted-foreground">
-                          Line {comment.lineNumber}
-                        </div>
-                        <div className="line-clamp-2 break-words text-sm leading-snug">
-                          {comment.content}
-                        </div>
-                      </div>
-                    </label>
-                  ))}
-                </div>
-              </div>
-            ))}
-            {unsentComments.length === 0 && (
-              <div className="px-4 py-6 text-center text-sm text-muted-foreground">
-                No unsent comments.
-              </div>
-            )}
-          </div>
-        </ScrollArea>
-      </PopoverContent>
-    </Popover>
-  );
-}
diff --git a/src/renderer/components/ConfigEditorModal.tsx b/src/renderer/components/ConfigEditorModal.tsx
deleted file mode 100644
index 57689546b0..0000000000
--- a/src/renderer/components/ConfigEditorModal.tsx
+++ /dev/null
@@ -1,449 +0,0 @@
-import React, { useCallback, useEffect, useMemo, useState } from 'react';
-import { Button } from './ui/button';
-import { Dialog, DialogContent, DialogHeader, DialogTitle } from './ui/dialog';
-import { Input } from './ui/input';
-import { Label } from './ui/label';
-import { Spinner } from './ui/spinner';
-import { Switch } from './ui/switch';
-import { Textarea } from './ui/textarea';
-
-type LifecycleScripts = {
-  setup: string;
-  run: string;
-  teardown: string;
-};
-
-type ConfigShape = Record<string, unknown> & {
-  preservePatterns?: string[];
-  scripts?: Partial<LifecycleScripts>;
-  shellSetup?: string;
-  tmux?: boolean;
-};
-
-interface ConfigEditorModalProps {
-  isOpen: boolean;
-  onClose: () => void;
-  projectPath: string;
-  isRemote?: boolean;
-  sshConnectionId?: string | null;
-}
-
-const EMPTY_SCRIPTS: LifecycleScripts = {
-  setup: '',
-  run: '',
-  teardown: '',
-};
-const PROJECT_CONFIG_DOCS_URL = 'https://docs.emdash.sh/project-config';
-
-function ensureConfigObject(raw: unknown): ConfigShape {
-  return raw && typeof raw === 'object' && !Array.isArray(raw) ? (raw as ConfigShape) : {};
-}
-
-function scriptsFromConfig(config: ConfigShape): LifecycleScripts {
-  const scripts = config.scripts;
-  if (!scripts || typeof scripts !== 'object' || Array.isArray(scripts)) {
-    return { ...EMPTY_SCRIPTS };
-  }
-
-  const obj = scripts as Record<string, unknown>;
-  return {
-    setup: typeof obj.setup === 'string' ? obj.setup : '',
-    run: typeof obj.run === 'string' ? obj.run : '',
-    teardown: typeof obj.teardown === 'string' ? obj.teardown : '',
-  };
-}
-
-function applyScripts(config: ConfigShape, scripts: LifecycleScripts): ConfigShape {
-  const existingScripts =
-    config.scripts && typeof config.scripts === 'object' && !Array.isArray(config.scripts)
-      ? (config.scripts as Record<string, unknown>)
-      : {};
-
-  const cleanScripts: Record<string, unknown> = { ...existingScripts };
-  if (scripts.setup.trim()) cleanScripts.setup = scripts.setup;
-  else delete cleanScripts.setup;
-  if (scripts.run.trim()) cleanScripts.run = scripts.run;
-  else delete cleanScripts.run;
-  if (scripts.teardown.trim()) cleanScripts.teardown = scripts.teardown;
-  else delete cleanScripts.teardown;
-
-  const { scripts: _scripts, ...rest } = config;
-  if (Object.keys(cleanScripts).length === 0) {
-    return rest;
-  }
-  return {
-    ...rest,
-    scripts: cleanScripts,
-  };
-}
-
-function preservePatternsFromConfig(config: ConfigShape): string[] {
-  const patterns = config.preservePatterns;
-  if (!Array.isArray(patterns)) return [];
-  return patterns.filter((value): value is string => typeof value === 'string');
-}
-
-function applyPreservePatterns(config: ConfigShape, patterns: string[]): ConfigShape {
-  const { preservePatterns: _preservePatterns, ...rest } = config;
-  if (patterns.length === 0) {
-    return rest;
-  }
-  return {
-    ...rest,
-    preservePatterns: patterns,
-  };
-}
-
-function applyShellSetup(config: ConfigShape, shellSetup: string): ConfigShape {
-  const { shellSetup: _shellSetup, ...rest } = config;
-  const trimmed = shellSetup.trim();
-  if (!trimmed) return rest;
-  return { ...rest, shellSetup: trimmed };
-}
-
-function applyTmux(config: ConfigShape, tmux: boolean): ConfigShape {
-  const { tmux: _tmux, ...rest } = config;
-  if (!tmux) return rest;
-  return { ...rest, tmux: true };
-}
-
-export const ConfigEditorModal: React.FC<ConfigEditorModalProps> = ({
-  isOpen,
-  onClose,
-  projectPath,
-  isRemote,
-  sshConnectionId,
-}) => {
-  const [config, setConfig] = useState<ConfigShape>({});
-  const [scripts, setScripts] = useState<LifecycleScripts>({ ...EMPTY_SCRIPTS });
-  const [originalScripts, setOriginalScripts] = useState<LifecycleScripts>({ ...EMPTY_SCRIPTS });
-  const [preservePatternsInput, setPreservePatternsInput] = useState('');
-  const [originalPreservePatternsInput, setOriginalPreservePatternsInput] = useState('');
-  const [shellSetup, setShellSetup] = useState('');
-  const [originalShellSetup, setOriginalShellSetup] = useState('');
-  const [tmux, setTmux] = useState(false);
-  const [originalTmux, setOriginalTmux] = useState(false);
-  const [isLoading, setIsLoading] = useState(false);
-  const [isSaving, setIsSaving] = useState(false);
-  const [error, setError] = useState<string | null>(null);
-  const [loadFailed, setLoadFailed] = useState(false);
-
-  const preservePatterns = useMemo(
-    () =>
-      preservePatternsInput
-        .split('\n')
-        .map((line) => line.trim())
-        .filter((line) => line.length > 0),
-    [preservePatternsInput]
-  );
-
-  const normalizedConfigContent = useMemo(() => {
-    const withPatterns = applyPreservePatterns(config, preservePatterns);
-    const withShellSetup = applyShellSetup(withPatterns, shellSetup);
-    const withTmux = applyTmux(withShellSetup, tmux);
-    const withScripts = applyScripts(withTmux, scripts);
-    return `${JSON.stringify(withScripts, null, 2)}\n`;
-  }, [config, preservePatterns, shellSetup, tmux, scripts]);
-
-  const scriptsDirty = useMemo(
-    () =>
-      scripts.setup !== originalScripts.setup ||
-      scripts.run !== originalScripts.run ||
-      scripts.teardown !== originalScripts.teardown ||
-      preservePatternsInput !== originalPreservePatternsInput ||
-      shellSetup !== originalShellSetup ||
-      tmux !== originalTmux,
-    [
-      originalShellSetup,
-      originalPreservePatternsInput,
-      originalScripts.run,
-      originalScripts.setup,
-      originalScripts.teardown,
-      originalTmux,
-      shellSetup,
-      preservePatternsInput,
-      scripts.run,
-      scripts.setup,
-      scripts.teardown,
-      tmux,
-    ]
-  );
-
-  const hasChanges = scriptsDirty;
-
-  const loadConfig = useCallback(async () => {
-    setIsLoading(true);
-    setError(null);
-    setLoadFailed(false);
-    try {
-      let content: string;
-
-      if (isRemote && sshConnectionId) {
-        const configPath = `${projectPath}/.emdash.json`;
-        try {
-          content = await window.electronAPI.sshReadFile(sshConnectionId, configPath);
-        } catch {
-          // File doesn't exist yet on remote — treat as empty config
-          content = '{}';
-        }
-      } else {
-        const result = await window.electronAPI.getProjectConfig(projectPath);
-        if (!result.success || !result.content) {
-          throw new Error(result.error || 'Failed to load config');
-        }
-        content = result.content;
-      }
-
-      const parsed = ensureConfigObject(JSON.parse(content));
-      const nextScripts = scriptsFromConfig(parsed);
-      const nextPreservePatterns = preservePatternsFromConfig(parsed);
-      const nextShellSetup = typeof parsed.shellSetup === 'string' ? parsed.shellSetup : '';
-      const nextTmux = parsed.tmux === true;
-      setConfig(parsed);
-      setScripts(nextScripts);
-      setOriginalScripts(nextScripts);
-      setPreservePatternsInput(nextPreservePatterns.join('\n'));
-      setOriginalPreservePatternsInput(nextPreservePatterns.join('\n'));
-      setShellSetup(nextShellSetup);
-      setOriginalShellSetup(nextShellSetup);
-      setTmux(nextTmux);
-      setOriginalTmux(nextTmux);
-    } catch (err) {
-      setConfig({});
-      setScripts({ ...EMPTY_SCRIPTS });
-      setOriginalScripts({ ...EMPTY_SCRIPTS });
-      setPreservePatternsInput('');
-      setOriginalPreservePatternsInput('');
-      setShellSetup('');
-      setOriginalShellSetup('');
-      setTmux(false);
-      setOriginalTmux(false);
-      setError(err instanceof Error ? err.message : 'Failed to load config');
-      setLoadFailed(true);
-    } finally {
-      setIsLoading(false);
-    }
-  }, [projectPath, isRemote, sshConnectionId]);
-
-  useEffect(() => {
-    if (!isOpen || !projectPath) return;
-    void loadConfig();
-  }, [isOpen, loadConfig, projectPath]);
-
-  const handleOpenChange = (open: boolean) => {
-    if (!open && isSaving) return;
-    if (!open) onClose();
-  };
-
-  const handleScriptChange =
-    (key: keyof LifecycleScripts) => (event: React.ChangeEvent<HTMLTextAreaElement>) => {
-      const value = event.target.value;
-      setScripts((prev) => ({ ...prev, [key]: value }));
-      setError(null);
-    };
-
-  const handleSave = useCallback(async () => {
-    setIsSaving(true);
-    setError(null);
-    try {
-      if (isRemote && sshConnectionId) {
-        const configPath = `${projectPath}/.emdash.json`;
-        await window.electronAPI.sshWriteFile(sshConnectionId, configPath, normalizedConfigContent);
-      } else {
-        const result = await window.electronAPI.saveProjectConfig(
-          projectPath,
-          normalizedConfigContent
-        );
-        if (!result.success) {
-          throw new Error(result.error || 'Failed to save config');
-        }
-      }
-
-      const nextConfig = applyScripts(
-        applyTmux(
-          applyShellSetup(applyPreservePatterns(config, preservePatterns), shellSetup),
-          tmux
-        ),
-        scripts
-      );
-      setConfig(nextConfig);
-      setOriginalScripts(scripts);
-      setOriginalPreservePatternsInput(preservePatternsInput);
-      setOriginalShellSetup(shellSetup);
-      setOriginalTmux(tmux);
-      onClose();
-    } catch (err) {
-      setError(err instanceof Error ? err.message : 'Failed to save config');
-    } finally {
-      setIsSaving(false);
-    }
-  }, [
-    config,
-    isRemote,
-    normalizedConfigContent,
-    onClose,
-    shellSetup,
-    sshConnectionId,
-    preservePatternsInput,
-    preservePatterns,
-    projectPath,
-    scripts,
-    tmux,
-  ]);
-
-  return (
-    <Dialog open={isOpen} onOpenChange={handleOpenChange}>
-      <DialogContent className="flex max-h-[88vh] max-w-3xl flex-col">
-        <DialogHeader>
-          <DialogTitle>Project config</DialogTitle>
-        </DialogHeader>
-
-        {isLoading ? (
-          <div className="flex items-center justify-center py-12">
-            <Spinner size="md" />
-          </div>
-        ) : loadFailed ? (
-          <div className="rounded-md bg-destructive/10 p-4 text-sm text-destructive">{error}</div>
-        ) : (
-          <>
-            {error ? (
-              <div className="rounded-md bg-destructive/10 p-3 text-xs text-destructive">
-                {error}
-              </div>
-            ) : null}
-
-            <div className="min-h-0 flex-1 space-y-4 overflow-y-auto pr-1">
-              <div className="space-y-2">
-                <Label htmlFor="config-preserve-patterns">Preserved patterns</Label>
-                <Textarea
-                  id="config-preserve-patterns"
-                  value={preservePatternsInput}
-                  onChange={(event) => {
-                    setPreservePatternsInput(event.target.value);
-                    setError(null);
-                  }}
-                  placeholder={['.env', '.env.local', 'config/local.yml', 'secrets/*.json'].join(
-                    '\n'
-                  )}
-                  className="min-h-[104px] font-mono text-xs"
-                  disabled={isSaving}
-                />
-                <p className="text-xs text-muted-foreground">
-                  Files copied to new tasks. One glob pattern per line.
-                </p>
-              </div>
-
-              <div className="space-y-2">
-                <Label htmlFor="config-shell-setup">Shell setup</Label>
-                <Input
-                  id="config-shell-setup"
-                  value={shellSetup}
-                  onChange={(event) => {
-                    setShellSetup(event.target.value);
-                    setError(null);
-                  }}
-                  placeholder="No shell setup configured"
-                  className="font-mono text-xs"
-                  disabled={isSaving}
-                />
-                <p className="text-xs text-muted-foreground">
-                  Runs in every terminal before the shell starts.
-                </p>
-              </div>
-
-              <div className="flex items-center justify-between">
-                <div className="space-y-0.5">
-                  <Label htmlFor="config-tmux">tmux session persistence</Label>
-                  <p className="text-xs text-muted-foreground">
-                    Wrap agent sessions in tmux so they survive disconnects and restarts.
-                  </p>
-                </div>
-                <Switch
-                  id="config-tmux"
-                  checked={tmux}
-                  onCheckedChange={(checked) => {
-                    setTmux(checked);
-                    setError(null);
-                  }}
-                  disabled={isSaving}
-                />
-              </div>
-
-              <div className="space-y-2">
-                <Label htmlFor="config-scripts-setup">Setup script</Label>
-                <Textarea
-                  id="config-scripts-setup"
-                  value={scripts.setup}
-                  onChange={handleScriptChange('setup')}
-                  placeholder="No setup script configured"
-                  className="min-h-[84px] font-mono text-xs"
-                  disabled={isSaving}
-                />
-                <p className="text-xs text-muted-foreground">
-                  Runs once right after a new task is created.
-                </p>
-              </div>
-
-              <div className="space-y-2">
-                <Label htmlFor="config-scripts-run">Run script</Label>
-                <Textarea
-                  id="config-scripts-run"
-                  value={scripts.run}
-                  onChange={handleScriptChange('run')}
-                  placeholder="No run script configured"
-                  className="min-h-[84px] font-mono text-xs"
-                  disabled={isSaving}
-                />
-                <p className="text-xs text-muted-foreground">
-                  Long-running command for the task (start/stop from the task terminal).
-                </p>
-              </div>
-
-              <div className="space-y-2">
-                <Label htmlFor="config-scripts-teardown">Teardown script</Label>
-                <Textarea
-                  id="config-scripts-teardown"
-                  value={scripts.teardown}
-                  onChange={handleScriptChange('teardown')}
-                  placeholder="No teardown script configured"
-                  className="min-h-[84px] font-mono text-xs"
-                  disabled={isSaving}
-                />
-                <p className="text-xs text-muted-foreground">
-                  Runs when a task is being deleted or archived.
-                </p>
-              </div>
-            </div>
-
-            <div className="mt-4 flex items-center justify-between gap-2 border-t pt-4">
-              <Button
-                type="button"
-                variant="link"
-                size="sm"
-                className="h-auto p-0 text-xs underline-offset-2 hover:underline"
-                onClick={() => window.electronAPI.openExternal(PROJECT_CONFIG_DOCS_URL)}
-              >
-                Check docs for examples ↗
-              </Button>
-              <div className="flex gap-2">
-                <Button type="button" variant="outline" onClick={onClose} disabled={isSaving}>
-                  Cancel
-                </Button>
-                <Button type="button" onClick={handleSave} disabled={!hasChanges || isSaving}>
-                  {isSaving ? (
-                    <>
-                      <Spinner size="sm" className="mr-2" />
-                      Saving...
-                    </>
-                  ) : (
-                    'Save'
-                  )}
-                </Button>
-              </div>
-            </div>
-          </>
-        )}
-      </DialogContent>
-    </Dialog>
-  );
-};
diff --git a/src/renderer/components/Context7SettingsCard.tsx b/src/renderer/components/Context7SettingsCard.tsx
deleted file mode 100644
index b058ebac8e..0000000000
--- a/src/renderer/components/Context7SettingsCard.tsx
+++ /dev/null
@@ -1,99 +0,0 @@
-import React from 'react';
-import { Button } from './ui/button';
-import { Switch } from './ui/switch';
-import { Info } from 'lucide-react';
-import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from './ui/tooltip';
-import { CONTEXT7_INTEGRATION } from '../mcp/context7';
-import FeedbackModal from './FeedbackModal';
-import context7Logo from '../../assets/images/context7.png';
-import { useAppSettings } from '@/contexts/AppSettingsProvider';
-
-const Context7SettingsCard: React.FC = () => {
-  const { settings, updateSettings, isLoading, isSaving } = useAppSettings();
-  const [showMcpFeedback, setShowMcpFeedback] = React.useState(false);
-
-  const enabled = Boolean(settings?.mcp?.context7?.enabled);
-
-  const onToggle = (next: boolean) => {
-    updateSettings({ mcp: { context7: { enabled: next } } });
-  };
-
-  return (
-    <>
-      <div className="flex items-center gap-2 p-2">
-        <img
-          src={context7Logo}
-          alt="Context7"
-          className="h-5 w-5 flex-shrink-0 rounded object-contain"
-        />
-        <div className="flex flex-1 items-center gap-1.5">
-          <p className="text-sm font-medium text-foreground">Context7</p>
-          <p className="text-sm text-foreground/50">
-            Enable Context7 MCP to enrich prompts with up‑to‑date library docs.
-          </p>
-          <TooltipProvider delayDuration={150}>
-            <Tooltip>
-              <TooltipTrigger asChild>
-                <button
-                  type="button"
-                  className="flex-shrink-0 text-foreground/50 transition-colors hover:text-foreground"
-                  aria-label="More information"
-                >
-                  <Info className="h-4 w-4" />
-                </button>
-              </TooltipTrigger>
-              <TooltipContent side="top" className="max-w-xs">
-                <div className="space-y-2 text-xs">
-                  <p>
-                    You must configure Context7 MCP in your coding agent (Codex, Claude Code,
-                    Cursor, etc.) before using it in Emdash.
-                  </p>
-                  <p>
-                    After setup, enabling Context7 here lets Emdash invoke it in your terminal
-                    sessions so agents can fetch up‑to‑date docs when needed.
-                  </p>
-                  <div className="flex gap-2 pt-1">
-                    <Button
-                      type="button"
-                      variant="link"
-                      size="sm"
-                      className="h-auto p-0 text-xs underline-offset-2 hover:underline"
-                      onClick={() => window.electronAPI.openExternal(CONTEXT7_INTEGRATION.docsUrl)}
-                    >
-                      Docs ↗
-                    </Button>
-                    <Button
-                      type="button"
-                      variant="link"
-                      size="sm"
-                      className="h-auto p-0 text-xs underline-offset-2 hover:underline"
-                      onClick={() => setShowMcpFeedback(true)}
-                    >
-                      Suggest an MCP ↗
-                    </Button>
-                  </div>
-                </div>
-              </TooltipContent>
-            </Tooltip>
-          </TooltipProvider>
-        </div>
-        <Switch
-          checked={enabled}
-          onCheckedChange={onToggle}
-          disabled={isLoading || isSaving}
-          aria-label="Enable Context7 MCP"
-        />
-      </div>
-
-      {showMcpFeedback ? (
-        <FeedbackModal
-          isOpen={showMcpFeedback}
-          onClose={() => setShowMcpFeedback(false)}
-          blurb="Which MCP would you like Emdash to support next? Include the MCP name, link, and why it helps your workflow."
-        />
-      ) : null}
-    </>
-  );
-};
-
-export default Context7SettingsCard;
diff --git a/src/renderer/components/Context7Tooltip.tsx b/src/renderer/components/Context7Tooltip.tsx
deleted file mode 100644
index 7bd1ecd649..0000000000
--- a/src/renderer/components/Context7Tooltip.tsx
+++ /dev/null
@@ -1,60 +0,0 @@
-import React from 'react';
-import type { Agent } from '../types';
-import { CONTEXT7_INTEGRATION } from '../mcp/context7';
-import { Badge } from './ui/badge';
-import context7Logo from '../../assets/images/context7.png';
-
-type Props = {
-  agent: Agent;
-  enabled: boolean;
-};
-
-const Context7Tooltip: React.FC<Props> = ({ enabled }) => {
-  return (
-    <div className="max-w-sm text-xs">
-      <div className="flex items-center gap-2">
-        <img src={context7Logo} alt="Context7" className="h-4 w-4 rounded-[3px] object-contain" />
-        <div className="font-medium">Context7 MCP</div>
-      </div>
-      <div className="mt-2 border-t border-border/60" />
-      <div className="mt-2 text-muted-foreground">
-        Context7 lets coding agents fetch up‑to‑date, indexed library docs on demand, improving
-        accuracy and reducing hallucinations.
-      </div>
-      <div className="mt-1 flex items-center gap-1.5 text-tiny text-muted-foreground">
-        <span className="rounded-md border bg-muted/40 px-1.5 py-0.5 text-micro opacity-80">
-          Requires setup in your used agent CLIs. Once configured, Emdash auto‑invokes Context7 in
-          prompts.
-        </span>
-      </div>
-
-      <div className="mt-2 border-t border-border/60 pt-2">
-        <div className="flex items-center justify-between gap-3">
-          <div className="flex items-center gap-2">
-            <span className="text-muted-foreground">Status:</span>
-            <Badge
-              className={
-                enabled
-                  ? 'border-emerald-600/40 bg-emerald-500/15 text-emerald-700'
-                  : 'border-border/60 bg-muted/40 text-muted-foreground'
-              }
-            >
-              {enabled ? 'Enabled' : 'Disabled'}
-            </Badge>
-          </div>
-          <button
-            type="button"
-            onClick={() =>
-              (window as any).electronAPI?.openExternal?.(CONTEXT7_INTEGRATION.docsUrl)
-            }
-            className="text-tiny text-muted-foreground underline-offset-2 hover:underline"
-          >
-            Open Context7 docs ↗
-          </button>
-        </div>
-      </div>
-    </div>
-  );
-};
-
-export default Context7Tooltip;
diff --git a/src/renderer/components/CreateChatModal.tsx b/src/renderer/components/CreateChatModal.tsx
deleted file mode 100644
index 1673119ea2..0000000000
--- a/src/renderer/components/CreateChatModal.tsx
+++ /dev/null
@@ -1,132 +0,0 @@
-import React, { useState, useEffect, useMemo } from 'react';
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle,
-} from './ui/dialog';
-import { Button } from './ui/button';
-import { Label } from './ui/label';
-import { Separator } from './ui/separator';
-import { AgentDropdown } from './AgentDropdown';
-import { agentConfig } from '../lib/agentConfig';
-import { isValidProviderId } from '@shared/providers/registry';
-import type { Agent } from '../types';
-import { rpc } from '@/lib/rpc';
-
-const DEFAULT_AGENT: Agent = 'claude';
-
-interface CreateChatModalProps {
-  isOpen: boolean;
-  onClose: () => void;
-  onCreateChat: (title: string, agent: string) => void;
-  installedAgents: string[];
-}
-
-export function CreateChatModal({
-  isOpen,
-  onClose,
-  onCreateChat,
-  installedAgents,
-}: CreateChatModalProps) {
-  const [selectedAgent, setSelectedAgent] = useState<Agent>(DEFAULT_AGENT);
-  const [isCreating, setIsCreating] = useState(false);
-  const [error, setError] = useState<string | null>(null);
-
-  const installedSet = useMemo(() => new Set(installedAgents), [installedAgents]);
-
-  // Load default agent from settings and reset state when modal opens
-  useEffect(() => {
-    if (isOpen) {
-      setError(null);
-
-      let cancel = false;
-      rpc.appSettings.get().then((settings) => {
-        if (cancel) return;
-
-        const settingsAgent = settings?.defaultProvider;
-        const defaultFromSettings: Agent = isValidProviderId(settingsAgent)
-          ? (settingsAgent as Agent)
-          : DEFAULT_AGENT;
-
-        // Priority: settings default (if installed) > first installed in agentConfig order
-        if (installedSet.has(defaultFromSettings)) {
-          setSelectedAgent(defaultFromSettings);
-          setError(null);
-        } else {
-          const firstInstalled = Object.keys(agentConfig).find((key) => installedSet.has(key)) as
-            | Agent
-            | undefined;
-          if (firstInstalled) {
-            setSelectedAgent(firstInstalled);
-            setError(null);
-          } else {
-            setError('No agents installed');
-          }
-        }
-      });
-
-      return () => {
-        cancel = true;
-      };
-    }
-  }, [isOpen, installedSet]);
-
-  const handleSubmit = async (e: React.FormEvent) => {
-    e.preventDefault();
-
-    if (!installedSet.has(selectedAgent)) {
-      setError('Please select an installed agent');
-      return;
-    }
-
-    setIsCreating(true);
-    try {
-      const chatTitle = `Chat ${Date.now()}`;
-      onCreateChat(chatTitle, selectedAgent);
-      onClose();
-      setError(null);
-    } catch (err) {
-      console.error('Failed to create chat:', err);
-      setError('Failed to create chat');
-    } finally {
-      setIsCreating(false);
-    }
-  };
-
-  return (
-    <Dialog open={isOpen} onOpenChange={(open) => !open && !isCreating && onClose()}>
-      <DialogContent className="max-h-[calc(100vh-48px)] max-w-md overflow-visible">
-        <DialogHeader>
-          <DialogTitle>Add Agent to Task</DialogTitle>
-          <DialogDescription className="text-xs">
-            Add another agent to this chat. It will share the same worktree and appear as a new tab
-            alongside your existing chats.
-          </DialogDescription>
-        </DialogHeader>
-
-        <Separator />
-
-        <form onSubmit={handleSubmit} className="space-y-4">
-          <div className="flex items-center gap-4">
-            <Label className="shrink-0">Agent</Label>
-            <AgentDropdown
-              value={selectedAgent}
-              onChange={setSelectedAgent}
-              installedAgents={installedAgents}
-            />
-          </div>
-          {error && <p className="text-xs text-destructive">{error}</p>}
-
-          <DialogFooter>
-            <Button type="submit" disabled={!!error || isCreating}>
-              {isCreating ? 'Creating...' : 'Create'}
-            </Button>
-          </DialogFooter>
-        </form>
-      </DialogContent>
-    </Dialog>
-  );
-}
diff --git a/src/renderer/components/CustomCommandModal.tsx b/src/renderer/components/CustomCommandModal.tsx
deleted file mode 100644
index 2fb99b9fc7..0000000000
--- a/src/renderer/components/CustomCommandModal.tsx
+++ /dev/null
@@ -1,492 +0,0 @@
-import React, { useCallback, useEffect, useMemo, useState } from 'react';
-import { createPortal } from 'react-dom';
-import { AnimatePresence, motion, useReducedMotion } from 'motion/react';
-import { X, RotateCcw, Info, Plus, Trash2 } from 'lucide-react';
-import { Button } from './ui/button';
-import { Input } from './ui/input';
-import { Label } from './ui/label';
-import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from './ui/tooltip';
-import { PROVIDERS, type ProviderDefinition } from '@shared/providers/registry';
-import type { ProviderCustomConfig } from '../types/electron-api';
-
-interface CustomCommandModalProps {
-  isOpen: boolean;
-  onClose: () => void;
-  providerId: string;
-}
-
-type EnvEntry = { key: string; value: string };
-
-type FormState = {
-  cli: string;
-  resumeFlag: string;
-  defaultArgs: string;
-  extraArgs: string;
-  autoApproveFlag: string;
-  initialPromptFlag: string;
-  envEntries: EnvEntry[];
-};
-
-const getDefaultFromProvider = (provider: ProviderDefinition | undefined): FormState => ({
-  cli: provider?.cli ?? '',
-  resumeFlag: provider?.resumeFlag ?? '',
-  defaultArgs: provider?.defaultArgs?.join(' ') ?? '',
-  extraArgs: '',
-  autoApproveFlag: provider?.autoApproveFlag ?? '',
-  initialPromptFlag: provider?.initialPromptFlag ?? '',
-  envEntries: [],
-});
-
-const CustomCommandModal: React.FC<CustomCommandModalProps> = ({ isOpen, onClose, providerId }) => {
-  const shouldReduceMotion = useReducedMotion();
-  const provider = useMemo(() => PROVIDERS.find((p) => p.id === providerId), [providerId]);
-
-  const defaults = useMemo(() => getDefaultFromProvider(provider), [provider]);
-
-  const [form, setForm] = useState<FormState>(defaults);
-  const [hasCustomConfig, setHasCustomConfig] = useState(false);
-  const [loading, setLoading] = useState(false);
-  const [saving, setSaving] = useState(false);
-
-  // Handle Escape key to close modal
-  useEffect(() => {
-    if (!isOpen) return;
-
-    const handleKeyDown = (event: KeyboardEvent) => {
-      if (event.key === 'Escape') {
-        event.preventDefault();
-        onClose();
-      }
-    };
-
-    window.addEventListener('keydown', handleKeyDown);
-    return () => {
-      window.removeEventListener('keydown', handleKeyDown);
-    };
-  }, [isOpen, onClose]);
-
-  // Load existing custom config
-  useEffect(() => {
-    if (!isOpen || !providerId) return;
-
-    const loadConfig = async () => {
-      setLoading(true);
-      try {
-        const result = await window.electronAPI.getProviderCustomConfig?.(providerId);
-        if (result?.success && result.config) {
-          const env = result.config.env;
-          const envEntries: EnvEntry[] =
-            env && typeof env === 'object'
-              ? Object.entries(env).map(([key, value]) => ({ key, value: String(value) }))
-              : [];
-          setForm({
-            cli: result.config.cli ?? defaults.cli,
-            resumeFlag: result.config.resumeFlag ?? defaults.resumeFlag,
-            defaultArgs: result.config.defaultArgs ?? defaults.defaultArgs,
-            extraArgs: result.config.extraArgs ?? '',
-            autoApproveFlag: result.config.autoApproveFlag ?? defaults.autoApproveFlag,
-            initialPromptFlag: result.config.initialPromptFlag ?? defaults.initialPromptFlag,
-            envEntries,
-          });
-          setHasCustomConfig(true);
-        } else {
-          setForm(defaults);
-          setHasCustomConfig(false);
-        }
-      } catch (error) {
-        console.error('Failed to load provider custom config:', error);
-        setForm(defaults);
-        setHasCustomConfig(false);
-      } finally {
-        setLoading(false);
-      }
-    };
-
-    void loadConfig();
-  }, [isOpen, providerId, defaults]);
-
-  const handleChange = useCallback((field: keyof FormState, value: string) => {
-    setForm((prev) => ({ ...prev, [field]: value }));
-  }, []);
-
-  const setEnvEntry = useCallback((index: number, update: Partial<EnvEntry>) => {
-    setForm((prev) => {
-      const next = [...prev.envEntries];
-      next[index] = { ...next[index], ...update };
-      return { ...prev, envEntries: next };
-    });
-  }, []);
-
-  const addEnvEntry = useCallback(() => {
-    setForm((prev) => ({ ...prev, envEntries: [...prev.envEntries, { key: '', value: '' }] }));
-  }, []);
-
-  const removeEnvEntry = useCallback((index: number) => {
-    setForm((prev) => ({
-      ...prev,
-      envEntries: prev.envEntries.filter((_, i) => i !== index),
-    }));
-  }, []);
-
-  const handleResetToDefaults = useCallback(() => {
-    setForm(defaults);
-  }, [defaults]);
-
-  const handleSave = useCallback(async () => {
-    setSaving(true);
-    try {
-      const envRecord: Record<string, string> = {};
-      for (const { key, value } of form.envEntries) {
-        const k = key.trim();
-        if (k && /^[A-Za-z_][A-Za-z0-9_]*$/.test(k)) {
-          envRecord[k] = value;
-        }
-      }
-
-      const isDefault =
-        form.cli === defaults.cli &&
-        form.resumeFlag === defaults.resumeFlag &&
-        form.defaultArgs === defaults.defaultArgs &&
-        form.extraArgs === '' &&
-        form.autoApproveFlag === defaults.autoApproveFlag &&
-        form.initialPromptFlag === defaults.initialPromptFlag &&
-        form.envEntries.every((e) => !e.key.trim());
-
-      if (isDefault) {
-        await window.electronAPI.updateProviderCustomConfig?.(providerId, undefined);
-        setHasCustomConfig(false);
-      } else {
-        const config: ProviderCustomConfig = {
-          cli: form.cli,
-          resumeFlag: form.resumeFlag,
-          defaultArgs: form.defaultArgs,
-          extraArgs: form.extraArgs.trim() || undefined,
-          autoApproveFlag: form.autoApproveFlag,
-          initialPromptFlag: form.initialPromptFlag,
-          env: Object.keys(envRecord).length > 0 ? envRecord : undefined,
-        };
-        await window.electronAPI.updateProviderCustomConfig?.(providerId, config);
-        setHasCustomConfig(true);
-      }
-      onClose();
-    } catch (error) {
-      console.error('Failed to save provider custom config:', error);
-    } finally {
-      setSaving(false);
-    }
-  }, [form, defaults, providerId, onClose]);
-
-  const previewCommand = useMemo(() => {
-    const parts: string[] = [];
-    if (form.cli) parts.push(form.cli);
-    if (form.resumeFlag) parts.push(form.resumeFlag);
-    if (form.defaultArgs) parts.push(form.defaultArgs);
-    if (form.extraArgs) parts.push(form.extraArgs);
-    if (form.autoApproveFlag) parts.push(form.autoApproveFlag);
-    if (form.initialPromptFlag) parts.push(form.initialPromptFlag);
-    parts.push('{prompt}');
-    return parts.join(' ');
-  }, [form]);
-
-  const hasChanges = useMemo(() => {
-    if (hasCustomConfig) return true;
-    const hasEnv = form.envEntries.some((e) => e.key.trim() !== '');
-    return (
-      form.cli !== defaults.cli ||
-      form.resumeFlag !== defaults.resumeFlag ||
-      form.defaultArgs !== defaults.defaultArgs ||
-      form.extraArgs !== '' ||
-      form.autoApproveFlag !== defaults.autoApproveFlag ||
-      form.initialPromptFlag !== defaults.initialPromptFlag ||
-      hasEnv
-    );
-  }, [form, defaults, hasCustomConfig]);
-
-  if (!provider) return null;
-
-  return createPortal(
-    <AnimatePresence>
-      {isOpen && (
-        <motion.div
-          role="dialog"
-          aria-modal="true"
-          aria-labelledby="custom-command-title"
-          className="fixed inset-0 z-[130] flex items-center justify-center bg-black/60 backdrop-blur-sm"
-          initial={shouldReduceMotion ? false : { opacity: 0 }}
-          animate={{ opacity: 1 }}
-          exit={shouldReduceMotion ? { opacity: 1 } : { opacity: 0 }}
-          transition={shouldReduceMotion ? { duration: 0 } : { duration: 0.12, ease: 'easeOut' }}
-          onClick={onClose}
-        >
-          <motion.div
-            onClick={(e) => e.stopPropagation()}
-            initial={shouldReduceMotion ? false : { opacity: 0, y: 8, scale: 0.995 }}
-            animate={{ opacity: 1, y: 0, scale: 1 }}
-            exit={
-              shouldReduceMotion
-                ? { opacity: 1, y: 0, scale: 1 }
-                : { opacity: 0, y: 6, scale: 0.995 }
-            }
-            transition={
-              shouldReduceMotion ? { duration: 0 } : { duration: 0.18, ease: [0.22, 1, 0.36, 1] }
-            }
-            className="mx-4 w-full max-w-lg overflow-hidden rounded-2xl border border-border/50 bg-background shadow-2xl"
-          >
-            {/* Header */}
-            <header className="flex items-center justify-between border-b border-border/60 px-6 py-4">
-              <div>
-                <h2 id="custom-command-title" className="text-lg font-semibold">
-                  {provider.name} Execution Settings
-                </h2>
-                <p className="mt-0.5 text-sm text-muted-foreground">
-                  Customize the agent execution command
-                </p>
-              </div>
-              <Button
-                type="button"
-                variant="ghost"
-                size="icon"
-                onClick={onClose}
-                className="h-8 w-8"
-                aria-label="Close"
-              >
-                <X className="h-4 w-4" />
-              </Button>
-            </header>
-
-            {/* Body */}
-            <div className="max-h-[60vh] overflow-y-auto px-6 py-5">
-              {loading ? (
-                <div className="flex items-center justify-center py-8">
-                  <div className="text-sm text-muted-foreground">Loading...</div>
-                </div>
-              ) : (
-                <div className="space-y-4">
-                  {/* CLI Command */}
-                  <div className="space-y-2">
-                    <div className="flex items-center gap-2">
-                      <Label htmlFor="cli" className="text-sm font-medium">
-                        CLI Command
-                      </Label>
-                      <FieldTooltip content="The CLI command to execute (e.g., claude, codex)" />
-                    </div>
-                    <Input
-                      id="cli"
-                      value={form.cli}
-                      onChange={(e) => handleChange('cli', e.target.value)}
-                      placeholder={defaults.cli || 'CLI command'}
-                      className="font-mono text-sm"
-                    />
-                  </div>
-
-                  {/* Resume Flag */}
-                  <div className="space-y-2">
-                    <div className="flex items-center gap-2">
-                      <Label htmlFor="resumeFlag" className="text-sm font-medium">
-                        Resume Flag
-                      </Label>
-                      <FieldTooltip content="Flag used when resuming a session (e.g., -c -r)" />
-                    </div>
-                    <Input
-                      id="resumeFlag"
-                      value={form.resumeFlag}
-                      onChange={(e) => handleChange('resumeFlag', e.target.value)}
-                      placeholder={defaults.resumeFlag || '(none)'}
-                      className="font-mono text-sm"
-                    />
-                  </div>
-
-                  {/* Default Args */}
-                  <div className="space-y-2">
-                    <div className="flex items-center gap-2">
-                      <Label htmlFor="defaultArgs" className="text-sm font-medium">
-                        Default Args
-                      </Label>
-                      <FieldTooltip content="Default arguments (e.g., run -s)" />
-                    </div>
-                    <Input
-                      id="defaultArgs"
-                      value={form.defaultArgs}
-                      onChange={(e) => handleChange('defaultArgs', e.target.value)}
-                      placeholder={defaults.defaultArgs || '(none)'}
-                      className="font-mono text-sm"
-                    />
-                  </div>
-
-                  {/* Additional parameters */}
-                  <div className="space-y-2">
-                    <div className="flex items-center gap-2">
-                      <Label htmlFor="extraArgs" className="text-sm font-medium">
-                        Additional parameters
-                      </Label>
-                      <FieldTooltip content="Extra flags appended to the command (e.g. --enable-all-github-mcp-tools)" />
-                    </div>
-                    <Input
-                      id="extraArgs"
-                      value={form.extraArgs}
-                      onChange={(e) => handleChange('extraArgs', e.target.value)}
-                      placeholder="e.g. --enable-all-github-mcp-tools"
-                      className="font-mono text-sm"
-                    />
-                  </div>
-
-                  {/* Environment variables */}
-                  <div className="space-y-2">
-                    <div className="flex items-center gap-2">
-                      <Label className="text-sm font-medium">Environment variables</Label>
-                      <FieldTooltip content="Environment variables set when running the agent" />
-                    </div>
-                    <div className="space-y-2">
-                      {form.envEntries.map((entry, i) => (
-                        <div key={i} className="flex items-center gap-2">
-                          <Input
-                            value={entry.key}
-                            onChange={(e) => setEnvEntry(i, { key: e.target.value })}
-                            placeholder="KEY"
-                            className="min-w-0 flex-1 font-mono text-sm"
-                          />
-                          <Input
-                            value={entry.value}
-                            onChange={(e) => setEnvEntry(i, { value: e.target.value })}
-                            placeholder="value"
-                            className="min-w-0 flex-1 font-mono text-sm"
-                          />
-                          <Button
-                            type="button"
-                            variant="ghost"
-                            size="icon"
-                            onClick={() => removeEnvEntry(i)}
-                            className="h-8 w-8 flex-shrink-0"
-                            aria-label="Remove"
-                          >
-                            <Trash2 className="h-3.5 w-3.5" />
-                          </Button>
-                        </div>
-                      ))}
-                      <Button
-                        type="button"
-                        variant="outline"
-                        size="sm"
-                        onClick={addEnvEntry}
-                        className="gap-1.5"
-                      >
-                        <Plus className="h-3.5 w-3.5" />
-                        Add variable
-                      </Button>
-                    </div>
-                  </div>
-
-                  {/* Auto-approve Flag */}
-                  <div className="space-y-2">
-                    <div className="flex items-center gap-2">
-                      <Label htmlFor="autoApproveFlag" className="text-sm font-medium">
-                        Auto-approve Flag
-                      </Label>
-                      <FieldTooltip content="Flag used in auto-approve mode" />
-                    </div>
-                    <Input
-                      id="autoApproveFlag"
-                      value={form.autoApproveFlag}
-                      onChange={(e) => handleChange('autoApproveFlag', e.target.value)}
-                      placeholder={defaults.autoApproveFlag || '(none)'}
-                      className="font-mono text-sm"
-                    />
-                  </div>
-
-                  {/* Initial Prompt Flag */}
-                  <div className="space-y-2">
-                    <div className="flex items-center gap-2">
-                      <Label htmlFor="initialPromptFlag" className="text-sm font-medium">
-                        Initial Prompt Flag
-                      </Label>
-                      <FieldTooltip content="Flag for passing initial prompt (empty means pass directly)" />
-                    </div>
-                    <Input
-                      id="initialPromptFlag"
-                      value={form.initialPromptFlag}
-                      onChange={(e) => handleChange('initialPromptFlag', e.target.value)}
-                      placeholder={defaults.initialPromptFlag || '(pass directly)'}
-                      className="font-mono text-sm"
-                    />
-                  </div>
-
-                  {/* Preview */}
-                  <div className="mt-6 rounded-lg border border-border/60 bg-muted/30 p-4">
-                    <div className="mb-2 text-xs font-medium text-muted-foreground">
-                      Command Preview
-                    </div>
-                    <code className="block break-all font-mono text-sm text-foreground">
-                      {previewCommand}
-                    </code>
-                  </div>
-
-                  {hasCustomConfig && (
-                    <div className="rounded-md border border-yellow-500/30 bg-yellow-500/10 px-3 py-2 text-xs text-yellow-600 dark:text-yellow-400">
-                      Custom configuration is applied
-                    </div>
-                  )}
-                </div>
-              )}
-            </div>
-
-            {/* Footer */}
-            <footer className="flex items-center justify-between border-t border-border/60 px-6 py-4">
-              <Button
-                type="button"
-                variant="ghost"
-                size="sm"
-                onClick={handleResetToDefaults}
-                disabled={loading || saving}
-                className="gap-1.5"
-              >
-                <RotateCcw className="h-3.5 w-3.5" />
-                Reset to Defaults
-              </Button>
-              <div className="flex gap-2">
-                <Button
-                  type="button"
-                  variant="outline"
-                  size="sm"
-                  onClick={onClose}
-                  disabled={saving}
-                >
-                  Cancel
-                </Button>
-                <Button
-                  type="button"
-                  size="sm"
-                  onClick={handleSave}
-                  disabled={loading || saving || !hasChanges}
-                >
-                  {saving ? 'Saving...' : 'Save'}
-                </Button>
-              </div>
-            </footer>
-          </motion.div>
-        </motion.div>
-      )}
-    </AnimatePresence>,
-    document.body
-  );
-};
-
-const FieldTooltip: React.FC<{ content: string }> = ({ content }) => (
-  <TooltipProvider>
-    <Tooltip delayDuration={200}>
-      <TooltipTrigger asChild>
-        <button
-          type="button"
-          className="text-muted-foreground hover:text-foreground"
-          aria-label="More information"
-        >
-          <Info className="h-3.5 w-3.5" aria-hidden="true" />
-        </button>
-      </TooltipTrigger>
-      <TooltipContent side="top" className="max-w-[200px] text-xs">
-        {content}
-      </TooltipContent>
-    </Tooltip>
-  </TooltipProvider>
-);
-
-export default CustomCommandModal;
diff --git a/src/renderer/components/DefaultAgentSettingsCard.tsx b/src/renderer/components/DefaultAgentSettingsCard.tsx
deleted file mode 100644
index bb1fab9f0f..0000000000
--- a/src/renderer/components/DefaultAgentSettingsCard.tsx
+++ /dev/null
@@ -1,43 +0,0 @@
-import React from 'react';
-import { AgentSelector } from './AgentSelector';
-import type { Agent } from '../types';
-import { isValidProviderId } from '@shared/providers/registry';
-import { useAppSettings } from '@/contexts/AppSettingsProvider';
-
-const DEFAULT_AGENT: Agent = 'claude';
-
-const DefaultAgentSettingsCard: React.FC = () => {
-  const { settings, updateSettings, isLoading: loading, isSaving: saving } = useAppSettings();
-
-  const defaultAgent: Agent = isValidProviderId(settings?.defaultProvider)
-    ? (settings!.defaultProvider as Agent)
-    : DEFAULT_AGENT;
-
-  const handleChange = (agent: Agent) => {
-    void import('../lib/telemetryClient').then(({ captureTelemetry }) => {
-      captureTelemetry('default_agent_changed', { agent });
-    });
-    updateSettings({ defaultProvider: agent });
-  };
-
-  return (
-    <div className="flex items-center justify-between gap-4">
-      <div className="flex flex-1 flex-col gap-0.5">
-        <p className="text-sm font-medium text-foreground">Default agent</p>
-        <p className="text-sm text-muted-foreground">
-          The agent that will be selected by default when creating a new task.
-        </p>
-      </div>
-      <div className="w-[183px] flex-shrink-0">
-        <AgentSelector
-          value={defaultAgent}
-          onChange={handleChange}
-          disabled={loading || saving}
-          className="w-full"
-        />
-      </div>
-    </div>
-  );
-};
-
-export default DefaultAgentSettingsCard;
diff --git a/src/renderer/components/DeletePrNotice.tsx b/src/renderer/components/DeletePrNotice.tsx
deleted file mode 100644
index e88169b97c..0000000000
--- a/src/renderer/components/DeletePrNotice.tsx
+++ /dev/null
@@ -1,71 +0,0 @@
-import React from 'react';
-import { Folder, GitBranch } from 'lucide-react';
-import githubLogo from '../../assets/images/github.png';
-import PrPreviewTooltip from './PrPreviewTooltip';
-import type { PrInfo } from '../lib/prStatus';
-
-type Props = {
-  tasks: Array<{ name: string; pr: PrInfo }>;
-};
-
-export const DeletePrNotice: React.FC<Props> = ({ tasks }) => {
-  if (!tasks.length) return null;
-
-  const handleOpen = (url?: string) => {
-    if (!url) return;
-    try {
-      window.electronAPI.openExternal(url);
-    } catch {}
-  };
-
-  return (
-    <div className="space-y-2 rounded-md border border-amber-300/60 bg-amber-50 px-3 py-2 text-sm text-amber-900 dark:border-amber-500/40 dark:bg-amber-500/10 dark:text-amber-50">
-      <div className="flex items-center gap-2">
-        <GitBranch className="h-4 w-4 text-amber-700 dark:text-amber-200" />
-        <p className="font-medium">Open PR detected</p>
-      </div>
-      <div className="space-y-1">
-        {tasks.map((ws) => {
-          const badge = ws.pr.isDraft ? 'Draft' : 'PR';
-          const number = typeof ws.pr.number === 'number' ? ` #${ws.pr.number}` : '';
-          const state = ws.pr.state ? ` (${String(ws.pr.state)})` : '';
-          const hasValidPr = typeof ws.pr.number === 'number' && typeof ws.pr.url === 'string';
-
-          const prBadge = (
-            <button
-              type="button"
-              className="inline-flex items-center gap-1 rounded-md border bg-white/60 px-2 py-0.5 text-xs font-medium text-amber-900 underline-offset-2 hover:underline dark:bg-white/10 dark:text-amber-50"
-              onClick={(e) => {
-                e.stopPropagation();
-                handleOpen(ws.pr.url);
-              }}
-            >
-              <img src={githubLogo} alt="GitHub" className="h-4 w-4" />
-              {badge}
-              {number}
-              {state}
-            </button>
-          );
-
-          return (
-            <div
-              key={`${ws.name}-${ws.pr.number ?? ws.pr.url ?? 'pr'}`}
-              className="flex items-center gap-2 rounded-md bg-amber-50/80 px-2 py-1 text-amber-900 dark:bg-amber-500/10 dark:text-amber-50"
-            >
-              <Folder className="h-4 w-4 fill-amber-700 text-amber-700" />
-              <span className="font-medium">{ws.name}</span>
-              <span className="text-muted-foreground">—</span>
-              {hasValidPr ? (
-                <PrPreviewTooltip pr={ws.pr as any}>{prBadge}</PrPreviewTooltip>
-              ) : (
-                prBadge
-              )}
-            </div>
-          );
-        })}
-      </div>
-    </div>
-  );
-};
-
-export default DeletePrNotice;
diff --git a/src/renderer/components/EditorMode.tsx b/src/renderer/components/EditorMode.tsx
deleted file mode 100644
index f0ef601e0f..0000000000
--- a/src/renderer/components/EditorMode.tsx
+++ /dev/null
@@ -1,575 +0,0 @@
-import React, { useState, useCallback, useEffect, useRef } from 'react';
-import {
-  X,
-  RefreshCw,
-  FolderOpen,
-  FileText,
-  ChevronRight,
-  ChevronDown,
-  PanelRight,
-  Eye,
-  EyeOff,
-} from 'lucide-react';
-import Editor from '@monaco-editor/react';
-import { Button } from './ui/button';
-import { cn } from '@/lib/utils';
-import { getMonacoLanguageId } from '@/lib/diffUtils';
-import { buildMonacoModelPath } from '@/lib/monacoModelPath';
-import { registerActiveCodeEditor } from '@/lib/activeCodeEditor';
-import { addMonacoKeyboardShortcuts } from '@/lib/monaco-config';
-import { useTheme } from '@/hooks/useTheme';
-import { useRightSidebar } from './ui/right-sidebar';
-
-interface FileNode {
-  name: string;
-  path: string;
-  type: 'file' | 'directory';
-  children?: FileNode[];
-}
-
-interface EditorModeProps {
-  taskPath: string;
-  taskName: string;
-  onClose: () => void;
-}
-
-export default function EditorMode({ taskPath, taskName, onClose }: EditorModeProps) {
-  const { effectiveTheme } = useTheme();
-  const { toggle: toggleRightSidebar, collapsed: rightSidebarCollapsed } = useRightSidebar();
-
-  const [files, setFiles] = useState<FileNode | null>(null);
-  const [selectedFile, setSelectedFile] = useState<string | null>(null);
-  const [fileContent, setFileContent] = useState<string>('');
-  const [originalContent, setOriginalContent] = useState<string>('');
-  const [expandedDirs, setExpandedDirs] = useState<Set<string>>(new Set(['']));
-  const [isLoading, setIsLoading] = useState(false);
-  const [isSaving, setIsSaving] = useState(false);
-  const [explorerWidth, setExplorerWidth] = useState(250);
-  const [isResizing, setIsResizing] = useState(false);
-  const [hasUnsavedChanges, setHasUnsavedChanges] = useState(false);
-  const [showIgnoredFiles, setShowIgnoredFiles] = useState(false);
-  const editorRegistrationCleanupRef = useRef<(() => void) | null>(null);
-
-  // Whitelist approach - only show files we explicitly want
-  const shouldIncludeFile = (fullPath: string): boolean => {
-    const lowerPath = fullPath.toLowerCase();
-
-    // IMMEDIATELY REJECT anything with these ANYWHERE in the path
-    const blacklistPatterns = [
-      'checkout', // This catches .checkouts, checkouts, etc
-      'delete-github',
-      'node_modules',
-      '.git',
-      'dist/',
-      'build/',
-      'coverage',
-      'tmp',
-      'temp',
-      'cache',
-      'vendor',
-      'releases',
-      'release/',
-      'logs',
-      '.turbo',
-      '.next',
-      'out/',
-      '_build',
-      'target/',
-      '.conductor',
-      '.cursor',
-      '.claude',
-      '.amp',
-      '.codex',
-      'worktree',
-      '.aider',
-      '.continue',
-      '.cody',
-      '.windsurf',
-    ];
-
-    // Check each pattern
-    for (const pattern of blacklistPatterns) {
-      if (lowerPath.includes(pattern)) {
-        return false; // Exclude
-      }
-    }
-
-    // Check file extension - only allow source code files
-    const allowedExtensions = [
-      // Web
-      '.js',
-      '.jsx',
-      '.ts',
-      '.tsx',
-      '.vue',
-      '.svelte',
-      '.html',
-      '.css',
-      '.scss',
-      '.sass',
-      '.less',
-
-      // Config
-      '.json',
-      '.yaml',
-      '.yml',
-      '.toml',
-      '.xml',
-      '.env',
-      '.env.example',
-
-      // Docs
-      '.md',
-      '.mdx',
-      '.txt',
-      '.rst',
-
-      // Programming languages
-      '.py',
-      '.rb',
-      '.php',
-      '.java',
-      '.kt',
-      '.scala',
-      '.go',
-      '.rs',
-      '.c',
-      '.cpp',
-      '.h',
-      '.hpp',
-      '.cs',
-      '.swift',
-      '.m',
-      '.mm',
-      '.sh',
-      '.bash',
-      '.zsh',
-      '.fish',
-      '.ps1',
-      '.bat',
-      '.cmd',
-
-      // Config files (no extension)
-      'dockerfile',
-      'makefile',
-      'rakefile',
-      'gemfile',
-      '.gitignore',
-      '.prettierrc',
-      '.eslintrc',
-      '.babelrc',
-      '.editorconfig',
-      '.gitattributes',
-    ];
-
-    const fileName = fullPath.split('/').pop() || '';
-    const lowerFileName = fileName.toLowerCase();
-
-    // Check if it's a directory (no extension usually means directory)
-    const hasExtension = fileName.includes('.');
-    if (!hasExtension) {
-      // For directories, only allow non-hidden ones and specific hidden ones
-      if (fileName.startsWith('.')) {
-        const allowedHiddenDirs = ['.github', '.vscode', '.gitlab'];
-        return allowedHiddenDirs.includes(fileName);
-      }
-      // Non-hidden directory - allow it (already passed blacklist check)
-      return true;
-    }
-
-    // For files, check if extension is allowed
-    for (const ext of allowedExtensions) {
-      if (lowerFileName.endsWith(ext) || lowerFileName === ext) {
-        return true;
-      }
-    }
-
-    return false; // Exclude everything else
-  };
-
-  // Load file tree
-  const loadFileTree = useCallback(async () => {
-    setIsLoading(true);
-    try {
-      // Use the existing fsRead API to list directory contents
-      const result = await window.electronAPI.fsList(taskPath, { includeDirs: true });
-
-      if (result.success && result.items) {
-        // Filter using whitelist approach
-        const filteredItems = showIgnoredFiles
-          ? result.items
-          : result.items.filter((item) => shouldIncludeFile(item.path));
-
-        // Sort items: directories first, then files, both alphabetically
-        const sortedItems = filteredItems.sort((a, b) => {
-          // Directories come before files
-          if (a.type === 'dir' && b.type !== 'dir') return -1;
-          if (a.type !== 'dir' && b.type === 'dir') return 1;
-          // Within same type, sort alphabetically
-          return a.path.localeCompare(b.path);
-        });
-
-        // Build a simple tree structure
-        const tree: FileNode = {
-          name: taskPath.split('/').pop() || 'root',
-          path: '',
-          type: 'directory',
-          children: sortedItems.map((item) => ({
-            name: item.path,
-            path: item.path,
-            type: item.type === 'dir' ? 'directory' : 'file',
-            children: item.type === 'dir' ? [] : undefined,
-          })),
-        };
-        setFiles(tree);
-      }
-    } catch (error) {
-      // Error loading files - handled silently
-    } finally {
-      setIsLoading(false);
-    }
-  }, [taskPath, showIgnoredFiles]);
-
-  // Load file tree on mount
-  useEffect(() => {
-    loadFileTree();
-  }, [loadFileTree]);
-
-  // Track unsaved changes
-  useEffect(() => {
-    if (selectedFile && fileContent !== originalContent) {
-      setHasUnsavedChanges(true);
-    } else {
-      setHasUnsavedChanges(false);
-    }
-  }, [fileContent, originalContent, selectedFile]);
-
-  // Auto-save after 2 seconds of inactivity
-  useEffect(() => {
-    if (!hasUnsavedChanges || !selectedFile) return;
-
-    const timer = setTimeout(() => {
-      saveFile();
-    }, 2000);
-
-    return () => clearTimeout(timer);
-  }, [fileContent, hasUnsavedChanges, selectedFile]);
-
-  // Load file content
-  const loadFile = async (filePath: string) => {
-    try {
-      const result = await window.electronAPI.fsRead(taskPath, filePath);
-
-      if (result.success && result.content !== undefined) {
-        setFileContent(result.content);
-        setOriginalContent(result.content);
-        setSelectedFile(filePath);
-        setHasUnsavedChanges(false);
-      } else {
-        setFileContent('// Failed to load file');
-        setOriginalContent('// Failed to load file');
-      }
-    } catch {
-      setFileContent('// Error loading file');
-      setOriginalContent('// Error loading file');
-    }
-  };
-
-  // Save file
-  const saveFile = async () => {
-    if (!selectedFile) return;
-
-    setIsSaving(true);
-    const fullSavePath = `${taskPath}/${selectedFile}`;
-
-    try {
-      const result = await window.electronAPI.fsWriteFile(
-        taskPath,
-        selectedFile,
-        fileContent,
-        true
-      );
-
-      if (!result.success) {
-        alert(`Failed to save file: ${result.error}\nPath: ${fullSavePath}`);
-      } else {
-        setOriginalContent(fileContent);
-        setHasUnsavedChanges(false);
-      }
-    } catch (error) {
-      alert(`Error saving file: ${error}`);
-    } finally {
-      setIsSaving(false);
-    }
-  };
-
-  // Handle keyboard shortcut for save
-  const handleEditorMount = (editor: any, monaco: any) => {
-    editorRegistrationCleanupRef.current?.();
-    editorRegistrationCleanupRef.current = registerActiveCodeEditor(editor);
-
-    addMonacoKeyboardShortcuts(editor, monaco, {
-      onSave: () => {
-        void saveFile();
-      },
-    });
-  };
-
-  useEffect(() => {
-    return () => {
-      editorRegistrationCleanupRef.current?.();
-      editorRegistrationCleanupRef.current = null;
-    };
-  }, []);
-
-  // Load subdirectory contents
-  const loadSubdirectory = async (dirPath: string): Promise<FileNode[]> => {
-    try {
-      const fullPath = dirPath ? `${taskPath}/${dirPath}` : taskPath;
-      const result = await window.electronAPI.fsList(fullPath, { includeDirs: true });
-
-      if (result.success && result.items) {
-        // Filter using whitelist approach
-        const filteredItems = showIgnoredFiles
-          ? result.items
-          : result.items.filter((item) => shouldIncludeFile(item.path));
-
-        // Sort items: directories first, then files, both alphabetically
-        const sortedItems = filteredItems.sort((a, b) => {
-          // Directories come before files
-          if (a.type === 'dir' && b.type !== 'dir') return -1;
-          if (a.type !== 'dir' && b.type === 'dir') return 1;
-          // Within same type, sort alphabetically
-          return a.path.localeCompare(b.path);
-        });
-
-        return sortedItems.map((item) => ({
-          name: item.path.split('/').pop() || item.path,
-          path: dirPath ? `${dirPath}/${item.path}` : item.path,
-          type: item.type === 'dir' ? 'directory' : 'file',
-          children: item.type === 'dir' ? [] : undefined,
-        }));
-      }
-      return [];
-    } catch (error) {
-      console.error('Failed to load subdirectory:', error);
-      return [];
-    }
-  };
-
-  // Update file tree with subdirectory contents
-  const updateNodeChildren = (node: FileNode, path: string, children: FileNode[]): FileNode => {
-    if (node.path === path) {
-      return { ...node, children };
-    }
-    if (node.children) {
-      return {
-        ...node,
-        children: node.children.map((child) => updateNodeChildren(child, path, children)),
-      };
-    }
-    return node;
-  };
-
-  // Toggle directory expansion
-  const toggleDir = async (path: string) => {
-    const newExpanded = new Set(expandedDirs);
-    if (newExpanded.has(path)) {
-      newExpanded.delete(path);
-    } else {
-      newExpanded.add(path);
-
-      // Load subdirectory contents if not already loaded
-      if (files) {
-        const children = await loadSubdirectory(path);
-        setFiles(updateNodeChildren(files, path, children));
-      }
-    }
-    setExpandedDirs(newExpanded);
-  };
-
-  // Handle resize
-  const handleMouseDown = (e: React.MouseEvent) => {
-    e.preventDefault();
-    setIsResizing(true);
-
-    const startX = e.clientX;
-    const startWidth = explorerWidth;
-
-    const handleMouseMove = (e: MouseEvent) => {
-      const newWidth = Math.max(150, Math.min(500, startWidth + e.clientX - startX));
-      setExplorerWidth(newWidth);
-    };
-
-    const handleMouseUp = () => {
-      setIsResizing(false);
-      document.removeEventListener('mousemove', handleMouseMove);
-      document.removeEventListener('mouseup', handleMouseUp);
-    };
-
-    document.addEventListener('mousemove', handleMouseMove);
-    document.addEventListener('mouseup', handleMouseUp);
-  };
-
-  // Render file tree recursively
-  const renderFileTree = (node: FileNode, level: number = 0) => {
-    const isExpanded = expandedDirs.has(node.path);
-    const isSelected = selectedFile === node.path;
-
-    return (
-      <div key={node.path}>
-        <div
-          className={cn(
-            'flex h-7 cursor-pointer items-center px-2 hover:bg-muted/50',
-            isSelected && 'bg-muted/70'
-          )}
-          style={{ paddingLeft: `${level * 16 + 8}px` }}
-          onClick={() => {
-            if (node.type === 'file') {
-              loadFile(node.path);
-            } else {
-              toggleDir(node.path);
-            }
-          }}
-        >
-          {node.type === 'directory' && (
-            <div className="mr-1">
-              {isExpanded ? (
-                <ChevronDown className="h-4 w-4" />
-              ) : (
-                <ChevronRight className="h-4 w-4" />
-              )}
-            </div>
-          )}
-          {node.type === 'directory' ? (
-            <FolderOpen className="mr-2 h-4 w-4 text-blue-500" />
-          ) : (
-            <FileText className="mr-2 h-4 w-4 text-gray-500" />
-          )}
-          <span className="truncate text-sm">{node.name}</span>
-        </div>
-        {node.type === 'directory' && isExpanded && node.children && (
-          <div>{node.children.map((child) => renderFileTree(child, level + 1))}</div>
-        )}
-      </div>
-    );
-  };
-
-  return (
-    <div className="fixed inset-0 z-30 flex flex-col bg-background">
-      <div className="flex h-12 items-center justify-between border-b border-border bg-muted/30 px-4">
-        <div className="flex items-center gap-2">
-          <FolderOpen className="h-5 w-5" />
-          <span className="font-medium">{taskName} - Editor</span>
-        </div>
-        <div className="flex items-center gap-2">
-          {selectedFile && (
-            <>
-              {hasUnsavedChanges && (
-                <span className="text-xs font-medium text-amber-500">● Unsaved</span>
-              )}
-              <Button
-                variant="ghost"
-                size="sm"
-                onClick={saveFile}
-                disabled={isSaving || !hasUnsavedChanges}
-              >
-                {isSaving ? 'Saving...' : hasUnsavedChanges ? 'Save (⌘S)' : 'Saved'}
-              </Button>
-            </>
-          )}
-          <Button
-            variant="ghost"
-            size="icon"
-            onClick={toggleRightSidebar}
-            title={rightSidebarCollapsed ? 'Show Changes' : 'Hide Changes'}
-          >
-            <PanelRight className="h-4 w-4" />
-          </Button>
-          <Button variant="ghost" size="icon" onClick={onClose}>
-            <X className="h-4 w-4" />
-          </Button>
-        </div>
-      </div>
-
-      <div className="flex flex-1 overflow-hidden">
-        <div className="border-r border-border bg-muted/10" style={{ width: explorerWidth }}>
-          <div className="flex h-10 items-center justify-between border-b border-border px-2">
-            <span className="text-xs font-medium uppercase">Explorer</span>
-            <div className="flex items-center gap-1">
-              <Button
-                variant="ghost"
-                size="icon"
-                className="h-6 w-6"
-                onClick={() => setShowIgnoredFiles(!showIgnoredFiles)}
-                title={showIgnoredFiles ? 'Hide ignored files' : 'Show ignored files'}
-              >
-                {showIgnoredFiles ? <EyeOff className="h-3 w-3" /> : <Eye className="h-3 w-3" />}
-              </Button>
-              <Button variant="ghost" size="icon" className="h-6 w-6" onClick={loadFileTree}>
-                <RefreshCw className="h-3 w-3" />
-              </Button>
-            </div>
-          </div>
-          <div className="h-full overflow-auto">
-            {isLoading ? (
-              <div className="p-4 text-center text-sm text-muted-foreground">Loading files...</div>
-            ) : files ? (
-              renderFileTree(files)
-            ) : (
-              <div className="p-4 text-center text-sm text-muted-foreground">No files found</div>
-            )}
-          </div>
-
-          <div
-            className="absolute right-0 top-0 h-full w-1 cursor-col-resize hover:bg-blue-500/50"
-            style={{ right: -2 }}
-            onMouseDown={handleMouseDown}
-          />
-        </div>
-
-        <div className="flex flex-1 flex-col">
-          {selectedFile ? (
-            <>
-              <div className="flex h-10 items-center justify-between border-b border-border px-4">
-                <div className="flex items-center">
-                  <FileText className="mr-2 h-4 w-4" />
-                  <span className="text-sm">{selectedFile}</span>
-                  {hasUnsavedChanges && <span className="ml-2 text-xs text-amber-500">●</span>}
-                </div>
-                <span className="text-xs text-muted-foreground">
-                  {hasUnsavedChanges ? 'Auto-save in 2s' : 'All changes saved'}
-                </span>
-              </div>
-              <div className="flex-1">
-                <Editor
-                  height="100%"
-                  language={getMonacoLanguageId(selectedFile)}
-                  path={buildMonacoModelPath(taskPath, selectedFile)}
-                  keepCurrentModel={true}
-                  value={fileContent}
-                  onChange={(value) => setFileContent(value || '')}
-                  onMount={handleEditorMount}
-                  theme={
-                    effectiveTheme === 'dark' || effectiveTheme === 'dark-black' ? 'vs-dark' : 'vs'
-                  }
-                  options={{
-                    minimap: { enabled: true },
-                    fontSize: 13,
-                    lineNumbers: 'on',
-                    wordWrap: 'on',
-                    automaticLayout: true,
-                  }}
-                />
-              </div>
-            </>
-          ) : (
-            <div className="flex flex-1 items-center justify-center text-muted-foreground">
-              Select a file to edit
-            </div>
-          )}
-        </div>
-      </div>
-    </div>
-  );
-}
diff --git a/src/renderer/components/ErrorBoundary.tsx b/src/renderer/components/ErrorBoundary.tsx
deleted file mode 100644
index 14ef724bdb..0000000000
--- a/src/renderer/components/ErrorBoundary.tsx
+++ /dev/null
@@ -1,71 +0,0 @@
-import React from 'react';
-import { captureComponentError } from '../lib/errorTracking';
-
-type ErrorBoundaryState = {
-  hasError: boolean;
-  error: Error | null;
-};
-
-type ErrorBoundaryProps = {
-  children?: React.ReactNode;
-  componentName?: string;
-};
-
-export default class ErrorBoundary extends React.Component<ErrorBoundaryProps, ErrorBoundaryState> {
-  constructor(props: ErrorBoundaryProps) {
-    super(props);
-    this.state = { hasError: false, error: null };
-  }
-
-  static getDerivedStateFromError(error: Error): ErrorBoundaryState {
-    return { hasError: true, error };
-  }
-
-  componentDidCatch(error: Error, info: React.ErrorInfo) {
-    try {
-      // Track error with PostHog
-      captureComponentError(error, this.props.componentName || 'App', {
-        component_stack: info.componentStack,
-        error_boundary: true,
-        severity: 'critical',
-      });
-
-      // Also log to app logger if available
-      void import('../lib/logger').then(({ log }) => {
-        try {
-          log.error('Renderer crash caught by ErrorBoundary', { error, info });
-        } catch {}
-      });
-    } catch {}
-  }
-
-  handleReload = () => {
-    try {
-      window.location.reload();
-    } catch {}
-  };
-
-  render() {
-    if (!this.state.hasError) return this.props.children as React.ReactElement;
-
-    const message = this.state.error?.message || 'An unexpected error occurred.';
-
-    return (
-      <div className="flex h-screen w-screen items-center justify-center bg-background p-6">
-        <div className="max-w-xl rounded-md border border-border bg-card p-6 text-card-foreground shadow-sm">
-          <h1 className="mb-2 text-lg font-semibold">Something went wrong</h1>
-          <p className="mb-4 break-all text-sm text-muted-foreground">{message}</p>
-          <div className="flex items-center gap-2">
-            <button
-              type="button"
-              className="inline-flex h-9 items-center justify-center rounded-md border border-input bg-primary px-4 text-sm font-medium text-primary-foreground shadow-sm"
-              onClick={this.handleReload}
-            >
-              Reload
-            </button>
-          </div>
-        </div>
-      </div>
-    );
-  }
-}
diff --git a/src/renderer/components/ExternalLinkModal.tsx b/src/renderer/components/ExternalLinkModal.tsx
deleted file mode 100644
index ddabcd059c..0000000000
--- a/src/renderer/components/ExternalLinkModal.tsx
+++ /dev/null
@@ -1,85 +0,0 @@
-import React from 'react';
-import { ExternalLink, AlertTriangle, Globe } from 'lucide-react';
-import {
-  AlertDialog,
-  AlertDialogAction,
-  AlertDialogCancel,
-  AlertDialogContent,
-  AlertDialogDescription,
-  AlertDialogFooter,
-  AlertDialogHeader,
-  AlertDialogTitle,
-} from './ui/alert-dialog';
-import { Button } from './ui/button';
-
-interface ExternalLinkModalProps {
-  open: boolean;
-  onOpenChange: (open: boolean) => void;
-  url: string;
-  onConfirm: () => void;
-  onCancel?: () => void;
-}
-
-export const ExternalLinkModal: React.FC<ExternalLinkModalProps> = ({
-  open,
-  onOpenChange,
-  url,
-  onConfirm,
-  onCancel,
-}) => {
-  const handleCancel = () => {
-    onOpenChange(false);
-    onCancel?.();
-  };
-
-  const handleConfirm = () => {
-    onOpenChange(false);
-    onConfirm();
-  };
-
-  // Parse the URL to display the domain
-  const getDomain = (urlString: string) => {
-    try {
-      const urlObj = new URL(urlString);
-      return urlObj.hostname;
-    } catch {
-      return urlString;
-    }
-  };
-
-  const domain = getDomain(url);
-
-  // Truncate long URLs for display
-  const displayUrl = url.length > 80 ? url.substring(0, 77) + '...' : url;
-
-  return (
-    <AlertDialog open={open} onOpenChange={onOpenChange}>
-      <AlertDialogContent className="max-w-md">
-        <AlertDialogHeader>
-          <div className="flex items-center gap-3">
-            <AlertDialogTitle className="text-lg">Open External Link?</AlertDialogTitle>
-          </div>
-        </AlertDialogHeader>
-
-        <div className="space-y-4">
-          <AlertDialogDescription className="text-sm">
-            This link will open in your default browser outside of Emdash.
-          </AlertDialogDescription>
-        </div>
-
-        <AlertDialogFooter>
-          <AlertDialogCancel onClick={handleCancel}>Cancel</AlertDialogCancel>
-          <AlertDialogAction
-            onClick={handleConfirm}
-            className="bg-primary px-4 py-2 text-primary-foreground hover:bg-primary/90"
-          >
-            <ExternalLink className="mr-2 h-4 w-4" />
-            Open Link
-          </AlertDialogAction>
-        </AlertDialogFooter>
-      </AlertDialogContent>
-    </AlertDialog>
-  );
-};
-
-export default ExternalLinkModal;
diff --git a/src/renderer/components/FeedbackModal.tsx b/src/renderer/components/FeedbackModal.tsx
deleted file mode 100644
index 7125cfdceb..0000000000
--- a/src/renderer/components/FeedbackModal.tsx
+++ /dev/null
@@ -1,404 +0,0 @@
-import React, { useCallback, useEffect, useRef, useState } from 'react';
-import { createPortal } from 'react-dom';
-import { AnimatePresence, motion, useReducedMotion } from 'motion/react';
-import { CornerDownLeft, Paperclip, X } from 'lucide-react';
-import { Button } from './ui/button';
-import { Input } from './ui/input';
-import { Spinner } from './ui/spinner';
-import { Textarea } from './ui/textarea';
-import { useToast } from '../hooks/use-toast';
-
-const DISCORD_WEBHOOK_URL =
-  'https://discord.com/api/webhooks/1473390363388416230/eRIo1UhylapH94KpqUUp5PDzkLhjBvcnjjyE_JezfHiAyfN3QEbRyEIJaSl8QQUz7Mak';
-
-interface FeedbackModalProps {
-  isOpen: boolean;
-  onClose: () => void;
-  githubUser?: {
-    login?: string;
-    name?: string;
-    html_url?: string;
-    email?: string;
-  } | null;
-  blurb?: string;
-}
-
-const FeedbackModal: React.FC<FeedbackModalProps> = ({ isOpen, onClose, githubUser, blurb }) => {
-  const shouldReduceMotion = useReducedMotion();
-  const submitButtonRef = useRef<HTMLButtonElement | null>(null);
-  const fileInputRef = useRef<HTMLInputElement | null>(null);
-  const [feedbackDetails, setFeedbackDetails] = useState('');
-  const [contactEmail, setContactEmail] = useState('');
-  const [submitting, setSubmitting] = useState(false);
-  const [errorMessage, setErrorMessage] = useState<string | null>(null);
-  const [attachments, setAttachments] = useState<File[]>([]);
-  const { toast } = useToast();
-
-  useEffect(() => {
-    if (!isOpen) {
-      return;
-    }
-
-    const handleKeyDown = (event: KeyboardEvent) => {
-      if (event.key === 'Escape') {
-        event.preventDefault();
-        onClose();
-      }
-    };
-
-    window.addEventListener('keydown', handleKeyDown);
-    return () => {
-      window.removeEventListener('keydown', handleKeyDown);
-    };
-  }, [isOpen, onClose]);
-
-  useEffect(() => {
-    if (!isOpen) {
-      setFeedbackDetails('');
-      setContactEmail('');
-      setSubmitting(false);
-      setErrorMessage(null);
-      setAttachments([]);
-    }
-  }, [isOpen]);
-
-  const handleSubmit = useCallback(async () => {
-    if (!feedbackDetails.trim() || submitting) {
-      if (!feedbackDetails.trim()) {
-        setErrorMessage('Please enter some feedback before sending.');
-      }
-      return;
-    }
-
-    if (!DISCORD_WEBHOOK_URL) {
-      setErrorMessage('Feedback webhook is not configured.');
-      return;
-    }
-
-    setSubmitting(true);
-    setErrorMessage(null);
-
-    const trimmedFeedback = feedbackDetails.trim();
-    const trimmedContact = contactEmail.trim();
-
-    const metadataLines: string[] = [];
-    if (trimmedContact) {
-      metadataLines.push(`Contact: ${trimmedContact}`);
-    }
-
-    const githubLogin = githubUser?.login?.trim();
-    const githubName = githubUser?.name?.trim();
-    if (githubLogin || githubName) {
-      const summaryParts: string[] = [];
-      if (githubName && githubLogin) {
-        summaryParts.push(`${githubName} (@${githubLogin})`);
-      } else if (githubName) {
-        summaryParts.push(githubName);
-      } else if (githubLogin) {
-        summaryParts.push(`@${githubLogin}`);
-      }
-      metadataLines.push(`GitHub: ${summaryParts.join(' ')}`);
-    }
-
-    const content = [trimmedFeedback, metadataLines.join('\n')].filter(Boolean).join('\n\n');
-
-    try {
-      let response: Response;
-
-      if (attachments.length > 0) {
-        const formData = new FormData();
-        formData.append('content', content);
-        attachments.forEach((file, index) => {
-          formData.append(`file${index}`, file);
-        });
-        response = await fetch(DISCORD_WEBHOOK_URL, {
-          method: 'POST',
-          body: formData,
-        });
-      } else {
-        response = await fetch(DISCORD_WEBHOOK_URL, {
-          method: 'POST',
-          headers: {
-            'Content-Type': 'application/json',
-          },
-          body: JSON.stringify({ content }),
-        });
-      }
-
-      if (!response.ok) {
-        throw new Error(`Discord webhook returned ${response.status}`);
-      }
-
-      setFeedbackDetails('');
-      setContactEmail('');
-      setAttachments([]);
-      onClose();
-      toast({ title: 'Feedback sent', description: 'Thanks for your feedback!' });
-    } catch (error) {
-      console.error('Failed to submit feedback:', error);
-      setErrorMessage('Unable to send feedback. Please try again.');
-      toast({
-        title: 'Failed to send feedback',
-        description: 'Please try again.',
-        variant: 'destructive' as any,
-      });
-    } finally {
-      setSubmitting(false);
-    }
-  }, [attachments, contactEmail, feedbackDetails, githubUser, onClose, submitting]);
-
-  const handleFormSubmit = useCallback(
-    async (event: React.FormEvent<HTMLFormElement>) => {
-      event.preventDefault();
-      await handleSubmit();
-    },
-    [handleSubmit]
-  );
-
-  const handleMetaEnter = (event: React.KeyboardEvent<HTMLTextAreaElement | HTMLInputElement>) => {
-    if ((event.metaKey || event.ctrlKey) && event.key.toLowerCase() === 'enter') {
-      event.preventDefault();
-      void handleSubmit();
-    }
-  };
-
-  const handleAttachmentClick = () => {
-    fileInputRef.current?.click();
-  };
-
-  const handleAttachmentChange = (event: React.ChangeEvent<HTMLInputElement>) => {
-    const files = Array.from(event.target.files ?? []);
-    if (files.length) {
-      setAttachments((prev) => [...prev, ...files]);
-      if (errorMessage) {
-        setErrorMessage(null);
-      }
-    }
-    event.target.value = '';
-  };
-
-  const handleRemoveAttachment = (index: number) => {
-    setAttachments((prev) => prev.filter((_, i) => i !== index));
-  };
-
-  const handlePaste = (event: React.ClipboardEvent<HTMLTextAreaElement>) => {
-    const items = event.clipboardData?.items;
-    if (!items) return;
-
-    const imageFiles: File[] = [];
-    for (const item of items) {
-      if (item.type.startsWith('image/')) {
-        const file = item.getAsFile();
-        if (file) {
-          imageFiles.push(file);
-        }
-      }
-    }
-
-    if (imageFiles.length > 0) {
-      setAttachments((prev) => [...prev, ...imageFiles]);
-      if (errorMessage) {
-        setErrorMessage(null);
-      }
-    }
-  };
-
-  const handleDrop = (event: React.DragEvent<HTMLFormElement>) => {
-    event.preventDefault();
-    event.stopPropagation();
-
-    const files = Array.from(event.dataTransfer?.files ?? []);
-    const imageFiles = files.filter((file) => file.type.startsWith('image/'));
-
-    if (imageFiles.length > 0) {
-      setAttachments((prev) => [...prev, ...imageFiles]);
-      if (errorMessage) {
-        setErrorMessage(null);
-      }
-    }
-  };
-
-  const handleDragOver = (event: React.DragEvent<HTMLFormElement>) => {
-    event.preventDefault();
-    event.stopPropagation();
-  };
-
-  if (typeof document === 'undefined') {
-    return null;
-  }
-
-  return createPortal(
-    <AnimatePresence>
-      {isOpen && (
-        <motion.div
-          role="dialog"
-          aria-modal="true"
-          aria-label="Feedback"
-          className="fixed inset-0 z-[120] flex items-center justify-center bg-black/60 backdrop-blur-sm"
-          initial={shouldReduceMotion ? false : { opacity: 0 }}
-          animate={{ opacity: 1 }}
-          exit={shouldReduceMotion ? { opacity: 1 } : { opacity: 0 }}
-          transition={shouldReduceMotion ? { duration: 0 } : { duration: 0.12, ease: 'easeOut' }}
-          onClick={onClose}
-        >
-          <motion.div
-            onClick={(event) => event.stopPropagation()}
-            initial={shouldReduceMotion ? false : { opacity: 0, y: 8, scale: 0.995 }}
-            animate={{ opacity: 1, y: 0, scale: 1 }}
-            exit={
-              shouldReduceMotion
-                ? { opacity: 1, y: 0, scale: 1 }
-                : { opacity: 0, y: 6, scale: 0.995 }
-            }
-            transition={
-              shouldReduceMotion ? { duration: 0 } : { duration: 0.2, ease: [0.22, 1, 0.36, 1] }
-            }
-            className="w-full max-w-lg transform-gpu rounded-xl border border-border bg-white shadow-2xl outline-none will-change-transform dark:border-border dark:bg-background"
-          >
-            <div className="flex items-start justify-between px-6 pb-2 pt-6">
-              <div className="flex flex-col gap-1">
-                <h2 className="text-lg font-semibold text-foreground">Feedback</h2>
-                {blurb ? <p className="max-w-md text-xs text-muted-foreground">{blurb}</p> : null}
-              </div>
-              <Button
-                type="button"
-                variant="ghost"
-                aria-label="Close feedback"
-                onClick={onClose}
-                size="icon"
-                className="text-muted-foreground hover:bg-background/80"
-              >
-                <X className="h-4 w-4" />
-              </Button>
-            </div>
-
-            <form
-              className="space-y-4 px-6 pb-6"
-              onSubmit={handleFormSubmit}
-              onDrop={handleDrop}
-              onDragOver={handleDragOver}
-            >
-              <div className="space-y-1.5">
-                <label htmlFor="feedback-details" className="sr-only">
-                  Feedback details
-                </label>
-                <Textarea
-                  id="feedback-details"
-                  rows={5}
-                  placeholder="What do you like? How can we improve?"
-                  className="resize-none"
-                  value={feedbackDetails}
-                  onChange={(event) => {
-                    setFeedbackDetails(event.target.value);
-                    if (errorMessage) {
-                      setErrorMessage(null);
-                    }
-                  }}
-                  onKeyDown={handleMetaEnter}
-                  onPaste={handlePaste}
-                />
-              </div>
-
-              <div className="space-y-1.5">
-                <label htmlFor="feedback-contact" className="sr-only">
-                  Contact email
-                </label>
-                <Input
-                  id="feedback-contact"
-                  type="text"
-                  placeholder="productive@example.com (optional)"
-                  value={contactEmail}
-                  onChange={(event) => {
-                    setContactEmail(event.target.value);
-                    if (errorMessage) {
-                      setErrorMessage(null);
-                    }
-                  }}
-                  onKeyDown={handleMetaEnter}
-                />
-              </div>
-
-              <div className="space-y-2">
-                <input
-                  ref={fileInputRef}
-                  type="file"
-                  accept="image/*"
-                  className="hidden"
-                  multiple
-                  onChange={handleAttachmentChange}
-                  disabled={submitting}
-                />
-                {attachments.length > 0 ? (
-                  <ul className="space-y-1 text-sm">
-                    {attachments.map((file, index) => (
-                      <li
-                        key={`${file.name}-${index}`}
-                        className="flex items-center justify-between rounded-md border border-dashed border-border px-3 py-2 text-foreground dark:border-border dark:text-foreground"
-                      >
-                        <span className="truncate">{file.name}</span>
-                        <Button
-                          type="button"
-                          variant="ghost"
-                          size="sm"
-                          onClick={() => handleRemoveAttachment(index)}
-                          disabled={submitting}
-                          className="text-xs text-muted-foreground hover:text-foreground"
-                        >
-                          Remove
-                        </Button>
-                      </li>
-                    ))}
-                  </ul>
-                ) : null}
-              </div>
-
-              {errorMessage ? (
-                <p className="text-sm text-destructive" role="alert">
-                  {errorMessage}
-                </p>
-              ) : null}
-
-              <div className="flex items-center justify-between gap-3 pt-2">
-                <Button
-                  type="button"
-                  variant="outline"
-                  onClick={handleAttachmentClick}
-                  className="gap-2"
-                  disabled={submitting}
-                >
-                  <Paperclip className="h-4 w-4" aria-hidden="true" />
-                  <span>Attach image</span>
-                </Button>
-                <Button
-                  type="submit"
-                  ref={submitButtonRef}
-                  className="gap-2 px-4"
-                  disabled={submitting || !feedbackDetails.trim()}
-                  aria-busy={submitting}
-                >
-                  {submitting ? (
-                    <>
-                      <Spinner size="sm" />
-                      <span>Sending…</span>
-                    </>
-                  ) : (
-                    <>
-                      <span>Send Feedback</span>
-                      <span className="flex items-center gap-1 rounded border border-white/40 bg-white/10 px-1.5 py-0.5 text-[11px] font-medium text-primary-foreground dark:border-white/20 dark:bg-white/5">
-                        <span>⌘</span>
-                        <CornerDownLeft className="h-3 w-3" aria-hidden="true" />
-                      </span>
-                    </>
-                  )}
-                </Button>
-              </div>
-            </form>
-          </motion.div>
-        </motion.div>
-      )}
-    </AnimatePresence>,
-    document.body
-  );
-};
-
-export default FeedbackModal;
diff --git a/src/renderer/components/FileChangesPanel.tsx b/src/renderer/components/FileChangesPanel.tsx
deleted file mode 100644
index adbfdf3774..0000000000
--- a/src/renderer/components/FileChangesPanel.tsx
+++ /dev/null
@@ -1,537 +0,0 @@
-import React, { useEffect, useRef, useState } from 'react';
-import { Badge } from './ui/badge';
-import { Button } from './ui/button';
-import { Spinner } from './ui/spinner';
-import { useToast } from '../hooks/use-toast';
-import { useCreatePR } from '../hooks/useCreatePR';
-import { useFileChanges } from '../hooks/useFileChanges';
-import { usePrStatus } from '../hooks/usePrStatus';
-import { useCheckRuns } from '../hooks/useCheckRuns';
-import { useAutoCheckRunsRefresh } from '../hooks/useAutoCheckRunsRefresh';
-import { usePrComments } from '../hooks/usePrComments';
-import { ChecksPanel } from './CheckRunsList';
-import { PrCommentsList } from './PrCommentsList';
-import MergePrSection from './MergePrSection';
-import { FileIcon } from './FileExplorer/FileIcons';
-import { Popover, PopoverContent, PopoverTrigger } from './ui/popover';
-import { Close as PopoverClose } from '@radix-ui/react-popover';
-import {
-  ArrowUpRight,
-  ChevronDown,
-  FileDiff,
-  Loader2,
-  CheckCircle2,
-  XCircle,
-  GitMerge,
-} from 'lucide-react';
-import {
-  AlertDialog,
-  AlertDialogAction,
-  AlertDialogCancel,
-  AlertDialogContent,
-  AlertDialogDescription,
-  AlertDialogFooter,
-  AlertDialogHeader,
-  AlertDialogTitle,
-} from './ui/alert-dialog';
-import { useTaskScope } from './TaskScopeContext';
-
-type ActiveTab = 'changes' | 'checks';
-type PrMode = 'create' | 'draft' | 'merge';
-
-const PR_MODE_LABELS: Record<PrMode, string> = {
-  create: 'Create PR',
-  draft: 'Draft PR',
-  merge: 'Merge into Main',
-};
-
-interface PrActionButtonProps {
-  mode: PrMode;
-  onModeChange: (mode: PrMode) => void;
-  onExecute: () => Promise<void>;
-  isLoading: boolean;
-}
-
-function PrActionButton({ mode, onModeChange, onExecute, isLoading }: PrActionButtonProps) {
-  return (
-    <div className="flex shrink-0">
-      <Button
-        variant="outline"
-        size="sm"
-        className="h-8 whitespace-nowrap rounded-r-none border-r-0 px-2 text-xs"
-        disabled={isLoading}
-        onClick={onExecute}
-      >
-        {isLoading ? <Spinner size="sm" /> : PR_MODE_LABELS[mode]}
-      </Button>
-      <Popover>
-        <PopoverTrigger asChild>
-          <Button
-            variant="outline"
-            size="sm"
-            className="h-8 rounded-l-none px-1.5"
-            disabled={isLoading}
-          >
-            <ChevronDown className="h-3.5 w-3.5" />
-          </Button>
-        </PopoverTrigger>
-        <PopoverContent align="end" className="w-auto min-w-0 p-0.5">
-          {(['create', 'draft', 'merge'] as PrMode[])
-            .filter((m) => m !== mode)
-            .map((m) => (
-              <PopoverClose key={m} asChild>
-                <button
-                  className="w-full whitespace-nowrap rounded px-2 py-1 text-left text-xs hover:bg-accent"
-                  onClick={() => onModeChange(m)}
-                >
-                  {PR_MODE_LABELS[m]}
-                </button>
-              </PopoverClose>
-            ))}
-        </PopoverContent>
-      </Popover>
-    </div>
-  );
-}
-
-function TabButton({
-  active,
-  onClick,
-  children,
-}: {
-  active: boolean;
-  onClick: () => void;
-  children: React.ReactNode;
-}) {
-  return (
-    <button
-      type="button"
-      className={`flex-1 px-3 py-1.5 text-xs font-medium transition-colors ${
-        active
-          ? 'border-b-2 border-primary text-foreground'
-          : 'text-muted-foreground hover:text-foreground'
-      }`}
-      onClick={onClick}
-    >
-      {children}
-    </button>
-  );
-}
-
-interface FileChangesPanelProps {
-  taskId?: string;
-  taskPath?: string;
-  className?: string;
-  onOpenChanges?: (filePath?: string, taskPath?: string) => void;
-}
-
-const FileChangesPanelComponent: React.FC<FileChangesPanelProps> = ({
-  taskId,
-  taskPath,
-  className,
-  onOpenChanges,
-}) => {
-  const { taskId: scopedTaskId, taskPath: scopedTaskPath } = useTaskScope();
-  const resolvedTaskId = taskId ?? scopedTaskId;
-  const resolvedTaskPath = taskPath ?? scopedTaskPath;
-  const safeTaskPath = resolvedTaskPath ?? '';
-  const canRender = Boolean(resolvedTaskId && resolvedTaskPath);
-
-  const [showDiffModal, setShowDiffModal] = useState(false);
-  const [showAllChangesModal, setShowAllChangesModal] = useState(false);
-  const [selectedPath, setSelectedPath] = useState<string | undefined>(undefined);
-
-  // Reset selectedPath and action loading states when task changes
-  useEffect(() => {
-    setSelectedPath(undefined);
-    setIsMergingToMain(false);
-  }, [resolvedTaskPath]);
-  const [stagingFiles, setStagingFiles] = useState<Set<string>>(new Set());
-  const [unstagingFiles, setUnstagingFiles] = useState<Set<string>>(new Set());
-  const [revertingFiles, setRevertingFiles] = useState<Set<string>>(new Set());
-  const [isStagingAll, setIsStagingAll] = useState(false);
-  const [commitMessage, setCommitMessage] = useState('');
-  const [isCommitting, setIsCommitting] = useState(false);
-  const [isMergingToMain, setIsMergingToMain] = useState(false);
-  const [showMergeConfirm, setShowMergeConfirm] = useState(false);
-  const [prMode, setPrMode] = useState<PrMode>(() => {
-    try {
-      const stored = localStorage.getItem('emdash:prMode');
-      if (stored === 'create' || stored === 'draft' || stored === 'merge') return stored;
-      // Migrate from old boolean key
-      if (localStorage.getItem('emdash:createPrAsDraft') === 'true') return 'draft';
-      return 'create';
-    } catch {
-      // localStorage not available in some environments
-      return 'create';
-    }
-  });
-  const { isCreatingForTaskPath, createPR } = useCreatePR();
-
-  const selectPrMode = (mode: PrMode) => {
-    setPrMode(mode);
-    try {
-      localStorage.setItem('emdash:prMode', mode);
-    } catch {
-      // localStorage not available
-    }
-  };
-
-  const { fileChanges, isLoading, refreshChanges } = useFileChanges(safeTaskPath);
-  const { toast } = useToast();
-  const hasChanges = fileChanges.length > 0;
-  const { pr, isLoading: isPrLoading, refresh: refreshPr } = usePrStatus(safeTaskPath);
-  const [activeTab, setActiveTab] = useState<ActiveTab>('changes');
-  const { status: checkRunsStatus, isLoading: checkRunsLoading } = useCheckRuns(
-    pr ? safeTaskPath : undefined
-  );
-  // Only poll for check runs when the Checks tab is active; the initial fetch
-  // from useCheckRuns is enough for the tab badge indicators.
-  const checksTabActive = activeTab === 'checks' && !!pr;
-  useAutoCheckRunsRefresh(checksTabActive ? safeTaskPath : undefined, checkRunsStatus);
-  const prevChecksAllComplete = useRef<boolean | null>(null);
-  useEffect(() => {
-    if (!checksTabActive || !pr || !checkRunsStatus) return;
-    const prev = prevChecksAllComplete.current;
-    const next = checkRunsStatus.allComplete;
-    prevChecksAllComplete.current = next;
-    if (prev === false && next === true) {
-      refreshPr().catch(() => {});
-    }
-  }, [checksTabActive, pr, checkRunsStatus, refreshPr]);
-  const { status: prCommentsStatus, isLoading: prCommentsLoading } = usePrComments(
-    pr ? safeTaskPath : undefined,
-    pr?.number
-  );
-  const [branchAhead, setBranchAhead] = useState<number | null>(null);
-  const [branchStatusLoading, setBranchStatusLoading] = useState<boolean>(false);
-
-  // Default to checks when PR exists but no changes; reset when PR disappears
-  useEffect(() => {
-    if (!pr) {
-      setActiveTab('changes');
-    } else if (!hasChanges) {
-      setActiveTab('checks');
-    }
-  }, [pr, hasChanges]);
-
-  useEffect(() => {
-    let cancelled = false;
-    const load = async () => {
-      if (!safeTaskPath) {
-        setBranchAhead(null);
-        return;
-      }
-
-      setBranchStatusLoading(true);
-      try {
-        const res = await window.electronAPI.getBranchStatus({ taskPath: safeTaskPath });
-        if (!cancelled) {
-          setBranchAhead(res?.success ? (res?.ahead ?? 0) : 0);
-        }
-      } catch {
-        // Network or IPC error - default to 0
-        if (!cancelled) setBranchAhead(0);
-      } finally {
-        if (!cancelled) setBranchStatusLoading(false);
-      }
-    };
-    load();
-    return () => {
-      cancelled = true;
-    };
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [safeTaskPath, hasChanges]);
-
-  const handleMergeToMain = async () => {
-    setIsMergingToMain(true);
-    try {
-      const result = await window.electronAPI.mergeToMain({ taskPath: safeTaskPath });
-      if (result.success) {
-        toast({
-          title: 'Merged to Main',
-          description: 'Changes have been merged to main.',
-        });
-        await refreshChanges();
-        try {
-          await refreshPr();
-        } catch {
-          // PR refresh is best-effort
-        }
-      } else {
-        toast({
-          title: 'Merge Failed',
-          description: result.error || 'Failed to merge to main.',
-          variant: 'destructive',
-        });
-      }
-    } catch (_error) {
-      toast({
-        title: 'Merge Failed',
-        description: 'An unexpected error occurred.',
-        variant: 'destructive',
-      });
-    } finally {
-      setIsMergingToMain(false);
-    }
-  };
-
-  const handlePrAction = async () => {
-    if (prMode === 'merge') {
-      setShowMergeConfirm(true);
-      return;
-    } else {
-      void (async () => {
-        const { captureTelemetry } = await import('../lib/telemetryClient');
-        captureTelemetry('pr_viewed');
-      })();
-      await createPR({
-        taskPath: safeTaskPath,
-        prOptions: prMode === 'draft' ? { draft: true } : undefined,
-        onSuccess: async () => {
-          await refreshChanges();
-          try {
-            await refreshPr();
-          } catch {
-            // PR refresh is best-effort
-          }
-        },
-      });
-    }
-  };
-
-  const renderPath = (p: string) => {
-    const last = p.lastIndexOf('/');
-    const dir = last >= 0 ? p.slice(0, last + 1) : '';
-    const base = last >= 0 ? p.slice(last + 1) : p;
-    return (
-      <span className="flex min-w-0" title={p}>
-        <span className="shrink-0 font-medium text-foreground">{base}</span>
-        {dir && <span className="ml-1 truncate text-muted-foreground">{dir}</span>}
-      </span>
-    );
-  };
-
-  const totalChanges = fileChanges.reduce(
-    (acc, change) => ({
-      additions: acc.additions + change.additions,
-      deletions: acc.deletions + change.deletions,
-    }),
-    { additions: 0, deletions: 0 }
-  );
-
-  if (!canRender) {
-    return null;
-  }
-
-  const isActionLoading = isCreatingForTaskPath(safeTaskPath) || isMergingToMain;
-
-  return (
-    <div className={`flex h-full flex-col bg-card shadow-sm ${className}`}>
-      <div className="bg-muted px-3 py-2">
-        <div className="flex w-full flex-wrap items-center justify-between gap-2">
-          <div className="flex shrink-0 items-center gap-1 text-xs">
-            {hasChanges ? (
-              <>
-                <span className="font-medium text-green-600 dark:text-green-400">
-                  +{totalChanges.additions}
-                </span>
-                <span className="text-muted-foreground">&middot;</span>
-                <span className="font-medium text-red-600 dark:text-red-400">
-                  -{totalChanges.deletions}
-                </span>
-              </>
-            ) : (
-              <>
-                <span className="font-medium text-green-600 dark:text-green-400">&mdash;</span>
-                <span className="text-muted-foreground">&middot;</span>
-                <span className="font-medium text-red-600 dark:text-red-400">&mdash;</span>
-              </>
-            )}
-          </div>
-          <div className="flex shrink-0 items-center gap-2">
-            {onOpenChanges && (
-              <Button
-                variant="outline"
-                size="sm"
-                className="h-8 shrink-0 px-2 text-xs"
-                title="View all changes and history"
-                onClick={() => onOpenChanges(undefined, safeTaskPath)}
-              >
-                <FileDiff className="h-3.5 w-3.5 sm:mr-1.5" />
-                <span className="hidden sm:inline">Changes</span>
-              </Button>
-            )}
-            {hasChanges ? (
-              <PrActionButton
-                mode={prMode}
-                onModeChange={selectPrMode}
-                onExecute={handlePrAction}
-                isLoading={isActionLoading}
-              />
-            ) : isPrLoading ? (
-              <div className="flex items-center justify-center p-1">
-                <Spinner size="sm" className="h-3.5 w-3.5" />
-              </div>
-            ) : pr ? (
-              <button
-                type="button"
-                onClick={(e) => {
-                  e.stopPropagation();
-                  if (pr.url) window.electronAPI?.openExternal?.(pr.url);
-                }}
-                className="inline-flex items-center gap-1 rounded border border-border bg-muted px-1.5 py-0.5 text-[10px] font-medium text-muted-foreground transition-colors hover:bg-accent hover:text-accent-foreground"
-                title={`${pr.title || 'Pull Request'} (#${pr.number})`}
-              >
-                {pr.isDraft
-                  ? 'Draft'
-                  : String(pr.state).toUpperCase() === 'OPEN'
-                    ? 'View PR'
-                    : `PR ${String(pr.state).charAt(0).toUpperCase() + String(pr.state).slice(1).toLowerCase()}`}
-                <ArrowUpRight className="size-3" />
-              </button>
-            ) : branchStatusLoading || (branchAhead !== null && branchAhead > 0) ? (
-              <PrActionButton
-                mode={prMode}
-                onModeChange={selectPrMode}
-                onExecute={handlePrAction}
-                isLoading={isActionLoading || branchStatusLoading}
-              />
-            ) : (
-              <span className="text-xs text-muted-foreground">No PR for this task</span>
-            )}
-          </div>
-        </div>
-      </div>
-
-      {pr && hasChanges && (
-        <div className="flex border-b border-border">
-          <TabButton active={activeTab === 'changes'} onClick={() => setActiveTab('changes')}>
-            Changes
-            <span className="ml-1.5 rounded-full bg-muted px-1.5 py-0.5 text-[10px]">
-              {fileChanges.length}
-            </span>
-          </TabButton>
-          <TabButton active={activeTab === 'checks'} onClick={() => setActiveTab('checks')}>
-            Checks
-            {checkRunsStatus && !checkRunsStatus.allComplete && (
-              <Loader2 className="ml-1.5 inline h-3 w-3 animate-spin text-foreground" />
-            )}
-            {checkRunsStatus?.hasFailures && checkRunsStatus.allComplete && (
-              <span className="ml-1.5 inline-block h-2 w-2 rounded-full bg-red-500" />
-            )}
-          </TabButton>
-        </div>
-      )}
-      {activeTab === 'checks' && pr ? (
-        <>
-          <div className="min-h-0 flex-1 overflow-y-auto">
-            {!hasChanges && (
-              <div className="flex items-center gap-1.5 px-4 py-1.5">
-                <span className="text-sm font-medium text-foreground">Checks</span>
-                {checkRunsStatus?.summary && (
-                  <div className="flex items-center gap-1.5">
-                    {checkRunsStatus.summary.passed > 0 && (
-                      <Badge variant="outline">
-                        <CheckCircle2 className="h-3 w-3 text-emerald-500" />
-                        {checkRunsStatus.summary.passed} passed
-                      </Badge>
-                    )}
-                    {checkRunsStatus.summary.failed > 0 && (
-                      <Badge variant="outline">
-                        <XCircle className="h-3 w-3 text-red-500" />
-                        {checkRunsStatus.summary.failed} failed
-                      </Badge>
-                    )}
-                    {checkRunsStatus.summary.pending > 0 && (
-                      <Badge variant="outline">
-                        <Loader2 className="h-3 w-3 animate-spin" />
-                        {checkRunsStatus.summary.pending} pending
-                      </Badge>
-                    )}
-                  </div>
-                )}
-              </div>
-            )}
-            <ChecksPanel
-              status={checkRunsStatus}
-              isLoading={checkRunsLoading}
-              hasPr={!!pr}
-              hideSummary={!hasChanges}
-            />
-            <PrCommentsList
-              status={prCommentsStatus}
-              isLoading={prCommentsLoading}
-              hasPr={!!pr}
-              prUrl={pr?.url}
-            />
-          </div>
-          <MergePrSection taskPath={safeTaskPath} pr={pr} refreshPr={refreshPr} />
-        </>
-      ) : (
-        <div className="min-h-0 flex-1 overflow-y-auto">
-          {isLoading && fileChanges.length === 0 ? (
-            <div className="flex h-full items-center justify-center">
-              <Spinner size="lg" className="text-muted-foreground" />
-            </div>
-          ) : (
-            fileChanges.map((change, index) => (
-              <div
-                key={index}
-                className="flex cursor-pointer items-center justify-between border-b border-border/50 px-4 py-2.5 last:border-b-0 hover:bg-muted/50"
-                onClick={() => onOpenChanges?.(change.path, safeTaskPath)}
-              >
-                <div className="flex min-w-0 flex-1 items-center gap-3 overflow-hidden">
-                  <span className="inline-flex shrink-0 items-center justify-center text-muted-foreground">
-                    <FileIcon filename={change.path} isDirectory={false} size={16} />
-                  </span>
-                  <div className="min-w-0 flex-1 overflow-hidden">
-                    <div className="min-w-0 truncate text-sm">{renderPath(change.path)}</div>
-                  </div>
-                </div>
-                <div className="ml-3 flex shrink-0 items-center gap-2">
-                  <span className="rounded bg-green-50 px-1.5 py-0.5 text-[11px] font-medium text-emerald-700 dark:bg-green-900/30 dark:text-emerald-300">
-                    +{change.additions}
-                  </span>
-                  <span className="rounded bg-rose-50 px-1.5 py-0.5 text-[11px] font-medium text-rose-700 dark:bg-rose-900/30 dark:text-rose-300">
-                    -{change.deletions}
-                  </span>
-                </div>
-              </div>
-            ))
-          )}
-        </div>
-      )}
-      <AlertDialog open={showMergeConfirm} onOpenChange={setShowMergeConfirm}>
-        <AlertDialogContent className="max-w-md">
-          <AlertDialogHeader>
-            <div className="flex items-center gap-3">
-              <AlertDialogTitle className="text-lg">Merge into main?</AlertDialogTitle>
-            </div>
-          </AlertDialogHeader>
-          <div className="space-y-4">
-            <AlertDialogDescription className="text-sm">
-              This will merge your branch into main. This action may be difficult to reverse.
-            </AlertDialogDescription>
-          </div>
-          <AlertDialogFooter>
-            <AlertDialogCancel onClick={() => setShowMergeConfirm(false)}>Cancel</AlertDialogCancel>
-            <AlertDialogAction
-              onClick={() => {
-                setShowMergeConfirm(false);
-                void handleMergeToMain();
-              }}
-              className="bg-primary px-4 py-2 text-primary-foreground hover:bg-primary/90"
-            >
-              <GitMerge className="mr-2 h-4 w-4" />
-              Merge into Main
-            </AlertDialogAction>
-          </AlertDialogFooter>
-        </AlertDialogContent>
-      </AlertDialog>
-    </div>
-  );
-};
-export const FileChangesPanel = React.memo(FileChangesPanelComponent);
-
-export default FileChangesPanel;
diff --git a/src/renderer/components/FileExplorer/CodeEditor.tsx b/src/renderer/components/FileExplorer/CodeEditor.tsx
deleted file mode 100644
index bf0c0f2a02..0000000000
--- a/src/renderer/components/FileExplorer/CodeEditor.tsx
+++ /dev/null
@@ -1,499 +0,0 @@
-import React, { useState, useCallback, useEffect, useRef } from 'react';
-import Editor from '@monaco-editor/react';
-import { cn } from '@/lib/utils';
-import { getMonacoLanguageId } from '@/lib/diffUtils';
-import { buildMonacoModelPath } from '@/lib/monacoModelPath';
-import { registerActiveCodeEditor } from '@/lib/activeCodeEditor';
-import { useTheme } from '@/hooks/useTheme';
-import { useRightSidebar } from '../ui/right-sidebar';
-import { useFileManager } from '@/hooks/useFileManager';
-import { useEditorDiffDecorations } from '@/hooks/useEditorDiffDecorations';
-import { useFileChanges, type FileChange } from '@/hooks/useFileChanges';
-import {
-  configureMonacoTypeScript,
-  configureMonacoEditor,
-  addMonacoKeyboardShortcuts,
-} from '@/lib/monaco-config';
-import { defineMonacoThemes, getMonacoTheme } from '@/lib/monaco-themes';
-import {
-  DEFAULT_EXCLUDE_PATTERNS,
-  EXPLORER_WIDTH,
-  DEFAULT_EDITOR_OPTIONS,
-  isMarkdownFile,
-} from '@/constants/file-explorer';
-import { FileTree } from './FileTree';
-import { FileTabs } from './FileTabs';
-import { EditorHeader } from './EditorHeader';
-import { MarkdownPreview } from './MarkdownPreview';
-import '@/styles/editor-diff.css';
-
-interface CodeEditorProps {
-  taskId: string;
-  taskPath: string;
-  taskName: string;
-  projectName: string;
-  onClose: () => void;
-  connectionId?: string | null;
-  remotePath?: string | null;
-}
-
-export default function CodeEditor({
-  taskId,
-  taskPath,
-  taskName,
-  projectName,
-  onClose,
-  connectionId,
-  remotePath,
-}: CodeEditorProps) {
-  const { effectiveTheme } = useTheme();
-  const { toggle: toggleRightSidebar, collapsed: rightSidebarCollapsed } = useRightSidebar();
-  const monacoRef = useRef<any>(null);
-  const editorRef = useRef<any>(null);
-  const editorRegistrationCleanupRef = useRef<(() => void) | null>(null);
-
-  // File management with custom hook
-  const {
-    openFiles,
-    activeFilePath,
-    activeFile,
-    hasUnsavedChanges,
-    isSaving,
-    loadFile,
-    saveFile,
-    saveAllFiles,
-    closeFile,
-    updateFileContent,
-    setActiveFile,
-  } = useFileManager({ taskId, taskPath, connectionId, remotePath });
-
-  // Get file changes status from git
-  const { fileChanges } = useFileChanges(taskPath);
-
-  // UI state
-  const [explorerWidth, setExplorerWidth] = useState(EXPLORER_WIDTH.DEFAULT);
-  const [isResizing, setIsResizing] = useState(false);
-
-  // Track which files are in preview mode (markdown files default to true)
-  const [previewMode, setPreviewMode] = useState<Map<string, boolean>>(new Map());
-  const modelRootPath = remotePath ? `${connectionId || 'remote'}:${remotePath}` : taskPath;
-
-  const isPreviewActive = activeFilePath
-    ? (previewMode.get(activeFilePath) ?? isMarkdownFile(activeFilePath))
-    : false;
-
-  const togglePreview = useCallback((filePath: string) => {
-    setPreviewMode((prev) => {
-      const next = new Map(prev);
-      const current = next.get(filePath) ?? isMarkdownFile(filePath);
-      next.set(filePath, !current);
-      return next;
-    });
-  }, []);
-
-  const handleCloseFile = useCallback(
-    (filePath: string) => {
-      closeFile(filePath);
-      setPreviewMode((prev) => {
-        const next = new Map(prev);
-        next.delete(filePath);
-        return next;
-      });
-    },
-    [closeFile]
-  );
-
-  // State to track when editor is ready
-  const [editorReady, setEditorReady] = useState(false);
-
-  // Diff decorations for showing git changes in the editor
-  const { refreshDecorations } = useEditorDiffDecorations({
-    editor: editorReady ? editorRef.current : null,
-    filePath: activeFilePath || '',
-    taskPath,
-  });
-
-  // Refresh diff decorations when active file changes or when file is saved
-  useEffect(() => {
-    if (editorReady && editorRef.current && activeFilePath && refreshDecorations) {
-      // Small delay to ensure file content is loaded and git has updated
-      const timer = setTimeout(() => {
-        refreshDecorations();
-      }, 300);
-      return () => clearTimeout(timer);
-    }
-  }, [activeFilePath, editorReady, refreshDecorations, activeFile?.isDirty]);
-
-  // Track previous save state to detect when a save completes
-  const prevIsSaving = useRef(false);
-
-  // Refresh decorations after save
-  useEffect(() => {
-    // Detect when save just completed (was saving, now not saving)
-    if (prevIsSaving.current && !isSaving && editorReady && refreshDecorations) {
-      // Immediately clear decorations to prevent old markers from showing
-      if (editorRef.current) {
-        // Clear existing decorations immediately
-        refreshDecorations(true); // Invalidate cache and refresh immediately
-      }
-
-      // Then refresh again after git has updated
-      const timer = setTimeout(() => {
-        refreshDecorations(true); // true = invalidate cache to get fresh diff
-      }, 800); // Wait for git to fully update
-
-      prevIsSaving.current = false;
-      return () => clearTimeout(timer);
-    }
-
-    prevIsSaving.current = isSaving;
-  }, [isSaving, editorReady, refreshDecorations]);
-
-  // Initialize Monaco once when first loaded
-  useEffect(() => {
-    const initMonaco = async () => {
-      const { loader } = await import('@monaco-editor/react');
-      loader.init().then((monaco) => {
-        if (!monacoRef.current) {
-          monacoRef.current = monaco;
-          configureMonacoTypeScript(monaco);
-          defineMonacoThemes(monaco);
-        }
-      });
-    };
-    initMonaco();
-  }, []);
-
-  // Handle editor mount
-  const handleEditorMount = useCallback(
-    (editor: any, monaco: any) => {
-      // Store editor reference
-      editorRef.current = editor;
-      editorRegistrationCleanupRef.current?.();
-      editorRegistrationCleanupRef.current = registerActiveCodeEditor(editor);
-
-      // Configure Monaco if not already done
-      if (!monacoRef.current) {
-        monacoRef.current = monaco;
-        configureMonacoTypeScript(monaco);
-      }
-
-      // Register custom themes
-      defineMonacoThemes(monaco);
-
-      // Configure editor options
-      configureMonacoEditor(editor, monaco);
-
-      // Enable glyph margin for diff indicators
-      editor.updateOptions({
-        glyphMargin: true,
-      });
-
-      // Add keyboard shortcuts
-      addMonacoKeyboardShortcuts(editor, monaco, {
-        onSave: async () => {
-          await saveFile();
-          // Refresh decorations after save with cache invalidation
-          setTimeout(() => {
-            if (refreshDecorations) {
-              refreshDecorations(true); // true = invalidate cache
-            }
-          }, 700); // Wait for git to update
-        },
-        onSaveAll: saveAllFiles,
-      });
-
-      // Mark editor as ready
-      setEditorReady(true);
-
-      // Refresh decorations when editor is ready
-      setTimeout(() => {
-        if (refreshDecorations) {
-          refreshDecorations();
-        }
-      }, 100);
-    },
-    [saveFile, saveAllFiles, refreshDecorations]
-  );
-
-  useEffect(() => {
-    return () => {
-      editorRegistrationCleanupRef.current?.();
-      editorRegistrationCleanupRef.current = null;
-    };
-  }, []);
-
-  // Handle editor content change
-  const handleEditorChange = useCallback(
-    (value: string | undefined) => {
-      if (!activeFilePath || value === undefined) return;
-      updateFileContent(activeFilePath, value);
-    },
-    [activeFilePath, updateFileContent]
-  );
-
-  // Handle resize
-  const handleMouseDown = useCallback(
-    (e: React.MouseEvent) => {
-      e.preventDefault();
-      setIsResizing(true);
-
-      const startX = e.clientX;
-      const startWidth = explorerWidth;
-
-      const handleMouseMove = (e: MouseEvent) => {
-        const newWidth = Math.max(
-          EXPLORER_WIDTH.MIN,
-          Math.min(EXPLORER_WIDTH.MAX, startWidth + e.clientX - startX)
-        );
-        setExplorerWidth(newWidth);
-      };
-
-      const handleMouseUp = () => {
-        setIsResizing(false);
-        document.body.style.cursor = '';
-        document.body.style.userSelect = '';
-        document.removeEventListener('mousemove', handleMouseMove);
-        document.removeEventListener('mouseup', handleMouseUp);
-      };
-
-      // Set cursor and prevent text selection during resize
-      document.body.style.cursor = 'col-resize';
-      document.body.style.userSelect = 'none';
-
-      document.addEventListener('mousemove', handleMouseMove);
-      document.addEventListener('mouseup', handleMouseUp);
-    },
-    [explorerWidth]
-  );
-
-  return (
-    <div className="fixed inset-0 z-30 flex flex-col bg-background">
-      <EditorHeader
-        taskName={taskName}
-        hasUnsavedChanges={hasUnsavedChanges}
-        isSaving={isSaving}
-        rightSidebarCollapsed={rightSidebarCollapsed}
-        onSaveAll={saveAllFiles}
-        onToggleRightSidebar={toggleRightSidebar}
-        onClose={onClose}
-      />
-
-      <div className="flex flex-1 overflow-hidden">
-        <FileExplorer
-          taskId={taskId}
-          taskPath={taskPath}
-          taskName={taskName}
-          projectName={projectName}
-          explorerWidth={explorerWidth}
-          isResizing={isResizing}
-          selectedFile={activeFilePath}
-          onSelectFile={loadFile}
-          onOpenFile={loadFile}
-          onMouseDown={handleMouseDown}
-          fileChanges={fileChanges}
-          connectionId={connectionId}
-          remotePath={remotePath}
-        />
-
-        <div className="flex flex-1 flex-col overflow-hidden">
-          <FileTabs
-            openFiles={openFiles}
-            activeFilePath={activeFilePath}
-            onTabClick={setActiveFile}
-            onTabClose={handleCloseFile}
-            previewMode={previewMode}
-            onTogglePreview={togglePreview}
-          />
-
-          <EditorContent
-            activeFile={activeFile}
-            effectiveTheme={effectiveTheme}
-            onEditorMount={handleEditorMount}
-            onEditorChange={handleEditorChange}
-            isPreviewActive={isPreviewActive}
-            modelRootPath={modelRootPath}
-            taskPath={taskPath}
-          />
-        </div>
-      </div>
-    </div>
-  );
-}
-
-interface FileExplorerProps {
-  taskId: string;
-  taskPath: string;
-  taskName: string;
-  projectName: string;
-  explorerWidth: number;
-  isResizing: boolean;
-  selectedFile: string | null;
-  onSelectFile: (path: string) => void;
-  onOpenFile: (path: string) => void;
-  onMouseDown: (e: React.MouseEvent) => void;
-  fileChanges: FileChange[];
-  connectionId?: string | null;
-  remotePath?: string | null;
-}
-
-const FileExplorer: React.FC<FileExplorerProps> = ({
-  taskId,
-  taskPath,
-  taskName,
-  projectName,
-  explorerWidth,
-  isResizing,
-  selectedFile,
-  onSelectFile,
-  onOpenFile,
-  onMouseDown,
-  fileChanges,
-  connectionId,
-  remotePath,
-}) => (
-  <div
-    className="relative flex flex-col border-r border-border bg-muted/5"
-    style={{ width: explorerWidth }}
-  >
-    <div className="flex flex-1 flex-col overflow-hidden">
-      <div className="flex h-8 items-center border-b border-border bg-muted/10 px-3">
-        <span className="text-xs font-medium text-foreground">{projectName}</span>
-      </div>
-      <div className="flex h-8 items-center border-b border-border bg-muted/20 px-3">
-        <span className="text-xs font-medium text-foreground">{taskName}</span>
-      </div>
-
-      <div className="flex flex-1 flex-col overflow-hidden">
-        <FileTree
-          taskId={taskId}
-          rootPath={taskPath}
-          selectedFile={selectedFile}
-          onSelectFile={onSelectFile}
-          onOpenFile={onOpenFile}
-          className="flex-1 overflow-y-auto"
-          showHiddenFiles={true}
-          excludePatterns={DEFAULT_EXCLUDE_PATTERNS}
-          fileChanges={fileChanges}
-          connectionId={connectionId}
-          remotePath={remotePath}
-        />
-      </div>
-    </div>
-
-    <ResizeHandle isResizing={isResizing} onMouseDown={onMouseDown} />
-  </div>
-);
-
-const ResizeHandle: React.FC<{
-  isResizing: boolean;
-  onMouseDown: (e: React.MouseEvent) => void;
-}> = ({ isResizing, onMouseDown }) => (
-  <div
-    className={cn(
-      'absolute -right-1 top-0 h-full w-2 cursor-col-resize',
-      'transition-colors hover:bg-border/80',
-      "after:absolute after:left-1/2 after:top-0 after:h-full after:w-0.5 after:-translate-x-1/2 after:content-['']",
-      'after:bg-border',
-      isResizing && 'bg-border/80'
-    )}
-    onMouseDown={onMouseDown}
-    title="Drag to resize"
-  />
-);
-
-interface EditorContentProps {
-  activeFile: any;
-  effectiveTheme: string;
-  onEditorMount: (editor: any, monaco: any) => void;
-  onEditorChange: (value: string | undefined) => void;
-  isPreviewActive: boolean;
-  modelRootPath: string;
-  taskPath: string;
-}
-
-const EditorContent: React.FC<EditorContentProps> = ({
-  activeFile,
-  effectiveTheme,
-  onEditorMount,
-  onEditorChange,
-  isPreviewActive,
-  modelRootPath,
-  taskPath,
-}) => {
-  if (!activeFile) {
-    return <NoFileOpen />;
-  }
-
-  if (activeFile.content.startsWith('data:image/')) {
-    return <ImagePreview file={activeFile} />;
-  }
-
-  if (activeFile.content === '[IMAGE_ERROR]') {
-    return <ImageError file={activeFile} />;
-  }
-
-  if (isPreviewActive) {
-    const fileDir = activeFile.path.includes('/')
-      ? activeFile.path.substring(0, activeFile.path.lastIndexOf('/'))
-      : '';
-    return <MarkdownPreview content={activeFile.content} rootPath={taskPath} fileDir={fileDir} />;
-  }
-
-  return (
-    <div className="flex-1">
-      <Editor
-        height="100%"
-        language={getMonacoLanguageId(activeFile.path)}
-        path={buildMonacoModelPath(modelRootPath, activeFile.path)}
-        keepCurrentModel={true}
-        value={activeFile.content}
-        onChange={onEditorChange}
-        beforeMount={defineMonacoThemes}
-        onMount={onEditorMount}
-        theme={getMonacoTheme(effectiveTheme)}
-        options={DEFAULT_EDITOR_OPTIONS}
-      />
-    </div>
-  );
-};
-
-const NoFileOpen: React.FC = () => (
-  <div className="flex flex-1 items-center justify-center text-muted-foreground">
-    <div className="text-center">
-      {/** 
-      <p className="text-sm">No file open</p>
-      <p className="mt-1 text-xs">Select a file from the explorer</p>
-      */}
-    </div>
-  </div>
-);
-
-const ImagePreview: React.FC<{ file: any }> = ({ file }) => (
-  <div className="flex flex-1 items-center justify-center overflow-auto bg-background p-8">
-    <div className="flex flex-col items-center">
-      <div className="relative flex h-[400px] w-[600px] items-center justify-center rounded-lg border border-border bg-muted/20 p-4">
-        <img
-          src={file.content}
-          alt={file.path}
-          className="max-h-full max-w-full object-contain"
-          style={{ imageRendering: 'auto' }}
-        />
-      </div>
-      <div className="mt-4 text-center">
-        <div className="text-sm font-medium text-foreground">{file.path.split('/').pop()}</div>
-        <div className="mt-1 text-xs text-muted-foreground">{file.path}</div>
-      </div>
-    </div>
-  </div>
-);
-
-const ImageError: React.FC<{ file: any }> = ({ file }) => (
-  <div className="flex flex-1 items-center justify-center overflow-auto bg-background p-8">
-    <div className="text-center text-muted-foreground">
-      <p className="mb-2 text-sm">Failed to load image</p>
-      <p className="text-xs opacity-70">{file.path}</p>
-      <p className="mt-2 text-xs opacity-50">The image file could not be read</p>
-    </div>
-  </div>
-);
diff --git a/src/renderer/components/FileExplorer/ContentSearchResults.tsx b/src/renderer/components/FileExplorer/ContentSearchResults.tsx
deleted file mode 100644
index db18f1ba48..0000000000
--- a/src/renderer/components/FileExplorer/ContentSearchResults.tsx
+++ /dev/null
@@ -1,124 +0,0 @@
-import React from 'react';
-import { FileIcon } from './FileIcons';
-import type { SearchResult } from '@/hooks/useContentSearch';
-
-// Constants for display limits
-const MAX_VISIBLE_MATCHES_PER_FILE = 3;
-
-interface ContentSearchResultsProps {
-  results: SearchResult[];
-  isSearching: boolean;
-  error: string | null;
-  onResultClick: (filePath: string) => void;
-}
-
-export const ContentSearchResults: React.FC<ContentSearchResultsProps> = ({
-  results,
-  isSearching,
-  error,
-  onResultClick,
-}) => {
-  if (isSearching) {
-    return <SearchingIndicator />;
-  }
-
-  if (error) {
-    return <ErrorMessage error={error} />;
-  }
-
-  if (results.length === 0) {
-    return <NoResultsMessage />;
-  }
-
-  const totalMatches = results.reduce((sum, result) => sum + result.matches.length, 0);
-  const fileCount = results.length;
-
-  return (
-    <div className="space-y-2">
-      <div className="px-1 text-xs text-muted-foreground">
-        found {totalMatches} {totalMatches === 1 ? 'line' : 'lines'} in {fileCount}{' '}
-        {fileCount === 1 ? 'file' : 'files'}
-      </div>
-      {results.map((result, index) => (
-        <SearchResultItem
-          key={`${result.file}-${index}`}
-          result={result}
-          onResultClick={onResultClick}
-        />
-      ))}
-    </div>
-  );
-};
-
-const SearchResultItem: React.FC<{
-  result: SearchResult;
-  onResultClick: (filePath: string) => void;
-}> = ({ result, onResultClick }) => {
-  const fileName = extractFileName(result.file);
-  const visibleMatches = result.matches.slice(0, MAX_VISIBLE_MATCHES_PER_FILE);
-  const remainingMatchCount = result.matches.length - MAX_VISIBLE_MATCHES_PER_FILE;
-
-  return (
-    <div className="border-b border-border pb-2">
-      <button
-        onClick={() => onResultClick(result.file)}
-        className="w-full rounded p-1 text-left hover:bg-accent/50"
-        aria-label={`Open ${result.file}`}
-      >
-        <FileHeader fileName={fileName} filePath={result.file} />
-        <MatchList matches={visibleMatches} />
-        {remainingMatchCount > 0 && <RemainingMatchesIndicator count={remainingMatchCount} />}
-      </button>
-    </div>
-  );
-};
-
-const FileHeader: React.FC<{ fileName: string; filePath: string }> = ({ fileName, filePath }) => (
-  <div className="flex items-center gap-1 overflow-hidden">
-    <span className="shrink-0">
-      <FileIcon filename={fileName} isDirectory={false} />
-    </span>
-    <span className="truncate text-sm font-medium" title={filePath}>
-      {filePath}
-    </span>
-  </div>
-);
-
-const MatchList: React.FC<{ matches: any[] }> = ({ matches }) => (
-  <div className="ml-5 mt-1 space-y-1">
-    {matches.map((match, index) => (
-      <MatchPreview key={index} match={match} />
-    ))}
-  </div>
-);
-
-const MatchPreview: React.FC<{ match: any }> = ({ match }) => (
-  <div className="flex gap-1 overflow-hidden text-xs text-muted-foreground">
-    <span className="shrink-0 font-mono">Line {match.line}:</span>
-    <span className="truncate text-foreground">{match.preview}</span>
-  </div>
-);
-
-const RemainingMatchesIndicator: React.FC<{ count: number }> = ({ count }) => (
-  <div className="ml-5 mt-1 text-xs text-muted-foreground">
-    ... and {count} more {count === 1 ? 'match' : 'matches'}
-  </div>
-);
-
-const SearchingIndicator: React.FC = () => (
-  <div className="text-sm text-muted-foreground">Searching...</div>
-);
-
-const ErrorMessage: React.FC<{ error: string }> = ({ error }) => (
-  <div className="text-sm text-destructive">Error: {error}</div>
-);
-
-const NoResultsMessage: React.FC = () => (
-  <div className="text-sm text-muted-foreground">No results found</div>
-);
-
-function extractFileName(filePath: string): string {
-  return filePath.split('/').pop() || '';
-}
-
-export default ContentSearchResults;
diff --git a/src/renderer/components/FileExplorer/EditorHeader.tsx b/src/renderer/components/FileExplorer/EditorHeader.tsx
deleted file mode 100644
index c75cede5bd..0000000000
--- a/src/renderer/components/FileExplorer/EditorHeader.tsx
+++ /dev/null
@@ -1,91 +0,0 @@
-import React from 'react';
-import { FolderOpen, X, PanelRight, Save } from 'lucide-react';
-import { Button } from '../ui/button';
-
-interface EditorHeaderProps {
-  taskName: string;
-  hasUnsavedChanges: boolean;
-  isSaving: boolean;
-  rightSidebarCollapsed: boolean;
-  onSaveAll: () => void;
-  onToggleRightSidebar: () => void;
-  onClose: () => void;
-}
-
-export const EditorHeader: React.FC<EditorHeaderProps> = ({
-  taskName,
-  hasUnsavedChanges,
-  isSaving,
-  rightSidebarCollapsed,
-  onSaveAll,
-  onToggleRightSidebar,
-  onClose,
-}) => {
-  return (
-    <div className="flex h-9 items-center justify-between border-b border-border bg-muted/30 px-3">
-      <TaskInfo taskName={taskName} hasUnsavedChanges={hasUnsavedChanges} />
-      <EditorControls
-        hasUnsavedChanges={hasUnsavedChanges}
-        isSaving={isSaving}
-        rightSidebarCollapsed={rightSidebarCollapsed}
-        onSaveAll={onSaveAll}
-        onToggleRightSidebar={onToggleRightSidebar}
-        onClose={onClose}
-      />
-    </div>
-  );
-};
-
-const TaskInfo: React.FC<{
-  taskName: string;
-  hasUnsavedChanges: boolean;
-}> = ({ taskName, hasUnsavedChanges }) => (
-  <div className="flex items-center gap-2">
-    <FolderOpen className="h-4 w-4 text-muted-foreground" />
-    <span className="text-sm font-medium">{taskName}</span>
-    {hasUnsavedChanges && <span className="text-xs text-amber-500">● Unsaved changes</span>}
-  </div>
-);
-
-const EditorControls: React.FC<{
-  hasUnsavedChanges: boolean;
-  isSaving: boolean;
-  rightSidebarCollapsed: boolean;
-  onSaveAll: () => void;
-  onToggleRightSidebar: () => void;
-  onClose: () => void;
-}> = ({
-  hasUnsavedChanges,
-  isSaving,
-  rightSidebarCollapsed,
-  onSaveAll,
-  onToggleRightSidebar,
-  onClose,
-}) => (
-  <div className="flex items-center gap-1">
-    <Button
-      variant="ghost"
-      size="icon"
-      className="h-7 w-7"
-      onClick={onSaveAll}
-      disabled={!hasUnsavedChanges || isSaving}
-      title="Save All (⌘⇧S)"
-    >
-      <Save className="h-3.5 w-3.5" />
-    </Button>
-    <Button
-      variant="ghost"
-      size="icon"
-      className="h-7 w-7"
-      onClick={onToggleRightSidebar}
-      title={rightSidebarCollapsed ? 'Show Changes' : 'Hide Changes'}
-    >
-      <PanelRight className="h-3.5 w-3.5" />
-    </Button>
-    <Button variant="ghost" size="icon" className="h-7 w-7" onClick={onClose} title="Close Editor">
-      <X className="h-3.5 w-3.5" />
-    </Button>
-  </div>
-);
-
-export default EditorHeader;
diff --git a/src/renderer/components/FileExplorer/FileIcons.tsx b/src/renderer/components/FileExplorer/FileIcons.tsx
deleted file mode 100644
index 705a5dac9e..0000000000
--- a/src/renderer/components/FileExplorer/FileIcons.tsx
+++ /dev/null
@@ -1,449 +0,0 @@
-import React, { Component, ErrorInfo, ReactNode, memo } from 'react';
-import {
-  VscFile,
-  VscFolder,
-  VscFolderOpened,
-  VscJson,
-  VscMarkdown,
-  VscFileCode,
-  VscFileBinary,
-  VscFileMedia,
-  VscFilePdf,
-  VscFileZip,
-  VscTerminal,
-  VscSettingsGear,
-  VscDatabase,
-  VscLock,
-  VscKey,
-  VscTable,
-  VscSymbolMisc,
-  VscError,
-} from 'react-icons/vsc';
-import {
-  SiTypescript,
-  SiJavascript,
-  SiReact,
-  SiPython,
-  SiHtml5,
-  SiCss3,
-  SiSass,
-  SiNodedotjs,
-  SiNpm,
-  SiYarn,
-  SiDocker,
-  SiGit,
-  SiGo,
-  SiRust,
-  SiCplusplus,
-  SiPhp,
-  SiRuby,
-  SiSwift,
-  SiKotlin,
-  SiLua,
-  SiVuedotjs,
-  SiAngular,
-  SiSvelte,
-  SiNextdotjs,
-  SiGraphql,
-  SiPostgresql,
-  SiMongodb,
-  SiRedis,
-  SiWebpack,
-  SiVite,
-  SiEslint,
-  SiPrettier,
-  SiJest,
-  SiCypress,
-  SiStorybook,
-  SiTailwindcss,
-  SiBabel,
-} from 'react-icons/si';
-import { DiCoffeescript } from 'react-icons/di';
-import { FaFileImage } from 'react-icons/fa';
-
-// Icon mapping configuration
-const SPECIAL_FILES: Record<string, { icon: React.ElementType; color: string; label: string }> = {
-  'package.json': { icon: SiNpm, color: 'text-red-500', label: 'NPM package file' },
-  'package-lock.json': { icon: SiNpm, color: 'text-red-400', label: 'NPM lock file' },
-  'yarn.lock': { icon: SiYarn, color: 'text-blue-400', label: 'Yarn lock file' },
-  'pnpm-lock.yaml': { icon: SiNpm, color: 'text-orange-500', label: 'PNPM lock file' },
-  '.gitignore': { icon: SiGit, color: 'text-orange-600', label: 'Git ignore file' },
-  '.gitattributes': { icon: SiGit, color: 'text-orange-600', label: 'Git attributes file' },
-  '.gitmodules': { icon: SiGit, color: 'text-orange-600', label: 'Git modules file' },
-  dockerfile: { icon: SiDocker, color: 'text-blue-500', label: 'Docker file' },
-  'docker-compose.yml': { icon: SiDocker, color: 'text-blue-500', label: 'Docker compose file' },
-  'docker-compose.yaml': { icon: SiDocker, color: 'text-blue-500', label: 'Docker compose file' },
-  '.dockerignore': { icon: SiDocker, color: 'text-blue-400', label: 'Docker ignore file' },
-  '.env': {
-    icon: VscSettingsGear,
-    color: 'text-amber-700 dark:text-amber-300',
-    label: 'Environment variables file',
-  },
-  '.env.local': {
-    icon: VscSettingsGear,
-    color: 'text-amber-700 dark:text-amber-300',
-    label: 'Local environment file',
-  },
-  '.env.production': {
-    icon: VscSettingsGear,
-    color: 'text-amber-700 dark:text-amber-300',
-    label: 'Production environment file',
-  },
-  '.env.development': {
-    icon: VscSettingsGear,
-    color: 'text-amber-700 dark:text-amber-300',
-    label: 'Development environment file',
-  },
-  '.eslintrc': {
-    icon: SiEslint,
-    color: 'text-violet-600 dark:text-violet-400',
-    label: 'ESLint config',
-  },
-  '.eslintrc.js': {
-    icon: SiEslint,
-    color: 'text-violet-600 dark:text-violet-400',
-    label: 'ESLint config',
-  },
-  '.eslintrc.json': {
-    icon: SiEslint,
-    color: 'text-violet-600 dark:text-violet-400',
-    label: 'ESLint config',
-  },
-  '.prettierrc': {
-    icon: SiPrettier,
-    color: 'text-pink-600 dark:text-pink-400',
-    label: 'Prettier config',
-  },
-  '.prettierrc.js': {
-    icon: SiPrettier,
-    color: 'text-pink-600 dark:text-pink-400',
-    label: 'Prettier config',
-  },
-  '.prettierrc.json': {
-    icon: SiPrettier,
-    color: 'text-pink-600 dark:text-pink-400',
-    label: 'Prettier config',
-  },
-  'vite.config.js': {
-    icon: SiVite,
-    color: 'text-violet-600 dark:text-violet-400',
-    label: 'Vite config',
-  },
-  'vite.config.ts': {
-    icon: SiVite,
-    color: 'text-violet-600 dark:text-violet-400',
-    label: 'Vite config',
-  },
-  'webpack.config.js': {
-    icon: SiWebpack,
-    color: 'text-blue-700 dark:text-blue-400',
-    label: 'Webpack config',
-  },
-  'rollup.config.js': { icon: VscFileCode, color: 'text-red-600', label: 'Rollup config' },
-  'babel.config.js': { icon: SiBabel, color: 'text-yellow-500', label: 'Babel config' },
-  '.babelrc': { icon: SiBabel, color: 'text-yellow-500', label: 'Babel config' },
-  'jest.config.js': { icon: SiJest, color: 'text-red-600', label: 'Jest config' },
-  'cypress.config.js': { icon: SiCypress, color: 'text-green-600', label: 'Cypress config' },
-  'tailwind.config.js': {
-    icon: SiTailwindcss,
-    color: 'text-cyan-600 dark:text-cyan-400',
-    label: 'Tailwind config',
-  },
-  'postcss.config.js': {
-    icon: VscFileCode,
-    color: 'text-orange-700 dark:text-orange-400',
-    label: 'PostCSS config',
-  },
-  'next.config.js': {
-    icon: SiNextdotjs,
-    color: 'text-gray-800 dark:text-white',
-    label: 'Next.js config',
-  },
-  'nuxt.config.js': { icon: VscFileCode, color: 'text-green-600', label: 'Nuxt config' },
-  'angular.json': { icon: SiAngular, color: 'text-red-600', label: 'Angular config' },
-  'readme.md': { icon: VscMarkdown, color: 'text-blue-600', label: 'README file' },
-  license: { icon: VscLock, color: 'text-yellow-600', label: 'License file' },
-  'license.md': { icon: VscLock, color: 'text-yellow-600', label: 'License file' },
-  makefile: { icon: VscSettingsGear, color: 'text-orange-600', label: 'Makefile' },
-};
-
-const EXTENSION_ICONS: Record<string, { icon: React.ElementType; color: string; label: string }> = {
-  // JavaScript/TypeScript
-  ts: { icon: SiTypescript, color: 'text-blue-600', label: 'TypeScript file' },
-  tsx: { icon: SiReact, color: 'text-cyan-500', label: 'TypeScript React file' },
-  js: { icon: SiJavascript, color: 'text-yellow-500', label: 'JavaScript file' },
-  jsx: { icon: SiReact, color: 'text-cyan-500', label: 'JavaScript React file' },
-  mjs: { icon: SiJavascript, color: 'text-yellow-500', label: 'JavaScript module' },
-  cjs: { icon: SiNodedotjs, color: 'text-green-600', label: 'CommonJS module' },
-  coffee: { icon: DiCoffeescript, color: 'text-brown-600', label: 'CoffeeScript file' },
-
-  // Web
-  html: { icon: SiHtml5, color: 'text-orange-600', label: 'HTML file' },
-  htm: { icon: SiHtml5, color: 'text-orange-600', label: 'HTML file' },
-  css: { icon: SiCss3, color: 'text-blue-600', label: 'CSS file' },
-  scss: { icon: SiSass, color: 'text-pink-600', label: 'SCSS file' },
-  sass: { icon: SiSass, color: 'text-pink-600', label: 'Sass file' },
-  less: { icon: VscFileCode, color: 'text-blue-800', label: 'Less file' },
-  styl: { icon: VscFileCode, color: 'text-green-600', label: 'Stylus file' },
-
-  // Frameworks
-  vue: { icon: SiVuedotjs, color: 'text-green-600', label: 'Vue file' },
-  svelte: { icon: SiSvelte, color: 'text-orange-600', label: 'Svelte file' },
-
-  // Data
-  json: { icon: VscJson, color: 'text-amber-700 dark:text-amber-300', label: 'JSON file' },
-  jsonc: {
-    icon: VscJson,
-    color: 'text-amber-700 dark:text-amber-300',
-    label: 'JSON with comments',
-  },
-  json5: { icon: VscJson, color: 'text-amber-700 dark:text-amber-300', label: 'JSON5 file' },
-  xml: { icon: VscFileCode, color: 'text-orange-500', label: 'XML file' },
-  yaml: { icon: VscFileCode, color: 'text-rose-700 dark:text-rose-400', label: 'YAML file' },
-  yml: { icon: VscFileCode, color: 'text-rose-700 dark:text-rose-400', label: 'YAML file' },
-  toml: { icon: VscFileCode, color: 'text-slate-600 dark:text-slate-300', label: 'TOML file' },
-  ini: { icon: VscSettingsGear, color: 'text-slate-600 dark:text-slate-300', label: 'INI file' },
-  env: {
-    icon: VscSettingsGear,
-    color: 'text-amber-700 dark:text-amber-300',
-    label: 'Environment file',
-  },
-  graphql: { icon: SiGraphql, color: 'text-pink-600', label: 'GraphQL file' },
-  gql: { icon: SiGraphql, color: 'text-pink-600', label: 'GraphQL file' },
-
-  // Programming Languages
-  py: { icon: SiPython, color: 'text-blue-500', label: 'Python file' },
-  pyc: { icon: SiPython, color: 'text-blue-400', label: 'Python compiled' },
-  pyw: { icon: SiPython, color: 'text-blue-500', label: 'Python Windows file' },
-  pyx: { icon: SiPython, color: 'text-blue-600', label: 'Cython file' },
-  pyi: { icon: SiPython, color: 'text-yellow-600', label: 'Python interface' },
-  go: { icon: SiGo, color: 'text-cyan-600', label: 'Go file' },
-  rs: { icon: SiRust, color: 'text-orange-700', label: 'Rust file' },
-  java: { icon: VscFileCode, color: 'text-red-600', label: 'Java file' },
-  class: { icon: VscFileCode, color: 'text-red-500', label: 'Java class file' },
-  jar: { icon: VscFileCode, color: 'text-red-700', label: 'Java archive' },
-  c: { icon: VscFileCode, color: 'text-blue-800', label: 'C file' },
-  cpp: { icon: SiCplusplus, color: 'text-blue-600', label: 'C++ file' },
-  cc: { icon: SiCplusplus, color: 'text-blue-600', label: 'C++ file' },
-  cxx: { icon: SiCplusplus, color: 'text-blue-600', label: 'C++ file' },
-  h: { icon: VscFileCode, color: 'text-purple-600', label: 'Header file' },
-  hpp: { icon: SiCplusplus, color: 'text-purple-600', label: 'C++ header' },
-  php: { icon: SiPhp, color: 'text-purple-600', label: 'PHP file' },
-  rb: { icon: SiRuby, color: 'text-red-600', label: 'Ruby file' },
-  swift: { icon: SiSwift, color: 'text-orange-600', label: 'Swift file' },
-  kt: { icon: SiKotlin, color: 'text-purple-600', label: 'Kotlin file' },
-  lua: { icon: SiLua, color: 'text-blue-800', label: 'Lua file' },
-  r: { icon: VscFileCode, color: 'text-blue-600', label: 'R file' },
-  dart: { icon: VscFileCode, color: 'text-blue-500', label: 'Dart file' },
-  scala: { icon: VscFileCode, color: 'text-red-600', label: 'Scala file' },
-  sh: { icon: VscTerminal, color: 'text-gray-600', label: 'Shell script' },
-  bash: { icon: VscTerminal, color: 'text-gray-600', label: 'Bash script' },
-  zsh: { icon: VscTerminal, color: 'text-gray-600', label: 'ZSH script' },
-  fish: { icon: VscTerminal, color: 'text-gray-600', label: 'Fish script' },
-  ps1: { icon: VscTerminal, color: 'text-blue-600', label: 'PowerShell script' },
-  bat: { icon: VscTerminal, color: 'text-gray-700', label: 'Batch file' },
-  cmd: { icon: VscTerminal, color: 'text-gray-700', label: 'Command file' },
-
-  // Database
-  sql: { icon: SiPostgresql, color: 'text-blue-600', label: 'SQL file' },
-  db: { icon: VscDatabase, color: 'text-gray-600', label: 'Database file' },
-  sqlite: { icon: VscDatabase, color: 'text-blue-600', label: 'SQLite database' },
-  sqlite3: { icon: VscDatabase, color: 'text-blue-600', label: 'SQLite database' },
-  mongodb: { icon: SiMongodb, color: 'text-green-600', label: 'MongoDB file' },
-  redis: { icon: SiRedis, color: 'text-red-600', label: 'Redis file' },
-
-  // Documentation
-  md: { icon: VscMarkdown, color: 'text-blue-600', label: 'Markdown file' },
-  mdx: { icon: VscMarkdown, color: 'text-blue-700', label: 'MDX file' },
-  rst: { icon: VscFileCode, color: 'text-gray-600', label: 'reStructuredText file' },
-  txt: { icon: VscFile, color: 'text-gray-500', label: 'Text file' },
-  pdf: { icon: VscFilePdf, color: 'text-red-600', label: 'PDF document' },
-  doc: { icon: VscFileCode, color: 'text-blue-700', label: 'Word document' },
-  docx: { icon: VscFileCode, color: 'text-blue-700', label: 'Word document' },
-  xls: { icon: VscTable, color: 'text-green-700', label: 'Excel spreadsheet' },
-  xlsx: { icon: VscTable, color: 'text-green-700', label: 'Excel spreadsheet' },
-  csv: { icon: VscTable, color: 'text-green-600', label: 'CSV file' },
-
-  // Images
-  png: { icon: FaFileImage, color: 'text-purple-500', label: 'PNG image' },
-  jpg: { icon: FaFileImage, color: 'text-purple-500', label: 'JPEG image' },
-  jpeg: { icon: FaFileImage, color: 'text-purple-500', label: 'JPEG image' },
-  gif: { icon: FaFileImage, color: 'text-purple-500', label: 'GIF image' },
-  webp: { icon: FaFileImage, color: 'text-purple-500', label: 'WebP image' },
-  svg: { icon: VscFileCode, color: 'text-orange-500', label: 'SVG image' },
-  ico: { icon: FaFileImage, color: 'text-purple-400', label: 'Icon file' },
-  bmp: { icon: FaFileImage, color: 'text-purple-400', label: 'Bitmap image' },
-  tiff: { icon: FaFileImage, color: 'text-purple-400', label: 'TIFF image' },
-
-  // Media
-  mp3: { icon: VscFileMedia, color: 'text-purple-600', label: 'MP3 audio' },
-  mp4: { icon: VscFileMedia, color: 'text-purple-600', label: 'MP4 video' },
-  avi: { icon: VscFileMedia, color: 'text-purple-600', label: 'AVI video' },
-  mov: { icon: VscFileMedia, color: 'text-purple-600', label: 'MOV video' },
-  webm: { icon: VscFileMedia, color: 'text-purple-600', label: 'WebM video' },
-  wav: { icon: VscFileMedia, color: 'text-purple-600', label: 'WAV audio' },
-  flac: { icon: VscFileMedia, color: 'text-purple-600', label: 'FLAC audio' },
-  ogg: { icon: VscFileMedia, color: 'text-purple-600', label: 'OGG audio' },
-
-  // Archives
-  zip: { icon: VscFileZip, color: 'text-gray-600', label: 'ZIP archive' },
-  rar: { icon: VscFileZip, color: 'text-gray-600', label: 'RAR archive' },
-  tar: { icon: VscFileZip, color: 'text-gray-600', label: 'TAR archive' },
-  gz: { icon: VscFileZip, color: 'text-gray-600', label: 'GZIP archive' },
-  '7z': { icon: VscFileZip, color: 'text-gray-600', label: '7-Zip archive' },
-  bz2: { icon: VscFileZip, color: 'text-gray-600', label: 'BZIP2 archive' },
-  xz: { icon: VscFileZip, color: 'text-gray-600', label: 'XZ archive' },
-
-  // Security
-  key: { icon: VscKey, color: 'text-yellow-600', label: 'Key file' },
-  pem: { icon: VscKey, color: 'text-yellow-600', label: 'PEM certificate' },
-  crt: { icon: VscKey, color: 'text-yellow-600', label: 'Certificate' },
-  cer: { icon: VscKey, color: 'text-yellow-600', label: 'Certificate' },
-  pub: { icon: VscKey, color: 'text-green-600', label: 'Public key' },
-  lock: { icon: VscLock, color: 'text-red-600', label: 'Lock file' },
-
-  // Binary
-  exe: { icon: VscFileBinary, color: 'text-gray-700', label: 'Executable' },
-  dll: { icon: VscFileBinary, color: 'text-gray-700', label: 'DLL file' },
-  so: { icon: VscFileBinary, color: 'text-gray-700', label: 'Shared object' },
-  dylib: { icon: VscFileBinary, color: 'text-gray-700', label: 'Dynamic library' },
-  bin: { icon: VscFileBinary, color: 'text-gray-700', label: 'Binary file' },
-  wasm: { icon: VscFileBinary, color: 'text-purple-600', label: 'WebAssembly' },
-
-  // Misc
-  log: { icon: VscFile, color: 'text-gray-600', label: 'Log file' },
-  bak: { icon: VscFile, color: 'text-gray-500', label: 'Backup file' },
-  tmp: { icon: VscFile, color: 'text-gray-500', label: 'Temporary file' },
-  cache: { icon: VscFile, color: 'text-gray-500', label: 'Cache file' },
-  test: { icon: VscSymbolMisc, color: 'text-green-600', label: 'Test file' },
-  spec: { icon: VscSymbolMisc, color: 'text-green-600', label: 'Spec file' },
-};
-
-// Error boundary for icon failures
-class IconErrorBoundary extends Component<
-  { children: ReactNode; fallback?: ReactNode },
-  { hasError: boolean }
-> {
-  constructor(props: { children: ReactNode; fallback?: ReactNode }) {
-    super(props);
-    this.state = { hasError: false };
-  }
-
-  static getDerivedStateFromError(): { hasError: boolean } {
-    return { hasError: true };
-  }
-
-  componentDidCatch(error: Error, errorInfo: ErrorInfo): void {
-    console.error('Icon loading error:', error, errorInfo);
-  }
-
-  render(): ReactNode {
-    if (this.state.hasError) {
-      return (
-        this.props.fallback || (
-          <VscError className="h-4 w-4 text-red-500" aria-label="Icon load error" />
-        )
-      );
-    }
-    return this.props.children;
-  }
-}
-
-interface FileIconProps {
-  filename: string;
-  isDirectory: boolean;
-  isExpanded?: boolean;
-  className?: string;
-  size?: number;
-  isLoading?: boolean;
-}
-
-// Memoized icon component for performance
-export const FileIcon = memo<FileIconProps>(
-  ({ filename, isDirectory, isExpanded = false, className = '', size = 16, isLoading = false }) => {
-    // Loading state
-    if (isLoading) {
-      return (
-        <div
-          className={`${className} animate-pulse rounded bg-gray-300 dark:bg-gray-600`}
-          style={{ width: size, height: size }}
-          role="img"
-          aria-label="Loading file icon"
-        />
-      );
-    }
-
-    const iconProps = {
-      className: `${className}`,
-      size,
-      style: { flexShrink: 0 },
-      role: 'img' as const,
-    };
-
-    // Handle directories
-    if (isDirectory) {
-      const label = isExpanded ? 'Expanded folder' : 'Folder';
-      const Icon = isExpanded ? VscFolderOpened : VscFolder;
-      return (
-        <IconErrorBoundary>
-          <Icon
-            {...iconProps}
-            className={`${className} text-blue-500/80`}
-            aria-label={label}
-            title={label}
-          />
-        </IconErrorBoundary>
-      );
-    }
-
-    const name = filename.toLowerCase();
-    const ext = filename.split('.').pop()?.toLowerCase();
-
-    // Get icon configuration
-    let iconConfig = SPECIAL_FILES[name];
-
-    // Check for special file patterns
-    if (!iconConfig) {
-      if (name.startsWith('dockerfile')) {
-        iconConfig = { icon: SiDocker, color: 'text-blue-500', label: 'Docker file' };
-      } else if (name.startsWith('.env')) {
-        iconConfig = {
-          icon: VscSettingsGear,
-          color: 'text-amber-700 dark:text-amber-300',
-          label: 'Environment file',
-        };
-      } else if (ext && EXTENSION_ICONS[ext]) {
-        iconConfig = EXTENSION_ICONS[ext];
-      } else if (name.includes('.test.') || name.includes('.spec.')) {
-        iconConfig = { icon: VscSymbolMisc, color: 'text-green-600', label: 'Test file' };
-      } else if (name.includes('.stories.')) {
-        iconConfig = { icon: SiStorybook, color: 'text-pink-600', label: 'Storybook file' };
-      } else {
-        // Default fallback
-        iconConfig = { icon: VscFile, color: 'text-gray-500', label: 'File' };
-      }
-    }
-
-    const { icon: IconComponent, color, label } = iconConfig;
-    const ariaLabel = `${label}: ${filename}`;
-
-    return (
-      <IconErrorBoundary
-        fallback={
-          <VscFile {...iconProps} className={`${className} text-gray-500`} aria-label={ariaLabel} />
-        }
-      >
-        <IconComponent
-          {...iconProps}
-          className={`${className} ${color}`}
-          aria-label={ariaLabel}
-          title={ariaLabel}
-        />
-      </IconErrorBoundary>
-    );
-  }
-);
-
-FileIcon.displayName = 'FileIcon';
-
-export default FileIcon;
diff --git a/src/renderer/components/FileExplorer/FileTabs.tsx b/src/renderer/components/FileExplorer/FileTabs.tsx
deleted file mode 100644
index cf5bea8230..0000000000
--- a/src/renderer/components/FileExplorer/FileTabs.tsx
+++ /dev/null
@@ -1,116 +0,0 @@
-import React from 'react';
-import { X, Eye, Pencil } from 'lucide-react';
-import { cn } from '@/lib/utils';
-import type { ManagedFile } from '@/hooks/useFileManager';
-import { FileIcon } from './FileIcons';
-import { isMarkdownFile } from '@/constants/file-explorer';
-
-interface FileTabsProps {
-  openFiles: Map<string, ManagedFile>;
-  activeFilePath: string | null;
-  onTabClick: (filePath: string) => void;
-  onTabClose: (filePath: string) => void;
-  previewMode: Map<string, boolean>;
-  onTogglePreview: (filePath: string) => void;
-}
-
-export const FileTabs: React.FC<FileTabsProps> = ({
-  openFiles,
-  activeFilePath,
-  onTabClick,
-  onTabClose,
-  previewMode,
-  onTogglePreview,
-}) => {
-  if (openFiles.size === 0) {
-    return null;
-  }
-
-  return (
-    <div className="flex h-8 shrink-0 items-center overflow-x-auto border-b border-border bg-muted/10 [overscroll-behavior-x:contain]">
-      {Array.from(openFiles.entries()).map(([path, file]) => (
-        <FileTab
-          key={path}
-          path={path}
-          file={file}
-          isActive={activeFilePath === path}
-          isMarkdown={isMarkdownFile(path)}
-          isPreview={previewMode.get(path) ?? isMarkdownFile(path)}
-          onClick={() => onTabClick(path)}
-          onClose={(e) => {
-            e.stopPropagation();
-            onTabClose(path);
-          }}
-          onTogglePreview={(e) => {
-            e.stopPropagation();
-            onTogglePreview(path);
-          }}
-        />
-      ))}
-    </div>
-  );
-};
-
-interface FileTabProps {
-  path: string;
-  file: ManagedFile;
-  isActive: boolean;
-  isMarkdown: boolean;
-  isPreview: boolean;
-  onClick: () => void;
-  onClose: (e: React.MouseEvent) => void;
-  onTogglePreview: (e: React.MouseEvent) => void;
-}
-
-const FileTab: React.FC<FileTabProps> = ({
-  path,
-  file,
-  isActive,
-  isMarkdown,
-  isPreview,
-  onClick,
-  onClose,
-  onTogglePreview,
-}) => {
-  const fileName = path.split('/').pop() || 'Untitled';
-
-  return (
-    <div
-      className={cn(
-        'flex h-full cursor-pointer items-center gap-1.5 border-r border-border px-3 hover:bg-accent/50',
-        isActive && 'bg-background'
-      )}
-      onClick={onClick}
-      title={path}
-    >
-      <span className="flex-shrink-0 [&>svg]:h-3 [&>svg]:w-3">
-        <FileIcon filename={fileName} isDirectory={false} />
-      </span>
-      <span className="max-w-[200px] truncate text-xs">{fileName}</span>
-      {file.isDirty && (
-        <span className="text-gray-500" title="Unsaved changes">
-          ●
-        </span>
-      )}
-      {isMarkdown && (
-        <button
-          className="ml-0.5 rounded p-0.5 text-muted-foreground hover:bg-accent hover:text-foreground"
-          onClick={onTogglePreview}
-          aria-label={isPreview ? 'Edit source' : 'Show preview'}
-          title={isPreview ? 'Edit source' : 'Show preview'}
-        >
-          {isPreview ? <Pencil className="h-3 w-3" /> : <Eye className="h-3 w-3" />}
-        </button>
-      )}
-      <button
-        className="ml-1 rounded p-0.5 hover:bg-accent"
-        onClick={onClose}
-        aria-label={`Close ${fileName}`}
-      >
-        <X className="h-3 w-3" />
-      </button>
-    </div>
-  );
-};
-
-export default FileTabs;
diff --git a/src/renderer/components/FileExplorer/FileTree.tsx b/src/renderer/components/FileExplorer/FileTree.tsx
deleted file mode 100644
index 5b5b0dea4f..0000000000
--- a/src/renderer/components/FileExplorer/FileTree.tsx
+++ /dev/null
@@ -1,620 +0,0 @@
-import React, { useState, useEffect, useCallback, useMemo, useRef } from 'react';
-import { ChevronRight, ChevronDown } from 'lucide-react';
-import { cn } from '@/lib/utils';
-import { FileIcon } from './FileIcons';
-import { useContentSearch } from '@/hooks/useContentSearch';
-import { SearchInput } from './SearchInput';
-import { ContentSearchResults } from './ContentSearchResults';
-import { getEditorState, saveEditorState } from '@/lib/editorStateStorage';
-import type { FileChange } from '@/hooks/useFileChanges';
-
-export interface FileNode {
-  id: string;
-  name: string;
-  path: string;
-  type: 'file' | 'directory';
-  children?: FileNode[];
-  isHidden?: boolean;
-  extension?: string;
-  isLoaded?: boolean;
-}
-
-export const constructSubRoot = (rootPath: string, nodePath: string): string => {
-  const separator = rootPath.includes('\\') ? '\\' : '/';
-  return rootPath.endsWith(separator)
-    ? `${rootPath}${nodePath}`
-    : `${rootPath}${separator}${nodePath}`;
-};
-
-function findNode(nodes: FileNode[], path: string): FileNode | null {
-  for (const n of nodes) {
-    if (n.path === path) return n;
-    if (n.children?.length) {
-      const found = findNode(n.children, path);
-      if (found) return found;
-    }
-  }
-  return null;
-}
-
-interface FileTreeProps {
-  taskId: string;
-  rootPath: string;
-  selectedFile?: string | null;
-  onSelectFile: (path: string) => void;
-  onOpenFile?: (path: string) => void;
-  className?: string;
-  showHiddenFiles?: boolean;
-  excludePatterns?: string[];
-  fileChanges?: FileChange[];
-  connectionId?: string | null;
-  remotePath?: string | null;
-}
-
-// Tree node component
-const TreeNode: React.FC<{
-  node: FileNode;
-  level: number;
-  selectedPath?: string | null;
-  expandedPaths: Set<string>;
-  onToggleExpand: (path: string) => void;
-  onSelect: (path: string) => void;
-  onOpen?: (path: string) => void;
-  onLoadChildren: (node: FileNode) => Promise<void>;
-  fileChanges: FileChange[];
-}> = ({
-  node,
-  level,
-  selectedPath,
-  expandedPaths,
-  onToggleExpand,
-  onSelect,
-  onOpen,
-  onLoadChildren,
-  fileChanges,
-}) => {
-  const isExpanded = expandedPaths.has(node.path);
-  const isSelected = selectedPath === node.path;
-
-  // Determine file status from git changes
-  const fileStatus = fileChanges.find((change) => change.path === node.path)?.status;
-
-  const handleClick = async (e: React.MouseEvent) => {
-    e.stopPropagation();
-    if (node.type === 'directory') {
-      // If not expanded and not loaded, load children
-      if (!isExpanded && !node.isLoaded) {
-        await onLoadChildren(node);
-      }
-      onToggleExpand(node.path);
-    } else {
-      onSelect(node.path);
-    }
-  };
-
-  const handleDoubleClick = (e: React.MouseEvent) => {
-    e.stopPropagation();
-    if (node.type === 'file' && onOpen) {
-      onOpen(node.path);
-    }
-  };
-
-  return (
-    <div>
-      <div
-        className={cn(
-          'flex h-6 cursor-pointer select-none items-center px-1 hover:bg-accent/50',
-          isSelected && 'bg-accent',
-          node.isHidden && 'opacity-60'
-        )}
-        style={{ paddingLeft: `${level * 12 + 4}px` }}
-        onClick={handleClick}
-        onDoubleClick={handleDoubleClick}
-        role="treeitem"
-        aria-selected={isSelected}
-        aria-expanded={node.type === 'directory' ? isExpanded : undefined}
-      >
-        {node.type === 'directory' && (
-          <span className="mr-1 text-muted-foreground">
-            {isExpanded ? (
-              <ChevronDown className="h-3 w-3" />
-            ) : (
-              <ChevronRight className="h-3 w-3" />
-            )}
-          </span>
-        )}
-        {node.type === 'file' && (
-          <span className="mr-1.5">
-            <FileIcon filename={node.name} isDirectory={false} isExpanded={false} />
-          </span>
-        )}
-        <span
-          className={cn(
-            'flex-1 truncate text-sm',
-            fileStatus === 'added' && 'text-green-500',
-            fileStatus === 'modified' && 'text-amber-500',
-            fileStatus === 'deleted' && 'text-red-500 line-through',
-            fileStatus === 'renamed' && 'text-blue-500'
-          )}
-        >
-          {node.name}
-        </span>
-      </div>
-
-      {node.type === 'directory' && isExpanded && node.children && (
-        <div>
-          {node.children.map((child) => (
-            <TreeNode
-              key={child.id}
-              node={child}
-              level={level + 1}
-              selectedPath={selectedPath}
-              expandedPaths={expandedPaths}
-              onToggleExpand={onToggleExpand}
-              onSelect={onSelect}
-              onOpen={onOpen}
-              onLoadChildren={onLoadChildren}
-              fileChanges={fileChanges}
-            />
-          ))}
-        </div>
-      )}
-    </div>
-  );
-};
-
-export const FileTree: React.FC<FileTreeProps> = ({
-  taskId,
-  rootPath,
-  selectedFile,
-  onSelectFile,
-  onOpenFile,
-  className,
-  showHiddenFiles = false,
-  excludePatterns = [],
-  fileChanges = [],
-  connectionId,
-  remotePath,
-}) => {
-  const [tree, setTree] = useState<FileNode[]>([]);
-  const [expandedPaths, setExpandedPaths] = useState<Set<string>>(() => {
-    const state = getEditorState(taskId);
-    return new Set(state?.expandedPaths ?? []);
-  });
-  const [loading, setLoading] = useState(true);
-  const [error, setError] = useState<string | null>(null);
-  const [allFiles, setAllFiles] = useState<any[]>([]);
-  const restoringRef = useRef(true);
-  const loadingPathsRef = useRef(new Set<string>());
-
-  // Use the clean content search hook
-  const {
-    searchQuery,
-    searchResults,
-    isSearching,
-    error: searchError,
-    handleSearchChange,
-    clearSearch,
-  } = useContentSearch(rootPath, { connectionId, remotePath });
-
-  const defaultExcludePatterns = useMemo(
-    () => [
-      '.git',
-      'dist',
-      'build',
-      '.next',
-      'out',
-      '.turbo',
-      'coverage',
-      '.nyc_output',
-      '.cache',
-      'tmp',
-      'temp',
-      '.DS_Store',
-      'Thumbs.db',
-      '.vscode-test',
-      '.idea',
-      '__pycache__',
-      '.pytest_cache',
-      'venv',
-      '.venv',
-      'target',
-      '.terraform',
-      '.serverless',
-      '.checkouts',
-      'checkouts',
-      'delete-github',
-      '.conductor',
-      '.cursor',
-      '.claude',
-      '.amp',
-      '.codex',
-      '.aider',
-      '.continue',
-      '.cody',
-      '.windsurf',
-      'worktrees',
-      '.worktrees',
-    ],
-    []
-  );
-
-  const allExcludePatterns = useMemo(
-    () => [...defaultExcludePatterns, ...excludePatterns],
-    [defaultExcludePatterns, excludePatterns]
-  );
-
-  // Check if an item should be excluded
-  const shouldExclude = useCallback(
-    (path: string): boolean => {
-      const parts = path.split('/');
-      return parts.some((part) => {
-        const lowerPart = part.toLowerCase();
-        return allExcludePatterns.some((pattern) => {
-          const lowerPattern = pattern.toLowerCase();
-
-          // Handle glob patterns (simplistic version)
-          if (lowerPattern.includes('*')) {
-            // Convert glob to regex: . -> \., * -> .*
-            const regexStr = '^' + lowerPattern.replace(/\./g, '\\.').replace(/\*/g, '.*') + '$';
-            return (
-              new RegExp(regexStr).test(lowerPart) || new RegExp(regexStr).test(path.toLowerCase())
-            );
-          }
-
-          return lowerPart === lowerPattern;
-        });
-      });
-    },
-    [allExcludePatterns]
-  );
-
-  // Build tree nodes from path
-  const buildNodesFromPath = useCallback(
-    (dirPath: string, files: any[]): FileNode[] => {
-      const immediateChildren = new Map<string, { type: 'file' | 'dir' }>();
-
-      files.forEach((item) => {
-        // Skip excluded items
-        if (shouldExclude(item.path)) {
-          return;
-        }
-
-        if (dirPath) {
-          if (!item.path.startsWith(dirPath + '/')) {
-            return;
-          }
-          // Remove the dirPath prefix to get relative path
-          const relativePath = item.path.substring(dirPath.length + 1);
-
-          // Get the first part only (immediate child)
-          const firstSlashIndex = relativePath.indexOf('/');
-          if (firstSlashIndex === -1) {
-            // It's a file in this directory
-            if (!showHiddenFiles && relativePath.startsWith('.')) {
-              return;
-            }
-            immediateChildren.set(relativePath, { type: item.type });
-          } else {
-            // It's a subdirectory or file in a subdirectory
-            const immediateChild = relativePath.substring(0, firstSlashIndex);
-            if (!showHiddenFiles && immediateChild.startsWith('.')) {
-              return;
-            }
-            // Mark it as a directory since it has children
-            immediateChildren.set(immediateChild, { type: 'dir' });
-          }
-        } else {
-          // We're at root - extract first part of path
-          const firstSlashIndex = item.path.indexOf('/');
-          if (firstSlashIndex === -1) {
-            // It's a file at root
-            if (!showHiddenFiles && item.path.startsWith('.')) {
-              return;
-            }
-            immediateChildren.set(item.path, { type: item.type });
-          } else {
-            // It's a directory or file in a subdirectory
-            const immediateChild = item.path.substring(0, firstSlashIndex);
-            if (!showHiddenFiles && immediateChild.startsWith('.')) {
-              return;
-            }
-            immediateChildren.set(immediateChild, { type: 'dir' });
-          }
-        }
-      });
-
-      // Convert map to array of FileNodes
-      const nodes: FileNode[] = [];
-      immediateChildren.forEach((itemInfo, itemName) => {
-        const nodePath = dirPath ? `${dirPath}/${itemName}` : itemName;
-        nodes.push({
-          id: nodePath,
-          name: itemName,
-          path: nodePath,
-          type: itemInfo.type === 'dir' ? 'directory' : 'file',
-          children: itemInfo.type === 'dir' ? [] : undefined,
-          isHidden: itemName.startsWith('.'),
-          extension:
-            itemInfo.type === 'file' && itemName.includes('.')
-              ? itemName.split('.').pop()
-              : undefined,
-          isLoaded: false,
-        });
-      });
-
-      // Sort: directories first, then alphabetically
-      nodes.sort((a, b) => {
-        if (a.type !== b.type) {
-          return a.type === 'directory' ? -1 : 1;
-        }
-        return a.name.localeCompare(b.name);
-      });
-
-      return nodes;
-    },
-    [showHiddenFiles, shouldExclude]
-  );
-
-  // Load all files once at the beginning - only when rootPath changes
-  useEffect(() => {
-    const loadAllFiles = async () => {
-      setLoading(true);
-      setError(null);
-
-      try {
-        const opts: {
-          includeDirs: boolean;
-          connectionId?: string;
-          remotePath?: string;
-        } = { includeDirs: true };
-
-        if (connectionId && remotePath) {
-          opts.connectionId = connectionId;
-          opts.remotePath = remotePath;
-        }
-
-        const result = await window.electronAPI.fsList(rootPath, {
-          ...opts,
-          recursive: false,
-        });
-
-        if (result.canceled) {
-          return;
-        }
-
-        if (!result.success || !result.items) {
-          throw new Error(result.error || 'Failed to load files');
-        }
-
-        // Store all files for later use
-        setAllFiles(result.items);
-      } catch (err) {
-        setError(err instanceof Error ? err.message : 'Failed to load files');
-      } finally {
-        setLoading(false);
-      }
-    };
-
-    loadAllFiles();
-  }, [rootPath, connectionId, remotePath]); // Reload when rootPath or remote info changes
-
-  // Build tree when files or filters change
-  useEffect(() => {
-    if (allFiles.length === 0) return;
-
-    // Build tree with current filters
-    const rootNodes = buildNodesFromPath('', allFiles);
-
-    // Preserve expanded state when rebuilding tree
-    setTree((prevTree) => {
-      // If this is the first load, just set the tree
-      if (prevTree.length === 0) {
-        return rootNodes;
-      }
-
-      // Otherwise, preserve the isLoaded state from previous tree
-      const preserveLoadedState = (newNodes: FileNode[], oldNodes: FileNode[]): FileNode[] => {
-        return newNodes.map((newNode) => {
-          const oldNode = oldNodes.find((n) => n.path === newNode.path);
-          if (oldNode && oldNode.isLoaded && oldNode.children) {
-            // Preserve the loaded children
-            return {
-              ...newNode,
-              isLoaded: true,
-              children: preserveLoadedState(
-                buildNodesFromPath(newNode.path, allFiles),
-                oldNode.children
-              ),
-            };
-          }
-          return newNode;
-        });
-      };
-
-      return preserveLoadedState(rootNodes, prevTree);
-    });
-  }, [allFiles, buildNodesFromPath]); // Rebuild tree when files or filter function changes
-
-  // Load children for a node
-  const loadChildren = useCallback(
-    async (node: FileNode) => {
-      // If already loaded, just toggle (handled by click handler, but nice to be safe)
-      if (node.isLoaded) return;
-
-      try {
-        const subRoot = constructSubRoot(rootPath, node.path);
-
-        const opts: {
-          includeDirs: boolean;
-          recursive: boolean;
-          connectionId?: string;
-          remotePath?: string;
-        } = {
-          includeDirs: true,
-          recursive: false,
-        };
-        if (connectionId && remotePath) {
-          opts.connectionId = connectionId;
-          opts.remotePath = remotePath;
-        }
-
-        const result = await window.electronAPI.fsList(subRoot, opts);
-
-        if (result.success && result.items) {
-          // Process new items:
-          // 1. Prefix their paths so they are relative to project root
-          // 2. Add them to allFiles
-          const newItems = result.items.map((item: any) => ({
-            ...item,
-            path: `${node.path}/${item.path}`, // item.path from fsList is relative to subRoot
-          }));
-
-          setAllFiles((prev) => {
-            // Remove any existing children of this node to avoid duplicates (optional but good)
-            const filtered = prev.filter((p) => !p.path.startsWith(node.path + '/'));
-            return [...filtered, ...newItems];
-          });
-
-          // Mark node as loaded to prevent re-fetching and allow expansion
-          setTree((currentTree) => {
-            const updateNode = (nodes: FileNode[]): FileNode[] => {
-              return nodes.map((n) => {
-                if (n.path === node.path) {
-                  return { ...n, isLoaded: true };
-                }
-                if (n.children && n.children.length > 0) {
-                  return { ...n, children: updateNode(n.children) };
-                }
-                return n;
-              });
-            };
-            return updateNode(currentTree);
-          });
-        }
-      } catch (error) {
-        console.error('Failed to load children', error);
-      }
-    },
-    [rootPath, connectionId, remotePath]
-  );
-
-  useEffect(() => {
-    restoringRef.current = true;
-    const state = getEditorState(taskId);
-    setExpandedPaths(new Set(state?.expandedPaths ?? []));
-  }, [taskId]);
-
-  useEffect(() => {
-    if (expandedPaths.size === 0 || tree.length === 0) return;
-    const paths = [...expandedPaths].sort(
-      (a, b) => a.split('/').filter(Boolean).length - b.split('/').filter(Boolean).length
-    );
-    const path = paths.find((p) => {
-      if (loadingPathsRef.current.has(p)) return false;
-      const node = findNode(tree, p);
-      return node?.type === 'directory' && !node.isLoaded;
-    });
-    if (!path) return;
-    const node = findNode(tree, path);
-    if (node) {
-      loadingPathsRef.current.add(path);
-      void loadChildren(node).finally(() => {
-        loadingPathsRef.current.delete(path);
-      });
-    }
-  }, [taskId, tree, expandedPaths, loadChildren]);
-
-  const handleToggleExpand = useCallback((path: string) => {
-    setExpandedPaths((prev) => {
-      const next = new Set(prev);
-      if (next.has(path)) {
-        next.delete(path);
-      } else {
-        next.add(path);
-      }
-      return next;
-    });
-  }, []);
-
-  // Persist expandedPaths to localStorage (skip during restore)
-  useEffect(() => {
-    if (restoringRef.current) {
-      restoringRef.current = false;
-      return;
-    }
-    saveEditorState(taskId, { expandedPaths: Array.from(expandedPaths) });
-  }, [taskId, expandedPaths]);
-
-  // Handle clicking on a search result
-  const handleSearchResultClick = useCallback(
-    (filePath: string) => {
-      onSelectFile(filePath);
-      if (onOpenFile) {
-        onOpenFile(filePath);
-      }
-    },
-    [onSelectFile, onOpenFile]
-  );
-
-  if (loading) {
-    return (
-      <div className={cn('p-4 text-sm text-muted-foreground', className)}>Loading files...</div>
-    );
-  }
-
-  if (error) {
-    return <div className={cn('p-4 text-sm text-destructive', className)}>Error: {error}</div>;
-  }
-
-  if (tree.length === 0) {
-    return <div className={cn('p-4 text-sm text-muted-foreground', className)}>No files found</div>;
-  }
-
-  return (
-    <div className={cn('flex flex-col', className)}>
-      <div>
-        <SearchInput
-          value={searchQuery}
-          onChange={handleSearchChange}
-          onClear={clearSearch}
-          placeholder="Search..."
-        />
-      </div>
-
-      <div className="flex-1 overflow-auto">
-        {searchQuery ? (
-          // Search results view
-          <div className="p-2">
-            <ContentSearchResults
-              results={searchResults}
-              isSearching={isSearching}
-              error={searchError}
-              onResultClick={handleSearchResultClick}
-            />
-          </div>
-        ) : (
-          // File tree view
-          <div role="tree" aria-label="File explorer">
-            {tree.map((child) => (
-              <TreeNode
-                key={child.id}
-                node={child}
-                level={0}
-                selectedPath={selectedFile}
-                expandedPaths={expandedPaths}
-                onToggleExpand={handleToggleExpand}
-                onSelect={onSelectFile}
-                onOpen={onOpenFile}
-                onLoadChildren={loadChildren}
-                fileChanges={fileChanges}
-              />
-            ))}
-          </div>
-        )}
-      </div>
-    </div>
-  );
-};
-
-export default FileTree;
diff --git a/src/renderer/components/FileExplorer/MarkdownPreview.tsx b/src/renderer/components/FileExplorer/MarkdownPreview.tsx
deleted file mode 100644
index 3c295f9da7..0000000000
--- a/src/renderer/components/FileExplorer/MarkdownPreview.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-import React from 'react';
-import { MarkdownRenderer } from '../ui/markdown-renderer';
-
-interface MarkdownPreviewProps {
-  content: string;
-  /** Root path for resolving relative image paths (e.g. taskPath / worktree root) */
-  rootPath?: string;
-  /** Directory of the markdown file, relative to rootPath */
-  fileDir?: string;
-}
-
-export const MarkdownPreview: React.FC<MarkdownPreviewProps> = ({ content, rootPath, fileDir }) => {
-  return (
-    <div className="flex flex-1 overflow-auto bg-background">
-      <MarkdownRenderer
-        content={content}
-        variant="full"
-        className="w-full max-w-3xl px-8 py-8"
-        rootPath={rootPath}
-        fileDir={fileDir}
-      />
-    </div>
-  );
-};
diff --git a/src/renderer/components/FileExplorer/SearchInput.tsx b/src/renderer/components/FileExplorer/SearchInput.tsx
deleted file mode 100644
index 85e19069dd..0000000000
--- a/src/renderer/components/FileExplorer/SearchInput.tsx
+++ /dev/null
@@ -1,68 +0,0 @@
-import React from 'react';
-import { Search, X } from 'lucide-react';
-
-interface SearchInputProps {
-  value: string;
-  onChange: (value: string) => void;
-  onClear: () => void;
-  placeholder?: string;
-  disabled?: boolean;
-}
-
-export const SearchInput: React.FC<SearchInputProps> = ({
-  value,
-  onChange,
-  onClear,
-  placeholder = 'Search',
-  disabled = false,
-}) => {
-  const handleInputChange = (event: React.ChangeEvent<HTMLInputElement>) => {
-    onChange(event.target.value);
-  };
-
-  const handleClearClick = () => {
-    onClear();
-  };
-
-  const showClearButton = value.length > 0;
-
-  return (
-    <div className="relative">
-      <SearchIcon />
-      <input
-        type="text"
-        value={value}
-        onChange={handleInputChange}
-        placeholder={placeholder}
-        disabled={disabled}
-        className="w-full rounded-none border border-input bg-background py-1 pl-9 pr-8 text-sm outline-none focus:border-accent focus:ring-1 focus:ring-accent disabled:opacity-50"
-        aria-label="Search input"
-      />
-      {showClearButton && <ClearButton onClick={handleClearClick} disabled={disabled} />}
-    </div>
-  );
-};
-
-const SearchIcon: React.FC = () => (
-  <Search
-    className="absolute left-3 top-1/2 h-3.5 w-3.5 -translate-y-1/2 text-muted-foreground"
-    aria-hidden="true"
-  />
-);
-
-const ClearButton: React.FC<{ onClick: () => void; disabled?: boolean }> = ({
-  onClick,
-  disabled = false,
-}) => (
-  <button
-    onClick={onClick}
-    disabled={disabled}
-    className="absolute right-2 top-1/2 -translate-y-1/2 rounded p-1 hover:bg-accent disabled:opacity-50"
-    aria-label="Clear search"
-    type="button"
-  >
-    <X className="h-3 w-3" />
-  </button>
-);
-
-export default SearchInput;
diff --git a/src/renderer/components/GitHubIssuePreviewTooltip.tsx b/src/renderer/components/GitHubIssuePreviewTooltip.tsx
deleted file mode 100644
index 6e20f468b2..0000000000
--- a/src/renderer/components/GitHubIssuePreviewTooltip.tsx
+++ /dev/null
@@ -1,200 +0,0 @@
-import React, { useEffect, useRef, useState } from 'react';
-import { motion } from 'motion/react';
-import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from './ui/tooltip';
-import { ExternalLink, Users, Tag } from 'lucide-react';
-import githubLogo from '../../assets/images/github.png';
-import type { GitHubIssueSummary } from '../types/github';
-
-type Props = {
-  issue: GitHubIssueSummary | null;
-  children: React.ReactElement;
-  side?: 'top' | 'right' | 'bottom' | 'left';
-};
-
-const StatusPill = ({ state }: { state?: string | null }) => {
-  if (!state) return null;
-
-  const getStatusColor = (state: string) => {
-    switch (state.toLowerCase()) {
-      case 'closed':
-        return 'bg-emerald-100/70 text-emerald-800 dark:bg-emerald-500/10 dark:text-emerald-200';
-      case 'open':
-        return 'bg-blue-100/70 text-blue-800 dark:bg-blue-500/10 dark:text-blue-200';
-      default:
-        return 'bg-slate-100/70 text-slate-800 dark:bg-slate-500/10 dark:text-slate-200';
-    }
-  };
-
-  return (
-    <span
-      className={`inline-flex items-center gap-1 rounded-md border border-border px-2 py-0.5 text-[11px] ${getStatusColor(state)}`}
-    >
-      {state}
-    </span>
-  );
-};
-
-// Module-level singleton: only one tooltip may be open at a time.
-// Stores the force-close function of the currently open tooltip instance.
-let activeTooltipForceClose: (() => void) | null = null;
-
-export const GitHubIssuePreviewTooltip: React.FC<Props> = ({ issue, children, side = 'top' }) => {
-  const [open, setOpen] = useState(false);
-  const closeTimer = useRef<ReturnType<typeof setTimeout> | null>(null);
-
-  const cancelClose = () => {
-    if (closeTimer.current !== null) {
-      clearTimeout(closeTimer.current);
-      closeTimer.current = null;
-    }
-  };
-
-  const latestClose = useRef<() => void>(() => {});
-  latestClose.current = () => {
-    cancelClose();
-    setOpen(false);
-  };
-
-  const stableForceClose = useRef<() => void>(() => latestClose.current());
-
-  const scheduleClose = () => {
-    cancelClose();
-    closeTimer.current = setTimeout(() => setOpen(false), 300);
-  };
-
-  const handleMouseEnter = () => {
-    cancelClose();
-    setOpen(true);
-  };
-
-  // Whenever this tooltip becomes visible (via ANY path — mouse enter, Radix's
-  // internal onOpenChange, etc.) register it in the global singleton and
-  // immediately force-close whichever other instance was previously open.
-  useEffect(() => {
-    const myForceClose = stableForceClose.current;
-    if (open) {
-      if (activeTooltipForceClose && activeTooltipForceClose !== myForceClose) {
-        activeTooltipForceClose(); // close the other tooltip immediately
-      }
-      activeTooltipForceClose = myForceClose;
-    } else {
-      if (activeTooltipForceClose === myForceClose) {
-        activeTooltipForceClose = null;
-      }
-    }
-    // Cleanup on unmount.
-    return () => {
-      if (activeTooltipForceClose === myForceClose) {
-        activeTooltipForceClose = null;
-      }
-    };
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [open]);
-
-  // Clean up pending close timer on unmount.
-  useEffect(() => {
-    return () => cancelClose();
-  }, []);
-
-  if (!issue) return children;
-
-  return (
-    <TooltipProvider delayDuration={150}>
-      <Tooltip
-        open={open}
-        onOpenChange={(next) => {
-          if (next) setOpen(true); /* closing handled by scheduleClose */
-        }}
-      >
-        <TooltipTrigger asChild onMouseEnter={handleMouseEnter} onMouseLeave={scheduleClose}>
-          {children}
-        </TooltipTrigger>
-        <TooltipContent
-          side={side}
-          align="start"
-          className="border-0 bg-transparent p-0 shadow-none"
-          style={{ zIndex: 10000 }}
-          onPointerDownOutside={(e) => e.preventDefault()}
-          onMouseEnter={cancelClose}
-          onMouseLeave={scheduleClose}
-        >
-          <motion.div
-            initial={{ opacity: 0, y: 4, scale: 0.98 }}
-            animate={{ opacity: 1, y: 0, scale: 1 }}
-            exit={{ opacity: 0, y: 4, scale: 0.98 }}
-            transition={{ duration: 0.16, ease: 'easeOut' }}
-            className="min-w-[260px] max-w-sm rounded-lg border border-border/70 bg-popover/95 p-3 shadow-xl backdrop-blur-sm"
-            onClick={(e) => e.stopPropagation()}
-          >
-            <div className="flex items-start justify-between gap-2">
-              <div className="flex items-center gap-2 text-xs font-medium text-muted-foreground">
-                <img src={githubLogo} alt="GitHub" className="h-4 w-4" />
-                <span className="tracking-wide">GitHub Issue</span>
-                <span className="font-semibold text-muted-foreground/80">#{issue.number}</span>
-              </div>
-              {issue.url && (
-                <a
-                  href={issue.url}
-                  target="_blank"
-                  rel="noopener noreferrer"
-                  className="inline-flex items-center gap-1 text-xs text-blue-600 hover:text-blue-700 dark:text-blue-400 dark:hover:text-blue-300"
-                  onClick={(e) => {
-                    e.stopPropagation();
-                    if (window.electronAPI?.openExternal && issue.url) {
-                      e.preventDefault();
-                      window.electronAPI.openExternal(issue.url);
-                    }
-                  }}
-                >
-                  <ExternalLink className="h-3 w-3" />
-                </a>
-              )}
-            </div>
-
-            <div className="mt-1 line-clamp-2 text-sm font-semibold text-foreground">
-              {issue.title || `Issue #${issue.number}`}
-            </div>
-
-            {issue.body && (
-              <div className="mt-1.5 line-clamp-2 text-xs text-muted-foreground">{issue.body}</div>
-            )}
-
-            <div className="mt-2 flex flex-wrap items-center gap-2 text-xs text-muted-foreground">
-              <StatusPill state={issue.state} />
-
-              {issue.assignees && issue.assignees.length > 0 && (
-                <span className="inline-flex items-center gap-1">
-                  <Users className="h-3 w-3" />
-                  <span>
-                    {issue.assignees
-                      .map((a) => a.login || a.name)
-                      .filter(Boolean)
-                      .slice(0, 2)
-                      .join(', ')}
-                    {issue.assignees.length > 2 && ` +${issue.assignees.length - 2}`}
-                  </span>
-                </span>
-              )}
-
-              {issue.labels && issue.labels.length > 0 && (
-                <span className="inline-flex items-center gap-1">
-                  <Tag className="h-3 w-3" />
-                  <span>
-                    {issue.labels
-                      .map((l) => l.name)
-                      .filter(Boolean)
-                      .slice(0, 2)
-                      .join(', ')}
-                    {issue.labels.length > 2 && ` +${issue.labels.length - 2}`}
-                  </span>
-                </span>
-              )}
-            </div>
-          </motion.div>
-        </TooltipContent>
-      </Tooltip>
-    </TooltipProvider>
-  );
-};
-
-export default GitHubIssuePreviewTooltip;
diff --git a/src/renderer/components/GitHubIssueSelector.tsx b/src/renderer/components/GitHubIssueSelector.tsx
deleted file mode 100644
index 0c8c1d1171..0000000000
--- a/src/renderer/components/GitHubIssueSelector.tsx
+++ /dev/null
@@ -1,347 +0,0 @@
-import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
-import { Input } from './ui/input';
-import { Select, SelectContent, SelectItem, SelectTrigger } from './ui/select';
-import { Search } from 'lucide-react';
-import githubLogo from '../../assets/images/github.png';
-import { Separator } from './ui/separator';
-import { Badge } from './ui/badge';
-import { Spinner } from './ui/spinner';
-import { type GitHubIssueSummary } from '../types/github';
-import { type GitHubIssueLink } from '../types/chat';
-import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from './ui/tooltip';
-import { GitHubIssuePreviewTooltip } from './GitHubIssuePreviewTooltip';
-
-interface GitHubIssueSelectorProps {
-  projectPath: string;
-  selectedIssue: GitHubIssueSummary | null;
-  onIssueChange: (issue: GitHubIssueSummary | null) => void;
-  linkedIssueMap?: ReadonlyMap<number, GitHubIssueLink>;
-  linkedIssueMode?: 'disable' | 'hide';
-  isOpen?: boolean;
-  className?: string;
-  disabled?: boolean;
-  placeholder?: string;
-}
-
-const EMPTY_LINKED_ISSUE_MAP = new Map<number, GitHubIssueLink>();
-
-export const GitHubIssueSelector: React.FC<GitHubIssueSelectorProps> = ({
-  projectPath,
-  selectedIssue,
-  onIssueChange,
-  linkedIssueMap,
-  linkedIssueMode = 'disable',
-  isOpen = false,
-  className = '',
-  disabled = false,
-  placeholder: customPlaceholder,
-}) => {
-  const [availableIssues, setAvailableIssues] = useState<GitHubIssueSummary[]>([]);
-  const [isLoadingIssues, setIsLoadingIssues] = useState(false);
-  const [issueListError, setIssueListError] = useState<string | null>(null);
-  const [hasRequestedIssues, setHasRequestedIssues] = useState(false);
-  const [searchTerm, setSearchTerm] = useState('');
-  const [searchResults, setSearchResults] = useState<GitHubIssueSummary[]>([]);
-  const [isSearching, setIsSearching] = useState(false);
-  const [visibleCount, setVisibleCount] = useState(10);
-  const isMountedRef = useRef(true);
-
-  const api = (typeof window !== 'undefined' ? (window as any).electronAPI : null) as any;
-  const canListGithub = !!api?.githubIssuesList && !!projectPath;
-  const issuesLoaded = availableIssues.length > 0;
-  const noIssuesAvailable =
-    hasRequestedIssues && !isLoadingIssues && !issuesLoaded && !issueListError;
-
-  useEffect(() => {
-    return () => {
-      isMountedRef.current = false;
-    };
-  }, []);
-
-  useEffect(() => {
-    if (!isOpen) {
-      setAvailableIssues([]);
-      setHasRequestedIssues(false);
-      setIssueListError(null);
-      setIsLoadingIssues(false);
-      setSearchTerm('');
-      setSearchResults([]);
-      setIsSearching(false);
-      onIssueChange(null);
-      setVisibleCount(10);
-    }
-  }, [isOpen, onIssueChange]);
-
-  const loadIssues = useCallback(async () => {
-    if (!canListGithub) return;
-    import('../lib/telemetryClient').then(({ captureTelemetry }) => {
-      captureTelemetry('github_issues_searched');
-    });
-    setIsLoadingIssues(true);
-    try {
-      const result = await api.githubIssuesList(projectPath, 50);
-      if (!isMountedRef.current) return;
-      if (!result?.success) throw new Error(result?.error || 'Failed to load GitHub issues.');
-      setAvailableIssues(result.issues ?? []);
-      setIssueListError(null);
-    } catch (error) {
-      if (!isMountedRef.current) return;
-      setAvailableIssues([]);
-      setIssueListError(error instanceof Error ? error.message : 'Failed to load GitHub issues.');
-    } finally {
-      if (!isMountedRef.current) return;
-      setIsLoadingIssues(false);
-      setHasRequestedIssues(true);
-    }
-  }, [api, canListGithub, projectPath]);
-
-  useEffect(() => {
-    if (!isOpen || !canListGithub || isLoadingIssues || hasRequestedIssues) return;
-    loadIssues();
-  }, [isOpen, canListGithub, isLoadingIssues, hasRequestedIssues, loadIssues]);
-
-  const searchIssues = useCallback(
-    async (term: string) => {
-      if (!term.trim()) {
-        setSearchResults([]);
-        setIsSearching(false);
-        return;
-      }
-      if (!api?.githubIssuesSearch) return;
-      setIsSearching(true);
-      try {
-        const result = await api.githubIssuesSearch(projectPath, term.trim(), 20);
-        if (!isMountedRef.current) return;
-        if (result?.success) setSearchResults(result.issues ?? []);
-        else setSearchResults([]);
-      } catch {
-        if (!isMountedRef.current) return;
-        setSearchResults([]);
-      } finally {
-        if (!isMountedRef.current) return;
-        setIsSearching(false);
-      }
-    },
-    [api, projectPath]
-  );
-
-  useEffect(() => {
-    const id = setTimeout(() => searchIssues(searchTerm), 300);
-    return () => clearTimeout(id);
-  }, [searchTerm, searchIssues]);
-
-  const displayIssues = useMemo(() => {
-    if (searchTerm.trim()) return searchResults;
-    return availableIssues;
-  }, [searchResults, availableIssues, searchTerm]);
-
-  const linkedIssueLookup = linkedIssueMap ?? EMPTY_LINKED_ISSUE_MAP;
-
-  const filteredIssues = useMemo(() => {
-    if (linkedIssueMode !== 'hide' || linkedIssueLookup.size === 0) return displayIssues;
-    return displayIssues.filter((issue) => !linkedIssueLookup.has(issue.number));
-  }, [displayIssues, linkedIssueLookup, linkedIssueMode]);
-
-  useEffect(() => setVisibleCount(10), [searchTerm]);
-
-  const showIssues = useMemo(
-    () => filteredIssues.slice(0, Math.max(10, visibleCount)),
-    [filteredIssues, visibleCount]
-  );
-
-  const handleScroll = useCallback(
-    (e: React.UIEvent<HTMLDivElement>) => {
-      const el = e.currentTarget;
-      const nearBottom = el.scrollTop + el.clientHeight >= el.scrollHeight - 16;
-      if (nearBottom && showIssues.length < filteredIssues.length) {
-        setVisibleCount((prev) => Math.min(prev + 10, filteredIssues.length));
-      }
-    },
-    [filteredIssues.length, showIssues.length]
-  );
-
-  const handleIssueSelect = (value: string) => {
-    if (value === '__clear__') {
-      onIssueChange(null);
-      return;
-    }
-    const num = Number(String(value).replace(/^#/, ''));
-    const issue = filteredIssues.find((i) => i.number === num) ?? null;
-    if (issue) {
-      import('../lib/telemetryClient').then(({ captureTelemetry }) => {
-        captureTelemetry('github_issue_selected');
-      });
-    }
-    onIssueChange(issue);
-  };
-
-  const issuePlaceholder =
-    customPlaceholder ??
-    (isLoadingIssues
-      ? 'Loading…'
-      : issueListError
-        ? 'Connect your GitHub'
-        : 'Select a GitHub issue');
-
-  if (!canListGithub) {
-    return (
-      <div className={className}>
-        <Input value="" placeholder="GitHub integration unavailable" disabled />
-        <p className="mt-2 text-xs text-muted-foreground">
-          Connect GitHub CLI in Settings to browse issues.
-        </p>
-      </div>
-    );
-  }
-
-  const selectBody = (
-    <Select
-      value={selectedIssue ? `#${selectedIssue.number}` : '__clear__'}
-      onValueChange={handleIssueSelect}
-      disabled={disabled || isLoadingIssues || !!issueListError || !issuesLoaded}
-    >
-      <SelectTrigger
-        className="h-9 w-full overflow-hidden border-none bg-muted"
-        style={{ maxWidth: '100%' }}
-      >
-        <div className="flex w-full items-center gap-2 overflow-hidden text-left text-foreground">
-          {selectedIssue ? (
-            <div className="flex min-w-0 flex-1 items-center gap-2 overflow-hidden">
-              <GitHubIssuePreviewTooltip issue={selectedIssue}>
-                <span
-                  className="inline-flex items-center gap-1.5 rounded border border-border bg-muted px-1.5 py-0.5 dark:border-border dark:bg-card"
-                  onClick={(e) => e.stopPropagation()}
-                >
-                  <img src={githubLogo} alt="GitHub" className="h-3.5 w-3.5" />
-                  <span className="text-[11px] font-medium text-foreground">
-                    #{selectedIssue.number}
-                  </span>
-                </span>
-              </GitHubIssuePreviewTooltip>
-              {selectedIssue.title ? (
-                <div className="flex min-w-0 flex-1 items-center gap-1 overflow-hidden">
-                  <span className="text-foreground">-</span>
-                  <span className="truncate text-muted-foreground">{selectedIssue.title}</span>
-                </div>
-              ) : null}
-            </div>
-          ) : (
-            <>
-              <img src={githubLogo} alt="GitHub" className="h-3.5 w-3.5" />
-              {isLoadingIssues ? (
-                <>
-                  <span className="truncate text-muted-foreground">Loading GitHub issues</span>
-                  <Spinner size="sm" />
-                </>
-              ) : (
-                <span className="truncate text-muted-foreground">{issuePlaceholder}</span>
-              )}
-            </>
-          )}
-        </div>
-      </SelectTrigger>
-      <SelectContent side="top" className="z-[120] w-full max-w-[480px]">
-        <div className="relative px-3 py-2">
-          <Search className="absolute left-3 top-1/2 z-10 h-4 w-4 -translate-y-1/2 text-muted-foreground" />
-          <Input
-            placeholder="Search by title or assignee…"
-            value={searchTerm}
-            onChange={(e) => setSearchTerm(e.target.value)}
-            className="h-7 w-full border-none bg-transparent pl-9 pr-3 focus:outline-none focus:ring-0 focus:ring-offset-0 focus-visible:ring-0 focus-visible:ring-offset-0"
-          />
-        </div>
-        <Separator />
-        <div className="max-h-80 overflow-y-auto overflow-x-hidden py-1" onScroll={handleScroll}>
-          <SelectItem value="__clear__">
-            <span className="text-sm text-muted-foreground">None</span>
-          </SelectItem>
-          <Separator className="my-1" />
-          {showIssues.length > 0 ? (
-            showIssues.map((issue) => {
-              const linkedIssue = linkedIssueLookup.get(issue.number);
-              const isLinked = Boolean(linkedIssue);
-              const isDisabled = linkedIssueMode === 'disable' && isLinked;
-              return (
-                <GitHubIssuePreviewTooltip key={issue.number} issue={issue} side="left">
-                  <SelectItem value={`#${issue.number}`} disabled={isDisabled}>
-                    <span className="flex min-w-0 flex-1 items-center gap-2">
-                      <span className="inline-flex shrink-0 items-center gap-1.5 rounded border border-border bg-muted px-1.5 py-0.5 dark:border-border dark:bg-card">
-                        <img src={githubLogo} alt="GitHub" className="h-3.5 w-3.5" />
-                        <span className="text-[11px] font-medium text-foreground">
-                          #{issue.number}
-                        </span>
-                      </span>
-                      {issue.title ? (
-                        <span className="truncate text-muted-foreground">{issue.title}</span>
-                      ) : null}
-                      {linkedIssueMode === 'disable' && isLinked ? (
-                        <Badge
-                          variant="outline"
-                          className="ml-auto shrink-0 text-[10px] opacity-75"
-                          title={`Already linked to task: ${linkedIssue?.taskName ?? 'another task'}`}
-                        >
-                          Linked to:{' '}
-                          {linkedIssue?.taskName
-                            ? linkedIssue.taskName.slice(0, 20) +
-                              (linkedIssue.taskName.length > 20 ? '...' : '')
-                            : 'task'}
-                        </Badge>
-                      ) : null}
-                    </span>
-                  </SelectItem>
-                </GitHubIssuePreviewTooltip>
-              );
-            })
-          ) : searchTerm.trim() ? (
-            <div className="px-3 py-2 text-sm text-muted-foreground">
-              {isSearching ? (
-                <div className="flex items-center gap-2">
-                  <Spinner size="sm" />
-                  <span>Searching</span>
-                </div>
-              ) : (
-                `No issues found for "${searchTerm}"`
-              )}
-            </div>
-          ) : (
-            <div className="px-3 py-2 text-sm text-muted-foreground">No issues available</div>
-          )}
-        </div>
-      </SelectContent>
-    </Select>
-  );
-
-  return (
-    <div className={`min-w-0 max-w-full overflow-hidden ${className}`} style={{ maxWidth: '100%' }}>
-      {noIssuesAvailable ? (
-        <TooltipProvider delayDuration={150}>
-          <Tooltip>
-            <TooltipTrigger asChild>
-              <div className="w-full">{selectBody}</div>
-            </TooltipTrigger>
-            <TooltipContent side="top" align="start" className="max-w-xs text-center">
-              No GitHub issues available for this project.
-            </TooltipContent>
-          </Tooltip>
-        </TooltipProvider>
-      ) : (
-        selectBody
-      )}
-      {issueListError ? (
-        <div className="mt-2 rounded-md border border-border bg-muted/40 p-2">
-          <div className="flex items-center gap-2">
-            <Badge className="inline-flex items-center gap-1.5">
-              <img src={githubLogo} alt="GitHub" className="h-3.5 w-3.5" />
-              <span>Connect GitHub</span>
-            </Badge>
-          </div>
-          <p className="mt-1 text-xs text-muted-foreground">
-            Sign in with GitHub CLI in Settings to browse and attach issues here.
-          </p>
-        </div>
-      ) : null}
-    </div>
-  );
-};
-
-export default GitHubIssueSelector;
diff --git a/src/renderer/components/GitLabIssuePreviewTooltip.tsx b/src/renderer/components/GitLabIssuePreviewTooltip.tsx
deleted file mode 100644
index 808d94c39b..0000000000
--- a/src/renderer/components/GitLabIssuePreviewTooltip.tsx
+++ /dev/null
@@ -1,196 +0,0 @@
-import React, { useEffect, useRef, useState } from 'react';
-import { motion } from 'motion/react';
-import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from './ui/tooltip';
-import { ExternalLink, User, Folder, Tag } from 'lucide-react';
-import gitlabLogoSvg from '../../assets/images/GitLab.svg?raw';
-import type { GitLabIssueSummary } from '../types/gitlab';
-import AgentLogo from './AgentLogo';
-
-type Props = {
-  issue: GitLabIssueSummary | null;
-  children: React.ReactElement;
-  side?: 'top' | 'right' | 'bottom' | 'left';
-};
-
-const StatusPill = ({ state }: { state?: string | null }) => {
-  if (!state) return null;
-
-  const getStatusColor = (s: string) => {
-    switch (s.toLowerCase()) {
-      case 'opened':
-        return 'bg-blue-100/70 text-blue-800 dark:bg-blue-500/10 dark:text-blue-200';
-      case 'closed':
-        return 'bg-emerald-100/70 text-emerald-800 dark:bg-emerald-500/10 dark:text-emerald-200';
-      default:
-        return 'bg-slate-100/70 text-slate-800 dark:bg-slate-500/10 dark:text-slate-200';
-    }
-  };
-
-  return (
-    <span
-      className={`inline-flex items-center gap-1 rounded-md border border-border px-2 py-0.5 text-[11px] ${getStatusColor(state)}`}
-    >
-      {state}
-    </span>
-  );
-};
-
-let activeTooltipForceClose: (() => void) | null = null;
-
-export const GitLabIssuePreviewTooltip: React.FC<Props> = ({ issue, children, side = 'top' }) => {
-  const [open, setOpen] = useState(false);
-  const closeTimer = useRef<ReturnType<typeof setTimeout> | null>(null);
-
-  const cancelClose = () => {
-    if (closeTimer.current !== null) {
-      clearTimeout(closeTimer.current);
-      closeTimer.current = null;
-    }
-  };
-
-  const latestClose = useRef<() => void>(() => {});
-  latestClose.current = () => {
-    cancelClose();
-    setOpen(false);
-  };
-
-  const stableForceClose = useRef<() => void>(() => latestClose.current());
-
-  const scheduleClose = () => {
-    cancelClose();
-    closeTimer.current = setTimeout(() => setOpen(false), 300);
-  };
-
-  const handleMouseEnter = () => {
-    cancelClose();
-    setOpen(true);
-  };
-
-  useEffect(() => {
-    const myForceClose = stableForceClose.current;
-    if (open) {
-      if (activeTooltipForceClose && activeTooltipForceClose !== myForceClose) {
-        activeTooltipForceClose();
-      }
-      activeTooltipForceClose = myForceClose;
-    } else {
-      if (activeTooltipForceClose === myForceClose) {
-        activeTooltipForceClose = null;
-      }
-    }
-    return () => {
-      if (activeTooltipForceClose === myForceClose) {
-        activeTooltipForceClose = null;
-      }
-    };
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [open]);
-
-  useEffect(() => {
-    return () => cancelClose();
-  }, []);
-
-  if (!issue) return children;
-
-  return (
-    <TooltipProvider delayDuration={150}>
-      <Tooltip
-        open={open}
-        onOpenChange={(next) => {
-          if (next) setOpen(true);
-        }}
-      >
-        <TooltipTrigger asChild onMouseEnter={handleMouseEnter} onMouseLeave={scheduleClose}>
-          {children}
-        </TooltipTrigger>
-        <TooltipContent
-          side={side}
-          align="start"
-          className="border-0 bg-transparent p-0 shadow-none"
-          style={{ zIndex: 10000 }}
-          onPointerDownOutside={(e) => e.preventDefault()}
-          onMouseEnter={cancelClose}
-          onMouseLeave={scheduleClose}
-        >
-          <motion.div
-            initial={{ opacity: 0, y: 4, scale: 0.98 }}
-            animate={{ opacity: 1, y: 0, scale: 1 }}
-            exit={{ opacity: 0, y: 4, scale: 0.98 }}
-            transition={{ duration: 0.16, ease: 'easeOut' }}
-            className="min-w-[260px] max-w-sm rounded-lg border border-border/70 bg-popover/95 p-3 shadow-xl backdrop-blur-sm"
-            onClick={(e) => e.stopPropagation()}
-          >
-            <div className="flex items-start justify-between gap-2">
-              <div className="flex items-center gap-2 text-xs font-medium text-muted-foreground">
-                <AgentLogo
-                  logo={gitlabLogoSvg}
-                  alt="GitLab"
-                  className="h-4 w-4 text-muted-foreground"
-                />
-                <span className="tracking-wide">GitLab Issue</span>
-                <span className="font-semibold text-muted-foreground/80">#{issue.iid}</span>
-              </div>
-              {issue.web_url && (
-                <a
-                  href={issue.web_url}
-                  target="_blank"
-                  rel="noopener noreferrer"
-                  className="inline-flex items-center gap-1 text-xs text-blue-600 hover:text-blue-700 dark:text-blue-400 dark:hover:text-blue-300"
-                  onClick={(e) => {
-                    e.stopPropagation();
-                    if (window.electronAPI?.openExternal && issue.web_url) {
-                      e.preventDefault();
-                      window.electronAPI.openExternal(issue.web_url);
-                    }
-                  }}
-                >
-                  <ExternalLink className="h-3 w-3" />
-                </a>
-              )}
-            </div>
-
-            <div className="mt-1 line-clamp-2 text-sm font-semibold text-foreground">
-              {issue.title || `Issue #${issue.iid}`}
-            </div>
-
-            {issue.description && (
-              <div className="mt-1.5 line-clamp-2 text-xs text-muted-foreground">
-                {issue.description}
-              </div>
-            )}
-
-            <div className="mt-2 flex flex-wrap items-center gap-2 text-xs text-muted-foreground">
-              <StatusPill state={issue.state} />
-
-              {issue.assignee?.name && (
-                <span className="inline-flex items-center gap-1">
-                  <User className="h-3 w-3" />
-                  <span>{issue.assignee.name}</span>
-                </span>
-              )}
-
-              {issue.project?.name && (
-                <span className="inline-flex items-center gap-1">
-                  <Folder className="h-3 w-3" />
-                  <span>{issue.project.name}</span>
-                </span>
-              )}
-
-              {issue.labels && issue.labels.length > 0 && (
-                <span className="inline-flex items-center gap-1">
-                  <Tag className="h-3 w-3" />
-                  <span>
-                    {issue.labels.slice(0, 2).join(', ')}
-                    {issue.labels.length > 2 && ` +${issue.labels.length - 2}`}
-                  </span>
-                </span>
-              )}
-            </div>
-          </motion.div>
-        </TooltipContent>
-      </Tooltip>
-    </TooltipProvider>
-  );
-};
-
-export default GitLabIssuePreviewTooltip;
diff --git a/src/renderer/components/GitLabIssueSelector.tsx b/src/renderer/components/GitLabIssueSelector.tsx
deleted file mode 100644
index e283b1b595..0000000000
--- a/src/renderer/components/GitLabIssueSelector.tsx
+++ /dev/null
@@ -1,301 +0,0 @@
-import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
-import { Input } from './ui/input';
-import { Select, SelectContent, SelectItem, SelectTrigger } from './ui/select';
-import { Search } from 'lucide-react';
-import gitlabLogoSvg from '../../assets/images/GitLab.svg?raw';
-import { type GitLabIssueSummary } from '../types/gitlab';
-import { Separator } from './ui/separator';
-import { Spinner } from './ui/spinner';
-import { GitLabIssuePreviewTooltip } from './GitLabIssuePreviewTooltip';
-import AgentLogo from './AgentLogo';
-
-interface GitLabIssueSelectorProps {
-  projectPath: string;
-  selectedIssue: GitLabIssueSummary | null;
-  onIssueChange: (issue: GitLabIssueSummary | null) => void;
-  isOpen?: boolean;
-  className?: string;
-  disabled?: boolean;
-  placeholder?: string;
-}
-
-export const GitLabIssueSelector: React.FC<GitLabIssueSelectorProps> = ({
-  projectPath,
-  selectedIssue,
-  onIssueChange,
-  isOpen = false,
-  className = '',
-  disabled = false,
-  placeholder: customPlaceholder,
-}) => {
-  const [availableIssues, setAvailableIssues] = useState<GitLabIssueSummary[]>([]);
-  const [isLoadingIssues, setIsLoadingIssues] = useState(false);
-  const [issueListError, setIssueListError] = useState<string | null>(null);
-  const [hasRequestedIssues, setHasRequestedIssues] = useState(false);
-  const [searchTerm, setSearchTerm] = useState('');
-  const [searchResults, setSearchResults] = useState<GitLabIssueSummary[]>([]);
-  const [isSearching, setIsSearching] = useState(false);
-  const isMountedRef = useRef(true);
-  const [visibleCount, setVisibleCount] = useState(10);
-
-  const canListGitlab =
-    typeof window !== 'undefined' && !!window.electronAPI?.gitlabInitialFetch && !!projectPath;
-  const issuesLoaded = availableIssues.length > 0;
-  const isDisabled = disabled || isLoadingIssues || !!issueListError || !issuesLoaded;
-
-  useEffect(() => () => void (isMountedRef.current = false), []);
-
-  useEffect(() => {
-    if (!isOpen) {
-      setAvailableIssues([]);
-      setHasRequestedIssues(false);
-      setIssueListError(null);
-      setIsLoadingIssues(false);
-      setSearchTerm('');
-      setSearchResults([]);
-      setIsSearching(false);
-      onIssueChange(null);
-      setVisibleCount(10);
-    }
-  }, [isOpen, onIssueChange]);
-
-  const loadIssues = useCallback(async () => {
-    if (!canListGitlab) return;
-    const api = window.electronAPI;
-    if (!api?.gitlabInitialFetch) {
-      setAvailableIssues([]);
-      setIssueListError('GitLab issue list unavailable in this build.');
-      setHasRequestedIssues(true);
-      return;
-    }
-    setIsLoadingIssues(true);
-    try {
-      const result = await api.gitlabInitialFetch(projectPath, 50);
-      if (!isMountedRef.current) return;
-      if (!result?.success) throw new Error(result?.error || 'Failed to load GitLab issues.');
-      setAvailableIssues(result.issues ?? []);
-      setIssueListError(null);
-    } catch (error) {
-      if (!isMountedRef.current) return;
-      setAvailableIssues([]);
-      setIssueListError(error instanceof Error ? error.message : 'Failed to load GitLab issues.');
-    } finally {
-      if (!isMountedRef.current) return;
-      setIsLoadingIssues(false);
-      setHasRequestedIssues(true);
-    }
-  }, [canListGitlab, projectPath]);
-
-  useEffect(() => {
-    if (!isOpen || !canListGitlab || isLoadingIssues || hasRequestedIssues) return;
-    loadIssues();
-  }, [isOpen, canListGitlab, isLoadingIssues, hasRequestedIssues, loadIssues]);
-
-  const searchIssues = useCallback(
-    async (term: string) => {
-      if (!term.trim()) {
-        setSearchResults([]);
-        setIsSearching(false);
-        return;
-      }
-      const api = window.electronAPI;
-      if (!api?.gitlabSearchIssues) return;
-      setIsSearching(true);
-      try {
-        const result = await api.gitlabSearchIssues(projectPath, term.trim(), 20);
-        if (!isMountedRef.current) return;
-        setSearchResults(result?.success ? (result.issues ?? []) : []);
-        if (result?.success) {
-          void (async () => {
-            const { captureTelemetry } = await import('../lib/telemetryClient');
-            captureTelemetry('gitlab_issues_searched');
-          })();
-        }
-      } catch {
-        if (isMountedRef.current) setSearchResults([]);
-      } finally {
-        if (isMountedRef.current) setIsSearching(false);
-      }
-    },
-    [projectPath]
-  );
-
-  useEffect(() => {
-    const t = setTimeout(() => void searchIssues(searchTerm), 300);
-    return () => clearTimeout(t);
-  }, [searchTerm, searchIssues]);
-
-  useEffect(() => {
-    setVisibleCount(10);
-  }, [searchTerm]);
-
-  const displayIssues = useMemo(() => {
-    return searchTerm.trim() ? searchResults : availableIssues;
-  }, [searchTerm, searchResults, availableIssues]);
-
-  const showIssues = useMemo(
-    () => displayIssues.slice(0, Math.max(10, visibleCount)),
-    [displayIssues, visibleCount]
-  );
-
-  const handleScroll = useCallback(
-    (e: React.UIEvent<HTMLDivElement>) => {
-      const el = e.currentTarget;
-      if (el.scrollTop + el.clientHeight >= el.scrollHeight - 16) {
-        setVisibleCount((prev) => Math.min(prev + 10, displayIssues.length));
-      }
-    },
-    [displayIssues.length]
-  );
-
-  const handleIssueSelect = (value: string) => {
-    if (value === '__clear__') {
-      onIssueChange(null);
-      return;
-    }
-    const iid = parseInt(value, 10);
-    const issue = displayIssues.find((i) => i.iid === iid) ?? null;
-    if (issue) {
-      void (async () => {
-        const { captureTelemetry } = await import('../lib/telemetryClient');
-        captureTelemetry('gitlab_issue_selected');
-      })();
-    }
-    onIssueChange(issue);
-  };
-
-  if (!canListGitlab) {
-    return (
-      <div className={className}>
-        <Input value="" placeholder="GitLab integration unavailable" disabled />
-        <p className="mt-2 text-xs text-muted-foreground">
-          Connect GitLab in Settings to browse issues.
-        </p>
-      </div>
-    );
-  }
-
-  const issuePlaceholder =
-    customPlaceholder ??
-    (isLoadingIssues
-      ? 'Loading…'
-      : issueListError
-        ? 'Connect your GitLab'
-        : 'Select a GitLab issue');
-
-  return (
-    <div className={`min-w-0 max-w-full overflow-hidden ${className}`} style={{ maxWidth: '100%' }}>
-      <Select
-        value={selectedIssue ? String(selectedIssue.iid) : '__clear__'}
-        onValueChange={handleIssueSelect}
-        disabled={isDisabled}
-      >
-        <SelectTrigger
-          className="h-9 w-full overflow-hidden border-none bg-muted"
-          style={{ maxWidth: '100%' }}
-        >
-          <div className="flex w-full items-center gap-2 overflow-hidden text-left text-foreground">
-            {selectedIssue ? (
-              <div className="flex min-w-0 flex-1 items-center gap-2 overflow-hidden">
-                <GitLabIssuePreviewTooltip issue={selectedIssue}>
-                  <span
-                    className="inline-flex items-center gap-1.5 rounded border border-border bg-muted px-1.5 py-0.5 dark:border-border dark:bg-card"
-                    onClick={(e) => e.stopPropagation()}
-                  >
-                    <AgentLogo
-                      logo={gitlabLogoSvg}
-                      alt="GitLab"
-                      className="h-3.5 w-3.5 text-foreground"
-                    />
-                    <span className="text-[11px] font-medium text-foreground">
-                      #{selectedIssue.iid}
-                    </span>
-                  </span>
-                </GitLabIssuePreviewTooltip>
-                {selectedIssue.title ? (
-                  <div className="flex min-w-0 flex-1 items-center gap-1 overflow-hidden">
-                    <span className="text-foreground">-</span>
-                    <span className="truncate text-muted-foreground">{selectedIssue.title}</span>
-                  </div>
-                ) : null}
-              </div>
-            ) : (
-              <>
-                <AgentLogo
-                  logo={gitlabLogoSvg}
-                  alt="GitLab"
-                  className="h-3.5 w-3.5 text-foreground"
-                />
-                {isLoadingIssues ? (
-                  <>
-                    <span className="truncate text-muted-foreground">Loading GitLab issues</span>
-                    <Spinner size="sm" />
-                  </>
-                ) : (
-                  <span className="truncate text-muted-foreground">{issuePlaceholder}</span>
-                )}
-              </>
-            )}
-          </div>
-        </SelectTrigger>
-        <SelectContent side="top" className="z-[120] w-full max-w-[480px]">
-          <div className="relative px-3 py-2">
-            <Search className="absolute left-3 top-1/2 z-10 h-4 w-4 -translate-y-1/2 text-muted-foreground" />
-            <Input
-              placeholder="Search by title or description..."
-              value={searchTerm}
-              onChange={(e) => setSearchTerm(e.target.value)}
-              disabled={disabled}
-              className="h-7 w-full border-none bg-transparent pl-9 pr-3 focus:outline-none focus:ring-0 focus:ring-offset-0 focus-visible:ring-0 focus-visible:ring-offset-0"
-            />
-          </div>
-          <Separator />
-          <div className="max-h-80 overflow-y-auto overflow-x-hidden py-1" onScroll={handleScroll}>
-            <SelectItem value="__clear__">
-              <span className="text-sm text-muted-foreground">None</span>
-            </SelectItem>
-            <Separator className="my-1" />
-            {showIssues.length > 0 ? (
-              showIssues.map((issue) => (
-                <GitLabIssuePreviewTooltip key={issue.id || issue.iid} issue={issue} side="left">
-                  <SelectItem value={String(issue.iid)}>
-                    <span className="flex min-w-0 items-center gap-2">
-                      <span className="inline-flex shrink-0 items-center gap-1.5 rounded border border-border bg-muted px-1.5 py-0.5 dark:border-border dark:bg-card">
-                        <AgentLogo
-                          logo={gitlabLogoSvg}
-                          alt="GitLab"
-                          className="h-3.5 w-3.5 text-foreground"
-                        />
-                        <span className="text-[11px] font-medium text-foreground">
-                          #{issue.iid}
-                        </span>
-                      </span>
-                      {issue.title ? (
-                        <span className="truncate text-foreground">{issue.title}</span>
-                      ) : null}
-                    </span>
-                  </SelectItem>
-                </GitLabIssuePreviewTooltip>
-              ))
-            ) : searchTerm.trim() ? (
-              <div className="px-3 py-2 text-sm text-muted-foreground">
-                {isSearching ? (
-                  <div className="flex items-center gap-2">
-                    <Spinner size="sm" />
-                    <span>Searching…</span>
-                  </div>
-                ) : (
-                  `No issues found for "${searchTerm}"`
-                )}
-              </div>
-            ) : (
-              <div className="px-3 py-2 text-sm text-muted-foreground">No issues available</div>
-            )}
-          </div>
-        </SelectContent>
-      </Select>
-    </div>
-  );
-};
-
-export default GitLabIssueSelector;
diff --git a/src/renderer/components/GithubConnectionCard.tsx b/src/renderer/components/GithubConnectionCard.tsx
deleted file mode 100644
index 4aeba8f2c5..0000000000
--- a/src/renderer/components/GithubConnectionCard.tsx
+++ /dev/null
@@ -1,219 +0,0 @@
-import React, { useCallback, useEffect, useMemo, useState } from 'react';
-import { Button } from './ui/button';
-import { Spinner } from './ui/spinner';
-import { RefreshCcw, LogOut, ExternalLink } from 'lucide-react';
-import { useGithubContext } from '../contexts/GithubContextProvider';
-
-type GithubConnectionStatus = 'connected' | 'disconnected' | 'missing';
-
-interface GithubConnectionCardProps {
-  onStatusChange?: (status: GithubConnectionStatus) => void;
-}
-
-const INSTALL_URL = 'https://cli.github.com/manual/installation';
-
-const GithubConnectionCard: React.FC<GithubConnectionCardProps> = ({ onStatusChange }) => {
-  const { installed, authenticated, user, isLoading, login, logout, checkStatus } =
-    useGithubContext();
-  const [message, setMessage] = useState<string | null>(null);
-  const [isError, setIsError] = useState<boolean>(false);
-  const [isInstalling, setIsInstalling] = useState(false);
-  const [cliInstalled, setCLIInstalled] = useState(true);
-
-  const status: GithubConnectionStatus = useMemo(() => {
-    if (!installed) {
-      return 'missing';
-    }
-    return authenticated ? 'connected' : 'disconnected';
-  }, [installed, authenticated]);
-
-  useEffect(() => {
-    onStatusChange?.(status);
-  }, [status, onStatusChange]);
-
-  useEffect(() => {
-    // Check if CLI is installed on mount
-    window.electronAPI.githubCheckCLIInstalled().then(setCLIInstalled);
-  }, []);
-
-  useEffect(() => {
-    if (status === 'connected') {
-      const handle = setTimeout(() => setMessage(null), 4000);
-      return () => clearTimeout(handle);
-    }
-    return undefined;
-  }, [status]);
-
-  const displayName = user?.name || user?.login || null;
-  const avatarUrl = (user as any)?.avatar_url as string | undefined;
-
-  const handleConnect = useCallback(async () => {
-    setMessage(null);
-    setIsError(false);
-
-    // Check if gh CLI is installed
-    const cliPresent = await window.electronAPI.githubCheckCLIInstalled();
-
-    if (!cliPresent) {
-      // Offer to install
-      setMessage('GitHub CLI not found. Installing...');
-      setIsInstalling(true);
-
-      const installResult = await window.electronAPI.githubInstallCLI();
-      setIsInstalling(false);
-
-      if (!installResult.success) {
-        setMessage(`Could not auto-install gh CLI: ${installResult.error || 'Unknown error'}`);
-        setIsError(true);
-        return;
-      }
-
-      setMessage('GitHub CLI installed successfully!');
-      setCLIInstalled(true);
-    }
-
-    // Proceed with OAuth authentication
-    try {
-      const result = await login(); // This now triggers OAuth flow
-      await checkStatus();
-      if (result?.success) {
-        setMessage('Successfully connected to GitHub!');
-        setIsError(false);
-      } else {
-        setMessage(result?.error || 'Authentication failed.');
-        setIsError(true);
-      }
-    } catch (error) {
-      console.error('GitHub authentication error:', error);
-      setMessage('Authentication failed.');
-      setIsError(true);
-    }
-  }, [login, checkStatus]);
-
-  const handleDisconnect = useCallback(async () => {
-    setMessage(null);
-    setIsError(false);
-
-    try {
-      await logout();
-      await checkStatus();
-      setMessage('Disconnected.');
-    } catch (error) {
-      console.error('GitHub logout error:', error);
-      setMessage('Failed to disconnect from GitHub.');
-      setIsError(true);
-    }
-  }, [logout, checkStatus]);
-
-  const handleRefresh = useCallback(async () => {
-    try {
-      await checkStatus();
-    } catch (error) {
-      console.error('GitHub status refresh failed:', error);
-    }
-  }, [checkStatus]);
-
-  const handleInstall = useCallback(async () => {
-    try {
-      await window.electronAPI.openExternal(INSTALL_URL);
-    } catch (error) {
-      console.error('Failed to open GitHub CLI install docs:', error);
-    }
-  }, []);
-
-  return (
-    <div id="settings-github-card" className="space-y-3">
-      {status === 'missing' ? (
-        <div className="space-y-3">
-          <div className="rounded-lg border border-dashed border-border bg-white p-3 dark:border-border dark:bg-background">
-            <p className="text-sm text-muted-foreground">
-              Install GitHub CLI (gh) to enable repo access.
-            </p>
-          </div>
-          <Button type="button" variant="outline" size="sm" onClick={handleInstall}>
-            <ExternalLink className="mr-2 h-4 w-4" /> Install GitHub CLI
-          </Button>
-        </div>
-      ) : status === 'connected' ? (
-        <div className="space-y-3">
-          <div className="flex items-center justify-between rounded-lg border border-border bg-white p-3 dark:border-border dark:bg-background">
-            <div className="flex items-center gap-2">
-              <span className="h-2 w-2 rounded-full bg-emerald-500" aria-hidden="true" />
-              {avatarUrl ? (
-                <img
-                  src={avatarUrl}
-                  alt="GitHub avatar"
-                  className="h-6 w-6 rounded-full object-cover"
-                  referrerPolicy="no-referrer"
-                />
-              ) : null}
-              <span className="text-sm font-medium text-foreground">
-                Connected{displayName ? ` as ${displayName}` : ''}
-              </span>
-            </div>
-            <div className="flex items-center gap-2">
-              <Button
-                type="button"
-                variant="outline"
-                size="icon"
-                onClick={handleRefresh}
-                disabled={isLoading}
-                aria-label="Refresh GitHub status"
-              >
-                <RefreshCcw className="h-3.5 w-3.5" />
-              </Button>
-              <Button
-                type="button"
-                variant="ghost"
-                size="sm"
-                onClick={handleDisconnect}
-                disabled={isLoading}
-              >
-                <LogOut className="mr-2 h-4 w-4" /> Sign out
-              </Button>
-            </div>
-          </div>
-          <p className="text-xs text-muted-foreground">
-            gh stays signed in to keep PR actions working.
-          </p>
-        </div>
-      ) : (
-        <div className="space-y-3">
-          <p className="text-sm text-muted-foreground">
-            Sign in to gh to enable cloning and PR actions.
-          </p>
-          <div className="flex flex-wrap gap-3">
-            <Button
-              type="button"
-              onClick={handleConnect}
-              disabled={isLoading}
-              aria-busy={isLoading}
-            >
-              {isLoading || isInstalling ? (
-                <>
-                  <Spinner size="sm" className="mr-2" />
-                  {isInstalling ? 'Installing CLI...' : 'Connecting…'}
-                </>
-              ) : (
-                'Sign in with GitHub'
-              )}
-            </Button>
-            <Button type="button" variant="outline" onClick={handleRefresh} disabled={isLoading}>
-              <RefreshCcw className="mr-2 h-4 w-4" /> Check status
-            </Button>
-          </div>
-        </div>
-      )}
-
-      {message ? (
-        <p
-          className={`text-sm ${isError ? 'text-red-600 dark:text-red-400' : 'text-muted-foreground'}`}
-        >
-          {message}
-        </p>
-      ) : null}
-    </div>
-  );
-};
-
-export default GithubConnectionCard;
diff --git a/src/renderer/components/GithubDeviceFlowModal.tsx b/src/renderer/components/GithubDeviceFlowModal.tsx
deleted file mode 100644
index f3239436e7..0000000000
--- a/src/renderer/components/GithubDeviceFlowModal.tsx
+++ /dev/null
@@ -1,405 +0,0 @@
-import React, { useState, useEffect, useRef } from 'react';
-import { DialogContent } from './ui/dialog';
-import { Button } from './ui/button';
-import { Spinner } from './ui/spinner';
-import { Check, Copy, ExternalLink, AlertCircle, X } from 'lucide-react';
-import { useToast } from '../hooks/use-toast';
-import emdashLogo from '../../assets/images/emdash/emdash_logo_white.svg';
-import type { BaseModalProps } from '@/contexts/ModalProvider';
-
-interface GithubDeviceFlowModalProps {
-  onClose: () => void;
-  onSuccess?: (user: any) => void;
-  onError?: (error: string) => void;
-}
-
-type GithubDeviceFlowOverlayExtraProps = {
-  onError?: (error: string) => void;
-};
-
-export function GithubDeviceFlowModalOverlay({
-  onSuccess,
-  onClose,
-  onError,
-}: GithubDeviceFlowOverlayExtraProps & BaseModalProps<unknown>) {
-  return (
-    <GithubDeviceFlowModal
-      onClose={onClose}
-      onSuccess={onSuccess}
-      onError={(error) => {
-        onError?.(error);
-        onClose();
-      }}
-    />
-  );
-}
-
-export function GithubDeviceFlowModal({ onClose, onSuccess, onError }: GithubDeviceFlowModalProps) {
-  const { toast } = useToast();
-
-  // Presentational state - updated via IPC events from main process
-  const [userCode, setUserCode] = useState<string>('');
-  const [verificationUri, setVerificationUri] = useState<string>('');
-  const [expiresIn, setExpiresIn] = useState<number>(900);
-  const [timeRemaining, setTimeRemaining] = useState<number>(900);
-  const [copied, setCopied] = useState(false);
-  const [success, setSuccess] = useState(false);
-  const [error, setError] = useState<string | null>(null);
-  const [user, setUser] = useState<any>(null);
-  const [browserOpening, setBrowserOpening] = useState(false);
-  const [browserOpenCountdown, setBrowserOpenCountdown] = useState(3);
-
-  const countdownIntervalRef = useRef<NodeJS.Timeout | null>(null);
-  const hasAutocopied = useRef(false);
-  const hasOpenedBrowser = useRef(false);
-
-  // Subscribe to auth events from main process
-  useEffect(() => {
-    // Device code received - display to user
-    const cleanupDeviceCode = window.electronAPI.onGithubAuthDeviceCode((data) => {
-      setUserCode(data.userCode);
-      setVerificationUri(data.verificationUri);
-      setExpiresIn(data.expiresIn);
-      setTimeRemaining(data.expiresIn);
-
-      // Auto-copy code
-      if (!hasAutocopied.current) {
-        hasAutocopied.current = true;
-        copyToClipboard(data.userCode, true);
-
-        // Show countdown and open browser after 3 seconds
-        setBrowserOpening(true);
-        let countdown = 3;
-        const countdownTimer = setInterval(() => {
-          countdown--;
-          setBrowserOpenCountdown(countdown);
-          if (countdown <= 0) {
-            clearInterval(countdownTimer);
-          }
-        }, 1000);
-
-        setTimeout(() => {
-          setBrowserOpening(false);
-          if (!hasOpenedBrowser.current) {
-            hasOpenedBrowser.current = true;
-            window.electronAPI.openExternal(data.verificationUri);
-          }
-        }, 3000);
-      }
-    });
-
-    // Auth successful
-    const cleanupSuccess = window.electronAPI.onGithubAuthSuccess((data) => {
-      setSuccess(true);
-      setUser(data.user);
-
-      toast({
-        title: 'Success!',
-        description: 'Connected to GitHub',
-      });
-
-      if (onSuccess) {
-        onSuccess(data.user);
-      }
-
-      // Auto-close after showing success animation
-      setTimeout(() => {
-        onClose();
-      }, 1000); // 1 second is enough to see success
-    });
-
-    // Auth error
-    const cleanupError = window.electronAPI.onGithubAuthError((data) => {
-      setError(data.message || data.error);
-
-      if (onError) {
-        onError(data.error);
-      }
-
-      toast({
-        title: 'Authentication Failed',
-        description: data.message || 'An error occurred',
-        variant: 'destructive',
-      });
-    });
-
-    // Cleanup listeners on unmount
-    return () => {
-      cleanupDeviceCode();
-      cleanupSuccess();
-      cleanupError();
-    };
-  }, [onSuccess, onError, onClose, toast]);
-
-  // Countdown timer for code expiration
-  useEffect(() => {
-    if (success || error) return;
-
-    countdownIntervalRef.current = setInterval(() => {
-      setTimeRemaining((prev) => {
-        if (prev <= 1) {
-          setError('Code expired. Please try again.');
-          return 0;
-        }
-        return prev - 1;
-      });
-    }, 1000);
-
-    return () => {
-      if (countdownIntervalRef.current) {
-        clearInterval(countdownIntervalRef.current);
-        countdownIntervalRef.current = null;
-      }
-    };
-  }, [success, error]);
-
-  // Reset state on mount (new auth flow)
-  useEffect(() => {
-    setSuccess(false);
-    setError(null);
-    setUser(null);
-    setCopied(false);
-    hasAutocopied.current = false;
-    hasOpenedBrowser.current = false;
-  }, []);
-
-  const copyToClipboard = async (code: string, isAutomatic = false) => {
-    try {
-      if (navigator.clipboard && navigator.clipboard.writeText) {
-        await navigator.clipboard.writeText(code);
-      } else {
-        // Fallback for older browsers
-        const textArea = document.createElement('textarea');
-        textArea.value = code;
-        textArea.style.position = 'fixed';
-        textArea.style.left = '-999999px';
-        document.body.appendChild(textArea);
-        textArea.select();
-        document.execCommand('copy');
-        document.body.removeChild(textArea);
-      }
-
-      setCopied(true);
-
-      if (!isAutomatic) {
-        toast({
-          title: '✓ Code copied',
-          description: 'Paste it in GitHub to authorize',
-        });
-      }
-
-      setTimeout(() => setCopied(false), 2000);
-    } catch (err) {
-      console.error('Failed to copy:', err);
-      if (!isAutomatic) {
-        toast({
-          title: 'Copy failed',
-          description: 'Please copy the code manually',
-          variant: 'destructive',
-        });
-      }
-    }
-  };
-
-  const openGitHub = () => {
-    if (verificationUri) {
-      window.electronAPI.openExternal(verificationUri);
-    }
-  };
-
-  const handleClose = () => {
-    // Cancel auth flow in main process (polling continues in background)
-    window.electronAPI.githubCancelAuth();
-    onClose();
-  };
-
-  const formatTime = (seconds: number) => {
-    const mins = Math.floor(seconds / 60);
-    const secs = seconds % 60;
-    return `${mins}:${secs.toString().padStart(2, '0')}`;
-  };
-
-  // Keyboard shortcuts (Escape is handled by DialogContent's onEscapeKeyDown)
-  useEffect(() => {
-    const handleKeyDown = (e: KeyboardEvent) => {
-      if ((e.metaKey || e.ctrlKey) && e.key === 'c') {
-        e.preventDefault();
-        copyToClipboard(userCode);
-      } else if (e.key === 'Enter') {
-        openGitHub();
-      } else if ((e.metaKey || e.ctrlKey) && e.key === 'r') {
-        e.preventDefault();
-        openGitHub();
-      }
-    };
-
-    window.addEventListener('keydown', handleKeyDown);
-    return () => window.removeEventListener('keydown', handleKeyDown);
-  }, [userCode]);
-
-  return (
-    <DialogContent
-      className="max-w-[480px] p-0"
-      onInteractOutside={() => handleClose()}
-      onEscapeKeyDown={() => handleClose()}
-    >
-      <button
-        onClick={handleClose}
-        className="absolute right-4 top-4 z-10 rounded-sm opacity-70 ring-offset-background transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:pointer-events-none data-[state=open]:bg-accent data-[state=open]:text-muted-foreground"
-      >
-        <X className="h-4 w-4" />
-        <span className="sr-only">Close</span>
-      </button>
-
-      <div className="flex flex-col items-center px-8 py-12">
-        <img src={emdashLogo} alt="Emdash" className="mb-8 h-8 opacity-90" />
-
-        {success ? (
-          // Success State
-          <div className="flex flex-col items-center space-y-6 duration-300 animate-in fade-in zoom-in">
-            <div className="flex h-16 w-16 items-center justify-center rounded-full bg-green-500 duration-500 animate-in zoom-in">
-              <Check className="h-8 w-8 text-white" strokeWidth={3} />
-            </div>
-            <div className="space-y-2 text-center">
-              <h2 className="text-2xl font-semibold">Success!</h2>
-              <p className="text-sm text-muted-foreground">You're connected to GitHub</p>
-              {user && (
-                <div className="mt-4 flex items-center justify-center gap-2">
-                  {user.avatar_url && (
-                    <img src={user.avatar_url} alt={user.name} className="h-10 w-10 rounded-full" />
-                  )}
-                  <div className="text-left">
-                    <p className="text-sm font-medium">{user.name || user.login}</p>
-                    <p className="text-xs text-muted-foreground">@{user.login}</p>
-                  </div>
-                </div>
-              )}
-            </div>
-          </div>
-        ) : error ? (
-          // Error State
-          <div className="flex w-full flex-col items-center space-y-6">
-            <div className="flex h-16 w-16 items-center justify-center rounded-full bg-red-500/20">
-              <AlertCircle className="h-8 w-8 text-red-500" />
-            </div>
-            <div className="space-y-2 text-center">
-              <h2 className="text-xl font-semibold">Authentication Failed</h2>
-              <p className="text-sm text-muted-foreground">{error}</p>
-            </div>
-            <Button onClick={handleClose} variant="outline" className="w-full">
-              Close
-            </Button>
-          </div>
-        ) : (
-          // Waiting State
-          <div className="flex w-full flex-col items-center space-y-6">
-            <div className="space-y-2 text-center">
-              <h2 className="text-2xl font-semibold">Connect to GitHub</h2>
-              <p className="text-sm text-muted-foreground">
-                Follow these steps to authorize Emdash
-              </p>
-            </div>
-
-            {userCode && (
-              <>
-                <div className="w-full space-y-3 rounded-lg bg-muted/30 p-6">
-                  <p className="text-center text-xs font-medium text-muted-foreground">Your code</p>
-                  <p className="select-all text-center font-mono text-4xl font-bold tracking-wider">
-                    {userCode}
-                  </p>
-                </div>
-
-                <Button
-                  onClick={() => copyToClipboard(userCode)}
-                  variant="outline"
-                  className="w-full"
-                  disabled={copied}
-                >
-                  {copied ? (
-                    <>
-                      <Check className="mr-2 h-4 w-4" />
-                      Copied!
-                    </>
-                  ) : (
-                    <>
-                      <Copy className="mr-2 h-4 w-4" />
-                      Copy Code
-                    </>
-                  )}
-                </Button>
-              </>
-            )}
-
-            <div className="w-full space-y-3 text-sm">
-              <div className="flex items-start gap-3">
-                <div className="flex h-6 w-6 flex-shrink-0 items-center justify-center rounded-full bg-primary/10 text-xs font-semibold">
-                  1
-                </div>
-                <p className="text-muted-foreground">
-                  Paste the code in GitHub{' '}
-                  <span className="font-medium text-foreground">(already copied!)</span>
-                </p>
-              </div>
-              <div className="flex items-start gap-3">
-                <div className="flex h-6 w-6 flex-shrink-0 items-center justify-center rounded-full bg-primary/10 text-xs font-semibold">
-                  2
-                </div>
-                <p className="text-muted-foreground">Click Authorize</p>
-              </div>
-            </div>
-
-            {browserOpening && (
-              <div className="w-full rounded-lg border border-blue-500/20 bg-blue-500/10 p-4">
-                <p className="text-center text-sm text-blue-600 dark:text-blue-400">
-                  Opening GitHub in {browserOpenCountdown}s...
-                </p>
-              </div>
-            )}
-
-            <div className="flex flex-col items-center gap-2 text-center">
-              <Spinner className="h-5 w-5 text-muted-foreground" />
-              <p className="text-sm text-muted-foreground">Waiting for authorization...</p>
-              {timeRemaining > 0 && (
-                <p className="text-xs text-muted-foreground">
-                  Code expires in {formatTime(timeRemaining)}
-                </p>
-              )}
-            </div>
-
-            {verificationUri && !browserOpening && (
-              <Button onClick={openGitHub} className="w-full" size="lg">
-                <ExternalLink className="mr-2 h-4 w-4" />
-                Open GitHub
-              </Button>
-            )}
-
-            <div className="w-full border-t pt-4">
-              <p className="text-center text-xs text-muted-foreground">
-                Having{' '}
-                <button
-                  onClick={() =>
-                    window.electronAPI.openExternal(
-                      'https://github.com/generalaction/emdash/issues'
-                    )
-                  }
-                  className="text-primary hover:underline focus:underline focus:outline-none"
-                >
-                  trouble
-                </button>
-                ?
-              </p>
-            </div>
-
-            <div className="space-x-3 text-center text-xs text-muted-foreground">
-              <span>⌘C to copy</span>
-              <span>•</span>
-              <span>⌘R to reopen</span>
-              <span>•</span>
-              <span>Esc to cancel</span>
-            </div>
-          </div>
-        )}
-      </div>
-    </DialogContent>
-  );
-}
diff --git a/src/renderer/components/GithubStatus.tsx b/src/renderer/components/GithubStatus.tsx
deleted file mode 100644
index 4ccf477133..0000000000
--- a/src/renderer/components/GithubStatus.tsx
+++ /dev/null
@@ -1,118 +0,0 @@
-import React from 'react';
-import { Download, Github } from 'lucide-react';
-import githubLogo from '../../assets/images/github.png';
-import { Button } from './ui/button';
-import { Spinner } from './ui/spinner';
-
-type GithubUser = { login?: string; name?: string; avatar_url?: string } | null;
-
-export function GithubStatus({
-  installed,
-  authenticated,
-  user,
-  className = '',
-  onConnect,
-  isLoading = false,
-  statusMessage,
-  isInitialized = false,
-}: {
-  installed?: boolean;
-  authenticated?: boolean;
-  user?: GithubUser;
-  className?: string;
-  onConnect?: () => void;
-  isLoading?: boolean;
-  statusMessage?: string;
-  isInitialized?: boolean;
-}) {
-  // Not initialized - don't show anything to avoid flash of incorrect state
-  if (!isInitialized) {
-    return null;
-  }
-
-  // Not installed - show install button
-  if (!installed) {
-    return (
-      <Button
-        onClick={onConnect}
-        disabled={isLoading}
-        variant="default"
-        size="sm"
-        className={`w-full min-w-0 items-center justify-start gap-2 overflow-hidden py-2 ${className}`}
-      >
-        {isLoading ? (
-          <>
-            <Spinner size="sm" className="flex-shrink-0" />
-            <span className="min-w-0 truncate text-xs font-medium">
-              {statusMessage || 'Installing GitHub CLI...'}
-            </span>
-          </>
-        ) : (
-          <>
-            <Download className="h-4 w-4 flex-shrink-0" />
-            <div className="flex min-w-0 flex-1 flex-col items-start gap-0.5">
-              <span className="w-full truncate text-xs font-medium leading-tight">
-                Connect GitHub
-              </span>
-              <span className="w-full truncate text-[10px] leading-tight opacity-80">
-                Install & sign in
-              </span>
-            </div>
-          </>
-        )}
-      </Button>
-    );
-  }
-
-  // Not authenticated - show sign in button
-  if (!authenticated) {
-    return (
-      <Button
-        onClick={onConnect}
-        disabled={isLoading}
-        variant="default"
-        size="sm"
-        className={`w-full min-w-0 items-center justify-start gap-2 overflow-hidden py-2 ${className}`}
-      >
-        {isLoading ? (
-          <>
-            <Spinner size="sm" className="flex-shrink-0" />
-            <span className="min-w-0 truncate text-xs font-medium">
-              {statusMessage || 'Connecting to GitHub...'}
-            </span>
-          </>
-        ) : (
-          <>
-            <Github className="h-4 w-4 flex-shrink-0" />
-            <div className="flex min-w-0 flex-1 flex-col items-start gap-0.5">
-              <span className="w-full truncate text-xs font-medium leading-tight">
-                Connect GitHub
-              </span>
-              <span className="w-full truncate text-[10px] leading-tight opacity-80">
-                Sign in with GitHub
-              </span>
-            </div>
-          </>
-        )}
-      </Button>
-    );
-  }
-
-  // Authenticated - show user info
-  const displayName = user?.login || user?.name || 'GitHub account';
-
-  return (
-    <div
-      className={`flex items-center gap-2 rounded-md px-2 py-1.5 text-xs text-muted-foreground ${className}`}
-    >
-      <img
-        src={githubLogo}
-        alt="GitHub"
-        className="h-5 w-5 rounded-sm object-contain dark:invert"
-      />
-      <span className="truncate font-medium">{displayName}</span>
-    </div>
-  );
-}
-
-export default GithubStatus;
diff --git a/src/renderer/components/HiddenToolsSettingsCard.tsx b/src/renderer/components/HiddenToolsSettingsCard.tsx
deleted file mode 100644
index 83ea76de9f..0000000000
--- a/src/renderer/components/HiddenToolsSettingsCard.tsx
+++ /dev/null
@@ -1,115 +0,0 @@
-import React, { useEffect, useMemo, useState } from 'react';
-import {
-  OPEN_IN_APPS,
-  getResolvedIconPath,
-  getResolvedLabel,
-  type OpenInAppId,
-  type PlatformKey,
-} from '@shared/openInApps';
-import IntegrationRow from './IntegrationRow';
-import { Switch } from './ui/switch';
-import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from './ui/tooltip';
-import { useAppSettings } from '@/contexts/AppSettingsProvider';
-
-export default function HiddenToolsSettingsCard() {
-  const { settings, updateSettings, isLoading, isSaving } = useAppSettings();
-  const [icons, setIcons] = useState<Partial<Record<OpenInAppId, string>>>({});
-  const [labels, setLabels] = useState<Partial<Record<OpenInAppId, string>>>({});
-  const [availability, setAvailability] = useState<Record<string, boolean>>({});
-
-  const hiddenApps: OpenInAppId[] = settings?.hiddenOpenInApps ?? [];
-
-  useEffect(() => {
-    const init = async () => {
-      let platform: PlatformKey = 'darwin';
-      try {
-        platform = ((await window.electronAPI?.getPlatform?.()) as PlatformKey) || 'darwin';
-      } catch {}
-
-      const loadedIcons: Partial<Record<OpenInAppId, string>> = {};
-      const loadedLabels: Partial<Record<OpenInAppId, string>> = {};
-      for (const app of OPEN_IN_APPS) {
-        const iconPath = getResolvedIconPath(app, platform);
-        loadedLabels[app.id] = getResolvedLabel(app, platform);
-        try {
-          loadedIcons[app.id] = new URL(`../../assets/images/${iconPath}`, import.meta.url).href;
-        } catch {}
-      }
-      setIcons(loadedIcons);
-      setLabels(loadedLabels);
-
-      try {
-        const appsResult = await window.electronAPI?.checkInstalledApps?.();
-        if (appsResult) setAvailability(appsResult);
-      } catch {}
-    };
-    void init();
-  }, []);
-
-  const toggle = (appId: OpenInAppId, visible: boolean) => {
-    const next = visible ? hiddenApps.filter((id) => id !== appId) : [...hiddenApps, appId];
-    updateSettings({ hiddenOpenInApps: next });
-    window.dispatchEvent(new Event('hiddenOpenInAppsChanged'));
-  };
-
-  // Sort: detected first, then alphabetically by label
-  const sortedApps = useMemo(() => {
-    return [...OPEN_IN_APPS].sort((a, b) => {
-      const aDetected = availability[a.id] ?? a.alwaysAvailable ?? false;
-      const bDetected = availability[b.id] ?? b.alwaysAvailable ?? false;
-      if (aDetected && !bDetected) return -1;
-      if (!aDetected && bDetected) return 1;
-      return (labels[a.id] ?? a.label).localeCompare(labels[b.id] ?? b.label);
-    });
-  }, [availability, labels]);
-
-  return (
-    <div className="rounded-xl border border-border/60 bg-muted/10 p-2">
-      <div className="space-y-2">
-        {sortedApps.map((app) => {
-          const isDetected = availability[app.id] ?? app.alwaysAvailable ?? false;
-          const isVisible = !hiddenApps.includes(app.id);
-          const label = labels[app.id] ?? app.label;
-          const icon = icons[app.id];
-          const indicatorClass = isDetected ? 'bg-emerald-500' : 'bg-muted-foreground/50';
-          const statusLabel = isDetected ? 'Detected' : 'Not detected';
-
-          return (
-            <IntegrationRow
-              key={app.id}
-              logoSrc={icon}
-              name={label}
-              status={isDetected ? 'connected' : 'missing'}
-              showStatusPill={false}
-              middle={
-                <span className="flex items-center gap-2 text-sm text-muted-foreground">
-                  <span className={`h-1.5 w-1.5 rounded-full ${indicatorClass}`} />
-                  {statusLabel}
-                </span>
-              }
-              rightExtra={
-                <TooltipProvider delayDuration={150}>
-                  <Tooltip>
-                    <TooltipTrigger asChild>
-                      <span>
-                        <Switch
-                          checked={isVisible}
-                          disabled={isLoading || isSaving}
-                          onCheckedChange={(checked) => toggle(app.id, checked)}
-                          aria-label={`${isVisible ? 'Hide' : 'Show'} ${label} in open menu`}
-                        />
-                      </span>
-                    </TooltipTrigger>
-                    <TooltipContent side="top" className="text-xs">
-                      {isVisible ? 'Hide from menu' : 'Show in menu'}
-                    </TooltipContent>
-                  </Tooltip>
-                </TooltipProvider>
-              }
-            />
-          );
-        })}
-      </div>
-    </div>
-  );
-}
diff --git a/src/renderer/components/HomeView.tsx b/src/renderer/components/HomeView.tsx
deleted file mode 100644
index 82fdd55059..0000000000
--- a/src/renderer/components/HomeView.tsx
+++ /dev/null
@@ -1,120 +0,0 @@
-import { motion } from 'framer-motion';
-import { FolderOpen, Github, Plus, Server } from 'lucide-react';
-import React from 'react';
-import emdashLogo from '../../assets/images/emdash/emdash_logo.svg';
-import emdashLogoWhite from '../../assets/images/emdash/emdash_logo_white.svg';
-import { useTheme } from '../hooks/useTheme';
-
-interface HomeViewProps {
-  onOpenProject: () => void;
-  onNewProjectClick: () => void;
-  onCloneProjectClick: () => void;
-  onAddRemoteProject: () => void;
-}
-
-const HomeView: React.FC<HomeViewProps> = ({
-  onOpenProject,
-  onNewProjectClick,
-  onCloneProjectClick,
-  onAddRemoteProject,
-}) => {
-  const { effectiveTheme } = useTheme();
-
-  return (
-    <div className="flex h-full flex-col overflow-y-auto bg-background text-foreground">
-      <div className="container mx-auto flex min-h-full max-w-3xl flex-1 flex-col justify-center px-8 py-8">
-        <div className="mb-3 text-center">
-          <div className="mb-3 flex items-center justify-center">
-            <div className="logo-shimmer-container">
-              <img
-                key={effectiveTheme}
-                src={
-                  effectiveTheme === 'dark' || effectiveTheme === 'dark-black'
-                    ? emdashLogoWhite
-                    : emdashLogo
-                }
-                alt="Emdash"
-                className="logo-shimmer-image"
-              />
-              <span
-                className="logo-shimmer-overlay"
-                aria-hidden="true"
-                style={{
-                  WebkitMaskImage: `url(${effectiveTheme === 'dark' || effectiveTheme === 'dark-black' ? emdashLogoWhite : emdashLogo})`,
-                  maskImage: `url(${effectiveTheme === 'dark' || effectiveTheme === 'dark-black' ? emdashLogoWhite : emdashLogo})`,
-                  WebkitMaskRepeat: 'no-repeat',
-                  maskRepeat: 'no-repeat',
-                  WebkitMaskSize: 'contain',
-                  maskSize: 'contain',
-                  WebkitMaskPosition: 'center',
-                  maskPosition: 'center',
-                }}
-              />
-            </div>
-          </div>
-          <p className="whitespace-nowrap text-xs text-muted-foreground">
-            Agentic Development Environment
-          </p>
-        </div>
-
-        <div className="grid grid-cols-1 gap-4 sm:grid-cols-4 sm:gap-2">
-          <motion.button
-            whileTap={{ scale: 0.97 }}
-            transition={{ duration: 0.1, ease: 'easeInOut' }}
-            onClick={() => {
-              void (async () => {
-                const { captureTelemetry } = await import('../lib/telemetryClient');
-                captureTelemetry('project_open_clicked');
-              })();
-              onOpenProject();
-            }}
-            className="group flex flex-col items-start justify-between rounded-lg border border-border bg-muted/20 p-4 text-card-foreground shadow-sm transition-all hover:bg-muted/40 hover:shadow-md focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2"
-          >
-            <FolderOpen className="mb-5 h-5 w-5 text-foreground opacity-70" />
-            <div className="w-full min-w-0 text-left">
-              <h3 className="truncate text-xs font-semibold">Open project</h3>
-            </div>
-          </motion.button>
-
-          <motion.button
-            whileTap={{ scale: 0.97 }}
-            transition={{ duration: 0.1, ease: 'easeInOut' }}
-            onClick={onNewProjectClick}
-            className="group flex flex-col items-start justify-between rounded-lg border border-border bg-muted/20 p-4 text-card-foreground shadow-sm transition-all hover:bg-muted/40 hover:shadow-md focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2"
-          >
-            <Plus className="mb-5 h-5 w-5 text-foreground opacity-70" />
-            <div className="w-full min-w-0 text-left">
-              <h3 className="truncate text-xs font-semibold">Create New Project</h3>
-            </div>
-          </motion.button>
-
-          <motion.button
-            whileTap={{ scale: 0.97 }}
-            transition={{ duration: 0.1, ease: 'easeInOut' }}
-            onClick={onCloneProjectClick}
-            className="group flex flex-col items-start justify-between rounded-lg border border-border bg-muted/20 p-4 text-card-foreground shadow-sm transition-all hover:bg-muted/40 hover:shadow-md focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2"
-          >
-            <Github className="mb-5 h-5 w-5 text-foreground opacity-70" />
-            <div className="w-full min-w-0 text-left">
-              <h3 className="truncate text-xs font-semibold">Clone from GitHub</h3>
-            </div>
-          </motion.button>
-
-          <motion.button
-            whileTap={{ scale: 0.97 }}
-            transition={{ duration: 0.1, ease: 'easeInOut' }}
-            onClick={onAddRemoteProject}
-            className="group flex flex-col items-start justify-between rounded-lg border border-border bg-muted/20 p-4 text-card-foreground shadow-sm transition-all hover:bg-muted/40 hover:shadow-md focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2"
-          >
-            <Server className="mb-5 h-5 w-5 text-foreground opacity-70" />
-            <div className="w-full min-w-0 text-left">
-              <h3 className="truncate text-xs font-semibold">Add Remote Project</h3>
-            </div>
-          </motion.button>
-        </div>
-      </div>
-    </div>
-  );
-};
-
-export default HomeView;
diff --git a/src/renderer/components/InstallBanner.tsx b/src/renderer/components/InstallBanner.tsx
deleted file mode 100644
index 02775de158..0000000000
--- a/src/renderer/components/InstallBanner.tsx
+++ /dev/null
@@ -1,161 +0,0 @@
-import React, { useEffect, useRef, useState } from 'react';
-import { ArrowUpRight, Check, Copy, Play } from 'lucide-react';
-import { Button } from './ui/button';
-import { agentMeta, type UiAgent } from '../providers/meta';
-import { getDocUrlForProvider, getInstallCommandForProvider } from '@shared/providers/registry';
-
-type Props = {
-  agent: UiAgent;
-  onOpenExternal: (url: string) => void;
-  installCommand?: string | null;
-  terminalId?: string;
-  onRunInstall?: (command: string) => void;
-  mode?: 'missing' | 'start_failed';
-  details?: string | null;
-};
-
-export const InstallBanner: React.FC<Props> = ({
-  agent,
-  onOpenExternal,
-  installCommand,
-  terminalId,
-  onRunInstall,
-  mode = 'missing',
-  details,
-}) => {
-  const meta = agentMeta[agent];
-  const helpUrl = getDocUrlForProvider(agent) ?? null;
-  const baseLabel = meta?.label || 'this agent';
-
-  const command =
-    installCommand === undefined ? getInstallCommandForProvider(agent) : installCommand;
-  const canRunInstall = Boolean(command && (onRunInstall || terminalId));
-  const [copied, setCopied] = useState(false);
-  const copyResetRef = useRef<number | null>(null);
-
-  const handleRunInstall = () => {
-    if (!command) return;
-    if (onRunInstall) {
-      onRunInstall(command);
-      return;
-    }
-    if (!terminalId) return;
-    try {
-      window.electronAPI?.ptyInput?.({ id: terminalId, data: `${command}\n` });
-    } catch (error) {
-      console.error('Failed to run install command', error);
-    }
-  };
-
-  const handleCopy = async () => {
-    if (!command) return;
-    if (typeof navigator === 'undefined' || !navigator.clipboard?.writeText) return;
-    try {
-      await navigator.clipboard.writeText(command);
-      setCopied(true);
-      if (copyResetRef.current) {
-        window.clearTimeout(copyResetRef.current);
-      }
-      copyResetRef.current = window.setTimeout(() => {
-        setCopied(false);
-        copyResetRef.current = null;
-      }, 1800);
-    } catch (error) {
-      console.error('Failed to copy install command', error);
-      setCopied(false);
-    }
-  };
-
-  useEffect(() => {
-    return () => {
-      if (copyResetRef.current) {
-        window.clearTimeout(copyResetRef.current);
-        copyResetRef.current = null;
-      }
-    };
-  }, []);
-
-  const showInstall = mode === 'missing';
-  const showDetails = mode === 'start_failed' && Boolean(details?.trim());
-  const isPtyDisabledOrUnavailable =
-    mode === 'start_failed' &&
-    (details?.includes('EMDASH_DISABLE_PTY=1') ||
-      details?.toLowerCase().includes('pty unavailable'));
-
-  return (
-    <div className="rounded-md border border-border bg-muted p-3 text-sm text-foreground dark:border-border dark:bg-background dark:text-foreground">
-      <div className="space-y-2">
-        <div className="text-foreground" aria-label={`${baseLabel} status`}>
-          <span className="font-normal">
-            {helpUrl ? (
-              <button
-                type="button"
-                onClick={() => onOpenExternal(helpUrl)}
-                className="inline-flex items-center gap-1 text-foreground hover:text-foreground/80"
-              >
-                {baseLabel}
-                <ArrowUpRight className="h-3.5 w-3.5" aria-hidden="true" />
-              </button>
-            ) : (
-              baseLabel
-            )}{' '}
-            {mode === 'start_failed' ? 'couldn’t start.' : 'isn’t installed.'}
-          </span>{' '}
-          {showInstall ? (
-            <span className="font-normal text-foreground">Run this in the terminal to use it:</span>
-          ) : null}
-        </div>
-
-        {showDetails ? (
-          <div className="text-foreground">
-            <span className="font-medium">Error:</span> {details}
-            {isPtyDisabledOrUnavailable ? (
-              <div className="mt-1 text-muted-foreground">
-                Embedded terminals are disabled/unavailable. Unset `EMDASH_DISABLE_PTY` (or set it
-                to `0`) and ensure the PTY native module is installed.
-              </div>
-            ) : null}
-          </div>
-        ) : null}
-
-        {showInstall && command ? (
-          <div className="flex flex-wrap items-center gap-1.5">
-            <code className="inline-flex h-7 items-center rounded bg-muted px-2 font-mono text-xs leading-none">
-              {command}
-            </code>
-            <Button
-              variant="ghost"
-              size="icon-sm"
-              onClick={handleCopy}
-              className="text-muted-foreground"
-              aria-label="Copy install command"
-              title={copied ? 'Copied' : 'Copy command'}
-            >
-              {copied ? (
-                <Check className="h-3.5 w-3.5" aria-hidden="true" />
-              ) : (
-                <Copy className="h-3.5 w-3.5" aria-hidden="true" />
-              )}
-            </Button>
-            {canRunInstall ? (
-              <Button
-                variant="ghost"
-                size="icon-sm"
-                onClick={handleRunInstall}
-                className="text-muted-foreground"
-                aria-label="Run in terminal"
-                title="Run in terminal"
-              >
-                <Play className="h-3.5 w-3.5" aria-hidden="true" />
-              </Button>
-            ) : null}
-          </div>
-        ) : showInstall ? (
-          <div className="text-foreground">Install the CLI to use it.</div>
-        ) : null}
-      </div>
-    </div>
-  );
-};
-
-export default InstallBanner;
diff --git a/src/renderer/components/IntegrationsCard.tsx b/src/renderer/components/IntegrationsCard.tsx
deleted file mode 100644
index 55339b68e1..0000000000
--- a/src/renderer/components/IntegrationsCard.tsx
+++ /dev/null
@@ -1,577 +0,0 @@
-import React, { useCallback, useEffect, useState } from 'react';
-import { Check, Plus, Loader2 } from 'lucide-react';
-import { useGithubContext } from '../contexts/GithubContextProvider';
-import { useTheme } from '../hooks/useTheme';
-import githubSvg from '../../assets/images/Github.svg?raw';
-import jiraSvg from '../../assets/images/Jira.svg?raw';
-import linearSvg from '../../assets/images/Linear.svg?raw';
-import gitlabSvg from '../../assets/images/GitLab.svg?raw';
-import { Button } from './ui/button';
-import { Input } from './ui/input';
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle,
-} from './ui/dialog';
-import { Separator } from './ui/separator';
-import JiraSetupForm from './integrations/JiraSetupForm';
-import { useModalContext } from '../contexts/ModalProvider';
-import GitLabSetupForm from './integrations/GitLabSetupForm';
-import { GithubDeviceFlowModal } from './GithubDeviceFlowModal';
-
-/** Light mode: original SVG colors. Dark / dark-black: primary colour. */
-const SvgLogo = ({ raw }: { raw: string }) => {
-  const { effectiveTheme } = useTheme();
-  const isDark = effectiveTheme === 'dark' || effectiveTheme === 'dark-black';
-
-  const processed = isDark
-    ? raw
-        .replace(/\bfill="[^"]*"/g, 'fill="currentColor"')
-        .replace(/\bstroke="[^"]*"/g, 'stroke="currentColor"')
-    : raw;
-
-  return (
-    <span
-      className={`inline-flex h-8 w-8 items-center justify-center [&_svg]:h-full [&_svg]:w-full [&_svg]:shrink-0 ${isDark ? 'text-primary' : ''}`}
-      dangerouslySetInnerHTML={{ __html: processed }}
-    />
-  );
-};
-
-const IntegrationsCard: React.FC = () => {
-  const { installed, authenticated, isLoading, login, logout, checkStatus } = useGithubContext();
-  const { showModal, closeModal } = useModalContext();
-
-  // Connection states
-  const [linearConnected, setLinearConnected] = useState(false);
-  const [jiraConnected, setJiraConnected] = useState(false);
-  const [gitlabConnected, setGitlabConnected] = useState(false);
-
-  // Modal state: which integration setup is open
-  const [integrationSetupModal, setIntegrationSetupModal] = useState<
-    null | 'linear' | 'jira' | 'gitlab'
-  >(null);
-  const [showGithubModal, setShowGithubModal] = useState(false);
-
-  // Linear state
-  const [linearInput, setLinearInput] = useState('');
-  const [linearLoading, setLinearLoading] = useState(false);
-
-  // Jira state
-  const [jiraSite, setJiraSite] = useState('');
-  const [jiraEmail, setJiraEmail] = useState('');
-  const [jiraToken, setJiraToken] = useState('');
-  const [jiraLoading, setJiraLoading] = useState(false);
-
-  // GitLab state
-  const [gitlabInstanceUrl, setGitlabInstanceUrl] = useState('');
-  const [gitlabToken, setGitlabToken] = useState('');
-  const [gitlabLoading, setGitlabLoading] = useState(false);
-
-  // Error states
-  const [githubError, setGithubError] = useState<string | null>(null);
-  const [linearError, setLinearError] = useState<string | null>(null);
-  const [jiraError, setJiraError] = useState<string | null>(null);
-  const [gitlabError, setGitlabError] = useState<string | null>(null);
-  // Check connection statuses on mount
-  useEffect(() => {
-    const checkLinear = async () => {
-      try {
-        const result = await window.electronAPI.linearCheckConnection?.();
-        setLinearConnected(!!result?.connected);
-      } catch {
-        setLinearConnected(false);
-      }
-    };
-
-    const checkJira = async () => {
-      try {
-        const result = await window.electronAPI.jiraCheckConnection?.();
-        setJiraConnected(!!result?.connected);
-      } catch {
-        setJiraConnected(false);
-      }
-    };
-
-    const checkGitlab = async () => {
-      try {
-        const result = await window.electronAPI.gitlabCheckConnection?.();
-        setGitlabConnected(!!result?.success);
-      } catch {
-        setGitlabConnected(false);
-      }
-    };
-
-    void checkLinear();
-    void checkJira();
-    void checkGitlab();
-  }, []);
-
-  // GitHub handlers
-  const handleGithubConnect = useCallback(async () => {
-    setGithubError(null);
-    try {
-      if (!installed) {
-        // Auto-install gh CLI
-        const installResult = await window.electronAPI.githubInstallCLI();
-        if (!installResult.success) {
-          setGithubError(
-            `Could not auto-install gh CLI: ${installResult.error || 'Unknown error'}`
-          );
-          return;
-        }
-        await checkStatus();
-      }
-
-      showModal('githubDeviceFlowModal', {
-        onSuccess: async () => {
-          let attempts = 0;
-          const maxAttempts = 15;
-          while (attempts < maxAttempts) {
-            await new Promise((resolve) => setTimeout(resolve, 200));
-            const status = await checkStatus();
-            if (status?.authenticated) break;
-            attempts++;
-          }
-        },
-        onError: (error) => setGithubError(error),
-      });
-      const result = await login();
-
-      if (!result?.success) {
-        setGithubError(result?.error || 'Could not connect.');
-        closeModal();
-      }
-    } catch (error) {
-      console.error('GitHub connect failed:', error);
-      setGithubError('Could not connect.');
-      closeModal();
-    }
-  }, [checkStatus, login, installed, showModal, closeModal]);
-
-  const handleGithubDisconnect = useCallback(async () => {
-    setGithubError(null);
-    try {
-      await logout();
-      await checkStatus();
-    } catch (error) {
-      console.error('GitHub logout failed:', error);
-      setGithubError('Could not disconnect.');
-    }
-  }, [logout, checkStatus]);
-
-  // Linear handlers
-  const handleLinearConnect = useCallback(async () => {
-    const token = linearInput.trim();
-    if (!token) return;
-
-    setLinearLoading(true);
-    setLinearError(null);
-
-    try {
-      const result = await window.electronAPI.linearSaveToken?.(token);
-      if (result?.success) {
-        setLinearConnected(true);
-        setLinearInput('');
-        setIntegrationSetupModal(null);
-      } else {
-        setLinearError(result?.error || 'Could not connect. Try again.');
-      }
-    } catch (error) {
-      console.error('Linear connect failed:', error);
-      setLinearError('Could not connect. Try again.');
-    } finally {
-      setLinearLoading(false);
-    }
-  }, [linearInput]);
-
-  const handleLinearDisconnect = useCallback(async () => {
-    try {
-      const result = await window.electronAPI.linearClearToken?.();
-      if (result?.success) {
-        setLinearConnected(false);
-        setLinearInput('');
-      }
-    } catch (error) {
-      console.error('Linear disconnect failed:', error);
-    }
-  }, []);
-
-  // Jira handlers
-  const handleJiraSubmit = useCallback(async () => {
-    setJiraError(null);
-    setJiraLoading(true);
-    try {
-      const api: any = window.electronAPI;
-      const res = await api?.jiraSaveCredentials?.({
-        siteUrl: jiraSite.trim(),
-        email: jiraEmail.trim(),
-        token: jiraToken.trim(),
-      });
-      if (res?.success) {
-        setJiraConnected(true);
-        setJiraSite('');
-        setJiraEmail('');
-        setJiraToken('');
-        setIntegrationSetupModal(null);
-      } else {
-        setJiraError(res?.error || 'Failed to connect.');
-      }
-    } catch (e: any) {
-      setJiraError(e?.message || 'Failed to connect.');
-    } finally {
-      setJiraLoading(false);
-    }
-  }, [jiraSite, jiraEmail, jiraToken]);
-
-  const handleJiraDisconnect = useCallback(async () => {
-    try {
-      const api: any = window.electronAPI;
-      const result = await api?.jiraClearCredentials?.();
-      if (result?.success) {
-        setJiraConnected(false);
-        setJiraSite('');
-        setJiraEmail('');
-        setJiraToken('');
-        setIntegrationSetupModal(null);
-      }
-    } catch (error) {
-      console.error('Jira disconnect failed:', error);
-    }
-  }, []);
-
-  // GitLab handlers
-  const handleGitlabSubmit = useCallback(async () => {
-    setGitlabError(null);
-    setGitlabLoading(true);
-    try {
-      const res = await window.electronAPI.gitlabSaveCredentials?.({
-        instanceUrl: gitlabInstanceUrl.trim(),
-        token: gitlabToken.trim(),
-      });
-      if (res?.success) {
-        setGitlabConnected(true);
-        setGitlabInstanceUrl('');
-        setGitlabToken('');
-        setIntegrationSetupModal(null);
-      } else {
-        setGitlabError(res?.error || 'Failed to connect.');
-      }
-    } catch (e: any) {
-      setGitlabError(e?.message || 'Failed to connect.');
-    } finally {
-      setGitlabLoading(false);
-    }
-  }, [gitlabInstanceUrl, gitlabToken]);
-
-  const handleGitlabDisconnect = useCallback(async () => {
-    try {
-      const result = await window.electronAPI.gitlabClearCredentials?.();
-      if (result?.success) {
-        setGitlabConnected(false);
-        setGitlabInstanceUrl('');
-        setGitlabToken('');
-        setIntegrationSetupModal(null);
-      }
-    } catch (error) {
-      console.error('GitLab disconnect failed:', error);
-    }
-  }, []);
-
-  const integrations = [
-    {
-      id: 'github',
-      name: 'GitHub',
-      description: 'Connect your repositories',
-      logoSvg: githubSvg,
-      connected: authenticated,
-      loading: isLoading,
-      onConnect: handleGithubConnect,
-      onDisconnect: handleGithubDisconnect,
-    },
-    {
-      id: 'linear',
-      name: 'Linear',
-      description: 'Work on Linear tickets',
-      logoSvg: linearSvg,
-      connected: linearConnected,
-      loading: linearLoading,
-      onConnect: () => {
-        setLinearError(null);
-        setIntegrationSetupModal('linear');
-      },
-      onDisconnect: handleLinearDisconnect,
-    },
-    {
-      id: 'jira',
-      name: 'Jira',
-      description: 'Work on Jira tickets',
-      logoSvg: jiraSvg,
-      connected: jiraConnected,
-      loading: jiraLoading,
-      onConnect: () => {
-        setJiraError(null);
-        setIntegrationSetupModal('jira');
-      },
-      onDisconnect: handleJiraDisconnect,
-    },
-    {
-      id: 'gitlab',
-      name: 'GitLab',
-      description: 'Work on GitLab issues',
-      logoSvg: gitlabSvg,
-      connected: gitlabConnected,
-      loading: gitlabLoading,
-      onConnect: () => {
-        setGitlabError(null);
-        setIntegrationSetupModal('gitlab');
-      },
-      onDisconnect: handleGitlabDisconnect,
-    },
-  ];
-
-  return (
-    <>
-      <div
-        className="grid gap-3"
-        style={{ gridTemplateColumns: 'repeat(auto-fit, minmax(280px, 1fr))' }}
-      >
-        {integrations.map((integration) => (
-          <div key={integration.id} className="flex h-full min-h-0">
-            <div className="flex w-full items-center gap-4 rounded-lg border border-muted bg-muted/20 p-4">
-              <div className="flex h-12 w-12 flex-shrink-0 items-center justify-center rounded-lg bg-muted/50">
-                <SvgLogo raw={integration.logoSvg} />
-              </div>
-              <div className="flex flex-1 flex-col gap-0.5">
-                <h3 className="text-sm font-medium text-foreground">{integration.name}</h3>
-                <p className="text-sm text-muted-foreground">{integration.description}</p>
-              </div>
-              {integration.connected ? (
-                <Button
-                  type="button"
-                  variant="outline"
-                  size="icon"
-                  className="h-8 w-8 flex-shrink-0"
-                  onClick={integration.onDisconnect}
-                  aria-label={`Disconnect ${integration.name}`}
-                >
-                  <Check className="h-4 w-4 text-emerald-600 dark:text-emerald-400" />
-                </Button>
-              ) : (
-                <Button
-                  type="button"
-                  variant="outline"
-                  size="icon"
-                  className="h-8 w-8 flex-shrink-0"
-                  onClick={integration.onConnect}
-                  disabled={integration.loading}
-                  aria-label={`Connect ${integration.name}`}
-                >
-                  {integration.loading ? (
-                    <Loader2 className="h-4 w-4 animate-spin" />
-                  ) : (
-                    <Plus className="h-4 w-4" />
-                  )}
-                </Button>
-              )}
-            </div>
-          </div>
-        ))}
-      </div>
-
-      {/* GitHub error (shown inline since GitHub has no modal) */}
-      {githubError && (
-        <p className="text-xs text-destructive" role="alert">
-          GitHub: {githubError}
-        </p>
-      )}
-
-      {/* Integration setup modal */}
-      <Dialog
-        open={integrationSetupModal !== null}
-        onOpenChange={(open) => {
-          if (!open) {
-            setIntegrationSetupModal(null);
-            setLinearError(null);
-            setJiraError(null);
-            setGitlabError(null);
-          }
-        }}
-      >
-        <DialogContent className="max-w-md">
-          {integrationSetupModal === 'linear' && (
-            <>
-              <DialogHeader>
-                <DialogTitle>Connect Linear</DialogTitle>
-                <DialogDescription className="text-xs">
-                  Enter your Linear API key to connect your workspace.
-                </DialogDescription>
-              </DialogHeader>
-              <Separator />
-              <div className="space-y-4">
-                <Input
-                  type="password"
-                  value={linearInput}
-                  onChange={(e) => setLinearInput(e.target.value)}
-                  onKeyDown={(e) => {
-                    if (e.key === 'Enter' && linearInput.trim() && !linearLoading) {
-                      void handleLinearConnect();
-                    }
-                  }}
-                  placeholder="Enter Linear API key"
-                  className="h-9"
-                  disabled={linearLoading}
-                  autoFocus
-                />
-                {linearError && (
-                  <p className="text-xs text-destructive" role="alert">
-                    {linearError}
-                  </p>
-                )}
-              </div>
-              <DialogFooter>
-                <Button
-                  type="button"
-                  variant="outline"
-                  size="sm"
-                  onClick={() => {
-                    setIntegrationSetupModal(null);
-                    setLinearError(null);
-                  }}
-                >
-                  Cancel
-                </Button>
-                <Button
-                  type="button"
-                  size="sm"
-                  onClick={() => void handleLinearConnect()}
-                  disabled={!linearInput.trim() || linearLoading}
-                >
-                  {linearLoading && <Loader2 className="mr-2 h-4 w-4 animate-spin" />}
-                  Connect
-                </Button>
-              </DialogFooter>
-            </>
-          )}
-
-          {integrationSetupModal === 'jira' && (
-            <>
-              <DialogHeader>
-                <DialogTitle>Connect Jira</DialogTitle>
-                <DialogDescription className="text-xs">
-                  Enter your Jira site URL, email, and API token to connect.
-                </DialogDescription>
-              </DialogHeader>
-              <Separator />
-              <div className="space-y-4">
-                <JiraSetupForm
-                  site={jiraSite}
-                  email={jiraEmail}
-                  token={jiraToken}
-                  onChange={(u) => {
-                    if (typeof u.site === 'string') setJiraSite(u.site);
-                    if (typeof u.email === 'string') setJiraEmail(u.email);
-                    if (typeof u.token === 'string') setJiraToken(u.token);
-                  }}
-                  onClose={() => {
-                    setIntegrationSetupModal(null);
-                    setJiraError(null);
-                  }}
-                  canSubmit={!!(jiraSite.trim() && jiraEmail.trim() && jiraToken.trim())}
-                  error={jiraError}
-                  onSubmit={handleJiraSubmit}
-                  hideHeader
-                  hideFooter
-                />
-              </div>
-              <DialogFooter>
-                <Button
-                  type="button"
-                  variant="outline"
-                  size="sm"
-                  onClick={() => {
-                    setIntegrationSetupModal(null);
-                    setJiraError(null);
-                  }}
-                >
-                  Cancel
-                </Button>
-                <Button
-                  type="button"
-                  size="sm"
-                  onClick={() => void handleJiraSubmit()}
-                  disabled={
-                    !(jiraSite.trim() && jiraEmail.trim() && jiraToken.trim()) || jiraLoading
-                  }
-                >
-                  {jiraLoading && <Loader2 className="mr-2 h-4 w-4 animate-spin" />}
-                  Connect
-                </Button>
-              </DialogFooter>
-            </>
-          )}
-
-          {integrationSetupModal === 'gitlab' && (
-            <>
-              <DialogHeader>
-                <DialogTitle>Connect GitLab</DialogTitle>
-                <DialogDescription className="text-xs">
-                  Enter your GitLab instance URL and a personal access token to connect.
-                </DialogDescription>
-              </DialogHeader>
-              <Separator />
-              <div className="space-y-4">
-                <GitLabSetupForm
-                  instanceUrl={gitlabInstanceUrl}
-                  token={gitlabToken}
-                  onChange={(u) => {
-                    if (typeof u.instanceUrl === 'string') setGitlabInstanceUrl(u.instanceUrl);
-                    if (typeof u.token === 'string') setGitlabToken(u.token);
-                  }}
-                  onClose={() => {
-                    setIntegrationSetupModal(null);
-                    setGitlabError(null);
-                  }}
-                  canSubmit={!!(gitlabInstanceUrl.trim() && gitlabToken.trim())}
-                  error={gitlabError}
-                  onSubmit={handleGitlabSubmit}
-                  hideHeader
-                  hideFooter
-                />
-              </div>
-              <DialogFooter>
-                <Button
-                  type="button"
-                  variant="outline"
-                  size="sm"
-                  onClick={() => {
-                    setIntegrationSetupModal(null);
-                    setGitlabError(null);
-                  }}
-                >
-                  Cancel
-                </Button>
-                <Button
-                  type="button"
-                  size="sm"
-                  onClick={() => void handleGitlabSubmit()}
-                  disabled={!(gitlabInstanceUrl.trim() && gitlabToken.trim()) || gitlabLoading}
-                >
-                  {gitlabLoading && <Loader2 className="mr-2 h-4 w-4 animate-spin" />}
-                  Connect
-                </Button>
-              </DialogFooter>
-            </>
-          )}
-        </DialogContent>
-      </Dialog>
-
-      {/* GitHub Device Flow Modal */}
-    </>
-  );
-};
-
-export default IntegrationsCard;
diff --git a/src/renderer/components/JiraIssuePreviewTooltip.tsx b/src/renderer/components/JiraIssuePreviewTooltip.tsx
deleted file mode 100644
index 512bf5d80a..0000000000
--- a/src/renderer/components/JiraIssuePreviewTooltip.tsx
+++ /dev/null
@@ -1,195 +0,0 @@
-import React, { useEffect, useRef, useState } from 'react';
-import { motion } from 'motion/react';
-import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from './ui/tooltip';
-import { ExternalLink, User, Folder } from 'lucide-react';
-import jiraLogo from '../../assets/images/jira.png';
-import type { JiraIssueSummary } from '../types/jira';
-
-type Props = {
-  issue: JiraIssueSummary | null;
-  children: React.ReactElement;
-  side?: 'top' | 'right' | 'bottom' | 'left';
-};
-
-const StatusPill = ({ status }: { status?: { name?: string | null } | null }) => {
-  if (!status?.name) return null;
-
-  const getStatusColor = (name: string) => {
-    const lowerName = name.toLowerCase();
-    if (
-      lowerName.includes('done') ||
-      lowerName.includes('closed') ||
-      lowerName.includes('resolved')
-    ) {
-      return 'bg-emerald-100/70 text-emerald-800 dark:bg-emerald-500/10 dark:text-emerald-200';
-    }
-    if (lowerName.includes('progress') || lowerName.includes('review')) {
-      return 'bg-blue-100/70 text-blue-800 dark:bg-blue-500/10 dark:text-blue-200';
-    }
-    if (lowerName.includes('blocked') || lowerName.includes('cancelled')) {
-      return 'bg-rose-100/70 text-rose-800 dark:bg-rose-500/10 dark:text-rose-200';
-    }
-    return 'bg-slate-100/70 text-slate-800 dark:bg-slate-500/10 dark:text-slate-200';
-  };
-
-  return (
-    <span
-      className={`inline-flex items-center gap-1 rounded-md border border-border px-2 py-0.5 text-[11px] ${getStatusColor(status.name)}`}
-    >
-      {status.name}
-    </span>
-  );
-};
-
-// Module-level singleton: only one tooltip may be open at a time.
-// Stores the force-close function of the currently open tooltip instance.
-let activeTooltipForceClose: (() => void) | null = null;
-
-export const JiraIssuePreviewTooltip: React.FC<Props> = ({ issue, children, side = 'top' }) => {
-  const [open, setOpen] = useState(false);
-  const closeTimer = useRef<ReturnType<typeof setTimeout> | null>(null);
-
-  const cancelClose = () => {
-    if (closeTimer.current !== null) {
-      clearTimeout(closeTimer.current);
-      closeTimer.current = null;
-    }
-  };
-
-  const latestClose = useRef<() => void>(() => {});
-  latestClose.current = () => {
-    cancelClose();
-    setOpen(false);
-  };
-
-  const stableForceClose = useRef<() => void>(() => latestClose.current());
-
-  const scheduleClose = () => {
-    cancelClose();
-    closeTimer.current = setTimeout(() => setOpen(false), 300);
-  };
-
-  const handleMouseEnter = () => {
-    cancelClose();
-    setOpen(true);
-  };
-
-  // Whenever this tooltip becomes visible (via ANY path — mouse enter, Radix's
-  // internal onOpenChange, etc.) register it in the global singleton and
-  // immediately force-close whichever other instance was previously open.
-  useEffect(() => {
-    const myForceClose = stableForceClose.current;
-    if (open) {
-      if (activeTooltipForceClose && activeTooltipForceClose !== myForceClose) {
-        activeTooltipForceClose(); // close the other tooltip immediately
-      }
-      activeTooltipForceClose = myForceClose;
-    } else {
-      if (activeTooltipForceClose === myForceClose) {
-        activeTooltipForceClose = null;
-      }
-    }
-    // Cleanup on unmount.
-    return () => {
-      if (activeTooltipForceClose === myForceClose) {
-        activeTooltipForceClose = null;
-      }
-    };
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [open]);
-
-  // Clean up pending close timer on unmount.
-  useEffect(() => {
-    return () => cancelClose();
-  }, []);
-
-  if (!issue) return children;
-
-  return (
-    <TooltipProvider delayDuration={150}>
-      <Tooltip
-        open={open}
-        onOpenChange={(next) => {
-          if (next) setOpen(true); /* closing handled by scheduleClose */
-        }}
-      >
-        <TooltipTrigger asChild onMouseEnter={handleMouseEnter} onMouseLeave={scheduleClose}>
-          {children}
-        </TooltipTrigger>
-        <TooltipContent
-          side={side}
-          align="start"
-          className="border-0 bg-transparent p-0 shadow-none"
-          style={{ zIndex: 10000 }}
-          onPointerDownOutside={(e) => e.preventDefault()}
-          onMouseEnter={cancelClose}
-          onMouseLeave={scheduleClose}
-        >
-          <motion.div
-            initial={{ opacity: 0, y: 4, scale: 0.98 }}
-            animate={{ opacity: 1, y: 0, scale: 1 }}
-            exit={{ opacity: 0, y: 4, scale: 0.98 }}
-            transition={{ duration: 0.16, ease: 'easeOut' }}
-            className="min-w-[260px] max-w-sm rounded-lg border border-border/70 bg-popover/95 p-3 shadow-xl backdrop-blur-sm"
-            onClick={(e) => e.stopPropagation()}
-          >
-            <div className="flex items-start justify-between gap-2">
-              <div className="flex items-center gap-2 text-xs font-medium text-muted-foreground">
-                <img src={jiraLogo} alt="Jira" className="h-4 w-4" />
-                <span className="tracking-wide">Jira Issue</span>
-                <span className="font-semibold text-muted-foreground/80">{issue.key}</span>
-              </div>
-              {issue.url && (
-                <a
-                  href={issue.url}
-                  target="_blank"
-                  rel="noopener noreferrer"
-                  className="inline-flex items-center gap-1 text-xs text-blue-600 hover:text-blue-700 dark:text-blue-400 dark:hover:text-blue-300"
-                  onClick={(e) => {
-                    e.stopPropagation();
-                    if (window.electronAPI?.openExternal && issue.url) {
-                      e.preventDefault();
-                      window.electronAPI.openExternal(issue.url);
-                    }
-                  }}
-                >
-                  <ExternalLink className="h-3 w-3" />
-                </a>
-              )}
-            </div>
-
-            <div className="mt-1 line-clamp-2 text-sm font-semibold text-foreground">
-              {issue.summary || `Issue ${issue.key}`}
-            </div>
-
-            {issue.description && (
-              <div className="mt-1.5 line-clamp-2 text-xs text-muted-foreground">
-                {issue.description}
-              </div>
-            )}
-
-            <div className="mt-2 flex flex-wrap items-center gap-2 text-xs text-muted-foreground">
-              <StatusPill status={issue.status} />
-
-              {issue.assignee?.displayName && (
-                <span className="inline-flex items-center gap-1">
-                  <User className="h-3 w-3" />
-                  <span>{issue.assignee.displayName}</span>
-                </span>
-              )}
-
-              {issue.project?.name && (
-                <span className="inline-flex items-center gap-1">
-                  <Folder className="h-3 w-3" />
-                  <span>{issue.project.name}</span>
-                </span>
-              )}
-            </div>
-          </motion.div>
-        </TooltipContent>
-      </Tooltip>
-    </TooltipProvider>
-  );
-};
-
-export default JiraIssuePreviewTooltip;
diff --git a/src/renderer/components/JiraIssueSelector.tsx b/src/renderer/components/JiraIssueSelector.tsx
deleted file mode 100644
index 21086f70b0..0000000000
--- a/src/renderer/components/JiraIssueSelector.tsx
+++ /dev/null
@@ -1,289 +0,0 @@
-import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
-import { Input } from './ui/input';
-import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from './ui/select';
-import { Search } from 'lucide-react';
-import jiraLogo from '../../assets/images/jira.png';
-import { type JiraIssueSummary } from '../types/jira';
-import { Separator } from './ui/separator';
-import { Spinner } from './ui/spinner';
-import { JiraIssuePreviewTooltip } from './JiraIssuePreviewTooltip';
-
-interface Props {
-  selectedIssue: JiraIssueSummary | null;
-  onIssueChange: (issue: JiraIssueSummary | null) => void;
-  isOpen?: boolean;
-  className?: string;
-  disabled?: boolean;
-  placeholder?: string;
-}
-
-const JiraIssueSelector: React.FC<Props> = ({
-  selectedIssue,
-  onIssueChange,
-  isOpen = false,
-  className = '',
-  disabled = false,
-  placeholder: customPlaceholder,
-}) => {
-  const [availableIssues, setAvailableIssues] = useState<JiraIssueSummary[]>([]);
-  const [isLoadingIssues, setIsLoadingIssues] = useState(false);
-  const [issueListError, setIssueListError] = useState<string | null>(null);
-  const [hasRequestedIssues, setHasRequestedIssues] = useState(false);
-  const [searchTerm, setSearchTerm] = useState('');
-  const [searchResults, setSearchResults] = useState<JiraIssueSummary[]>([]);
-  const [isSearching, setIsSearching] = useState(false);
-  const isMountedRef = useRef(true);
-  const [visibleCount, setVisibleCount] = useState(10);
-
-  const canList = typeof window !== 'undefined' && !!window.electronAPI?.jiraInitialFetch;
-  const issuesLoaded = availableIssues.length > 0;
-  const [isConnected, setIsConnected] = useState<boolean | null>(null);
-  // Only disable when explicitly disabled, or when not connected and we can't load
-  const isDisabled =
-    disabled ||
-    (isConnected === false ? isLoadingIssues || !!issueListError || !issuesLoaded : false);
-
-  useEffect(() => () => void (isMountedRef.current = false), []);
-
-  useEffect(() => {
-    if (!isOpen) {
-      setAvailableIssues([]);
-      setHasRequestedIssues(false);
-      setIssueListError(null);
-      setIsLoadingIssues(false);
-      setSearchTerm('');
-      setSearchResults([]);
-      setIsSearching(false);
-      onIssueChange(null);
-      setVisibleCount(10);
-    }
-  }, [isOpen, onIssueChange]);
-
-  // Check connection so we can show better guidance when listing fails
-  useEffect(() => {
-    let cancel = false;
-    (async () => {
-      try {
-        const api: any = (window as any).electronAPI;
-        const res = await api?.jiraCheckConnection?.();
-        if (!cancel) setIsConnected(!!res?.connected);
-      } catch {
-        if (!cancel) setIsConnected(null);
-      }
-    })();
-    return () => {
-      cancel = true;
-    };
-  }, []);
-
-  const loadIssues = useCallback(async () => {
-    if (!canList) return;
-    const api = window.electronAPI;
-    if (!api?.jiraInitialFetch) {
-      setAvailableIssues([]);
-      setIssueListError('Jira issue list unavailable in this build.');
-      setHasRequestedIssues(true);
-      return;
-    }
-    setIsLoadingIssues(true);
-    try {
-      const result = await api.jiraInitialFetch(50);
-      if (!isMountedRef.current) return;
-      if (!result?.success) throw new Error(result?.error || 'Failed to load Jira issues.');
-      setAvailableIssues(result.issues ?? []);
-      setIssueListError(null);
-    } catch (error) {
-      if (!isMountedRef.current) return;
-      setAvailableIssues([]);
-      setIssueListError(error instanceof Error ? error.message : 'Failed to load Jira issues.');
-    } finally {
-      if (!isMountedRef.current) return;
-      setIsLoadingIssues(false);
-      setHasRequestedIssues(true);
-    }
-  }, [canList]);
-
-  useEffect(() => {
-    if (!isOpen || !canList || isLoadingIssues || hasRequestedIssues) return;
-    loadIssues();
-  }, [isOpen, canList, isLoadingIssues, hasRequestedIssues, loadIssues]);
-
-  const searchIssues = useCallback(async (term: string) => {
-    if (!term.trim()) {
-      setSearchResults([]);
-      setIsSearching(false);
-      return;
-    }
-    const api = window.electronAPI;
-    if (!api?.jiraSearchIssues) return;
-    setIsSearching(true);
-    try {
-      const result = await api.jiraSearchIssues(term.trim(), 20);
-      if (!isMountedRef.current) return;
-      setSearchResults(result?.success ? (result.issues ?? []) : []);
-      if (result?.success) {
-        // Track search
-        void (async () => {
-          const { captureTelemetry } = await import('../lib/telemetryClient');
-          captureTelemetry('jira_issues_searched');
-        })();
-      }
-    } catch {
-      if (isMountedRef.current) setSearchResults([]);
-    } finally {
-      if (isMountedRef.current) setIsSearching(false);
-    }
-  }, []);
-
-  useEffect(() => {
-    const t = setTimeout(() => void searchIssues(searchTerm), 250);
-    return () => clearTimeout(t);
-  }, [searchTerm, searchIssues]);
-
-  const showIssues = useMemo(() => {
-    const source = searchTerm.trim() ? searchResults : availableIssues;
-    return source.slice(0, visibleCount);
-  }, [availableIssues, searchResults, searchTerm, visibleCount]);
-
-  const handleScroll = (e: React.UIEvent<HTMLDivElement>) => {
-    const el = e.currentTarget;
-    if (el.scrollTop + el.clientHeight >= el.scrollHeight - 16) {
-      setVisibleCount((c) =>
-        Math.min(c + 10, (searchTerm.trim() ? searchResults : availableIssues).length)
-      );
-    }
-  };
-
-  const handleIssueSelect = (key: string) => {
-    if (key === '__clear__') {
-      onIssueChange(null);
-      return;
-    }
-    const all = searchTerm.trim() ? searchResults : availableIssues;
-    const issue = all.find((i) => i.key === key) || null;
-    if (issue) {
-      void (async () => {
-        const { captureTelemetry } = await import('../lib/telemetryClient');
-        captureTelemetry('jira_issue_selected');
-      })();
-    }
-    onIssueChange(issue);
-  };
-
-  if (!canList) {
-    return (
-      <div className={className}>
-        <Input value="" placeholder="Jira integration unavailable" disabled />
-        <p className="mt-2 text-xs text-muted-foreground">
-          Connect Jira in Settings to browse issues.
-        </p>
-      </div>
-    );
-  }
-
-  const issuePlaceholder =
-    customPlaceholder ??
-    (isLoadingIssues ? 'Loading…' : issueListError ? 'Connect your Jira' : 'Select a Jira issue');
-
-  return (
-    <div className={`min-w-0 max-w-full overflow-hidden ${className}`} style={{ maxWidth: '100%' }}>
-      <Select
-        value={selectedIssue?.key || '__clear__'}
-        onValueChange={handleIssueSelect}
-        disabled={isDisabled}
-      >
-        <SelectTrigger
-          className="h-9 w-full overflow-hidden border-none bg-muted"
-          style={{ maxWidth: '100%' }}
-        >
-          <div className="flex w-full items-center gap-2 overflow-hidden text-left text-foreground">
-            {selectedIssue ? (
-              <div className="flex min-w-0 flex-1 items-center gap-2 overflow-hidden">
-                <JiraIssuePreviewTooltip issue={selectedIssue}>
-                  <span
-                    className="inline-flex items-center gap-1.5 rounded border border-border bg-muted px-1.5 py-0.5 dark:border-border dark:bg-card"
-                    onClick={(e) => e.stopPropagation()}
-                  >
-                    <img src={jiraLogo} alt="Jira" className="h-3.5 w-3.5" />
-                    <span className="text-[11px] font-medium text-foreground">
-                      {selectedIssue.key}
-                    </span>
-                  </span>
-                </JiraIssuePreviewTooltip>
-                {selectedIssue.summary ? (
-                  <div className="flex min-w-0 flex-1 items-center gap-1 overflow-hidden">
-                    <span className="text-foreground">-</span>
-                    <span className="truncate text-muted-foreground">{selectedIssue.summary}</span>
-                  </div>
-                ) : null}
-              </div>
-            ) : (
-              <>
-                <img src={jiraLogo} alt="Jira" className="h-3.5 w-3.5" />
-                {isLoadingIssues ? (
-                  <>
-                    <span className="truncate text-muted-foreground">Loading Jira issues</span>
-                    <Spinner size="sm" />
-                  </>
-                ) : (
-                  <span className="truncate text-muted-foreground">{issuePlaceholder}</span>
-                )}
-              </>
-            )}
-          </div>
-        </SelectTrigger>
-        <SelectContent side="top" className="z-[120] w-full max-w-[480px]">
-          <div className="relative px-3 py-2">
-            <Search className="absolute left-3 top-1/2 z-10 h-4 w-4 -translate-y-1/2 text-muted-foreground" />
-            <Input
-              placeholder="Search by key"
-              value={searchTerm}
-              onChange={(e) => setSearchTerm(e.target.value)}
-              disabled={disabled}
-              className="h-7 w-full border-none bg-transparent pl-9 pr-3 focus:outline-none focus:ring-0 focus:ring-offset-0 focus-visible:ring-0 focus-visible:ring-offset-0"
-            />
-          </div>
-          <Separator />
-          <div className="max-h-80 overflow-y-auto overflow-x-hidden py-1" onScroll={handleScroll}>
-            <SelectItem value="__clear__">
-              <span className="text-sm text-muted-foreground">None</span>
-            </SelectItem>
-            <Separator className="my-1" />
-            {showIssues.length > 0 ? (
-              showIssues.map((issue) => (
-                <JiraIssuePreviewTooltip key={issue.id || issue.key} issue={issue} side="left">
-                  <SelectItem value={issue.key}>
-                    <span className="flex min-w-0 items-center gap-2">
-                      <span className="inline-flex shrink-0 items-center gap-1.5 rounded border border-border bg-muted px-1.5 py-0.5 dark:border-border dark:bg-card">
-                        <img src={jiraLogo} alt="Jira" className="h-3.5 w-3.5" />
-                        <span className="text-[11px] font-medium text-foreground">{issue.key}</span>
-                      </span>
-                      {issue.summary ? (
-                        <span className="truncate text-foreground">{issue.summary}</span>
-                      ) : null}
-                    </span>
-                  </SelectItem>
-                </JiraIssuePreviewTooltip>
-              ))
-            ) : searchTerm.trim() ? (
-              <div className="px-3 py-2 text-sm text-muted-foreground">
-                {isSearching ? (
-                  <div className="flex items-center gap-2">
-                    <Spinner size="sm" />
-                    <span>Searching…</span>
-                  </div>
-                ) : (
-                  `No issues found for "${searchTerm}"`
-                )}
-              </div>
-            ) : (
-              <div className="px-3 py-2 text-sm text-muted-foreground">No issues available</div>
-            )}
-          </div>
-        </SelectContent>
-      </Select>
-    </div>
-  );
-};
-
-export default JiraIssueSelector;
diff --git a/src/renderer/components/KeyboardSettingsCard.tsx b/src/renderer/components/KeyboardSettingsCard.tsx
deleted file mode 100644
index 00b63d00f3..0000000000
--- a/src/renderer/components/KeyboardSettingsCard.tsx
+++ /dev/null
@@ -1,354 +0,0 @@
-import React, { useState, useCallback, useRef, useMemo, useEffect } from 'react';
-import { ArrowBigUp, Command, RotateCcw } from 'lucide-react';
-import { Button } from './ui/button';
-import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from './ui/tooltip';
-import { toast } from '../hooks/use-toast';
-import {
-  APP_SHORTCUTS,
-  hasShortcutConflict,
-  normalizeShortcutKey,
-  type AppShortcut,
-  type ShortcutSettingsKey,
-} from '../hooks/useKeyboardShortcuts';
-import type { ShortcutModifier } from '../types/shortcuts';
-import { useAppSettings } from '@/contexts/AppSettingsProvider';
-
-interface ShortcutBinding {
-  key: string;
-  modifier: ShortcutModifier;
-}
-
-// Get configurable shortcuts (filter out hidden ones)
-const CONFIGURABLE_SHORTCUTS = Object.entries(APP_SHORTCUTS)
-  .filter(([, shortcut]) => !shortcut.hideFromSettings && shortcut.modifier)
-  .map(([id, shortcut]) => ({ id, ...shortcut }));
-
-function findConflictingShortcut(
-  settingsKey: ShortcutSettingsKey,
-  binding: ShortcutBinding,
-  allBindings: Record<ShortcutSettingsKey, ShortcutBinding>
-): (AppShortcut & { id: string }) | null {
-  const candidate = { key: binding.key, modifier: binding.modifier, description: '' };
-
-  for (const shortcut of CONFIGURABLE_SHORTCUTS) {
-    if (shortcut.settingsKey === settingsKey) continue;
-
-    const existing = allBindings[shortcut.settingsKey];
-    if (!existing) continue;
-
-    const existingConfig = { key: existing.key, modifier: existing.modifier, description: '' };
-    if (hasShortcutConflict(candidate, existingConfig)) {
-      return shortcut;
-    }
-  }
-
-  return null;
-}
-
-const formatModifier = (modifier: ShortcutModifier | undefined): string => {
-  switch (modifier) {
-    case 'cmd':
-      return '⌘';
-    case 'cmd+shift':
-      return '⌘⇧';
-    case 'ctrl':
-      return 'Ctrl';
-    case 'ctrl+shift':
-      return 'Ctrl⇧';
-    case 'alt':
-    case 'option':
-      return '⌥';
-    case 'shift':
-      return '⇧';
-    default:
-      return '';
-  }
-};
-
-const formatDisplayKey = (value: string): string => {
-  const key = normalizeShortcutKey(value);
-  if (key === 'ArrowLeft') return '←';
-  if (key === 'ArrowRight') return '→';
-  if (key === 'ArrowUp') return '↑';
-  if (key === 'ArrowDown') return '↓';
-  if (key === 'Escape') return 'Esc';
-  if (key === 'Tab') return 'Tab';
-  return key.toUpperCase();
-};
-
-const ShortcutDisplay: React.FC<{ binding: ShortcutBinding }> = ({ binding }) => {
-  const displayKey = formatDisplayKey(binding.key);
-
-  const kbdBase = 'flex h-6 min-w-6 items-center justify-center rounded bg-muted px-1.5 text-xs';
-
-  // Split compound modifiers into separate kbd elements
-  const modifierElements: React.ReactNode[] = [];
-  if (binding.modifier === 'cmd+shift') {
-    modifierElements.push(
-      <kbd key="cmd" className={kbdBase}>
-        <Command className="h-3 w-3" />
-      </kbd>
-    );
-    modifierElements.push(
-      <kbd key="shift" className={kbdBase}>
-        <ArrowBigUp className="h-3 w-3" />
-      </kbd>
-    );
-  } else if (binding.modifier === 'ctrl+shift') {
-    modifierElements.push(
-      <kbd key="ctrl" className={`${kbdBase} font-mono`}>
-        Ctrl
-      </kbd>
-    );
-    modifierElements.push(
-      <kbd key="shift" className={kbdBase}>
-        <ArrowBigUp className="h-3 w-3" />
-      </kbd>
-    );
-  } else if (binding.modifier === 'cmd') {
-    modifierElements.push(
-      <kbd key="cmd" className={kbdBase}>
-        <Command className="h-3 w-3" />
-      </kbd>
-    );
-  } else if (binding.modifier === 'shift') {
-    modifierElements.push(
-      <kbd key="shift" className={kbdBase}>
-        <ArrowBigUp className="h-3 w-3" />
-      </kbd>
-    );
-  } else if (binding.modifier) {
-    modifierElements.push(
-      <kbd key="mod" className={`${kbdBase} font-mono`}>
-        {formatModifier(binding.modifier)}
-      </kbd>
-    );
-  }
-
-  return (
-    <span className="flex items-center gap-1">
-      {modifierElements}
-      <kbd className={`${kbdBase} font-mono`}>{displayKey}</kbd>
-    </span>
-  );
-};
-
-const KeyboardSettingsCard: React.FC = () => {
-  const { settings, updateSettings, isLoading: loading, isSaving: saving } = useAppSettings();
-  const [error, setError] = useState<string | null>(null);
-  const [capturingKey, setCapturingKey] = useState<ShortcutSettingsKey | null>(null);
-  const captureRef = useRef<HTMLButtonElement>(null);
-
-  const bindings = useMemo<Record<ShortcutSettingsKey, ShortcutBinding>>(() => {
-    const keyboard = settings?.keyboard;
-    const result: Record<string, ShortcutBinding> = {};
-    for (const shortcut of CONFIGURABLE_SHORTCUTS) {
-      const saved = keyboard?.[shortcut.settingsKey as keyof typeof keyboard];
-      result[shortcut.settingsKey] = saved ?? { key: shortcut.key, modifier: shortcut.modifier! };
-    }
-    return result as Record<ShortcutSettingsKey, ShortcutBinding>;
-  }, [settings?.keyboard]);
-
-  const saveBinding = useCallback(
-    (settingsKey: ShortcutSettingsKey, binding: ShortcutBinding) => {
-      const shortcut = CONFIGURABLE_SHORTCUTS.find((s) => s.settingsKey === settingsKey);
-      if (!shortcut) return;
-
-      const nextBindings = { ...bindings, [settingsKey]: binding };
-      const conflict = findConflictingShortcut(settingsKey, binding, nextBindings);
-      if (conflict) {
-        const message = `Conflicts with "${conflict.label}". Choose a different shortcut.`;
-        setError(message);
-        toast({ title: 'Shortcut conflict', description: message, variant: 'destructive' });
-        return;
-      }
-
-      setError(null);
-      updateSettings({ keyboard: { [settingsKey]: binding } });
-      toast({
-        title: 'Shortcut updated',
-        description: `${shortcut.label} is now ${formatModifier(binding.modifier)} ${formatDisplayKey(binding.key)}`,
-      });
-    },
-    [bindings, updateSettings]
-  );
-
-  const handleKeyCapture = useCallback(
-    (event: KeyboardEvent) => {
-      event.preventDefault();
-      event.stopPropagation();
-
-      if (!capturingKey) return;
-
-      // Determine which modifier is pressed
-      let modifier: ShortcutModifier | null = null;
-      if (event.metaKey && event.ctrlKey) {
-        setError('Please use either Cmd or Ctrl, not both.');
-        return;
-      }
-      if (event.altKey && (event.metaKey || event.ctrlKey || event.shiftKey)) {
-        setError('Alt/Option can only be used by itself.');
-        return;
-      }
-      if (event.metaKey && event.shiftKey) {
-        modifier = 'cmd+shift';
-      } else if (event.ctrlKey && event.shiftKey) {
-        modifier = 'ctrl+shift';
-      } else if (event.metaKey) {
-        modifier = 'cmd';
-      } else if (event.ctrlKey) {
-        modifier = 'ctrl';
-      } else if (event.altKey) {
-        modifier = 'alt';
-      } else if (event.shiftKey) {
-        modifier = 'shift';
-      }
-
-      // Ignore if only modifier key pressed (no actual key)
-      const isModifierOnly = ['Meta', 'Control', 'Alt', 'Shift'].includes(event.key);
-      if (isModifierOnly) return;
-
-      // Require a modifier
-      if (!modifier) {
-        setError('Please press a modifier key (Cmd/Ctrl/Alt/Shift) + key');
-        return;
-      }
-
-      const normalizedKey = normalizeShortcutKey(event.key);
-      const isSinglePrintable = normalizedKey.length === 1 && /\S/u.test(normalizedKey);
-      const isAllowedSpecial = [
-        'Tab',
-        'Escape',
-        'ArrowLeft',
-        'ArrowRight',
-        'ArrowUp',
-        'ArrowDown',
-      ].includes(normalizedKey);
-      if (!isSinglePrintable && !isAllowedSpecial) {
-        setError('Allowed keys: printable character, Tab, Esc, or arrow keys.');
-        return;
-      }
-
-      const newBinding: ShortcutBinding = {
-        key: normalizedKey,
-        modifier,
-      };
-
-      const currentCapturingKey = capturingKey;
-      setCapturingKey(null);
-      saveBinding(currentCapturingKey, newBinding);
-    },
-    [capturingKey, saveBinding]
-  );
-
-  useEffect(() => {
-    if (capturingKey) {
-      window.addEventListener('keydown', handleKeyCapture);
-      return () => window.removeEventListener('keydown', handleKeyCapture);
-    }
-  }, [capturingKey, handleKeyCapture]);
-
-  const startCapture = (settingsKey: ShortcutSettingsKey) => {
-    setError(null);
-    setCapturingKey(settingsKey);
-    captureRef.current?.focus();
-  };
-
-  const cancelCapture = () => {
-    setCapturingKey(null);
-    setError(null);
-  };
-
-  const handleReset = (shortcut: AppShortcut & { id: string }) => {
-    if (shortcut.modifier) {
-      saveBinding(shortcut.settingsKey, {
-        key: shortcut.key,
-        modifier: shortcut.modifier,
-      });
-    }
-  };
-
-  const isModified = (shortcut: AppShortcut & { id: string }) => {
-    const current = bindings[shortcut.settingsKey];
-    if (!current || !shortcut.modifier) return false;
-    return current.key !== shortcut.key || current.modifier !== shortcut.modifier;
-  };
-
-  return (
-    <div className="rounded-xl border border-border/60 bg-muted/10 p-4">
-      <div className="space-y-4">
-        {CONFIGURABLE_SHORTCUTS.map((shortcut) => (
-          <div key={shortcut.id} className="flex items-center justify-between gap-2">
-            <div className="space-y-1">
-              <div className="text-sm">{shortcut.label}</div>
-              <div className="text-xs text-muted-foreground">{shortcut.description}</div>
-            </div>
-            <div className="flex items-center gap-2">
-              {capturingKey === shortcut.settingsKey ? (
-                <>
-                  <Button
-                    ref={captureRef}
-                    type="button"
-                    variant="outline"
-                    size="sm"
-                    className="min-w-[80px] animate-pulse"
-                    onClick={cancelCapture}
-                    disabled={saving}
-                  >
-                    Press keys...
-                  </Button>
-                  <Button
-                    type="button"
-                    variant="ghost"
-                    size="sm"
-                    onClick={cancelCapture}
-                    disabled={saving}
-                  >
-                    Cancel
-                  </Button>
-                </>
-              ) : (
-                <>
-                  {isModified(shortcut) ? (
-                    <TooltipProvider delayDuration={150}>
-                      <Tooltip>
-                        <TooltipTrigger asChild>
-                          <Button
-                            type="button"
-                            variant="ghost"
-                            size="icon"
-                            className="h-8 w-8"
-                            onClick={() => handleReset(shortcut)}
-                            disabled={loading || saving}
-                          >
-                            <RotateCcw className="h-4 w-4" />
-                          </Button>
-                        </TooltipTrigger>
-                        <TooltipContent>
-                          <p>Reset to default shortcut</p>
-                        </TooltipContent>
-                      </Tooltip>
-                    </TooltipProvider>
-                  ) : null}
-                  <Button
-                    type="button"
-                    variant="outline"
-                    size="sm"
-                    className="min-w-[80px]"
-                    onClick={() => startCapture(shortcut.settingsKey)}
-                    disabled={loading || saving}
-                  >
-                    <ShortcutDisplay binding={bindings[shortcut.settingsKey]} />
-                  </Button>
-                </>
-              )}
-            </div>
-          </div>
-        ))}
-        {error ? <p className="text-xs text-destructive">{error}</p> : null}
-      </div>
-    </div>
-  );
-};
-
-export default KeyboardSettingsCard;
diff --git a/src/renderer/components/LinearIssuePreviewTooltip.tsx b/src/renderer/components/LinearIssuePreviewTooltip.tsx
deleted file mode 100644
index e93275b205..0000000000
--- a/src/renderer/components/LinearIssuePreviewTooltip.tsx
+++ /dev/null
@@ -1,176 +0,0 @@
-import React, { useEffect, useRef, useState } from 'react';
-import { motion } from 'motion/react';
-import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from './ui/tooltip';
-import { ExternalLink, User, Tag, Folder } from 'lucide-react';
-import linearLogoSvg from '../../assets/images/Linear.svg?raw';
-import type { LinearIssueSummary } from '../types/linear';
-import AgentLogo from './AgentLogo';
-import { LinearStatusPill } from './LinearStatusPill';
-
-type Props = {
-  issue: LinearIssueSummary | null;
-  children: React.ReactElement;
-  side?: 'top' | 'right' | 'bottom' | 'left';
-};
-
-// Module-level singleton: only one tooltip may be open at a time.
-// Stores the force-close function of the currently open tooltip instance.
-let activeTooltipForceClose: (() => void) | null = null;
-
-export const LinearIssuePreviewTooltip: React.FC<Props> = ({ issue, children, side = 'top' }) => {
-  const [open, setOpen] = useState(false);
-  const closeTimer = useRef<ReturnType<typeof setTimeout> | null>(null);
-
-  const cancelClose = () => {
-    if (closeTimer.current !== null) {
-      clearTimeout(closeTimer.current);
-      closeTimer.current = null;
-    }
-  };
-
-  const latestClose = useRef<() => void>(() => {});
-  latestClose.current = () => {
-    cancelClose();
-    setOpen(false);
-  };
-
-  const stableForceClose = useRef<() => void>(() => latestClose.current());
-
-  const scheduleClose = () => {
-    cancelClose();
-    closeTimer.current = setTimeout(() => setOpen(false), 300);
-  };
-
-  const handleMouseEnter = () => {
-    cancelClose();
-    setOpen(true);
-  };
-
-  // Whenever this tooltip becomes visible, register it in the global singleton
-  // and immediately force-close whichever other instance was previously open.
-  useEffect(() => {
-    const myForceClose = stableForceClose.current;
-    if (open) {
-      if (activeTooltipForceClose && activeTooltipForceClose !== myForceClose) {
-        activeTooltipForceClose();
-      }
-      activeTooltipForceClose = myForceClose;
-    } else {
-      if (activeTooltipForceClose === myForceClose) {
-        activeTooltipForceClose = null;
-      }
-    }
-    return () => {
-      if (activeTooltipForceClose === myForceClose) {
-        activeTooltipForceClose = null;
-      }
-    };
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [open]);
-
-  // Clean up pending close timer on unmount.
-  useEffect(() => {
-    return () => cancelClose();
-  }, []);
-
-  if (!issue) return children;
-
-  return (
-    <TooltipProvider delayDuration={150}>
-      <Tooltip
-        open={open}
-        onOpenChange={(next) => {
-          if (next) setOpen(true);
-        }}
-      >
-        <TooltipTrigger asChild onMouseEnter={handleMouseEnter} onMouseLeave={scheduleClose}>
-          {children}
-        </TooltipTrigger>
-        <TooltipContent
-          side={side}
-          align="start"
-          className="border-0 bg-transparent p-0 shadow-none"
-          style={{ zIndex: 10000 }}
-          onPointerDownOutside={(e) => e.preventDefault()}
-          onMouseEnter={cancelClose}
-          onMouseLeave={scheduleClose}
-        >
-          <motion.div
-            initial={{ opacity: 0, y: 4, scale: 0.98 }}
-            animate={{ opacity: 1, y: 0, scale: 1 }}
-            exit={{ opacity: 0, y: 4, scale: 0.98 }}
-            transition={{ duration: 0.16, ease: 'easeOut' }}
-            className="min-w-[260px] max-w-sm rounded-lg border border-border/70 bg-popover/95 p-3 shadow-xl backdrop-blur-sm"
-            onClick={(e) => e.stopPropagation()}
-          >
-            <div className="flex items-start justify-between gap-2">
-              <div className="flex items-center gap-2 text-xs font-medium text-muted-foreground">
-                <AgentLogo
-                  logo={linearLogoSvg}
-                  alt="Linear"
-                  className="h-4 w-4 text-muted-foreground"
-                />
-                <span className="tracking-wide">Linear Issue</span>
-                <span className="font-semibold text-muted-foreground/80">{issue.identifier}</span>
-              </div>
-              {issue.url && (
-                <a
-                  href={issue.url}
-                  target="_blank"
-                  rel="noopener noreferrer"
-                  className="inline-flex items-center gap-1 text-xs text-blue-600 hover:text-blue-700 dark:text-blue-400 dark:hover:text-blue-300"
-                  onClick={(e) => {
-                    e.stopPropagation();
-                    if (window.electronAPI?.openExternal && issue.url) {
-                      e.preventDefault();
-                      window.electronAPI.openExternal(issue.url);
-                    }
-                  }}
-                >
-                  <ExternalLink className="h-3 w-3" />
-                </a>
-              )}
-            </div>
-
-            <div className="mt-1 line-clamp-2 text-sm font-semibold text-foreground">
-              {issue.title || `Issue ${issue.identifier}`}
-            </div>
-
-            {issue.description && (
-              <div className="mt-1.5 line-clamp-2 text-xs text-muted-foreground">
-                {issue.description}
-              </div>
-            )}
-
-            <div className="mt-2 flex flex-wrap items-center gap-2 text-xs text-muted-foreground">
-              <LinearStatusPill state={issue.state} />
-
-              {issue.assignee?.name && (
-                <span className="inline-flex items-center gap-1">
-                  <User className="h-3 w-3" />
-                  <span>{issue.assignee.name}</span>
-                </span>
-              )}
-
-              {issue.project?.name && (
-                <span className="inline-flex items-center gap-1">
-                  <Folder className="h-3 w-3" />
-                  <span>{issue.project.name}</span>
-                </span>
-              )}
-
-              {issue.team?.name && (
-                <span className="inline-flex items-center gap-1">
-                  <Tag className="h-3 w-3" />
-                  <span>{issue.team.name}</span>
-                </span>
-              )}
-            </div>
-          </motion.div>
-        </TooltipContent>
-      </Tooltip>
-    </TooltipProvider>
-  );
-};
-
-export default LinearIssuePreviewTooltip;
diff --git a/src/renderer/components/LinearIssueSelector.tsx b/src/renderer/components/LinearIssueSelector.tsx
deleted file mode 100644
index f15f021cdb..0000000000
--- a/src/renderer/components/LinearIssueSelector.tsx
+++ /dev/null
@@ -1,363 +0,0 @@
-import React, { useCallback, useEffect, useRef, useState, useMemo } from 'react';
-import { Input } from './ui/input';
-import { Select, SelectContent, SelectItem, SelectTrigger } from './ui/select';
-import { Search } from 'lucide-react';
-import linearLogoSvg from '../../assets/images/Linear.svg?raw';
-import { type LinearIssueSummary } from '../types/linear';
-import { Separator } from './ui/separator';
-import { Spinner } from './ui/spinner';
-import { LinearIssuePreviewTooltip } from './LinearIssuePreviewTooltip';
-import { LinearStatusPill } from './LinearStatusPill';
-import AgentLogo from './AgentLogo';
-
-interface LinearIssueSelectorProps {
-  selectedIssue: LinearIssueSummary | null;
-  onIssueChange: (issue: LinearIssueSummary | null) => void;
-  isOpen?: boolean;
-  className?: string;
-  disabled?: boolean;
-  autoOpen?: boolean;
-  onAutoOpenHandled?: () => void;
-  placeholder?: string;
-}
-
-export const LinearIssueSelector: React.FC<LinearIssueSelectorProps> = ({
-  selectedIssue,
-  onIssueChange,
-  isOpen = false,
-  className = '',
-  disabled = false,
-  autoOpen = false,
-  onAutoOpenHandled,
-  placeholder: customPlaceholder,
-}) => {
-  const [availableIssues, setAvailableIssues] = useState<LinearIssueSummary[]>([]);
-  const [isLoadingIssues, setIsLoadingIssues] = useState(false);
-  const [issueListError, setIssueListError] = useState<string | null>(null);
-  const [hasRequestedIssues, setHasRequestedIssues] = useState(false);
-  const [searchTerm, setSearchTerm] = useState('');
-  const [searchResults, setSearchResults] = useState<LinearIssueSummary[]>([]);
-  const [isSearching, setIsSearching] = useState(false);
-  const isMountedRef = useRef(true);
-  const [visibleCount, setVisibleCount] = useState(10);
-  const [dropdownOpen, setDropdownOpen] = useState(false);
-
-  const canListLinear = typeof window !== 'undefined' && !!window.electronAPI?.linearInitialFetch;
-  const issuesLoaded = availableIssues.length > 0;
-  const isDisabled = disabled || isLoadingIssues || !!issueListError || !issuesLoaded;
-
-  useEffect(() => {
-    return () => {
-      isMountedRef.current = false;
-    };
-  }, []);
-
-  useEffect(() => {
-    if (!isOpen) {
-      setAvailableIssues([]);
-      setHasRequestedIssues(false);
-      setIssueListError(null);
-      setIsLoadingIssues(false);
-      setSearchTerm('');
-      setSearchResults([]);
-      setIsSearching(false);
-      onIssueChange(null);
-      setVisibleCount(10);
-    }
-  }, [isOpen, onIssueChange]);
-
-  useEffect(() => {
-    if (!isOpen) {
-      setDropdownOpen(false);
-    }
-  }, [isOpen]);
-
-  useEffect(() => {
-    if (autoOpen) {
-      setDropdownOpen(true);
-      onAutoOpenHandled?.();
-    }
-  }, [autoOpen, onAutoOpenHandled]);
-
-  const loadLinearIssues = useCallback(async () => {
-    if (!canListLinear) {
-      return;
-    }
-
-    const api = window.electronAPI;
-    if (!api?.linearInitialFetch) {
-      setAvailableIssues([]);
-      setIssueListError('Linear issue list unavailable in this build.');
-      setHasRequestedIssues(true);
-      return;
-    }
-
-    setIsLoadingIssues(true);
-    try {
-      // Fetch a generous set from Linear; UI renders 10 initially
-      const result = await api.linearInitialFetch(50);
-      if (!isMountedRef.current) return;
-      if (!result?.success) {
-        throw new Error(result?.error || 'Failed to load Linear issues.');
-      }
-      setAvailableIssues(result.issues ?? []);
-      setIssueListError(null);
-    } catch (error) {
-      if (!isMountedRef.current) return;
-      setAvailableIssues([]);
-      setIssueListError(error instanceof Error ? error.message : 'Failed to load Linear issues.');
-    } finally {
-      if (!isMountedRef.current) return;
-      setIsLoadingIssues(false);
-      setHasRequestedIssues(true);
-    }
-  }, [canListLinear]);
-
-  useEffect(() => {
-    if (!isOpen || !canListLinear || isLoadingIssues || hasRequestedIssues) return;
-    loadLinearIssues();
-  }, [isOpen, canListLinear, isLoadingIssues, hasRequestedIssues, loadLinearIssues]);
-
-  const searchIssues = useCallback(async (term: string) => {
-    if (!term.trim()) {
-      setSearchResults([]);
-      setIsSearching(false);
-      return;
-    }
-
-    const api = window.electronAPI;
-    if (!api?.linearSearchIssues) {
-      return;
-    }
-
-    setIsSearching(true);
-    try {
-      const result = await api.linearSearchIssues(term.trim(), 20);
-      if (!isMountedRef.current) return;
-      if (result?.success) {
-        setSearchResults(result.issues ?? []);
-        // Track search
-        void (async () => {
-          const { captureTelemetry } = await import('../lib/telemetryClient');
-          captureTelemetry('linear_issues_searched');
-        })();
-      } else {
-        setSearchResults([]);
-      }
-    } catch (error) {
-      if (!isMountedRef.current) return;
-      setSearchResults([]);
-    } finally {
-      if (!isMountedRef.current) return;
-      setIsSearching(false);
-    }
-  }, []);
-
-  // Debounced search effect
-  useEffect(() => {
-    const timeoutId = setTimeout(() => {
-      searchIssues(searchTerm);
-    }, 300);
-
-    return () => clearTimeout(timeoutId);
-  }, [searchTerm, searchIssues]);
-
-  // Combine search results and available issues
-  const displayIssues = useMemo(() => {
-    if (searchTerm.trim()) {
-      return searchResults;
-    }
-    return availableIssues;
-  }, [searchTerm, searchResults, availableIssues]);
-
-  // Reset how many are visible when the search term changes
-  useEffect(() => {
-    setVisibleCount(10);
-  }, [searchTerm]);
-
-  const showIssues = useMemo(
-    () => displayIssues.slice(0, Math.max(10, visibleCount)),
-    [displayIssues, visibleCount]
-  );
-
-  const handleScroll = useCallback(
-    (e: React.UIEvent<HTMLDivElement>) => {
-      const el = e.currentTarget;
-      const nearBottom = el.scrollTop + el.clientHeight >= el.scrollHeight - 16;
-      if (nearBottom && showIssues.length < displayIssues.length) {
-        setVisibleCount((prev) => Math.min(prev + 10, displayIssues.length));
-      }
-    },
-    [displayIssues.length, showIssues.length]
-  );
-
-  const handleIssueSelect = (identifier: string) => {
-    if (identifier === '__clear__') {
-      onIssueChange(null);
-      return;
-    }
-    const issue = displayIssues.find((issue) => issue.identifier === identifier) ?? null;
-    if (issue) {
-      void (async () => {
-        const { captureTelemetry } = await import('../lib/telemetryClient');
-        captureTelemetry('linear_issue_selected');
-      })();
-    }
-    onIssueChange(issue);
-  };
-
-  const issueHelperText = (() => {
-    if (!canListLinear) {
-      return 'Connect Linear in Settings to browse issues.';
-    }
-    if (hasRequestedIssues && !isLoadingIssues && !issuesLoaded && !issueListError) {
-      return 'No Linear issues available.';
-    }
-    return null;
-  })();
-
-  const issuePlaceholder =
-    customPlaceholder ??
-    (isLoadingIssues
-      ? 'Loading…'
-      : issueListError
-        ? 'Connect your Linear'
-        : 'Select a Linear issue');
-
-  if (!canListLinear) {
-    return (
-      <div className={className}>
-        <Input value="" placeholder="Linear integration unavailable" disabled />
-        <p className="mt-2 text-xs text-muted-foreground">
-          Connect Linear in Settings to browse issues.
-        </p>
-      </div>
-    );
-  }
-
-  return (
-    <div className={`min-w-0 max-w-full overflow-hidden ${className}`} style={{ maxWidth: '100%' }}>
-      <Select
-        value={selectedIssue?.identifier || '__clear__'}
-        onValueChange={handleIssueSelect}
-        disabled={isDisabled}
-        open={dropdownOpen}
-        onOpenChange={(open) => setDropdownOpen(open)}
-      >
-        <SelectTrigger
-          className="h-9 w-full overflow-hidden border-none bg-muted"
-          style={{ maxWidth: '100%' }}
-        >
-          <div className="flex w-full items-center gap-2 overflow-hidden text-left text-foreground">
-            {selectedIssue ? (
-              <div className="flex min-w-0 flex-1 items-center gap-2 overflow-hidden">
-                <LinearIssuePreviewTooltip issue={selectedIssue}>
-                  <span
-                    className="inline-flex items-center gap-1.5 rounded border border-border bg-muted px-1.5 py-0.5 dark:border-border dark:bg-card"
-                    onClick={(e) => e.stopPropagation()}
-                  >
-                    <AgentLogo
-                      logo={linearLogoSvg}
-                      alt="Linear"
-                      className="h-3.5 w-3.5 text-foreground"
-                    />
-                    <span className="text-[11px] font-medium text-foreground">
-                      {selectedIssue.identifier}
-                    </span>
-                  </span>
-                </LinearIssuePreviewTooltip>
-                {selectedIssue.title ? (
-                  <div className="flex min-w-0 flex-1 items-center gap-1 overflow-hidden">
-                    <span className="text-foreground">-</span>
-                    <span className="truncate text-muted-foreground">{selectedIssue.title}</span>
-                  </div>
-                ) : null}
-              </div>
-            ) : (
-              <>
-                <AgentLogo
-                  logo={linearLogoSvg}
-                  alt="Linear"
-                  className="h-3.5 w-3.5 text-foreground"
-                />
-                {isLoadingIssues ? (
-                  <>
-                    <span className="truncate text-muted-foreground">Loading Linear issues</span>
-                    <Spinner size="sm" />
-                  </>
-                ) : (
-                  <span className="truncate text-muted-foreground">{issuePlaceholder}</span>
-                )}
-              </>
-            )}
-          </div>
-        </SelectTrigger>
-        <SelectContent side="top" className="z-[120] w-full max-w-[480px]">
-          <div className="relative px-3 py-2">
-            <Search className="absolute left-3 top-1/2 z-10 h-4 w-4 -translate-y-1/2 text-muted-foreground" />
-            <Input
-              placeholder="Search by name, ID, or assignee..."
-              value={searchTerm}
-              onChange={(e) => setSearchTerm(e.target.value)}
-              disabled={disabled}
-              className="h-7 w-full border-none bg-transparent pl-9 pr-3 focus:outline-none focus:ring-0 focus:ring-offset-0 focus-visible:ring-0 focus-visible:ring-offset-0"
-            />
-          </div>
-          <Separator />
-          <div className="max-h-80 overflow-y-auto overflow-x-hidden py-1" onScroll={handleScroll}>
-            <SelectItem value="__clear__">
-              <span className="text-sm text-muted-foreground">None</span>
-            </SelectItem>
-            <Separator className="my-1" />
-            {showIssues.length > 0 ? (
-              showIssues.map((issue) => (
-                <LinearIssuePreviewTooltip
-                  key={issue.id || issue.identifier}
-                  issue={issue}
-                  side="left"
-                >
-                  <SelectItem value={issue.identifier}>
-                    <span className="flex min-w-0 items-center gap-2">
-                      <span className="inline-flex shrink-0 items-center gap-1.5 rounded border border-border bg-muted px-1.5 py-0.5 dark:border-border dark:bg-card">
-                        <AgentLogo
-                          logo={linearLogoSvg}
-                          alt="Linear"
-                          className="h-3.5 w-3.5 text-foreground"
-                        />
-                        <span className="text-[11px] font-medium text-foreground">
-                          {issue.identifier}
-                        </span>
-                      </span>
-                      <LinearStatusPill state={issue.state} />
-                      {issue.title ? (
-                        <span className="truncate text-muted-foreground">{issue.title}</span>
-                      ) : null}
-                    </span>
-                  </SelectItem>
-                </LinearIssuePreviewTooltip>
-              ))
-            ) : searchTerm.trim() ? (
-              <div className="px-3 py-2 text-sm text-muted-foreground">
-                {isSearching ? (
-                  <div className="flex items-center gap-2">
-                    <Spinner size="sm" />
-                    <span>Searching</span>
-                  </div>
-                ) : (
-                  `No issues found for "${searchTerm}"`
-                )}
-              </div>
-            ) : (
-              <div className="px-3 py-2 text-sm text-muted-foreground">No issues available</div>
-            )}
-          </div>
-        </SelectContent>
-      </Select>
-      {issueHelperText ? (
-        <p className="mt-2 text-xs text-muted-foreground">{issueHelperText}</p>
-      ) : null}
-    </div>
-  );
-};
-
-export default LinearIssueSelector;
diff --git a/src/renderer/components/LinearStatusPill.tsx b/src/renderer/components/LinearStatusPill.tsx
deleted file mode 100644
index f6d67eb06d..0000000000
--- a/src/renderer/components/LinearStatusPill.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import React from 'react';
-import type { LinearStateRef } from '../types/linear';
-
-export const LinearStatusPill: React.FC<{ state?: LinearStateRef | null }> = ({ state }) => {
-  if (!state?.name) return null;
-
-  return (
-    <span className="inline-flex shrink-0 items-center gap-1.5 rounded-md border border-border bg-muted px-2 py-0.5 text-[11px] text-muted-foreground">
-      {state.color && (
-        <span
-          className="inline-block h-2 w-2 shrink-0 rounded-full"
-          style={{ backgroundColor: state.color }}
-        />
-      )}
-      {state.name}
-    </span>
-  );
-};
diff --git a/src/renderer/components/MainContent.tsx b/src/renderer/components/MainContent.tsx
deleted file mode 100644
index d239ec4f8d..0000000000
--- a/src/renderer/components/MainContent.tsx
+++ /dev/null
@@ -1,117 +0,0 @@
-import React, { useState } from 'react';
-import { Repo, Run } from '../types';
-import RunLauncher from './RunLauncher';
-import RunList from './RunList';
-import { FolderOpen } from 'lucide-react';
-
-interface MainContentProps {
-  selectedRepo: Repo | null;
-  runs: Run[];
-  selectedRun: Run | null;
-  onRunSelect: (run: Run) => void;
-  onCreateRun: (config: any) => void;
-}
-
-const MainContent: React.FC<MainContentProps> = ({
-  selectedRepo,
-  runs,
-  selectedRun,
-  onRunSelect,
-  onCreateRun,
-}) => {
-  const [showRunLauncher, setShowRunLauncher] = useState(false);
-
-  const handleCreateRun = (config: any) => {
-    onCreateRun(config);
-    setShowRunLauncher(false);
-  };
-
-  if (!selectedRepo) {
-    return (
-      <div className="flex flex-1 items-center justify-center bg-background">
-        <div className="text-center">
-          <div className="mb-8">
-            <h1
-              className="mb-4 font-mono text-6xl font-semibold text-white"
-              style={{
-                letterSpacing: '0.1em',
-                textShadow: '2px 2px 0px #000',
-              }}
-            >
-              Emdash
-            </h1>
-            <h2 className="text-2xl text-muted-foreground">Codex</h2>
-          </div>
-
-          <div className="flex justify-center gap-6">
-            <div className="rounded-lg border border-border bg-card p-6 transition-colors hover:bg-accent">
-              <div className="mb-3 flex justify-center">
-                <FolderOpen className="h-12 w-12 text-blue-400" />
-              </div>
-              <h3 className="mb-2 text-lg font-semibold text-white">Open Project</h3>
-              <p className="text-sm text-muted-foreground">Select a repository to get started</p>
-            </div>
-          </div>
-        </div>
-      </div>
-    );
-  }
-
-  return (
-    <div className="flex flex-1 flex-col bg-background">
-      <div className="border-b border-border bg-card p-4">
-        <div className="flex items-center justify-between">
-          <div>
-            <h2 className="text-xl font-semibold text-white">
-              {selectedRepo.path.split('/').pop()}
-            </h2>
-            <p className="text-sm text-muted-foreground">{selectedRepo.origin}</p>
-          </div>
-          <div className="flex gap-2">
-            <button
-              className="rounded bg-blue-600 px-4 py-2 text-white transition-colors hover:bg-blue-700"
-              onClick={() => setShowRunLauncher(true)}
-            >
-              Start Run
-            </button>
-            <button className="rounded bg-muted px-4 py-2 text-white transition-colors hover:bg-muted">
-              Settings
-            </button>
-          </div>
-        </div>
-      </div>
-
-      <div className="flex-1 overflow-hidden">
-        {runs.length === 0 ? (
-          <div className="flex h-full items-center justify-center">
-            <div className="text-center">
-              <div className="mb-4 text-6xl">🤖</div>
-              <h3 className="mb-2 text-xl font-semibold text-white">No runs yet</h3>
-              <p className="mb-4 text-muted-foreground">Start your first coding agent run</p>
-              <button
-                className="rounded-lg bg-blue-600 px-6 py-3 text-white transition-colors hover:bg-blue-700"
-                onClick={() => setShowRunLauncher(true)}
-              >
-                Create Run
-              </button>
-            </div>
-          </div>
-        ) : (
-          <RunList runs={runs} selectedRun={selectedRun} onRunSelect={onRunSelect} />
-        )}
-      </div>
-
-      {showRunLauncher && (
-        <div className="absolute inset-0 z-50 flex items-center justify-center bg-black bg-opacity-50">
-          <RunLauncher
-            repo={selectedRepo}
-            onCreateRun={handleCreateRun}
-            onCancel={() => setShowRunLauncher(false)}
-          />
-        </div>
-      )}
-    </div>
-  );
-};
-
-export default MainContent;
diff --git a/src/renderer/components/MainContentArea.tsx b/src/renderer/components/MainContentArea.tsx
deleted file mode 100644
index e09552b0ea..0000000000
--- a/src/renderer/components/MainContentArea.tsx
+++ /dev/null
@@ -1,154 +0,0 @@
-import React from 'react';
-import ChatInterface from './ChatInterface';
-import KanbanBoard from './kanban/KanbanBoard';
-import MultiAgentTask from './MultiAgentTask';
-import ProjectMainView from './ProjectMainView';
-import HomeView from './HomeView';
-import SkillsView from './skills/SkillsView';
-import { SettingsPage, type SettingsPageTab } from './SettingsPage';
-import TaskCreationLoading from './TaskCreationLoading';
-import { useProjectManagementContext } from '../contexts/ProjectManagementProvider';
-import { useTaskManagementContext } from '../contexts/TaskManagementContext';
-import { useProjectRemoteInfo } from '../hooks/useProjectRemoteInfo';
-
-interface MainContentAreaProps {
-  showSettingsPage: boolean;
-  settingsPageInitialTab?: SettingsPageTab;
-  handleCloseSettingsPage?: () => void;
-}
-
-const MainContentArea: React.FC<MainContentAreaProps> = ({
-  showSettingsPage,
-  settingsPageInitialTab,
-  handleCloseSettingsPage,
-}) => {
-  const { connectionId: projectRemoteConnectionId, remotePath: projectRemotePath } =
-    useProjectRemoteInfo();
-  const {
-    selectedProject,
-    showHomeView,
-    showSkillsView,
-    showKanban,
-    setShowKanban,
-    projectDefaultBranch,
-    projectBranchOptions,
-    isLoadingBranches,
-    setProjectDefaultBranch,
-    handleDeleteProject,
-    handleOpenProject,
-    handleNewProjectClick,
-    handleCloneProjectClick,
-    handleAddRemoteProject,
-  } = useProjectManagementContext();
-  const {
-    activeTask,
-    activeTaskAgent,
-    isCreatingTask,
-    handleTaskInterfaceReady: onTaskInterfaceReady,
-    openTaskModal,
-    handleSelectTask,
-    handleDeleteTask,
-    handleArchiveTask,
-    handleRestoreTask,
-    handleRenameTask: onRenameTask,
-  } = useTaskManagementContext();
-  if (showSettingsPage) {
-    return (
-      <div className="relative z-10 flex min-h-0 flex-1 overflow-hidden bg-background">
-        <SettingsPage
-          initialTab={settingsPageInitialTab}
-          onClose={handleCloseSettingsPage || (() => {})}
-        />
-      </div>
-    );
-  }
-
-  if (selectedProject && showKanban) {
-    return (
-      <div className="flex min-h-0 flex-1 flex-col overflow-hidden">
-        <KanbanBoard
-          project={selectedProject}
-          onOpenTask={(ws: any) => {
-            handleSelectTask(ws);
-            setShowKanban(false);
-          }}
-          onCreateTask={() => openTaskModal()}
-        />
-      </div>
-    );
-  }
-
-  if (showSkillsView) {
-    return <SkillsView />;
-  }
-
-  if (showHomeView) {
-    return (
-      <HomeView
-        onOpenProject={handleOpenProject}
-        onNewProjectClick={handleNewProjectClick}
-        onCloneProjectClick={handleCloneProjectClick}
-        onAddRemoteProject={handleAddRemoteProject}
-      />
-    );
-  }
-
-  if (selectedProject) {
-    return (
-      <div className="relative flex min-h-0 flex-1 flex-col overflow-hidden">
-        {activeTask ? (
-          (activeTask.metadata as any)?.multiAgent?.enabled ? (
-            <MultiAgentTask
-              task={activeTask}
-              projectName={selectedProject.name}
-              projectId={selectedProject.id}
-              projectPath={selectedProject.path}
-              projectRemoteConnectionId={projectRemoteConnectionId}
-              projectRemotePath={projectRemotePath}
-              defaultBranch={projectDefaultBranch}
-              onTaskInterfaceReady={onTaskInterfaceReady}
-            />
-          ) : (
-            <ChatInterface
-              task={activeTask}
-              project={selectedProject}
-              projectName={selectedProject.name}
-              projectPath={selectedProject.path}
-              projectRemoteConnectionId={projectRemoteConnectionId}
-              projectRemotePath={projectRemotePath}
-              defaultBranch={projectDefaultBranch}
-              className="min-h-0 flex-1"
-              initialAgent={activeTaskAgent || undefined}
-              onTaskInterfaceReady={onTaskInterfaceReady}
-              onRenameTask={onRenameTask}
-            />
-          )
-        ) : (
-          <ProjectMainView
-            project={selectedProject}
-            onCreateTask={() => openTaskModal()}
-            activeTask={activeTask}
-            onSelectTask={handleSelectTask}
-            onDeleteTask={handleDeleteTask}
-            onArchiveTask={handleArchiveTask}
-            onRestoreTask={handleRestoreTask}
-            onDeleteProject={handleDeleteProject}
-            branchOptions={projectBranchOptions}
-            isLoadingBranches={isLoadingBranches}
-            onBaseBranchChange={setProjectDefaultBranch}
-          />
-        )}
-
-        {isCreatingTask && (
-          <div className="absolute inset-0 z-10 bg-background">
-            <TaskCreationLoading />
-          </div>
-        )}
-      </div>
-    );
-  }
-
-  return null;
-};
-
-export default MainContentArea;
diff --git a/src/renderer/components/MergePrSection.tsx b/src/renderer/components/MergePrSection.tsx
deleted file mode 100644
index da60e901ba..0000000000
--- a/src/renderer/components/MergePrSection.tsx
+++ /dev/null
@@ -1,373 +0,0 @@
-import React, { useState } from 'react';
-import { AlertTriangle, Check, CheckCircle2, ChevronDown, XCircle } from 'lucide-react';
-import type { PrStatus } from '../lib/prStatus';
-import { useToast } from '../hooks/use-toast';
-import { Badge } from './ui/badge';
-import { Button } from './ui/button';
-import { Popover, PopoverContent, PopoverTrigger } from './ui/popover';
-import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from './ui/tooltip';
-import { Spinner } from './ui/spinner';
-import { Switch } from './ui/switch';
-import { Close as PopoverClose } from '@radix-ui/react-popover';
-
-type MergeUiStateKind = 'merged' | 'ready' | 'draft' | 'conflicts' | 'blocked' | 'unknown';
-
-type MergeUiState = { kind: MergeUiStateKind; title: string; detail?: string; canMerge: boolean };
-
-type MergeStrategy = 'merge' | 'squash' | 'rebase';
-
-const MERGE_STRATEGIES: Array<{
-  id: MergeStrategy;
-  title: string;
-  description: string;
-}> = [
-  {
-    id: 'merge',
-    title: 'Create a merge commit',
-    description:
-      'All commits from this branch will be added to the base branch via a merge commit.',
-  },
-  {
-    id: 'squash',
-    title: 'Squash and merge',
-    description:
-      'All commits from this branch will be combined into one commit in the base branch.',
-  },
-  {
-    id: 'rebase',
-    title: 'Rebase and merge',
-    description: 'All commits from this branch will be rebased and added to the base branch.',
-  },
-];
-
-function computeMergeUiState(pr: PrStatus, adminOverride: boolean): MergeUiState {
-  const prState = typeof pr.state === 'string' ? pr.state.toUpperCase() : '';
-  if (prState === 'MERGED') {
-    return { kind: 'merged', title: 'Merged', canMerge: false };
-  }
-
-  if (pr.isDraft) {
-    return {
-      kind: 'draft',
-      title: 'Draft PR',
-      detail: 'Mark it ready to enable merging.',
-      canMerge: false,
-    };
-  }
-
-  const mergeState =
-    typeof pr.mergeStateStatus === 'string' ? pr.mergeStateStatus.toUpperCase() : '';
-
-  switch (mergeState) {
-    case 'CLEAN':
-      return { kind: 'ready', title: 'Ready to merge', canMerge: true };
-    case 'DIRTY':
-      return {
-        kind: 'conflicts',
-        title: 'Merge conflicts',
-        detail: 'Resolve conflicts to enable merging.',
-        canMerge: false,
-      };
-    case 'BEHIND':
-      return {
-        kind: 'blocked',
-        title: 'Behind base branch',
-        detail: 'Update the branch before merging.',
-        canMerge: false,
-      };
-    case 'BLOCKED':
-      return {
-        kind: 'blocked',
-        title: 'Blocked',
-        detail: adminOverride ? 'Bypass enabled' : 'Branch protections or approvals required.',
-        canMerge: adminOverride,
-      };
-    case 'HAS_HOOKS':
-      return {
-        kind: 'blocked',
-        title: 'Checks required',
-        detail: adminOverride ? 'Bypass enabled' : 'Required checks are not satisfied yet.',
-        canMerge: adminOverride,
-      };
-    case 'UNSTABLE':
-      return {
-        kind: 'blocked',
-        title: 'Checks failing',
-        detail: adminOverride ? 'Bypass enabled' : 'Fix failing checks before merging.',
-        canMerge: adminOverride,
-      };
-    default:
-      return {
-        kind: 'unknown',
-        title: 'Merge status unknown',
-        detail: 'Refresh PR status and try again.',
-        canMerge: false,
-      };
-  }
-}
-
-function StatusBadge({ state }: { state: MergeUiState }) {
-  switch (state.kind) {
-    case 'merged':
-      return (
-        <Badge variant="outline">
-          <CheckCircle2 className="h-3 w-3 text-emerald-500" />
-          Merged
-        </Badge>
-      );
-    case 'ready':
-      return (
-        <Badge variant="outline">
-          <CheckCircle2 className="h-3 w-3 text-emerald-500" />
-          Ready
-        </Badge>
-      );
-    case 'conflicts':
-      return (
-        <Badge variant="outline">
-          <XCircle className="h-3 w-3 text-red-500" />
-          Conflicts
-        </Badge>
-      );
-    case 'draft':
-      return (
-        <Badge variant="outline">
-          <AlertTriangle className="h-3 w-3 text-muted-foreground" />
-          Draft
-        </Badge>
-      );
-    case 'blocked':
-      return (
-        <Badge variant="outline">
-          <AlertTriangle className="h-3 w-3 text-muted-foreground" />
-          {state.canMerge ? 'Bypass' : 'Blocked'}
-        </Badge>
-      );
-    case 'unknown':
-    default:
-      return (
-        <Badge variant="outline">
-          <AlertTriangle className="h-3 w-3 text-muted-foreground" />
-          Unknown
-        </Badge>
-      );
-  }
-}
-
-export function MergePrSection({
-  taskPath,
-  pr,
-  refreshPr,
-}: {
-  taskPath: string;
-  pr: PrStatus | null;
-  refreshPr: () => Promise<void>;
-}) {
-  const { toast } = useToast();
-  const [isMerging, setIsMerging] = useState(false);
-  const [strategy, setStrategy] = useState<MergeStrategy>(() => {
-    try {
-      const stored = localStorage.getItem('emdash:prMergeStrategy');
-      if (stored === 'merge' || stored === 'squash' || stored === 'rebase') return stored;
-    } catch {}
-    return 'merge';
-  });
-  const [adminOverride, setAdminOverride] = useState(false);
-
-  const activePr = pr && typeof pr.number === 'number' && Number.isFinite(pr.number) ? pr : null;
-  const mergeUiState = activePr ? computeMergeUiState(activePr, adminOverride) : null;
-  const mergeState =
-    activePr && typeof activePr.mergeStateStatus === 'string'
-      ? activePr.mergeStateStatus.toUpperCase()
-      : '';
-  const showBypassToggle =
-    mergeUiState?.kind === 'blocked' &&
-    (mergeState === 'BLOCKED' || mergeState === 'HAS_HOOKS' || mergeState === 'UNSTABLE');
-
-  if (!activePr || !mergeUiState) return null;
-  const prStateNormalized = typeof pr?.state === 'string' ? pr.state.toUpperCase() : '';
-  if (prStateNormalized === 'CLOSED') return null;
-
-  const formatMergeError = (error: unknown): string => {
-    if (typeof error !== 'string') return 'Failed to merge PR.';
-    const lines = error
-      .split('\n')
-      .map((l) => l.trim())
-      .filter(Boolean);
-    const first = lines[0] || 'Failed to merge PR.';
-    const cleaned = first.replace(/^error:\\s*/i, '').trim();
-    return cleaned.length > 240 ? `${cleaned.slice(0, 237)}...` : cleaned;
-  };
-
-  const setAndPersistAdminOverride = (next: boolean) => {
-    setAdminOverride(next);
-  };
-
-  const setAndPersistStrategy = (next: MergeStrategy) => {
-    setStrategy(next);
-    try {
-      localStorage.setItem('emdash:prMergeStrategy', next);
-    } catch {}
-  };
-
-  const doMerge = async () => {
-    setIsMerging(true);
-    try {
-      const res = await window.electronAPI.mergePr({
-        taskPath,
-        prNumber: activePr.number,
-        strategy,
-        admin: adminOverride,
-      });
-
-      if (res?.success) {
-        toast({
-          title: 'PR merged',
-          description: activePr.title ? activePr.title : `#${activePr.number}`,
-        });
-        await refreshPr();
-      } else {
-        toast({
-          title: 'Merge failed',
-          description: formatMergeError(res?.error),
-          variant: 'destructive',
-        });
-      }
-    } catch {
-      toast({
-        title: 'Merge failed',
-        description: 'An unexpected error occurred.',
-        variant: 'destructive',
-      });
-    } finally {
-      setIsMerging(false);
-    }
-  };
-
-  const disabled = isMerging || !mergeUiState.canMerge;
-  const isMerged = mergeUiState.kind === 'merged';
-  const showDisabledTooltip = !isMerged && !isMerging && !mergeUiState.canMerge;
-  const disabledTooltipText = `Disabled because ${mergeUiState.detail || mergeUiState.title}.`;
-
-  return (
-    <div className="border-t border-border px-4 py-3">
-      <div className="space-y-2">
-        <div className="min-w-0">
-          <div className="flex items-center justify-between gap-2">
-            <span className="text-sm font-medium text-foreground">Merge Pull Request</span>
-            <StatusBadge state={mergeUiState} />
-          </div>
-        </div>
-        {showBypassToggle && (
-          <div className="flex items-center justify-between gap-3">
-            <div className="text-xs text-muted-foreground" title="Attempts `gh pr merge --admin`">
-              {adminOverride ? 'Bypass enabled' : 'Merge without waiting'}
-            </div>
-            <Switch
-              checked={adminOverride}
-              onCheckedChange={setAndPersistAdminOverride}
-              disabled={isMerging}
-              aria-label="Merge without waiting"
-            />
-          </div>
-        )}
-        {isMerged ? (
-          <Button
-            variant="default"
-            size="sm"
-            className="h-8 w-full justify-center px-2 text-xs disabled:opacity-100"
-            disabled
-          >
-            <span className="inline-flex items-center gap-1.5">
-              <CheckCircle2 className="h-3.5 w-3.5" />
-              Merged
-            </span>
-          </Button>
-        ) : (
-          <div className="flex w-full min-w-0">
-            {showDisabledTooltip ? (
-              <TooltipProvider delayDuration={120}>
-                <Tooltip>
-                  <TooltipTrigger asChild>
-                    <span className="min-w-0 flex-1">
-                      <Button
-                        variant="default"
-                        size="sm"
-                        className="h-8 w-full justify-center rounded-r-none px-2 text-xs disabled:opacity-100"
-                        disabled
-                      >
-                        Merge pull request
-                      </Button>
-                    </span>
-                  </TooltipTrigger>
-                  <TooltipContent side="top">{disabledTooltipText}</TooltipContent>
-                </Tooltip>
-              </TooltipProvider>
-            ) : (
-              <Button
-                variant="default"
-                size="sm"
-                className="h-8 min-w-0 flex-1 justify-center rounded-r-none px-2 text-xs disabled:opacity-100"
-                disabled={disabled}
-                onClick={doMerge}
-                title={disabled ? mergeUiState.title : 'Merge via GitHub'}
-              >
-                {isMerging ? <Spinner size="sm" /> : 'Merge pull request'}
-              </Button>
-            )}
-            <Popover>
-              <PopoverTrigger asChild>
-                <Button
-                  variant="default"
-                  size="sm"
-                  className="h-8 w-10 shrink-0 rounded-l-none px-0 disabled:opacity-100"
-                  disabled={isMerging}
-                  title="Select merge method"
-                >
-                  <ChevronDown className="h-4 w-4" />
-                </Button>
-              </PopoverTrigger>
-              <PopoverContent align="end" className="w-80 p-1">
-                {MERGE_STRATEGIES.map((opt) => (
-                  <PopoverClose key={opt.id} asChild>
-                    <button
-                      type="button"
-                      className="w-full rounded px-2 py-2 text-left hover:bg-accent"
-                      onClick={() => setAndPersistStrategy(opt.id)}
-                    >
-                      <div className="flex items-start gap-2">
-                        <span className="mt-0.5 inline-flex h-4 w-4 items-center justify-center">
-                          {strategy === opt.id ? (
-                            <Check className="h-4 w-4 text-foreground" />
-                          ) : null}
-                        </span>
-                        <div className="min-w-0">
-                          <div className="text-sm font-medium text-foreground">{opt.title}</div>
-                          <div className="mt-0.5 text-xs text-muted-foreground">
-                            {opt.description}
-                          </div>
-                        </div>
-                      </div>
-                    </button>
-                  </PopoverClose>
-                ))}
-              </PopoverContent>
-            </Popover>
-          </div>
-        )}
-        {mergeUiState.kind === 'conflicts' && (
-          <div>
-            <Badge
-              variant="outline"
-              className="w-full justify-center text-xs text-muted-foreground"
-            >
-              Resolve merge conflicts before merging
-            </Badge>
-          </div>
-        )}
-      </div>
-    </div>
-  );
-}
-
-export default MergePrSection;
diff --git a/src/renderer/components/ModalRenderer.tsx b/src/renderer/components/ModalRenderer.tsx
deleted file mode 100644
index 22ba8d4220..0000000000
--- a/src/renderer/components/ModalRenderer.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import { Dialog } from '@/components/ui/dialog';
-import { useModalContext } from '@/contexts/ModalProvider';
-import { useMemo } from 'react';
-
-export function ModalRenderer() {
-  const { activeModalId, renderModal, closeModal } = useModalContext();
-  const content = useMemo(
-    () => (activeModalId ? renderModal() : null),
-    [renderModal, activeModalId]
-  );
-  return (
-    <Dialog
-      open={activeModalId !== null}
-      onOpenChange={(open) => {
-        if (!open && activeModalId !== null) {
-          closeModal();
-        }
-      }}
-    >
-      {content}
-    </Dialog>
-  );
-}
diff --git a/src/renderer/components/MultiAgentDropdown.tsx b/src/renderer/components/MultiAgentDropdown.tsx
deleted file mode 100644
index 6755562ebe..0000000000
--- a/src/renderer/components/MultiAgentDropdown.tsx
+++ /dev/null
@@ -1,281 +0,0 @@
-import React, { useState } from 'react';
-import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from './ui/select';
-import { TooltipProvider, Tooltip, TooltipTrigger, TooltipContent } from './ui/tooltip';
-import { Info, ExternalLink } from 'lucide-react';
-import { type Agent } from '../types';
-import { type AgentRun } from '../types/chat';
-import { agentConfig } from '../lib/agentConfig';
-import { AgentInfoCard } from './AgentInfoCard';
-import AgentLogo from './AgentLogo';
-import type { UiAgent } from '@/providers/meta';
-
-const MAX_RUNS = 4;
-
-interface MultiAgentDropdownProps {
-  agentRuns: AgentRun[];
-  onChange: (agentRuns: AgentRun[]) => void;
-  className?: string;
-  disabledAgents?: string[];
-}
-
-export const MultiAgentDropdown: React.FC<MultiAgentDropdownProps> = ({
-  agentRuns,
-  onChange,
-  className = '',
-  disabledAgents = [],
-}) => {
-  // Use agentConfig order directly (already properly ordered)
-  const sortedAgents = Object.entries(agentConfig);
-  const [open, setOpen] = useState(false);
-  const [hoveredAgent, setHoveredAgent] = useState<Agent | null>(null);
-  const [runsSelectOpenFor, setRunsSelectOpenFor] = useState<Agent | null>(null);
-
-  const selectedAgents = new Set(agentRuns.map((ar) => ar.agent));
-
-  // Checkbox: always add/remove (multi-select)
-  const toggleAgent = (agent: Agent) => {
-    // Don't allow toggling disabled agents
-    if (disabledAgents.includes(agent)) return;
-
-    if (selectedAgents.has(agent)) {
-      if (agentRuns.length > 1) {
-        onChange(agentRuns.filter((ar) => ar.agent !== agent));
-      }
-    } else {
-      onChange([...agentRuns, { agent, runs: 1 }]);
-    }
-  };
-
-  // Row click: switch when single, add when multiple
-  const handleRowClick = (agent: Agent) => {
-    // Don't allow clicking disabled agents
-    if (disabledAgents.includes(agent)) return;
-    if (selectedAgents.has(agent)) return;
-    if (agentRuns.length === 1) {
-      onChange([{ agent, runs: 1 }]);
-    } else {
-      onChange([...agentRuns, { agent, runs: 1 }]);
-    }
-  };
-
-  const updateRuns = (agent: Agent, runs: number) => {
-    onChange(agentRuns.map((ar) => (ar.agent === agent ? { ...ar, runs } : ar)));
-  };
-
-  const getAgentRuns = (agent: Agent): number => {
-    return agentRuns.find((ar) => ar.agent === agent)?.runs ?? 1;
-  };
-
-  // Build trigger text: "Cursor, Gemini (2x), ..." - only show runs if >1
-  const triggerText = agentRuns
-    .map((ar) => {
-      const name = agentConfig[ar.agent]?.name;
-      return ar.runs > 1 ? `${name} (${ar.runs}x)` : name;
-    })
-    .join(', ');
-
-  // Show logo only when single agent selected
-  const singleAgent = agentRuns.length === 1 ? agentRuns[0] : null;
-  const singleAgentConfig = singleAgent ? agentConfig[singleAgent.agent] : null;
-
-  return (
-    <TooltipProvider delayDuration={300}>
-      <Select
-        open={open}
-        onOpenChange={(isOpen) => {
-          setOpen(isOpen);
-          if (!isOpen) {
-            setHoveredAgent(null);
-            setRunsSelectOpenFor(null);
-          }
-        }}
-      >
-        <SelectTrigger
-          className={`flex h-9 w-full items-center justify-between border-none bg-muted px-3 text-sm ${className}`}
-        >
-          <div className="flex min-w-0 items-center gap-2">
-            {singleAgentConfig && (
-              <AgentLogo
-                logo={singleAgentConfig.logo}
-                alt={singleAgentConfig.alt}
-                isSvg={singleAgentConfig.isSvg}
-                invertInDark={singleAgentConfig.invertInDark}
-                className="h-4 w-4 flex-shrink-0 rounded-sm"
-              />
-            )}
-            <span className="truncate">{triggerText}</span>
-          </div>
-        </SelectTrigger>
-        <SelectContent
-          side="top"
-          className="z-[1000] max-h-80 w-[var(--radix-select-trigger-width)] overflow-y-auto p-1"
-        >
-          <TooltipProvider delayDuration={150}>
-            {sortedAgents.map(([key, config]) => {
-              const agent = key as Agent;
-              const isSelected = selectedAgents.has(agent);
-              const isLastSelected = isSelected && agentRuns.length === 1;
-              const isDisabled = disabledAgents.includes(agent);
-
-              return !isDisabled ? (
-                <AgentTooltipRow
-                  key={key}
-                  id={agent as UiAgent}
-                  isHovered={hoveredAgent === agent || runsSelectOpenFor === agent}
-                  onHover={() => setHoveredAgent(agent)}
-                  onLeave={() => {
-                    if (runsSelectOpenFor !== agent) {
-                      setHoveredAgent(null);
-                    }
-                  }}
-                >
-                  <div
-                    className="flex h-8 cursor-pointer items-center justify-between rounded-sm px-2 hover:bg-accent"
-                    onClick={() => handleRowClick(agent)}
-                  >
-                    <div className="flex flex-1 items-center gap-2">
-                      <input
-                        type="checkbox"
-                        checked={isSelected}
-                        disabled={isLastSelected}
-                        onChange={(e) => {
-                          e.stopPropagation();
-                          toggleAgent(agent);
-                        }}
-                        onClick={(e) => e.stopPropagation()}
-                        className="h-4 w-4 cursor-pointer"
-                      />
-                      <AgentLogo
-                        logo={config.logo}
-                        alt={config.alt}
-                        isSvg={config.isSvg}
-                        invertInDark={config.invertInDark}
-                        className="h-4 w-4 flex-shrink-0 rounded-sm"
-                      />
-                      <span className="text-sm">{config.name}</span>
-                    </div>
-                    {isSelected && (
-                      <div className="flex items-center gap-1">
-                        <Select
-                          value={String(getAgentRuns(agent))}
-                          onValueChange={(v) => updateRuns(agent, parseInt(v, 10))}
-                          onOpenChange={(isSelectOpen) => {
-                            setRunsSelectOpenFor(isSelectOpen ? agent : null);
-                          }}
-                        >
-                          <SelectTrigger
-                            className="h-6 w-auto gap-1 border-none bg-transparent p-0 text-sm shadow-none"
-                            title="Run up to 4 instances of this agent to compare different solutions"
-                          >
-                            <SelectValue />
-                          </SelectTrigger>
-                          <SelectContent side="right" className="z-[1001] min-w-[4rem]">
-                            {[1, 2, 3, 4].map((n) => (
-                              <SelectItem key={n} value={String(n)}>
-                                {n}x
-                              </SelectItem>
-                            ))}
-                          </SelectContent>
-                        </Select>
-                        <Tooltip>
-                          <TooltipTrigger asChild>
-                            <Info className="h-3 w-3 opacity-40 hover:opacity-60" />
-                          </TooltipTrigger>
-                          <TooltipContent
-                            side="top"
-                            className="z-[10000] max-w-xs"
-                            style={{ zIndex: 10000 }}
-                          >
-                            <p>
-                              Run up to {MAX_RUNS} instances of this agent to compare different
-                              solutions.{' '}
-                              <a
-                                href="https://docs.emdash.sh/best-of-n"
-                                target="_blank"
-                                rel="noopener noreferrer"
-                                className="inline-flex items-center gap-0.5 underline hover:opacity-70"
-                                onClick={(e) => e.stopPropagation()}
-                              >
-                                Docs
-                                <ExternalLink className="h-3 w-3" />
-                              </a>
-                            </p>
-                          </TooltipContent>
-                        </Tooltip>
-                      </div>
-                    )}
-                  </div>
-                </AgentTooltipRow>
-              ) : (
-                /* Disabled agents with tooltip */
-                <Tooltip key={key}>
-                  <TooltipTrigger asChild>
-                    <div className="flex h-8 cursor-not-allowed items-center justify-between rounded-sm px-2 opacity-50">
-                      <div className="flex flex-1 items-center gap-2">
-                        <input
-                          type="checkbox"
-                          checked={isSelected}
-                          disabled={true}
-                          className="h-4 w-4 cursor-not-allowed"
-                        />
-                        <AgentLogo
-                          logo={config.logo}
-                          alt={config.alt}
-                          isSvg={config.isSvg}
-                          invertInDark={config.invertInDark}
-                          className="h-4 w-4 flex-shrink-0 rounded-sm"
-                          grayscale
-                        />
-                        <span className="text-sm text-muted-foreground">
-                          {config.name}
-                          <span className="ml-1 text-xs">(in use)</span>
-                        </span>
-                      </div>
-                    </div>
-                  </TooltipTrigger>
-                  <TooltipContent side="right" className="z-[10000]" style={{ zIndex: 10000 }}>
-                    <p className="text-xs">This agent already has an active chat in this task</p>
-                  </TooltipContent>
-                </Tooltip>
-              );
-            })}
-          </TooltipProvider>
-        </SelectContent>
-      </Select>
-    </TooltipProvider>
-  );
-};
-
-const AgentTooltipRow: React.FC<{
-  id: UiAgent;
-  children: React.ReactElement;
-  isHovered: boolean;
-  onHover: () => void;
-  onLeave: () => void;
-}> = ({ id, children, isHovered, onHover, onLeave }) => {
-  return (
-    <Tooltip open={isHovered}>
-      <TooltipTrigger asChild>
-        {React.cloneElement(children, {
-          onMouseEnter: onHover,
-          onMouseLeave: onLeave,
-          onPointerEnter: onHover,
-          onPointerLeave: onLeave,
-        })}
-      </TooltipTrigger>
-      <TooltipContent
-        side="left"
-        align="start"
-        className="z-[1000] border-foreground/20 bg-background p-0 text-foreground"
-        onMouseEnter={onHover}
-        onMouseLeave={onLeave}
-        onPointerEnter={onHover}
-        onPointerLeave={onLeave}
-      >
-        <AgentInfoCard id={id} />
-      </TooltipContent>
-    </Tooltip>
-  );
-};
-
-export default MultiAgentDropdown;
diff --git a/src/renderer/components/MultiAgentTask.tsx b/src/renderer/components/MultiAgentTask.tsx
deleted file mode 100644
index 65af24491d..0000000000
--- a/src/renderer/components/MultiAgentTask.tsx
+++ /dev/null
@@ -1,663 +0,0 @@
-import React, { useEffect, useMemo, useRef, useState } from 'react';
-import { type Task } from '../types/chat';
-import { type Agent } from '../types';
-import { Button } from './ui/button';
-import { Input } from './ui/input';
-import OpenInMenu from './titlebar/OpenInMenu';
-import { TerminalPane } from './TerminalPane';
-import { agentMeta } from '@/providers/meta';
-import { agentAssets } from '@/providers/assets';
-import AgentLogo from './AgentLogo';
-import { useTheme } from '@/hooks/useTheme';
-import { classifyActivity } from '@/lib/activityClassifier';
-import { activityStore } from '@/lib/activityStore';
-import { Spinner } from './ui/spinner';
-import { BUSY_HOLD_MS, CLEAR_BUSY_MS, INJECT_ENTER_DELAY_MS } from '@/lib/activityConstants';
-import { CornerDownLeft } from 'lucide-react';
-import { TooltipProvider, Tooltip, TooltipTrigger, TooltipContent } from './ui/tooltip';
-import { useAutoScrollOnTaskSwitch } from '@/hooks/useAutoScrollOnTaskSwitch';
-import { getTaskEnvVars } from '@shared/task/envVars';
-import { rpc } from '@/lib/rpc';
-
-interface Props {
-  task: Task;
-  projectName: string;
-  projectId: string;
-  projectPath?: string | null;
-  projectRemoteConnectionId?: string | null;
-  projectRemotePath?: string | null;
-  defaultBranch?: string | null;
-  onTaskInterfaceReady?: () => void;
-}
-
-type Variant = {
-  id: string;
-  agent: Agent;
-  name: string;
-  branch: string;
-  path: string;
-  worktreeId: string;
-};
-
-const MultiAgentTask: React.FC<Props> = ({
-  task,
-  projectPath,
-  projectRemoteConnectionId,
-  projectRemotePath: _projectRemotePath,
-  defaultBranch,
-  onTaskInterfaceReady,
-}) => {
-  const { effectiveTheme } = useTheme();
-  const [prompt, setPrompt] = useState('');
-  const [activeTabIndex, setActiveTabIndex] = useState(0);
-  const [variantBusy, setVariantBusy] = useState<Record<string, boolean>>({});
-  const multi = task.metadata?.multiAgent;
-  const variants = (multi?.variants || []) as Variant[];
-
-  const variantEnvs = useMemo(() => {
-    if (!projectPath) return new Map<string, Record<string, string>>();
-    const envMap = new Map<string, Record<string, string>>();
-    for (const variant of variants) {
-      const key = variant.worktreeId || variant.path;
-      envMap.set(
-        key,
-        getTaskEnvVars({
-          taskId: task.id,
-          taskName: variant.name || task.name,
-          taskPath: variant.path,
-          projectPath,
-          defaultBranch: defaultBranch || undefined,
-          portSeed: key,
-        })
-      );
-    }
-    return envMap;
-  }, [variants, task.id, task.name, projectPath, defaultBranch]);
-
-  // Auto-scroll to bottom when this task becomes active
-  const { scrollToBottom } = useAutoScrollOnTaskSwitch(true, task.id);
-
-  const readySignaledTaskIdRef = useRef<string | null>(null);
-  useEffect(() => {
-    if (!onTaskInterfaceReady) return;
-    if (variants.length === 0) return;
-    if (readySignaledTaskIdRef.current === task.id) return;
-    readySignaledTaskIdRef.current = task.id;
-    onTaskInterfaceReady();
-  }, [task.id, variants.length, onTaskInterfaceReady]);
-
-  // Helper to generate display label with instance number if needed
-  const getVariantDisplayLabel = (variant: Variant): string => {
-    const meta = agentMeta[variant.agent];
-    const baseName = meta?.label || variant.agent;
-
-    // Count how many variants use this agent
-    const agentVariants = variants.filter((v) => v.agent === variant.agent);
-
-    // If only one instance of this agent, just show base name
-    if (agentVariants.length === 1) {
-      return baseName;
-    }
-
-    // Multiple instances: extract instance number from variant name
-    // variant.name format: "task-agent-1", "task-agent-2", etc.
-    const match = variant.name.match(/-(\d+)$/);
-    const instanceNum = match ? match[1] : String(agentVariants.indexOf(variant) + 1);
-
-    return `${baseName} #${instanceNum}`;
-  };
-
-  // Build initial issue context (feature parity with single-agent ChatInterface)
-  const initialInjection: string | null = useMemo(() => {
-    const md: any = task.metadata || null;
-    if (!md) return null;
-    const p = (md.initialPrompt || '').trim();
-    if (p) return p;
-    // Linear
-    const issue = md.linearIssue;
-    if (issue) {
-      const parts: string[] = [];
-      const line1 = `Linked Linear issue: ${issue.identifier}${issue.title ? ` — ${issue.title}` : ''}`;
-      parts.push(line1);
-      const details: string[] = [];
-      if (issue.state?.name) details.push(`State: ${issue.state.name}`);
-      if (issue.assignee?.displayName || issue.assignee?.name)
-        details.push(`Assignee: ${issue.assignee?.displayName || issue.assignee?.name}`);
-      if (issue.team?.key) details.push(`Team: ${issue.team.key}`);
-      if (issue.project?.name) details.push(`Project: ${issue.project.name}`);
-      if (details.length) parts.push(`Details: ${details.join(' • ')}`);
-      if (issue.url) parts.push(`URL: ${issue.url}`);
-      const desc = (issue as any)?.description;
-      if (typeof desc === 'string' && desc.trim()) {
-        const trimmed = desc.trim();
-        const max = 1500;
-        const body = trimmed.length > max ? trimmed.slice(0, max) + '\n…' : trimmed;
-        parts.push('', 'Issue Description:', body);
-      }
-      return parts.join('\n');
-    }
-    // GitHub
-    const gh = (md as any)?.githubIssue as
-      | {
-          number: number;
-          title?: string;
-          url?: string;
-          state?: string;
-          assignees?: any[];
-          labels?: any[];
-          body?: string;
-        }
-      | undefined;
-    if (gh) {
-      const parts: string[] = [];
-      const line1 = `Linked GitHub issue: #${gh.number}${gh.title ? ` — ${gh.title}` : ''}`;
-      parts.push(line1);
-      const details: string[] = [];
-      if (gh.state) details.push(`State: ${gh.state}`);
-      try {
-        const as = Array.isArray(gh.assignees)
-          ? gh.assignees
-              .map((a: any) => a?.name || a?.login)
-              .filter(Boolean)
-              .join(', ')
-          : '';
-        if (as) details.push(`Assignees: ${as}`);
-      } catch {}
-      try {
-        const ls = Array.isArray(gh.labels)
-          ? gh.labels
-              .map((l: any) => l?.name)
-              .filter(Boolean)
-              .join(', ')
-          : '';
-        if (ls) details.push(`Labels: ${ls}`);
-      } catch {}
-      if (details.length) parts.push(`Details: ${details.join(' • ')}`);
-      if (gh.url) parts.push(`URL: ${gh.url}`);
-      const body = typeof gh.body === 'string' ? gh.body.trim() : '';
-      if (body) {
-        const max = 1500;
-        const clipped = body.length > max ? body.slice(0, max) + '\n…' : body;
-        parts.push('', 'Issue Description:', clipped);
-      }
-      return parts.join('\n');
-    }
-    // Jira
-    const j = md?.jiraIssue as any;
-    if (j) {
-      const lines: string[] = [];
-      const l1 = `Linked Jira issue: ${j.key}${j.summary ? ` — ${j.summary}` : ''}`;
-      lines.push(l1);
-      const details: string[] = [];
-      if (j.status?.name) details.push(`Status: ${j.status.name}`);
-      if (j.assignee?.displayName || j.assignee?.name)
-        details.push(`Assignee: ${j.assignee?.displayName || j.assignee?.name}`);
-      if (j.project?.key) details.push(`Project: ${j.project.key}`);
-      if (details.length) lines.push(`Details: ${details.join(' • ')}`);
-      if (j.url) lines.push(`URL: ${j.url}`);
-      return lines.join('\n');
-    }
-    return null;
-  }, [task.metadata]);
-
-  const injectPrompt = async (ptyId: string, agent: Agent, text: string) => {
-    const trimmed = (text || '').trim();
-    if (!trimmed) return;
-    let sent = false;
-    let silenceTimer: any = null;
-    const send = () => {
-      if (sent) return;
-      sent = true;
-      try {
-        const pty = (window as any).electronAPI?.ptyInput;
-        if (!pty) return;
-        // Send text + line endings first so the TUI displays the input,
-        // then send a bare \r after a short delay to submit.  Sending
-        // Enter separately prevents TUI "paste-detection" from swallowing it.
-        pty({ id: ptyId, data: trimmed + '\r\n' });
-        setTimeout(() => {
-          pty({ id: ptyId, data: '\r' });
-        }, INJECT_ENTER_DELAY_MS);
-      } catch {}
-    };
-    const offData = (window as any).electronAPI?.onPtyData?.(ptyId, (chunk: string) => {
-      if (silenceTimer) clearTimeout(silenceTimer);
-      silenceTimer = setTimeout(() => {
-        if (!sent) send();
-      }, 1000);
-      try {
-        const signal = classifyActivity(agent, chunk);
-        if (signal === 'idle' && !sent) {
-          setTimeout(send, 200);
-        }
-      } catch {}
-    });
-    const offStarted = (window as any).electronAPI?.onPtyStarted?.((info: { id: string }) => {
-      if (info?.id === ptyId) {
-        if (silenceTimer) clearTimeout(silenceTimer);
-        silenceTimer = setTimeout(() => {
-          if (!sent) send();
-        }, 1500);
-      }
-    });
-    // Fallback in case no events arrive
-    // Try once shortly in case PTY is already interactive
-    const eager = setTimeout(() => {
-      if (!sent) send();
-    }, 300);
-
-    const hard = setTimeout(() => {
-      if (!sent) send();
-    }, 5000);
-    // Give the injector a brief window; cleanup shortly after send
-    setTimeout(() => {
-      clearTimeout(eager);
-      clearTimeout(hard);
-      if (silenceTimer) clearTimeout(silenceTimer);
-      offData?.();
-      offStarted?.();
-    }, 6000);
-  };
-
-  const handleRunAll = async () => {
-    const msg = prompt.trim();
-    if (!msg) return;
-    // Send concurrently via PTY injection for all agents (Codex/Claude included)
-    const tasks: Promise<any>[] = [];
-    variants.forEach((v) => {
-      const termId = `${v.worktreeId}-main`;
-      tasks.push(injectPrompt(termId, v.agent, msg));
-    });
-    await Promise.all(tasks);
-    setPrompt('');
-  };
-
-  // Track per-variant activity so we can render a spinner on the tabs
-  useEffect(() => {
-    if (!variants.length) {
-      setVariantBusy({});
-      return;
-    }
-
-    // Keep busy state only for currently mounted variants
-    setVariantBusy((prev) => {
-      const next: Record<string, boolean> = {};
-      variants.forEach((v) => {
-        next[v.worktreeId] = prev[v.worktreeId] ?? false;
-      });
-      return next;
-    });
-
-    const timers = new Map<string, ReturnType<typeof setTimeout>>();
-    const busySince = new Map<string, number>();
-    const busyState = new Map<string, boolean>();
-
-    const publish = (variantId: string, busy: boolean) => {
-      busyState.set(variantId, busy);
-      setVariantBusy((prev) => {
-        if (prev[variantId] === busy) return prev;
-        return { ...prev, [variantId]: busy };
-      });
-    };
-
-    const clearTimer = (variantId: string) => {
-      const t = timers.get(variantId);
-      if (t) clearTimeout(t);
-      timers.delete(variantId);
-    };
-
-    const setBusy = (variantId: string, busy: boolean) => {
-      const current = busyState.get(variantId) || false;
-      if (busy) {
-        clearTimer(variantId);
-        busySince.set(variantId, Date.now());
-        if (!current) publish(variantId, true);
-        return;
-      }
-
-      const started = busySince.get(variantId) || 0;
-      const elapsed = started ? Date.now() - started : BUSY_HOLD_MS;
-      const remaining = elapsed < BUSY_HOLD_MS ? BUSY_HOLD_MS - elapsed : 0;
-
-      const clearNow = () => {
-        clearTimer(variantId);
-        busySince.delete(variantId);
-        if (busyState.get(variantId) !== false) publish(variantId, false);
-      };
-
-      if (remaining > 0) {
-        clearTimer(variantId);
-        timers.set(variantId, setTimeout(clearNow, remaining));
-      } else {
-        clearNow();
-      }
-    };
-
-    const armNeutral = (variantId: string) => {
-      if (!busyState.get(variantId)) return;
-      clearTimer(variantId);
-      timers.set(
-        variantId,
-        setTimeout(() => setBusy(variantId, false), CLEAR_BUSY_MS)
-      );
-    };
-
-    const cleanups: Array<() => void> = [];
-
-    variants.forEach((variant) => {
-      const variantId = variant.worktreeId;
-      const ptyId = `${variant.worktreeId}-main`;
-      busyState.set(variantId, variantBusy[variantId] ?? false);
-
-      const offData = (window as any).electronAPI?.onPtyData?.(ptyId, (chunk: string) => {
-        try {
-          const signal = classifyActivity(variant.agent, chunk || '');
-          if (signal === 'busy') setBusy(variantId, true);
-          else if (signal === 'idle') setBusy(variantId, false);
-          else armNeutral(variantId);
-        } catch {
-          // ignore classification failures
-        }
-      });
-      if (offData) cleanups.push(offData);
-
-      const offExit = (window as any).electronAPI?.onPtyExit?.(ptyId, () => {
-        setBusy(variantId, false);
-      });
-      if (offExit) cleanups.push(offExit);
-    });
-
-    return () => {
-      cleanups.forEach((off) => {
-        try {
-          off?.();
-        } catch {}
-      });
-      timers.forEach((t) => clearTimeout(t));
-      timers.clear();
-      busySince.clear();
-      busyState.clear();
-    };
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [variants]);
-
-  // Prefill the top input with the prepared issue context once
-  const prefillOnceRef = useRef(false);
-  useEffect(() => {
-    if (prefillOnceRef.current) return;
-    const text = (initialInjection || '').trim();
-    if (text && !prompt) {
-      setPrompt(text);
-    }
-    prefillOnceRef.current = true;
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [initialInjection]);
-
-  // Sync variant busy state to activityStore for sidebar indicator
-  useEffect(() => {
-    const anyBusy = Object.values(variantBusy).some(Boolean);
-    activityStore.setTaskBusy(task.id, anyBusy);
-  }, [variantBusy, task.id]);
-
-  // Ref to the active terminal
-  const activeTerminalRef = useRef<{ focus: () => void }>(null);
-
-  // Auto-scroll and focus when task or active tab changes
-  useEffect(() => {
-    if (variants.length > 0 && activeTabIndex >= 0 && activeTabIndex < variants.length) {
-      // Small delay to ensure the tab content is rendered
-      const timeout = setTimeout(() => {
-        scrollToBottom({ onlyIfNearTop: true });
-        // Focus the active terminal when switching tabs
-        activeTerminalRef.current?.focus();
-      }, 150);
-
-      return () => clearTimeout(timeout);
-    }
-  }, [task.id, activeTabIndex, variants.length, scrollToBottom]);
-
-  useEffect(() => {
-    let mounted = true;
-    let timer: ReturnType<typeof setTimeout> | null = null;
-    const handleWindowFocus = () => {
-      timer = setTimeout(() => {
-        timer = null;
-        if (!mounted) return;
-        activeTerminalRef.current?.focus();
-      }, 0);
-    };
-    window.addEventListener('focus', handleWindowFocus);
-    return () => {
-      mounted = false;
-      if (timer !== null) clearTimeout(timer);
-      window.removeEventListener('focus', handleWindowFocus);
-    };
-  }, []);
-
-  // Switch active agent tab via global shortcuts (Cmd+Shift+J/K)
-  useEffect(() => {
-    const handleAgentSwitch = (event: Event) => {
-      const customEvent = event as CustomEvent<{ direction: 'next' | 'prev' }>;
-      if (variants.length <= 1) return;
-      const direction = customEvent.detail?.direction;
-      if (!direction) return;
-
-      setActiveTabIndex((current) => {
-        if (variants.length <= 1) return current;
-        if (direction === 'prev') {
-          return current <= 0 ? variants.length - 1 : current - 1;
-        }
-        return (current + 1) % variants.length;
-      });
-    };
-
-    window.addEventListener('emdash:switch-agent', handleAgentSwitch);
-    return () => {
-      window.removeEventListener('emdash:switch-agent', handleAgentSwitch);
-    };
-  }, [variants.length]);
-
-  if (!multi?.enabled) {
-    return (
-      <div className="flex h-full items-center justify-center text-sm text-muted-foreground">
-        Multi-agent config missing for this task.
-      </div>
-    );
-  }
-
-  if (variants.length === 0) {
-    return <div className="h-full" />;
-  }
-
-  return (
-    <div className="relative flex h-full flex-col">
-      {variants.map((v, idx) => {
-        const isDark = effectiveTheme === 'dark' || effectiveTheme === 'dark-black';
-        const isActive = idx === activeTabIndex;
-        return (
-          <div
-            key={v.worktreeId}
-            className={`flex-1 overflow-hidden ${isActive ? '' : 'invisible absolute inset-0'}`}
-          >
-            <div className="flex h-full flex-col">
-              <div className="flex items-center justify-end gap-2 px-3 py-1.5">
-                <OpenInMenu
-                  path={v.path}
-                  isRemote={!!projectRemoteConnectionId}
-                  sshConnectionId={projectRemoteConnectionId}
-                  isActive={isActive}
-                />
-              </div>
-              <div className="mt-2 flex items-center justify-center px-4 py-2">
-                <TooltipProvider delayDuration={250}>
-                  <div className="flex items-center gap-2">
-                    {variants.map((variant, tabIdx) => {
-                      const asset = agentAssets[variant.agent];
-                      const meta = agentMeta[variant.agent];
-                      const isTabActive = tabIdx === activeTabIndex;
-                      return (
-                        <Tooltip key={variant.worktreeId}>
-                          <TooltipTrigger asChild>
-                            <button
-                              type="button"
-                              onClick={() => setActiveTabIndex(tabIdx)}
-                              className={`inline-flex h-8 items-center gap-2 rounded-md px-3 text-xs font-medium transition-all ${
-                                isTabActive
-                                  ? 'border-2 border-foreground/30 bg-background text-foreground shadow-sm'
-                                  : 'border border-border/50 bg-transparent text-muted-foreground hover:border-border/70 hover:bg-background/50 hover:text-foreground'
-                              }`}
-                            >
-                              {asset?.logo ? (
-                                <AgentLogo
-                                  logo={asset.logo}
-                                  alt={asset.alt || meta?.label || variant.agent}
-                                  isSvg={asset.isSvg}
-                                  invertInDark={asset.invertInDark}
-                                  className="h-4 w-4 shrink-0"
-                                />
-                              ) : null}
-                              <span>{getVariantDisplayLabel(variant)}</span>
-                              {variantBusy[variant.worktreeId] ? (
-                                <Spinner
-                                  size="sm"
-                                  className={
-                                    isTabActive ? 'text-foreground' : 'text-muted-foreground'
-                                  }
-                                />
-                              ) : null}
-                            </button>
-                          </TooltipTrigger>
-                          <TooltipContent>
-                            <p>{variant.name}</p>
-                          </TooltipContent>
-                        </Tooltip>
-                      );
-                    })}
-                  </div>
-                </TooltipProvider>
-              </div>
-              <div className="min-h-0 flex-1 px-6 pt-4">
-                <div
-                  className={`mx-auto h-full max-w-4xl overflow-hidden rounded-md ${
-                    v.agent === 'mistral'
-                      ? isDark
-                        ? 'bg-[#202938]'
-                        : 'bg-white'
-                      : isDark
-                        ? 'bg-card'
-                        : 'bg-white'
-                  }`}
-                >
-                  <TerminalPane
-                    ref={isActive ? activeTerminalRef : undefined}
-                    id={`${v.worktreeId}-main`}
-                    cwd={v.path}
-                    remote={
-                      projectRemoteConnectionId
-                        ? { connectionId: projectRemoteConnectionId }
-                        : undefined
-                    }
-                    providerId={v.agent}
-                    env={variantEnvs.get(v.worktreeId || v.path)}
-                    autoApprove={
-                      Boolean(task.metadata?.autoApprove) &&
-                      Boolean(agentMeta[v.agent]?.autoApproveFlag)
-                    }
-                    initialPrompt={
-                      agentMeta[v.agent]?.initialPromptFlag !== undefined &&
-                      !agentMeta[v.agent]?.useKeystrokeInjection &&
-                      !task.metadata?.initialInjectionSent
-                        ? (initialInjection ?? undefined)
-                        : undefined
-                    }
-                    keepAlive
-                    mapShiftEnterToCtrlJ
-                    variant={isDark ? 'dark' : 'light'}
-                    themeOverride={
-                      v.agent === 'mistral'
-                        ? {
-                            background:
-                              effectiveTheme === 'dark-black'
-                                ? '#141820'
-                                : isDark
-                                  ? '#202938'
-                                  : '#ffffff',
-                            selectionBackground: 'rgba(96, 165, 250, 0.35)',
-                            selectionForeground: isDark ? '#f9fafb' : '#0f172a',
-                          }
-                        : effectiveTheme === 'dark-black'
-                          ? {
-                              background: '#000000',
-                              selectionBackground: 'rgba(96, 165, 250, 0.35)',
-                              selectionForeground: '#f9fafb',
-                            }
-                          : undefined
-                    }
-                    className="h-full w-full"
-                    onStartSuccess={() => {
-                      // For agents WITHOUT CLI flag support or with keystroke injection, type prompt in
-                      if (
-                        initialInjection &&
-                        !task.metadata?.initialInjectionSent &&
-                        (agentMeta[v.agent]?.initialPromptFlag === undefined ||
-                          agentMeta[v.agent]?.useKeystrokeInjection)
-                      ) {
-                        void injectPrompt(`${v.worktreeId}-main`, v.agent, initialInjection);
-                      }
-                      // Mark initial injection as sent so it won't re-run on restart
-                      if (initialInjection && !task.metadata?.initialInjectionSent) {
-                        void rpc.db.saveTask({
-                          ...task,
-                          metadata: {
-                            ...task.metadata,
-                            initialInjectionSent: true,
-                          },
-                        });
-                      }
-                    }}
-                  />
-                </div>
-              </div>
-            </div>
-          </div>
-        );
-      })}
-
-      <div className="px-6 pb-6 pt-4">
-        <div className="mx-auto max-w-4xl">
-          <div className="relative rounded-md border border-border bg-white shadow-lg dark:border-border dark:bg-card">
-            <div className="flex items-center gap-2 rounded-md px-4 py-3">
-              <Input
-                className="h-9 flex-1 border-border bg-muted dark:border-border dark:bg-muted"
-                placeholder="Tell the agents what to do..."
-                value={prompt}
-                onChange={(e) => setPrompt(e.target.value)}
-                onKeyDown={(e) => {
-                  if (e.key === 'Enter' && !e.shiftKey) {
-                    e.preventDefault();
-                    if (prompt.trim()) {
-                      void handleRunAll();
-                    }
-                  }
-                }}
-              />
-              <Button
-                variant="outline"
-                size="sm"
-                className="h-9 border border-border bg-muted px-3 text-xs font-medium hover:bg-muted dark:border-border dark:bg-muted dark:hover:bg-muted"
-                onClick={handleRunAll}
-                disabled={!prompt.trim()}
-                title="Run in all panes (Enter)"
-                aria-label="Run in all panes"
-              >
-                <CornerDownLeft className="h-4 w-4" />
-              </Button>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  );
-};
-
-export default MultiAgentTask;
diff --git a/src/renderer/components/NewProjectModal.tsx b/src/renderer/components/NewProjectModal.tsx
deleted file mode 100644
index a361e4f425..0000000000
--- a/src/renderer/components/NewProjectModal.tsx
+++ /dev/null
@@ -1,288 +0,0 @@
-import React, { useCallback, useEffect, useState, useRef } from 'react';
-import { Button } from './ui/button';
-import { DialogContent, DialogHeader, DialogTitle } from './ui/dialog';
-import { Input } from './ui/input';
-import { SlugInput } from './ui/slug-input';
-import { Label } from './ui/label';
-import { RadioGroup, RadioGroupItem } from './ui/radio-group';
-import { Spinner } from './ui/spinner';
-import { Separator } from './ui/separator';
-
-interface NewProjectModalProps {
-  onClose: () => void;
-  onSuccess: (projectPath: string) => void;
-}
-
-interface Owner {
-  login: string;
-  type: 'User' | 'Organization';
-}
-
-export const NewProjectModal: React.FC<NewProjectModalProps> = ({ onClose, onSuccess }) => {
-  const [repoName, setRepoName] = useState('');
-  const [description, setDescription] = useState('');
-  const [owner, setOwner] = useState<string>('');
-  const [_owners, setOwners] = useState<Owner[]>([]);
-  const [isPrivate, setIsPrivate] = useState(false);
-  const [isCreating, setIsCreating] = useState(false);
-  const [error, setError] = useState<string | null>(null);
-  const [validationError, setValidationError] = useState<string | null>(null);
-  const [isValidating, setIsValidating] = useState(false);
-  const [progress, setProgress] = useState<string>('');
-  const [touched, setTouched] = useState(false);
-  const validationTimeoutRef = useRef<NodeJS.Timeout | null>(null);
-
-  // Load owners on mount
-  useEffect(() => {
-    let cancel = false;
-    (async () => {
-      try {
-        const result = await window.electronAPI.githubGetOwners();
-        if (cancel) return;
-        if (result.success && result.owners) {
-          setOwners(result.owners);
-          // Set default owner to current user
-          const user = result.owners.find((o) => o.type === 'User');
-          if (user) {
-            setOwner(user.login);
-          }
-        }
-      } catch (error) {
-        console.error('Failed to load owners:', error);
-      }
-    })();
-
-    return () => {
-      cancel = true;
-    };
-  }, []);
-
-  // Reset form on mount
-  useEffect(() => {
-    setRepoName('');
-    setDescription('');
-    setIsPrivate(false);
-    setError(null);
-    setValidationError(null);
-    setIsValidating(false);
-    setProgress('');
-    setTouched(false);
-  }, []);
-
-  // Validate repository name
-  useEffect(() => {
-    if (!repoName.trim() || !owner) {
-      setValidationError(null);
-      return;
-    }
-
-    // Clear existing timeout
-    if (validationTimeoutRef.current) {
-      clearTimeout(validationTimeoutRef.current);
-    }
-
-    setIsValidating(true);
-    validationTimeoutRef.current = setTimeout(async () => {
-      try {
-        const result = await window.electronAPI.githubValidateRepoName(repoName.trim(), owner);
-        setIsValidating(false);
-        if (!result.success || !result.valid) {
-          setValidationError(result.error || 'Invalid repository name');
-        } else if (result.exists) {
-          setValidationError(`Repository ${owner}/${repoName.trim()} already exists`);
-        } else {
-          setValidationError(null);
-        }
-      } catch (error) {
-        setIsValidating(false);
-        setValidationError(null); // Don't block on validation errors
-      }
-    }, 500); // Debounce 500ms
-
-    return () => {
-      if (validationTimeoutRef.current) {
-        clearTimeout(validationTimeoutRef.current);
-      }
-    };
-  }, [repoName, owner]);
-
-  const handleSubmit = useCallback(
-    async (e: React.FormEvent) => {
-      e.preventDefault();
-      setTouched(true);
-      setError(null);
-
-      if (!repoName.trim()) {
-        setError('Repository name is required');
-        return;
-      }
-
-      if (validationError) {
-        setError(validationError);
-        return;
-      }
-
-      if (!owner) {
-        setError('Unable to determine GitHub account. Please ensure you are authenticated.');
-        return;
-      }
-
-      setIsCreating(true);
-      setProgress('Creating repository on GitHub...');
-
-      try {
-        const result = await window.electronAPI.githubCreateNewProject({
-          name: repoName.trim(),
-          description: description.trim() || undefined,
-          owner,
-          isPrivate,
-        });
-
-        if (result.success && result.projectPath) {
-          setProgress('Repository created successfully! Adding to workspace...');
-          // Brief delay to show success message
-          await new Promise((resolve) => setTimeout(resolve, 500));
-          onSuccess(result.projectPath);
-          onClose();
-        } else {
-          let errorMessage = result.error || 'Failed to create project';
-          if (result.githubRepoCreated && result.repoUrl) {
-            errorMessage += `\n\nNote: The GitHub repository was created but setup failed. You can clone it manually: ${result.repoUrl}`;
-          }
-          setError(errorMessage);
-          setProgress('');
-        }
-      } catch (error) {
-        setError(error instanceof Error ? error.message : 'Failed to create project');
-        setProgress('');
-      } finally {
-        setIsCreating(false);
-      }
-    },
-    [repoName, description, owner, isPrivate, validationError, onSuccess, onClose]
-  );
-
-  return (
-    <DialogContent
-      className="max-w-md"
-      onInteractOutside={(e) => {
-        if (isCreating) e.preventDefault();
-      }}
-      onEscapeKeyDown={(e) => {
-        if (isCreating) e.preventDefault();
-      }}
-    >
-      <DialogHeader>
-        <DialogTitle>New Project</DialogTitle>
-      </DialogHeader>
-
-      <Separator />
-
-      {isCreating && progress ? (
-        <div className="space-y-4 py-4">
-          <div className="flex items-center gap-3">
-            <Spinner size="sm" />
-            <div className="flex-1">
-              <p className="text-sm font-medium">{progress}</p>
-              <p className="text-xs text-muted-foreground">This may take a few seconds...</p>
-            </div>
-          </div>
-        </div>
-      ) : (
-        <form onSubmit={handleSubmit} className="space-y-4">
-          <div>
-            <Label htmlFor="repo-name" className="mb-2 block">
-              Repository name <span className="text-destructive">*</span>
-            </Label>
-            <SlugInput
-              id="repo-name"
-              value={repoName}
-              onChange={setRepoName}
-              onBlur={() => setTouched(true)}
-              placeholder="my-awesome-project"
-              maxLength={100}
-              className={`w-full ${
-                touched && (error || validationError)
-                  ? 'border-destructive focus-visible:border-destructive focus-visible:ring-destructive'
-                  : ''
-              }`}
-              aria-invalid={touched && !!(error || validationError)}
-              disabled={isCreating}
-              autoFocus
-            />
-            {touched && (validationError || error) && (
-              <div className="mt-1">
-                <p className="text-xs text-destructive">{validationError || error}</p>
-              </div>
-            )}
-          </div>
-
-          <div>
-            <Label htmlFor="description" className="mb-2 block">
-              Description
-            </Label>
-            <Input
-              id="description"
-              value={description}
-              onChange={(e) => setDescription(e.target.value)}
-              placeholder="A brief description of your project"
-              disabled={isCreating}
-            />
-          </div>
-
-          <div>
-            <Label className="mb-2 block">Visibility</Label>
-            <RadioGroup
-              value={isPrivate ? 'private' : 'public'}
-              onValueChange={(value: string) => setIsPrivate(value === 'private')}
-              disabled={isCreating}
-              className="flex items-center gap-4"
-            >
-              <div className="flex items-center space-x-2">
-                <RadioGroupItem value="public" id="visibility-public" />
-                <Label htmlFor="visibility-public" className="cursor-pointer font-normal">
-                  Public
-                </Label>
-              </div>
-              <div className="flex items-center space-x-2">
-                <RadioGroupItem value="private" id="visibility-private" />
-                <Label htmlFor="visibility-private" className="cursor-pointer font-normal">
-                  Private
-                </Label>
-              </div>
-            </RadioGroup>
-          </div>
-
-          {error && !validationError && (
-            <div className="rounded-md bg-destructive/10 p-3 text-sm text-destructive">
-              {error.split('\n').map((line, i) => (
-                <p key={i}>{line}</p>
-              ))}
-            </div>
-          )}
-
-          <div className="flex justify-end gap-2">
-            <Button type="button" variant="outline" onClick={onClose} disabled={isCreating}>
-              Cancel
-            </Button>
-            <Button
-              type="submit"
-              disabled={
-                !!validationError || !repoName.trim() || !owner || isCreating || isValidating
-              }
-            >
-              {isCreating ? (
-                <>
-                  <Spinner size="sm" className="mr-2" />
-                  Creating...
-                </>
-              ) : (
-                'Create Project'
-              )}
-            </Button>
-          </div>
-        </form>
-      )}
-    </DialogContent>
-  );
-};
diff --git a/src/renderer/components/NotificationSettingsCard.tsx b/src/renderer/components/NotificationSettingsCard.tsx
deleted file mode 100644
index 1692a5ab79..0000000000
--- a/src/renderer/components/NotificationSettingsCard.tsx
+++ /dev/null
@@ -1,90 +0,0 @@
-import React from 'react';
-import { Switch } from './ui/switch';
-import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from './ui/select';
-import { cn } from '@/lib/utils';
-import { useAppSettings } from '@/contexts/AppSettingsProvider';
-
-const NotificationSettingsCard: React.FC = () => {
-  const { settings, updateSettings, isLoading: loading } = useAppSettings();
-
-  const { notifications } = settings ?? {};
-
-  return (
-    <div className="flex flex-col gap-4">
-      {/* Master toggle */}
-      <div className="flex items-center justify-between gap-4">
-        <div className="flex flex-1 flex-col gap-0.5">
-          <p className="text-sm font-medium text-foreground">Notifications</p>
-          <p className="text-sm text-muted-foreground">
-            Get notified when agents need your attention.
-          </p>
-        </div>
-        <Switch
-          checked={notifications?.enabled ?? true}
-          disabled={loading}
-          onCheckedChange={(next) => updateSettings({ notifications: { enabled: next } })}
-        />
-      </div>
-
-      {/* Sub-settings */}
-      <div
-        className={cn(
-          'flex flex-col gap-3 pl-1',
-          !notifications?.enabled && 'pointer-events-none opacity-50'
-        )}
-      >
-        {/* Sound toggle */}
-        <div className="flex items-center justify-between gap-4">
-          <div className="flex flex-1 flex-col gap-0.5">
-            <p className="text-sm font-medium text-foreground">Sound</p>
-            <p className="text-sm text-muted-foreground">Play audio cues for agent events.</p>
-          </div>
-          <Switch
-            checked={notifications?.sound ?? true}
-            disabled={loading}
-            onCheckedChange={(next) => updateSettings({ notifications: { sound: next } })}
-          />
-        </div>
-
-        {/* Sound timing */}
-        <div className="flex items-center justify-between gap-4">
-          <div className="flex flex-1 flex-col gap-0.5">
-            <p className="text-sm font-medium text-foreground">Sound timing</p>
-            <p className="text-sm text-muted-foreground">When to play sounds.</p>
-          </div>
-          <Select
-            value={notifications?.soundFocusMode ?? 'always'}
-            onValueChange={(next) =>
-              updateSettings({ notifications: { soundFocusMode: next as 'always' | 'unfocused' } })
-            }
-          >
-            <SelectTrigger className="w-auto shrink-0 gap-2 [&>span]:line-clamp-none">
-              <SelectValue />
-            </SelectTrigger>
-            <SelectContent>
-              <SelectItem value="always">Always</SelectItem>
-              <SelectItem value="unfocused">Only when unfocused</SelectItem>
-            </SelectContent>
-          </Select>
-        </div>
-
-        {/* OS notifications toggle */}
-        <div className="flex items-center justify-between gap-4">
-          <div className="flex flex-1 flex-col gap-0.5">
-            <p className="text-sm font-medium text-foreground">OS notifications</p>
-            <p className="text-sm text-muted-foreground">
-              Show system banners when agents need attention or finish (while Emdash is unfocused).
-            </p>
-          </div>
-          <Switch
-            checked={notifications?.osNotifications ?? true}
-            disabled={loading}
-            onCheckedChange={(next) => updateSettings({ notifications: { osNotifications: next } })}
-          />
-        </div>
-      </div>
-    </div>
-  );
-};
-
-export default NotificationSettingsCard;
diff --git a/src/renderer/components/PrCommentsList.tsx b/src/renderer/components/PrCommentsList.tsx
deleted file mode 100644
index 7c13bd3238..0000000000
--- a/src/renderer/components/PrCommentsList.tsx
+++ /dev/null
@@ -1,91 +0,0 @@
-import { CheckCircle2, XCircle } from 'lucide-react';
-import type { PrCommentsStatus, PrComment } from '../lib/prCommentsStatus';
-import { formatRelativeTime } from '../lib/prCommentsStatus';
-
-function ReviewBadge({ state }: { state?: PrComment['reviewState'] }) {
-  switch (state) {
-    case 'APPROVED':
-      return (
-        <span className="flex items-center gap-1 rounded-full bg-emerald-500/10 px-2 py-0.5 text-[10px] font-medium text-emerald-600 dark:text-emerald-400">
-          <CheckCircle2 className="h-3 w-3" />
-          Approved
-        </span>
-      );
-    case 'CHANGES_REQUESTED':
-      return (
-        <span className="flex items-center gap-1 rounded-full bg-red-500/10 px-2 py-0.5 text-[10px] font-medium text-red-600 dark:text-red-400">
-          <XCircle className="h-3 w-3" />
-          Changes requested
-        </span>
-      );
-    default:
-      return null;
-  }
-}
-
-function stripMarkdown(text: string): string {
-  return text
-    .replace(/```[\s\S]*?```/g, '') // code blocks
-    .replace(/`[^`]*`/g, '') // inline code
-    .replace(/!?\[([^\]]*)\]\([^)]*\)/g, '$1') // links/images
-    .replace(/<[^>]+>/g, '') // HTML tags
-    .replace(/[#*_~>|]/g, '') // markdown symbols
-    .replace(/\|[^\n]*\|/g, '') // table rows
-    .replace(/:-+/g, '') // table separators
-    .replace(/\n{2,}/g, ' ') // collapse newlines
-    .replace(/\s+/g, ' ') // collapse whitespace
-    .trim();
-}
-
-function CommentItem({ comment, prUrl }: { comment: PrComment; prUrl?: string }) {
-  const preview = comment.body ? stripMarkdown(comment.body) : '';
-
-  return (
-    <div
-      className="min-w-0 cursor-pointer px-4 py-2.5 transition-colors hover:bg-muted/50"
-      onClick={() => prUrl && window.electronAPI?.openExternal?.(prUrl)}
-    >
-      <div className="flex items-center gap-2">
-        <img
-          src={comment.author.avatarUrl || `https://github.com/${comment.author.login}.png?size=40`}
-          alt=""
-          className="h-5 w-5 shrink-0 rounded-sm"
-        />
-        <span className="shrink-0 text-sm font-medium text-foreground">{comment.author.login}</span>
-        {preview && (
-          <span className="min-w-0 truncate text-xs text-muted-foreground">{preview}</span>
-        )}
-        <span className="ml-auto shrink-0 text-xs text-muted-foreground">
-          {formatRelativeTime(comment.createdAt)}
-        </span>
-        {comment.type === 'review' && <ReviewBadge state={comment.reviewState} />}
-      </div>
-    </div>
-  );
-}
-
-interface PrCommentsListProps {
-  status: PrCommentsStatus | null;
-  isLoading: boolean;
-  hasPr: boolean;
-  prUrl?: string;
-}
-
-export function PrCommentsList({ status, isLoading, hasPr, prUrl }: PrCommentsListProps) {
-  if (!hasPr) return null;
-
-  if (isLoading && !status) return null;
-
-  if (!status || status.comments.length === 0) return null;
-
-  return (
-    <div className="min-w-0">
-      <div className="flex items-center gap-1.5 px-4 py-1.5">
-        <span className="text-sm font-medium text-foreground">Comments</span>
-      </div>
-      {status.comments.map((comment) => (
-        <CommentItem key={`${comment.type}-${comment.id}`} comment={comment} prUrl={prUrl} />
-      ))}
-    </div>
-  );
-}
diff --git a/src/renderer/components/PrPreviewTooltip.tsx b/src/renderer/components/PrPreviewTooltip.tsx
deleted file mode 100644
index ec2201a2da..0000000000
--- a/src/renderer/components/PrPreviewTooltip.tsx
+++ /dev/null
@@ -1,85 +0,0 @@
-import React from 'react';
-import { motion } from 'motion/react';
-import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from './ui/tooltip';
-import githubLogo from '../../assets/images/github.png';
-import type { PrStatus } from '../lib/prStatus';
-
-type Props = {
-  pr: PrStatus;
-  children: React.ReactElement;
-  side?: 'top' | 'right' | 'bottom' | 'left';
-};
-
-const Pill = ({
-  color,
-  children,
-}: {
-  color: 'green' | 'red' | 'blue';
-  children: React.ReactNode;
-}) => {
-  const palette =
-    color === 'green'
-      ? 'bg-emerald-100/70 text-emerald-800 dark:bg-emerald-500/10 dark:text-emerald-200'
-      : color === 'red'
-        ? 'bg-rose-100/70 text-rose-800 dark:bg-rose-500/10 dark:text-rose-200'
-        : 'bg-slate-100/70 text-slate-800 dark:bg-slate-500/10 dark:text-slate-200';
-  return (
-    <span
-      className={`inline-flex items-center gap-1 rounded-md border border-border px-2 py-0.5 text-[11px] ${palette}`}
-    >
-      {children}
-    </span>
-  );
-};
-
-export const PrPreviewTooltip: React.FC<Props> = ({ pr, children, side = 'top' }) => {
-  if (!pr) return children;
-  const num = (v: unknown): number | null => {
-    if (typeof v === 'number' && Number.isFinite(v)) return v;
-    const parsed = typeof v === 'string' ? Number.parseInt(v, 10) : NaN;
-    return Number.isFinite(parsed) ? parsed : null;
-  };
-  const additions = num(pr.additions);
-  const deletions = num(pr.deletions);
-  const changed = num(pr.changedFiles);
-
-  return (
-    <TooltipProvider delayDuration={150}>
-      <Tooltip>
-        <TooltipTrigger asChild>{children}</TooltipTrigger>
-        <TooltipContent
-          side={side}
-          align="start"
-          className="border-0 bg-transparent p-0 shadow-none"
-        >
-          <motion.div
-            initial={{ opacity: 0, y: 4, scale: 0.98 }}
-            animate={{ opacity: 1, y: 0, scale: 1 }}
-            exit={{ opacity: 0, y: 4, scale: 0.98 }}
-            transition={{ duration: 0.16, ease: 'easeOut' }}
-            className="min-w-[260px] max-w-sm rounded-lg border border-border/70 bg-popover/95 p-3 shadow-xl backdrop-blur-sm"
-          >
-            <div className="flex items-center gap-2 text-xs font-medium text-muted-foreground">
-              <img src={githubLogo} alt="GitHub" className="h-4 w-4" />
-              <span className="tracking-wide">Pull Request</span>
-              <span className="font-semibold text-muted-foreground/80">#{pr.number}</span>
-            </div>
-            <div className="mt-1 line-clamp-2 text-sm font-semibold text-foreground">
-              {pr.title || `PR #${pr.number}`}
-            </div>
-            <div className="mt-2 flex flex-wrap items-center gap-2 text-xs text-muted-foreground">
-              {additions !== null ? <Pill color="green">+{additions} added</Pill> : null}
-              {deletions !== null ? <Pill color="red">-{deletions} deleted</Pill> : null}
-              {changed !== null ? <Pill color="blue">{changed} files</Pill> : null}
-              {additions === null && deletions === null && changed === null ? (
-                <span className="text-[11px] text-muted-foreground/80">Diff stats unavailable</span>
-              ) : null}
-            </div>
-          </motion.div>
-        </TooltipContent>
-      </Tooltip>
-    </TooltipProvider>
-  );
-};
-
-export default PrPreviewTooltip;
diff --git a/src/renderer/components/ProjectDeleteButton.tsx b/src/renderer/components/ProjectDeleteButton.tsx
deleted file mode 100644
index 29ba01fb2a..0000000000
--- a/src/renderer/components/ProjectDeleteButton.tsx
+++ /dev/null
@@ -1,272 +0,0 @@
-import React, { useMemo } from 'react';
-import { motion, AnimatePresence } from 'motion/react';
-import { Trash, Folder } from 'lucide-react';
-import { Checkbox } from './ui/checkbox';
-import { Spinner } from './ui/spinner';
-import {
-  AlertDialog,
-  AlertDialogAction,
-  AlertDialogCancel,
-  AlertDialogContent,
-  AlertDialogDescription,
-  AlertDialogFooter,
-  AlertDialogHeader,
-  AlertDialogTitle,
-  AlertDialogTrigger,
-} from './ui/alert-dialog';
-import { TooltipProvider, Tooltip, TooltipTrigger, TooltipContent } from './ui/tooltip';
-import { Button } from './ui/button';
-import { cn } from '@/lib/utils';
-import { useDeleteRisks } from '../hooks/useDeleteRisks';
-import DeletePrNotice from './DeletePrNotice';
-import { isActivePr } from '../lib/prStatus';
-import type { Task } from '../types/chat';
-
-type Props = {
-  projectName: string;
-  tasks?: Task[];
-  onConfirm: () => void | Promise<void>;
-  className?: string;
-  'aria-label'?: string;
-  isDeleting?: boolean;
-};
-
-export const ProjectDeleteButton: React.FC<Props> = ({
-  projectName,
-  tasks = [],
-  onConfirm,
-  className,
-  'aria-label': ariaLabel = 'Delete project',
-  isDeleting = false,
-}) => {
-  const [open, setOpen] = React.useState(false);
-  const [acknowledge, setAcknowledge] = React.useState(false);
-
-  const targets = useMemo(
-    () => tasks.map((ws) => ({ id: ws.id, name: ws.name, path: ws.path })),
-    [tasks]
-  );
-
-  const { risks, loading, hasData } = useDeleteRisks(targets, open);
-
-  // Tasks with uncommitted/unpushed changes BUT NO PR
-  const tasksWithUncommittedWork = tasks.filter((ws) => {
-    const status = risks[ws.id];
-    if (!status) return false;
-    const hasUncommittedWork =
-      status.staged > 0 || status.unstaged > 0 || status.untracked > 0 || status.ahead > 0;
-    const hasPR = status.pr && isActivePr(status.pr);
-    // Only show in this section if has uncommitted work BUT NO PR
-    return hasUncommittedWork && !hasPR;
-  });
-
-  // Tasks with PRs (may or may not have uncommitted work)
-  const tasksWithPRs = tasks.filter((ws) => {
-    const status = risks[ws.id];
-    return status?.pr && isActivePr(status.pr);
-  });
-
-  const hasRisks = tasksWithUncommittedWork.length > 0 || tasksWithPRs.length > 0;
-  const disableDelete = Boolean(isDeleting || loading) || (hasRisks && !acknowledge);
-
-  React.useEffect(() => {
-    if (!open) {
-      setAcknowledge(false);
-    }
-  }, [open]);
-  return (
-    <AlertDialog open={open} onOpenChange={setOpen}>
-      <TooltipProvider delayDuration={200}>
-        <Tooltip>
-          <TooltipTrigger asChild>
-            <AlertDialogTrigger asChild>
-              <Button
-                variant="outline"
-                size="icon-sm"
-                className={cn('h-8 w-8', className, isDeleting && 'opacity-100')}
-                title="Delete project"
-                aria-label={ariaLabel}
-                aria-busy={isDeleting}
-                disabled={isDeleting}
-                onClick={(e) => e.stopPropagation()}
-              >
-                {isDeleting ? (
-                  <Spinner className="h-3.5 w-3.5" size="sm" />
-                ) : (
-                  <Trash className="h-3.5 w-3.5" />
-                )}
-              </Button>
-            </AlertDialogTrigger>
-          </TooltipTrigger>
-          <TooltipContent side="top" className="text-xs">
-            Delete project
-          </TooltipContent>
-        </Tooltip>
-      </TooltipProvider>
-      <AlertDialogContent onClick={(e) => e.stopPropagation()} className="space-y-4">
-        <AlertDialogHeader>
-          <AlertDialogTitle>Delete project?</AlertDialogTitle>
-          <AlertDialogDescription>
-            {`This removes "${projectName}" from Emdash, including its saved tasks and conversations. Files on disk are not deleted.`}
-          </AlertDialogDescription>
-        </AlertDialogHeader>
-
-        <div className="space-y-3 text-sm">
-          <AnimatePresence initial={false}>
-            {loading ? (
-              <motion.div
-                key="project-delete-loading"
-                initial={{ opacity: 0, y: 6, scale: 0.99 }}
-                animate={{ opacity: 1, y: 0, scale: 1 }}
-                exit={{ opacity: 0, y: 6, scale: 0.99 }}
-                transition={{ duration: 0.18, ease: 'easeOut' }}
-                className="flex items-start gap-3 rounded-md border border-border/70 bg-muted/30 px-4 py-4"
-              >
-                <Spinner className="mt-0.5 h-5 w-5 flex-shrink-0 text-muted-foreground" size="sm" />
-                <div className="flex min-w-0 flex-col gap-1">
-                  <span className="text-sm font-semibold text-foreground">Please wait...</span>
-                  <span className="text-xs text-muted-foreground">
-                    Scanning tasks for uncommitted changes and open pull requests
-                  </span>
-                </div>
-              </motion.div>
-            ) : null}
-          </AnimatePresence>
-
-          <AnimatePresence initial={false}>
-            {!loading && tasksWithUncommittedWork.length > 0 ? (
-              <motion.div
-                key="project-delete-risk"
-                initial={{ opacity: 0, y: 6, scale: 0.99 }}
-                animate={{ opacity: 1, y: 0, scale: 1 }}
-                exit={{ opacity: 0, y: 6, scale: 0.99 }}
-                transition={{ duration: 0.18, ease: 'easeOut' }}
-                className="space-y-2 rounded-md border border-amber-300/60 bg-amber-50 px-3 py-2 text-amber-900 dark:border-amber-500/40 dark:bg-amber-500/10 dark:text-amber-50"
-              >
-                <p className="font-medium">
-                  {tasksWithUncommittedWork.length === 1
-                    ? 'Unmerged or unpushed work detected in 1 task'
-                    : `Unmerged or unpushed work detected in ${tasksWithUncommittedWork.length} tasks`}
-                </p>
-                <ul className="space-y-1.5">
-                  {tasksWithUncommittedWork.map((ws) => {
-                    const status = risks[ws.id];
-                    if (!status) return null;
-                    const summary = [
-                      status.staged > 0
-                        ? `${status.staged} ${status.staged === 1 ? 'file' : 'files'} staged`
-                        : null,
-                      status.unstaged > 0
-                        ? `${status.unstaged} ${status.unstaged === 1 ? 'file' : 'files'} unstaged`
-                        : null,
-                      status.untracked > 0
-                        ? `${status.untracked} ${status.untracked === 1 ? 'file' : 'files'} untracked`
-                        : null,
-                      status.ahead > 0
-                        ? `ahead by ${status.ahead} ${status.ahead === 1 ? 'commit' : 'commits'}`
-                        : null,
-                    ]
-                      .filter(Boolean)
-                      .join(', ');
-
-                    return (
-                      <li
-                        key={ws.id}
-                        className="flex items-center gap-2 rounded-md bg-amber-50/80 px-2 py-1 text-amber-900 dark:bg-amber-500/10 dark:text-amber-50"
-                      >
-                        <Folder className="h-4 w-4 fill-amber-700 text-amber-700" />
-                        <span className="font-medium">{ws.name}</span>
-                        <span className="text-muted-foreground">—</span>
-                        <span className="text-sm">{summary}</span>
-                      </li>
-                    );
-                  })}
-                </ul>
-              </motion.div>
-            ) : null}
-          </AnimatePresence>
-
-          <AnimatePresence initial={false}>
-            {!loading && tasksWithPRs.length > 0 ? (
-              <motion.div
-                key="project-delete-prs"
-                initial={{ opacity: 0, y: 6, scale: 0.99 }}
-                animate={{ opacity: 1, y: 0, scale: 1 }}
-                exit={{ opacity: 0, y: 6, scale: 0.99 }}
-                transition={{ duration: 0.18, ease: 'easeOut', delay: 0.02 }}
-              >
-                <DeletePrNotice
-                  tasks={
-                    tasksWithPRs
-                      .map((ws) => {
-                        const pr = risks[ws.id]?.pr;
-                        return pr && isActivePr(pr) ? { name: ws.name, pr } : null;
-                      })
-                      .filter(
-                        (w): w is { name: string; pr: NonNullable<typeof w>['pr'] } => w !== null
-                      ) as any
-                  }
-                />
-              </motion.div>
-            ) : null}
-          </AnimatePresence>
-
-          <AnimatePresence initial={false}>
-            {hasRisks ? (
-              <motion.label
-                key="ack-project-delete"
-                className="flex items-start gap-2 rounded-md border border-border/70 bg-muted/30 px-3 py-2"
-                initial={{ opacity: 0, y: 6, scale: 0.99 }}
-                animate={{ opacity: 1, y: 0, scale: 1 }}
-                exit={{ opacity: 0, y: 6, scale: 0.99 }}
-                transition={{ duration: 0.18, ease: 'easeOut', delay: 0.02 }}
-              >
-                <Checkbox
-                  checked={acknowledge}
-                  onCheckedChange={(checked) => setAcknowledge(checked === true)}
-                  className="mt-0.5"
-                />
-                <span className="text-sm leading-tight text-foreground">Delete project anyway</span>
-              </motion.label>
-            ) : null}
-          </AnimatePresence>
-        </div>
-
-        <AlertDialogFooter>
-          <AlertDialogCancel disabled={isDeleting}>Cancel</AlertDialogCancel>
-          <TooltipProvider delayDuration={200}>
-            <Tooltip>
-              <TooltipTrigger asChild>
-                <AlertDialogAction
-                  className="bg-destructive px-4 py-2 text-destructive-foreground hover:bg-destructive/90"
-                  disabled={disableDelete}
-                  onClick={async (e) => {
-                    e.stopPropagation();
-                    setOpen(false);
-                    try {
-                      await onConfirm();
-                    } catch {}
-                  }}
-                >
-                  {isDeleting ? <Spinner className="mr-2 h-4 w-4" size="sm" /> : null}
-                  Delete
-                </AlertDialogAction>
-              </TooltipTrigger>
-              {disableDelete && !isDeleting ? (
-                <TooltipContent side="top" className="text-xs">
-                  {loading
-                    ? 'Checking tasks...'
-                    : hasRisks && !acknowledge
-                      ? 'Acknowledge the risks to delete'
-                      : 'Delete is disabled'}
-                </TooltipContent>
-              ) : null}
-            </Tooltip>
-          </TooltipProvider>
-        </AlertDialogFooter>
-      </AlertDialogContent>
-    </AlertDialog>
-  );
-};
-
-export default ProjectDeleteButton;
diff --git a/src/renderer/components/ProjectMainView.tsx b/src/renderer/components/ProjectMainView.tsx
deleted file mode 100644
index 475c1a286b..0000000000
--- a/src/renderer/components/ProjectMainView.tsx
+++ /dev/null
@@ -1,1201 +0,0 @@
-import React, { useCallback, useEffect, useMemo, useState } from 'react';
-import { Button } from './ui/button';
-import { Input } from './ui/input';
-import {
-  Plus,
-  Loader2,
-  ArrowUpRight,
-  Folder,
-  Archive,
-  ArchiveRestore,
-  Search,
-  Github,
-  X,
-  Trash2,
-  Check,
-  ListFilter,
-} from 'lucide-react';
-import { AnimatePresence, motion } from 'motion/react';
-import { Separator } from './ui/separator';
-import { Alert, AlertDescription, AlertTitle } from './ui/alert';
-import { usePrStatus } from '../hooks/usePrStatus';
-import { useTaskChanges } from '../hooks/useTaskChanges';
-import { ChangesBadge } from './TaskChanges';
-import { Spinner } from './ui/spinner';
-import TaskDeleteButton from './TaskDeleteButton';
-import ProjectDeleteButton from './ProjectDeleteButton';
-import {
-  AlertDialog,
-  AlertDialogAction,
-  AlertDialogCancel,
-  AlertDialogContent,
-  AlertDialogDescription,
-  AlertDialogFooter,
-  AlertDialogHeader,
-  AlertDialogTitle,
-} from './ui/alert-dialog';
-import { Checkbox } from './ui/checkbox';
-import BaseBranchControls from './BaseBranchControls';
-import { pickDefaultBranch, type BranchOption } from './BranchSelect';
-import { ConfigEditorModal } from './ConfigEditorModal';
-import { useToast } from '../hooks/use-toast';
-import DeletePrNotice from './DeletePrNotice';
-import PrPreviewTooltip from './PrPreviewTooltip';
-import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from './ui/tooltip';
-import { Popover, PopoverContent, PopoverTrigger } from './ui/popover';
-import { isActivePr, PrInfo } from '../lib/prStatus';
-import { refreshPrStatus } from '../lib/prStatusStore';
-import { rpc } from '../lib/rpc';
-import { useTaskBusy } from '../hooks/useTaskBusy';
-import { useTaskAgentNames } from '../hooks/useTaskAgentNames';
-import AgentLogo from './AgentLogo';
-import { agentAssets } from '../providers/assets';
-import { getProvider } from '@shared/providers/registry';
-import type { ProviderId } from '@shared/providers/registry';
-import type { Project, Task } from '../types/app';
-import { useTaskManagementContext } from '../contexts/TaskManagementContext';
-
-const normalizeBaseRef = (ref?: string | null): string | undefined => {
-  if (!ref) return undefined;
-  const trimmed = ref.trim();
-  return trimmed.length > 0 ? trimmed : undefined;
-};
-
-function TaskRow({
-  ws,
-  active,
-  onClick,
-  onDelete,
-  onArchive,
-  onRestore,
-  isSelectMode,
-  isSelected,
-  onToggleSelect,
-  enablePrStatus = true,
-}: {
-  ws: Task;
-  active: boolean;
-  onClick: () => void;
-  onDelete: () => void | Promise<void | boolean>;
-  onArchive?: () => void | Promise<void | boolean>;
-  onRestore?: () => void | Promise<void>;
-  isSelectMode?: boolean;
-  isSelected?: boolean;
-  onToggleSelect?: () => void;
-  enablePrStatus?: boolean;
-}) {
-  const isArchived = Boolean(ws.archivedAt);
-  const isRunning = useTaskBusy(ws.id);
-  const [isDeleting, setIsDeleting] = useState(false);
-  const { pr } = usePrStatus(ws.path, enablePrStatus);
-  const { totalAdditions, totalDeletions, isLoading } = useTaskChanges(ws.path, ws.id);
-  const agentInfo = useTaskAgentNames(ws.id, ws.agentId);
-
-  const handleRowClick = () => {
-    if (isSelectMode) {
-      onToggleSelect?.();
-    } else {
-      onClick();
-    }
-  };
-
-  const contentClasses = [
-    'task-card relative flex flex-1 items-center gap-[2px] h-16 px-3 transition-all duration-150',
-    'before:absolute before:inset-x-0 before:top-0 before:h-px before:bg-border before:transition-opacity',
-    'cursor-pointer',
-    'focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary',
-    active
-      ? 'bg-muted rounded-xl before:opacity-0'
-      : isSelected
-        ? 'bg-accent rounded-xl before:opacity-0'
-        : 'hover:bg-accent hover:rounded-xl hover:before:opacity-0',
-  ].join(' ');
-
-  // Render agent icons + names
-  // 1 chat: show agent with icon
-  // 2 chats: show both unique providers with icons
-  // 3+ chats: show first provider + "+N"
-  const renderAgents = () => {
-    const { providerIds, additionalCount } = agentInfo;
-    if (providerIds.length === 0) return null;
-
-    const totalChats = additionalCount + 1;
-    const showIds = totalChats <= 2 ? providerIds : [providerIds[0]];
-
-    return (
-      <div className="flex items-center gap-2">
-        {showIds.map((id) => {
-          const asset = agentAssets[id as keyof typeof agentAssets];
-          const provider = getProvider(id as ProviderId);
-          if (!asset) return null;
-          return (
-            <div key={id} className="flex items-center gap-1">
-              <AgentLogo
-                logo={asset.logo}
-                alt={asset.alt}
-                isSvg={asset.isSvg}
-                invertInDark={asset.invertInDark}
-                className="h-4 w-4"
-              />
-              <span className="text-sm font-medium text-muted-foreground">
-                {provider?.name ?? id}
-              </span>
-            </div>
-          );
-        })}
-        {totalChats > 2 && (
-          <span className="text-sm font-medium text-muted-foreground">+{additionalCount}</span>
-        )}
-      </div>
-    );
-  };
-
-  return (
-    <div
-      className="task-row group relative flex items-center gap-3"
-      data-active={active || undefined}
-      data-selected={isSelected || undefined}
-    >
-      <Checkbox
-        checked={isSelected}
-        onCheckedChange={() => onToggleSelect?.()}
-        aria-label={`Select ${ws.name}`}
-        className={[
-          'h-4 w-4 shrink-0 rounded border-muted-foreground/50 transition-opacity duration-150',
-
-          isSelectMode || isSelected ? 'opacity-100' : 'opacity-0 group-hover:opacity-100',
-        ].join(' ')}
-      />
-      <div onClick={handleRowClick} role="button" tabIndex={0} className={contentClasses}>
-        <div className="flex min-w-0 flex-1 items-center gap-2">
-          <span className={`text-sm font-medium ${isArchived ? 'text-muted-foreground' : ''}`}>
-            {ws.name}
-          </span>
-          {isArchived && (
-            <span className="rounded bg-muted px-1.5 py-0.5 text-[10px] font-medium text-muted-foreground">
-              Archived
-            </span>
-          )}
-          {(isRunning || ws.status === 'running') && (
-            <Spinner size="sm" className="size-3 text-muted-foreground" />
-          )}
-        </div>
-
-        <div className="flex shrink-0 items-center gap-4">
-          {renderAgents()}
-
-          {!isLoading && (totalAdditions > 0 || totalDeletions > 0) ? (
-            <ChangesBadge additions={totalAdditions} deletions={totalDeletions} />
-          ) : null}
-
-          {!isLoading && totalAdditions === 0 && totalDeletions === 0 && pr ? (
-            <PrPreviewTooltip pr={pr} side="top">
-              <button
-                type="button"
-                onClick={(e) => {
-                  e.stopPropagation();
-                  if (pr.url) window.electronAPI.openExternal(pr.url);
-                }}
-                className="inline-flex items-center gap-1 rounded border border-border bg-muted px-1.5 py-0.5 text-xs font-medium text-muted-foreground transition-colors hover:bg-accent hover:text-accent-foreground"
-                title={`${pr.title || 'Pull Request'} (#${pr.number})`}
-              >
-                {pr.isDraft
-                  ? 'Draft'
-                  : String(pr.state).toUpperCase() === 'OPEN'
-                    ? 'View PR'
-                    : `PR ${String(pr.state).charAt(0).toUpperCase() + String(pr.state).slice(1).toLowerCase()}`}
-                <ArrowUpRight className="size-3" />
-              </button>
-            </PrPreviewTooltip>
-          ) : null}
-
-          {!isSelectMode && (
-            <div className="flex items-center gap-1">
-              {isArchived && onRestore ? (
-                <TooltipProvider delayDuration={300}>
-                  <Tooltip>
-                    <TooltipTrigger asChild>
-                      <Button
-                        variant="ghost"
-                        size="icon"
-                        className="text-muted-foreground"
-                        onClick={(e) => {
-                          e.stopPropagation();
-                          onRestore();
-                        }}
-                        aria-label={`Unarchive task ${ws.name}`}
-                      >
-                        <ArchiveRestore className="h-4 w-4" />
-                      </Button>
-                    </TooltipTrigger>
-                    <TooltipContent side="top" className="text-xs">
-                      Unarchive
-                    </TooltipContent>
-                  </Tooltip>
-                </TooltipProvider>
-              ) : onArchive && !isArchived ? (
-                <TooltipProvider delayDuration={300}>
-                  <Tooltip>
-                    <TooltipTrigger asChild>
-                      <Button
-                        variant="ghost"
-                        size="icon"
-                        className="text-muted-foreground"
-                        onClick={(e) => {
-                          e.stopPropagation();
-                          onArchive();
-                        }}
-                        aria-label={`Archive task ${ws.name}`}
-                      >
-                        <Archive className="h-4 w-4" />
-                      </Button>
-                    </TooltipTrigger>
-                    <TooltipContent side="top" className="text-xs">
-                      Archive
-                    </TooltipContent>
-                  </Tooltip>
-                </TooltipProvider>
-              ) : null}
-              <TaskDeleteButton
-                taskName={ws.name}
-                taskId={ws.id}
-                taskPath={ws.path}
-                useWorktree={ws.useWorktree}
-                onConfirm={async () => {
-                  try {
-                    setIsDeleting(true);
-                    await onDelete();
-                  } finally {
-                    setIsDeleting(false);
-                  }
-                }}
-                isDeleting={isDeleting}
-                aria-label={`Delete task ${ws.name}`}
-                className="text-muted-foreground"
-              />
-            </div>
-          )}
-        </div>
-      </div>
-    </div>
-  );
-}
-
-interface ProjectMainViewProps {
-  project: Project;
-  onCreateTask: () => void;
-  activeTask: Task | null;
-  onSelectTask: (task: Task) => void;
-  onDeleteTask: (
-    project: Project,
-    task: Task,
-    options?: { silent?: boolean }
-  ) => void | Promise<void | boolean>;
-  onArchiveTask?: (
-    project: Project,
-    task: Task,
-    options?: { silent?: boolean }
-  ) => void | Promise<void | boolean>;
-  onRestoreTask?: (project: Project, task: Task) => void | Promise<void>;
-  onDeleteProject?: (project: Project) => void | Promise<void>;
-  branchOptions: BranchOption[];
-  isLoadingBranches: boolean;
-  onBaseBranchChange?: (branch: string) => void;
-}
-
-const ProjectMainView: React.FC<ProjectMainViewProps> = ({
-  project,
-  onCreateTask,
-  activeTask,
-  onSelectTask,
-  onDeleteTask,
-  onArchiveTask,
-  onRestoreTask,
-  onDeleteProject,
-  branchOptions,
-  isLoadingBranches,
-  onBaseBranchChange: onBaseBranchChangeCallback,
-}) => {
-  const { toast } = useToast();
-  const { tasksByProjectId } = useTaskManagementContext();
-
-  const [baseBranch, setBaseBranch] = useState<string | undefined>(() =>
-    normalizeBaseRef(project.gitInfo.baseRef)
-  );
-  const [isSavingBaseBranch, setIsSavingBaseBranch] = useState(false);
-
-  // Multi-select state
-  const [isSelectMode, setIsSelectMode] = useState(false);
-  const [selectedIds, setSelectedIds] = useState<Set<string>>(new Set());
-  const [showDeleteDialog, setShowDeleteDialog] = useState(false);
-  const [isDeleting, setIsDeleting] = useState(false);
-  const [isArchiving, setIsArchiving] = useState(false);
-  const [isRestoring, setIsRestoring] = useState(false);
-  const [acknowledgeDirtyDelete, setAcknowledgeDirtyDelete] = useState(false);
-  const [showConfigEditor, setShowConfigEditor] = useState(false);
-  const [searchFilter, setSearchFilter] = useState('');
-  const [showFilter, setShowFilter] = useState<'active' | 'all'>('active');
-  const [archivedTasks, setArchivedTasks] = useState<Task[]>([]);
-
-  const activeTasks = tasksByProjectId[project.id] ?? [];
-  const activeTasksLength = activeTasks.length;
-
-  const refetchArchivedTasks = useCallback(() => {
-    const timeoutId = setTimeout(async () => {
-      try {
-        const archivedTasks = (await rpc.db.getArchivedTasks(project.id)) as Task[];
-        setArchivedTasks(archivedTasks);
-      } catch {
-        //
-      }
-    }, 100);
-    return () => clearTimeout(timeoutId);
-  }, [project.id]);
-
-  useEffect(() => {
-    const cleanup = refetchArchivedTasks();
-    return cleanup;
-  }, [project.id, refetchArchivedTasks]);
-  const tasksInProject = useMemo(
-    () => (showFilter === 'all' ? [...activeTasks, ...archivedTasks] : activeTasks),
-    [activeTasks, archivedTasks, showFilter]
-  );
-  const hasAnyTasks = activeTasks.length > 0 || archivedTasks.length > 0;
-  const filteredTasks = useMemo(
-    () =>
-      searchFilter.trim()
-        ? tasksInProject.filter((ws) =>
-            ws.name.toLowerCase().includes(searchFilter.trim().toLowerCase())
-          )
-        : tasksInProject,
-    [tasksInProject, searchFilter]
-  );
-  const selectedCount = selectedIds.size;
-  const selectedTasks = useMemo(
-    () => tasksInProject.filter((ws) => selectedIds.has(ws.id)),
-    [selectedIds, tasksInProject]
-  );
-
-  // Determine which bulk actions to show
-  const bulkActionState = useMemo(() => {
-    const archivedCount = selectedTasks.filter((t) => t.archivedAt).length;
-    const activeCount = selectedTasks.length - archivedCount;
-    return {
-      hasArchived: archivedCount > 0,
-      hasActive: activeCount > 0,
-      archivedCount,
-      activeCount,
-    };
-  }, [selectedTasks]);
-
-  // Calculate select all checkbox state
-  const allFilteredSelected =
-    filteredTasks.length > 0 && filteredTasks.every((t) => selectedIds.has(t.id));
-  const someFilteredSelected =
-    filteredTasks.some((t) => selectedIds.has(t.id)) && !allFilteredSelected;
-  const [deleteStatus, setDeleteStatus] = useState<
-    Record<
-      string,
-      {
-        staged: number;
-        unstaged: number;
-        untracked: number;
-        ahead: number;
-        behind: number;
-        error?: string;
-        pr?: PrInfo | null;
-      }
-    >
-  >({});
-  const [deleteStatusLoading, setDeleteStatusLoading] = useState(false);
-  const deleteRisks = useMemo(() => {
-    const riskyIds = new Set<string>();
-    const summaries: Record<string, string> = {};
-    for (const ws of selectedTasks) {
-      const status = deleteStatus[ws.id];
-      if (!status) continue;
-      const dirty =
-        status.staged > 0 ||
-        status.unstaged > 0 ||
-        status.untracked > 0 ||
-        status.ahead > 0 ||
-        !!status.error ||
-        (status.pr && isActivePr(status.pr));
-      if (dirty) {
-        riskyIds.add(ws.id);
-        const parts: string[] = [];
-        if (status.staged > 0)
-          parts.push(`${status.staged} ${status.staged === 1 ? 'file' : 'files'} staged`);
-        if (status.unstaged > 0)
-          parts.push(`${status.unstaged} ${status.unstaged === 1 ? 'file' : 'files'} unstaged`);
-        if (status.untracked > 0)
-          parts.push(`${status.untracked} ${status.untracked === 1 ? 'file' : 'files'} untracked`);
-        if (status.ahead > 0)
-          parts.push(`ahead by ${status.ahead} ${status.ahead === 1 ? 'commit' : 'commits'}`);
-        if (status.behind > 0)
-          parts.push(`behind by ${status.behind} ${status.behind === 1 ? 'commit' : 'commits'}`);
-        if (status.pr && isActivePr(status.pr)) parts.push('PR open');
-        if (!parts.length && status.error) parts.push('status unavailable');
-        summaries[ws.id] = parts.join(', ');
-      }
-    }
-    return { riskyIds, summaries };
-  }, [deleteStatus, selectedTasks]);
-  const deleteDisabled: boolean =
-    Boolean(isDeleting || deleteStatusLoading) ||
-    (deleteRisks.riskyIds.size > 0 && acknowledgeDirtyDelete !== true);
-
-  const toggleSelect = (id: string) => {
-    setSelectedIds((prev) => {
-      const next = new Set(prev);
-      if (next.has(id)) {
-        next.delete(id);
-      } else {
-        next.add(id);
-        if (!isSelectMode) setIsSelectMode(true);
-      }
-      return next;
-    });
-  };
-
-  const toggleSelectAll = () => {
-    const filteredIds = new Set(filteredTasks.map((t) => t.id));
-    const allFilteredSelected = filteredTasks.every((t) => selectedIds.has(t.id));
-
-    if (allFilteredSelected) {
-      // Deselect all filtered tasks
-      setSelectedIds((prev) => {
-        const next = new Set(prev);
-        filteredIds.forEach((id) => next.delete(id));
-        return next;
-      });
-    } else {
-      // Select all filtered tasks
-      setSelectedIds((prev) => {
-        const next = new Set(prev);
-        filteredIds.forEach((id) => next.add(id));
-        return next;
-      });
-      if (!isSelectMode) setIsSelectMode(true);
-    }
-  };
-
-  const exitSelectMode = () => {
-    setIsSelectMode(false);
-    setSelectedIds(new Set());
-  };
-
-  const handleBulkDelete = async () => {
-    const toDelete = tasksInProject.filter((ws) => selectedIds.has(ws.id));
-    if (toDelete.length === 0) return;
-
-    setIsDeleting(true);
-    setShowDeleteDialog(false);
-
-    const deletedNames: string[] = [];
-    for (const ws of toDelete) {
-      try {
-        const result = await onDeleteTask(project, ws, { silent: true });
-        if (result !== false) {
-          deletedNames.push(ws.name);
-        }
-      } catch {
-        // Continue deleting remaining tasks
-      }
-    }
-
-    setIsDeleting(false);
-    exitSelectMode();
-
-    if (deletedNames.length > 0) {
-      refetchArchivedTasks();
-
-      const maxNames = 3;
-      const displayNames = deletedNames.slice(0, maxNames).join(', ');
-      const remaining = deletedNames.length - maxNames;
-
-      toast({
-        title: deletedNames.length === 1 ? 'Task deleted' : 'Tasks deleted',
-        description: remaining > 0 ? `${displayNames} and ${remaining} more` : displayNames,
-      });
-    }
-  };
-
-  const handleBulkArchive = async () => {
-    if (!onArchiveTask) return;
-    const toArchive = tasksInProject.filter((ws) => selectedIds.has(ws.id) && !ws.archivedAt);
-    if (toArchive.length === 0) return;
-
-    setIsArchiving(true);
-
-    const archivedNames: string[] = [];
-    for (const ws of toArchive) {
-      try {
-        const result = await onArchiveTask(project, ws, { silent: true });
-        // Only count as archived if returned true (or void for backwards compat)
-        if (result !== false) {
-          archivedNames.push(ws.name);
-        }
-      } catch {
-        // Continue archiving remaining tasks
-      }
-    }
-
-    setIsArchiving(false);
-    exitSelectMode();
-
-    if (archivedNames.length > 0) {
-      refetchArchivedTasks();
-
-      const maxNames = 3;
-      const displayNames = archivedNames.slice(0, maxNames).join(', ');
-      const remaining = archivedNames.length - maxNames;
-
-      toast({
-        title: archivedNames.length === 1 ? 'Task archived' : 'Tasks archived',
-        description: remaining > 0 ? `${displayNames} and ${remaining} more` : displayNames,
-      });
-    }
-  };
-
-  const handleBulkRestore = async () => {
-    const toRestore = tasksInProject.filter((ws) => selectedIds.has(ws.id) && ws.archivedAt);
-    if (toRestore.length === 0) return;
-
-    setIsRestoring(true);
-
-    const restoredNames: string[] = [];
-    for (const ws of toRestore) {
-      try {
-        if (onRestoreTask) {
-          await onRestoreTask(project, ws);
-        } else {
-          await rpc.db.restoreTask(ws.id);
-        }
-        setArchivedTasks((prev) => prev.filter((t) => t.id !== ws.id));
-        restoredNames.push(ws.name);
-      } catch {
-        // Continue restoring remaining tasks
-      }
-    }
-
-    setIsRestoring(false);
-    exitSelectMode();
-
-    if (restoredNames.length > 0) {
-      const maxNames = 3;
-      const displayNames = restoredNames.slice(0, maxNames).join(', ');
-      const remaining = restoredNames.length - maxNames;
-
-      toast({
-        title: restoredNames.length === 1 ? 'Task restored' : 'Tasks restored',
-        description: remaining > 0 ? `${displayNames} and ${remaining} more` : displayNames,
-      });
-    } else {
-      toast({ title: 'Failed to restore tasks', variant: 'destructive' });
-    }
-  };
-
-  const handleDeleteTask = useCallback(
-    async (task: Task) => {
-      const wasArchived = Boolean(task.archivedAt);
-      const result = await onDeleteTask(project, task);
-
-      if (wasArchived && result !== false) {
-        refetchArchivedTasks();
-      }
-
-      return result;
-    },
-    [onDeleteTask, project, refetchArchivedTasks]
-  );
-
-  const handleArchiveTask = useCallback(
-    async (task: Task) => {
-      if (!onArchiveTask) return;
-      const result = await onArchiveTask(project, task);
-      if (result !== false) {
-        refetchArchivedTasks();
-      }
-      return result;
-    },
-    [onArchiveTask, project, refetchArchivedTasks]
-  );
-
-  const handleRestoreTask = useCallback(
-    async (task: Task) => {
-      try {
-        if (onRestoreTask) {
-          await onRestoreTask(project, task);
-        } else {
-          await rpc.db.restoreTask(task.id);
-        }
-        setArchivedTasks((prev) => prev.filter((t) => t.id !== task.id));
-        toast({ title: 'Task restored', description: task.name });
-      } catch {
-        toast({ title: 'Failed to restore task', variant: 'destructive' });
-      }
-    },
-    [onRestoreTask, project, toast]
-  );
-
-  // Reset select mode when project changes
-  useEffect(() => {
-    setIsSelectMode(false);
-    setSelectedIds(new Set());
-  }, [project.id]);
-
-  useEffect(() => {
-    setBaseBranch(normalizeBaseRef(project.gitInfo.baseRef));
-  }, [project.id, project.gitInfo.baseRef]);
-
-  useEffect(() => {
-    if (!showDeleteDialog) {
-      setDeleteStatus({});
-      setAcknowledgeDirtyDelete(false);
-      return;
-    }
-
-    let cancelled = false;
-    const loadStatus = async () => {
-      setDeleteStatusLoading(true);
-      const next: typeof deleteStatus = {};
-
-      for (const ws of selectedTasks) {
-        try {
-          const [statusRes, infoRes, rawPr] = await Promise.allSettled([
-            window.electronAPI.getGitStatus(ws.path),
-            window.electronAPI.getGitInfo(ws.path),
-            project.isRemote ? Promise.resolve(null) : refreshPrStatus(ws.path),
-          ]);
-
-          let staged = 0;
-          let unstaged = 0;
-          let untracked = 0;
-          if (
-            statusRes.status === 'fulfilled' &&
-            statusRes.value?.success &&
-            statusRes.value.changes
-          ) {
-            for (const change of statusRes.value.changes) {
-              if (change.status === 'untracked') {
-                untracked += 1;
-              } else if (change.isStaged) {
-                staged += 1;
-              } else {
-                unstaged += 1;
-              }
-            }
-          }
-
-          const ahead =
-            infoRes.status === 'fulfilled' && typeof infoRes.value?.aheadCount === 'number'
-              ? infoRes.value.aheadCount
-              : 0;
-          const behind =
-            infoRes.status === 'fulfilled' && typeof infoRes.value?.behindCount === 'number'
-              ? infoRes.value.behindCount
-              : 0;
-          const prValue = rawPr.status === 'fulfilled' ? rawPr.value : null;
-          const pr = isActivePr(prValue) ? prValue : null;
-
-          next[ws.id] = {
-            staged,
-            unstaged,
-            untracked,
-            ahead,
-            behind,
-            error:
-              statusRes.status === 'fulfilled'
-                ? statusRes.value?.error
-                : statusRes.reason?.message || String(statusRes.reason || ''),
-            pr,
-          };
-        } catch (error: any) {
-          next[ws.id] = {
-            staged: 0,
-            unstaged: 0,
-            untracked: 0,
-            ahead: 0,
-            behind: 0,
-            error: error?.message || String(error),
-          };
-        }
-      }
-
-      if (!cancelled) {
-        setDeleteStatus(next);
-        setDeleteStatusLoading(false);
-      }
-    };
-
-    void loadStatus();
-    return () => {
-      cancelled = true;
-    };
-  }, [showDeleteDialog, selectedTasks]);
-
-  // Sync baseBranch when branchOptions change
-  useEffect(() => {
-    if (branchOptions.length === 0) return;
-    const current = baseBranch ?? normalizeBaseRef(project.gitInfo.baseRef);
-    const validDefault = pickDefaultBranch(branchOptions, current);
-    if (validDefault && validDefault !== baseBranch) {
-      setBaseBranch(validDefault);
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [branchOptions]);
-
-  const handleBaseBranchChange = useCallback(
-    async (nextValue: string) => {
-      const trimmed = normalizeBaseRef(nextValue);
-      if (!trimmed || trimmed === baseBranch) return;
-      const previous = baseBranch;
-      setBaseBranch(trimmed);
-      setIsSavingBaseBranch(true);
-      try {
-        const res = await window.electronAPI.updateProjectSettings({
-          projectId: project.id,
-          baseRef: trimmed,
-        });
-        if (!res?.success) {
-          throw new Error(res?.error || 'Failed to update base branch');
-        }
-        if (project.gitInfo) {
-          project.gitInfo.baseRef = trimmed;
-        }
-        onBaseBranchChangeCallback?.(trimmed);
-      } catch (error) {
-        setBaseBranch(previous);
-        toast({
-          variant: 'destructive',
-          title: 'Failed to update base branch',
-          description: error instanceof Error ? error.message : String(error),
-        });
-      } finally {
-        setIsSavingBaseBranch(false);
-      }
-    },
-    [baseBranch, project.id, project.gitInfo, onBaseBranchChangeCallback, toast]
-  );
-
-  return (
-    <div className="flex min-h-0 flex-1 flex-col bg-background">
-      <div className="flex-1 overflow-y-auto">
-        <div className="px-6 py-8">
-          <div className="mx-auto w-full max-w-6xl">
-            {/* Header */}
-            <div className="px-10">
-              <header className="flex items-center justify-between">
-                <h1 className="text-2xl font-semibold tracking-tight">{project.name}</h1>
-                <div className="flex items-center gap-2">
-                  <BaseBranchControls
-                    baseBranch={baseBranch}
-                    branchOptions={branchOptions}
-                    isLoadingBranches={isLoadingBranches}
-                    isSavingBaseBranch={isSavingBaseBranch}
-                    onBaseBranchChange={handleBaseBranchChange}
-                    onOpenConfig={() => setShowConfigEditor(true)}
-                  />
-                  {project.githubInfo?.connected && project.githubInfo.repository ? (
-                    <motion.button
-                      whileTap={{ scale: 0.97 }}
-                      transition={{ duration: 0.1, ease: 'easeInOut' }}
-                      className="inline-flex h-8 items-center justify-center gap-1.5 rounded-md border border-input bg-background px-3 text-xs font-medium transition-colors hover:bg-accent hover:text-accent-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2"
-                      onClick={() =>
-                        window.electronAPI.openExternal(
-                          `https://github.com/${project.githubInfo?.repository}`
-                        )
-                      }
-                    >
-                      <Github className="size-3.5" />
-                      View on GitHub
-                    </motion.button>
-                  ) : null}
-                  {onDeleteProject ? (
-                    <ProjectDeleteButton
-                      projectName={project.name}
-                      tasks={activeTasks}
-                      onConfirm={() => onDeleteProject?.(project)}
-                      aria-label={`Delete project ${project.name}`}
-                    />
-                  ) : null}
-                </div>
-              </header>
-              <Separator className="mt-4" />
-            </div>
-
-            {/* Tasks Section */}
-            <div className="mt-6 flex flex-col gap-4 px-10">
-              <div className="flex items-center justify-between">
-                <div className="space-y-1">
-                  <h2 className="text-xl font-semibold">Tasks</h2>
-                  <p className="text-sm text-muted-foreground">
-                    Spin up a fresh, isolated task for this project.
-                  </p>
-                </div>
-                <motion.button
-                  whileTap={{ scale: 0.97 }}
-                  transition={{ duration: 0.1, ease: 'easeInOut' }}
-                  className="inline-flex h-8 items-center justify-center rounded-md bg-primary px-4 text-sm font-semibold text-primary-foreground shadow-sm transition-colors hover:bg-primary/90 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50"
-                  onClick={onCreateTask}
-                >
-                  <Plus className="mr-2 size-4" />
-                  New Task
-                </motion.button>
-              </div>
-
-              {hasAnyTasks ? (
-                <>
-                  <div className="relative">
-                    <Search className="absolute left-3 top-1/2 h-4 w-4 -translate-y-1/2 text-muted-foreground" />
-                    <Input
-                      placeholder="Search tasks..."
-                      value={searchFilter}
-                      onChange={(e) => setSearchFilter(e.target.value)}
-                      className="h-10 w-full pl-10"
-                    />
-                  </div>
-
-                  <div className="flex h-7 items-center gap-2 px-3">
-                    {isSelectMode ? (
-                      <>
-                        <Checkbox
-                          checked={someFilteredSelected ? 'indeterminate' : allFilteredSelected}
-                          onCheckedChange={toggleSelectAll}
-                          aria-label="Select all tasks"
-                          className="-ml-10 h-4 w-4 shrink-0 rounded border-muted-foreground/50"
-                        />
-                        <span className="text-sm text-muted-foreground">
-                          {selectedCount} selected
-                        </span>
-                        {onArchiveTask && bulkActionState.hasActive && (
-                          <TooltipProvider delayDuration={300}>
-                            <Tooltip>
-                              <TooltipTrigger asChild>
-                                <Button
-                                  variant="ghost"
-                                  size="icon-sm"
-                                  className="text-muted-foreground"
-                                  onClick={handleBulkArchive}
-                                  disabled={
-                                    isArchiving || isDeleting || isRestoring || selectedCount === 0
-                                  }
-                                  aria-label="Archive selected"
-                                >
-                                  {isArchiving ? (
-                                    <Loader2 className="h-3.5 w-3.5 animate-spin" />
-                                  ) : (
-                                    <Archive className="h-3.5 w-3.5" />
-                                  )}
-                                </Button>
-                              </TooltipTrigger>
-                              <TooltipContent side="top" className="text-xs">
-                                Archive {bulkActionState.activeCount}{' '}
-                                {bulkActionState.activeCount === 1 ? 'task' : 'tasks'}
-                              </TooltipContent>
-                            </Tooltip>
-                          </TooltipProvider>
-                        )}
-                        {bulkActionState.hasArchived && (
-                          <TooltipProvider delayDuration={300}>
-                            <Tooltip>
-                              <TooltipTrigger asChild>
-                                <Button
-                                  variant="ghost"
-                                  size="icon-sm"
-                                  className="text-muted-foreground"
-                                  onClick={handleBulkRestore}
-                                  disabled={
-                                    isArchiving || isDeleting || isRestoring || selectedCount === 0
-                                  }
-                                  aria-label="Unarchive selected"
-                                >
-                                  {isRestoring ? (
-                                    <Loader2 className="h-3.5 w-3.5 animate-spin" />
-                                  ) : (
-                                    <ArchiveRestore className="h-3.5 w-3.5" />
-                                  )}
-                                </Button>
-                              </TooltipTrigger>
-                              <TooltipContent side="top" className="text-xs">
-                                Unarchive {bulkActionState.archivedCount}{' '}
-                                {bulkActionState.archivedCount === 1 ? 'task' : 'tasks'}
-                              </TooltipContent>
-                            </Tooltip>
-                          </TooltipProvider>
-                        )}
-                        <Button
-                          variant="ghost"
-                          size="icon-sm"
-                          className="text-muted-foreground"
-                          onClick={() => setShowDeleteDialog(true)}
-                          disabled={isDeleting || isArchiving || isRestoring || selectedCount === 0}
-                          aria-label="Delete selected"
-                        >
-                          {isDeleting ? (
-                            <Loader2 className="h-3.5 w-3.5 animate-spin" />
-                          ) : (
-                            <Trash2 className="h-3.5 w-3.5" />
-                          )}
-                        </Button>
-                        <Button
-                          variant="ghost"
-                          size="icon-sm"
-                          className="ml-auto text-muted-foreground"
-                          onClick={exitSelectMode}
-                          aria-label="Exit select mode"
-                        >
-                          <X className="h-3.5 w-3.5" />
-                        </Button>
-                      </>
-                    ) : (
-                      <>
-                        <span className="text-sm text-muted-foreground">
-                          {filteredTasks.length} {filteredTasks.length === 1 ? 'task' : 'tasks'}{' '}
-                          with Emdash
-                        </span>
-                        {filteredTasks.length > 0 && (
-                          <button
-                            type="button"
-                            className="cursor-pointer text-sm text-muted-foreground underline"
-                            onClick={() => setIsSelectMode(true)}
-                          >
-                            Select
-                          </button>
-                        )}
-                        <Popover>
-                          <PopoverTrigger asChild>
-                            <Button
-                              variant="ghost"
-                              size="icon-sm"
-                              className="ml-auto text-muted-foreground"
-                              aria-label="Filter tasks"
-                            >
-                              <ListFilter className="h-3.5 w-3.5" />
-                            </Button>
-                          </PopoverTrigger>
-                          <PopoverContent align="end" className="w-48 p-1">
-                            <p className="px-2 py-1.5 text-xs font-medium text-muted-foreground">
-                              Show
-                            </p>
-                            <button
-                              type="button"
-                              className="flex w-full items-center justify-between rounded-sm px-2 py-1.5 text-sm hover:bg-accent"
-                              onClick={() => setShowFilter('all')}
-                            >
-                              All tasks
-                              {showFilter === 'all' && (
-                                <Check className="h-3.5 w-3.5 text-foreground" />
-                              )}
-                            </button>
-                            <button
-                              type="button"
-                              className="flex w-full items-center justify-between rounded-sm px-2 py-1.5 text-sm hover:bg-accent"
-                              onClick={() => setShowFilter('active')}
-                            >
-                              Hide archived
-                              {showFilter === 'active' && (
-                                <Check className="h-3.5 w-3.5 text-foreground" />
-                              )}
-                            </button>
-                          </PopoverContent>
-                        </Popover>
-                      </>
-                    )}
-                  </div>
-
-                  {filteredTasks.length > 0 ? (
-                    <div className="task-list -ml-7 flex flex-col">
-                      <style>{`
-                        .task-list .task-row:first-child .task-card::before { opacity: 0; }
-                        .task-list .task-row:hover + .task-row .task-card::before,
-                        .task-list .task-row[data-active] + .task-row .task-card::before,
-                        .task-list .task-row[data-selected] + .task-row .task-card::before { opacity: 0; }
-                        .task-list .task-row:last-child .task-card::after {
-                          content: ''; position: absolute; inset: auto 0 0 0; height: 1px; background: hsl(var(--border));
-                        }
-                        .task-list .task-row:last-child:hover .task-card::after,
-                        .task-list .task-row:last-child[data-active] .task-card::after,
-                        .task-list .task-row:last-child[data-selected] .task-card::after { opacity: 0; }
-                      `}</style>
-                      {filteredTasks.map((ws) => (
-                        <TaskRow
-                          key={ws.id}
-                          ws={ws}
-                          isSelectMode={isSelectMode}
-                          isSelected={selectedIds.has(ws.id)}
-                          onToggleSelect={() => toggleSelect(ws.id)}
-                          active={activeTask?.id === ws.id}
-                          onClick={() => onSelectTask(ws)}
-                          onDelete={() => handleDeleteTask(ws)}
-                          onArchive={onArchiveTask ? () => handleArchiveTask(ws) : undefined}
-                          enablePrStatus={!project.isRemote}
-                          onRestore={ws.archivedAt ? () => handleRestoreTask(ws) : undefined}
-                        />
-                      ))}
-                    </div>
-                  ) : (
-                    <div className="flex flex-col items-center justify-center py-12 text-center">
-                      <Archive className="mb-3 h-12 w-12 text-muted-foreground/50" />
-                      <p className="text-sm text-muted-foreground">
-                        {searchFilter.trim()
-                          ? 'No tasks match your search.'
-                          : showFilter === 'active'
-                            ? 'All tasks are archived. Use the filter to view them.'
-                            : 'No tasks found.'}
-                      </p>
-                    </div>
-                  )}
-                </>
-              ) : (
-                <Alert>
-                  <AlertTitle>What's a task?</AlertTitle>
-                  <AlertDescription>
-                    Each task is an isolated copy and branch of your repo (Git-tracked files only).
-                  </AlertDescription>
-                </Alert>
-              )}
-            </div>
-          </div>
-        </div>
-      </div>
-
-      <AlertDialog open={showDeleteDialog} onOpenChange={setShowDeleteDialog}>
-        <AlertDialogContent>
-          <AlertDialogHeader>
-            <AlertDialogTitle>Delete tasks?</AlertDialogTitle>
-            <AlertDialogDescription>
-              This will permanently delete the selected tasks and their worktrees.
-            </AlertDialogDescription>
-          </AlertDialogHeader>
-          <div className="space-y-3">
-            <AnimatePresence initial={false}>
-              {deleteStatusLoading ? (
-                <motion.div
-                  key="bulk-delete-loading"
-                  initial={{ opacity: 0, y: 6, scale: 0.99 }}
-                  animate={{ opacity: 1, y: 0, scale: 1 }}
-                  exit={{ opacity: 0, y: 6, scale: 0.99 }}
-                  transition={{ duration: 0.18, ease: 'easeOut' }}
-                  className="flex items-start gap-3 rounded-md border border-border/70 bg-muted/30 px-4 py-4"
-                >
-                  <Spinner
-                    className="mt-0.5 h-5 w-5 flex-shrink-0 text-muted-foreground"
-                    size="sm"
-                  />
-                  <div className="flex min-w-0 flex-col gap-1">
-                    <span className="text-sm font-semibold text-foreground">Please wait...</span>
-                    <span className="text-xs text-muted-foreground">
-                      Scanning tasks for uncommitted changes and open pull requests
-                    </span>
-                  </div>
-                </motion.div>
-              ) : null}
-            </AnimatePresence>
-            <AnimatePresence initial={false}>
-              {(() => {
-                const tasksWithUncommittedWorkOnly = selectedTasks.filter((ws) => {
-                  const summary = deleteRisks.summaries[ws.id];
-                  const status = deleteStatus[ws.id];
-                  if (!summary && !status?.error) return false;
-                  if (status?.pr && isActivePr(status.pr)) return false;
-                  return true;
-                });
-
-                return tasksWithUncommittedWorkOnly.length > 0 && !deleteStatusLoading ? (
-                  <motion.div
-                    key="bulk-risk"
-                    initial={{ opacity: 0, y: 6, scale: 0.99 }}
-                    animate={{ opacity: 1, y: 0, scale: 1 }}
-                    exit={{ opacity: 0, y: 6, scale: 0.99 }}
-                    transition={{ duration: 0.2, ease: 'easeOut' }}
-                    className="space-y-2 rounded-md border border-amber-300/60 bg-amber-50 px-3 py-2 text-sm text-amber-900 dark:border-amber-500/40 dark:bg-amber-500/10 dark:text-amber-50"
-                  >
-                    <p className="font-medium">Unmerged or unpushed work detected</p>
-                    <ul className="space-y-1">
-                      {tasksWithUncommittedWorkOnly.map((ws) => {
-                        const summary = deleteRisks.summaries[ws.id];
-                        const status = deleteStatus[ws.id];
-                        return (
-                          <li
-                            key={ws.id}
-                            className="flex items-center gap-2 rounded-md bg-amber-50/80 px-2 py-1 text-sm text-amber-900 dark:bg-amber-500/10 dark:text-amber-50"
-                          >
-                            <Folder className="h-4 w-4 fill-amber-700 text-amber-700" />
-                            <span className="font-medium">{ws.name}</span>
-                            <span className="text-muted-foreground">—</span>
-                            <span>{summary || status?.error || 'Status unavailable'}</span>
-                          </li>
-                        );
-                      })}
-                    </ul>
-                  </motion.div>
-                ) : null;
-              })()}
-            </AnimatePresence>
-
-            <AnimatePresence initial={false}>
-              {(() => {
-                const prTasks = selectedTasks
-                  .map((ws) => ({ name: ws.name, pr: deleteStatus[ws.id]?.pr }))
-                  .filter((w) => w.pr && isActivePr(w.pr));
-                return prTasks.length && !deleteStatusLoading ? (
-                  <motion.div
-                    key="bulk-pr-notice"
-                    initial={{ opacity: 0, y: 6, scale: 0.99 }}
-                    animate={{ opacity: 1, y: 0, scale: 1 }}
-                    exit={{ opacity: 0, y: 6, scale: 0.99 }}
-                    transition={{ duration: 0.2, ease: 'easeOut', delay: 0.02 }}
-                  >
-                    <DeletePrNotice tasks={prTasks as any} />
-                  </motion.div>
-                ) : null;
-              })()}
-            </AnimatePresence>
-
-            <AnimatePresence initial={false}>
-              {deleteRisks.riskyIds.size > 0 && !deleteStatusLoading ? (
-                <motion.label
-                  key="bulk-ack"
-                  className="flex items-start gap-2 rounded-md border border-border/70 bg-muted/30 px-3 py-2 text-sm"
-                  initial={{ opacity: 0, y: 6, scale: 0.99 }}
-                  animate={{ opacity: 1, y: 0, scale: 1 }}
-                  exit={{ opacity: 0, y: 6, scale: 0.99 }}
-                  transition={{ duration: 0.18, ease: 'easeOut', delay: 0.03 }}
-                >
-                  <Checkbox
-                    id="ack-delete"
-                    checked={acknowledgeDirtyDelete}
-                    onCheckedChange={(val) => setAcknowledgeDirtyDelete(val === true)}
-                  />
-                  <span className="leading-tight">Delete tasks anyway</span>
-                </motion.label>
-              ) : null}
-            </AnimatePresence>
-          </div>
-          <AlertDialogFooter>
-            <AlertDialogCancel>Cancel</AlertDialogCancel>
-            <AlertDialogAction
-              className="bg-destructive px-4 text-destructive-foreground hover:bg-destructive/90"
-              onClick={handleBulkDelete}
-              disabled={deleteDisabled}
-            >
-              Delete
-            </AlertDialogAction>
-          </AlertDialogFooter>
-        </AlertDialogContent>
-      </AlertDialog>
-
-      <ConfigEditorModal
-        isOpen={showConfigEditor}
-        onClose={() => setShowConfigEditor(false)}
-        projectPath={project.path}
-        isRemote={project.isRemote}
-        sshConnectionId={project.sshConnectionId}
-      />
-    </div>
-  );
-};
-
-export default ProjectMainView;
diff --git a/src/renderer/components/ProjectPrepSettingsCard.tsx b/src/renderer/components/ProjectPrepSettingsCard.tsx
deleted file mode 100644
index f647a73ac5..0000000000
--- a/src/renderer/components/ProjectPrepSettingsCard.tsx
+++ /dev/null
@@ -1,81 +0,0 @@
-import React, { useCallback, useEffect, useState } from 'react';
-import { Switch } from './ui/switch';
-import { rpc } from '@/lib/rpc';
-
-type PrepSettings = {
-  autoInstallOnOpenInEditor: boolean;
-};
-
-const DEFAULTS: PrepSettings = {
-  autoInstallOnOpenInEditor: true,
-};
-
-const ProjectPrepSettingsCard: React.FC = () => {
-  const [settings, setSettings] = useState<PrepSettings>(DEFAULTS);
-  const [loading, setLoading] = useState<boolean>(true);
-  const [saving, setSaving] = useState<boolean>(false);
-
-  const load = useCallback(async () => {
-    try {
-      const settings = await rpc.appSettings.get();
-      if (settings?.projectPrep) {
-        setSettings({
-          autoInstallOnOpenInEditor:
-            typeof settings.projectPrep.autoInstallOnOpenInEditor === 'boolean'
-              ? settings.projectPrep.autoInstallOnOpenInEditor
-              : DEFAULTS.autoInstallOnOpenInEditor,
-        });
-      } else {
-        setSettings(DEFAULTS);
-      }
-    } finally {
-      setLoading(false);
-    }
-  }, []);
-
-  useEffect(() => {
-    void load();
-  }, [load]);
-
-  const save = useCallback(
-    async (partial: Partial<PrepSettings>) => {
-      setSaving(true);
-      try {
-        const next = { ...settings, ...partial };
-        const res = await rpc.appSettings.update({ projectPrep: next as any });
-        if (res.projectPrep) {
-          setSettings({
-            autoInstallOnOpenInEditor:
-              typeof res.projectPrep.autoInstallOnOpenInEditor === 'boolean'
-                ? res.projectPrep.autoInstallOnOpenInEditor
-                : DEFAULTS.autoInstallOnOpenInEditor,
-          });
-        }
-      } finally {
-        setSaving(false);
-      }
-    },
-    [settings]
-  );
-
-  return (
-    <div className="flex items-center justify-between gap-4">
-      <div className="space-y-1 text-xs text-muted-foreground">
-        <div className="text-sm text-foreground">Auto-install on “Open in …”</div>
-        <div>
-          For Node projects only: when opening a worktree in Cursor, VS Code, or Zed, install
-          dependencies in the background (uses pnpm/yarn/bun/npm based on lockfile) if
-          <code className="mx-1 rounded bg-muted/60 px-1">node_modules</code> is missing.
-        </div>
-      </div>
-      <Switch
-        checked={settings.autoInstallOnOpenInEditor}
-        onCheckedChange={(checked) => save({ autoInstallOnOpenInEditor: Boolean(checked) })}
-        disabled={loading || saving}
-        aria-label="Enable auto-install on Open in …"
-      />
-    </div>
-  );
-};
-
-export default ProjectPrepSettingsCard;
diff --git a/src/renderer/components/ReorderList.tsx b/src/renderer/components/ReorderList.tsx
deleted file mode 100644
index e6069bb664..0000000000
--- a/src/renderer/components/ReorderList.tsx
+++ /dev/null
@@ -1,52 +0,0 @@
-import React from 'react';
-import { Reorder } from 'motion/react';
-
-type Axis = 'x' | 'y';
-
-interface ReorderListProps<T> {
-  items: T[];
-  onReorder: (items: T[]) => void;
-  axis?: Axis;
-  className?: string;
-  itemClassName?: string;
-  layoutScroll?: boolean;
-  as?: keyof JSX.IntrinsicElements | React.ComponentType<any>;
-  getKey?: (item: T, index: number) => string | number;
-  children: (item: T, index: number) => React.ReactNode;
-}
-
-export function ReorderList<T>({
-  items,
-  onReorder,
-  axis = 'y',
-  className,
-  itemClassName,
-  layoutScroll = true,
-  as = 'div',
-  getKey,
-  children,
-}: ReorderListProps<T>) {
-  return (
-    <Reorder.Group
-      as={as as any}
-      axis={axis}
-      values={items}
-      onReorder={onReorder as any}
-      layoutScroll={layoutScroll}
-      className={className}
-    >
-      {items.map((item, index) => (
-        <Reorder.Item
-          key={(getKey ? getKey(item, index) : (index as any)) as React.Key}
-          value={item as any}
-          className={itemClassName}
-          transition={{ layout: { duration: 0 } }}
-        >
-          {children(item, index)}
-        </Reorder.Item>
-      ))}
-    </Reorder.Group>
-  );
-}
-
-export default ReorderList;
diff --git a/src/renderer/components/RepositorySettingsCard.tsx b/src/renderer/components/RepositorySettingsCard.tsx
deleted file mode 100644
index db2ce33afb..0000000000
--- a/src/renderer/components/RepositorySettingsCard.tsx
+++ /dev/null
@@ -1,58 +0,0 @@
-import React, { useMemo } from 'react';
-import { Input } from './ui/input';
-import { Switch } from './ui/switch';
-import { useAppSettings } from '@/contexts/AppSettingsProvider';
-
-type RepoSettings = {
-  branchPrefix: string;
-  pushOnCreate: boolean;
-};
-
-const DEFAULTS: RepoSettings = {
-  branchPrefix: 'emdash',
-  pushOnCreate: true,
-};
-
-const RepositorySettingsCard: React.FC = () => {
-  const { settings, updateSettings, isLoading: loading, isSaving: saving } = useAppSettings();
-
-  const { repository } = settings ?? {};
-
-  const example = useMemo(() => {
-    const prefix = repository?.branchPrefix || DEFAULTS.branchPrefix;
-    return `${prefix}/my-feature-a3f`;
-  }, [repository?.branchPrefix]);
-
-  return (
-    <div className="grid gap-8">
-      <div className="grid gap-2">
-        <Input
-          defaultValue={repository?.branchPrefix ?? DEFAULTS.branchPrefix}
-          onBlur={(e) => updateSettings({ repository: { branchPrefix: e.target.value.trim() } })}
-          placeholder="Branch prefix"
-          aria-label="Branch prefix"
-          disabled={loading}
-        />
-        <div className="text-[11px] text-muted-foreground">
-          Example: <code className="rounded bg-muted/60 px-1">{example}</code>
-        </div>
-      </div>
-      <div className="flex items-center justify-between gap-4">
-        <div className="space-y-1 text-xs text-muted-foreground">
-          <div className="text-sm font-medium text-foreground">Auto-push to origin</div>
-          <div className="text-sm">
-            Push the new branch to origin and set upstream after creation.
-          </div>
-        </div>
-        <Switch
-          defaultChecked={repository?.pushOnCreate ?? DEFAULTS.pushOnCreate}
-          onCheckedChange={(checked) => updateSettings({ repository: { pushOnCreate: checked } })}
-          disabled={loading || saving}
-          aria-label="Enable automatic push on create"
-        />
-      </div>
-    </div>
-  );
-};
-
-export default RepositorySettingsCard;
diff --git a/src/renderer/components/RequirementsNotice.tsx b/src/renderer/components/RequirementsNotice.tsx
deleted file mode 100644
index 7ad1341193..0000000000
--- a/src/renderer/components/RequirementsNotice.tsx
+++ /dev/null
@@ -1,30 +0,0 @@
-import React from 'react';
-
-type Props = {
-  showGithubRequirement: boolean;
-  needsGhInstall: boolean;
-  needsGhAuth: boolean;
-};
-
-const RequirementsNotice: React.FC<Props> = ({
-  showGithubRequirement,
-  needsGhInstall,
-  needsGhAuth,
-}) => {
-  return (
-    <div className="mx-auto max-w-2xl space-y-4 text-sm text-muted-foreground">
-      {showGithubRequirement && (
-        <div>
-          <p className="mb-2">
-            <strong>Requirements:</strong> GitHub account
-          </p>
-          {needsGhAuth && (
-            <p className="text-xs">Click "Sign in with GitHub" to connect your account</p>
-          )}
-        </div>
-      )}
-    </div>
-  );
-};
-
-export default RequirementsNotice;
diff --git a/src/renderer/components/RightSidebar.tsx b/src/renderer/components/RightSidebar.tsx
deleted file mode 100644
index 7ce4b004d0..0000000000
--- a/src/renderer/components/RightSidebar.tsx
+++ /dev/null
@@ -1,414 +0,0 @@
-import React, { useState } from 'react';
-import { cn } from '@/lib/utils';
-import FileChangesPanel from './FileChangesPanel';
-import TaskTerminalPanel from './TaskTerminalPanel';
-import { useRightSidebar } from './ui/right-sidebar';
-import { agentAssets } from '@/providers/assets';
-import { agentMeta } from '@/providers/meta';
-import AgentLogo from './AgentLogo';
-import type { Agent } from '../types';
-import { TaskScopeProvider, useTaskScope } from './TaskScopeContext';
-import { ChevronDown, ChevronRight } from 'lucide-react';
-import { ResizablePanelGroup, ResizablePanel, ResizableHandle } from './ui/resizable';
-import { RIGHT_SIDEBAR_VERTICAL_STORAGE_KEY } from '@/constants/layout';
-
-export interface RightSidebarTask {
-  id: string;
-  name: string;
-  branch: string;
-  path: string;
-  status: 'active' | 'idle' | 'running';
-  agentId?: string;
-  metadata?: any;
-}
-
-interface RightSidebarProps extends React.HTMLAttributes<HTMLElement> {
-  task: RightSidebarTask | null;
-  projectPath?: string | null;
-  projectRemoteConnectionId?: string | null;
-  projectRemotePath?: string | null;
-  projectDefaultBranch?: string | null;
-  forceBorder?: boolean;
-  onOpenChanges?: (filePath?: string, taskPath?: string) => void;
-}
-
-const RightSidebar: React.FC<RightSidebarProps> = ({
-  task,
-  projectPath,
-  projectRemoteConnectionId,
-  projectRemotePath,
-  projectDefaultBranch,
-  className,
-  forceBorder = false,
-  onOpenChanges,
-  ...rest
-}) => {
-  const { collapsed } = useRightSidebar();
-  const [isDarkMode, setIsDarkMode] = useState(false);
-  const [collapsedVariants, setCollapsedVariants] = useState<Set<string>>(new Set());
-
-  const toggleVariantCollapsed = (variantKey: string) => {
-    setCollapsedVariants((prev) => {
-      const newSet = new Set(prev);
-      if (newSet.has(variantKey)) {
-        newSet.delete(variantKey);
-      } else {
-        newSet.add(variantKey);
-      }
-      return newSet;
-    });
-  };
-
-  React.useEffect(() => {
-    const checkDarkMode = () => {
-      setIsDarkMode(document.documentElement.classList.contains('dark'));
-    };
-    checkDarkMode();
-    const observer = new MutationObserver(checkDarkMode);
-    observer.observe(document.documentElement, { attributes: true, attributeFilter: ['class'] });
-    return () => observer.disconnect();
-  }, []);
-
-  // Detect multi-agent variants in task metadata
-  const variants: Array<{ agent: Agent; name: string; path: string; worktreeId?: string }> =
-    (() => {
-      try {
-        const v = task?.metadata?.multiAgent?.variants || [];
-        if (Array.isArray(v))
-          return v
-            .map((x: any) => ({
-              agent: x?.agent as Agent,
-              name: x?.name,
-              path: x?.path,
-              worktreeId: x?.worktreeId,
-            }))
-            .filter((x) => x?.path);
-      } catch {}
-      return [];
-    })();
-
-  // Helper to generate display label with instance number if needed
-  const getVariantDisplayLabel = (variant: { agent: Agent; name: string }): string => {
-    const meta = agentMeta[variant.agent];
-    const asset = agentAssets[variant.agent];
-    const baseName = meta?.label || asset?.name || String(variant.agent);
-
-    // Count how many variants use this agent
-    const agentVariants = variants.filter((v) => v.agent === variant.agent);
-
-    // If only one instance of this agent, just show base name
-    if (agentVariants.length === 1) {
-      return baseName;
-    }
-
-    // Multiple instances: extract instance number from variant name
-    // variant.name format: "task-agent-1", "task-agent-2", etc.
-    const match = variant.name.match(/-(\d+)$/);
-    const instanceNum = match
-      ? match[1]
-      : String(agentVariants.findIndex((v) => v.name === variant.name) + 1);
-
-    return `${baseName} #${instanceNum}`;
-  };
-
-  return (
-    <aside
-      data-state={collapsed ? 'collapsed' : 'open'}
-      className={cn(
-        'group/right-sidebar relative z-[45] flex h-full w-full min-w-0 flex-shrink-0 flex-col overflow-hidden transition-all duration-200 ease-linear',
-        forceBorder
-          ? 'bg-background'
-          : 'border-l border-border bg-muted/10 data-[state=collapsed]:border-l-0',
-        'data-[state=collapsed]:pointer-events-none',
-        className
-      )}
-      style={
-        forceBorder
-          ? {
-              borderLeft: collapsed
-                ? 'none'
-                : isDarkMode
-                  ? '2px solid rgb(63, 63, 70)'
-                  : '2px solid rgb(228, 228, 231)',
-              boxShadow: collapsed
-                ? 'none'
-                : isDarkMode
-                  ? '-2px 0 8px rgba(0,0,0,0.5)'
-                  : '-2px 0 8px rgba(0,0,0,0.1)',
-            }
-          : undefined
-      }
-      aria-hidden={collapsed}
-      {...rest}
-    >
-      <TaskScopeProvider value={{ taskId: task?.id, taskPath: task?.path, projectPath }}>
-        <div className="flex h-full w-full min-w-0 flex-col">
-          {task || projectPath ? (
-            <div className="flex h-full flex-col">
-              {task && variants.length > 1 ? (
-                <div className="min-h-0 flex-1 overflow-y-auto">
-                  {variants.map((v, i) => {
-                    const variantKey = `${v.agent}-${i}`;
-                    const isCollapsed = collapsedVariants.has(variantKey);
-                    return (
-                      <div
-                        key={variantKey}
-                        className="mb-2 border-b border-border last:mb-0 last:border-b-0"
-                      >
-                        <button
-                          type="button"
-                          onClick={() => toggleVariantCollapsed(variantKey)}
-                          className="flex w-full min-w-0 cursor-pointer items-center justify-between bg-muted px-3 py-2 text-xs font-medium text-foreground hover:bg-muted/80 dark:bg-background dark:hover:bg-muted/20"
-                        >
-                          <span className="inline-flex min-w-0 items-center gap-2">
-                            {isCollapsed ? (
-                              <ChevronRight className="h-3.5 w-3.5 shrink-0 text-muted-foreground" />
-                            ) : (
-                              <ChevronDown className="h-3.5 w-3.5 shrink-0 text-muted-foreground" />
-                            )}
-                            {(() => {
-                              const asset = agentAssets[v.agent as keyof typeof agentAssets];
-                              const meta = (agentMeta as any)[v.agent] as
-                                | { label?: string }
-                                | undefined;
-                              return (
-                                <span className="inline-flex shrink-0 items-center gap-1.5 rounded-md border border-border/70 bg-muted/40 px-2 py-0.5 text-[10px] font-medium">
-                                  {asset?.logo ? (
-                                    <AgentLogo
-                                      logo={asset.logo}
-                                      alt={asset.alt || meta?.label || String(v.agent)}
-                                      isSvg={asset.isSvg}
-                                      invertInDark={asset.invertInDark}
-                                      className="h-3.5 w-3.5"
-                                    />
-                                  ) : null}
-                                  {getVariantDisplayLabel(v)}
-                                </span>
-                              );
-                            })()}
-                            <span className="truncate" title={v.name}>
-                              {v.name}
-                            </span>
-                          </span>
-                        </button>
-                        {!isCollapsed && (
-                          <TaskScopeProvider
-                            value={{ taskId: task.id, taskPath: v.path, projectPath }}
-                          >
-                            <VariantChangesIfAny
-                              path={v.path}
-                              taskId={task.id}
-                              onOpenChanges={onOpenChanges}
-                            />
-                            <TaskTerminalPanel
-                              task={{
-                                ...task,
-                                path: v.path,
-                                name: v.name || task.name,
-                              }}
-                              agent={v.agent}
-                              projectPath={projectPath || task?.path}
-                              remote={
-                                projectRemoteConnectionId
-                                  ? {
-                                      connectionId: projectRemoteConnectionId,
-                                      projectPath: projectRemotePath || projectPath || undefined,
-                                    }
-                                  : undefined
-                              }
-                              defaultBranch={projectDefaultBranch || undefined}
-                              portSeed={v.worktreeId}
-                              className="min-h-[200px]"
-                            />
-                          </TaskScopeProvider>
-                        )}
-                      </div>
-                    );
-                  })}
-                </div>
-              ) : task && variants.length === 1 ? (
-                (() => {
-                  const v = variants[0];
-                  const derived = {
-                    ...task,
-                    path: v.path,
-                    name: v.name || task.name,
-                  } as any;
-                  return (
-                    <ResizablePanelGroup
-                      direction="vertical"
-                      autoSaveId={RIGHT_SIDEBAR_VERTICAL_STORAGE_KEY}
-                    >
-                      <ResizablePanel defaultSize={50} minSize={20}>
-                        <VariantChangesIfAny
-                          path={v.path}
-                          taskId={task.id}
-                          className="h-full min-h-0"
-                          onOpenChanges={onOpenChanges}
-                        />
-                      </ResizablePanel>
-                      <ResizableHandle />
-                      <ResizablePanel defaultSize={50} minSize={20}>
-                        <TaskTerminalPanel
-                          task={derived}
-                          agent={v.agent}
-                          projectPath={projectPath || task?.path}
-                          remote={
-                            projectRemoteConnectionId
-                              ? {
-                                  connectionId: projectRemoteConnectionId,
-                                  projectPath: projectRemotePath || projectPath || undefined,
-                                }
-                              : undefined
-                          }
-                          defaultBranch={projectDefaultBranch || undefined}
-                          portSeed={v.worktreeId}
-                          className="h-full min-h-0"
-                        />
-                      </ResizablePanel>
-                    </ResizablePanelGroup>
-                  );
-                })()
-              ) : task ? (
-                <SingleTaskSidebar
-                  task={task}
-                  projectPath={projectPath}
-                  projectRemoteConnectionId={projectRemoteConnectionId}
-                  projectRemotePath={projectRemotePath}
-                  projectDefaultBranch={projectDefaultBranch}
-                  onOpenChanges={onOpenChanges}
-                />
-              ) : (
-                <ResizablePanelGroup
-                  direction="vertical"
-                  autoSaveId={RIGHT_SIDEBAR_VERTICAL_STORAGE_KEY}
-                >
-                  <ResizablePanel defaultSize={50} minSize={20}>
-                    <div className="flex h-full flex-col bg-background">
-                      <div className="border-b border-border bg-muted px-3 py-2 text-sm font-medium text-foreground dark:bg-background">
-                        <span className="whitespace-nowrap">Changes</span>
-                      </div>
-                      <div className="flex flex-1 items-center justify-center px-4 text-center text-sm text-muted-foreground">
-                        <span className="overflow-hidden text-ellipsis whitespace-nowrap">
-                          Select a task to review file changes.
-                        </span>
-                      </div>
-                    </div>
-                  </ResizablePanel>
-                  <ResizableHandle />
-                  <ResizablePanel defaultSize={50} minSize={20}>
-                    <TaskTerminalPanel
-                      task={null}
-                      agent={undefined}
-                      projectPath={projectPath || undefined}
-                      remote={
-                        projectRemoteConnectionId
-                          ? {
-                              connectionId: projectRemoteConnectionId,
-                              projectPath: projectRemotePath || projectPath || undefined,
-                            }
-                          : undefined
-                      }
-                      defaultBranch={projectDefaultBranch || undefined}
-                      className="h-full min-h-0"
-                    />
-                  </ResizablePanel>
-                </ResizablePanelGroup>
-              )}
-            </div>
-          ) : (
-            <ResizablePanelGroup
-              direction="vertical"
-              autoSaveId={RIGHT_SIDEBAR_VERTICAL_STORAGE_KEY}
-              className="text-sm text-muted-foreground"
-            >
-              <ResizablePanel defaultSize={50} minSize={20}>
-                <div className="flex h-full flex-col bg-background">
-                  <div className="border-b border-border bg-muted px-3 py-2 text-sm font-medium text-foreground dark:bg-background">
-                    <span className="whitespace-nowrap">Changes</span>
-                  </div>
-                  <div className="flex flex-1 items-center justify-center px-4 text-center">
-                    <span className="overflow-hidden text-ellipsis whitespace-nowrap">
-                      Select a task to review file changes.
-                    </span>
-                  </div>
-                </div>
-              </ResizablePanel>
-              <ResizableHandle />
-              <ResizablePanel defaultSize={50} minSize={20}>
-                <div className="flex h-full flex-col bg-background">
-                  <div className="border-b border-border bg-muted px-3 py-2 text-sm font-medium text-foreground dark:bg-background">
-                    <span className="whitespace-nowrap">Terminal</span>
-                  </div>
-                  <div className="flex flex-1 items-center justify-center px-4 text-center">
-                    <span className="overflow-hidden text-ellipsis whitespace-nowrap">
-                      Select a task to open its terminal.
-                    </span>
-                  </div>
-                </div>
-              </ResizablePanel>
-            </ResizablePanelGroup>
-          )}
-        </div>
-      </TaskScopeProvider>
-    </aside>
-  );
-};
-
-export default RightSidebar;
-
-const SingleTaskSidebar: React.FC<{
-  task: RightSidebarTask;
-  projectPath?: string | null;
-  projectRemoteConnectionId?: string | null;
-  projectRemotePath?: string | null;
-  projectDefaultBranch?: string | null;
-  onOpenChanges?: (filePath?: string, taskPath?: string) => void;
-}> = ({
-  task,
-  projectPath,
-  projectRemoteConnectionId,
-  projectRemotePath,
-  projectDefaultBranch,
-  onOpenChanges,
-}) => {
-  return (
-    <ResizablePanelGroup direction="vertical" autoSaveId={RIGHT_SIDEBAR_VERTICAL_STORAGE_KEY}>
-      <ResizablePanel defaultSize={50} minSize={20}>
-        <FileChangesPanel className="h-full min-h-0" onOpenChanges={onOpenChanges} />
-      </ResizablePanel>
-      <ResizableHandle />
-      <ResizablePanel defaultSize={50} minSize={20}>
-        <TaskTerminalPanel
-          task={task}
-          agent={task.agentId as Agent}
-          projectPath={projectPath || task?.path}
-          remote={
-            projectRemoteConnectionId
-              ? {
-                  connectionId: projectRemoteConnectionId,
-                  projectPath: projectRemotePath || projectPath || undefined,
-                }
-              : undefined
-          }
-          defaultBranch={projectDefaultBranch || undefined}
-          className="h-full min-h-0"
-        />
-      </ResizablePanel>
-    </ResizablePanelGroup>
-  );
-};
-
-const VariantChangesIfAny: React.FC<{
-  path: string;
-  taskId: string;
-  className?: string;
-  onOpenChanges?: (filePath?: string, taskPath?: string) => void;
-}> = ({ path, taskId, className, onOpenChanges }) => {
-  const { projectPath } = useTaskScope();
-  return (
-    <TaskScopeProvider value={{ taskId, taskPath: path, projectPath }}>
-      <FileChangesPanel className={className || 'min-h-0'} onOpenChanges={onOpenChanges} />
-    </TaskScopeProvider>
-  );
-};
diff --git a/src/renderer/components/RightSidebarSettingsCard.tsx b/src/renderer/components/RightSidebarSettingsCard.tsx
deleted file mode 100644
index b980648421..0000000000
--- a/src/renderer/components/RightSidebarSettingsCard.tsx
+++ /dev/null
@@ -1,34 +0,0 @@
-import React from 'react';
-import { Switch } from './ui/switch';
-import { useAppSettings } from '@/contexts/AppSettingsProvider';
-
-const RightSidebarSettingsCard: React.FC = () => {
-  const { settings, updateSettings, isLoading: loading } = useAppSettings();
-
-  const { interface: interfaceSettings } = settings ?? {};
-
-  const autoRightSidebarBehavior = interfaceSettings?.autoRightSidebarBehavior ?? false;
-
-  return (
-    <div className="flex items-center justify-between gap-4">
-      <div className="flex flex-1 flex-col gap-0.5">
-        <span className="text-sm font-medium text-foreground">
-          Auto-collapse right sidebar on home pages
-        </span>
-        <span className="text-sm text-muted-foreground">
-          Collapse sidebar on home/repo pages, expand on tasks
-        </span>
-      </div>
-      <Switch
-        checked={autoRightSidebarBehavior}
-        defaultChecked={autoRightSidebarBehavior}
-        disabled={loading}
-        onCheckedChange={(checked) =>
-          updateSettings({ interface: { autoRightSidebarBehavior: checked } })
-        }
-      />
-    </div>
-  );
-};
-
-export default RightSidebarSettingsCard;
diff --git a/src/renderer/components/RoutingInfoCard.tsx b/src/renderer/components/RoutingInfoCard.tsx
deleted file mode 100644
index 31dc7c5f30..0000000000
--- a/src/renderer/components/RoutingInfoCard.tsx
+++ /dev/null
@@ -1,93 +0,0 @@
-import React, { useEffect, useRef, useState } from 'react';
-import { Workflow, ArrowUpRight, Check, Copy } from 'lucide-react';
-import { Button } from './ui/button';
-import { getInstallCommandForProvider } from '@shared/providers/registry';
-
-export const RoutingInfoCard: React.FC = () => {
-  const installCommand = getInstallCommandForProvider('codex') ?? 'npm install -g @openai/codex';
-  const [copied, setCopied] = useState(false);
-  const copyResetRef = useRef<number | null>(null);
-
-  useEffect(() => {
-    return () => {
-      if (copyResetRef.current !== null) {
-        window.clearTimeout(copyResetRef.current);
-      }
-    };
-  }, []);
-
-  const handleCopyClick = async () => {
-    if (typeof navigator === 'undefined' || !navigator.clipboard) {
-      return;
-    }
-    const { clipboard } = navigator;
-    if (typeof clipboard.writeText !== 'function') {
-      return;
-    }
-    try {
-      await clipboard.writeText(installCommand);
-      setCopied(true);
-      if (copyResetRef.current !== null) {
-        window.clearTimeout(copyResetRef.current);
-      }
-      copyResetRef.current = window.setTimeout(() => {
-        setCopied(false);
-        copyResetRef.current = null;
-      }, 2000);
-    } catch (error) {
-      console.error('Failed to copy install command', error);
-      setCopied(false);
-    }
-  };
-
-  const CopyIndicatorIcon = copied ? Check : Copy;
-
-  return (
-    <div className="w-80 max-w-[20rem] rounded-lg bg-background p-3 text-foreground shadow-sm">
-      <div className="mb-2 flex items-center gap-2">
-        <Workflow className="h-5 w-5" aria-hidden="true" />
-        <div className="flex items-baseline gap-1 text-sm leading-none">
-          <span className="text-muted-foreground">Agent</span>
-          <span className="text-muted-foreground">/</span>
-          <strong className="font-semibold text-foreground">Routing</strong>
-        </div>
-        <span className="ml-auto rounded-md border px-1.5 py-0.5 text-micro text-muted-foreground">
-          Soon
-        </span>
-      </div>
-      <p className="mb-2 text-xs text-muted-foreground">
-        Smart routing between available CLIs to pick the best tool for your request.
-      </p>
-      <div className="mb-2">
-        <a
-          href="https://artificialanalysis.ai/insights/coding-agents-comparison"
-          target="_blank"
-          rel="noreferrer noopener"
-          className="inline-flex items-center gap-1 rounded-md border px-2 py-1 text-xs text-foreground hover:underline"
-        >
-          <span>Compare agents</span>
-          <ArrowUpRight className="h-3.5 w-3.5" aria-hidden="true" />
-        </a>
-      </div>
-      <div className="flex h-7 items-center justify-between rounded-md border px-2 text-xs text-foreground">
-        <code className="max-w-[calc(100%-2.5rem)] truncate font-mono text-tiny leading-none">
-          {installCommand}
-        </code>
-        <Button
-          variant="ghost"
-          size="icon-sm"
-          onClick={() => {
-            void handleCopyClick();
-          }}
-          className="ml-2 text-muted-foreground"
-          aria-label="Copy install command"
-          title={copied ? 'Copied' : 'Copy command'}
-        >
-          <CopyIndicatorIcon className="h-3.5 w-3.5" aria-hidden="true" />
-        </Button>
-      </div>
-    </div>
-  );
-};
-
-export default RoutingInfoCard;
diff --git a/src/renderer/components/RunLauncher.tsx b/src/renderer/components/RunLauncher.tsx
deleted file mode 100644
index fe8f092bae..0000000000
--- a/src/renderer/components/RunLauncher.tsx
+++ /dev/null
@@ -1,143 +0,0 @@
-import React, { useState } from 'react';
-import { Repo } from '../types';
-import { useToast } from '../hooks/use-toast';
-import { Input } from './ui/input';
-import { Textarea } from './ui/textarea';
-import { RadioGroup, RadioGroupItem } from './ui/radio-group';
-import { Label } from './ui/label';
-
-interface RunLauncherProps {
-  repo: Repo;
-  onCreateRun: (config: any) => void;
-  onCancel: () => void;
-}
-
-const RunLauncher: React.FC<RunLauncherProps> = ({ repo, onCreateRun, onCancel }) => {
-  const { toast } = useToast();
-  const [provider, setProvider] = useState<'claude-code' | 'openai-agents'>('claude-code');
-  const [prompt, setPrompt] = useState('');
-  const [numAgents, setNumAgents] = useState(1);
-  const [baseBranch, setBaseBranch] = useState(repo.defaultBranch);
-
-  const handleSubmit = (e: React.FormEvent) => {
-    e.preventDefault();
-
-    if (!prompt.trim()) {
-      toast({
-        title: 'Validation Error',
-        description: 'Please enter a prompt',
-        variant: 'destructive',
-      });
-      return;
-    }
-
-    onCreateRun({
-      provider,
-      prompt: prompt.trim(),
-      numAgents,
-      baseBranch,
-    });
-  };
-
-  return (
-    <div className="w-full max-w-2xl rounded-lg border border-border bg-card p-6">
-      <div className="mb-6 flex items-center justify-between">
-        <h3 className="text-xl font-semibold text-white">Start New Run</h3>
-        <button className="text-xl text-muted-foreground hover:text-white" onClick={onCancel}>
-          ×
-        </button>
-      </div>
-
-      <form onSubmit={handleSubmit} className="space-y-4">
-        <div>
-          <Label className="mb-2 block text-sm font-medium text-muted-foreground">Agent</Label>
-          <RadioGroup
-            value={provider}
-            onValueChange={(value: string) => setProvider(value as 'claude-code' | 'openai-agents')}
-            className="flex gap-4"
-          >
-            <div className="flex items-center space-x-2">
-              <RadioGroupItem value="claude-code" id="provider-claude" />
-              <Label htmlFor="provider-claude" className="cursor-pointer font-normal">
-                Claude Code
-              </Label>
-            </div>
-            <div className="flex items-center space-x-2">
-              <RadioGroupItem value="openai-agents" id="provider-openai" />
-              <Label htmlFor="provider-openai" className="cursor-pointer font-normal">
-                OpenAI Agents
-              </Label>
-            </div>
-          </RadioGroup>
-        </div>
-
-        <div>
-          <Label className="mb-2 block text-sm font-medium text-muted-foreground">Prompt</Label>
-          <Textarea
-            value={prompt}
-            onChange={(e) => setPrompt(e.target.value)}
-            placeholder="Describe what you want the coding agents to do..."
-            className="h-32"
-            required
-          />
-        </div>
-
-        <div>
-          <Label className="mb-2 block text-sm font-medium text-muted-foreground">
-            Number of Agents
-          </Label>
-          <select
-            value={numAgents}
-            onChange={(e) => setNumAgents(parseInt(e.target.value))}
-            className="w-full rounded border border-border bg-muted p-3 text-white focus:border-blue-500 focus:outline-none"
-          >
-            <option value={1}>1 Agent</option>
-            <option value={2}>2 Agents</option>
-            <option value={3}>3 Agents</option>
-            <option value={4}>4 Agents</option>
-            <option value={5}>5 Agents</option>
-          </select>
-        </div>
-
-        <div>
-          <Label className="mb-2 block text-sm font-medium text-muted-foreground">
-            Base Branch
-          </Label>
-          <Input
-            type="text"
-            value={baseBranch}
-            onChange={(e) => setBaseBranch(e.target.value)}
-            placeholder="main"
-          />
-        </div>
-
-        <div className="rounded bg-muted p-3">
-          <div className="text-sm text-muted-foreground">
-            <strong>Repository:</strong> {repo.path.split('/').pop()}
-          </div>
-          <div className="text-sm text-muted-foreground">
-            <strong>Origin:</strong> {repo.origin}
-          </div>
-        </div>
-
-        <div className="flex gap-3 pt-4">
-          <button
-            type="submit"
-            className="flex-1 rounded bg-blue-600 px-4 py-3 font-medium text-white transition-colors hover:bg-blue-700"
-          >
-            Start Run
-          </button>
-          <button
-            type="button"
-            onClick={onCancel}
-            className="hover:bg-muted0 rounded bg-muted px-4 py-3 text-white transition-colors"
-          >
-            Cancel
-          </button>
-        </div>
-      </form>
-    </div>
-  );
-};
-
-export default RunLauncher;
diff --git a/src/renderer/components/RunList.tsx b/src/renderer/components/RunList.tsx
deleted file mode 100644
index 5a35b33321..0000000000
--- a/src/renderer/components/RunList.tsx
+++ /dev/null
@@ -1,111 +0,0 @@
-import React from 'react';
-import { Run } from '../types';
-
-interface RunListProps {
-  runs: Run[];
-  selectedRun: Run | null;
-  onRunSelect: (run: Run) => void;
-}
-
-const RunList: React.FC<RunListProps> = ({ runs, selectedRun, onRunSelect }) => {
-  const formatDuration = (startedAt: string, finishedAt?: string | null) => {
-    const start = new Date(startedAt);
-    const end = finishedAt ? new Date(finishedAt) : new Date();
-    const diffMs = end.getTime() - start.getTime();
-    const diffMins = Math.floor(diffMs / (1000 * 60));
-    const diffSecs = Math.floor((diffMs % (1000 * 60)) / 1000);
-
-    if (diffMins > 0) {
-      return `${diffMins}m ${diffSecs}s`;
-    }
-    return `${diffSecs}s`;
-  };
-
-  const getStatusColor = (status: Run['status']) => {
-    switch (status) {
-      case 'running':
-        return 'text-blue-400';
-      case 'completed':
-        return 'text-green-400';
-      case 'failed':
-        return 'text-red-400';
-      case 'cancelled':
-        return 'text-muted-foreground';
-      default:
-        return 'text-yellow-400';
-    }
-  };
-
-  const getStatusIcon = (status: Run['status']) => {
-    switch (status) {
-      case 'running':
-        return '🔄';
-      case 'completed':
-        return '✅';
-      case 'failed':
-        return '❌';
-      case 'cancelled':
-        return '⏹️';
-      default:
-        return '⏳';
-    }
-  };
-
-  return (
-    <div className="h-full overflow-y-auto">
-      <div className="p-4">
-        <h3 className="mb-4 text-lg font-semibold text-white">Active Runs</h3>
-
-        {runs.length === 0 ? (
-          <div className="py-8 text-center">
-            <div className="text-muted-foreground">No runs found</div>
-          </div>
-        ) : (
-          <div className="space-y-3">
-            {runs.map((run) => (
-              <div
-                key={run.id}
-                className={`cursor-pointer rounded-lg border p-4 transition-colors ${
-                  selectedRun?.id === run.id
-                    ? 'border-blue-500 bg-blue-600'
-                    : 'border-border bg-card hover:bg-accent'
-                }`}
-                onClick={() => onRunSelect(run)}
-              >
-                <div className="mb-2 flex items-center justify-between">
-                  <div className="flex items-center gap-2">
-                    <span className="text-lg">{getStatusIcon(run.status)}</span>
-                    <span className={`font-medium ${getStatusColor(run.status)}`}>
-                      {run.status.toUpperCase()}
-                    </span>
-                    <span className="text-sm text-muted-foreground">
-                      {formatDuration(run.startedAt, run.finishedAt)}
-                    </span>
-                  </div>
-                  <div className="text-sm text-muted-foreground">
-                    {run.provider === 'claude-code' ? 'Claude' : 'OpenAI'}
-                  </div>
-                </div>
-
-                <div className="mb-2 text-sm text-muted-foreground">
-                  <strong>Branch:</strong> {run.branch}
-                </div>
-
-                <div className="line-clamp-2 text-sm text-muted-foreground">{run.prompt}</div>
-
-                {run.tokenUsage > 0 && (
-                  <div className="mt-2 flex items-center gap-4 text-xs text-muted-foreground">
-                    <span>Tokens: {run.tokenUsage.toLocaleString()}</span>
-                    {run.cost > 0 && <span>Cost: ${run.cost.toFixed(4)}</span>}
-                  </div>
-                )}
-              </div>
-            ))}
-          </div>
-        )}
-      </div>
-    </div>
-  );
-};
-
-export default RunList;
diff --git a/src/renderer/components/SettingsPage.tsx b/src/renderer/components/SettingsPage.tsx
deleted file mode 100644
index 40be4f47d6..0000000000
--- a/src/renderer/components/SettingsPage.tsx
+++ /dev/null
@@ -1,360 +0,0 @@
-import React, { useCallback, useEffect, useState } from 'react';
-import { ExternalLink, X } from 'lucide-react';
-import { Separator } from './ui/separator';
-import type { CliAgentStatus } from '../types/connections';
-import { BASE_CLI_AGENTS, CliAgentsList } from './CliAgentsList';
-import { Button } from './ui/button';
-
-// Import existing settings cards
-import TelemetryCard from './TelemetryCard';
-import NotificationSettingsCard from './NotificationSettingsCard';
-import { UpdateCard } from './UpdateCard';
-import DefaultAgentSettingsCard from './DefaultAgentSettingsCard';
-import {
-  AutoApproveByDefaultRow,
-  AutoGenerateTaskNamesRow,
-  AutoTrustWorktreesRow,
-} from './TaskSettingsRows';
-import IntegrationsCard from './IntegrationsCard';
-import Context7SettingsCard from './Context7SettingsCard';
-import RepositorySettingsCard from './RepositorySettingsCard';
-import ThemeCard from './ThemeCard';
-import KeyboardSettingsCard from './KeyboardSettingsCard';
-import RightSidebarSettingsCard from './RightSidebarSettingsCard';
-import BrowserPreviewSettingsCard from './BrowserPreviewSettingsCard';
-import TaskHoverActionCard from './TaskHoverActionCard';
-import TerminalSettingsCard from './TerminalSettingsCard';
-import HiddenToolsSettingsCard from './HiddenToolsSettingsCard';
-import { useTaskSettings } from '../hooks/useTaskSettings';
-
-export type SettingsPageTab =
-  | 'general'
-  | 'clis-models'
-  | 'integrations'
-  | 'repository'
-  | 'interface'
-  | 'docs';
-
-// Helper functions from SettingsModal
-const createDefaultCliAgents = (): CliAgentStatus[] =>
-  BASE_CLI_AGENTS.map((agent) => ({ ...agent }));
-
-const mergeCliAgents = (incoming: CliAgentStatus[]): CliAgentStatus[] => {
-  const mergedMap = new Map<string, CliAgentStatus>();
-  BASE_CLI_AGENTS.forEach((agent) => {
-    mergedMap.set(agent.id, { ...agent });
-  });
-  incoming.forEach((agent) => {
-    mergedMap.set(agent.id, {
-      ...(mergedMap.get(agent.id) ?? {}),
-      ...agent,
-    });
-  });
-  return Array.from(mergedMap.values());
-};
-
-type CachedAgentStatus = {
-  installed: boolean;
-  path?: string | null;
-  version?: string | null;
-  lastChecked?: number;
-};
-
-const mapAgentStatusesToCli = (
-  statuses: Record<string, CachedAgentStatus | undefined>
-): CliAgentStatus[] => {
-  return Object.entries(statuses).reduce<CliAgentStatus[]>((acc, [agentId, status]) => {
-    if (!status) return acc;
-    const base = BASE_CLI_AGENTS.find((agent) => agent.id === agentId);
-    acc.push({
-      ...(base ?? {
-        id: agentId,
-        name: agentId,
-        status: 'missing' as const,
-        docUrl: null,
-        installCommand: null,
-      }),
-      id: agentId,
-      name: base?.name ?? agentId,
-      status: status.installed ? 'connected' : 'missing',
-      version: status.version ?? null,
-      command: status.path ?? null,
-    });
-    return acc;
-  }, []);
-};
-
-interface SettingsPageProps {
-  initialTab?: SettingsPageTab;
-  onClose: () => void;
-}
-
-interface SectionConfig {
-  title?: string;
-  action?: React.ReactNode;
-  component: React.ReactNode;
-}
-
-export const SettingsPage: React.FC<SettingsPageProps> = ({ initialTab, onClose }) => {
-  const [activeTab, setActiveTab] = useState<SettingsPageTab>(initialTab || 'general');
-  const [cliAgents, setCliAgents] = useState<CliAgentStatus[]>(() => createDefaultCliAgents());
-  const taskSettings = useTaskSettings();
-
-  useEffect(() => {
-    setActiveTab(initialTab || 'general');
-  }, [initialTab]);
-
-  // Load CLI agent statuses
-  useEffect(() => {
-    let cancelled = false;
-
-    const applyCachedStatuses = (statuses: Record<string, CachedAgentStatus> | undefined) => {
-      if (!statuses) return;
-      const agents = mapAgentStatusesToCli(statuses);
-      if (!agents.length) return;
-      setCliAgents((prev) => mergeCliAgents([...prev, ...agents]));
-    };
-
-    const loadCachedStatuses = async () => {
-      if (!window?.electronAPI?.getProviderStatuses) return;
-      try {
-        const result = await window.electronAPI.getProviderStatuses();
-        if (cancelled) return;
-        if (result?.success && result.statuses) {
-          applyCachedStatuses(result.statuses);
-        }
-      } catch (error) {
-        if (!cancelled) {
-          console.error('Failed to load cached CLI agent statuses:', error);
-        }
-      }
-    };
-
-    const off =
-      window?.electronAPI?.onProviderStatusUpdated?.(
-        (payload: { providerId: string; status: CachedAgentStatus }) => {
-          if (!payload?.providerId || !payload.status) return;
-          applyCachedStatuses({ [payload.providerId]: payload.status });
-        }
-      ) ?? null;
-
-    void loadCachedStatuses();
-
-    return () => {
-      cancelled = true;
-      off?.();
-    };
-  }, []);
-
-  // Handle Escape key to close
-  useEffect(() => {
-    const handleKeyDown = (e: KeyboardEvent) => {
-      if (e.key === 'Escape') {
-        onClose();
-      }
-    };
-    window.addEventListener('keydown', handleKeyDown);
-    return () => window.removeEventListener('keydown', handleKeyDown);
-  }, [onClose]);
-
-  const handleDocsClick = useCallback(() => {
-    window.electronAPI.openExternal('https://docs.emdash.sh');
-  }, []);
-
-  const tabs: Array<{
-    id: string;
-    label: string;
-    isExternal?: boolean;
-  }> = [
-    { id: 'general', label: 'General' },
-    { id: 'clis-models', label: 'Agents' },
-    { id: 'integrations', label: 'Integrations' },
-    { id: 'repository', label: 'Repository' },
-    { id: 'interface', label: 'Interface' },
-    { id: 'docs', label: 'Docs', isExternal: true },
-  ];
-
-  // Sort agents: detected first, then alphabetically
-  const sortedAgents = React.useMemo(() => {
-    return [...cliAgents].sort((a, b) => {
-      if (a.status === 'connected' && b.status !== 'connected') return -1;
-      if (b.status === 'connected' && a.status !== 'connected') return 1;
-      return a.name.localeCompare(b.name);
-    });
-  }, [cliAgents]);
-
-  const tabContent: Record<
-    string,
-    { title: string; description: string; sections: SectionConfig[] }
-  > = {
-    general: {
-      title: 'General',
-      description: 'Manage your account, privacy settings, notifications, and app updates.',
-      sections: [
-        {
-          component: <TelemetryCard />,
-        },
-        {
-          component: <AutoGenerateTaskNamesRow taskSettings={taskSettings} />,
-        },
-        {
-          component: <AutoApproveByDefaultRow taskSettings={taskSettings} />,
-        },
-        {
-          component: <AutoTrustWorktreesRow taskSettings={taskSettings} />,
-        },
-        {
-          component: <NotificationSettingsCard />,
-        },
-        {
-          component: <UpdateCard />,
-        },
-      ],
-    },
-    'clis-models': {
-      title: 'Agents',
-      description: 'Manage CLI agents and model configurations.',
-      sections: [
-        { component: <DefaultAgentSettingsCard /> },
-        {
-          title: 'CLI agents',
-          component: (
-            <div className="rounded-xl border border-border/60 bg-muted/10 p-2">
-              <CliAgentsList agents={sortedAgents} isLoading={false} />
-            </div>
-          ),
-        },
-      ],
-    },
-    integrations: {
-      title: 'Integrations',
-      description: 'Connect external services and tools.',
-      sections: [
-        { title: 'Integrations', component: <IntegrationsCard /> },
-        { title: 'MCP Server', component: <Context7SettingsCard /> },
-      ],
-    },
-    repository: {
-      title: 'Repository',
-      description: 'Configure repository and branch settings.',
-      sections: [{ title: 'Branch name', component: <RepositorySettingsCard /> }],
-    },
-    interface: {
-      title: 'Interface',
-      description: 'Customize the appearance and behavior of the app.',
-      sections: [
-        { component: <ThemeCard /> },
-        { component: <TerminalSettingsCard /> },
-        { title: 'Keyboard shortcuts', component: <KeyboardSettingsCard /> },
-        {
-          title: 'Workspace',
-          component: (
-            <div className="flex flex-col gap-8 rounded-xl border border-muted p-4">
-              <RightSidebarSettingsCard />
-              <BrowserPreviewSettingsCard />
-              <TaskHoverActionCard />
-            </div>
-          ),
-        },
-        {
-          title: 'Tools',
-          component: <HiddenToolsSettingsCard />,
-        },
-      ],
-    },
-  };
-
-  const currentContent = tabContent[activeTab as keyof typeof tabContent];
-
-  return (
-    <div className="flex h-full min-h-0 w-full flex-1 flex-col overflow-hidden px-6 pb-0 pt-8">
-      <div className="mx-auto flex h-full min-h-0 w-full max-w-[1060px] flex-col gap-6">
-        {/* Header */}
-        <div className="flex flex-col gap-6">
-          <div className="flex items-start justify-between gap-4">
-            <div className="flex flex-col gap-1.5">
-              <h1 className="text-2xl font-semibold tracking-tight">Settings</h1>
-              <p className="text-sm text-muted-foreground">
-                Manage your account settings and set preferences.
-              </p>
-            </div>
-            <Button
-              type="button"
-              variant="ghost"
-              size="icon"
-              onClick={onClose}
-              className="h-8 w-8"
-              aria-label="Close settings"
-            >
-              <X className="h-4 w-4" />
-            </Button>
-          </div>
-          <Separator />
-        </div>
-
-        {/* Contents: Navigation + Content */}
-        <div className="grid min-h-0 flex-1 grid-cols-[13rem_minmax(0,1fr)] gap-8 overflow-hidden">
-          {/* Navigation menu */}
-          <nav className="flex min-h-0 w-52 flex-col gap-2 overflow-y-auto">
-            {tabs.map((tab) => {
-              const isActive = activeTab === tab.id && !tab.isExternal;
-
-              return (
-                <button
-                  key={tab.id}
-                  type="button"
-                  onClick={() => {
-                    if (tab.isExternal) {
-                      handleDocsClick();
-                    } else {
-                      setActiveTab(tab.id as SettingsPageTab);
-                    }
-                  }}
-                  className={`flex w-full items-center gap-2 rounded-md px-4 py-2 text-sm font-medium transition-colors ${
-                    isActive
-                      ? 'bg-muted text-foreground'
-                      : tab.isExternal
-                        ? 'text-muted-foreground hover:bg-muted/60'
-                        : 'text-foreground hover:bg-muted/60'
-                  }`}
-                >
-                  <span className="text-left">{tab.label}</span>
-                  {tab.isExternal && <ExternalLink className="h-4 w-4" />}
-                </button>
-              );
-            })}
-          </nav>
-
-          {/* Content container */}
-          {currentContent && (
-            <div className="flex min-h-0 min-w-0 flex-1 justify-center overflow-y-auto pb-8">
-              <div className="mx-auto w-full max-w-4xl space-y-8">
-                {/* Page title */}
-                <div className="flex flex-col gap-6">
-                  <div className="flex flex-col gap-1">
-                    <h2 className="text-base font-medium">{currentContent.title}</h2>
-                    <p className="text-sm text-muted-foreground">{currentContent.description}</p>
-                  </div>
-                  <Separator />
-                </div>
-
-                {/* Sections */}
-                {currentContent.sections.map((section, index) => (
-                  <div key={index} className="flex flex-col gap-3">
-                    {section.title && (
-                      <div className="flex items-center justify-between">
-                        <h3 className="text-sm font-medium text-foreground">{section.title}</h3>
-                        {section.action && <div>{section.action}</div>}
-                      </div>
-                    )}
-                    {section.component}
-                  </div>
-                ))}
-              </div>
-            </div>
-          )}
-        </div>
-      </div>
-    </div>
-  );
-};
diff --git a/src/renderer/components/SidebarEmptyState.tsx b/src/renderer/components/SidebarEmptyState.tsx
deleted file mode 100644
index f5cdb8fa23..0000000000
--- a/src/renderer/components/SidebarEmptyState.tsx
+++ /dev/null
@@ -1,64 +0,0 @@
-import React from 'react';
-import { Card, CardContent, CardDescription, CardHeader, CardTitle } from './ui/card';
-import { Button } from './ui/button';
-import { FolderOpen } from 'lucide-react';
-
-type Props = {
-  title: string;
-  description?: string;
-  actionLabel?: string;
-  onAction?: () => void;
-  secondaryActionLabel?: string;
-  onSecondaryAction?: () => void;
-};
-
-const SidebarEmptyState: React.FC<Props> = ({
-  title,
-  description,
-  actionLabel,
-  onAction,
-  secondaryActionLabel,
-  onSecondaryAction,
-}) => {
-  return (
-    <div className="min-w-0 overflow-hidden">
-      <Card className="bg-muted/20">
-        <CardHeader className="p-4">
-          <CardTitle className="text-lg font-semibold leading-tight">{title}</CardTitle>
-          {description ? (
-            <CardDescription className="text-sm leading-relaxed">{description}</CardDescription>
-          ) : null}
-        </CardHeader>
-        {(actionLabel && onAction) || (secondaryActionLabel && onSecondaryAction) ? (
-          <CardContent className="space-y-2 p-4 pt-0">
-            {actionLabel && onAction && (
-              <Button
-                type="button"
-                variant="outline"
-                size="sm"
-                className="w-full justify-center"
-                onClick={onAction}
-              >
-                <FolderOpen className="mr-2 h-4 w-4" />
-                {actionLabel}
-              </Button>
-            )}
-            {secondaryActionLabel && onSecondaryAction && (
-              <Button
-                type="button"
-                variant="default"
-                size="sm"
-                className="w-full justify-center"
-                onClick={onSecondaryAction}
-              >
-                {secondaryActionLabel}
-              </Button>
-            )}
-          </CardContent>
-        ) : null}
-      </Card>
-    </div>
-  );
-};
-
-export default SidebarEmptyState;
diff --git a/src/renderer/components/TaskAdvancedSettings.tsx b/src/renderer/components/TaskAdvancedSettings.tsx
deleted file mode 100644
index 530fc7def4..0000000000
--- a/src/renderer/components/TaskAdvancedSettings.tsx
+++ /dev/null
@@ -1,615 +0,0 @@
-import React, { useCallback, useState } from 'react';
-import { AnimatePresence, motion, useReducedMotion } from 'motion/react';
-import { ExternalLink, Settings } from 'lucide-react';
-import { Button } from './ui/button';
-import { Checkbox } from './ui/checkbox';
-import { Label } from './ui/label';
-import { Spinner } from './ui/spinner';
-import { Textarea } from './ui/textarea';
-import { Accordion, AccordionContent, AccordionItem, AccordionTrigger } from './ui/accordion';
-import { LinearIssueSelector } from './LinearIssueSelector';
-import { GitHubIssueSelector } from './GitHubIssueSelector';
-import JiraIssueSelector from './JiraIssueSelector';
-import { GitLabIssueSelector } from './GitLabIssueSelector';
-import LinearSetupForm from './integrations/LinearSetupForm';
-import JiraSetupForm from './integrations/JiraSetupForm';
-import GitLabSetupForm from './integrations/GitLabSetupForm';
-import { type LinearIssueSummary } from '../types/linear';
-import { type GitHubIssueSummary } from '../types/github';
-import { type GitHubIssueLink } from '../types/chat';
-import { type JiraIssueSummary } from '../types/jira';
-import { type GitLabIssueSummary } from '../types/gitlab';
-
-interface TaskAdvancedSettingsProps {
-  isOpen: boolean;
-  projectPath?: string;
-
-  // Worktree
-  useWorktree: boolean;
-  onUseWorktreeChange: (value: boolean) => void;
-
-  // Auto-approve
-  autoApprove: boolean;
-  onAutoApproveChange: (value: boolean) => void;
-  hasAutoApproveSupport: boolean;
-
-  // Initial prompt
-  initialPrompt: string;
-  onInitialPromptChange: (value: string) => void;
-  hasInitialPromptSupport: boolean;
-
-  // Linear
-  selectedLinearIssue: LinearIssueSummary | null;
-  onLinearIssueChange: (issue: LinearIssueSummary | null) => void;
-  isLinearConnected: boolean | null;
-  onLinearConnect: (apiKey: string) => Promise<void>;
-
-  // GitHub
-  selectedGithubIssue: GitHubIssueSummary | null;
-  onGithubIssueChange: (issue: GitHubIssueSummary | null) => void;
-  linkedGithubIssueMap?: ReadonlyMap<number, GitHubIssueLink>;
-  isGithubConnected: boolean;
-  onGithubConnect: () => Promise<void>;
-  githubLoading: boolean;
-  githubInstalled: boolean;
-
-  // Jira
-  selectedJiraIssue: JiraIssueSummary | null;
-  onJiraIssueChange: (issue: JiraIssueSummary | null) => void;
-  isJiraConnected: boolean | null;
-  onJiraConnect: (credentials: { siteUrl: string; email: string; token: string }) => Promise<void>;
-
-  // GitLab
-  selectedGitlabIssue: GitLabIssueSummary | null;
-  onGitlabIssueChange: (issue: GitLabIssueSummary | null) => void;
-  isGitlabConnected: boolean | null;
-  onGitlabConnect: (credentials: { instanceUrl: string; token: string }) => Promise<void>;
-}
-
-export const TaskAdvancedSettings: React.FC<TaskAdvancedSettingsProps> = ({
-  isOpen,
-  projectPath,
-  useWorktree,
-  onUseWorktreeChange,
-  autoApprove,
-  onAutoApproveChange,
-  hasAutoApproveSupport,
-  initialPrompt,
-  onInitialPromptChange,
-  hasInitialPromptSupport,
-  selectedLinearIssue,
-  onLinearIssueChange,
-  isLinearConnected,
-  onLinearConnect,
-  selectedGithubIssue,
-  onGithubIssueChange,
-  linkedGithubIssueMap,
-  isGithubConnected,
-  onGithubConnect,
-  githubLoading,
-  githubInstalled,
-  selectedJiraIssue,
-  onJiraIssueChange,
-  isJiraConnected,
-  onJiraConnect,
-  selectedGitlabIssue,
-  onGitlabIssueChange,
-  isGitlabConnected,
-  onGitlabConnect,
-}) => {
-  const shouldReduceMotion = useReducedMotion();
-  const [showAdvanced, setShowAdvanced] = useState(false);
-
-  // Linear setup state
-  const [linearSetupOpen, setLinearSetupOpen] = useState(false);
-  const [linearApiKey, setLinearApiKey] = useState('');
-  const [linearConnectionError, setLinearConnectionError] = useState<string | null>(null);
-  const [autoOpenLinearSelector, setAutoOpenLinearSelector] = useState(false);
-
-  // Jira setup state
-  const [jiraSetupOpen, setJiraSetupOpen] = useState(false);
-  const [jiraSite, setJiraSite] = useState('');
-  const [jiraEmail, setJiraEmail] = useState('');
-  const [jiraToken, setJiraToken] = useState('');
-  const [jiraConnectionError, setJiraConnectionError] = useState<string | null>(null);
-
-  // GitLab setup state
-  const [gitlabSetupOpen, setGitlabSetupOpen] = useState(false);
-  const [gitlabInstanceUrl, setGitlabInstanceUrl] = useState('');
-  const [gitlabToken, setGitlabToken] = useState('');
-  const [gitlabConnectionError, setGitlabConnectionError] = useState<string | null>(null);
-
-  const handleLinearConnect = useCallback(async () => {
-    const trimmedKey = linearApiKey.trim();
-    if (!trimmedKey) return;
-
-    setLinearConnectionError(null);
-    try {
-      await onLinearConnect(trimmedKey);
-      setLinearSetupOpen(false);
-      setLinearApiKey('');
-      setAutoOpenLinearSelector(true);
-    } catch (error: any) {
-      setLinearConnectionError(error?.message || 'Could not connect Linear. Try again.');
-    }
-  }, [linearApiKey, onLinearConnect]);
-
-  const handleJiraConnect = useCallback(async () => {
-    setJiraConnectionError(null);
-    try {
-      await onJiraConnect({
-        siteUrl: jiraSite.trim(),
-        email: jiraEmail.trim(),
-        token: jiraToken.trim(),
-      });
-      setJiraSetupOpen(false);
-      setJiraSite('');
-      setJiraEmail('');
-      setJiraToken('');
-    } catch (error: any) {
-      setJiraConnectionError(error?.message || 'Failed to connect.');
-    }
-  }, [jiraSite, jiraEmail, jiraToken, onJiraConnect]);
-
-  const handleGitlabConnect = useCallback(async () => {
-    setGitlabConnectionError(null);
-    try {
-      await onGitlabConnect({
-        instanceUrl: gitlabInstanceUrl.trim(),
-        token: gitlabToken.trim(),
-      });
-      setGitlabSetupOpen(false);
-      setGitlabInstanceUrl('');
-      setGitlabToken('');
-    } catch (error: any) {
-      setGitlabConnectionError(error?.message || 'Failed to connect.');
-    }
-  }, [gitlabInstanceUrl, gitlabToken, onGitlabConnect]);
-
-  const handleLinearIssueChange = useCallback(
-    (issue: LinearIssueSummary | null) => {
-      onLinearIssueChange(issue);
-      if (issue) {
-        onGithubIssueChange(null);
-        onJiraIssueChange(null);
-        onGitlabIssueChange(null);
-      }
-    },
-    [onLinearIssueChange, onGithubIssueChange, onJiraIssueChange, onGitlabIssueChange]
-  );
-
-  const handleGithubIssueChange = useCallback(
-    (issue: GitHubIssueSummary | null) => {
-      onGithubIssueChange(issue);
-      if (issue) {
-        onLinearIssueChange(null);
-        onJiraIssueChange(null);
-        onGitlabIssueChange(null);
-      }
-    },
-    [onGithubIssueChange, onLinearIssueChange, onJiraIssueChange, onGitlabIssueChange]
-  );
-
-  const handleJiraIssueChange = useCallback(
-    (issue: JiraIssueSummary | null) => {
-      onJiraIssueChange(issue);
-      if (issue) {
-        onLinearIssueChange(null);
-        onGithubIssueChange(null);
-        onGitlabIssueChange(null);
-      }
-    },
-    [onJiraIssueChange, onLinearIssueChange, onGithubIssueChange, onGitlabIssueChange]
-  );
-
-  const handleGitlabIssueChange = useCallback(
-    (issue: GitLabIssueSummary | null) => {
-      onGitlabIssueChange(issue);
-      if (issue) {
-        onLinearIssueChange(null);
-        onGithubIssueChange(null);
-        onJiraIssueChange(null);
-      }
-    },
-    [onGitlabIssueChange, onLinearIssueChange, onGithubIssueChange, onJiraIssueChange]
-  );
-
-  const getInitialPromptPlaceholder = () => {
-    if (!hasInitialPromptSupport) {
-      return 'Selected provider does not support initial prompts';
-    }
-    if (selectedLinearIssue) {
-      return `e.g. Fix the attached Linear ticket ${selectedLinearIssue.identifier} — describe any constraints.`;
-    }
-    if (selectedGithubIssue) {
-      return `e.g. Fix the attached GitHub issue #${selectedGithubIssue.number} — describe any constraints.`;
-    }
-    if (selectedJiraIssue) {
-      return `e.g. Fix the attached Jira ticket ${selectedJiraIssue.key} — describe any constraints.`;
-    }
-    if (selectedGitlabIssue) {
-      return `e.g. Fix the attached GitLab issue #${selectedGitlabIssue.iid} — describe any constraints.`;
-    }
-    return 'e.g. Summarize the key problems and propose a plan.';
-  };
-
-  return (
-    <>
-      <Accordion
-        type="single"
-        collapsible
-        value={showAdvanced ? 'advanced' : undefined}
-        className="space-y-2"
-      >
-        <AccordionItem value="advanced" className="border-none">
-          <AccordionTrigger
-            className="flex h-9 w-full items-center justify-between whitespace-nowrap rounded-md border-none bg-muted px-3 text-sm font-medium text-foreground hover:bg-accent hover:no-underline [&>svg]:h-4 [&>svg]:w-4 [&>svg]:shrink-0"
-            onPointerDown={(e) => {
-              e.preventDefault();
-              const wasClosed = !showAdvanced;
-              setShowAdvanced((prev) => !prev);
-              if (wasClosed) {
-                void (async () => {
-                  const { captureTelemetry } = await import('../lib/telemetryClient');
-                  captureTelemetry('task_advanced_options_opened');
-                })();
-              }
-            }}
-            onKeyDown={(e) => {
-              if (e.key === 'Enter' || e.key === ' ') {
-                e.preventDefault();
-                const wasClosed = !showAdvanced;
-                setShowAdvanced((prev) => !prev);
-                if (wasClosed) {
-                  void (async () => {
-                    const { captureTelemetry } = await import('../lib/telemetryClient');
-                    captureTelemetry('task_advanced_options_opened');
-                  })();
-                }
-              }
-            }}
-          >
-            <span className="inline-flex items-center gap-2">
-              <Settings className="h-4 w-4 text-muted-foreground" />
-              <span>Advanced options</span>
-            </span>
-          </AccordionTrigger>
-          <AccordionContent className="space-y-4 overflow-hidden px-0 pt-2" id="task-advanced">
-            <div className="flex flex-col gap-4 p-2">
-              <div className="flex items-center gap-4">
-                <Label className="w-32 shrink-0">Run in worktree</Label>
-                <div className="min-w-0 flex-1">
-                  <label className="inline-flex cursor-pointer items-start gap-2 text-sm leading-tight">
-                    <Checkbox
-                      checked={useWorktree}
-                      onCheckedChange={(checked) => onUseWorktreeChange(checked === true)}
-                      className="mt-[1px]"
-                    />
-                    <div className="space-y-1">
-                      <span className="text-muted-foreground">
-                        {useWorktree
-                          ? 'Create isolated Git worktree (recommended)'
-                          : 'Work directly on current branch'}
-                      </span>
-                      {!useWorktree && (
-                        <p className="text-xs text-destructive">
-                          ⚠️ Changes will affect your current working directory
-                        </p>
-                      )}
-                    </div>
-                  </label>
-                </div>
-              </div>
-
-              {hasAutoApproveSupport ? (
-                <div className="flex items-center gap-4">
-                  <Label className="w-32 shrink-0">Auto-approve</Label>
-                  <div className="min-w-0 flex-1">
-                    <label className="inline-flex cursor-pointer items-start gap-2 text-sm leading-tight">
-                      <Checkbox
-                        checked={autoApprove}
-                        onCheckedChange={(checked) => onAutoApproveChange(checked === true)}
-                        className="mt-[1px]"
-                      />
-                      <div className="space-y-1">
-                        <span className="text-muted-foreground">
-                          Skip permissions for file operations
-                        </span>
-                        <a
-                          href="https://simonwillison.net/2025/Oct/22/living-dangerously-with-claude/"
-                          target="_blank"
-                          rel="noreferrer noopener"
-                          className="ml-1 inline-flex items-center gap-1 text-foreground underline"
-                        >
-                          Explanation
-                          <ExternalLink className="h-3 w-3" aria-hidden="true" />
-                        </a>
-                      </div>
-                    </label>
-                  </div>
-                </div>
-              ) : null}
-
-              <div className="grid grid-cols-[128px_1fr] items-start gap-4">
-                <Label htmlFor="linear-issue" className="pt-2">
-                  Linear issue
-                </Label>
-                <div className="flex min-w-0 items-center gap-2">
-                  <div className="min-w-0 flex-1 overflow-hidden">
-                    <LinearIssueSelector
-                      selectedIssue={selectedLinearIssue}
-                      onIssueChange={handleLinearIssueChange}
-                      isOpen={isOpen}
-                      disabled={
-                        !hasInitialPromptSupport ||
-                        !isLinearConnected ||
-                        !!selectedGithubIssue ||
-                        !!selectedJiraIssue ||
-                        !!selectedGitlabIssue
-                      }
-                      className="w-full"
-                      autoOpen={autoOpenLinearSelector}
-                      onAutoOpenHandled={() => setAutoOpenLinearSelector(false)}
-                      placeholder={isLinearConnected ? 'Select a Linear issue' : 'Select issue'}
-                    />
-                  </div>
-                  {!isLinearConnected && (
-                    <Button
-                      type="button"
-                      size="sm"
-                      variant="outline"
-                      className="h-9 shrink-0 whitespace-nowrap border-border/50 bg-transparent text-muted-foreground hover:border-border hover:bg-muted/50 hover:text-foreground"
-                      onClick={() => setLinearSetupOpen(true)}
-                    >
-                      Connect
-                    </Button>
-                  )}
-                </div>
-              </div>
-
-              <div className="grid grid-cols-[128px_1fr] items-start gap-4">
-                <Label htmlFor="github-issue" className="pt-2">
-                  GitHub issue
-                </Label>
-                <div className="flex min-w-0 items-center gap-2">
-                  <div className="min-w-0 flex-1 overflow-hidden">
-                    <GitHubIssueSelector
-                      projectPath={projectPath || ''}
-                      selectedIssue={selectedGithubIssue}
-                      onIssueChange={handleGithubIssueChange}
-                      linkedIssueMap={linkedGithubIssueMap}
-                      isOpen={isOpen}
-                      disabled={
-                        !hasInitialPromptSupport ||
-                        !isGithubConnected ||
-                        !!selectedJiraIssue ||
-                        !!selectedLinearIssue ||
-                        !!selectedGitlabIssue
-                      }
-                      className="w-full"
-                      placeholder={isGithubConnected ? 'Select a GitHub issue' : 'Select issue'}
-                    />
-                  </div>
-                  {!isGithubConnected && (
-                    <Button
-                      type="button"
-                      size="sm"
-                      variant="outline"
-                      className="h-9 shrink-0 whitespace-nowrap border-border/50 bg-transparent text-muted-foreground hover:border-border hover:bg-muted/50 hover:text-foreground"
-                      onClick={() => void onGithubConnect()}
-                      disabled={githubLoading}
-                    >
-                      {githubLoading ? (
-                        <>
-                          <Spinner size="sm" className="mr-1" />
-                          Connecting...
-                        </>
-                      ) : !githubInstalled ? (
-                        'Install CLI'
-                      ) : (
-                        'Connect'
-                      )}
-                    </Button>
-                  )}
-                </div>
-              </div>
-
-              <div className="grid grid-cols-[128px_1fr] items-start gap-4">
-                <Label htmlFor="jira-issue" className="pt-2">
-                  Jira issue
-                </Label>
-                <div className="flex min-w-0 items-center gap-2">
-                  <div className="min-w-0 flex-1 overflow-hidden">
-                    <JiraIssueSelector
-                      selectedIssue={selectedJiraIssue}
-                      onIssueChange={handleJiraIssueChange}
-                      isOpen={isOpen}
-                      disabled={
-                        !hasInitialPromptSupport ||
-                        !isJiraConnected ||
-                        !!selectedLinearIssue ||
-                        !!selectedGithubIssue ||
-                        !!selectedGitlabIssue
-                      }
-                      className="w-full"
-                      placeholder={isJiraConnected ? 'Select a Jira issue' : 'Select issue'}
-                    />
-                  </div>
-                  {!isJiraConnected && (
-                    <Button
-                      type="button"
-                      size="sm"
-                      variant="outline"
-                      className="h-9 shrink-0 whitespace-nowrap border-border/50 bg-transparent text-muted-foreground hover:border-border hover:bg-muted/50 hover:text-foreground"
-                      onClick={() => setJiraSetupOpen(true)}
-                    >
-                      Connect
-                    </Button>
-                  )}
-                </div>
-              </div>
-
-              <div className="grid grid-cols-[128px_1fr] items-start gap-4">
-                <Label htmlFor="gitlab-issue" className="pt-2">
-                  GitLab issue
-                </Label>
-                <div className="flex min-w-0 items-center gap-2">
-                  <div className="min-w-0 flex-1 overflow-hidden">
-                    <GitLabIssueSelector
-                      projectPath={projectPath || ''}
-                      selectedIssue={selectedGitlabIssue}
-                      onIssueChange={handleGitlabIssueChange}
-                      isOpen={isOpen}
-                      disabled={
-                        !hasInitialPromptSupport ||
-                        !isGitlabConnected ||
-                        !!selectedLinearIssue ||
-                        !!selectedGithubIssue ||
-                        !!selectedJiraIssue
-                      }
-                      className="w-full"
-                      placeholder={isGitlabConnected ? 'Select a GitLab issue' : 'Select issue'}
-                    />
-                  </div>
-                  {!isGitlabConnected && (
-                    <Button
-                      type="button"
-                      size="sm"
-                      variant="outline"
-                      className="h-9 shrink-0 whitespace-nowrap border-border/50 bg-transparent text-muted-foreground hover:border-border hover:bg-muted/50 hover:text-foreground"
-                      onClick={() => setGitlabSetupOpen(true)}
-                    >
-                      Connect
-                    </Button>
-                  )}
-                </div>
-              </div>
-            </div>
-
-            <div className="flex items-start gap-4 p-2">
-              <Label htmlFor="initial-prompt" className="w-32 shrink-0">
-                Initial prompt
-              </Label>
-              <div className="min-w-0 flex-1">
-                <Textarea
-                  id="initial-prompt"
-                  value={initialPrompt}
-                  onChange={(e) => onInitialPromptChange(e.target.value)}
-                  disabled={!hasInitialPromptSupport}
-                  placeholder={getInitialPromptPlaceholder()}
-                  className="resize-none"
-                  rows={3}
-                />
-              </div>
-            </div>
-          </AccordionContent>
-        </AccordionItem>
-      </Accordion>
-
-      <AnimatePresence>
-        {linearSetupOpen ? (
-          <motion.div
-            className="fixed inset-0 z-[1000] flex items-center justify-center px-3"
-            initial={{ opacity: 0 }}
-            animate={{ opacity: 1 }}
-            exit={{ opacity: 0 }}
-            onClick={() => setLinearSetupOpen(false)}
-          >
-            <div className="absolute inset-0 bg-black/60 backdrop-blur-sm" />
-            <motion.div
-              className="relative z-10 w-full max-w-md rounded-xl border border-border/70 bg-background/95 p-4 shadow-2xl backdrop-blur-sm"
-              initial={{ opacity: 0, scale: 0.95 }}
-              animate={{ opacity: 1, scale: 1 }}
-              exit={{ opacity: 0, scale: 0.95 }}
-              transition={{ duration: shouldReduceMotion ? 0 : 0.15 }}
-              onClick={(event) => event.stopPropagation()}
-            >
-              <LinearSetupForm
-                apiKey={linearApiKey}
-                onChange={(value) => setLinearApiKey(value)}
-                onSubmit={() => void handleLinearConnect()}
-                onClose={() => setLinearSetupOpen(false)}
-                canSubmit={!!linearApiKey.trim()}
-                error={linearConnectionError}
-              />
-            </motion.div>
-          </motion.div>
-        ) : null}
-      </AnimatePresence>
-
-      <AnimatePresence>
-        {jiraSetupOpen ? (
-          <motion.div
-            className="fixed inset-0 z-[1000] flex items-center justify-center px-3"
-            initial={{ opacity: 0 }}
-            animate={{ opacity: 1 }}
-            exit={{ opacity: 0 }}
-            onClick={() => setJiraSetupOpen(false)}
-          >
-            <div className="absolute inset-0 bg-black/60 backdrop-blur-sm" />
-            <motion.div
-              className="relative z-10 w-full max-w-md rounded-xl border border-border/70 bg-background/95 p-4 shadow-2xl backdrop-blur-sm"
-              initial={{ opacity: 0, scale: 0.95 }}
-              animate={{ opacity: 1, scale: 1 }}
-              exit={{ opacity: 0, scale: 0.95 }}
-              transition={{ duration: shouldReduceMotion ? 0 : 0.15 }}
-              onClick={(event) => event.stopPropagation()}
-            >
-              <JiraSetupForm
-                site={jiraSite}
-                email={jiraEmail}
-                token={jiraToken}
-                onChange={(u) => {
-                  if (typeof u.site === 'string') setJiraSite(u.site);
-                  if (typeof u.email === 'string') setJiraEmail(u.email);
-                  if (typeof u.token === 'string') setJiraToken(u.token);
-                }}
-                onClose={() => setJiraSetupOpen(false)}
-                canSubmit={!!(jiraSite.trim() && jiraEmail.trim() && jiraToken.trim())}
-                error={jiraConnectionError}
-                onSubmit={() => void handleJiraConnect()}
-              />
-            </motion.div>
-          </motion.div>
-        ) : null}
-      </AnimatePresence>
-
-      <AnimatePresence>
-        {gitlabSetupOpen ? (
-          <motion.div
-            className="fixed inset-0 z-[1000] flex items-center justify-center px-3"
-            initial={{ opacity: 0 }}
-            animate={{ opacity: 1 }}
-            exit={{ opacity: 0 }}
-            onClick={() => setGitlabSetupOpen(false)}
-          >
-            <div className="absolute inset-0 bg-black/60 backdrop-blur-sm" />
-            <motion.div
-              className="relative z-10 w-full max-w-md rounded-xl border border-border/70 bg-background/95 p-4 shadow-2xl backdrop-blur-sm"
-              initial={{ opacity: 0, scale: 0.95 }}
-              animate={{ opacity: 1, scale: 1 }}
-              exit={{ opacity: 0, scale: 0.95 }}
-              transition={{ duration: shouldReduceMotion ? 0 : 0.15 }}
-              onClick={(event) => event.stopPropagation()}
-            >
-              <GitLabSetupForm
-                instanceUrl={gitlabInstanceUrl}
-                token={gitlabToken}
-                onChange={(u) => {
-                  if (typeof u.instanceUrl === 'string') setGitlabInstanceUrl(u.instanceUrl);
-                  if (typeof u.token === 'string') setGitlabToken(u.token);
-                }}
-                onClose={() => setGitlabSetupOpen(false)}
-                canSubmit={!!(gitlabInstanceUrl.trim() && gitlabToken.trim())}
-                error={gitlabConnectionError}
-                onSubmit={() => void handleGitlabConnect()}
-              />
-            </motion.div>
-          </motion.div>
-        ) : null}
-      </AnimatePresence>
-    </>
-  );
-};
-
-export default TaskAdvancedSettings;
diff --git a/src/renderer/components/TaskChanges.tsx b/src/renderer/components/TaskChanges.tsx
deleted file mode 100644
index f587391166..0000000000
--- a/src/renderer/components/TaskChanges.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-import React from 'react';
-
-interface ChangesBadgeProps {
-  additions: number;
-  deletions: number;
-  className?: string;
-}
-
-export const ChangesBadge: React.FC<ChangesBadgeProps> = ({
-  additions,
-  deletions,
-  className = '',
-}) => {
-  if (additions === 0 && deletions === 0) {
-    return null;
-  }
-
-  return (
-    <div className={`inline-flex items-center gap-1 text-sm font-medium ${className}`}>
-      {additions > 0 && (
-        <span className="mr-1 text-green-600 dark:text-green-400">+{additions}</span>
-      )}
-      {deletions > 0 && <span className="text-red-600 dark:text-red-400">-{deletions}</span>}
-    </div>
-  );
-};
diff --git a/src/renderer/components/TaskContextBadges.tsx b/src/renderer/components/TaskContextBadges.tsx
deleted file mode 100644
index 0208d051eb..0000000000
--- a/src/renderer/components/TaskContextBadges.tsx
+++ /dev/null
@@ -1,230 +0,0 @@
-import React from 'react';
-import { ExternalLink, MessageSquare } from 'lucide-react';
-import { type LinearIssueSummary } from '../types/linear';
-import { type GitHubIssueSummary } from '../types/github';
-import { type JiraIssueSummary } from '../types/jira';
-import { TooltipProvider, Tooltip, TooltipTrigger, TooltipContent } from './ui/tooltip';
-import { CommentsPopover } from './CommentsPopover';
-import { Button } from './ui/button';
-import { useTaskComments } from '../hooks/useLineComments';
-import { useTaskScope } from './TaskScopeContext';
-import linearLogoSvg from '../../assets/images/Linear.svg?raw';
-import githubLogo from '../../assets/images/github.png';
-import jiraLogo from '../../assets/images/jira.png';
-import AgentLogo from './AgentLogo';
-
-type Props = {
-  taskId?: string;
-  linearIssue?: LinearIssueSummary | null;
-  githubIssue?: GitHubIssueSummary | null;
-  jiraIssue?: JiraIssueSummary | null;
-};
-
-export const TaskContextBadges: React.FC<Props> = ({
-  taskId,
-  linearIssue,
-  githubIssue,
-  jiraIssue,
-}) => {
-  const { taskId: scopedTaskId } = useTaskScope();
-  const resolvedTaskId = taskId ?? scopedTaskId;
-  const { unsentCount } = useTaskComments(resolvedTaskId);
-  const [selectedCount, setSelectedCount] = React.useState(0);
-
-  React.useEffect(() => {
-    setSelectedCount(0);
-  }, [resolvedTaskId]);
-
-  const handleIssueClick = (url?: string) => {
-    if (!url) return;
-    try {
-      window.electronAPI?.openExternal?.(url);
-    } catch (e) {
-      console.error('Failed to open external link:', e);
-    }
-  };
-
-  return (
-    <div className="inline-flex items-center gap-2">
-      {linearIssue && (
-        <TooltipProvider delayDuration={250}>
-          <Tooltip>
-            <TooltipTrigger asChild>
-              <button
-                type="button"
-                className="inline-flex h-7 items-center gap-1.5 rounded-md border border-border bg-muted px-2 text-xs font-medium text-foreground hover:bg-muted/80 dark:border-border dark:bg-muted dark:hover:bg-muted/80"
-                onClick={() => handleIssueClick(linearIssue.url || undefined)}
-                aria-label={`Linear issue ${linearIssue.identifier}: ${linearIssue.title || 'No title'}`}
-              >
-                <AgentLogo
-                  logo={linearLogoSvg}
-                  alt="Linear"
-                  className="h-3.5 w-3.5 text-foreground"
-                />
-                <span>{linearIssue.identifier}</span>
-              </button>
-            </TooltipTrigger>
-            <TooltipContent side="bottom" className="max-w-sm">
-              <div className="text-xs">
-                <div className="mb-1.5 flex min-w-0 items-center gap-2">
-                  <span className="inline-flex shrink-0 items-center gap-1.5 rounded border border-border bg-muted px-1.5 py-0.5 dark:border-border dark:bg-card">
-                    <AgentLogo
-                      logo={linearLogoSvg}
-                      alt="Linear"
-                      className="h-3 w-3 text-foreground"
-                    />
-                    <span className="text-[11px] font-medium">{linearIssue.identifier}</span>
-                  </span>
-                  {linearIssue.title && (
-                    <span className="truncate text-foreground">{linearIssue.title}</span>
-                  )}
-                </div>
-                <div className="space-y-0.5 text-muted-foreground">
-                  {linearIssue.state?.name && (
-                    <div>
-                      <span className="font-medium">State:</span> {linearIssue.state.name}
-                    </div>
-                  )}
-                  {(linearIssue.assignee?.displayName || linearIssue.assignee?.name) && (
-                    <div>
-                      <span className="font-medium">Assignee:</span>{' '}
-                      {linearIssue.assignee.displayName || linearIssue.assignee.name}
-                    </div>
-                  )}
-                  {linearIssue.url && (
-                    <div className="mt-1 flex items-center gap-1">
-                      <ExternalLink className="h-3 w-3" aria-hidden="true" />
-                      <span className="text-[11px]">Click to open in Linear</span>
-                    </div>
-                  )}
-                </div>
-              </div>
-            </TooltipContent>
-          </Tooltip>
-        </TooltipProvider>
-      )}
-
-      {githubIssue && (
-        <TooltipProvider delayDuration={250}>
-          <Tooltip>
-            <TooltipTrigger asChild>
-              <button
-                type="button"
-                className="inline-flex h-7 items-center gap-1.5 rounded-md border border-border bg-muted px-2 text-xs font-medium text-foreground hover:bg-muted/80 dark:border-border dark:bg-muted dark:hover:bg-muted/80"
-                onClick={() => handleIssueClick(githubIssue.url || undefined)}
-                aria-label={`GitHub issue #${githubIssue.number}: ${githubIssue.title || 'No title'}`}
-              >
-                <img src={githubLogo} alt="GitHub" className="h-3.5 w-3.5" />
-                <span>#{githubIssue.number}</span>
-              </button>
-            </TooltipTrigger>
-            <TooltipContent side="bottom" className="max-w-sm">
-              <div className="text-xs">
-                <div className="mb-1.5 flex min-w-0 items-center gap-2">
-                  <span className="inline-flex shrink-0 items-center gap-1.5 rounded border border-border bg-muted px-1.5 py-0.5 dark:border-border dark:bg-card">
-                    <img src={githubLogo} alt="GitHub" className="h-3 w-3" />
-                    <span className="text-[11px] font-medium">#{githubIssue.number}</span>
-                  </span>
-                  {githubIssue.title && (
-                    <span className="truncate text-foreground">{githubIssue.title}</span>
-                  )}
-                </div>
-                {githubIssue.url && (
-                  <div className="mt-1 flex items-center gap-1 text-muted-foreground">
-                    <ExternalLink className="h-3 w-3" aria-hidden="true" />
-                    <span className="text-[11px]">Click to open on GitHub</span>
-                  </div>
-                )}
-              </div>
-            </TooltipContent>
-          </Tooltip>
-        </TooltipProvider>
-      )}
-
-      {jiraIssue && (
-        <TooltipProvider delayDuration={250}>
-          <Tooltip>
-            <TooltipTrigger asChild>
-              <button
-                type="button"
-                className="inline-flex h-7 items-center gap-1.5 rounded-md border border-border bg-muted px-2 text-xs font-medium text-foreground hover:bg-muted/80 dark:border-border dark:bg-muted dark:hover:bg-muted/80"
-                onClick={() => handleIssueClick(jiraIssue.url || undefined)}
-                aria-label={`Jira issue ${jiraIssue.key}: ${jiraIssue.summary || 'No summary'}`}
-              >
-                <img src={jiraLogo} alt="Jira" className="h-3.5 w-3.5" />
-                <span>{jiraIssue.key}</span>
-              </button>
-            </TooltipTrigger>
-            <TooltipContent side="bottom" className="max-w-sm">
-              <div className="text-xs">
-                <div className="mb-1.5 flex min-w-0 items-center gap-2">
-                  <span className="inline-flex shrink-0 items-center gap-1.5 rounded border border-border bg-muted px-1.5 py-0.5 dark:border-border dark:bg-card">
-                    <img src={jiraLogo} alt="Jira" className="h-3 w-3" />
-                    <span className="text-[11px] font-medium">{jiraIssue.key}</span>
-                  </span>
-                  {jiraIssue.summary && (
-                    <span className="truncate text-foreground">{jiraIssue.summary}</span>
-                  )}
-                </div>
-                <div className="space-y-0.5 text-muted-foreground">
-                  {jiraIssue.status?.name && (
-                    <div>
-                      <span className="font-medium">Status:</span> {jiraIssue.status.name}
-                    </div>
-                  )}
-                  {(jiraIssue.assignee?.displayName || jiraIssue.assignee?.name) && (
-                    <div>
-                      <span className="font-medium">Assignee:</span>{' '}
-                      {jiraIssue.assignee.displayName || jiraIssue.assignee.name}
-                    </div>
-                  )}
-                  {jiraIssue.url && (
-                    <div className="mt-1 flex items-center gap-1">
-                      <ExternalLink className="h-3 w-3" aria-hidden="true" />
-                      <span className="text-[11px]">Click to open in Jira</span>
-                    </div>
-                  )}
-                </div>
-              </div>
-            </TooltipContent>
-          </Tooltip>
-        </TooltipProvider>
-      )}
-
-      {resolvedTaskId && unsentCount > 0 && (
-        <CommentsPopover
-          tooltipContent="Selected comments are appended to your next agent message."
-          tooltipDelay={300}
-          onSelectedCountChange={setSelectedCount}
-        >
-          <Button
-            type="button"
-            variant="outline"
-            size="sm"
-            className={[
-              'relative h-7 gap-1.5 px-2 text-xs',
-              selectedCount > 0
-                ? 'border-blue-500/50 bg-blue-500/10 hover:bg-blue-500/15'
-                : 'border-border bg-muted hover:bg-muted/80 dark:border-border dark:bg-muted',
-            ].join(' ')}
-            title={
-              selectedCount > 0
-                ? `${selectedCount} selected comment${selectedCount === 1 ? '' : 's'} ready to append`
-                : 'Review or select comments to append'
-            }
-          >
-            <MessageSquare className="h-3.5 w-3.5 flex-shrink-0" />
-            <span className="font-medium">Comments</span>
-            {selectedCount > 0 && (
-              <span className="absolute -right-1.5 -top-1.5 flex h-4 min-w-4 items-center justify-center rounded-full bg-blue-500 px-1 text-[10px] font-semibold text-white">
-                {selectedCount}
-              </span>
-            )}
-          </Button>
-        </CommentsPopover>
-      )}
-    </div>
-  );
-};
-
-export default TaskContextBadges;
diff --git a/src/renderer/components/TaskCreationLoading.tsx b/src/renderer/components/TaskCreationLoading.tsx
deleted file mode 100644
index de711faae1..0000000000
--- a/src/renderer/components/TaskCreationLoading.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-import React from 'react';
-import { Spinner } from './ui/spinner';
-import { cn } from '@/lib/utils';
-
-interface TaskCreationLoadingProps {
-  className?: string;
-}
-
-const TaskCreationLoading: React.FC<TaskCreationLoadingProps> = ({ className }) => {
-  return (
-    <div
-      className={cn('flex h-full min-h-0 flex-col items-center justify-center gap-3', className)}
-    >
-      <Spinner size="lg" />
-      <p className="text-sm text-muted-foreground">Creating task...</p>
-    </div>
-  );
-};
-
-export default TaskCreationLoading;
diff --git a/src/renderer/components/TaskDeleteButton.tsx b/src/renderer/components/TaskDeleteButton.tsx
deleted file mode 100644
index a305c962d7..0000000000
--- a/src/renderer/components/TaskDeleteButton.tsx
+++ /dev/null
@@ -1,251 +0,0 @@
-import React, { useMemo } from 'react';
-import { motion, AnimatePresence } from 'motion/react';
-import { Trash, Folder } from 'lucide-react';
-import { Checkbox } from './ui/checkbox';
-import { Spinner } from './ui/spinner';
-import {
-  AlertDialog,
-  AlertDialogAction,
-  AlertDialogCancel,
-  AlertDialogContent,
-  AlertDialogDescription,
-  AlertDialogFooter,
-  AlertDialogHeader,
-  AlertDialogTitle,
-  AlertDialogTrigger,
-} from './ui/alert-dialog';
-import { TooltipProvider, Tooltip, TooltipTrigger, TooltipContent } from './ui/tooltip';
-import { Button } from './ui/button';
-import { cn } from '@/lib/utils';
-import { useDeleteRisks } from '../hooks/useDeleteRisks';
-import DeletePrNotice from './DeletePrNotice';
-import { isActivePr } from '../lib/prStatus';
-
-type Props = {
-  taskName: string;
-  taskId: string;
-  taskPath: string;
-  onConfirm: () => void | Promise<void | boolean>;
-  className?: string;
-  'aria-label'?: string;
-  isDeleting?: boolean;
-  /**
-   * Indicates whether the task uses a Git worktree for isolation.
-   * When false, the task runs directly on the main repository branch.
-   * This affects deletion warnings - worktree tasks may have uncommitted changes
-   * that will be lost, while main branch tasks do not have this risk.
-   * @default true
-   */
-  useWorktree?: boolean;
-  /** Controlled open state — when provided, overrides the internal state. */
-  externalOpen?: boolean;
-  /** Callback when controlled open state changes. */
-  onExternalOpenChange?: (open: boolean) => void;
-  /** When true, the trigger button is hidden and only the dialog is rendered. */
-  hideTrigger?: boolean;
-};
-
-export const TaskDeleteButton: React.FC<Props> = ({
-  taskName,
-  taskId,
-  taskPath,
-  onConfirm,
-  className,
-  'aria-label': ariaLabel = 'Delete Task',
-  isDeleting = false,
-  useWorktree = true,
-  externalOpen,
-  onExternalOpenChange,
-  hideTrigger = false,
-}) => {
-  const [internalOpen, setInternalOpen] = React.useState(false);
-  const isControlled = externalOpen !== undefined;
-  const open = isControlled ? externalOpen : internalOpen;
-  const setOpen = isControlled ? (v: boolean) => onExternalOpenChange?.(v) : setInternalOpen;
-  const [acknowledge, setAcknowledge] = React.useState(false);
-  const targets = useMemo(
-    () => [{ id: taskId, name: taskName, path: taskPath }],
-    [taskId, taskName, taskPath]
-  );
-  // Only check for deletion risks if the task uses a worktree.
-  // Tasks running directly on the main branch (useWorktree === false) don't need risk assessment
-  // since they don't have isolated changes that could be lost.
-  const { risks, loading, hasData } = useDeleteRisks(targets, open && useWorktree);
-  const status = risks[taskId] || {
-    staged: 0,
-    unstaged: 0,
-    untracked: 0,
-    ahead: 0,
-    behind: 0,
-    error: undefined,
-    pr: null,
-  };
-
-  // Determine if deletion is risky based on uncommitted changes or active PRs.
-  // Tasks on main branch (useWorktree === false) are never considered risky
-  // because they don't have worktree-specific changes that would be lost.
-  const risky: boolean =
-    useWorktree &&
-    (status.staged > 0 ||
-      status.unstaged > 0 ||
-      status.untracked > 0 ||
-      status.ahead > 0 ||
-      !!status.error ||
-      !!(status.pr && isActivePr(status.pr)));
-  const disableDelete: boolean = Boolean(isDeleting || loading) || (risky && !acknowledge);
-
-  React.useEffect(() => {
-    if (!open) {
-      setAcknowledge(false);
-    }
-  }, [open]);
-
-  return (
-    <AlertDialog open={open} onOpenChange={setOpen}>
-      {!hideTrigger && (
-        <TooltipProvider delayDuration={200}>
-          <Tooltip>
-            <TooltipTrigger asChild>
-              <AlertDialogTrigger asChild>
-                <Button
-                  variant="ghost"
-                  size="icon-sm"
-                  className={cn(className, isDeleting && 'opacity-100')}
-                  title="Delete Task"
-                  aria-label={ariaLabel}
-                  aria-busy={isDeleting}
-                  disabled={isDeleting}
-                  onClick={(e) => e.stopPropagation()}
-                >
-                  {isDeleting ? (
-                    <Spinner className="h-4 w-4" size="sm" />
-                  ) : (
-                    <Trash className="h-4 w-4" />
-                  )}
-                </Button>
-              </AlertDialogTrigger>
-            </TooltipTrigger>
-            <TooltipContent side="top" className="text-xs">
-              Delete Task
-            </TooltipContent>
-          </Tooltip>
-        </TooltipProvider>
-      )}
-      <AlertDialogContent onClick={(e) => e.stopPropagation()} className="space-y-4">
-        <AlertDialogHeader>
-          <AlertDialogTitle>Delete task?</AlertDialogTitle>
-          <AlertDialogDescription>
-            {useWorktree
-              ? 'This will permanently delete this task and its worktree.'
-              : 'This will permanently delete this task from the project.'}
-          </AlertDialogDescription>
-        </AlertDialogHeader>
-        <div className="space-y-3 text-sm">
-          <AnimatePresence initial={false}>
-            {loading && useWorktree ? (
-              <motion.div
-                key="task-delete-loading"
-                initial={{ opacity: 0, y: 6, scale: 0.99 }}
-                animate={{ opacity: 1, y: 0, scale: 1 }}
-                exit={{ opacity: 0, y: 6, scale: 0.99 }}
-                transition={{ duration: 0.18, ease: 'easeOut' }}
-                className="flex items-start gap-3 rounded-md border border-border/70 bg-muted/30 px-4 py-4"
-              >
-                <Spinner className="mt-0.5 h-5 w-5 flex-shrink-0 text-muted-foreground" size="sm" />
-                <div className="flex min-w-0 flex-col gap-1">
-                  <span className="text-sm font-semibold text-foreground">Please wait...</span>
-                  <span className="text-xs text-muted-foreground">
-                    Scanning task for uncommitted changes and open pull requests
-                  </span>
-                </div>
-              </motion.div>
-            ) : null}
-          </AnimatePresence>
-          <AnimatePresence initial={false}>
-            {risky && !loading ? (
-              <motion.div
-                key="delete-risk"
-                initial={{ opacity: 0, y: 6, scale: 0.99 }}
-                animate={{ opacity: 1, y: 0, scale: 1 }}
-                exit={{ opacity: 0, y: 6, scale: 0.99 }}
-                transition={{ duration: 0.18, ease: 'easeOut' }}
-                className="space-y-2 rounded-md border border-amber-300/60 bg-amber-50 px-3 py-2 text-amber-900 dark:border-amber-500/40 dark:bg-amber-500/10 dark:text-amber-50"
-              >
-                <p className="font-medium">Unmerged or unpushed work detected</p>
-                <div className="flex items-center gap-2 rounded-md bg-amber-50/80 px-2 py-1 text-amber-900 dark:bg-amber-500/10 dark:text-amber-50">
-                  <Folder className="h-4 w-4 fill-amber-700 text-amber-700" />
-                  <span className="font-medium">{taskName}</span>
-                  <span className="text-muted-foreground">—</span>
-                  <span>
-                    {[
-                      status.staged > 0
-                        ? `${status.staged} ${status.staged === 1 ? 'file' : 'files'} staged`
-                        : null,
-                      status.unstaged > 0
-                        ? `${status.unstaged} ${status.unstaged === 1 ? 'file' : 'files'} unstaged`
-                        : null,
-                      status.untracked > 0
-                        ? `${status.untracked} ${status.untracked === 1 ? 'file' : 'files'} untracked`
-                        : null,
-                      status.ahead > 0
-                        ? `ahead by ${status.ahead} ${status.ahead === 1 ? 'commit' : 'commits'}`
-                        : null,
-                      status.behind > 0
-                        ? `behind by ${status.behind} ${status.behind === 1 ? 'commit' : 'commits'}`
-                        : null,
-                    ]
-                      .filter(Boolean)
-                      .join(', ') ||
-                      status.error ||
-                      'Status unavailable'}
-                  </span>
-                </div>
-                {status.pr && isActivePr(status.pr) ? (
-                  <DeletePrNotice tasks={[{ name: taskName, pr: status.pr }]} />
-                ) : null}
-              </motion.div>
-            ) : null}
-          </AnimatePresence>
-          <AnimatePresence initial={false}>
-            {risky && !loading ? (
-              <motion.label
-                key="ack-delete"
-                className="flex items-start gap-2 rounded-md border border-border/70 bg-muted/30 px-3 py-2"
-                initial={{ opacity: 0, y: 6, scale: 0.99 }}
-                animate={{ opacity: 1, y: 0, scale: 1 }}
-                exit={{ opacity: 0, y: 6, scale: 0.99 }}
-                transition={{ duration: 0.18, ease: 'easeOut', delay: 0.02 }}
-              >
-                <Checkbox
-                  checked={acknowledge}
-                  onCheckedChange={(checked) => setAcknowledge(checked === true)}
-                  className="mt-0.5"
-                />
-                <span className="text-sm leading-tight text-foreground">Delete task anyway</span>
-              </motion.label>
-            ) : null}
-          </AnimatePresence>
-        </div>
-        <AlertDialogFooter>
-          <AlertDialogCancel disabled={isDeleting}>Cancel</AlertDialogCancel>
-          <AlertDialogAction
-            className="bg-destructive px-4 py-2 text-destructive-foreground hover:bg-destructive/90"
-            disabled={disableDelete}
-            onClick={async (e) => {
-              e.stopPropagation();
-              setOpen(false);
-              try {
-                await onConfirm();
-              } catch {}
-            }}
-          >
-            {isDeleting ? <Spinner className="mr-2 h-4 w-4" size="sm" /> : null}
-            Delete
-          </AlertDialogAction>
-        </AlertDialogFooter>
-      </AlertDialogContent>
-    </AlertDialog>
-  );
-};
-
-export default TaskDeleteButton;
diff --git a/src/renderer/components/TaskHoverActionCard.tsx b/src/renderer/components/TaskHoverActionCard.tsx
deleted file mode 100644
index 82a8990504..0000000000
--- a/src/renderer/components/TaskHoverActionCard.tsx
+++ /dev/null
@@ -1,40 +0,0 @@
-import React from 'react';
-import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from './ui/select';
-import { useAppSettings } from '@/contexts/AppSettingsProvider';
-
-const TaskHoverActionCard: React.FC = () => {
-  const { settings, updateSettings, isLoading, isSaving } = useAppSettings();
-
-  const value = settings?.interface?.taskHoverAction ?? 'delete';
-
-  const handleChange = (next: 'delete' | 'archive') => {
-    updateSettings({ interface: { taskHoverAction: next } });
-    window.dispatchEvent(new CustomEvent('taskHoverActionChanged', { detail: { value: next } }));
-  };
-
-  return (
-    <div className="flex items-center justify-between gap-4">
-      <div className="flex flex-1 flex-col gap-0.5">
-        <p className="text-sm font-medium text-foreground">Task hover action</p>
-        <p className="text-sm text-muted-foreground">
-          Primary action when hovering over tasks in the sidebar.
-        </p>
-      </div>
-      <Select
-        value={value}
-        onValueChange={(next) => handleChange(next as 'delete' | 'archive')}
-        disabled={isLoading || isSaving}
-      >
-        <SelectTrigger className="w-auto shrink-0 gap-2 [&>span]:line-clamp-none">
-          <SelectValue />
-        </SelectTrigger>
-        <SelectContent>
-          <SelectItem value="delete">Delete</SelectItem>
-          <SelectItem value="archive">Archive</SelectItem>
-        </SelectContent>
-      </Select>
-    </div>
-  );
-};
-
-export default TaskHoverActionCard;
diff --git a/src/renderer/components/TaskItem.tsx b/src/renderer/components/TaskItem.tsx
deleted file mode 100644
index 3bfa951e3f..0000000000
--- a/src/renderer/components/TaskItem.tsx
+++ /dev/null
@@ -1,371 +0,0 @@
-import React, { useState, useRef, useEffect, useCallback } from 'react';
-import { ArrowUpRight, AlertCircle, Archive, Pencil, Pin, PinOff, Trash2 } from 'lucide-react';
-import { useTaskChanges } from '../hooks/useTaskChanges';
-import { ChangesBadge } from './TaskChanges';
-
-import { Spinner } from './ui/spinner';
-import { usePrStatus } from '../hooks/usePrStatus';
-import { useTaskBusy } from '../hooks/useTaskBusy';
-
-import PrPreviewTooltip from './PrPreviewTooltip';
-import TaskDeleteButton from './TaskDeleteButton';
-import { normalizeTaskName, MAX_TASK_NAME_LENGTH } from '../lib/taskNames';
-import {
-  ContextMenu,
-  ContextMenuContent,
-  ContextMenuItem,
-  ContextMenuTrigger,
-} from './ui/context-menu';
-
-function stopPropagation(e: React.MouseEvent): void {
-  e.stopPropagation();
-}
-
-function formatCompactDate(dateStr?: string): string {
-  if (!dateStr) return '';
-  const date = new Date(dateStr);
-  const now = new Date();
-  const diffMs = now.getTime() - date.getTime();
-  if (diffMs < 0) return '';
-  const diffMin = Math.floor(diffMs / 60000);
-  if (diffMin < 1) return 'now';
-  if (diffMin < 60) return `${diffMin}m`;
-  const diffHrs = Math.floor(diffMin / 60);
-  if (diffHrs < 24) return `${diffHrs}h`;
-  const diffDays = Math.floor(diffHrs / 24);
-  if (diffDays < 30) return `${diffDays}d`;
-  const diffMonths = Math.floor(diffDays / 30);
-  if (diffMonths < 12) return `${diffMonths}mo`;
-  return `${Math.floor(diffDays / 365)}y`;
-}
-
-interface Task {
-  id: string;
-  name: string;
-  branch: string;
-  path: string;
-  status: 'active' | 'idle' | 'running';
-  agentId?: string;
-  useWorktree?: boolean;
-  updatedAt?: string;
-}
-
-interface TaskItemProps {
-  task: Task;
-  onDelete?: () => void | Promise<void | boolean>;
-  onArchive?: () => void | Promise<void | boolean>;
-  onRename?: (newName: string) => void | Promise<void>;
-  onPin?: () => void | Promise<void>;
-  isPinned?: boolean;
-  showDelete?: boolean;
-  showDirectBadge?: boolean;
-  primaryAction?: 'delete' | 'archive';
-}
-
-export const TaskItem: React.FC<TaskItemProps> = ({
-  task,
-  onDelete,
-  onArchive,
-  onRename,
-  onPin,
-  isPinned,
-  showDelete,
-  showDirectBadge = true,
-  primaryAction = 'delete',
-}) => {
-  const { totalAdditions, totalDeletions, isLoading } = useTaskChanges(task.path, task.id);
-  const { pr } = usePrStatus(task.path);
-  const isRunning = useTaskBusy(task.id);
-
-  const [isDeleting, setIsDeleting] = useState(false);
-  const [deleteDialogOpen, setDeleteDialogOpen] = useState(false);
-  const [isEditing, setIsEditing] = useState(false);
-  const [editValue, setEditValue] = useState(task.name);
-
-  const inputRef = useRef<HTMLInputElement>(null);
-  const isSubmittingRef = useRef(false);
-  const blurGuardRef = useRef(false);
-  const blurGuardTimerRef = useRef<ReturnType<typeof setTimeout>>();
-
-  const handleStartEdit = useCallback(() => {
-    if (!onRename) return;
-    setEditValue(task.name);
-    isSubmittingRef.current = false;
-    blurGuardRef.current = true;
-    setIsEditing(true);
-    // Keep blur guard active long enough for Radix context menu close
-    // animation (~150ms) and focus restoration to complete
-    clearTimeout(blurGuardTimerRef.current);
-    blurGuardTimerRef.current = setTimeout(() => {
-      blurGuardRef.current = false;
-    }, 300);
-  }, [onRename, task.name]);
-
-  const handleCancelEdit = useCallback(() => {
-    blurGuardRef.current = false;
-    clearTimeout(blurGuardTimerRef.current);
-    setIsEditing(false);
-    setEditValue(task.name);
-  }, [task.name]);
-
-  const handleConfirmEdit = useCallback(async () => {
-    if (isSubmittingRef.current) return;
-    isSubmittingRef.current = true;
-    blurGuardRef.current = false;
-    clearTimeout(blurGuardTimerRef.current);
-
-    const normalized = normalizeTaskName(editValue);
-    if (!normalized) {
-      handleCancelEdit();
-      return;
-    }
-    if (normalized === normalizeTaskName(task.name)) {
-      setIsEditing(false);
-      return;
-    }
-    setIsEditing(false);
-    await onRename?.(normalized);
-  }, [editValue, task.name, onRename, handleCancelEdit]);
-
-  const handleKeyDown = useCallback(
-    (e: React.KeyboardEvent) => {
-      if (e.key === 'Enter') {
-        e.preventDefault();
-        handleConfirmEdit();
-      } else if (e.key === 'Escape') {
-        e.preventDefault();
-        handleCancelEdit();
-      }
-    },
-    [handleConfirmEdit, handleCancelEdit]
-  );
-
-  useEffect(() => {
-    if (isEditing && inputRef.current) {
-      requestAnimationFrame(() => {
-        inputRef.current?.focus();
-        inputRef.current?.select();
-      });
-    }
-  }, [isEditing]);
-
-  const hasChanges = !isLoading && (totalAdditions > 0 || totalDeletions > 0);
-  const compact = formatCompactDate(task.updatedAt);
-
-  // Right side: PR badge only, OR changes + date, OR just date
-  const rightBadge = pr ? (
-    <PrPreviewTooltip pr={pr} side="top">
-      <button
-        type="button"
-        onClick={(e) => {
-          e.stopPropagation();
-          if (pr.url) window.electronAPI.openExternal(pr.url);
-        }}
-        className="inline-flex items-center rounded border border-border bg-muted px-1.5 text-[10px] font-medium text-muted-foreground transition-colors hover:bg-accent hover:text-accent-foreground"
-        title={`${pr.title || 'Pull Request'} (#${pr.number})`}
-      >
-        {pr.isDraft
-          ? 'Draft'
-          : String(pr.state).toUpperCase() === 'OPEN'
-            ? 'View PR'
-            : `PR ${String(pr.state).charAt(0).toUpperCase() + String(pr.state).slice(1).toLowerCase()}`}
-      </button>
-    </PrPreviewTooltip>
-  ) : (
-    <div className="flex items-center gap-1.5">
-      {hasChanges && (
-        <ChangesBadge additions={totalAdditions} deletions={totalDeletions} className="text-xs" />
-      )}
-      {compact && <span className="text-xs font-medium text-muted-foreground">{compact}</span>}
-    </div>
-  );
-
-  const taskContent = (
-    <div className="flex min-w-0 items-center gap-1.5">
-      {/* Left icon slot — same width as the project folder icon */}
-      <div className="flex w-5 flex-shrink-0 items-center justify-center">
-        {showDelete && onDelete && primaryAction === 'delete' ? (
-          <TaskDeleteButton
-            taskName={task.name}
-            taskId={task.id}
-            taskPath={task.path}
-            useWorktree={task.useWorktree}
-            onConfirm={async () => {
-              try {
-                setIsDeleting(true);
-                await onDelete();
-              } finally {
-                setIsDeleting(false);
-              }
-            }}
-            isDeleting={isDeleting}
-            aria-label={`Delete Task ${task.name}`}
-            className={`!h-5 !w-5 text-muted-foreground ${isDeleting ? '' : 'opacity-0 group-hover/task:opacity-100'}`}
-          />
-        ) : showDelete && onArchive && primaryAction === 'archive' ? (
-          <>
-            <button
-              type="button"
-              className={`rounded p-0.5 text-muted-foreground hover:text-foreground ${isDeleting ? 'opacity-100' : 'opacity-0 group-hover/task:opacity-100'}`}
-              aria-label={`Archive Task ${task.name}`}
-              onClick={(e) => {
-                e.stopPropagation();
-                onArchive();
-              }}
-            >
-              <Archive className="h-4 w-4" />
-            </button>
-            {onDelete && (
-              <TaskDeleteButton
-                taskName={task.name}
-                taskId={task.id}
-                taskPath={task.path}
-                useWorktree={task.useWorktree}
-                onConfirm={async () => {
-                  try {
-                    setIsDeleting(true);
-                    await onDelete();
-                  } finally {
-                    setIsDeleting(false);
-                  }
-                }}
-                isDeleting={isDeleting}
-                hideTrigger
-                externalOpen={deleteDialogOpen}
-                onExternalOpenChange={setDeleteDialogOpen}
-              />
-            )}
-          </>
-        ) : null}
-      </div>
-      <div className="flex min-w-0 flex-1 items-center gap-1.5">
-        {(isRunning || task.status === 'running') && (
-          <Spinner size="sm" className="h-3 w-3 flex-shrink-0 text-muted-foreground" />
-        )}
-        {isEditing ? (
-          <input
-            ref={inputRef}
-            type="text"
-            value={editValue}
-            onChange={(e) => setEditValue(e.target.value)}
-            onKeyDown={handleKeyDown}
-            onBlur={() => {
-              if (blurGuardRef.current) {
-                // Re-focus: blur was caused by context menu close/focus restoration
-                requestAnimationFrame(() => {
-                  inputRef.current?.focus();
-                });
-                return;
-              }
-              handleConfirmEdit();
-            }}
-            maxLength={MAX_TASK_NAME_LENGTH}
-            className="min-w-0 flex-1 rounded border border-border bg-background px-1.5 py-0.5 text-sm font-medium text-foreground outline-none focus:border-ring focus:ring-1 focus:ring-ring"
-            onClick={stopPropagation}
-            onMouseDown={stopPropagation}
-          />
-        ) : (
-          <>
-            {isPinned && (
-              <Pin
-                className="h-3 w-3 flex-shrink-0 cursor-pointer text-muted-foreground hover:text-foreground"
-                onClick={(e) => {
-                  e.stopPropagation();
-                  onPin?.();
-                }}
-              />
-            )}
-            <span className="block truncate text-sm font-medium text-foreground">{task.name}</span>
-          </>
-        )}
-        {showDirectBadge && task.useWorktree === false && (
-          <span
-            className="inline-flex items-center gap-0.5 rounded bg-muted px-0.5 py-0.5 text-xs font-medium text-muted-foreground"
-            title="Running directly on branch (no worktree isolation)"
-          >
-            <AlertCircle className="h-2.5 w-2.5" />
-            Direct
-          </span>
-        )}
-      </div>
-      <div className="flex flex-shrink-0 items-center">{rightBadge}</div>
-    </div>
-  );
-
-  // Wrap with context menu if rename, delete, archive, or pin is available
-  if (onRename || onDelete || onArchive || onPin) {
-    return (
-      <ContextMenu>
-        <ContextMenuTrigger asChild>{taskContent}</ContextMenuTrigger>
-        <ContextMenuContent>
-          {onPin && (
-            <ContextMenuItem
-              onClick={(e) => {
-                e.stopPropagation();
-                onPin();
-              }}
-            >
-              {isPinned ? (
-                <>
-                  <PinOff className="mr-2 h-3.5 w-3.5" />
-                  Unpin
-                </>
-              ) : (
-                <>
-                  <Pin className="mr-2 h-3.5 w-3.5" />
-                  Pin
-                </>
-              )}
-            </ContextMenuItem>
-          )}
-          {onRename && (
-            <ContextMenuItem
-              onClick={(e) => {
-                e.stopPropagation();
-                handleStartEdit();
-              }}
-            >
-              <Pencil className="mr-2 h-3.5 w-3.5" />
-              Rename
-            </ContextMenuItem>
-          )}
-          {primaryAction === 'delete' && onArchive && (
-            <ContextMenuItem
-              onClick={(e) => {
-                e.stopPropagation();
-                onArchive();
-              }}
-            >
-              <Archive className="mr-2 h-3.5 w-3.5" />
-              Archive
-            </ContextMenuItem>
-          )}
-          {primaryAction === 'archive' && onDelete && (
-            <ContextMenuItem
-              onClick={(e) => {
-                e.stopPropagation();
-                setDeleteDialogOpen(true);
-              }}
-            >
-              <Trash2 className="mr-2 h-3.5 w-3.5" />
-              Delete
-            </ContextMenuItem>
-          )}
-          {!onArchive && onDelete && (
-            <ContextMenuItem
-              onClick={(e) => {
-                e.stopPropagation();
-                onDelete();
-              }}
-            >
-              <Trash2 className="mr-2 h-3.5 w-3.5" />
-              Delete
-            </ContextMenuItem>
-          )}
-        </ContextMenuContent>
-      </ContextMenu>
-    );
-  }
-
-  return taskContent;
-};
diff --git a/src/renderer/components/TaskList.tsx b/src/renderer/components/TaskList.tsx
deleted file mode 100644
index 63970f8d44..0000000000
--- a/src/renderer/components/TaskList.tsx
+++ /dev/null
@@ -1,81 +0,0 @@
-import React from 'react';
-import { Button } from './ui/button';
-import { Card, CardContent, CardDescription, CardHeader, CardTitle } from './ui/card';
-import { Spinner } from './ui/spinner';
-import { GitBranch, Bot, Play, Pause, Plus } from 'lucide-react';
-
-interface Task {
-  id: string;
-  name: string;
-  branch: string;
-  path: string;
-  status: 'active' | 'idle' | 'running';
-}
-
-interface Props {
-  tasks: Task[];
-  activeTask: Task | null;
-  onSelectTask: (task: Task) => void;
-  onCreateTask: () => void;
-}
-
-export const TaskList: React.FC<Props> = ({ tasks, activeTask, onSelectTask, onCreateTask }) => {
-  const getStatusIcon = (status: string) => {
-    switch (status) {
-      case 'running':
-        return <Play className="h-4 w-4 text-green-500" />;
-      case 'idle':
-        return <Pause className="h-4 w-4 text-yellow-500" />;
-      default:
-        return <Bot className="h-4 w-4 text-blue-500" />;
-    }
-  };
-
-  return (
-    <div className="flex h-full flex-col p-4">
-      <div className="mb-4 flex items-center justify-between">
-        <h2 className="text-xl font-semibold">Tasks</h2>
-        <Button variant="default" size="sm" onClick={onCreateTask}>
-          <Plus className="mr-2 h-4 w-4" /> New
-        </Button>
-      </div>
-
-      {tasks.length === 0 ? (
-        <div className="flex h-full flex-col items-center justify-center text-muted-foreground">
-          <Bot className="mb-4 h-12 w-12" />
-          <p className="text-center">No tasks yet. Create one to get started!</p>
-        </div>
-      ) : (
-        <div className="flex-1 space-y-3 overflow-y-auto">
-          {tasks.map((task) => (
-            <Card
-              key={task.id}
-              className={`cursor-pointer transition-all duration-200 ${
-                activeTask?.id === task.id
-                  ? 'border-blue-500 ring-2 ring-blue-500'
-                  : 'border-border hover:border-border dark:border-border dark:hover:border-border'
-              }`}
-              onClick={() => onSelectTask(task)}
-            >
-              <CardHeader className="p-4">
-                <CardTitle className="flex items-center text-lg">
-                  {getStatusIcon(task.status)}
-                  <span className="ml-2">{task.name}</span>
-                </CardTitle>
-                <CardDescription className="mt-1 flex items-center text-sm text-muted-foreground">
-                  <GitBranch className="mr-1 h-3 w-3" />
-                  <code className="font-mono text-xs">{task.branch}</code>
-                </CardDescription>
-              </CardHeader>
-              <CardContent className="p-4 pt-0 text-xs text-muted-foreground">
-                <p className="capitalize">Status: {task.status}</p>
-              </CardContent>
-            </Card>
-          ))}
-        </div>
-      )}
-    </div>
-  );
-};
-
-export default TaskList;
diff --git a/src/renderer/components/TaskModal.tsx b/src/renderer/components/TaskModal.tsx
deleted file mode 100644
index 9a807de30e..0000000000
--- a/src/renderer/components/TaskModal.tsx
+++ /dev/null
@@ -1,470 +0,0 @@
-import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
-import { Button } from './ui/button';
-import {
-  DialogContent,
-  DialogDescription,
-  DialogHeader,
-  DialogTitle,
-  DialogFooter,
-} from './ui/dialog';
-import type { BaseModalProps } from '@/contexts/ModalProvider';
-import { SlugInput } from './ui/slug-input';
-import { Label } from './ui/label';
-import { Separator } from './ui/separator';
-import { MultiAgentDropdown } from './MultiAgentDropdown';
-import { TaskAdvancedSettings } from './TaskAdvancedSettings';
-import { useIntegrationStatus } from './hooks/useIntegrationStatus';
-import { type Agent } from '../types';
-import { type AgentRun } from '../types/chat';
-import { agentMeta } from '../providers/meta';
-import { isValidProviderId } from '@shared/providers/registry';
-import { type LinearIssueSummary } from '../types/linear';
-import { type GitHubIssueSummary } from '../types/github';
-import { type JiraIssueSummary } from '../types/jira';
-import { type GitLabIssueSummary } from '../types/gitlab';
-import {
-  generateFriendlyTaskName,
-  normalizeTaskName,
-  MAX_TASK_NAME_LENGTH,
-} from '../lib/taskNames';
-import BranchSelect from './BranchSelect';
-import { generateTaskNameFromContext } from '../lib/branchNameGenerator';
-import { useProjectManagementContext } from '../contexts/ProjectManagementProvider';
-import { useTaskManagementContext } from '../contexts/TaskManagementContext';
-import { rpc } from '@/lib/rpc';
-
-const DEFAULT_AGENT: Agent = 'claude';
-
-export interface CreateTaskResult {
-  name: string;
-  initialPrompt?: string;
-  agentRuns?: AgentRun[];
-  linkedLinearIssue?: LinearIssueSummary | null;
-  linkedGithubIssue?: GitHubIssueSummary | null;
-  linkedJiraIssue?: JiraIssueSummary | null;
-  autoApprove?: boolean;
-  useWorktree?: boolean;
-  baseRef?: string;
-  nameGenerated?: boolean;
-}
-
-interface TaskModalProps {
-  onClose: () => void;
-  onCreateTask: (
-    name: string,
-    initialPrompt?: string,
-    agentRuns?: AgentRun[],
-    linkedLinearIssue?: LinearIssueSummary | null,
-    linkedGithubIssue?: GitHubIssueSummary | null,
-    linkedJiraIssue?: JiraIssueSummary | null,
-    autoApprove?: boolean,
-    useWorktree?: boolean,
-    baseRef?: string,
-    nameGenerated?: boolean
-  ) => void;
-}
-
-export type TaskModalOverlayProps = BaseModalProps<CreateTaskResult>;
-
-export function TaskModalOverlay({ onSuccess, onClose }: TaskModalOverlayProps) {
-  return (
-    <TaskModal
-      onClose={onClose}
-      onCreateTask={(
-        name,
-        initialPrompt,
-        agentRuns,
-        linkedLinearIssue,
-        linkedGithubIssue,
-        linkedJiraIssue,
-        autoApprove,
-        useWorktree,
-        baseRef,
-        nameGenerated
-      ) =>
-        onSuccess({
-          name,
-          initialPrompt,
-          agentRuns,
-          linkedLinearIssue,
-          linkedGithubIssue,
-          linkedJiraIssue,
-          autoApprove,
-          useWorktree,
-          baseRef,
-          nameGenerated,
-        })
-      }
-    />
-  );
-}
-
-const TaskModal: React.FC<TaskModalProps> = ({ onClose, onCreateTask }) => {
-  const {
-    selectedProject,
-    projectDefaultBranch: defaultBranch,
-    projectBranchOptions: branchOptions,
-    isLoadingBranches,
-    refreshBranches,
-  } = useProjectManagementContext();
-  const { linkedGithubIssueMap } = useTaskManagementContext();
-
-  const projectName = selectedProject?.name || '';
-  const existingNames = (selectedProject?.tasks || []).map((w) => w.name);
-  const projectPath = selectedProject?.path;
-  // Form state
-  const [taskName, setTaskName] = useState('');
-  const [agentRuns, setAgentRuns] = useState<AgentRun[]>([{ agent: DEFAULT_AGENT, runs: 1 }]);
-  const [error, setError] = useState<string | null>(null);
-  const [touched, setTouched] = useState(false);
-  const [isFocused, setIsFocused] = useState(false);
-
-  // Advanced settings state
-  const [initialPrompt, setInitialPrompt] = useState('');
-  const [selectedLinearIssue, setSelectedLinearIssue] = useState<LinearIssueSummary | null>(null);
-  const [selectedGithubIssue, setSelectedGithubIssue] = useState<GitHubIssueSummary | null>(null);
-  const [selectedJiraIssue, setSelectedJiraIssue] = useState<JiraIssueSummary | null>(null);
-  const [selectedGitlabIssue, setSelectedGitlabIssue] = useState<GitLabIssueSummary | null>(null);
-  const [autoApprove, setAutoApprove] = useState(false);
-  const [useWorktree, setUseWorktree] = useState(true);
-
-  // Branch selection state - sync with defaultBranch unless user manually changed it
-  const [selectedBranch, setSelectedBranch] = useState(defaultBranch);
-  const userChangedBranchRef = useRef(false);
-  const taskNameInputRef = useRef<HTMLInputElement>(null);
-
-  useEffect(() => {
-    if (!userChangedBranchRef.current) {
-      setSelectedBranch(defaultBranch);
-    }
-  }, [defaultBranch]);
-
-  const handleBranchChange = (value: string) => {
-    setSelectedBranch(value);
-    userChangedBranchRef.current = true;
-  };
-
-  // Auto-name tracking
-  const [autoGeneratedName, setAutoGeneratedName] = useState('');
-  const [autoGenerateName, setAutoGenerateName] = useState(true);
-  const userHasTypedRef = useRef(false);
-  const autoNameInitializedRef = useRef(false);
-  const customNameTrackedRef = useRef(false);
-  // True when the name was derived from context (prompt/issue) — already descriptive
-  const nameFromContextRef = useRef(false);
-
-  // Integration connections — always active since component only mounts when open
-  const integrations = useIntegrationStatus(true);
-
-  // Computed values
-  const activeAgents = useMemo(() => agentRuns.map((ar) => ar.agent), [agentRuns]);
-  const hasAutoApproveSupport = activeAgents.every((id) => !!agentMeta[id]?.autoApproveFlag);
-  const hasInitialPromptSupport = activeAgents.every(
-    (id) => agentMeta[id]?.initialPromptFlag !== undefined
-  );
-
-  const normalizedExisting = useMemo(
-    () => existingNames.map((n) => normalizeTaskName(n)).filter(Boolean),
-    [existingNames]
-  );
-
-  // Validation — empty name is allowed (will auto-generate a random fallback)
-  const validate = useCallback(
-    (value: string): string | null => {
-      const normalized = normalizeTaskName(value);
-      if (!normalized) return null; // Empty is OK — will generate a random name
-      if (normalizedExisting.includes(normalized)) return 'A Task with this name already exists.';
-      if (normalized.length > MAX_TASK_NAME_LENGTH)
-        return `Task name is too long (max ${MAX_TASK_NAME_LENGTH} characters).`;
-      return null;
-    },
-    [normalizedExisting]
-  );
-
-  // Clear issues when provider doesn't support them
-  useEffect(() => {
-    if (!hasInitialPromptSupport) {
-      setSelectedLinearIssue(null);
-      setSelectedGithubIssue(null);
-      setSelectedJiraIssue(null);
-      setSelectedGitlabIssue(null);
-      setInitialPrompt('');
-    }
-  }, [hasInitialPromptSupport]);
-
-  // Clear auto-approve if not supported
-  useEffect(() => {
-    if (!hasAutoApproveSupport && autoApprove) setAutoApprove(false);
-  }, [hasAutoApproveSupport, autoApprove]);
-
-  // Reset form and load settings on mount
-  useEffect(() => {
-    void refreshBranches();
-    // Reset state
-    setTaskName('');
-    setAutoGeneratedName('');
-    setError(null);
-    setTouched(false);
-    setIsFocused(false);
-    setInitialPrompt('');
-    setSelectedLinearIssue(null);
-    setSelectedGithubIssue(null);
-    setSelectedJiraIssue(null);
-    setSelectedGitlabIssue(null);
-    setAutoApprove(false);
-    setUseWorktree(true);
-    userHasTypedRef.current = false;
-    autoNameInitializedRef.current = false;
-    customNameTrackedRef.current = false;
-    nameFromContextRef.current = false;
-    userChangedBranchRef.current = false;
-    setSelectedBranch(defaultBranch);
-
-    // Generate initial name
-    const suggested = generateFriendlyTaskName(normalizedExisting);
-    setAutoGeneratedName(suggested);
-    setTaskName(suggested);
-    setError(validate(suggested));
-    autoNameInitializedRef.current = true;
-
-    // Load settings
-    let cancel = false;
-    rpc.appSettings.get().then((settings) => {
-      if (cancel) return;
-
-      const settingsAgent = settings?.defaultProvider;
-      const agent: Agent = isValidProviderId(settingsAgent)
-        ? (settingsAgent as Agent)
-        : DEFAULT_AGENT;
-      setAgentRuns([{ agent, runs: 1 }]);
-
-      const autoApproveByDefault = settings?.tasks?.autoApproveByDefault ?? false;
-      setAutoApprove(autoApproveByDefault && !!agentMeta[agent]?.autoApproveFlag);
-
-      // Handle auto-generate setting
-      const shouldAutoGenerate = settings?.tasks?.autoGenerateName !== false;
-      setAutoGenerateName(shouldAutoGenerate);
-      if (!shouldAutoGenerate && !userHasTypedRef.current) {
-        setAutoGeneratedName('');
-        setTaskName('');
-        setError(null);
-      }
-    });
-
-    return () => {
-      cancel = true;
-    };
-  }, []);
-
-  // Auto-generate name from context (prompt / linked issue) with debounce
-  useEffect(() => {
-    if (!autoGenerateName || userHasTypedRef.current) return;
-
-    // Immediate for issue linking, debounced for typed prompts
-    const hasIssue = !!(selectedLinearIssue || selectedGithubIssue || selectedJiraIssue);
-    const delay = hasIssue ? 0 : 400;
-
-    const timer = setTimeout(() => {
-      if (userHasTypedRef.current) return;
-      const generated = generateTaskNameFromContext({
-        initialPrompt: initialPrompt || null,
-        linearIssue: selectedLinearIssue,
-        githubIssue: selectedGithubIssue,
-        jiraIssue: selectedJiraIssue,
-      });
-      if (generated) {
-        nameFromContextRef.current = true;
-        setAutoGeneratedName(generated);
-        setTaskName(generated);
-        setError(validate(generated));
-      }
-    }, delay);
-
-    return () => clearTimeout(timer);
-  }, [
-    autoGenerateName,
-    initialPrompt,
-    selectedLinearIssue,
-    selectedGithubIssue,
-    selectedJiraIssue,
-    validate,
-  ]);
-
-  const handleNameChange = (val: string) => {
-    setTaskName(val);
-    setError(validate(val));
-    userHasTypedRef.current = true;
-
-    // Track custom naming for telemetry (only once per session)
-    if (
-      autoGeneratedName &&
-      val !== autoGeneratedName &&
-      val.trim() &&
-      !customNameTrackedRef.current
-    ) {
-      customNameTrackedRef.current = true;
-      void (async () => {
-        const { captureTelemetry } = await import('../lib/telemetryClient');
-        captureTelemetry('task_custom_named', { custom_name: 'true' });
-      })();
-    }
-  };
-
-  const handleSubmit = async (e: React.FormEvent) => {
-    e.preventDefault();
-    setTouched(true);
-
-    const err = validate(taskName);
-    if (err) {
-      setError(err);
-      return;
-    }
-
-    // Determine the final task name and whether it should be eligible for
-    // post-creation auto-rename (nameGenerated flag).
-    let finalName = normalizeTaskName(taskName);
-    let isNameGenerated = false;
-    if (!finalName) {
-      // No name at all — use a random fallback; mark for post-creation rename
-      finalName = generateFriendlyTaskName(normalizedExisting);
-      isNameGenerated = true;
-    } else if (!userHasTypedRef.current && !nameFromContextRef.current) {
-      // User never touched the name field AND the name wasn't derived from
-      // context (prompt/issue) — it's still a random fallback name.
-      // Mark for post-creation rename so the first terminal message can improve it.
-      isNameGenerated = true;
-    }
-    // When the name was auto-generated from context (prompt/issue),
-    // it's already descriptive — don't mark it for post-creation rename.
-
-    // Close modal immediately - task creation happens in background
-    // The task will appear in sidebar via optimistic UI update
-    onClose();
-
-    // Fire and forget - don't await
-    try {
-      onCreateTask(
-        finalName,
-        hasInitialPromptSupport && initialPrompt.trim() ? initialPrompt.trim() : undefined,
-        agentRuns,
-        selectedLinearIssue,
-        selectedGithubIssue,
-        selectedJiraIssue,
-        hasAutoApproveSupport ? autoApprove : false,
-        useWorktree,
-        selectedBranch,
-        isNameGenerated
-      );
-    } catch (error) {
-      console.error('Failed to create task:', error);
-    }
-  };
-
-  const handleOpenAutoFocus = useCallback((event: Event) => {
-    event.preventDefault();
-    taskNameInputRef.current?.focus({ preventScroll: true });
-  }, []);
-
-  return (
-    <DialogContent
-      className="max-h-[calc(100vh-48px)] max-w-md overflow-visible"
-      onOpenAutoFocus={handleOpenAutoFocus}
-    >
-      <DialogHeader>
-        <DialogTitle>New Task</DialogTitle>
-        <DialogDescription className="text-xs">
-          Create a task and open the agent workspace.
-        </DialogDescription>
-        <div className="space-y-1 pt-1">
-          <p className="text-sm font-medium text-foreground">{projectName}</p>
-          <div className="flex items-center gap-1.5">
-            <span className="text-xs text-muted-foreground">from</span>
-            {branchOptions.length > 0 ? (
-              <BranchSelect
-                value={selectedBranch}
-                onValueChange={handleBranchChange}
-                options={branchOptions}
-                isLoading={isLoadingBranches}
-                variant="ghost"
-              />
-            ) : (
-              <span className="text-xs text-muted-foreground">
-                {isLoadingBranches ? 'Loading...' : selectedBranch || defaultBranch}
-              </span>
-            )}
-          </div>
-        </div>
-      </DialogHeader>
-
-      <Separator />
-
-      <form onSubmit={handleSubmit} className="space-y-4">
-        <div>
-          <Label htmlFor="task-name" className="mb-2 block">
-            Task name (optional)
-          </Label>
-          <SlugInput
-            ref={taskNameInputRef}
-            id="task-name"
-            value={taskName}
-            onChange={handleNameChange}
-            onFocus={() => setIsFocused(true)}
-            onBlur={() => {
-              setTouched(true);
-              setIsFocused(false);
-            }}
-            placeholder="refactor-api-routes"
-            maxLength={MAX_TASK_NAME_LENGTH}
-            className={`w-full ${touched && error && !isFocused ? 'border-destructive focus-visible:border-destructive focus-visible:ring-destructive' : ''}`}
-            aria-invalid={touched && !!error && !isFocused}
-          />
-        </div>
-
-        <div className="flex items-center gap-4">
-          <Label className="shrink-0">Agent</Label>
-          <MultiAgentDropdown agentRuns={agentRuns} onChange={setAgentRuns} />
-        </div>
-
-        <TaskAdvancedSettings
-          isOpen={true}
-          projectPath={projectPath}
-          useWorktree={useWorktree}
-          onUseWorktreeChange={setUseWorktree}
-          autoApprove={autoApprove}
-          onAutoApproveChange={setAutoApprove}
-          hasAutoApproveSupport={hasAutoApproveSupport}
-          initialPrompt={initialPrompt}
-          onInitialPromptChange={setInitialPrompt}
-          hasInitialPromptSupport={hasInitialPromptSupport}
-          selectedLinearIssue={selectedLinearIssue}
-          onLinearIssueChange={setSelectedLinearIssue}
-          isLinearConnected={integrations.isLinearConnected}
-          onLinearConnect={integrations.handleLinearConnect}
-          selectedGithubIssue={selectedGithubIssue}
-          onGithubIssueChange={setSelectedGithubIssue}
-          linkedGithubIssueMap={linkedGithubIssueMap}
-          isGithubConnected={integrations.isGithubConnected}
-          onGithubConnect={integrations.handleGithubConnect}
-          githubLoading={integrations.githubLoading}
-          githubInstalled={integrations.githubInstalled}
-          selectedJiraIssue={selectedJiraIssue}
-          onJiraIssueChange={setSelectedJiraIssue}
-          isJiraConnected={integrations.isJiraConnected}
-          onJiraConnect={integrations.handleJiraConnect}
-          selectedGitlabIssue={selectedGitlabIssue}
-          onGitlabIssueChange={setSelectedGitlabIssue}
-          isGitlabConnected={integrations.isGitlabConnected}
-          onGitlabConnect={integrations.handleGitlabConnect}
-        />
-
-        <DialogFooter>
-          <Button type="submit" disabled={!!error}>
-            Create
-          </Button>
-        </DialogFooter>
-      </form>
-    </DialogContent>
-  );
-};
-
-export default TaskModal;
diff --git a/src/renderer/components/TaskScopeContext.tsx b/src/renderer/components/TaskScopeContext.tsx
deleted file mode 100644
index 066b56cc02..0000000000
--- a/src/renderer/components/TaskScopeContext.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-import React, { createContext, useContext } from 'react';
-
-export type TaskScope = {
-  taskId?: string;
-  taskPath?: string;
-  projectPath?: string | null;
-};
-
-const TaskScopeContext = createContext<TaskScope | null>(null);
-
-export const TaskScopeProvider: React.FC<{
-  value: TaskScope;
-  children: React.ReactNode;
-}> = ({ value, children }) => {
-  return <TaskScopeContext.Provider value={value}>{children}</TaskScopeContext.Provider>;
-};
-
-export function useTaskScope(): TaskScope {
-  return useContext(TaskScopeContext) ?? {};
-}
diff --git a/src/renderer/components/TaskSettingsCard.tsx b/src/renderer/components/TaskSettingsCard.tsx
deleted file mode 100644
index 3dcdd19cd0..0000000000
--- a/src/renderer/components/TaskSettingsCard.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-import React from 'react';
-import { useTaskSettings } from '../hooks/useTaskSettings';
-import {
-  AutoApproveByDefaultRow,
-  AutoGenerateTaskNamesRow,
-  AutoTrustWorktreesRow,
-} from './TaskSettingsRows';
-
-const TaskSettingsCard: React.FC = () => {
-  const taskSettings = useTaskSettings();
-  return (
-    <div className="flex flex-col gap-4">
-      <AutoGenerateTaskNamesRow taskSettings={taskSettings} />
-      <AutoApproveByDefaultRow taskSettings={taskSettings} />
-      <AutoTrustWorktreesRow taskSettings={taskSettings} />
-    </div>
-  );
-};
-
-export default TaskSettingsCard;
diff --git a/src/renderer/components/TaskSettingsRows.tsx b/src/renderer/components/TaskSettingsRows.tsx
deleted file mode 100644
index 40ecb1329b..0000000000
--- a/src/renderer/components/TaskSettingsRows.tsx
+++ /dev/null
@@ -1,125 +0,0 @@
-import React from 'react';
-import { Info } from 'lucide-react';
-import { Switch } from './ui/switch';
-import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from './ui/tooltip';
-import { agentMeta } from '../providers/meta';
-import type { TaskSettingsModel } from '../hooks/useTaskSettings';
-
-const SUPPORTED_AUTO_APPROVE_AGENTS = Object.values(agentMeta)
-  .filter((meta) => Boolean(meta.autoApproveFlag))
-  .map((meta) => meta.label)
-  .sort((a, b) => a.localeCompare(b))
-  .join(', ');
-
-interface RowProps {
-  taskSettings: TaskSettingsModel;
-}
-
-export const AutoGenerateTaskNamesRow: React.FC<RowProps> = ({ taskSettings }) => {
-  const showError =
-    Boolean(taskSettings.error) &&
-    (taskSettings.errorScope === 'autoGenerateName' || taskSettings.errorScope === 'load');
-
-  return (
-    <div className="flex flex-col gap-1.5">
-      <div className="flex items-center justify-between gap-4">
-        <div className="flex flex-1 flex-col gap-0.5">
-          <p className="text-sm font-medium text-foreground">Auto-generate task names</p>
-          <p className="text-sm text-muted-foreground">
-            Automatically suggests a task name when creating a new task.
-          </p>
-        </div>
-        <Switch
-          checked={taskSettings.autoGenerateName}
-          disabled={taskSettings.loading || taskSettings.saving}
-          onCheckedChange={taskSettings.updateAutoGenerateName}
-        />
-      </div>
-      {showError ? <p className="text-xs text-destructive">{taskSettings.error}</p> : null}
-    </div>
-  );
-};
-
-export const AutoApproveByDefaultRow: React.FC<RowProps> = ({ taskSettings }) => {
-  const showError =
-    Boolean(taskSettings.error) && taskSettings.errorScope === 'autoApproveByDefault';
-
-  return (
-    <div className="flex flex-col gap-1.5">
-      <div className="flex items-center justify-between gap-4">
-        <div className="flex flex-1 flex-col gap-0.5">
-          <div className="flex items-center gap-1.5">
-            <p className="text-sm font-medium text-foreground">Auto-approve by default</p>
-            <TooltipProvider delayDuration={150}>
-              <Tooltip>
-                <TooltipTrigger asChild>
-                  <button
-                    type="button"
-                    className="inline-flex h-4 w-4 items-center justify-center text-muted-foreground hover:text-foreground"
-                    aria-label="Show supported agents for auto-approve"
-                  >
-                    <Info className="h-3.5 w-3.5" />
-                  </button>
-                </TooltipTrigger>
-                <TooltipContent side="top" className="max-w-xs text-xs">
-                  Supported by: {SUPPORTED_AUTO_APPROVE_AGENTS}
-                </TooltipContent>
-              </Tooltip>
-            </TooltipProvider>
-          </div>
-          <p className="text-sm text-muted-foreground">
-            Skips permission prompts for file operations in new tasks.
-          </p>
-        </div>
-        <Switch
-          checked={taskSettings.autoApproveByDefault}
-          disabled={taskSettings.loading || taskSettings.saving}
-          onCheckedChange={taskSettings.updateAutoApproveByDefault}
-        />
-      </div>
-      {showError ? <p className="text-xs text-destructive">{taskSettings.error}</p> : null}
-    </div>
-  );
-};
-
-export const AutoTrustWorktreesRow: React.FC<RowProps> = ({ taskSettings }) => {
-  const showError = Boolean(taskSettings.error) && taskSettings.errorScope === 'autoTrustWorktrees';
-
-  return (
-    <div className="flex flex-col gap-1.5">
-      <div className="flex items-center justify-between gap-4">
-        <div className="flex flex-1 flex-col gap-0.5">
-          <div className="flex items-center gap-1.5">
-            <p className="text-sm font-medium text-foreground">Auto-trust worktree directories</p>
-            <TooltipProvider delayDuration={150}>
-              <Tooltip>
-                <TooltipTrigger asChild>
-                  <button
-                    type="button"
-                    className="inline-flex h-4 w-4 items-center justify-center text-muted-foreground hover:text-foreground"
-                    aria-label="More info about auto-trust worktrees"
-                  >
-                    <Info className="h-3.5 w-3.5" />
-                  </button>
-                </TooltipTrigger>
-                <TooltipContent side="top" className="max-w-xs text-xs">
-                  Only applies to Claude Code. Writes trust entries to ~/.claude.json before
-                  launching.
-                </TooltipContent>
-              </Tooltip>
-            </TooltipProvider>
-          </div>
-          <p className="text-sm text-muted-foreground">
-            Skip the folder trust prompt in Claude Code for new tasks.
-          </p>
-        </div>
-        <Switch
-          checked={taskSettings.autoTrustWorktrees}
-          disabled={taskSettings.loading || taskSettings.saving}
-          onCheckedChange={taskSettings.updateAutoTrustWorktrees}
-        />
-      </div>
-      {showError ? <p className="text-xs text-destructive">{taskSettings.error}</p> : null}
-    </div>
-  );
-};
diff --git a/src/renderer/components/TaskTerminalPanel.tsx b/src/renderer/components/TaskTerminalPanel.tsx
deleted file mode 100644
index 9ec25b4a8b..0000000000
--- a/src/renderer/components/TaskTerminalPanel.tsx
+++ /dev/null
@@ -1,712 +0,0 @@
-import React, { useMemo, useState, useEffect, useCallback, useRef } from 'react';
-import { TerminalPane } from './TerminalPane';
-import { Bot, Plus, Play, Square, X } from 'lucide-react';
-import { useTheme } from '../hooks/useTheme';
-import { useTaskTerminals } from '@/lib/taskTerminalsStore';
-import { useTerminalSelection } from '../hooks/useTerminalSelection';
-import { cn } from '@/lib/utils';
-import { TooltipProvider, Tooltip, TooltipTrigger, TooltipContent } from './ui/tooltip';
-import { Button } from './ui/button';
-import {
-  Select,
-  SelectContent,
-  SelectGroup,
-  SelectItem,
-  SelectTrigger,
-  SelectValue,
-} from './ui/select';
-import type { Agent } from '../types';
-import { getTaskEnvVars } from '@shared/task/envVars';
-import {
-  type LifecycleLogs,
-  type LifecyclePhase,
-  MAX_LIFECYCLE_LOG_LINES,
-  formatLifecycleLogLine,
-} from '@shared/lifecycle';
-import { shouldDisablePlay } from '../lib/lifecycleUi';
-
-interface Task {
-  id: string;
-  name: string;
-  branch: string;
-  path: string;
-  status: 'active' | 'idle' | 'running';
-}
-
-interface Props {
-  task: Task | null;
-  agent?: Agent;
-  className?: string;
-  projectPath?: string;
-  remote?: {
-    connectionId: string;
-    projectPath?: string;
-  };
-  defaultBranch?: string;
-  portSeed?: string;
-}
-
-type LifecyclePhaseStatus = 'idle' | 'running' | 'succeeded' | 'failed';
-
-const TaskTerminalPanelComponent: React.FC<Props> = ({
-  task,
-  agent,
-  className,
-  projectPath,
-  remote,
-  defaultBranch,
-  portSeed,
-}) => {
-  const { effectiveTheme } = useTheme();
-
-  // Use path in the key to differentiate multi-agent variants that share the same task.id
-  const taskKey = task ? `${task.id}::${task.path}` : 'task-placeholder';
-  const taskTerminals = useTaskTerminals(taskKey, task?.path);
-  // Global terminals are scoped per variant (or project when no task) so each
-  // agent worktree gets its own global terminal and simultaneous variants don't conflict.
-  const globalKey = task?.path ? `global::${task.path}` : `global::${projectPath}`;
-  const globalTerminals = useTaskTerminals(globalKey, projectPath, { defaultCwd: projectPath });
-
-  const selection = useTerminalSelection({ task, taskTerminals, globalTerminals });
-
-  const terminalRefs = useRef<Map<string, { focus: () => void }>>(new Map());
-  const setTerminalRef = useCallback((id: string, ref: { focus: () => void } | null) => {
-    if (ref) {
-      terminalRefs.current.set(id, ref);
-    } else {
-      terminalRefs.current.delete(id);
-    }
-  }, []);
-
-  // Small delay to ensure the terminal pane has rendered after visibility change
-  useEffect(() => {
-    const id = selection.activeTerminalId;
-    if (!id) return;
-    const timer = setTimeout(() => {
-      terminalRefs.current.get(id)?.focus();
-    }, 50);
-    return () => clearTimeout(timer);
-  }, [selection.activeTerminalId]);
-
-  const [runStatus, setRunStatus] = useState<LifecyclePhaseStatus>('idle');
-  const [setupStatus, setSetupStatus] = useState<LifecyclePhaseStatus>('idle');
-  const [teardownStatus, setTeardownStatus] = useState<LifecyclePhaseStatus>('idle');
-  const [runActionBusy, setRunActionBusy] = useState(false);
-  const activeTaskIdRef = useRef<string | null>(task?.id ?? null);
-  const [lifecycleLogs, setLifecycleLogs] = useState<LifecycleLogs>({
-    setup: [],
-    run: [],
-    teardown: [],
-  });
-
-  const taskEnv = useMemo(() => {
-    if (!task || !task.path || !projectPath) return undefined;
-    return getTaskEnvVars({
-      taskId: task.id,
-      taskName: task.name,
-      taskPath: task.path,
-      projectPath,
-      defaultBranch,
-      portSeed,
-    });
-  }, [task?.id, task?.name, task?.path, projectPath, defaultBranch, portSeed]);
-
-  useEffect(() => {
-    activeTaskIdRef.current = task?.id ?? null;
-  }, [task?.id]);
-
-  const refreshLifecycleState = useCallback(async () => {
-    const taskId = task?.id;
-    if (!taskId) return;
-    const api = window.electronAPI as any;
-    if (typeof api?.lifecycleGetState !== 'function') return;
-    try {
-      const res = await api.lifecycleGetState({ taskId });
-      if (activeTaskIdRef.current !== taskId) return;
-      if (!res?.success || !res.state) return;
-      if (res.state.run?.status) setRunStatus(res.state.run.status);
-      if (res.state.setup?.status) setSetupStatus(res.state.setup.status);
-      if (res.state.teardown?.status) setTeardownStatus(res.state.teardown.status);
-
-      // Restore buffered logs from the main process
-      if (typeof api?.lifecycleGetLogs === 'function') {
-        const logsRes = await api.lifecycleGetLogs({ taskId });
-        if (activeTaskIdRef.current !== taskId) return;
-        if (logsRes?.success && logsRes.logs) {
-          setLifecycleLogs(logsRes.logs);
-        }
-      }
-    } catch {}
-  }, [task?.id]);
-
-  useEffect(() => {
-    setRunStatus('idle');
-    setSetupStatus('idle');
-    setTeardownStatus('idle');
-    setRunActionBusy(false);
-    setLifecycleLogs({ setup: [], run: [], teardown: [] });
-    if (!task) return;
-
-    const api = window.electronAPI as any;
-    let cancelled = false;
-
-    void refreshLifecycleState();
-
-    if (typeof api?.onLifecycleEvent !== 'function') {
-      return () => {
-        cancelled = true;
-      };
-    }
-
-    const off = api.onLifecycleEvent((evt: any) => {
-      if (!evt || evt.taskId !== task.id) return;
-      const phase =
-        evt.phase === 'setup' || evt.phase === 'run' || evt.phase === 'teardown'
-          ? (evt.phase as LifecyclePhase)
-          : null;
-      if (phase) {
-        const line = formatLifecycleLogLine(phase, evt.status, evt);
-        if (line !== null) {
-          setLifecycleLogs((prev) => ({
-            ...prev,
-            [phase]: [...prev[phase], line].slice(-MAX_LIFECYCLE_LOG_LINES),
-          }));
-        }
-      }
-
-      if (evt.phase === 'setup') {
-        if (evt.status === 'starting') setSetupStatus('running');
-        if (evt.status === 'done') setSetupStatus('succeeded');
-        if (evt.status === 'error') setSetupStatus('failed');
-        return;
-      }
-      if (evt.phase === 'teardown') {
-        if (evt.status === 'starting') setTeardownStatus('running');
-        if (evt.status === 'done') setTeardownStatus('succeeded');
-        if (evt.status === 'error') setTeardownStatus('failed');
-        return;
-      }
-      if (evt.phase !== 'run') return;
-      if (evt.status === 'starting') {
-        setRunStatus('running');
-        return;
-      }
-      if (evt.status === 'error') {
-        setRunStatus('failed');
-        return;
-      }
-      if (evt.status === 'exit') {
-        void (async () => {
-          if (cancelled) return;
-          const apiInner = window.electronAPI as any;
-          if (typeof apiInner?.lifecycleGetState === 'function') {
-            try {
-              const res = await apiInner.lifecycleGetState({ taskId: task.id });
-              if (!cancelled && res?.success && res.state?.run?.status) {
-                setRunStatus(res.state.run.status);
-                return;
-              }
-            } catch {}
-          }
-          if (cancelled) return;
-          if (evt.exitCode === 0) setRunStatus('succeeded');
-          else if (typeof evt.exitCode === 'number') setRunStatus('failed');
-          else setRunStatus('idle');
-        })();
-      }
-    });
-
-    return () => {
-      cancelled = true;
-      off?.();
-    };
-  }, [task?.id, refreshLifecycleState]);
-
-  // Auto-switch dropdown to Run when the run phase first starts.
-  const prevRunStatusRef = useRef(runStatus);
-  useEffect(() => {
-    const wasRunning = prevRunStatusRef.current === 'running';
-    prevRunStatusRef.current = runStatus;
-    if (runStatus === 'running' && !wasRunning) {
-      selection.onChange('lifecycle::run');
-    }
-  }, [runStatus, selection.onChange]);
-
-  const totalTerminals = taskTerminals.terminals.length + globalTerminals.terminals.length;
-
-  const canStartRun =
-    !!task &&
-    !!projectPath &&
-    !runActionBusy &&
-    runStatus !== 'running' &&
-    setupStatus !== 'running' &&
-    setupStatus !== 'failed';
-
-  const isRunSelection = !selection.selectedLifecycle || selection.selectedLifecycle === 'run';
-  const selectedTerminalScope = useMemo(() => {
-    if (selection.parsed?.mode === 'task') return 'WORKTREE';
-    if (selection.parsed?.mode === 'global') return 'GLOBAL';
-    return null;
-  }, [selection.parsed?.mode]);
-
-  const handlePlay = useCallback(async () => {
-    if (!task || !projectPath) return;
-    const api = window.electronAPI as any;
-    setRunActionBusy(true);
-    try {
-      if (selection.selectedLifecycle === 'setup') {
-        await api.lifecycleSetup?.({
-          taskId: task.id,
-          taskPath: task.path,
-          projectPath,
-          taskName: task.name,
-        });
-      } else if (selection.selectedLifecycle === 'teardown') {
-        await api.lifecycleTeardown?.({
-          taskId: task.id,
-          taskPath: task.path,
-          projectPath,
-          taskName: task.name,
-        });
-      } else {
-        await api.lifecycleRunStart?.({
-          taskId: task.id,
-          taskPath: task.path,
-          projectPath,
-          taskName: task.name,
-        });
-      }
-    } catch (error) {
-      console.error('Failed lifecycle play action:', error);
-    } finally {
-      setRunActionBusy(false);
-      void refreshLifecycleState();
-    }
-  }, [
-    task?.id,
-    task?.name,
-    task?.path,
-    projectPath,
-    selection.selectedLifecycle,
-    refreshLifecycleState,
-  ]);
-
-  const handleStop = useCallback(async () => {
-    if (!task) return;
-    const api = window.electronAPI as any;
-    setRunActionBusy(true);
-    try {
-      await api.lifecycleRunStop?.({ taskId: task.id });
-    } catch (error) {
-      console.error('Failed to stop run phase:', error);
-    } finally {
-      setRunActionBusy(false);
-      void refreshLifecycleState();
-    }
-  }, [task?.id, refreshLifecycleState]);
-
-  const [nativeTheme, setNativeTheme] = useState<{
-    background?: string;
-    foreground?: string;
-    cursor?: string;
-    cursorAccent?: string;
-    selectionBackground?: string;
-    black?: string;
-    red?: string;
-    green?: string;
-    yellow?: string;
-    blue?: string;
-    magenta?: string;
-    cyan?: string;
-    white?: string;
-    brightBlack?: string;
-    brightRed?: string;
-    brightGreen?: string;
-    brightYellow?: string;
-    brightBlue?: string;
-    brightMagenta?: string;
-    brightCyan?: string;
-    brightWhite?: string;
-  } | null>(null);
-
-  useEffect(() => {
-    void (async () => {
-      try {
-        const result = await window.electronAPI.terminalGetTheme();
-        if (result?.ok && result.config?.theme) setNativeTheme(result.config.theme);
-      } catch (error) {
-        console.warn('Failed to load native terminal theme', error);
-      }
-    })();
-  }, []);
-
-  const defaultTheme = useMemo(() => {
-    const isMistral = agent === 'mistral';
-    const darkBackground = isMistral ? '#202938' : '#1e1e1e';
-    const blackBackground = isMistral ? '#141820' : '#000000';
-
-    return effectiveTheme === 'dark' || effectiveTheme === 'dark-black'
-      ? {
-          background: effectiveTheme === 'dark-black' ? blackBackground : darkBackground,
-          foreground: '#d4d4d4',
-          cursor: '#aeafad',
-          cursorAccent: effectiveTheme === 'dark-black' ? blackBackground : darkBackground,
-          selectionBackground: 'rgba(96, 165, 250, 0.35)',
-          selectionForeground: '#f9fafb',
-          black: '#000000',
-          red: '#cd3131',
-          green: '#0dbc79',
-          yellow: '#e5e510',
-          blue: '#2472c8',
-          magenta: '#bc3fbc',
-          cyan: '#11a8cd',
-          white: '#e5e5e5',
-          brightBlack: '#666666',
-          brightRed: '#f14c4c',
-          brightGreen: '#23d18b',
-          brightYellow: '#f5f543',
-          brightBlue: '#3b8eea',
-          brightMagenta: '#d670d6',
-          brightCyan: '#29b8db',
-          brightWhite: '#ffffff',
-        }
-      : {
-          background: '#ffffff',
-          foreground: '#1e1e1e',
-          cursor: '#1e1e1e',
-          cursorAccent: '#ffffff',
-          selectionBackground: 'rgba(59, 130, 246, 0.35)',
-          selectionForeground: '#0f172a',
-          black: '#000000',
-          red: '#cd3131',
-          green: '#0dbc79',
-          yellow: '#bf8803',
-          blue: '#0451a5',
-          magenta: '#bc05bc',
-          cyan: '#0598bc',
-          white: '#e5e5e5',
-          brightBlack: '#666666',
-          brightRed: '#cd3131',
-          brightGreen: '#14ce14',
-          brightYellow: '#b5ba00',
-          brightBlue: '#0451a5',
-          brightMagenta: '#bc05bc',
-          brightCyan: '#0598bc',
-          brightWhite: '#a5a5a5',
-        };
-  }, [effectiveTheme, agent]);
-
-  const themeOverride = useMemo(() => {
-    if (!nativeTheme) return defaultTheme;
-    return { ...defaultTheme, ...nativeTheme };
-  }, [nativeTheme, defaultTheme]);
-
-  if (!task && !projectPath) {
-    return (
-      <div className={`flex h-full flex-col items-center justify-center bg-muted ${className}`}>
-        <Bot className="mb-2 h-8 w-8 text-muted-foreground" />
-        <h3 className="mb-1 text-sm text-muted-foreground">No Task Selected</h3>
-        <p className="text-center text-xs text-muted-foreground dark:text-muted-foreground">
-          Select a task to view its terminal
-        </p>
-      </div>
-    );
-  }
-
-  return (
-    <div className={cn('flex h-full min-w-0 flex-col bg-card', className)}>
-      <div className="flex items-center gap-2 border-b border-border bg-muted px-2 py-1.5 dark:bg-background">
-        <Select
-          value={selection.value}
-          onValueChange={selection.onChange}
-          open={selection.isOpen}
-          onOpenChange={selection.setIsOpen}
-        >
-          <SelectTrigger className="h-7 min-w-0 flex-1 justify-between border-none bg-transparent px-2 text-left text-xs shadow-none">
-            <span className="flex min-w-0 flex-1 items-center">
-              <span className="mr-2 inline-flex w-4 shrink-0 justify-center text-[11px] leading-none text-muted-foreground/90">
-                {'>_'}
-              </span>
-              <SelectValue placeholder="Select target" />
-            </span>
-          </SelectTrigger>
-          <SelectContent>
-            {task && (
-              <SelectGroup>
-                <div className="flex items-center justify-between px-2 py-1.5">
-                  <span className="text-[10px] font-semibold text-muted-foreground">Worktree</span>
-                  <button
-                    type="button"
-                    className="flex h-4 w-4 items-center justify-center rounded text-muted-foreground hover:bg-accent hover:text-accent-foreground"
-                    onClick={(e) => {
-                      e.preventDefault();
-                      e.stopPropagation();
-                      void (async () => {
-                        const { captureTelemetry } = await import('../lib/telemetryClient');
-                        captureTelemetry('terminal_new_terminal_created', { scope: 'task' });
-                      })();
-                      const newId = taskTerminals.createTerminal({ cwd: task?.path });
-                      selection.onCreateTerminal('task', newId);
-                    }}
-                    title="New worktree terminal"
-                  >
-                    <Plus className="h-3 w-3" />
-                  </button>
-                </div>
-                {taskTerminals.terminals.map((terminal) => (
-                  <SelectItem
-                    key={`task::${terminal.id}`}
-                    value={`task::${terminal.id}`}
-                    className="text-xs"
-                  >
-                    {terminal.title}
-                  </SelectItem>
-                ))}
-              </SelectGroup>
-            )}
-
-            {projectPath && (
-              <SelectGroup>
-                <div className="flex items-center justify-between px-2 py-1.5">
-                  <span className="text-[10px] font-semibold text-muted-foreground">Global</span>
-                  <button
-                    type="button"
-                    className="flex h-4 w-4 items-center justify-center rounded text-muted-foreground hover:bg-accent hover:text-accent-foreground"
-                    onClick={(e) => {
-                      e.preventDefault();
-                      e.stopPropagation();
-                      void (async () => {
-                        const { captureTelemetry } = await import('../lib/telemetryClient');
-                        captureTelemetry('terminal_new_terminal_created', { scope: 'global' });
-                      })();
-                      const newId = globalTerminals.createTerminal({ cwd: projectPath });
-                      selection.onCreateTerminal('global', newId);
-                    }}
-                    title="New global terminal"
-                  >
-                    <Plus className="h-3 w-3" />
-                  </button>
-                </div>
-                {globalTerminals.terminals.map((terminal) => (
-                  <SelectItem
-                    key={`global::${terminal.id}`}
-                    value={`global::${terminal.id}`}
-                    className="text-xs"
-                  >
-                    {terminal.title}
-                  </SelectItem>
-                ))}
-              </SelectGroup>
-            )}
-
-            {task && (
-              <SelectGroup>
-                <div className="px-2 py-1.5">
-                  <span className="text-[10px] font-semibold text-muted-foreground">Lifecycle</span>
-                </div>
-                <SelectItem value="lifecycle::setup" className="text-xs">
-                  Setup
-                </SelectItem>
-                <SelectItem value="lifecycle::run" className="text-xs">
-                  Run
-                </SelectItem>
-                <SelectItem value="lifecycle::teardown" className="text-xs">
-                  Teardown
-                </SelectItem>
-              </SelectGroup>
-            )}
-          </SelectContent>
-        </Select>
-        {selectedTerminalScope && (
-          <span className="shrink-0 rounded bg-zinc-500/15 px-1 py-0.5 text-[9px] font-medium uppercase tracking-wide text-zinc-600 dark:bg-zinc-400/15 dark:text-zinc-400">
-            {selectedTerminalScope}
-          </span>
-        )}
-
-        {task && (
-          <TooltipProvider delayDuration={200}>
-            <Tooltip>
-              <TooltipTrigger asChild>
-                {isRunSelection && runStatus === 'running' ? (
-                  <Button
-                    variant="ghost"
-                    size="icon-sm"
-                    onClick={handleStop}
-                    disabled={runActionBusy}
-                    className="text-muted-foreground hover:text-foreground"
-                  >
-                    <Square className="h-3.5 w-3.5" />
-                  </Button>
-                ) : (
-                  <Button
-                    variant="ghost"
-                    size="icon-sm"
-                    onClick={handlePlay}
-                    disabled={shouldDisablePlay({
-                      runActionBusy,
-                      hasProjectPath: !!projectPath,
-                      isRunSelection,
-                      canStartRun,
-                    })}
-                    className="text-muted-foreground hover:text-foreground"
-                  >
-                    <Play className="h-3.5 w-3.5" />
-                  </Button>
-                )}
-              </TooltipTrigger>
-              <TooltipContent side="bottom">
-                <p className="text-xs">
-                  {isRunSelection && runStatus === 'running'
-                    ? 'Stop run script'
-                    : selection.selectedLifecycle === 'setup'
-                      ? 'Run setup script'
-                      : selection.selectedLifecycle === 'teardown'
-                        ? 'Run teardown script'
-                        : setupStatus === 'running'
-                          ? 'Setup is still running'
-                          : setupStatus === 'failed'
-                            ? 'Setup failed'
-                            : 'Start run script'}
-                </p>
-              </TooltipContent>
-            </Tooltip>
-          </TooltipProvider>
-        )}
-
-        {(() => {
-          const canDelete =
-            selection.parsed?.mode === 'task'
-              ? taskTerminals.terminals.length > 1
-              : selection.parsed?.mode === 'global'
-                ? globalTerminals.terminals.length > 1
-                : false;
-          return (
-            <TooltipProvider delayDuration={200}>
-              <Tooltip>
-                <TooltipTrigger asChild>
-                  <Button
-                    variant="ghost"
-                    size="icon-sm"
-                    onClick={() => {
-                      if (selection.activeTerminalId && selection.parsed && canDelete) {
-                        void (async () => {
-                          const { captureTelemetry } = await import('../lib/telemetryClient');
-                          captureTelemetry('terminal_deleted');
-                        })();
-                        if (selection.parsed.mode === 'task') {
-                          taskTerminals.closeTerminal(selection.activeTerminalId);
-                        } else if (selection.parsed.mode === 'global') {
-                          globalTerminals.closeTerminal(selection.activeTerminalId);
-                        }
-                      }
-                    }}
-                    className="ml-auto text-muted-foreground hover:text-destructive"
-                    disabled={!selection.activeTerminalId || !canDelete}
-                  >
-                    <X className="h-3.5 w-3.5" />
-                  </Button>
-                </TooltipTrigger>
-                <TooltipContent side="bottom">
-                  <p className="text-xs">
-                    {canDelete ? 'Close terminal tab' : 'Cannot close selected item'}
-                  </p>
-                </TooltipContent>
-              </Tooltip>
-            </TooltipProvider>
-          );
-        })()}
-      </div>
-
-      {selection.selectedLifecycle ? (
-        <div className="flex h-full flex-1 flex-col overflow-hidden">
-          <div className="border-b border-border px-3 py-2 text-xs text-muted-foreground">
-            {selection.selectedLifecycle === 'setup'
-              ? `Setup status: ${setupStatus}`
-              : selection.selectedLifecycle === 'teardown'
-                ? `Teardown status: ${teardownStatus}`
-                : `Run status: ${runStatus}`}
-          </div>
-          <pre className="h-full overflow-y-auto overflow-x-hidden whitespace-pre-wrap break-words p-3 text-xs leading-relaxed text-foreground">
-            {lifecycleLogs[selection.selectedLifecycle].join('') || 'No lifecycle output yet.'}
-          </pre>
-        </div>
-      ) : (
-        <div
-          className={cn(
-            'bw-terminal relative flex-1 overflow-hidden',
-            effectiveTheme === 'dark' || effectiveTheme === 'dark-black'
-              ? agent === 'mistral'
-                ? effectiveTheme === 'dark-black'
-                  ? 'bg-[#141820]'
-                  : 'bg-[#202938]'
-                : 'bg-card'
-              : 'bg-white'
-          )}
-        >
-          {taskTerminals.terminals.map((terminal) => {
-            const isActive =
-              selection.parsed?.mode === 'task' && terminal.id === selection.activeTerminalId;
-            return (
-              <div
-                key={`task::${terminal.id}`}
-                className={cn(
-                  'absolute inset-0 h-full w-full transition-opacity',
-                  isActive ? 'opacity-100' : 'pointer-events-none opacity-0'
-                )}
-              >
-                <TerminalPane
-                  ref={(r) => setTerminalRef(terminal.id, r)}
-                  id={terminal.id}
-                  cwd={terminal.cwd || task?.path}
-                  remote={remote?.connectionId ? { connectionId: remote.connectionId } : undefined}
-                  env={taskEnv}
-                  variant={
-                    effectiveTheme === 'dark' || effectiveTheme === 'dark-black' ? 'dark' : 'light'
-                  }
-                  themeOverride={themeOverride}
-                  className="h-full w-full"
-                  keepAlive
-                />
-              </div>
-            );
-          })}
-          {globalTerminals.terminals.map((terminal) => {
-            const isActive =
-              selection.parsed?.mode === 'global' && terminal.id === selection.activeTerminalId;
-            return (
-              <div
-                key={`global::${terminal.id}`}
-                className={cn(
-                  'absolute inset-0 h-full w-full transition-opacity',
-                  isActive ? 'opacity-100' : 'pointer-events-none opacity-0'
-                )}
-              >
-                <TerminalPane
-                  ref={(r) => setTerminalRef(terminal.id, r)}
-                  id={terminal.id}
-                  cwd={terminal.cwd || projectPath}
-                  remote={remote?.connectionId ? { connectionId: remote.connectionId } : undefined}
-                  variant={
-                    effectiveTheme === 'dark' || effectiveTheme === 'dark-black' ? 'dark' : 'light'
-                  }
-                  themeOverride={themeOverride}
-                  className="h-full w-full"
-                  keepAlive
-                />
-              </div>
-            );
-          })}
-          {totalTerminals === 0 ? (
-            <div className="flex h-full flex-col items-center justify-center text-xs text-muted-foreground">
-              <p>No terminal found.</p>
-            </div>
-          ) : null}
-        </div>
-      )}
-    </div>
-  );
-};
-
-export const TaskTerminalPanel = React.memo(TaskTerminalPanelComponent);
-
-export default TaskTerminalPanel;
diff --git a/src/renderer/components/TelemetryCard.tsx b/src/renderer/components/TelemetryCard.tsx
deleted file mode 100644
index 9ed96f4a4e..0000000000
--- a/src/renderer/components/TelemetryCard.tsx
+++ /dev/null
@@ -1,58 +0,0 @@
-import React from 'react';
-import { Switch } from './ui/switch';
-import { Button } from './ui/button';
-import { useTelemetryConsent } from '../hooks/useTelemetryConsent';
-
-const TelemetryCard: React.FC = () => {
-  const { prefEnabled, envDisabled, hasKeyAndHost, loading, setTelemetryEnabled } =
-    useTelemetryConsent();
-
-  return (
-    <div className="flex items-center justify-between gap-4">
-      <div className="flex flex-1 flex-col gap-0.5">
-        <p className="text-sm font-medium text-foreground">Privacy & Telemetry</p>
-        <div className="text-sm text-muted-foreground">
-          <p>Help improve Emdash by sending anonymous usage data.</p>
-          <p>
-            <span>See </span>
-            <Button
-              type="button"
-              variant="link"
-              size="sm"
-              className="group inline-flex h-auto items-center gap-1 px-0 text-sm font-normal text-muted-foreground hover:text-foreground hover:no-underline focus-visible:outline-none focus-visible:ring-0"
-              onClick={() => window.electronAPI.openExternal('https://docs.emdash.sh/telemetry')}
-            >
-              <span className="transition-colors group-hover:text-foreground">
-                Telemetry information
-              </span>
-              <span className="text-sm text-muted-foreground transition-colors group-hover:text-foreground">
-                ↗
-              </span>
-            </Button>
-            <span> for details.</span>
-          </p>
-        </div>
-      </div>
-      <div className="flex flex-col items-end gap-1">
-        <Switch
-          checked={prefEnabled}
-          onCheckedChange={async (checked) => {
-            void import('../lib/telemetryClient').then(({ captureTelemetry }) => {
-              captureTelemetry('telemetry_toggled', { enabled: checked });
-            });
-            void setTelemetryEnabled(checked);
-          }}
-          disabled={loading || envDisabled}
-          aria-label="Enable anonymous telemetry"
-        />
-        {!hasKeyAndHost && (
-          <span className="text-[10px] text-muted-foreground">
-            Inactive in this build (no PostHog keys)
-          </span>
-        )}
-      </div>
-    </div>
-  );
-};
-
-export default TelemetryCard;
diff --git a/src/renderer/components/TerminalPane.tsx b/src/renderer/components/TerminalPane.tsx
deleted file mode 100644
index f350070702..0000000000
--- a/src/renderer/components/TerminalPane.tsx
+++ /dev/null
@@ -1,293 +0,0 @@
-import React, { useEffect, useRef, useMemo, forwardRef, useImperativeHandle } from 'react';
-import { terminalSessionRegistry } from '../terminal/SessionRegistry';
-import type { SessionTheme } from '../terminal/TerminalSessionManager';
-import { log } from '../lib/logger';
-
-type Props = {
-  id: string;
-  cwd?: string;
-  remote?: {
-    connectionId: string;
-  };
-  providerId?: string; // If set, uses direct CLI spawn (no shell)
-  shell?: string; // Used for shell-based spawn when providerId not set
-  cols?: number;
-  rows?: number;
-  env?: Record<string, string>;
-  className?: string;
-  variant?: 'dark' | 'light';
-  themeOverride?: any;
-  contentFilter?: string;
-  keepAlive?: boolean;
-  autoApprove?: boolean;
-  initialPrompt?: string;
-  mapShiftEnterToCtrlJ?: boolean;
-  disableSnapshots?: boolean; // If true, don't save/restore terminal snapshots (for non-main chats)
-  onActivity?: () => void;
-  onStartError?: (message: string) => void;
-  onStartSuccess?: () => void;
-  onExit?: (info: { exitCode: number | undefined; signal?: number }) => void;
-  onFirstMessage?: (message: string) => void;
-};
-
-const TerminalPaneComponent = forwardRef<{ focus: () => void }, Props>(
-  (
-    {
-      id,
-      cwd,
-      remote,
-      providerId,
-      cols = 120,
-      rows = 32,
-      shell,
-      env,
-      className,
-      variant = 'dark',
-      themeOverride,
-      contentFilter,
-      keepAlive = true,
-      autoApprove,
-      initialPrompt,
-      mapShiftEnterToCtrlJ,
-      disableSnapshots = false,
-      onActivity,
-      onStartError,
-      onStartSuccess,
-      onExit,
-      onFirstMessage,
-    },
-    ref
-  ) => {
-    const containerRef = useRef<HTMLDivElement | null>(null);
-    const sessionRef = useRef<ReturnType<(typeof terminalSessionRegistry)['attach']> | null>(null);
-    const activityCleanupRef = useRef<(() => void) | null>(null);
-    const readyCleanupRef = useRef<(() => void) | null>(null);
-    const errorCleanupRef = useRef<(() => void) | null>(null);
-    const exitCleanupRef = useRef<(() => void) | null>(null);
-
-    const cwdRef = useRef(cwd);
-    cwdRef.current = cwd;
-    const remoteRef = useRef(remote);
-    remoteRef.current = remote;
-    const providerIdRef = useRef(providerId);
-    providerIdRef.current = providerId;
-    const shellRef = useRef(shell);
-    shellRef.current = shell;
-    const colsRef = useRef(cols);
-    colsRef.current = cols;
-    const rowsRef = useRef(rows);
-    rowsRef.current = rows;
-    const envRef = useRef(env);
-    envRef.current = env;
-    const autoApproveRef = useRef(autoApprove);
-    autoApproveRef.current = autoApprove;
-    const initialPromptRef = useRef(initialPrompt);
-    initialPromptRef.current = initialPrompt;
-    const mapShiftEnterToCtrlJRef = useRef(mapShiftEnterToCtrlJ);
-    mapShiftEnterToCtrlJRef.current = mapShiftEnterToCtrlJ;
-    const disableSnapshotsRef = useRef(disableSnapshots);
-    disableSnapshotsRef.current = disableSnapshots;
-    const onActivityRef = useRef(onActivity);
-    onActivityRef.current = onActivity;
-    const onStartErrorRef = useRef(onStartError);
-    onStartErrorRef.current = onStartError;
-    const onStartSuccessRef = useRef(onStartSuccess);
-    onStartSuccessRef.current = onStartSuccess;
-    const onExitRef = useRef(onExit);
-    onExitRef.current = onExit;
-    const onFirstMessageRef = useRef(onFirstMessage);
-    onFirstMessageRef.current = onFirstMessage;
-
-    const theme = useMemo<SessionTheme>(
-      () => ({ base: variant, override: themeOverride }),
-      [variant, themeOverride]
-    );
-    const themeRef = useRef(theme);
-    themeRef.current = theme;
-
-    // Expose focus method via ref
-    useImperativeHandle(
-      ref,
-      () => ({
-        focus: () => {
-          sessionRef.current?.focus();
-        },
-      }),
-      []
-    );
-
-    useEffect(() => {
-      const container = containerRef.current;
-      if (!container) return;
-
-      const handleLinkClick = (url: string) => {
-        if (!url || !window.electronAPI?.openExternal) return;
-        window.electronAPI.openExternal(url).catch((error) => {
-          log.warn('failed to open external link', { url, error });
-        });
-      };
-
-      const session = terminalSessionRegistry.attach({
-        taskId: id,
-        container,
-        cwd: cwdRef.current,
-        remote: remoteRef.current,
-        providerId: providerIdRef.current,
-        shell: shellRef.current,
-        env: envRef.current,
-        initialSize: { cols: colsRef.current, rows: rowsRef.current },
-        theme: themeRef.current,
-        autoApprove: autoApproveRef.current,
-        initialPrompt: initialPromptRef.current,
-        mapShiftEnterToCtrlJ: mapShiftEnterToCtrlJRef.current,
-        disableSnapshots: disableSnapshotsRef.current,
-        onLinkClick: handleLinkClick,
-        onFirstMessage: onFirstMessageRef.current,
-      });
-      sessionRef.current = session;
-
-      if (onActivityRef.current) {
-        activityCleanupRef.current = session.registerActivityListener((...args: []) =>
-          onActivityRef.current?.(...args)
-        );
-      }
-
-      if (onStartSuccessRef.current) {
-        readyCleanupRef.current = session.registerReadyListener((...args: []) =>
-          onStartSuccessRef.current?.(...args)
-        );
-      }
-      if (onStartErrorRef.current) {
-        errorCleanupRef.current = session.registerErrorListener((msg: string) =>
-          onStartErrorRef.current?.(msg)
-        );
-      }
-      if (onExitRef.current) {
-        exitCleanupRef.current = session.registerExitListener(
-          (info: { exitCode: number | undefined; signal?: number }) => onExitRef.current?.(info)
-        );
-      }
-
-      return () => {
-        activityCleanupRef.current?.();
-        activityCleanupRef.current = null;
-        readyCleanupRef.current?.();
-        readyCleanupRef.current = null;
-        errorCleanupRef.current?.();
-        errorCleanupRef.current = null;
-        exitCleanupRef.current?.();
-        exitCleanupRef.current = null;
-        terminalSessionRegistry.detach(id);
-      };
-    }, [id]);
-
-    useEffect(() => {
-      if (sessionRef.current) {
-        sessionRef.current.setTheme(theme);
-      }
-    }, [theme]);
-
-    useEffect(() => {
-      return () => {
-        activityCleanupRef.current?.();
-        activityCleanupRef.current = null;
-        readyCleanupRef.current?.();
-        readyCleanupRef.current = null;
-        errorCleanupRef.current?.();
-        errorCleanupRef.current = null;
-        exitCleanupRef.current?.();
-        exitCleanupRef.current = null;
-        if (!keepAlive) {
-          terminalSessionRegistry.dispose(id);
-        }
-      };
-    }, [id, keepAlive]);
-
-    const handleFocus = () => {
-      void (async () => {
-        const { captureTelemetry } = await import('../lib/telemetryClient');
-        captureTelemetry('terminal_entered');
-      })();
-      // Focus the terminal session
-      sessionRef.current?.focus();
-    };
-
-    const handleDrop: React.DragEventHandler<HTMLDivElement> = async (event) => {
-      try {
-        event.preventDefault();
-        const dt = event.dataTransfer;
-        if (!dt || !dt.files || dt.files.length === 0) return;
-        const paths: string[] = [];
-        for (let i = 0; i < dt.files.length; i++) {
-          const file = dt.files[i] as any;
-          const p: string | undefined = file?.path;
-          if (p) paths.push(p);
-        }
-        if (paths.length === 0) return;
-
-        if (remoteRef.current?.connectionId) {
-          // SSH terminal: transfer files to remote first via scp
-          try {
-            const result = await window.electronAPI.ptyScpToRemote({
-              connectionId: remoteRef.current.connectionId,
-              localPaths: paths,
-            });
-            if (result.success && result.remotePaths) {
-              const escaped = result.remotePaths
-                .map((p) => `'${p.replace(/'/g, "'\\''")}'`)
-                .join(' ');
-              window.electronAPI.ptyInput({ id, data: `${escaped} ` });
-            }
-          } catch (error) {
-            log.warn('SSH file transfer failed', { error });
-          }
-        } else {
-          // Local terminal: send local path directly
-          const escaped = paths.map((p) => `'${p.replace(/'/g, "'\\''")}'`).join(' ');
-          window.electronAPI.ptyInput({ id, data: `${escaped} ` });
-        }
-        sessionRef.current?.focus();
-      } catch (error) {
-        log.warn('Terminal drop failed', { error });
-      }
-    };
-
-    return (
-      <div
-        className={['terminal-pane flex h-full w-full min-w-0', className]
-          .filter(Boolean)
-          .join(' ')}
-        style={{
-          width: '100%',
-          height: '100%',
-          minHeight: 0,
-          padding: '4px 8px 8px 8px',
-          backgroundColor: variant === 'light' ? '#ffffff' : themeOverride?.background || '#1f2937',
-          boxSizing: 'border-box',
-        }}
-      >
-        <div
-          ref={containerRef}
-          data-terminal-container
-          style={{
-            width: '100%',
-            height: '100%',
-            minHeight: 0,
-            overflow: 'hidden',
-            filter: contentFilter || undefined,
-          }}
-          onClick={handleFocus}
-          onMouseDown={handleFocus}
-          onDragOver={(event) => event.preventDefault()}
-          onDrop={handleDrop}
-        />
-      </div>
-    );
-  }
-);
-
-TerminalPaneComponent.displayName = 'TerminalPane';
-
-export const TerminalPane = React.memo(TerminalPaneComponent);
-
-export default TerminalPane;
diff --git a/src/renderer/components/TerminalSettingsCard.tsx b/src/renderer/components/TerminalSettingsCard.tsx
deleted file mode 100644
index 8e51419240..0000000000
--- a/src/renderer/components/TerminalSettingsCard.tsx
+++ /dev/null
@@ -1,276 +0,0 @@
-import React, { useCallback, useEffect, useMemo, useState } from 'react';
-import { Check, ChevronDown } from 'lucide-react';
-import { Button } from './ui/button';
-import { Input } from './ui/input';
-import { Popover, PopoverContent, PopoverTrigger } from './ui/popover';
-import { Switch } from './ui/switch';
-import { useAppSettings } from '@/contexts/AppSettingsProvider';
-
-type FontOption = {
-  id: string;
-  label: string;
-  fontValue: string;
-};
-
-const POPULAR_FONTS = [
-  'Menlo',
-  'SF Mono',
-  'JetBrains Mono',
-  'Fira Code',
-  'Cascadia Code',
-  'Iosevka',
-  'Source Code Pro',
-  'MesloLGS NF',
-];
-
-const toOptionId = (font: string) =>
-  `font-${font
-    .toLowerCase()
-    .replace(/[^a-z0-9]+/g, '-')
-    .replace(/(^-|-$)/g, '')}`;
-
-const dedupeAndSort = (fonts: string[]) =>
-  Array.from(new Set(fonts.map((font) => font.trim()).filter(Boolean))).sort((a, b) =>
-    a.localeCompare(b)
-  );
-
-const TerminalSettingsCard: React.FC = () => {
-  const { settings, updateSettings, isLoading: loading, isSaving: saving } = useAppSettings();
-  const [pickerOpen, setPickerOpen] = useState<boolean>(false);
-  const [search, setSearch] = useState<string>('');
-  const [installedFonts, setInstalledFonts] = useState<string[] | null>(null);
-  const [loadingFonts, setLoadingFonts] = useState<boolean>(false);
-
-  const fontFamily = settings?.terminal?.fontFamily ?? '';
-  const autoCopyOnSelection = settings?.terminal?.autoCopyOnSelection ?? false;
-
-  const popularOptions = useMemo<FontOption[]>(() => {
-    return [
-      { id: 'popular-default', label: 'Default (Menlo)', fontValue: '' },
-      ...POPULAR_FONTS.map((font) => ({
-        id: `popular-${toOptionId(font)}`,
-        label: font,
-        fontValue: font,
-      })),
-    ];
-  }, []);
-
-  const installedOptions = useMemo<FontOption[]>(() => {
-    const sourceFonts = dedupeAndSort(installedFonts ?? []);
-    return sourceFonts
-      .filter(
-        (font) =>
-          !POPULAR_FONTS.some((popular) => popular.toLowerCase() === font.toLowerCase()) &&
-          font.toLowerCase() !== 'menlo'
-      )
-      .map((font) => ({
-        id: `installed-${toOptionId(font)}`,
-        label: font,
-        fontValue: font,
-      }));
-  }, [installedFonts]);
-
-  const allOptions = useMemo<FontOption[]>(() => {
-    const byValue = new Map<string, FontOption>();
-    for (const option of [...popularOptions, ...installedOptions]) {
-      byValue.set(option.fontValue.toLowerCase(), option);
-    }
-    return Array.from(byValue.values());
-  }, [installedOptions, popularOptions]);
-
-  const findPreset = useCallback(
-    (font: string) => {
-      const normalized = font.trim().toLowerCase();
-      return allOptions.find((option) => option.fontValue.toLowerCase() === normalized) ?? null;
-    },
-    [allOptions]
-  );
-
-  const loadInstalledFonts = useCallback(async () => {
-    if (loadingFonts || installedFonts !== null) return;
-    setLoadingFonts(true);
-    try {
-      const result = await window.electronAPI.listInstalledFonts();
-      if (result?.success && Array.isArray(result.fonts) && result.fonts.length) {
-        setInstalledFonts(dedupeAndSort(result.fonts));
-      } else {
-        setInstalledFonts([]);
-      }
-    } catch {
-      setInstalledFonts([]);
-    } finally {
-      setLoadingFonts(false);
-    }
-  }, [installedFonts, loadingFonts]);
-
-  useEffect(() => {
-    if (pickerOpen) {
-      void loadInstalledFonts();
-    }
-  }, [loadInstalledFonts, pickerOpen]);
-
-  const applyFont = useCallback(
-    (next: string) => {
-      const normalized = next.trim();
-      updateSettings({ terminal: { fontFamily: normalized } });
-      window.dispatchEvent(
-        new CustomEvent('terminal-font-changed', { detail: { fontFamily: normalized } })
-      );
-    },
-    [updateSettings]
-  );
-
-  const toggleAutoCopy = useCallback(
-    (next: boolean) => {
-      updateSettings({ terminal: { autoCopyOnSelection: next } });
-      window.dispatchEvent(
-        new CustomEvent('terminal-auto-copy-changed', { detail: { autoCopyOnSelection: next } })
-      );
-    },
-    [updateSettings]
-  );
-
-  const selectedPreset = findPreset(fontFamily);
-  const pickerLabel = fontFamily.trim()
-    ? (selectedPreset?.label ?? `Custom: ${fontFamily.trim()}`)
-    : 'Default (Menlo)';
-
-  const filteredPopularOptions = useMemo(() => {
-    const query = search.trim().toLowerCase();
-    if (!query) return popularOptions;
-    return popularOptions.filter((option) => option.label.toLowerCase().includes(query));
-  }, [popularOptions, search]);
-
-  const filteredInstalledOptions = useMemo(() => {
-    const query = search.trim().toLowerCase();
-    if (!query) return installedOptions;
-    return installedOptions.filter((option) => option.label.toLowerCase().includes(query));
-  }, [installedOptions, search]);
-
-  const hasAnyResults = filteredPopularOptions.length > 0 || filteredInstalledOptions.length > 0;
-
-  return (
-    <div className="flex flex-col gap-4">
-      <div className="flex items-center justify-between gap-4">
-        <div className="flex flex-1 flex-col gap-0.5">
-          <p className="text-sm font-medium text-foreground">Terminal font</p>
-          <p className="text-sm text-muted-foreground">Choose the font family for the terminal.</p>
-        </div>
-        <div className="w-[183px] flex-shrink-0">
-          <Popover open={pickerOpen} onOpenChange={setPickerOpen}>
-            <PopoverTrigger asChild>
-              <Button
-                type="button"
-                variant="outline"
-                className="h-9 w-full justify-between text-sm font-normal"
-                disabled={loading || saving}
-              >
-                <span className="truncate text-left">{pickerLabel}</span>
-                <ChevronDown className="ml-2 h-4 w-4 shrink-0 opacity-70" />
-              </Button>
-            </PopoverTrigger>
-            <PopoverContent align="start" className="w-[var(--radix-popover-trigger-width)] p-2">
-              <div className="grid gap-2">
-                <Input
-                  value={search}
-                  onChange={(e) => setSearch(e.target.value)}
-                  onKeyDown={(e) => {
-                    if (e.key !== 'Enter') return;
-                    const typed = search.trim();
-                    if (!typed) return;
-                    setSearch('');
-                    setPickerOpen(false);
-                    applyFont(typed);
-                  }}
-                  placeholder="Search or type custom font"
-                  aria-label="Search font options"
-                  className="h-8"
-                />
-                <div className="max-h-56 overflow-auto">
-                  {filteredPopularOptions.length > 0 ? (
-                    <>
-                      <div className="px-2 py-1 text-[11px] font-medium uppercase tracking-wide text-muted-foreground">
-                        Popular
-                      </div>
-                      {filteredPopularOptions.map((option) => {
-                        const selected =
-                          selectedPreset?.fontValue.toLowerCase() ===
-                          option.fontValue.toLowerCase();
-                        return (
-                          <button
-                            key={option.id}
-                            type="button"
-                            className="flex w-full items-center justify-between rounded-md px-2 py-1.5 text-left text-sm hover:bg-accent"
-                            onClick={() => {
-                              setSearch('');
-                              setPickerOpen(false);
-                              applyFont(option.fontValue);
-                            }}
-                          >
-                            <span>{option.label}</span>
-                            {selected ? <Check className="h-4 w-4 opacity-80" /> : null}
-                          </button>
-                        );
-                      })}
-                    </>
-                  ) : null}
-
-                  {filteredInstalledOptions.length > 0 || loadingFonts ? (
-                    <div className="px-2 pb-1 pt-2 text-[11px] font-medium uppercase tracking-wide text-muted-foreground">
-                      Installed Fonts
-                    </div>
-                  ) : null}
-
-                  {loadingFonts ? (
-                    <div className="px-2 py-1.5 text-sm text-muted-foreground">
-                      Loading installed fonts...
-                    </div>
-                  ) : null}
-
-                  {filteredInstalledOptions.map((option) => {
-                    const selected =
-                      selectedPreset?.fontValue.toLowerCase() === option.fontValue.toLowerCase();
-                    return (
-                      <button
-                        key={option.id}
-                        type="button"
-                        className="flex w-full items-center justify-between rounded-md px-2 py-1.5 text-left text-sm hover:bg-accent"
-                        onClick={() => {
-                          setSearch('');
-                          setPickerOpen(false);
-                          applyFont(option.fontValue);
-                        }}
-                      >
-                        <span>{option.label}</span>
-                        {selected ? <Check className="h-4 w-4 opacity-80" /> : null}
-                      </button>
-                    );
-                  })}
-
-                  {!loadingFonts && !hasAnyResults ? (
-                    <div className="px-2 py-1.5 text-sm text-muted-foreground">No fonts found.</div>
-                  ) : null}
-                </div>
-              </div>
-            </PopoverContent>
-          </Popover>
-        </div>
-      </div>
-      <div className="flex items-center justify-between gap-4">
-        <div className="flex flex-1 flex-col gap-0.5">
-          <p className="text-sm font-medium text-foreground">Auto-copy selected text</p>
-          <p className="text-sm text-muted-foreground">
-            Automatically copy text to clipboard when you select it in the terminal.
-          </p>
-        </div>
-        <Switch
-          checked={autoCopyOnSelection}
-          disabled={loading || saving}
-          onCheckedChange={toggleAutoCopy}
-        />
-      </div>
-    </div>
-  );
-};
-
-export default TerminalSettingsCard;
diff --git a/src/renderer/components/ThemeCard.tsx b/src/renderer/components/ThemeCard.tsx
deleted file mode 100644
index a41da76f15..0000000000
--- a/src/renderer/components/ThemeCard.tsx
+++ /dev/null
@@ -1,51 +0,0 @@
-import React from 'react';
-import { useTheme } from '../hooks/useTheme';
-import { Sun, Moon, Monitor, Circle } from 'lucide-react';
-
-const ThemeCard: React.FC = () => {
-  const { theme, setTheme } = useTheme();
-
-  const options = [
-    { value: 'light' as const, label: 'Light', icon: Sun },
-    { value: 'dark' as const, label: 'Dark Navy', icon: Moon },
-    { value: 'dark-black' as const, label: 'Dark Black', icon: Circle },
-    { value: 'system' as const, label: 'System', icon: Monitor },
-  ];
-
-  return (
-    <div className="grid gap-3">
-      <div>
-        <div className="text-sm font-medium text-foreground">Color mode</div>
-        <div className="text-sm text-muted-foreground">Choose how Emdash looks.</div>
-      </div>
-      <div className="grid grid-cols-[repeat(auto-fit,minmax(6.5rem,1fr))] gap-2">
-        {options.map(({ value, label, icon: Icon }) => (
-          <button
-            key={value}
-            type="button"
-            onClick={async () => {
-              if (theme !== value) {
-                void import('../lib/telemetryClient').then(({ captureTelemetry }) => {
-                  captureTelemetry('theme_changed', { theme: value });
-                });
-              }
-              setTheme(value);
-            }}
-            className={`flex min-h-24 flex-col items-center justify-center gap-2 rounded-lg border px-2 py-2.5 text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 focus-visible:ring-offset-background sm:px-3 ${
-              theme === value
-                ? 'border-primary bg-primary/10 text-foreground'
-                : 'border-border/60 bg-background text-muted-foreground hover:border-border hover:bg-muted/40'
-            }`}
-            aria-pressed={theme === value}
-            aria-label={`Set theme to ${label}`}
-          >
-            <Icon className="h-4 w-4 shrink-0" aria-hidden="true" />
-            <span className="text-center leading-tight">{label}</span>
-          </button>
-        ))}
-      </div>
-    </div>
-  );
-};
-
-export default ThemeCard;
diff --git a/src/renderer/components/ThemeProvider.tsx b/src/renderer/components/ThemeProvider.tsx
deleted file mode 100644
index 44ea910259..0000000000
--- a/src/renderer/components/ThemeProvider.tsx
+++ /dev/null
@@ -1,73 +0,0 @@
-import { useAppSettings } from '@/contexts/AppSettingsProvider';
-import { createContext, useEffect, useState, type ReactNode } from 'react';
-
-type Theme = 'light' | 'dark' | 'dark-black' | 'system';
-type EffectiveTheme = 'light' | 'dark' | 'dark-black';
-
-function getSystemTheme(): EffectiveTheme {
-  if (typeof window === 'undefined') return 'light';
-  return window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark-black' : 'light';
-}
-
-function applyTheme(theme: Theme, systemTheme: EffectiveTheme) {
-  if (typeof document === 'undefined') return;
-
-  const root = document.documentElement;
-  const effectiveTheme = theme === 'system' ? systemTheme : theme;
-
-  root.classList.remove('dark', 'dark-black');
-
-  if (effectiveTheme === 'dark') {
-    root.classList.add('dark');
-  } else if (effectiveTheme === 'dark-black') {
-    root.classList.add('dark', 'dark-black');
-  }
-}
-
-interface ThemeContextType {
-  theme: Theme;
-  setTheme: (theme: Theme) => void;
-  toggleTheme: () => void;
-  effectiveTheme: EffectiveTheme;
-}
-
-export const ThemeContext = createContext<ThemeContextType | undefined>(undefined);
-
-export function ThemeProvider({ children }: { children: ReactNode }) {
-  const { settings, updateSettings } = useAppSettings();
-  const [systemTheme, setSystemTheme] = useState<EffectiveTheme>(() => getSystemTheme());
-
-  const theme: Theme = settings?.interface?.theme ?? 'system';
-  const effectiveTheme: EffectiveTheme = theme === 'system' ? systemTheme : theme;
-
-  useEffect(() => {
-    applyTheme(theme, systemTheme);
-  }, [theme, systemTheme]);
-
-  // Listen for OS theme changes when preference is 'system'
-  useEffect(() => {
-    if (theme !== 'system') return undefined;
-
-    const mediaQuery = window.matchMedia('(prefers-color-scheme: dark)');
-    const handler = () => setSystemTheme(getSystemTheme());
-
-    mediaQuery.addEventListener('change', handler);
-    return () => mediaQuery.removeEventListener('change', handler);
-  }, [theme]);
-
-  const setTheme = (newTheme: Theme) => {
-    updateSettings({ interface: { theme: newTheme } });
-  };
-
-  const toggleTheme = () => {
-    const base = theme === 'system' ? effectiveTheme : theme;
-    const next: Theme = base === 'light' ? 'dark' : base === 'dark' ? 'dark-black' : 'light';
-    setTheme(next);
-  };
-
-  return (
-    <ThemeContext.Provider value={{ theme, setTheme, toggleTheme, effectiveTheme }}>
-      {children}
-    </ThemeContext.Provider>
-  );
-}
diff --git a/src/renderer/components/UpdateCard.tsx b/src/renderer/components/UpdateCard.tsx
deleted file mode 100644
index 91b75c9172..0000000000
--- a/src/renderer/components/UpdateCard.tsx
+++ /dev/null
@@ -1,246 +0,0 @@
-import React, { useState, useEffect } from 'react';
-import { Button } from '@/components/ui/button';
-import { Badge } from '@/components/ui/badge';
-import { CheckCircle2, Download, RefreshCw, AlertCircle, Loader2 } from 'lucide-react';
-import { useUpdater, EMDASH_RELEASES_URL } from '@/hooks/useUpdater';
-
-export function UpdateCard(): JSX.Element {
-  const updater = useUpdater();
-  const [appVersion, setAppVersion] = useState<string>('');
-  const [isDev, setIsDev] = useState(false);
-
-  useEffect(() => {
-    window.electronAPI
-      .getAppVersion()
-      .then(setAppVersion)
-      .catch(() => setAppVersion('Unknown'));
-
-    setIsDev(window.location.hostname === 'localhost' || !window.electronAPI);
-  }, []);
-
-  const handleCheckNow = async () => {
-    await updater.check();
-  };
-
-  const handleDownload = async () => {
-    await updater.download();
-  };
-
-  const handleInstall = () => {
-    updater.install();
-  };
-
-  // In dev, show simple informational message
-  if (isDev) {
-    return (
-      <div className="flex items-center justify-between gap-4">
-        <div className="flex flex-1 flex-col gap-0.5">
-          <div className="flex items-center gap-2">
-            <p className="text-sm font-medium text-foreground">Version</p>
-            {appVersion && (
-              <Badge variant="outline" className="h-5 px-2 font-mono text-xs">
-                v{appVersion}
-              </Badge>
-            )}
-          </div>
-          <p className="text-sm text-muted-foreground">
-            Auto-updates are enabled in production builds.{' '}
-            <button
-              type="button"
-              onClick={() => window.electronAPI.openExternal(EMDASH_RELEASES_URL)}
-              className="text-sm text-muted-foreground underline-offset-2 hover:text-foreground"
-            >
-              View changelog ↗
-            </button>
-          </p>
-        </div>
-        <Button
-          type="button"
-          variant="outline"
-          size="icon"
-          className="h-8 w-8"
-          onClick={handleCheckNow}
-          disabled
-          aria-label="Check for updates (disabled in development)"
-        >
-          <RefreshCw className="h-3 w-3" />
-        </Button>
-      </div>
-    );
-  }
-
-  return (
-    <div className="grid gap-3">
-      <div className="flex items-center justify-between gap-4">
-        <div className="flex flex-1 flex-col gap-0.5">
-          <div className="flex items-center gap-2">
-            <p className="text-sm font-medium text-foreground">Version</p>
-            {appVersion && (
-              <Badge variant="outline" className="h-5 px-2 font-mono text-xs">
-                v{appVersion}
-              </Badge>
-            )}
-          </div>
-          {renderStatusMessage()}
-        </div>
-        <div className="flex items-center gap-2">
-          {updater.state.status !== 'downloaded' && updater.state.status !== 'installing' && (
-            <Button
-              type="button"
-              variant="outline"
-              size="icon"
-              className="h-8 w-8"
-              onClick={handleCheckNow}
-              disabled={updater.state.status === 'checking'}
-              aria-label="Check for updates"
-            >
-              <RefreshCw
-                className={`h-3 w-3 ${updater.state.status === 'checking' ? 'animate-spin' : ''}`}
-              />
-            </Button>
-          )}
-          {renderAction()}
-        </div>
-      </div>
-
-      {updater.state.status === 'downloading' && updater.state.progress && (
-        <div className="space-y-2">
-          <div className="h-1.5 w-full overflow-hidden rounded-full bg-muted">
-            <div
-              className="h-full bg-primary transition-all duration-300 ease-out"
-              style={{ width: `${updater.state.progress.percent || 0}%` }}
-            />
-          </div>
-          <p className="text-xs text-muted-foreground">
-            {formatBytes(updater.state.progress.transferred || 0)} /{' '}
-            {formatBytes(updater.state.progress.total || 0)}
-          </p>
-        </div>
-      )}
-    </div>
-  );
-
-  function renderStatusMessage() {
-    switch (updater.state.status) {
-      case 'checking':
-        return (
-          <p className="flex items-center gap-1 text-sm text-muted-foreground">
-            <Loader2 className="h-3 w-3 animate-spin" />
-            Checking for updates...
-          </p>
-        );
-
-      case 'available':
-        if (updater.state.info?.version) {
-          return (
-            <p className="text-sm text-muted-foreground">
-              Version {updater.state.info.version} is available
-            </p>
-          );
-        }
-        return <p className="text-sm text-muted-foreground">An update is available</p>;
-
-      case 'downloading':
-        return (
-          <p className="text-sm text-muted-foreground">
-            Downloading update{updater.progressLabel ? ` (${updater.progressLabel})` : '...'}
-          </p>
-        );
-
-      case 'downloaded':
-        return (
-          <p className="flex items-center gap-1 text-sm text-green-600 dark:text-green-500">
-            <CheckCircle2 className="h-3 w-3" />
-            Update ready. Restart Emdash to use the new version.
-          </p>
-        );
-
-      case 'installing':
-        return (
-          <p className="flex items-center gap-1 text-sm text-muted-foreground">
-            <Loader2 className="h-3 w-3 animate-spin" />
-            Installing update. Emdash will close and restart automatically — this may take a few
-            seconds.
-          </p>
-        );
-
-      case 'error':
-        return (
-          <Badge
-            variant="outline"
-            className="border-amber-200 bg-amber-50 text-amber-700 dark:border-amber-800 dark:bg-amber-950/40 dark:text-amber-400"
-          >
-            <AlertCircle className="h-3 w-3" />
-            Update temporarily unavailable — please try again later
-          </Badge>
-        );
-
-      default:
-        return (
-          <p className="flex items-center gap-1 text-sm text-muted-foreground">
-            <CheckCircle2 className="h-3 w-3 text-green-600 dark:text-green-500" />
-            You're up to date.{' '}
-            <button
-              type="button"
-              onClick={() => window.electronAPI.openExternal(EMDASH_RELEASES_URL)}
-              className="text-sm text-muted-foreground underline-offset-2 hover:text-foreground"
-            >
-              View changelog ↗
-            </button>
-          </p>
-        );
-    }
-  }
-
-  function renderAction() {
-    switch (updater.state.status) {
-      case 'available':
-        return (
-          <Button size="sm" variant="default" onClick={handleDownload} className="h-7 text-xs">
-            <Download className="mr-1.5 h-3 w-3" />
-            Download
-          </Button>
-        );
-
-      case 'downloading':
-        return (
-          <Button size="sm" variant="outline" disabled className="h-7 text-xs">
-            <Loader2 className="mr-1.5 h-3 w-3 animate-spin" />
-            Downloading
-          </Button>
-        );
-
-      case 'downloaded':
-        return (
-          <Button size="sm" variant="default" onClick={handleInstall} className="h-7 text-xs">
-            <RefreshCw className="mr-1.5 h-3 w-3" />
-            Restart
-          </Button>
-        );
-
-      case 'installing':
-        return (
-          <Button size="sm" variant="outline" disabled className="h-7 text-xs">
-            <Loader2 className="mr-1.5 h-3 w-3 animate-spin" />
-            Installing
-          </Button>
-        );
-
-      default:
-        return null;
-    }
-  }
-
-  function formatBytes(bytes: number): string {
-    const units = ['B', 'KB', 'MB', 'GB'];
-    let size = bytes;
-    let unitIndex = 0;
-
-    while (size >= 1024 && unitIndex < units.length - 1) {
-      size /= 1024;
-      unitIndex++;
-    }
-
-    return `${size.toFixed(1)} ${units[unitIndex]}`;
-  }
-}
diff --git a/src/renderer/components/UpdateModal.tsx b/src/renderer/components/UpdateModal.tsx
deleted file mode 100644
index ccc157f3bf..0000000000
--- a/src/renderer/components/UpdateModal.tsx
+++ /dev/null
@@ -1,195 +0,0 @@
-import React, { useState, useEffect } from 'react';
-import {
-  DialogContent,
-  DialogHeader,
-  DialogTitle,
-  DialogDescription,
-} from '@/components/ui/dialog';
-import { Button } from '@/components/ui/button';
-import {
-  CheckCircle2,
-  Download,
-  ExternalLink,
-  RefreshCw,
-  AlertCircle,
-  Loader2,
-} from 'lucide-react';
-import { useUpdater, EMDASH_RELEASES_URL } from '@/hooks/useUpdater';
-import { BaseModalProps } from '@/contexts/ModalProvider';
-
-interface UpdateModalProps {
-  onClose: () => void;
-}
-
-export function UpdateModalOverlay({ onClose }: BaseModalProps<void>) {
-  return <UpdateModal onClose={onClose} />;
-}
-
-function UpdateModal({ onClose }: UpdateModalProps): JSX.Element {
-  const updater = useUpdater();
-  const [appVersion, setAppVersion] = useState('');
-
-  useEffect(() => {
-    window.electronAPI
-      .getAppVersion()
-      .then(setAppVersion)
-      .catch(() => setAppVersion('Unknown'));
-  }, []);
-
-  // Auto-check when modal opens if not already in a progressed state
-  useEffect(() => {
-    const { status } = updater.state;
-    if (status === 'idle' || status === 'not-available') {
-      updater.check();
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
-
-  const handleCheck = async () => {
-    await updater.check();
-  };
-
-  const handleDownload = async () => {
-    await updater.download();
-  };
-
-  const handleInstall = () => {
-    updater.install();
-  };
-
-  return (
-    <DialogContent className="max-w-sm focus:outline-none">
-      <DialogHeader>
-        <DialogTitle>Software Update</DialogTitle>
-        <DialogDescription>
-          Current version: v{appVersion || '...'} &middot;{' '}
-          <button
-            type="button"
-            onClick={() => window.electronAPI.openExternal(EMDASH_RELEASES_URL)}
-            className="inline-flex items-center gap-1 outline-none hover:text-foreground"
-          >
-            Changelog <ExternalLink className="h-3 w-3" />
-          </button>
-        </DialogDescription>
-      </DialogHeader>
-
-      <div className="flex flex-col items-center gap-4 py-4">
-        {updater.state.status === 'checking' && (
-          <>
-            <Loader2 className="h-8 w-8 animate-spin text-muted-foreground" />
-            <p className="text-sm text-muted-foreground">Checking for updates...</p>
-          </>
-        )}
-
-        {(updater.state.status === 'idle' || updater.state.status === 'not-available') && (
-          <>
-            <CheckCircle2 className="h-8 w-8 text-green-600 dark:text-green-500" />
-            <p className="text-sm">Emdash is up to date.</p>
-            <div className="flex gap-2">
-              <Button variant="outline" size="sm" onClick={onClose}>
-                OK
-              </Button>
-              <Button variant="outline" size="sm" onClick={handleCheck}>
-                <RefreshCw className="mr-1.5 h-3.5 w-3.5" />
-                Check Again
-              </Button>
-            </div>
-          </>
-        )}
-
-        {updater.state.status === 'available' && (
-          <>
-            <Download className="h-8 w-8 text-primary" />
-            <p className="text-sm text-muted-foreground">
-              {updater.state.info?.version
-                ? `Version ${updater.state.info.version} is available.`
-                : 'An update is available.'}
-            </p>
-            <Button size="sm" onClick={handleDownload}>
-              <Download className="mr-1.5 h-3.5 w-3.5" />
-              Download
-            </Button>
-          </>
-        )}
-
-        {updater.state.status === 'downloading' && (
-          <>
-            <Loader2 className="h-8 w-8 animate-spin text-primary" />
-            <p className="text-sm text-muted-foreground">
-              Downloading update{updater.progressLabel ? ` (${updater.progressLabel})` : '...'}
-            </p>
-            {updater.state.progress && (
-              <div className="w-full space-y-1">
-                <div className="h-1.5 w-full overflow-hidden rounded-full bg-muted">
-                  <div
-                    className="h-full bg-primary transition-all duration-300 ease-out"
-                    style={{ width: `${updater.state.progress.percent || 0}%` }}
-                  />
-                </div>
-                <p className="text-center text-xs text-muted-foreground">
-                  {formatBytes(updater.state.progress.transferred || 0)} /{' '}
-                  {formatBytes(updater.state.progress.total || 0)}
-                </p>
-              </div>
-            )}
-          </>
-        )}
-
-        {updater.state.status === 'downloaded' && (
-          <>
-            <CheckCircle2 className="h-8 w-8 text-green-600 dark:text-green-500" />
-            <p className="text-sm">Update downloaded and ready to install.</p>
-            <div className="flex gap-2">
-              <Button variant="outline" size="sm" onClick={onClose}>
-                Later
-              </Button>
-              <Button size="sm" onClick={handleInstall}>
-                <RefreshCw className="mr-1.5 h-3.5 w-3.5" />
-                Restart Now
-              </Button>
-            </div>
-          </>
-        )}
-
-        {updater.state.status === 'installing' && (
-          <>
-            <Loader2 className="h-8 w-8 animate-spin text-primary" />
-            <p className="text-center text-sm text-muted-foreground">
-              Installing update. Emdash will close automatically when ready.
-            </p>
-          </>
-        )}
-
-        {updater.state.status === 'error' && (
-          <>
-            <AlertCircle className="h-8 w-8 text-red-600 dark:text-red-500" />
-            <p className="text-center text-sm text-muted-foreground">
-              {updater.state.message || 'Update check failed'}
-            </p>
-            <div className="flex gap-2">
-              <Button variant="outline" size="sm" onClick={onClose}>
-                Close
-              </Button>
-              <Button size="sm" variant="outline" onClick={handleCheck}>
-                Try Again
-              </Button>
-            </div>
-          </>
-        )}
-      </div>
-    </DialogContent>
-  );
-}
-
-function formatBytes(bytes: number): string {
-  const units = ['B', 'KB', 'MB', 'GB'];
-  let size = bytes;
-  let unitIndex = 0;
-
-  while (size >= 1024 && unitIndex < units.length - 1) {
-    size /= 1024;
-    unitIndex++;
-  }
-
-  return `${size.toFixed(1)} ${units[unitIndex]}`;
-}
diff --git a/src/renderer/components/diff-viewer/ChangesTab.tsx b/src/renderer/components/diff-viewer/ChangesTab.tsx
deleted file mode 100644
index 5c8a12d577..0000000000
--- a/src/renderer/components/diff-viewer/ChangesTab.tsx
+++ /dev/null
@@ -1,100 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import { FileList } from './FileList';
-import { CommitArea } from './CommitArea';
-import { DiffPanel } from './DiffPanel';
-import type { FileChange } from '../../hooks/useFileChanges';
-import { ResizablePanelGroup, ResizablePanel, ResizableHandle } from '../ui/resizable';
-
-interface ChangesTabProps {
-  taskId?: string;
-  taskPath?: string;
-  fileChanges: FileChange[];
-  onRefreshChanges?: () => Promise<void> | void;
-  header?: React.ReactNode;
-  closeButton?: React.ReactNode;
-  leftPanelSize?: number;
-  onLeftPanelResize?: (size: number) => void;
-  initialFile?: string | null;
-}
-
-export const ChangesTab: React.FC<ChangesTabProps> = ({
-  taskId,
-  taskPath,
-  fileChanges,
-  onRefreshChanges,
-  header,
-  closeButton,
-  leftPanelSize = 30,
-  onLeftPanelResize,
-  initialFile,
-}) => {
-  const [selectedFile, setSelectedFile] = useState<string | null>(null);
-  const initialFileConsumed = React.useRef(false);
-
-  // Auto-select the initial file or the first file, or clear selection when files disappear
-  useEffect(() => {
-    if (fileChanges.length === 0) {
-      setSelectedFile(null);
-      return;
-    }
-
-    // If we have an initial file that hasn't been consumed yet, select it
-    if (
-      initialFile &&
-      !initialFileConsumed.current &&
-      fileChanges.some((f) => f.path === initialFile)
-    ) {
-      initialFileConsumed.current = true;
-      setSelectedFile(initialFile);
-      return;
-    }
-
-    if (selectedFile === null || !fileChanges.some((f) => f.path === selectedFile)) {
-      setSelectedFile(fileChanges[0].path);
-    }
-  }, [fileChanges, selectedFile, initialFile]);
-
-  return (
-    <ResizablePanelGroup
-      direction="horizontal"
-      onLayout={(sizes) => {
-        if (sizes[0] !== undefined) onLeftPanelResize?.(sizes[0]);
-      }}
-    >
-      {/* Left panel — tabs + file list + commit area */}
-      <ResizablePanel defaultSize={leftPanelSize} minSize={20} maxSize={50}>
-        <div className="flex h-full flex-col border-r border-border">
-          {header}
-          <div className="flex-1 overflow-y-auto">
-            <FileList
-              fileChanges={fileChanges}
-              selectedFile={selectedFile}
-              onSelectFile={setSelectedFile}
-              taskPath={taskPath}
-              onRefreshChanges={onRefreshChanges}
-            />
-          </div>
-          <CommitArea
-            taskPath={taskPath}
-            fileChanges={fileChanges}
-            onRefreshChanges={onRefreshChanges}
-          />
-        </div>
-      </ResizablePanel>
-
-      <ResizableHandle />
-
-      {/* Right panel — diff viewer */}
-      <ResizablePanel defaultSize={100 - leftPanelSize} minSize={30}>
-        <DiffPanel
-          taskId={taskId}
-          taskPath={taskPath}
-          fileChanges={fileChanges}
-          selectedFile={selectedFile}
-          onRefreshChanges={onRefreshChanges}
-          closeButton={closeButton}
-        />
-      </ResizablePanel>
-    </ResizablePanelGroup>
-  );
-};
diff --git a/src/renderer/components/diff-viewer/CommitArea.tsx b/src/renderer/components/diff-viewer/CommitArea.tsx
deleted file mode 100644
index 000cf038cd..0000000000
--- a/src/renderer/components/diff-viewer/CommitArea.tsx
+++ /dev/null
@@ -1,313 +0,0 @@
-import React, { useCallback, useEffect, useState } from 'react';
-import { ArrowUp, ArrowDown, Undo2, Loader2 } from 'lucide-react';
-import { useToast } from '../../hooks/use-toast';
-import type { FileChange } from '../../hooks/useFileChanges';
-import { subscribeToFileChanges } from '../../lib/fileChangeEvents';
-
-interface CommitAreaProps {
-  taskPath?: string;
-  fileChanges: FileChange[];
-  onRefreshChanges?: () => Promise<void> | void;
-}
-
-interface LatestCommit {
-  hash: string;
-  subject: string;
-  body: string;
-  isPushed: boolean;
-}
-
-function friendlyGitError(raw: string): string {
-  const s = raw.toLowerCase();
-  if (s.includes('non-fast-forward') || s.includes('tip of your current branch is behind'))
-    return 'Remote has new commits. Pull before pushing.';
-  if (s.includes('merge conflict') || s.includes('fix conflicts'))
-    return 'Merge conflicts detected. Resolve them in your editor.';
-  if (s.includes('permission denied') || s.includes('authentication'))
-    return 'Authentication failed. Check your credentials.';
-  if (s.includes('could not resolve host') || s.includes('unable to access'))
-    return 'Cannot reach remote. Check your network connection.';
-  if (s.includes('no such remote')) return 'No remote configured for this repository.';
-  if (s.includes('cannot undo the initial commit')) return 'Cannot undo the initial commit.';
-  if (s.includes('nothing to commit')) return 'Nothing to commit.';
-  // Return first meaningful line, capped
-  const firstLine = raw.split('\n').find((l) => l.trim().length > 0) || raw;
-  return firstLine.length > 120 ? firstLine.slice(0, 120) + '...' : firstLine;
-}
-
-export const CommitArea: React.FC<CommitAreaProps> = ({
-  taskPath,
-  fileChanges,
-  onRefreshChanges,
-}) => {
-  const { toast } = useToast();
-  const [commitMessage, setCommitMessage] = useState('');
-  const [description, setDescription] = useState('');
-  const [branch, setBranch] = useState<string | null>(null);
-  const [latestCommit, setLatestCommit] = useState<LatestCommit | null>(null);
-  const [isCommitting, setIsCommitting] = useState(false);
-  const [isPushing, setIsPushing] = useState(false);
-  const [isPulling, setIsPulling] = useState(false);
-  const [isUndoing, setIsUndoing] = useState(false);
-  const [aheadCount, setAheadCount] = useState(0);
-  const [behindCount, setBehindCount] = useState(0);
-
-  const hasStagedFiles = fileChanges.some((f) => f.isStaged);
-  const canCommit = hasStagedFiles && commitMessage.trim().length > 0 && !isCommitting;
-
-  const fetchBranch = useCallback(async () => {
-    if (!taskPath) return;
-    const result = await window.electronAPI.getBranchStatus({ taskPath });
-    if (result.success) {
-      if (result.branch) setBranch(result.branch);
-      if (typeof result.ahead === 'number') setAheadCount(result.ahead);
-      if (typeof result.behind === 'number') setBehindCount(result.behind);
-    }
-  }, [taskPath]);
-
-  const fetchLatestCommit = useCallback(async () => {
-    if (!taskPath) return;
-    const result = await window.electronAPI.gitGetLatestCommit({ taskPath });
-    if (result.success) {
-      setLatestCommit(result.commit ?? null);
-    }
-  }, [taskPath]);
-
-  useEffect(() => {
-    void fetchBranch();
-    void fetchLatestCommit();
-  }, [fetchBranch, fetchLatestCommit]);
-
-  // Refresh branch status when file changes are detected (external git operations, watchers)
-  useEffect(() => {
-    if (!taskPath) return;
-    return subscribeToFileChanges((event) => {
-      if (event.detail.taskPath === taskPath) {
-        void fetchBranch();
-        void fetchLatestCommit();
-      }
-    });
-  }, [taskPath, fetchBranch, fetchLatestCommit]);
-
-  const handleCommit = async () => {
-    if (!taskPath || !canCommit) return;
-    setIsCommitting(true);
-    try {
-      const message = description.trim()
-        ? `${commitMessage.trim()}\n\n${description.trim()}`
-        : commitMessage.trim();
-      const result = await window.electronAPI.gitCommit({ taskPath, message });
-      if (result.success) {
-        setCommitMessage('');
-        setDescription('');
-        await onRefreshChanges?.();
-        await fetchLatestCommit();
-        await fetchBranch();
-      } else {
-        toast({
-          title: 'Commit failed',
-          description: friendlyGitError(result?.error || 'Unknown error'),
-          variant: 'destructive',
-        });
-      }
-    } catch (err) {
-      toast({
-        title: 'Commit failed',
-        description: friendlyGitError(err instanceof Error ? err.message : String(err)),
-        variant: 'destructive',
-      });
-    } finally {
-      setIsCommitting(false);
-    }
-  };
-
-  const hasUnpushed = aheadCount > 0 || (latestCommit != null && !latestCommit.isPushed);
-
-  const handlePush = async () => {
-    if (!taskPath || !hasUnpushed || isPushing) return;
-    setIsPushing(true);
-    try {
-      const result = await window.electronAPI.gitPush({ taskPath });
-      if (result?.success) {
-        toast({ title: 'Pushed successfully' });
-      } else {
-        toast({
-          title: 'Push failed',
-          description: friendlyGitError(result?.error || 'Unknown error'),
-          variant: 'destructive',
-        });
-      }
-      await fetchBranch();
-      await fetchLatestCommit();
-    } catch (err) {
-      toast({
-        title: 'Push failed',
-        description: friendlyGitError(err instanceof Error ? err.message : String(err)),
-        variant: 'destructive',
-      });
-    } finally {
-      setIsPushing(false);
-    }
-  };
-
-  const handlePull = async () => {
-    if (!taskPath || isPulling) return;
-    setIsPulling(true);
-    try {
-      const result = await window.electronAPI.gitPull({ taskPath });
-      if (!result?.success) {
-        toast({
-          title: 'Pull failed',
-          description: friendlyGitError(result?.error || 'Unknown error'),
-          variant: 'destructive',
-        });
-      }
-      await fetchBranch();
-      await fetchLatestCommit();
-      await onRefreshChanges?.();
-    } catch (err) {
-      toast({
-        title: 'Pull failed',
-        description: friendlyGitError(err instanceof Error ? err.message : String(err)),
-        variant: 'destructive',
-      });
-    } finally {
-      setIsPulling(false);
-    }
-  };
-
-  const handleUndo = async () => {
-    if (!taskPath || isUndoing) return;
-    setIsUndoing(true);
-    try {
-      const result = await window.electronAPI.gitSoftReset({ taskPath });
-      if (result.success) {
-        if (result.subject) setCommitMessage(result.subject);
-        if (result.body) setDescription(result.body);
-        await onRefreshChanges?.();
-        await fetchLatestCommit();
-        await fetchBranch();
-      } else {
-        toast({
-          title: 'Undo failed',
-          description: friendlyGitError(result?.error || 'Unknown error'),
-          variant: 'destructive',
-        });
-      }
-    } catch (err) {
-      toast({
-        title: 'Undo failed',
-        description: friendlyGitError(err instanceof Error ? err.message : String(err)),
-        variant: 'destructive',
-      });
-    } finally {
-      setIsUndoing(false);
-    }
-  };
-
-  return (
-    <div className="flex flex-col gap-2 border-t border-border p-3">
-      {/* Branch name */}
-      {branch && (
-        <span className="truncate text-xs text-muted-foreground" title={branch}>
-          On branch <span className="font-medium text-foreground">{branch}</span>
-        </span>
-      )}
-
-      {/* Commit message input */}
-      <input
-        type="text"
-        value={commitMessage}
-        onChange={(e) => setCommitMessage(e.target.value)}
-        placeholder="Enter commit message"
-        className="w-full rounded-md border border-border bg-background px-2.5 py-1.5 text-xs text-foreground placeholder:text-muted-foreground focus:outline-none focus:ring-1 focus:ring-ring"
-        onKeyDown={(e) => {
-          if (e.key === 'Enter' && !e.shiftKey && canCommit) {
-            void handleCommit();
-          }
-        }}
-      />
-
-      {/* Description textarea */}
-      <textarea
-        value={description}
-        onChange={(e) => setDescription(e.target.value)}
-        placeholder="Description"
-        rows={3}
-        className="w-full resize-none rounded-md border border-border bg-background px-2.5 py-1.5 text-xs text-foreground placeholder:text-muted-foreground focus:outline-none focus:ring-1 focus:ring-ring"
-      />
-
-      {/* Commit & Push & Pull buttons */}
-      <div className="flex gap-2">
-        <button
-          onClick={() => void handleCommit()}
-          disabled={!canCommit}
-          className="flex flex-1 items-center justify-center gap-1 rounded-md border border-border bg-background px-3 py-1.5 text-xs font-medium transition-colors hover:bg-accent disabled:cursor-not-allowed disabled:opacity-50"
-        >
-          {isCommitting ? (
-            <>
-              <Loader2 className="h-3 w-3 animate-spin" />
-              Committing...
-            </>
-          ) : (
-            'Commit'
-          )}
-        </button>
-        <button
-          onClick={() => void handlePush()}
-          disabled={!hasUnpushed || isPushing}
-          className="flex items-center justify-center gap-1 rounded-md border border-border bg-background px-3 py-1.5 text-xs font-medium transition-colors hover:bg-accent disabled:cursor-not-allowed disabled:opacity-50"
-          title={
-            hasUnpushed
-              ? `Push${aheadCount > 0 ? ` ${aheadCount} commit${aheadCount > 1 ? 's' : ''}` : ''}`
-              : 'No unpushed commits'
-          }
-        >
-          {isPushing ? (
-            <Loader2 className="h-3 w-3 animate-spin" />
-          ) : (
-            <ArrowUp className="h-3 w-3" />
-          )}
-          {isPushing ? 'Pushing...' : <>Push{aheadCount > 0 ? ` (${aheadCount})` : ''}</>}
-        </button>
-        {behindCount > 0 && (
-          <button
-            onClick={() => void handlePull()}
-            disabled={isPulling}
-            className="flex items-center justify-center gap-1 rounded-md border border-border bg-background px-3 py-1.5 text-xs font-medium transition-colors hover:bg-accent disabled:cursor-not-allowed disabled:opacity-50"
-            title={`Pull ${behindCount} commit${behindCount > 1 ? 's' : ''} from remote`}
-          >
-            <ArrowDown className="h-3 w-3" />
-            Pull ({behindCount})
-          </button>
-        )}
-      </div>
-
-      {/* Separator — full width edge to edge */}
-      <hr className="-mx-3 border-border" />
-
-      {/* Latest commit */}
-      {latestCommit && (
-        <div className="flex items-center gap-2">
-          <span
-            className="min-w-0 flex-1 truncate text-xs text-muted-foreground"
-            title={latestCommit.subject}
-          >
-            {latestCommit.subject}
-          </span>
-          {!latestCommit.isPushed && (
-            <button
-              onClick={() => void handleUndo()}
-              disabled={isUndoing}
-              className="flex flex-shrink-0 items-center gap-1 rounded-md border border-border bg-background px-2 py-1 text-xs text-muted-foreground transition-colors hover:bg-accent hover:text-foreground disabled:cursor-not-allowed disabled:opacity-50"
-              title="Undo last commit"
-            >
-              <Undo2 className="h-3 w-3" />
-              Undo
-            </button>
-          )}
-        </div>
-      )}
-    </div>
-  );
-};
diff --git a/src/renderer/components/diff-viewer/CommitFileDiffView.tsx b/src/renderer/components/diff-viewer/CommitFileDiffView.tsx
deleted file mode 100644
index da66ce67c3..0000000000
--- a/src/renderer/components/diff-viewer/CommitFileDiffView.tsx
+++ /dev/null
@@ -1,194 +0,0 @@
-import React, { useEffect, useRef, useState } from 'react';
-import { DiffEditor, loader } from '@monaco-editor/react';
-import type * as monaco from 'monaco-editor';
-import { convertDiffLinesToMonacoFormat, getMonacoLanguageId } from '../../lib/diffUtils';
-import { configureDiffEditorDiagnostics, resetDiagnosticOptions } from '../../lib/monacoDiffConfig';
-import { registerDiffThemes, getDiffThemeName } from '../../lib/monacoDiffThemes';
-import { DIFF_EDITOR_BASE_OPTIONS } from './editorConfig';
-import { useTheme } from '../../hooks/useTheme';
-
-interface CommitFileDiffViewProps {
-  taskPath?: string;
-  commitHash: string;
-  filePath: string;
-  diffStyle: 'unified' | 'split';
-}
-
-export const CommitFileDiffView: React.FC<CommitFileDiffViewProps> = ({
-  taskPath,
-  commitHash,
-  filePath,
-  diffStyle,
-}) => {
-  const { effectiveTheme } = useTheme();
-  const isDark = effectiveTheme === 'dark' || effectiveTheme === 'dark-black';
-
-  const [data, setData] = useState<{
-    original: string;
-    modified: string;
-    language: string;
-    loading: boolean;
-    error: string | null;
-  } | null>(null);
-
-  const editorRef = useRef<monaco.editor.IStandaloneDiffEditor | null>(null);
-
-  // Load commit file diff
-  useEffect(() => {
-    if (!taskPath || !commitHash || !filePath) {
-      setData(null);
-      return;
-    }
-
-    let cancelled = false;
-    const language = getMonacoLanguageId(filePath);
-
-    setData({ original: '', modified: '', language, loading: true, error: null });
-
-    const load = async () => {
-      try {
-        const res = await window.electronAPI.gitGetCommitFileDiff({
-          taskPath,
-          commitHash,
-          filePath,
-        });
-        if (!res?.success || !res.diff) {
-          throw new Error(res?.error || 'Failed to load commit diff');
-        }
-
-        const converted = convertDiffLinesToMonacoFormat(res.diff.lines);
-        const original = res.diff.originalContent ?? converted.original;
-        const modified = res.diff.modifiedContent ?? converted.modified;
-
-        if (!cancelled) {
-          setData({
-            original,
-            modified,
-            language,
-            loading: false,
-            error: null,
-          });
-        }
-      } catch (error: unknown) {
-        if (!cancelled) {
-          setData({
-            original: '',
-            modified: '',
-            language,
-            loading: false,
-            error: (error as Error)?.message ?? String(error),
-          });
-        }
-      }
-    };
-
-    load();
-    return () => {
-      cancelled = true;
-    };
-  }, [taskPath, commitHash, filePath]);
-
-  // Register and apply Monaco diff themes
-  useEffect(() => {
-    let cancelled = false;
-    registerDiffThemes()
-      .then(async () => {
-        if (!cancelled) {
-          const monacoInstance = await loader.init();
-          monacoInstance.editor.setTheme(getDiffThemeName(effectiveTheme));
-        }
-      })
-      .catch((err: unknown) => console.warn('Failed to register diff themes:', err));
-    return () => {
-      cancelled = true;
-    };
-  }, [effectiveTheme]);
-
-  // Editor mount handler
-  const handleEditorDidMount = async (editor: monaco.editor.IStandaloneDiffEditor) => {
-    editorRef.current = editor;
-
-    try {
-      const monacoInstance = await loader.init();
-      configureDiffEditorDiagnostics(editor, monacoInstance, {
-        disableAllValidation: true,
-        suppressSpecificErrors: false,
-      });
-    } catch (error) {
-      console.warn('Failed to configure editor:', error);
-    }
-  };
-
-  // Cleanup
-  useEffect(() => {
-    return () => {
-      try {
-        editorRef.current?.dispose();
-      } catch {
-        // ignore
-      }
-      editorRef.current = null;
-
-      loader
-        .init()
-        .then((m) => resetDiagnosticOptions(m))
-        .catch(() => {});
-    };
-  }, []);
-
-  const monacoTheme = getDiffThemeName(effectiveTheme);
-
-  if (!data) {
-    return (
-      <div className="flex h-full items-center justify-center text-sm text-muted-foreground">
-        No file selected
-      </div>
-    );
-  }
-
-  if (data.loading) {
-    return (
-      <div className="flex h-full items-center justify-center text-muted-foreground">
-        <div className="flex items-center gap-2">
-          <div className="h-4 w-4 animate-spin rounded-full border-2 border-border border-t-gray-600 dark:border-border dark:border-t-gray-400" />
-          <span className="text-sm">Loading diff...</span>
-        </div>
-      </div>
-    );
-  }
-
-  if (data.error) {
-    return (
-      <div className="flex h-full items-center justify-center text-sm text-muted-foreground">
-        {data.error}
-      </div>
-    );
-  }
-
-  if (!data.original && !data.modified) {
-    return (
-      <div className="flex h-full items-center justify-center text-sm text-muted-foreground">
-        File is empty
-      </div>
-    );
-  }
-
-  return (
-    <div className="h-full">
-      <DiffEditor
-        height="100%"
-        language={data.language}
-        original={data.original}
-        modified={data.modified}
-        theme={monacoTheme}
-        options={{
-          ...DIFF_EDITOR_BASE_OPTIONS,
-          readOnly: true,
-          renderSideBySide: diffStyle === 'split',
-          glyphMargin: false,
-        }}
-        onMount={handleEditorDidMount}
-      />
-    </div>
-  );
-};
diff --git a/src/renderer/components/diff-viewer/CommitFileList.tsx b/src/renderer/components/diff-viewer/CommitFileList.tsx
deleted file mode 100644
index 21acfe7dec..0000000000
--- a/src/renderer/components/diff-viewer/CommitFileList.tsx
+++ /dev/null
@@ -1,118 +0,0 @@
-import React, { useEffect, useRef, useState } from 'react';
-import { splitPath } from './pathUtils';
-
-interface CommitFile {
-  path: string;
-  status: string;
-  additions: number;
-  deletions: number;
-}
-
-interface CommitFileListProps {
-  taskPath?: string;
-  commitHash: string;
-  selectedFile: string | null;
-  onSelectFile: (filePath: string) => void;
-}
-
-export const CommitFileList: React.FC<CommitFileListProps> = ({
-  taskPath,
-  commitHash,
-  selectedFile,
-  onSelectFile,
-}) => {
-  const [files, setFiles] = useState<CommitFile[]>([]);
-  const [loading, setLoading] = useState(false);
-
-  const onSelectFileRef = useRef(onSelectFile);
-  onSelectFileRef.current = onSelectFile;
-
-  useEffect(() => {
-    if (!taskPath || !commitHash) {
-      setFiles([]);
-      return;
-    }
-
-    let cancelled = false;
-    setLoading(true);
-
-    const load = async () => {
-      try {
-        const res = await window.electronAPI.gitGetCommitFiles({ taskPath, commitHash });
-        if (!cancelled && res?.success && res.files) {
-          setFiles(res.files);
-          // Auto-select the first file
-          if (res.files.length > 0) {
-            onSelectFileRef.current(res.files[0].path);
-          }
-        }
-      } catch {
-        // ignore
-      } finally {
-        if (!cancelled) setLoading(false);
-      }
-    };
-
-    load();
-    return () => {
-      cancelled = true;
-    };
-    // Intentionally only re-run on taskPath/commitHash change. onSelectFile is excluded
-    // to avoid re-fetching when the parent re-renders with a new callback reference.
-  }, [taskPath, commitHash]);
-
-  if (loading) {
-    return (
-      <div className="flex h-full items-center justify-center text-sm text-muted-foreground">
-        Loading...
-      </div>
-    );
-  }
-
-  if (files.length === 0) {
-    return (
-      <div className="flex h-full items-center justify-center text-sm text-muted-foreground">
-        No files
-      </div>
-    );
-  }
-
-  return (
-    <div className="overflow-y-auto">
-      <div className="flex h-9 items-center border-b border-border px-3 text-sm font-medium text-muted-foreground">
-        {files.length} changed file{files.length !== 1 ? 's' : ''}
-      </div>
-      {files.map((file) => {
-        const { filename, directory } = splitPath(file.path);
-        return (
-          <button
-            key={file.path}
-            className={`w-full cursor-pointer border-b border-border/50 px-3 py-2 text-left ${
-              selectedFile === file.path ? 'bg-accent' : 'hover:bg-muted/50'
-            }`}
-            onClick={() => onSelectFile(file.path)}
-          >
-            <div className="flex items-center gap-2">
-              <div className="min-w-0 flex-1">
-                <div className="truncate text-sm font-medium">{filename}</div>
-                {directory && (
-                  <div className="truncate text-xs text-muted-foreground">{directory}</div>
-                )}
-              </div>
-              <span
-                className={`h-2 w-2 flex-shrink-0 rounded-full ${
-                  file.status === 'added'
-                    ? 'bg-green-500'
-                    : file.status === 'deleted'
-                      ? 'bg-red-500'
-                      : 'bg-blue-500'
-                }`}
-                title={file.status}
-              />
-            </div>
-          </button>
-        );
-      })}
-    </div>
-  );
-};
diff --git a/src/renderer/components/diff-viewer/CommitList.tsx b/src/renderer/components/diff-viewer/CommitList.tsx
deleted file mode 100644
index 2907ab5f2d..0000000000
--- a/src/renderer/components/diff-viewer/CommitList.tsx
+++ /dev/null
@@ -1,200 +0,0 @@
-import React, { useCallback, useEffect, useRef, useState } from 'react';
-import { ArrowUp, Tag } from 'lucide-react';
-
-interface Commit {
-  hash: string;
-  subject: string;
-  body: string;
-  author: string;
-  date: string;
-  isPushed: boolean;
-  tags: string[];
-}
-
-export interface CommitInfo {
-  hash: string;
-  subject: string;
-  body: string;
-  author: string;
-}
-
-interface CommitListProps {
-  taskPath?: string;
-  selectedCommit: string | null;
-  onSelectCommit: (commit: CommitInfo) => void;
-}
-
-const PAGE_SIZE = 50;
-
-function formatRelativeDate(dateStr: string): string {
-  const date = new Date(dateStr);
-  if (isNaN(date.getTime())) return dateStr || '';
-  const now = new Date();
-  const diffMs = now.getTime() - date.getTime();
-  const diffSec = Math.floor(diffMs / 1000);
-  const diffMin = Math.floor(diffSec / 60);
-  const diffHr = Math.floor(diffMin / 60);
-  const diffDays = Math.floor(diffHr / 24);
-
-  if (diffSec < 60) return 'just now';
-  if (diffMin < 60) return `${diffMin} minute${diffMin === 1 ? '' : 's'} ago`;
-  if (diffHr < 24) return `${diffHr} hour${diffHr === 1 ? '' : 's'} ago`;
-  if (diffDays < 30) return `${diffDays} day${diffDays === 1 ? '' : 's'} ago`;
-  const diffMonths = Math.floor(diffDays / 30);
-  if (diffMonths < 12) return `${diffMonths} month${diffMonths === 1 ? '' : 's'} ago`;
-  const diffYears = Math.floor(diffDays / 365);
-  return `${diffYears} year${diffYears === 1 ? '' : 's'} ago`;
-}
-
-export const CommitList: React.FC<CommitListProps> = ({
-  taskPath,
-  selectedCommit,
-  onSelectCommit,
-}) => {
-  const [commits, setCommits] = useState<Commit[]>([]);
-  const [loading, setLoading] = useState(false);
-  const [loadingMore, setLoadingMore] = useState(false);
-  const [hasMore, setHasMore] = useState(false);
-  const [aheadCount, setAheadCount] = useState<number | undefined>(undefined);
-
-  const onSelectCommitRef = useRef(onSelectCommit);
-  onSelectCommitRef.current = onSelectCommit;
-
-  useEffect(() => {
-    if (!taskPath) {
-      setCommits([]);
-      setHasMore(false);
-      setAheadCount(undefined);
-      return;
-    }
-
-    let cancelled = false;
-    setLoading(true);
-
-    const load = async () => {
-      try {
-        const res = await window.electronAPI.gitGetLog({ taskPath, maxCount: PAGE_SIZE });
-        if (!cancelled && res?.success && res.commits) {
-          setCommits(res.commits);
-          setAheadCount(res.aheadCount);
-          setHasMore(res.commits.length >= PAGE_SIZE);
-          // Auto-select the latest commit if none is selected
-          if (res.commits.length > 0 && !selectedCommit) {
-            const c = res.commits[0];
-            onSelectCommitRef.current({
-              hash: c.hash,
-              subject: c.subject,
-              body: c.body,
-              author: c.author,
-            });
-          }
-        }
-      } catch {
-        // ignore
-      } finally {
-        if (!cancelled) setLoading(false);
-      }
-    };
-
-    load();
-    return () => {
-      cancelled = true;
-    };
-    // Intentionally only re-run on taskPath change. onSelectCommit and selectedCommit
-    // are excluded to avoid re-fetching commits when the parent re-renders with new callbacks.
-  }, [taskPath]);
-
-  const loadMore = useCallback(async () => {
-    if (!taskPath || loadingMore || !hasMore) return;
-    setLoadingMore(true);
-    try {
-      const res = await window.electronAPI.gitGetLog({
-        taskPath,
-        maxCount: PAGE_SIZE,
-        skip: commits.length,
-        aheadCount,
-      });
-      if (res?.success && res.commits && res.commits.length > 0) {
-        const newCommits = res.commits;
-        setCommits((prev) => [...prev, ...newCommits]);
-        setHasMore(newCommits.length >= PAGE_SIZE);
-      } else {
-        setHasMore(false);
-      }
-    } catch {
-      // ignore
-    } finally {
-      setLoadingMore(false);
-    }
-  }, [taskPath, loadingMore, hasMore, commits.length, aheadCount]);
-
-  if (loading) {
-    return (
-      <div className="flex h-full items-center justify-center text-sm text-muted-foreground">
-        Loading...
-      </div>
-    );
-  }
-
-  if (commits.length === 0) {
-    return (
-      <div className="flex h-full items-center justify-center text-sm text-muted-foreground">
-        No commits
-      </div>
-    );
-  }
-
-  return (
-    <div className="overflow-y-auto">
-      {commits.map((commit) => (
-        <button
-          key={commit.hash}
-          className={`w-full cursor-pointer border-b border-border/50 px-3 py-2 text-left ${
-            selectedCommit === commit.hash ? 'bg-accent' : 'hover:bg-muted/50'
-          }`}
-          onClick={() =>
-            onSelectCommit({
-              hash: commit.hash,
-              subject: commit.subject,
-              body: commit.body,
-              author: commit.author,
-            })
-          }
-        >
-          <div className="flex items-center gap-2">
-            <div className="min-w-0 flex-1">
-              {commit.subject ? <div className="truncate text-sm">{commit.subject}</div> : null}
-              <div className="text-xs text-muted-foreground">
-                {commit.author} &middot; {formatRelativeDate(commit.date)}
-              </div>
-            </div>
-            {commit.tags.length > 0 &&
-              commit.tags.map((tag) => (
-                <span
-                  key={tag}
-                  className="flex shrink-0 items-center gap-0.5 rounded border border-border bg-muted px-1.5 py-0.5 text-[10px] font-medium text-muted-foreground"
-                >
-                  <Tag className="h-2.5 w-2.5" />
-                  {tag}
-                </span>
-              ))}
-            {!commit.isPushed && (
-              <span title="Not yet pushed to remote">
-                <ArrowUp className="h-4 w-4 shrink-0 text-muted-foreground" strokeWidth={2.5} />
-              </span>
-            )}
-          </div>
-        </button>
-      ))}
-      {hasMore && (
-        <button
-          onClick={() => void loadMore()}
-          disabled={loadingMore}
-          className="w-full px-3 py-2.5 text-center text-xs font-medium text-muted-foreground transition-colors hover:bg-muted/50 hover:text-foreground"
-        >
-          {loadingMore ? 'Loading...' : 'Load more'}
-        </button>
-      )}
-    </div>
-  );
-};
diff --git a/src/renderer/components/diff-viewer/DiffPanel.tsx b/src/renderer/components/diff-viewer/DiffPanel.tsx
deleted file mode 100644
index 14d2400098..0000000000
--- a/src/renderer/components/diff-viewer/DiffPanel.tsx
+++ /dev/null
@@ -1,103 +0,0 @@
-import React, { useEffect, useRef, useState } from 'react';
-import type { FileChange } from '../../hooks/useFileChanges';
-import { DiffToolbar } from './DiffToolbar';
-import { FileDiffView } from './FileDiffView';
-import { splitPath } from './pathUtils';
-import { StackedDiffView } from './StackedDiffView';
-
-interface DiffPanelProps {
-  taskId?: string;
-  taskPath?: string;
-  fileChanges: FileChange[];
-  selectedFile: string | null;
-  onRefreshChanges?: () => Promise<void> | void;
-  closeButton?: React.ReactNode;
-}
-
-export const DiffPanel: React.FC<DiffPanelProps> = ({
-  taskId,
-  taskPath,
-  fileChanges,
-  selectedFile,
-  onRefreshChanges,
-  closeButton,
-}) => {
-  const [viewMode, setViewMode] = useState<'stacked' | 'file'>(
-    () => (localStorage.getItem('diffViewer:viewMode') as 'stacked' | 'file') || 'stacked'
-  );
-  const [diffStyle, setDiffStyle] = useState<'unified' | 'split'>(
-    () => (localStorage.getItem('diffViewer:diffStyle') as 'unified' | 'split') || 'unified'
-  );
-
-  const handleViewModeChange = (mode: 'stacked' | 'file') => {
-    setViewMode(mode);
-    localStorage.setItem('diffViewer:viewMode', mode);
-  };
-
-  const handleDiffStyleChange = (style: 'unified' | 'split') => {
-    setDiffStyle(style);
-    localStorage.setItem('diffViewer:diffStyle', style);
-  };
-
-  // When user clicks a file in the sidebar while in stacked mode, switch to file view
-  const prevSelectedFileRef = useRef(selectedFile);
-  useEffect(() => {
-    if (selectedFile && selectedFile !== prevSelectedFileRef.current && viewMode === 'stacked') {
-      handleViewModeChange('file');
-    }
-    prevSelectedFileRef.current = selectedFile;
-  }, [selectedFile, viewMode]);
-
-  return (
-    <div className="flex h-full flex-col">
-      <DiffToolbar
-        viewMode={viewMode}
-        onViewModeChange={handleViewModeChange}
-        diffStyle={diffStyle}
-        onDiffStyleChange={handleDiffStyleChange}
-        closeButton={closeButton}
-      />
-      {viewMode === 'file' &&
-        selectedFile &&
-        (() => {
-          const fileChange = fileChanges.find((f) => f.path === selectedFile);
-          const { filename, directory } = splitPath(selectedFile);
-          return (
-            <div className="flex h-9 items-center gap-2 border-b border-border bg-muted/30 px-3 text-xs">
-              <span className="truncate font-medium">{filename}</span>
-              {directory && <span className="truncate text-muted-foreground">{directory}</span>}
-              {fileChange && (
-                <span className="ml-auto shrink-0">
-                  <span className="text-green-500">+{fileChange.additions}</span>{' '}
-                  <span className="text-red-500">-{fileChange.deletions}</span>
-                </span>
-              )}
-            </div>
-          );
-        })()}
-      <div className="flex-1 overflow-hidden">
-        {viewMode === 'stacked' ? (
-          <StackedDiffView
-            taskPath={taskPath}
-            taskId={taskId}
-            fileChanges={fileChanges}
-            diffStyle={diffStyle}
-            onRefreshChanges={onRefreshChanges}
-          />
-        ) : selectedFile ? (
-          <FileDiffView
-            taskPath={taskPath}
-            taskId={taskId}
-            filePath={selectedFile}
-            diffStyle={diffStyle}
-            onRefreshChanges={onRefreshChanges}
-          />
-        ) : (
-          <div className="flex h-full items-center justify-center text-sm text-muted-foreground">
-            Select a file to view changes
-          </div>
-        )}
-      </div>
-    </div>
-  );
-};
diff --git a/src/renderer/components/diff-viewer/DiffToolbar.tsx b/src/renderer/components/diff-viewer/DiffToolbar.tsx
deleted file mode 100644
index 0d2c6ea145..0000000000
--- a/src/renderer/components/diff-viewer/DiffToolbar.tsx
+++ /dev/null
@@ -1,67 +0,0 @@
-import React from 'react';
-import { Layers, FileText, AlignJustify, Columns2 } from 'lucide-react';
-
-interface DiffToolbarProps {
-  viewMode: 'stacked' | 'file';
-  onViewModeChange: (mode: 'stacked' | 'file') => void;
-  diffStyle: 'unified' | 'split';
-  onDiffStyleChange: (style: 'unified' | 'split') => void;
-  hideViewModeToggle?: boolean;
-  closeButton?: React.ReactNode;
-}
-
-export const DiffToolbar: React.FC<DiffToolbarProps> = ({
-  viewMode,
-  onViewModeChange,
-  diffStyle,
-  onDiffStyleChange,
-  hideViewModeToggle,
-  closeButton,
-}) => {
-  const activeClass = 'bg-accent text-foreground';
-  const inactiveClass = 'text-muted-foreground hover:text-foreground hover:bg-muted';
-
-  return (
-    <div className="flex h-9 items-center gap-2 border-b border-border px-3">
-      {/* Stacked / File toggle */}
-      {!hideViewModeToggle && (
-        <div className="flex items-center rounded-md border border-border">
-          <button
-            className={`flex items-center rounded-l-md px-2 py-1 ${viewMode === 'stacked' ? activeClass : inactiveClass}`}
-            onClick={() => onViewModeChange('stacked')}
-            title="Stacked view"
-          >
-            <Layers className="h-3.5 w-3.5" />
-          </button>
-          <button
-            className={`flex items-center rounded-r-md px-2 py-1 ${viewMode === 'file' ? activeClass : inactiveClass}`}
-            onClick={() => onViewModeChange('file')}
-            title="File view"
-          >
-            <FileText className="h-3.5 w-3.5" />
-          </button>
-        </div>
-      )}
-
-      {/* Unified / Split toggle */}
-      <div className="flex items-center rounded-md border border-border">
-        <button
-          className={`flex items-center rounded-l-md px-2 py-1 ${diffStyle === 'unified' ? activeClass : inactiveClass}`}
-          onClick={() => onDiffStyleChange('unified')}
-          title="Unified view"
-        >
-          <AlignJustify className="h-3.5 w-3.5" />
-        </button>
-        <button
-          className={`flex items-center rounded-r-md px-2 py-1 ${diffStyle === 'split' ? activeClass : inactiveClass}`}
-          onClick={() => onDiffStyleChange('split')}
-          title="Split view"
-        >
-          <Columns2 className="h-3.5 w-3.5" />
-        </button>
-      </div>
-
-      <div className="ml-auto flex items-center gap-2">{closeButton}</div>
-    </div>
-  );
-};
diff --git a/src/renderer/components/diff-viewer/DiffViewer.tsx b/src/renderer/components/diff-viewer/DiffViewer.tsx
deleted file mode 100644
index 5ee0be29b2..0000000000
--- a/src/renderer/components/diff-viewer/DiffViewer.tsx
+++ /dev/null
@@ -1,89 +0,0 @@
-import React, { useState } from 'react';
-import { X } from 'lucide-react';
-import { useFileChanges } from '../../hooks/useFileChanges';
-import { ChangesTab } from './ChangesTab';
-import { HistoryTab } from './HistoryTab';
-
-interface DiffViewerProps {
-  onClose: () => void;
-  taskId?: string;
-  taskPath?: string;
-  initialFile?: string | null;
-}
-
-type Tab = 'changes' | 'history';
-
-export const DiffViewer: React.FC<DiffViewerProps> = ({
-  onClose,
-  taskId,
-  taskPath,
-  initialFile,
-}) => {
-  const [activeTab, setActiveTab] = useState<Tab>('changes');
-  const { fileChanges, refreshChanges } = useFileChanges(taskPath);
-  const fileCount = fileChanges.length;
-  const [leftPanelSize, setLeftPanelSize] = useState(30);
-
-  const tabHeader = (
-    <div className="flex h-9 border-b border-border bg-muted/50">
-      <button
-        onClick={() => setActiveTab('changes')}
-        className={`flex-1 text-center text-sm font-medium transition-colors ${
-          activeTab === 'changes'
-            ? 'border-b-2 border-foreground text-foreground'
-            : 'text-muted-foreground hover:text-foreground'
-        }`}
-      >
-        Changes{fileCount > 0 ? ` (${fileCount})` : ''}
-      </button>
-      <button
-        onClick={() => setActiveTab('history')}
-        className={`flex-1 text-center text-sm font-medium transition-colors ${
-          activeTab === 'history'
-            ? 'border-b-2 border-foreground text-foreground'
-            : 'text-muted-foreground hover:text-foreground'
-        }`}
-      >
-        History
-      </button>
-    </div>
-  );
-
-  const closeButton = (
-    <button
-      onClick={onClose}
-      className="rounded-md p-1.5 text-muted-foreground transition-colors hover:bg-accent hover:text-foreground"
-      aria-label="Close diff viewer"
-    >
-      <X className="h-4 w-4" />
-    </button>
-  );
-
-  return (
-    <div className="flex h-full flex-col bg-background">
-      <div className="min-h-0 flex-1 overflow-hidden">
-        {activeTab === 'changes' ? (
-          <ChangesTab
-            taskId={taskId}
-            taskPath={taskPath}
-            fileChanges={fileChanges}
-            onRefreshChanges={refreshChanges}
-            header={tabHeader}
-            closeButton={closeButton}
-            leftPanelSize={leftPanelSize}
-            onLeftPanelResize={setLeftPanelSize}
-            initialFile={initialFile}
-          />
-        ) : (
-          <HistoryTab
-            taskPath={taskPath}
-            header={tabHeader}
-            closeButton={closeButton}
-            leftPanelSize={leftPanelSize}
-            onLeftPanelResize={setLeftPanelSize}
-          />
-        )}
-      </div>
-    </div>
-  );
-};
diff --git a/src/renderer/components/diff-viewer/FileDiffView.tsx b/src/renderer/components/diff-viewer/FileDiffView.tsx
deleted file mode 100644
index f0cbb933cc..0000000000
--- a/src/renderer/components/diff-viewer/FileDiffView.tsx
+++ /dev/null
@@ -1,385 +0,0 @@
-import React, { useEffect, useRef, useState } from 'react';
-import { DiffEditor, loader } from '@monaco-editor/react';
-import type * as monaco from 'monaco-editor';
-import type { DiffLine } from '../../hooks/useFileDiff';
-import {
-  convertDiffLinesToMonacoFormat,
-  getMonacoLanguageId,
-  isBinaryFile,
-} from '../../lib/diffUtils';
-import { configureDiffEditorDiagnostics, resetDiagnosticOptions } from '../../lib/monacoDiffConfig';
-import { registerDiffThemes, getDiffThemeName } from '../../lib/monacoDiffThemes';
-import { DIFF_EDITOR_BASE_OPTIONS } from './editorConfig';
-import { dispatchFileChangeEvent } from '../../lib/fileChangeEvents';
-import { useDiffEditorComments } from '../../hooks/useDiffEditorComments';
-import { useTheme } from '../../hooks/useTheme';
-import { registerActiveCodeEditor } from '../../lib/activeCodeEditor';
-
-interface FileDiffViewProps {
-  taskPath?: string;
-  taskId?: string;
-  filePath: string;
-  diffStyle: 'unified' | 'split';
-  onRefreshChanges?: () => Promise<void> | void;
-  onContentHeightChange?: (height: number) => void;
-}
-
-export const FileDiffView: React.FC<FileDiffViewProps> = ({
-  taskPath,
-  taskId,
-  filePath,
-  diffStyle,
-  onRefreshChanges,
-  onContentHeightChange,
-}) => {
-  const { effectiveTheme } = useTheme();
-  const isDark = effectiveTheme === 'dark' || effectiveTheme === 'dark-black';
-
-  const [fileData, setFileData] = useState<{
-    original: string;
-    modified: string;
-    initialModified: string;
-    language: string;
-    loading: boolean;
-    error: string | null;
-  } | null>(null);
-  const [modifiedDraft, setModifiedDraft] = useState('');
-
-  const [editorInstance, setEditorInstance] = useState<monaco.editor.IStandaloneDiffEditor | null>(
-    null
-  );
-  const editorRef = useRef<monaco.editor.IStandaloneDiffEditor | null>(null);
-  const changeDisposableRef = useRef<monaco.IDisposable | null>(null);
-  const contentSizeDisposableRef = useRef<monaco.IDisposable | null>(null);
-  const activeEditorCleanupRef = useRef<(() => void) | null>(null);
-  const handleSaveRef = useRef<() => void>(() => {});
-  const onContentHeightChangeRef = useRef(onContentHeightChange);
-  onContentHeightChangeRef.current = onContentHeightChange;
-
-  // Comment integration
-  useDiffEditorComments({
-    editor: editorInstance,
-    taskId: taskId ?? '',
-    filePath,
-  });
-
-  // Load file data
-  useEffect(() => {
-    if (!taskPath || !filePath) {
-      setFileData(null);
-      setModifiedDraft('');
-      return;
-    }
-
-    if (isBinaryFile(filePath)) {
-      setFileData({
-        original: '',
-        modified: '',
-        initialModified: '',
-        language: 'plaintext',
-        loading: false,
-        error: 'Binary file — diff not available',
-      });
-      setModifiedDraft('');
-      return;
-    }
-
-    let cancelled = false;
-    const language = getMonacoLanguageId(filePath);
-
-    setFileData({
-      original: '',
-      modified: '',
-      initialModified: '',
-      language,
-      loading: true,
-      error: null,
-    });
-    setModifiedDraft('');
-
-    const load = async () => {
-      try {
-        const diffRes = await window.electronAPI.getFileDiff({
-          taskPath,
-          filePath,
-        });
-        if (!diffRes?.success || !diffRes.diff) {
-          throw new Error(diffRes?.error || 'Failed to load diff');
-        }
-
-        const diffLines: DiffLine[] = diffRes.diff.lines;
-        const converted = convertDiffLinesToMonacoFormat(diffLines);
-        const originalContent = diffRes.diff.originalContent ?? converted.original;
-        let modifiedContent = diffRes.diff.modifiedContent ?? converted.modified;
-
-        // Re-read the file from disk to get the most up-to-date content.
-        // The agent may still be writing while we render, so this ensures
-        // we show the latest version rather than a stale backend snapshot.
-        try {
-          const readRes = await window.electronAPI.fsRead(taskPath, filePath, 2 * 1024 * 1024);
-          if (readRes?.success && readRes.content !== undefined && readRes.content !== null) {
-            modifiedContent = readRes.content.replace(/\n$/, '');
-          }
-        } catch {
-          // fallback to diff-based content
-        }
-
-        if (!cancelled) {
-          setFileData({
-            original: originalContent,
-            modified: modifiedContent,
-            initialModified: modifiedContent,
-            language,
-            loading: false,
-            error: null,
-          });
-          setModifiedDraft(modifiedContent);
-        }
-      } catch (error: unknown) {
-        if (!cancelled) {
-          setFileData({
-            original: '',
-            modified: '',
-            initialModified: '',
-            language,
-            loading: false,
-            error: (error as Error)?.message ?? String(error),
-          });
-        }
-      }
-    };
-
-    load();
-    return () => {
-      cancelled = true;
-    };
-  }, [taskPath, filePath]);
-
-  // Inject diff panel styles (always update content so theme-dependent colors refresh)
-  useEffect(() => {
-    const styleId = 'diff-panel-styles';
-    let style = document.getElementById(styleId) as HTMLStyleElement | null;
-    if (!style) {
-      style = document.createElement('style');
-      style.id = styleId;
-      document.head.appendChild(style);
-    }
-    style.textContent = `
-      .monaco-diff-editor .diffViewport { padding-left: 0 !important; }
-      .monaco-diff-editor .line-numbers { text-align: right !important; padding-right: 12px !important; padding-left: 4px !important; min-width: 40px !important; }
-      .monaco-diff-editor .monaco-editor .margin { padding-right: 8px !important; }
-      .monaco-diff-editor .original .line-numbers { display: none !important; }
-      .monaco-diff-editor .original .margin { display: none !important; }
-      .monaco-diff-editor .monaco-editor .overview-ruler { width: 3px !important; }
-      .monaco-diff-editor .margin-view-overlays .line-insert,
-      .monaco-diff-editor .margin-view-overlays .line-delete,
-      .monaco-diff-editor .margin-view-overlays .codicon-add,
-      .monaco-diff-editor .margin-view-overlays .codicon-remove,
-      .monaco-diff-editor .margin-view-overlays .codicon-diff-added,
-      .monaco-diff-editor .margin-view-overlays .codicon-diff-removed { display: none !important; visibility: hidden !important; opacity: 0 !important; }
-      .monaco-diff-editor .modified .margin-view-overlays { border-right: 1px solid ${isDark ? 'rgba(156,163,175,0.2)' : 'rgba(107,114,128,0.2)'} !important; }
-      .monaco-diff-editor .monaco-editor .margin { border-right: 1px solid ${isDark ? 'rgba(156,163,175,0.2)' : 'rgba(107,114,128,0.2)'} !important; }
-      .monaco-diff-editor .diffViewport { display: none !important; }
-      .monaco-diff-editor .monaco-scrollable-element { box-shadow: none !important; }
-      .monaco-diff-editor .overflow-guard { box-shadow: none !important; }
-      .comment-hover-icon { display: flex; align-items: center; justify-content: center; width: 22px; height: 22px; margin: 1px auto; border-radius: 6px; border: 1px solid transparent; background: transparent; cursor: pointer; pointer-events: auto; transition: background-color 0.15s ease, border-color 0.15s ease; }
-      .comment-hover-icon::before { content: ''; display: block; width: 12px; height: 12px; background-color: hsl(var(--muted-foreground)); mask-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='currentColor' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cline x1='12' y1='5' x2='12' y2='19'%3E%3C/line%3E%3Cline x1='5' y1='12' x2='19' y2='12'%3E%3C/line%3E%3C/svg%3E"); mask-size: contain; mask-repeat: no-repeat; mask-position: center; }
-      .comment-hover-icon:hover, .comment-hover-icon.comment-hover-icon-pinned { background-color: hsl(var(--foreground) / 0.08); border-color: hsl(var(--border)); }
-      .comment-hover-icon:hover::before, .comment-hover-icon.comment-hover-icon-pinned::before { background-color: hsl(var(--foreground)); }
-      .monaco-editor .glyph-margin > div { border: none !important; outline: none !important; box-shadow: none !important; }
-      .monaco-diff-editor .margin-view-overlays .cgmr,
-      .monaco-diff-editor .margin-view-overlays .codicon,
-      .monaco-diff-editor .glyph-margin-widgets .codicon,
-      .monaco-diff-editor .line-decorations .codicon,
-      .monaco-diff-editor .margin-view-overlays [class*="codicon-"] { border: none !important; outline: none !important; box-shadow: none !important; }
-      .monaco-diff-editor .dirty-diff-deleted-indicator,
-      .monaco-diff-editor .dirty-diff-modified-indicator,
-      .monaco-diff-editor .dirty-diff-added-indicator { border: none !important; box-shadow: none !important; }
-      .monaco-diff-editor .glyph-margin .codicon-arrow-left,
-      .monaco-diff-editor .glyph-margin .codicon-discard { display: none !important; }
-      .monaco-editor .view-zones { pointer-events: auto !important; }
-      .monaco-editor .view-zone { pointer-events: auto !important; }
-    `;
-  }, [isDark]);
-
-  // Register and apply Monaco diff themes
-  useEffect(() => {
-    let cancelled = false;
-    registerDiffThemes()
-      .then(async () => {
-        if (!cancelled) {
-          const monacoInstance = await loader.init();
-          monacoInstance.editor.setTheme(getDiffThemeName(effectiveTheme));
-        }
-      })
-      .catch((err: unknown) => console.warn('Failed to register diff themes:', err));
-    return () => {
-      cancelled = true;
-    };
-  }, [effectiveTheme]);
-
-  // Save handler
-  const handleSave = async () => {
-    if (!taskPath || !filePath || !fileData) return;
-    try {
-      // Ensure trailing newline (Monaco strips it, but POSIX files should end with one)
-      const content = modifiedDraft.endsWith('\n') ? modifiedDraft : modifiedDraft + '\n';
-      const res = await window.electronAPI.fsWriteFile(taskPath, filePath, content, true);
-      if (!res?.success) {
-        throw new Error(res?.error || 'Failed to save file');
-      }
-      setFileData((prev) =>
-        prev ? { ...prev, modified: modifiedDraft, initialModified: modifiedDraft } : prev
-      );
-      dispatchFileChangeEvent(taskPath, filePath);
-      if (onRefreshChanges) {
-        await onRefreshChanges();
-      }
-    } catch (error: unknown) {
-      console.error('Save failed:', error instanceof Error ? error.message : String(error));
-    }
-  };
-
-  useEffect(() => {
-    handleSaveRef.current = handleSave;
-  });
-
-  // Editor mount handler
-  const handleEditorDidMount = async (editor: monaco.editor.IStandaloneDiffEditor) => {
-    editorRef.current = editor;
-    setEditorInstance(editor);
-
-    try {
-      activeEditorCleanupRef.current?.();
-    } catch {
-      // ignore
-    }
-    activeEditorCleanupRef.current = registerActiveCodeEditor(editor.getModifiedEditor());
-
-    try {
-      const monacoInstance = await loader.init();
-
-      editor.addCommand(monacoInstance.KeyMod.CtrlCmd | monacoInstance.KeyCode.KeyS, () => {
-        handleSaveRef.current();
-      });
-
-      configureDiffEditorDiagnostics(editor, monacoInstance, {
-        disableAllValidation: true,
-        suppressSpecificErrors: false,
-      });
-    } catch (error) {
-      console.warn('Failed to configure editor:', error);
-    }
-
-    try {
-      const modifiedEditor = editor.getModifiedEditor();
-      changeDisposableRef.current?.dispose();
-      changeDisposableRef.current = modifiedEditor.onDidChangeModelContent(() => {
-        const value = modifiedEditor.getValue() ?? '';
-        setModifiedDraft(value);
-      });
-    } catch {
-      // best effort
-    }
-
-    // Report content height changes for stacked view dynamic sizing
-    try {
-      const modifiedEditor = editor.getModifiedEditor();
-      const reportHeight = () => {
-        const h = modifiedEditor.getContentHeight();
-        onContentHeightChangeRef.current?.(h);
-      };
-      reportHeight();
-      contentSizeDisposableRef.current?.dispose();
-      contentSizeDisposableRef.current = modifiedEditor.onDidContentSizeChange(() => {
-        reportHeight();
-      });
-    } catch {
-      // best effort
-    }
-  };
-
-  // Cleanup
-  useEffect(() => {
-    return () => {
-      try {
-        editorRef.current?.dispose();
-      } catch {
-        // ignore
-      }
-      editorRef.current = null;
-      try {
-        changeDisposableRef.current?.dispose();
-      } catch {
-        // ignore
-      }
-      changeDisposableRef.current = null;
-      try {
-        contentSizeDisposableRef.current?.dispose();
-      } catch {
-        // ignore
-      }
-      contentSizeDisposableRef.current = null;
-      try {
-        activeEditorCleanupRef.current?.();
-      } catch {
-        // ignore
-      }
-      activeEditorCleanupRef.current = null;
-
-      loader
-        .init()
-        .then((m) => resetDiagnosticOptions(m))
-        .catch(() => {});
-    };
-  }, []);
-
-  const monacoTheme = getDiffThemeName(effectiveTheme);
-
-  if (!fileData) {
-    return (
-      <div className="flex h-full items-center justify-center text-sm text-muted-foreground">
-        No file selected
-      </div>
-    );
-  }
-
-  if (fileData.loading) {
-    return (
-      <div className="flex h-full items-center justify-center text-muted-foreground">
-        <div className="flex items-center gap-2">
-          <div className="h-4 w-4 animate-spin rounded-full border-2 border-border border-t-gray-600 dark:border-border dark:border-t-gray-400" />
-          <span className="text-sm">Loading diff...</span>
-        </div>
-      </div>
-    );
-  }
-
-  if (fileData.error) {
-    return (
-      <div className="flex h-full items-center justify-center text-sm text-muted-foreground">
-        {fileData.error}
-      </div>
-    );
-  }
-
-  return (
-    <div className="h-full">
-      <DiffEditor
-        height="100%"
-        language={fileData.language}
-        original={fileData.original}
-        modified={modifiedDraft}
-        theme={monacoTheme}
-        options={{
-          ...DIFF_EDITOR_BASE_OPTIONS,
-          readOnly: false,
-          renderSideBySide: diffStyle === 'split',
-          glyphMargin: true,
-          lineDecorationsWidth: 16,
-        }}
-        onMount={handleEditorDidMount}
-      />
-    </div>
-  );
-};
diff --git a/src/renderer/components/diff-viewer/FileList.tsx b/src/renderer/components/diff-viewer/FileList.tsx
deleted file mode 100644
index 3ea8354e8d..0000000000
--- a/src/renderer/components/diff-viewer/FileList.tsx
+++ /dev/null
@@ -1,228 +0,0 @@
-import React, { useState } from 'react';
-import { Undo2 } from 'lucide-react';
-import { Checkbox } from '../ui/checkbox';
-import {
-  AlertDialog,
-  AlertDialogAction,
-  AlertDialogCancel,
-  AlertDialogContent,
-  AlertDialogDescription,
-  AlertDialogFooter,
-  AlertDialogHeader,
-  AlertDialogTitle,
-} from '../ui/alert-dialog';
-import type { FileChange } from '../../hooks/useFileChanges';
-
-interface FileListProps {
-  fileChanges: FileChange[];
-  selectedFile: string | null;
-  onSelectFile: (filePath: string) => void;
-  taskPath?: string;
-  onRefreshChanges?: () => Promise<void> | void;
-}
-
-export const FileList: React.FC<FileListProps> = ({
-  fileChanges,
-  selectedFile,
-  onSelectFile,
-  taskPath,
-  onRefreshChanges,
-}) => {
-  const [restoreTarget, setRestoreTarget] = useState<string | null>(null);
-
-  const tracked = fileChanges
-    .filter((f) => f.status !== 'added')
-    .sort((a, b) => a.path.localeCompare(b.path));
-  const untracked = fileChanges
-    .filter((f) => f.status === 'added')
-    .sort((a, b) => a.path.localeCompare(b.path));
-
-  const allStaged = fileChanges.length > 0 && fileChanges.every((f) => f.isStaged);
-  const trackedAllStaged = tracked.length > 0 && tracked.every((f) => f.isStaged);
-  const untrackedAllStaged = untracked.length > 0 && untracked.every((f) => f.isStaged);
-
-  const handleStageAll = async (checked: boolean) => {
-    if (!taskPath) return;
-    try {
-      if (checked) {
-        await window.electronAPI.stageAllFiles({ taskPath });
-      } else {
-        await Promise.all(
-          fileChanges
-            .filter((f) => f.isStaged)
-            .map((f) => window.electronAPI.unstageFile({ taskPath, filePath: f.path }))
-        );
-      }
-    } catch (err) {
-      console.error('Staging failed:', err);
-    }
-    await onRefreshChanges?.();
-  };
-
-  const handleGroupStage = async (files: FileChange[], checked: boolean) => {
-    if (!taskPath) return;
-    try {
-      await Promise.all(
-        files.map((file) => {
-          if (checked && !file.isStaged) {
-            return window.electronAPI.stageFile({ taskPath, filePath: file.path });
-          } else if (!checked && file.isStaged) {
-            return window.electronAPI.unstageFile({ taskPath, filePath: file.path });
-          }
-          return Promise.resolve();
-        })
-      );
-    } catch (err) {
-      console.error('Staging failed:', err);
-    }
-    await onRefreshChanges?.();
-  };
-
-  const handleFileStage = async (filePath: string, checked: boolean) => {
-    if (!taskPath) return;
-    try {
-      if (checked) {
-        await window.electronAPI.stageFile({ taskPath, filePath });
-      } else {
-        await window.electronAPI.unstageFile({ taskPath, filePath });
-      }
-    } catch (err) {
-      console.error('Staging failed:', err);
-    }
-    await onRefreshChanges?.();
-  };
-
-  const executeRestore = async () => {
-    if (!taskPath || !restoreTarget) return;
-    try {
-      await window.electronAPI.revertFile({ taskPath, filePath: restoreTarget });
-      setRestoreTarget(null);
-      await onRefreshChanges?.();
-    } catch (err) {
-      console.error('Restore failed:', err);
-      setRestoreTarget(null);
-    }
-  };
-
-  const renderFileRow = (file: FileChange, dotColor: string) => {
-    const parts = file.path.split('/');
-    const filename = parts.pop() || file.path;
-    const directory = parts.length > 0 ? parts.join('/') + '/' : '';
-
-    return (
-      <div
-        key={file.path}
-        className={`group/file flex cursor-pointer items-center gap-2 px-3 py-1.5 text-sm transition-colors hover:bg-accent/50 ${
-          selectedFile === file.path ? 'bg-accent' : ''
-        }`}
-        onClick={() => onSelectFile(file.path)}
-      >
-        <span className={`h-2 w-2 flex-shrink-0 rounded-full ${dotColor}`} />
-        <div className="min-w-0 flex-1 truncate">
-          <span className="font-medium text-foreground">{filename}</span>
-          {directory && <span className="ml-1 text-muted-foreground">{directory}</span>}
-        </div>
-        <button
-          className="flex-shrink-0 rounded p-0.5 text-muted-foreground opacity-0 transition-opacity hover:bg-accent hover:text-foreground group-hover/file:opacity-100"
-          onClick={(e) => {
-            e.stopPropagation();
-            setRestoreTarget(file.path);
-          }}
-          title="Restore file"
-        >
-          <Undo2 className="h-3.5 w-3.5" />
-        </button>
-        <Checkbox
-          checked={file.isStaged}
-          onCheckedChange={(checked) => {
-            void handleFileStage(file.path, checked === true);
-          }}
-          onClick={(e) => e.stopPropagation()}
-          className={`flex-shrink-0 transition-opacity ${file.isStaged ? '' : 'opacity-0 group-hover/file:opacity-100'}`}
-        />
-      </div>
-    );
-  };
-
-  if (fileChanges.length === 0) {
-    return (
-      <div className="flex h-full items-center justify-center p-4 text-sm text-muted-foreground">
-        No changes
-      </div>
-    );
-  }
-
-  return (
-    <>
-      <div className="flex flex-col">
-        {/* Stage All */}
-        <div className="flex h-9 items-center gap-2 border-b border-border px-3">
-          <Checkbox
-            checked={allStaged}
-            onCheckedChange={(checked) => void handleStageAll(checked === true)}
-          />
-          <span className="text-xs font-medium text-muted-foreground">Stage All</span>
-        </div>
-
-        {/* Tracked files */}
-        {tracked.length > 0 && (
-          <div className="mt-4">
-            <div className="flex items-center gap-2 px-3 py-1.5">
-              <Checkbox
-                checked={trackedAllStaged}
-                onCheckedChange={(checked) => void handleGroupStage(tracked, checked === true)}
-              />
-              <span className="text-xs font-medium tracking-wide text-muted-foreground">
-                Tracked
-              </span>
-              <span className="text-xs text-muted-foreground">({tracked.length})</span>
-            </div>
-            {tracked.map((file) => renderFileRow(file, 'bg-blue-500'))}
-          </div>
-        )}
-
-        {/* Untracked files */}
-        {untracked.length > 0 && (
-          <div className={tracked.length > 0 ? 'mt-3 pt-1' : ''}>
-            <div className="flex items-center gap-2 px-3 py-1.5">
-              <Checkbox
-                checked={untrackedAllStaged}
-                onCheckedChange={(checked) => void handleGroupStage(untracked, checked === true)}
-              />
-              <span className="text-xs font-medium tracking-wide text-muted-foreground">
-                Untracked
-              </span>
-              <span className="text-xs text-muted-foreground">({untracked.length})</span>
-            </div>
-            {untracked.map((file) => renderFileRow(file, 'bg-green-500'))}
-          </div>
-        )}
-      </div>
-
-      <AlertDialog open={!!restoreTarget} onOpenChange={(open) => !open && setRestoreTarget(null)}>
-        <AlertDialogContent className="max-w-md">
-          <AlertDialogHeader>
-            <AlertDialogTitle className="text-lg">Restore file?</AlertDialogTitle>
-          </AlertDialogHeader>
-          <AlertDialogDescription className="text-sm">
-            This will discard all uncommitted changes to{' '}
-            <code className="rounded bg-muted px-1 py-0.5 text-xs">
-              {restoreTarget?.split('/').pop()}
-            </code>{' '}
-            and restore it to the last committed version. This action cannot be undone.
-          </AlertDialogDescription>
-          <AlertDialogFooter>
-            <AlertDialogCancel>Cancel</AlertDialogCancel>
-            <AlertDialogAction
-              onClick={() => void executeRestore()}
-              className="bg-destructive px-4 py-2 text-destructive-foreground hover:bg-destructive/90"
-            >
-              <Undo2 className="mr-2 h-4 w-4" />
-              Restore
-            </AlertDialogAction>
-          </AlertDialogFooter>
-        </AlertDialogContent>
-      </AlertDialog>
-    </>
-  );
-};
diff --git a/src/renderer/components/diff-viewer/HistoryTab.tsx b/src/renderer/components/diff-viewer/HistoryTab.tsx
deleted file mode 100644
index d6c65a634b..0000000000
--- a/src/renderer/components/diff-viewer/HistoryTab.tsx
+++ /dev/null
@@ -1,201 +0,0 @@
-import React, { useEffect, useRef, useState } from 'react';
-import { ChevronDown, ChevronUp, Copy, Check } from 'lucide-react';
-import { CommitList } from './CommitList';
-import type { CommitInfo } from './CommitList';
-import { CommitFileList } from './CommitFileList';
-import { CommitFileDiffView } from './CommitFileDiffView';
-import { DiffToolbar } from './DiffToolbar';
-import { ResizablePanelGroup, ResizablePanel, ResizableHandle } from '../ui/resizable';
-
-interface HistoryTabProps {
-  taskPath?: string;
-  header?: React.ReactNode;
-  closeButton?: React.ReactNode;
-  leftPanelSize?: number;
-  onLeftPanelResize?: (size: number) => void;
-}
-
-export const HistoryTab: React.FC<HistoryTabProps> = ({
-  taskPath,
-  header,
-  closeButton,
-  leftPanelSize = 20,
-  onLeftPanelResize,
-}) => {
-  const [selectedCommit, setSelectedCommit] = useState<CommitInfo | null>(null);
-  const [selectedFile, setSelectedFile] = useState<string | null>(null);
-  const [diffStyle, setDiffStyle] = useState<'unified' | 'split'>(
-    () => (localStorage.getItem('diffViewer:diffStyle') as 'unified' | 'split') || 'unified'
-  );
-  const [detailExpanded, setDetailExpanded] = useState(false);
-  const [copied, setCopied] = useState(false);
-
-  const handleDiffStyleChange = (style: 'unified' | 'split') => {
-    setDiffStyle(style);
-    localStorage.setItem('diffViewer:diffStyle', style);
-  };
-
-  const handleSelectCommit = (commit: CommitInfo) => {
-    if (commit.hash === selectedCommit?.hash) return;
-    setSelectedCommit(commit);
-    setSelectedFile(null);
-    setDetailExpanded(false);
-    setCopied(false);
-  };
-
-  // Compute middle and right panel sizes so all three sum to 100
-  const middlePanelSize = Math.round((100 - leftPanelSize) * 0.2);
-  const rightPanelSize = 100 - leftPanelSize - middlePanelSize;
-
-  const bodyTrimmed = selectedCommit?.body?.trim() || '';
-  const hasExpandableContent = bodyTrimmed.length > 0 || !!selectedCommit?.author;
-
-  const copyTimerRef = useRef<ReturnType<typeof setTimeout>>();
-
-  const handleCopyHash = async () => {
-    if (!selectedCommit) return;
-    try {
-      await navigator.clipboard.writeText(selectedCommit.hash);
-      setCopied(true);
-      clearTimeout(copyTimerRef.current);
-      copyTimerRef.current = setTimeout(() => setCopied(false), 2000);
-    } catch {
-      // Clipboard API not available
-    }
-  };
-
-  useEffect(() => {
-    return () => clearTimeout(copyTimerRef.current);
-  }, []);
-
-  return (
-    <ResizablePanelGroup
-      direction="horizontal"
-      onLayout={(sizes) => {
-        if (sizes[0] !== undefined) onLeftPanelResize?.(sizes[0]);
-      }}
-    >
-      {/* Left column: Tabs + Commit list */}
-      <ResizablePanel defaultSize={leftPanelSize} minSize={12} maxSize={40}>
-        <div className="flex h-full flex-col border-r border-border">
-          {header}
-          <div className="flex-1 overflow-y-auto">
-            <CommitList
-              taskPath={taskPath}
-              selectedCommit={selectedCommit?.hash ?? null}
-              onSelectCommit={handleSelectCommit}
-            />
-          </div>
-        </div>
-      </ResizablePanel>
-
-      <ResizableHandle />
-
-      {/* Middle column: Commit detail + file list */}
-      <ResizablePanel defaultSize={middlePanelSize} minSize={10} maxSize={35}>
-        <div className="flex h-full flex-col border-r border-border">
-          {selectedCommit ? (
-            <>
-              {/* Commit message detail */}
-              <div className="border-b border-border px-3 py-2">
-                <div className="flex items-center gap-1">
-                  <div className="min-w-0 flex-1 truncate text-sm font-medium leading-snug">
-                    {selectedCommit.subject}
-                  </div>
-                  {hasExpandableContent && (
-                    <button
-                      className="flex-shrink-0 rounded p-0.5 text-muted-foreground hover:bg-muted hover:text-foreground"
-                      onClick={() => setDetailExpanded((prev) => !prev)}
-                    >
-                      {detailExpanded ? (
-                        <ChevronUp className="h-3.5 w-3.5" />
-                      ) : (
-                        <ChevronDown className="h-3.5 w-3.5" />
-                      )}
-                    </button>
-                  )}
-                </div>
-                {detailExpanded && (
-                  <div className="mt-1.5">
-                    <div className="flex items-center gap-2 text-xs text-muted-foreground">
-                      <span>{selectedCommit.author}</span>
-                      <button
-                        className="flex items-center gap-1 rounded px-1 py-0.5 font-mono hover:bg-muted hover:text-foreground"
-                        onClick={() => void handleCopyHash()}
-                        title="Copy commit hash"
-                      >
-                        {selectedCommit.hash.slice(0, 7)}
-                        {copied ? (
-                          <Check className="h-3 w-3 text-green-500" />
-                        ) : (
-                          <Copy className="h-3 w-3" />
-                        )}
-                      </button>
-                    </div>
-                    {bodyTrimmed && (
-                      <div className="mt-1.5 whitespace-pre-wrap text-xs leading-relaxed text-muted-foreground">
-                        {bodyTrimmed}
-                      </div>
-                    )}
-                  </div>
-                )}
-              </div>
-              {/* File list */}
-              <div className="min-h-0 flex-1 overflow-y-auto">
-                <CommitFileList
-                  taskPath={taskPath}
-                  commitHash={selectedCommit.hash}
-                  selectedFile={selectedFile}
-                  onSelectFile={setSelectedFile}
-                />
-              </div>
-            </>
-          ) : (
-            <div className="flex h-full items-center justify-center text-sm text-muted-foreground">
-              Select a commit
-            </div>
-          )}
-        </div>
-      </ResizablePanel>
-
-      <ResizableHandle />
-
-      {/* Right column: Diff view */}
-      <ResizablePanel defaultSize={rightPanelSize} minSize={30}>
-        <div className="flex h-full flex-col">
-          {selectedCommit && selectedFile ? (
-            <>
-              <DiffToolbar
-                viewMode="file"
-                onViewModeChange={() => {}}
-                diffStyle={diffStyle}
-                onDiffStyleChange={handleDiffStyleChange}
-                hideViewModeToggle
-                closeButton={closeButton}
-              />
-              <div className="min-h-0 flex-1">
-                <CommitFileDiffView
-                  taskPath={taskPath}
-                  commitHash={selectedCommit.hash}
-                  filePath={selectedFile}
-                  diffStyle={diffStyle}
-                />
-              </div>
-            </>
-          ) : (
-            <div className="flex h-full flex-col">
-              <div className="flex items-center justify-end border-b border-border px-2 py-1">
-                {closeButton}
-              </div>
-              <div className="flex flex-1 items-center justify-center text-sm text-muted-foreground">
-                {selectedCommit
-                  ? 'Select a file to view changes'
-                  : 'Select a commit to view changes'}
-              </div>
-            </div>
-          )}
-        </div>
-      </ResizablePanel>
-    </ResizablePanelGroup>
-  );
-};
diff --git a/src/renderer/components/diff-viewer/StackedDiffView.tsx b/src/renderer/components/diff-viewer/StackedDiffView.tsx
deleted file mode 100644
index 9c17037a71..0000000000
--- a/src/renderer/components/diff-viewer/StackedDiffView.tsx
+++ /dev/null
@@ -1,157 +0,0 @@
-import React, { useState, useCallback } from 'react';
-import { ChevronRight, ChevronDown } from 'lucide-react';
-import { Checkbox } from '../ui/checkbox';
-import type { FileChange } from '../../hooks/useFileChanges';
-import { isBinaryFile } from '../../lib/diffUtils';
-import { FileDiffView } from './FileDiffView';
-import { splitPath } from './pathUtils';
-
-interface StackedDiffViewProps {
-  taskPath?: string;
-  taskId?: string;
-  fileChanges: FileChange[];
-  diffStyle: 'unified' | 'split';
-  onRefreshChanges?: () => Promise<void> | void;
-}
-
-const LARGE_DIFF_LINE_THRESHOLD = 2500;
-const MIN_EDITOR_HEIGHT = 100;
-
-interface FileSectionProps {
-  file: FileChange;
-  taskPath?: string;
-  taskId?: string;
-  diffStyle: 'unified' | 'split';
-  onRefreshChanges?: () => Promise<void> | void;
-}
-
-const FileSection: React.FC<FileSectionProps> = ({
-  file,
-  taskPath,
-  taskId,
-  diffStyle,
-  onRefreshChanges,
-}) => {
-  const [expanded, setExpanded] = useState(true);
-  const [forceLoad, setForceLoad] = useState(false);
-  const [contentHeight, setContentHeight] = useState<number | null>(null);
-
-  const binary = isBinaryFile(file.path);
-  const totalDiffLines = file.additions + file.deletions;
-  const isLarge = totalDiffLines > LARGE_DIFF_LINE_THRESHOLD;
-
-  const { filename: fileName, directory: dirPath } = splitPath(file.path);
-
-  const toggleExpanded = useCallback(() => setExpanded((prev) => !prev), []);
-
-  const handleStage = useCallback(
-    async (checked: boolean) => {
-      if (!taskPath) return;
-      try {
-        if (checked) {
-          await window.electronAPI.stageFile({ taskPath, filePath: file.path });
-        } else {
-          await window.electronAPI.unstageFile({ taskPath, filePath: file.path });
-        }
-      } catch (err) {
-        console.error('Staging failed:', err);
-      }
-      await onRefreshChanges?.();
-    },
-    [taskPath, file.path, onRefreshChanges]
-  );
-
-  const editorHeight =
-    contentHeight != null ? Math.max(contentHeight, MIN_EDITOR_HEIGHT) : MIN_EDITOR_HEIGHT;
-
-  return (
-    <div className="border-b border-border">
-      <div className="flex w-full items-center gap-1.5 px-3 py-2 text-sm hover:bg-muted/50">
-        <button
-          className="flex min-w-0 flex-1 items-center gap-1.5 text-left"
-          onClick={toggleExpanded}
-        >
-          {expanded ? (
-            <ChevronDown className="h-3.5 w-3.5 flex-shrink-0 text-muted-foreground" />
-          ) : (
-            <ChevronRight className="h-3.5 w-3.5 flex-shrink-0 text-muted-foreground" />
-          )}
-          <span className="font-medium text-foreground">{fileName}</span>
-          {dirPath && <span className="truncate text-muted-foreground">{dirPath}</span>}
-        </button>
-        <span className="shrink-0 text-xs">
-          <span className="text-green-500">+{file.additions}</span>{' '}
-          <span className="text-red-500">-{file.deletions}</span>
-        </span>
-        <Checkbox
-          checked={file.isStaged}
-          onCheckedChange={(checked) => {
-            void handleStage(checked === true);
-          }}
-          onClick={(e) => e.stopPropagation()}
-          className="ml-1 flex-shrink-0"
-        />
-      </div>
-
-      {expanded && (
-        <div style={{ height: binary || (isLarge && !forceLoad) ? 120 : editorHeight }}>
-          {binary ? (
-            <div className="flex h-full items-center justify-center text-sm text-muted-foreground">
-              Binary file
-            </div>
-          ) : isLarge && !forceLoad ? (
-            <div className="flex h-full flex-col items-center justify-center gap-2 text-sm text-muted-foreground">
-              <span>Large file ({totalDiffLines} diff lines). Loading may be slow.</span>
-              <button
-                className="rounded-md border border-border px-3 py-1 text-xs font-medium hover:bg-muted"
-                onClick={() => setForceLoad(true)}
-              >
-                Load anyway
-              </button>
-            </div>
-          ) : (
-            <FileDiffView
-              taskPath={taskPath}
-              taskId={taskId}
-              filePath={file.path}
-              diffStyle={diffStyle}
-              onRefreshChanges={onRefreshChanges}
-              onContentHeightChange={setContentHeight}
-            />
-          )}
-        </div>
-      )}
-    </div>
-  );
-};
-
-export const StackedDiffView: React.FC<StackedDiffViewProps> = ({
-  taskPath,
-  taskId,
-  fileChanges,
-  diffStyle,
-  onRefreshChanges,
-}) => {
-  if (fileChanges.length === 0) {
-    return (
-      <div className="flex h-full items-center justify-center text-sm text-muted-foreground">
-        No changes to display
-      </div>
-    );
-  }
-
-  return (
-    <div className="h-full overflow-y-auto">
-      {fileChanges.map((file) => (
-        <FileSection
-          key={file.path}
-          file={file}
-          taskPath={taskPath}
-          taskId={taskId}
-          diffStyle={diffStyle}
-          onRefreshChanges={onRefreshChanges}
-        />
-      ))}
-    </div>
-  );
-};
diff --git a/src/renderer/components/diff-viewer/index.ts b/src/renderer/components/diff-viewer/index.ts
deleted file mode 100644
index 5414141f11..0000000000
--- a/src/renderer/components/diff-viewer/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { DiffViewer } from './DiffViewer';
diff --git a/src/renderer/components/diff-viewer/pathUtils.ts b/src/renderer/components/diff-viewer/pathUtils.ts
deleted file mode 100644
index 7c1d35cd00..0000000000
--- a/src/renderer/components/diff-viewer/pathUtils.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/** Split a file path into filename and directory parts. */
-export function splitPath(filePath: string): { filename: string; directory: string } {
-  const lastSlash = filePath.lastIndexOf('/');
-  if (lastSlash === -1) {
-    return { filename: filePath, directory: '' };
-  }
-  return {
-    filename: filePath.slice(lastSlash + 1),
-    directory: filePath.slice(0, lastSlash),
-  };
-}
diff --git a/src/renderer/components/diff/comments/CommentCard.tsx b/src/renderer/components/diff/comments/CommentCard.tsx
deleted file mode 100644
index d12c0d48a1..0000000000
--- a/src/renderer/components/diff/comments/CommentCard.tsx
+++ /dev/null
@@ -1,104 +0,0 @@
-import * as React from 'react';
-import { Card, CardContent, CardHeader, CardTitle } from '../../ui/card';
-import { Textarea, type TextareaProps } from '../../ui/textarea';
-import { cn } from '@/lib/utils';
-
-export function useTextareaAutoFocus(ref: React.RefObject<HTMLTextAreaElement>, active: boolean) {
-  React.useEffect(() => {
-    if (!active) return;
-    const focusTextarea = () => {
-      const textarea = ref.current;
-      if (!textarea) return;
-      textarea.focus();
-      textarea.select();
-    };
-
-    let raf2: number | null = null;
-    const raf1 = requestAnimationFrame(() => {
-      raf2 = requestAnimationFrame(() => {
-        focusTextarea();
-      });
-    });
-    const timer = setTimeout(() => {
-      focusTextarea();
-    }, 80);
-
-    return () => {
-      cancelAnimationFrame(raf1);
-      if (raf2 !== null) cancelAnimationFrame(raf2);
-      clearTimeout(timer);
-    };
-  }, [active, ref]);
-}
-
-const CommentRoot = React.forwardRef<HTMLDivElement, React.HTMLAttributes<HTMLDivElement>>(
-  ({ className, ...props }, ref) => (
-    <Card ref={ref} className={cn('flex h-[140px] w-full flex-col', className)} {...props} />
-  )
-);
-CommentRoot.displayName = 'CommentRoot';
-
-const CommentHeader = React.forwardRef<HTMLDivElement, React.HTMLAttributes<HTMLDivElement>>(
-  ({ className, ...props }, ref) => (
-    <CardHeader
-      ref={ref}
-      className={cn('flex flex-row items-center justify-between space-y-0 px-3 py-2', className)}
-      {...props}
-    />
-  )
-);
-CommentHeader.displayName = 'CommentHeader';
-
-const CommentTitle = React.forwardRef<
-  HTMLParagraphElement,
-  React.HTMLAttributes<HTMLHeadingElement>
->(({ className, ...props }, ref) => (
-  <CardTitle ref={ref} className={cn('text-sm font-semibold leading-none', className)} {...props} />
-));
-CommentTitle.displayName = 'CommentTitle';
-
-const CommentMeta = React.forwardRef<HTMLSpanElement, React.HTMLAttributes<HTMLSpanElement>>(
-  ({ className, ...props }, ref) => (
-    <span
-      ref={ref}
-      className={cn('text-xs font-normal text-muted-foreground', className)}
-      {...props}
-    />
-  )
-);
-CommentMeta.displayName = 'CommentMeta';
-
-const CommentActions = React.forwardRef<HTMLDivElement, React.HTMLAttributes<HTMLDivElement>>(
-  ({ className, ...props }, ref) => (
-    <div ref={ref} className={cn('flex items-center gap-1.5', className)} {...props} />
-  )
-);
-CommentActions.displayName = 'CommentActions';
-
-const CommentBody = React.forwardRef<HTMLDivElement, React.HTMLAttributes<HTMLDivElement>>(
-  ({ className, ...props }, ref) => (
-    <CardContent
-      ref={ref}
-      className={cn('flex-1 overflow-hidden px-3 pb-3 pt-0', className)}
-      {...props}
-    />
-  )
-);
-CommentBody.displayName = 'CommentBody';
-
-const CommentTextarea = React.forwardRef<HTMLTextAreaElement, TextareaProps>(
-  ({ className, ...props }, ref) => (
-    <Textarea ref={ref} className={cn('h-full resize-none text-sm', className)} {...props} />
-  )
-);
-CommentTextarea.displayName = 'CommentTextarea';
-
-export const Comment = {
-  Root: CommentRoot,
-  Header: CommentHeader,
-  Title: CommentTitle,
-  Meta: CommentMeta,
-  Actions: CommentActions,
-  Body: CommentBody,
-  Textarea: CommentTextarea,
-};
diff --git a/src/renderer/components/diff/comments/CommentInput.tsx b/src/renderer/components/diff/comments/CommentInput.tsx
deleted file mode 100644
index 338551b924..0000000000
--- a/src/renderer/components/diff/comments/CommentInput.tsx
+++ /dev/null
@@ -1,92 +0,0 @@
-import React, { useRef, useState } from 'react';
-import { Check, X } from 'lucide-react';
-import { Button } from '../../ui/button';
-import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '../../ui/tooltip';
-import { Comment, useTextareaAutoFocus } from './CommentCard';
-
-interface CommentInputProps {
-  lineNumber: number;
-  existingContent?: string;
-  onSubmit: (content: string) => void;
-  onCancel: () => void;
-}
-
-export const CommentInput: React.FC<CommentInputProps> = ({
-  lineNumber,
-  existingContent,
-  onSubmit,
-  onCancel,
-}) => {
-  const [content, setContent] = useState(existingContent || '');
-  const textareaRef = useRef<HTMLTextAreaElement>(null);
-
-  useTextareaAutoFocus(textareaRef, true);
-
-  const handleSubmit = () => {
-    if (content.trim()) {
-      onSubmit(content.trim());
-    }
-  };
-
-  const handleKeyDown = (e: React.KeyboardEvent) => {
-    if (e.key === 'Enter' && (e.metaKey || e.ctrlKey)) {
-      e.preventDefault();
-      handleSubmit();
-    }
-    if (e.key === 'Escape') {
-      onCancel();
-    }
-  };
-
-  return (
-    <Comment.Root>
-      <Comment.Header>
-        <Comment.Title>
-          {existingContent ? 'Edit comment' : 'Add comment'}
-          <Comment.Meta className="ml-2">(Line {lineNumber})</Comment.Meta>
-        </Comment.Title>
-        <TooltipProvider delayDuration={400}>
-          <Comment.Actions>
-            <Tooltip>
-              <TooltipTrigger asChild>
-                <Button variant="ghost" size="icon" className="h-8 w-8" onClick={onCancel}>
-                  <X className="h-4 w-4" />
-                </Button>
-              </TooltipTrigger>
-              <TooltipContent side="bottom" className="text-xs">
-                Cancel (Esc)
-              </TooltipContent>
-            </Tooltip>
-            <Tooltip>
-              <TooltipTrigger asChild>
-                <Button
-                  variant="ghost"
-                  size="icon"
-                  className="h-8 w-8"
-                  onClick={handleSubmit}
-                  disabled={!content.trim()}
-                >
-                  <Check className="h-4 w-4 text-emerald-600 dark:text-emerald-400" />
-                </Button>
-              </TooltipTrigger>
-              <TooltipContent side="bottom" className="text-xs">
-                Submit (⌘+Enter)
-              </TooltipContent>
-            </Tooltip>
-          </Comment.Actions>
-        </TooltipProvider>
-      </Comment.Header>
-
-      <Comment.Body>
-        <Comment.Textarea
-          ref={textareaRef}
-          value={content}
-          onChange={(e) => setContent(e.target.value)}
-          onKeyDown={handleKeyDown}
-          placeholder="Add a note about this line…"
-          autoFocus
-        />
-      </Comment.Body>
-    </Comment.Root>
-  );
-};
diff --git a/src/renderer/components/diff/comments/CommentWidget.tsx b/src/renderer/components/diff/comments/CommentWidget.tsx
deleted file mode 100644
index 7469bb0e2f..0000000000
--- a/src/renderer/components/diff/comments/CommentWidget.tsx
+++ /dev/null
@@ -1,162 +0,0 @@
-import React, { useRef, useState } from 'react';
-import { Check, Pencil, Trash2, X } from 'lucide-react';
-import { Button } from '../../ui/button';
-import { RelativeTime } from '../../ui/relative-time';
-import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '../../ui/tooltip';
-import { Comment, useTextareaAutoFocus } from './CommentCard';
-import type { LineComment } from '../../../types/electron-api';
-
-interface CommentWidgetProps {
-  comment: LineComment;
-  onEdit: (content: string) => void;
-  onDelete: () => void;
-}
-
-export const CommentWidget: React.FC<CommentWidgetProps> = ({ comment, onEdit, onDelete }) => {
-  const [isEditing, setIsEditing] = useState(false);
-  const [editContent, setEditContent] = useState(comment.content);
-  const editTextareaRef = useRef<HTMLTextAreaElement>(null);
-
-  useTextareaAutoFocus(editTextareaRef, isEditing);
-  React.useEffect(() => {
-    if (!isEditing) {
-      setEditContent(comment.content);
-    }
-  }, [comment.content, isEditing]);
-
-  const handleSave = () => {
-    if (editContent.trim()) {
-      onEdit(editContent.trim());
-      setIsEditing(false);
-      if (document.activeElement instanceof HTMLElement) {
-        document.activeElement.blur();
-      }
-    }
-  };
-
-  const handleCancel = () => {
-    setEditContent(comment.content);
-    setIsEditing(false);
-    if (document.activeElement instanceof HTMLElement) {
-      document.activeElement.blur();
-    }
-  };
-
-  const handleKeyDown = (e: React.KeyboardEvent) => {
-    if (e.key === 'Enter' && (e.metaKey || e.ctrlKey)) {
-      e.preventDefault();
-      handleSave();
-    }
-    if (e.key === 'Escape') {
-      handleCancel();
-    }
-  };
-
-  return (
-    <Comment.Root>
-      <Comment.Header>
-        <Comment.Title>
-          {isEditing ? 'Edit comment' : 'Comment'}
-          <Comment.Meta className="ml-2">
-            (Line {comment.lineNumber}
-            {!isEditing && (
-              <>
-                {' '}
-                • <RelativeTime value={comment.updatedAt} />
-              </>
-            )}
-            )
-          </Comment.Meta>
-        </Comment.Title>
-        <TooltipProvider delayDuration={400}>
-          <Comment.Actions>
-            {isEditing ? (
-              <>
-                <Tooltip>
-                  <TooltipTrigger asChild>
-                    <Button variant="ghost" size="icon" className="h-8 w-8" onClick={handleCancel}>
-                      <X className="h-4 w-4" />
-                    </Button>
-                  </TooltipTrigger>
-                  <TooltipContent side="bottom" className="text-xs">
-                    Cancel (Esc)
-                  </TooltipContent>
-                </Tooltip>
-                <Tooltip>
-                  <TooltipTrigger asChild>
-                    <Button
-                      variant="ghost"
-                      size="icon"
-                      className="h-8 w-8"
-                      onClick={handleSave}
-                      disabled={!editContent.trim()}
-                    >
-                      <Check className="h-4 w-4 text-emerald-600 dark:text-emerald-400" />
-                    </Button>
-                  </TooltipTrigger>
-                  <TooltipContent side="bottom" className="text-xs">
-                    Save (⌘+Enter)
-                  </TooltipContent>
-                </Tooltip>
-              </>
-            ) : (
-              <>
-                <Tooltip>
-                  <TooltipTrigger asChild>
-                    <Button
-                      variant="ghost"
-                      size="icon"
-                      className="h-8 w-8"
-                      onClick={() => setIsEditing(true)}
-                    >
-                      <Pencil className="h-4 w-4" />
-                    </Button>
-                  </TooltipTrigger>
-                  <TooltipContent side="bottom" className="text-xs">
-                    Edit
-                  </TooltipContent>
-                </Tooltip>
-                <Tooltip>
-                  <TooltipTrigger asChild>
-                    <Button
-                      variant="ghost"
-                      size="icon"
-                      className="h-8 w-8 text-destructive hover:text-destructive"
-                      onClick={onDelete}
-                    >
-                      <Trash2 className="h-4 w-4" />
-                    </Button>
-                  </TooltipTrigger>
-                  <TooltipContent side="bottom" className="text-xs">
-                    Delete
-                  </TooltipContent>
-                </Tooltip>
-              </>
-            )}
-          </Comment.Actions>
-        </TooltipProvider>
-      </Comment.Header>
-
-      <Comment.Body>
-        {!isEditing ? (
-          <Comment.Textarea
-            readOnly
-            value={comment.content}
-            onDoubleClick={() => setIsEditing(true)}
-            tabIndex={-1}
-            onMouseDown={(event) => event.preventDefault()}
-            onFocus={(event) => event.currentTarget.blur()}
-          />
-        ) : (
-          <Comment.Textarea
-            ref={editTextareaRef}
-            value={editContent}
-            onChange={(e) => setEditContent(e.target.value)}
-            onKeyDown={handleKeyDown}
-            placeholder="Update the note…"
-          />
-        )}
-      </Comment.Body>
-    </Comment.Root>
-  );
-};
diff --git a/src/renderer/components/diff/comments/index.ts b/src/renderer/components/diff/comments/index.ts
deleted file mode 100644
index e734772105..0000000000
--- a/src/renderer/components/diff/comments/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export { Comment } from './CommentCard';
-export { CommentInput } from './CommentInput';
-export { CommentWidget } from './CommentWidget';
-export { useTextareaAutoFocus } from './CommentCard';
diff --git a/src/renderer/components/diff/index.ts b/src/renderer/components/diff/index.ts
deleted file mode 100644
index 34f6c9cd77..0000000000
--- a/src/renderer/components/diff/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export { Comment } from './comments/CommentCard';
-export { CommentWidget } from './comments/CommentWidget';
-export { CommentInput } from './comments/CommentInput';
diff --git a/src/renderer/components/hooks/useIntegrationStatus.ts b/src/renderer/components/hooks/useIntegrationStatus.ts
deleted file mode 100644
index e4c4da422c..0000000000
--- a/src/renderer/components/hooks/useIntegrationStatus.ts
+++ /dev/null
@@ -1,178 +0,0 @@
-import { useEffect, useState, useCallback } from 'react';
-import { useGithubContext } from '../../contexts/GithubContextProvider';
-
-interface IntegrationStatus {
-  // Linear
-  isLinearConnected: boolean | null;
-  handleLinearConnect: (apiKey: string) => Promise<void>;
-
-  // GitHub
-  isGithubConnected: boolean;
-  githubInstalled: boolean;
-  githubLoading: boolean;
-  handleGithubConnect: () => Promise<void>;
-
-  // Jira
-  isJiraConnected: boolean | null;
-  handleJiraConnect: (credentials: {
-    siteUrl: string;
-    email: string;
-    token: string;
-  }) => Promise<void>;
-
-  // GitLab
-  isGitlabConnected: boolean | null;
-  handleGitlabConnect: (credentials: { instanceUrl: string; token: string }) => Promise<void>;
-}
-
-/**
- * Hook to manage integration connection status for Linear, GitHub, and Jira.
- * Checks connection status when isOpen becomes true.
- */
-export function useIntegrationStatus(isOpen: boolean): IntegrationStatus {
-  const [isLinearConnected, setIsLinearConnected] = useState<boolean | null>(null);
-  const [isJiraConnected, setIsJiraConnected] = useState<boolean | null>(null);
-  const [isGitlabConnected, setIsGitlabConnected] = useState<boolean | null>(null);
-
-  const {
-    installed: githubInstalled,
-    authenticated: githubAuthenticated,
-    login: githubLogin,
-    isLoading: githubLoading,
-  } = useGithubContext();
-
-  const isGithubConnected = githubInstalled && githubAuthenticated;
-
-  // Check Linear connection
-  useEffect(() => {
-    if (!isOpen) return;
-    let cancel = false;
-    const api = window.electronAPI as any;
-    if (!api?.linearCheckConnection) {
-      setIsLinearConnected(false);
-      return;
-    }
-    api
-      .linearCheckConnection()
-      .then((res: any) => {
-        if (!cancel) setIsLinearConnected(!!res?.connected);
-      })
-      .catch(() => {
-        if (!cancel) setIsLinearConnected(false);
-      });
-    return () => {
-      cancel = true;
-    };
-  }, [isOpen]);
-
-  // Check Jira connection
-  useEffect(() => {
-    if (!isOpen) return;
-    let cancel = false;
-    const api = window.electronAPI as any;
-    if (!api?.jiraCheckConnection) {
-      setIsJiraConnected(false);
-      return;
-    }
-    api
-      .jiraCheckConnection()
-      .then((res: any) => {
-        if (!cancel) setIsJiraConnected(!!res?.connected);
-      })
-      .catch(() => {
-        if (!cancel) setIsJiraConnected(false);
-      });
-    return () => {
-      cancel = true;
-    };
-  }, [isOpen]);
-
-  // Check GitLab connection
-  useEffect(() => {
-    if (!isOpen) return;
-    let cancel = false;
-    const api = window.electronAPI as any;
-    if (!api?.gitlabCheckConnection) {
-      setIsGitlabConnected(false);
-      return;
-    }
-    api
-      .gitlabCheckConnection()
-      .then((res: any) => {
-        if (!cancel) setIsGitlabConnected(!!res?.success);
-      })
-      .catch(() => {
-        if (!cancel) setIsGitlabConnected(false);
-      });
-    return () => {
-      cancel = true;
-    };
-  }, [isOpen]);
-
-  const handleLinearConnect = useCallback(async (apiKey: string) => {
-    if (!apiKey || !window?.electronAPI?.linearSaveToken) {
-      throw new Error('Invalid API key');
-    }
-    const result = await window.electronAPI.linearSaveToken(apiKey);
-    if (result?.success) {
-      setIsLinearConnected(true);
-    } else {
-      throw new Error(result?.error || 'Could not connect Linear. Try again.');
-    }
-  }, []);
-
-  const handleGithubConnect = useCallback(async () => {
-    if (!githubInstalled) {
-      try {
-        await window.electronAPI.openExternal('https://cli.github.com/manual/installation');
-      } catch (error) {
-        console.error('Failed to open GitHub CLI install docs:', error);
-      }
-      return;
-    }
-    try {
-      await githubLogin();
-    } catch (error) {
-      console.error('Failed to connect GitHub:', error);
-      throw error;
-    }
-  }, [githubInstalled, githubLogin]);
-
-  const handleJiraConnect = useCallback(
-    async (credentials: { siteUrl: string; email: string; token: string }) => {
-      const api = window.electronAPI as any;
-      const res = await api?.jiraSaveCredentials?.(credentials);
-      if (res?.success) {
-        setIsJiraConnected(true);
-      } else {
-        throw new Error(res?.error || 'Failed to connect.');
-      }
-    },
-    []
-  );
-
-  const handleGitlabConnect = useCallback(
-    async (credentials: { instanceUrl: string; token: string }) => {
-      const res = await window.electronAPI.gitlabSaveCredentials?.(credentials);
-      if (res?.success) {
-        setIsGitlabConnected(true);
-      } else {
-        throw new Error(res?.error || 'Failed to connect.');
-      }
-    },
-    []
-  );
-
-  return {
-    isLinearConnected,
-    handleLinearConnect,
-    isGithubConnected,
-    githubInstalled,
-    githubLoading,
-    handleGithubConnect,
-    isJiraConnected,
-    handleJiraConnect,
-    isGitlabConnected,
-    handleGitlabConnect,
-  };
-}
diff --git a/src/renderer/components/integrations/GitLabSetupForm.tsx b/src/renderer/components/integrations/GitLabSetupForm.tsx
deleted file mode 100644
index e06690eb58..0000000000
--- a/src/renderer/components/integrations/GitLabSetupForm.tsx
+++ /dev/null
@@ -1,100 +0,0 @@
-import React from 'react';
-import { Input } from '../ui/input';
-import { Info } from 'lucide-react';
-import gitlabLogoSvg from '../../../assets/images/GitLab.svg?raw';
-import AgentLogo from '../AgentLogo';
-
-interface Props {
-  instanceUrl: string;
-  token: string;
-  onChange: (update: Partial<{ instanceUrl: string; token: string }>) => void;
-  onSubmit: () => void | Promise<void>;
-  onClose: () => void;
-  canSubmit: boolean;
-  error?: string | null;
-  hideHeader?: boolean;
-  hideFooter?: boolean;
-}
-
-const GitLabSetupForm: React.FC<Props> = ({
-  instanceUrl,
-  token,
-  onChange,
-  onSubmit,
-  onClose,
-  canSubmit,
-  error,
-  hideHeader,
-  hideFooter,
-}) => {
-  return (
-    <div className="w-full">
-      {!hideHeader && (
-        <div className="flex items-center gap-2">
-          <span className="inline-flex items-center gap-1.5 rounded-md border border-border/70 bg-muted/40 px-2 py-0.5 text-xs font-medium">
-            <AgentLogo logo={gitlabLogoSvg} alt="GitLab" className="h-3.5 w-3.5" />
-            GitLab setup
-          </span>
-          <span className="text-xs text-muted-foreground">
-            Connect to GitLab with a personal access token.
-          </span>
-        </div>
-      )}
-      <div className={hideHeader ? 'grid gap-2' : 'mt-2 grid gap-2'}>
-        <Input
-          placeholder="https://gitlab.com"
-          value={instanceUrl}
-          onChange={(e: React.ChangeEvent<HTMLInputElement>) =>
-            onChange({ instanceUrl: e.target.value })
-          }
-          className="h-9 w-full"
-        />
-        <Input
-          type="password"
-          placeholder="Personal access token"
-          value={token}
-          onChange={(e: React.ChangeEvent<HTMLInputElement>) => onChange({ token: e.target.value })}
-          className="h-9 w-full"
-        />
-      </div>
-      <div className="mt-2 rounded-md border border-dashed border-border/70 bg-muted/40 p-2">
-        <div className="flex items-start gap-2">
-          <Info className="mt-0.5 h-4 w-4 text-muted-foreground" aria-hidden="true" />
-          <div className="text-xs leading-snug text-muted-foreground">
-            <p className="font-medium text-foreground">Required token scope</p>
-            <p className="mt-0.5">
-              Create a personal access token with the <code className="font-mono">read_api</code>{' '}
-              scope at <span className="font-medium">Settings → Access Tokens</span>.
-            </p>
-          </div>
-        </div>
-      </div>
-      {error ? (
-        <p className="mt-2 text-xs text-destructive" role="alert">
-          {error}
-        </p>
-      ) : null}
-      {!hideFooter && (
-        <div className="mt-3 flex justify-end gap-2">
-          <button
-            type="button"
-            className="inline-flex h-8 items-center justify-center rounded-md border border-border/70 bg-background px-2.5 text-xs font-medium"
-            onClick={onClose}
-          >
-            Close
-          </button>
-          <button
-            type="button"
-            className="inline-flex h-8 items-center justify-center rounded-md border border-border/70 bg-background px-2.5 text-xs font-medium disabled:opacity-60"
-            onClick={() => void onSubmit()}
-            disabled={!canSubmit}
-          >
-            Connect
-          </button>
-        </div>
-      )}
-    </div>
-  );
-};
-
-export default GitLabSetupForm;
diff --git a/src/renderer/components/integrations/JiraSetupForm.tsx b/src/renderer/components/integrations/JiraSetupForm.tsx
deleted file mode 100644
index 6f1e5067eb..0000000000
--- a/src/renderer/components/integrations/JiraSetupForm.tsx
+++ /dev/null
@@ -1,96 +0,0 @@
-import React from 'react';
-import { Input } from '../ui/input';
-import { Info } from 'lucide-react';
-import jiraLogo from '../../../assets/images/jira.png';
-
-interface Props {
-  site: string;
-  email: string;
-  token: string;
-  onChange: (update: Partial<{ site: string; email: string; token: string }>) => void;
-  onSubmit: () => void | Promise<void>;
-  onClose: () => void;
-  canSubmit: boolean;
-  error?: string | null;
-  /** When true, hides the Jira badge header (useful when rendered inside a Dialog with its own title). */
-  hideHeader?: boolean;
-  /** When true, hides the footer buttons (parent e.g. Dialog provides its own DialogFooter). */
-  hideFooter?: boolean;
-}
-
-const JiraSetupForm: React.FC<Props> = ({
-  site,
-  email,
-  token,
-  onChange,
-  onSubmit,
-  onClose,
-  canSubmit,
-  error,
-  hideHeader,
-  hideFooter,
-}) => {
-  return (
-    <div className="w-full">
-      {!hideHeader && (
-        <div className="flex items-center gap-2">
-          <span className="inline-flex items-center gap-1.5 rounded-md border border-border/70 bg-muted/40 px-2 py-0.5 text-xs font-medium">
-            <img src={jiraLogo} alt="Jira" className="h-3.5 w-3.5" />
-            Jira
-          </span>
-        </div>
-      )}
-      <div className={hideHeader ? 'grid gap-2' : 'mt-2 grid gap-2'}>
-        <Input
-          placeholder="https://your-domain.atlassian.net"
-          value={site}
-          onChange={(e: React.ChangeEvent<HTMLInputElement>) => onChange({ site: e.target.value })}
-          className="h-9 w-full"
-        />
-        <Input
-          placeholder="Email"
-          value={email}
-          onChange={(e: React.ChangeEvent<HTMLInputElement>) => onChange({ email: e.target.value })}
-          className="h-9 w-full"
-        />
-        <Input
-          type="password"
-          placeholder="API token"
-          value={token}
-          onChange={(e: React.ChangeEvent<HTMLInputElement>) => onChange({ token: e.target.value })}
-          className="h-9 w-full"
-        />
-      </div>
-      <p className="mt-2 text-xs text-muted-foreground">
-        Create an API token at{' '}
-        <span className="font-medium">id.atlassian.com/manage-profile/security/api-tokens</span>
-      </p>
-      {error ? (
-        <p className="mt-2 text-xs text-destructive" role="alert">
-          {error}
-        </p>
-      ) : null}
-      {!hideFooter && (
-        <div className="mt-3 flex justify-end gap-2">
-          <button
-            type="button"
-            className="inline-flex h-8 items-center justify-center rounded-md border border-border/70 bg-background px-2.5 text-xs font-medium"
-            onClick={onClose}
-          >
-            Close
-          </button>
-          <button
-            type="button"
-            className="inline-flex h-8 items-center justify-center rounded-md border border-border/70 bg-background px-2.5 text-xs font-medium disabled:opacity-60"
-            onClick={() => void onSubmit()}
-            disabled={!canSubmit}
-          >
-            Connect
-          </button>
-        </div>
-      )}
-    </div>
-  );
-};
-
-export default JiraSetupForm;
diff --git a/src/renderer/components/integrations/LinearSetupForm.tsx b/src/renderer/components/integrations/LinearSetupForm.tsx
deleted file mode 100644
index 99e0ec4cd4..0000000000
--- a/src/renderer/components/integrations/LinearSetupForm.tsx
+++ /dev/null
@@ -1,82 +0,0 @@
-import React from 'react';
-import { Input } from '../ui/input';
-import { Info } from 'lucide-react';
-import linearLogo from '../../../assets/images/linear-icon.png';
-
-interface Props {
-  apiKey: string;
-  onChange: (value: string) => void;
-  onSubmit: () => void | Promise<void>;
-  onClose: () => void;
-  canSubmit: boolean;
-  error?: string | null;
-}
-
-const LinearSetupForm: React.FC<Props> = ({
-  apiKey,
-  onChange,
-  onSubmit,
-  onClose,
-  canSubmit,
-  error,
-}) => {
-  return (
-    <div className="w-full">
-      <div className="flex items-center gap-2">
-        <span className="inline-flex items-center gap-1.5 rounded-md border border-border/70 bg-muted/40 px-2 py-0.5 text-xs font-medium">
-          <img src={linearLogo} alt="Linear" className="h-3.5 w-3.5" />
-          Linear setup
-        </span>
-        <span className="text-xs text-muted-foreground">
-          Connect to Linear by entering an API key.
-        </span>
-      </div>
-      <div className="mt-2 grid gap-2">
-        <Input
-          type="password"
-          placeholder="Linear API key"
-          value={apiKey}
-          onChange={(e: React.ChangeEvent<HTMLInputElement>) => onChange(e.target.value)}
-          className="h-8 w-full"
-          aria-label="Linear API key"
-        />
-      </div>
-      <div className="mt-2 rounded-md border border-dashed border-border/70 bg-muted/40 p-2">
-        <div className="flex items-start gap-2">
-          <Info className="mt-0.5 h-4 w-4 text-muted-foreground" aria-hidden="true" />
-          <div className="text-xs leading-snug text-muted-foreground">
-            <p className="font-medium text-foreground">How to get a Linear API key</p>
-            <ol className="mt-1 list-decimal pl-4">
-              <li>Open Linear, go to Settings → Security & access → Personal API keys.</li>
-              <li>Create a new token and copy the key.</li>
-            </ol>
-          </div>
-        </div>
-      </div>
-      {error ? (
-        <p className="mt-2 text-xs text-destructive" role="alert">
-          {error}
-        </p>
-      ) : null}
-      <div className="mt-3 flex justify-end gap-2">
-        <button
-          type="button"
-          className="inline-flex h-8 items-center justify-center rounded-md border border-border/70 bg-background px-2.5 text-xs font-medium"
-          onClick={onClose}
-        >
-          Close
-        </button>
-        <button
-          type="button"
-          className="inline-flex h-8 items-center justify-center rounded-md border border-border/70 bg-background px-2.5 text-xs font-medium disabled:opacity-60"
-          onClick={() => void onSubmit()}
-          disabled={!canSubmit}
-        >
-          Connect
-        </button>
-      </div>
-    </div>
-  );
-};
-
-export default LinearSetupForm;
diff --git a/src/renderer/components/kanban/AgentTooltip.tsx b/src/renderer/components/kanban/AgentTooltip.tsx
deleted file mode 100644
index 23dec27828..0000000000
--- a/src/renderer/components/kanban/AgentTooltip.tsx
+++ /dev/null
@@ -1,186 +0,0 @@
-import React from 'react';
-import { TooltipProvider, Tooltip, TooltipTrigger, TooltipContent } from '../ui/tooltip';
-import { agentAssets } from '../../providers/assets';
-import { agentMeta, type UiAgent } from '../../providers/meta';
-import AgentLogo from '../AgentLogo';
-import { GitBranch } from 'lucide-react';
-
-type AgentTooltipProps = {
-  agents: UiAgent[];
-  adminAgent?: UiAgent | null;
-  side?: 'top' | 'bottom' | 'left' | 'right';
-  delay?: number;
-  children: React.ReactNode;
-  taskPath?: string;
-  taskName?: string;
-};
-
-export const AgentTooltip: React.FC<AgentTooltipProps> = ({
-  agents,
-  adminAgent = null,
-  side = 'top',
-  delay = 150,
-  children,
-  taskPath,
-  taskName,
-}) => {
-  const items = React.useMemo(() => {
-    const seen = new Set<string>();
-    const ids = (Array.isArray(agents) ? agents : []).filter(Boolean);
-    return ids
-      .map((id) => {
-        const meta = agentMeta[id as UiAgent];
-        const asset = agentAssets[id as UiAgent];
-        const label = meta?.label || asset?.name || String(id);
-        return {
-          id: id as UiAgent,
-          label,
-          logo: asset?.logo,
-          invert: !!asset?.invertInDark,
-          isSvg: !!asset?.isSvg,
-        };
-      })
-      .filter((x) => {
-        if (!x.label) return false;
-        if (seen.has(x.label)) return false;
-        seen.add(x.label);
-        return true;
-      });
-  }, [agents]);
-
-  const adminLabel = React.useMemo(() => {
-    if (!adminAgent) return null;
-    const meta = agentMeta[adminAgent as UiAgent];
-    const asset = agentAssets[adminAgent as UiAgent];
-    return meta?.label || asset?.name || String(adminAgent);
-  }, [adminAgent]);
-
-  // Diff summary state
-  const [open, setOpen] = React.useState(false);
-  const [diffSummary, setDiffSummary] = React.useState<{
-    files: number;
-    additions: number;
-    deletions: number;
-    top: Array<{ path: string; additions: number; deletions: number; status?: string }>;
-  } | null>(null);
-
-  React.useEffect(() => {
-    let cancelled = false;
-    const fetchSummary = async () => {
-      if (!open) return;
-      if (!taskPath) return;
-      try {
-        const res = await (window as any).electronAPI?.getGitStatus?.(taskPath);
-        if (!res?.success || !Array.isArray(res?.changes)) {
-          if (!cancelled) setDiffSummary(null);
-          return;
-        }
-        const filtered = (res.changes as Array<any>).filter(
-          (c) =>
-            !String(c?.path || '').startsWith('.emdash/') && String(c?.path || '') !== 'PLANNING.md'
-        );
-        const additions = filtered.reduce((s, c) => s + Number(c?.additions || 0), 0);
-        const deletions = filtered.reduce((s, c) => s + Number(c?.deletions || 0), 0);
-        const top = filtered
-          .slice()
-          .sort((a, b) => b.additions + b.deletions - (a.additions + a.deletions))
-          .slice(0, 3)
-          .map((c) => ({
-            path: String(c.path || ''),
-            additions: Number(c.additions || 0),
-            deletions: Number(c.deletions || 0),
-            status: String(c.status || ''),
-          }));
-        if (!cancelled) setDiffSummary({ files: filtered.length, additions, deletions, top });
-      } catch {
-        if (!cancelled) setDiffSummary(null);
-      }
-    };
-    fetchSummary();
-    return () => {
-      cancelled = true;
-    };
-  }, [open, taskPath]);
-
-  if (!items || items.length === 0) return <>{children}</>;
-
-  return (
-    <TooltipProvider delayDuration={delay}>
-      <Tooltip onOpenChange={setOpen}>
-        <TooltipTrigger asChild>{children}</TooltipTrigger>
-        <TooltipContent
-          side={side}
-          className="max-w-xs rounded-md border border-border bg-background p-2 text-xs shadow-sm"
-        >
-          {taskName ? (
-            <div className="mb-1 flex items-center gap-1.5 text-code font-semibold leading-tight text-foreground">
-              <GitBranch className="h-3.5 w-3.5 shrink-0 text-muted-foreground" />
-              <span className="truncate" title={taskName}>
-                {taskName}
-              </span>
-            </div>
-          ) : null}
-          <div className="mb-1 mt-0.5 font-medium text-foreground">Agents</div>
-          <div className="flex flex-col gap-1">
-            {items.map((it) => (
-              <div key={it.id} className="flex items-center gap-2 text-foreground/90">
-                {it.logo ? (
-                  <AgentLogo
-                    logo={it.logo}
-                    alt={it.label}
-                    isSvg={it.isSvg}
-                    invertInDark={it.invert}
-                    className="h-3.5 w-3.5 shrink-0 rounded-sm"
-                  />
-                ) : (
-                  <span className="h-3.5 w-3.5 shrink-0 rounded-sm bg-muted" />
-                )}
-                <span className="leading-none">{it.label}</span>
-              </div>
-            ))}
-          </div>
-          {adminLabel ? (
-            <div className="mt-2 border-t border-border/60 pt-1 text-muted-foreground">
-              Admin: {adminLabel}
-            </div>
-          ) : null}
-
-          {taskPath && diffSummary ? (
-            <div className="mt-2 border-t border-border/60 pt-1">
-              <div className="mb-1 font-medium text-foreground">Changes</div>
-              {diffSummary.files > 0 ? (
-                <div className="flex flex-col gap-1 text-xs">
-                  <div className="flex items-center gap-2 text-foreground/90">
-                    <span className="inline-flex items-center rounded-md border border-border/70 bg-muted/40 px-1.5 py-0.5 text-[11px]">
-                      +{diffSummary.additions}
-                    </span>
-                    <span className="inline-flex items-center rounded-md border border-border/70 bg-muted/40 px-1.5 py-0.5 text-[11px]">
-                      -{diffSummary.deletions}
-                    </span>
-                    <span className="text-muted-foreground">
-                      · {diffSummary.files} file{diffSummary.files === 1 ? '' : 's'}
-                    </span>
-                  </div>
-                  {diffSummary.top.map((t) => (
-                    <div key={t.path} className="flex items-center justify-between gap-2">
-                      <div className="truncate text-foreground/90" title={t.path}>
-                        {t.path}
-                      </div>
-                      <div className="shrink-0 text-muted-foreground">
-                        +{t.additions} / -{t.deletions}
-                      </div>
-                    </div>
-                  ))}
-                </div>
-              ) : (
-                <div className="text-muted-foreground">No local changes</div>
-              )}
-            </div>
-          ) : null}
-        </TooltipContent>
-      </Tooltip>
-    </TooltipProvider>
-  );
-};
-
-export default AgentTooltip;
diff --git a/src/renderer/components/kanban/KanbanBoard.tsx b/src/renderer/components/kanban/KanbanBoard.tsx
deleted file mode 100644
index 9645cfeaa6..0000000000
--- a/src/renderer/components/kanban/KanbanBoard.tsx
+++ /dev/null
@@ -1,340 +0,0 @@
-import React from 'react';
-import type { Project, Task } from '../../types/app';
-import KanbanColumn from './KanbanColumn';
-import KanbanCard from './KanbanCard';
-import { Button } from '../ui/button';
-import { Inbox, Plus } from 'lucide-react';
-import { getAll, setStatus, type KanbanStatus } from '../../lib/kanbanStore';
-import { subscribeDerivedStatus, watchTaskPty, watchTaskActivity } from '../../lib/taskStatus';
-import { activityStore } from '../../lib/activityStore';
-import { refreshPrStatus } from '../../lib/prStatusStore';
-
-const order: KanbanStatus[] = ['todo', 'in-progress', 'done'];
-const titles: Record<KanbanStatus, string> = {
-  todo: 'To‑do',
-  'in-progress': 'In‑progress',
-  done: 'Ready for review',
-};
-
-const KanbanBoard: React.FC<{
-  project: Project;
-  onOpenTask?: (ws: Task) => void;
-  onCreateTask?: () => void;
-}> = ({ project, onOpenTask, onCreateTask }) => {
-  const [statusMap, setStatusMap] = React.useState<Record<string, KanbanStatus>>({});
-
-  React.useEffect(() => {
-    setStatusMap(getAll());
-  }, [project.id]);
-
-  // Auto-promote to in-progress when derived status reports busy.
-  React.useEffect(() => {
-    const offs: Array<() => void> = [];
-    const idleTimers = new Map<string, ReturnType<typeof setTimeout>>();
-    const wsList = project.tasks || [];
-    for (const ws of wsList) {
-      // Watch PTY output to capture terminal-based providers as activity
-      offs.push(watchTaskPty(ws.id));
-      // Watch container run state as another activity source (build/start/ready)
-      // Watch app-wide activity classification (matches left sidebar spinner)
-      offs.push(watchTaskActivity(ws.id));
-      const off = subscribeDerivedStatus(ws.id, (derived) => {
-        if (derived !== 'busy') return;
-        setStatusMap((prev) => {
-          if (prev[ws.id] === 'in-progress') return prev;
-          setStatus(ws.id, 'in-progress');
-          return { ...prev, [ws.id]: 'in-progress' };
-        });
-      });
-      offs.push(off);
-
-      // Auto-complete: when activity goes idle, schedule move to Done after a grace period.
-      const un = activityStore.subscribe(ws.id, (isBusy) => {
-        const existing = idleTimers.get(ws.id);
-        if (isBusy) {
-          if (existing) {
-            clearTimeout(existing);
-            idleTimers.delete(ws.id);
-          }
-          return;
-        }
-        // schedule auto-move to done if currently in-progress
-        if (existing) clearTimeout(existing);
-        const t = setTimeout(() => {
-          setStatusMap((prev) => {
-            const cur = prev[ws.id] || 'todo';
-            if (cur !== 'in-progress') return prev;
-            setStatus(ws.id, 'done');
-            return { ...prev, [ws.id]: 'done' };
-          });
-          idleTimers.delete(ws.id);
-        }, 10_000);
-        idleTimers.set(ws.id, t as any);
-      });
-      offs.push(un);
-    }
-
-    // Per-task: when the PTY exits and task is not busy anymore, move to Done
-    for (const ws of wsList) {
-      try {
-        const offExit = (window as any).electronAPI.onPtyExit?.(
-          ws.id,
-          (_info: { exitCode: number; signal?: number }) => {
-            let currentlyBusy = false;
-            const un = activityStore.subscribe(ws.id, (b) => {
-              currentlyBusy = b;
-            });
-            un?.();
-            if (currentlyBusy) return;
-            setStatusMap((prev) => {
-              const cur = prev[ws.id] || 'todo';
-              if (cur !== 'in-progress') return prev;
-              setStatus(ws.id, 'done');
-              return { ...prev, [ws.id]: 'done' };
-            });
-          }
-        );
-        if (offExit) offs.push(offExit);
-      } catch {}
-    }
-    return () => offs.forEach((f) => f());
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [project.id, project.tasks?.length]);
-
-  // Promote any task with local changes directly to "Ready for review" (done)
-  React.useEffect(() => {
-    let cancelled = false;
-    const wsList = project.tasks || [];
-    const check = async () => {
-      for (const ws of wsList) {
-        const variantPaths: string[] = (() => {
-          try {
-            const v = ws?.metadata?.multiAgent?.variants || [];
-            if (Array.isArray(v)) return v.map((x: any) => String(x?.path || '')).filter(Boolean);
-          } catch {}
-          return [];
-        })();
-        const paths = [ws.path, ...variantPaths].filter((p, i, arr) => p && arr.indexOf(p) === i);
-        if (paths.length === 0) continue;
-        try {
-          let hasChanges = false;
-          for (const p of paths) {
-            const res = await (window as any).electronAPI?.getGitStatus?.(p);
-            if (res?.success && Array.isArray(res?.changes) && res.changes.length > 0) {
-              hasChanges = true;
-              break;
-            }
-          }
-          if (hasChanges && !cancelled) {
-            // Do not auto-complete while busy
-            let currentlyBusy = false;
-            const un = activityStore.subscribe(ws.id, (b) => {
-              currentlyBusy = b;
-            });
-            un?.();
-            if (currentlyBusy) continue;
-            setStatusMap((prev) => {
-              if (prev[ws.id] === 'done') return prev;
-              setStatus(ws.id, 'done');
-              return { ...prev, [ws.id]: 'done' };
-            });
-          }
-        } catch {
-          // ignore per-task errors
-        }
-      }
-    };
-    check();
-    const id = window.setInterval(check, 10000);
-    return () => {
-      cancelled = true;
-      window.clearInterval(id);
-    };
-  }, [project.id, project.tasks?.length]);
-
-  // Promote any task with an open PR to "Ready for review" (done)
-  React.useEffect(() => {
-    let cancelled = false;
-    const wsList = project.tasks || [];
-    const check = async () => {
-      for (const ws of wsList) {
-        const variantPaths: string[] = (() => {
-          try {
-            const v = ws?.metadata?.multiAgent?.variants || [];
-            if (Array.isArray(v)) return v.map((x: any) => String(x?.path || '')).filter(Boolean);
-          } catch {}
-          return [];
-        })();
-        const paths = [ws.path, ...variantPaths].filter((p, i, arr) => p && arr.indexOf(p) === i);
-        if (paths.length === 0) continue;
-        try {
-          let hasPr = false;
-          for (const p of paths) {
-            const pr = await refreshPrStatus(p);
-            if (pr) {
-              hasPr = true;
-              break;
-            }
-          }
-          if (hasPr && !cancelled) {
-            // Do not auto-complete while busy
-            let currentlyBusy = false;
-            const un = activityStore.subscribe(ws.id, (b) => {
-              currentlyBusy = b;
-            });
-            un?.();
-            if (currentlyBusy) continue;
-            setStatusMap((prev) => {
-              if (prev[ws.id] === 'done') return prev;
-              setStatus(ws.id, 'done');
-              return { ...prev, [ws.id]: 'done' };
-            });
-          }
-        } catch {
-          // ignore
-        }
-      }
-    };
-    check();
-    const id = window.setInterval(check, 30000);
-    return () => {
-      cancelled = true;
-      window.clearInterval(id);
-    };
-  }, [project.id, project.tasks?.length]);
-
-  React.useEffect(() => {
-    let cancelled = false;
-    const wsList = project.tasks || [];
-    const check = async () => {
-      for (const ws of wsList) {
-        const variantPaths: string[] = (() => {
-          try {
-            const v = ws?.metadata?.multiAgent?.variants || [];
-            if (Array.isArray(v)) return v.map((x: any) => String(x?.path || '')).filter(Boolean);
-          } catch {}
-          return [];
-        })();
-        const paths = [ws.path, ...variantPaths].filter((p, i, arr) => p && arr.indexOf(p) === i);
-        if (paths.length === 0) continue;
-        try {
-          let ahead = 0;
-          for (const p of paths) {
-            const res = await (window as any).electronAPI?.getBranchStatus?.({ taskPath: p });
-            if (res?.success) {
-              const a = Number(res?.ahead ?? 0);
-              if (a > 0) {
-                ahead = a;
-                break;
-              }
-            }
-          }
-          if (ahead > 0 && !cancelled) {
-            let currentlyBusy = false;
-            const un = activityStore.subscribe(ws.id, (b) => {
-              currentlyBusy = b;
-            });
-            un?.();
-            if (currentlyBusy) continue;
-            setStatusMap((prev) => {
-              if (prev[ws.id] === 'done') return prev;
-              setStatus(ws.id, 'done');
-              return { ...prev, [ws.id]: 'done' };
-            });
-          }
-        } catch {
-          // ignore
-        }
-      }
-    };
-    check();
-    const id = window.setInterval(check, 30000);
-    return () => {
-      cancelled = true;
-      window.clearInterval(id);
-    };
-  }, [project.id, project.tasks?.length]);
-
-  const byStatus: Record<KanbanStatus, Task[]> = { todo: [], 'in-progress': [], done: [] };
-  for (const ws of project.tasks || []) {
-    const s = statusMap[ws.id] || 'todo';
-    byStatus[s].push(ws);
-  }
-  const hasAny = (project.tasks?.length ?? 0) > 0;
-
-  const handleDrop = (target: KanbanStatus, taskId: string) => {
-    setStatus(taskId, target);
-    setStatusMap({ ...statusMap, [taskId]: target });
-  };
-
-  return (
-    <div className="grid h-full w-full grid-cols-1 gap-4 p-3 sm:grid-cols-3">
-      {order.map((s) => (
-        <KanbanColumn
-          key={s}
-          title={titles[s]}
-          count={byStatus[s].length}
-          onDropCard={(id) => handleDrop(s, id)}
-          action={
-            s === 'todo' && onCreateTask ? (
-              <Button
-                variant="ghost"
-                size="icon"
-                className="h-8 w-8 rounded-md border border-border/60 bg-muted text-foreground shadow-sm hover:bg-muted/80"
-                onClick={onCreateTask}
-                aria-label="New Task"
-              >
-                <Plus className="h-4 w-4" aria-hidden="true" />
-              </Button>
-            ) : undefined
-          }
-        >
-          {byStatus[s].length === 0 ? (
-            s === 'todo' && !hasAny && onCreateTask ? (
-              <div className="flex h-full flex-col">
-                <div className="rounded-lg border border-dashed border-border/70 bg-muted/20 p-4 text-center text-sm text-muted-foreground">
-                  <div className="mx-auto mb-2 inline-flex h-7 w-7 items-center justify-center rounded-full border border-dashed border-border/60 bg-background/60">
-                    <Inbox className="h-3.5 w-3.5" aria-hidden="true" />
-                  </div>
-                  <span className="ml-2">No items</span>
-                </div>
-                <div className="flex flex-1 items-center justify-center">
-                  <Button variant="default" size="sm" onClick={onCreateTask}>
-                    <Plus className="mr-1.5 h-3.5 w-3.5" />
-                    New Task
-                  </Button>
-                </div>
-              </div>
-            ) : (
-              <div className="rounded-lg border border-dashed border-border/70 bg-muted/20 p-4 text-center text-sm text-muted-foreground">
-                <div className="mx-auto mb-2 inline-flex h-7 w-7 items-center justify-center rounded-full border border-dashed border-border/60 bg-background/60">
-                  <Inbox className="h-3.5 w-3.5" aria-hidden="true" />
-                </div>
-                <span className="ml-2">No items</span>
-              </div>
-            )
-          ) : (
-            <>
-              {byStatus[s].map((ws) => (
-                <KanbanCard key={ws.id} ws={ws} onOpen={onOpenTask} />
-              ))}
-              {s === 'todo' && onCreateTask ? (
-                <Button
-                  variant="ghost"
-                  size="sm"
-                  className="mt-1 w-full justify-center text-xs font-medium"
-                  onClick={onCreateTask}
-                >
-                  <Plus className="mr-1.5 h-3.5 w-3.5" />
-                  New Task
-                </Button>
-              ) : null}
-            </>
-          )}
-        </KanbanColumn>
-      ))}
-    </div>
-  );
-};
-
-export default KanbanBoard;
diff --git a/src/renderer/components/kanban/KanbanCard.tsx b/src/renderer/components/kanban/KanbanCard.tsx
deleted file mode 100644
index 1a0e4a9022..0000000000
--- a/src/renderer/components/kanban/KanbanCard.tsx
+++ /dev/null
@@ -1,145 +0,0 @@
-import React from 'react';
-import type { Task } from '../../types/app';
-import { agentAssets } from '../../providers/assets';
-import { agentMeta, type UiAgent } from '../../providers/meta';
-import { useTaskBusy } from '../../hooks/useTaskBusy';
-import AgentTooltip from './AgentTooltip';
-import AgentLogo from '../AgentLogo';
-import { Spinner } from '../ui/spinner';
-
-function resolveAgent(taskId: string): UiAgent | null {
-  try {
-    const v = localStorage.getItem(`taskAgent:${taskId}`);
-    if (!v) return null;
-    const id = v.trim() as UiAgent;
-    return id in agentAssets ? id : null;
-  } catch {
-    return null;
-  }
-}
-
-const KanbanCard: React.FC<{
-  ws: Task;
-  onOpen?: (ws: Task) => void;
-  draggable?: boolean;
-}> = ({ ws, onOpen, draggable = true }) => {
-  const SHOW_AGENT_LOGOS = false;
-  // Resolve single-agent from legacy localStorage (single-agent tasks)
-  const agent = resolveAgent(ws.id);
-  const asset = agent ? agentAssets[agent] : null;
-
-  // Multi‑agent badges (metadata lists selected agents)
-  const multi = ws.metadata?.multiAgent?.enabled ? ws.metadata?.multiAgent : null;
-  const agentRuns = (multi?.agentRuns?.map((ar) => ar.agent) ?? []) as UiAgent[];
-  const legacyAgents = Array.isArray(multi?.agents) ? (multi?.agents as UiAgent[]) : [];
-  const agents = Array.from(new Set([...agentRuns, ...legacyAgents]));
-  const adminAgent: UiAgent | null = (multi?.selectedAgent as UiAgent) || null;
-
-  const handleClick = () => onOpen?.(ws);
-  const busy = useTaskBusy(ws.id);
-
-  return (
-    <AgentTooltip
-      agents={agents.length > 0 ? agents : agent ? [agent] : []}
-      adminAgent={adminAgent}
-      side="top"
-      delay={150}
-      taskPath={ws.path}
-      taskName={ws.name}
-    >
-      <div
-        role="button"
-        tabIndex={0}
-        className="rounded-lg border border-border bg-background p-3 shadow-sm transition hover:bg-muted/40 focus:outline-none focus:ring-0 focus-visible:outline-none focus-visible:ring-0"
-        draggable={draggable}
-        onDragStart={(e) => {
-          e.dataTransfer.setData('text/plain', ws.id);
-        }}
-        onDoubleClick={handleClick}
-        onClick={handleClick}
-        onKeyDown={(e) => {
-          if (e.key === 'Enter' || e.key === ' ') {
-            e.preventDefault();
-            handleClick();
-          }
-        }}
-      >
-        <div className="flex w-full items-center justify-between gap-2 overflow-hidden">
-          <div className="min-w-0">
-            <div className="truncate text-sm font-medium text-foreground">{ws.name}</div>
-            <div className="mt-0.5 text-[11px] text-muted-foreground">{ws.branch}</div>
-          </div>
-
-          {agents.length > 0 && (SHOW_AGENT_LOGOS || busy) ? (
-            <div className="flex shrink-0 items-center gap-1">
-              {busy ? <Spinner size="sm" className="shrink-0 text-muted-foreground" /> : null}
-              {SHOW_AGENT_LOGOS
-                ? agents.slice(0, 3).map((a) => {
-                    const asset = agentAssets[a];
-                    if (!asset) return null;
-                    const isAdmin = adminAgent && a === adminAgent;
-                    const label = agentMeta[a]?.label ?? asset.name;
-                    const tooltip = isAdmin ? `${label} (admin)` : label;
-                    return (
-                      <span
-                        key={`${ws.id}-agent-${a}`}
-                        className={`inline-flex h-6 shrink-0 items-center gap-1 rounded-md border border-border/70 bg-muted/40 px-1.5 py-0 text-[11px] leading-none text-muted-foreground ${
-                          isAdmin ? 'ring-1 ring-primary/60' : ''
-                        }`}
-                        title={tooltip}
-                      >
-                        <AgentLogo
-                          logo={asset.logo}
-                          alt={asset.alt}
-                          isSvg={asset.isSvg}
-                          invertInDark={asset.invertInDark}
-                          className="h-3.5 w-3.5 shrink-0 rounded-sm"
-                        />
-                      </span>
-                    );
-                  })
-                : null}
-              {SHOW_AGENT_LOGOS && agents.length > 3 ? (
-                <span className="inline-flex items-center rounded-md border border-border/70 bg-muted/40 px-1.5 py-0.5 text-[11px] text-muted-foreground">
-                  +{agents.length - 3}
-                </span>
-              ) : null}
-            </div>
-          ) : asset ? (
-            SHOW_AGENT_LOGOS ? (
-              <span className="inline-flex h-6 shrink-0 items-center gap-1 rounded-md border border-border/70 bg-muted/40 px-1.5 py-0 text-[11px] leading-none text-muted-foreground">
-                {busy ? <Spinner size="sm" className="shrink-0 text-muted-foreground" /> : null}
-                <AgentLogo
-                  logo={asset.logo}
-                  alt={asset.alt}
-                  isSvg={asset.isSvg}
-                  invertInDark={asset.invertInDark}
-                  className="h-3.5 w-3.5 shrink-0 rounded-sm"
-                />
-              </span>
-            ) : busy ? (
-              <Spinner size="sm" className="shrink-0 text-muted-foreground" />
-            ) : null
-          ) : null}
-        </div>
-
-        {SHOW_AGENT_LOGOS && adminAgent && agentAssets[adminAgent] ? (
-          <div className="mt-2">
-            <span className="inline-flex items-center gap-1 rounded-md border border-border/70 bg-muted/40 px-1.5 py-0.5 text-[11px] text-muted-foreground">
-              <span className="font-medium text-foreground/80">Admin:</span>
-              <AgentLogo
-                logo={agentAssets[adminAgent].logo}
-                alt={agentAssets[adminAgent].alt}
-                isSvg={agentAssets[adminAgent].isSvg}
-                invertInDark={agentAssets[adminAgent].invertInDark}
-                className="h-3.5 w-3.5 rounded-sm"
-              />
-            </span>
-          </div>
-        ) : null}
-      </div>
-    </AgentTooltip>
-  );
-};
-
-export default KanbanCard;
diff --git a/src/renderer/components/kanban/KanbanColumn.tsx b/src/renderer/components/kanban/KanbanColumn.tsx
deleted file mode 100644
index 13acc45ad2..0000000000
--- a/src/renderer/components/kanban/KanbanColumn.tsx
+++ /dev/null
@@ -1,36 +0,0 @@
-import React from 'react';
-
-const KanbanColumn: React.FC<{
-  title: string;
-  count: number;
-  onDropCard: (taskId: string) => void;
-  children: React.ReactNode;
-  action?: React.ReactNode;
-}> = ({ title, count, onDropCard, children, action }) => {
-  return (
-    <div className="flex min-h-0 flex-col rounded-xl border border-border bg-background shadow-sm">
-      <div className="flex items-center justify-between border-b border-border px-3 py-2 text-sm font-medium">
-        <div className="flex items-center gap-2">
-          <span>{title}</span>
-          <span className="inline-flex h-5 min-w-5 items-center justify-center rounded-full bg-muted/50 px-1.5 text-[11px]">
-            {count}
-          </span>
-        </div>
-        {action ? <div className="shrink-0">{action}</div> : null}
-      </div>
-      <div
-        className="min-h-0 flex-1 space-y-2 overflow-auto p-2"
-        onDragOver={(e) => e.preventDefault()}
-        onDrop={(e) => {
-          const id = e.dataTransfer.getData('text/plain');
-          if (id) onDropCard(id);
-          e.preventDefault();
-        }}
-      >
-        {children}
-      </div>
-    </div>
-  );
-};
-
-export default KanbanColumn;
diff --git a/src/renderer/components/sidebar/LeftSidebar.tsx b/src/renderer/components/sidebar/LeftSidebar.tsx
deleted file mode 100644
index 3ab0dd4f7e..0000000000
--- a/src/renderer/components/sidebar/LeftSidebar.tsx
+++ /dev/null
@@ -1,425 +0,0 @@
-import React, { useState, useEffect, useCallback, useRef, useMemo } from 'react';
-import { motion } from 'framer-motion';
-import ReorderList from '../ReorderList';
-import { Button } from '../ui/button';
-import {
-  Sidebar,
-  SidebarContent,
-  SidebarGroup,
-  SidebarGroupContent,
-  SidebarHeader,
-  SidebarMenu,
-  SidebarMenuItem,
-  SidebarMenuButton,
-  useSidebar,
-} from '../ui/sidebar';
-import { Collapsible, CollapsibleTrigger, CollapsibleContent } from '../ui/collapsible';
-import {
-  Home,
-  Plus,
-  FolderOpen,
-  FolderClosed,
-  Puzzle,
-  Archive,
-  RotateCcw,
-  ChevronRight,
-} from 'lucide-react';
-import SidebarEmptyState from '../SidebarEmptyState';
-import { TaskItem } from '../TaskItem';
-import { TaskDeleteButton } from '../TaskDeleteButton';
-import { RemoteProjectIndicator } from '../ssh/RemoteProjectIndicator';
-import { useRemoteProject } from '../../hooks/useRemoteProject';
-import type { Project } from '../../types/app';
-import type { Task } from '../../types/chat';
-import type { ConnectionState } from '../ssh';
-import { useProjectManagementContext } from '../../contexts/ProjectManagementProvider';
-import { useTaskManagementContext } from '../../contexts/TaskManagementContext';
-import { useAppSettings } from '../../contexts/AppSettingsProvider';
-import { useLocalStorage } from '../../hooks/useLocalStorage';
-import { ProjectsGroupLabel } from './ProjectsGroupLabel';
-
-const PINNED_TASKS_KEY = 'emdash-pinned-tasks';
-const PROJECT_ORDER_KEY = 'sidebarProjectOrder';
-
-interface LeftSidebarProps {
-  onSidebarContextChange?: (state: {
-    open: boolean;
-    isMobile: boolean;
-    setOpen: (next: boolean) => void;
-  }) => void;
-  onCloseSettingsPage?: () => void;
-}
-
-const isRemoteProject = (project: Project): boolean => {
-  return Boolean(project.isRemote || project.sshConnectionId);
-};
-
-const getConnectionId = (project: Project): string | null => {
-  return project.sshConnectionId || null;
-};
-
-interface ProjectItemProps {
-  project: Project;
-}
-
-const ProjectItem = React.memo<ProjectItemProps>(({ project }) => {
-  const remote = useRemoteProject(project);
-  const connectionId = getConnectionId(project);
-
-  if (!connectionId && !isRemoteProject(project)) {
-    return <span className="flex-1 truncate">{project.name}</span>;
-  }
-
-  return (
-    <div className="flex min-w-0 items-center gap-2">
-      {connectionId && (
-        <RemoteProjectIndicator
-          host={remote.host || undefined}
-          connectionState={remote.connectionState as ConnectionState}
-          size="md"
-          onReconnect={remote.reconnect}
-          disabled={remote.isLoading}
-        />
-      )}
-      <span className="flex-1 truncate">{project.name}</span>
-    </div>
-  );
-});
-ProjectItem.displayName = 'ProjectItem';
-
-export const LeftSidebar: React.FC<LeftSidebarProps> = ({
-  onSidebarContextChange,
-  onCloseSettingsPage,
-}) => {
-  const { open, isMobile, setOpen } = useSidebar();
-  const {
-    projects,
-    selectedProject,
-    showHomeView: isHomeView,
-    showSkillsView: isSkillsView,
-    handleSelectProject: onSelectProject,
-    handleGoHome: onGoHome,
-    handleOpenProject: onOpenProject,
-    handleGoToSkills: onGoToSkills,
-  } = useProjectManagementContext();
-
-  // --- Project order (localStorage only — context holds raw DB order) ---
-  const [projectOrder, setProjectOrder] = useLocalStorage<string[]>(PROJECT_ORDER_KEY, []);
-
-  const sortedProjects = useMemo(() => {
-    if (!projectOrder.length) return projects;
-    return [...projects].sort((a, b) => {
-      const ai = projectOrder.indexOf(a.id);
-      const bi = projectOrder.indexOf(b.id);
-      if (ai === -1 && bi === -1) return 0; // both new → keep relative DB order
-      if (ai === -1) return -1; // a is new → float to top
-      if (bi === -1) return 1; // b is new → float to top
-      return ai - bi;
-    });
-  }, [projects, projectOrder]);
-
-  const handleReorderProjects = useCallback(
-    (newOrder: Project[]) => {
-      setProjectOrder(newOrder.map((p) => p.id));
-    },
-    [setProjectOrder]
-  );
-
-  const {
-    activeTask,
-    tasksByProjectId,
-    archivedTasksByProjectId,
-    handleSelectTask: onSelectTask,
-    handleStartCreateTaskFromSidebar: onCreateTaskForProject,
-    handleRenameTask: onRenameTask,
-    handleArchiveTask: onArchiveTask,
-    handleRestoreTask: onRestoreTask,
-    handleDeleteTask,
-  } = useTaskManagementContext();
-
-  const { settings } = useAppSettings();
-  const taskHoverAction = settings?.interface?.taskHoverAction ?? 'delete';
-
-  const [pinnedTaskIdsArray, setPinnedTaskIdsArray] = useLocalStorage<string[]>(
-    PINNED_TASKS_KEY,
-    []
-  );
-  const pinnedTaskIds = useMemo(() => new Set(pinnedTaskIdsArray), [pinnedTaskIdsArray]);
-
-  const handlePinTask = useCallback(
-    (task: Task) => {
-      setPinnedTaskIdsArray((prev) =>
-        prev.includes(task.id) ? prev.filter((id) => id !== task.id) : [...prev, task.id]
-      );
-    },
-    [setPinnedTaskIdsArray]
-  );
-
-  // Remove pinned IDs for tasks that no longer exist (deleted or archived)
-  useEffect(() => {
-    if (!pinnedTaskIdsArray.length) return;
-    const allActiveIds = new Set(
-      Object.values(tasksByProjectId)
-        .flat()
-        .map((t) => t.id)
-    );
-    const cleaned = pinnedTaskIdsArray.filter((id) => allActiveIds.has(id));
-    if (cleaned.length !== pinnedTaskIdsArray.length) {
-      setPinnedTaskIdsArray(cleaned);
-    }
-  }, [tasksByProjectId, pinnedTaskIdsArray, setPinnedTaskIdsArray]);
-
-  const [forceOpenIds, setForceOpenIds] = useState<Set<string>>(new Set());
-  const prevTaskCountsRef = useRef<Map<string, number>>(new Map());
-
-  useEffect(() => {
-    const prev = prevTaskCountsRef.current;
-    for (const project of projects) {
-      const taskCount = tasksByProjectId[project.id]?.length ?? 0;
-      const prevCount = prev.get(project.id) ?? 0;
-      if (prevCount === 0 && taskCount > 0) {
-        setForceOpenIds((s) => new Set(s).add(project.id));
-      }
-      prev.set(project.id, taskCount);
-    }
-  }, [projects, tasksByProjectId]);
-
-  useEffect(() => {
-    onSidebarContextChange?.({ open, isMobile, setOpen });
-  }, [open, isMobile, setOpen, onSidebarContextChange]);
-
-  const handleNavigationWithCloseSettings = useCallback(
-    (callback: () => void) => {
-      onCloseSettingsPage?.();
-      callback();
-    },
-    [onCloseSettingsPage]
-  );
-
-  return (
-    <div className="relative h-full">
-      <Sidebar className="!w-full lg:border-r-0">
-        <SidebarHeader className="border-b-0 px-3 py-3">
-          <SidebarMenu>
-            <SidebarMenuItem>
-              <SidebarMenuButton
-                asChild
-                className={`min-w-0 ${isHomeView ? 'bg-black/[0.06] dark:bg-white/[0.08]' : ''}`}
-              >
-                <Button
-                  variant="ghost"
-                  onClick={() => handleNavigationWithCloseSettings(onGoHome)}
-                  aria-label="Home"
-                  className="w-full justify-start"
-                >
-                  <Home className="h-5 w-5 text-muted-foreground sm:h-4 sm:w-4" />
-                  <span className="text-sm font-medium">Home</span>
-                </Button>
-              </SidebarMenuButton>
-            </SidebarMenuItem>
-            {onGoToSkills && (
-              <SidebarMenuItem>
-                <SidebarMenuButton
-                  asChild
-                  className={`min-w-0 ${isSkillsView ? 'bg-black/[0.06] dark:bg-white/[0.08]' : ''}`}
-                >
-                  <Button
-                    variant="ghost"
-                    onClick={() => handleNavigationWithCloseSettings(onGoToSkills)}
-                    aria-label="Skills"
-                    className="w-full justify-start"
-                  >
-                    <Puzzle className="h-5 w-5 text-muted-foreground sm:h-4 sm:w-4" />
-                    <span className="text-sm font-medium">Skills</span>
-                  </Button>
-                </SidebarMenuButton>
-              </SidebarMenuItem>
-            )}
-          </SidebarMenu>
-        </SidebarHeader>
-        <SidebarContent className="flex flex-col">
-          <SidebarGroup>
-            <ProjectsGroupLabel />
-            <SidebarGroupContent>
-              <SidebarMenu>
-                <ReorderList
-                  as="div"
-                  axis="y"
-                  items={sortedProjects}
-                  onReorder={(newOrder) => handleReorderProjects(newOrder as Project[])}
-                  className="m-0 flex min-w-0 list-none flex-col gap-1 p-0"
-                  itemClassName="relative group cursor-pointer rounded-md list-none min-w-0"
-                  getKey={(p) => (p as Project).id}
-                >
-                  {(project) => {
-                    const typedProject = project as Project;
-                    const isProjectActive = selectedProject?.id === typedProject.id && !activeTask;
-                    return (
-                      <SidebarMenuItem>
-                        <Collapsible
-                          defaultOpen
-                          open={forceOpenIds.has(typedProject.id) ? true : undefined}
-                          onOpenChange={() => {
-                            if (forceOpenIds.has(typedProject.id)) {
-                              setForceOpenIds((s) => {
-                                const n = new Set(s);
-                                n.delete(typedProject.id);
-                                return n;
-                              });
-                            }
-                          }}
-                          className="group/collapsible"
-                        >
-                          <div
-                            className={`group/project relative flex w-full min-w-0 items-center gap-1.5 rounded-md py-1.5 pl-1 pr-1 text-sm font-medium hover:bg-accent ${isProjectActive ? 'bg-black/[0.06] dark:bg-white/[0.08]' : ''}`}
-                          >
-                            <CollapsibleTrigger asChild>
-                              <button
-                                type="button"
-                                className="flex-shrink-0 rounded p-0.5 outline-none hover:bg-black/5 dark:hover:bg-white/5"
-                              >
-                                <FolderOpen className="hidden h-4 w-4 text-foreground/60 group-data-[state=open]/collapsible:block" />
-                                <FolderClosed className="block h-4 w-4 text-foreground/60 group-data-[state=open]/collapsible:hidden" />
-                              </button>
-                            </CollapsibleTrigger>
-                            <motion.button
-                              type="button"
-                              className="min-w-0 flex-1 truncate bg-transparent text-left text-foreground/60"
-                              whileTap={{ scale: 0.97 }}
-                              onClick={() =>
-                                handleNavigationWithCloseSettings(() =>
-                                  onSelectProject(typedProject)
-                                )
-                              }
-                            >
-                              <ProjectItem project={typedProject} />
-                            </motion.button>
-                            {onCreateTaskForProject && (
-                              <button
-                                type="button"
-                                className="p-0.5 text-muted-foreground hover:bg-black/5"
-                                onClick={() =>
-                                  handleNavigationWithCloseSettings(() =>
-                                    onCreateTaskForProject(typedProject)
-                                  )
-                                }
-                              >
-                                <Plus className="h-4 w-4" />
-                              </button>
-                            )}
-                          </div>
-
-                          <CollapsibleContent
-                            forceMount
-                            className="mt-1 min-w-0 data-[state=closed]:hidden"
-                          >
-                            <div className="flex min-w-0 flex-col gap-1">
-                              {(tasksByProjectId[typedProject.id] ?? [])
-                                .slice()
-                                .sort(
-                                  (a, b) =>
-                                    (pinnedTaskIds.has(b.id) ? 1 : 0) -
-                                    (pinnedTaskIds.has(a.id) ? 1 : 0)
-                                )
-                                .map((task) => {
-                                  const isActive = activeTask?.id === task.id;
-                                  return (
-                                    <motion.div
-                                      key={task.id}
-                                      whileTap={{ scale: 0.97 }}
-                                      onClick={() =>
-                                        handleNavigationWithCloseSettings(() =>
-                                          onSelectTask?.(task)
-                                        )
-                                      }
-                                      className={`group/task min-w-0 rounded-md py-1.5 pl-1 pr-2 hover:bg-accent ${isActive ? 'bg-black/[0.06] dark:bg-white/[0.08]' : ''}`}
-                                    >
-                                      <TaskItem
-                                        task={task}
-                                        showDelete={true}
-                                        showDirectBadge={false}
-                                        isPinned={pinnedTaskIds.has(task.id)}
-                                        onPin={() => handlePinTask(task)}
-                                        onRename={(n) => onRenameTask?.(typedProject, task, n)}
-                                        onDelete={() => handleDeleteTask(typedProject, task)}
-                                        onArchive={() => onArchiveTask?.(typedProject, task)}
-                                        primaryAction={taskHoverAction}
-                                      />
-                                    </motion.div>
-                                  );
-                                })}
-                              {(archivedTasksByProjectId[typedProject.id]?.length ?? 0) > 0 && (
-                                <Collapsible className="mt-1">
-                                  <CollapsibleTrigger asChild>
-                                    <button className="flex w-full items-center gap-2 rounded-md px-2 py-1.5 text-xs text-muted-foreground hover:bg-black/5">
-                                      <Archive className="h-3 w-3 opacity-50" />
-                                      <span>
-                                        Archived ({archivedTasksByProjectId[typedProject.id].length}
-                                        )
-                                      </span>
-                                      <ChevronRight className="ml-auto h-3 w-3 transition-transform group-data-[state=open]/archived:rotate-90" />
-                                    </button>
-                                  </CollapsibleTrigger>
-                                  <CollapsibleContent>
-                                    <div className="ml-1.5 space-y-0.5 border-l pl-2">
-                                      {archivedTasksByProjectId[typedProject.id].map(
-                                        (archivedTask) => (
-                                          <div
-                                            key={archivedTask.id}
-                                            className="flex min-w-0 items-center justify-between gap-2 px-2 py-1.5 text-muted-foreground"
-                                          >
-                                            <span className="truncate text-xs font-medium">
-                                              {archivedTask.name}
-                                            </span>
-                                            <div className="flex items-center gap-0.5 opacity-0 group-hover:opacity-100">
-                                              <Button
-                                                variant="ghost"
-                                                size="icon-sm"
-                                                onClick={() =>
-                                                  onRestoreTask?.(typedProject, archivedTask)
-                                                }
-                                              >
-                                                <RotateCcw className="h-3 w-3" />
-                                              </Button>
-                                              <TaskDeleteButton
-                                                taskName={archivedTask.name}
-                                                taskId={archivedTask.id}
-                                                taskPath={archivedTask.path}
-                                                useWorktree={archivedTask.useWorktree !== false}
-                                                onConfirm={() =>
-                                                  handleDeleteTask(typedProject, archivedTask)
-                                                }
-                                              />
-                                            </div>
-                                          </div>
-                                        )
-                                      )}
-                                    </div>
-                                  </CollapsibleContent>
-                                </Collapsible>
-                              )}
-                            </div>
-                          </CollapsibleContent>
-                        </Collapsible>
-                      </SidebarMenuItem>
-                    );
-                  }}
-                </ReorderList>
-              </SidebarMenu>
-            </SidebarGroupContent>
-          </SidebarGroup>
-          {projects.length === 0 && (
-            <div className="mt-auto">
-              <SidebarEmptyState
-                title="Put your agents to work"
-                description="Create a task and run one or more agents on it in parallel."
-                actionLabel="Open Folder"
-                onAction={onOpenProject}
-              />
-            </div>
-          )}
-        </SidebarContent>
-      </Sidebar>
-    </div>
-  );
-};
diff --git a/src/renderer/components/sidebar/ProjectsGroupLabel.tsx b/src/renderer/components/sidebar/ProjectsGroupLabel.tsx
deleted file mode 100644
index d753b731fb..0000000000
--- a/src/renderer/components/sidebar/ProjectsGroupLabel.tsx
+++ /dev/null
@@ -1,95 +0,0 @@
-import { FolderOpen, FolderPlus, Github, Plus, Server } from 'lucide-react';
-import { Button } from '../ui/button';
-import { Popover, PopoverContent, PopoverTrigger } from '../ui/popover';
-import { SidebarGroupLabel } from '../ui/sidebar';
-import React from 'react';
-import { useProjectManagementContext } from '../../contexts/ProjectManagementProvider';
-
-export function ProjectsGroupLabel() {
-  const {
-    handleOpenProject: onOpenProject,
-    handleNewProjectClick: onNewProject,
-    handleCloneProjectClick: onCloneProject,
-    handleAddRemoteProject: onAddRemoteProject,
-  } = useProjectManagementContext();
-  return (
-    <SidebarGroupLabel className="flex items-center justify-between pr-0">
-      <span className="cursor-default select-none text-sm font-medium normal-case tracking-normal text-foreground/30">
-        Projects
-      </span>
-
-      <Popover>
-        <PopoverTrigger asChild>
-          <Button variant="ghost" size="icon-sm" className="text-foreground/30">
-            <FolderPlus className="h-3.5 w-3.5" />
-          </Button>
-        </PopoverTrigger>
-        <PopoverContent className="w-48 p-1" align="start" sideOffset={4}>
-          <div className="space-y-1">
-            <MenuItemButton
-              icon={FolderOpen}
-              label="Open Folder"
-              ariaLabel="Open"
-              onClick={() => onOpenProject?.()}
-            />
-            <MenuItemButton
-              icon={Plus}
-              label="Create New"
-              ariaLabel="New"
-              onClick={() => onNewProject?.()}
-            />
-            <MenuItemButton
-              icon={Github}
-              label="Clone"
-              ariaLabel="Clone"
-              onClick={() => onCloneProject?.()}
-            />
-            <MenuItemButton
-              icon={Server}
-              label="Remote Project"
-              ariaLabel="Remote Project"
-              onClick={() => onAddRemoteProject?.()}
-            />
-          </div>
-        </PopoverContent>
-      </Popover>
-    </SidebarGroupLabel>
-  );
-}
-
-interface MenuItemButtonProps {
-  icon: React.ComponentType<{ className?: string }>;
-  label: string;
-  ariaLabel: string;
-  onClick: () => void;
-}
-
-const MenuItemButton = React.memo<MenuItemButtonProps>(
-  ({ icon: Icon, label, ariaLabel, onClick }) => {
-    const handleKeyDown = React.useCallback(
-      (e: React.KeyboardEvent) => {
-        if (e.key === 'Enter' || e.key === ' ') {
-          e.preventDefault();
-          onClick();
-        }
-      },
-      [onClick]
-    );
-
-    return (
-      <button
-        type="button"
-        role="menuitem"
-        tabIndex={0}
-        aria-label={ariaLabel}
-        className="flex w-full items-center gap-2 rounded-md px-2 py-2 text-sm text-foreground hover:bg-muted dark:text-muted-foreground dark:hover:bg-accent"
-        onClick={onClick}
-        onKeyDown={handleKeyDown}
-      >
-        <Icon className="h-4 w-4" />
-        {label}
-      </button>
-    );
-  }
-);
-MenuItemButton.displayName = 'MenuItemButton';
diff --git a/src/renderer/components/skills/SkillCard.tsx b/src/renderer/components/skills/SkillCard.tsx
deleted file mode 100644
index ed67ca17a1..0000000000
--- a/src/renderer/components/skills/SkillCard.tsx
+++ /dev/null
@@ -1,85 +0,0 @@
-import React, { useState } from 'react';
-import { motion } from 'framer-motion';
-import { Plus, Pencil } from 'lucide-react';
-import type { CatalogSkill } from '@shared/skills/types';
-import { useIsMonochrome } from '../../hooks/useIsMonochrome';
-
-interface SkillCardProps {
-  skill: CatalogSkill;
-  onSelect: (skill: CatalogSkill) => void;
-  onInstall: (skillId: string) => void;
-}
-
-const SkillIcon: React.FC<{ skill: CatalogSkill }> = ({ skill }) => {
-  const [imgError, setImgError] = useState(false);
-  const letter = skill.displayName.charAt(0).toUpperCase();
-  const isMonochrome = useIsMonochrome(skill.iconUrl);
-
-  if (skill.iconUrl && !imgError) {
-    return (
-      <div className="flex h-12 w-12 flex-shrink-0 items-center justify-center overflow-hidden rounded-xl bg-muted/40">
-        <img
-          src={skill.iconUrl}
-          alt=""
-          className={`h-10 w-10 rounded-lg object-contain ${isMonochrome !== false ? 'dark:invert' : ''}`.trim()}
-          onError={() => setImgError(true)}
-          loading="lazy"
-        />
-      </div>
-    );
-  }
-
-  return (
-    <div className="flex h-12 w-12 flex-shrink-0 items-center justify-center rounded-xl bg-muted/40 text-base font-semibold text-foreground/60 dark:text-white">
-      {letter}
-    </div>
-  );
-};
-
-const SkillCard: React.FC<SkillCardProps> = ({ skill, onSelect, onInstall }) => {
-  return (
-    <motion.div
-      role="button"
-      tabIndex={0}
-      whileTap={{ scale: 0.97 }}
-      transition={{ duration: 0.1, ease: 'easeInOut' }}
-      onClick={() => onSelect(skill)}
-      onKeyDown={(e) => {
-        if (e.key === 'Enter' || e.key === ' ') {
-          e.preventDefault();
-          onSelect(skill);
-        }
-      }}
-      className="group flex w-full cursor-pointer items-center gap-3 rounded-lg border border-border bg-muted/20 p-4 text-left text-card-foreground shadow-sm transition-all hover:bg-muted/40 hover:shadow-md"
-    >
-      <SkillIcon skill={skill} />
-
-      {/* Content */}
-      <div className="min-w-0 flex-1">
-        <h3 className="truncate text-sm font-semibold">{skill.displayName}</h3>
-        <p className="mt-0.5 line-clamp-1 text-xs text-muted-foreground">{skill.description}</p>
-      </div>
-
-      {/* Action */}
-      <div className="flex-shrink-0 self-center">
-        {skill.installed ? (
-          <Pencil className="h-4 w-4 text-muted-foreground opacity-0 transition-opacity group-hover:opacity-100" />
-        ) : (
-          <button
-            type="button"
-            onClick={(e) => {
-              e.stopPropagation();
-              onInstall(skill.id);
-            }}
-            className="rounded-md p-1 text-muted-foreground transition-colors hover:bg-muted hover:text-foreground"
-            aria-label={`Install ${skill.displayName}`}
-          >
-            <Plus className="h-4 w-4" />
-          </button>
-        )}
-      </div>
-    </motion.div>
-  );
-};
-
-export default SkillCard;
diff --git a/src/renderer/components/skills/SkillDetailModal.tsx b/src/renderer/components/skills/SkillDetailModal.tsx
deleted file mode 100644
index a1a7a68550..0000000000
--- a/src/renderer/components/skills/SkillDetailModal.tsx
+++ /dev/null
@@ -1,175 +0,0 @@
-import React, { useState, useEffect, useCallback } from 'react';
-import { Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle } from '../ui/dialog';
-import { MarkdownRenderer } from '../ui/markdown-renderer';
-import { Button } from '../ui/button';
-import { Separator } from '../ui/separator';
-import { Check, FolderOpen, Trash2 } from 'lucide-react';
-import type { CatalogSkill } from '@shared/skills/types';
-import { parseFrontmatter } from '@shared/skills/validation';
-import { useIsMonochrome } from '../../hooks/useIsMonochrome';
-
-const ModalSkillIcon: React.FC<{ skill: CatalogSkill }> = ({ skill }) => {
-  const letter = skill.displayName.charAt(0).toUpperCase();
-  const isMonochrome = useIsMonochrome(skill.iconUrl);
-
-  if (skill.iconUrl) {
-    return (
-      <div className="flex h-12 w-12 flex-shrink-0 items-center justify-center overflow-hidden rounded-xl bg-muted/40">
-        <img
-          src={skill.iconUrl}
-          alt=""
-          className={`h-10 w-10 rounded-lg object-contain ${isMonochrome !== false ? 'dark:invert' : ''}`.trim()}
-        />
-      </div>
-    );
-  }
-
-  return (
-    <div className="flex h-12 w-12 flex-shrink-0 items-center justify-center rounded-xl bg-muted/40 text-base font-semibold text-foreground/60 dark:text-white">
-      {letter}
-    </div>
-  );
-};
-
-interface SkillDetailModalProps {
-  skill: CatalogSkill | null;
-  isOpen: boolean;
-  onClose: () => void;
-  onInstall: (skillId: string) => Promise<boolean>;
-  onUninstall: (skillId: string) => Promise<boolean>;
-  onOpenTerminal?: (skillPath: string) => void;
-}
-
-const SkillDetailModal: React.FC<SkillDetailModalProps> = ({
-  skill,
-  isOpen,
-  onClose,
-  onInstall,
-  onUninstall,
-  onOpenTerminal,
-}) => {
-  const [isProcessing, setIsProcessing] = useState(false);
-  const [justInstalled, setJustInstalled] = useState(false);
-
-  // Reset justInstalled when the modal opens with a different skill
-  useEffect(() => {
-    if (isOpen) setJustInstalled(false);
-  }, [isOpen, skill?.id]);
-
-  const handleInstall = useCallback(async () => {
-    if (!skill) return;
-    setIsProcessing(true);
-    try {
-      const success = await onInstall(skill.id);
-      if (success) setJustInstalled(true);
-    } finally {
-      setIsProcessing(false);
-    }
-  }, [skill, onInstall]);
-
-  const handleUninstall = useCallback(async () => {
-    if (!skill) return;
-    setIsProcessing(true);
-    try {
-      await onUninstall(skill.id);
-      onClose();
-    } finally {
-      setIsProcessing(false);
-    }
-  }, [skill, onUninstall, onClose]);
-
-  const handleOpen = useCallback(() => {
-    if (skill?.localPath && onOpenTerminal) {
-      onOpenTerminal(skill.localPath);
-    }
-  }, [skill, onOpenTerminal]);
-
-  if (!skill) return null;
-
-  const body = skill.skillMdContent ? parseFrontmatter(skill.skillMdContent).body.trim() : '';
-
-  return (
-    <Dialog open={isOpen} onOpenChange={(open) => !open && !isProcessing && onClose()}>
-      <DialogContent className="max-w-lg">
-        <DialogHeader>
-          <div className="flex items-center gap-3">
-            <ModalSkillIcon skill={skill} />
-            <div className="min-w-0 flex-1">
-              <DialogTitle className="text-base">{skill.displayName}</DialogTitle>
-            </div>
-          </div>
-        </DialogHeader>
-
-        {skill.source !== 'local' && (
-          <div className="flex items-center gap-1.5 text-sm text-muted-foreground">
-            <img
-              src={
-                skill.source === 'openai'
-                  ? 'https://github.com/openai.png'
-                  : 'https://github.com/anthropics.png'
-              }
-              alt=""
-              className="h-5 w-5 rounded-sm"
-            />
-            <span>From {skill.source === 'openai' ? 'OpenAI' : 'Anthropic'} skill library</span>
-          </div>
-        )}
-
-        <Separator />
-
-        {skill.defaultPrompt && (
-          <div className="space-y-1">
-            <p className="text-xs font-medium text-muted-foreground">Example prompt</p>
-            <pre className="whitespace-pre-wrap break-words rounded-md bg-muted/40 px-3 py-2 text-xs text-foreground">
-              {skill.defaultPrompt}
-            </pre>
-          </div>
-        )}
-
-        {body && (
-          <MarkdownRenderer
-            content={body}
-            variant="compact"
-            className="max-h-60 overflow-y-auto rounded-md bg-muted/20 px-3 py-2 text-xs text-muted-foreground"
-          />
-        )}
-
-        <DialogFooter className="gap-2 sm:gap-2">
-          {skill.installed && (
-            <>
-              <Button
-                variant="ghost"
-                size="sm"
-                onClick={handleUninstall}
-                disabled={isProcessing}
-                className="text-destructive hover:text-destructive"
-              >
-                <Trash2 className="mr-1.5 h-3.5 w-3.5" />
-                Uninstall
-              </Button>
-              {skill.localPath && onOpenTerminal && (
-                <Button variant="outline" size="sm" onClick={handleOpen}>
-                  <FolderOpen className="mr-1.5 h-3.5 w-3.5" />
-                  Open
-                </Button>
-              )}
-            </>
-          )}
-          {!skill.installed && !justInstalled && (
-            <Button size="sm" onClick={handleInstall} disabled={isProcessing}>
-              {isProcessing ? 'Installing...' : 'Install'}
-            </Button>
-          )}
-          {justInstalled && (
-            <Button size="sm" variant="outline" disabled>
-              <Check className="mr-1.5 h-3.5 w-3.5" />
-              Installed
-            </Button>
-          )}
-        </DialogFooter>
-      </DialogContent>
-    </Dialog>
-  );
-};
-
-export default SkillDetailModal;
diff --git a/src/renderer/components/skills/SkillsView.tsx b/src/renderer/components/skills/SkillsView.tsx
deleted file mode 100644
index 8a6a909a2b..0000000000
--- a/src/renderer/components/skills/SkillsView.tsx
+++ /dev/null
@@ -1,303 +0,0 @@
-import React, { useState } from 'react';
-import { RefreshCw, Search, Plus, Loader2, Sparkles } from 'lucide-react';
-import { Button } from '../ui/button';
-import { Input } from '../ui/input';
-import { Textarea } from '../ui/textarea';
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle,
-} from '../ui/dialog';
-import { Label } from '../ui/label';
-import { Separator } from '../ui/separator';
-import SkillCard from './SkillCard';
-import SkillDetailModal from './SkillDetailModal';
-import { useSkills } from './useSkills';
-import { isValidSkillName } from '@shared/skills/validation';
-
-const SkillsView: React.FC = () => {
-  const {
-    isLoading,
-    isRefreshing,
-    searchQuery,
-    setSearchQuery,
-    selectedSkill,
-    showDetailModal,
-    showCreateModal,
-    setShowCreateModal,
-    installedSkills,
-    recommendedSkills,
-    refresh,
-    install,
-    uninstall,
-    openDetail,
-    closeDetail,
-    loadCatalog,
-  } = useSkills();
-
-  // New Skill form state
-  const [newName, setNewName] = useState('');
-  const [newDescription, setNewDescription] = useState('');
-  const [newContent, setNewContent] = useState('');
-  const [createError, setCreateError] = useState<string | null>(null);
-  const [isCreating, setIsCreating] = useState(false);
-
-  const handleCreateSkill = async (e: React.FormEvent) => {
-    e.preventDefault();
-    setCreateError(null);
-
-    const trimmedName = newName.trim();
-    if (!isValidSkillName(trimmedName)) {
-      setCreateError('Name must be lowercase letters, numbers, and hyphens (2-64 chars).');
-      return;
-    }
-    if (!newDescription.trim()) {
-      setCreateError('Description is required.');
-      return;
-    }
-
-    setIsCreating(true);
-    try {
-      const result = await window.electronAPI.skillsCreate({
-        name: trimmedName,
-        description: newDescription.trim(),
-        content: newContent.trim(),
-      });
-      if (result.success) {
-        import('../../lib/telemetryClient').then(({ captureTelemetry }) => {
-          captureTelemetry('skill_created');
-        });
-        setShowCreateModal(false);
-        setNewName('');
-        setNewDescription('');
-        setNewContent('');
-        await loadCatalog();
-      } else {
-        setCreateError(result.error || 'Failed to create skill');
-      }
-    } catch (err) {
-      setCreateError(err instanceof Error ? err.message : 'Failed to create skill');
-    } finally {
-      setIsCreating(false);
-    }
-  };
-
-  const handleOpenTerminal = (skillPath: string) => {
-    window.electronAPI.openIn({ app: 'terminal', path: skillPath });
-  };
-
-  if (isLoading) {
-    return (
-      <div className="flex h-full items-center justify-center bg-background text-foreground">
-        <Loader2 className="h-6 w-6 animate-spin text-muted-foreground" />
-      </div>
-    );
-  }
-
-  return (
-    <div className="flex h-full flex-col overflow-y-auto bg-background text-foreground">
-      <div className="mx-auto w-full max-w-3xl px-8 py-8">
-        {/* Header */}
-        <div className="mb-6">
-          <h1 className="text-lg font-semibold">Skills</h1>
-          <p className="mt-1 text-xs text-muted-foreground">
-            Extend your agents with reusable skill modules
-          </p>
-        </div>
-
-        {/* Toolbar */}
-        <div className="mb-6 flex items-center gap-2">
-          <div className="relative flex-1">
-            <Search className="absolute left-2.5 top-1/2 h-4 w-4 -translate-y-1/2 text-muted-foreground" />
-            <Input
-              placeholder="Search skills..."
-              value={searchQuery}
-              onChange={(e) => setSearchQuery(e.target.value)}
-              className="pl-9"
-            />
-          </div>
-          <Button
-            variant="ghost"
-            size="icon"
-            onClick={refresh}
-            disabled={isRefreshing}
-            aria-label="Refresh catalog"
-          >
-            <RefreshCw
-              className={`h-4 w-4 text-muted-foreground ${isRefreshing ? 'animate-spin' : ''}`}
-            />
-          </Button>
-          <Button variant="outline" size="sm" onClick={() => setShowCreateModal(true)}>
-            <Plus className="mr-1.5 h-3.5 w-3.5" />
-            New Skill
-          </Button>
-        </div>
-
-        <div className="mb-4 flex items-start gap-3 rounded-lg border border-border bg-muted/20 px-4 py-3">
-          <p className="text-xs leading-relaxed text-muted-foreground">
-            Skills from the{' '}
-            <a
-              href="https://github.com/openai/skills"
-              target="_blank"
-              rel="noopener noreferrer"
-              className="font-medium text-foreground underline decoration-muted-foreground/40 underline-offset-2 hover:decoration-foreground"
-            >
-              OpenAI
-            </a>{' '}
-            and{' '}
-            <a
-              href="https://github.com/anthropics/skills"
-              target="_blank"
-              rel="noopener noreferrer"
-              className="font-medium text-foreground underline decoration-muted-foreground/40 underline-offset-2 hover:decoration-foreground"
-            >
-              Anthropic
-            </a>{' '}
-            catalogs. Install a skill to make it available across all your coding agents. Skills
-            follow the open{' '}
-            <a
-              href="https://agentskills.io"
-              target="_blank"
-              rel="noopener noreferrer"
-              className="font-medium text-foreground underline decoration-muted-foreground/40 underline-offset-2 hover:decoration-foreground"
-            >
-              Agent Skills
-            </a>{' '}
-            standard. If you want to use skills from another library, feel free to let us know
-            through the feedback modal.
-          </p>
-        </div>
-
-        {installedSkills.length > 0 && (
-          <div className="mb-6">
-            <h2 className="mb-3 text-xs font-medium tracking-wide text-muted-foreground">
-              Installed
-            </h2>
-            <div className="grid grid-cols-1 gap-3 sm:grid-cols-2">
-              {installedSkills.map((skill) => (
-                <SkillCard key={skill.id} skill={skill} onSelect={openDetail} onInstall={install} />
-              ))}
-            </div>
-          </div>
-        )}
-
-        {recommendedSkills.length > 0 && (
-          <div className="mb-6">
-            <h2 className="mb-3 text-xs font-medium tracking-wide text-muted-foreground">
-              Recommended
-            </h2>
-            <div className="grid grid-cols-1 gap-3 sm:grid-cols-2">
-              {recommendedSkills.map((skill) => (
-                <SkillCard key={skill.id} skill={skill} onSelect={openDetail} onInstall={install} />
-              ))}
-            </div>
-          </div>
-        )}
-
-        {installedSkills.length === 0 && recommendedSkills.length === 0 && (
-          <div className="py-12 text-center">
-            <p className="text-sm text-muted-foreground">
-              {searchQuery ? 'No skills match your search.' : 'No skills available.'}
-            </p>
-          </div>
-        )}
-      </div>
-
-      <SkillDetailModal
-        skill={selectedSkill}
-        isOpen={showDetailModal}
-        onClose={closeDetail}
-        onInstall={install}
-        onUninstall={uninstall}
-        onOpenTerminal={handleOpenTerminal}
-      />
-
-      <Dialog
-        open={showCreateModal}
-        onOpenChange={(open) => {
-          if (!open && !isCreating) {
-            setShowCreateModal(false);
-            setNewName('');
-            setNewDescription('');
-            setNewContent('');
-            setCreateError(null);
-          }
-        }}
-      >
-        <DialogContent className="max-h-[90vh] max-w-2xl overflow-y-auto">
-          <DialogHeader>
-            <DialogTitle>New Skill</DialogTitle>
-            <DialogDescription className="text-xs">
-              Create a new skill module in ~/.agentskills/
-            </DialogDescription>
-          </DialogHeader>
-          <Separator />
-          <form onSubmit={handleCreateSkill} className="space-y-4">
-            <div className="space-y-2">
-              <Label htmlFor="skill-name" className="text-xs">
-                Name
-              </Label>
-              <Input
-                id="skill-name"
-                placeholder="my-skill"
-                value={newName}
-                onChange={(e) => {
-                  setNewName(e.target.value);
-                  setCreateError(null);
-                }}
-                className="text-sm"
-              />
-              <p className="text-[10px] text-muted-foreground">
-                Lowercase letters, numbers, and hyphens
-              </p>
-            </div>
-            <div className="space-y-2">
-              <Label htmlFor="skill-desc" className="text-xs">
-                Description
-              </Label>
-              <Input
-                id="skill-desc"
-                placeholder="What does this skill do?"
-                value={newDescription}
-                onChange={(e) => {
-                  setNewDescription(e.target.value);
-                  setCreateError(null);
-                }}
-                className="text-sm"
-              />
-            </div>
-            <div className="space-y-2">
-              <Label htmlFor="skill-content" className="text-xs">
-                Instructions
-              </Label>
-              <Textarea
-                id="skill-content"
-                placeholder="Write the skill instructions here. The YAML frontmatter (name and description) will be added automatically."
-                value={newContent}
-                onChange={(e) => {
-                  setNewContent(e.target.value);
-                  setCreateError(null);
-                }}
-                className="min-h-[200px] font-mono text-sm"
-              />
-              <p className="text-[10px] text-muted-foreground">
-                Define what this skill does and how agents should use it
-              </p>
-            </div>
-            {createError && <p className="text-xs text-destructive">{createError}</p>}
-            <DialogFooter>
-              <Button type="submit" size="sm" disabled={isCreating}>
-                {isCreating ? 'Creating...' : 'Create'}
-              </Button>
-            </DialogFooter>
-          </form>
-        </DialogContent>
-      </Dialog>
-    </div>
-  );
-};
-
-export default SkillsView;
diff --git a/src/renderer/components/skills/useSkills.ts b/src/renderer/components/skills/useSkills.ts
deleted file mode 100644
index 9cd998ec0a..0000000000
--- a/src/renderer/components/skills/useSkills.ts
+++ /dev/null
@@ -1,204 +0,0 @@
-import { useState, useEffect, useCallback, useMemo } from 'react';
-import type { CatalogSkill, CatalogIndex } from '@shared/skills/types';
-import { useToast } from '@/hooks/use-toast';
-
-export function useSkills() {
-  const { toast } = useToast();
-  const [catalog, setCatalog] = useState<CatalogIndex | null>(null);
-  const [isLoading, setIsLoading] = useState(true);
-  const [isRefreshing, setIsRefreshing] = useState(false);
-  const [searchQuery, setSearchQuery] = useState('');
-  const [selectedSkill, setSelectedSkill] = useState<CatalogSkill | null>(null);
-  const [showDetailModal, setShowDetailModal] = useState(false);
-  const [showCreateModal, setShowCreateModal] = useState(false);
-
-  const loadCatalog = useCallback(async () => {
-    try {
-      const result = await window.electronAPI.skillsGetCatalog();
-      if (result.success && result.data) {
-        setCatalog(result.data);
-      }
-    } catch (error) {
-      console.error('Failed to load skills catalog:', error);
-    } finally {
-      setIsLoading(false);
-    }
-  }, []);
-
-  useEffect(() => {
-    loadCatalog();
-  }, [loadCatalog]);
-
-  const refresh = useCallback(async () => {
-    setIsRefreshing(true);
-    try {
-      const result = await window.electronAPI.skillsRefreshCatalog();
-      if (result.success && result.data) {
-        setCatalog(result.data);
-      }
-    } catch (error) {
-      console.error('Failed to refresh catalog:', error);
-    } finally {
-      setIsRefreshing(false);
-    }
-  }, []);
-
-  const install = useCallback(
-    async (skillId: string) => {
-      // Optimistic update
-      setCatalog((prev) => {
-        if (!prev) return prev;
-        return {
-          ...prev,
-          skills: prev.skills.map((s) => (s.id === skillId ? { ...s, installed: true } : s)),
-        };
-      });
-
-      try {
-        const result = await window.electronAPI.skillsInstall({ skillId });
-        if (!result.success) {
-          // Revert optimistic update
-          setCatalog((prev) => {
-            if (!prev) return prev;
-            return {
-              ...prev,
-              skills: prev.skills.map((s) => (s.id === skillId ? { ...s, installed: false } : s)),
-            };
-          });
-          toast({
-            title: 'Install failed',
-            description: result.error || 'Could not install skill',
-            variant: 'destructive',
-          });
-        } else {
-          const skill = catalog?.skills.find((s) => s.id === skillId);
-          import('../../lib/telemetryClient').then(({ captureTelemetry }) => {
-            captureTelemetry('skill_installed', { source: skill?.source });
-          });
-          toast({
-            title: 'Skill installed',
-            description: `${skillId} is now available across your agents`,
-          });
-          await loadCatalog();
-        }
-        return result.success;
-      } catch {
-        toast({
-          title: 'Install failed',
-          description: 'An unexpected error occurred',
-          variant: 'destructive',
-        });
-        await loadCatalog();
-        return false;
-      }
-    },
-    [catalog?.skills, loadCatalog, toast]
-  );
-
-  const uninstall = useCallback(
-    async (skillId: string) => {
-      // Optimistic update
-      setCatalog((prev) => {
-        if (!prev) return prev;
-        return {
-          ...prev,
-          skills: prev.skills.map((s) =>
-            s.id === skillId ? { ...s, installed: false, localPath: undefined } : s
-          ),
-        };
-      });
-
-      try {
-        const result = await window.electronAPI.skillsUninstall({ skillId });
-        if (!result.success) {
-          toast({
-            title: 'Uninstall failed',
-            description: result.error || 'Could not uninstall skill',
-            variant: 'destructive',
-          });
-          await loadCatalog();
-        } else {
-          import('../../lib/telemetryClient').then(({ captureTelemetry }) => {
-            captureTelemetry('skill_uninstalled');
-          });
-          toast({ title: 'Skill removed', description: `${skillId} has been uninstalled` });
-        }
-        return result.success;
-      } catch {
-        toast({
-          title: 'Uninstall failed',
-          description: 'An unexpected error occurred',
-          variant: 'destructive',
-        });
-        await loadCatalog();
-        return false;
-      }
-    },
-    [loadCatalog, toast]
-  );
-
-  const openDetail = useCallback(async (skill: CatalogSkill) => {
-    import('../../lib/telemetryClient').then(({ captureTelemetry }) => {
-      captureTelemetry('skill_detail_viewed', { source: skill.source });
-    });
-    setSelectedSkill(skill);
-    setShowDetailModal(true);
-    // Load full detail
-    try {
-      const result = await window.electronAPI.skillsGetDetail({ skillId: skill.id });
-      if (result.success && result.data) {
-        setSelectedSkill(result.data);
-      }
-    } catch {
-      // Keep what we have
-    }
-  }, []);
-
-  const closeDetail = useCallback(() => {
-    setShowDetailModal(false);
-    setSelectedSkill(null);
-  }, []);
-
-  const filteredSkills = useMemo(() => {
-    if (!catalog) return [];
-    const q = searchQuery.toLowerCase().trim();
-    if (!q) return catalog.skills;
-    return catalog.skills.filter(
-      (s) =>
-        s.displayName.toLowerCase().includes(q) ||
-        s.description.toLowerCase().includes(q) ||
-        s.id.toLowerCase().includes(q)
-    );
-  }, [catalog, searchQuery]);
-
-  const installedSkills = useMemo(
-    () => filteredSkills.filter((s) => s.installed),
-    [filteredSkills]
-  );
-
-  const recommendedSkills = useMemo(
-    () => filteredSkills.filter((s) => !s.installed),
-    [filteredSkills]
-  );
-
-  return {
-    catalog,
-    isLoading,
-    isRefreshing,
-    searchQuery,
-    setSearchQuery,
-    selectedSkill,
-    showDetailModal,
-    showCreateModal,
-    setShowCreateModal,
-    filteredSkills,
-    installedSkills,
-    recommendedSkills,
-    refresh,
-    install,
-    uninstall,
-    openDetail,
-    closeDetail,
-    loadCatalog,
-  };
-}
diff --git a/src/renderer/components/ssh/AddRemoteProjectModal.tsx b/src/renderer/components/ssh/AddRemoteProjectModal.tsx
deleted file mode 100644
index 52bb4a4376..0000000000
--- a/src/renderer/components/ssh/AddRemoteProjectModal.tsx
+++ /dev/null
@@ -1,1658 +0,0 @@
-import React, { useState, useCallback, useEffect } from 'react';
-import { Button } from '../ui/button';
-import { DialogContent, DialogHeader, DialogTitle, DialogDescription } from '../ui/dialog';
-import { Input } from '../ui/input';
-import { Label } from '../ui/label';
-import { Spinner } from '../ui/spinner';
-import { Separator } from '../ui/separator';
-import { Alert, AlertDescription } from '../ui/alert';
-import { Badge } from '../ui/badge';
-import { RadioGroup, RadioGroupItem } from '../ui/radio-group';
-import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '../ui/select';
-import { Collapsible, CollapsibleTrigger, CollapsibleContent } from '../ui/collapsible';
-import { cn } from '@/lib/utils';
-import type { SshConfig, ConnectionTestResult, FileEntry, SshConfigHost } from '@shared/ssh/types';
-import {
-  Server,
-  Key,
-  Lock,
-  User,
-  FolderOpen,
-  Check,
-  ChevronRight,
-  ChevronLeft,
-  RefreshCw,
-  FileCode,
-  AlertCircle,
-  Globe,
-  CheckCircle2,
-  XCircle,
-  Folder,
-  ChevronUp,
-  ChevronDown,
-  Loader2,
-  Shield,
-  Trash,
-  Plus,
-  GitBranch,
-  Download,
-  Copy,
-} from 'lucide-react';
-
-type WizardStep = 'connection' | 'auth' | 'path' | 'confirm';
-type AuthType = 'password' | 'key' | 'agent';
-type TestStatus = 'idle' | 'testing' | 'success' | 'error';
-type RepoMode = 'pick' | 'create' | 'clone';
-
-interface AddRemoteProjectModalProps {
-  onClose: () => void;
-  onSuccess: (project: {
-    id: string;
-    name: string;
-    path: string;
-    host: string;
-    connectionId: string;
-  }) => void;
-}
-
-interface FormData {
-  // Connection step
-  name: string;
-  host: string;
-  port: number;
-  username: string;
-
-  // Auth step
-  authType: AuthType;
-  password: string;
-  privateKeyPath: string;
-  passphrase: string;
-
-  // Path step
-  remotePath: string;
-}
-
-interface FormErrors {
-  name?: string;
-  host?: string;
-  port?: string;
-  username?: string;
-  password?: string;
-  privateKeyPath?: string;
-  remotePath?: string;
-  general?: string;
-}
-
-export const AddRemoteProjectModal: React.FC<AddRemoteProjectModalProps> = ({
-  onClose,
-  onSuccess,
-}) => {
-  // Wizard state
-  const [currentStep, setCurrentStep] = useState<WizardStep>('connection');
-  const [isSubmitting, setIsSubmitting] = useState(false);
-  const [testStatus, setTestStatus] = useState<TestStatus>('idle');
-  const [testResult, setTestResult] = useState<ConnectionTestResult | null>(null);
-  const [debugLogs, setDebugLogs] = useState<string[]>([]);
-  const [debugLogsOpen, setDebugLogsOpen] = useState(false);
-  const [debugLogsCopied, setDebugLogsCopied] = useState(false);
-  const [errors, setErrors] = useState<FormErrors>({});
-  const [touched, setTouched] = useState<Record<string, boolean>>({});
-
-  // Path browsing state
-  const [fileEntries, setFileEntries] = useState<FileEntry[]>([]);
-  const [isBrowsing, setIsBrowsing] = useState(false);
-  const [browseError, setBrowseError] = useState<string | null>(null);
-  const [connectionId, setConnectionId] = useState<string | null>(null);
-
-  // Repo mode state
-  const [repoMode, setRepoMode] = useState<RepoMode>('pick');
-  const [newRepoName, setNewRepoName] = useState('');
-  const [cloneUrl, setCloneUrl] = useState('');
-  const [cloneDirName, setCloneDirName] = useState('');
-  const [cloneDirManuallyEdited, setCloneDirManuallyEdited] = useState(false);
-  const [isCreatingRepo, setIsCreatingRepo] = useState(false);
-  const [isCloningRepo, setIsCloningRepo] = useState(false);
-
-  // SSH config auto-detect state
-  const [sshConfigHosts, setSshConfigHosts] = useState<SshConfigHost[]>([]);
-  const [isLoadingSshConfig, setIsLoadingSshConfig] = useState(false);
-  const [sshConfigSelection, setSshConfigSelection] = useState<string>('');
-
-  // Saved connections state (for reusing existing SSH connections)
-  const [savedConnections, setSavedConnections] = useState<
-    Array<{
-      id: string;
-      name: string;
-      host: string;
-      port: number;
-      username: string;
-      authType: AuthType;
-      privateKeyPath?: string;
-      useAgent?: boolean;
-    }>
-  >([]);
-  const [isLoadingSavedConnections, setIsLoadingSavedConnections] = useState(false);
-  const [selectedSavedConnection, setSelectedSavedConnection] = useState<string | null>(null);
-  const [useExistingConnection, setUseExistingConnection] = useState(false);
-
-  // Form data
-  const [formData, setFormData] = useState<FormData>({
-    name: '',
-    host: '',
-    port: 22,
-    username: '',
-    authType: 'password',
-    password: '',
-    privateKeyPath: '',
-    passphrase: '',
-    remotePath: '',
-  });
-
-  // Reset form when modal opens and load SSH config
-  // Reset form and load data on mount (component only mounts when modal is open)
-  useEffect(() => {
-    setCurrentStep('connection');
-    setFormData({
-      name: '',
-      host: '',
-      port: 22,
-      username: '',
-      authType: 'password',
-      password: '',
-      privateKeyPath: '',
-      passphrase: '',
-      remotePath: '',
-    });
-    setErrors({});
-    setTouched({});
-    setTestStatus('idle');
-    setTestResult(null);
-    setDebugLogs([]);
-    setDebugLogsOpen(false);
-    setDebugLogsCopied(false);
-    setFileEntries([]);
-    setBrowseError(null);
-    setConnectionId(null);
-    setSshConfigSelection('');
-    setSavedConnections([]);
-    setSelectedSavedConnection(null);
-    setUseExistingConnection(false);
-    setRepoMode('pick');
-    setNewRepoName('');
-    setCloneUrl('');
-    setCloneDirName('');
-    setCloneDirManuallyEdited(false);
-    setIsCreatingRepo(false);
-    setIsCloningRepo(false);
-
-    // Load SSH config hosts and saved connections
-    void loadSshConfig();
-    void loadSavedConnections();
-
-    import('../../lib/telemetryClient').then(({ captureTelemetry }) => {
-      captureTelemetry('remote_project_modal_opened');
-    });
-  }, []);
-
-  // Load SSH config from ~/.ssh/config
-  const loadSshConfig = useCallback(async () => {
-    setIsLoadingSshConfig(true);
-    try {
-      const result = await window.electronAPI.sshGetConfig();
-      if (result.success && result.hosts) {
-        setSshConfigHosts(result.hosts);
-      }
-    } catch (error) {
-      // Silently fail - SSH config is optional
-      console.debug('Failed to load SSH config:', error);
-    } finally {
-      setIsLoadingSshConfig(false);
-    }
-  }, []);
-
-  // Load saved SSH connections from database
-  const loadSavedConnections = useCallback(async () => {
-    setIsLoadingSavedConnections(true);
-    try {
-      const connections = await window.electronAPI.sshGetConnections();
-      if (Array.isArray(connections)) {
-        setSavedConnections(connections as typeof savedConnections);
-      }
-    } catch (error) {
-      console.debug('Failed to load saved connections:', error);
-    } finally {
-      setIsLoadingSavedConnections(false);
-    }
-  }, []);
-
-  const deleteSavedConnection = useCallback(
-    async (id: string) => {
-      try {
-        await window.electronAPI.sshDeleteConnection(id);
-        if (selectedSavedConnection === id) {
-          setSelectedSavedConnection(null);
-          setUseExistingConnection(false);
-        }
-        await loadSavedConnections();
-      } catch (error) {
-        console.error('Failed to delete connection:', error);
-      }
-    },
-    [selectedSavedConnection, loadSavedConnections]
-  );
-
-  // Apply SSH config host selection
-  const applySshHost = useCallback(
-    (host: SshConfigHost) => {
-      const stableId = `ssh-config:${encodeURIComponent(host.host)}`;
-      setConnectionId(stableId);
-
-      // Determine auth type and key path
-      let authType: AuthType;
-      let privateKeyPath = '';
-
-      if (host.identityAgent) {
-        // IdentityAgent signals the user wants agent-based auth (e.g. 1Password)
-        authType = 'agent';
-      } else if (host.identityFile) {
-        // SSH config specifies a key - use it
-        authType = 'key';
-        privateKeyPath = host.identityFile;
-      } else {
-        // No key specified - default to key auth with ed25519 (most common modern key)
-        authType = 'key';
-        privateKeyPath = '~/.ssh/id_ed25519';
-      }
-
-      setFormData((prev) => ({
-        ...prev,
-        name: host.host, // Use the SSH host alias as connection name
-        host: host.hostname || host.host,
-        port: host.port || 22,
-        username: host.user || prev.username,
-        privateKeyPath,
-        authType,
-      }));
-      setSshConfigSelection(host.host);
-
-      // Clear any previous test results when host is changed
-      setTestStatus('idle');
-      setTestResult(null);
-    },
-    [setFormData]
-  );
-
-  // Update form field
-  const updateField = useCallback(
-    <K extends keyof FormData>(field: K, value: FormData[K]) => {
-      setFormData((prev) => ({ ...prev, [field]: value }));
-      // Clear error when user starts typing
-      if (errors[field as keyof FormErrors]) {
-        setErrors((prev) => ({ ...prev, [field]: undefined }));
-      }
-    },
-    [errors]
-  );
-
-  // Mark field as touched
-  const touchField = useCallback((field: string) => {
-    setTouched((prev) => ({ ...prev, [field]: true }));
-  }, []);
-
-  // Validate current step
-  const validateStep = useCallback(
-    (step: WizardStep): boolean => {
-      const newErrors: FormErrors = {};
-
-      switch (step) {
-        case 'connection':
-          if (!formData.name.trim()) {
-            newErrors.name = 'Connection name is required';
-          }
-          if (!formData.host.trim()) {
-            newErrors.host = 'Host is required';
-          } else if (
-            !/^[a-zA-Z0-9][a-zA-Z0-9._-]*[a-zA-Z0-9]$/.test(formData.host.trim()) &&
-            !/^(?:[0-9]{1,3}\.){3}[0-9]{1,3}$/.test(formData.host.trim()) &&
-            // Allow single-word SSH aliases like "lamb_clutha"
-            !/^[a-zA-Z0-9_-]+$/.test(formData.host.trim())
-          ) {
-            newErrors.host = 'Please enter a valid hostname, IP address, or SSH alias';
-          }
-          if (!formData.username.trim()) {
-            newErrors.username = 'Username is required';
-          }
-          if (formData.port < 1 || formData.port > 65535) {
-            newErrors.port = 'Port must be between 1 and 65535';
-          }
-          break;
-
-        case 'auth':
-          if (formData.authType === 'password' && !formData.password) {
-            newErrors.password = 'Password is required';
-          }
-          if (formData.authType === 'key' && !formData.privateKeyPath) {
-            newErrors.privateKeyPath = 'Private key path is required';
-          }
-          break;
-
-        case 'path':
-          if (repoMode === 'pick') {
-            if (!formData.remotePath.trim()) {
-              newErrors.remotePath = 'Remote path is required';
-            } else if (!formData.remotePath.startsWith('/')) {
-              newErrors.remotePath = 'Path must be absolute (start with /)';
-            }
-          } else if (repoMode === 'create') {
-            if (!formData.remotePath.trim()) {
-              newErrors.remotePath = 'Parent directory is required';
-            } else if (!formData.remotePath.startsWith('/')) {
-              newErrors.remotePath = 'Path must be absolute (start with /)';
-            }
-            if (!newRepoName.trim()) {
-              newErrors.general = 'Repository name is required';
-            } else if (!/^[a-zA-Z0-9][a-zA-Z0-9._-]*$/.test(newRepoName.trim())) {
-              newErrors.general =
-                'Invalid name. Use letters, numbers, hyphens, underscores, dots. Must start with a letter or number.';
-            }
-          } else if (repoMode === 'clone') {
-            if (!cloneUrl.trim()) {
-              newErrors.general = 'Repository URL is required';
-            } else {
-              const patterns = [/^https?:\/\/.+/i, /^git@.+:.+/i, /^ssh:\/\/.+/i];
-              if (!patterns.some((p) => p.test(cloneUrl.trim()))) {
-                newErrors.general = 'Invalid URL. Use https://, git@, or ssh:// format.';
-              }
-            }
-            if (!formData.remotePath.trim()) {
-              newErrors.remotePath = 'Parent directory is required';
-            } else if (!formData.remotePath.startsWith('/')) {
-              newErrors.remotePath = 'Path must be absolute (start with /)';
-            }
-            if (!cloneDirName.trim()) {
-              newErrors.general = newErrors.general || 'Directory name is required';
-            }
-          }
-          break;
-      }
-
-      setErrors(newErrors);
-      return Object.keys(newErrors).length === 0;
-    },
-    [formData, repoMode, newRepoName, cloneUrl, cloneDirName]
-  );
-
-  // Test connection
-  const testConnection = useCallback(async (): Promise<boolean> => {
-    setErrors((prev) => ({ ...prev, general: undefined }));
-    setTestStatus('testing');
-    setTestResult(null);
-
-    try {
-      const testConfig: SshConfig & { password?: string; passphrase?: string } = {
-        id: connectionId || undefined,
-        name: formData.name,
-        host: formData.host,
-        port: formData.port,
-        username: formData.username,
-        authType: formData.authType,
-        privateKeyPath: formData.privateKeyPath || undefined,
-        useAgent: formData.authType === 'agent',
-        password: formData.authType === 'password' ? formData.password : undefined,
-        passphrase: formData.authType === 'key' ? formData.passphrase || undefined : undefined,
-      };
-
-      const result = await window.electronAPI.sshTestConnection(testConfig);
-      setTestResult(result);
-      setDebugLogs(result.debugLogs || []);
-
-      import('../../lib/telemetryClient').then(({ captureTelemetry }) => {
-        captureTelemetry('remote_project_connection_tested', { success: result.success });
-      });
-
-      if (result.success) {
-        setTestStatus('success');
-        setErrors((prev) => ({ ...prev, general: undefined }));
-        return true;
-      } else {
-        setTestStatus('error');
-
-        // Provide more detailed error messages based on auth type and error
-        let errorMsg = result.error || 'Connection failed';
-        let suggestKeyAuth = false;
-
-        // Agent auth failures - be more aggressive with fallback
-        if (formData.authType === 'agent') {
-          // Any agent failure should suggest key auth
-          errorMsg =
-            'SSH agent authentication failed. Switched to SSH Key authentication - select a key file below from common options.';
-          suggestKeyAuth = true;
-        } else if (formData.authType === 'key' && errorMsg.includes('Failed to read private key')) {
-          errorMsg = `Cannot read key file: ${formData.privateKeyPath}. Verify it exists and has read permissions (chmod 600).`;
-        } else if (errorMsg.includes('Authentication failed') && formData.authType === 'key') {
-          errorMsg =
-            'Authentication failed. Verify the correct key file is being used and the public key is in ~/.ssh/authorized_keys on the server.';
-        }
-
-        setErrors((prev) => ({ ...prev, general: errorMsg }));
-
-        // Auto-switch to key auth on agent failure for better UX
-        if (suggestKeyAuth && formData.authType === 'agent') {
-          setFormData((prev) => ({ ...prev, authType: 'key' }));
-        }
-        return false;
-      }
-    } catch (error) {
-      const message = error instanceof Error ? error.message : 'Unknown error occurred';
-      setTestStatus('error');
-      setTestResult({ success: false, error: message });
-      setErrors((prev) => ({ ...prev, general: message }));
-      return false;
-    }
-  }, [formData, connectionId]);
-
-  // Browse remote directory
-  const browseRemotePath = useCallback(
-    async (path: string) => {
-      if (!connectionId) return;
-
-      setIsBrowsing(true);
-      setBrowseError(null);
-
-      try {
-        const result = await window.electronAPI.sshListFiles(connectionId, path);
-        // Handle both old array format and new object format for backward compatibility
-        const entries: FileEntry[] =
-          result && typeof result === 'object' && 'files' in result
-            ? (result.files as FileEntry[]) || []
-            : Array.isArray(result)
-              ? (result as FileEntry[])
-              : [];
-        // Sort: directories first, then files, alphabetically
-        const sorted = entries.sort((a: FileEntry, b: FileEntry) => {
-          if (a.type === 'directory' && b.type !== 'directory') return -1;
-          if (a.type !== 'directory' && b.type === 'directory') return 1;
-          return a.name.localeCompare(b.name);
-        });
-        setFileEntries(sorted);
-        updateField('remotePath', path);
-      } catch (error) {
-        const message = error instanceof Error ? error.message : 'Failed to browse directory';
-        setBrowseError(message);
-      } finally {
-        setIsBrowsing(false);
-      }
-    },
-    [connectionId, updateField]
-  );
-
-  // Select an existing saved connection
-  const selectExistingConnection = useCallback(
-    async (conn: (typeof savedConnections)[number]) => {
-      setSelectedSavedConnection(conn.id);
-      setUseExistingConnection(true);
-      setErrors({});
-
-      // Populate form data for display in confirm step
-      setFormData((prev) => ({
-        ...prev,
-        name: conn.name,
-        host: conn.host,
-        port: conn.port,
-        username: conn.username,
-        authType: conn.authType,
-        privateKeyPath: conn.privateKeyPath || '',
-      }));
-
-      // Connect using the saved connection ID
-      try {
-        const connId = await window.electronAPI.sshConnect(conn.id);
-        setConnectionId(connId);
-        setCurrentStep('path');
-
-        // Browse directly with connId since connectionId state hasn't updated yet
-        const homePath = '/home/' + conn.username;
-        setIsBrowsing(true);
-        setBrowseError(null);
-        try {
-          const result = await window.electronAPI.sshListFiles(connId, homePath);
-          const entries: FileEntry[] =
-            result && typeof result === 'object' && 'files' in result
-              ? (result.files as FileEntry[]) || []
-              : Array.isArray(result)
-                ? (result as FileEntry[])
-                : [];
-          const sorted = entries.sort((a: FileEntry, b: FileEntry) => {
-            if (a.type === 'directory' && b.type !== 'directory') return -1;
-            if (a.type !== 'directory' && b.type === 'directory') return 1;
-            return a.name.localeCompare(b.name);
-          });
-          setFileEntries(sorted);
-          updateField('remotePath', homePath);
-        } catch (browseErr) {
-          const msg = browseErr instanceof Error ? browseErr.message : 'Failed to browse directory';
-          setBrowseError(msg);
-        } finally {
-          setIsBrowsing(false);
-        }
-      } catch (error) {
-        const message = error instanceof Error ? error.message : 'Failed to reconnect';
-        setErrors({ general: message });
-        setUseExistingConnection(false);
-        setSelectedSavedConnection(null);
-      }
-    },
-    [updateField]
-  );
-
-  // Navigate up
-  const navigateUp = useCallback(() => {
-    const currentPath = formData.remotePath;
-    if (currentPath === '/') return;
-    const parentPath = currentPath.split('/').slice(0, -1).join('/') || '/';
-    void browseRemotePath(parentPath);
-  }, [formData.remotePath, browseRemotePath]);
-
-  // Navigate to directory
-  const navigateTo = useCallback(
-    (entry: FileEntry) => {
-      if (entry.type === 'directory') {
-        void browseRemotePath(entry.path);
-      } else {
-        // For files, select the parent directory
-        const parentPath = entry.path.split('/').slice(0, -1).join('/') || '/';
-        updateField('remotePath', parentPath);
-      }
-    },
-    [browseRemotePath, updateField]
-  );
-
-  // Auto-extract directory name from clone URL (only if user hasn't manually edited it)
-  useEffect(() => {
-    if (cloneDirManuallyEdited) return;
-    if (!cloneUrl.trim()) {
-      setCloneDirName('');
-      return;
-    }
-    const cleaned = cloneUrl.trim().replace(/#.*$/, '').replace(/\?.*$/, '').replace(/\/+$/, '');
-    // Try common URL patterns
-    const match = cleaned.match(/[/:]([^/]+?)(?:\.git)?\/?$/);
-    if (match) {
-      setCloneDirName(match[1]);
-    }
-  }, [cloneUrl, cloneDirManuallyEdited]);
-
-  // Handle next step
-  const handleNext = useCallback(async () => {
-    if (!validateStep(currentStep)) return;
-
-    if (currentStep === 'auth') {
-      // Test connection before proceeding
-      const success = await testConnection();
-      if (!success) return;
-
-      // Create connection for browsing
-      try {
-        const connectConfig: SshConfig & { password?: string; passphrase?: string } = {
-          name: formData.name,
-          host: formData.host,
-          port: formData.port,
-          username: formData.username,
-          authType: formData.authType,
-          privateKeyPath: formData.privateKeyPath || undefined,
-          useAgent: formData.authType === 'agent',
-          password: formData.authType === 'password' ? formData.password : undefined,
-          passphrase: formData.authType === 'key' ? formData.passphrase || undefined : undefined,
-        };
-
-        const connId = await window.electronAPI.sshConnect({
-          ...connectConfig,
-          id: connectionId || undefined,
-        });
-        setConnectionId(connId);
-
-        // Browse directly with connId since connectionId state hasn't updated yet
-        const homePath = '/home/' + formData.username;
-        setIsBrowsing(true);
-        setBrowseError(null);
-        try {
-          const result = await window.electronAPI.sshListFiles(connId, homePath);
-          const entries: FileEntry[] =
-            result && typeof result === 'object' && 'files' in result
-              ? (result.files as FileEntry[]) || []
-              : Array.isArray(result)
-                ? (result as FileEntry[])
-                : [];
-          const sorted = entries.sort((a: FileEntry, b: FileEntry) => {
-            if (a.type === 'directory' && b.type !== 'directory') return -1;
-            if (a.type !== 'directory' && b.type === 'directory') return 1;
-            return a.name.localeCompare(b.name);
-          });
-          setFileEntries(sorted);
-          updateField('remotePath', homePath);
-        } catch (browseErr) {
-          const msg = browseErr instanceof Error ? browseErr.message : 'Failed to browse directory';
-          setBrowseError(msg);
-        } finally {
-          setIsBrowsing(false);
-        }
-      } catch (error) {
-        const message = error instanceof Error ? error.message : 'Failed to connect';
-        setTestStatus('idle');
-        setTestResult(null);
-        setErrors((prev) => ({ ...prev, general: message }));
-        return;
-      }
-    }
-
-    // Handle repo creation/cloning on the path step before advancing to confirm
-    if (currentStep === 'path' && connectionId) {
-      if (repoMode === 'create') {
-        setIsCreatingRepo(true);
-        setErrors({});
-        try {
-          const createdPath = await window.electronAPI.sshInitRepo(
-            connectionId,
-            formData.remotePath.replace(/\/+$/, ''),
-            newRepoName.trim()
-          );
-          updateField('remotePath', createdPath);
-        } catch (err) {
-          const msg = err instanceof Error ? err.message : 'Failed to create repository';
-          setErrors({ general: msg });
-          setIsCreatingRepo(false);
-          return;
-        }
-        setIsCreatingRepo(false);
-      } else if (repoMode === 'clone') {
-        setIsCloningRepo(true);
-        setErrors({});
-        try {
-          const targetPath = `${formData.remotePath.replace(/\/+$/, '')}/${cloneDirName.trim()}`;
-          const clonedPath = await window.electronAPI.sshCloneRepo(
-            connectionId,
-            cloneUrl.trim(),
-            targetPath
-          );
-          updateField('remotePath', clonedPath);
-        } catch (err) {
-          const msg = err instanceof Error ? err.message : 'Failed to clone repository';
-          setErrors({ general: msg });
-          setIsCloningRepo(false);
-          return;
-        }
-        setIsCloningRepo(false);
-      }
-    }
-
-    const stepOrder: WizardStep[] = useExistingConnection
-      ? ['connection', 'path', 'confirm']
-      : ['connection', 'auth', 'path', 'confirm'];
-    const currentIndex = stepOrder.indexOf(currentStep);
-    if (currentIndex < stepOrder.length - 1) {
-      setCurrentStep(stepOrder[currentIndex + 1]);
-    }
-  }, [
-    currentStep,
-    formData,
-    connectionId,
-    validateStep,
-    testConnection,
-    updateField,
-    useExistingConnection,
-    repoMode,
-    newRepoName,
-    cloneUrl,
-    cloneDirName,
-  ]);
-
-  // Handle previous step
-  const handleBack = useCallback(() => {
-    if (useExistingConnection && currentStep === 'path') {
-      // Going back from path with existing connection → reset to connection selection
-      setUseExistingConnection(false);
-      setSelectedSavedConnection(null);
-      setCurrentStep('connection');
-      return;
-    }
-    const stepOrder: WizardStep[] = useExistingConnection
-      ? ['connection', 'path', 'confirm']
-      : ['connection', 'auth', 'path', 'confirm'];
-    const currentIndex = stepOrder.indexOf(currentStep);
-    if (currentIndex > 0) {
-      setCurrentStep(stepOrder[currentIndex - 1]);
-    }
-  }, [currentStep, useExistingConnection]);
-
-  // Handle submit
-  const handleSubmit = useCallback(async () => {
-    if (!validateStep('path')) return;
-
-    setIsSubmitting(true);
-
-    try {
-      // Derive project display name from the remote folder path, not the connection name
-      const projectName = formData.remotePath.split('/').filter(Boolean).pop() || formData.name;
-
-      if (useExistingConnection && selectedSavedConnection) {
-        // Reuse existing connection — no save needed
-        onSuccess({
-          id: Date.now().toString(),
-          name: projectName,
-          path: formData.remotePath,
-          host: formData.host,
-          connectionId: selectedSavedConnection,
-        });
-      } else {
-        // Save a new connection
-        const saveConfig: SshConfig & { password?: string; passphrase?: string } = {
-          id: connectionId || undefined,
-          name: formData.name,
-          host: formData.host,
-          port: formData.port,
-          username: formData.username,
-          authType: formData.authType,
-          privateKeyPath: formData.privateKeyPath || undefined,
-          useAgent: formData.authType === 'agent',
-          password: formData.authType === 'password' ? formData.password : undefined,
-          passphrase: formData.authType === 'key' ? formData.passphrase || undefined : undefined,
-        };
-
-        const savedConfig = await window.electronAPI.sshSaveConnection(saveConfig);
-
-        onSuccess({
-          id: Date.now().toString(),
-          name: projectName,
-          path: formData.remotePath,
-          host: formData.host,
-          connectionId: savedConfig.id!,
-        });
-      }
-
-      onClose();
-    } catch (error) {
-      const message = error instanceof Error ? error.message : 'Failed to save connection';
-      setErrors((prev) => ({ ...prev, general: message }));
-    } finally {
-      setIsSubmitting(false);
-    }
-  }, [
-    formData,
-    connectionId,
-    validateStep,
-    onSuccess,
-    onClose,
-    useExistingConnection,
-    selectedSavedConnection,
-  ]);
-
-  // Handle close
-  const handleClose = useCallback(() => {
-    if (connectionId) {
-      void window.electronAPI.sshDisconnect(connectionId);
-    }
-    onClose();
-  }, [connectionId, onClose]);
-
-  // Step indicators — omit auth step when reusing an existing connection
-  const steps: { id: WizardStep; label: string; icon: React.ElementType }[] = useExistingConnection
-    ? [
-        { id: 'connection', label: 'Connection', icon: Server },
-        { id: 'path', label: 'Project Path', icon: FolderOpen },
-        { id: 'confirm', label: 'Confirm', icon: Check },
-      ]
-    : [
-        { id: 'connection', label: 'Connection', icon: Server },
-        {
-          id: 'auth',
-          label: 'Authentication',
-          icon: formData.authType === 'password' ? Lock : Key,
-        },
-        { id: 'path', label: 'Project Path', icon: FolderOpen },
-        { id: 'confirm', label: 'Confirm', icon: Check },
-      ];
-
-  const currentStepIndex = steps.findIndex((s) => s.id === currentStep);
-
-  // Render step content
-  const renderStepContent = () => {
-    switch (currentStep) {
-      case 'connection':
-        return (
-          <div className="space-y-4">
-            {/* Saved connections for reuse */}
-            {isLoadingSavedConnections ? (
-              <div className="flex items-center gap-2 text-sm text-muted-foreground">
-                <Loader2 className="h-4 w-4 animate-spin" />
-                Loading saved connections...
-              </div>
-            ) : savedConnections.length > 0 ? (
-              <div className="space-y-2">
-                <Label>Saved Connections</Label>
-                <div className="space-y-2">
-                  {savedConnections.map((conn) => (
-                    <button
-                      key={conn.id}
-                      type="button"
-                      onClick={() => void selectExistingConnection(conn)}
-                      className={cn(
-                        'flex w-full items-center gap-3 rounded-md border p-3 text-left transition-colors hover:bg-accent',
-                        selectedSavedConnection === conn.id && 'border-primary bg-primary/5'
-                      )}
-                    >
-                      <Server className="h-4 w-4 shrink-0 text-muted-foreground" />
-                      <div className="min-w-0 flex-1">
-                        <div className="text-sm font-medium">{conn.name}</div>
-                        <div className="truncate text-xs text-muted-foreground">
-                          {conn.username}@{conn.host}:{conn.port}
-                        </div>
-                      </div>
-                      <Button
-                        variant="ghost"
-                        size="icon-sm"
-                        className="text-muted-foreground"
-                        onClick={(e) => {
-                          e.stopPropagation();
-                          void deleteSavedConnection(conn.id);
-                        }}
-                      >
-                        <Trash className="h-3.5 w-3.5" />
-                      </Button>
-                      <ChevronRight className="h-4 w-4 shrink-0 text-muted-foreground" />
-                    </button>
-                  ))}
-                </div>
-                <div className="relative py-2">
-                  <Separator />
-                  <span className="absolute left-1/2 top-1/2 -translate-x-1/2 -translate-y-1/2 bg-background px-2 text-xs text-muted-foreground">
-                    Or create a new connection
-                  </span>
-                </div>
-              </div>
-            ) : null}
-
-            {sshConfigHosts.length > 0 && (
-              <div className="space-y-2">
-                <Label>SSH Config (optional)</Label>
-                <Select
-                  value={sshConfigSelection}
-                  onValueChange={(value) => {
-                    setSshConfigSelection(value);
-                    const selected = sshConfigHosts.find((h) => h.host === value);
-                    if (selected) applySshHost(selected);
-                  }}
-                  disabled={isLoadingSshConfig}
-                >
-                  <SelectTrigger>
-                    <SelectValue
-                      placeholder={
-                        isLoadingSshConfig
-                          ? 'Loading ~/.ssh/config...'
-                          : 'Select a host from ~/.ssh/config'
-                      }
-                    />
-                  </SelectTrigger>
-                  <SelectContent>
-                    {sshConfigHosts.map((h) => (
-                      <SelectItem key={h.host} value={h.host}>
-                        {h.host}
-                        {h.hostname ? ` -> ${h.hostname}` : ''}
-                      </SelectItem>
-                    ))}
-                  </SelectContent>
-                </Select>
-                <p className="text-xs text-muted-foreground">
-                  Selecting a host auto-fills name, host, user, port, and key path when available.
-                </p>
-              </div>
-            )}
-
-            <div className="space-y-2">
-              <Label htmlFor="name">
-                Connection Name <span className="text-destructive">*</span>
-              </Label>
-              <Input
-                id="name"
-                value={formData.name}
-                onChange={(e) => updateField('name', e.target.value)}
-                onBlur={() => touchField('name')}
-                placeholder="My Remote Server"
-                className={cn(errors.name && touched.name && 'border-destructive')}
-              />
-              {errors.name && touched.name && (
-                <p className="text-xs text-destructive">{errors.name}</p>
-              )}
-            </div>
-
-            <div className="grid grid-cols-3 gap-4">
-              <div className="col-span-2 space-y-2">
-                <Label htmlFor="host">
-                  Host <span className="text-destructive">*</span>
-                </Label>
-                <div className="relative">
-                  <Globe className="absolute left-3 top-1/2 h-4 w-4 -translate-y-1/2 text-muted-foreground" />
-                  <Input
-                    id="host"
-                    value={formData.host}
-                    onChange={(e) => updateField('host', e.target.value)}
-                    onBlur={() => touchField('host')}
-                    placeholder="server.example.com or SSH alias"
-                    className={cn('pl-10', errors.host && touched.host && 'border-destructive')}
-                  />
-                </div>
-                {errors.host && touched.host && (
-                  <p className="text-xs text-destructive">{errors.host}</p>
-                )}
-              </div>
-
-              <div className="space-y-2">
-                <Label htmlFor="port">Port</Label>
-                <Input
-                  id="port"
-                  type="number"
-                  value={formData.port}
-                  onChange={(e) => updateField('port', parseInt(e.target.value) || 22)}
-                  min={1}
-                  max={65535}
-                  className={cn(errors.port && 'border-destructive')}
-                />
-              </div>
-            </div>
-
-            <div className="space-y-2">
-              <Label htmlFor="username">
-                Username <span className="text-destructive">*</span>
-              </Label>
-              <div className="relative">
-                <User className="absolute left-3 top-1/2 h-4 w-4 -translate-y-1/2 text-muted-foreground" />
-                <Input
-                  id="username"
-                  value={formData.username}
-                  onChange={(e) => updateField('username', e.target.value)}
-                  onBlur={() => touchField('username')}
-                  placeholder="user"
-                  className={cn(
-                    'pl-10',
-                    errors.username && touched.username && 'border-destructive'
-                  )}
-                />
-              </div>
-              {errors.username && touched.username && (
-                <p className="text-xs text-destructive">{errors.username}</p>
-              )}
-            </div>
-          </div>
-        );
-
-      case 'auth':
-        return (
-          <div className="space-y-4">
-            {/* Show common SSH key paths when key auth is selected */}
-            {formData.authType === 'key' && (
-              <Alert>
-                <AlertCircle className="h-4 w-4" />
-                <AlertDescription>
-                  <p className="mb-2 text-sm font-medium">Quick select common SSH keys:</p>
-                  <div className="space-y-1 text-xs">
-                    {[
-                      { name: 'id_ed25519', path: '~/.ssh/id_ed25519' },
-                      { name: 'id_rsa', path: '~/.ssh/id_rsa' },
-                      { name: 'id_ecdsa', path: '~/.ssh/id_ecdsa' },
-                    ].map((key) => (
-                      <button
-                        key={key.name}
-                        type="button"
-                        onClick={() => updateField('privateKeyPath', key.path)}
-                        className="block text-left font-medium text-foreground hover:underline"
-                      >
-                        {key.path}
-                      </button>
-                    ))}
-                  </div>
-                </AlertDescription>
-              </Alert>
-            )}
-
-            <div className="space-y-3">
-              <Label>Authentication Method</Label>
-              <RadioGroup
-                value={formData.authType}
-                onValueChange={(value) => updateField('authType', value as AuthType)}
-                className="grid grid-cols-3 gap-3"
-              >
-                <div>
-                  <RadioGroupItem value="password" id="auth-password" className="sr-only" />
-                  <Label
-                    htmlFor="auth-password"
-                    className={cn(
-                      'flex cursor-pointer flex-col items-center justify-between rounded-md border-2 border-muted bg-popover p-4 hover:bg-accent hover:text-accent-foreground [&:has([data-state=checked])]:border-primary',
-                      formData.authType === 'password' && 'border-primary'
-                    )}
-                  >
-                    <Lock className="mb-3 h-6 w-6" />
-                    <span className="text-sm font-medium">Password</span>
-                  </Label>
-                </div>
-
-                <div>
-                  <RadioGroupItem value="key" id="auth-key" className="sr-only" />
-                  <Label
-                    htmlFor="auth-key"
-                    className={cn(
-                      'flex cursor-pointer flex-col items-center justify-between rounded-md border-2 border-muted bg-popover p-4 hover:bg-accent hover:text-accent-foreground [&:has([data-state=checked])]:border-primary',
-                      formData.authType === 'key' && 'border-primary'
-                    )}
-                  >
-                    <FileCode className="mb-3 h-6 w-6" />
-                    <span className="text-sm font-medium">SSH Key</span>
-                  </Label>
-                </div>
-
-                <div>
-                  <RadioGroupItem value="agent" id="auth-agent" className="sr-only" />
-                  <Label
-                    htmlFor="auth-agent"
-                    className={cn(
-                      'flex cursor-pointer flex-col items-center justify-between rounded-md border-2 border-muted bg-popover p-4 hover:bg-accent hover:text-accent-foreground [&:has([data-state=checked])]:border-primary',
-                      formData.authType === 'agent' && 'border-primary'
-                    )}
-                  >
-                    <Shield className="mb-3 h-6 w-6" />
-                    <span className="text-sm font-medium">Agent</span>
-                  </Label>
-                </div>
-              </RadioGroup>
-            </div>
-
-            <Separator />
-
-            {formData.authType === 'password' && (
-              <div className="space-y-2">
-                <Label htmlFor="password">
-                  Password <span className="text-destructive">*</span>
-                </Label>
-                <Input
-                  id="password"
-                  type="password"
-                  value={formData.password}
-                  onChange={(e) => updateField('password', e.target.value)}
-                  onBlur={() => touchField('password')}
-                  placeholder="Enter your password"
-                  className={cn(errors.password && touched.password && 'border-destructive')}
-                />
-                {errors.password && touched.password && (
-                  <p className="text-xs text-destructive">{errors.password}</p>
-                )}
-                <p className="text-xs text-muted-foreground">
-                  Your password will be securely stored in the system keychain.
-                </p>
-              </div>
-            )}
-
-            {formData.authType === 'key' && (
-              <div className="space-y-4">
-                <div className="space-y-2">
-                  <Label htmlFor="private-key">
-                    Private Key Path <span className="text-destructive">*</span>
-                  </Label>
-                  <div className="flex gap-2">
-                    <Input
-                      id="private-key"
-                      value={formData.privateKeyPath}
-                      onChange={(e) => updateField('privateKeyPath', e.target.value)}
-                      onBlur={() => touchField('privateKeyPath')}
-                      placeholder="~/.ssh/id_rsa"
-                      className={cn(
-                        errors.privateKeyPath && touched.privateKeyPath && 'border-destructive'
-                      )}
-                    />
-                    <Button
-                      type="button"
-                      variant="outline"
-                      onClick={async () => {
-                        try {
-                          const result = await window.electronAPI.openFile({
-                            title: 'Select SSH Private Key',
-                            message: 'Select your SSH private key file',
-                          });
-                          if (result.success && result.path) {
-                            updateField('privateKeyPath', result.path);
-                          }
-                        } catch (e) {
-                          // Ignore
-                        }
-                      }}
-                    >
-                      Browse
-                    </Button>
-                  </div>
-                  {errors.privateKeyPath && touched.privateKeyPath && (
-                    <p className="text-xs text-destructive">{errors.privateKeyPath}</p>
-                  )}
-                </div>
-
-                <div className="space-y-2">
-                  <Label htmlFor="passphrase">Passphrase (optional)</Label>
-                  <Input
-                    id="passphrase"
-                    type="password"
-                    value={formData.passphrase}
-                    onChange={(e) => updateField('passphrase', e.target.value)}
-                    placeholder="Leave empty if no passphrase"
-                  />
-                  <p className="text-xs text-muted-foreground">
-                    If your key is encrypted, enter the passphrase here.
-                  </p>
-                </div>
-              </div>
-            )}
-
-            {formData.authType === 'agent' && (
-              <Alert>
-                <Shield className="h-4 w-4" />
-                <AlertDescription>
-                  <div className="space-y-2">
-                    <p>
-                      SSH Agent authentication uses your system&apos;s SSH agent. Ensure your key is
-                      loaded before connecting.
-                    </p>
-                    <details className="text-xs text-muted-foreground">
-                      <summary className="cursor-pointer font-semibold text-foreground">
-                        How to set up SSH agent
-                      </summary>
-                      <div className="mt-2 space-y-1 font-mono text-xs">
-                        <p>1. Start SSH agent (if not running):</p>
-                        <p className="pl-2 text-muted-foreground">
-                          eval &quot;$(ssh-agent -s)&quot;
-                        </p>
-                        <p className="pt-1">2. Check if your key is loaded:</p>
-                        <p className="pl-2 text-muted-foreground">ssh-add -l</p>
-                        <p className="pt-1">3. If not listed, add your key:</p>
-                        <p className="pl-2 text-muted-foreground">ssh-add ~/.ssh/id_ed25519</p>
-                        <p className="pt-1">(or your key filename if different)</p>
-                      </div>
-                    </details>
-                  </div>
-                </AlertDescription>
-              </Alert>
-            )}
-
-            {/* Connection Test Result */}
-            {testStatus !== 'idle' && (
-              <Badge
-                variant="outline"
-                className={cn(
-                  'w-full justify-start gap-2 py-1.5',
-                  testStatus === 'success' && 'border-emerald-500/40 bg-emerald-500/10',
-                  testStatus === 'error' && 'border-destructive/40 bg-destructive/10'
-                )}
-              >
-                {testStatus === 'testing' && <Loader2 className="h-3 w-3 animate-spin" />}
-                {testStatus === 'success' && (
-                  <CheckCircle2 className="h-3 w-3 shrink-0 text-emerald-500" />
-                )}
-                {testStatus === 'error' && (
-                  <XCircle className="h-3 w-3 shrink-0 text-destructive" />
-                )}
-                <span className="whitespace-pre-wrap break-words">
-                  {testStatus === 'testing' && 'Testing connection...'}
-                  {testStatus === 'success' &&
-                    `Connected successfully${testResult?.latency ? ` (${testResult.latency}ms)` : ''}`}
-                  {testStatus === 'error' && (testResult?.error || 'Connection failed')}
-                </span>
-              </Badge>
-            )}
-
-            {debugLogs.length > 0 && (
-              <Collapsible open={debugLogsOpen} onOpenChange={setDebugLogsOpen}>
-                <CollapsibleTrigger className="flex items-center gap-1 text-xs text-muted-foreground hover:text-foreground [&[data-state=open]>svg:first-child]:rotate-180">
-                  <ChevronDown className="h-3 w-3 transition-transform duration-200" />
-                  Show connection debug log ({debugLogs.length})
-                </CollapsibleTrigger>
-                <CollapsibleContent>
-                  <div className="mt-1 flex items-center justify-end">
-                    <button
-                      type="button"
-                      onClick={async () => {
-                        try {
-                          await navigator.clipboard.writeText(debugLogs.join('\n'));
-                          setDebugLogsCopied(true);
-                          setTimeout(() => setDebugLogsCopied(false), 2000);
-                        } catch {
-                          // Clipboard access may be denied
-                        }
-                      }}
-                      className="flex items-center gap-1 text-[10px] text-muted-foreground hover:text-foreground"
-                      aria-label="Copy debug log"
-                    >
-                      {debugLogsCopied ? (
-                        <Check className="h-3 w-3" />
-                      ) : (
-                        <Copy className="h-3 w-3" />
-                      )}
-                      {debugLogsCopied ? 'Copied' : 'Copy'}
-                    </button>
-                  </div>
-                  <pre className="max-h-[200px] overflow-y-auto overflow-x-hidden whitespace-pre-wrap break-words rounded border bg-muted/50 p-2 font-mono text-[10px] leading-relaxed text-muted-foreground">
-                    {debugLogs.join('\n')}
-                  </pre>
-                </CollapsibleContent>
-              </Collapsible>
-            )}
-          </div>
-        );
-
-      case 'path':
-        return (
-          <div className="space-y-4">
-            {/* Repo mode picker */}
-            <div className="grid grid-cols-3 gap-2">
-              {(
-                [
-                  { id: 'pick' as RepoMode, label: 'Pick Existing', icon: FolderOpen },
-                  { id: 'create' as RepoMode, label: 'Create New', icon: Plus },
-                  { id: 'clone' as RepoMode, label: 'Clone', icon: Download },
-                ] as const
-              ).map(({ id, label, icon: Icon }) => (
-                <button
-                  key={id}
-                  type="button"
-                  onClick={() => {
-                    setRepoMode(id);
-                    setErrors({});
-                  }}
-                  className={cn(
-                    'flex items-center justify-center gap-2 rounded-md border-2 px-3 py-2 text-sm font-medium transition-colors hover:bg-accent',
-                    repoMode === id
-                      ? 'border-primary bg-primary/5 text-primary'
-                      : 'border-muted text-muted-foreground'
-                  )}
-                >
-                  <Icon className="h-4 w-4" />
-                  {label}
-                </button>
-              ))}
-            </div>
-
-            <Separator />
-
-            {/* Mode-specific form fields */}
-            {repoMode === 'create' && (
-              <div className="space-y-2">
-                <Label htmlFor="new-repo-name">
-                  Repository Name <span className="text-destructive">*</span>
-                </Label>
-                <div className="relative">
-                  <GitBranch className="absolute left-3 top-1/2 h-4 w-4 -translate-y-1/2 text-muted-foreground" />
-                  <Input
-                    id="new-repo-name"
-                    value={newRepoName}
-                    onChange={(e) => {
-                      setNewRepoName(e.target.value);
-                      setErrors((prev) => ({ ...prev, general: undefined }));
-                    }}
-                    placeholder="my-new-project"
-                    className="pl-10"
-                  />
-                </div>
-                <p className="text-xs text-muted-foreground">
-                  A new git repository will be created at{' '}
-                  <span className="font-mono">
-                    {formData.remotePath.replace(/\/+$/, '')}/{newRepoName || '...'}
-                  </span>
-                </p>
-              </div>
-            )}
-
-            {repoMode === 'clone' && (
-              <div className="space-y-3">
-                <div className="space-y-2">
-                  <Label htmlFor="clone-url">
-                    Repository URL <span className="text-destructive">*</span>
-                  </Label>
-                  <div className="relative">
-                    <Globe className="absolute left-3 top-1/2 h-4 w-4 -translate-y-1/2 text-muted-foreground" />
-                    <Input
-                      id="clone-url"
-                      value={cloneUrl}
-                      onChange={(e) => {
-                        setCloneUrl(e.target.value);
-                        setErrors((prev) => ({ ...prev, general: undefined }));
-                      }}
-                      placeholder="https://github.com/owner/repo.git"
-                      className="pl-10"
-                    />
-                  </div>
-                </div>
-                <div className="space-y-2">
-                  <Label htmlFor="clone-dir">Directory Name</Label>
-                  <Input
-                    id="clone-dir"
-                    value={cloneDirName}
-                    onChange={(e) => {
-                      setCloneDirName(e.target.value);
-                      setCloneDirManuallyEdited(true);
-                    }}
-                    placeholder="repo"
-                  />
-                  <p className="text-xs text-muted-foreground">
-                    Will be cloned to{' '}
-                    <span className="font-mono">
-                      {formData.remotePath.replace(/\/+$/, '')}/{cloneDirName || '...'}
-                    </span>
-                  </p>
-                </div>
-              </div>
-            )}
-
-            {/* Path browser header */}
-            <div className="space-y-2">
-              <Label>{repoMode === 'pick' ? 'Project Path' : 'Parent Directory'}</Label>
-              <div className="flex gap-2">
-                <div className="relative min-w-0 flex-1">
-                  <FolderOpen className="absolute left-3 top-1/2 h-4 w-4 -translate-y-1/2 text-muted-foreground" />
-                  <Input
-                    id="remote-path"
-                    value={formData.remotePath}
-                    onChange={(e) => updateField('remotePath', e.target.value)}
-                    onBlur={() => touchField('remotePath')}
-                    placeholder={repoMode === 'pick' ? '/home/user/myproject' : '/home/user'}
-                    className={cn(
-                      'pl-10',
-                      errors.remotePath && touched.remotePath && 'border-destructive'
-                    )}
-                  />
-                </div>
-                <Button
-                  type="button"
-                  variant="outline"
-                  className="shrink-0"
-                  onClick={() => void browseRemotePath(formData.remotePath || '/')}
-                  disabled={isBrowsing}
-                >
-                  {isBrowsing ? <Spinner size="sm" /> : <RefreshCw className="h-4 w-4" />}
-                </Button>
-              </div>
-              {errors.remotePath && touched.remotePath && (
-                <p className="text-xs text-destructive">{errors.remotePath}</p>
-              )}
-            </div>
-
-            {browseError && (
-              <Badge
-                variant="outline"
-                className="w-full justify-start gap-2 border-destructive/40 bg-destructive/10 py-1.5"
-              >
-                <XCircle className="h-3 w-3 shrink-0 text-destructive" />
-                <span className="whitespace-pre-wrap break-words">{browseError}</span>
-              </Badge>
-            )}
-
-            {/* Directory browser */}
-            <div className="overflow-hidden rounded-md border">
-              <div className="flex items-center gap-2 border-b bg-muted/50 px-3 py-2">
-                <Button
-                  type="button"
-                  variant="ghost"
-                  size="icon-sm"
-                  className="h-6 w-6"
-                  onClick={navigateUp}
-                  disabled={formData.remotePath === '/' || isBrowsing}
-                >
-                  <ChevronUp className="h-4 w-4" />
-                </Button>
-                <span className="min-w-0 flex-1 truncate text-sm font-medium">
-                  {formData.remotePath || '/'}
-                </span>
-              </div>
-              <div className="max-h-[200px] overflow-y-auto">
-                {isBrowsing && fileEntries.length === 0 ? (
-                  <div className="flex items-center justify-center py-8">
-                    <Spinner size="md" />
-                  </div>
-                ) : fileEntries.length === 0 ? (
-                  <div className="py-8 text-center text-sm text-muted-foreground">
-                    Click refresh to browse directory
-                  </div>
-                ) : (
-                  <div className="divide-y">
-                    {fileEntries.map((entry) => (
-                      <button
-                        key={entry.path}
-                        type="button"
-                        onClick={() => navigateTo(entry)}
-                        className={cn(
-                          'flex w-full items-center gap-2 px-3 py-2 text-left text-sm hover:bg-accent',
-                          entry.type === 'directory' && 'font-medium'
-                        )}
-                      >
-                        {entry.type === 'directory' ? (
-                          <Folder className="h-4 w-4 text-muted-foreground" />
-                        ) : (
-                          <FileCode className="h-4 w-4 text-muted-foreground" />
-                        )}
-                        <span className="flex-1 truncate">{entry.name}</span>
-                        {entry.type === 'file' && (
-                          <span className="text-xs text-muted-foreground">
-                            {(entry.size / 1024).toFixed(1)} KB
-                          </span>
-                        )}
-                      </button>
-                    ))}
-                  </div>
-                )}
-              </div>
-            </div>
-
-            <p className="text-xs text-muted-foreground">
-              {repoMode === 'pick' &&
-                'Select the directory containing your project. Click on a folder to navigate into it.'}
-              {repoMode === 'create' && 'Navigate to where you want to create the new repository.'}
-              {repoMode === 'clone' && 'Navigate to where you want to clone the repository.'}
-            </p>
-          </div>
-        );
-
-      case 'confirm':
-        return (
-          <div className="space-y-4">
-            <Badge
-              variant="outline"
-              className="w-full justify-start gap-2 border-emerald-500/40 bg-emerald-500/10 py-1.5"
-            >
-              <CheckCircle2 className="h-3 w-3 shrink-0 text-emerald-500" />
-              <span>Please review your configuration before saving.</span>
-            </Badge>
-
-            <div className="rounded-md border">
-              <div className="border-b bg-muted/50 px-4 py-2 text-sm font-medium">
-                Connection Summary
-              </div>
-              <div className="divide-y">
-                <div className="flex px-4 py-3">
-                  <span className="w-32 shrink-0 text-sm text-muted-foreground">Name</span>
-                  <span className="min-w-0 flex-1 truncate text-sm font-medium">
-                    {formData.name}
-                  </span>
-                </div>
-                <div className="flex px-4 py-3">
-                  <span className="w-32 shrink-0 text-sm text-muted-foreground">Host</span>
-                  <span className="min-w-0 flex-1 truncate text-sm font-medium">
-                    {formData.username}@{formData.host}:{formData.port}
-                  </span>
-                </div>
-                <div className="flex px-4 py-3">
-                  <span className="w-32 shrink-0 text-sm text-muted-foreground">
-                    Authentication
-                  </span>
-                  <span className="min-w-0 flex-1 truncate text-sm font-medium">
-                    {formData.authType === 'password' && 'Password'}
-                    {formData.authType === 'key' && 'SSH Key'}
-                    {formData.authType === 'agent' && 'SSH Agent'}
-                  </span>
-                </div>
-                <div className="flex px-4 py-3">
-                  <span className="w-32 shrink-0 text-sm text-muted-foreground">Project Path</span>
-                  <span className="min-w-0 flex-1 truncate font-mono text-sm font-medium">
-                    {formData.remotePath}
-                  </span>
-                </div>
-              </div>
-            </div>
-
-            <p className="text-xs text-muted-foreground">
-              {useExistingConnection
-                ? 'The existing connection will be reused for this project.'
-                : "The connection will be saved and you'll be able to access this project from the workspace."}
-            </p>
-          </div>
-        );
-    }
-  };
-
-  return (
-    <DialogContent
-      className="max-w-lg md:max-w-2xl"
-      onInteractOutside={(e) => {
-        if (isSubmitting) e.preventDefault();
-        else handleClose();
-      }}
-      onEscapeKeyDown={(e) => {
-        if (isSubmitting) e.preventDefault();
-        else handleClose();
-      }}
-    >
-      <DialogHeader>
-        <DialogTitle>Add Remote Project</DialogTitle>
-        <DialogDescription>
-          Connect to a remote server via SSH to work on your project.
-        </DialogDescription>
-      </DialogHeader>
-
-      <Separator />
-
-      {/* Step indicator */}
-      <div className="flex items-center gap-2 py-2">
-        {steps.map((step, index) => {
-          const Icon = step.icon;
-          const isActive = index === currentStepIndex;
-          const isCompleted = index < currentStepIndex;
-
-          return (
-            <React.Fragment key={step.id}>
-              <div
-                className={cn(
-                  'flex h-8 w-8 items-center justify-center rounded-sm border-2 text-xs font-medium',
-                  isActive && 'border-primary bg-primary text-primary-foreground',
-                  isCompleted && 'border-primary bg-primary/10 text-primary',
-                  !isActive && !isCompleted && 'border-muted text-muted-foreground'
-                )}
-              >
-                {isCompleted ? <Check className="h-4 w-4" /> : <Icon className="h-4 w-4" />}
-              </div>
-              {index < steps.length - 1 && (
-                <ChevronRight
-                  className={cn('h-4 w-4', isCompleted ? 'text-primary' : 'text-muted-foreground')}
-                />
-              )}
-            </React.Fragment>
-          );
-        })}
-      </div>
-
-      {/* Step title */}
-      <div>
-        <h3 className="text-lg font-medium">{steps[currentStepIndex]?.label}</h3>
-      </div>
-
-      {/* Error display (hidden on auth step where test result badge already shows it) */}
-      {errors.general && currentStep !== 'auth' && (
-        <Badge
-          variant="outline"
-          className="w-full justify-start gap-2 border-destructive/40 bg-destructive/10 py-1.5"
-        >
-          <XCircle className="h-3 w-3 shrink-0 text-destructive" />
-          <span className="whitespace-pre-wrap break-words">{errors.general}</span>
-        </Badge>
-      )}
-
-      {/* Step content */}
-      <div className="min-w-0 py-2">{renderStepContent()}</div>
-
-      {/* Navigation buttons */}
-      <div
-        className={cn(
-          'flex gap-2',
-          currentStep === 'connection' ? 'justify-end' : 'justify-between'
-        )}
-      >
-        <Button
-          type="button"
-          variant="outline"
-          onClick={currentStep === 'connection' ? onClose : handleBack}
-          disabled={isSubmitting}
-        >
-          {currentStep === 'connection' ? (
-            'Cancel'
-          ) : (
-            <>
-              <ChevronLeft className="mr-1 h-4 w-4" />
-              Back
-            </>
-          )}
-        </Button>
-
-        {currentStep === 'confirm' ? (
-          <Button type="button" onClick={() => void handleSubmit()} disabled={isSubmitting}>
-            {isSubmitting ? (
-              <>
-                <Spinner size="sm" className="mr-2" />
-                Saving...
-              </>
-            ) : (
-              <>
-                <Check className="mr-1 h-4 w-4" />
-                {useExistingConnection ? 'Add Project' : 'Save Connection'}
-              </>
-            )}
-          </Button>
-        ) : (
-          <Button
-            type="button"
-            onClick={() => void handleNext()}
-            disabled={
-              isSubmitting ||
-              (currentStep === 'auth' && testStatus === 'testing') ||
-              isCreatingRepo ||
-              isCloningRepo
-            }
-          >
-            {currentStep === 'auth' && testStatus === 'testing' ? (
-              <>
-                <Loader2 className="mr-1 h-4 w-4 animate-spin" />
-                Testing...
-              </>
-            ) : isCreatingRepo ? (
-              <>
-                <Loader2 className="mr-1 h-4 w-4 animate-spin" />
-                Creating...
-              </>
-            ) : isCloningRepo ? (
-              <>
-                <Loader2 className="mr-1 h-4 w-4 animate-spin" />
-                Cloning...
-              </>
-            ) : (
-              <>
-                Next
-                <ChevronRight className="ml-1 h-4 w-4" />
-              </>
-            )}
-          </Button>
-        )}
-      </div>
-    </DialogContent>
-  );
-};
-
-export default AddRemoteProjectModal;
diff --git a/src/renderer/components/ssh/ConnectionStatusBadge.tsx b/src/renderer/components/ssh/ConnectionStatusBadge.tsx
deleted file mode 100644
index 8bdd021e0a..0000000000
--- a/src/renderer/components/ssh/ConnectionStatusBadge.tsx
+++ /dev/null
@@ -1,85 +0,0 @@
-import React from 'react';
-import { cn } from '@/lib/utils';
-import { CheckCircle2, AlertCircle, Loader2, XCircle, Circle } from 'lucide-react';
-
-export type ConnectionState =
-  | 'connected'
-  | 'connecting'
-  | 'disconnected'
-  | 'error'
-  | 'reconnecting';
-
-interface Props {
-  state: ConnectionState;
-  showIcon?: boolean;
-  className?: string;
-}
-
-const stateConfig: Record<
-  ConnectionState,
-  {
-    label: string;
-    icon: React.ElementType;
-    colorClass: string;
-    bgClass: string;
-  }
-> = {
-  connected: {
-    label: 'Connected',
-    icon: CheckCircle2,
-    colorClass: 'text-emerald-600 dark:text-emerald-400',
-    bgClass: 'bg-emerald-100 dark:bg-emerald-900/30',
-  },
-  connecting: {
-    label: 'Connecting',
-    icon: Loader2,
-    colorClass: 'text-amber-600 dark:text-amber-400',
-    bgClass: 'bg-amber-100 dark:bg-amber-900/30',
-  },
-  reconnecting: {
-    label: 'Reconnecting',
-    icon: Loader2,
-    colorClass: 'text-amber-600 dark:text-amber-400',
-    bgClass: 'bg-amber-100 dark:bg-amber-900/30',
-  },
-  disconnected: {
-    label: 'Disconnected',
-    icon: Circle,
-    colorClass: 'text-gray-600 dark:text-gray-400',
-    bgClass: 'bg-gray-100 dark:bg-gray-800',
-  },
-  error: {
-    label: 'Error',
-    icon: XCircle,
-    colorClass: 'text-red-600 dark:text-red-400',
-    bgClass: 'bg-red-100 dark:bg-red-900/30',
-  },
-};
-
-export const ConnectionStatusBadge: React.FC<Props> = ({ state, showIcon = true, className }) => {
-  const config = stateConfig[state];
-  const Icon = config.icon;
-
-  return (
-    <span
-      className={cn(
-        'inline-flex items-center gap-1.5 rounded-full px-2.5 py-0.5 text-xs font-medium',
-        config.bgClass,
-        config.colorClass,
-        className
-      )}
-    >
-      {showIcon && (
-        <Icon
-          className={cn(
-            'h-3.5 w-3.5',
-            state === 'connecting' || state === 'reconnecting' ? 'animate-spin' : ''
-          )}
-        />
-      )}
-      <span>{config.label}</span>
-    </span>
-  );
-};
-
-export default ConnectionStatusBadge;
diff --git a/src/renderer/components/ssh/RemoteProjectIndicator.tsx b/src/renderer/components/ssh/RemoteProjectIndicator.tsx
deleted file mode 100644
index e8de51193d..0000000000
--- a/src/renderer/components/ssh/RemoteProjectIndicator.tsx
+++ /dev/null
@@ -1,126 +0,0 @@
-import React, { useCallback } from 'react';
-import { Globe, AlertCircle, RefreshCw, Loader2 } from 'lucide-react';
-import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '../ui/tooltip';
-import { cn } from '../../lib/utils';
-
-export type ConnectionState =
-  | 'connected'
-  | 'connecting'
-  | 'disconnected'
-  | 'error'
-  | 'reconnecting';
-
-interface Props {
-  host?: string;
-  connectionState?: ConnectionState;
-  showLabel?: boolean;
-  size?: 'sm' | 'md' | 'lg';
-  onReconnect?: () => void;
-  disabled?: boolean;
-}
-
-const stateConfig: Record<
-  ConnectionState,
-  { color: string; icon: React.ReactNode; label: string }
-> = {
-  connected: {
-    color: 'text-muted-foreground',
-    icon: <Globe className="h-full w-full" />,
-    label: 'Connected',
-  },
-  connecting: {
-    color: 'text-muted-foreground',
-    icon: <Loader2 className="h-full w-full animate-spin" />,
-    label: 'Connecting...',
-  },
-  reconnecting: {
-    color: 'text-muted-foreground',
-    icon: <RefreshCw className="h-full w-full animate-spin" />,
-    label: 'Reconnecting...',
-  },
-  disconnected: {
-    color: 'text-muted-foreground',
-    icon: <Globe className="h-full w-full opacity-50" />,
-    label: 'Disconnected',
-  },
-  error: {
-    color: 'text-muted-foreground',
-    icon: <AlertCircle className="h-full w-full" />,
-    label: 'Connection Error',
-  },
-};
-
-const sizeClasses = {
-  sm: 'h-3 w-3',
-  md: 'h-4 w-4',
-  lg: 'h-5 w-5',
-};
-
-export const RemoteProjectIndicator: React.FC<Props> = ({
-  host,
-  connectionState = 'disconnected',
-  showLabel = false,
-  size = 'sm',
-  onReconnect,
-  disabled = false,
-}) => {
-  const config = stateConfig[connectionState];
-  const isDisconnected = connectionState === 'disconnected' || connectionState === 'error';
-
-  const handleReconnect = useCallback(
-    (e: React.MouseEvent) => {
-      e.stopPropagation();
-      if (isDisconnected && onReconnect && !disabled) {
-        onReconnect();
-      }
-    },
-    [isDisconnected, onReconnect, disabled]
-  );
-
-  const tooltipContent = (
-    <div className="space-y-1">
-      <p className="font-medium">
-        {config.label}
-        {host && <span className="text-muted-foreground"> - {host}</span>}
-      </p>
-      {isDisconnected && onReconnect && (
-        <p className="text-xs text-muted-foreground">Click to reconnect</p>
-      )}
-    </div>
-  );
-
-  return (
-    <TooltipProvider delayDuration={100}>
-      <Tooltip>
-        <TooltipTrigger asChild>
-          <span
-            className={cn(
-              'inline-flex items-center gap-1.5',
-              isDisconnected && onReconnect && !disabled && 'cursor-pointer'
-            )}
-            onClick={handleReconnect}
-            role={isDisconnected && onReconnect ? 'button' : undefined}
-            tabIndex={isDisconnected && onReconnect ? 0 : undefined}
-            onKeyDown={(e) => {
-              if ((e.key === 'Enter' || e.key === ' ') && isDisconnected && onReconnect) {
-                e.preventDefault();
-                onReconnect();
-              }
-            }}
-          >
-            <span className={cn(config.color, sizeClasses[size], 'flex-shrink-0')}>
-              {config.icon}
-            </span>
-            {showLabel && <span className={cn('text-xs', config.color)}>{config.label}</span>}
-            {isDisconnected && onReconnect && !disabled && (
-              <RefreshCw className="h-3 w-3 text-muted-foreground opacity-0 transition-opacity hover:text-foreground group-hover:opacity-100" />
-            )}
-          </span>
-        </TooltipTrigger>
-        <TooltipContent side="top" align="center">
-          {tooltipContent}
-        </TooltipContent>
-      </Tooltip>
-    </TooltipProvider>
-  );
-};
diff --git a/src/renderer/components/ssh/SshConnectionForm.tsx b/src/renderer/components/ssh/SshConnectionForm.tsx
deleted file mode 100644
index 9aa0acd81e..0000000000
--- a/src/renderer/components/ssh/SshConnectionForm.tsx
+++ /dev/null
@@ -1,479 +0,0 @@
-import React, { useState, useCallback, useEffect } from 'react';
-import { Button } from '../ui/button';
-import { Input } from '../ui/input';
-import { Label } from '../ui/label';
-import { RadioGroup, RadioGroupItem } from '../ui/radio-group';
-import { Spinner } from '../ui/spinner';
-import { cn } from '@/lib/utils';
-import { FolderOpen, Eye, EyeOff, Server, User, Lock, Key, Shield, Download } from 'lucide-react';
-import { useSshConnections } from '../../hooks/useSshConnections';
-import type { SshConfig, SshConfigHost } from '@shared/ssh/types';
-
-export interface SshConnectionConfig extends Omit<SshConfig, 'id'> {
-  password?: string;
-  passphrase?: string;
-}
-
-interface ValidationErrors {
-  name?: string;
-  host?: string;
-  port?: string;
-  username?: string;
-  password?: string;
-  privateKeyPath?: string;
-  passphrase?: string;
-  [key: string]: string | undefined;
-}
-
-interface Props {
-  initialValues?: Partial<SshConnectionConfig>;
-  onSubmit: (config: SshConnectionConfig) => void;
-  onCancel?: () => void;
-  isSubmitting?: boolean;
-}
-
-export const SshConnectionForm: React.FC<Props> = ({
-  initialValues,
-  onSubmit,
-  onCancel,
-  isSubmitting = false,
-}) => {
-  const { getSshConfigHost } = useSshConnections();
-
-  const [formData, setFormData] = useState<SshConnectionConfig>({
-    name: '',
-    host: '',
-    port: 22,
-    username: '',
-    authType: 'password',
-    password: '',
-    privateKeyPath: '',
-    passphrase: '',
-    ...initialValues,
-  });
-
-  const [errors, setErrors] = useState<ValidationErrors>({});
-  const [showPassword, setShowPassword] = useState(false);
-  const [showPassphrase, setShowPassphrase] = useState(false);
-  const [isLoadingFromConfig, setIsLoadingFromConfig] = useState(false);
-  const [showConfigSuggestions, setShowConfigSuggestions] = useState(false);
-  const [sshConfigHosts, setSshConfigHosts] = useState<SshConfigHost[]>([]);
-  const [hostMatches, setHostMatches] = useState<SshConfigHost[]>([]);
-
-  // Load SSH config hosts on mount
-  useEffect(() => {
-    const loadSshConfigHosts = async () => {
-      try {
-        const result = (await window.electronAPI.sshGetConfig()) as {
-          success: boolean;
-          hosts?: Array<{
-            host: string;
-            hostname?: string;
-            user?: string;
-            port?: number;
-            identityFile?: string;
-            identityAgent?: string;
-          }>;
-          error?: string;
-        };
-
-        if (result.success && result.hosts) {
-          setSshConfigHosts(result.hosts);
-        }
-      } catch (err) {
-        console.warn('Failed to load SSH config hosts:', err);
-      }
-    };
-
-    loadSshConfigHosts();
-  }, []);
-
-  // Update host suggestions when user types in host field
-  useEffect(() => {
-    if (formData.host.trim().length > 0) {
-      const matches = sshConfigHosts.filter((h) =>
-        h.host.toLowerCase().includes(formData.host.toLowerCase())
-      );
-      setHostMatches(matches);
-      setShowConfigSuggestions(matches.length > 0);
-    } else {
-      setHostMatches([]);
-      setShowConfigSuggestions(false);
-    }
-  }, [formData.host, sshConfigHosts]);
-
-  // Reset form when initialValues change
-  useEffect(() => {
-    if (initialValues) {
-      setFormData((prev) => ({
-        ...prev,
-        ...initialValues,
-      }));
-    }
-  }, [initialValues]);
-
-  // Apply SSH config host settings to form
-  const applyConfigHost = useCallback(async (host: SshConfigHost) => {
-    try {
-      setIsLoadingFromConfig(true);
-
-      // Determine auth type based on config
-      let authType: 'password' | 'key' | 'agent' = 'agent';
-      let privateKeyPath = '';
-
-      if (host.identityAgent) {
-        // IdentityAgent signals the user wants agent-based auth (e.g. 1Password)
-        authType = 'agent';
-      } else if (host.identityFile) {
-        authType = 'key';
-        privateKeyPath = host.identityFile;
-      }
-
-      // Apply settings to form
-      setFormData((prev) => ({
-        ...prev,
-        host: host.hostname || host.host,
-        port: host.port || 22,
-        username: host.user || '',
-        authType,
-        privateKeyPath,
-        // Keep existing name if set, otherwise use host alias
-        name: prev.name || `${host.host} (from SSH config)`,
-      }));
-
-      // Hide suggestions
-      setShowConfigSuggestions(false);
-    } catch (err) {
-      console.error('Failed to apply SSH config:', err);
-    } finally {
-      setIsLoadingFromConfig(false);
-    }
-  }, []);
-
-  const validate = useCallback((): boolean => {
-    const newErrors: ValidationErrors = {};
-
-    if (!formData.name?.trim()) {
-      newErrors.name = 'Name is required';
-    }
-
-    if (!formData.host?.trim()) {
-      newErrors.host = 'Host is required';
-    }
-
-    if (!formData.port || formData.port < 1 || formData.port > 65535) {
-      newErrors.port = 'Port must be between 1 and 65535';
-    }
-
-    if (!formData.username?.trim()) {
-      newErrors.username = 'Username is required';
-    }
-
-    if (formData.authType === 'password' && !formData.password?.trim()) {
-      newErrors.password = 'Password is required';
-    }
-
-    if (formData.authType === 'key') {
-      if (!formData.privateKeyPath?.trim()) {
-        newErrors.privateKeyPath = 'Private key path is required';
-      }
-    }
-
-    setErrors(newErrors);
-    return Object.keys(newErrors).length === 0;
-  }, [formData]);
-
-  const handleSubmit = useCallback(
-    (e: React.FormEvent) => {
-      e.preventDefault();
-      if (validate()) {
-        onSubmit(formData);
-      }
-    },
-    [formData, onSubmit, validate]
-  );
-
-  const handleChange = useCallback(
-    (field: keyof SshConnectionConfig, value: string | number) => {
-      setFormData((prev) => ({ ...prev, [field]: value }));
-      // Clear error when user starts typing
-      if (errors[field]) {
-        setErrors((prev) => ({ ...prev, [field]: undefined }));
-      }
-    },
-    [errors]
-  );
-
-  const handleSelectKeyFile = useCallback(async () => {
-    try {
-      const result = await window.electronAPI.openFile({
-        title: 'Select SSH Private Key',
-        message: 'Select your SSH private key file',
-      });
-      if (result.success && result.path) {
-        handleChange('privateKeyPath', result.path);
-      }
-    } catch (error) {
-      console.error('Failed to select key file:', error);
-    }
-  }, [handleChange]);
-
-  return (
-    <form onSubmit={handleSubmit} className="space-y-5">
-      {/* Connection Name */}
-      <div className="space-y-2">
-        <Label htmlFor="name">
-          Connection Name <span className="text-red-500">*</span>
-        </Label>
-        <Input
-          id="name"
-          type="text"
-          placeholder="e.g., Production Server"
-          value={formData.name}
-          onChange={(e) => handleChange('name', e.target.value)}
-          className={cn(errors.name && 'border-red-500 focus-visible:ring-red-500')}
-        />
-        {errors.name && <p className="text-xs text-red-500">{errors.name}</p>}
-      </div>
-
-      {/* Host and Port */}
-      <div className="grid grid-cols-3 gap-4">
-        <div className="col-span-2 space-y-2">
-          <Label htmlFor="host">
-            Host <span className="text-red-500">*</span>
-          </Label>
-          <div className="relative">
-            <Server className="absolute left-3 top-1/2 h-4 w-4 -translate-y-1/2 text-muted-foreground" />
-            <Input
-              id="host"
-              type="text"
-              placeholder="e.g., 192.168.1.100 or server.example.com"
-              value={formData.host}
-              onChange={(e) => handleChange('host', e.target.value)}
-              onFocus={() =>
-                formData.host.trim().length > 0 && setShowConfigSuggestions(hostMatches.length > 0)
-              }
-              className={cn('pl-10', errors.host && 'border-red-500 focus-visible:ring-red-500')}
-            />
-
-            {/* SSH Config suggestions dropdown */}
-            {showConfigSuggestions && hostMatches.length > 0 && (
-              <div className="absolute left-0 right-0 top-full z-10 mt-1 max-h-48 overflow-y-auto rounded-md border border-border bg-popover shadow-md">
-                <div className="border-b border-border px-3 py-2 text-xs text-muted-foreground">
-                  Found in ~/.ssh/config
-                </div>
-                {hostMatches.map((match) => (
-                  <button
-                    key={match.host}
-                    type="button"
-                    onClick={() => applyConfigHost(match)}
-                    disabled={isLoadingFromConfig}
-                    className="group flex w-full items-center justify-between px-3 py-2 text-left hover:bg-accent disabled:opacity-50"
-                  >
-                    <div className="flex flex-col gap-0.5">
-                      <span className="text-sm font-medium">{match.host}</span>
-                      {match.hostname && (
-                        <span className="text-xs text-muted-foreground">
-                          {match.hostname}:{match.port || 22} • {match.user || 'unknown'}
-                        </span>
-                      )}
-                    </div>
-                    <Download className="h-3 w-3 text-muted-foreground opacity-0 group-hover:opacity-100" />
-                  </button>
-                ))}
-              </div>
-            )}
-          </div>
-          {errors.host && <p className="text-xs text-red-500">{errors.host}</p>}
-        </div>
-
-        <div className="space-y-2">
-          <Label htmlFor="port">Port</Label>
-          <Input
-            id="port"
-            type="number"
-            min={1}
-            max={65535}
-            value={formData.port}
-            onChange={(e) => handleChange('port', parseInt(e.target.value, 10) || 22)}
-            className={cn(errors.port && 'border-red-500 focus-visible:ring-red-500')}
-          />
-          {errors.port && <p className="text-xs text-red-500">{errors.port}</p>}
-        </div>
-      </div>
-
-      {/* Username */}
-      <div className="space-y-2">
-        <Label htmlFor="username">
-          Username <span className="text-red-500">*</span>
-        </Label>
-        <div className="relative">
-          <User className="absolute left-3 top-1/2 h-4 w-4 -translate-y-1/2 text-muted-foreground" />
-          <Input
-            id="username"
-            type="text"
-            placeholder="e.g., ubuntu"
-            value={formData.username}
-            onChange={(e) => handleChange('username', e.target.value)}
-            className={cn('pl-10', errors.username && 'border-red-500 focus-visible:ring-red-500')}
-          />
-        </div>
-        {errors.username && <p className="text-xs text-red-500">{errors.username}</p>}
-      </div>
-
-      {/* Auth Type */}
-      <div className="space-y-3">
-        <Label>Authentication Method</Label>
-        <RadioGroup
-          value={formData.authType}
-          onValueChange={(value: 'password' | 'key' | 'agent') => handleChange('authType', value)}
-          className="flex flex-col gap-3"
-        >
-          <div className="flex items-center space-x-2 rounded-lg border border-border p-3 hover:bg-muted/50">
-            <RadioGroupItem value="password" id="auth-password" />
-            <Label
-              htmlFor="auth-password"
-              className="flex cursor-pointer items-center gap-2 font-normal"
-            >
-              <Lock className="h-4 w-4 text-muted-foreground" />
-              <div>
-                <span className="font-medium">Password</span>
-                <p className="text-xs text-muted-foreground">Authenticate using a password</p>
-              </div>
-            </Label>
-          </div>
-
-          <div className="flex items-center space-x-2 rounded-lg border border-border p-3 hover:bg-muted/50">
-            <RadioGroupItem value="key" id="auth-key" />
-            <Label
-              htmlFor="auth-key"
-              className="flex cursor-pointer items-center gap-2 font-normal"
-            >
-              <Key className="h-4 w-4 text-muted-foreground" />
-              <div>
-                <span className="font-medium">SSH Key</span>
-                <p className="text-xs text-muted-foreground">Use a private key file (PEM, KEY)</p>
-              </div>
-            </Label>
-          </div>
-
-          <div className="flex items-center space-x-2 rounded-lg border border-border p-3 hover:bg-muted/50">
-            <RadioGroupItem value="agent" id="auth-agent" />
-            <Label
-              htmlFor="auth-agent"
-              className="flex cursor-pointer items-center gap-2 font-normal"
-            >
-              <Shield className="h-4 w-4 text-muted-foreground" />
-              <div>
-                <span className="font-medium">SSH Agent</span>
-                <p className="text-xs text-muted-foreground">Use the system SSH agent</p>
-              </div>
-            </Label>
-          </div>
-        </RadioGroup>
-      </div>
-
-      {/* Conditional Fields based on Auth Type */}
-      {formData.authType === 'password' && (
-        <div className="space-y-2">
-          <Label htmlFor="password">Password</Label>
-          <div className="relative">
-            <Lock className="absolute left-3 top-1/2 h-4 w-4 -translate-y-1/2 text-muted-foreground" />
-            <Input
-              id="password"
-              type={showPassword ? 'text' : 'password'}
-              placeholder="Enter your password"
-              value={formData.password || ''}
-              onChange={(e) => handleChange('password', e.target.value)}
-              className={cn(
-                'pl-10 pr-10',
-                errors.password && 'border-red-500 focus-visible:ring-red-500'
-              )}
-            />
-            <button
-              type="button"
-              onClick={() => setShowPassword(!showPassword)}
-              className="absolute right-3 top-1/2 -translate-y-1/2 text-muted-foreground hover:text-foreground"
-            >
-              {showPassword ? <EyeOff className="h-4 w-4" /> : <Eye className="h-4 w-4" />}
-            </button>
-          </div>
-          {errors.password && <p className="text-xs text-red-500">{errors.password}</p>}
-        </div>
-      )}
-
-      {formData.authType === 'key' && (
-        <div className="space-y-4">
-          <div className="space-y-2">
-            <Label htmlFor="privateKeyPath">Private Key Path</Label>
-            <div className="flex gap-2">
-              <div className="relative flex-1">
-                <Key className="absolute left-3 top-1/2 h-4 w-4 -translate-y-1/2 text-muted-foreground" />
-                <Input
-                  id="privateKeyPath"
-                  type="text"
-                  placeholder="/home/user/.ssh/id_rsa"
-                  value={formData.privateKeyPath || ''}
-                  onChange={(e) => handleChange('privateKeyPath', e.target.value)}
-                  className={cn(
-                    'pl-10',
-                    errors.privateKeyPath && 'border-red-500 focus-visible:ring-red-500'
-                  )}
-                />
-              </div>
-              <Button type="button" variant="outline" size="icon" onClick={handleSelectKeyFile}>
-                <FolderOpen className="h-4 w-4" />
-              </Button>
-            </div>
-            {errors.privateKeyPath && (
-              <p className="text-xs text-red-500">{errors.privateKeyPath}</p>
-            )}
-          </div>
-
-          <div className="space-y-2">
-            <Label htmlFor="passphrase">Key Passphrase (optional)</Label>
-            <div className="relative">
-              <Lock className="absolute left-3 top-1/2 h-4 w-4 -translate-y-1/2 text-muted-foreground" />
-              <Input
-                id="passphrase"
-                type={showPassphrase ? 'text' : 'password'}
-                placeholder="Enter passphrase if your key is encrypted"
-                value={formData.passphrase || ''}
-                onChange={(e) => handleChange('passphrase', e.target.value)}
-                className="pl-10 pr-10"
-              />
-              <button
-                type="button"
-                onClick={() => setShowPassphrase(!showPassphrase)}
-                className="absolute right-3 top-1/2 -translate-y-1/2 text-muted-foreground hover:text-foreground"
-              >
-                {showPassphrase ? <EyeOff className="h-4 w-4" /> : <Eye className="h-4 w-4" />}
-              </button>
-            </div>
-          </div>
-        </div>
-      )}
-
-      {/* Action Buttons */}
-      <div className="flex justify-end gap-3 pt-4">
-        {onCancel && (
-          <Button type="button" variant="outline" onClick={onCancel} disabled={isSubmitting}>
-            Cancel
-          </Button>
-        )}
-        <Button type="submit" disabled={isSubmitting}>
-          {isSubmitting ? (
-            <>
-              <Spinner size="sm" className="mr-2" />
-              Saving...
-            </>
-          ) : (
-            'Save Connection'
-          )}
-        </Button>
-      </div>
-    </form>
-  );
-};
-
-export default SshConnectionForm;
diff --git a/src/renderer/components/ssh/SshConnectionList.tsx b/src/renderer/components/ssh/SshConnectionList.tsx
deleted file mode 100644
index 665383fe31..0000000000
--- a/src/renderer/components/ssh/SshConnectionList.tsx
+++ /dev/null
@@ -1,230 +0,0 @@
-import React, { useState } from 'react';
-import { Button } from '../ui/button';
-import { Badge } from '../ui/badge';
-import { Spinner } from '../ui/spinner';
-import { cn } from '@/lib/utils';
-import { Edit2, Trash2, Play, Server, Plus, Monitor, Globe } from 'lucide-react';
-import { ConnectionStatusBadge } from './ConnectionStatusBadge';
-import type { ConnectionState } from './ConnectionStatusBadge';
-
-export interface SshConnection {
-  id: string;
-  name: string;
-  host: string;
-  port: number;
-  username: string;
-  authType: 'password' | 'key' | 'agent';
-  privateKeyPath?: string;
-  useAgent?: boolean;
-  state?: ConnectionState;
-  lastError?: string;
-  createdAt: Date;
-  updatedAt: Date;
-}
-
-interface Props {
-  connections: SshConnection[];
-  isLoading?: boolean;
-  onEdit?: (connection: SshConnection) => void;
-  onDelete?: (connection: SshConnection) => void;
-  onTest?: (connection: SshConnection) => void;
-  onSelect?: (connection: SshConnection) => void;
-  selectedId?: string;
-  onAddNew?: () => void;
-}
-
-export const SshConnectionList: React.FC<Props> = ({
-  connections,
-  isLoading = false,
-  onEdit,
-  onDelete,
-  onTest,
-  onSelect,
-  selectedId,
-  onAddNew,
-}) => {
-  const [deletingId, setDeletingId] = useState<string | null>(null);
-  const [testingId, setTestingId] = useState<string | null>(null);
-
-  const handleDelete = async (connection: SshConnection) => {
-    if (!onDelete) return;
-
-    // Confirm deletion
-    if (!confirm(`Are you sure you want to delete "${connection.name}"?`)) {
-      return;
-    }
-
-    setDeletingId(connection.id);
-    try {
-      await onDelete(connection);
-    } finally {
-      setDeletingId(null);
-    }
-  };
-
-  const handleTest = async (connection: SshConnection) => {
-    if (!onTest) return;
-
-    setTestingId(connection.id);
-    try {
-      await onTest(connection);
-    } finally {
-      setTestingId(null);
-    }
-  };
-
-  if (isLoading) {
-    return (
-      <div className="flex h-48 items-center justify-center">
-        <Spinner size="lg" />
-      </div>
-    );
-  }
-
-  if (connections.length === 0) {
-    return (
-      <div className="flex h-64 flex-col items-center justify-center rounded-lg border border-dashed border-border bg-muted/20 p-8 text-center">
-        <div className="mb-4 rounded-full bg-muted p-4">
-          <Monitor className="h-8 w-8 text-muted-foreground" />
-        </div>
-        <h3 className="mb-1 text-sm font-medium">No SSH connections</h3>
-        <p className="mb-4 max-w-xs text-xs text-muted-foreground">
-          Add an SSH connection to connect to remote servers and manage projects remotely.
-        </p>
-        {onAddNew && (
-          <Button type="button" variant="outline" size="sm" onClick={onAddNew}>
-            <Plus className="mr-2 h-4 w-4" />
-            Add Connection
-          </Button>
-        )}
-      </div>
-    );
-  }
-
-  return (
-    <div className="space-y-3">
-      {connections.map((connection) => (
-        <div
-          key={connection.id}
-          className={cn(
-            'group relative rounded-lg border p-4 transition-all',
-            selectedId === connection.id
-              ? 'border-primary bg-primary/5'
-              : 'border-border bg-background hover:border-border/80 hover:bg-muted/30',
-            onSelect && 'cursor-pointer'
-          )}
-          onClick={() => onSelect?.(connection)}
-        >
-          <div className="flex items-start justify-between gap-4">
-            {/* Left side: Icon and Info */}
-            <div className="flex min-w-0 flex-1 items-start gap-3">
-              <div className="mt-0.5 flex h-10 w-10 shrink-0 items-center justify-center rounded-full bg-muted">
-                {connection.authType === 'password' ? (
-                  <Globe className="h-5 w-5 text-muted-foreground" />
-                ) : (
-                  <Server className="h-5 w-5 text-muted-foreground" />
-                )}
-              </div>
-
-              <div className="min-w-0 flex-1">
-                <div className="flex items-center gap-2">
-                  <h4 className="truncate font-medium">{connection.name}</h4>
-                  {connection.state && (
-                    <ConnectionStatusBadge state={connection.state} showIcon={false} />
-                  )}
-                </div>
-
-                <div className="mt-1 flex items-center gap-2 text-xs text-muted-foreground">
-                  <span className="font-mono">
-                    {connection.username}@{connection.host}
-                  </span>
-                  <span>·</span>
-                  <span>Port {connection.port}</span>
-                </div>
-
-                {connection.lastError && (
-                  <p className="mt-2 text-xs text-red-600 dark:text-red-400">
-                    {connection.lastError}
-                  </p>
-                )}
-
-                <div className="mt-2 flex items-center gap-2">
-                  <Badge variant="outline" className="text-[10px]">
-                    {connection.authType === 'password'
-                      ? 'Password'
-                      : connection.authType === 'key'
-                        ? 'SSH Key'
-                        : 'SSH Agent'}
-                  </Badge>
-                </div>
-              </div>
-            </div>
-
-            {/* Right side: Actions */}
-            <div className="flex shrink-0 items-center gap-1 opacity-100 transition-opacity sm:opacity-0 sm:group-hover:opacity-100">
-              {onTest && (
-                <Button
-                  type="button"
-                  variant="ghost"
-                  size="icon"
-                  className="h-8 w-8"
-                  onClick={(e) => {
-                    e.stopPropagation();
-                    handleTest(connection);
-                  }}
-                  disabled={testingId === connection.id}
-                  title="Test connection"
-                >
-                  {testingId === connection.id ? (
-                    <Spinner size="sm" />
-                  ) : (
-                    <Play className="h-4 w-4" />
-                  )}
-                </Button>
-              )}
-
-              {onEdit && (
-                <Button
-                  type="button"
-                  variant="ghost"
-                  size="icon"
-                  className="h-8 w-8"
-                  onClick={(e) => {
-                    e.stopPropagation();
-                    onEdit(connection);
-                  }}
-                  title="Edit connection"
-                >
-                  <Edit2 className="h-4 w-4" />
-                </Button>
-              )}
-
-              {onDelete && (
-                <Button
-                  type="button"
-                  variant="ghost"
-                  size="icon"
-                  className="h-8 w-8 text-red-600 hover:text-red-700"
-                  onClick={(e) => {
-                    e.stopPropagation();
-                    handleDelete(connection);
-                  }}
-                  disabled={deletingId === connection.id}
-                  title="Delete connection"
-                >
-                  {deletingId === connection.id ? (
-                    <Spinner size="sm" />
-                  ) : (
-                    <Trash2 className="h-4 w-4" />
-                  )}
-                </Button>
-              )}
-            </div>
-          </div>
-        </div>
-      ))}
-    </div>
-  );
-};
-
-export default SshConnectionList;
diff --git a/src/renderer/components/ssh/SshConnectionTestButton.tsx b/src/renderer/components/ssh/SshConnectionTestButton.tsx
deleted file mode 100644
index 3eb1a8d1bd..0000000000
--- a/src/renderer/components/ssh/SshConnectionTestButton.tsx
+++ /dev/null
@@ -1,180 +0,0 @@
-import React, { useState, useCallback } from 'react';
-import { Button } from '../ui/button';
-import { Spinner } from '../ui/spinner';
-import { Collapsible, CollapsibleTrigger, CollapsibleContent } from '../ui/collapsible';
-import { cn } from '@/lib/utils';
-import { Play, CheckCircle2, XCircle, Zap, ChevronDown, Copy, Check } from 'lucide-react';
-import type { ConnectionTestResult } from '@shared/ssh/types';
-
-type TestState = 'idle' | 'testing' | 'success' | 'error';
-
-interface Props {
-  connectionId: string;
-  onResult?: (result: { success: boolean; message?: string }) => void;
-  size?: 'sm' | 'default' | 'lg' | 'icon' | 'icon-sm';
-  variant?: 'default' | 'outline' | 'ghost';
-}
-
-export const SshConnectionTestButton: React.FC<Props> = ({
-  connectionId,
-  onResult,
-  size = 'default',
-  variant = 'outline',
-}) => {
-  const [testState, setTestState] = useState<TestState>('idle');
-  const [result, setResult] = useState<ConnectionTestResult | null>(null);
-  const [errorMessage, setErrorMessage] = useState<string | null>(null);
-  const [debugLogsOpen, setDebugLogsOpen] = useState(false);
-  const [copied, setCopied] = useState(false);
-
-  const handleTest = useCallback(async () => {
-    setTestState('testing');
-    setResult(null);
-    setErrorMessage(null);
-    setDebugLogsOpen(false);
-    setCopied(false);
-
-    try {
-      // For testing, we need the full config - this would need to be fetched or passed in
-      // For now, we'll call the test with just the ID and let the main process handle it
-      // TODO: Fetch connection details or update IPC to accept just ID
-      const testResult = await window.electronAPI.sshTestConnection({
-        id: connectionId,
-        name: '',
-        host: '',
-        port: 22,
-        username: '',
-        authType: 'password',
-      });
-
-      setResult(testResult);
-
-      if (testResult.success) {
-        setTestState('success');
-        onResult?.({ success: true, message: `Connected successfully` });
-      } else {
-        setTestState('error');
-        setErrorMessage(testResult.error || 'Connection failed');
-        onResult?.({ success: false, message: testResult.error });
-      }
-
-      // Reset button state to idle after 3 seconds on success,
-      // but keep result so debug logs remain accessible
-      if (testResult.success) {
-        setTimeout(() => {
-          setTestState('idle');
-        }, 3000);
-      }
-    } catch (error) {
-      const message = error instanceof Error ? error.message : 'Unknown error occurred';
-      setTestState('error');
-      setErrorMessage(message);
-      onResult?.({ success: false, message });
-    }
-  }, [connectionId, onResult]);
-
-  const getButtonContent = () => {
-    switch (testState) {
-      case 'testing':
-        return (
-          <>
-            <Spinner size="sm" className="mr-2" />
-            <span>Testing...</span>
-          </>
-        );
-      case 'success':
-        return (
-          <>
-            <CheckCircle2 className="mr-2 h-4 w-4 text-emerald-500" />
-            <span>Connected</span>
-            {result?.latency && (
-              <span className="ml-1 flex items-center text-xs text-muted-foreground">
-                <Zap className="mr-0.5 h-3 w-3" />
-                {result.latency}ms
-              </span>
-            )}
-          </>
-        );
-      case 'error':
-        return (
-          <>
-            <XCircle className="mr-2 h-4 w-4 text-red-500" />
-            <span>Failed</span>
-          </>
-        );
-      default:
-        return (
-          <>
-            <Play className="mr-2 h-4 w-4" />
-            <span>Test</span>
-          </>
-        );
-    }
-  };
-
-  const getButtonClass = () => {
-    switch (testState) {
-      case 'success':
-        return 'border-emerald-500/50 text-emerald-600 hover:bg-emerald-50 dark:hover:bg-emerald-950/30';
-      case 'error':
-        return 'border-red-500/50 text-red-600 hover:bg-red-50 dark:hover:bg-red-950/30';
-      default:
-        return '';
-    }
-  };
-
-  return (
-    <div className="flex flex-col gap-2">
-      <Button
-        type="button"
-        variant={variant}
-        size={size}
-        onClick={handleTest}
-        disabled={testState === 'testing'}
-        aria-busy={testState === 'testing'}
-        className={cn(getButtonClass())}
-      >
-        {getButtonContent()}
-      </Button>
-
-      {testState === 'error' && errorMessage && (
-        <p className="max-w-[200px] text-xs text-red-600 dark:text-red-400">{errorMessage}</p>
-      )}
-
-      {result?.debugLogs && result.debugLogs.length > 0 && (
-        <Collapsible open={debugLogsOpen} onOpenChange={setDebugLogsOpen} className="max-w-[300px]">
-          <CollapsibleTrigger className="flex items-center gap-1 text-xs text-muted-foreground hover:text-foreground [&[data-state=open]>svg:first-child]:rotate-180">
-            <ChevronDown className="h-3 w-3 transition-transform duration-200" />
-            Show debug log ({result.debugLogs.length})
-          </CollapsibleTrigger>
-          <CollapsibleContent>
-            <div className="mt-1 flex items-center justify-end">
-              <button
-                type="button"
-                onClick={async () => {
-                  try {
-                    await navigator.clipboard.writeText(result.debugLogs!.join('\n'));
-                    setCopied(true);
-                    setTimeout(() => setCopied(false), 2000);
-                  } catch {
-                    // Clipboard access may be denied
-                  }
-                }}
-                className="flex items-center gap-1 text-[10px] text-muted-foreground hover:text-foreground"
-                aria-label="Copy debug log"
-              >
-                {copied ? <Check className="h-3 w-3" /> : <Copy className="h-3 w-3" />}
-                {copied ? 'Copied' : 'Copy'}
-              </button>
-            </div>
-            <pre className="max-h-[200px] overflow-y-auto overflow-x-hidden whitespace-pre-wrap break-words rounded border bg-muted/50 p-2 font-mono text-[10px] leading-relaxed text-muted-foreground">
-              {result.debugLogs.join('\n')}
-            </pre>
-          </CollapsibleContent>
-        </Collapsible>
-      )}
-    </div>
-  );
-};
-
-export default SshConnectionTestButton;
diff --git a/src/renderer/components/ssh/SshSettingsCard.tsx b/src/renderer/components/ssh/SshSettingsCard.tsx
deleted file mode 100644
index 07ccc0cc84..0000000000
--- a/src/renderer/components/ssh/SshSettingsCard.tsx
+++ /dev/null
@@ -1,197 +0,0 @@
-import React, { useState, useCallback } from 'react';
-import { Button } from '../ui/button';
-import { Card, CardContent, CardHeader, CardTitle, CardDescription } from '../ui/card';
-import { SshConnectionList, SshConnection } from './SshConnectionList';
-import { SshConnectionForm, SshConnectionConfig } from './SshConnectionForm';
-import { Plus, Server, ChevronLeft, KeyRound } from 'lucide-react';
-import { useSshConnections } from '../../hooks/useSshConnections';
-
-interface Props {
-  onAddConnection?: () => void;
-  onManageKeys?: () => void;
-}
-
-type ViewState = 'list' | 'create' | 'edit';
-
-export const SshSettingsCard: React.FC<Props> = ({ onAddConnection, onManageKeys }) => {
-  const {
-    connections,
-    isLoading,
-    error,
-    createConnection,
-    updateConnection,
-    deleteConnection,
-    testConnection,
-    refresh,
-  } = useSshConnections();
-
-  const [viewState, setViewState] = useState<ViewState>('list');
-  const [editingConnection, setEditingConnection] = useState<SshConnection | null>(null);
-  const [isSubmitting, setIsSubmitting] = useState(false);
-
-  const handleAddNew = useCallback(() => {
-    setEditingConnection(null);
-    setViewState('create');
-    onAddConnection?.();
-    void import('../../lib/telemetryClient').then(({ captureTelemetry }) => {
-      captureTelemetry('ssh_settings_opened');
-    });
-  }, [onAddConnection]);
-
-  const handleEdit = useCallback((connection: SshConnection) => {
-    setEditingConnection(connection);
-    setViewState('edit');
-  }, []);
-
-  const handleCancel = useCallback(() => {
-    setViewState('list');
-    setEditingConnection(null);
-  }, []);
-
-  const handleSubmit = useCallback(
-    async (config: SshConnectionConfig) => {
-      setIsSubmitting(true);
-      try {
-        if (viewState === 'edit' && editingConnection) {
-          await updateConnection(editingConnection.id, config);
-        } else {
-          await createConnection(config.name, config);
-        }
-        setViewState('list');
-        setEditingConnection(null);
-        await refresh();
-      } catch (err) {
-        console.error('Failed to save connection:', err);
-        // Error handling is done in the hook
-      } finally {
-        setIsSubmitting(false);
-      }
-    },
-    [viewState, editingConnection, createConnection, updateConnection, refresh]
-  );
-
-  const handleDelete = useCallback(
-    async (connection: SshConnection) => {
-      try {
-        await deleteConnection(connection.id);
-        await refresh();
-      } catch (err) {
-        console.error('Failed to delete connection:', err);
-      }
-    },
-    [deleteConnection, refresh]
-  );
-
-  const handleTest = useCallback(
-    async (connection: SshConnection) => {
-      try {
-        const result = await testConnection(connection.id);
-        // Force refresh to get updated state
-        await refresh();
-        return result;
-      } catch (err) {
-        console.error('Failed to test connection:', err);
-        return { success: false, message: 'Test failed' };
-      }
-    },
-    [testConnection, refresh]
-  );
-
-  const getInitialValues = (): Partial<SshConnectionConfig> => {
-    if (editingConnection) {
-      return {
-        name: editingConnection.name,
-        host: editingConnection.host,
-        port: editingConnection.port,
-        username: editingConnection.username,
-        authType: editingConnection.authType,
-        // Password and passphrase are not returned for security reasons
-        password: '',
-        passphrase: '',
-      };
-    }
-    return {
-      port: 22,
-      authType: 'password',
-    };
-  };
-
-  return (
-    <Card className="w-full">
-      <CardHeader className="flex flex-row items-center justify-between space-y-0 pb-4">
-        <div>
-          <CardTitle className="flex items-center gap-2 text-base">
-            <Server className="h-5 w-5" />
-            SSH Connections
-          </CardTitle>
-          <CardDescription className="text-xs">
-            Manage connections to remote servers
-          </CardDescription>
-        </div>
-
-        {viewState === 'list' ? (
-          <div className="flex items-center gap-2">
-            {onManageKeys && (
-              <Button
-                type="button"
-                variant="outline"
-                size="sm"
-                onClick={onManageKeys}
-                className="hidden sm:flex"
-              >
-                <KeyRound className="mr-2 h-4 w-4" />
-                Manage Keys
-              </Button>
-            )}
-            <Button type="button" size="sm" onClick={handleAddNew}>
-              <Plus className="mr-2 h-4 w-4" />
-              Add Connection
-            </Button>
-          </div>
-        ) : (
-          <Button type="button" variant="ghost" size="sm" onClick={handleCancel}>
-            <ChevronLeft className="mr-2 h-4 w-4" />
-            Back
-          </Button>
-        )}
-      </CardHeader>
-
-      <CardContent>
-        {error && (
-          <div className="mb-4 rounded-lg border border-red-200 bg-red-50 p-3 text-sm text-red-600 dark:border-red-800 dark:bg-red-950/30 dark:text-red-400">
-            {error.message}
-          </div>
-        )}
-
-        {viewState === 'list' ? (
-          <SshConnectionList
-            connections={connections.map((conn) => ({
-              ...conn,
-              createdAt: conn.createdAt || new Date(),
-              updatedAt: conn.updatedAt || new Date(),
-            }))}
-            isLoading={isLoading}
-            onEdit={handleEdit}
-            onDelete={handleDelete}
-            onTest={handleTest}
-            onAddNew={handleAddNew}
-          />
-        ) : (
-          <div className="rounded-lg border border-border bg-muted/20 p-6">
-            <h3 className="mb-4 text-sm font-medium">
-              {viewState === 'edit' ? 'Edit Connection' : 'New SSH Connection'}
-            </h3>
-            <SshConnectionForm
-              initialValues={getInitialValues()}
-              onSubmit={handleSubmit}
-              onCancel={handleCancel}
-              isSubmitting={isSubmitting}
-            />
-          </div>
-        )}
-      </CardContent>
-    </Card>
-  );
-};
-
-export default SshSettingsCard;
diff --git a/src/renderer/components/ssh/index.ts b/src/renderer/components/ssh/index.ts
deleted file mode 100644
index 2327cc3eed..0000000000
--- a/src/renderer/components/ssh/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-// SSH Components
-export { AddRemoteProjectModal } from './AddRemoteProjectModal';
-export { SshConnectionForm } from './SshConnectionForm';
-export { SshConnectionList } from './SshConnectionList';
-export { SshConnectionTestButton } from './SshConnectionTestButton';
-export { RemoteProjectIndicator } from './RemoteProjectIndicator';
-export { ConnectionStatusBadge } from './ConnectionStatusBadge';
-export { SshSettingsCard } from './SshSettingsCard';
-
-// Types
-export type { SshConnectionConfig } from './SshConnectionForm';
-export type { SshConnection } from './SshConnectionList';
-export type { ConnectionState } from './ConnectionStatusBadge';
diff --git a/src/renderer/components/titlebar/BrowserToggleButton.tsx b/src/renderer/components/titlebar/BrowserToggleButton.tsx
deleted file mode 100644
index c68bab4923..0000000000
--- a/src/renderer/components/titlebar/BrowserToggleButton.tsx
+++ /dev/null
@@ -1,184 +0,0 @@
-import React, { useEffect } from 'react';
-import { Globe } from 'lucide-react';
-import { Button } from '../ui/button';
-import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '../ui/tooltip';
-import { useBrowser } from '@/providers/BrowserProvider';
-import {
-  getLastUrl,
-  setLastUrl,
-  isRunning,
-  setRunning,
-  isInstalled,
-  setInstalled,
-} from '@/lib/previewStorage';
-import { isReachable, isAppPort, FALLBACK_DELAY_MS, SPINNER_MAX_MS } from '@/lib/previewNetwork';
-
-interface Props {
-  defaultUrl?: string;
-  taskId?: string | null;
-  taskPath?: string | null;
-  parentProjectPath?: string | null;
-}
-
-const BrowserToggleButton: React.FC<Props> = ({ taskId, taskPath, parentProjectPath }) => {
-  const browser = useBrowser();
-  async function needsInstall(path?: string | null): Promise<boolean> {
-    const p = (path || '').trim();
-    if (!p) return false;
-    try {
-      const res = await (window as any).electronAPI?.fsList?.(p, {
-        includeDirs: true,
-        maxEntries: 2000,
-      });
-      const items = Array.isArray(res?.items) ? res.items : [];
-      const hasNodeModules = items.some(
-        (x: any) => x?.path === 'node_modules' && x?.type === 'dir'
-      );
-      if (hasNodeModules) return false;
-      const pkg = await (window as any).electronAPI?.fsRead?.(p, 'package.json', 1024 * 64);
-      return !!pkg?.success;
-    } catch {
-      return false;
-    }
-  }
-
-  // Auto-open when host preview emits a URL for this task
-  useEffect(() => {
-    const off = (window as any).electronAPI?.onHostPreviewEvent?.((data: any) => {
-      try {
-        if (data?.type === 'url' && data?.taskId && data?.url) {
-          if (taskId && data.taskId !== taskId) return;
-          const appPort = Number(window.location.port || 0);
-          if (isAppPort(String(data.url), appPort)) return;
-          browser.open(String(data.url));
-          try {
-            if (taskId) {
-              setLastUrl(taskId, String(data.url));
-              setRunning(taskId, true);
-            }
-          } catch {}
-        }
-        if (data?.type === 'setup' && data?.taskId && data?.status === 'done') {
-          if (taskId && data.taskId !== taskId) return;
-          try {
-            if (taskId) setInstalled(taskId, true);
-          } catch {}
-        }
-        if (data?.type === 'exit' && data?.taskId) {
-          if (taskId && data.taskId !== taskId) return;
-          try {
-            if (taskId) setRunning(taskId, false);
-          } catch {}
-        }
-      } catch {}
-    });
-    return () => {
-      try {
-        off?.();
-      } catch {}
-    };
-  }, [browser, taskId]);
-
-  const handleClick = React.useCallback(async () => {
-    if (!browser.isOpen) {
-      import('../../lib/telemetryClient').then(({ captureTelemetry }) => {
-        captureTelemetry('browser_preview_opened');
-      });
-    }
-    const id = (taskId || '').trim();
-    const wp = (taskPath || '').trim();
-    const appPort = Number(window.location.port || 0);
-    // Open pane immediately with no URL; we will navigate when ready
-    browser.showSpinner();
-    browser.toggle(undefined);
-
-    if (id) {
-      try {
-        const last = getLastUrl(id);
-        const running = isRunning(id);
-        let openedFromLast = false;
-        if (last) {
-          const portClashesWithApp = isAppPort(last, appPort);
-          const reachable = !portClashesWithApp && (await isReachable(last));
-          if (reachable) {
-            browser.open(last);
-            openedFromLast = true;
-          }
-          if (running && !reachable) {
-            try {
-              setRunning(id, false);
-            } catch {}
-          }
-        }
-        if (openedFromLast) browser.hideSpinner();
-      } catch {}
-    }
-
-    // Auto-run: setup (if needed) + start, then probe common ports; also rely on URL events
-    if (id && wp) {
-      try {
-        const installed = isInstalled(id);
-        // If install needed, run setup first (only when sentinel not present)
-        if (!installed && (await needsInstall(wp))) {
-          await (window as any).electronAPI?.hostPreviewSetup?.({
-            taskId: id,
-            taskPath: wp,
-          });
-          setInstalled(id, true);
-        }
-        const running = isRunning(id);
-        if (!running) {
-          await (window as any).electronAPI?.hostPreviewStart?.({
-            taskId: id,
-            taskPath: wp,
-            parentProjectPath: (parentProjectPath || '').trim(),
-          });
-        }
-        // Fallback: if no URL event yet after a short delay, try default dev port once.
-        setTimeout(async () => {
-          try {
-            const candidate = 'http://localhost:5173';
-            // Avoid the app's own port
-            if (isAppPort(candidate, appPort)) return;
-            if (await isReachable(candidate)) {
-              browser.open(candidate);
-              try {
-                setLastUrl(id, candidate);
-                setRunning(id, true);
-              } catch {}
-              browser.hideSpinner();
-            }
-          } catch {}
-        }, FALLBACK_DELAY_MS);
-      } catch {}
-    }
-    // Fallback: clear spinner after a grace period if nothing arrives
-    setTimeout(() => browser.hideSpinner(), SPINNER_MAX_MS);
-  }, [browser, taskId, taskPath, parentProjectPath]);
-
-  return (
-    <TooltipProvider delayDuration={200}>
-      <Tooltip>
-        <TooltipTrigger asChild>
-          <Button
-            type="button"
-            variant="ghost"
-            size="icon"
-            aria-label="Toggle in-app browser"
-            onClick={handleClick}
-            className="h-8 w-8 text-muted-foreground transition-colors hover:bg-transparent hover:text-foreground"
-          >
-            <Globe className="h-4 w-4" />
-          </Button>
-        </TooltipTrigger>
-        <TooltipContent side="bottom" className="text-xs font-medium">
-          <div className="flex flex-col gap-1">
-            <span>Toggle in-app browser</span>
-          </div>
-        </TooltipContent>
-      </Tooltip>
-    </TooltipProvider>
-  );
-};
-
-export default BrowserToggleButton;
diff --git a/src/renderer/components/titlebar/OpenInMenu.tsx b/src/renderer/components/titlebar/OpenInMenu.tsx
deleted file mode 100644
index 6f931b7a04..0000000000
--- a/src/renderer/components/titlebar/OpenInMenu.tsx
+++ /dev/null
@@ -1,244 +0,0 @@
-import React from 'react';
-import { AnimatePresence, motion, useReducedMotion } from 'motion/react';
-import { ChevronDown } from 'lucide-react';
-import { Button } from '../ui/button';
-import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '../ui/tooltip';
-import { useToast } from '@/hooks/use-toast';
-import { getAppById, isValidOpenInAppId, type OpenInAppId } from '@shared/openInApps';
-import { useOpenInApps } from '../../hooks/useOpenInApps';
-import { useAppSettings } from '@/contexts/AppSettingsProvider';
-
-interface OpenInMenuProps {
-  path: string;
-  align?: 'left' | 'right';
-  isRemote?: boolean;
-  sshConnectionId?: string | null;
-  isActive?: boolean;
-}
-
-const menuItemBase =
-  'flex w-full select-none items-center gap-2 rounded px-2.5 py-2 text-sm transition-colors cursor-pointer hover:bg-accent hover:text-accent-foreground';
-
-const OpenInMenu: React.FC<OpenInMenuProps> = ({
-  path,
-  align = 'right',
-  isRemote = false,
-  sshConnectionId = null,
-  isActive = true,
-}) => {
-  const [open, setOpen] = React.useState(false);
-  const containerRef = React.useRef<HTMLDivElement | null>(null);
-  const shouldReduceMotion = useReducedMotion();
-  const { toast } = useToast();
-  const { icons, labels, installedApps, availability, loading } = useOpenInApps();
-  const { settings, updateSettings } = useAppSettings();
-
-  const defaultApp: OpenInAppId | null =
-    settings?.defaultOpenInApp && isValidOpenInAppId(settings.defaultOpenInApp)
-      ? settings.defaultOpenInApp
-      : null;
-
-  React.useEffect(() => {
-    function onDocClick(e: MouseEvent) {
-      if (!containerRef.current) return;
-      if (!containerRef.current.contains(e.target as Node)) setOpen(false);
-    }
-    if (open) document.addEventListener('mousedown', onDocClick);
-    return () => document.removeEventListener('mousedown', onDocClick);
-  }, [open]);
-
-  const persistPreferredApp = React.useCallback(
-    (appId: OpenInAppId) => {
-      updateSettings({ defaultOpenInApp: appId });
-      window.dispatchEvent(new CustomEvent('defaultOpenInAppChanged', { detail: appId }));
-    },
-    [updateSettings]
-  );
-
-  const callOpen = React.useCallback(
-    async (appId: OpenInAppId) => {
-      const label = labels[appId] || appId;
-
-      void import('../../lib/telemetryClient').then(({ captureTelemetry }) => {
-        captureTelemetry('toolbar_open_in_selected', { app: appId });
-      });
-      try {
-        const res = await window.electronAPI?.openIn?.({
-          app: appId,
-          path,
-          isRemote,
-          sshConnectionId,
-        });
-        if (!res?.success) {
-          toast({
-            title: `Open in ${label} failed`,
-            description: res?.error || 'Application not available.',
-            variant: 'destructive',
-          });
-        }
-      } catch (e: any) {
-        toast({
-          title: `Open in ${label} failed`,
-          description: e?.message || String(e),
-          variant: 'destructive',
-        });
-      }
-      setOpen(false);
-    },
-    [labels, path, isRemote, sshConnectionId, toast]
-  );
-
-  // Sort installed apps with default first
-  const sortedApps = React.useMemo(() => {
-    if (!defaultApp) return installedApps;
-    return [...installedApps].sort((a, b) => {
-      if (a.id === defaultApp) return -1;
-      if (b.id === defaultApp) return 1;
-      return 0;
-    });
-  }, [defaultApp, installedApps]);
-
-  const menuApps = React.useMemo(
-    () => sortedApps.filter((app) => !app.hideIfUnavailable || availability[app.id]),
-    [availability, sortedApps]
-  );
-
-  // Primary click app: persisted app first, otherwise first available entry.
-  const buttonAppId = React.useMemo(() => {
-    if (defaultApp && menuApps.some((app) => app.id === defaultApp)) {
-      return defaultApp;
-    }
-    return menuApps[0]?.id;
-  }, [defaultApp, menuApps]);
-
-  const buttonAppLabel = buttonAppId ? (labels[buttonAppId] ?? buttonAppId) : null;
-
-  React.useEffect(() => {
-    if (!isActive) return;
-    const handleOpenInEditorEvent = () => {
-      if (buttonAppId) {
-        void callOpen(buttonAppId);
-      }
-    };
-    window.addEventListener('emdash:open-in-editor', handleOpenInEditorEvent);
-    return () => window.removeEventListener('emdash:open-in-editor', handleOpenInEditorEvent);
-  }, [isActive, buttonAppId, callOpen]);
-
-  return (
-    <div ref={containerRef} className="relative">
-      <div className="flex min-w-0">
-        <TooltipProvider delayDuration={0}>
-          <Tooltip>
-            <TooltipTrigger asChild>
-              <Button
-                type="button"
-                variant="ghost"
-                size="sm"
-                className="group h-7 min-w-0 gap-1.5 truncate rounded-r-none pl-2 pr-0.5 text-[13px] font-medium leading-none text-muted-foreground transition-colors hover:bg-transparent hover:text-foreground"
-                onClick={() => {
-                  if (!buttonAppId) return;
-                  void callOpen(buttonAppId);
-                }}
-                disabled={!buttonAppId || loading}
-                aria-label={buttonAppLabel ? `Open in ${buttonAppLabel}` : 'Open'}
-              >
-                {buttonAppId && icons[buttonAppId] && (
-                  <img
-                    src={icons[buttonAppId]}
-                    alt={labels[buttonAppId] || buttonAppId}
-                    className={`h-4 w-4 rounded ${
-                      getAppById(buttonAppId)?.invertInDark ? 'dark:invert' : ''
-                    }`}
-                  />
-                )}
-                <span>Open</span>
-              </Button>
-            </TooltipTrigger>
-            <TooltipContent side="bottom" className="text-xs font-medium">
-              Open in {buttonAppLabel || 'editor'} ⌘O
-            </TooltipContent>
-          </Tooltip>
-        </TooltipProvider>
-        <Button
-          type="button"
-          variant="ghost"
-          size="sm"
-          className={[
-            'group h-7 rounded-l-none px-1 text-muted-foreground transition-colors hover:bg-transparent hover:text-foreground',
-            open ? 'text-foreground' : '',
-          ].join(' ')}
-          onClick={() => {
-            const newState = !open;
-            void import('../../lib/telemetryClient').then(({ captureTelemetry }) => {
-              captureTelemetry('toolbar_open_in_menu_clicked', {
-                state: newState ? 'open' : 'closed',
-              });
-            });
-            setOpen(newState);
-          }}
-          aria-expanded={open}
-          aria-haspopup
-          aria-label="Open in options"
-        >
-          <ChevronDown
-            className={`h-3.5 w-3.5 transition-transform duration-200 ${open ? 'rotate-180' : ''}`}
-          />
-        </Button>
-      </div>
-      <AnimatePresence>
-        {open && (
-          <motion.div
-            role="menu"
-            className={[
-              'absolute z-50 mt-1 min-w-[180px] rounded-md border border-border bg-popover p-1 shadow-md',
-              align === 'right' ? 'right-0' : 'left-0',
-            ].join(' ')}
-            style={{ transformOrigin: align === 'right' ? 'top right' : 'top left' }}
-            initial={shouldReduceMotion ? false : { opacity: 0, y: 6, scale: 0.98 }}
-            animate={{ opacity: 1, y: 0, scale: 1 }}
-            exit={
-              shouldReduceMotion
-                ? { opacity: 1, y: 0, scale: 1 }
-                : { opacity: 0, y: 4, scale: 0.98 }
-            }
-            transition={
-              shouldReduceMotion ? { duration: 0 } : { duration: 0.16, ease: [0.22, 1, 0.36, 1] }
-            }
-          >
-            {menuApps.map((app) => {
-              // While loading, disable apps that aren't confirmed installed
-              const isAvailable = loading ? availability[app.id] === true : true;
-              return (
-                <button
-                  key={app.id}
-                  className={`${menuItemBase} ${!isAvailable ? 'cursor-not-allowed opacity-50' : ''}`}
-                  role="menuitem"
-                  onClick={() => {
-                    if (!isAvailable) return;
-                    void persistPreferredApp(app.id);
-                    setOpen(false);
-                  }}
-                  disabled={!isAvailable}
-                >
-                  {icons[app.id] ? (
-                    <img
-                      src={icons[app.id]}
-                      alt={labels[app.id] || app.label}
-                      className={`h-4 w-4 rounded ${app.invertInDark ? 'dark:invert' : ''}`}
-                    />
-                  ) : null}
-                  <span>{labels[app.id] || app.label}</span>
-                  {app.id === defaultApp && (
-                    <span className="ml-auto text-xs text-muted-foreground">Selected</span>
-                  )}
-                </button>
-              );
-            })}
-          </motion.div>
-        )}
-      </AnimatePresence>
-    </div>
-  );
-};
-
-export default OpenInMenu;
diff --git a/src/renderer/components/titlebar/SidebarLeftToggleButton.tsx b/src/renderer/components/titlebar/SidebarLeftToggleButton.tsx
deleted file mode 100644
index 282525492d..0000000000
--- a/src/renderer/components/titlebar/SidebarLeftToggleButton.tsx
+++ /dev/null
@@ -1,60 +0,0 @@
-import React from 'react';
-import { Button } from '../ui/button';
-import { PanelLeft } from 'lucide-react';
-import { useSidebar } from '../ui/sidebar';
-import { Tooltip, TooltipTrigger, TooltipContent, TooltipProvider } from '../ui/tooltip';
-import { ShortcutHint } from '../ui/shortcut-hint';
-
-interface SidebarLeftToggleButtonProps {
-  isDisabled?: boolean;
-}
-
-const SidebarLeftToggleButton: React.FC<SidebarLeftToggleButtonProps> = ({
-  isDisabled = false,
-}) => {
-  const { toggle, open } = useSidebar();
-
-  const handleClick = async () => {
-    if (isDisabled) return;
-    const newState = !open;
-    void import('../../lib/telemetryClient').then(({ captureTelemetry }) => {
-      captureTelemetry('toolbar_left_sidebar_clicked', { state: newState ? 'open' : 'closed' });
-    });
-    toggle();
-  };
-
-  return (
-    <TooltipProvider delayDuration={200}>
-      <Tooltip>
-        <TooltipTrigger asChild>
-          <Button
-            type="button"
-            variant="ghost"
-            size="icon"
-            onClick={handleClick}
-            disabled={isDisabled}
-            className="h-8 w-8 text-muted-foreground transition-colors [-webkit-app-region:no-drag] hover:bg-transparent hover:text-foreground disabled:cursor-not-allowed disabled:opacity-50"
-            aria-label="Toggle left sidebar"
-            aria-disabled={isDisabled}
-          >
-            <PanelLeft className="h-4 w-4" />
-          </Button>
-        </TooltipTrigger>
-        <TooltipContent
-          side="bottom"
-          align="end"
-          sideOffset={8}
-          collisionPadding={8}
-          className="text-xs font-medium"
-        >
-          <div className="flex flex-col gap-1">
-            <span>{isDisabled ? 'Sidebar disabled in editor mode' : 'Toggle left sidebar'}</span>
-            {!isDisabled && <ShortcutHint settingsKey="toggleLeftSidebar" />}
-          </div>
-        </TooltipContent>
-      </Tooltip>
-    </TooltipProvider>
-  );
-};
-
-export default SidebarLeftToggleButton;
diff --git a/src/renderer/components/titlebar/SidebarRightToggleButton.tsx b/src/renderer/components/titlebar/SidebarRightToggleButton.tsx
deleted file mode 100644
index 7dcccbcc6d..0000000000
--- a/src/renderer/components/titlebar/SidebarRightToggleButton.tsx
+++ /dev/null
@@ -1,54 +0,0 @@
-import React from 'react';
-import { Button } from '../ui/button';
-import { PanelRight } from 'lucide-react';
-import { useRightSidebar } from '../ui/right-sidebar';
-import { Tooltip, TooltipTrigger, TooltipContent, TooltipProvider } from '../ui/tooltip';
-import { ShortcutHint } from '../ui/shortcut-hint';
-
-const SidebarRightToggleButton: React.FC = () => {
-  const { toggle, collapsed } = useRightSidebar();
-
-  const label = 'Toggle right sidebar';
-
-  const handleClick = async () => {
-    const nextCollapsed = !collapsed;
-    const nextState = nextCollapsed ? 'closed' : 'open';
-    void import('../../lib/telemetryClient').then(({ captureTelemetry }) => {
-      captureTelemetry('toolbar_right_sidebar_clicked', { state: nextState });
-    });
-    toggle();
-  };
-
-  return (
-    <TooltipProvider delayDuration={200}>
-      <Tooltip>
-        <TooltipTrigger asChild>
-          <Button
-            type="button"
-            variant="ghost"
-            size="icon"
-            onClick={handleClick}
-            className="h-8 w-8 text-muted-foreground transition-colors [-webkit-app-region:no-drag] hover:bg-transparent hover:text-foreground"
-            aria-label={label}
-          >
-            <PanelRight className="h-4 w-4" />
-          </Button>
-        </TooltipTrigger>
-        <TooltipContent
-          side="bottom"
-          align="end"
-          sideOffset={8}
-          collisionPadding={8}
-          className="text-xs font-medium"
-        >
-          <div className="flex flex-col gap-1">
-            <span>Toggle right sidebar</span>
-            <ShortcutHint settingsKey="toggleRightSidebar" />
-          </div>
-        </TooltipContent>
-      </Tooltip>
-    </TooltipProvider>
-  );
-};
-
-export default SidebarRightToggleButton;
diff --git a/src/renderer/components/titlebar/Titlebar.tsx b/src/renderer/components/titlebar/Titlebar.tsx
deleted file mode 100644
index 21dbaf48f1..0000000000
--- a/src/renderer/components/titlebar/Titlebar.tsx
+++ /dev/null
@@ -1,349 +0,0 @@
-import React, { useCallback, useEffect, useRef, useState } from 'react';
-import type { LucideIcon } from 'lucide-react';
-import {
-  ArrowLeft,
-  Command,
-  MessageSquare,
-  Settings as SettingsIcon,
-  KanbanSquare,
-  Code2,
-} from 'lucide-react';
-import { ShortcutHint } from '../ui/shortcut-hint';
-import SidebarLeftToggleButton from './SidebarLeftToggleButton';
-import SidebarRightToggleButton from './SidebarRightToggleButton';
-import { Button } from '../ui/button';
-import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '../ui/tooltip';
-import OpenInMenu from './OpenInMenu';
-import FeedbackModal from '../FeedbackModal';
-import BrowserToggleButton from './BrowserToggleButton';
-import TitlebarContext from './TitlebarContext';
-import { useProjectManagementContext } from '../../contexts/ProjectManagementProvider';
-import { useTaskManagementContext } from '../../contexts/TaskManagementContext';
-import { useGithubContext } from '../../contexts/GithubContextProvider';
-
-interface GithubUser {
-  login?: string;
-  name?: string;
-  html_url?: string;
-  email?: string;
-}
-
-interface TitlebarProps {
-  onToggleSettings: () => void;
-  isSettingsOpen?: boolean;
-  onToggleKanban?: () => void;
-  onToggleEditor?: () => void;
-}
-
-interface TitlebarToggleButtonProps {
-  isOpen: boolean;
-  openLabel: string;
-  openIcon: LucideIcon;
-  closedIcon: LucideIcon;
-  ariaLabelOpen: string;
-  ariaLabelClosed: string;
-  onClick: () => void;
-  tooltip: React.ReactNode;
-}
-
-function TitlebarToggleButton({
-  isOpen,
-  openLabel,
-  openIcon: OpenIcon,
-  closedIcon: ClosedIcon,
-  ariaLabelOpen,
-  ariaLabelClosed,
-  onClick,
-  tooltip,
-}: TitlebarToggleButtonProps) {
-  return (
-    <TooltipProvider delayDuration={200}>
-      <Tooltip>
-        <TooltipTrigger asChild>
-          <Button
-            type="button"
-            variant="ghost"
-            size={isOpen ? 'sm' : 'icon'}
-            aria-label={isOpen ? ariaLabelOpen : ariaLabelClosed}
-            onClick={onClick}
-            className={`h-8 text-muted-foreground transition-colors hover:bg-transparent hover:text-foreground ${
-              isOpen ? 'gap-1.5 px-2 text-xs font-medium' : 'w-8 text-muted-foreground'
-            }`}
-          >
-            {isOpen ? (
-              <>
-                <OpenIcon className="h-3.5 w-3.5" />
-                <span>{openLabel}</span>
-              </>
-            ) : (
-              <ClosedIcon className="h-4 w-4" />
-            )}
-          </Button>
-        </TooltipTrigger>
-        <TooltipContent side="bottom" className="text-xs font-medium">
-          {tooltip}
-        </TooltipContent>
-      </Tooltip>
-    </TooltipProvider>
-  );
-}
-
-const Titlebar: React.FC<TitlebarProps> = ({
-  onToggleSettings,
-  isSettingsOpen = false,
-  onToggleKanban,
-  onToggleEditor,
-}) => {
-  const {
-    projects,
-    selectedProject,
-    handleSelectProject: onSelectProject,
-    showKanban: isKanbanOpen,
-    showEditorMode: isEditorOpen,
-  } = useProjectManagementContext();
-  const { activeTask, handleSelectTask: onSelectTask } = useTaskManagementContext();
-  const { user: githubUser } = useGithubContext();
-
-  const isTaskMultiAgent = Boolean(activeTask?.metadata?.multiAgent?.enabled);
-  const currentPath = isTaskMultiAgent
-    ? null
-    : activeTask?.path ||
-      (selectedProject?.isRemote ? selectedProject?.remotePath : selectedProject?.path) ||
-      null;
-  const taskId = activeTask?.id || null;
-  const taskPath = activeTask?.path || null;
-  const projectPath = selectedProject?.path || null;
-  const kanbanAvailable = Boolean(selectedProject);
-  const showEditorButton = Boolean(activeTask);
-  const [isFeedbackOpen, setIsFeedbackOpen] = useState(false);
-  const [isHeaderHovered, setIsHeaderHovered] = useState(false);
-  const feedbackButtonRef = useRef<HTMLButtonElement | null>(null);
-  const headerRef = useRef<HTMLElement | null>(null);
-
-  const handleOpenFeedback = useCallback(async () => {
-    void import('../../lib/telemetryClient').then(({ captureTelemetry }) => {
-      captureTelemetry('toolbar_feedback_clicked');
-    });
-    setIsFeedbackOpen(true);
-  }, []);
-
-  const handleCloseFeedback = useCallback(() => {
-    setIsFeedbackOpen(false);
-    feedbackButtonRef.current?.blur();
-  }, []);
-
-  // Broadcast overlay state so the preview pane can hide while feedback is open
-  useEffect(() => {
-    try {
-      const open = Boolean(isFeedbackOpen);
-      window.dispatchEvent(new CustomEvent('emdash:overlay:changed', { detail: { open } }));
-    } catch {}
-  }, [isFeedbackOpen]);
-
-  useEffect(() => {
-    const handleGlobalShortcut = (event: KeyboardEvent) => {
-      if (event.defaultPrevented) {
-        return;
-      }
-
-      const target = event.target as HTMLElement | null;
-      if (target) {
-        const tagName = target.tagName;
-        const isEditable =
-          target.getAttribute('contenteditable') === 'true' ||
-          tagName === 'INPUT' ||
-          tagName === 'TEXTAREA' ||
-          tagName === 'SELECT';
-        if (isEditable) {
-          return;
-        }
-      }
-
-      const isMeta = event.metaKey || event.ctrlKey;
-      if (isMeta && event.shiftKey && event.key.toLowerCase() === 'f') {
-        event.preventDefault();
-        handleOpenFeedback();
-      }
-    };
-
-    window.addEventListener('keydown', handleGlobalShortcut);
-    return () => {
-      window.removeEventListener('keydown', handleGlobalShortcut);
-    };
-  }, [handleOpenFeedback]);
-
-  // Track mouse position to show/hide center content on header hover.
-  // CSS :hover doesn't work on -webkit-app-region:drag elements in Electron.
-  useEffect(() => {
-    const handleMouseMove = (e: MouseEvent) => {
-      const headerEl = headerRef.current;
-      if (!headerEl) return;
-      const rect = headerEl.getBoundingClientRect();
-      setIsHeaderHovered(e.clientY >= rect.top && e.clientY <= rect.bottom);
-    };
-
-    const handleMouseLeave = () => {
-      setIsHeaderHovered(false);
-    };
-
-    document.addEventListener('mousemove', handleMouseMove);
-    document.documentElement.addEventListener('mouseleave', handleMouseLeave);
-    return () => {
-      document.removeEventListener('mousemove', handleMouseMove);
-      document.documentElement.removeEventListener('mouseleave', handleMouseLeave);
-    };
-  }, []);
-
-  return (
-    <>
-      <header
-        ref={headerRef}
-        className="fixed inset-x-0 top-0 z-[80] flex h-[var(--tb,36px)] items-center justify-end bg-muted pr-2 shadow-[inset_0_-1px_0_hsl(var(--border))] [-webkit-app-region:drag] dark:bg-background"
-      >
-        <div
-          className={`pointer-events-none flex justify-center transition-opacity duration-200 has-[[data-state=open]]:opacity-100 ${isHeaderHovered ? 'opacity-100' : 'opacity-0'}`}
-        >
-          <div className="w-[min(60vw,720px)] truncate">
-            <TitlebarContext
-              projects={projects}
-              selectedProject={selectedProject}
-              activeTask={activeTask}
-              onSelectProject={onSelectProject}
-              onSelectTask={onSelectTask}
-            />
-          </div>
-        </div>
-        <div className="pointer-events-auto flex items-center gap-1 [-webkit-app-region:no-drag]">
-          {currentPath ? (
-            <OpenInMenu
-              path={currentPath}
-              align="right"
-              isRemote={selectedProject?.isRemote || false}
-              sshConnectionId={selectedProject?.sshConnectionId || null}
-            />
-          ) : null}
-          {showEditorButton ? (
-            <TitlebarToggleButton
-              isOpen={isEditorOpen}
-              openLabel="Home"
-              openIcon={ArrowLeft}
-              closedIcon={Code2}
-              ariaLabelOpen="Back to Home"
-              ariaLabelClosed="Open Editor"
-              onClick={() => {
-                void import('../../lib/telemetryClient').then(({ captureTelemetry }) => {
-                  captureTelemetry('toolbar_editor_clicked', {
-                    action: isEditorOpen ? 'close' : 'open',
-                  });
-                });
-                onToggleEditor?.();
-              }}
-              tooltip={
-                <div className="flex flex-col gap-1">
-                  <span>{isEditorOpen ? 'Home' : 'Open Editor'}</span>
-                  <ShortcutHint settingsKey="toggleEditor" />
-                </div>
-              }
-            />
-          ) : null}
-          {kanbanAvailable ? (
-            <TitlebarToggleButton
-              isOpen={isKanbanOpen}
-              openLabel="Home"
-              openIcon={ArrowLeft}
-              closedIcon={KanbanSquare}
-              ariaLabelOpen="Back to Home"
-              ariaLabelClosed="Toggle Kanban view"
-              onClick={() => {
-                const newState = !isKanbanOpen;
-                void import('../../lib/telemetryClient').then(({ captureTelemetry }) => {
-                  captureTelemetry('toolbar_kanban_toggled', {
-                    state: newState ? 'open' : 'closed',
-                  });
-                });
-                onToggleKanban?.();
-              }}
-              tooltip={
-                <div className="flex flex-col gap-1">
-                  <span>{isKanbanOpen ? 'Home' : 'Toggle Kanban view'}</span>
-                  <ShortcutHint settingsKey="toggleKanban" />
-                </div>
-              }
-            />
-          ) : null}
-          {taskId && !isTaskMultiAgent ? (
-            <BrowserToggleButton
-              taskId={taskId}
-              taskPath={taskPath}
-              parentProjectPath={projectPath}
-            />
-          ) : null}
-          <TooltipProvider delayDuration={200}>
-            <Tooltip>
-              <TooltipTrigger asChild>
-                <Button
-                  type="button"
-                  variant="ghost"
-                  size="icon"
-                  aria-label="Open feedback"
-                  onClick={handleOpenFeedback}
-                  ref={feedbackButtonRef}
-                  className="h-8 w-8 text-muted-foreground transition-colors [-webkit-app-region:no-drag] hover:bg-transparent hover:text-foreground"
-                >
-                  <MessageSquare className="h-4 w-4" />
-                </Button>
-              </TooltipTrigger>
-              <TooltipContent side="bottom" className="text-xs font-medium">
-                <div className="flex flex-col gap-1">
-                  <span>Open feedback</span>
-                  <span className="flex items-center gap-1 text-muted-foreground">
-                    <Command className="h-3 w-3" aria-hidden="true" />
-                    <span>⇧</span>
-                    <span>F</span>
-                  </span>
-                </div>
-              </TooltipContent>
-            </Tooltip>
-          </TooltipProvider>
-          <SidebarLeftToggleButton isDisabled={isEditorOpen} />
-          <SidebarRightToggleButton />
-          <TooltipProvider delayDuration={200}>
-            <Tooltip>
-              <TooltipTrigger asChild>
-                <Button
-                  type="button"
-                  variant={isSettingsOpen ? 'secondary' : 'ghost'}
-                  size="icon"
-                  aria-label="Open settings"
-                  aria-pressed={isSettingsOpen}
-                  onClick={async () => {
-                    void import('../../lib/telemetryClient').then(({ captureTelemetry }) => {
-                      captureTelemetry('toolbar_settings_clicked');
-                    });
-                    onToggleSettings();
-                  }}
-                  className="h-8 w-8 text-muted-foreground transition-colors hover:bg-transparent hover:text-foreground"
-                >
-                  <SettingsIcon className="h-4 w-4" />
-                </Button>
-              </TooltipTrigger>
-              <TooltipContent side="bottom" className="text-xs font-medium">
-                <div className="flex flex-col gap-1">
-                  <span>Open settings</span>
-                  <ShortcutHint settingsKey="settings" />
-                </div>
-              </TooltipContent>
-            </Tooltip>
-          </TooltipProvider>
-        </div>
-      </header>
-      <FeedbackModal
-        isOpen={isFeedbackOpen}
-        onClose={handleCloseFeedback}
-        githubUser={githubUser}
-      />
-    </>
-  );
-};
-
-export default Titlebar;
diff --git a/src/renderer/components/titlebar/TitlebarContext.tsx b/src/renderer/components/titlebar/TitlebarContext.tsx
deleted file mode 100644
index d7f8614b56..0000000000
--- a/src/renderer/components/titlebar/TitlebarContext.tsx
+++ /dev/null
@@ -1,115 +0,0 @@
-import React from 'react';
-import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '../ui/select';
-import type { Project, Task } from '../../types/app';
-
-interface TitlebarContextProps {
-  projects: Project[];
-  selectedProject: Project | null;
-  activeTask: Task | null;
-  onSelectProject: (project: Project) => void;
-  onSelectTask: (task: Task) => void;
-}
-
-const TitlebarContext: React.FC<TitlebarContextProps> = ({
-  projects,
-  selectedProject,
-  activeTask,
-  onSelectProject,
-  onSelectTask,
-}) => {
-  if (!selectedProject) {
-    return <div />;
-  }
-
-  const tasks = selectedProject?.tasks ?? [];
-  const projectValue = selectedProject.id;
-  const noTaskValue = '__no_task_selected__';
-  const taskValue = activeTask?.id ?? noTaskValue;
-  const projectLabel = selectedProject.name;
-  const taskLabel = activeTask?.name ?? '';
-  const selectContentClassName = 'w-[min(280px,90vw)]';
-
-  const handleProjectChange = (value: string) => {
-    const nextProject = projects.find((project) => project.id === value);
-    if (nextProject) {
-      onSelectProject(nextProject);
-    }
-  };
-
-  const handleTaskChange = (value: string) => {
-    if (value === noTaskValue) return;
-    const nextTask = tasks.find((task) => task.id === value);
-    if (nextTask) {
-      onSelectTask(nextTask);
-    }
-  };
-
-  return (
-    <div className="grid w-full grid-cols-[1fr_auto_1fr] items-center">
-      <div className="flex items-center justify-end">
-        <Select value={projectValue} onValueChange={handleProjectChange}>
-          <SelectTrigger
-            className="pointer-events-auto h-7 w-auto justify-start gap-1 border-none bg-transparent px-1 py-0.5 text-[13px] font-medium leading-none text-muted-foreground shadow-none [-webkit-app-region:no-drag] hover:bg-background/70 hover:text-foreground data-[state=open]:bg-background/80 data-[state=open]:text-foreground [&>span]:block [&>span]:max-w-[218px] [&>span]:truncate [&>svg]:hidden"
-            aria-label="Select project"
-            title={projectLabel}
-          >
-            <SelectValue placeholder="Project" />
-          </SelectTrigger>
-          <SelectContent side="bottom" align="start" className={selectContentClassName}>
-            {projects.length > 0 ? (
-              projects.map((project) => (
-                <SelectItem
-                  key={project.id}
-                  value={project.id}
-                  className="min-w-0 [&>span:last-child]:block [&>span:last-child]:min-w-0 [&>span:last-child]:truncate"
-                >
-                  {project.name}
-                </SelectItem>
-              ))
-            ) : (
-              <SelectItem value="__empty_projects__" disabled>
-                No projects yet
-              </SelectItem>
-            )}
-          </SelectContent>
-        </Select>
-      </div>
-      <span className="px-2 text-center text-[11px] text-muted-foreground/60">/</span>
-      <div className="flex items-center justify-start">
-        <Select value={taskValue} onValueChange={handleTaskChange} disabled={!selectedProject}>
-          <SelectTrigger
-            className="pointer-events-auto h-7 w-auto min-w-[60px] justify-start gap-1 border-none bg-transparent px-1 py-0.5 text-[13px] font-medium leading-none text-muted-foreground shadow-none [-webkit-app-region:no-drag] hover:bg-background/70 hover:text-foreground data-[state=open]:bg-background/80 data-[placeholder]:text-muted-foreground/70 data-[state=open]:text-foreground [&>span]:block [&>span]:max-w-[218px] [&>span]:truncate [&>svg]:hidden"
-            aria-label="Select task"
-            title={taskLabel}
-          >
-            <SelectValue placeholder="" />
-          </SelectTrigger>
-          <SelectContent side="bottom" align="start" className={selectContentClassName}>
-            {!activeTask && (
-              <SelectItem value={noTaskValue} disabled>
-                No active task
-              </SelectItem>
-            )}
-            {tasks.length > 0 ? (
-              tasks.map((task) => (
-                <SelectItem
-                  key={task.id}
-                  value={task.id}
-                  className="min-w-0 [&>span:last-child]:block [&>span:last-child]:min-w-0 [&>span:last-child]:truncate"
-                >
-                  {task.name}
-                </SelectItem>
-              ))
-            ) : (
-              <SelectItem value="__empty_tasks__" disabled>
-                No tasks yet
-              </SelectItem>
-            )}
-          </SelectContent>
-        </Select>
-      </div>
-    </div>
-  );
-};
-
-export default TitlebarContext;
diff --git a/src/renderer/components/ui/accordion.tsx b/src/renderer/components/ui/accordion.tsx
deleted file mode 100644
index 0ef5afdaa3..0000000000
--- a/src/renderer/components/ui/accordion.tsx
+++ /dev/null
@@ -1,59 +0,0 @@
-import * as React from 'react';
-import * as AccordionPrimitive from '@radix-ui/react-accordion';
-import { ChevronDown } from 'lucide-react';
-
-import { cn } from '@/lib/utils';
-
-const Accordion = AccordionPrimitive.Root;
-
-const AccordionItem = React.forwardRef<
-  React.ElementRef<typeof AccordionPrimitive.Item>,
-  React.ComponentPropsWithoutRef<typeof AccordionPrimitive.Item>
->(({ className, ...props }, ref) => (
-  <AccordionPrimitive.Item ref={ref} className={cn('border-b', className)} {...props} />
-));
-AccordionItem.displayName = 'AccordionItem';
-
-const AccordionTrigger = React.forwardRef<
-  React.ElementRef<typeof AccordionPrimitive.Trigger>,
-  React.ComponentPropsWithoutRef<typeof AccordionPrimitive.Trigger>
->(({ className, children, ...props }, ref) => (
-  <AccordionPrimitive.Header className="flex">
-    <AccordionPrimitive.Trigger
-      ref={ref}
-      className={cn(
-        'flex flex-1 items-center justify-between py-4 text-left text-sm font-medium transition-all hover:underline [&>svg]:shrink-0 [&[data-state=open]>svg]:rotate-180',
-        className
-      )}
-      {...props}
-    >
-      {children}
-      <ChevronDown className="h-4 w-4 shrink-0 text-muted-foreground transition-transform duration-200" />
-    </AccordionPrimitive.Trigger>
-  </AccordionPrimitive.Header>
-));
-AccordionTrigger.displayName = AccordionPrimitive.Trigger.displayName;
-
-interface AccordionContentProps
-  extends React.ComponentPropsWithoutRef<typeof AccordionPrimitive.Content> {
-  contentClassName?: string;
-}
-
-const AccordionContent = React.forwardRef<
-  React.ElementRef<typeof AccordionPrimitive.Content>,
-  AccordionContentProps
->(({ className, contentClassName, children, ...props }, ref) => (
-  <AccordionPrimitive.Content
-    ref={ref}
-    className={cn(
-      'overflow-hidden text-sm data-[state=closed]:animate-accordion-up data-[state=open]:animate-accordion-down',
-      contentClassName
-    )}
-    {...props}
-  >
-    <div className={cn('pb-4 pt-0', className)}>{children}</div>
-  </AccordionPrimitive.Content>
-));
-AccordionContent.displayName = AccordionPrimitive.Content.displayName;
-
-export { Accordion, AccordionItem, AccordionTrigger, AccordionContent };
diff --git a/src/renderer/components/ui/alert-dialog.tsx b/src/renderer/components/ui/alert-dialog.tsx
deleted file mode 100644
index 39a03b32e6..0000000000
--- a/src/renderer/components/ui/alert-dialog.tsx
+++ /dev/null
@@ -1,123 +0,0 @@
-import * as React from 'react';
-import * as AlertDialogPrimitive from '@radix-ui/react-alert-dialog';
-
-import { cn } from '@/lib/utils';
-
-const AlertDialog = AlertDialogPrimitive.Root;
-
-const AlertDialogTrigger = AlertDialogPrimitive.Trigger;
-
-const AlertDialogPortal = AlertDialogPrimitive.Portal;
-
-const AlertDialogOverlay = React.forwardRef<
-  React.ElementRef<typeof AlertDialogPrimitive.Overlay>,
-  React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Overlay>
->(({ className, ...props }, ref) => (
-  <AlertDialogPrimitive.Overlay
-    ref={ref}
-    className={cn('fixed inset-0 z-50 bg-background/80 backdrop-blur-sm', className)}
-    {...props}
-  />
-));
-AlertDialogOverlay.displayName = AlertDialogPrimitive.Overlay.displayName;
-
-const AlertDialogContent = React.forwardRef<
-  React.ElementRef<typeof AlertDialogPrimitive.Content>,
-  React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Content>
->(({ className, children, ...props }, ref) => (
-  <AlertDialogPortal>
-    <AlertDialogOverlay />
-    <AlertDialogPrimitive.Content
-      ref={ref}
-      className={cn(
-        'fixed left-1/2 top-1/2 z-50 w-full max-w-sm -translate-x-1/2 -translate-y-1/2 space-y-4 rounded-lg border bg-background p-6 shadow-lg focus:outline-none',
-        className
-      )}
-      {...props}
-    >
-      {children}
-    </AlertDialogPrimitive.Content>
-  </AlertDialogPortal>
-));
-AlertDialogContent.displayName = AlertDialogPrimitive.Content.displayName;
-
-const AlertDialogHeader = ({ className, ...props }: React.HTMLAttributes<HTMLDivElement>) => (
-  <div className={cn('flex flex-col space-y-2 text-center sm:text-left', className)} {...props} />
-);
-AlertDialogHeader.displayName = 'AlertDialogHeader';
-
-const AlertDialogFooter = ({ className, ...props }: React.HTMLAttributes<HTMLDivElement>) => (
-  <div
-    className={cn('flex flex-col-reverse gap-2 sm:flex-row sm:justify-end', className)}
-    {...props}
-  />
-);
-AlertDialogFooter.displayName = 'AlertDialogFooter';
-
-const AlertDialogTitle = React.forwardRef<
-  React.ElementRef<typeof AlertDialogPrimitive.Title>,
-  React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Title>
->(({ className, ...props }, ref) => (
-  <AlertDialogPrimitive.Title
-    ref={ref}
-    className={cn('text-lg font-semibold', className)}
-    {...props}
-  />
-));
-AlertDialogTitle.displayName = AlertDialogPrimitive.Title.displayName;
-
-const AlertDialogDescription = React.forwardRef<
-  React.ElementRef<typeof AlertDialogPrimitive.Description>,
-  React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Description>
->(({ className, ...props }, ref) => (
-  <AlertDialogPrimitive.Description
-    ref={ref}
-    className={cn('text-sm text-muted-foreground', className)}
-    {...props}
-  />
-));
-AlertDialogDescription.displayName = AlertDialogPrimitive.Description.displayName;
-
-const AlertDialogAction = React.forwardRef<
-  React.ElementRef<typeof AlertDialogPrimitive.Action>,
-  React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Action>
->(({ className, ...props }, ref) => (
-  <AlertDialogPrimitive.Action
-    ref={ref}
-    className={cn(
-      'inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50',
-      className
-    )}
-    {...props}
-  />
-));
-AlertDialogAction.displayName = AlertDialogPrimitive.Action.displayName;
-
-const AlertDialogCancel = React.forwardRef<
-  React.ElementRef<typeof AlertDialogPrimitive.Cancel>,
-  React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Cancel>
->(({ className, ...props }, ref) => (
-  <AlertDialogPrimitive.Cancel
-    ref={ref}
-    className={cn(
-      'inline-flex items-center justify-center whitespace-nowrap rounded-md border border-input bg-background px-4 py-2 text-sm font-medium transition-colors hover:bg-accent hover:text-accent-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50',
-      className
-    )}
-    {...props}
-  />
-));
-AlertDialogCancel.displayName = AlertDialogPrimitive.Cancel.displayName;
-
-export {
-  AlertDialog,
-  AlertDialogPortal,
-  AlertDialogOverlay,
-  AlertDialogTrigger,
-  AlertDialogContent,
-  AlertDialogHeader,
-  AlertDialogFooter,
-  AlertDialogTitle,
-  AlertDialogDescription,
-  AlertDialogAction,
-  AlertDialogCancel,
-};
diff --git a/src/renderer/components/ui/alert.tsx b/src/renderer/components/ui/alert.tsx
deleted file mode 100644
index 5b2e5a3dcd..0000000000
--- a/src/renderer/components/ui/alert.tsx
+++ /dev/null
@@ -1,49 +0,0 @@
-import * as React from 'react';
-import { cva, type VariantProps } from 'class-variance-authority';
-
-import { cn } from '@/lib/utils';
-
-const alertVariants = cva(
-  'relative w-full rounded-lg border px-4 py-3 text-sm [&>svg+div]:translate-y-[-3px] [&>svg]:absolute [&>svg]:left-4 [&>svg]:top-4 [&>svg]:text-foreground [&>svg~*]:pl-7',
-  {
-    variants: {
-      variant: {
-        default: 'bg-background text-foreground',
-        destructive:
-          'border-destructive/50 text-destructive dark:border-destructive [&>svg]:text-destructive',
-      },
-    },
-    defaultVariants: {
-      variant: 'default',
-    },
-  }
-);
-
-const Alert = React.forwardRef<
-  HTMLDivElement,
-  React.HTMLAttributes<HTMLDivElement> & VariantProps<typeof alertVariants>
->(({ className, variant, ...props }, ref) => (
-  <div ref={ref} role="alert" className={cn(alertVariants({ variant }), className)} {...props} />
-));
-Alert.displayName = 'Alert';
-
-const AlertTitle = React.forwardRef<HTMLParagraphElement, React.HTMLAttributes<HTMLHeadingElement>>(
-  ({ className, ...props }, ref) => (
-    <h5
-      ref={ref}
-      className={cn('mb-1 font-medium leading-none tracking-tight', className)}
-      {...props}
-    />
-  )
-);
-AlertTitle.displayName = 'AlertTitle';
-
-const AlertDescription = React.forwardRef<
-  HTMLParagraphElement,
-  React.HTMLAttributes<HTMLParagraphElement>
->(({ className, ...props }, ref) => (
-  <div ref={ref} className={cn('text-sm [&_p]:leading-relaxed', className)} {...props} />
-));
-AlertDescription.displayName = 'AlertDescription';
-
-export { Alert, AlertTitle, AlertDescription };
diff --git a/src/renderer/components/ui/badge.tsx b/src/renderer/components/ui/badge.tsx
deleted file mode 100644
index ff2497d631..0000000000
--- a/src/renderer/components/ui/badge.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-import React from 'react';
-import { cn } from '@/lib/utils';
-
-type Props = React.HTMLAttributes<HTMLSpanElement> & {
-  variant?: 'default' | 'secondary' | 'outline';
-};
-
-export const Badge: React.FC<Props> = ({ className, variant = 'secondary', ...props }) => {
-  const base = 'inline-flex items-center gap-1.5 rounded-md px-2 py-0.5 text-xs font-medium';
-  const styles =
-    variant === 'outline'
-      ? 'border border-border/70 bg-background text-foreground'
-      : variant === 'default'
-        ? 'bg-foreground text-background'
-        : 'border border-border/70 bg-muted/40 text-foreground';
-  return <span className={cn(base, styles, className)} {...props} />;
-};
-
-export default Badge;
diff --git a/src/renderer/components/ui/breadcrumb.tsx b/src/renderer/components/ui/breadcrumb.tsx
deleted file mode 100644
index 7c73a8405b..0000000000
--- a/src/renderer/components/ui/breadcrumb.tsx
+++ /dev/null
@@ -1,101 +0,0 @@
-import * as React from 'react';
-import { Slot } from '@radix-ui/react-slot';
-import { ChevronRight, MoreHorizontal } from 'lucide-react';
-
-import { cn } from '@/lib/utils';
-
-const Breadcrumb = React.forwardRef<
-  HTMLElement,
-  React.ComponentPropsWithoutRef<'nav'> & {
-    separator?: React.ReactNode;
-  }
->(({ ...props }, ref) => <nav ref={ref} aria-label="breadcrumb" {...props} />);
-Breadcrumb.displayName = 'Breadcrumb';
-
-const BreadcrumbList = React.forwardRef<HTMLOListElement, React.ComponentPropsWithoutRef<'ol'>>(
-  ({ className, ...props }, ref) => (
-    <ol
-      ref={ref}
-      className={cn(
-        'flex flex-wrap items-center gap-1.5 break-words text-sm text-muted-foreground sm:gap-2.5',
-        className
-      )}
-      {...props}
-    />
-  )
-);
-BreadcrumbList.displayName = 'BreadcrumbList';
-
-const BreadcrumbItem = React.forwardRef<HTMLLIElement, React.ComponentPropsWithoutRef<'li'>>(
-  ({ className, ...props }, ref) => (
-    <li ref={ref} className={cn('inline-flex items-center gap-1.5', className)} {...props} />
-  )
-);
-BreadcrumbItem.displayName = 'BreadcrumbItem';
-
-const BreadcrumbLink = React.forwardRef<
-  HTMLAnchorElement,
-  React.ComponentPropsWithoutRef<'a'> & {
-    asChild?: boolean;
-  }
->(({ asChild, className, ...props }, ref) => {
-  const Comp = asChild ? Slot : 'a';
-
-  return (
-    <Comp
-      ref={ref}
-      className={cn('transition-colors hover:text-foreground', className)}
-      {...props}
-    />
-  );
-});
-BreadcrumbLink.displayName = 'BreadcrumbLink';
-
-const BreadcrumbPage = React.forwardRef<HTMLSpanElement, React.ComponentPropsWithoutRef<'span'>>(
-  ({ className, ...props }, ref) => (
-    <span
-      ref={ref}
-      role="link"
-      aria-disabled="true"
-      aria-current="page"
-      className={cn('font-normal text-foreground', className)}
-      {...props}
-    />
-  )
-);
-BreadcrumbPage.displayName = 'BreadcrumbPage';
-
-const BreadcrumbSeparator = ({ children, className, ...props }: React.ComponentProps<'li'>) => (
-  <li
-    role="presentation"
-    aria-hidden="true"
-    className={cn('[&>svg]:h-3.5 [&>svg]:w-3.5', className)}
-    {...props}
-  >
-    {children ?? <ChevronRight />}
-  </li>
-);
-BreadcrumbSeparator.displayName = 'BreadcrumbSeparator';
-
-const BreadcrumbEllipsis = ({ className, ...props }: React.ComponentProps<'span'>) => (
-  <span
-    role="presentation"
-    aria-hidden="true"
-    className={cn('flex h-9 w-9 items-center justify-center', className)}
-    {...props}
-  >
-    <MoreHorizontal className="h-4 w-4" />
-    <span className="sr-only">More</span>
-  </span>
-);
-BreadcrumbEllipsis.displayName = 'BreadcrumbElipssis';
-
-export {
-  Breadcrumb,
-  BreadcrumbList,
-  BreadcrumbItem,
-  BreadcrumbLink,
-  BreadcrumbPage,
-  BreadcrumbSeparator,
-  BreadcrumbEllipsis,
-};
diff --git a/src/renderer/components/ui/button.tsx b/src/renderer/components/ui/button.tsx
deleted file mode 100644
index 8c9f096d26..0000000000
--- a/src/renderer/components/ui/button.tsx
+++ /dev/null
@@ -1,50 +0,0 @@
-import * as React from 'react';
-import { Slot } from '@radix-ui/react-slot';
-import { cva, type VariantProps } from 'class-variance-authority';
-
-import { cn } from '@/lib/utils';
-
-const buttonVariants = cva(
-  'inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50',
-  {
-    variants: {
-      variant: {
-        default: 'bg-primary text-primary-foreground hover:bg-primary/90',
-        destructive: 'bg-destructive text-destructive-foreground hover:bg-destructive/90',
-        outline: 'border border-input bg-background hover:bg-accent hover:text-accent-foreground',
-        secondary: 'bg-secondary text-secondary-foreground hover:bg-secondary/80',
-        ghost: 'hover:bg-accent hover:text-accent-foreground',
-        link: 'text-primary underline-offset-4 hover:underline',
-      },
-      size: {
-        default: 'h-10 px-4 py-2',
-        sm: 'h-9 rounded-md px-3',
-        lg: 'h-11 rounded-md px-8',
-        icon: 'h-10 w-10',
-        'icon-sm': 'h-7 w-7',
-      },
-    },
-    defaultVariants: {
-      variant: 'default',
-      size: 'default',
-    },
-  }
-);
-
-export interface ButtonProps
-  extends React.ButtonHTMLAttributes<HTMLButtonElement>,
-    VariantProps<typeof buttonVariants> {
-  asChild?: boolean;
-}
-
-const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
-  ({ className, variant, size, asChild = false, ...props }, ref) => {
-    const Comp = asChild ? Slot : 'button';
-    return (
-      <Comp className={cn(buttonVariants({ variant, size, className }))} ref={ref} {...props} />
-    );
-  }
-);
-Button.displayName = 'Button';
-
-export { Button, buttonVariants };
diff --git a/src/renderer/components/ui/card.tsx b/src/renderer/components/ui/card.tsx
deleted file mode 100644
index f3a70ba2b4..0000000000
--- a/src/renderer/components/ui/card.tsx
+++ /dev/null
@@ -1,56 +0,0 @@
-import * as React from 'react';
-
-import { cn } from '@/lib/utils';
-
-const Card = React.forwardRef<HTMLDivElement, React.HTMLAttributes<HTMLDivElement>>(
-  ({ className, ...props }, ref) => (
-    <div
-      ref={ref}
-      className={cn('rounded-lg border bg-card text-card-foreground shadow-sm', className)}
-      {...props}
-    />
-  )
-);
-Card.displayName = 'Card';
-
-const CardHeader = React.forwardRef<HTMLDivElement, React.HTMLAttributes<HTMLDivElement>>(
-  ({ className, ...props }, ref) => (
-    <div ref={ref} className={cn('flex flex-col space-y-1.5 p-6', className)} {...props} />
-  )
-);
-CardHeader.displayName = 'CardHeader';
-
-const CardTitle = React.forwardRef<HTMLParagraphElement, React.HTMLAttributes<HTMLHeadingElement>>(
-  ({ className, ...props }, ref) => (
-    <h3
-      ref={ref}
-      className={cn('text-2xl font-semibold leading-none tracking-tight', className)}
-      {...props}
-    />
-  )
-);
-CardTitle.displayName = 'CardTitle';
-
-const CardDescription = React.forwardRef<
-  HTMLParagraphElement,
-  React.HTMLAttributes<HTMLParagraphElement>
->(({ className, ...props }, ref) => (
-  <p ref={ref} className={cn('text-sm text-muted-foreground', className)} {...props} />
-));
-CardDescription.displayName = 'CardDescription';
-
-const CardContent = React.forwardRef<HTMLDivElement, React.HTMLAttributes<HTMLDivElement>>(
-  ({ className, ...props }, ref) => (
-    <div ref={ref} className={cn('p-6 pt-0', className)} {...props} />
-  )
-);
-CardContent.displayName = 'CardContent';
-
-const CardFooter = React.forwardRef<HTMLDivElement, React.HTMLAttributes<HTMLDivElement>>(
-  ({ className, ...props }, ref) => (
-    <div ref={ref} className={cn('flex items-center p-6 pt-0', className)} {...props} />
-  )
-);
-CardFooter.displayName = 'CardFooter';
-
-export { Card, CardHeader, CardFooter, CardTitle, CardDescription, CardContent };
diff --git a/src/renderer/components/ui/checkbox.tsx b/src/renderer/components/ui/checkbox.tsx
deleted file mode 100644
index af83b206d1..0000000000
--- a/src/renderer/components/ui/checkbox.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-import * as React from 'react';
-import * as CheckboxPrimitive from '@radix-ui/react-checkbox';
-import { Check } from 'lucide-react';
-
-import { cn } from '@/lib/utils';
-
-const Checkbox = React.forwardRef<
-  React.ElementRef<typeof CheckboxPrimitive.Root>,
-  React.ComponentPropsWithoutRef<typeof CheckboxPrimitive.Root>
->(({ className, ...props }, ref) => (
-  <CheckboxPrimitive.Root
-    ref={ref}
-    className={cn(
-      'peer grid h-4 w-4 shrink-0 place-content-center rounded-sm border border-primary focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:cursor-not-allowed disabled:opacity-50 data-[state=checked]:bg-primary data-[state=checked]:text-primary-foreground',
-      className
-    )}
-    {...props}
-  >
-    <CheckboxPrimitive.Indicator className={cn('grid place-content-center text-current')}>
-      <Check className="h-3 w-3" />
-    </CheckboxPrimitive.Indicator>
-  </CheckboxPrimitive.Root>
-));
-Checkbox.displayName = CheckboxPrimitive.Root.displayName;
-
-export { Checkbox };
diff --git a/src/renderer/components/ui/collapsible.tsx b/src/renderer/components/ui/collapsible.tsx
deleted file mode 100644
index 2d828b977d..0000000000
--- a/src/renderer/components/ui/collapsible.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-'use client';
-
-import * as React from 'react';
-import * as CollapsiblePrimitive from '@radix-ui/react-collapsible';
-
-function Collapsible({ ...props }: React.ComponentProps<typeof CollapsiblePrimitive.Root>) {
-  return <CollapsiblePrimitive.Root data-slot="collapsible" {...props} />;
-}
-
-function CollapsibleTrigger({
-  ...props
-}: React.ComponentProps<typeof CollapsiblePrimitive.CollapsibleTrigger>) {
-  return <CollapsiblePrimitive.CollapsibleTrigger data-slot="collapsible-trigger" {...props} />;
-}
-
-function CollapsibleContent({
-  ...props
-}: React.ComponentProps<typeof CollapsiblePrimitive.CollapsibleContent>) {
-  return <CollapsiblePrimitive.CollapsibleContent data-slot="collapsible-content" {...props} />;
-}
-
-export { Collapsible, CollapsibleTrigger, CollapsibleContent };
diff --git a/src/renderer/components/ui/context-menu.tsx b/src/renderer/components/ui/context-menu.tsx
deleted file mode 100644
index 7187df38f1..0000000000
--- a/src/renderer/components/ui/context-menu.tsx
+++ /dev/null
@@ -1,64 +0,0 @@
-import * as React from 'react';
-import * as ContextMenuPrimitive from '@radix-ui/react-context-menu';
-
-import { cn } from '@/lib/utils';
-
-const ContextMenu = ContextMenuPrimitive.Root;
-
-const ContextMenuTrigger = ContextMenuPrimitive.Trigger;
-
-const ContextMenuContent = React.forwardRef<
-  React.ElementRef<typeof ContextMenuPrimitive.Content>,
-  React.ComponentPropsWithoutRef<typeof ContextMenuPrimitive.Content>
->(({ className, ...props }, ref) => (
-  <ContextMenuPrimitive.Portal>
-    <ContextMenuPrimitive.Content
-      ref={ref}
-      className={cn(
-        'z-[240] min-w-[6rem] overflow-hidden rounded-md border border-border bg-background p-0.5 text-foreground shadow-md',
-        'animate-in fade-in-0 zoom-in-95 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95',
-        className
-      )}
-      {...props}
-    />
-  </ContextMenuPrimitive.Portal>
-));
-ContextMenuContent.displayName = ContextMenuPrimitive.Content.displayName;
-
-const ContextMenuItem = React.forwardRef<
-  React.ElementRef<typeof ContextMenuPrimitive.Item>,
-  React.ComponentPropsWithoutRef<typeof ContextMenuPrimitive.Item> & {
-    inset?: boolean;
-  }
->(({ className, inset, ...props }, ref) => (
-  <ContextMenuPrimitive.Item
-    ref={ref}
-    className={cn(
-      'relative flex cursor-default select-none items-center rounded-sm px-2 py-1 text-xs outline-none focus:bg-accent focus:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50',
-      inset && 'pl-6',
-      className
-    )}
-    {...props}
-  />
-));
-ContextMenuItem.displayName = ContextMenuPrimitive.Item.displayName;
-
-const ContextMenuSeparator = React.forwardRef<
-  React.ElementRef<typeof ContextMenuPrimitive.Separator>,
-  React.ComponentPropsWithoutRef<typeof ContextMenuPrimitive.Separator>
->(({ className, ...props }, ref) => (
-  <ContextMenuPrimitive.Separator
-    ref={ref}
-    className={cn('-mx-1 my-1 h-px bg-border', className)}
-    {...props}
-  />
-));
-ContextMenuSeparator.displayName = ContextMenuPrimitive.Separator.displayName;
-
-export {
-  ContextMenu,
-  ContextMenuTrigger,
-  ContextMenuContent,
-  ContextMenuItem,
-  ContextMenuSeparator,
-};
diff --git a/src/renderer/components/ui/dialog.tsx b/src/renderer/components/ui/dialog.tsx
deleted file mode 100644
index daf568a032..0000000000
--- a/src/renderer/components/ui/dialog.tsx
+++ /dev/null
@@ -1,102 +0,0 @@
-import * as React from 'react';
-import * as DialogPrimitive from '@radix-ui/react-dialog';
-import { X } from 'lucide-react';
-
-import { cn } from '@/lib/utils';
-
-const Dialog = DialogPrimitive.Root;
-
-const DialogTrigger = DialogPrimitive.Trigger;
-
-const DialogPortal = DialogPrimitive.Portal;
-
-const DialogClose = DialogPrimitive.Close;
-
-const DialogOverlay = React.forwardRef<
-  React.ElementRef<typeof DialogPrimitive.Overlay>,
-  React.ComponentPropsWithoutRef<typeof DialogPrimitive.Overlay>
->(({ className, ...props }, ref) => (
-  <DialogPrimitive.Overlay
-    ref={ref}
-    className={cn(
-      'fixed inset-0 z-[998] bg-black/50 backdrop-blur-sm data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0',
-      className
-    )}
-    {...props}
-  />
-));
-DialogOverlay.displayName = DialogPrimitive.Overlay.displayName;
-
-const DialogContent = React.forwardRef<
-  React.ElementRef<typeof DialogPrimitive.Content>,
-  React.ComponentPropsWithoutRef<typeof DialogPrimitive.Content>
->(({ className, children, ...props }, ref) => (
-  <DialogPortal>
-    <DialogOverlay />
-    <DialogPrimitive.Content
-      ref={ref}
-      className={cn(
-        'fixed left-[50%] top-[50%] z-[999] grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-4 overflow-hidden border bg-background p-6 shadow-lg duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] sm:rounded-lg',
-        className
-      )}
-      {...props}
-    >
-      {children}
-      <DialogPrimitive.Close className="absolute right-4 top-4 rounded-sm opacity-70 ring-offset-background transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:pointer-events-none data-[state=open]:bg-accent data-[state=open]:text-muted-foreground">
-        <X className="h-4 w-4" />
-        <span className="sr-only">Close</span>
-      </DialogPrimitive.Close>
-    </DialogPrimitive.Content>
-  </DialogPortal>
-));
-DialogContent.displayName = DialogPrimitive.Content.displayName;
-
-const DialogHeader = ({ className, ...props }: React.HTMLAttributes<HTMLDivElement>) => (
-  <div className={cn('flex flex-col space-y-1.5 text-center sm:text-left', className)} {...props} />
-);
-DialogHeader.displayName = 'DialogHeader';
-
-const DialogFooter = ({ className, ...props }: React.HTMLAttributes<HTMLDivElement>) => (
-  <div
-    className={cn('flex flex-col-reverse sm:flex-row sm:justify-end sm:space-x-2', className)}
-    {...props}
-  />
-);
-DialogFooter.displayName = 'DialogFooter';
-
-const DialogTitle = React.forwardRef<
-  React.ElementRef<typeof DialogPrimitive.Title>,
-  React.ComponentPropsWithoutRef<typeof DialogPrimitive.Title>
->(({ className, ...props }, ref) => (
-  <DialogPrimitive.Title
-    ref={ref}
-    className={cn('text-lg font-semibold leading-none tracking-tight', className)}
-    {...props}
-  />
-));
-DialogTitle.displayName = DialogPrimitive.Title.displayName;
-
-const DialogDescription = React.forwardRef<
-  React.ElementRef<typeof DialogPrimitive.Description>,
-  React.ComponentPropsWithoutRef<typeof DialogPrimitive.Description>
->(({ className, ...props }, ref) => (
-  <DialogPrimitive.Description
-    ref={ref}
-    className={cn('text-sm text-muted-foreground', className)}
-    {...props}
-  />
-));
-DialogDescription.displayName = DialogPrimitive.Description.displayName;
-
-export {
-  Dialog,
-  DialogPortal,
-  DialogOverlay,
-  DialogTrigger,
-  DialogClose,
-  DialogContent,
-  DialogHeader,
-  DialogFooter,
-  DialogTitle,
-  DialogDescription,
-};
diff --git a/src/renderer/components/ui/input.tsx b/src/renderer/components/ui/input.tsx
deleted file mode 100644
index 6ef0f2abae..0000000000
--- a/src/renderer/components/ui/input.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-import * as React from 'react';
-
-import { cn } from '@/lib/utils';
-
-export interface InputProps extends React.InputHTMLAttributes<HTMLInputElement> {}
-
-const Input = React.forwardRef<HTMLInputElement, InputProps>(
-  ({ className, type, ...props }, ref) => {
-    return (
-      <input
-        type={type}
-        className={cn(
-          'flex h-10 w-full rounded-md border border-input bg-background px-3 py-2 text-sm ring-offset-background file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-muted-foreground focus-visible:border-border focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-gray-300 focus-visible:ring-offset-0 disabled:cursor-not-allowed disabled:opacity-50 dark:focus-visible:border-border dark:focus-visible:ring-gray-600',
-          className
-        )}
-        ref={ref}
-        {...props}
-      />
-    );
-  }
-);
-Input.displayName = 'Input';
-
-export { Input };
diff --git a/src/renderer/components/ui/label.tsx b/src/renderer/components/ui/label.tsx
deleted file mode 100644
index 84d16161b4..0000000000
--- a/src/renderer/components/ui/label.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-import * as React from 'react';
-import * as LabelPrimitive from '@radix-ui/react-label';
-import { cva, type VariantProps } from 'class-variance-authority';
-
-import { cn } from '../../lib/utils';
-
-const labelVariants = cva(
-  'text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70'
-);
-
-const Label = React.forwardRef<
-  React.ElementRef<typeof LabelPrimitive.Root>,
-  React.ComponentPropsWithoutRef<typeof LabelPrimitive.Root> & VariantProps<typeof labelVariants>
->(({ className, ...props }, ref) => (
-  <LabelPrimitive.Root ref={ref} className={cn(labelVariants(), className)} {...props} />
-));
-Label.displayName = LabelPrimitive.Root.displayName;
-
-export { Label };
diff --git a/src/renderer/components/ui/markdown-renderer.tsx b/src/renderer/components/ui/markdown-renderer.tsx
deleted file mode 100644
index 067ace0de6..0000000000
--- a/src/renderer/components/ui/markdown-renderer.tsx
+++ /dev/null
@@ -1,283 +0,0 @@
-import React, { useMemo, useState, useEffect } from 'react';
-import Markdown from 'react-markdown';
-import remarkGfm from 'remark-gfm';
-import rehypeRaw from 'rehype-raw';
-import rehypeSanitize, { defaultSchema } from 'rehype-sanitize';
-import { Prism as SyntaxHighlighter } from 'react-syntax-highlighter';
-import { oneDark, oneLight } from 'react-syntax-highlighter/dist/esm/styles/prism';
-import { useTheme } from '@/hooks/useTheme';
-import { cn } from '@/lib/utils';
-
-type Variant = 'full' | 'compact';
-
-interface MarkdownRendererProps {
-  content: string;
-  variant?: Variant;
-  className?: string;
-  /** Root path for resolving relative image paths (e.g. taskPath / worktree root) */
-  rootPath?: string;
-  /** Directory of the markdown file, relative to rootPath */
-  fileDir?: string;
-}
-
-/** Sanitize schema that also allows data: URIs on images */
-const sanitizeSchema = {
-  ...defaultSchema,
-  protocols: {
-    ...defaultSchema.protocols,
-    src: [...(defaultSchema.protocols?.src || []), 'data'],
-  },
-};
-
-/** Resolves a local image src via fsReadImage and renders as base64 data URI */
-const ResolvedImage: React.FC<{ src: string; alt: string; rootPath: string; fileDir: string }> = ({
-  src,
-  alt,
-  rootPath,
-  fileDir,
-}) => {
-  const [dataUrl, setDataUrl] = useState<string | null>(null);
-  const [error, setError] = useState(false);
-
-  useEffect(() => {
-    let cancelled = false;
-    const relPath = fileDir ? `${fileDir}/${src}` : src;
-    window.electronAPI
-      .fsReadImage(rootPath, relPath)
-      .then((result: any) => {
-        if (cancelled) return;
-        if (result.success && result.dataUrl) {
-          setDataUrl(result.dataUrl);
-        } else {
-          setError(true);
-        }
-      })
-      .catch(() => {
-        if (!cancelled) setError(true);
-      });
-    return () => {
-      cancelled = true;
-    };
-  }, [src, rootPath, fileDir]);
-
-  if (error) {
-    return (
-      <span className="my-3 inline-block text-xs text-muted-foreground">
-        [Image not found: {src}]
-      </span>
-    );
-  }
-  if (!dataUrl) {
-    return (
-      <span className="my-3 inline-block text-xs text-muted-foreground">Loading image...</span>
-    );
-  }
-  return <img src={dataUrl} alt={alt} className="my-3 max-w-full rounded" />;
-};
-
-function useFullComponents(isDark: boolean, rootPath?: string, fileDir?: string) {
-  return useMemo(
-    () => ({
-      h1: ({ children }: any) => (
-        <h1 className="mb-4 mt-6 border-b border-border pb-2 text-2xl font-semibold text-foreground first:mt-0">
-          {children}
-        </h1>
-      ),
-      h2: ({ children }: any) => (
-        <h2 className="mb-3 mt-6 border-b border-border pb-2 text-xl font-semibold text-foreground first:mt-0">
-          {children}
-        </h2>
-      ),
-      h3: ({ children }: any) => (
-        <h3 className="mb-2 mt-4 text-lg font-semibold text-foreground">{children}</h3>
-      ),
-      h4: ({ children }: any) => (
-        <h4 className="mb-2 mt-4 text-base font-semibold text-foreground">{children}</h4>
-      ),
-      h5: ({ children }: any) => (
-        <h5 className="mb-1 mt-3 text-sm font-semibold text-foreground">{children}</h5>
-      ),
-      h6: ({ children }: any) => (
-        <h6 className="mb-1 mt-3 text-sm font-semibold text-muted-foreground">{children}</h6>
-      ),
-      p: ({ children }: any) => (
-        <p className="mb-3 text-sm leading-relaxed text-foreground">{children}</p>
-      ),
-      ul: ({ children }: any) => (
-        <ul className="mb-3 ml-6 list-disc space-y-1 text-sm text-foreground">{children}</ul>
-      ),
-      ol: ({ children }: any) => (
-        <ol className="mb-3 ml-6 list-decimal space-y-1 text-sm text-foreground">{children}</ol>
-      ),
-      li: ({ children }: any) => <li className="leading-relaxed">{children}</li>,
-      code: ({ children, className }: any) => {
-        const match = /language-(\w+)/.exec(className || '');
-        const language = match ? match[1] : '';
-        const isBlock = className?.includes('language-');
-
-        if (isBlock) {
-          return (
-            <SyntaxHighlighter
-              style={isDark ? oneDark : oneLight}
-              language={language}
-              PreTag="div"
-              className="!my-0 !rounded-md !text-xs"
-            >
-              {String(children).replace(/\n$/, '')}
-            </SyntaxHighlighter>
-          );
-        }
-
-        return <code className="rounded bg-muted px-1.5 py-0.5 text-xs">{children}</code>;
-      },
-      pre: ({ children }: any) => (
-        <pre className="mb-3 overflow-x-auto rounded-md border border-border">{children}</pre>
-      ),
-      a: ({ href, children }: any) => {
-        const isHttp = typeof href === 'string' && /^https?:\/\//i.test(href);
-        const handleClick = (e: React.MouseEvent) => {
-          if (isHttp && typeof window !== 'undefined' && window.electronAPI?.openExternal) {
-            e.preventDefault();
-            window.electronAPI.openExternal(href).catch(() => {});
-          }
-        };
-        return (
-          <a
-            href={href}
-            className="text-primary underline decoration-primary/50 hover:decoration-primary"
-            target="_blank"
-            rel="noopener noreferrer"
-            onClick={handleClick}
-          >
-            {children}
-          </a>
-        );
-      },
-      blockquote: ({ children }: any) => (
-        <blockquote className="mb-3 border-l-4 border-border bg-muted/30 py-1 pl-4 text-sm italic text-muted-foreground">
-          {children}
-        </blockquote>
-      ),
-      table: ({ children }: any) => (
-        <div className="mb-3 overflow-x-auto">
-          <table className="w-full border-collapse text-sm">{children}</table>
-        </div>
-      ),
-      thead: ({ children }: any) => (
-        <thead className="border-b border-border bg-muted/30">{children}</thead>
-      ),
-      th: ({ children }: any) => (
-        <th className="px-3 py-2 text-left font-semibold text-foreground">{children}</th>
-      ),
-      td: ({ children }: any) => (
-        <td className="border-t border-border px-3 py-2 text-foreground">{children}</td>
-      ),
-      hr: () => <hr className="my-6 border-border" />,
-      img: ({ src, alt }: any) => {
-        const isExternal = typeof src === 'string' && /^https?:\/\//i.test(src);
-        if (!isExternal && rootPath && src) {
-          return (
-            <ResolvedImage src={src} alt={alt || ''} rootPath={rootPath} fileDir={fileDir || ''} />
-          );
-        }
-        return <img src={src} alt={alt || ''} className="my-3 max-w-full rounded" />;
-      },
-      strong: ({ children }: any) => (
-        <strong className="font-semibold text-foreground">{children}</strong>
-      ),
-      input: ({ checked, ...props }: any) => (
-        <input
-          type="checkbox"
-          checked={checked}
-          disabled
-          className="mr-2 align-middle"
-          {...props}
-        />
-      ),
-    }),
-    [isDark, rootPath, fileDir]
-  );
-}
-
-function useCompactComponents() {
-  return useMemo(
-    () => ({
-      h1: ({ children }: any) => (
-        <h2 className="mb-1 mt-3 text-sm font-semibold text-foreground first:mt-0">{children}</h2>
-      ),
-      h2: ({ children }: any) => (
-        <h3 className="mb-1 mt-3 text-sm font-semibold text-foreground first:mt-0">{children}</h3>
-      ),
-      h3: ({ children }: any) => (
-        <h4 className="mb-1 mt-2 text-xs font-semibold text-foreground">{children}</h4>
-      ),
-      p: ({ children }: any) => <p className="mb-2 leading-relaxed">{children}</p>,
-      ul: ({ children }: any) => <ul className="mb-2 ml-4 list-disc space-y-0.5">{children}</ul>,
-      ol: ({ children }: any) => <ol className="mb-2 ml-4 list-decimal space-y-0.5">{children}</ol>,
-      li: ({ children }: any) => <li className="leading-relaxed">{children}</li>,
-      code: ({ children, className }: any) => {
-        const isBlock = className?.includes('language-');
-        return isBlock ? (
-          <code className="block overflow-x-auto rounded bg-muted/60 p-2 text-[11px]">
-            {children}
-          </code>
-        ) : (
-          <code className="rounded bg-muted/60 px-1 py-0.5 text-[11px]">{children}</code>
-        );
-      },
-      pre: ({ children }: any) => <pre className="mb-2 overflow-x-auto">{children}</pre>,
-      strong: ({ children }: any) => (
-        <strong className="font-semibold text-foreground">{children}</strong>
-      ),
-      a: ({ href, children }: any) => {
-        const isHttp = typeof href === 'string' && /^https?:\/\//i.test(href);
-        const handleClick = (e: React.MouseEvent) => {
-          if (isHttp && typeof window !== 'undefined' && window.electronAPI?.openExternal) {
-            e.preventDefault();
-            window.electronAPI.openExternal(href).catch(() => {});
-          }
-        };
-        return (
-          <a
-            href={href}
-            className="text-primary underline"
-            target="_blank"
-            rel="noopener noreferrer"
-            onClick={handleClick}
-          >
-            {children}
-          </a>
-        );
-      },
-    }),
-    []
-  );
-}
-
-export const MarkdownRenderer: React.FC<MarkdownRendererProps> = ({
-  content,
-  variant = 'full',
-  className,
-  rootPath,
-  fileDir,
-}) => {
-  const { effectiveTheme } = useTheme();
-  const isDark = effectiveTheme === 'dark' || effectiveTheme === 'dark-black';
-
-  const fullComponents = useFullComponents(isDark, rootPath, fileDir);
-  const compactComponents = useCompactComponents();
-
-  const components = variant === 'full' ? fullComponents : compactComponents;
-  const rehypePlugins =
-    variant === 'full'
-      ? [rehypeRaw, [rehypeSanitize, sanitizeSchema] as any]
-      : [[rehypeSanitize, sanitizeSchema] as any];
-
-  return (
-    <div className={cn(className)}>
-      <Markdown remarkPlugins={[remarkGfm]} rehypePlugins={rehypePlugins} components={components}>
-        {content}
-      </Markdown>
-    </div>
-  );
-};
diff --git a/src/renderer/components/ui/popover.tsx b/src/renderer/components/ui/popover.tsx
deleted file mode 100644
index 460db1b65d..0000000000
--- a/src/renderer/components/ui/popover.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import * as React from 'react';
-import * as PopoverPrimitive from '@radix-ui/react-popover';
-
-import { cn } from '@/lib/utils';
-
-const Popover = PopoverPrimitive.Root;
-
-const PopoverTrigger = PopoverPrimitive.Trigger;
-
-const PopoverAnchor = PopoverPrimitive.Anchor;
-
-const PopoverContent = React.forwardRef<
-  React.ElementRef<typeof PopoverPrimitive.Content>,
-  React.ComponentPropsWithoutRef<typeof PopoverPrimitive.Content>
->(({ className, align = 'center', sideOffset = 4, ...props }, ref) => (
-  <PopoverPrimitive.Portal>
-    <PopoverPrimitive.Content
-      ref={ref}
-      align={align}
-      sideOffset={sideOffset}
-      className={cn(
-        'relative z-[9999] w-72 origin-[--radix-popover-content-transform-origin] overflow-hidden rounded-md border bg-popover text-popover-foreground shadow-md outline-none data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2',
-        className
-      )}
-      style={{ zIndex: 9999 }}
-      {...props}
-    />
-  </PopoverPrimitive.Portal>
-));
-PopoverContent.displayName = PopoverPrimitive.Content.displayName;
-
-export { Popover, PopoverTrigger, PopoverContent, PopoverAnchor };
diff --git a/src/renderer/components/ui/progress.tsx b/src/renderer/components/ui/progress.tsx
deleted file mode 100644
index 61992d86d4..0000000000
--- a/src/renderer/components/ui/progress.tsx
+++ /dev/null
@@ -1,25 +0,0 @@
-import * as React from 'react';
-import * as ProgressPrimitive from '@radix-ui/react-progress';
-import { cn } from '@/lib/utils';
-
-const Progress = React.forwardRef<
-  React.ElementRef<typeof ProgressPrimitive.Root>,
-  React.ComponentPropsWithoutRef<typeof ProgressPrimitive.Root>
->(({ className, value, ...props }, ref) => (
-  <ProgressPrimitive.Root
-    ref={ref}
-    className={cn(
-      'relative h-2 w-full overflow-hidden rounded-full bg-gray-200 dark:bg-gray-800',
-      className
-    )}
-    {...props}
-  >
-    <ProgressPrimitive.Indicator
-      className="h-full w-full flex-1 bg-blue-600 transition-all dark:bg-blue-500"
-      style={{ transform: `translateX(-${100 - (value || 0)}%)` }}
-    />
-  </ProgressPrimitive.Root>
-));
-Progress.displayName = ProgressPrimitive.Root.displayName;
-
-export { Progress };
diff --git a/src/renderer/components/ui/radio-group.tsx b/src/renderer/components/ui/radio-group.tsx
deleted file mode 100644
index 05eb0c33de..0000000000
--- a/src/renderer/components/ui/radio-group.tsx
+++ /dev/null
@@ -1,36 +0,0 @@
-import * as React from 'react';
-import * as RadioGroupPrimitive from '@radix-ui/react-radio-group';
-import { Circle } from 'lucide-react';
-
-import { cn } from '@/lib/utils';
-
-const RadioGroup = React.forwardRef<
-  React.ElementRef<typeof RadioGroupPrimitive.Root>,
-  React.ComponentPropsWithoutRef<typeof RadioGroupPrimitive.Root>
->(({ className, ...props }, ref) => {
-  return <RadioGroupPrimitive.Root className={cn('grid gap-2', className)} {...props} ref={ref} />;
-});
-RadioGroup.displayName = RadioGroupPrimitive.Root.displayName;
-
-const RadioGroupItem = React.forwardRef<
-  React.ElementRef<typeof RadioGroupPrimitive.Item>,
-  React.ComponentPropsWithoutRef<typeof RadioGroupPrimitive.Item>
->(({ className, ...props }, ref) => {
-  return (
-    <RadioGroupPrimitive.Item
-      ref={ref}
-      className={cn(
-        'aspect-square h-4 w-4 rounded-full border border-primary text-primary ring-offset-background focus:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50',
-        className
-      )}
-      {...props}
-    >
-      <RadioGroupPrimitive.Indicator className="flex items-center justify-center">
-        <Circle className="h-2.5 w-2.5 fill-current text-current" />
-      </RadioGroupPrimitive.Indicator>
-    </RadioGroupPrimitive.Item>
-  );
-});
-RadioGroupItem.displayName = RadioGroupPrimitive.Item.displayName;
-
-export { RadioGroup, RadioGroupItem };
diff --git a/src/renderer/components/ui/relative-time.tsx b/src/renderer/components/ui/relative-time.tsx
deleted file mode 100644
index 743e9cea31..0000000000
--- a/src/renderer/components/ui/relative-time.tsx
+++ /dev/null
@@ -1,68 +0,0 @@
-import React, { useEffect, useMemo, useState } from 'react';
-
-type RelativeTimeProps = {
-  value: string | number | Date;
-  className?: string;
-};
-
-function parseTimestamp(input: string | number | Date): Date | null {
-  if (input instanceof Date) return input;
-  if (typeof input === 'number') {
-    const d = new Date(input);
-    return isNaN(d.getTime()) ? null : d;
-  }
-
-  const raw = String(input).trim();
-  if (!raw) return null;
-
-  let normalized = raw;
-  if (/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/.test(normalized)) {
-    normalized = normalized.replace(' ', 'T') + 'Z';
-  } else if (/^\d{4}-\d{2}-\d{2}$/.test(normalized)) {
-    normalized = normalized + 'T00:00:00Z';
-  }
-
-  const d = new Date(normalized);
-  if (!isNaN(d.getTime())) return d;
-
-  const fallback = new Date(raw);
-  return isNaN(fallback.getTime()) ? null : fallback;
-}
-
-function formatRelative(date: Date, nowMs: number): string {
-  const diffMs = nowMs - date.getTime();
-  const diffSeconds = Math.round(diffMs / 1000);
-  const diffMinutes = Math.round(diffSeconds / 60);
-  const diffHours = Math.round(diffMinutes / 60);
-  const diffDays = Math.round(diffHours / 24);
-
-  if (diffMinutes < 1) return 'just now';
-  if (diffMinutes < 60) return `${diffMinutes}m ago`;
-  if (diffHours < 24) return `${diffHours}h ago`;
-  if (diffDays < 7) return `${diffDays}d ago`;
-
-  return date.toLocaleDateString();
-}
-
-export const RelativeTime: React.FC<RelativeTimeProps> = ({ value, className }) => {
-  const [nowMs, setNowMs] = useState(() => Date.now());
-
-  useEffect(() => {
-    const timer = setInterval(() => setNowMs(Date.now()), 60_000);
-    return () => clearInterval(timer);
-  }, []);
-
-  const date = useMemo(() => parseTimestamp(value), [value]);
-  if (!date) {
-    return <span className={className}>—</span>;
-  }
-
-  const label = formatRelative(date, nowMs);
-  return (
-    <time className={className} dateTime={date.toISOString()}>
-      {label}
-    </time>
-  );
-};
-
-export default RelativeTime;
diff --git a/src/renderer/components/ui/resizable.tsx b/src/renderer/components/ui/resizable.tsx
deleted file mode 100644
index 221f688f72..0000000000
--- a/src/renderer/components/ui/resizable.tsx
+++ /dev/null
@@ -1,35 +0,0 @@
-import * as React from 'react';
-import { GripVertical } from 'lucide-react';
-import * as ResizablePrimitive from 'react-resizable-panels';
-
-import { cn } from '@/lib/utils';
-
-const ResizablePanelGroup = ({
-  className,
-  ...props
-}: React.ComponentProps<typeof ResizablePrimitive.PanelGroup>) => (
-  <ResizablePrimitive.PanelGroup
-    className={cn('flex h-full w-full data-[panel-group-direction=vertical]:flex-col', className)}
-    {...props}
-  />
-);
-
-const ResizablePanel = ResizablePrimitive.Panel;
-
-const ResizableHandle = ({
-  withHandle,
-  className,
-  ...props
-}: React.ComponentProps<typeof ResizablePrimitive.PanelResizeHandle> & {
-  withHandle?: boolean;
-}) => (
-  <ResizablePrimitive.PanelResizeHandle
-    className={cn(
-      'relative flex w-px items-center justify-center bg-border after:absolute after:inset-y-0 after:left-1/2 after:w-1 after:-translate-x-1/2 focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring focus-visible:ring-offset-1 data-[panel-group-direction=vertical]:h-px data-[panel-group-direction=vertical]:w-full data-[panel-group-direction=vertical]:after:left-0 data-[panel-group-direction=vertical]:after:h-1 data-[panel-group-direction=vertical]:after:w-full data-[panel-group-direction=vertical]:after:-translate-y-1/2 data-[panel-group-direction=vertical]:after:translate-x-0',
-      className
-    )}
-    {...props}
-  />
-);
-
-export { ResizablePanelGroup, ResizablePanel, ResizableHandle };
diff --git a/src/renderer/components/ui/scroll-area.tsx b/src/renderer/components/ui/scroll-area.tsx
deleted file mode 100644
index 42e7076b89..0000000000
--- a/src/renderer/components/ui/scroll-area.tsx
+++ /dev/null
@@ -1,44 +0,0 @@
-import * as React from 'react';
-import * as ScrollAreaPrimitive from '@radix-ui/react-scroll-area';
-
-import { cn } from '@/lib/utils';
-
-const ScrollArea = React.forwardRef<
-  React.ElementRef<typeof ScrollAreaPrimitive.Root>,
-  React.ComponentPropsWithoutRef<typeof ScrollAreaPrimitive.Root>
->(({ className, children, ...props }, ref) => (
-  <ScrollAreaPrimitive.Root
-    ref={ref}
-    className={cn('relative overflow-hidden', className)}
-    {...props}
-  >
-    <ScrollAreaPrimitive.Viewport className="h-full w-full rounded-[inherit]">
-      {children}
-    </ScrollAreaPrimitive.Viewport>
-    <ScrollBar />
-    <ScrollAreaPrimitive.Corner />
-  </ScrollAreaPrimitive.Root>
-));
-ScrollArea.displayName = ScrollAreaPrimitive.Root.displayName;
-
-const ScrollBar = React.forwardRef<
-  React.ElementRef<typeof ScrollAreaPrimitive.ScrollAreaScrollbar>,
-  React.ComponentPropsWithoutRef<typeof ScrollAreaPrimitive.ScrollAreaScrollbar>
->(({ className, orientation = 'vertical', ...props }, ref) => (
-  <ScrollAreaPrimitive.ScrollAreaScrollbar
-    ref={ref}
-    orientation={orientation}
-    className={cn(
-      'flex touch-none select-none transition-colors',
-      orientation === 'vertical' && 'h-full w-2.5 border-l border-l-transparent p-[1px]',
-      orientation === 'horizontal' && 'h-2.5 flex-col border-t border-t-transparent p-[1px]',
-      className
-    )}
-    {...props}
-  >
-    <ScrollAreaPrimitive.ScrollAreaThumb className="relative flex-1 rounded-full bg-border" />
-  </ScrollAreaPrimitive.ScrollAreaScrollbar>
-));
-ScrollBar.displayName = ScrollAreaPrimitive.ScrollAreaScrollbar.displayName;
-
-export { ScrollArea, ScrollBar };
diff --git a/src/renderer/components/ui/select.tsx b/src/renderer/components/ui/select.tsx
deleted file mode 100644
index c598a5a243..0000000000
--- a/src/renderer/components/ui/select.tsx
+++ /dev/null
@@ -1,150 +0,0 @@
-import * as React from 'react';
-import * as SelectPrimitive from '@radix-ui/react-select';
-import { Check, ChevronDown, ChevronUp } from 'lucide-react';
-
-import { cn } from '@/lib/utils';
-
-const Select = SelectPrimitive.Root;
-
-const SelectGroup = SelectPrimitive.Group;
-
-const SelectValue = SelectPrimitive.Value;
-
-const SelectTrigger = React.forwardRef<
-  React.ElementRef<typeof SelectPrimitive.Trigger>,
-  React.ComponentPropsWithoutRef<typeof SelectPrimitive.Trigger>
->(({ className, children, ...props }, ref) => (
-  <SelectPrimitive.Trigger
-    ref={ref}
-    className={cn(
-      'flex h-9 w-full min-w-0 items-center justify-between overflow-hidden rounded-md border border-input bg-transparent px-3 py-2 text-sm shadow-sm ring-offset-background focus:outline-none disabled:opacity-50 data-[placeholder]:text-muted-foreground [&>span]:line-clamp-1',
-      className
-    )}
-    {...props}
-  >
-    {children}
-    <SelectPrimitive.Icon asChild>
-      <ChevronDown className="h-4 w-4 shrink-0 opacity-50" />
-    </SelectPrimitive.Icon>
-  </SelectPrimitive.Trigger>
-));
-SelectTrigger.displayName = SelectPrimitive.Trigger.displayName;
-
-const SelectScrollUpButton = React.forwardRef<
-  React.ElementRef<typeof SelectPrimitive.ScrollUpButton>,
-  React.ComponentPropsWithoutRef<typeof SelectPrimitive.ScrollUpButton>
->(({ className, ...props }, ref) => (
-  <SelectPrimitive.ScrollUpButton
-    ref={ref}
-    className={cn('flex cursor-default items-center justify-center py-1', className)}
-    {...props}
-  >
-    <ChevronUp className="h-4 w-4" />
-  </SelectPrimitive.ScrollUpButton>
-));
-SelectScrollUpButton.displayName = SelectPrimitive.ScrollUpButton.displayName;
-
-const SelectScrollDownButton = React.forwardRef<
-  React.ElementRef<typeof SelectPrimitive.ScrollDownButton>,
-  React.ComponentPropsWithoutRef<typeof SelectPrimitive.ScrollDownButton>
->(({ className, ...props }, ref) => (
-  <SelectPrimitive.ScrollDownButton
-    ref={ref}
-    className={cn('flex cursor-default items-center justify-center py-1', className)}
-    {...props}
-  >
-    <ChevronDown className="h-4 w-4" />
-  </SelectPrimitive.ScrollDownButton>
-));
-SelectScrollDownButton.displayName = SelectPrimitive.ScrollDownButton.displayName;
-
-const SelectContent = React.forwardRef<
-  React.ElementRef<typeof SelectPrimitive.Content>,
-  React.ComponentPropsWithoutRef<typeof SelectPrimitive.Content>
->(({ className, children, position = 'popper', ...props }, ref) => (
-  <SelectPrimitive.Portal>
-    <SelectPrimitive.Content
-      ref={ref}
-      className={cn(
-        'relative z-[9999] max-h-[--radix-select-content-available-height] min-w-[8rem] origin-[--radix-select-content-transform-origin] overflow-y-auto overflow-x-hidden rounded-md border bg-popover text-popover-foreground shadow-md data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2',
-        position === 'popper' &&
-          'data-[side=bottom]:translate-y-1 data-[side=left]:-translate-x-1 data-[side=right]:translate-x-1 data-[side=top]:-translate-y-1',
-        className
-      )}
-      position={position}
-      sideOffset={5}
-      style={{ zIndex: 9999 }}
-      {...props}
-    >
-      <SelectPrimitive.Viewport
-        className={cn(
-          'emd-select-viewport max-h-80 overflow-y-auto p-1',
-          position === 'popper' &&
-            'h-[var(--radix-select-trigger-height)] w-full min-w-[var(--radix-select-trigger-width)]'
-        )}
-      >
-        {children}
-      </SelectPrimitive.Viewport>
-    </SelectPrimitive.Content>
-  </SelectPrimitive.Portal>
-));
-SelectContent.displayName = SelectPrimitive.Content.displayName;
-
-const SelectLabel = React.forwardRef<
-  React.ElementRef<typeof SelectPrimitive.Label>,
-  React.ComponentPropsWithoutRef<typeof SelectPrimitive.Label>
->(({ className, ...props }, ref) => (
-  <SelectPrimitive.Label
-    ref={ref}
-    className={cn('px-2 py-1.5 text-sm font-semibold', className)}
-    {...props}
-  />
-));
-SelectLabel.displayName = SelectPrimitive.Label.displayName;
-
-const SelectItem = React.forwardRef<
-  React.ElementRef<typeof SelectPrimitive.Item>,
-  React.ComponentPropsWithoutRef<typeof SelectPrimitive.Item>
->(({ className, children, ...props }, ref) => (
-  <SelectPrimitive.Item
-    ref={ref}
-    className={cn(
-      'relative flex w-full cursor-pointer select-none items-center rounded-sm py-1.5 pl-2 pr-8 text-sm outline-none focus:bg-accent focus:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50',
-      className
-    )}
-    {...props}
-  >
-    <span className="absolute right-2 flex h-3.5 w-3.5 items-center justify-center">
-      <SelectPrimitive.ItemIndicator>
-        <Check className="h-4 w-4" />
-      </SelectPrimitive.ItemIndicator>
-    </span>
-    <SelectPrimitive.ItemText>{children}</SelectPrimitive.ItemText>
-  </SelectPrimitive.Item>
-));
-SelectItem.displayName = SelectPrimitive.Item.displayName;
-
-const SelectSeparator = React.forwardRef<
-  React.ElementRef<typeof SelectPrimitive.Separator>,
-  React.ComponentPropsWithoutRef<typeof SelectPrimitive.Separator>
->(({ className, ...props }, ref) => (
-  <SelectPrimitive.Separator
-    ref={ref}
-    className={cn('-mx-1 my-1 h-px bg-muted', className)}
-    {...props}
-  />
-));
-SelectSeparator.displayName = SelectPrimitive.Separator.displayName;
-
-export {
-  Select,
-  SelectGroup,
-  SelectValue,
-  SelectTrigger,
-  SelectContent,
-  SelectLabel,
-  SelectItem,
-  SelectSeparator,
-  SelectScrollUpButton,
-  SelectScrollDownButton,
-};
diff --git a/src/renderer/components/ui/separator.tsx b/src/renderer/components/ui/separator.tsx
deleted file mode 100644
index 466b405201..0000000000
--- a/src/renderer/components/ui/separator.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-import * as React from 'react';
-import * as SeparatorPrimitive from '@radix-ui/react-separator';
-
-import { cn } from '@/lib/utils';
-
-const Separator = React.forwardRef<
-  React.ElementRef<typeof SeparatorPrimitive.Root>,
-  React.ComponentPropsWithoutRef<typeof SeparatorPrimitive.Root>
->(({ className, orientation = 'horizontal', decorative = true, ...props }, ref) => (
-  <SeparatorPrimitive.Root
-    ref={ref}
-    decorative={decorative}
-    orientation={orientation}
-    className={cn(
-      'shrink-0 bg-border',
-      orientation === 'horizontal' ? 'h-[1px] w-full' : 'h-full w-[1px]',
-      className
-    )}
-    {...props}
-  />
-));
-Separator.displayName = SeparatorPrimitive.Root.displayName;
-
-export { Separator };
diff --git a/src/renderer/components/ui/shortcut-hint.tsx b/src/renderer/components/ui/shortcut-hint.tsx
deleted file mode 100644
index be84bc0c07..0000000000
--- a/src/renderer/components/ui/shortcut-hint.tsx
+++ /dev/null
@@ -1,69 +0,0 @@
-import React from 'react';
-import { ArrowBigUp, Command } from 'lucide-react';
-import { useKeyboardSettings } from '../../contexts/KeyboardSettingsContext';
-import { normalizeShortcutKey } from '../../hooks/useKeyboardShortcuts';
-import type { ShortcutSettingsKey } from '../../hooks/useKeyboardShortcuts';
-import type { ShortcutModifier } from '../../types/shortcuts';
-
-interface ShortcutHintProps {
-  settingsKey: ShortcutSettingsKey;
-  className?: string;
-}
-
-const ModifierIcon: React.FC<{ modifier: ShortcutModifier }> = ({ modifier }) => {
-  switch (modifier) {
-    case 'cmd':
-      return <Command className="h-3 w-3" aria-hidden="true" />;
-    case 'ctrl':
-      return <span>Ctrl</span>;
-    case 'alt':
-    case 'option':
-      return <span>⌥</span>;
-    case 'shift':
-      return <ArrowBigUp className="h-3 w-3" aria-hidden="true" />;
-    case 'ctrl+shift':
-      return (
-        <span className="inline-flex items-center gap-1">
-          <span>Ctrl</span>
-          <ArrowBigUp className="h-3 w-3" aria-hidden="true" />
-        </span>
-      );
-    default:
-      return null;
-  }
-};
-
-export const ShortcutHint: React.FC<ShortcutHintProps> = ({ settingsKey, className }) => {
-  const { getShortcut } = useKeyboardSettings();
-  const { key, modifier } = getShortcut(settingsKey);
-
-  if (!key) return null;
-
-  // Format key display (handle arrow keys and special keys)
-  let displayKey = normalizeShortcutKey(key);
-  if (displayKey === 'ArrowLeft') displayKey = '←';
-  else if (displayKey === 'ArrowRight') displayKey = '→';
-  else if (displayKey === 'ArrowUp') displayKey = '↑';
-  else if (displayKey === 'ArrowDown') displayKey = '↓';
-  else if (displayKey === 'Escape') displayKey = 'Esc';
-  else if (displayKey === 'Tab') displayKey = 'Tab';
-  else displayKey = displayKey.toUpperCase();
-
-  // Handle compound modifiers separately
-  const modifierElements: React.ReactNode[] = [];
-  if (modifier === 'cmd+shift') {
-    modifierElements.push(<Command key="cmd" className="h-3 w-3" aria-hidden="true" />);
-    modifierElements.push(<ArrowBigUp key="shift" className="h-3 w-3" aria-hidden="true" />);
-  } else if (modifier) {
-    modifierElements.push(<ModifierIcon key="mod" modifier={modifier} />);
-  }
-
-  return (
-    <span className={`flex items-center gap-1 text-muted-foreground ${className || ''}`}>
-      {modifierElements}
-      <span>{displayKey}</span>
-    </span>
-  );
-};
-
-export default ShortcutHint;
diff --git a/src/renderer/components/ui/sidebar.tsx b/src/renderer/components/ui/sidebar.tsx
deleted file mode 100644
index 73d26ed583..0000000000
--- a/src/renderer/components/ui/sidebar.tsx
+++ /dev/null
@@ -1,338 +0,0 @@
-import * as React from 'react';
-import { Slot } from '@radix-ui/react-slot';
-import { cn } from '@/lib/utils';
-
-interface SidebarContextValue {
-  open: boolean;
-  isMobile: boolean;
-  setOpen: (next: boolean) => void;
-  toggle: () => void;
-}
-
-const SidebarContext = React.createContext<SidebarContextValue | undefined>(undefined);
-
-function useMediaQuery(query: string) {
-  const [matches, setMatches] = React.useState<boolean>(() => {
-    if (typeof window === 'undefined') return false;
-    return window.matchMedia(query).matches;
-  });
-
-  React.useEffect(() => {
-    if (typeof window === 'undefined') return;
-    const mediaQuery = window.matchMedia(query);
-    const handler = (event: MediaQueryListEvent) => {
-      setMatches(event.matches);
-    };
-
-    mediaQuery.addEventListener('change', handler);
-    setMatches(mediaQuery.matches);
-
-    return () => mediaQuery.removeEventListener('change', handler);
-  }, [query]);
-
-  return matches;
-}
-
-type SidebarVariant = 'default' | 'unstyled';
-
-interface SidebarProviderProps {
-  defaultOpen?: boolean;
-  children: React.ReactNode;
-}
-
-export function SidebarProvider({ defaultOpen = true, children }: SidebarProviderProps) {
-  const isMobile = useMediaQuery('(max-width: 1024px)');
-  const storageKey = 'emdash.sidebarOpen';
-
-  const [desktopOpen, setDesktopOpen] = React.useState<boolean>(() => {
-    if (typeof window === 'undefined') return defaultOpen;
-    try {
-      const stored = window.localStorage.getItem(storageKey);
-      if (stored === null) return defaultOpen;
-      return stored === 'true';
-    } catch {
-      return defaultOpen;
-    }
-  });
-  const [mobileOpen, setMobileOpen] = React.useState(false);
-
-  React.useEffect(() => {
-    if (isMobile) {
-      setMobileOpen(false);
-    }
-  }, [isMobile]);
-
-  React.useEffect(() => {
-    if (typeof window === 'undefined') return;
-    try {
-      window.localStorage.setItem(storageKey, desktopOpen ? 'true' : 'false');
-    } catch {
-      // ignore persistence errors
-    }
-  }, [desktopOpen, storageKey]);
-
-  const setOpen = React.useCallback(
-    (next: boolean) => {
-      if (isMobile) {
-        setMobileOpen(next);
-        return;
-      }
-      setDesktopOpen(next);
-    },
-    [isMobile]
-  );
-
-  const toggle = React.useCallback(() => {
-    if (isMobile) {
-      setMobileOpen((prev) => !prev);
-      return;
-    }
-    setDesktopOpen((prev) => !prev);
-  }, [isMobile]);
-
-  const open = isMobile ? mobileOpen : desktopOpen;
-
-  const value = React.useMemo(
-    () => ({
-      open,
-      isMobile,
-      setOpen,
-      toggle,
-    }),
-    [open, isMobile, setOpen, toggle]
-  );
-
-  return <SidebarContext.Provider value={value}>{children}</SidebarContext.Provider>;
-}
-
-export function useSidebar() {
-  const context = React.useContext(SidebarContext);
-  if (!context) {
-    throw new Error('useSidebar must be used within a SidebarProvider');
-  }
-  return context;
-}
-
-interface SidebarProps extends React.HTMLAttributes<HTMLDivElement> {
-  variant?: SidebarVariant;
-}
-
-const Sidebar = React.forwardRef<HTMLDivElement, SidebarProps>(
-  ({ className, children, variant = 'default', ...props }, ref) => {
-    const { open, isMobile, setOpen } = useSidebar();
-
-    const baseClasses =
-      variant === 'default'
-        ? 'group/sidebar relative z-50 flex h-full flex-col border-r border-border bg-gray-50 dark:bg-muted/10 text-sm text-foreground transition-all duration-200 ease-linear overflow-hidden flex-shrink-0 data-[state=collapsed]:border-r-0 data-[state=collapsed]:pointer-events-none'
-        : '';
-    const responsiveClasses =
-      variant === 'default'
-        ? isMobile
-          ? cn(
-              'fixed inset-y-0 left-0 w-[var(--sidebar-width-mobile,18rem)] bg-background shadow-lg pt-[var(--tb)]',
-              open ? 'translate-x-0' : '-translate-x-full'
-            )
-          : cn(open ? 'w-full' : 'w-0')
-        : '';
-
-    return (
-      <>
-        <aside
-          ref={ref}
-          data-state={open ? 'open' : 'collapsed'}
-          data-mobile={isMobile ? 'true' : 'false'}
-          className={cn(baseClasses, responsiveClasses, className)}
-          {...props}
-        >
-          {children}
-        </aside>
-        {isMobile && open ? (
-          <button
-            type="button"
-            aria-label="Close sidebar overlay"
-            className="fixed inset-0 z-40 bg-black/20 backdrop-blur-sm lg:hidden"
-            onClick={() => setOpen(false)}
-          />
-        ) : null}
-      </>
-    );
-  }
-);
-Sidebar.displayName = 'Sidebar';
-
-const SidebarHeader = React.forwardRef<HTMLDivElement, React.HTMLAttributes<HTMLDivElement>>(
-  ({ className, ...props }, ref) => (
-    <div
-      ref={ref}
-      className={cn('flex flex-col gap-1 border-b border-border px-4 py-3', className)}
-      {...props}
-    />
-  )
-);
-SidebarHeader.displayName = 'SidebarHeader';
-
-interface SidebarContentProps extends React.HTMLAttributes<HTMLDivElement> {
-  variant?: SidebarVariant;
-}
-
-const SidebarContent = React.forwardRef<HTMLDivElement, SidebarContentProps>(
-  ({ className, variant = 'default', ...props }, ref) => (
-    <div
-      ref={ref}
-      className={cn(
-        'flex-1 overflow-y-auto',
-        variant === 'default' ? 'px-3 py-4 text-sm text-muted-foreground' : '',
-        className
-      )}
-      {...props}
-    />
-  )
-);
-SidebarContent.displayName = 'SidebarContent';
-
-const SidebarFooter = React.forwardRef<HTMLDivElement, React.HTMLAttributes<HTMLDivElement>>(
-  ({ className, ...props }, ref) => (
-    <div
-      ref={ref}
-      className={cn('mt-auto border-t border-border px-4 py-3', className)}
-      {...props}
-    />
-  )
-);
-SidebarFooter.displayName = 'SidebarFooter';
-
-const SidebarInset = React.forwardRef<HTMLDivElement, React.HTMLAttributes<HTMLDivElement>>(
-  ({ className, ...props }, ref) => (
-    <div ref={ref} className={cn('flex flex-1 flex-col', className)} {...props} />
-  )
-);
-SidebarInset.displayName = 'SidebarInset';
-
-const SidebarGroup = React.forwardRef<HTMLDivElement, React.HTMLAttributes<HTMLDivElement>>(
-  ({ className, ...props }, ref) => (
-    <div ref={ref} className={cn('mb-6 grid gap-1', className)} {...props} />
-  )
-);
-SidebarGroup.displayName = 'SidebarGroup';
-
-const SidebarGroupLabel = React.forwardRef<HTMLDivElement, React.HTMLAttributes<HTMLDivElement>>(
-  ({ className, ...props }, ref) => (
-    <div
-      ref={ref}
-      className={cn(
-        'px-2 text-xs font-semibold uppercase tracking-wide text-muted-foreground/70',
-        className
-      )}
-      {...props}
-    />
-  )
-);
-SidebarGroupLabel.displayName = 'SidebarGroupLabel';
-
-const SidebarGroupContent = React.forwardRef<HTMLDivElement, React.HTMLAttributes<HTMLDivElement>>(
-  ({ className, ...props }, ref) => (
-    <div ref={ref} className={cn('grid gap-1', className)} {...props} />
-  )
-);
-SidebarGroupContent.displayName = 'SidebarGroupContent';
-
-const SidebarMenu = React.forwardRef<HTMLDivElement, React.HTMLAttributes<HTMLDivElement>>(
-  ({ className, ...props }, ref) => (
-    <div ref={ref} className={cn('grid gap-1', className)} {...props} />
-  )
-);
-SidebarMenu.displayName = 'SidebarMenu';
-
-interface SidebarMenuItemProps extends React.HTMLAttributes<HTMLDivElement> {}
-
-const SidebarMenuItem = React.forwardRef<HTMLDivElement, SidebarMenuItemProps>(
-  ({ className, ...props }, ref) => (
-    <div ref={ref} className={cn('list-none', className)} {...props} />
-  )
-);
-SidebarMenuItem.displayName = 'SidebarMenuItem';
-
-interface SidebarMenuButtonProps extends React.ButtonHTMLAttributes<HTMLButtonElement> {
-  asChild?: boolean;
-  isActive?: boolean;
-}
-
-const SidebarMenuButton = React.forwardRef<HTMLButtonElement, SidebarMenuButtonProps>(
-  ({ className, asChild = false, isActive, ...props }, ref) => {
-    const Comp = asChild ? Slot : 'button';
-    return (
-      <Comp
-        ref={ref as any}
-        data-active={isActive ? 'true' : undefined}
-        className={cn(
-          'flex w-full items-center gap-2 rounded-md px-2 py-1.5 text-sm font-medium transition-colors hover:bg-accent hover:text-accent-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 data-[active=true]:bg-accent data-[active=true]:text-accent-foreground',
-          className
-        )}
-        {...props}
-      />
-    );
-  }
-);
-SidebarMenuButton.displayName = 'SidebarMenuButton';
-
-const SidebarMenuIcon = React.forwardRef<HTMLDivElement, React.HTMLAttributes<HTMLDivElement>>(
-  ({ className, ...props }, ref) => (
-    <div
-      ref={ref}
-      className={cn('flex h-5 w-5 items-center justify-center text-muted-foreground', className)}
-      {...props}
-    />
-  )
-);
-SidebarMenuIcon.displayName = 'SidebarMenuIcon';
-
-const SidebarMenuBadge = React.forwardRef<HTMLDivElement, React.HTMLAttributes<HTMLDivElement>>(
-  ({ className, ...props }, ref) => (
-    <div
-      ref={ref}
-      className={cn(
-        'ml-auto inline-flex rounded-full bg-muted px-2 py-0.5 text-[11px] font-medium text-muted-foreground',
-        className
-      )}
-      {...props}
-    />
-  )
-);
-SidebarMenuBadge.displayName = 'SidebarMenuBadge';
-
-const SidebarTrigger = React.forwardRef<
-  HTMLButtonElement,
-  React.ButtonHTMLAttributes<HTMLButtonElement>
->(({ className, ...props }, ref) => {
-  const { toggle } = useSidebar();
-  return (
-    <button
-      ref={ref}
-      type="button"
-      onClick={() => toggle()}
-      className={cn(
-        'inline-flex h-9 w-9 items-center justify-center rounded-md border border-border bg-background text-sm font-medium text-foreground shadow-sm transition-colors hover:bg-accent hover:text-accent-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 lg:hidden',
-        className
-      )}
-      {...props}
-    />
-  );
-});
-SidebarTrigger.displayName = 'SidebarTrigger';
-
-export {
-  Sidebar,
-  SidebarContent,
-  SidebarFooter,
-  SidebarGroup,
-  SidebarGroupContent,
-  SidebarGroupLabel,
-  SidebarHeader,
-  SidebarInset,
-  SidebarMenu,
-  SidebarMenuBadge,
-  SidebarMenuButton,
-  SidebarMenuIcon,
-  SidebarMenuItem,
-  SidebarTrigger,
-};
diff --git a/src/renderer/components/ui/switch.tsx b/src/renderer/components/ui/switch.tsx
deleted file mode 100644
index d625eb8ead..0000000000
--- a/src/renderer/components/ui/switch.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
-import * as React from 'react';
-import * as SwitchPrimitives from '@radix-ui/react-switch';
-
-import { cn } from '@/lib/utils';
-
-const Switch = React.forwardRef<
-  React.ElementRef<typeof SwitchPrimitives.Root>,
-  React.ComponentPropsWithoutRef<typeof SwitchPrimitives.Root>
->(({ className, ...props }, ref) => (
-  <SwitchPrimitives.Root
-    className={cn(
-      'peer inline-flex h-5 w-9 shrink-0 cursor-pointer items-center rounded-full border-2 border-transparent shadow-sm transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 focus-visible:ring-offset-background disabled:cursor-not-allowed disabled:opacity-50 data-[state=checked]:bg-primary data-[state=unchecked]:bg-input',
-      className
-    )}
-    {...props}
-    ref={ref}
-  >
-    <SwitchPrimitives.Thumb
-      className={cn(
-        'pointer-events-none block h-4 w-4 rounded-full bg-background shadow-lg ring-0 transition-transform data-[state=checked]:translate-x-4 data-[state=unchecked]:translate-x-0'
-      )}
-    />
-  </SwitchPrimitives.Root>
-));
-Switch.displayName = SwitchPrimitives.Root.displayName;
-
-export { Switch };
diff --git a/src/renderer/components/ui/textarea.tsx b/src/renderer/components/ui/textarea.tsx
deleted file mode 100644
index e034670685..0000000000
--- a/src/renderer/components/ui/textarea.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import * as React from 'react';
-
-import { cn } from '@/lib/utils';
-
-export interface TextareaProps extends React.TextareaHTMLAttributes<HTMLTextAreaElement> {}
-
-const Textarea = React.forwardRef<HTMLTextAreaElement, TextareaProps>(
-  ({ className, ...props }, ref) => {
-    return (
-      <textarea
-        className={cn(
-          'flex min-h-[80px] w-full rounded-md border border-input bg-background px-3 py-2 text-sm ring-offset-background placeholder:text-muted-foreground focus-visible:border-border focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-gray-300 focus-visible:ring-offset-0 disabled:cursor-not-allowed disabled:opacity-50 dark:focus-visible:border-border dark:focus-visible:ring-gray-600',
-          className
-        )}
-        ref={ref}
-        {...props}
-      />
-    );
-  }
-);
-Textarea.displayName = 'Textarea';
-
-export { Textarea };
diff --git a/src/renderer/components/ui/toast.tsx b/src/renderer/components/ui/toast.tsx
deleted file mode 100644
index b2c617a6d7..0000000000
--- a/src/renderer/components/ui/toast.tsx
+++ /dev/null
@@ -1,123 +0,0 @@
-'use client';
-
-import * as React from 'react';
-import * as ToastPrimitives from '@radix-ui/react-toast';
-import { cva, type VariantProps } from 'class-variance-authority';
-import { X } from 'lucide-react';
-
-import { cn } from '../../lib/utils';
-
-const ToastProvider = ToastPrimitives.Provider;
-
-const ToastViewport = React.forwardRef<
-  React.ElementRef<typeof ToastPrimitives.Viewport>,
-  React.ComponentPropsWithoutRef<typeof ToastPrimitives.Viewport>
->(({ className, ...props }, ref) => (
-  <ToastPrimitives.Viewport
-    ref={ref}
-    className={cn(
-      'fixed top-0 z-[10000] flex max-h-screen w-full flex-col-reverse p-4 sm:bottom-0 sm:right-0 sm:top-auto sm:flex-col md:max-w-[420px]',
-      className
-    )}
-    {...props}
-  />
-));
-ToastViewport.displayName = ToastPrimitives.Viewport.displayName;
-
-const toastVariants = cva(
-  'group pointer-events-auto relative flex w-full flex-col overflow-hidden rounded-md border p-6 pr-8 shadow-lg transition-all data-[swipe=cancel]:translate-x-0 data-[swipe=end]:translate-x-[var(--radix-toast-swipe-end-x)] data-[swipe=move]:translate-x-[var(--radix-toast-swipe-move-x)] data-[swipe=move]:transition-none data-[state=open]:animate-in data-[state=closed]:animate-out data-[swipe=end]:animate-out data-[state=closed]:fade-out-80 data-[state=closed]:slide-out-to-right-full data-[state=open]:slide-in-from-top-full data-[state=open]:sm:slide-in-from-bottom-full',
-  {
-    variants: {
-      variant: {
-        default: 'border bg-background text-foreground',
-        destructive: 'border-destructive/50 bg-background text-foreground',
-      },
-    },
-    defaultVariants: {
-      variant: 'default',
-    },
-  }
-);
-
-const Toast = React.forwardRef<
-  React.ElementRef<typeof ToastPrimitives.Root>,
-  React.ComponentPropsWithoutRef<typeof ToastPrimitives.Root> & VariantProps<typeof toastVariants>
->(({ className, variant, ...props }, ref) => {
-  return (
-    <ToastPrimitives.Root
-      ref={ref}
-      className={cn(toastVariants({ variant }), className)}
-      {...props}
-    />
-  );
-});
-Toast.displayName = ToastPrimitives.Root.displayName;
-
-const ToastAction = React.forwardRef<
-  React.ElementRef<typeof ToastPrimitives.Action>,
-  React.ComponentPropsWithoutRef<typeof ToastPrimitives.Action>
->(({ className, ...props }, ref) => (
-  <ToastPrimitives.Action
-    ref={ref}
-    className={cn(
-      'inline-flex h-8 shrink-0 items-center justify-center rounded-md border bg-transparent px-3 text-sm font-medium ring-offset-background transition-colors hover:bg-secondary focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:pointer-events-none disabled:opacity-50',
-      className
-    )}
-    {...props}
-  />
-));
-ToastAction.displayName = ToastPrimitives.Action.displayName;
-
-const ToastClose = React.forwardRef<
-  React.ElementRef<typeof ToastPrimitives.Close>,
-  React.ComponentPropsWithoutRef<typeof ToastPrimitives.Close>
->(({ className, ...props }, ref) => (
-  <ToastPrimitives.Close
-    ref={ref}
-    className={cn(
-      'absolute right-2 top-2 rounded-md p-1 text-foreground/50 opacity-0 transition-opacity hover:text-foreground focus:opacity-100 focus:outline-none focus:ring-2 group-hover:opacity-100',
-      className
-    )}
-    toast-close=""
-    {...props}
-  >
-    <X className="h-4 w-4" />
-  </ToastPrimitives.Close>
-));
-ToastClose.displayName = ToastPrimitives.Close.displayName;
-
-const ToastTitle = React.forwardRef<
-  React.ElementRef<typeof ToastPrimitives.Title>,
-  React.ComponentPropsWithoutRef<typeof ToastPrimitives.Title>
->(({ className, ...props }, ref) => (
-  <ToastPrimitives.Title ref={ref} className={cn('text-sm font-semibold', className)} {...props} />
-));
-ToastTitle.displayName = ToastPrimitives.Title.displayName;
-
-const ToastDescription = React.forwardRef<
-  React.ElementRef<typeof ToastPrimitives.Description>,
-  React.ComponentPropsWithoutRef<typeof ToastPrimitives.Description>
->(({ className, ...props }, ref) => (
-  <ToastPrimitives.Description
-    ref={ref}
-    className={cn('line-clamp-2 break-words text-sm opacity-90', className)}
-    {...props}
-  />
-));
-ToastDescription.displayName = ToastPrimitives.Description.displayName;
-
-type ToastProps = React.ComponentPropsWithoutRef<typeof Toast>;
-
-type ToastActionElement = React.ReactElement<typeof ToastAction>;
-
-export {
-  type ToastProps,
-  type ToastActionElement,
-  ToastProvider,
-  ToastViewport,
-  Toast,
-  ToastTitle,
-  ToastDescription,
-  ToastClose,
-  ToastAction,
-};
diff --git a/src/renderer/components/ui/toaster.tsx b/src/renderer/components/ui/toaster.tsx
deleted file mode 100644
index 3418788ddb..0000000000
--- a/src/renderer/components/ui/toaster.tsx
+++ /dev/null
@@ -1,94 +0,0 @@
-'use client';
-
-import { useEffect, useRef } from 'react';
-import {
-  Toast,
-  ToastClose,
-  ToastDescription,
-  ToastProvider,
-  ToastTitle,
-  ToastViewport,
-} from './toast';
-import { useToast } from '../../hooks/use-toast';
-import { AlertCircle } from 'lucide-react';
-
-export function Toaster() {
-  const { toasts } = useToast();
-
-  const lastFocusedOutsideToast = useRef<HTMLElement | null>(null);
-  const previousToastsCount = useRef(0);
-
-  const isInToastViewport = (element: Element | null) =>
-    element?.closest?.('[data-radix-toast-viewport]') != null;
-
-  // Track the most recent focus target outside the toast viewport so we can
-  // restore it if Radix shifts focus to the toast/viewport when a toast opens.
-  useEffect(() => {
-    const active = document.activeElement;
-    if (active instanceof HTMLElement && !isInToastViewport(active) && active !== document.body) {
-      lastFocusedOutsideToast.current = active;
-    }
-
-    const onFocusIn = (event: FocusEvent) => {
-      const target = event.target;
-      if (!(target instanceof HTMLElement)) return;
-      if (isInToastViewport(target)) return;
-      if (target === document.body) return;
-      lastFocusedOutsideToast.current = target;
-    };
-
-    document.addEventListener('focusin', onFocusIn);
-    return () => {
-      document.removeEventListener('focusin', onFocusIn);
-    };
-  }, []);
-
-  useEffect(() => {
-    const currentToastsCount = toasts.length;
-    const toastsChanged = currentToastsCount !== previousToastsCount.current;
-    if (!toastsChanged) return;
-
-    requestAnimationFrame(() => {
-      const currentFocus = document.activeElement;
-      const focusIsOnToast = isInToastViewport(currentFocus);
-      const focusIsOnBody = currentFocus === document.body;
-      const restoreTarget = lastFocusedOutsideToast.current;
-
-      if (
-        (focusIsOnToast || focusIsOnBody) &&
-        restoreTarget &&
-        document.body.contains(restoreTarget) &&
-        restoreTarget !== document.activeElement
-      ) {
-        restoreTarget.focus();
-      }
-    });
-
-    previousToastsCount.current = currentToastsCount;
-  }, [toasts.length]);
-
-  return (
-    <ToastProvider>
-      {toasts.map(function ({ id, title, description, action, variant, ...props }) {
-        return (
-          <Toast key={id} variant={variant} {...props}>
-            <div className="flex gap-3 pr-6">
-              {variant === 'destructive' && (
-                <AlertCircle className="mt-0.5 h-5 w-5 flex-none self-start text-amber-600 dark:text-amber-400" />
-              )}
-              <div className="min-w-0 flex-1">
-                <div className="grid gap-1">
-                  {title && <ToastTitle>{title}</ToastTitle>}
-                  {description && <ToastDescription>{description}</ToastDescription>}
-                </div>
-                {action && <div className="mt-3 flex justify-start">{action}</div>}
-              </div>
-            </div>
-            <ToastClose />
-          </Toast>
-        );
-      })}
-      <ToastViewport />
-    </ToastProvider>
-  );
-}
diff --git a/src/renderer/components/ui/tooltip.tsx b/src/renderer/components/ui/tooltip.tsx
deleted file mode 100644
index e0a1f91a6d..0000000000
--- a/src/renderer/components/ui/tooltip.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import * as React from 'react';
-import * as TooltipPrimitive from '@radix-ui/react-tooltip';
-import { cn } from '@/lib/utils';
-
-export const TooltipProvider = TooltipPrimitive.Provider;
-export const Tooltip = TooltipPrimitive.Root;
-export const TooltipTrigger = TooltipPrimitive.Trigger;
-
-export const TooltipContent = React.forwardRef<
-  React.ElementRef<typeof TooltipPrimitive.Content>,
-  React.ComponentPropsWithoutRef<typeof TooltipPrimitive.Content>
->(({ className, sideOffset = 4, ...props }, ref) => (
-  <TooltipPrimitive.Portal>
-    <TooltipPrimitive.Content
-      ref={ref}
-      sideOffset={sideOffset}
-      className={cn(
-        // High z-index to appear above sidebars, selects, modals
-        'z-[240] overflow-hidden rounded-md border border-border px-3 py-1.5 text-xs shadow-md',
-        // Default to app background + foreground (white in light)
-        'bg-background text-foreground',
-        'animate-in fade-in-0 zoom-in-95 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95',
-        'data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2',
-        className
-      )}
-      {...props}
-    >
-      {props.children}
-      <TooltipPrimitive.Arrow className="fill-background" />
-    </TooltipPrimitive.Content>
-  </TooltipPrimitive.Portal>
-));
-TooltipContent.displayName = TooltipPrimitive.Content.displayName;
diff --git a/src/renderer/constants/agents.ts b/src/renderer/constants/agents.ts
deleted file mode 100644
index 12033939af..0000000000
--- a/src/renderer/constants/agents.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-export const TERMINAL_PROVIDER_IDS = [
-  'qwen',
-  'codex',
-  'claude',
-  'droid',
-  'gemini',
-  'cursor',
-  'copilot',
-  'amp',
-  'opencode',
-  'charm',
-  'auggie',
-  'kimi',
-  'kiro',
-  'rovo',
-  'pi',
-  'autohand',
-] as const;
-
-export type TerminalProviderId = (typeof TERMINAL_PROVIDER_IDS)[number];
diff --git a/src/renderer/constants/file-explorer.ts b/src/renderer/constants/file-explorer.ts
deleted file mode 100644
index 340d76c54c..0000000000
--- a/src/renderer/constants/file-explorer.ts
+++ /dev/null
@@ -1,93 +0,0 @@
-/**
- * File Explorer constants
- * Centralized configuration for file explorer behavior
- */
-
-// Default patterns for files/directories to exclude from the file tree
-export const DEFAULT_EXCLUDE_PATTERNS = [
-  '**/.git',
-  '**/.svn',
-  '**/.hg',
-  '**/CVS',
-  '**/.DS_Store',
-  '**/Thumbs.db',
-  '**/.next',
-  '**/dist',
-  '**/build',
-  '**/.turbo',
-  '**/coverage',
-  '**/.nyc_output',
-  '**/tmp',
-  '**/.tmp',
-  '**/temp',
-  '**/.temp',
-  '**/.cache',
-  '**/.parcel-cache',
-  '**/__pycache__',
-  '**/.pytest_cache',
-  '**/venv',
-  '**/.venv',
-  '**/target',
-  '**/.idea',
-  '**/.vscode-test',
-  '**/.terraform',
-  '**/.serverless',
-  '**/.checkouts',
-  '**/checkouts',
-  '**/delete-github*',
-  '**/.conductor',
-  '**/.cursor',
-  '**/.claude',
-  '**/.amp',
-  '**/.codex',
-  '**/.aider',
-  '**/.continue',
-  '**/.cody',
-  '**/.windsurf',
-  '**/worktrees',
-  '**/.worktrees',
-];
-
-// File extensions considered as images
-export const IMAGE_EXTENSIONS = ['png', 'jpg', 'jpeg', 'gif', 'webp', 'svg', 'ico', 'bmp'];
-
-// File extensions considered as markdown
-export const MARKDOWN_EXTENSIONS = ['md', 'mdx'];
-
-/** Check if a file path points to a markdown file */
-export function isMarkdownFile(filePath: string): boolean {
-  const ext = filePath.split('.').pop()?.toLowerCase();
-  return ext ? MARKDOWN_EXTENSIONS.includes(ext) : false;
-}
-
-// UI Layout constants
-export const EXPLORER_WIDTH = {
-  DEFAULT: 288,
-  MIN: 150,
-  MAX: 600,
-};
-
-// Auto-save delay in milliseconds
-export const AUTO_SAVE_DELAY = 2000;
-
-// Editor theme configuration
-export const EDITOR_THEMES = {
-  DARK: 'vs-dark',
-  LIGHT: 'light',
-} as const;
-
-// Editor default options
-export const DEFAULT_EDITOR_OPTIONS = {
-  minimap: { enabled: true },
-  fontSize: 13,
-  lineNumbers: 'on' as const,
-  rulers: [],
-  wordWrap: 'on' as const,
-  automaticLayout: true,
-  scrollBeyondLastLine: false,
-  renderWhitespace: 'selection' as const,
-  cursorBlinking: 'smooth' as const,
-  smoothScrolling: true,
-  formatOnPaste: true,
-  formatOnType: true,
-};
diff --git a/src/renderer/constants/layout.ts b/src/renderer/constants/layout.ts
deleted file mode 100644
index 5bfe8778b9..0000000000
--- a/src/renderer/constants/layout.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-export const TITLEBAR_HEIGHT = '36px';
-export const PANEL_LAYOUT_STORAGE_KEY = 'emdash.layout.left-main-right.v2';
-export const DEFAULT_PANEL_LAYOUT: [number, number, number] = [20, 60, 20];
-export const LEFT_SIDEBAR_MIN_SIZE = 16;
-export const LEFT_SIDEBAR_MAX_SIZE = 30;
-export const FIRST_LAUNCH_KEY = 'emdash:first-launch:v1';
-export const RIGHT_SIDEBAR_MIN_SIZE = 16;
-export const RIGHT_SIDEBAR_MAX_SIZE = 50;
-export const ACTIVE_PROJECT_KEY = 'emdash:activeProjectId';
-export const ACTIVE_TASK_KEY = 'emdash:activeTaskId';
-export const MAIN_PANEL_MIN_SIZE = 30;
-export const RIGHT_SIDEBAR_VERTICAL_STORAGE_KEY = 'emdash.layout.right-sidebar-vertical';
-export const DEFAULT_RIGHT_SIDEBAR_VERTICAL_LAYOUT: [number, number] = [50, 50];
-
-export const getStoredActiveIds = (): { projectId: string | null; taskId: string | null } => {
-  try {
-    return {
-      projectId: localStorage.getItem(ACTIVE_PROJECT_KEY),
-      taskId: localStorage.getItem(ACTIVE_TASK_KEY),
-    };
-  } catch {
-    return { projectId: null, taskId: null };
-  }
-};
-
-export const saveActiveIds = (projectId: string | null, taskId: string | null): void => {
-  try {
-    if (projectId) {
-      localStorage.setItem(ACTIVE_PROJECT_KEY, projectId);
-    } else {
-      localStorage.removeItem(ACTIVE_PROJECT_KEY);
-    }
-    if (taskId) {
-      localStorage.setItem(ACTIVE_TASK_KEY, taskId);
-    } else {
-      localStorage.removeItem(ACTIVE_TASK_KEY);
-    }
-  } catch {}
-};
-
-export const clampLeftSidebarSize = (value: number) =>
-  Math.min(
-    Math.max(Number.isFinite(value) ? value : DEFAULT_PANEL_LAYOUT[0], LEFT_SIDEBAR_MIN_SIZE),
-    LEFT_SIDEBAR_MAX_SIZE
-  );
-
-export const clampRightSidebarSize = (value: number) =>
-  Math.min(
-    Math.max(Number.isFinite(value) ? value : DEFAULT_PANEL_LAYOUT[2], RIGHT_SIDEBAR_MIN_SIZE),
-    RIGHT_SIDEBAR_MAX_SIZE
-  );
diff --git a/src/renderer/contexts/AppContextProvider.tsx b/src/renderer/contexts/AppContextProvider.tsx
deleted file mode 100644
index 714d6cb3af..0000000000
--- a/src/renderer/contexts/AppContextProvider.tsx
+++ /dev/null
@@ -1,47 +0,0 @@
-import { useQuery } from '@tanstack/react-query';
-import { createContext, ReactNode, useContext } from 'react';
-
-type AppContextValue = {
-  platform?: string;
-  appVersion?: string;
-  electronVersion?: string;
-};
-
-const AppContext = createContext<AppContextValue | null>(null);
-
-export function AppContextProvider({ children }: { children: ReactNode }) {
-  const { data: platform } = useQuery({
-    queryKey: ['app:platform'],
-    staleTime: 60_000,
-    queryFn: () => window.electronAPI.getPlatform(),
-    refetchOnWindowFocus: false,
-  });
-
-  const { data: appVersion } = useQuery({
-    queryKey: ['app:version'],
-    staleTime: 60_000,
-    queryFn: () => window.electronAPI.getAppVersion(),
-    refetchOnWindowFocus: false,
-  });
-
-  const { data: electronVersion } = useQuery({
-    queryKey: ['app:electronVersion'],
-    staleTime: 60_000,
-    queryFn: () => window.electronAPI.getElectronVersion(),
-    refetchOnWindowFocus: false,
-  });
-
-  return (
-    <AppContext.Provider value={{ platform, appVersion, electronVersion }}>
-      {children}
-    </AppContext.Provider>
-  );
-}
-
-export function useAppContext() {
-  const ctx = useContext(AppContext);
-  if (!ctx) {
-    throw new Error('App Context must be used inside of an app context provider');
-  }
-  return ctx;
-}
diff --git a/src/renderer/contexts/AppSettingsProvider.tsx b/src/renderer/contexts/AppSettingsProvider.tsx
deleted file mode 100644
index 15b7f7f0c3..0000000000
--- a/src/renderer/contexts/AppSettingsProvider.tsx
+++ /dev/null
@@ -1,52 +0,0 @@
-import { rpc } from '@/lib/rpc';
-import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
-import { createContext, ReactNode, useCallback, useContext } from 'react';
-import { AppSettings, AppSettingsUpdate } from 'src/main/settings';
-
-interface AppSettingsContextValue {
-  settings: AppSettings | undefined;
-  isLoading: boolean;
-  isSaving: boolean;
-  updateSettings: (settings: AppSettingsUpdate) => void;
-}
-
-const AppSettingsContext = createContext<AppSettingsContextValue | null>(null);
-
-export function AppSettingsProvider({ children }: { children: ReactNode }) {
-  const queryClient = useQueryClient();
-
-  const { data: settings, isLoading } = useQuery({
-    queryKey: ['appSettings'],
-    queryFn: () => rpc.appSettings.get(),
-  });
-
-  const updateSettingsMutation = useMutation({
-    mutationFn: (update: AppSettingsUpdate) => rpc.appSettings.update(update),
-    onSuccess: () => {
-      queryClient.invalidateQueries({ queryKey: ['appSettings'] });
-    },
-  });
-
-  const isSaving = updateSettingsMutation.isPending;
-
-  const updateSettings = useCallback(
-    (settings: AppSettingsUpdate) => {
-      updateSettingsMutation.mutate(settings);
-    },
-    [updateSettingsMutation]
-  );
-
-  return (
-    <AppSettingsContext.Provider value={{ settings, isLoading, isSaving, updateSettings }}>
-      {children}
-    </AppSettingsContext.Provider>
-  );
-}
-
-export function useAppSettings() {
-  const context = useContext(AppSettingsContext);
-  if (!context) {
-    throw new Error('useAppSettings must be used within an AppSettingsProvider');
-  }
-  return context;
-}
diff --git a/src/renderer/contexts/ExternalLinkContext.tsx b/src/renderer/contexts/ExternalLinkContext.tsx
deleted file mode 100644
index 75939d9466..0000000000
--- a/src/renderer/contexts/ExternalLinkContext.tsx
+++ /dev/null
@@ -1,61 +0,0 @@
-import React, { createContext, useContext, useState, useCallback } from 'react';
-import ExternalLinkModal from '../components/ExternalLinkModal';
-
-interface ExternalLinkContextType {
-  openLinkModal: (url: string) => void;
-}
-
-const ExternalLinkContext = createContext<ExternalLinkContextType | undefined>(undefined);
-
-export const useExternalLink = () => {
-  const context = useContext(ExternalLinkContext);
-  if (!context) {
-    throw new Error('useExternalLink must be used within an ExternalLinkProvider');
-  }
-  return context;
-};
-
-interface ExternalLinkProviderProps {
-  children: React.ReactNode;
-}
-
-export const ExternalLinkProvider: React.FC<ExternalLinkProviderProps> = ({ children }) => {
-  const [modalOpen, setModalOpen] = useState(false);
-  const [currentUrl, setCurrentUrl] = useState('');
-
-  const openLinkModal = useCallback((url: string) => {
-    setCurrentUrl(url);
-    setModalOpen(true);
-  }, []);
-
-  const handleConfirm = useCallback(() => {
-    if (currentUrl) {
-      // Use electron's shell API to open the URL safely in the default browser
-      window.electronAPI?.openExternal?.(currentUrl).catch((error: any) => {
-        console.error('Failed to open external link:', error);
-      });
-    }
-    setModalOpen(false);
-    setCurrentUrl('');
-  }, [currentUrl]);
-
-  const handleCancel = useCallback(() => {
-    setModalOpen(false);
-    setCurrentUrl('');
-  }, []);
-
-  return (
-    <ExternalLinkContext.Provider value={{ openLinkModal }}>
-      {children}
-      <ExternalLinkModal
-        open={modalOpen}
-        onOpenChange={setModalOpen}
-        url={currentUrl}
-        onConfirm={handleConfirm}
-        onCancel={handleCancel}
-      />
-    </ExternalLinkContext.Provider>
-  );
-};
-
-export default ExternalLinkProvider;
diff --git a/src/renderer/contexts/GithubContextProvider.tsx b/src/renderer/contexts/GithubContextProvider.tsx
deleted file mode 100644
index f4fb9049df..0000000000
--- a/src/renderer/contexts/GithubContextProvider.tsx
+++ /dev/null
@@ -1,235 +0,0 @@
-import React, { createContext, useContext, useState, useCallback, useEffect } from 'react';
-import { useQuery, useQueryClient, useMutation } from '@tanstack/react-query';
-import { useToast } from '../hooks/use-toast';
-import { useModalContext } from './ModalProvider';
-import { useAppContext } from './AppContextProvider';
-
-type GithubUser = any;
-
-type GithubContextValue = {
-  installed: boolean;
-  authenticated: boolean;
-  user: GithubUser | null;
-  /** True while the status query is fetching or login/logout mutation is pending */
-  isLoading: boolean;
-  isInitialized: boolean;
-
-  /** True during the handleGithubConnect flow (CLI install + auth start) */
-  githubLoading: boolean;
-  githubStatusMessage: string | undefined;
-  needsGhInstall: boolean;
-  needsGhAuth: boolean;
-
-  /** Full connect flow: installs CLI if needed, starts device flow, shows modal */
-  handleGithubConnect: () => Promise<void>;
-  /** Raw login — starts the device flow and returns the IPC result */
-  login: () => Promise<any>;
-  /** Logout and invalidate cached status */
-  logout: () => Promise<void>;
-  /** Force-refresh status and return the raw result */
-  checkStatus: () => Promise<any>;
-};
-
-const GITHUB_STATUS_KEY = ['github:status'] as const;
-
-const GithubContext = createContext<GithubContextValue | null>(null);
-
-export function GithubContextProvider({ children }: { children: React.ReactNode }) {
-  const { showModal } = useModalContext();
-  const { toast } = useToast();
-  const { platform } = useAppContext();
-  const queryClient = useQueryClient();
-
-  const [githubLoading, setGithubLoading] = useState(false);
-  const [githubStatusMessage, setGithubStatusMessage] = useState<string | undefined>();
-
-  const {
-    data: statusData,
-    isFetching,
-    isSuccess,
-  } = useQuery({
-    queryKey: GITHUB_STATUS_KEY,
-    queryFn: () => window.electronAPI.githubGetStatus(),
-    staleTime: 30_000,
-    refetchOnWindowFocus: true,
-  });
-
-  const installed = statusData?.installed ?? true;
-  const authenticated = statusData?.authenticated ?? false;
-  const user: GithubUser | null = statusData?.user ?? null;
-  const isInitialized = isSuccess;
-
-  const needsGhInstall = isInitialized && !installed;
-  const needsGhAuth = isInitialized && installed && !authenticated;
-
-  const loginMutation = useMutation({
-    mutationFn: () => window.electronAPI.githubAuth(),
-  });
-
-  const logoutMutation = useMutation({
-    mutationFn: () => window.electronAPI.githubLogout(),
-    onSettled: () => void queryClient.invalidateQueries({ queryKey: GITHUB_STATUS_KEY }),
-  });
-
-  const isLoading = isFetching || loginMutation.isPending || logoutMutation.isPending;
-
-  const checkStatus = useCallback(async () => {
-    return queryClient.fetchQuery({
-      queryKey: GITHUB_STATUS_KEY,
-      queryFn: () => window.electronAPI.githubGetStatus(),
-      staleTime: 0,
-    });
-  }, [queryClient]);
-
-  const login = useCallback(() => loginMutation.mutateAsync(), [loginMutation]);
-
-  const logout = useCallback(async () => {
-    await logoutMutation.mutateAsync();
-  }, [logoutMutation]);
-
-  const handleDeviceFlowSuccess = useCallback(
-    async (flowUser: GithubUser) => {
-      void checkStatus();
-      setTimeout(() => void checkStatus(), 500);
-      toast({
-        title: 'Connected to GitHub',
-        description: `Signed in as ${flowUser?.login || flowUser?.name || 'user'}`,
-      });
-    },
-    [checkStatus, toast]
-  );
-
-  const handleDeviceFlowError = useCallback(
-    (error: string) => {
-      toast({
-        title: 'Authentication Failed',
-        description: error,
-        variant: 'destructive',
-      });
-    },
-    [toast]
-  );
-
-  // Subscribe to GitHub auth IPC events from the main process
-  useEffect(() => {
-    const cleanupSuccess = window.electronAPI.onGithubAuthSuccess((data) => {
-      void handleDeviceFlowSuccess(data.user);
-    });
-    const cleanupError = window.electronAPI.onGithubAuthError((data) => {
-      handleDeviceFlowError(data.message || data.error);
-    });
-    const cleanupUserUpdated = window.electronAPI.onGithubAuthUserUpdated(() => {
-      void checkStatus();
-    });
-
-    return () => {
-      cleanupSuccess();
-      cleanupError();
-      cleanupUserUpdated();
-    };
-  }, [handleDeviceFlowSuccess, handleDeviceFlowError, checkStatus]);
-
-  const handleGithubConnect = useCallback(async () => {
-    setGithubLoading(true);
-    setGithubStatusMessage(undefined);
-
-    try {
-      setGithubStatusMessage('Checking for GitHub CLI...');
-      const cliInstalled = await window.electronAPI.githubCheckCLIInstalled();
-
-      if (!cliInstalled) {
-        let installMessage = 'Installing GitHub CLI...';
-        if (platform === 'darwin') {
-          installMessage = 'Installing GitHub CLI via Homebrew...';
-        } else if (platform === 'linux') {
-          installMessage = 'Installing GitHub CLI via apt...';
-        } else if (platform === 'win32') {
-          installMessage = 'Installing GitHub CLI via winget...';
-        }
-
-        setGithubStatusMessage(installMessage);
-        const installResult = await window.electronAPI.githubInstallCLI();
-
-        if (!installResult.success) {
-          setGithubLoading(false);
-          setGithubStatusMessage(undefined);
-          toast({
-            title: 'Installation Failed',
-            description: `Could not auto-install gh CLI: ${installResult.error || 'Unknown error'}`,
-            variant: 'destructive',
-          });
-          return;
-        }
-
-        setGithubStatusMessage('GitHub CLI installed! Setting up connection...');
-        toast({
-          title: 'GitHub CLI Installed',
-          description: 'Now authenticating with GitHub...',
-        });
-        void checkStatus();
-      }
-
-      setGithubStatusMessage('Starting authentication...');
-      const result = await login();
-
-      setGithubLoading(false);
-      setGithubStatusMessage(undefined);
-
-      if (result?.success) {
-        showModal('githubDeviceFlowModal', {
-          onSuccess: handleDeviceFlowSuccess,
-          onError: handleDeviceFlowError,
-        });
-      } else {
-        toast({
-          title: 'Authentication Failed',
-          description: result?.error || 'Could not start authentication',
-          variant: 'destructive',
-        });
-      }
-    } catch (error) {
-      console.error('GitHub connection error:', error);
-      setGithubLoading(false);
-      setGithubStatusMessage(undefined);
-      toast({
-        title: 'Connection Failed',
-        description: 'Failed to connect to GitHub. Please try again.',
-        variant: 'destructive',
-      });
-    }
-  }, [
-    platform,
-    toast,
-    checkStatus,
-    login,
-    showModal,
-    handleDeviceFlowSuccess,
-    handleDeviceFlowError,
-  ]);
-
-  const value: GithubContextValue = {
-    installed,
-    authenticated,
-    user,
-    isLoading,
-    isInitialized,
-    githubLoading,
-    githubStatusMessage,
-    needsGhInstall,
-    needsGhAuth,
-    handleGithubConnect,
-    login,
-    logout,
-    checkStatus,
-  };
-
-  return <GithubContext.Provider value={value}>{children}</GithubContext.Provider>;
-}
-
-export function useGithubContext() {
-  const ctx = useContext(GithubContext);
-  if (!ctx) {
-    throw new Error('useGithubContext must be used inside GithubContextProvider');
-  }
-  return ctx;
-}
diff --git a/src/renderer/contexts/KeyboardSettingsContext.tsx b/src/renderer/contexts/KeyboardSettingsContext.tsx
deleted file mode 100644
index de6808a369..0000000000
--- a/src/renderer/contexts/KeyboardSettingsContext.tsx
+++ /dev/null
@@ -1,67 +0,0 @@
-import React, { createContext, useCallback, useContext } from 'react';
-import type { KeyboardSettings, ShortcutModifier } from '../types/shortcuts';
-import { APP_SHORTCUTS, type ShortcutSettingsKey } from '../hooks/useKeyboardShortcuts';
-import { useAppSettings } from '@/contexts/AppSettingsProvider';
-import { useQueryClient } from '@tanstack/react-query';
-
-interface KeyboardSettingsContextValue {
-  settings: KeyboardSettings | null;
-  getShortcut: (settingsKey: ShortcutSettingsKey) => { key: string; modifier?: ShortcutModifier };
-  refreshSettings: () => Promise<void>;
-}
-
-const KeyboardSettingsContext = createContext<KeyboardSettingsContextValue | null>(null);
-
-export const KeyboardSettingsProvider: React.FC<{ children: React.ReactNode }> = ({ children }) => {
-  const { settings: appSettings } = useAppSettings();
-  const queryClient = useQueryClient();
-
-  const settings: KeyboardSettings | null = appSettings?.keyboard ?? null;
-
-  const refreshSettings = useCallback(async () => {
-    await queryClient.invalidateQueries({ queryKey: ['appSettings'] });
-  }, [queryClient]);
-
-  const getShortcut = useCallback(
-    (settingsKey: ShortcutSettingsKey): { key: string; modifier?: ShortcutModifier } => {
-      const custom = settings?.[settingsKey];
-      if (custom) {
-        return { key: custom.key, modifier: custom.modifier };
-      }
-      const defaultShortcut = Object.values(APP_SHORTCUTS).find(
-        (s) => s.settingsKey === settingsKey
-      );
-      if (defaultShortcut) {
-        return { key: defaultShortcut.key, modifier: defaultShortcut.modifier };
-      }
-      return { key: '', modifier: undefined };
-    },
-    [settings]
-  );
-
-  return (
-    <KeyboardSettingsContext.Provider value={{ settings, getShortcut, refreshSettings }}>
-      {children}
-    </KeyboardSettingsContext.Provider>
-  );
-};
-
-export const useKeyboardSettings = (): KeyboardSettingsContextValue => {
-  const context = useContext(KeyboardSettingsContext);
-  if (!context) {
-    return {
-      settings: null,
-      getShortcut: (settingsKey: ShortcutSettingsKey) => {
-        const defaultShortcut = Object.values(APP_SHORTCUTS).find(
-          (s) => s.settingsKey === settingsKey
-        );
-        if (defaultShortcut) {
-          return { key: defaultShortcut.key, modifier: defaultShortcut.modifier };
-        }
-        return { key: '', modifier: undefined };
-      },
-      refreshSettings: async () => {},
-    };
-  }
-  return context;
-};
diff --git a/src/renderer/contexts/ModalProvider.tsx b/src/renderer/contexts/ModalProvider.tsx
deleted file mode 100644
index 90a14a185c..0000000000
--- a/src/renderer/contexts/ModalProvider.tsx
+++ /dev/null
@@ -1,118 +0,0 @@
-import { createContext, ReactNode, useCallback, useContext, useRef, useState } from 'react';
-import { CloneFromUrlModal } from '@/components/CloneFromUrlModal';
-import { NewProjectModal } from '@/components/NewProjectModal';
-import { UpdateModalOverlay } from '@/components/UpdateModal';
-import { TaskModalOverlay } from '@/components/TaskModal';
-import { AddRemoteProjectModal } from '@/components/ssh/AddRemoteProjectModal';
-import { GithubDeviceFlowModalOverlay } from '@/components/GithubDeviceFlowModal';
-
-// Define overlays here so we can use them in the showOverlay function
-const modalRegistry = {
-  updateModal: UpdateModalOverlay,
-  newProjectModal: NewProjectModal,
-  cloneFromUrlModal: CloneFromUrlModal,
-  taskModal: TaskModalOverlay,
-  addRemoteProjectModal: AddRemoteProjectModal,
-  githubDeviceFlowModal: GithubDeviceFlowModalOverlay,
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-} satisfies Record<string, ModalComponent<any, any>>;
-
-export interface BaseModalProps<TResult = unknown> {
-  onSuccess: (result: TResult) => void;
-  onClose: () => void;
-}
-
-type UserArgs<MId extends ModalId> = Omit<ModalArgs<MId>, 'onSuccess' | 'onClose'> & {
-  onSuccess?: (
-    result: ModalArgs<MId> extends { onSuccess: (result: infer R) => void } ? R : unknown
-  ) => void;
-  onClose?: () => void;
-};
-
-type ModalComponent<TProps = unknown, TResult = unknown> = (
-  props: TProps & BaseModalProps<TResult>
-) => ReactNode;
-
-type ModalId = keyof typeof modalRegistry;
-
-type ModalArgs<TId extends ModalId> = Parameters<(typeof modalRegistry)[TId]>[0];
-
-type ModalContext = {
-  activeModalId: ModalId | null;
-  renderModal: () => ReactNode;
-  closeModal: () => void;
-  showModal: <TId extends ModalId>(modal: TId, args: UserArgs<TId>) => void;
-};
-
-const ModalContext = createContext<ModalContext | undefined>(undefined);
-
-export function ModalProvider({ children }: { children: ReactNode }) {
-  const [activeModalId, setActiveModalId] = useState<ModalId | null>(null);
-  const activeModalArgs = useRef<ModalArgs<ModalId> | null>(null);
-
-  const renderModal = useCallback((): ReactNode => {
-    if (!activeModalId || !activeModalArgs.current) return null;
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const Component = modalRegistry[activeModalId] as React.ComponentType<any>;
-    return <Component {...activeModalArgs.current} />;
-  }, [activeModalId]);
-
-  const dispatchOverlayEvent = (open: boolean) => {
-    window.dispatchEvent(new CustomEvent('emdash:overlay:changed', { detail: { open } }));
-  };
-
-  const closeModal = useCallback(() => {
-    setActiveModalId(null);
-    activeModalArgs.current = null;
-    dispatchOverlayEvent(false);
-  }, [setActiveModalId, activeModalArgs]);
-
-  const showModal = useCallback(
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    <TId extends ModalId>(id: TId, args: UserArgs<TId>) => {
-      const wrappedArgs = {
-        ...args,
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        onSuccess: (result: any) => {
-          args.onSuccess?.(result);
-          closeModal();
-        },
-        onClose: () => {
-          args.onClose?.();
-          closeModal();
-        },
-      };
-      setActiveModalId(id);
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      activeModalArgs.current = wrappedArgs as any;
-      dispatchOverlayEvent(true);
-    },
-    [setActiveModalId, activeModalArgs, closeModal]
-  );
-
-  return (
-    <ModalContext.Provider
-      value={{
-        activeModalId: activeModalId,
-        renderModal: renderModal,
-        closeModal: closeModal,
-        showModal: showModal,
-      }}
-    >
-      {children}
-    </ModalContext.Provider>
-  );
-}
-
-export function useModalContext() {
-  const context = useContext(ModalContext);
-  if (!context) {
-    throw new Error('useWorkspaceOverlayContext must be used within a WorkspaceOverlayProvider');
-  }
-  return context;
-}
-
-export function useShowModal<MId extends ModalId>(id: MId) {
-  const { showModal } = useModalContext();
-  return (args: UserArgs<MId>) => showModal(id, args);
-}
diff --git a/src/renderer/contexts/ProjectManagementProvider.tsx b/src/renderer/contexts/ProjectManagementProvider.tsx
deleted file mode 100644
index dc46cfdfc3..0000000000
--- a/src/renderer/contexts/ProjectManagementProvider.tsx
+++ /dev/null
@@ -1,25 +0,0 @@
-import React, { createContext, useContext } from 'react';
-import { useProjectManagement } from '../hooks/useProjectManagement';
-
-type ProjectManagementContextValue = ReturnType<typeof useProjectManagement>;
-
-export const ProjectManagementContext = createContext<ProjectManagementContextValue | null>(null);
-
-export function useProjectManagementContext(): ProjectManagementContextValue {
-  const ctx = useContext(ProjectManagementContext);
-  if (!ctx) {
-    throw new Error(
-      'useProjectManagementContext must be used within a ProjectManagementContext.Provider'
-    );
-  }
-  return ctx;
-}
-
-export function ProjectManagementProvider({ children }: { children: React.ReactNode }) {
-  const projectManagement = useProjectManagement();
-  return (
-    <ProjectManagementContext.Provider value={projectManagement}>
-      {children}
-    </ProjectManagementContext.Provider>
-  );
-}
diff --git a/src/renderer/contexts/TaskManagementContext.tsx b/src/renderer/contexts/TaskManagementContext.tsx
deleted file mode 100644
index ab468ce84c..0000000000
--- a/src/renderer/contexts/TaskManagementContext.tsx
+++ /dev/null
@@ -1,25 +0,0 @@
-import React, { createContext, useContext } from 'react';
-import { useTaskManagement } from '../hooks/useTaskManagement';
-
-type TaskManagementContextValue = ReturnType<typeof useTaskManagement>;
-
-export const TaskManagementContext = createContext<TaskManagementContextValue | null>(null);
-
-export function useTaskManagementContext(): TaskManagementContextValue {
-  const ctx = useContext(TaskManagementContext);
-  if (!ctx) {
-    throw new Error(
-      'useTaskManagementContext must be used within a TaskManagementContext.Provider'
-    );
-  }
-  return ctx;
-}
-
-export function TaskManagementProvider({ children }: { children: React.ReactNode }) {
-  const taskManagement = useTaskManagement();
-  return (
-    <TaskManagementContext.Provider value={taskManagement}>
-      {children}
-    </TaskManagementContext.Provider>
-  );
-}
diff --git a/src/renderer/features/integrations/ForgejoSetupForm.tsx b/src/renderer/features/integrations/ForgejoSetupForm.tsx
new file mode 100644
index 0000000000..12fac0b21b
--- /dev/null
+++ b/src/renderer/features/integrations/ForgejoSetupForm.tsx
@@ -0,0 +1,43 @@
+import React from 'react';
+import { Input } from '@renderer/lib/ui/input';
+
+interface Props {
+  instanceUrl: string;
+  token: string;
+  onChange: (update: Partial<{ instanceUrl: string; token: string }>) => void;
+  error?: string | null;
+}
+
+const ForgejoSetupForm: React.FC<Props> = ({ instanceUrl, token, onChange, error }) => {
+  return (
+    <div className="grid gap-2">
+      <Input
+        placeholder="https://forgejo.example.com"
+        value={instanceUrl}
+        onChange={(e: React.ChangeEvent<HTMLInputElement>) =>
+          onChange({ instanceUrl: e.target.value })
+        }
+        className="h-9 w-full"
+        autoFocus
+      />
+      <Input
+        type="password"
+        placeholder="API token"
+        value={token}
+        onChange={(e: React.ChangeEvent<HTMLInputElement>) => onChange({ token: e.target.value })}
+        className="h-9 w-full"
+      />
+      <p className="text-xs text-muted-foreground">
+        Create an API token in your Forgejo user settings under{' '}
+        <span className="font-medium">Applications</span>.
+      </p>
+      {error ? (
+        <p className="text-xs text-destructive" role="alert">
+          {error}
+        </p>
+      ) : null}
+    </div>
+  );
+};
+
+export default ForgejoSetupForm;
diff --git a/src/renderer/features/integrations/GitLabSetupForm.tsx b/src/renderer/features/integrations/GitLabSetupForm.tsx
new file mode 100644
index 0000000000..da20e488c2
--- /dev/null
+++ b/src/renderer/features/integrations/GitLabSetupForm.tsx
@@ -0,0 +1,43 @@
+import React from 'react';
+import { Input } from '@renderer/lib/ui/input';
+
+interface Props {
+  instanceUrl: string;
+  token: string;
+  onChange: (update: Partial<{ instanceUrl: string; token: string }>) => void;
+  error?: string | null;
+}
+
+const GitLabSetupForm: React.FC<Props> = ({ instanceUrl, token, onChange, error }) => {
+  return (
+    <div className="grid gap-2">
+      <Input
+        placeholder="https://gitlab.com"
+        value={instanceUrl}
+        onChange={(e: React.ChangeEvent<HTMLInputElement>) =>
+          onChange({ instanceUrl: e.target.value })
+        }
+        className="h-9 w-full"
+        autoFocus
+      />
+      <Input
+        type="password"
+        placeholder="Personal access token"
+        value={token}
+        onChange={(e: React.ChangeEvent<HTMLInputElement>) => onChange({ token: e.target.value })}
+        className="h-9 w-full"
+      />
+      <p className="text-xs text-muted-foreground">
+        Create a personal access token with <span className="font-medium">read_api</span> scope in
+        GitLab settings.
+      </p>
+      {error ? (
+        <p className="text-xs text-destructive" role="alert">
+          {error}
+        </p>
+      ) : null}
+    </div>
+  );
+};
+
+export default GitLabSetupForm;
diff --git a/src/renderer/features/integrations/JiraSetupForm.tsx b/src/renderer/features/integrations/JiraSetupForm.tsx
new file mode 100644
index 0000000000..d23017e0a0
--- /dev/null
+++ b/src/renderer/features/integrations/JiraSetupForm.tsx
@@ -0,0 +1,48 @@
+import React from 'react';
+import { Input } from '@renderer/lib/ui/input';
+
+interface Props {
+  site: string;
+  email: string;
+  token: string;
+  onChange: (update: Partial<{ site: string; email: string; token: string }>) => void;
+  error?: string | null;
+}
+
+const JiraSetupForm: React.FC<Props> = ({ site, email, token, onChange, error }) => {
+  return (
+    <div className="grid gap-2">
+      <Input
+        placeholder="https://your-domain.atlassian.net"
+        value={site}
+        onChange={(e: React.ChangeEvent<HTMLInputElement>) => onChange({ site: e.target.value })}
+        className="h-9 w-full"
+        autoFocus
+      />
+      <Input
+        placeholder="Email"
+        value={email}
+        onChange={(e: React.ChangeEvent<HTMLInputElement>) => onChange({ email: e.target.value })}
+        className="h-9 w-full"
+      />
+      <Input
+        type="password"
+        placeholder="API token"
+        value={token}
+        onChange={(e: React.ChangeEvent<HTMLInputElement>) => onChange({ token: e.target.value })}
+        className="h-9 w-full"
+      />
+      <p className="text-xs text-muted-foreground">
+        Create an API token at{' '}
+        <span className="font-medium">id.atlassian.com/manage-profile/security/api-tokens</span>
+      </p>
+      {error ? (
+        <p className="text-xs text-destructive" role="alert">
+          {error}
+        </p>
+      ) : null}
+    </div>
+  );
+};
+
+export default JiraSetupForm;
diff --git a/src/renderer/features/integrations/LinearSetupForm.tsx b/src/renderer/features/integrations/LinearSetupForm.tsx
new file mode 100644
index 0000000000..b9022d6163
--- /dev/null
+++ b/src/renderer/features/integrations/LinearSetupForm.tsx
@@ -0,0 +1,44 @@
+import { Info } from 'lucide-react';
+import React from 'react';
+import { Input } from '@renderer/lib/ui/input';
+
+interface Props {
+  apiKey: string;
+  onChange: (value: string) => void;
+  error?: string | null;
+}
+
+const LinearSetupForm: React.FC<Props> = ({ apiKey, onChange, error }) => {
+  return (
+    <div className="grid gap-2">
+      <Input
+        type="password"
+        placeholder="Linear API key"
+        value={apiKey}
+        onChange={(e: React.ChangeEvent<HTMLInputElement>) => onChange(e.target.value)}
+        className="h-9 w-full"
+        aria-label="Linear API key"
+        autoFocus
+      />
+      <div className="rounded-md border border-dashed border-border/70 bg-muted/40 p-2">
+        <div className="flex items-start gap-2">
+          <Info className="mt-0.5 h-4 w-4 text-muted-foreground" aria-hidden="true" />
+          <div className="text-xs leading-snug text-muted-foreground">
+            <p className="font-medium text-foreground">How to get a Linear API key</p>
+            <ol className="mt-1 list-decimal pl-4">
+              <li>Open Linear, go to Settings → Security & access → Personal API keys.</li>
+              <li>Create a new token and copy the key.</li>
+            </ol>
+          </div>
+        </div>
+      </div>
+      {error ? (
+        <p className="text-xs text-destructive" role="alert">
+          {error}
+        </p>
+      ) : null}
+    </div>
+  );
+};
+
+export default LinearSetupForm;
diff --git a/src/renderer/features/integrations/PlainSetupForm.tsx b/src/renderer/features/integrations/PlainSetupForm.tsx
new file mode 100644
index 0000000000..5625e64879
--- /dev/null
+++ b/src/renderer/features/integrations/PlainSetupForm.tsx
@@ -0,0 +1,44 @@
+import { Info } from 'lucide-react';
+import React from 'react';
+import { Input } from '@renderer/lib/ui/input';
+
+interface Props {
+  apiKey: string;
+  onChange: (value: string) => void;
+  error?: string | null;
+}
+
+const PlainSetupForm: React.FC<Props> = ({ apiKey, onChange, error }) => {
+  return (
+    <div className="grid gap-2">
+      <Input
+        type="password"
+        placeholder="Plain API key"
+        value={apiKey}
+        onChange={(e: React.ChangeEvent<HTMLInputElement>) => onChange(e.target.value)}
+        className="h-9 w-full"
+        aria-label="Plain API key"
+        autoFocus
+      />
+      <div className="rounded-md border border-dashed border-border/70 bg-muted/40 p-2">
+        <div className="flex items-start gap-2">
+          <Info className="mt-0.5 h-4 w-4 text-muted-foreground" aria-hidden="true" />
+          <div className="text-xs leading-snug text-muted-foreground">
+            <p className="font-medium text-foreground">How to get a Plain API key</p>
+            <ol className="mt-1 list-decimal pl-4">
+              <li>Open Plain, go to Settings → API keys.</li>
+              <li>Create a new API key and copy it.</li>
+            </ol>
+          </div>
+        </div>
+      </div>
+      {error ? (
+        <p className="text-xs text-destructive" role="alert">
+          {error}
+        </p>
+      ) : null}
+    </div>
+  );
+};
+
+export default PlainSetupForm;
diff --git a/src/renderer/features/integrations/components/github-auth-disclaimer.tsx b/src/renderer/features/integrations/components/github-auth-disclaimer.tsx
new file mode 100644
index 0000000000..c7e7d4d5ea
--- /dev/null
+++ b/src/renderer/features/integrations/components/github-auth-disclaimer.tsx
@@ -0,0 +1,22 @@
+import { Github } from 'lucide-react';
+import { Button } from '@renderer/lib/ui/button';
+
+export function GithubAuthDisclaimer({
+  onOpenAccountSettings,
+}: {
+  onOpenAccountSettings: () => void;
+}) {
+  return (
+    <div className="flex w-full flex-col items-center justify-center gap-5 rounded-md border border-border border-dashed p-8">
+      <span className="relative flex size-8 items-center justify-center overflow-hidden rounded-full bg-background-2">
+        <Github className="size-4 text-foreground-muted" />
+      </span>
+      <p className="text-center text-sm font-normal text-foreground-muted">
+        GitHub is not connected. Connect your account to create a repository.
+      </p>
+      <Button type="button" variant="outline" size="xs" onClick={onOpenAccountSettings}>
+        Open Account Settings
+      </Button>
+    </div>
+  );
+}
diff --git a/src/renderer/features/integrations/integration-setup-modal.tsx b/src/renderer/features/integrations/integration-setup-modal.tsx
new file mode 100644
index 0000000000..968409a956
--- /dev/null
+++ b/src/renderer/features/integrations/integration-setup-modal.tsx
@@ -0,0 +1,215 @@
+import { Loader2 } from 'lucide-react';
+import { useCallback, useState } from 'react';
+import { BaseModalProps } from '@renderer/lib/modal/modal-provider';
+import { Button } from '@renderer/lib/ui/button';
+import { ConfirmButton } from '@renderer/lib/ui/confirm-button';
+import {
+  DialogContentArea,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+} from '@renderer/lib/ui/dialog';
+import ForgejoSetupForm from './ForgejoSetupForm';
+import GitLabSetupForm from './GitLabSetupForm';
+import { useIntegrationsContext } from './integrations-provider';
+import JiraSetupForm from './JiraSetupForm';
+import LinearSetupForm from './LinearSetupForm';
+import PlainSetupForm from './PlainSetupForm';
+
+type IntegrationType = 'linear' | 'jira' | 'gitlab' | 'plain' | 'forgejo';
+
+type IntegrationSetupModalArgs = {
+  integration: IntegrationType;
+};
+
+type Props = BaseModalProps<void> & IntegrationSetupModalArgs;
+
+const descriptions: Record<IntegrationType, { title: string; subtitle: string }> = {
+  linear: {
+    title: 'Connect Linear',
+    subtitle: 'Enter your Linear API key to connect your workspace.',
+  },
+  jira: {
+    title: 'Connect Jira',
+    subtitle: 'Enter your Jira site URL, email, and API token to connect.',
+  },
+  gitlab: {
+    title: 'Connect GitLab',
+    subtitle: 'Enter your GitLab instance URL and personal access token.',
+  },
+  plain: {
+    title: 'Connect Plain',
+    subtitle: 'Enter your Plain API key to connect your workspace.',
+  },
+  forgejo: {
+    title: 'Connect Forgejo',
+    subtitle: 'Enter your Forgejo instance URL and API token.',
+  },
+};
+
+export function IntegrationSetupModal({ integration, onSuccess, onClose }: Props) {
+  const {
+    connectLinear,
+    connectJira,
+    connectGitlab,
+    connectPlain,
+    connectForgejo,
+    isLinearLoading,
+    isJiraLoading,
+    isGitlabLoading,
+    isPlainLoading,
+    isForgejoLoading,
+  } = useIntegrationsContext();
+
+  // Linear state
+  const [linearKey, setLinearKey] = useState('');
+
+  // Jira state
+  const [jiraSite, setJiraSite] = useState('');
+  const [jiraEmail, setJiraEmail] = useState('');
+  const [jiraToken, setJiraToken] = useState('');
+
+  // GitLab state
+  const [gitlabInstanceUrl, setGitlabInstanceUrl] = useState('');
+  const [gitlabToken, setGitlabToken] = useState('');
+
+  // Plain state
+  const [plainKey, setPlainKey] = useState('');
+
+  // Forgejo state
+  const [forgejoInstanceUrl, setForgejoInstanceUrl] = useState('');
+  const [forgejoToken, setForgejoToken] = useState('');
+
+  const [error, setError] = useState<string | null>(null);
+
+  const isLoading =
+    (integration === 'linear' && isLinearLoading) ||
+    (integration === 'jira' && isJiraLoading) ||
+    (integration === 'gitlab' && isGitlabLoading) ||
+    (integration === 'plain' && isPlainLoading) ||
+    (integration === 'forgejo' && isForgejoLoading);
+
+  const canSubmit =
+    (integration === 'linear' && !!linearKey.trim()) ||
+    (integration === 'jira' && !!(jiraSite.trim() && jiraEmail.trim() && jiraToken.trim())) ||
+    (integration === 'gitlab' && !!(gitlabInstanceUrl.trim() && gitlabToken.trim())) ||
+    (integration === 'plain' && !!plainKey.trim()) ||
+    (integration === 'forgejo' && !!(forgejoInstanceUrl.trim() && forgejoToken.trim()));
+
+  const handleSubmit = useCallback(async () => {
+    setError(null);
+    try {
+      switch (integration) {
+        case 'linear':
+          await connectLinear(linearKey.trim());
+          break;
+        case 'jira':
+          await connectJira({
+            siteUrl: jiraSite.trim(),
+            email: jiraEmail.trim(),
+            token: jiraToken.trim(),
+          });
+          break;
+        case 'gitlab':
+          await connectGitlab({
+            instanceUrl: gitlabInstanceUrl.trim(),
+            token: gitlabToken.trim(),
+          });
+          break;
+        case 'plain':
+          await connectPlain(plainKey.trim());
+          break;
+        case 'forgejo':
+          await connectForgejo({
+            instanceUrl: forgejoInstanceUrl.trim(),
+            token: forgejoToken.trim(),
+          });
+          break;
+      }
+      onSuccess();
+    } catch (e) {
+      setError((e as Error).message || 'Failed to connect.');
+    }
+  }, [
+    integration,
+    linearKey,
+    jiraSite,
+    jiraEmail,
+    jiraToken,
+    gitlabInstanceUrl,
+    gitlabToken,
+    plainKey,
+    forgejoInstanceUrl,
+    forgejoToken,
+    connectLinear,
+    connectJira,
+    connectGitlab,
+    connectPlain,
+    connectForgejo,
+    onSuccess,
+  ]);
+
+  const { title, subtitle } = descriptions[integration];
+
+  return (
+    <>
+      <DialogHeader showCloseButton={false}>
+        <DialogTitle>{title}</DialogTitle>
+        <DialogDescription className="text-xs">{subtitle}</DialogDescription>
+      </DialogHeader>
+      <DialogContentArea>
+        {integration === 'linear' && (
+          <LinearSetupForm apiKey={linearKey} onChange={setLinearKey} error={error} />
+        )}
+        {integration === 'jira' && (
+          <JiraSetupForm
+            site={jiraSite}
+            email={jiraEmail}
+            token={jiraToken}
+            onChange={(u) => {
+              if (typeof u.site === 'string') setJiraSite(u.site);
+              if (typeof u.email === 'string') setJiraEmail(u.email);
+              if (typeof u.token === 'string') setJiraToken(u.token);
+            }}
+            error={error}
+          />
+        )}
+        {integration === 'gitlab' && (
+          <GitLabSetupForm
+            instanceUrl={gitlabInstanceUrl}
+            token={gitlabToken}
+            onChange={(u) => {
+              if (typeof u.instanceUrl === 'string') setGitlabInstanceUrl(u.instanceUrl);
+              if (typeof u.token === 'string') setGitlabToken(u.token);
+            }}
+            error={error}
+          />
+        )}
+        {integration === 'plain' && (
+          <PlainSetupForm apiKey={plainKey} onChange={setPlainKey} error={error} />
+        )}
+        {integration === 'forgejo' && (
+          <ForgejoSetupForm
+            instanceUrl={forgejoInstanceUrl}
+            token={forgejoToken}
+            onChange={(u) => {
+              if (typeof u.instanceUrl === 'string') setForgejoInstanceUrl(u.instanceUrl);
+              if (typeof u.token === 'string') setForgejoToken(u.token);
+            }}
+            error={error}
+          />
+        )}
+      </DialogContentArea>
+      <DialogFooter>
+        <Button variant="outline" onClick={onClose}>
+          Cancel
+        </Button>
+        <ConfirmButton onClick={() => void handleSubmit()} disabled={!canSubmit || isLoading}>
+          {isLoading && <Loader2 className="mr-2 h-4 w-4 animate-spin" />}
+          Connect
+        </ConfirmButton>
+      </DialogFooter>
+    </>
+  );
+}
diff --git a/src/renderer/features/integrations/integrations-provider.tsx b/src/renderer/features/integrations/integrations-provider.tsx
new file mode 100644
index 0000000000..ab3ef6139c
--- /dev/null
+++ b/src/renderer/features/integrations/integrations-provider.tsx
@@ -0,0 +1,199 @@
+import { useQuery, useQueryClient } from '@tanstack/react-query';
+import React, { createContext, useCallback, useContext } from 'react';
+import {
+  ISSUE_PROVIDER_CAPABILITIES,
+  type ConnectionStatusMap,
+  type IssueProviderType,
+} from '@shared/issue-providers';
+import { rpc } from '@renderer/lib/ipc';
+import { useProviderConnection } from './use-provider-connection';
+
+export const ISSUE_CONNECTION_STATUS_QUERY_KEY = ['issues:connection-status'] as const;
+
+const DEFAULT_CONNECTION_STATUS: ConnectionStatusMap = Object.fromEntries(
+  Object.entries(ISSUE_PROVIDER_CAPABILITIES).map(([provider, capabilities]) => [
+    provider,
+    { connected: false, capabilities },
+  ])
+) as ConnectionStatusMap;
+
+const DEFAULT_CONNECT_ERROR = 'Failed to connect.';
+
+function validateTokenInput(token: string): string | null {
+  return token.trim() ? null : 'Invalid API key';
+}
+
+function validateJiraCredentials(input: {
+  siteUrl: string;
+  email: string;
+  token: string;
+}): string | null {
+  if (!input.siteUrl?.trim() || !input.email?.trim() || !input.token?.trim()) {
+    return 'Site URL, email, and API token are required.';
+  }
+  return null;
+}
+
+function validateInstanceCredentials(input: { instanceUrl: string; token: string }): string | null {
+  if (!input.instanceUrl?.trim() || !input.token?.trim()) {
+    return 'Instance URL and API token are required.';
+  }
+  return null;
+}
+
+const PROVIDER_CONNECTION_CONFIG = {
+  linear: {
+    connectMutationFn: (apiKey: string) => rpc.linear.saveToken(apiKey),
+    disconnectMutationFn: () => rpc.linear.clearToken(),
+    fallbackError: DEFAULT_CONNECT_ERROR,
+    validateInput: validateTokenInput,
+  },
+  jira: {
+    connectMutationFn: (credentials: { siteUrl: string; email: string; token: string }) =>
+      rpc.jira.saveCredentials(credentials),
+    disconnectMutationFn: () => rpc.jira.clearCredentials(),
+    fallbackError: DEFAULT_CONNECT_ERROR,
+    validateInput: validateJiraCredentials,
+  },
+  gitlab: {
+    connectMutationFn: (credentials: { instanceUrl: string; token: string }) =>
+      rpc.gitlab.saveCredentials(credentials),
+    disconnectMutationFn: () => rpc.gitlab.clearCredentials(),
+    fallbackError: DEFAULT_CONNECT_ERROR,
+    validateInput: validateInstanceCredentials,
+  },
+  plain: {
+    connectMutationFn: (apiKey: string) => rpc.plain.saveToken(apiKey),
+    disconnectMutationFn: () => rpc.plain.clearToken(),
+    fallbackError: DEFAULT_CONNECT_ERROR,
+    validateInput: validateTokenInput,
+  },
+  forgejo: {
+    connectMutationFn: (credentials: { instanceUrl: string; token: string }) =>
+      rpc.forgejo.saveCredentials(credentials),
+    disconnectMutationFn: () => rpc.forgejo.clearCredentials(),
+    fallbackError: DEFAULT_CONNECT_ERROR,
+    validateInput: validateInstanceCredentials,
+  },
+} as const;
+
+type IntegrationsContextValue = {
+  connectionStatus: ConnectionStatusMap;
+  isCheckingConnections: boolean;
+
+  // Legacy-friendly fields consumed around settings/issue selector.
+  isLinearConnected: boolean | null;
+  isJiraConnected: boolean | null;
+  isGitlabConnected: boolean | null;
+  isPlainConnected: boolean | null;
+  isForgejoConnected: boolean | null;
+
+  // Auth mutations stay per provider.
+  isLinearLoading: boolean;
+  isJiraLoading: boolean;
+  isGitlabLoading: boolean;
+  isPlainLoading: boolean;
+  isForgejoLoading: boolean;
+  connectLinear: (apiKey: string) => Promise<void>;
+  disconnectLinear: () => Promise<void>;
+  connectJira: (credentials: { siteUrl: string; email: string; token: string }) => Promise<void>;
+  disconnectJira: () => Promise<void>;
+  connectGitlab: (credentials: { instanceUrl: string; token: string }) => Promise<void>;
+  disconnectGitlab: () => Promise<void>;
+  connectPlain: (apiKey: string) => Promise<void>;
+  disconnectPlain: () => Promise<void>;
+  connectForgejo: (credentials: { instanceUrl: string; token: string }) => Promise<void>;
+  disconnectForgejo: () => Promise<void>;
+};
+
+const IntegrationsContext = createContext<IntegrationsContextValue | null>(null);
+
+function isConnected(
+  statusData: ConnectionStatusMap | undefined,
+  provider: IssueProviderType
+): boolean | null {
+  if (!statusData) {
+    return null;
+  }
+
+  return !!statusData[provider]?.connected;
+}
+
+export function IntegrationsProvider({ children }: { children: React.ReactNode }) {
+  const queryClient = useQueryClient();
+
+  const {
+    data: statusData,
+    isFetching: isCheckingConnections,
+    isLoading: isInitialConnectionCheck,
+  } = useQuery({
+    queryKey: ISSUE_CONNECTION_STATUS_QUERY_KEY,
+    queryFn: () => rpc.issues.checkAllConnections(),
+    staleTime: 30_000,
+    refetchOnWindowFocus: true,
+  });
+
+  const invalidateStatuses = useCallback(() => {
+    void queryClient.invalidateQueries({ queryKey: ISSUE_CONNECTION_STATUS_QUERY_KEY });
+  }, [queryClient]);
+
+  const linearConnection = useProviderConnection({
+    ...PROVIDER_CONNECTION_CONFIG.linear,
+    invalidate: invalidateStatuses,
+  });
+  const jiraConnection = useProviderConnection({
+    ...PROVIDER_CONNECTION_CONFIG.jira,
+    invalidate: invalidateStatuses,
+  });
+  const gitlabConnection = useProviderConnection({
+    ...PROVIDER_CONNECTION_CONFIG.gitlab,
+    invalidate: invalidateStatuses,
+  });
+  const plainConnection = useProviderConnection({
+    ...PROVIDER_CONNECTION_CONFIG.plain,
+    invalidate: invalidateStatuses,
+  });
+  const forgejoConnection = useProviderConnection({
+    ...PROVIDER_CONNECTION_CONFIG.forgejo,
+    invalidate: invalidateStatuses,
+  });
+
+  const connectionStatus = statusData ?? DEFAULT_CONNECTION_STATUS;
+
+  return (
+    <IntegrationsContext.Provider
+      value={{
+        connectionStatus,
+        isCheckingConnections,
+        isLinearConnected: isConnected(statusData, 'linear'),
+        isJiraConnected: isConnected(statusData, 'jira'),
+        isGitlabConnected: isConnected(statusData, 'gitlab'),
+        isPlainConnected: isConnected(statusData, 'plain'),
+        isForgejoConnected: isConnected(statusData, 'forgejo'),
+        isLinearLoading: isInitialConnectionCheck || linearConnection.isLoading,
+        isJiraLoading: isInitialConnectionCheck || jiraConnection.isLoading,
+        isGitlabLoading: isInitialConnectionCheck || gitlabConnection.isLoading,
+        isPlainLoading: isInitialConnectionCheck || plainConnection.isLoading,
+        isForgejoLoading: isInitialConnectionCheck || forgejoConnection.isLoading,
+        connectLinear: linearConnection.connect,
+        disconnectLinear: linearConnection.disconnect,
+        connectJira: jiraConnection.connect,
+        disconnectJira: jiraConnection.disconnect,
+        connectGitlab: gitlabConnection.connect,
+        disconnectGitlab: gitlabConnection.disconnect,
+        connectPlain: plainConnection.connect,
+        disconnectPlain: plainConnection.disconnect,
+        connectForgejo: forgejoConnection.connect,
+        disconnectForgejo: forgejoConnection.disconnect,
+      }}
+    >
+      {children}
+    </IntegrationsContext.Provider>
+  );
+}
+
+export function useIntegrationsContext() {
+  const ctx = useContext(IntegrationsContext);
+  if (!ctx) throw new Error('useIntegrationsContext must be used inside IntegrationsProvider');
+  return ctx;
+}
diff --git a/src/renderer/features/integrations/issue-provider-meta.ts b/src/renderer/features/integrations/issue-provider-meta.ts
new file mode 100644
index 0000000000..7d4b2dc14b
--- /dev/null
+++ b/src/renderer/features/integrations/issue-provider-meta.ts
@@ -0,0 +1,31 @@
+import forgejoLogo from '@/assets/images/Forgejo.svg';
+import githubLogo from '@/assets/images/github.png';
+import gitlabLogo from '@/assets/images/GitLab.svg';
+import jiraLogo from '@/assets/images/jira.png';
+import linearLogo from '@/assets/images/Linear.svg';
+import plainLogo from '@/assets/images/Plain.svg';
+import type { IssueProviderType } from '@shared/issue-providers';
+
+export const ISSUE_PROVIDER_ORDER: IssueProviderType[] = [
+  'linear',
+  'github',
+  'jira',
+  'gitlab',
+  'forgejo',
+  'plain',
+];
+
+export const ISSUE_PROVIDER_META: Record<
+  IssueProviderType,
+  {
+    displayName: string;
+    logo: string;
+  }
+> = {
+  linear: { displayName: 'Linear', logo: linearLogo },
+  github: { displayName: 'GitHub', logo: githubLogo },
+  jira: { displayName: 'Jira', logo: jiraLogo },
+  gitlab: { displayName: 'GitLab', logo: gitlabLogo },
+  forgejo: { displayName: 'Forgejo', logo: forgejoLogo },
+  plain: { displayName: 'Plain', logo: plainLogo },
+};
diff --git a/src/renderer/features/integrations/use-issues.ts b/src/renderer/features/integrations/use-issues.ts
new file mode 100644
index 0000000000..2da9625719
--- /dev/null
+++ b/src/renderer/features/integrations/use-issues.ts
@@ -0,0 +1,142 @@
+import { keepPreviousData, useQuery } from '@tanstack/react-query';
+import { useEffect, useMemo, useState } from 'react';
+import type { IssueProviderType } from '@shared/issue-providers';
+import type { Issue } from '@shared/tasks';
+import { rpc } from '@renderer/lib/ipc';
+
+const INITIAL_FETCH_LIMIT = 50;
+const SEARCH_LIMIT = 20;
+const SEARCH_DEBOUNCE_MS = 300;
+
+const SEARCH_MIN_LENGTH_BY_PROVIDER: Partial<Record<IssueProviderType, number>> = {
+  plain: 2,
+};
+
+export interface UseIssuesResult {
+  issues: Issue[];
+  isLoading: boolean;
+  error: string | null;
+  searchTerm: string;
+  setSearchTerm: (term: string) => void;
+  isSearching: boolean;
+}
+
+interface UseIssuesOptions {
+  projectId?: string;
+  projectPath?: string;
+  nameWithOwner?: string;
+  enabled?: boolean;
+  initialLimit?: number;
+  searchLimit?: number;
+}
+
+function getSearchMinLength(provider: IssueProviderType | null): number {
+  if (!provider) return 1;
+  return SEARCH_MIN_LENGTH_BY_PROVIDER[provider] ?? 1;
+}
+
+export function useIssues(
+  provider: IssueProviderType | null,
+  {
+    projectId,
+    projectPath,
+    nameWithOwner,
+    enabled = true,
+    initialLimit = INITIAL_FETCH_LIMIT,
+    searchLimit = SEARCH_LIMIT,
+  }: UseIssuesOptions = {}
+): UseIssuesResult {
+  const [searchTerm, setSearchTerm] = useState('');
+  const [debouncedTerm, setDebouncedTerm] = useState('');
+
+  useEffect(() => {
+    const id = setTimeout(() => setDebouncedTerm(searchTerm), SEARCH_DEBOUNCE_MS);
+    return () => clearTimeout(id);
+  }, [searchTerm]);
+
+  const isReady = enabled && !!provider;
+
+  const {
+    data: initialIssues,
+    isLoading: isLoadingInitial,
+    error: initialError,
+  } = useQuery({
+    queryKey: [
+      'issues:initial',
+      provider,
+      projectId ?? '',
+      projectPath ?? '',
+      nameWithOwner ?? '',
+      initialLimit,
+    ],
+    queryFn: async () => {
+      if (!provider) return [] as Issue[];
+
+      const result = await rpc.issues.listIssues(provider, {
+        limit: initialLimit,
+        projectId,
+        projectPath,
+        nameWithOwner,
+      });
+
+      if (!result?.success) {
+        throw new Error(result?.error ?? 'Failed to load issues.');
+      }
+
+      return result.issues ?? [];
+    },
+    staleTime: 60_000,
+    enabled: isReady,
+  });
+
+  const minSearchLength = getSearchMinLength(provider);
+  const isActiveSearch = debouncedTerm.trim().length >= minSearchLength;
+
+  const { data: searchIssues, isFetching: isSearching } = useQuery({
+    queryKey: [
+      'issues:search',
+      provider,
+      projectId ?? '',
+      projectPath ?? '',
+      nameWithOwner ?? '',
+      debouncedTerm.trim(),
+      searchLimit,
+    ],
+    queryFn: async () => {
+      if (!provider) return [] as Issue[];
+
+      const result = await rpc.issues.searchIssues(provider, {
+        limit: searchLimit,
+        searchTerm: debouncedTerm.trim(),
+        projectId,
+        projectPath,
+        nameWithOwner,
+      });
+
+      if (result?.success) {
+        return result.issues ?? [];
+      }
+
+      return [] as Issue[];
+    },
+    staleTime: 30_000,
+    enabled: isReady && isActiveSearch,
+    placeholderData: keepPreviousData,
+  });
+
+  const issues = useMemo<Issue[]>(() => {
+    if (isActiveSearch) return searchIssues ?? [];
+    return initialIssues ?? [];
+  }, [initialIssues, isActiveSearch, searchIssues]);
+
+  const error = initialError instanceof Error ? initialError.message : null;
+
+  return {
+    issues,
+    isLoading: isLoadingInitial,
+    error,
+    searchTerm,
+    setSearchTerm,
+    isSearching: isActiveSearch && isSearching,
+  };
+}
diff --git a/src/renderer/features/integrations/use-provider-connection.ts b/src/renderer/features/integrations/use-provider-connection.ts
new file mode 100644
index 0000000000..d2c49fe532
--- /dev/null
+++ b/src/renderer/features/integrations/use-provider-connection.ts
@@ -0,0 +1,55 @@
+import { useMutation } from '@tanstack/react-query';
+import { useCallback } from 'react';
+
+type ConnectionMutationResult = { success?: boolean; error?: string } | null | undefined;
+
+type UseProviderConnectionOptions<TInput> = {
+  connectMutationFn: (input: TInput) => Promise<ConnectionMutationResult>;
+  disconnectMutationFn: () => Promise<unknown>;
+  invalidate: () => void;
+  fallbackError: string;
+  validateInput?: (input: TInput) => string | null;
+};
+
+export function useProviderConnection<TInput>({
+  connectMutationFn,
+  disconnectMutationFn,
+  invalidate,
+  fallbackError,
+  validateInput,
+}: UseProviderConnectionOptions<TInput>) {
+  const connectMutation = useMutation({
+    mutationFn: (input: TInput) => connectMutationFn(input),
+    onSettled: invalidate,
+  });
+
+  const disconnectMutation = useMutation({
+    mutationFn: () => disconnectMutationFn(),
+    onSettled: invalidate,
+  });
+
+  const connect = useCallback(
+    async (input: TInput) => {
+      const validationError = validateInput?.(input);
+      if (validationError) {
+        throw new Error(validationError);
+      }
+
+      const result = await connectMutation.mutateAsync(input);
+      if (!result?.success) {
+        throw new Error(result?.error || fallbackError);
+      }
+    },
+    [connectMutation, fallbackError, validateInput]
+  );
+
+  const disconnect = useCallback(async () => {
+    await disconnectMutation.mutateAsync();
+  }, [disconnectMutation]);
+
+  return {
+    connect,
+    disconnect,
+    isLoading: connectMutation.isPending || disconnectMutation.isPending,
+  };
+}
diff --git a/src/renderer/features/mcp/components/KeyValueSection.tsx b/src/renderer/features/mcp/components/KeyValueSection.tsx
new file mode 100644
index 0000000000..e93c493330
--- /dev/null
+++ b/src/renderer/features/mcp/components/KeyValueSection.tsx
@@ -0,0 +1,87 @@
+import { X } from 'lucide-react';
+import React from 'react';
+import { Button } from '@renderer/lib/ui/button';
+import { Field, FieldLabel } from '@renderer/lib/ui/field';
+import { Input } from '@renderer/lib/ui/input';
+
+export interface KVEntry {
+  id: number;
+  key: string;
+  value: string;
+}
+
+interface KeyValueSectionProps {
+  label: string;
+  entries: KVEntry[];
+  onChange: (entries: KVEntry[]) => void;
+  addLabel: string;
+  makeId: () => number;
+  credentialKeys: Map<string, boolean>;
+}
+
+export const KeyValueSection: React.FC<KeyValueSectionProps> = ({
+  label,
+  entries,
+  onChange,
+  addLabel,
+  makeId,
+  credentialKeys,
+}) => {
+  return (
+    <Field>
+      <FieldLabel>{label}</FieldLabel>
+      <div className="space-y-2">
+        {entries.map((entry, i) => {
+          const isCredential = credentialKeys.has(entry.key);
+          const isRequired = credentialKeys.get(entry.key) === true;
+          return (
+            <div key={entry.id} className="flex items-center gap-2">
+              <Input
+                value={entry.key}
+                onChange={(e) => {
+                  const next = [...entries];
+                  next[i] = { ...entry, key: e.target.value };
+                  onChange(next);
+                }}
+                className="h-8 w-1/2"
+                placeholder="KEY"
+              />
+              <Input
+                value={entry.value}
+                onChange={(e) => {
+                  const next = [...entries];
+                  next[i] = { ...entry, value: e.target.value };
+                  onChange(next);
+                }}
+                className={`h-8 w-1/2 ${
+                  isCredential && isRequired && !entry.value
+                    ? 'border-amber-400/60 bg-amber-50/10'
+                    : ''
+                }`}
+                placeholder={isCredential ? (isRequired ? 'Required' : 'Optional') : 'value'}
+              />
+              <Button
+                type="button"
+                variant="ghost"
+                size="icon"
+                className="h-8 w-8 shrink-0 text-muted-foreground hover:text-destructive"
+                onClick={() => onChange(entries.filter((_, j) => j !== i))}
+              >
+                <X className="h-3 w-3" />
+              </Button>
+            </div>
+          );
+        })}
+        <Button
+          type="button"
+          variant="link"
+          size="sm"
+          className="h-auto p-0 text-xs"
+          onClick={() => onChange([...entries, { id: makeId(), key: '', value: '' }])}
+        >
+          {addLabel}
+        </Button>
+      </div>
+    </Field>
+  );
+};
diff --git a/src/renderer/features/mcp/components/McpCard.tsx b/src/renderer/features/mcp/components/McpCard.tsx
new file mode 100644
index 0000000000..a1d75f5f5f
--- /dev/null
+++ b/src/renderer/features/mcp/components/McpCard.tsx
@@ -0,0 +1,126 @@
+import { motion } from 'framer-motion';
+import { ExternalLink, Globe, Pencil, Plus, Terminal } from 'lucide-react';
+import React from 'react';
+import { AgentProviderId } from '@shared/agent-provider-registry';
+import type { McpCatalogEntry, McpServer } from '@shared/mcp/types';
+import AgentLogo from '@renderer/lib/components/agent-logo';
+import { agentConfig } from '@renderer/utils/agentConfig';
+import { McpServerIcon } from '@renderer/utils/mcpIcons';
+
+interface McpCardProps {
+  server?: McpServer;
+  catalogEntry?: McpCatalogEntry;
+  onEdit: (server: McpServer) => void;
+  onAdd?: (entry: McpCatalogEntry) => void;
+}
+
+function getTransport(server?: McpServer, entry?: McpCatalogEntry): 'stdio' | 'http' {
+  if (server) return server.transport;
+  const cfg = entry?.defaultConfig;
+  if (cfg?.type === 'http' || (cfg && 'url' in cfg && !('command' in cfg))) return 'http';
+  return 'stdio';
+}
+
+function getSyncedProviders(server?: McpServer) {
+  if (!server) return [];
+  return server.providers.flatMap((id) => {
+    const cfg = agentConfig[id as AgentProviderId];
+    return cfg ? [{ id, ...cfg }] : [];
+  });
+}
+
+export const McpCard: React.FC<McpCardProps> = ({ server, catalogEntry, onEdit, onAdd }) => {
+  const name = server?.name ?? catalogEntry?.name ?? 'Unknown';
+  const description = catalogEntry?.description ?? (server ? `${server.transport} server` : '');
+  const isInstalled = !!server;
+  const transport = getTransport(server, catalogEntry);
+  const docsUrl = catalogEntry?.docsUrl;
+  const syncedProviders = getSyncedProviders(server);
+
+  const handleClick = () => {
+    if (isInstalled && server) {
+      onEdit(server);
+    } else if (catalogEntry && onAdd) {
+      onAdd(catalogEntry);
+    }
+  };
+
+  return (
+    <motion.div
+      role="button"
+      tabIndex={0}
+      whileTap={{ scale: 0.97 }}
+      transition={{ duration: 0.1, ease: 'easeInOut' }}
+      onClick={handleClick}
+      onKeyDown={(e) => {
+        if (e.key === 'Enter' || e.key === ' ') {
+          e.preventDefault();
+          handleClick();
+        }
+      }}
+      className="group flex w-full cursor-pointer items-center gap-3 rounded-lg border border-border bg-muted/20 p-4 text-left text-card-foreground shadow-sm transition-all hover:bg-muted/40 hover:shadow-md"
+    >
+      <McpServerIcon name={name} iconKey={catalogEntry?.key ?? server?.name} />
+      <div className="min-w-0 flex-1">
+        <div className="flex items-center gap-1.5">
+          <h3 className="truncate text-sm font-semibold">{name}</h3>
+          <span className="inline-flex shrink-0 items-center gap-0.5 rounded bg-muted px-1 py-0.5 text-[10px] text-muted-foreground">
+            {transport === 'http' ? (
+              <Globe className="h-2.5 w-2.5" />
+            ) : (
+              <Terminal className="h-2.5 w-2.5" />
+            )}
+            {transport}
+          </span>
+        </div>
+        {description && (
+          <p className="mt-0.5 line-clamp-1 text-xs text-muted-foreground">{description}</p>
+        )}
+        {syncedProviders.length > 0 && (
+          <div className="mt-1.5 flex items-center gap-1">
+            {syncedProviders.map((p) => (
+              <AgentLogo
+                key={p.id}
+                logo={p.logo}
+                alt={p.alt}
+                isSvg={p.isSvg}
+                invertInDark={p.invertInDark}
+                className="h-3.5 w-3.5 rounded-sm"
+              />
+            ))}
+          </div>
+        )}
+      </div>
+      <div className="flex shrink-0 items-center gap-1 self-center">
+        {docsUrl && (
+          <button
+            type="button"
+            onClick={(e) => {
+              e.stopPropagation();
+              window.open(docsUrl, '_blank', 'noopener,noreferrer');
+            }}
+            className="rounded-md p-1 opacity-0 transition-opacity group-hover:opacity-100"
+            aria-label={`View ${name} docs`}
+          >
+            <ExternalLink className="h-3.5 w-3.5" />
+          </button>
+        )}
+        {isInstalled ? (
+          <Pencil className="h-4 w-4 text-muted-foreground opacity-0 transition-opacity group-hover:opacity-100" />
+        ) : onAdd ? (
+          <button
+            type="button"
+            onClick={(e) => {
+              e.stopPropagation();
+              if (catalogEntry) onAdd(catalogEntry);
+            }}
+            className="rounded-md p-1 text-muted-foreground transition-colors hover:bg-muted hover:text-foreground"
+            aria-label={`Add ${name}`}
+          >
+            <Plus className="h-4 w-4" />
+          </button>
+        ) : null}
+      </div>
+    </motion.div>
+  );
+};
diff --git a/src/renderer/features/mcp/components/McpModal.tsx b/src/renderer/features/mcp/components/McpModal.tsx
new file mode 100644
index 0000000000..4080c52889
--- /dev/null
+++ b/src/renderer/features/mcp/components/McpModal.tsx
@@ -0,0 +1,366 @@
+import { useForm } from '@tanstack/react-form';
+import { Trash2 } from 'lucide-react';
+import React, { useRef, useState } from 'react';
+import type { McpCatalogEntry, McpProvidersResponse, McpServer } from '@shared/mcp/types';
+import { Button } from '@renderer/lib/ui/button';
+import { ConfirmButton } from '@renderer/lib/ui/confirm-button';
+import {
+  DialogContentArea,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+} from '@renderer/lib/ui/dialog';
+import { Field, FieldGroup, FieldLabel } from '@renderer/lib/ui/field';
+import { Input } from '@renderer/lib/ui/input';
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from '@renderer/lib/ui/select';
+import { KeyValueSection, type KVEntry } from './KeyValueSection';
+import { ProviderSelect } from './ProviderSelect';
+
+export type McpModalMode =
+  | { type: 'add-catalog'; entry: McpCatalogEntry }
+  | { type: 'add-custom' }
+  | { type: 'edit'; server: McpServer };
+
+export interface McpModalProps {
+  mode: McpModalMode;
+  providers: McpProvidersResponse[];
+  onSave: (server: McpServer) => Promise<void>;
+  onRemove?: (serverName: string) => void;
+  onSuccess: (result: unknown) => void;
+}
+
+export const McpModal: React.FC<McpModalProps> = ({
+  mode,
+  providers,
+  onSave,
+  onRemove,
+  onSuccess,
+}) => {
+  const isEdit = mode.type === 'edit';
+  const isCatalog = mode.type === 'add-catalog';
+  const credentialKeys = isCatalog
+    ? new Map(mode.entry.credentialKeys.map((c) => [c.key, c.required]))
+    : new Map<string, boolean>();
+
+  const nextId = useRef(0);
+  const makeId = () => nextId.current++;
+
+  const toKV = (entries: [string, string][]): KVEntry[] =>
+    entries.map(([k, v]) => ({ id: makeId(), key: k, value: v }));
+
+  const initial = getInitialState(mode);
+  const [saving, setSaving] = useState(false);
+
+  const form = useForm({
+    defaultValues: {
+      name: initial.name,
+      transport: initial.transport,
+      command: initial.command,
+      args: initial.args,
+      url: initial.url,
+      envEntries: toKV(initial.env),
+      headerEntries: toKV(initial.headers),
+      selectedProviders: initial.providers,
+    },
+  });
+
+  const handleSave = async () => {
+    if (saving) return;
+    setSaving(true);
+    try {
+      const v = form.state.values;
+      const filledHeaders = v.headerEntries.filter((e) => e.key && e.value);
+      const filledEnv = v.envEntries.filter((e) => e.key && e.value);
+      const server: McpServer = {
+        name: v.name,
+        transport: v.transport,
+        command: v.transport === 'stdio' ? v.command : undefined,
+        args:
+          v.transport === 'stdio' && v.args.trim()
+            ? v.args.split('\n').filter((a) => a.length > 0)
+            : undefined,
+        url: v.transport === 'http' ? v.url : undefined,
+        headers: filledHeaders.length
+          ? Object.fromEntries(filledHeaders.map((e) => [e.key, e.value]))
+          : undefined,
+        env: filledEnv.length
+          ? Object.fromEntries(filledEnv.map((e) => [e.key, e.value]))
+          : undefined,
+        providers: v.selectedProviders,
+      };
+      await onSave(server);
+      onSuccess(server);
+    } catch {
+    } finally {
+      setSaving(false);
+    }
+  };
+
+  return (
+    <>
+      <DialogHeader>
+        <DialogTitle>
+          {isEdit
+            ? 'Edit MCP Server'
+            : isCatalog
+              ? `Add ${form.state.values.name}`
+              : 'Add Custom MCP Server'}
+        </DialogTitle>
+      </DialogHeader>
+
+      <DialogContentArea>
+        {isCatalog && mode.entry.description && (
+          <p className="text-xs text-muted-foreground">{mode.entry.description}</p>
+        )}
+        <FieldGroup>
+          {/* Name */}
+          <form.Field name="name">
+            {(field) => (
+              <Field>
+                <FieldLabel>Server Name</FieldLabel>
+                <Input
+                  value={field.state.value}
+                  onChange={(e) => field.handleChange(e.target.value)}
+                  disabled={isCatalog || isEdit}
+                  placeholder="my-server"
+                />
+              </Field>
+            )}
+          </form.Field>
+
+          {/* Transport */}
+          {!isCatalog && (
+            <form.Field name="transport">
+              {(field) => (
+                <Field>
+                  <FieldLabel>Transport</FieldLabel>
+                  <Select
+                    value={field.state.value}
+                    onValueChange={(v) => {
+                      const next = v as 'stdio' | 'http';
+                      field.handleChange(next);
+                      if (next === 'http') {
+                        form.setFieldValue('selectedProviders', (prev) => {
+                          return prev.filter((id) => {
+                            const provider = providers.find((p) => p.id === id);
+                            return provider?.supportsHttp ?? true;
+                          });
+                        });
+                      }
+                    }}
+                  >
+                    <SelectTrigger>
+                      <SelectValue />
+                    </SelectTrigger>
+                    <SelectContent>
+                      <SelectItem value="stdio">stdio</SelectItem>
+                      <SelectItem value="http">http</SelectItem>
+                    </SelectContent>
+                  </Select>
+                </Field>
+              )}
+            </form.Field>
+          )}
+
+          {/* Transport-specific fields */}
+          <form.Subscribe selector={(state) => state.values.transport}>
+            {(transport) => (
+              <>
+                {transport === 'stdio' && (
+                  <>
+                    <form.Field name="command">
+                      {(field) => (
+                        <Field>
+                          <FieldLabel>Command</FieldLabel>
+                          <Input
+                            value={field.state.value}
+                            onChange={(e) => field.handleChange(e.target.value)}
+                            disabled={isCatalog}
+                            placeholder="npx"
+                          />
+                        </Field>
+                      )}
+                    </form.Field>
+                    <form.Field name="args">
+                      {(field) => (
+                        <Field>
+                          <FieldLabel>Arguments (one per line)</FieldLabel>
+                          <textarea
+                            value={field.state.value}
+                            onChange={(e) => field.handleChange(e.target.value)}
+                            disabled={isCatalog}
+                            placeholder={'-y\nmy-mcp-server'}
+                            rows={3}
+                            className="flex w-full rounded-md border border-input bg-background px-3 py-2 text-sm ring-offset-background placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50"
+                          />
+                        </Field>
+                      )}
+                    </form.Field>
+                  </>
+                )}
+
+                {transport === 'http' && (
+                  <form.Field name="url">
+                    {(field) => (
+                      <Field>
+                        <FieldLabel>URL</FieldLabel>
+                        <Input
+                          value={field.state.value}
+                          onChange={(e) => field.handleChange(e.target.value)}
+                          disabled={isCatalog}
+                          placeholder="https://mcp.example.com"
+                        />
+                      </Field>
+                    )}
+                  </form.Field>
+                )}
+              </>
+            )}
+          </form.Subscribe>
+
+          {/* Env vars — both transports */}
+          <form.Field name="envEntries">
+            {(field) => (
+              <KeyValueSection
+                label="Environment Variables"
+                entries={field.state.value}
+                onChange={(entries) => field.handleChange(entries)}
+                addLabel="+ Add env var"
+                makeId={makeId}
+                credentialKeys={credentialKeys}
+              />
+            )}
+          </form.Field>
+
+          {/* Headers — http only */}
+          <form.Subscribe selector={(state) => state.values.transport}>
+            {(transport) =>
+              transport === 'http' && (
+                <form.Field name="headerEntries">
+                  {(field) => (
+                    <KeyValueSection
+                      label="Headers"
+                      entries={field.state.value}
+                      onChange={(entries) => field.handleChange(entries)}
+                      addLabel="+ Add header"
+                      makeId={makeId}
+                      credentialKeys={credentialKeys}
+                    />
+                  )}
+                </form.Field>
+              )
+            }
+          </form.Subscribe>
+
+          {/* Providers */}
+          <form.Field name="selectedProviders">
+            {(field) => (
+              <form.Subscribe selector={(state) => state.values.transport}>
+                {(transport) => (
+                  <ProviderSelect
+                    providers={providers}
+                    selectedProviders={field.state.value}
+                    transport={transport}
+                    onToggle={(id) => {
+                      field.handleChange(
+                        field.state.value.includes(id)
+                          ? field.state.value.filter((value) => value !== id)
+                          : [...field.state.value, id]
+                      );
+                    }}
+                  />
+                )}
+              </form.Subscribe>
+            )}
+          </form.Field>
+        </FieldGroup>
+      </DialogContentArea>
+
+      {/* Actions */}
+      <DialogFooter className="gap-2 sm:gap-2">
+        {isEdit && onRemove && (
+          <Button
+            type="button"
+            variant="ghost"
+            size="sm"
+            className="text-destructive hover:text-destructive"
+            onClick={() => onRemove(form.state.values.name)}
+          >
+            <Trash2 className="mr-1.5 h-3.5 w-3.5" />
+            Remove
+          </Button>
+        )}
+        <form.Subscribe selector={(state) => state.values}>
+          {(values) => {
+            const canSave =
+              !!values.name.trim() &&
+              !saving &&
+              values.selectedProviders.length > 0 &&
+              !!(values.transport === 'http' ? values.url.trim() : values.command.trim());
+            return (
+              <ConfirmButton
+                type="button"
+                onClick={() => void handleSave()}
+                disabled={!canSave}
+                size="sm"
+              >
+                {saving ? (isEdit ? 'Saving...' : 'Adding...') : isEdit ? 'Save' : 'Add'}
+              </ConfirmButton>
+            );
+          }}
+        </form.Subscribe>
+      </DialogFooter>
+    </>
+  );
+};
+
+// ── Helpers ────────────────────────────────────────────────────────────────
+
+function getInitialState(mode: McpModalMode) {
+  if (mode.type === 'edit') {
+    const s = mode.server;
+    return {
+      name: s.name,
+      transport: s.transport,
+      command: s.command ?? '',
+      args: s.args?.join('\n') ?? '',
+      url: s.url ?? '',
+      env: Object.entries(s.env ?? {}),
+      headers: Object.entries(s.headers ?? {}),
+      providers: s.providers,
+    };
+  }
+  if (mode.type === 'add-catalog') {
+    const cfg = mode.entry.defaultConfig;
+    const isHttp = cfg.type === 'http' || ('url' in cfg && !('command' in cfg));
+    const clearPlaceholders = (entries: [string, string][]): [string, string][] =>
+      entries.map(([k, v]) => [k, typeof v === 'string' && v.startsWith('YOUR_') ? '' : v]);
+    return {
+      name: mode.entry.key,
+      transport: (isHttp ? 'http' : 'stdio') as 'stdio' | 'http',
+      command: (cfg.command as string) ?? '',
+      args: Array.isArray(cfg.args) ? (cfg.args as string[]).join('\n') : '',
+      url: (cfg.url as string) ?? '',
+      env: clearPlaceholders(Object.entries((cfg.env as Record<string, string>) ?? {})),
+      headers: clearPlaceholders(Object.entries((cfg.headers as Record<string, string>) ?? {})),
+      providers: [] as string[],
+    };
+  }
+  // add-custom
+  return {
+    name: '',
+    transport: 'stdio' as const,
+    command: '',
+    args: '',
+    url: '',
+    env: [] as [string, string][],
+    headers: [] as [string, string][],
+    providers: [] as string[],
+  };
+}
diff --git a/src/renderer/features/mcp/components/McpView.tsx b/src/renderer/features/mcp/components/McpView.tsx
new file mode 100644
index 0000000000..6aa0d738fe
--- /dev/null
+++ b/src/renderer/features/mcp/components/McpView.tsx
@@ -0,0 +1,154 @@
+import { Loader2, Plus, RefreshCw, Search } from 'lucide-react';
+import React, { useState } from 'react';
+import { useModalContext, useShowModal } from '@renderer/lib/modal/modal-provider';
+import { Button } from '@renderer/lib/ui/button';
+import { Input } from '@renderer/lib/ui/input';
+import { McpCard } from './McpCard';
+import type { McpModalMode } from './McpModal';
+import { useMcps } from './useMcps';
+
+export const McpView: React.FC = () => {
+  const {
+    installed,
+    catalog,
+    providers,
+    isLoading,
+    isRefreshing,
+    saveServer,
+    removeServer,
+    refresh,
+  } = useMcps();
+
+  const { showModal, closeModal } = useModalContext();
+  const showConfirm = useShowModal('confirmActionModal');
+  const [search, setSearch] = useState('');
+
+  const handleRemoveRequest = (serverName: string) => {
+    closeModal();
+    showConfirm({
+      title: 'Remove MCP server?',
+      description: `This will remove "${serverName}" from all agents. This action cannot be undone.`,
+      confirmLabel: 'Remove',
+      onSuccess: () => void removeServer(serverName),
+    });
+  };
+
+  const openModal = (mode: McpModalMode) => {
+    const source =
+      mode.type === 'add-catalog' ? 'catalog' : mode.type === 'add-custom' ? 'custom' : null;
+    showModal('mcpServerModal', {
+      mode,
+      providers,
+      onSave: (server) => saveServer(server, source),
+      onRemove: handleRemoveRequest,
+    });
+  };
+
+  // Filter
+  const lowerSearch = search.toLowerCase();
+  const installedNames = new Set(installed.map((s) => s.name));
+  const filteredInstalled = installed.filter(
+    (s) => !search || s.name.toLowerCase().includes(lowerSearch)
+  );
+  const filteredCatalog = catalog.filter(
+    (c) =>
+      !installedNames.has(c.key) &&
+      (!search ||
+        c.name.toLowerCase().includes(lowerSearch) ||
+        c.description.toLowerCase().includes(lowerSearch))
+  );
+
+  if (isLoading) {
+    return (
+      <div className="flex h-full items-center justify-center bg-background text-foreground">
+        <Loader2 className="h-6 w-6 animate-spin text-muted-foreground" />
+      </div>
+    );
+  }
+
+  return (
+    <div className="flex h-full flex-col overflow-y-auto bg-background text-foreground">
+      <div className="mx-auto w-full max-w-3xl px-8 py-8">
+        {/* Header */}
+        <div className="mb-6">
+          <h1 className="text-lg font-semibold">MCP</h1>
+          <p className="mt-1 text-xs text-muted-foreground">
+            Connect your agents with external data sources and tools
+          </p>
+        </div>
+
+        {/* Toolbar */}
+        <div className="mb-6 flex items-center gap-2">
+          <div className="relative flex-1">
+            <Search className="absolute left-2.5 top-1/2 h-4 w-4 -translate-y-1/2 text-muted-foreground" />
+            <Input
+              value={search}
+              onChange={(e) => setSearch(e.target.value)}
+              placeholder="Search servers..."
+              className="pl-9"
+            />
+          </div>
+          <Button
+            variant="ghost"
+            size="icon"
+            onClick={refresh}
+            disabled={isRefreshing}
+            aria-label="Refresh providers"
+          >
+            <RefreshCw
+              className={`h-4 w-4 text-muted-foreground ${isRefreshing ? 'animate-spin' : ''}`}
+            />
+          </Button>
+          <Button variant="outline" size="sm" onClick={() => openModal({ type: 'add-custom' })}>
+            <Plus className="mr-1.5 h-3.5 w-3.5" />
+            Custom MCP
+          </Button>
+        </div>
+
+        {/* Installed */}
+        {filteredInstalled.length > 0 && (
+          <div className="mb-6">
+            <h2 className="mb-3 text-xs font-medium tracking-wide text-muted-foreground">Added</h2>
+            <div className="grid grid-cols-1 gap-3 sm:grid-cols-2">
+              {filteredInstalled.map((server) => (
+                <McpCard
+                  key={server.name}
+                  server={server}
+                  catalogEntry={catalog.find((c) => c.key === server.name)}
+                  onEdit={(s) => openModal({ type: 'edit', server: s })}
+                />
+              ))}
+            </div>
+          </div>
+        )}
+
+        {/* Recommended */}
+        {filteredCatalog.length > 0 && (
+          <div className="mb-6">
+            <h2 className="mb-3 text-xs font-medium tracking-wide text-muted-foreground">
+              Recommended
+            </h2>
+            <div className="grid grid-cols-1 gap-3 sm:grid-cols-2">
+              {filteredCatalog.map((entry) => (
+                <McpCard
+                  key={entry.key}
+                  catalogEntry={entry}
+                  onEdit={() => {}}
+                  onAdd={(e) => openModal({ type: 'add-catalog', entry: e })}
+                />
+              ))}
+            </div>
+          </div>
+        )}
+
+        {filteredInstalled.length === 0 && filteredCatalog.length === 0 && (
+          <div className="py-12 text-center">
+            <p className="text-sm text-muted-foreground">
+              {search ? 'No servers match your search.' : 'No servers available.'}
+            </p>
+          </div>
+        )}
+      </div>
+    </div>
+  );
+};
diff --git a/src/renderer/features/mcp/components/ProviderSelect.tsx b/src/renderer/features/mcp/components/ProviderSelect.tsx
new file mode 100644
index 0000000000..a6ae65f873
--- /dev/null
+++ b/src/renderer/features/mcp/components/ProviderSelect.tsx
@@ -0,0 +1,79 @@
+import React from 'react';
+import { AgentProviderId } from '@shared/agent-provider-registry';
+import type { McpProvidersResponse } from '@shared/mcp/types';
+import AgentLogo from '@renderer/lib/components/agent-logo';
+import { Button } from '@renderer/lib/ui/button';
+import { Field, FieldLabel } from '@renderer/lib/ui/field';
+import { agentConfig } from '@renderer/utils/agentConfig';
+import { cn } from '@renderer/utils/utils';
+
+interface ProviderSelectProps {
+  providers: McpProvidersResponse[];
+  selectedProviders: string[];
+  transport: 'stdio' | 'http';
+  onToggle: (id: string) => void;
+}
+
+export const ProviderSelect: React.FC<ProviderSelectProps> = ({
+  providers,
+  selectedProviders,
+  transport,
+  onToggle,
+}) => {
+  const selectedProviderIds = new Set(selectedProviders);
+
+  return (
+    <Field>
+      <FieldLabel>Sync to agents</FieldLabel>
+      <div className="flex flex-wrap gap-2">
+        {providers
+          .filter((p) => p.installed)
+          .map((p) => {
+            const unsupported = transport === 'http' && !p.supportsHttp;
+            const selected = selectedProviderIds.has(p.id);
+            const logo = agentConfig[p.id as AgentProviderId];
+            return (
+              <Button
+                key={p.id}
+                type="button"
+                variant="outline"
+                size="sm"
+                disabled={unsupported}
+                aria-pressed={selected}
+                onClick={() => onToggle(p.id)}
+                title={unsupported ? `${p.name} does not support HTTP servers` : undefined}
+                className={cn(
+                  'gap-1.5 border transition-[border-color,background-color,color,box-shadow]',
+                  unsupported &&
+                    'cursor-not-allowed border-border/70 bg-background text-muted-foreground/40 shadow-none',
+                  !unsupported &&
+                    selected &&
+                    'border-primary bg-primary/10 text-foreground ring-1 ring-primary/30 shadow-sm hover:border-primary hover:bg-primary/12 hover:text-foreground',
+                  !unsupported &&
+                    !selected &&
+                    'border-border/85 bg-background text-muted-foreground hover:border-primary/45 hover:bg-background-1/70 hover:text-foreground'
+                )}
+              >
+                {logo && (
+                  <AgentLogo
+                    logo={logo.logo}
+                    alt={logo.alt}
+                    isSvg={logo.isSvg}
+                    invertInDark={logo.invertInDark}
+                    className="h-4 w-4 rounded-sm"
+                    grayscale={unsupported}
+                  />
+                )}
+                {p.name}
+              </Button>
+            );
+          })}
+      </div>
+      {transport === 'http' && providers.some((p) => p.installed && !p.supportsHttp) && (
+        <p className="mt-1.5 text-xs text-muted-foreground">
+          Some agents don't support HTTP servers and are disabled.
+        </p>
+      )}
+    </Field>
+  );
+};
diff --git a/src/renderer/features/mcp/components/useMcps.ts b/src/renderer/features/mcp/components/useMcps.ts
new file mode 100644
index 0000000000..d74cf9315c
--- /dev/null
+++ b/src/renderer/features/mcp/components/useMcps.ts
@@ -0,0 +1,124 @@
+import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
+import { useCallback } from 'react';
+import type { McpCatalogEntry, McpProvidersResponse, McpServer } from '@shared/mcp/types';
+import { useToast } from '@renderer/lib/hooks/use-toast';
+import { rpc } from '@renderer/lib/ipc';
+import { captureTelemetry } from '@renderer/utils/telemetryClient';
+
+const MCP_QUERY_KEY = ['mcp', 'all'] as const;
+const PROVIDERS_QUERY_KEY = ['mcp', 'providers'] as const;
+
+export function useMcps() {
+  const { toast } = useToast();
+  const queryClient = useQueryClient();
+
+  // ── Queries ──────────────────────────────────────────────────────────
+
+  const {
+    data: mcpData,
+    isPending: isLoading,
+    refetch: reload,
+  } = useQuery({
+    queryKey: MCP_QUERY_KEY,
+    queryFn: async () => {
+      const result = await rpc.mcp.loadAll();
+      if (result.success && result.data) return result.data;
+      throw new Error(result.error ?? 'Failed to load MCP servers');
+    },
+  });
+
+  const installed: McpServer[] = mcpData?.installed ?? [];
+  const catalog: McpCatalogEntry[] = mcpData?.catalog ?? [];
+
+  const { data: providers = [] } = useQuery({
+    queryKey: PROVIDERS_QUERY_KEY,
+    queryFn: async () => {
+      const result = await rpc.mcp.getProviders();
+      if (result.success && result.data) return result.data as McpProvidersResponse[];
+      throw new Error(result.error ?? 'Failed to get providers');
+    },
+  });
+
+  // ── Mutations ────────────────────────────────────────────────────────
+
+  const saveMutation = useMutation({
+    mutationFn: async (payload: { server: McpServer; source: 'catalog' | 'custom' | null }) => {
+      const result = await rpc.mcp.saveServer(payload.server);
+      if (!result.success) throw new Error(result.error ?? 'Failed to save server');
+    },
+    onSuccess: (_, payload) => {
+      if (payload.source) {
+        captureTelemetry('mcp_server_added', { source: payload.source });
+      }
+      queryClient.invalidateQueries({ queryKey: MCP_QUERY_KEY });
+    },
+    onError: (error) => {
+      toast({
+        title: 'Failed to save server',
+        description: error.message,
+        variant: 'destructive',
+      });
+    },
+  });
+
+  const saveServer = useCallback(
+    async (server: McpServer, source: 'catalog' | 'custom' | null = null) => {
+      await saveMutation.mutateAsync({ server, source });
+    },
+    [saveMutation]
+  );
+
+  const removeMutation = useMutation({
+    mutationFn: async (serverName: string) => {
+      const result = await rpc.mcp.removeServer(serverName);
+      if (!result.success) throw new Error(result.error ?? 'Failed to remove server');
+    },
+    onSuccess: () => {
+      captureTelemetry('mcp_server_removed');
+      queryClient.invalidateQueries({ queryKey: MCP_QUERY_KEY });
+    },
+    onError: (error) => {
+      toast({
+        title: 'Failed to remove server',
+        description: error.message,
+        variant: 'destructive',
+      });
+    },
+  });
+
+  const removeServer = useCallback(
+    async (serverName: string) => {
+      await removeMutation.mutateAsync(serverName);
+    },
+    [removeMutation]
+  );
+
+  const refreshMutation = useMutation({
+    mutationFn: async () => {
+      const result = await rpc.mcp.refreshProviders();
+      if (result.success && result.data) return result.data as McpProvidersResponse[];
+      throw new Error(result.error ?? 'Failed to refresh providers');
+    },
+    onSuccess: (data) => {
+      queryClient.setQueryData(PROVIDERS_QUERY_KEY, data);
+      queryClient.invalidateQueries({ queryKey: MCP_QUERY_KEY });
+    },
+    onError: () => {
+      toast({ title: 'Failed to refresh MCP data', variant: 'destructive' });
+    },
+  });
+
+  const refresh = useCallback(() => refreshMutation.mutate(), [refreshMutation]);
+
+  return {
+    installed,
+    catalog,
+    providers,
+    isLoading,
+    isRefreshing: refreshMutation.isPending,
+    saveServer,
+    removeServer,
+    refresh,
+    reload,
+  };
+}
diff --git a/src/renderer/features/mcp/mcp-view.tsx b/src/renderer/features/mcp/mcp-view.tsx
new file mode 100644
index 0000000000..ab3615c077
--- /dev/null
+++ b/src/renderer/features/mcp/mcp-view.tsx
@@ -0,0 +1,15 @@
+import { McpView } from '@renderer/features/mcp/components/McpView';
+import { Titlebar } from '@renderer/lib/components/titlebar/Titlebar';
+
+export function McpTitlebar() {
+  return <Titlebar />;
+}
+
+export function McpMainPanel() {
+  return <McpView />;
+}
+
+export const mcpView = {
+  TitlebarSlot: McpTitlebar,
+  MainPanel: McpMainPanel,
+};
diff --git a/src/renderer/features/onboarding/import-step.tsx b/src/renderer/features/onboarding/import-step.tsx
new file mode 100644
index 0000000000..6b6fab26f0
--- /dev/null
+++ b/src/renderer/features/onboarding/import-step.tsx
@@ -0,0 +1,144 @@
+import { Import } from 'lucide-react';
+import { useEffect, useRef, useState } from 'react';
+import { useLegacyPortImport, useLegacyPortPreview } from '@renderer/lib/hooks/useLegacyPort';
+import { Button } from '@renderer/lib/ui/button';
+
+const PROGRESS_DURATION_MS = 4000;
+const COMPLETE_DELAY_MS = 1000;
+
+export function ImportStep({ onComplete }: { onComplete: () => void }) {
+  const { data: preview, isLoading: previewLoading } = useLegacyPortPreview(true);
+  const importMutation = useLegacyPortImport();
+
+  const [isImporting, setIsImporting] = useState(false);
+  const [progress, setProgress] = useState(0);
+  const [importError, setImportError] = useState<string | null>(null);
+
+  const onCompleteRef = useRef(onComplete);
+  useEffect(() => {
+    onCompleteRef.current = onComplete;
+  }, [onComplete]);
+
+  const animationRef = useRef<number | null>(null);
+  const completeTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
+  const importDoneRef = useRef(false);
+  const animationDoneRef = useRef(false);
+
+  useEffect(() => {
+    return () => {
+      if (animationRef.current !== null) cancelAnimationFrame(animationRef.current);
+      if (completeTimerRef.current !== null) clearTimeout(completeTimerRef.current);
+    };
+  }, []);
+
+  const maybeScheduleComplete = () => {
+    if (importDoneRef.current && animationDoneRef.current && completeTimerRef.current === null) {
+      completeTimerRef.current = setTimeout(() => {
+        onCompleteRef.current();
+      }, COMPLETE_DELAY_MS);
+    }
+  };
+
+  const startAnimation = () => {
+    const startTime = performance.now();
+
+    const tick = (now: number) => {
+      const elapsed = now - startTime;
+      const pct = Math.min(elapsed / PROGRESS_DURATION_MS, 1);
+      setProgress(Math.round(pct * 100));
+
+      if (pct < 1) {
+        animationRef.current = requestAnimationFrame(tick);
+      } else {
+        animationRef.current = null;
+        animationDoneRef.current = true;
+        maybeScheduleComplete();
+      }
+    };
+
+    animationRef.current = requestAnimationFrame(tick);
+  };
+
+  const handleImport = async () => {
+    setImportError(null);
+    setIsImporting(true);
+    setProgress(0);
+    importDoneRef.current = false;
+    animationDoneRef.current = false;
+    completeTimerRef.current = null;
+
+    startAnimation();
+
+    try {
+      const result = await importMutation.mutateAsync();
+      if (!result.success) {
+        if (animationRef.current !== null) {
+          cancelAnimationFrame(animationRef.current);
+          animationRef.current = null;
+        }
+        setImportError(result.error ?? 'Import failed');
+        setIsImporting(false);
+        setProgress(0);
+        return;
+      }
+      importDoneRef.current = true;
+      maybeScheduleComplete();
+    } catch (err) {
+      if (animationRef.current !== null) {
+        cancelAnimationFrame(animationRef.current);
+        animationRef.current = null;
+      }
+      setImportError(err instanceof Error ? err.message : 'Import failed');
+      setIsImporting(false);
+      setProgress(0);
+    }
+  };
+
+  const projectCount = preview?.projects ?? 0;
+  const taskCount = preview?.tasks ?? 0;
+
+  return (
+    <div className="flex flex-col space-y-8 max-w-sm w-full">
+      <div className="flex flex-col items-center justify-center gap-4">
+        <div className="flex flex-col items-center justify-center gap-6">
+          <Import className="h-10 w-10" absoluteStrokeWidth strokeWidth={1.5} />
+          <div className="flex flex-col items-center justify-center gap-2">
+            <h1 className="text-xl text-center">Import your Emdash v0 data</h1>
+            {previewLoading ? (
+              <p className="text-md text-foreground-muted text-center">
+                Scanning legacy database...
+              </p>
+            ) : (
+              <p className="text-md text-foreground-muted text-center">
+                Found <span className="text-foreground font-medium">{projectCount}</span>{' '}
+                {projectCount === 1 ? 'project' : 'projects'} and{' '}
+                <span className="text-foreground font-medium">{taskCount}</span>{' '}
+                {taskCount === 1 ? 'task' : 'tasks'} from your previous Emdash installation
+              </p>
+            )}
+          </div>
+        </div>
+      </div>
+
+      {isImporting && (
+        <div className="flex flex-col gap-2">
+          <div className="w-full h-2 bg-background-1 rounded-full overflow-hidden">
+            <div className="h-full bg-foreground rounded-full" style={{ width: `${progress}%` }} />
+          </div>
+          <p className="text-xs text-foreground-muted text-center">{progress}%</p>
+        </div>
+      )}
+
+      {importError && <p className="text-sm text-destructive text-center">{importError}</p>}
+
+      <div className="flex flex-col w-full gap-2">
+        <Button size={'lg'} onClick={handleImport} disabled={isImporting || previewLoading}>
+          {isImporting ? 'Importing...' : 'Import data'}
+        </Button>
+        <Button variant="ghost" onClick={onComplete} disabled={isImporting}>
+          Skip
+        </Button>
+      </div>
+    </div>
+  );
+}
diff --git a/src/renderer/features/onboarding/onboarding-shell.tsx b/src/renderer/features/onboarding/onboarding-shell.tsx
new file mode 100644
index 0000000000..ee0feed647
--- /dev/null
+++ b/src/renderer/features/onboarding/onboarding-shell.tsx
@@ -0,0 +1,85 @@
+import { useState } from 'react';
+import { cn } from '@renderer/utils/utils';
+import { ImportStep } from './import-step';
+import { SignInStep } from './sign-in-step';
+
+type OnboardingStep = 'sign-in' | 'import';
+
+const stepConfig: Record<
+  OnboardingStep,
+  { label: string; component: React.ComponentType<{ onComplete: () => void }> }
+> = {
+  'sign-in': {
+    label: 'Sign in',
+    component: SignInStep,
+  },
+  import: {
+    label: 'Import',
+    component: ImportStep,
+  },
+};
+
+function StepHeader({
+  label,
+  isActive,
+  onClick,
+  isLast,
+}: {
+  label: string;
+  isActive: boolean;
+  onClick: () => void;
+  isLast: boolean;
+}) {
+  return (
+    <button
+      className={cn(
+        'text-md border-r py-3 px-5 hover:bg-background-1/50',
+        isActive ? 'text-primary bg-background-1 hover:bg-background-1' : 'text-foreground-muted',
+        isLast && 'border-r-0'
+      )}
+      onClick={onClick}
+    >
+      {label}
+    </button>
+  );
+}
+
+export function OnboardingShell({
+  steps,
+  onComplete,
+}: {
+  steps: OnboardingStep[];
+  onComplete: () => void;
+}) {
+  const [activeIndex, setActiveIndex] = useState(0);
+  const activeStep = steps[activeIndex];
+  const StepComponent = stepConfig[activeStep]?.component;
+
+  const handleStepComplete = () => {
+    const nextIndex = activeIndex + 1;
+    if (nextIndex >= steps.length) {
+      onComplete();
+    } else {
+      setActiveIndex(nextIndex);
+    }
+  };
+
+  return (
+    <div className="flex flex-col items-start justify-center max-w-5xl mx-auto w-full h-full max-h-[70vh] [-webkit-app-region:no-drag]">
+      <div className="flex flex-row border border-b-0">
+        {steps.map((step, index) => (
+          <StepHeader
+            key={step}
+            label={stepConfig[step].label}
+            isLast={index === steps.length - 1}
+            isActive={step === activeStep}
+            onClick={() => setActiveIndex(index)}
+          />
+        ))}
+      </div>
+      <div className="flex flex-col items-center justify-center h-full w-full border bg-background-1">
+        <StepComponent onComplete={handleStepComplete} />
+      </div>
+    </div>
+  );
+}
diff --git a/src/renderer/features/onboarding/onboarding.tsx b/src/renderer/features/onboarding/onboarding.tsx
new file mode 100644
index 0000000000..1fc5e557de
--- /dev/null
+++ b/src/renderer/features/onboarding/onboarding.tsx
@@ -0,0 +1,20 @@
+import { useState } from 'react';
+import { OnboardingShell } from './onboarding-shell';
+
+type OnboardingStep = 'sign-in' | 'import';
+
+export function Onboarding({
+  steps: initialSteps,
+  onComplete,
+}: {
+  steps: OnboardingStep[];
+  onComplete: () => void;
+}) {
+  const [steps] = useState(initialSteps);
+
+  return (
+    <div className="flex flex-col items-center justify-center h-full w-full [-webkit-app-region:drag]">
+      <OnboardingShell steps={steps} onComplete={onComplete} />
+    </div>
+  );
+}
diff --git a/src/renderer/features/onboarding/sign-in-step.tsx b/src/renderer/features/onboarding/sign-in-step.tsx
new file mode 100644
index 0000000000..eca9d96ea7
--- /dev/null
+++ b/src/renderer/features/onboarding/sign-in-step.tsx
@@ -0,0 +1,89 @@
+import { CheckCircle, Github, LogIn, User } from 'lucide-react';
+import { useState } from 'react';
+import { useAccountSession, useAccountSignIn } from '@renderer/lib/hooks/useAccount';
+import { Button } from '@renderer/lib/ui/button';
+
+export function SignInStep({ onComplete }: { onComplete: () => void }) {
+  const { data: session, isLoading: sessionLoading } = useAccountSession();
+  const signInMutation = useAccountSignIn();
+  const [error, setError] = useState<string | null>(null);
+
+  const handleSignIn = async () => {
+    setError(null);
+    try {
+      const result = await signInMutation.mutateAsync(undefined);
+      if (!result.success) {
+        setError(result.error || 'Sign in failed');
+        return;
+      }
+      onComplete();
+    } catch (err) {
+      setError(err instanceof Error ? err.message : 'Sign in failed');
+    }
+  };
+
+  if (sessionLoading) {
+    return (
+      <div className="flex items-center justify-center py-12 text-sm text-foreground-muted">
+        Loading...
+      </div>
+    );
+  }
+
+  if (session?.isSignedIn && session.user) {
+    const { user } = session;
+    return (
+      <div className="flex flex-col space-y-8 max-w-sm">
+        <div className="flex flex-col items-center justify-center gap-6">
+          <div className="relative">
+            {user.avatarUrl ? (
+              <img
+                src={user.avatarUrl}
+                alt={user.username}
+                className="h-14 w-14 rounded-full border border-border"
+              />
+            ) : (
+              <div className="flex h-14 w-14 items-center justify-center rounded-full border border-border bg-background-1">
+                <User className="h-7 w-7 text-foreground-muted" />
+              </div>
+            )}
+            <CheckCircle className="absolute -bottom-1 -right-1 h-5 w-5 text-primary fill-background" />
+          </div>
+          <div className="flex flex-col items-center justify-center gap-1">
+            <h1 className="text-xl text-center">Connected as @{user.username}</h1>
+            {user.email && (
+              <p className="text-sm text-foreground-muted text-center">{user.email}</p>
+            )}
+          </div>
+        </div>
+        <Button size={'lg'} onClick={onComplete}>
+          Continue
+        </Button>
+      </div>
+    );
+  }
+
+  return (
+    <div className="flex flex-col space-y-8 max-w-sm">
+      <div className="flex flex-col items-center justify-center gap-6">
+        <Github className="h-10 w-10" absoluteStrokeWidth strokeWidth={1.5} />
+        <div className="flex flex-col items-center justify-center gap-2">
+          <h1 className="text-xl text-center">Connect your GitHub account to Emdash</h1>
+          <p className="text-md text-foreground-muted text-center">
+            This will allow you to work with your GitHub repositories in Emdash
+          </p>
+        </div>
+      </div>
+      {error && <p className="text-sm text-destructive text-center">{error}</p>}
+      <div className="flex flex-col w-full gap-2">
+        <Button size={'lg'} onClick={handleSignIn} disabled={signInMutation.isPending}>
+          <LogIn className="h-4 w-4" />
+          {signInMutation.isPending ? 'Signing in...' : 'Sign in with GitHub'}
+        </Button>
+        <Button variant="ghost" onClick={onComplete} disabled={signInMutation.isPending}>
+          Skip
+        </Button>
+      </div>
+    </div>
+  );
+}
diff --git a/src/renderer/features/projects/components/add-project-modal/add-project-modal.tsx b/src/renderer/features/projects/components/add-project-modal/add-project-modal.tsx
new file mode 100644
index 0000000000..4adbdf29d7
--- /dev/null
+++ b/src/renderer/features/projects/components/add-project-modal/add-project-modal.tsx
@@ -0,0 +1,318 @@
+import { useQuery } from '@tanstack/react-query';
+import { Home, Server } from 'lucide-react';
+import { observer } from 'mobx-react-lite';
+import { useMemo, useState } from 'react';
+import { SshConnectionSelector } from '@renderer/features/projects/components/add-project-modal/ssh-connection-selector';
+import { getProjectManagerStore } from '@renderer/features/projects/stores/project-selectors';
+import { useAppSettingsKey } from '@renderer/features/settings/use-app-settings-key';
+import { rpc } from '@renderer/lib/ipc';
+import { useNavigate } from '@renderer/lib/layout/navigation-provider';
+import { useShowModal, type BaseModalProps } from '@renderer/lib/modal/modal-provider';
+import { useGithubContext } from '@renderer/lib/providers/github-context-provider';
+import { appState } from '@renderer/lib/stores/app-state';
+import { ConfirmButton } from '@renderer/lib/ui/confirm-button';
+import {
+  DialogContentArea,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+} from '@renderer/lib/ui/dialog';
+import { Field, FieldLabel } from '@renderer/lib/ui/field';
+import { ModalLayout } from '@renderer/lib/ui/modal-layout';
+import { ToggleGroup, ToggleGroupItem } from '@renderer/lib/ui/toggle-group';
+import { Tooltip, TooltipContent, TooltipTrigger } from '@renderer/lib/ui/tooltip';
+import { log } from '@renderer/utils/logger';
+import { ClonePanel, CreateNewPanel, PickExistingPanel } from './content';
+import { useCloneMode, useNewMode, usePickMode } from './modes';
+
+export type Strategy = 'local' | 'ssh';
+
+export type Mode = 'pick' | 'new' | 'clone';
+
+export interface BaseModeData {
+  name: string;
+  path: string;
+  initGitRepository?: boolean;
+}
+
+export interface NewModeData extends BaseModeData {
+  repositoryName: string;
+  repositoryOwner: string;
+  repositoryVisibility: 'public' | 'private';
+}
+
+export interface CloneModeData extends BaseModeData {
+  repositoryUrl: string;
+}
+
+export type ModeData = BaseModeData | NewModeData | CloneModeData;
+
+export interface AddProjectModalProps extends BaseModalProps<void> {
+  strategy?: Strategy;
+  mode?: Mode;
+  connectionId?: string;
+}
+
+export const AddProjectModal = observer(function AddProjectModal({
+  strategy: strategyProp,
+  mode: modeProp,
+  onClose,
+  connectionId: connectionIdProp,
+}: AddProjectModalProps) {
+  const [strategy, setStrategy] = useState<Strategy>(strategyProp ?? 'local');
+  const [mode, setMode] = useState<Mode>(modeProp ?? 'pick');
+  const [connectionId, setConnectionId] = useState<string | undefined>(connectionIdProp);
+  const { connections } = appState.sshConnections;
+  const availableConnectionIds = useMemo(
+    () =>
+      connections.map((connection) => connection.id).filter((id): id is string => id !== undefined),
+    [connections]
+  );
+  const selectedConnectionId =
+    strategy === 'ssh' ? (connectionId ?? availableConnectionIds[0]) : connectionId;
+
+  const { navigate } = useNavigate();
+  const { isInitialized, needsGhAuth } = useGithubContext();
+
+  const showSshConnModal = useShowModal('addSshConnModal');
+  const showAddProjectModal = useShowModal('addProjectModal');
+
+  const handleAddConnection = () => {
+    showSshConnModal({
+      onSuccess: ({ connectionId: newId }) =>
+        showAddProjectModal({
+          strategy: 'ssh',
+          mode,
+          connectionId: newId,
+        }),
+      onClose: () =>
+        showAddProjectModal({
+          strategy: 'ssh',
+          mode,
+        }),
+    });
+  };
+
+  const handleEditConnection = (id: string) => {
+    const conn = appState.sshConnections.connections.find((c) => c.id === id);
+    if (!conn) return;
+    showSshConnModal({
+      initialConfig: conn,
+      onSuccess: () =>
+        showAddProjectModal({
+          strategy: 'ssh',
+          mode,
+          connectionId: id,
+        }),
+      onClose: () =>
+        showAddProjectModal({
+          strategy: 'ssh',
+          mode,
+          connectionId: id,
+        }),
+    });
+  };
+
+  const { value: localProjectSettings } = useAppSettingsKey('localProject');
+  const defaultPath =
+    strategy === 'local' ? (localProjectSettings?.defaultProjectsDirectory ?? '') : '';
+
+  const pickState = usePickMode();
+  const newState = useNewMode(defaultPath);
+  const cloneState = useCloneMode(defaultPath);
+  const showGithubAuthDisclaimer = mode === 'new' && isInitialized && needsGhAuth;
+
+  const activeMode = { pick: pickState, new: newState, clone: cloneState }[mode];
+  const shouldCheckPickPathStatus =
+    mode === 'pick' &&
+    pickState.path.trim().length > 0 &&
+    (strategy === 'local' || !!selectedConnectionId);
+  const pickPathStatusQuery = useQuery({
+    queryKey: ['projectPathStatus', strategy, selectedConnectionId, pickState.path],
+    queryFn: () =>
+      strategy === 'ssh'
+        ? rpc.projects.getSshProjectPathStatus(pickState.path, selectedConnectionId!)
+        : rpc.projects.getLocalProjectPathStatus(pickState.path),
+    enabled: shouldCheckPickPathStatus,
+  });
+  const requiresGitInitialization =
+    mode === 'pick' &&
+    pickPathStatusQuery.data?.isDirectory === true &&
+    pickPathStatusQuery.data.isGitRepo === false;
+  const isCheckingPickPathStatus = shouldCheckPickPathStatus && pickPathStatusQuery.isPending;
+
+  const canCreate =
+    activeMode.isValid &&
+    (strategy === 'local' || !!selectedConnectionId) &&
+    !isCheckingPickPathStatus &&
+    (!requiresGitInitialization || pickState.initGitRepository);
+
+  const handleSubmit = async () => {
+    try {
+      if (strategy === 'local') {
+        const project = await rpc.projects.getLocalProjectByPath(pickState.path);
+        if (project) {
+          navigate('project', { projectId: project.id });
+          onClose();
+          return;
+        }
+      }
+      if (strategy === 'ssh') {
+        const project = await rpc.projects.getSshProjectByPath(
+          pickState.path,
+          selectedConnectionId!
+        );
+        if (project) {
+          navigate('project', { projectId: project.id });
+          onClose();
+          return;
+        }
+      }
+    } catch (e) {
+      log.error(e);
+    }
+
+    const id = crypto.randomUUID();
+    const projectType =
+      strategy === 'ssh' && selectedConnectionId
+        ? { type: 'ssh' as const, connectionId: selectedConnectionId }
+        : { type: 'local' as const };
+
+    switch (mode) {
+      case 'pick':
+        void getProjectManagerStore().createProject(
+          projectType,
+          {
+            mode: 'pick',
+            name: pickState.name,
+            path: pickState.path,
+            initGitRepository: pickState.initGitRepository,
+          },
+          id
+        );
+        break;
+      case 'new':
+        void getProjectManagerStore().createProject(
+          projectType,
+          {
+            mode: 'new',
+            name: newState.name,
+            path: newState.path,
+            repositoryName: newState.repositoryName,
+            repositoryOwner: newState.repositoryOwner?.value ?? '',
+            repositoryVisibility: newState.repositoryVisibility,
+          },
+          id
+        );
+        break;
+      case 'clone':
+        void getProjectManagerStore().createProject(
+          projectType,
+          {
+            mode: 'clone',
+            name: cloneState.name,
+            path: cloneState.path,
+            repositoryUrl: cloneState.repositoryUrl,
+          },
+          id
+        );
+        break;
+    }
+    onClose();
+    navigate('project', { projectId: id });
+  };
+
+  return (
+    <ModalLayout
+      header={
+        <DialogHeader>
+          <DialogTitle>Add Project</DialogTitle>
+        </DialogHeader>
+      }
+      footer={
+        <DialogFooter>
+          <ConfirmButton type="button" onClick={() => void handleSubmit()} disabled={!canCreate}>
+            Create
+          </ConfirmButton>
+        </DialogFooter>
+      }
+    >
+      <DialogContentArea className="gap-4">
+        <div className="flex items-center gap-2">
+          <ToggleGroup
+            className="w-full flex-1"
+            value={[mode]}
+            onValueChange={([value]) => {
+              if (value) setMode(value as Mode);
+            }}
+          >
+            <ToggleGroupItem value="pick" className="flex-1">
+              Pick
+            </ToggleGroupItem>
+            <ToggleGroupItem value="new" className="flex-1">
+              New
+            </ToggleGroupItem>
+            <ToggleGroupItem value="clone" className="flex-1">
+              Clone
+            </ToggleGroupItem>
+          </ToggleGroup>
+          <ToggleGroup
+            value={[strategy]}
+            onValueChange={([value]) => {
+              if (value) setStrategy(value as Strategy);
+            }}
+            size="sm"
+          >
+            <Tooltip>
+              <TooltipTrigger>
+                <ToggleGroupItem value="local" aria-label="Local" className="rounded-l-md">
+                  <Home className="size-3.5" />
+                </ToggleGroupItem>
+              </TooltipTrigger>
+              <TooltipContent>Local</TooltipContent>
+            </Tooltip>
+            <Tooltip>
+              <TooltipTrigger>
+                <ToggleGroupItem value="ssh" aria-label="SSH" className="rounded-r-md">
+                  <Server className="size-3.5" />
+                </ToggleGroupItem>
+              </TooltipTrigger>
+              <TooltipContent>SSH</TooltipContent>
+            </Tooltip>
+          </ToggleGroup>
+        </div>
+        {strategy === 'ssh' && !showGithubAuthDisclaimer && (
+          <Field>
+            <FieldLabel>SSH Connection</FieldLabel>
+            <SshConnectionSelector
+              connectionId={selectedConnectionId}
+              onConnectionIdChange={setConnectionId}
+              onAddConnection={handleAddConnection}
+              onEditConnection={handleEditConnection}
+            />
+          </Field>
+        )}
+        {mode === 'pick' && (
+          <PickExistingPanel
+            strategy={strategy}
+            connectionId={selectedConnectionId}
+            state={pickState}
+            showInitializeGitPrompt={requiresGitInitialization}
+          />
+        )}
+        {mode === 'new' && (
+          <CreateNewPanel
+            strategy={strategy}
+            connectionId={selectedConnectionId}
+            state={newState}
+            showGithubAuthDisclaimer={showGithubAuthDisclaimer}
+            onOpenAccountSettings={() => navigate('settings', { tab: 'account' })}
+          />
+        )}
+        {mode === 'clone' && (
+          <ClonePanel strategy={strategy} connectionId={selectedConnectionId} state={cloneState} />
+        )}
+      </DialogContentArea>
+    </ModalLayout>
+  );
+});
diff --git a/src/renderer/features/projects/components/add-project-modal/button-card.tsx b/src/renderer/features/projects/components/add-project-modal/button-card.tsx
new file mode 100644
index 0000000000..268fc5be22
--- /dev/null
+++ b/src/renderer/features/projects/components/add-project-modal/button-card.tsx
@@ -0,0 +1,31 @@
+import { ButtonHTMLAttributes, forwardRef } from 'react';
+import { cn } from '@renderer/utils/utils';
+
+interface ButtonCardProps extends ButtonHTMLAttributes<HTMLButtonElement> {}
+
+export const ButtonCard = forwardRef<HTMLButtonElement, ButtonCardProps>(
+  ({ children, className, ...props }, ref) => {
+    return (
+      <button
+        ref={ref}
+        className={cn(
+          'w-full border border-border rounded-md p-4 hover:bg-muted/30 transition-colors flex flex-col items-center justify-center gap-2 data-active:shadow-sm data-active:text-primary text-muted-foreground data-active:bg-muted/40 data-active:border-primary/40',
+          className
+        )}
+        {...props}
+      >
+        {children}
+      </button>
+    );
+  }
+);
+
+export function ButtonCardGroup({
+  children,
+  className,
+}: {
+  children: React.ReactNode;
+  className?: string;
+}) {
+  return <div className={cn('flex flex-col gap-2', className)}>{children}</div>;
+}
diff --git a/src/renderer/features/projects/components/add-project-modal/content.tsx b/src/renderer/features/projects/components/add-project-modal/content.tsx
new file mode 100644
index 0000000000..4df055b87a
--- /dev/null
+++ b/src/renderer/features/projects/components/add-project-modal/content.tsx
@@ -0,0 +1,223 @@
+import { ChevronsUpDownIcon } from 'lucide-react';
+import { GithubAuthDisclaimer } from '@renderer/features/integrations/components/github-auth-disclaimer';
+import { ComboboxTrigger, ComboboxValue } from '@renderer/lib/ui/combobox';
+import { ComboboxPopover } from '@renderer/lib/ui/combobox-popover';
+import { Field, FieldGroup, FieldLabel } from '@renderer/lib/ui/field';
+import { Input } from '@renderer/lib/ui/input';
+import { Label } from '@renderer/lib/ui/label';
+import { RadioGroup, RadioGroupItem } from '@renderer/lib/ui/radio-group';
+import { Separator } from '@renderer/lib/ui/separator';
+import { Switch } from '@renderer/lib/ui/switch';
+import { Strategy } from './add-project-modal';
+import { LocalDirectorySelector } from './local-directory-selector';
+import { CloneModeState, NewModeState, PickModeState } from './modes';
+import { RemoteDirectorySelector } from './remote-directory-selector';
+
+export function PickExistingPanel({
+  strategy,
+  connectionId,
+  state,
+  showInitializeGitPrompt,
+}: {
+  strategy: Strategy;
+  connectionId?: string;
+  state: PickModeState;
+  showInitializeGitPrompt: boolean;
+}) {
+  return (
+    <FieldGroup>
+      <Field>
+        <FieldLabel>Directory</FieldLabel>
+        {strategy === 'local' ? (
+          <LocalDirectorySelector
+            path={state.path}
+            onPathChange={state.handlePathChange}
+            title="Select a local project"
+            message="Select a project directory to open"
+          />
+        ) : (
+          <RemoteDirectorySelector
+            connectionId={connectionId}
+            value={state.path}
+            onChange={state.handlePathChange}
+          />
+        )}
+      </Field>
+      <Field>
+        <FieldLabel>Name</FieldLabel>
+        <Input
+          placeholder="Enter a project name"
+          value={state.name}
+          onChange={(e) => state.handleNameChange(e.target.value)}
+        />
+      </Field>
+      {showInitializeGitPrompt && (
+        <div className="overflow-hidden rounded-md border border-border">
+          <p className="border-b border-border bg-background-1 px-2 py-1 text-xs text-foreground-muted">
+            This directory is not a git repository.
+          </p>
+          <div className="p-2">
+            <Field orientation="horizontal">
+              <Switch
+                checked={state.initGitRepository}
+                onCheckedChange={state.setinitGitRepository}
+              />
+              <FieldLabel>Initialize git repository</FieldLabel>
+            </Field>
+          </div>
+        </div>
+      )}
+    </FieldGroup>
+  );
+}
+
+export function CreateNewPanel({
+  strategy,
+  connectionId,
+  state,
+  showGithubAuthDisclaimer,
+  onOpenAccountSettings,
+}: {
+  strategy: Strategy;
+  connectionId?: string;
+  state: NewModeState;
+  showGithubAuthDisclaimer: boolean;
+  onOpenAccountSettings: () => void;
+}) {
+  if (showGithubAuthDisclaimer) {
+    return <GithubAuthDisclaimer onOpenAccountSettings={onOpenAccountSettings} />;
+  }
+
+  return (
+    <div className="flex flex-col gap-6">
+      <FieldGroup>
+        <Field>
+          <FieldLabel>Repository Name</FieldLabel>
+          <Input
+            autoFocus
+            placeholder="Enter a repository name"
+            value={state.repositoryName}
+            onChange={(e) => state.handleRepositoryNameChange(e.target.value)}
+          />
+        </Field>
+        <Field>
+          <FieldLabel>Owner</FieldLabel>
+          <ComboboxPopover
+            trigger={
+              <ComboboxTrigger
+                render={
+                  <button className="flex h-9 w-full min-w-0 items-center justify-between rounded-md border border-border px-2.5 py-1 text-left text-sm outline-none">
+                    <ComboboxValue />
+                    <ChevronsUpDownIcon className="size-4 shrink-0 text-muted-foreground" />
+                  </button>
+                }
+              />
+            }
+            items={state.owners}
+            defaultValue={state.repositoryOwner}
+            value={state.repositoryOwner ?? null}
+            onValueChange={state.handleOwnerChange}
+          />
+        </Field>
+        <Field>
+          <FieldLabel>Privacy</FieldLabel>
+          <RadioGroup
+            value={state.repositoryVisibility}
+            onValueChange={(value) => state.setRepositoryVisibility(value as 'public' | 'private')}
+          >
+            <div className="flex items-center gap-3">
+              <RadioGroupItem value="private" />
+              <Label className="cursor-pointer font-normal">Private</Label>
+            </div>
+            <div className="flex items-center gap-3">
+              <RadioGroupItem value="public" />
+              <Label className="cursor-pointer font-normal">Public</Label>
+            </div>
+          </RadioGroup>
+        </Field>
+      </FieldGroup>
+      <Separator className="w-full" />
+      <FieldGroup>
+        <Field>
+          <FieldLabel>Project Name</FieldLabel>
+          <Input
+            placeholder="Enter a project name"
+            value={state.name}
+            onChange={(e) => state.handleNameChange(e.target.value)}
+          />
+        </Field>
+        <Field>
+          <FieldLabel>{strategy === 'local' ? 'Project Directory' : 'Remote Directory'}</FieldLabel>
+          {strategy === 'local' ? (
+            <LocalDirectorySelector
+              path={state.path}
+              onPathChange={state.setPath}
+              title="Select a local project"
+              message="Select a project directory to open"
+            />
+          ) : (
+            <RemoteDirectorySelector
+              connectionId={connectionId}
+              value={state.path}
+              onChange={state.setPath}
+            />
+          )}
+        </Field>
+      </FieldGroup>
+    </div>
+  );
+}
+
+export function ClonePanel({
+  strategy,
+  connectionId,
+  state,
+}: {
+  strategy: Strategy;
+  connectionId?: string;
+  state: CloneModeState;
+}) {
+  return (
+    <div className="flex flex-col gap-6">
+      <FieldGroup>
+        <Field>
+          <FieldLabel>Repository URL</FieldLabel>
+          <Input
+            autoFocus
+            placeholder="Enter a repository URL"
+            value={state.repositoryUrl}
+            onChange={(e) => state.handleRepositoryUrlChange(e.target.value)}
+          />
+        </Field>
+      </FieldGroup>
+      <Separator className="w-full" />
+      <FieldGroup>
+        <Field>
+          <FieldLabel>Project Name</FieldLabel>
+          <Input
+            placeholder="Enter a project name"
+            value={state.name}
+            onChange={(e) => state.handleNameChange(e.target.value)}
+          />
+        </Field>
+        <Field>
+          <FieldLabel>{strategy === 'local' ? 'Project Directory' : 'Remote Directory'}</FieldLabel>
+          {strategy === 'local' ? (
+            <LocalDirectorySelector
+              path={state.path}
+              onPathChange={state.setPath}
+              title="Select a local project"
+              message="Select a project directory to open"
+            />
+          ) : (
+            <RemoteDirectorySelector
+              connectionId={connectionId}
+              value={state.path}
+              onChange={state.setPath}
+            />
+          )}
+        </Field>
+      </FieldGroup>
+    </div>
+  );
+}
diff --git a/src/renderer/features/projects/components/add-project-modal/local-directory-selector.tsx b/src/renderer/features/projects/components/add-project-modal/local-directory-selector.tsx
new file mode 100644
index 0000000000..2fe89aca75
--- /dev/null
+++ b/src/renderer/features/projects/components/add-project-modal/local-directory-selector.tsx
@@ -0,0 +1,55 @@
+import { Folder } from 'lucide-react';
+import { useState } from 'react';
+import { rpc } from '@renderer/lib/ipc';
+import { Button } from '@renderer/lib/ui/button';
+import { cn } from '@renderer/utils/utils';
+
+interface LocalDirectorySelectorProps {
+  title: string;
+  message: string;
+  path?: string;
+  onPathChange: (path: string) => void;
+  placeholder?: string;
+}
+
+export function LocalDirectorySelector({
+  title,
+  message,
+  onPathChange,
+  path: initialPath,
+  placeholder = 'Select a directory',
+}: LocalDirectorySelectorProps) {
+  const [path, setPath] = useState<string>(initialPath || '');
+
+  const handleOpenFileDialog = async () => {
+    const result = await rpc.app.openSelectDirectoryDialog({
+      title,
+      message,
+    });
+    if (result) {
+      setPath(result);
+      onPathChange(result);
+    }
+  };
+
+  return (
+    <button
+      className="h-9 border border-border rounded-md p-2 w-full flex items-center gap-2 hover:bg-background-quaternary-1 pr-1.5 transition-colors"
+      onClick={handleOpenFileDialog}
+    >
+      <Folder className="size-4 text-foreground-muted" />
+      <p
+        className={cn(
+          'text-sm text-foreground-passive truncate min-w-0 flex-1 w-full text-left',
+          path ? 'text-foreground' : ''
+        )}
+      >
+        {' '}
+        {path || placeholder}
+      </p>
+      <Button variant="outline" size="xs">
+        Choose
+      </Button>
+    </button>
+  );
+}
diff --git a/src/renderer/features/projects/components/add-project-modal/mode-tabs.tsx b/src/renderer/features/projects/components/add-project-modal/mode-tabs.tsx
new file mode 100644
index 0000000000..4971f78cd9
--- /dev/null
+++ b/src/renderer/features/projects/components/add-project-modal/mode-tabs.tsx
@@ -0,0 +1,53 @@
+import { Tabs } from '@base-ui/react';
+import { Folder, Github, Plus } from 'lucide-react';
+import { type Mode } from './add-project-modal';
+import { ButtonCard } from './button-card';
+
+export function ModeTabs({
+  mode,
+  onModeChange,
+  children,
+}: {
+  mode: Mode;
+  onModeChange: (mode: Mode) => void;
+  children: React.ReactNode;
+}) {
+  return (
+    <Tabs.Root
+      value={mode}
+      onValueChange={(v) => onModeChange(v as Mode)}
+      className="flex flex-col gap-6"
+    >
+      <Tabs.List className="w-full flex gap-2">
+        <Tabs.Tab
+          value="pick"
+          render={
+            <ButtonCard>
+              <Folder className="size-6" />
+              Pick existing
+            </ButtonCard>
+          }
+        />
+        <Tabs.Tab
+          value="new"
+          render={
+            <ButtonCard>
+              <Plus className="size-6" />
+              New
+            </ButtonCard>
+          }
+        />
+        <Tabs.Tab
+          value="clone"
+          render={
+            <ButtonCard>
+              <Github className="size-6" />
+              Clone
+            </ButtonCard>
+          }
+        />
+      </Tabs.List>
+      <div>{children}</div>
+    </Tabs.Root>
+  );
+}
diff --git a/src/renderer/features/projects/components/add-project-modal/modes.ts b/src/renderer/features/projects/components/add-project-modal/modes.ts
new file mode 100644
index 0000000000..a69bd72a11
--- /dev/null
+++ b/src/renderer/features/projects/components/add-project-modal/modes.ts
@@ -0,0 +1,156 @@
+import { useQuery } from '@tanstack/react-query';
+import { useMemo, useState } from 'react';
+import { rpc } from '@renderer/lib/ipc';
+import { useGithubContext } from '@renderer/lib/providers/github-context-provider';
+import { ComboboxSelectOption } from '@renderer/lib/ui/combobox-popover';
+
+export function usePickMode() {
+  const [path, setPath] = useState('');
+  const [name, setName] = useState('');
+  const [nameIsTouched, setNameIsTouched] = useState<boolean>(false);
+  const [initGitRepository, setinitGitRepository] = useState<boolean>(false);
+
+  const handlePathChange = (newPath: string) => {
+    setPath(newPath);
+    setinitGitRepository(false);
+    if (!nameIsTouched) {
+      const dirName = newPath.split('/').filter(Boolean).pop() ?? '';
+      if (dirName && !nameIsTouched) setName(dirName);
+    }
+  };
+
+  const handleNameChange = (newName: string) => {
+    setName(newName);
+    setNameIsTouched(true);
+  };
+
+  const isValid = name.trim().length > 0 && path.trim().length > 0;
+
+  return {
+    path,
+    name,
+    initGitRepository,
+    setinitGitRepository,
+    handlePathChange,
+    handleNameChange,
+    isValid,
+  };
+}
+
+export type PickModeState = ReturnType<typeof usePickMode>;
+export type NewModeState = ReturnType<typeof useNewMode>;
+export type CloneModeState = ReturnType<typeof useCloneMode>;
+
+export function useNewMode(defaultPath: string) {
+  const { authenticated } = useGithubContext();
+  const [name, setName] = useState('');
+  const [_, setNameIsTouched] = useState<boolean>(false);
+  const [repositoryName, setRepositoryName] = useState('');
+  const [repositoryNameIsTouched, setRepositoryNameIsTouched] = useState<boolean>(false);
+  const [repositoryOwnerOverride, setRepositoryOwnerOverride] = useState<
+    ComboboxSelectOption | undefined
+  >(undefined);
+  const [repositoryVisibility, setRepositoryVisibility] = useState<'public' | 'private'>('private');
+  const [pathOverride, setPathOverride] = useState<string | undefined>(undefined);
+  const path = pathOverride ?? defaultPath;
+
+  const [ownerIsTouched, setOwnerIsTouched] = useState<boolean>(false);
+
+  const handleNameChange = (newName: string) => {
+    setName(newName);
+    setNameIsTouched(true);
+    if (!repositoryNameIsTouched) setRepositoryName(newName);
+  };
+
+  const handleRepositoryNameChange = (newRepositoryName: string) => {
+    setRepositoryName(newRepositoryName);
+    setRepositoryNameIsTouched(true);
+    setName(newRepositoryName);
+    setNameIsTouched(false);
+  };
+
+  const { data } = useQuery({
+    queryKey: ['owners'],
+    queryFn: () => rpc.github.getOwners(),
+    enabled: authenticated,
+  });
+
+  const owners = useMemo(
+    () =>
+      authenticated
+        ? (data?.owners?.map((owner) => ({ value: owner.login, label: owner.login })) ?? [])
+        : [],
+    [authenticated, data]
+  );
+
+  const repositoryOwner = useMemo(
+    () => (ownerIsTouched ? repositoryOwnerOverride : owners[0]),
+    [owners, ownerIsTouched, repositoryOwnerOverride]
+  );
+
+  const handleOwnerChange = (item: ComboboxSelectOption) => {
+    setRepositoryOwnerOverride(item);
+    setOwnerIsTouched(true);
+  };
+
+  const isValid =
+    name.trim().length > 0 &&
+    repositoryName.trim().length > 0 &&
+    !!repositoryOwner &&
+    path.trim().length > 0;
+
+  return {
+    name,
+    repositoryName,
+    repositoryOwner,
+    repositoryVisibility,
+    owners,
+    setRepositoryVisibility,
+    path,
+    setPath: setPathOverride,
+    handleNameChange,
+    handleRepositoryNameChange,
+    handleOwnerChange,
+    isValid,
+  };
+}
+
+export function useCloneMode(defaultPath: string) {
+  const [repositoryUrl, setRepositoryUrl] = useState('');
+  const [name, setName] = useState('');
+  const [nameIsTouched, setNameIsTouched] = useState<boolean>(false);
+  const [pathOverride, setPathOverride] = useState<string | undefined>(undefined);
+  const path = pathOverride ?? defaultPath;
+
+  const handleRepositoryUrlChange = (newRepositoryUrl: string) => {
+    setRepositoryUrl(newRepositoryUrl);
+    if (!nameIsTouched) setName(extractRepoName(newRepositoryUrl));
+  };
+
+  const handleNameChange = (newName: string) => {
+    setName(newName);
+    setNameIsTouched(true);
+  };
+
+  const isValid =
+    name.trim().length > 0 && repositoryUrl.trim().length > 0 && path.trim().length > 0;
+
+  return {
+    repositoryUrl,
+    name,
+    path,
+    setPath: setPathOverride,
+    handleRepositoryUrlChange,
+    handleNameChange,
+    isValid,
+  };
+}
+
+function extractRepoName(url: string): string {
+  try {
+    const parts = url.replace(/\.git$/, '').split('/');
+    return parts[parts.length - 1] ?? '';
+  } catch {
+    return '';
+  }
+}
diff --git a/src/renderer/features/projects/components/add-project-modal/remote-directory-selector.tsx b/src/renderer/features/projects/components/add-project-modal/remote-directory-selector.tsx
new file mode 100644
index 0000000000..791c1f882d
--- /dev/null
+++ b/src/renderer/features/projects/components/add-project-modal/remote-directory-selector.tsx
@@ -0,0 +1,167 @@
+import { ChevronUp, FileCode, Folder, Loader2 } from 'lucide-react';
+import { useEffect, useState } from 'react';
+import type { FileEntry } from '@shared/ssh';
+import { rpc } from '@renderer/lib/ipc';
+import { Button } from '@renderer/lib/ui/button';
+import { Input } from '@renderer/lib/ui/input';
+import { Popover, PopoverContent, PopoverTrigger } from '@renderer/lib/ui/popover';
+import { cn } from '@renderer/utils/utils';
+
+interface RemoteDirectorySelectorProps {
+  connectionId: string | undefined;
+  value: string;
+  onChange: (path: string) => void;
+}
+
+export function RemoteDirectorySelector({
+  connectionId,
+  value,
+  onChange,
+}: RemoteDirectorySelectorProps) {
+  const [currentPath, setCurrentPath] = useState<undefined | string>(value);
+  const [fileEntries, setFileEntries] = useState<FileEntry[]>([]);
+  const [isBrowsing, setIsBrowsing] = useState(false);
+  const [browseError, setBrowseError] = useState<string | null>(null);
+  const [open, setOpen] = useState(false);
+
+  useEffect(() => {
+    if (connectionId) void loadDirectory(currentPath || '/');
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [connectionId]);
+
+  const loadDirectory = async (path: string) => {
+    if (!connectionId) return;
+    setIsBrowsing(true);
+    setBrowseError(null);
+    try {
+      const entries = await rpc.ssh.listFiles({ connectionId, path });
+      setFileEntries(entries);
+    } catch (e) {
+      setBrowseError(e instanceof Error ? e.message : 'Failed to list directory');
+      setFileEntries([]);
+    } finally {
+      setIsBrowsing(false);
+    }
+  };
+
+  const navigateTo = (entry: FileEntry) => {
+    if (entry.type !== 'directory') return;
+    setCurrentPath(entry.path);
+    onChange(entry.path);
+    void loadDirectory(entry.path);
+  };
+
+  const navigateUp = () => {
+    const parent = currentPath?.split('/').slice(0, -1).join('/') || '/';
+    setCurrentPath(parent);
+    onChange(parent);
+    void loadDirectory(parent);
+  };
+
+  const handleManualPathChange = (path: string) => {
+    setCurrentPath(path);
+    onChange(path);
+  };
+
+  return (
+    <div className="space-y-2">
+      <Popover
+        open={open}
+        onOpenChange={(newOpen, eventDetails) => {
+          // Prevent the trigger click from toggling the popover closed —
+          // it should only close on outside press, Escape, or focus-out.
+          if (!newOpen && eventDetails.reason === 'trigger-press') return;
+          setOpen(newOpen);
+        }}
+      >
+        <PopoverTrigger
+          render={
+            <Input
+              placeholder="/home/user/project"
+              value={currentPath}
+              onChange={(e) => handleManualPathChange(e.target.value)}
+              onFocus={() => {
+                if (connectionId) {
+                  setOpen(true);
+                  void loadDirectory(currentPath || '/');
+                }
+              }}
+              onKeyDown={(e) => {
+                if (e.key === 'Enter') {
+                  e.preventDefault();
+                  void loadDirectory(currentPath || '/');
+                }
+              }}
+              disabled={!connectionId}
+            />
+          }
+        />
+        <PopoverContent align="start" sideOffset={4} className="w-[--anchor-width] p-0">
+          <div className="flex items-center gap-2 border-b bg-muted/50 px-3 py-2">
+            <Button
+              type="button"
+              variant="ghost"
+              size="sm"
+              className="h-6 w-6 p-0"
+              onClick={navigateUp}
+              disabled={currentPath === '/' || isBrowsing}
+            >
+              <ChevronUp className="h-4 w-4" />
+            </Button>
+            <span className="min-w-0 flex-1 truncate text-sm font-medium text-left">
+              {currentPath || '/'}
+            </span>
+            {isBrowsing && (
+              <Loader2 className="h-3.5 w-3.5 shrink-0 animate-spin text-muted-foreground" />
+            )}
+          </div>
+
+          <div className="max-h-[240px] overflow-y-auto">
+            {isBrowsing && fileEntries.length === 0 ? (
+              <div className="flex items-center justify-center py-8">
+                <Loader2 className="h-5 w-5 animate-spin text-muted-foreground" />
+              </div>
+            ) : browseError ? (
+              <div className="py-4 text-center text-sm text-destructive">{browseError}</div>
+            ) : fileEntries.length === 0 ? (
+              <div className="py-6 text-center text-sm text-muted-foreground">Empty directory</div>
+            ) : (
+              <div className="divide-y">
+                {fileEntries.map((entry) => (
+                  <button
+                    key={entry.path}
+                    type="button"
+                    onClick={() => navigateTo(entry)}
+                    disabled={entry.type !== 'directory'}
+                    className={cn(
+                      'flex w-full items-center gap-2 px-3 py-2 text-left text-sm hover:bg-accent',
+                      entry.type === 'directory' && 'cursor-pointer font-medium',
+                      entry.type !== 'directory' && 'cursor-default opacity-50'
+                    )}
+                  >
+                    {entry.type === 'directory' ? (
+                      <Folder className="h-4 w-4 shrink-0 text-muted-foreground" />
+                    ) : (
+                      <FileCode className="h-4 w-4 shrink-0 text-muted-foreground" />
+                    )}
+                    <span className="flex-1 truncate">{entry.name}</span>
+                    {entry.type === 'file' && (
+                      <span className="text-xs text-muted-foreground">
+                        {(entry.size / 1024).toFixed(1)} KB
+                      </span>
+                    )}
+                  </button>
+                ))}
+              </div>
+            )}
+          </div>
+        </PopoverContent>
+      </Popover>
+      {!connectionId && (
+        <p className="text-xs text-muted-foreground">
+          Select an SSH connection to browse remote directories.
+        </p>
+      )}
+    </div>
+  );
+}
diff --git a/src/renderer/features/projects/components/add-project-modal/ssh-connection-selector.tsx b/src/renderer/features/projects/components/add-project-modal/ssh-connection-selector.tsx
new file mode 100644
index 0000000000..3233101876
--- /dev/null
+++ b/src/renderer/features/projects/components/add-project-modal/ssh-connection-selector.tsx
@@ -0,0 +1,72 @@
+import { ChevronsUpDownIcon, PencilIcon, PlusIcon } from 'lucide-react';
+import { observer } from 'mobx-react-lite';
+import { appState } from '@renderer/lib/stores/app-state';
+import { ComboboxTrigger, ComboboxValue } from '@renderer/lib/ui/combobox';
+import { ComboboxPopover } from '@renderer/lib/ui/combobox-popover';
+
+interface SshConnectionSelectorProps {
+  connectionId?: string;
+  onConnectionIdChange: (connectionId: string) => void;
+  onAddConnection: () => void;
+  onEditConnection?: (connectionId: string) => void;
+}
+
+export const SshConnectionSelector = observer(function SshConnectionSelector({
+  connectionId,
+  onConnectionIdChange,
+  onAddConnection,
+  onEditConnection,
+}: SshConnectionSelectorProps) {
+  const { connections } = appState.sshConnections;
+
+  const options = connections
+    .filter((c): c is typeof c & { id: string } => c.id !== undefined)
+    .map((connection) => ({
+      value: connection.id,
+      label: connection.name,
+    }));
+
+  const selectedOption = connectionId
+    ? (options.find((o) => o.value === connectionId) ?? null)
+    : null;
+
+  const actions = [
+    {
+      id: 'add',
+      label: 'Add Connection',
+      icon: <PlusIcon className="size-4" />,
+      onClick: onAddConnection,
+    },
+    ...(connectionId && onEditConnection
+      ? [
+          {
+            id: 'edit',
+            label: 'Edit Connection',
+            icon: <PencilIcon className="size-4" />,
+            onClick: () => onEditConnection(connectionId),
+          },
+        ]
+      : []),
+  ];
+
+  return (
+    <ComboboxPopover
+      items={options}
+      value={selectedOption}
+      onValueChange={(conn) => onConnectionIdChange(conn.value)}
+      actions={actions}
+      trigger={
+        <ComboboxTrigger
+          render={
+            <button className="flex h-9 w-full min-w-0 items-center justify-between rounded-md border border-border px-2.5 py-1 text-left text-sm outline-none">
+              <ComboboxValue
+                placeholder={<p className="text-muted-foreground">Select or add a connection</p>}
+              />
+              <ChevronsUpDownIcon className="size-4 shrink-0 text-muted-foreground" />
+            </button>
+          }
+        />
+      }
+    />
+  );
+});
diff --git a/src/renderer/features/projects/components/main-panel/active-project.tsx b/src/renderer/features/projects/components/main-panel/active-project.tsx
new file mode 100644
index 0000000000..a7b81fe6a0
--- /dev/null
+++ b/src/renderer/features/projects/components/main-panel/active-project.tsx
@@ -0,0 +1,25 @@
+import { observer } from 'mobx-react-lite';
+import { PullRequestView } from '@renderer/features/projects/components/pr-view/pr-view';
+import { SettingsPanel } from '@renderer/features/projects/components/settings-view/settings-panel';
+import { TaskList } from '@renderer/features/projects/components/task-view/task-list';
+import { asMounted, getProjectStore } from '@renderer/features/projects/stores/project-selectors';
+import { useParams } from '@renderer/lib/layout/navigation-provider';
+
+export const ActiveProject = observer(function ActiveProject() {
+  const {
+    params: { projectId },
+  } = useParams('project');
+  const store = asMounted(getProjectStore(projectId));
+
+  if (!store) return null;
+
+  const activeView = store.view.activeView;
+
+  return (
+    <>
+      {activeView === 'tasks' && <TaskList />}
+      {activeView === 'pull-request' && <PullRequestView />}
+      {activeView === 'settings' && <SettingsPanel />}
+    </>
+  );
+});
diff --git a/src/renderer/features/projects/components/main-panel/main-panel.tsx b/src/renderer/features/projects/components/main-panel/main-panel.tsx
new file mode 100644
index 0000000000..72ea1c2df7
--- /dev/null
+++ b/src/renderer/features/projects/components/main-panel/main-panel.tsx
@@ -0,0 +1,128 @@
+import { Loader2, TriangleAlert, Unplug } from 'lucide-react';
+import { observer } from 'mobx-react-lite';
+import { useParams } from '@renderer/lib/layout/navigation-provider';
+import { appState } from '@renderer/lib/stores/app-state';
+import { isUnregisteredProject } from '../../stores/project';
+import {
+  getProjectManagerStore,
+  getProjectStore,
+  projectViewKind,
+  unmountedMountErrorMessage,
+} from '../../stores/project-selectors';
+import { ActiveProject } from './active-project';
+import { PendingProjectStatus } from './pending-project';
+
+export const ProjectMainPanel = observer(function ProjectMainPanel() {
+  const {
+    params: { projectId },
+  } = useParams('project');
+  const store = getProjectStore(projectId);
+  const kind = projectViewKind(store);
+
+  if (kind === 'creating' && store && isUnregisteredProject(store)) {
+    return <PendingProjectStatus project={store} />;
+  }
+
+  if (kind === 'bootstrapping') {
+    return <ProjectBootstrappingPanel />;
+  }
+
+  if (kind === 'path_not_found') {
+    return <ProjectPathNotFoundPanel path={store?.error ?? ''} projectId={projectId} />;
+  }
+
+  if (kind === 'ssh_disconnected') {
+    const connectionId = store?.error ?? '';
+    return <ProjectSshDisconnectedPanel connectionId={connectionId} projectId={projectId} />;
+  }
+
+  if (kind === 'mount_error') {
+    return <ProjectBootstrapErrorPanel message={unmountedMountErrorMessage(store)} />;
+  }
+
+  if (kind !== 'ready') {
+    return <div className="flex flex-1 items-center justify-center text-foreground-muted" />;
+  }
+
+  return <ActiveProject />;
+});
+
+function ProjectBootstrappingPanel() {
+  return (
+    <div className="flex h-full w-full flex-col items-center justify-center gap-3">
+      <Loader2 className="h-5 w-5 animate-spin text-foreground-passive" />
+      <p className="text-xs font-mono text-foreground-passive">Setting up project…</p>
+    </div>
+  );
+}
+
+function ProjectBootstrapErrorPanel({ message }: { message: string }) {
+  return (
+    <div className="flex h-full w-full flex-col items-center justify-center p-8">
+      <div className="flex max-w-xs flex-col items-center text-center gap-2">
+        <p className="text-sm font-medium font-mono text-foreground-destructive">
+          Failed to set up project
+        </p>
+        <p className="text-xs font-mono text-foreground-passive">{message}</p>
+      </div>
+    </div>
+  );
+}
+
+function ProjectSshDisconnectedPanel({
+  connectionId,
+  projectId,
+}: {
+  connectionId: string;
+  projectId: string;
+}) {
+  const handleReconnect = () => {
+    void appState.sshConnections
+      .connect(connectionId)
+      .then(() => getProjectManagerStore().mountProject(projectId))
+      .catch(() => {});
+  };
+
+  return (
+    <div className="flex h-full w-full flex-col items-center justify-center p-8">
+      <div className="flex max-w-sm flex-col items-center text-center gap-3">
+        <Unplug className="h-6 w-6 text-foreground-passive" />
+        <p className="text-sm font-medium font-mono text-foreground">SSH not connected</p>
+        <p className="text-xs text-foreground-passive">
+          The SSH connection for this project is unavailable.
+        </p>
+        <button
+          type="button"
+          className="mt-2 text-xs text-foreground underline underline-offset-2 hover:text-foreground/80 transition-colors"
+          onClick={handleReconnect}
+        >
+          Reconnect
+        </button>
+      </div>
+    </div>
+  );
+}
+
+function ProjectPathNotFoundPanel({ path, projectId }: { path: string; projectId: string }) {
+  return (
+    <div className="flex h-full w-full flex-col items-center justify-center p-8">
+      <div className="flex max-w-sm flex-col items-center text-center gap-3">
+        <TriangleAlert className="h-6 w-6 text-foreground-destructive" />
+        <p className="text-sm font-medium font-mono text-foreground-destructive">
+          Project not found
+        </p>
+        {path && <p className="text-xs font-mono text-foreground-passive break-all">{path}</p>}
+        <p className="text-xs text-foreground-passive">
+          The project directory no longer exists at the configured path.
+        </p>
+        <button
+          type="button"
+          className="mt-2 text-xs text-foreground-destructive underline underline-offset-2 hover:text-foreground-destructive/80 transition-colors"
+          onClick={() => void getProjectManagerStore().deleteProject(projectId)}
+        >
+          Remove Project
+        </button>
+      </div>
+    </div>
+  );
+}
diff --git a/src/renderer/features/projects/components/main-panel/pending-project.tsx b/src/renderer/features/projects/components/main-panel/pending-project.tsx
new file mode 100644
index 0000000000..0ca6fbe41e
--- /dev/null
+++ b/src/renderer/features/projects/components/main-panel/pending-project.tsx
@@ -0,0 +1,88 @@
+import { AlertCircle, Check, Loader2, X } from 'lucide-react';
+import { observer } from 'mobx-react-lite';
+import { UnregisteredProject } from '@renderer/features/projects/stores/project';
+import { getProjectManagerStore } from '@renderer/features/projects/stores/project-selectors';
+import { useNavigate } from '@renderer/lib/layout/navigation-provider';
+import { Button } from '@renderer/lib/ui/button';
+
+type Stage = 'creating-repo' | 'cloning' | 'registering';
+
+const STAGE_LABELS: Record<Stage, string> = {
+  'creating-repo': 'Creating repository',
+  cloning: 'Cloning',
+  registering: 'Registering',
+};
+
+const STAGES_BY_MODE: Record<'pick' | 'clone' | 'new', Stage[]> = {
+  pick: ['registering'],
+  clone: ['cloning', 'registering'],
+  new: ['creating-repo', 'cloning', 'registering'],
+};
+
+export const PendingProjectStatus = observer(function PendingProjectStatus({
+  project,
+}: {
+  project: UnregisteredProject;
+}) {
+  const { navigate } = useNavigate();
+  const stages = STAGES_BY_MODE[project.mode];
+  const currentStageIndex = stages.indexOf(project.phase as Stage);
+  const isError = project.phase === 'error';
+
+  const handleDismiss = () => {
+    getProjectManagerStore().removeUnregisteredProject(project.id);
+    navigate('home');
+  };
+
+  return (
+    <div className="flex flex-1 flex-col items-center justify-center gap-6 p-8">
+      <div className="flex w-full max-w-sm flex-col gap-3">
+        <h2 className="mb-2 text-base">{project.name}</h2>
+
+        {stages.map((stage, i) => {
+          const isDone = !isError && i < currentStageIndex;
+          const isActive = !isError && stage === project.phase;
+          return (
+            <div key={stage} className="flex items-center gap-3">
+              <div className="flex h-5 w-5 shrink-0 items-center justify-center">
+                {isDone ? (
+                  <Check className="h-4 w-4 text-green-500" />
+                ) : isActive ? (
+                  <Loader2 className="h-4 w-4 animate-spin text-muted-foreground" />
+                ) : (
+                  <div className="h-2 w-2 rounded-full bg-muted-foreground/30" />
+                )}
+              </div>
+              <span
+                className={
+                  isActive
+                    ? 'text-sm font-medium text-foreground'
+                    : isDone
+                      ? 'text-sm text-muted-foreground'
+                      : 'text-sm text-muted-foreground/50'
+                }
+              >
+                {STAGE_LABELS[stage]}
+              </span>
+            </div>
+          );
+        })}
+
+        {isError && (
+          <div className="mt-2 flex flex-col gap-3 rounded-md border border-destructive/40 bg-destructive/10 p-3">
+            <div className="flex items-start gap-2">
+              <AlertCircle className="mt-0.5 h-4 w-4 shrink-0 text-destructive" />
+              <span className="text-sm text-destructive">
+                {project.error ?? 'An error occurred'}
+              </span>
+            </div>
+            <Button size="sm" variant="outline" className="self-start" onClick={handleDismiss}>
+              <X className="mr-1.5 h-3.5 w-3.5" />
+              Dismiss
+            </Button>
+          </div>
+        )}
+      </div>
+    </div>
+  );
+});
diff --git a/src/renderer/features/projects/components/pr-view/pr-row.tsx b/src/renderer/features/projects/components/pr-view/pr-row.tsx
new file mode 100644
index 0000000000..176043ba5d
--- /dev/null
+++ b/src/renderer/features/projects/components/pr-view/pr-row.tsx
@@ -0,0 +1,66 @@
+import { ExternalLink, ScanSearch } from 'lucide-react';
+import { memo } from 'react';
+import { getPrNumber, type PullRequest } from '@shared/pull-requests';
+import { PrMergeLine } from '@renderer/lib/components/pr-merge-line';
+import { PrNumberBadge } from '@renderer/lib/components/pr-number-badge';
+import { StatusIcon } from '@renderer/lib/components/pr-status-icon';
+import { rpc } from '@renderer/lib/ipc';
+import { useShowModal } from '@renderer/lib/modal/modal-provider';
+import { Button } from '@renderer/lib/ui/button';
+import { RelativeTime } from '@renderer/lib/ui/relative-time';
+import { Tooltip, TooltipContent, TooltipTrigger } from '@renderer/lib/ui/tooltip';
+
+export const PrRow = memo(function PrRow({
+  pr,
+  projectId,
+}: {
+  pr: PullRequest;
+  projectId: string;
+}) {
+  const showCreateTaskModal = useShowModal('taskModal');
+
+  return (
+    <div className="flex relative items-start gap-3 rounded-lg p-3 py-4 hover:bg-background-1 transition-colors group">
+      <div className="pt-0.5 shrink-0">
+        <StatusIcon status={pr.status} />
+      </div>
+      <div className="flex-1 min-w-0 flex flex-col gap-2">
+        <div className="flex items-center gap-2 justify-between">
+          <div className="flex items-center gap-2 flex-wrap min-w-0">
+            <span className="text-sm text-foreground leading-snug truncate min-w-0">
+              {pr.title}
+            </span>
+            <PrNumberBadge number={getPrNumber(pr) ?? 0} />
+            <Tooltip>
+              <TooltipTrigger>
+                <Button
+                  variant="ghost"
+                  size="icon-xs"
+                  className="opacity-0 group-hover:opacity-100 transition-opacity"
+                  onClick={() => rpc.app.openExternal(pr.url)}
+                >
+                  <ExternalLink className="size-3.5" />
+                </Button>
+              </TooltipTrigger>
+              <TooltipContent>Open PR on github</TooltipContent>
+            </Tooltip>
+          </div>
+          <RelativeTime value={pr.createdAt} className="text-xs text-foreground-passive" compact />
+        </div>
+        <PrMergeLine pr={pr} />
+      </div>
+      <div className="shrink-0 absolute top-0 flex h-full items-center gap-1 right-3  opacity-0 group-hover:opacity-100 transition-opacity">
+        <Button
+          variant="outline"
+          size="sm"
+          onClick={() =>
+            showCreateTaskModal({ projectId, strategy: 'from-pull-request', initialPR: pr })
+          }
+        >
+          <ScanSearch className="size-3.5" />
+          Review in Task
+        </Button>
+      </div>
+    </div>
+  );
+});
diff --git a/src/renderer/features/projects/components/pr-view/pr-sync-status-card.tsx b/src/renderer/features/projects/components/pr-view/pr-sync-status-card.tsx
new file mode 100644
index 0000000000..5a8bdf0ecc
--- /dev/null
+++ b/src/renderer/features/projects/components/pr-view/pr-sync-status-card.tsx
@@ -0,0 +1,146 @@
+import { AlertCircle, CheckCircle2, Loader2, RotateCcw, X } from 'lucide-react';
+import { observer } from 'mobx-react-lite';
+import { ReactNode, useEffect, useState } from 'react';
+import { getPrSyncStore } from '@renderer/features/projects/stores/project-selectors';
+import { ListPopoverCard } from '@renderer/lib/components/list-popover-card';
+import { Button } from '@renderer/lib/ui/button';
+
+const KIND_LABELS: Record<string, string> = {
+  full: 'Full sync',
+  incremental: 'Incremental sync',
+  single: 'Single PR',
+};
+
+interface SyncStatusCardProps {
+  icon: ReactNode;
+  label?: ReactNode;
+  content: ReactNode;
+  actions?: ReactNode;
+  className?: string;
+}
+
+function SyncStatusCard({ icon, label, content, actions, className }: SyncStatusCardProps) {
+  return (
+    <ListPopoverCard className={className}>
+      {icon}
+      {label && <span className="text-foreground-muted shrink-0">{label}</span>}
+
+      <span className="text-foreground-passive grow min-w-0">{content}</span>
+      {actions && <div className="flex items-center gap-1 shrink-0">{actions}</div>}
+    </ListPopoverCard>
+  );
+}
+
+interface Props {
+  projectId: string;
+  repositoryUrl: string;
+}
+
+export const PrSyncStatusCard = observer(function PrSyncStatusCard({
+  projectId,
+  repositoryUrl,
+}: Props) {
+  const prSync = getPrSyncStore(projectId);
+  const state = prSync?.getState(repositoryUrl);
+  const [showSuccess, setShowSuccess] = useState(false);
+
+  useEffect(() => {
+    if (state?.status === 'done') {
+      setShowSuccess(true);
+      const timer = setTimeout(() => {
+        setShowSuccess(false);
+        prSync?.clear(repositoryUrl);
+      }, 1000);
+      return () => clearTimeout(timer);
+    }
+  }, [state?.status, prSync, repositoryUrl]);
+
+  if (showSuccess) {
+    return (
+      <SyncStatusCard
+        icon={<CheckCircle2 className="size-3.5 shrink-0 text-green-500" />}
+        content="Sync complete"
+      />
+    );
+  }
+
+  if (!state || state.status === 'done') return null;
+
+  const kindLabel = KIND_LABELS[state.kind] ?? state.kind;
+
+  if (state.status === 'running' && state.kind !== 'single') {
+    const hasProgress = state.total != null && state.total > 0;
+    return (
+      <SyncStatusCard
+        icon={<Loader2 className="size-3.5 shrink-0 animate-spin text-muted-foreground" />}
+        label={kindLabel}
+        content={
+          hasProgress ? `Syncing PRs: ${state.synced ?? 0} / ${state.total}` : 'Syncing PRs…'
+        }
+        actions={
+          <Button
+            variant="ghost"
+            size="sm"
+            className="shrink-0 h-6 px-2 text-xs"
+            onClick={() => prSync?.cancel(repositoryUrl)}
+          >
+            Cancel
+          </Button>
+        }
+      />
+    );
+  }
+
+  if (state.status === 'cancelled' && state.kind !== 'single') {
+    return (
+      <SyncStatusCard
+        icon={<RotateCcw className="size-3.5 shrink-0 text-muted-foreground" />}
+        label={kindLabel}
+        content="Sync cancelled"
+        actions={
+          <Button
+            variant="ghost"
+            size="sm"
+            className="h-6 px-2 text-xs"
+            onClick={() => prSync?.retry()}
+          >
+            Resume
+          </Button>
+        }
+      />
+    );
+  }
+
+  // error state
+  return (
+    <SyncStatusCard
+      icon={<AlertCircle className="size-3.5 shrink-0 text-foreground-destructive" />}
+      label={<span className="text-destructive font-medium">Sync failed</span>}
+      content={
+        <span className="block truncate" title={state.error}>
+          {state.error ?? 'Unknown error'}
+        </span>
+      }
+      actions={
+        <>
+          <Button
+            variant="ghost"
+            size="sm"
+            className="h-6 px-2 text-xs"
+            onClick={() => prSync?.retry()}
+          >
+            Retry
+          </Button>
+          <Button
+            variant="ghost"
+            size="icon-sm"
+            onClick={() => prSync?.clear(repositoryUrl)}
+            aria-label="Dismiss"
+          >
+            <X className="size-3.5" />
+          </Button>
+        </>
+      }
+    />
+  );
+});
diff --git a/src/renderer/features/projects/components/pr-view/pr-view.tsx b/src/renderer/features/projects/components/pr-view/pr-view.tsx
new file mode 100644
index 0000000000..6c63d31cf0
--- /dev/null
+++ b/src/renderer/features/projects/components/pr-view/pr-view.tsx
@@ -0,0 +1,414 @@
+import { CheckIcon, ChevronDownIcon, Github, RefreshCw, X } from 'lucide-react';
+import { observer } from 'mobx-react-lite';
+import { motion } from 'motion/react';
+import { useState } from 'react';
+import type { PrSortField } from '@shared/pull-requests';
+import {
+  usePrViewState,
+  type LabelItem,
+  type StatusFilter,
+  type UserItem,
+} from '@renderer/features/projects/components/pr-view/usePrViewState';
+import { getRepositoryStore } from '@renderer/features/projects/stores/project-selectors';
+import { useNavigate, useParams } from '@renderer/lib/layout/navigation-provider';
+import { useGithubContext } from '@renderer/lib/providers/github-context-provider';
+import { Button } from '@renderer/lib/ui/button';
+import {
+  ContextMenu,
+  ContextMenuContent,
+  ContextMenuItem,
+  ContextMenuTrigger,
+} from '@renderer/lib/ui/context-menu';
+import { Input } from '@renderer/lib/ui/input';
+import { Popover, PopoverContent, PopoverTrigger } from '@renderer/lib/ui/popover';
+import { SearchInput } from '@renderer/lib/ui/search-input';
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from '@renderer/lib/ui/select';
+import { ToggleGroup, ToggleGroupItem } from '@renderer/lib/ui/toggle-group';
+import { PrSyncStatusCard } from './pr-sync-status-card';
+import { PrVirtualList } from './pr-virtual-list';
+
+const SORT_OPTIONS: { value: PrSortField; label: string }[] = [
+  { value: 'newest', label: 'Newest' },
+  { value: 'oldest', label: 'Oldest' },
+  { value: 'recently-updated', label: 'Recently Updated' },
+];
+
+function FilterButton({
+  label,
+  active,
+  disabled,
+  children,
+}: {
+  label: string;
+  active: boolean;
+  disabled?: boolean;
+  children: React.ReactNode;
+}) {
+  return (
+    <Popover>
+      <PopoverTrigger
+        disabled={disabled}
+        className={
+          'flex items-center text-sm gap-1 hover:text-foreground disabled:opacity-40 disabled:cursor-not-allowed ' +
+          (active ? 'text-foreground font-medium' : 'text-foreground-muted')
+        }
+      >
+        {label}
+        <ChevronDownIcon className="size-3.5" />
+      </PopoverTrigger>
+      <PopoverContent align="start" className="w-56 p-2 gap-0">
+        {children}
+      </PopoverContent>
+    </Popover>
+  );
+}
+
+function UserFilterPopover({
+  label,
+  items,
+  selected,
+  onChange,
+}: {
+  label: string;
+  items: UserItem[];
+  selected: string | null;
+  onChange: (value: string | null) => void;
+}) {
+  const [search, setSearch] = useState('');
+  const filtered = items.filter((i) => i.label.toLowerCase().includes(search.toLowerCase()));
+
+  return (
+    <FilterButton label={label} active={selected !== null} disabled={items.length === 0}>
+      <Input
+        className="mb-1 h-7 text-xs"
+        placeholder={`Search ${label.toLowerCase()}…`}
+        value={search}
+        onChange={(e) => setSearch(e.target.value)}
+        autoFocus
+      />
+      <ul className="max-h-52 overflow-y-auto">
+        {filtered.map((item) => (
+          <li key={item.value}>
+            <button
+              className="flex w-full items-center gap-2 rounded px-2 py-1.5 text-sm hover:bg-muted"
+              onClick={() => onChange(selected === item.value ? null : item.value)}
+            >
+              {item.avatarUrl ? (
+                <img
+                  src={item.avatarUrl}
+                  alt={item.label}
+                  className="size-4 shrink-0 rounded-full"
+                />
+              ) : (
+                <span className="size-4 shrink-0 rounded-full bg-muted-foreground/20" />
+              )}
+              <span className="flex-1 truncate text-left">{item.label}</span>
+              {selected === item.value && (
+                <CheckIcon className="size-3.5 shrink-0 text-foreground" />
+              )}
+            </button>
+          </li>
+        ))}
+        {filtered.length === 0 && (
+          <li className="px-2 py-3 text-xs text-center text-muted-foreground">No results</li>
+        )}
+      </ul>
+    </FilterButton>
+  );
+}
+
+function LabelFilterPopover({
+  items,
+  selected,
+  onChange,
+}: {
+  items: LabelItem[];
+  selected: string[];
+  onChange: (values: string[]) => void;
+}) {
+  const [search, setSearch] = useState('');
+  const filtered = items.filter((i) => i.label.toLowerCase().includes(search.toLowerCase()));
+
+  const toggle = (value: string) =>
+    onChange(selected.includes(value) ? selected.filter((v) => v !== value) : [...selected, value]);
+
+  return (
+    <FilterButton label="Label" active={selected.length > 0} disabled={items.length === 0}>
+      <Input
+        className="mb-1 h-7 text-xs"
+        placeholder="Search labels…"
+        value={search}
+        onChange={(e) => setSearch(e.target.value)}
+        autoFocus
+      />
+      <ul className="max-h-52 overflow-y-auto">
+        {filtered.map((item) => (
+          <li key={item.value}>
+            <button
+              className="flex w-full items-center gap-2 rounded px-2 py-1.5 text-sm hover:bg-muted"
+              onClick={() => toggle(item.value)}
+            >
+              {item.color ? (
+                <span
+                  className="size-3 shrink-0 rounded-full"
+                  style={{ backgroundColor: `#${item.color}` }}
+                />
+              ) : (
+                <span className="size-3 shrink-0 rounded-full bg-muted-foreground/20" />
+              )}
+              <span className="flex-1 truncate text-left">{item.label}</span>
+              {selected.includes(item.value) && (
+                <CheckIcon className="size-3.5 shrink-0 text-foreground" />
+              )}
+            </button>
+          </li>
+        ))}
+        {filtered.length === 0 && (
+          <li className="px-2 py-3 text-xs text-center text-muted-foreground">No results</li>
+        )}
+      </ul>
+    </FilterButton>
+  );
+}
+
+function FilterPill({
+  avatarUrl,
+  color,
+  label,
+  onRemove,
+}: {
+  avatarUrl?: string;
+  color?: string;
+  label: string;
+  onRemove: () => void;
+}) {
+  return (
+    <span className="inline-flex items-center gap-1 rounded-full border border-border bg-muted px-2 py-0.5 text-xs">
+      {avatarUrl && <img src={avatarUrl} alt={label} className="size-3.5 rounded-full" />}
+      {color && (
+        <span className="size-2 rounded-full shrink-0" style={{ backgroundColor: `#${color}` }} />
+      )}
+      {label}
+      <button
+        className="ml-0.5 rounded-full text-muted-foreground hover:text-foreground"
+        onClick={onRemove}
+        aria-label={`Remove ${label} filter`}
+      >
+        <X className="size-2.5" />
+      </button>
+    </span>
+  );
+}
+
+export const PullRequestView = observer(function PullRequestView() {
+  const {
+    params: { projectId },
+  } = useParams('project');
+  const repositoryUrl = getRepositoryStore(projectId)?.repositoryUrl ?? null;
+  const { needsGhAuth } = useGithubContext();
+  const { navigate } = useNavigate();
+
+  const {
+    statusFilter,
+    sortFilter,
+    query,
+    setQuery,
+    syncing,
+    selectedAuthorLogin,
+    setSelectedAuthorLogin,
+    selectedLabelNames,
+    setSelectedLabelNames,
+    selectedAssigneeLogin,
+    setSelectedAssigneeLogin,
+    handleStatusChange,
+    handleSortChange,
+    handleRefresh,
+    handleForceFullSync,
+    removeLabel,
+    prs,
+    loading,
+    fetchNextPage,
+    hasNextPage,
+    isFetchingNextPage,
+    authorItems,
+    assigneeItems,
+    labelItems,
+    selectedAuthorItem,
+    selectedAssigneeItem,
+    selectedLabelItems,
+    hasPills,
+  } = usePrViewState(projectId, repositoryUrl);
+
+  if (!repositoryUrl) {
+    return (
+      <div className="flex flex-col max-w-3xl mx-auto w-full h-full pt-6 px-6 min-h-0">
+        <p className="text-sm text-muted-foreground text-center py-4">
+          Pull requests are currently available only for configured GitHub remotes. You can change
+          the remote in the project settings.
+        </p>
+      </div>
+    );
+  }
+
+  if (needsGhAuth) {
+    return (
+      <div className="flex flex-col max-w-3xl mx-auto w-full h-full pt-6 px-6 min-h-0">
+        <div className="flex w-full flex-col items-center justify-center gap-5 rounded-md border border-border border-dashed p-8 mt-4">
+          <span className="relative flex size-8 items-center justify-center overflow-hidden rounded-full bg-background-2">
+            <Github className="size-4 text-foreground-muted" />
+          </span>
+          <p className="text-center text-sm font-normal text-foreground-muted">
+            GitHub is not connected. Create a user account and connect your GitHub account to view
+            pull requests.
+          </p>
+          <Button
+            type="button"
+            variant="outline"
+            size="xs"
+            onClick={() =>
+              navigate('settings', {
+                tab: 'account',
+              })
+            }
+          >
+            Connect User Account
+          </Button>
+        </div>
+      </div>
+    );
+  }
+
+  return (
+    <div className="relative flex flex-col max-w-3xl mx-auto w-full h-full pt-6 px-6 min-h-0">
+      {/* ── Header controls ── */}
+      <div className="flex flex-col gap-4 border-b border-border pb-2">
+        <div className="flex items-center gap-2 shrink-0 flex-wrap justify-between">
+          <ToggleGroup
+            value={[statusFilter]}
+            onValueChange={(values) => {
+              const next = values.find((v) => v !== statusFilter) ?? statusFilter;
+              handleStatusChange(next as StatusFilter);
+            }}
+          >
+            <ToggleGroupItem value="open">Open</ToggleGroupItem>
+            <ToggleGroupItem value="not-open">Closed</ToggleGroupItem>
+          </ToggleGroup>
+
+          <div className="flex items-center gap-2">
+            <SearchInput
+              placeholder="Search by title, branch, or number..."
+              value={query}
+              onChange={(e) => setQuery(e.target.value)}
+            />
+            <ContextMenu>
+              <ContextMenuTrigger>
+                <Button variant="outline" size="icon-sm" onClick={handleRefresh} disabled={syncing}>
+                  <motion.div
+                    animate={syncing ? { rotate: 360 } : {}}
+                    transition={syncing ? { repeat: Infinity, duration: 0.8, ease: 'linear' } : {}}
+                  >
+                    <RefreshCw className="size-3.5" />
+                  </motion.div>
+                </Button>
+              </ContextMenuTrigger>
+              <ContextMenuContent>
+                <ContextMenuItem onClick={handleForceFullSync} disabled={syncing}>
+                  <RefreshCw className="size-4" />
+                  Force full sync
+                </ContextMenuItem>
+              </ContextMenuContent>
+            </ContextMenu>
+          </div>
+        </div>
+
+        {/* ── Sort + filter row ── */}
+        <div className="flex gap-2 flex-wrap flex-col">
+          <div className="flex items-center gap-2 flex-wrap justify-between">
+            <div className="flex items-center gap-1.5">
+              <span className="text-sm text-foreground-passive">Sort</span>
+              <Select value={sortFilter} onValueChange={handleSortChange}>
+                <SelectTrigger
+                  size="sm"
+                  className="w-auto border-none p-0 gap-1 text-foreground-muted hover:text-foreground"
+                >
+                  <SelectValue />
+                </SelectTrigger>
+                <SelectContent>
+                  {SORT_OPTIONS.map(({ value, label }) => (
+                    <SelectItem key={value} value={value}>
+                      {label}
+                    </SelectItem>
+                  ))}
+                </SelectContent>
+              </Select>
+            </div>
+
+            <div className="flex items-center gap-3">
+              <span className="text-sm text-foreground-passive">Filter by</span>
+              <UserFilterPopover
+                label="Author"
+                items={authorItems}
+                selected={selectedAuthorLogin}
+                onChange={setSelectedAuthorLogin}
+              />
+              <LabelFilterPopover
+                items={labelItems}
+                selected={selectedLabelNames}
+                onChange={setSelectedLabelNames}
+              />
+              <UserFilterPopover
+                label="Assignee"
+                items={assigneeItems}
+                selected={selectedAssigneeLogin}
+                onChange={setSelectedAssigneeLogin}
+              />
+            </div>
+          </div>
+
+          {/* ── Active filter pills ── */}
+          {hasPills && (
+            <div className="flex items-center gap-1.5 flex-wrap">
+              {selectedAuthorItem && (
+                <FilterPill
+                  label={selectedAuthorItem.label}
+                  avatarUrl={selectedAuthorItem.avatarUrl}
+                  onRemove={() => setSelectedAuthorLogin(null)}
+                />
+              )}
+              {selectedLabelItems.map((l) => (
+                <FilterPill
+                  key={l.value}
+                  label={l.label}
+                  color={l.color}
+                  onRemove={() => removeLabel(l.value)}
+                />
+              ))}
+              {selectedAssigneeItem && (
+                <FilterPill
+                  label={selectedAssigneeItem.label}
+                  avatarUrl={selectedAssigneeItem.avatarUrl}
+                  onRemove={() => setSelectedAssigneeLogin(null)}
+                />
+              )}
+            </div>
+          )}
+        </div>
+      </div>
+      <PrVirtualList
+        prs={prs}
+        projectId={projectId}
+        loading={loading}
+        hasNextPage={hasNextPage}
+        isFetchingNextPage={isFetchingNextPage}
+        fetchNextPage={fetchNextPage}
+      />
+      <PrSyncStatusCard projectId={projectId} repositoryUrl={repositoryUrl} />
+    </div>
+  );
+});
diff --git a/src/renderer/features/projects/components/pr-view/pr-virtual-list.tsx b/src/renderer/features/projects/components/pr-view/pr-virtual-list.tsx
new file mode 100644
index 0000000000..721bde2049
--- /dev/null
+++ b/src/renderer/features/projects/components/pr-view/pr-virtual-list.tsx
@@ -0,0 +1,94 @@
+import type { FetchNextPageOptions, InfiniteQueryObserverResult } from '@tanstack/react-query';
+import { useVirtualizer } from '@tanstack/react-virtual';
+import { useEffect, useRef } from 'react';
+import type { PullRequest } from '@shared/pull-requests';
+import { EmptyState } from '@renderer/lib/ui/empty-state';
+import { cn } from '@renderer/utils/utils';
+import { PrRow } from './pr-row';
+
+interface PrVirtualListProps {
+  prs: PullRequest[];
+  projectId: string;
+  loading: boolean;
+  hasNextPage: boolean;
+  isFetchingNextPage: boolean;
+  fetchNextPage: (options?: FetchNextPageOptions) => Promise<InfiniteQueryObserverResult>;
+}
+
+export function PrVirtualList({
+  prs,
+  projectId,
+  loading,
+  hasNextPage,
+  isFetchingNextPage,
+  fetchNextPage,
+}: PrVirtualListProps) {
+  const parentRef = useRef<HTMLDivElement>(null);
+
+  // eslint-disable-next-line react-hooks/incompatible-library
+  const virtualizer = useVirtualizer({
+    count: prs.length,
+    getScrollElement: () => parentRef.current,
+    estimateSize: () => 84,
+    overscan: 5,
+    measureElement: (el) => el.getBoundingClientRect().height,
+  });
+
+  const virtualItems = virtualizer.getVirtualItems();
+
+  // Trigger next page load when the last virtual item becomes visible
+  useEffect(() => {
+    const lastItem = virtualItems[virtualItems.length - 1];
+    if (!lastItem) return;
+    if (lastItem.index >= prs.length - 1 && hasNextPage && !isFetchingNextPage) {
+      void fetchNextPage();
+    }
+  }, [virtualItems, prs.length, hasNextPage, isFetchingNextPage, fetchNextPage]);
+
+  if (loading && prs.length === 0) {
+    return <p className="text-sm text-muted-foreground text-center py-4">Loading…</p>;
+  }
+
+  if (prs.length === 0) {
+    return (
+      <EmptyState
+        label="No pull requests"
+        description="No pull requests available or none that match this filter"
+      />
+    );
+  }
+
+  return (
+    <div
+      ref={parentRef}
+      className="overflow-y-auto min-h-0 flex-1 "
+      style={{ scrollbarWidth: 'none' }}
+    >
+      <div style={{ height: virtualizer.getTotalSize(), position: 'relative' }}>
+        {virtualItems.map((virtualItem) => (
+          <div
+            key={virtualItem.key}
+            data-index={virtualItem.index}
+            ref={virtualizer.measureElement}
+            className={cn(
+              'border-b border-border py-1',
+              virtualItem.index === prs.length - 1 && 'border-b-0'
+            )}
+            style={{
+              position: 'absolute',
+              top: 0,
+              left: 0,
+              width: '100%',
+              transform: `translateY(${virtualItem.start}px)`,
+            }}
+          >
+            <PrRow pr={prs[virtualItem.index]!} projectId={projectId} />
+          </div>
+        ))}
+      </div>
+      {isFetchingNextPage && (
+        <p className="text-xs text-muted-foreground text-center py-2">Loading more…</p>
+      )}
+    </div>
+  );
+}
diff --git a/src/renderer/features/projects/components/pr-view/usePrViewState.ts b/src/renderer/features/projects/components/pr-view/usePrViewState.ts
new file mode 100644
index 0000000000..dfa1a0657b
--- /dev/null
+++ b/src/renderer/features/projects/components/pr-view/usePrViewState.ts
@@ -0,0 +1,165 @@
+import { useQueryClient } from '@tanstack/react-query';
+import { useEffect, useMemo, useState } from 'react';
+import type { PrFilters, PrSortField } from '@shared/pull-requests';
+import { getPrSyncStore } from '@renderer/features/projects/stores/project-selectors';
+import { rpc } from '@renderer/lib/ipc';
+import { useFilterOptions, usePullRequests } from './usePullRequests';
+
+export type StatusFilter = 'open' | 'not-open';
+
+export type UserItem = { value: string; label: string; avatarUrl?: string };
+export type LabelItem = { value: string; label: string; color?: string };
+
+function useDebounce<T>(value: T, delay: number): T {
+  const [debounced, setDebounced] = useState(value);
+  useEffect(() => {
+    const id = setTimeout(() => setDebounced(value), delay);
+    return () => clearTimeout(id);
+  }, [value, delay]);
+  return debounced;
+}
+
+export function usePrViewState(projectId: string, repositoryUrl: string | null) {
+  const queryClient = useQueryClient();
+  const [statusFilter, setStatusFilter] = useState<StatusFilter>('open');
+  const [sortFilter, setSortFilter] = useState<PrSortField>('newest');
+  const [selectedAuthorUserId, setSelectedAuthorUserId] = useState<string | null>(null);
+  const [selectedLabelNames, setSelectedLabelNames] = useState<string[]>([]);
+  const [selectedAssigneeUserId, setSelectedAssigneeUserId] = useState<string | null>(null);
+  const [query, setQuery] = useState('');
+  const debouncedQuery = useDebounce(query, 200);
+  const [syncing, setSyncing] = useState(false);
+
+  const filters: PrFilters = {
+    status: statusFilter,
+    ...(selectedAuthorUserId ? { authorUserIds: [selectedAuthorUserId] } : {}),
+    ...(selectedLabelNames.length > 0 ? { labelNames: selectedLabelNames } : {}),
+    ...(selectedAssigneeUserId ? { assigneeUserIds: [selectedAssigneeUserId] } : {}),
+  };
+
+  const { prs, refresh, loading, dataUpdatedAt, fetchNextPage, hasNextPage, isFetchingNextPage } =
+    usePullRequests(projectId, repositoryUrl ?? undefined, {
+      filters,
+      sort: sortFilter,
+      searchQuery: debouncedQuery || undefined,
+    });
+
+  useEffect(() => {
+    if (dataUpdatedAt > 0 && repositoryUrl) {
+      void queryClient.invalidateQueries({ queryKey: ['pr-filter-options', repositoryUrl] });
+    }
+  }, [dataUpdatedAt, repositoryUrl, queryClient]);
+
+  const { data: filterOptions } = useFilterOptions(projectId, repositoryUrl ?? undefined);
+
+  const authorItems: UserItem[] = useMemo(
+    () =>
+      (filterOptions?.authors ?? []).map((a) => ({
+        value: a.userId,
+        label: a.displayName ?? a.userName,
+        avatarUrl: a.avatarUrl ?? undefined,
+      })),
+    [filterOptions?.authors]
+  );
+
+  const assigneeItems: UserItem[] = useMemo(
+    () =>
+      (filterOptions?.assignees ?? []).map((a) => ({
+        value: a.userId,
+        label: a.displayName ?? a.userName,
+        avatarUrl: a.avatarUrl ?? undefined,
+      })),
+    [filterOptions?.assignees]
+  );
+
+  const labelItems: LabelItem[] = useMemo(
+    () =>
+      (filterOptions?.labels ?? []).map((l) => ({
+        value: l.name,
+        label: l.name,
+        color: l.color ?? undefined,
+      })),
+    [filterOptions?.labels]
+  );
+
+  const selectedAuthorItem = authorItems.find((a) => a.value === selectedAuthorUserId);
+  const selectedAssigneeItem = assigneeItems.find((a) => a.value === selectedAssigneeUserId);
+  const selectedLabelItems = useMemo(
+    () => labelItems.filter((l) => selectedLabelNames.includes(l.value)),
+    [labelItems, selectedLabelNames]
+  );
+
+  const hasPills = Boolean(
+    selectedAuthorUserId || selectedAssigneeUserId || selectedLabelNames.length > 0
+  );
+
+  const handleStatusChange = (value: StatusFilter) => setStatusFilter(value);
+
+  const handleSortChange = (value: string | null) => {
+    if (value) setSortFilter(value as PrSortField);
+  };
+
+  const handleRefresh = async () => {
+    setSyncing(true);
+    try {
+      await refresh();
+    } finally {
+      setSyncing(false);
+    }
+  };
+
+  const handleForceFullSync = async () => {
+    setSyncing(true);
+    try {
+      await rpc.pullRequests.forceFullSyncPullRequests(projectId);
+      await queryClient.invalidateQueries({ queryKey: ['pull-requests', projectId] });
+    } finally {
+      setSyncing(false);
+    }
+  };
+
+  const prSyncStore = getPrSyncStore(projectId);
+  const backgroundSyncing = repositoryUrl
+    ? (prSyncStore?.isSyncing(repositoryUrl) ?? false)
+    : false;
+  const isSyncing = syncing || backgroundSyncing;
+
+  const removeLabel = (name: string) =>
+    setSelectedLabelNames((prev) => prev.filter((n) => n !== name));
+
+  return {
+    // filter state
+    statusFilter,
+    sortFilter,
+    query,
+    setQuery,
+    syncing: isSyncing,
+    selectedAuthorLogin: selectedAuthorUserId,
+    setSelectedAuthorLogin: setSelectedAuthorUserId,
+    selectedLabelNames,
+    setSelectedLabelNames,
+    selectedAssigneeLogin: selectedAssigneeUserId,
+    setSelectedAssigneeLogin: setSelectedAssigneeUserId,
+    // handlers
+    handleStatusChange,
+    handleSortChange,
+    handleRefresh,
+    handleForceFullSync,
+    removeLabel,
+    // data
+    prs,
+    loading,
+    fetchNextPage,
+    hasNextPage,
+    isFetchingNextPage,
+    // filter option items
+    authorItems,
+    assigneeItems,
+    labelItems,
+    // active pills
+    selectedAuthorItem,
+    selectedAssigneeItem,
+    selectedLabelItems,
+    hasPills,
+  };
+}
diff --git a/src/renderer/features/projects/components/pr-view/usePullRequests.ts b/src/renderer/features/projects/components/pr-view/usePullRequests.ts
new file mode 100644
index 0000000000..76c69987c9
--- /dev/null
+++ b/src/renderer/features/projects/components/pr-view/usePullRequests.ts
@@ -0,0 +1,116 @@
+import { useInfiniteQuery, useQuery, useQueryClient } from '@tanstack/react-query';
+import { useCallback } from 'react';
+import type {
+  ListPrOptions,
+  PrFilterOptions,
+  PrFilters,
+  PrSortField,
+  PullRequest,
+} from '@shared/pull-requests';
+import { rpc } from '@renderer/lib/ipc';
+
+const PAGE_SIZE = 50;
+
+export const prQueryKeys = {
+  list: (projectId: string, repositoryUrl: string) =>
+    ['pull-requests', projectId, repositoryUrl] as const,
+  listFull: (
+    projectId: string,
+    repositoryUrl: string,
+    filters?: PrFilters,
+    sort?: PrSortField,
+    searchQuery?: string
+  ) => ['pull-requests', projectId, repositoryUrl, filters, sort, searchQuery] as const,
+  filterOptions: (repositoryUrl: string) => ['pr-filter-options', repositoryUrl] as const,
+};
+
+export interface UsePullRequestsOptions {
+  filters?: PrFilters;
+  sort?: PrSortField;
+  searchQuery?: string;
+  enabled?: boolean;
+}
+
+export function usePullRequests(
+  projectId?: string,
+  repositoryUrl?: string,
+  options: UsePullRequestsOptions = {}
+) {
+  const { filters, sort, searchQuery, enabled = true } = options;
+  const queryClient = useQueryClient();
+
+  const query = useInfiniteQuery({
+    queryKey: prQueryKeys.listFull(projectId!, repositoryUrl!, filters, sort, searchQuery),
+    queryFn: async ({ pageParam }: { pageParam: number }) => {
+      const listOptions: ListPrOptions = {
+        limit: PAGE_SIZE,
+        offset: pageParam,
+        filters,
+        sort,
+        searchQuery,
+        repositoryUrl,
+      };
+      const response = await rpc.pullRequests.listPullRequests(projectId!, listOptions);
+      if (!response?.success) {
+        throw new Error(response?.error || 'Failed to load pull requests');
+      }
+      const prs = (response.prs ?? []) as PullRequest[];
+      return {
+        prs,
+        nextOffset: prs.length === PAGE_SIZE ? pageParam + PAGE_SIZE : undefined,
+      };
+    },
+    initialPageParam: 0,
+    getNextPageParam: (lastPage) => lastPage.nextOffset,
+    enabled: !!projectId && !!repositoryUrl && enabled,
+    staleTime: 0,
+  });
+
+  const prs = query.data?.pages.flatMap((p) => p.prs) ?? [];
+
+  const refresh = useCallback(async () => {
+    if (!projectId || !repositoryUrl) return;
+    await rpc.pullRequests.syncPullRequests(projectId);
+    await queryClient.invalidateQueries({ queryKey: prQueryKeys.list(projectId, repositoryUrl) });
+    await queryClient.invalidateQueries({
+      queryKey: prQueryKeys.filterOptions(repositoryUrl),
+    });
+  }, [queryClient, projectId, repositoryUrl]);
+
+  return {
+    prs,
+    loading: query.isLoading,
+    dataUpdatedAt: query.dataUpdatedAt,
+    isFetchingNextPage: query.isFetchingNextPage,
+    hasNextPage: query.hasNextPage,
+    fetchNextPage: query.fetchNextPage,
+    error: query.error
+      ? query.error instanceof Error
+        ? query.error.message
+        : String(query.error)
+      : null,
+    refresh,
+  };
+}
+
+export function useFilterOptions(projectId?: string, repositoryUrl?: string) {
+  return useQuery<PrFilterOptions>({
+    queryKey: prQueryKeys.filterOptions(repositoryUrl!),
+    queryFn: async () => {
+      const response = await rpc.pullRequests.getFilterOptions(projectId!);
+      if (!response?.success) {
+        throw new Error(response?.error || 'Failed to load filter options');
+      }
+      const { authors, labels, assignees } = response as {
+        authors: PrFilterOptions['authors'];
+        labels: PrFilterOptions['labels'];
+        assignees: PrFilterOptions['assignees'];
+      };
+      return { authors, labels, assignees };
+    },
+    enabled: !!repositoryUrl,
+    staleTime: 60_000,
+  });
+}
+
+export type { PrFilters, PrSortField } from '@shared/pull-requests';
diff --git a/src/renderer/features/projects/components/project-titlebar.tsx b/src/renderer/features/projects/components/project-titlebar.tsx
new file mode 100644
index 0000000000..7c1b4fab34
--- /dev/null
+++ b/src/renderer/features/projects/components/project-titlebar.tsx
@@ -0,0 +1,168 @@
+import { ChevronDown, Ellipsis, ExternalLink, GithubIcon, Globe, Trash2 } from 'lucide-react';
+import { observer } from 'mobx-react-lite';
+import {
+  asMounted,
+  getProjectManagerStore,
+  getProjectStore,
+  getRepositoryStore,
+  projectDisplayName,
+  projectViewKind,
+} from '@renderer/features/projects/stores/project-selectors';
+import type { ProjectView } from '@renderer/features/projects/stores/project-view';
+import { OpenInMenu } from '@renderer/lib/components/titlebar/open-in-menu';
+import { Titlebar } from '@renderer/lib/components/titlebar/Titlebar';
+import { rpc } from '@renderer/lib/ipc';
+import { useNavigate, useParams } from '@renderer/lib/layout/navigation-provider';
+import { useShowModal } from '@renderer/lib/modal/modal-provider';
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuTrigger,
+} from '@renderer/lib/ui/dropdown-menu';
+import { Separator } from '@renderer/lib/ui/separator';
+import { ToggleGroup, ToggleGroupItem } from '@renderer/lib/ui/toggle-group';
+
+const MountedProjectTitlebarLeft = observer(function ProjectTitlebarLeft({
+  projectId,
+}: {
+  projectId: string;
+}) {
+  const { navigate } = useNavigate();
+  const store = getProjectStore(projectId);
+  const displayName = projectDisplayName(store);
+  const showConfirmDeleteProject = useShowModal('confirmActionModal');
+
+  const repo = getRepositoryStore(projectId);
+  const configuredRemote = repo?.configuredRemote;
+  const remoteUrl = configuredRemote?.url;
+  const repositoryUrl = repo?.repositoryUrl;
+
+  const isGithubUrl = repositoryUrl?.includes('github.com');
+  const repoLabel = repositoryUrl
+    ? repositoryUrl.replace(/^https?:\/\/(www\.)?github\.com\//, '')
+    : remoteUrl?.replace(/^https?:\/\//, '');
+
+  return (
+    <div className="flex items-center px-2 gap-2 h-full">
+      <DropdownMenu>
+        <DropdownMenuTrigger
+          render={
+            <button className="flex items-center gap-1.5 text-foreground-muted text-sm hover:text-foreground group">
+              <span className="text-sm">{displayName}</span>
+              <ChevronDown className="size-3.5" />
+            </button>
+          }
+        >
+          <Ellipsis className="size-4" />
+        </DropdownMenuTrigger>
+        <DropdownMenuContent className="min-w-40">
+          <DropdownMenuItem
+            className="flex items-center gap-2 text-foreground-destructive"
+            onClick={() => {
+              showConfirmDeleteProject({
+                title: 'Delete project',
+                description: `"${displayName}" will be deleted. The project folder and worktrees will stay on the filesystem.`,
+                confirmLabel: 'Delete',
+                onSuccess: () => {
+                  void getProjectManagerStore().deleteProject(projectId);
+                  navigate('home');
+                },
+              });
+            }}
+          >
+            <Trash2 className="size-4 " />
+            Remove Project
+          </DropdownMenuItem>
+        </DropdownMenuContent>
+      </DropdownMenu>
+      {remoteUrl && (
+        <>
+          <Separator
+            orientation="vertical"
+            className="h-4 data-[orientation=vertical]:self-center"
+          />
+          <button
+            className="flex items-center gap-1.5 text-foreground-muted text-sm hover:text-foreground group transition-colors"
+            onClick={() => void rpc.app.openExternal(remoteUrl ?? '')}
+          >
+            <div className="text-sm flex items-center gap-1">
+              {isGithubUrl ? <GithubIcon className="size-3.5" /> : <Globe className="size-3.5" />}
+              <span className="truncate">{repoLabel}</span>
+            </div>
+            <ExternalLink className="size-3.5 shrink-0 opacity-0 group-hover:opacity-100 text-foreground-muted hover:text-foreground transition-opacity" />
+          </button>
+        </>
+      )}
+    </div>
+  );
+});
+
+const ProjectTitlebarLeft = observer(function ProjectTitlebarLeft({
+  projectId,
+}: {
+  projectId: string;
+}) {
+  const store = getProjectStore(projectId);
+  const displayName = projectDisplayName(store);
+  return (
+    <div className="flex items-center px-2 gap-2">
+      <span className="text-sm text-foreground-muted">{displayName}</span>
+    </div>
+  );
+});
+
+export const ProjectTitlebar = observer(function ProjectTitlebar() {
+  const {
+    params: { projectId },
+  } = useParams('project');
+  const store = getProjectStore(projectId);
+  const kind = projectViewKind(store);
+
+  if (kind !== 'ready') {
+    return <Titlebar leftSlot={<ProjectTitlebarLeft projectId={projectId} />} />;
+  }
+
+  const mounted = asMounted(store);
+  if (!mounted) return <Titlebar leftSlot={<ProjectTitlebarLeft projectId={projectId} />} />;
+
+  const isRemote = mounted.data.type === 'ssh';
+  const sshConnectionId = mounted.data.type === 'ssh' ? mounted.data.connectionId : null;
+
+  return (
+    <Titlebar
+      leftSlot={<MountedProjectTitlebarLeft projectId={projectId} />}
+      rightSlot={
+        <div className="flex items-center gap-2 mr-2">
+          {!isRemote && (
+            <OpenInMenu
+              path={mounted.data.path}
+              isRemote={isRemote}
+              sshConnectionId={sshConnectionId}
+              className="h-7 bg-background"
+            />
+          )}
+          <ToggleGroup
+            variant="outline"
+            size="sm"
+            value={[mounted.view.activeView]}
+            className="rounded-lg overflow-hidden shadow-none h-7 border border-border mx-1"
+            onValueChange={([value]) => {
+              if (value) mounted.view.setProjectView(value as ProjectView);
+            }}
+          >
+            <ToggleGroupItem value="tasks" size="sm">
+              Tasks
+            </ToggleGroupItem>
+            <ToggleGroupItem value="pull-request" size="sm">
+              Pull Requests
+            </ToggleGroupItem>
+            <ToggleGroupItem value="settings" size="sm">
+              Settings
+            </ToggleGroupItem>
+          </ToggleGroup>
+        </div>
+      }
+    />
+  );
+});
diff --git a/src/renderer/features/projects/components/project-view-wrapper.tsx b/src/renderer/features/projects/components/project-view-wrapper.tsx
new file mode 100644
index 0000000000..6ad0e99af0
--- /dev/null
+++ b/src/renderer/features/projects/components/project-view-wrapper.tsx
@@ -0,0 +1,10 @@
+import type { ReactNode } from 'react';
+
+interface ProjectViewWrapperProps {
+  children: ReactNode;
+  projectId: string;
+}
+
+export function ProjectViewWrapper({ children }: ProjectViewWrapperProps) {
+  return <>{children}</>;
+}
diff --git a/src/renderer/features/projects/components/settings-view/project-settings-form.tsx b/src/renderer/features/projects/components/settings-view/project-settings-form.tsx
new file mode 100644
index 0000000000..c0103ee127
--- /dev/null
+++ b/src/renderer/features/projects/components/settings-view/project-settings-form.tsx
@@ -0,0 +1,369 @@
+import { Check, Loader2, Undo2 } from 'lucide-react';
+import { observer } from 'mobx-react-lite';
+import { useMemo, useState } from 'react';
+import type { Branch } from '@shared/git';
+import type { UpdateProjectSettingsError } from '@shared/projects';
+import { err, type Result } from '@shared/result';
+import type { ProjectSettings } from '@main/core/projects/settings/schema';
+import { getRepositoryStore } from '@renderer/features/projects/stores/project-selectors';
+import { ProjectBranchSelector } from '@renderer/lib/components/project-branch-selector';
+import { rpc } from '@renderer/lib/ipc';
+import { Button } from '@renderer/lib/ui/button';
+import { ConfirmButton } from '@renderer/lib/ui/confirm-button';
+import { Field, FieldDescription, FieldGroup, FieldTitle } from '@renderer/lib/ui/field';
+import { Input } from '@renderer/lib/ui/input';
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from '@renderer/lib/ui/select';
+import { Separator } from '@renderer/lib/ui/separator';
+import { Switch } from '@renderer/lib/ui/switch';
+import { Textarea } from '@renderer/lib/ui/textarea';
+import { cn } from '@renderer/utils/utils';
+
+type FormState = {
+  preservePatterns: string;
+  shellSetup: string;
+  tmux: boolean;
+  scriptSetup: string;
+  scriptRun: string;
+  scriptTeardown: string;
+  worktreeDirectory: string;
+  defaultBranch: Branch | null;
+  remote: string;
+};
+
+function normalizeScript(val: string | string[] | undefined): string {
+  if (Array.isArray(val)) return val.join('\n');
+  return val ?? '';
+}
+
+export function settingsToForm(
+  s: ProjectSettings,
+  configuredRemote: string,
+  remotes: { name: string; url: string }[]
+): FormState {
+  let defaultBranch: Branch | null = null;
+  const configuredRemoteMeta = remotes.find((remote) => remote.name === configuredRemote) ?? {
+    name: configuredRemote,
+    url: '',
+  };
+  if (s.defaultBranch) {
+    if (typeof s.defaultBranch === 'string') {
+      defaultBranch = { type: 'local', branch: s.defaultBranch };
+    } else {
+      defaultBranch = {
+        type: 'remote',
+        branch: s.defaultBranch.name,
+        remote: configuredRemoteMeta,
+      };
+    }
+  }
+  return {
+    preservePatterns: (s.preservePatterns ?? []).join('\n'),
+    shellSetup: s.shellSetup ?? '',
+    tmux: s.tmux ?? false,
+    scriptSetup: normalizeScript(s.scripts?.setup),
+    scriptRun: normalizeScript(s.scripts?.run),
+    scriptTeardown: normalizeScript(s.scripts?.teardown),
+    worktreeDirectory: s.worktreeDirectory ?? '',
+    defaultBranch,
+    remote: s.remote ?? '',
+  };
+}
+
+export function formToSettings(f: FormState): ProjectSettings {
+  let defaultBranch: ProjectSettings['defaultBranch'];
+  if (f.defaultBranch) {
+    defaultBranch =
+      f.defaultBranch.type === 'remote'
+        ? { name: f.defaultBranch.branch, remote: true }
+        : f.defaultBranch.branch;
+  }
+  return {
+    preservePatterns: f.preservePatterns
+      .split('\n')
+      .map((p) => p.trim())
+      .filter(Boolean),
+    shellSetup: f.shellSetup || undefined,
+    tmux: f.tmux || undefined,
+    scripts: {
+      setup: f.scriptSetup,
+      run: f.scriptRun,
+      teardown: f.scriptTeardown,
+    },
+    worktreeDirectory: f.worktreeDirectory || undefined,
+    defaultBranch,
+    remote: f.remote || undefined,
+  };
+}
+
+export interface ProjectSettingsFormProps {
+  projectId: string;
+  initial: ProjectSettings;
+  onSuccess: () => void;
+  save: (settings: ProjectSettings) => Promise<Result<void, UpdateProjectSettingsError>>;
+}
+
+type SaveStatus = 'idle' | 'saving' | 'saved' | 'error';
+const EMPTY_REMOTES: { name: string; url: string }[] = [];
+
+export const ProjectSettingsForm = observer(function ProjectSettingsForm({
+  projectId,
+  initial,
+  onSuccess,
+  save,
+}: ProjectSettingsFormProps) {
+  const repo = getRepositoryStore(projectId);
+  const remotes = repo?.remotes ?? EMPTY_REMOTES;
+  const configuredRemote = repo?.configuredRemote.name ?? 'origin';
+
+  const baseline = useMemo(
+    () => settingsToForm(initial, configuredRemote, remotes),
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [initial, configuredRemote, remotes]
+  );
+  const [form, setForm] = useState<FormState>(baseline);
+  const [savedForm, setSavedForm] = useState<FormState>(baseline);
+  const [saveStatus, setSaveStatus] = useState<SaveStatus>('idle');
+  const [worktreeDirectoryError, setWorktreeDirectoryError] = useState<string | null>(null);
+
+  const formSnapshot = useMemo(() => JSON.stringify(form), [form]);
+  const savedSnapshot = useMemo(() => JSON.stringify(savedForm), [savedForm]);
+  const dirty = formSnapshot !== savedSnapshot;
+  const saving = saveStatus === 'saving';
+  const saved = saveStatus === 'saved' && !dirty;
+  const saveDisabled = saving || !dirty;
+
+  function update<K extends keyof FormState>(key: K, value: FormState[K]) {
+    setForm((current) => ({ ...current, [key]: value }));
+    setSaveStatus((current) => (current === 'idle' ? current : 'idle'));
+    if (key === 'worktreeDirectory' && worktreeDirectoryError) {
+      setWorktreeDirectoryError(null);
+    }
+  }
+
+  async function handleSave() {
+    const formAtSubmit = form;
+    setSaveStatus('saving');
+
+    const result = await save(formToSettings(formAtSubmit)).catch(() => err({ type: 'error' }));
+
+    if (result.success) {
+      setWorktreeDirectoryError(null);
+      setSavedForm(formAtSubmit);
+      setSaveStatus('saved');
+      onSuccess();
+      return;
+    }
+
+    if (result.error.type === 'invalid-worktree-directory') {
+      setWorktreeDirectoryError('Invalid worktree directory');
+      setSaveStatus('idle');
+      return;
+    }
+
+    setWorktreeDirectoryError(null);
+    setSaveStatus('error');
+  }
+
+  return (
+    <div className="flex flex-col max-w-3xl mx-auto w-full h-full overflow-hidden px-10">
+      <h1 className="text-lg font-medium pt-10 pb-5">Project Settings</h1>
+      <div className="flex-1 overflow-y-auto overflow-x-hidden" style={{ scrollbarWidth: 'none' }}>
+        <FieldGroup>
+          <Field>
+            <FieldTitle>Preserve patterns</FieldTitle>
+            <FieldDescription>
+              Gitignored files matching these glob patterns are copied from the main repo into each
+              worktree. One pattern per line.
+            </FieldDescription>
+            <Textarea
+              rows={5}
+              placeholder={'.env\n.env.local\n.envrc'}
+              value={form.preservePatterns}
+              onChange={(e) => update('preservePatterns', e.target.value)}
+            />
+          </Field>
+
+          <Separator />
+
+          <Field>
+            <FieldTitle>Worktree directory</FieldTitle>
+            <FieldDescription>
+              Override where worktrees are created. Defaults to the app-level worktree directory
+              setting.
+            </FieldDescription>
+            <div className="relative">
+              <Input
+                aria-invalid={worktreeDirectoryError ? true : undefined}
+                className={cn(worktreeDirectoryError ? 'pr-44' : undefined)}
+                placeholder="Leave blank to use the default"
+                value={form.worktreeDirectory}
+                onChange={(e) => update('worktreeDirectory', e.target.value)}
+              />
+              {worktreeDirectoryError ? (
+                <span className="pointer-events-none absolute right-2 top-1/2 -translate-y-1/2 text-xs text-red-500">
+                  {worktreeDirectoryError}
+                </span>
+              ) : null}
+            </div>
+          </Field>
+
+          <Separator />
+
+          <Field>
+            <FieldTitle>Default branch</FieldTitle>
+            <FieldDescription>
+              The branch new tasks are created from by default. Overrides the branch detected at
+              project creation time.
+            </FieldDescription>
+            <ProjectBranchSelector
+              projectId={projectId}
+              value={form.defaultBranch ?? undefined}
+              onValueChange={(branch: Branch) => update('defaultBranch', branch)}
+            />
+          </Field>
+
+          <Separator />
+
+          <Field>
+            <FieldTitle>Remote</FieldTitle>
+            <FieldDescription>
+              The git remote used for fetching and syncing worktrees. Defaults to{' '}
+              <code className="font-mono text-xs">origin</code>.
+            </FieldDescription>
+            <Select
+              value={form.remote || 'origin'}
+              onValueChange={(value) => update('remote', value ?? '')}
+            >
+              <SelectTrigger>
+                <SelectValue placeholder="Select a remote" />
+              </SelectTrigger>
+              <SelectContent>
+                {remotes.length > 0 ? (
+                  remotes.map((r) => (
+                    <SelectItem key={r.name} value={r.name}>
+                      {r.name}
+                      <span className="ml-2 text-xs text-muted-foreground">{r.url}</span>
+                    </SelectItem>
+                  ))
+                ) : (
+                  <SelectItem value="origin">origin</SelectItem>
+                )}
+              </SelectContent>
+            </Select>
+          </Field>
+
+          <Separator />
+
+          <Field>
+            <FieldTitle>Shell setup</FieldTitle>
+            <FieldDescription>
+              Shell commands run before the agent starts in each worktree session (e.g.{' '}
+              <code className="font-mono text-xs">nvm use</code>).
+            </FieldDescription>
+            <Textarea
+              rows={3}
+              placeholder={'nvm use\nsource .envrc'}
+              value={form.shellSetup}
+              onChange={(e) => update('shellSetup', e.target.value)}
+            />
+          </Field>
+
+          <Separator />
+
+          <Field orientation="horizontal">
+            <div className="flex flex-1 flex-col gap-1">
+              <FieldTitle>Enable tmux</FieldTitle>
+              <FieldDescription>Run the agent session inside a tmux session.</FieldDescription>
+            </div>
+            <Switch checked={form.tmux} onCheckedChange={(checked) => update('tmux', checked)} />
+          </Field>
+
+          <Separator />
+
+          <div className="flex flex-col gap-4">
+            <div>
+              <FieldTitle>Lifecycle scripts</FieldTitle>
+              <FieldDescription className="mt-1">
+                Shell commands run at each stage of the worktree lifecycle. One command per line.
+                <span> See </span>
+                <Button
+                  type="button"
+                  variant="link"
+                  size="sm"
+                  className="group inline-flex h-auto cursor-pointer items-center gap-1 px-0 text-sm font-normal text-muted-foreground hover:text-foreground hover:no-underline focus-visible:outline-none focus-visible:ring-0"
+                  onClick={() => rpc.app.openExternal('https://www.emdash.sh/docs/project-config')}
+                >
+                  <span className="font-mono text-xs transition-colors group-hover:text-foreground">
+                    docs
+                  </span>
+                  <span className="text-sm text-muted-foreground transition-colors group-hover:text-foreground">
+                    ↗
+                  </span>
+                </Button>
+                <span> for the full project config reference.</span>
+              </FieldDescription>
+            </div>
+
+            <Field>
+              <FieldTitle className="text-xs font-normal text-muted-foreground">Setup</FieldTitle>
+              <Textarea
+                rows={3}
+                placeholder={'npm install\ncp .env.example .env'}
+                value={form.scriptSetup}
+                onChange={(e) => update('scriptSetup', e.target.value)}
+              />
+            </Field>
+
+            <Field>
+              <FieldTitle className="text-xs font-normal text-muted-foreground">Run</FieldTitle>
+              <Textarea
+                rows={3}
+                placeholder="npm run dev"
+                value={form.scriptRun}
+                onChange={(e) => update('scriptRun', e.target.value)}
+              />
+            </Field>
+
+            <Field>
+              <FieldTitle className="text-xs font-normal text-muted-foreground">
+                Teardown
+              </FieldTitle>
+              <Textarea
+                rows={3}
+                placeholder="docker compose down"
+                value={form.scriptTeardown}
+                onChange={(e) => update('scriptTeardown', e.target.value)}
+              />
+            </Field>
+          </div>
+        </FieldGroup>
+      </div>
+      <div className="flex justify-end gap-2 pt-5 pb-10">
+        <Button
+          variant="outline"
+          onClick={() => {
+            setForm(savedForm);
+            setWorktreeDirectoryError(null);
+            if (saveStatus === 'error') setSaveStatus('idle');
+          }}
+          disabled={!dirty || saving}
+        >
+          <Undo2 />
+        </Button>
+        <ConfirmButton onClick={() => void handleSave()} disabled={saveDisabled}>
+          <span className="inline-flex min-w-22 items-center justify-center gap-1.5">
+            {saving && <Loader2 className="size-4 animate-spin" aria-hidden="true" />}
+            {!saving && saved && <Check className="size-4" aria-hidden="true" />}
+            {saving ? 'Saving…' : saved ? 'Saved' : 'Save'}
+          </span>
+        </ConfirmButton>
+      </div>
+    </div>
+  );
+});
diff --git a/src/renderer/features/projects/components/settings-view/settings-panel.tsx b/src/renderer/features/projects/components/settings-view/settings-panel.tsx
new file mode 100644
index 0000000000..57334fc4e4
--- /dev/null
+++ b/src/renderer/features/projects/components/settings-view/settings-panel.tsx
@@ -0,0 +1,31 @@
+import { observer } from 'mobx-react-lite';
+import { ProjectSettingsForm } from '@renderer/features/projects/components/settings-view/project-settings-form';
+import { getProjectSettingsStore } from '@renderer/features/projects/stores/project-selectors';
+import { useParams } from '@renderer/lib/layout/navigation-provider';
+import { Spinner } from '@renderer/lib/ui/spinner';
+
+export const SettingsPanel = observer(function SettingsPanel() {
+  const {
+    params: { projectId },
+  } = useParams('project');
+  const store = getProjectSettingsStore(projectId);
+  const settings = store?.settings;
+
+  if (!store || store.settingsData.loading || !settings) {
+    return (
+      <div className="flex items-center justify-center py-10">
+        <Spinner />
+      </div>
+    );
+  }
+
+  return (
+    <ProjectSettingsForm
+      key={projectId}
+      projectId={projectId}
+      initial={settings}
+      onSuccess={() => {}}
+      save={(s) => store.save(s)}
+    />
+  );
+});
diff --git a/src/renderer/features/projects/components/task-view/task-list.tsx b/src/renderer/features/projects/components/task-view/task-list.tsx
new file mode 100644
index 0000000000..6cb9c462b9
--- /dev/null
+++ b/src/renderer/features/projects/components/task-view/task-list.tsx
@@ -0,0 +1,224 @@
+import { useVirtualizer } from '@tanstack/react-virtual';
+import { Archive, RotateCcw, Trash2, X } from 'lucide-react';
+import { observer } from 'mobx-react-lite';
+import { useRef } from 'react';
+import { asMounted, getProjectStore } from '@renderer/features/projects/stores/project-selectors';
+import { getTaskManagerStore } from '@renderer/features/tasks/stores/task-selectors';
+import { ListPopoverCard } from '@renderer/lib/components/list-popover-card';
+import { useParams } from '@renderer/lib/layout/navigation-provider';
+import { useShowModal } from '@renderer/lib/modal/modal-provider';
+import { Button } from '@renderer/lib/ui/button';
+import { EmptyState } from '@renderer/lib/ui/empty-state';
+import { SearchInput } from '@renderer/lib/ui/search-input';
+import { ShortcutHint } from '@renderer/lib/ui/shortcut-hint';
+import { ToggleGroup, ToggleGroupItem } from '@renderer/lib/ui/toggle-group';
+import { cn } from '@renderer/utils/utils';
+import { ReadyTask, TaskRow } from './task-row';
+
+function TaskVirtualList({
+  tasks,
+  selectedIds,
+  onToggleSelect,
+}: {
+  tasks: ReadyTask[];
+  selectedIds: Set<string>;
+  onToggleSelect: (id: string) => void;
+}) {
+  const parentRef = useRef<HTMLDivElement>(null);
+
+  // eslint-disable-next-line react-hooks/incompatible-library
+  const virtualizer = useVirtualizer({
+    count: tasks.length,
+    getScrollElement: () => parentRef.current,
+    estimateSize: () => 60,
+    overscan: 5,
+    measureElement: (el) => el.getBoundingClientRect().height,
+  });
+
+  const virtualItems = virtualizer.getVirtualItems();
+
+  if (tasks.length === 0) {
+    return <EmptyState label="No tasks" description="No tasks found" />;
+  }
+
+  return (
+    <div
+      ref={parentRef}
+      className="overflow-y-auto min-h-0 flex-1 py-3"
+      style={{ scrollbarWidth: 'none' }}
+    >
+      <div style={{ height: virtualizer.getTotalSize(), position: 'relative' }}>
+        {virtualItems.map((virtualItem) => {
+          const task = tasks[virtualItem.index]!;
+          return (
+            <div
+              key={virtualItem.key}
+              data-index={virtualItem.index}
+              ref={virtualizer.measureElement}
+              className={cn(virtualItem.index === tasks.length - 1 && 'border-b-0')}
+              style={{
+                position: 'absolute',
+                top: 0,
+                left: 0,
+                width: '100%',
+                transform: `translateY(${virtualItem.start}px)`,
+              }}
+            >
+              <TaskRow
+                task={task}
+                isSelected={selectedIds.has(task.data.id)}
+                onToggleSelect={() => onToggleSelect(task.data.id)}
+              />
+            </div>
+          );
+        })}
+      </div>
+    </div>
+  );
+}
+
+function SelectionBar({
+  count,
+  tab,
+  onClear,
+  onArchive,
+  onRestore,
+  onDelete,
+}: {
+  count: number;
+  tab: 'active' | 'archived';
+  onClear: () => void;
+  onArchive: () => void;
+  onRestore: () => void;
+  onDelete: () => void;
+}) {
+  if (count === 0) return null;
+
+  return (
+    <ListPopoverCard className="justify-between">
+      <span className="text-foreground-muted whitespace-nowrap">{count} selected</span>
+      <div className="flex items-center gap-2">
+        {tab === 'active' && (
+          <Button variant="outline" size="sm" onClick={onArchive}>
+            <Archive className="size-3.5" />
+            Archive
+          </Button>
+        )}
+        {tab === 'archived' && (
+          <Button variant="outline" size="sm" onClick={onRestore}>
+            <RotateCcw className="size-3.5" />
+            Restore
+          </Button>
+        )}
+        <Button variant="destructive" size="sm" onClick={onDelete}>
+          <Trash2 className="size-3.5" />
+          Delete
+        </Button>
+        <Button variant="ghost" size="icon-sm" onClick={onClear} aria-label="Clear selection">
+          <X className="size-3.5" />
+        </Button>
+      </div>
+    </ListPopoverCard>
+  );
+}
+
+export const TaskList = observer(function TaskList() {
+  const {
+    params: { projectId },
+  } = useParams('project');
+  const store = asMounted(getProjectStore(projectId));
+  const taskManager = getTaskManagerStore(projectId);
+  const showConfirm = useShowModal('confirmActionModal');
+  const showCreateTaskModal = useShowModal('taskModal');
+
+  const taskView = store?.view.taskView ?? null;
+
+  const allTasks = taskManager
+    ? Array.from(taskManager.tasks.values()).filter(
+        (t): t is ReadyTask => t.state !== 'unregistered'
+      )
+    : [];
+  const activeTasks = allTasks.filter((t) => !t.data.archivedAt);
+  const archivedTasks = allTasks.filter((t) => Boolean(t.data.archivedAt));
+
+  if (!taskView) return null;
+
+  const displayTasks = taskView.tab === 'active' ? activeTasks : archivedTasks;
+  const q = taskView.searchQuery.trim().toLowerCase();
+  const filteredTasks = q
+    ? displayTasks.filter((t) => t.data.name.toLowerCase().includes(q))
+    : displayTasks;
+
+  const clearSelection = () => taskView.setSelectedIds(new Set());
+
+  const bulkArchive = () => {
+    const ids = [...taskView.selectedIds];
+    ids.forEach((id) => void taskManager?.archiveTask(id));
+    clearSelection();
+  };
+
+  const bulkRestore = () => {
+    const ids = [...taskView.selectedIds];
+    ids.forEach((id) => void taskManager?.restoreTask(id));
+    clearSelection();
+  };
+
+  const bulkDelete = () => {
+    const count = taskView.selectedIds.size;
+    showConfirm({
+      title: `Delete ${count} task${count === 1 ? '' : 's'}`,
+      description: 'The selected tasks will be permanently deleted. This action cannot be undone.',
+      confirmLabel: `Delete ${count} task${count === 1 ? '' : 's'}`,
+      onSuccess: () => {
+        const ids = [...taskView.selectedIds];
+        ids.forEach((id) => void taskManager?.deleteTask(id));
+        clearSelection();
+      },
+    });
+  };
+
+  return (
+    <div className="relative flex flex-col max-w-3xl mx-auto w-full h-full pt-6 px-6 min-h-0">
+      <div className="flex flex-col gap-4 border-b border-border pb-3 shrink-0">
+        <div className="flex items-center gap-2 flex-wrap justify-between">
+          <ToggleGroup
+            multiple={false}
+            value={[taskView.tab]}
+            onValueChange={([value]) => {
+              if (value) taskView.setTab(value as 'active' | 'archived');
+            }}
+          >
+            <ToggleGroupItem value="active">Active ({activeTasks.length})</ToggleGroupItem>
+            <ToggleGroupItem value="archived">Archived ({archivedTasks.length})</ToggleGroupItem>
+          </ToggleGroup>
+          <div className="flex items-center gap-2">
+            <SearchInput
+              placeholder="Search tasks…"
+              value={taskView.searchQuery}
+              onChange={(e) => taskView.setSearchQuery(e.target.value)}
+              className="flex-1"
+            />
+            <Button onClick={() => showCreateTaskModal({ projectId })}>
+              Create Task <ShortcutHint settingsKey="newTask" />
+            </Button>
+          </div>
+        </div>
+      </div>
+
+      <TaskVirtualList
+        tasks={filteredTasks}
+        selectedIds={taskView.selectedIds}
+        onToggleSelect={(id) => taskView.toggleSelect(id)}
+      />
+
+      <SelectionBar
+        count={taskView.selectedIds.size}
+        tab={taskView.tab}
+        onClear={clearSelection}
+        onArchive={bulkArchive}
+        onRestore={bulkRestore}
+        onDelete={bulkDelete}
+      />
+    </div>
+  );
+});
diff --git a/src/renderer/features/projects/components/task-view/task-row.tsx b/src/renderer/features/projects/components/task-view/task-row.tsx
new file mode 100644
index 0000000000..6a109b615b
--- /dev/null
+++ b/src/renderer/features/projects/components/task-view/task-row.tsx
@@ -0,0 +1,144 @@
+import { observer } from 'mobx-react-lite';
+import { selectCurrentPr } from '@shared/pull-requests';
+import { type Task } from '@shared/tasks';
+import { AgentStatusIndicator } from '@renderer/features/tasks/components/agent-status-indicator';
+import { TaskContextMenu } from '@renderer/features/tasks/components/task-context-menu';
+import { TaskGitDiffStats } from '@renderer/features/tasks/components/task-git-diff-stats';
+import { type TaskStore } from '@renderer/features/tasks/stores/task';
+import {
+  getTaskManagerStore,
+  taskAgentStatus,
+} from '@renderer/features/tasks/stores/task-selectors';
+import AgentLogo from '@renderer/lib/components/agent-logo';
+import { PrBadge } from '@renderer/lib/components/pr-badge';
+import { useNavigate } from '@renderer/lib/layout/navigation-provider';
+import { useShowModal } from '@renderer/lib/modal/modal-provider';
+import { Checkbox } from '@renderer/lib/ui/checkbox';
+import { RelativeTime } from '@renderer/lib/ui/relative-time';
+import { agentConfig } from '@renderer/utils/agentConfig';
+import { cn } from '@renderer/utils/utils';
+
+export type ReadyTask = TaskStore & { data: Task };
+
+export const TaskRow = observer(function TaskRow({
+  task,
+  isSelected,
+  onToggleSelect,
+}: {
+  task: ReadyTask;
+  isSelected: boolean;
+  onToggleSelect: () => void;
+}) {
+  const { navigate } = useNavigate();
+  const showRename = useShowModal('renameTaskModal');
+  const showConfirm = useShowModal('confirmActionModal');
+  const taskManager = getTaskManagerStore(task.data.projectId);
+
+  const handleArchive = () => void taskManager?.archiveTask(task.data.id);
+  const handleRestore = () => void taskManager?.restoreTask(task.data.id);
+  const handleProvision = () => void taskManager?.provisionTask(task.data.id);
+  const handleDelete = () =>
+    showConfirm({
+      title: 'Delete task',
+      description: `"${task.data.name}" will be permanently deleted. This action cannot be undone.`,
+      confirmLabel: 'Delete',
+      onSuccess: () => void taskManager?.deleteTask(task.data.id),
+    });
+  const handleRename = () =>
+    showRename({
+      projectId: task.data.projectId,
+      taskId: task.data.id,
+      currentName: task.data.name,
+    });
+
+  const isArchived = Boolean(task.data.archivedAt);
+  const canPin = task.state !== 'unregistered';
+  const agentAttention = taskAgentStatus(task);
+  const currentPr = task.data.prs ? selectCurrentPr(task.data.prs) : undefined;
+
+  return (
+    <TaskContextMenu
+      isPinned={task.data.isPinned}
+      canPin={canPin}
+      isArchived={isArchived}
+      onPin={() => void task.setPinned(true)}
+      onUnpin={() => void task.setPinned(false)}
+      onRename={handleRename}
+      onArchive={handleArchive}
+      onRestore={handleRestore}
+      onDelete={handleDelete}
+    >
+      <button
+        onClick={() => {
+          if (isArchived) return;
+          handleProvision();
+          navigate('task', { projectId: task.data.projectId, taskId: task.data.id });
+        }}
+        className="group flex items-center gap-2 rounded-lg p-3  hover:bg-background-1 transition-colors w-full"
+      >
+        <div
+          onClick={(e) => e.stopPropagation()}
+          className={cn(
+            'transition-opacity',
+            isSelected ? 'opacity-100' : 'opacity-0 group-hover:opacity-100'
+          )}
+        >
+          <Checkbox
+            checked={isSelected}
+            onCheckedChange={onToggleSelect}
+            aria-label="Select task"
+          />
+        </div>
+        <div className="flex min-w-0 flex-1 items-center gap-2">
+          <div className="flex min-w-0 flex-1 items-center gap-2">
+            <span className="min-w-0 text-left text-sm truncate">{task.data.name}</span>
+            <TaskGitDiffStats task={task} className="text-xs shrink-0" />
+            {currentPr && <PrBadge pr={currentPr} />}
+          </div>
+        </div>
+        <div className="flex items-center shrink-0 [&>span]:ring-2 [&>span]:ring-background [&>span:not(:first-child)]:-ml-1.5">
+          {Object.entries(task.conversationStats).map(([providerId, count]) => {
+            const config = agentConfig[providerId as keyof typeof agentConfig];
+            if (!config) return null;
+            return (
+              <span
+                key={providerId}
+                className="relative flex items-center justify-center h-5 w-5 rounded-sm bg-background-2 overflow-hidden"
+                title={`${config.name}: ${String(count)}`}
+              >
+                <AgentLogo
+                  logo={config.logo}
+                  alt={config.alt}
+                  isSvg={config.isSvg}
+                  invertInDark={config.invertInDark}
+                  className="h-3.5 w-3.5"
+                />
+                {count > 1 && (
+                  <span className="absolute -bottom-px -right-px text-[8px] leading-none font-semibold bg-background text-foreground-passive px-px rounded-tl">
+                    {count}
+                  </span>
+                )}
+              </span>
+            );
+          })}
+        </div>
+        <div
+          className={cn(
+            'flex min-w-8 shrink-0 items-center justify-end',
+            agentAttention ? 'justify-end' : 'justify-middle'
+          )}
+        >
+          {agentAttention ? (
+            <AgentStatusIndicator status={agentAttention} />
+          ) : (
+            <RelativeTime
+              value={task.data.createdAt}
+              className="text-xs text-foreground-passive font-mono pr-1"
+              compact
+            />
+          )}
+        </div>
+      </button>
+    </TaskContextMenu>
+  );
+});
diff --git a/src/renderer/features/projects/stores/pr-sync-store.ts b/src/renderer/features/projects/stores/pr-sync-store.ts
new file mode 100644
index 0000000000..75a2eea249
--- /dev/null
+++ b/src/renderer/features/projects/stores/pr-sync-store.ts
@@ -0,0 +1,47 @@
+import { makeAutoObservable, observable, runInAction } from 'mobx';
+import { prSyncProgressChannel } from '@shared/events/prEvents';
+import type { PrSyncProgress } from '@shared/pull-requests';
+import { events, rpc } from '@renderer/lib/ipc';
+import { log } from '@renderer/utils/logger';
+
+export class PrSyncStore {
+  readonly states = observable.map<string, PrSyncProgress>();
+  private _unsub: (() => void) | null = null;
+
+  constructor(private readonly projectId: string) {
+    log.info('[PrSyncStore] created for project', projectId);
+    this._unsub = events.on(prSyncProgressChannel, (progress) => {
+      log.info('[PrSyncStore] received prSyncProgress event', progress);
+      runInAction(() => {
+        this.states.set(progress.remoteUrl, progress);
+      });
+    });
+    makeAutoObservable(this, { states: false });
+  }
+
+  getState(remoteUrl: string): PrSyncProgress | undefined {
+    return this.states.get(remoteUrl);
+  }
+
+  cancel(remoteUrl: string): void {
+    void rpc.pullRequests.cancelSync(remoteUrl);
+  }
+
+  retry(): void {
+    log.info('[PrSyncStore] retry triggered for project', this.projectId);
+    void rpc.pullRequests.syncPullRequests(this.projectId);
+  }
+
+  isSyncing(remoteUrl: string): boolean {
+    return this.states.get(remoteUrl)?.status === 'running';
+  }
+
+  clear(remoteUrl: string): void {
+    this.states.delete(remoteUrl);
+  }
+
+  dispose(): void {
+    this._unsub?.();
+    this._unsub = null;
+  }
+}
diff --git a/src/renderer/features/projects/stores/project-manager.ts b/src/renderer/features/projects/stores/project-manager.ts
new file mode 100644
index 0000000000..8f1faee4e6
--- /dev/null
+++ b/src/renderer/features/projects/stores/project-manager.ts
@@ -0,0 +1,420 @@
+import { makeObservable, observable, runInAction } from 'mobx';
+import { sshConnectionEventChannel } from '@shared/events/sshEvents';
+import { LocalProject, SshProject } from '@shared/projects';
+import type { ProjectViewSnapshot } from '@shared/view-state';
+import { events, rpc } from '@renderer/lib/ipc';
+import { appState } from '@renderer/lib/stores/app-state';
+import { captureTelemetry } from '@renderer/utils/telemetryClient';
+import {
+  createUnmountedProject,
+  createUnregisteredProject,
+  isMountedProject,
+  isUnmountedProject,
+  isUnregisteredProject,
+  ProjectStore,
+  UnregisteredProjectPhase,
+} from './project';
+
+interface BaseModeData {
+  name: string;
+  path: string;
+}
+
+export interface PickModeData extends BaseModeData {
+  mode: 'pick';
+  initGitRepository?: boolean;
+}
+
+export interface CloneModeData extends BaseModeData {
+  mode: 'clone';
+  repositoryUrl: string;
+}
+
+export interface NewModeData extends BaseModeData {
+  mode: 'new';
+  repositoryName: string;
+  repositoryOwner: string;
+  repositoryVisibility: 'public' | 'private';
+}
+
+export type ModeData = PickModeData | CloneModeData | NewModeData;
+
+export type ProjectType = { type: 'local' } | { type: 'ssh'; connectionId: string };
+
+export class ProjectManagerStore {
+  projects = observable.map<string, ProjectStore>();
+  private _projectMountPromises = new Map<string, Promise<void>>();
+  private _loadPromise: Promise<void> | null = null;
+
+  constructor() {
+    makeObservable(this, { projects: observable });
+
+    events.on(sshConnectionEventChannel, (event) => {
+      if (event.type !== 'connected' && event.type !== 'reconnected') return;
+      for (const [projectId, store] of this.projects) {
+        if (
+          isUnmountedProject(store) &&
+          store.errorCode === 'ssh-disconnected' &&
+          store.data.type === 'ssh' &&
+          store.data.connectionId === event.connectionId
+        ) {
+          this.mountProject(projectId).catch(() => {});
+        }
+      }
+    });
+  }
+
+  load(): Promise<void> {
+    if (!this._loadPromise) {
+      this._loadPromise = this._doLoad();
+    }
+    return this._loadPromise;
+  }
+
+  private async _doLoad(): Promise<void> {
+    const rawProjects = await rpc.projects.getProjects();
+    const toMount: string[] = [];
+    runInAction(() => {
+      for (const p of rawProjects) {
+        if (this.projects.has(p.id)) continue;
+        this.projects.set(p.id, createUnmountedProject(p, 'idle'));
+        toMount.push(p.id);
+      }
+    });
+    await Promise.allSettled(toMount.map((id) => this.mountProject(id)));
+  }
+
+  async createProject(
+    projectType: ProjectType,
+    data: ModeData,
+    id?: string
+  ): Promise<string | undefined> {
+    if (projectType.type === 'local') {
+      const existing = await rpc.projects.getLocalProjectByPath(data.path);
+      if (existing) return existing.id;
+    } else {
+      const existing = await rpc.projects.getSshProjectByPath(data.path, projectType.connectionId);
+      if (existing) return existing.id;
+    }
+
+    const projectId = id ?? crypto.randomUUID();
+    const isSsh = projectType.type === 'ssh';
+    const projectTelemetryType: 'local' | 'ssh' = isSsh ? 'ssh' : 'local';
+    const projectTelemetryStrategy: 'open' | 'create' | 'clone' =
+      data.mode === 'clone' ? 'clone' : data.mode === 'new' ? 'create' : 'open';
+
+    switch (data.mode) {
+      case 'pick': {
+        runInAction(() => {
+          this.projects.set(
+            projectId,
+            createUnregisteredProject(projectId, data.name, 'registering', 'pick')
+          );
+        });
+        try {
+          const project = isSsh
+            ? await rpc.projects.createSshProject({
+                id: projectId,
+                path: data.path,
+                name: data.name,
+                connectionId: projectType.connectionId,
+                initGitRepository: data.initGitRepository,
+              })
+            : await rpc.projects.createLocalProject({
+                id: projectId,
+                path: data.path,
+                name: data.name,
+                initGitRepository: data.initGitRepository,
+              });
+          this._setAndOpenProject(projectId, project);
+          captureTelemetry('project_added', {
+            type: projectTelemetryType,
+            strategy: projectTelemetryStrategy,
+            success: true,
+          });
+        } catch (err) {
+          this._markError(projectId, err);
+          captureTelemetry('project_added', {
+            type: projectTelemetryType,
+            strategy: projectTelemetryStrategy,
+            success: false,
+          });
+          throw err;
+        }
+        break;
+      }
+
+      case 'clone': {
+        runInAction(() => {
+          this.projects.set(
+            projectId,
+            createUnregisteredProject(projectId, data.name, 'cloning', 'clone')
+          );
+        });
+        try {
+          const clonePath = `${data.path}/${data.name}`;
+          const connectionId = isSsh ? projectType.connectionId : undefined;
+          const cloneResult = await rpc.github.cloneRepository(
+            data.repositoryUrl,
+            clonePath,
+            connectionId
+          );
+          if (!cloneResult.success) throw new Error(cloneResult.error);
+          this._updatePhase(projectId, 'registering');
+          const project = isSsh
+            ? await rpc.projects.createSshProject({
+                id: projectId,
+                path: clonePath,
+                name: data.name,
+                connectionId: projectType.connectionId,
+              })
+            : await rpc.projects.createLocalProject({
+                id: projectId,
+                path: clonePath,
+                name: data.name,
+              });
+          this._setAndOpenProject(projectId, project);
+          captureTelemetry('project_added', {
+            type: projectTelemetryType,
+            strategy: projectTelemetryStrategy,
+            success: true,
+          });
+        } catch (err) {
+          this._markError(projectId, err);
+          captureTelemetry('project_added', {
+            type: projectTelemetryType,
+            strategy: projectTelemetryStrategy,
+            success: false,
+          });
+          throw err;
+        }
+        break;
+      }
+
+      case 'new': {
+        runInAction(() => {
+          this.projects.set(
+            projectId,
+            createUnregisteredProject(projectId, data.name, 'creating-repo', 'new')
+          );
+        });
+        try {
+          const connectionId = isSsh ? projectType.connectionId : undefined;
+          const repoResult = await rpc.github.createRepository({
+            name: data.repositoryName,
+            owner: data.repositoryOwner,
+            isPrivate: data.repositoryVisibility === 'private',
+          });
+          if (!repoResult.success || !repoResult.repoUrl) throw new Error(repoResult.error);
+
+          this._updatePhase(projectId, 'cloning');
+          const clonePath = `${data.path}/${data.name}`;
+          const cloneUrl = `https://github.com/${repoResult.nameWithOwner}.git`;
+          const cloneResult = await rpc.github.cloneRepository(cloneUrl, clonePath, connectionId);
+          if (!cloneResult.success) throw new Error(cloneResult.error);
+
+          const initResult = await rpc.github.initializeProject({
+            targetPath: clonePath,
+            name: data.name,
+            connectionId,
+          });
+          if (!initResult.success) throw new Error(initResult.error);
+
+          this._updatePhase(projectId, 'registering');
+          const project = isSsh
+            ? await rpc.projects.createSshProject({
+                id: projectId,
+                path: clonePath,
+                name: data.name,
+                connectionId: projectType.connectionId,
+              })
+            : await rpc.projects.createLocalProject({
+                id: projectId,
+                path: clonePath,
+                name: data.name,
+              });
+          this._setAndOpenProject(projectId, project);
+          captureTelemetry('project_added', {
+            type: projectTelemetryType,
+            strategy: projectTelemetryStrategy,
+            success: true,
+          });
+        } catch (err) {
+          this._markError(projectId, err);
+          captureTelemetry('project_added', {
+            type: projectTelemetryType,
+            strategy: projectTelemetryStrategy,
+            success: false,
+          });
+          throw err;
+        }
+        break;
+      }
+    }
+
+    return projectId;
+  }
+
+  mountProject(projectId: string): Promise<void> {
+    const inFlight = this._projectMountPromises.get(projectId);
+    if (inFlight) return inFlight;
+
+    const project = this.projects.get(projectId);
+    if (!project || !isUnmountedProject(project)) return Promise.resolve();
+
+    runInAction(() => {
+      project.phase = 'opening';
+      project.error = undefined;
+      project.errorCode = undefined;
+    });
+
+    const promise = Promise.all([
+      rpc.projects.openProject(projectId),
+      rpc.viewState.get(`project:${projectId}`),
+    ])
+      .then(async ([openResult, savedSnapshot]) => {
+        if (!openResult.success) {
+          runInAction(() => {
+            const current = this.projects.get(projectId);
+            if (current && isUnmountedProject(current)) {
+              current.phase = 'error';
+              if (openResult.error.type === 'path-not-found') {
+                current.error = openResult.error.path;
+                current.errorCode = 'path-not-found';
+              } else if (openResult.error.type === 'ssh-disconnected') {
+                current.error = openResult.error.connectionId;
+                current.errorCode = 'ssh-disconnected';
+              } else {
+                current.error = openResult.error.message;
+                current.errorCode = undefined;
+              }
+            }
+          });
+          return;
+        }
+        runInAction(() => {
+          const current = this.projects.get(projectId);
+          if (current && isUnmountedProject(current)) {
+            current.transitionToMounted(
+              current.data,
+              savedSnapshot as ProjectViewSnapshot | undefined
+            );
+          }
+        });
+        // Load the task list before provisioning so the tasks map is populated.
+        const taskManager = this.projects.get(projectId)?.mountedProject?.taskManager;
+        if (taskManager) {
+          await taskManager.loadTasks();
+          const nav = appState.navigation;
+          const navParams = nav.viewParamsStore['task'] as
+            | { projectId?: string; taskId?: string }
+            | undefined;
+          const navTaskId =
+            nav.currentViewId === 'task' && navParams?.projectId === projectId
+              ? navParams.taskId
+              : undefined;
+          if (navTaskId) {
+            taskManager.provisionTask(navTaskId).catch(() => {});
+          }
+        }
+      })
+      .catch((err: unknown) => {
+        runInAction(() => {
+          const current = this.projects.get(projectId);
+          if (current && isUnmountedProject(current)) {
+            current.phase = 'error';
+            current.error = err instanceof Error ? err.message : String(err);
+            current.errorCode = undefined;
+          }
+        });
+        throw err;
+      })
+      .finally(() => {
+        this._projectMountPromises.delete(projectId);
+      });
+
+    this._projectMountPromises.set(projectId, promise);
+    return promise;
+  }
+
+  async deleteProject(projectId: string): Promise<void> {
+    const snapshot = this.projects.get(projectId);
+    runInAction(() => {
+      this.projects.delete(projectId);
+    });
+    try {
+      await rpc.projects.deleteProject(projectId);
+    } catch (err) {
+      runInAction(() => {
+        if (snapshot) this.projects.set(projectId, snapshot);
+      });
+      throw err;
+    }
+  }
+
+  async updateProjectConnection(projectId: string, newConnectionId: string): Promise<void> {
+    await rpc.projects.updateProjectConnection(projectId, newConnectionId);
+
+    const store = this.projects.get(projectId);
+    if (!store || !store.data || store.data.type !== 'ssh') return;
+
+    const newData: SshProject = { ...store.data, connectionId: newConnectionId };
+
+    runInAction(() => {
+      const current = this.projects.get(projectId);
+      if (!current || !current.data || current.data.type !== 'ssh') return;
+      if (isMountedProject(current)) {
+        current.transitionToUnmounted(newData, 'opening');
+      } else if (isUnmountedProject(current)) {
+        current.data = newData;
+        current.phase = 'opening';
+        current.error = undefined;
+        current.errorCode = undefined;
+      }
+    });
+
+    // Wait for any existing in-flight mount to settle before attempting a fresh mount
+    const inFlight = this._projectMountPromises.get(projectId);
+    if (inFlight) await inFlight.catch(() => {});
+
+    this.mountProject(projectId).catch(() => {});
+  }
+
+  removeUnregisteredProject(projectId: string): void {
+    runInAction(() => {
+      const store = this.projects.get(projectId);
+      if (store && isUnregisteredProject(store)) {
+        this.projects.delete(projectId);
+      }
+    });
+  }
+
+  private _setAndOpenProject(id: string, project: LocalProject | SshProject): void {
+    runInAction(() => {
+      const current = this.projects.get(id);
+      if (current) {
+        current.transitionToUnmounted(project, 'opening');
+      } else {
+        this.projects.set(id, createUnmountedProject(project, 'opening'));
+      }
+    });
+    this.mountProject(id);
+  }
+
+  private _updatePhase(id: string, phase: UnregisteredProjectPhase): void {
+    runInAction(() => {
+      const store = this.projects.get(id);
+      if (store && isUnregisteredProject(store)) store.phase = phase;
+    });
+  }
+
+  private _markError(id: string, err: unknown): void {
+    runInAction(() => {
+      const store = this.projects.get(id);
+      if (store && isUnregisteredProject(store)) {
+        store.phase = 'error';
+        store.error = err instanceof Error ? err.message : String(err);
+      }
+    });
+  }
+}
diff --git a/src/renderer/features/projects/stores/project-selectors.ts b/src/renderer/features/projects/stores/project-selectors.ts
new file mode 100644
index 0000000000..ad5e12376e
--- /dev/null
+++ b/src/renderer/features/projects/stores/project-selectors.ts
@@ -0,0 +1,84 @@
+import type { LocalProject, SshProject } from '@shared/projects';
+import { appState } from '@renderer/lib/stores/app-state';
+import type { PrSyncStore } from './pr-sync-store';
+import { isUnmountedProject, isUnregisteredProject, MountedProject, ProjectStore } from './project';
+import type { ProjectManagerStore } from './project-manager';
+import type { ProjectSettingsStore } from './project-settings-store';
+import type { RepositoryStore } from './repository-store';
+
+/** Returns the ProjectManagerStore from appState. Call only inside `observer` components (or other MobX reactions). */
+export function getProjectManagerStore(): ProjectManagerStore {
+  return appState.projects;
+}
+
+/** Call only inside `observer` components (or other MobX reactions). */
+export function getProjectStore(projectId: string): ProjectStore | undefined {
+  return getProjectManagerStore().projects.get(projectId);
+}
+
+/** Summary for routing the project shell; call only inside `observer` (or other MobX reactions). */
+export type ProjectViewKind =
+  | 'missing'
+  | 'creating'
+  | 'bootstrapping'
+  | 'mount_error'
+  | 'path_not_found'
+  | 'ssh_disconnected'
+  | 'idle_unmounted'
+  | 'ready';
+
+export function projectViewKind(store: ProjectStore | undefined): ProjectViewKind {
+  if (!store) return 'missing';
+  if (isUnregisteredProject(store)) return 'creating';
+  if (isUnmountedProject(store)) {
+    if (store.phase === 'opening') return 'bootstrapping';
+    if (store.phase === 'error') {
+      if (store.errorCode === 'path-not-found') return 'path_not_found';
+      if (store.errorCode === 'ssh-disconnected') return 'ssh_disconnected';
+      return 'mount_error';
+    }
+    return 'idle_unmounted';
+  }
+  return 'ready';
+}
+
+/** Returns the mounted project payload if ready, otherwise undefined. */
+export function asMounted(store: ProjectStore | undefined): MountedProject | undefined {
+  return store?.mountedProject ?? undefined;
+}
+
+export function mountedProjectData(
+  store: ProjectStore | undefined
+): LocalProject | SshProject | null {
+  return store?.mountedProject?.data ?? null;
+}
+
+/** Returns the display name from any project store variant. */
+export function projectDisplayName(store: ProjectStore | undefined): string | undefined {
+  return store?.name ?? undefined;
+}
+
+export function unmountedMountErrorMessage(store: ProjectStore | undefined): string {
+  if (store && isUnmountedProject(store) && store.phase === 'error') {
+    if (store.errorCode === 'path-not-found') {
+      return `No project found at ${store.error ?? 'the configured path'}`;
+    }
+    return store.error ?? 'Failed to open project';
+  }
+  return 'Failed to open project';
+}
+
+/** Returns the RepositoryStore for a mounted project, or undefined if not ready. */
+export function getRepositoryStore(projectId: string): RepositoryStore | undefined {
+  return asMounted(getProjectStore(projectId))?.repository;
+}
+
+/** Returns the ProjectSettingsStore for a mounted project, or undefined if not ready. */
+export function getProjectSettingsStore(projectId: string): ProjectSettingsStore | undefined {
+  return asMounted(getProjectStore(projectId))?.settings;
+}
+
+/** Returns the PrSyncStore for a mounted project, or undefined if not ready. */
+export function getPrSyncStore(projectId: string): PrSyncStore | undefined {
+  return asMounted(getProjectStore(projectId))?.prSync;
+}
diff --git a/src/renderer/features/projects/stores/project-settings-store.ts b/src/renderer/features/projects/stores/project-settings-store.ts
new file mode 100644
index 0000000000..da75036e0a
--- /dev/null
+++ b/src/renderer/features/projects/stores/project-settings-store.ts
@@ -0,0 +1,32 @@
+import type { UpdateProjectSettingsError } from '@shared/projects';
+import type { Result } from '@shared/result';
+import type { ProjectSettings } from '@main/core/projects/settings/schema';
+import { rpc } from '@renderer/lib/ipc';
+import { Resource } from '@renderer/lib/stores/resource';
+
+export class ProjectSettingsStore {
+  readonly settingsData: Resource<ProjectSettings>;
+
+  constructor(private readonly projectId: string) {
+    this.settingsData = new Resource(
+      () => rpc.projects.getProjectSettings(projectId),
+      [{ kind: 'demand' }]
+    );
+  }
+
+  get settings(): ProjectSettings | null {
+    return this.settingsData.data;
+  }
+
+  async save(settings: ProjectSettings): Promise<Result<void, UpdateProjectSettingsError>> {
+    const result = await rpc.projects.updateProjectSettings(this.projectId, settings);
+    if (result.success) {
+      this.settingsData.invalidate();
+    }
+    return result;
+  }
+
+  dispose(): void {
+    this.settingsData.dispose();
+  }
+}
diff --git a/src/renderer/features/projects/stores/project-view.ts b/src/renderer/features/projects/stores/project-view.ts
new file mode 100644
index 0000000000..fa7db6e0f8
--- /dev/null
+++ b/src/renderer/features/projects/stores/project-view.ts
@@ -0,0 +1,56 @@
+import { makeAutoObservable } from 'mobx';
+import type { ProjectViewSnapshot } from '@shared/view-state';
+import type { Snapshottable } from '@renderer/lib/stores/snapshottable';
+
+export type ProjectView = 'tasks' | 'pull-request' | 'settings';
+
+export class ProjectViewStore implements Snapshottable<ProjectViewSnapshot> {
+  activeView: ProjectView = 'tasks';
+  taskView: TaskViewStore = new TaskViewStore();
+
+  constructor() {
+    makeAutoObservable(this);
+  }
+
+  setProjectView(view: ProjectView) {
+    this.activeView = view;
+  }
+
+  get snapshot(): ProjectViewSnapshot {
+    return {
+      activeView: this.activeView,
+      taskViewTab: this.taskView.tab,
+    };
+  }
+
+  restoreSnapshot(snapshot: Partial<ProjectViewSnapshot>): void {
+    if (snapshot.activeView) this.activeView = snapshot.activeView as ProjectView;
+    if (snapshot.taskViewTab) this.taskView.setTab(snapshot.taskViewTab);
+  }
+}
+
+class TaskViewStore {
+  tab: 'active' | 'archived' = 'active';
+  searchQuery: string = '';
+  selectedIds: Set<string> = new Set();
+
+  constructor() {
+    makeAutoObservable(this);
+  }
+
+  setTab(tab: 'active' | 'archived') {
+    this.tab = tab;
+  }
+
+  setSearchQuery(query: string) {
+    this.searchQuery = query;
+  }
+
+  setSelectedIds(ids: Set<string>) {
+    this.selectedIds = ids;
+  }
+
+  toggleSelect(id: string) {
+    this.selectedIds.has(id) ? this.selectedIds.delete(id) : this.selectedIds.add(id);
+  }
+}
diff --git a/src/renderer/features/projects/stores/project.ts b/src/renderer/features/projects/stores/project.ts
new file mode 100644
index 0000000000..fcc1f58d26
--- /dev/null
+++ b/src/renderer/features/projects/stores/project.ts
@@ -0,0 +1,196 @@
+import { makeAutoObservable, observable } from 'mobx';
+import type { LocalProject, SshProject } from '@shared/projects';
+import type { ProjectViewSnapshot } from '@shared/view-state';
+import { TaskManagerStore } from '@renderer/features/tasks/stores/task-manager';
+import { snapshotRegistry } from '@renderer/lib/stores/snapshot-registry';
+import { PrSyncStore } from './pr-sync-store';
+import { ProjectSettingsStore } from './project-settings-store';
+import { ProjectViewStore } from './project-view';
+import { RepositoryStore } from './repository-store';
+
+export type UnregisteredProjectPhase =
+  | 'creating-repo' // gh api — new mode only
+  | 'cloning' // git clone
+  | 'registering' // db insert
+  | 'error';
+
+export type UnmountedProjectPhase = 'opening' | 'error' | 'closing' | 'idle';
+
+export type ProjectMode = 'pick' | 'clone' | 'new';
+
+/**
+ * Holds all mounted-only state for a project. Created atomically by
+ * ProjectStore.transitionToMounted and disposed on unmount or deletion.
+ */
+export class MountedProject {
+  readonly taskManager: TaskManagerStore;
+  readonly view: ProjectViewStore;
+  readonly settings: ProjectSettingsStore;
+  readonly repository: RepositoryStore;
+  readonly prSync: PrSyncStore;
+  readonly data: LocalProject | SshProject;
+
+  private _snapshotDisposer: (() => void) | null = null;
+
+  get snapshot(): ProjectViewSnapshot {
+    return {
+      activeView: this.view.activeView,
+      taskViewTab: this.view.taskView.tab,
+    };
+  }
+
+  constructor(data: LocalProject | SshProject, savedSnapshot?: ProjectViewSnapshot) {
+    this.data = data;
+    this.view = new ProjectViewStore();
+    this.settings = new ProjectSettingsStore(data.id);
+    this.repository = new RepositoryStore(data.id, this.settings, data.baseRef);
+    this.prSync = new PrSyncStore(data.id);
+    this.taskManager = new TaskManagerStore(data.id, this.repository);
+
+    if (savedSnapshot) this.view.restoreSnapshot(savedSnapshot);
+
+    makeAutoObservable(this, {
+      taskManager: false,
+      view: false,
+      settings: false,
+      repository: false,
+      prSync: false,
+    });
+
+    this._snapshotDisposer = snapshotRegistry.register(`project:${data.id}`, () => this.snapshot);
+  }
+
+  dispose(): void {
+    this.repository.dispose();
+    this.prSync.dispose();
+    this.settings.dispose();
+    this._snapshotDisposer?.();
+    this._snapshotDisposer = null;
+  }
+}
+
+/**
+ * Container class — holds a stable reference in the ObservableMap across all
+ * lifecycle transitions. Transitioning replaces `mountedProject` atomically
+ * rather than nulling out individual fields.
+ */
+export class ProjectStore {
+  state: 'unregistered' | 'unmounted' | 'mounted';
+  id: string;
+  name: string | null;
+  data: LocalProject | SshProject | null;
+  phase: UnregisteredProjectPhase | UnmountedProjectPhase | null;
+  error: string | undefined = undefined;
+  errorCode: 'path-not-found' | 'ssh-disconnected' | undefined = undefined;
+  mode: ProjectMode | null;
+  mountedProject: MountedProject | null = null;
+
+  constructor(
+    state: ProjectStore['state'],
+    id: string,
+    name: string | null,
+    data: LocalProject | SshProject | null,
+    phase: UnregisteredProjectPhase | UnmountedProjectPhase | null,
+    mode: ProjectMode | null = null
+  ) {
+    this.state = state;
+    this.id = id;
+    this.name = name;
+    this.data = data;
+    this.phase = phase;
+    this.mode = mode;
+    makeAutoObservable(this, { mountedProject: observable.ref });
+  }
+
+  transitionToMounted(data: LocalProject | SshProject, savedSnapshot?: ProjectViewSnapshot): void {
+    this.mountedProject = new MountedProject(data, savedSnapshot);
+    this.data = data;
+    this.id = data.id;
+    this.name = data.name;
+    this.state = 'mounted';
+    this.phase = null;
+    this.error = undefined;
+    this.errorCode = undefined;
+  }
+
+  transitionToUnmounted(
+    data: LocalProject | SshProject,
+    phase: UnmountedProjectPhase = 'opening'
+  ): void {
+    this.mountedProject?.dispose();
+    this.mountedProject = null;
+    this.data = data;
+    this.id = data.id;
+    this.name = data.name;
+    this.state = 'unmounted';
+    this.phase = phase;
+    this.error = undefined;
+    this.errorCode = undefined;
+  }
+
+  transitionToUnregistered(
+    id: string,
+    name: string,
+    phase: UnregisteredProjectPhase,
+    mode: ProjectMode
+  ): void {
+    this.mountedProject?.dispose();
+    this.mountedProject = null;
+    this.data = null;
+    this.id = id;
+    this.name = name;
+    this.state = 'unregistered';
+    this.phase = phase;
+    this.mode = mode;
+    this.error = undefined;
+  }
+}
+
+export type UnregisteredProject = ProjectStore & {
+  state: 'unregistered';
+  id: string;
+  name: string;
+  phase: UnregisteredProjectPhase;
+  mode: ProjectMode;
+  error: string | undefined;
+};
+
+export type UnmountedProject = ProjectStore & {
+  state: 'unmounted';
+  data: LocalProject | SshProject;
+  phase: UnmountedProjectPhase;
+  error: string | undefined;
+  errorCode: 'path-not-found' | 'ssh-disconnected' | undefined;
+};
+
+export function isUnregisteredProject(p: ProjectStore): p is UnregisteredProject {
+  return p.state === 'unregistered';
+}
+
+export function isUnmountedProject(p: ProjectStore): p is UnmountedProject {
+  return p.state === 'unmounted';
+}
+
+export function isMountedProject(p: ProjectStore): p is ProjectStore & {
+  state: 'mounted';
+  mountedProject: MountedProject;
+  data: LocalProject | SshProject;
+} {
+  return p.state === 'mounted';
+}
+
+export function createUnregisteredProject(
+  id: string,
+  name: string,
+  phase: UnregisteredProjectPhase,
+  mode: ProjectMode = 'pick'
+): ProjectStore {
+  return new ProjectStore('unregistered', id, name, null, phase, mode);
+}
+
+export function createUnmountedProject(
+  data: LocalProject | SshProject,
+  phase: UnmountedProjectPhase = 'opening'
+): ProjectStore {
+  return new ProjectStore('unmounted', data.id, data.name, data, phase);
+}
diff --git a/src/renderer/features/projects/stores/repository-store.ts b/src/renderer/features/projects/stores/repository-store.ts
new file mode 100644
index 0000000000..9f480176bc
--- /dev/null
+++ b/src/renderer/features/projects/stores/repository-store.ts
@@ -0,0 +1,203 @@
+import { computed, makeObservable, reaction } from 'mobx';
+import { gitRefChangedChannel, type GitRefChange } from '@shared/events/gitEvents';
+import type {
+  LocalBranch,
+  LocalBranchesPayload,
+  Remote,
+  RemoteBranch,
+  RemoteBranchesPayload,
+} from '@shared/git';
+import { bareRefName, computeDefaultBranch, selectPreferredRemote } from '@shared/git-utils';
+import { events, rpc } from '@renderer/lib/ipc';
+import { Resource } from '@renderer/lib/stores/resource';
+import { isGitHubUrl, normalizeGitHubUrl } from '@renderer/utils/github/utils';
+import type { ProjectSettingsStore } from './project-settings-store';
+
+export class RepositoryStore {
+  readonly localData: Resource<LocalBranchesPayload, GitRefChange>;
+  readonly remoteData: Resource<RemoteBranchesPayload, GitRefChange>;
+
+  private _settingsDisposer: (() => void) | null = null;
+
+  constructor(
+    private readonly projectId: string,
+    private readonly settingsStore: ProjectSettingsStore,
+    private readonly baseRef: string
+  ) {
+    this.localData = new Resource<LocalBranchesPayload, GitRefChange>(
+      () => rpc.repository.getLocalBranches(projectId),
+      [
+        { kind: 'demand' },
+        {
+          kind: 'event',
+          subscribe: (handler) =>
+            events.on(gitRefChangedChannel, (p) => {
+              if (p.projectId === projectId && p.kind === 'local-refs') handler(p);
+            }),
+          onEvent: 'reload',
+          debounceMs: 200,
+        },
+      ]
+    );
+
+    this.remoteData = new Resource<RemoteBranchesPayload, GitRefChange>(
+      () => rpc.repository.getRemoteBranches(projectId),
+      [
+        { kind: 'demand' },
+        {
+          kind: 'event',
+          subscribe: (handler) =>
+            events.on(gitRefChangedChannel, (p) => {
+              if (p.projectId === projectId && (p.kind === 'remote-refs' || p.kind === 'config'))
+                handler(p);
+            }),
+          onEvent: 'reload',
+          debounceMs: 300,
+        },
+      ]
+    );
+
+    // Activate event strategies — demand is wired in Resource constructor, event strategies are not.
+    this.localData.start();
+    this.remoteData.start();
+
+    // Invalidate remote data when settings that affect remote resolution change.
+    this._settingsDisposer = reaction(
+      () => [settingsStore.settings?.remote, settingsStore.settings?.defaultBranch],
+      () => this.remoteData.invalidate()
+    );
+
+    makeObservable(this, {
+      isUnborn: computed,
+      currentBranch: computed,
+      branches: computed,
+      localBranches: computed,
+      remoteBranches: computed,
+      configuredRemote: computed,
+      defaultBranchName: computed,
+      defaultBranch: computed,
+      remotes: computed,
+      loading: computed,
+      isGitHubRemote: computed,
+      repositoryUrl: computed,
+    });
+  }
+
+  get loading(): boolean {
+    return this.localData.loading || this.remoteData.loading;
+  }
+
+  get isUnborn(): boolean {
+    return this.localData.data?.isUnborn ?? false;
+  }
+
+  get currentBranch(): string | null {
+    return this.localData.data?.currentBranch ?? null;
+  }
+
+  /** Combined local + remote branches, preserving the same shape as the old BranchesPayload.branches. */
+  get branches(): (LocalBranch | RemoteBranch)[] {
+    return [...this.localBranches, ...this.remoteBranches];
+  }
+
+  get localBranches(): LocalBranch[] {
+    const d = this.localData.data;
+    if (!d) return [];
+    if (d.isUnborn && d.currentBranch) return [{ type: 'local', branch: d.currentBranch }];
+    return d.localBranches;
+  }
+
+  get remoteBranches(): RemoteBranch[] {
+    return this.remoteData.data?.remoteBranches ?? [];
+  }
+
+  get configuredRemote(): Remote {
+    const setting = this.settingsStore.settings?.remote;
+    const remotes = this.remoteData.data?.remotes ?? [];
+    return selectPreferredRemote(setting, remotes);
+  }
+
+  get remotes(): Remote[] {
+    return this.remoteData.data?.remotes ?? [];
+  }
+
+  /** True when the configured remote points to a GitHub.com repository. */
+  get isGitHubRemote(): boolean {
+    const url = this.configuredRemote.url;
+    return !!url && isGitHubUrl(url);
+  }
+
+  /**
+   * The normalised HTTPS GitHub URL for the configured remote
+   * (e.g. `https://github.com/owner/repo`), or `null` if not a GitHub remote.
+   */
+  get repositoryUrl(): string | null {
+    const url = this.configuredRemote.url;
+    if (!url || !isGitHubUrl(url)) return null;
+    return normalizeGitHubUrl(url);
+  }
+
+  get defaultBranchName(): string {
+    const d = this.remoteData.data;
+    if (!d) return 'main';
+    const raw = this.settingsStore.settings?.defaultBranch;
+    const configured =
+      raw === undefined ? bareRefName(this.baseRef) : typeof raw === 'string' ? raw : raw.name;
+    return computeDefaultBranch(
+      configured,
+      this.branches,
+      this.configuredRemote.name,
+      d.gitDefaultBranch
+    );
+  }
+
+  get defaultBranch(): LocalBranch | RemoteBranch | undefined {
+    const name = this.defaultBranchName;
+    const raw = this.settingsStore.settings?.defaultBranch;
+    const isRemotePref = typeof raw === 'object' && raw.remote === true;
+
+    if (isRemotePref) {
+      const remote = this.remoteBranches.find(
+        (b) => b.branch === name && b.remote.name === this.configuredRemote.name
+      );
+      if (remote) return remote;
+    }
+    const local = this.localBranches.find((b) => b.branch === name);
+    if (local) return local;
+    return this.remoteBranches.find((b) => b.branch === name);
+  }
+
+  isDefault(branch: LocalBranch | RemoteBranch): boolean {
+    return branch.branch === this.defaultBranchName;
+  }
+
+  isBranchOnRemote(branchName: string): boolean {
+    const remoteName = this.configuredRemote.name;
+    return this.remoteBranches.some((b) => b.branch === branchName && b.remote.name === remoteName);
+  }
+
+  getBranchDivergence(branchName: string): { ahead: number; behind: number } | null {
+    return this.localBranches.find((b) => b.branch === branchName)?.divergence ?? null;
+  }
+
+  refreshLocal(): void {
+    this.localData.invalidate();
+  }
+
+  refreshRemote(): void {
+    this.remoteData.invalidate();
+  }
+
+  /** Refresh both — for call-sites that don't know which half changed. */
+  refresh(): void {
+    this.localData.invalidate();
+    this.remoteData.invalidate();
+  }
+
+  dispose(): void {
+    this.localData.dispose();
+    this.remoteData.dispose();
+    this._settingsDisposer?.();
+    this._settingsDisposer = null;
+  }
+}
diff --git a/src/renderer/features/projects/view.tsx b/src/renderer/features/projects/view.tsx
new file mode 100644
index 0000000000..7fc226e9b3
--- /dev/null
+++ b/src/renderer/features/projects/view.tsx
@@ -0,0 +1,9 @@
+import { ProjectViewWrapper } from '@renderer/features/projects/components/project-view-wrapper';
+import { ProjectMainPanel } from './components/main-panel/main-panel';
+import { ProjectTitlebar } from './components/project-titlebar';
+
+export const projectView = {
+  WrapView: ProjectViewWrapper,
+  TitlebarSlot: ProjectTitlebar,
+  MainPanel: ProjectMainPanel,
+};
diff --git a/src/renderer/features/settings/components/AccountTab.tsx b/src/renderer/features/settings/components/AccountTab.tsx
new file mode 100644
index 0000000000..ffbf0afd4e
--- /dev/null
+++ b/src/renderer/features/settings/components/AccountTab.tsx
@@ -0,0 +1,157 @@
+import { LogIn, LogOut, User } from 'lucide-react';
+import { useState } from 'react';
+import { useToast } from '@renderer/lib/hooks/use-toast';
+import {
+  useAccountHealth,
+  useAccountSession,
+  useAccountSignIn,
+  useAccountSignOut,
+} from '@renderer/lib/hooks/useAccount';
+import { Button } from '@renderer/lib/ui/button';
+import { ServerUnavailableMessage } from './ServerUnavailableMessage';
+
+export function AccountTab() {
+  const { data: session, isLoading } = useAccountSession();
+  const { data: serverAvailable } = useAccountHealth();
+  const signInMutation = useAccountSignIn();
+  const signOutMutation = useAccountSignOut();
+  const { toast } = useToast();
+
+  const [error, setError] = useState<string | null>(null);
+
+  const user = session?.user ?? null;
+  const isSignedIn = session?.isSignedIn ?? false;
+  const hasAccount = session?.hasAccount ?? false;
+
+  const handleSignIn = async () => {
+    setError(null);
+    try {
+      const result = await signInMutation.mutateAsync(undefined);
+      if (!result.success) {
+        const message = result.error || 'Sign in failed';
+        setError(message);
+        toast({
+          title: 'Sign in failed',
+          description: message,
+          variant: 'destructive',
+        });
+        return;
+      }
+      toast({
+        title: 'Signed in to Emdash',
+        description: result.user ? `Connected as @${result.user.username}` : 'Signed in',
+      });
+    } catch (err) {
+      const message = err instanceof Error ? err.message : 'Sign in failed';
+      setError(message);
+      toast({
+        title: 'Sign in failed',
+        description: message,
+        variant: 'destructive',
+      });
+    }
+  };
+
+  const handleSignOut = async () => {
+    await signOutMutation.mutateAsync();
+  };
+
+  if (isLoading) {
+    return (
+      <div className="flex items-center justify-center py-12 text-sm text-muted-foreground">
+        Loading account...
+      </div>
+    );
+  }
+
+  if (isSignedIn && user) {
+    return (
+      <div className="rounded-xl border border-border/60 bg-muted/10 p-4">
+        <div className="flex items-center gap-4">
+          {user.avatarUrl ? (
+            <img
+              src={user.avatarUrl}
+              alt={user.username}
+              className="h-12 w-12 rounded-full border border-border/60"
+            />
+          ) : (
+            <div className="flex h-12 w-12 items-center justify-center rounded-full border border-border/60 bg-muted">
+              <User className="h-6 w-6 text-muted-foreground" />
+            </div>
+          )}
+          <div className="flex-1">
+            <p className="text-sm font-medium text-foreground">
+              Connected as <span className="font-semibold">@{user.username}</span>
+            </p>
+            {user.email && <p className="text-xs text-muted-foreground">{user.email}</p>}
+          </div>
+          <Button
+            type="button"
+            className="w-fit"
+            onClick={handleSignOut}
+            disabled={signOutMutation.isPending}
+          >
+            <LogOut className="h-3.5 w-3.5" />
+            Sign Out
+          </Button>
+        </div>
+      </div>
+    );
+  }
+
+  if (hasAccount && !isSignedIn) {
+    return (
+      <div className="rounded-xl border border-border/60 bg-muted/10 p-4">
+        <div className="flex flex-col gap-3">
+          <div>
+            <p className="text-sm font-medium text-foreground">Session expired</p>
+            <p className="text-xs text-muted-foreground">
+              Sign in again to reconnect your Emdash account.
+            </p>
+          </div>
+          {error && <p className="text-xs text-destructive">{error}</p>}
+          {serverAvailable === false ? (
+            <ServerUnavailableMessage />
+          ) : (
+            <Button
+              type="button"
+              className="w-fit"
+              onClick={handleSignIn}
+              disabled={signInMutation.isPending}
+            >
+              <LogIn className="h-3.5 w-3.5" />
+              {signInMutation.isPending ? 'Signing in...' : 'Sign In'}
+            </Button>
+          )}
+        </div>
+      </div>
+    );
+  }
+
+  return (
+    <div className="rounded-xl border border-border/60 bg-muted/10 p-4">
+      <div className="flex flex-col gap-3">
+        <div>
+          <p className="text-sm font-medium text-foreground">Emdash Account</p>
+          <p className="text-xs text-muted-foreground">
+            Create an Emdash account to automatically connect GitHub using OAuth2.
+          </p>
+        </div>
+        {error && <p className="text-xs text-destructive">{error}</p>}
+        {serverAvailable === false ? (
+          <ServerUnavailableMessage />
+        ) : (
+          <Button
+            type="button"
+            className="w-fit"
+            onClick={handleSignIn}
+            disabled={signInMutation.isPending}
+          >
+            <LogIn className="h-3.5 w-3.5" />
+            {signInMutation.isPending ? 'Creating account...' : 'Create Account'}
+          </Button>
+        )}
+      </div>
+    </div>
+  );
+}
diff --git a/src/renderer/features/settings/components/CliAgentsList.tsx b/src/renderer/features/settings/components/CliAgentsList.tsx
new file mode 100644
index 0000000000..e55c2a1583
--- /dev/null
+++ b/src/renderer/features/settings/components/CliAgentsList.tsx
@@ -0,0 +1,197 @@
+import { Settings2, Sparkles } from 'lucide-react';
+import { observer } from 'mobx-react-lite';
+import React, { useCallback, useMemo, useState } from 'react';
+import {
+  AGENT_PROVIDERS,
+  isValidProviderId,
+  type AgentProviderId,
+} from '@shared/agent-provider-registry';
+import type { DependencyState } from '@shared/dependencies';
+import { CliAgentStatus } from '@renderer/features/settings/components/connections';
+import CustomCommandModal from '@renderer/features/settings/components/CustomCommandModal';
+import IntegrationRow from '@renderer/features/settings/components/IntegrationRow';
+import { getAgentInstallErrorMessage } from '@renderer/lib/components/agent-selector/agent-install';
+import { AgentInstallButton } from '@renderer/lib/components/agent-selector/agent-install-button';
+import { useToast } from '@renderer/lib/hooks/use-toast';
+import { rpc } from '@renderer/lib/ipc';
+import { agentMeta } from '@renderer/lib/providers/meta';
+import { appState } from '@renderer/lib/stores/app-state';
+import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@renderer/lib/ui/tooltip';
+import { log } from '@renderer/utils/logger';
+
+export const BASE_CLI_AGENTS: CliAgentStatus[] = AGENT_PROVIDERS.filter(
+  (provider) => provider.detectable !== false
+).map((provider) => ({
+  id: provider.id,
+  name: provider.name,
+  status: 'missing' as const,
+  docUrl: provider.docUrl ?? null,
+  installCommand: provider.installCommand ?? null,
+}));
+
+function mapDependencyStatesToCli(
+  agentStatuses: Record<string, DependencyState>
+): CliAgentStatus[] {
+  const mergedMap = new Map<string, CliAgentStatus>();
+  BASE_CLI_AGENTS.forEach((agent) => {
+    mergedMap.set(agent.id, { ...agent });
+  });
+  Object.entries(agentStatuses).forEach(([agentId, state]) => {
+    const base = mergedMap.get(agentId);
+    mergedMap.set(agentId, {
+      ...(base ?? { id: agentId, name: agentId, docUrl: null, installCommand: null }),
+      id: agentId,
+      name: base?.name ?? agentId,
+      status: state.status === 'available' ? 'connected' : state.status,
+      version: state.version ?? null,
+      command: state.path ?? null,
+    });
+  });
+  return Array.from(mergedMap.values());
+}
+
+const ICON_BUTTON =
+  'rounded-md p-1.5 text-muted-foreground transition hover:bg-muted/40 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 focus-visible:ring-offset-background';
+
+type AgentRowActions = {
+  isInstalling: (id: AgentProviderId) => boolean;
+  onInstallClick: (agent: CliAgentStatus) => void;
+  onSettingsClick: (id: string) => void;
+};
+
+const renderAgentRow = (agent: CliAgentStatus, actions: AgentRowActions) => {
+  const logo = agentMeta[agent.id as keyof typeof agentMeta]?.icon;
+  const providerId = isValidProviderId(agent.id) ? agent.id : null;
+
+  const handleNameClick = agent.docUrl
+    ? async () => {
+        try {
+          await rpc.app.openExternal(agent.docUrl!);
+        } catch (openError) {
+          log.error(`Failed to open ${agent.name} docs:`, openError);
+        }
+      }
+    : undefined;
+
+  const isDetected = agent.status === 'connected';
+  const indicatorClass = isDetected ? 'bg-emerald-500' : 'bg-muted-foreground/50';
+  const statusLabel = isDetected ? 'Detected' : 'Not detected';
+
+  return (
+    <IntegrationRow
+      key={agent.id}
+      logoSrc={logo}
+      icon={
+        logo ? undefined : (
+          <Sparkles className="h-3.5 w-3.5 text-muted-foreground" aria-hidden="true" />
+        )
+      }
+      name={agent.name}
+      onNameClick={handleNameClick}
+      status={agent.status}
+      statusLabel={statusLabel}
+      showStatusPill={false}
+      installCommand={agent.installCommand}
+      middle={
+        <span className="flex items-center gap-2 text-sm text-muted-foreground">
+          <span className={`h-1.5 w-1.5 rounded-full ${indicatorClass}`} />
+          {statusLabel}
+        </span>
+      }
+      rightExtra={
+        isDetected ? (
+          <TooltipProvider delay={150}>
+            <Tooltip>
+              <TooltipTrigger>
+                <button
+                  type="button"
+                  onClick={() => actions.onSettingsClick(agent.id)}
+                  className={ICON_BUTTON}
+                  aria-label={`${agent.name} execution settings`}
+                >
+                  <Settings2 className="h-4 w-4" aria-hidden="true" />
+                </button>
+              </TooltipTrigger>
+              <TooltipContent side="top" className="text-xs">
+                Execution settings
+              </TooltipContent>
+            </Tooltip>
+          </TooltipProvider>
+        ) : providerId ? (
+          <AgentInstallButton
+            agentId={providerId}
+            canInstall={!!agent.installCommand}
+            isInstalled={isDetected}
+            isInstalling={actions.isInstalling(providerId)}
+            tooltipSide="top"
+            onInstall={() => actions.onInstallClick(agent)}
+          />
+        ) : null
+      }
+    />
+  );
+};
+
+export const CliAgentsList: React.FC = observer(() => {
+  const [customModalAgentId, setCustomModalAgentId] = useState<string | null>(null);
+  const { toast } = useToast();
+  const agentStatuses = appState.dependencies.agentStatuses;
+
+  const sortedAgents = useMemo(() => {
+    return mapDependencyStatesToCli(agentStatuses).sort((a, b) => {
+      if (a.status === 'connected' && b.status !== 'connected') return -1;
+      if (b.status === 'connected' && a.status !== 'connected') return 1;
+      return a.name.localeCompare(b.name);
+    });
+  }, [agentStatuses]);
+
+  const handleInstall = useCallback(
+    async (agent: CliAgentStatus) => {
+      if (!isValidProviderId(agent.id) || appState.dependencies.isInstalling(agent.id)) {
+        return;
+      }
+
+      const result = await appState.dependencies.install(agent.id);
+
+      if (result.success) {
+        toast({
+          title: 'Agent installed',
+          description: `${agent.name} is ready.`,
+        });
+        return;
+      }
+
+      toast({
+        title: 'Install failed',
+        description: getAgentInstallErrorMessage(result.error),
+        variant: 'destructive',
+      });
+    },
+    [toast]
+  );
+
+  const rowActions = useMemo<AgentRowActions>(
+    () => ({
+      isInstalling: (id) => appState.dependencies.isInstalling(id),
+      onInstallClick: (agent) => {
+        void handleInstall(agent);
+      },
+      onSettingsClick: setCustomModalAgentId,
+    }),
+    [handleInstall]
+  );
+
+  return (
+    <div className="space-y-3">
+      <div className="space-y-2">
+        {sortedAgents.map((agent) => renderAgentRow(agent, rowActions))}
+      </div>
+
+      <CustomCommandModal
+        isOpen={customModalAgentId !== null}
+        onClose={() => setCustomModalAgentId(null)}
+        providerId={customModalAgentId ?? ''}
+      />
+    </div>
+  );
+});
diff --git a/src/renderer/features/settings/components/CustomCommandModal.tsx b/src/renderer/features/settings/components/CustomCommandModal.tsx
new file mode 100644
index 0000000000..41f9e6ae69
--- /dev/null
+++ b/src/renderer/features/settings/components/CustomCommandModal.tsx
@@ -0,0 +1,419 @@
+import { Info, Plus, RotateCcw, Trash2 } from 'lucide-react';
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import { AGENT_PROVIDERS, type AgentProviderDefinition } from '@shared/agent-provider-registry';
+import type { ProviderCustomConfig } from '@shared/app-settings';
+import { useProviderSettings } from '@renderer/features/settings/use-provider-settings';
+import { Button } from '@renderer/lib/ui/button';
+import { ConfirmButton } from '@renderer/lib/ui/confirm-button';
+import { Dialog, DialogContent, DialogHeader, DialogTitle } from '@renderer/lib/ui/dialog';
+import { Input } from '@renderer/lib/ui/input';
+import { Label } from '@renderer/lib/ui/label';
+import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@renderer/lib/ui/tooltip';
+import { log } from '@renderer/utils/logger';
+
+interface CustomCommandModalProps {
+  isOpen: boolean;
+  onClose: () => void;
+  providerId: string;
+}
+
+type EnvEntry = { key: string; value: string };
+
+type FormState = {
+  cli: string;
+  resumeFlag: string;
+  defaultArgs: string;
+  extraArgs: string;
+  autoApproveFlag: string;
+  initialPromptFlag: string;
+  envEntries: EnvEntry[];
+};
+
+const getDefaultFromProvider = (provider: AgentProviderDefinition | undefined): FormState => ({
+  cli: provider?.cli ?? '',
+  resumeFlag: provider?.resumeFlag ?? '',
+  defaultArgs: provider?.defaultArgs?.join(' ') ?? '',
+  extraArgs: '',
+  autoApproveFlag: provider?.autoApproveFlag ?? '',
+  initialPromptFlag: provider?.initialPromptFlag ?? '',
+  envEntries: [],
+});
+
+const configToFormState = (config: ProviderCustomConfig, fallback: FormState): FormState => ({
+  cli: config.cli ?? fallback.cli,
+  resumeFlag: config.resumeFlag ?? fallback.resumeFlag,
+  defaultArgs: Array.isArray(config.defaultArgs)
+    ? config.defaultArgs.join(' ')
+    : (config.defaultArgs ?? fallback.defaultArgs),
+  extraArgs: config.extraArgs ?? '',
+  autoApproveFlag: config.autoApproveFlag ?? fallback.autoApproveFlag,
+  initialPromptFlag: config.initialPromptFlag ?? fallback.initialPromptFlag,
+  envEntries: config.env ? Object.entries(config.env).map(([key, value]) => ({ key, value })) : [],
+});
+
+const CustomCommandModal: React.FC<CustomCommandModalProps> = ({ isOpen, onClose, providerId }) => {
+  const provider = useMemo(() => AGENT_PROVIDERS.find((p) => p.id === providerId), [providerId]);
+  const registryDefaults = useMemo(() => getDefaultFromProvider(provider), [provider]);
+
+  const {
+    value: storedConfig,
+    isOverridden,
+    isLoading,
+    update,
+    reset,
+  } = useProviderSettings(providerId);
+
+  const [form, setForm] = useState<FormState>(registryDefaults);
+  const [saving, setSaving] = useState(false);
+
+  useEffect(() => {
+    if (!isOpen || isLoading) return;
+    if (storedConfig && isOverridden) {
+      setForm(configToFormState(storedConfig, registryDefaults));
+    } else {
+      setForm(registryDefaults);
+    }
+  }, [isOpen, isLoading, storedConfig, isOverridden, registryDefaults]);
+
+  const handleChange = useCallback((field: keyof FormState, value: string) => {
+    setForm((prev) => ({ ...prev, [field]: value }));
+  }, []);
+
+  const setEnvEntry = useCallback((index: number, entryUpdate: Partial<EnvEntry>) => {
+    setForm((prev) => {
+      const next = [...prev.envEntries];
+      next[index] = { ...next[index], ...entryUpdate };
+      return { ...prev, envEntries: next };
+    });
+  }, []);
+
+  const addEnvEntry = useCallback(() => {
+    setForm((prev) => ({ ...prev, envEntries: [...prev.envEntries, { key: '', value: '' }] }));
+  }, []);
+
+  const removeEnvEntry = useCallback((index: number) => {
+    setForm((prev) => ({
+      ...prev,
+      envEntries: prev.envEntries.filter((_, i) => i !== index),
+    }));
+  }, []);
+
+  const handleResetToDefaults = useCallback(() => {
+    setForm(registryDefaults);
+  }, [registryDefaults]);
+
+  const handleSave = useCallback(async () => {
+    setSaving(true);
+    try {
+      const envRecord: Record<string, string> = {};
+      for (const { key, value } of form.envEntries) {
+        const k = key.trim();
+        if (k && /^[A-Za-z_][A-Za-z0-9_]*$/.test(k)) {
+          envRecord[k] = value;
+        }
+      }
+
+      const isAtDefaults =
+        form.cli === registryDefaults.cli &&
+        form.resumeFlag === registryDefaults.resumeFlag &&
+        form.defaultArgs === registryDefaults.defaultArgs &&
+        form.extraArgs === '' &&
+        form.autoApproveFlag === registryDefaults.autoApproveFlag &&
+        form.initialPromptFlag === registryDefaults.initialPromptFlag &&
+        form.envEntries.every((e) => !e.key.trim());
+
+      if (isAtDefaults) {
+        await new Promise<void>((resolve, reject) =>
+          reset(undefined, { onSuccess: resolve, onError: reject })
+        );
+      } else {
+        const config: ProviderCustomConfig = {
+          cli: form.cli,
+          resumeFlag: form.resumeFlag,
+          defaultArgs: form.defaultArgs.trim() ? form.defaultArgs.trim().split(/\s+/) : undefined,
+          extraArgs: form.extraArgs.trim() || undefined,
+          autoApproveFlag: form.autoApproveFlag,
+          initialPromptFlag: form.initialPromptFlag,
+          env: Object.keys(envRecord).length > 0 ? envRecord : undefined,
+        };
+        await new Promise<void>((resolve, reject) =>
+          update(config, { onSuccess: resolve, onError: reject })
+        );
+      }
+      onClose();
+    } catch (error) {
+      log.error('Failed to save provider custom config:', error);
+    } finally {
+      setSaving(false);
+    }
+  }, [form, registryDefaults, reset, update, onClose]);
+
+  const previewCommand = useMemo(() => {
+    const parts: string[] = [];
+    if (form.cli) parts.push(form.cli);
+    if (form.resumeFlag) parts.push(form.resumeFlag);
+    if (form.defaultArgs) parts.push(form.defaultArgs);
+    if (form.extraArgs) parts.push(form.extraArgs);
+    if (form.autoApproveFlag) parts.push(form.autoApproveFlag);
+    if (form.initialPromptFlag) parts.push(form.initialPromptFlag);
+    parts.push('{prompt}');
+    return parts.join(' ');
+  }, [form]);
+
+  const hasChanges = useMemo(() => {
+    if (isOverridden) return true;
+    const hasEnv = form.envEntries.some((e) => e.key.trim() !== '');
+    return (
+      form.cli !== registryDefaults.cli ||
+      form.resumeFlag !== registryDefaults.resumeFlag ||
+      form.defaultArgs !== registryDefaults.defaultArgs ||
+      form.extraArgs !== '' ||
+      form.autoApproveFlag !== registryDefaults.autoApproveFlag ||
+      form.initialPromptFlag !== registryDefaults.initialPromptFlag ||
+      hasEnv
+    );
+  }, [form, registryDefaults, isOverridden]);
+
+  if (!provider) return null;
+
+  return (
+    <Dialog open={isOpen} onOpenChange={(open) => !open && onClose()}>
+      <DialogContent
+        className="max-h-[85vh] max-w-lg gap-0 overflow-hidden p-0"
+        showCloseButton={false}
+      >
+        <div className="border-b border-border/60">
+          <DialogHeader className="flex-row items-start gap-4">
+            <div>
+              <DialogTitle className="text-lg font-semibold">
+                {provider.name} Execution Settings
+              </DialogTitle>
+            </div>
+          </DialogHeader>
+        </div>
+
+        <div className="min-h-0 flex-1 overflow-y-auto px-6 py-5">
+          {isLoading ? (
+            <div className="flex items-center justify-center py-8">
+              <div className="text-sm text-muted-foreground">Loading...</div>
+            </div>
+          ) : (
+            <div className="space-y-4">
+              {/* CLI Command */}
+              <div className="space-y-2">
+                <div className="flex items-center gap-2">
+                  <Label htmlFor="cli" className="text-sm font-medium">
+                    CLI Command
+                  </Label>
+                  <FieldTooltip content="The CLI command to execute (e.g., claude, codex)" />
+                </div>
+                <Input
+                  id="cli"
+                  value={form.cli}
+                  onChange={(e) => handleChange('cli', e.target.value)}
+                  placeholder={registryDefaults.cli || 'CLI command'}
+                  className="font-mono text-sm"
+                />
+              </div>
+
+              {/* Resume Flag */}
+              <div className="space-y-2">
+                <div className="flex items-center gap-2">
+                  <Label htmlFor="resumeFlag" className="text-sm font-medium">
+                    Resume Flag
+                  </Label>
+                  <FieldTooltip content="Flag used when resuming a session (e.g., -c -r)" />
+                </div>
+                <Input
+                  id="resumeFlag"
+                  value={form.resumeFlag}
+                  onChange={(e) => handleChange('resumeFlag', e.target.value)}
+                  placeholder={registryDefaults.resumeFlag || '(none)'}
+                  className="font-mono text-sm"
+                />
+              </div>
+
+              {/* Default Args */}
+              <div className="space-y-2">
+                <div className="flex items-center gap-2">
+                  <Label htmlFor="defaultArgs" className="text-sm font-medium">
+                    Default Args
+                  </Label>
+                  <FieldTooltip content="Default arguments (e.g., run -s)" />
+                </div>
+                <Input
+                  id="defaultArgs"
+                  value={form.defaultArgs}
+                  onChange={(e) => handleChange('defaultArgs', e.target.value)}
+                  placeholder={registryDefaults.defaultArgs || '(none)'}
+                  className="font-mono text-sm"
+                />
+              </div>
+
+              {/* Additional parameters */}
+              <div className="space-y-2">
+                <div className="flex items-center gap-2">
+                  <Label htmlFor="extraArgs" className="text-sm font-medium">
+                    Additional parameters
+                  </Label>
+                  <FieldTooltip content="Extra flags appended to the command (e.g. --enable-all-github-mcp-tools)" />
+                </div>
+                <Input
+                  id="extraArgs"
+                  value={form.extraArgs}
+                  onChange={(e) => handleChange('extraArgs', e.target.value)}
+                  placeholder="e.g. --enable-all-github-mcp-tools"
+                  className="font-mono text-sm"
+                />
+              </div>
+
+              {/* Environment variables */}
+              <div className="space-y-2">
+                <div className="flex items-center gap-2">
+                  <Label className="text-sm font-medium">Environment variables</Label>
+                  <FieldTooltip content="Environment variables set when running the agent" />
+                </div>
+                <div className="space-y-2">
+                  {form.envEntries.map((entry, i) => (
+                    <div key={i} className="flex items-center gap-2">
+                      <Input
+                        value={entry.key}
+                        onChange={(e) => setEnvEntry(i, { key: e.target.value })}
+                        placeholder="KEY"
+                        className="min-w-0 flex-1 font-mono text-sm"
+                      />
+                      <Input
+                        value={entry.value}
+                        onChange={(e) => setEnvEntry(i, { value: e.target.value })}
+                        placeholder="value"
+                        className="min-w-0 flex-1 font-mono text-sm"
+                      />
+                      <Button
+                        type="button"
+                        variant="ghost"
+                        size="icon"
+                        onClick={() => removeEnvEntry(i)}
+                        className="h-8 w-8 shrink-0"
+                        aria-label="Remove"
+                      >
+                        <Trash2 className="h-3.5 w-3.5" />
+                      </Button>
+                    </div>
+                  ))}
+                  <Button
+                    type="button"
+                    variant="outline"
+                    size="sm"
+                    onClick={addEnvEntry}
+                    className="gap-1.5"
+                  >
+                    <Plus className="h-3.5 w-3.5" />
+                    Add variable
+                  </Button>
+                </div>
+              </div>
+
+              {/* Auto-approve Flag */}
+              <div className="space-y-2">
+                <div className="flex items-center gap-2">
+                  <Label htmlFor="autoApproveFlag" className="text-sm font-medium">
+                    Auto-approve Flag
+                  </Label>
+                  <FieldTooltip content="Flag used in auto-approve mode" />
+                </div>
+                <Input
+                  id="autoApproveFlag"
+                  value={form.autoApproveFlag}
+                  onChange={(e) => handleChange('autoApproveFlag', e.target.value)}
+                  placeholder={registryDefaults.autoApproveFlag || '(none)'}
+                  className="font-mono text-sm"
+                />
+              </div>
+
+              {/* Initial Prompt Flag */}
+              <div className="space-y-2">
+                <div className="flex items-center gap-2">
+                  <Label htmlFor="initialPromptFlag" className="text-sm font-medium">
+                    Initial Prompt Flag
+                  </Label>
+                  <FieldTooltip content="Flag for passing initial prompt (empty means pass directly)" />
+                </div>
+                <Input
+                  id="initialPromptFlag"
+                  value={form.initialPromptFlag}
+                  onChange={(e) => handleChange('initialPromptFlag', e.target.value)}
+                  placeholder={registryDefaults.initialPromptFlag || '(pass directly)'}
+                  className="font-mono text-sm"
+                />
+              </div>
+
+              {/* Preview */}
+              <div className="mt-6 rounded-lg border border-border/60 bg-muted/30 p-4">
+                <div className="mb-2 text-xs font-medium text-muted-foreground">
+                  Command Preview
+                </div>
+                <code className="block break-all font-mono text-sm text-foreground">
+                  {previewCommand}
+                </code>
+              </div>
+
+              {isOverridden && (
+                <div className="rounded-md border border-yellow-500/30 bg-yellow-500/10 px-3 py-2 text-xs text-yellow-600 dark:text-yellow-400">
+                  Custom configuration is applied
+                </div>
+              )}
+            </div>
+          )}
+        </div>
+
+        <div className="flex items-center justify-between border-t border-border/60 px-6 py-4">
+          <Button
+            type="button"
+            variant="ghost"
+            size="sm"
+            onClick={handleResetToDefaults}
+            disabled={isLoading || saving}
+            className="gap-1.5"
+          >
+            <RotateCcw className="h-3.5 w-3.5" />
+            Reset to Defaults
+          </Button>
+          <div className="flex gap-2">
+            <Button type="button" variant="outline" size="sm" onClick={onClose} disabled={saving}>
+              Cancel
+            </Button>
+            <ConfirmButton
+              type="button"
+              size="sm"
+              onClick={() => void handleSave()}
+              disabled={isLoading || saving || !hasChanges}
+            >
+              {saving ? 'Saving...' : 'Save'}
+            </ConfirmButton>
+          </div>
+        </div>
+      </DialogContent>
+    </Dialog>
+  );
+};
+
+const FieldTooltip: React.FC<{ content: string }> = ({ content }) => (
+  <TooltipProvider>
+    <Tooltip>
+      <TooltipTrigger>
+        <button
+          type="button"
+          className="text-muted-foreground hover:text-foreground"
+          aria-label="More information"
+        >
+          <Info className="h-3.5 w-3.5" aria-hidden="true" />
+        </button>
+      </TooltipTrigger>
+      <TooltipContent side="top" className="max-w-[200px] text-xs">
+        {content}
+      </TooltipContent>
+    </Tooltip>
+  </TooltipProvider>
+);
+
+export default CustomCommandModal;
diff --git a/src/renderer/features/settings/components/DefaultAgentSettingsCard.tsx b/src/renderer/features/settings/components/DefaultAgentSettingsCard.tsx
new file mode 100644
index 0000000000..dee37a93fd
--- /dev/null
+++ b/src/renderer/features/settings/components/DefaultAgentSettingsCard.tsx
@@ -0,0 +1,44 @@
+import React from 'react';
+import { AgentProviderId, isValidProviderId } from '@shared/agent-provider-registry';
+import type { AppSettings } from '@shared/app-settings';
+import { useAppSettingsKey } from '@renderer/features/settings/use-app-settings-key';
+import { AgentSelector } from '@renderer/lib/components/agent-selector/agent-selector';
+import { SettingRow } from './SettingRow';
+
+const DEFAULT_AGENT: AgentProviderId = 'claude';
+
+const DefaultAgentSettingsCard: React.FC = () => {
+  const {
+    value: defaultAgentValue,
+    update,
+    isLoading: loading,
+    isSaving: saving,
+  } = useAppSettingsKey('defaultAgent');
+
+  const defaultAgent: AgentProviderId = isValidProviderId(defaultAgentValue)
+    ? (defaultAgentValue as AgentProviderId)
+    : DEFAULT_AGENT;
+
+  const handleChange = (agent: AgentProviderId) => {
+    update(agent as AppSettings['defaultAgent']);
+  };
+
+  return (
+    <SettingRow
+      title="Default agent"
+      description="The agent that will be selected by default when creating a new task."
+      control={
+        <div className="w-[183px] shrink-0">
+          <AgentSelector
+            value={defaultAgent}
+            onChange={handleChange}
+            disabled={loading || saving}
+            className="w-full"
+          />
+        </div>
+      }
+    />
+  );
+};
+
+export default DefaultAgentSettingsCard;
diff --git a/src/renderer/features/settings/components/HiddenToolsSettingsCard.tsx b/src/renderer/features/settings/components/HiddenToolsSettingsCard.tsx
new file mode 100644
index 0000000000..b03e304393
--- /dev/null
+++ b/src/renderer/features/settings/components/HiddenToolsSettingsCard.tsx
@@ -0,0 +1,84 @@
+import { useMemo } from 'react';
+import { OPEN_IN_APPS, type OpenInAppId } from '@shared/openInApps';
+import { useAppSettingsKey } from '@renderer/features/settings/use-app-settings-key';
+import { useOpenInApps } from '@renderer/lib/hooks/useOpenInApps';
+import { Switch } from '@renderer/lib/ui/switch';
+import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@renderer/lib/ui/tooltip';
+import IntegrationRow from './IntegrationRow';
+
+export default function HiddenToolsSettingsCard() {
+  const { value: openIn, update, isLoading, isSaving } = useAppSettingsKey('openIn');
+  const { icons, labels, availability } = useOpenInApps();
+
+  const hiddenApps: OpenInAppId[] = openIn?.hidden ?? [];
+
+  const toggle = (appId: OpenInAppId, visible: boolean) => {
+    const next = visible ? hiddenApps.filter((id) => id !== appId) : [...hiddenApps, appId];
+    update({ hidden: next });
+  };
+
+  const sortedApps = useMemo(() => {
+    return Object.values(OPEN_IN_APPS).sort((a, b) => {
+      const aDetected = availability[a.id] ?? a.alwaysAvailable ?? false;
+      const bDetected = availability[b.id] ?? b.alwaysAvailable ?? false;
+      if (aDetected && !bDetected) return -1;
+      if (!aDetected && bDetected) return 1;
+      return (labels[a.id] ?? a.label).localeCompare(labels[b.id] ?? b.label);
+    });
+  }, [availability, labels]);
+
+  return (
+    <div className="rounded-xl border border-border/60 bg-muted/10 p-2">
+      <div className="space-y-2">
+        {sortedApps.map((app) => {
+          const isDetected = availability[app.id] ?? app.alwaysAvailable ?? false;
+          const isVisible = isDetected && !hiddenApps.includes(app.id);
+          const canToggleVisibility = isDetected;
+          const label = labels[app.id] ?? app.label;
+          const icon = icons[app.id];
+          const indicatorClass = isDetected ? 'bg-emerald-500' : 'bg-muted-foreground/50';
+          const statusLabel = isDetected ? 'Detected' : 'Not detected';
+
+          return (
+            <IntegrationRow
+              key={app.id}
+              logoSrc={icon}
+              name={label}
+              status={isDetected ? 'connected' : 'missing'}
+              showStatusPill={false}
+              middle={
+                <span className="flex items-center gap-2 text-sm text-muted-foreground">
+                  <span className={`h-1.5 w-1.5 rounded-full ${indicatorClass}`} />
+                  {statusLabel}
+                </span>
+              }
+              rightExtra={
+                <TooltipProvider delay={150}>
+                  <Tooltip>
+                    <TooltipTrigger>
+                      <span>
+                        <Switch
+                          checked={isVisible}
+                          disabled={isLoading || isSaving || !canToggleVisibility}
+                          onCheckedChange={(checked) => toggle(app.id, checked)}
+                          aria-label={`${isVisible ? 'Hide' : 'Show'} ${label} in open menu`}
+                        />
+                      </span>
+                    </TooltipTrigger>
+                    <TooltipContent side="top" className="text-xs">
+                      {!isDetected
+                        ? 'Install this tool to show it in menu'
+                        : isVisible
+                          ? 'Hide from menu'
+                          : 'Show in menu'}
+                    </TooltipContent>
+                  </Tooltip>
+                </TooltipProvider>
+              }
+            />
+          );
+        })}
+      </div>
+    </div>
+  );
+}
diff --git a/src/renderer/components/IntegrationRow.tsx b/src/renderer/features/settings/components/IntegrationRow.tsx
similarity index 98%
rename from src/renderer/components/IntegrationRow.tsx
rename to src/renderer/features/settings/components/IntegrationRow.tsx
index b0567ebaf0..b51035614c 100644
--- a/src/renderer/components/IntegrationRow.tsx
+++ b/src/renderer/features/settings/components/IntegrationRow.tsx
@@ -1,6 +1,6 @@
-import React, { useEffect, useRef, useState } from 'react';
 import { Check, Copy, ExternalLink, Trash2 } from 'lucide-react';
-import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from './ui/tooltip';
+import React, { useEffect, useRef, useState } from 'react';
+import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@renderer/lib/ui/tooltip';
 
 type IntegrationStatus =
   | 'connected'
@@ -174,8 +174,8 @@ const IntegrationRow: React.FC<IntegrationRowProps> = ({
       <div className="flex items-center justify-end gap-2 text-sm text-muted-foreground">
         {showInstallCopy ? (
           <TooltipProvider>
-            <Tooltip delayDuration={150}>
-              <TooltipTrigger asChild>
+            <Tooltip>
+              <TooltipTrigger>
                 <button
                   type="button"
                   onClick={() => {
diff --git a/src/renderer/features/settings/components/IntegrationsCard.tsx b/src/renderer/features/settings/components/IntegrationsCard.tsx
new file mode 100644
index 0000000000..8825347778
--- /dev/null
+++ b/src/renderer/features/settings/components/IntegrationsCard.tsx
@@ -0,0 +1,225 @@
+import { Check, Loader2, Plus } from 'lucide-react';
+import React, { useEffect } from 'react';
+import forgejoSvg from '@/assets/images/Forgejo.svg?raw';
+import githubSvg from '@/assets/images/Github.svg?raw';
+import gitlabSvg from '@/assets/images/GitLab.svg?raw';
+import jiraSvg from '@/assets/images/Jira.svg?raw';
+import linearSvg from '@/assets/images/Linear.svg?raw';
+import plainSvg from '@/assets/images/Plain.svg?raw';
+import { useIntegrationsContext } from '@renderer/features/integrations/integrations-provider';
+import { useTheme } from '@renderer/lib/hooks/useTheme';
+import { useShowModal } from '@renderer/lib/modal/modal-provider';
+import { useGithubContext } from '@renderer/lib/providers/github-context-provider';
+import { Button } from '@renderer/lib/ui/button';
+import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@renderer/lib/ui/tooltip';
+
+/** Light mode: original SVG colors. Dark / dark-black: primary colour. */
+const SvgLogo = ({ raw }: { raw: string }) => {
+  const { effectiveTheme } = useTheme();
+  const isDark = effectiveTheme === 'emdark';
+
+  const processed = isDark
+    ? raw
+        .replace(/\bfill="[^"]*"/g, 'fill="currentColor"')
+        .replace(/\bstroke="[^"]*"/g, 'stroke="currentColor"')
+    : raw;
+
+  return (
+    <span
+      className={`inline-flex h-8 w-8 items-center justify-center [&_svg]:h-full [&_svg]:w-full [&_svg]:shrink-0 ${isDark ? 'text-primary' : ''}`}
+      dangerouslySetInnerHTML={{ __html: processed }}
+    />
+  );
+};
+
+const IntegrationsCard: React.FC = () => {
+  const {
+    authenticated,
+    isLoading,
+    githubLoading,
+    handleGithubConnect,
+    cancelGithubConnect,
+    logout,
+    tokenSource,
+    checkStatus,
+  } = useGithubContext();
+  const {
+    connectionStatus,
+    isLinearConnected,
+    isLinearLoading,
+    disconnectLinear,
+    isJiraConnected,
+    isJiraLoading,
+    disconnectJira,
+    isGitlabConnected,
+    isGitlabLoading,
+    disconnectGitlab,
+    isPlainConnected,
+    isPlainLoading,
+    disconnectPlain,
+    isForgejoConnected,
+    isForgejoLoading,
+    disconnectForgejo,
+  } = useIntegrationsContext();
+
+  const showIntegrationSetup = useShowModal('integrationSetupModal');
+
+  const isCliManaged = authenticated && tokenSource === 'cli';
+
+  useEffect(() => {
+    void checkStatus();
+  }, [checkStatus]);
+
+  const integrations = [
+    {
+      id: 'github',
+      name: 'GitHub',
+      description: 'Connect your repositories',
+      logoSvg: githubSvg,
+      connected: authenticated,
+      loading: isLoading || githubLoading,
+      onConnect: handleGithubConnect,
+      onCancel: cancelGithubConnect,
+      onDisconnect: logout,
+      disabledTooltip: isCliManaged
+        ? 'Run `gh auth logout` in your terminal to disconnect'
+        : undefined,
+    },
+    {
+      id: 'linear',
+      name: 'Linear',
+      description:
+        isLinearConnected && connectionStatus.linear.displayName
+          ? connectionStatus.linear.displayName
+          : 'Work on Linear tickets',
+      logoSvg: linearSvg,
+      connected: !!isLinearConnected,
+      loading: isLinearLoading,
+      onConnect: () => showIntegrationSetup({ integration: 'linear' }),
+      onDisconnect: disconnectLinear,
+    },
+    {
+      id: 'jira',
+      name: 'Jira',
+      description:
+        isJiraConnected && connectionStatus.jira.displayName
+          ? connectionStatus.jira.displayName
+          : 'Work on Jira tickets',
+      logoSvg: jiraSvg,
+      connected: !!isJiraConnected,
+      loading: isJiraLoading,
+      onConnect: () => showIntegrationSetup({ integration: 'jira' }),
+      onDisconnect: disconnectJira,
+    },
+    {
+      id: 'gitlab',
+      name: 'GitLab',
+      description:
+        isGitlabConnected && connectionStatus.gitlab.displayName
+          ? connectionStatus.gitlab.displayName
+          : 'Work on GitLab issues',
+      logoSvg: gitlabSvg,
+      connected: !!isGitlabConnected,
+      loading: isGitlabLoading,
+      onConnect: () => showIntegrationSetup({ integration: 'gitlab' }),
+      onDisconnect: disconnectGitlab,
+    },
+    {
+      id: 'plain',
+      name: 'Plain',
+      description: 'Work on Plain threads',
+      logoSvg: plainSvg,
+      connected: !!isPlainConnected,
+      loading: isPlainLoading,
+      onConnect: () => showIntegrationSetup({ integration: 'plain' }),
+      onDisconnect: disconnectPlain,
+    },
+    {
+      id: 'forgejo',
+      name: 'Forgejo',
+      description:
+        isForgejoConnected && connectionStatus.forgejo.displayName
+          ? connectionStatus.forgejo.displayName
+          : 'Work on Forgejo issues',
+      logoSvg: forgejoSvg,
+      connected: !!isForgejoConnected,
+      loading: isForgejoLoading,
+      onConnect: () => showIntegrationSetup({ integration: 'forgejo' }),
+      onDisconnect: disconnectForgejo,
+    },
+  ];
+
+  return (
+    <div
+      className="grid gap-3"
+      style={{ gridTemplateColumns: 'repeat(auto-fit, minmax(280px, 1fr))' }}
+    >
+      {integrations.map((integration) => (
+        <div key={integration.id} className="flex h-full min-h-0">
+          <div className="flex w-full items-center gap-4 rounded-lg border border-muted bg-muted/20 p-4">
+            <div className="flex h-12 w-12 shrink-0 items-center justify-center rounded-lg bg-muted/50">
+              <SvgLogo raw={integration.logoSvg} />
+            </div>
+            <div className="flex flex-1 flex-col gap-0.5">
+              <h3 className="text-sm font-medium text-foreground">{integration.name}</h3>
+              <p className="text-sm text-muted-foreground">{integration.description}</p>
+            </div>
+            {integration.connected ? (
+              integration.disabledTooltip ? (
+                <TooltipProvider>
+                  <Tooltip>
+                    <TooltipTrigger
+                      className="inline-flex h-8 w-8 shrink-0 cursor-default items-center justify-center rounded-md border border-input bg-background opacity-70"
+                      aria-label={integration.disabledTooltip}
+                    >
+                      <Check className="h-4 w-4 text-emerald-600 dark:text-emerald-400" />
+                    </TooltipTrigger>
+                    <TooltipContent side="top">
+                      <p className="text-xs">{integration.disabledTooltip}</p>
+                    </TooltipContent>
+                  </Tooltip>
+                </TooltipProvider>
+              ) : (
+                <Button
+                  type="button"
+                  variant="outline"
+                  size="icon"
+                  className="h-8 w-8 shrink-0"
+                  onClick={integration.onDisconnect}
+                  aria-label={`Disconnect ${integration.name}`}
+                >
+                  <Check className="h-4 w-4 text-emerald-600 dark:text-emerald-400" />
+                </Button>
+              )
+            ) : (
+              <Button
+                type="button"
+                variant="outline"
+                size="icon"
+                className="h-8 w-8 shrink-0"
+                onClick={
+                  integration.loading && integration.onCancel
+                    ? integration.onCancel
+                    : integration.onConnect
+                }
+                aria-label={
+                  integration.loading
+                    ? `Cancel connecting ${integration.name}`
+                    : `Connect ${integration.name}`
+                }
+              >
+                {integration.loading ? (
+                  <Loader2 className="h-4 w-4 animate-spin" />
+                ) : (
+                  <Plus className="h-4 w-4" />
+                )}
+              </Button>
+            )}
+          </div>
+        </div>
+      ))}
+    </div>
+  );
+};
+
+export default IntegrationsCard;
diff --git a/src/renderer/features/settings/components/KeyboardSettingsCard.tsx b/src/renderer/features/settings/components/KeyboardSettingsCard.tsx
new file mode 100644
index 0000000000..734fd4f81e
--- /dev/null
+++ b/src/renderer/features/settings/components/KeyboardSettingsCard.tsx
@@ -0,0 +1,210 @@
+import { formatForDisplay, useHotkeyRecorder, type Hotkey } from '@tanstack/react-hotkeys';
+import { RotateCcw, X } from 'lucide-react';
+import React, { useState } from 'react';
+import { useAppSettingsKey } from '@renderer/features/settings/use-app-settings-key';
+import { toast } from '@renderer/lib/hooks/use-toast';
+import {
+  APP_SHORTCUTS,
+  getEffectiveHotkey,
+  type ShortcutSettingsKey,
+} from '@renderer/lib/hooks/useKeyboardShortcuts';
+import { Button } from '@renderer/lib/ui/button';
+import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@renderer/lib/ui/tooltip';
+
+const CONFIGURABLE_SHORTCUTS = (
+  Object.entries(APP_SHORTCUTS) as [
+    ShortcutSettingsKey,
+    (typeof APP_SHORTCUTS)[ShortcutSettingsKey],
+  ][]
+).filter(([, def]) => !def.hideFromSettings);
+
+const SHORTCUTS_BY_CATEGORY = CONFIGURABLE_SHORTCUTS.reduce<
+  Record<string, [ShortcutSettingsKey, (typeof APP_SHORTCUTS)[ShortcutSettingsKey]][]>
+>((acc, entry) => {
+  const category = entry[1].category;
+  if (!acc[category]) acc[category] = [];
+  acc[category].push(entry);
+  return acc;
+}, {});
+
+const KeyboardSettingsCard: React.FC = () => {
+  const {
+    value: keyboard,
+    update,
+    isLoading: loading,
+    isSaving: saving,
+    resetField,
+  } = useAppSettingsKey('keyboard');
+
+  const [editingKey, setEditingKey] = useState<ShortcutSettingsKey | null>(null);
+
+  const recorder = useHotkeyRecorder({
+    onRecord: (hotkey: Hotkey) => {
+      if (!editingKey) return;
+
+      const conflict = CONFIGURABLE_SHORTCUTS.find(([key]) => {
+        if (key === editingKey) return false;
+        return getEffectiveHotkey(key, keyboard) === hotkey;
+      });
+
+      if (conflict) {
+        const [, def] = conflict;
+        const msg = `Conflicts with "${def.label}". Choose a different shortcut.`;
+        toast({ title: 'Shortcut conflict', description: msg, variant: 'destructive' });
+        recorder.cancelRecording();
+        setEditingKey(null);
+        return;
+      }
+
+      update({ [editingKey]: hotkey });
+      toast({
+        title: 'Shortcut updated',
+        description: `${APP_SHORTCUTS[editingKey].label} is now ${formatForDisplay(hotkey)}`,
+      });
+      setEditingKey(null);
+    },
+    onCancel: () => setEditingKey(null),
+  });
+
+  const startCapture = (key: ShortcutSettingsKey) => {
+    setEditingKey(key);
+    recorder.startRecording();
+  };
+
+  const handleReset = (key: ShortcutSettingsKey) => {
+    resetField(key);
+    toast({
+      title: 'Shortcut reset',
+      description: `${APP_SHORTCUTS[key].label} reset to default.`,
+    });
+  };
+
+  const handleClear = (key: ShortcutSettingsKey) => {
+    update({ [key]: null });
+    toast({
+      title: 'Shortcut removed',
+      description: `${APP_SHORTCUTS[key].label} no longer has a key binding.`,
+    });
+  };
+
+  return (
+    <div className="rounded-xl border border-border/60 bg-muted/10 p-4">
+      <div className="space-y-6">
+        {Object.entries(SHORTCUTS_BY_CATEGORY).map(([category, shortcuts]) => (
+          <div key={category}>
+            <div className="mb-3 text-xs font-medium uppercase tracking-wide text-muted-foreground">
+              {category}
+            </div>
+            <div className="space-y-3">
+              {shortcuts.map(([key, def]) => {
+                const effectiveHotkey = getEffectiveHotkey(key, keyboard);
+                const capturing = editingKey === key && recorder.isRecording;
+                const cleared = keyboard?.[key] === null;
+                const showClear = !cleared;
+                const showReset = effectiveHotkey !== def.defaultHotkey;
+                const showActions = showClear || showReset;
+                const displayHotkey = effectiveHotkey ? formatForDisplay(effectiveHotkey) : '';
+
+                return (
+                  <div
+                    key={key}
+                    className="group/shortcut flex min-w-0 flex-wrap items-start justify-between gap-x-2 gap-y-2"
+                  >
+                    <div className="min-w-0 flex-1 basis-64 space-y-1">
+                      <div className="break-words text-sm">{def.label}</div>
+                      <div className="break-words text-xs text-muted-foreground">
+                        {def.description}
+                      </div>
+                    </div>
+                    <div className="ml-auto flex shrink-0 items-center gap-2">
+                      {capturing ? (
+                        <>
+                          <Button
+                            type="button"
+                            variant="outline"
+                            size="sm"
+                            className="min-w-[80px] animate-pulse"
+                            onClick={() => recorder.cancelRecording()}
+                            disabled={saving}
+                          >
+                            Press keys...
+                          </Button>
+                          <Button
+                            type="button"
+                            variant="ghost"
+                            size="sm"
+                            onClick={() => recorder.cancelRecording()}
+                            disabled={saving}
+                          >
+                            Cancel
+                          </Button>
+                        </>
+                      ) : (
+                        <>
+                          {showActions && (
+                            <div className="pointer-events-none flex items-center gap-1 opacity-0 transition-opacity group-hover/shortcut:pointer-events-auto group-hover/shortcut:opacity-100">
+                              <TooltipProvider delay={150}>
+                                {showClear && (
+                                  <Tooltip>
+                                    <TooltipTrigger>
+                                      <Button
+                                        type="button"
+                                        variant="ghost"
+                                        size="icon"
+                                        className="text-muted-foreground hover:text-foreground"
+                                        onClick={() => handleClear(key)}
+                                        disabled={loading || saving}
+                                        aria-label="Remove shortcut"
+                                      >
+                                        <X className="h-3.5 w-3.5" />
+                                      </Button>
+                                    </TooltipTrigger>
+                                    <TooltipContent side="top">Remove shortcut</TooltipContent>
+                                  </Tooltip>
+                                )}
+                                {showReset && (
+                                  <Tooltip>
+                                    <TooltipTrigger>
+                                      <Button
+                                        type="button"
+                                        variant="ghost"
+                                        size="icon"
+                                        className="text-muted-foreground hover:text-foreground"
+                                        onClick={() => handleReset(key)}
+                                        disabled={loading || saving}
+                                        aria-label="Reset to default"
+                                      >
+                                        <RotateCcw className="h-3.5 w-3.5" />
+                                      </Button>
+                                    </TooltipTrigger>
+                                    <TooltipContent side="top">Reset to default</TooltipContent>
+                                  </Tooltip>
+                                )}
+                              </TooltipProvider>
+                            </div>
+                          )}
+                          <Button
+                            type="button"
+                            variant="outline"
+                            size="sm"
+                            className="min-w-[80px] font-mono"
+                            onClick={() => startCapture(key)}
+                            disabled={loading || saving}
+                          >
+                            {displayHotkey}
+                          </Button>
+                        </>
+                      )}
+                    </div>
+                  </div>
+                );
+              })}
+            </div>
+          </div>
+        ))}
+      </div>
+    </div>
+  );
+};
+
+export default KeyboardSettingsCard;
diff --git a/src/renderer/features/settings/components/NotificationSettingsCard.tsx b/src/renderer/features/settings/components/NotificationSettingsCard.tsx
new file mode 100644
index 0000000000..91b4ec66ff
--- /dev/null
+++ b/src/renderer/features/settings/components/NotificationSettingsCard.tsx
@@ -0,0 +1,122 @@
+import React from 'react';
+import { useAppSettingsKey } from '@renderer/features/settings/use-app-settings-key';
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from '@renderer/lib/ui/select';
+import { Switch } from '@renderer/lib/ui/switch';
+import { cn } from '@renderer/utils/utils';
+import { ResetToDefaultButton } from './ResetToDefaultButton';
+import { SettingRow } from './SettingRow';
+
+const NotificationSettingsCard: React.FC = () => {
+  const {
+    value: notifications,
+    update,
+    isLoading: loading,
+    isFieldOverridden,
+    resetField,
+  } = useAppSettingsKey('notifications');
+
+  return (
+    <div className="flex flex-col gap-4">
+      <SettingRow
+        title="Notifications"
+        description="Get notified when agents need your attention."
+        control={
+          <>
+            <ResetToDefaultButton
+              visible={isFieldOverridden('enabled')}
+              defaultLabel="on"
+              onReset={() => resetField('enabled')}
+              disabled={loading}
+            />
+            <Switch
+              checked={notifications?.enabled ?? true}
+              disabled={loading}
+              onCheckedChange={(next) => update({ enabled: next })}
+            />
+          </>
+        }
+      />
+      <div
+        className={cn(
+          'flex flex-col gap-3',
+          !notifications?.enabled && 'pointer-events-none opacity-33'
+        )}
+      >
+        <SettingRow
+          title="Sound"
+          description="Play audio cues for agent events."
+          control={
+            <>
+              <ResetToDefaultButton
+                visible={isFieldOverridden('sound')}
+                defaultLabel="on"
+                onReset={() => resetField('sound')}
+                disabled={loading}
+              />
+              <Switch
+                checked={notifications?.sound ?? true}
+                disabled={loading}
+                onCheckedChange={(next) => update({ sound: next })}
+              />
+            </>
+          }
+        />
+
+        <SettingRow
+          title="Sound timing"
+          description="When to play sounds."
+          control={
+            <>
+              <ResetToDefaultButton
+                visible={isFieldOverridden('soundFocusMode')}
+                defaultLabel="always"
+                onReset={() => resetField('soundFocusMode')}
+                disabled={loading}
+              />
+              <Select
+                value={notifications?.soundFocusMode ?? 'always'}
+                onValueChange={(next) => update({ soundFocusMode: next as 'always' | 'unfocused' })}
+              >
+                <SelectTrigger className="w-auto shrink-0 gap-2 [&>span]:line-clamp-none">
+                  <SelectValue />
+                </SelectTrigger>
+                <SelectContent className="min-w-max">
+                  <SelectItem value="always">Always</SelectItem>
+                  <SelectItem value="unfocused">Only when unfocused</SelectItem>
+                </SelectContent>
+              </Select>
+            </>
+          }
+        />
+
+        <SettingRow
+          title="OS notifications"
+          description="Show system banners when agents need attention or finish (while Emdash is unfocused)."
+          control={
+            <>
+              <ResetToDefaultButton
+                visible={isFieldOverridden('osNotifications')}
+                defaultLabel="on"
+                onReset={() => resetField('osNotifications')}
+                disabled={loading}
+              />
+              <Switch
+                checked={notifications?.osNotifications ?? true}
+                disabled={loading}
+                onCheckedChange={(next) => update({ osNotifications: next })}
+              />
+            </>
+          }
+        />
+      </div>
+    </div>
+  );
+};
+
+export default NotificationSettingsCard;
diff --git a/src/renderer/features/settings/components/RepositorySettingsCard.tsx b/src/renderer/features/settings/components/RepositorySettingsCard.tsx
new file mode 100644
index 0000000000..0d49d09702
--- /dev/null
+++ b/src/renderer/features/settings/components/RepositorySettingsCard.tsx
@@ -0,0 +1,99 @@
+import React, { useMemo } from 'react';
+import { useAppSettingsKey } from '@renderer/features/settings/use-app-settings-key';
+import { Input } from '@renderer/lib/ui/input';
+import { Switch } from '@renderer/lib/ui/switch';
+import { ResetToDefaultButton } from './ResetToDefaultButton';
+import { SettingRow } from './SettingRow';
+
+const RepositorySettingsCard: React.FC = () => {
+  const {
+    value: localProject,
+    update,
+    isLoading: loading,
+    isSaving: saving,
+    isFieldOverridden,
+    resetField,
+  } = useAppSettingsKey('localProject');
+
+  const branchPrefix = localProject?.branchPrefix ?? '';
+  const pushOnCreate = localProject?.pushOnCreate ?? true;
+  const writeAgentConfigToGitIgnore = localProject?.writeAgentConfigToGitIgnore ?? true;
+
+  const example = useMemo(() => {
+    return `${branchPrefix}/my-feature-a3f`;
+  }, [branchPrefix]);
+
+  return (
+    <div className="grid gap-8">
+      <div className="grid gap-2">
+        <div className="flex items-center gap-2">
+          <Input
+            key={branchPrefix}
+            defaultValue={branchPrefix}
+            onBlur={(e) => {
+              const next = e.target.value.trim();
+              if (next !== branchPrefix) {
+                update({ branchPrefix: next });
+              }
+            }}
+            placeholder="Branch prefix"
+            aria-label="Branch prefix"
+            disabled={loading}
+            className="flex-1"
+          />
+          <ResetToDefaultButton
+            visible={isFieldOverridden('branchPrefix')}
+            defaultLabel="emdash"
+            onReset={() => resetField('branchPrefix')}
+            disabled={loading || saving}
+          />
+        </div>
+        <div className="text-[11px] text-muted-foreground">
+          Example: <code className="rounded bg-muted/60 px-1">{example}</code>
+        </div>
+      </div>
+      <SettingRow
+        title="Auto-push on create"
+        description="Push the new branch to the selected project remote and set upstream after creation."
+        control={
+          <>
+            <ResetToDefaultButton
+              visible={isFieldOverridden('pushOnCreate')}
+              defaultLabel="on"
+              onReset={() => resetField('pushOnCreate')}
+              disabled={loading || saving}
+            />
+            <Switch
+              checked={pushOnCreate}
+              onCheckedChange={(checked) => update({ pushOnCreate: checked })}
+              disabled={loading || saving}
+              aria-label="Enable automatic push on create"
+            />
+          </>
+        }
+      />
+      <SettingRow
+        title="Auto-update .gitignore"
+        description="When Emdash writes CLI hook configs, also add their paths to .gitignore."
+        control={
+          <>
+            <ResetToDefaultButton
+              visible={isFieldOverridden('writeAgentConfigToGitIgnore')}
+              defaultLabel="on"
+              onReset={() => resetField('writeAgentConfigToGitIgnore')}
+              disabled={loading || saving}
+            />
+            <Switch
+              checked={writeAgentConfigToGitIgnore}
+              onCheckedChange={(checked) => update({ writeAgentConfigToGitIgnore: checked })}
+              disabled={loading || saving}
+              aria-label="Enable .gitignore updates for CLI hook configs"
+            />
+          </>
+        }
+      />
+    </div>
+  );
+};
+
+export default RepositorySettingsCard;
diff --git a/src/renderer/features/settings/components/ResetToDefaultButton.tsx b/src/renderer/features/settings/components/ResetToDefaultButton.tsx
new file mode 100644
index 0000000000..4006d120e3
--- /dev/null
+++ b/src/renderer/features/settings/components/ResetToDefaultButton.tsx
@@ -0,0 +1,46 @@
+import { RotateCcw } from 'lucide-react';
+import React from 'react';
+import { Button } from '@renderer/lib/ui/button';
+import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@renderer/lib/ui/tooltip';
+
+interface ResetToDefaultButtonProps {
+  /** Optional label shown in the tooltip: "Reset to default: <label>" */
+  defaultLabel?: string;
+  onReset: () => void;
+  disabled?: boolean;
+  visible?: boolean;
+}
+
+export const ResetToDefaultButton: React.FC<ResetToDefaultButtonProps> = ({
+  defaultLabel,
+  onReset,
+  disabled,
+  visible = true,
+}) => {
+  if (!visible) {
+    return <span aria-hidden="true" className="h-7 w-7 shrink-0" />;
+  }
+
+  return (
+    <TooltipProvider delay={150}>
+      <Tooltip>
+        <TooltipTrigger>
+          <Button
+            type="button"
+            variant="ghost"
+            size="icon"
+            className="h-7 w-7 shrink-0 text-muted-foreground hover:text-foreground"
+            onClick={onReset}
+            disabled={disabled}
+            aria-label="Reset to default"
+          >
+            <RotateCcw className="h-3.5 w-3.5" />
+          </Button>
+        </TooltipTrigger>
+        <TooltipContent side="top">
+          {defaultLabel !== undefined ? `Reset to default: ${defaultLabel}` : 'Reset to default'}
+        </TooltipContent>
+      </Tooltip>
+    </TooltipProvider>
+  );
+};
diff --git a/src/renderer/features/settings/components/ReviewPromptSettingsCard.tsx b/src/renderer/features/settings/components/ReviewPromptSettingsCard.tsx
new file mode 100644
index 0000000000..a169957cc1
--- /dev/null
+++ b/src/renderer/features/settings/components/ReviewPromptSettingsCard.tsx
@@ -0,0 +1,41 @@
+import { RotateCcw } from 'lucide-react';
+import { useAppSettingsKey } from '@renderer/features/settings/use-app-settings-key';
+import { Button } from '@renderer/lib/ui/button';
+import { Textarea } from '@renderer/lib/ui/textarea';
+
+export function ReviewPromptResetButton() {
+  const { value, defaults, reset, isLoading, isSaving } = useAppSettingsKey('reviewPrompt');
+  const canReset = (value ?? '') !== (defaults ?? '');
+  const isVisible = !(isLoading || isSaving || !canReset);
+
+  return (
+    <Button
+      variant="ghost"
+      size="sm"
+      onClick={() => reset()}
+      disabled={!isVisible || isLoading || !canReset}
+    >
+      <RotateCcw />
+    </Button>
+  );
+}
+
+export function ReviewPromptSettingsCard() {
+  const { value, update, isLoading, isSaving } = useAppSettingsKey('reviewPrompt');
+  const reviewPrompt = value ?? '';
+
+  return (
+    <Textarea
+      key={reviewPrompt}
+      defaultValue={reviewPrompt}
+      onBlur={(e) => {
+        const next = e.target.value;
+        if (next !== reviewPrompt) {
+          update(next);
+        }
+      }}
+      className="min-h-36 px-3 py-2.5 text-[14px] leading-relaxed"
+      disabled={isLoading || isSaving}
+    />
+  );
+}
diff --git a/src/renderer/features/settings/components/ServerUnavailableMessage.tsx b/src/renderer/features/settings/components/ServerUnavailableMessage.tsx
new file mode 100644
index 0000000000..c048529956
--- /dev/null
+++ b/src/renderer/features/settings/components/ServerUnavailableMessage.tsx
@@ -0,0 +1,13 @@
+import { AlertCircle } from 'lucide-react';
+import { PRODUCT_NAME } from '@shared/app-identity';
+
+export function ServerUnavailableMessage() {
+  return (
+    <div className="flex items-center gap-2 rounded-md border border-border/60 bg-muted/20 px-3 py-2">
+      <AlertCircle className="h-3.5 w-3.5 shrink-0 text-muted-foreground" />
+      <p className="text-xs text-muted-foreground">
+        {PRODUCT_NAME} server is currently unavailable. Please try again later.
+      </p>
+    </div>
+  );
+}
diff --git a/src/renderer/features/settings/components/SettingRow.tsx b/src/renderer/features/settings/components/SettingRow.tsx
new file mode 100644
index 0000000000..d216dfd2d3
--- /dev/null
+++ b/src/renderer/features/settings/components/SettingRow.tsx
@@ -0,0 +1,21 @@
+import React from 'react';
+
+interface SettingRowProps {
+  title: React.ReactNode;
+  description?: React.ReactNode;
+  control: React.ReactNode;
+}
+
+export function SettingRow({ title, description, control }: SettingRowProps) {
+  return (
+    <div className="flex min-w-0 flex-wrap items-start gap-x-4 gap-y-2">
+      <div className="flex min-w-0 flex-1 basis-64 flex-col gap-0.5">
+        <div className="break-words text-sm text-foreground">{title}</div>
+        {description && (
+          <div className="break-words text-xs text-foreground-passive">{description}</div>
+        )}
+      </div>
+      <div className="ml-auto flex shrink-0 items-center gap-1">{control}</div>
+    </div>
+  );
+}
diff --git a/src/renderer/features/settings/components/SettingsPage.tsx b/src/renderer/features/settings/components/SettingsPage.tsx
new file mode 100644
index 0000000000..38da5995a4
--- /dev/null
+++ b/src/renderer/features/settings/components/SettingsPage.tsx
@@ -0,0 +1,199 @@
+import { ExternalLink } from 'lucide-react';
+import React, { useCallback } from 'react';
+import { rpc } from '@renderer/lib/ipc';
+import { Separator } from '@renderer/lib/ui/separator';
+import { cn } from '@renderer/utils/utils';
+import { AccountTab } from './AccountTab';
+import { CliAgentsList } from './CliAgentsList';
+import DefaultAgentSettingsCard from './DefaultAgentSettingsCard';
+import HiddenToolsSettingsCard from './HiddenToolsSettingsCard';
+import IntegrationsCard from './IntegrationsCard';
+import KeyboardSettingsCard from './KeyboardSettingsCard';
+import NotificationSettingsCard from './NotificationSettingsCard';
+import RepositorySettingsCard from './RepositorySettingsCard';
+import { ReviewPromptResetButton, ReviewPromptSettingsCard } from './ReviewPromptSettingsCard';
+import { AutoGenerateTaskNamesRow, AutoTrustWorktreesRow } from './TaskSettingsRows';
+import TelemetryCard from './TelemetryCard';
+import TerminalSettingsCard from './TerminalSettingsCard';
+import ThemeCard from './ThemeCard';
+import { UpdateCard } from './UpdateCard';
+
+export type SettingsPageTab =
+  | 'general'
+  | 'account'
+  | 'clis-models'
+  | 'integrations'
+  | 'repository'
+  | 'interface'
+  | 'docs';
+
+interface SectionConfig {
+  title?: string;
+  action?: React.ReactNode;
+  component: React.ReactNode;
+}
+
+export function SettingsPage({
+  tab: activeTab,
+  onTabChange,
+}: {
+  tab: SettingsPageTab;
+  onTabChange: (tab: SettingsPageTab) => void;
+}) {
+  const handleDocsClick = useCallback(() => {
+    rpc.app.openExternal('https://docs.emdash.sh');
+  }, []);
+
+  const tabs: Array<{
+    id: SettingsPageTab;
+    label: string;
+    isExternal?: boolean;
+  }> = [
+    { id: 'general', label: 'General' },
+    { id: 'account', label: 'Account' },
+    { id: 'clis-models', label: 'Agents' },
+    { id: 'integrations', label: 'Integrations' },
+    { id: 'repository', label: 'Repository' },
+    { id: 'interface', label: 'Interface' },
+    { id: 'docs', label: 'Docs', isExternal: true },
+  ];
+
+  const tabContent: Record<
+    string,
+    { title: string; description: string; sections: SectionConfig[] }
+  > = {
+    general: {
+      title: 'General',
+      description: 'Manage your account, privacy settings, notifications, and app updates.',
+      sections: [
+        {
+          component: <TelemetryCard />,
+        },
+        {
+          component: <AutoGenerateTaskNamesRow />,
+        },
+        {
+          component: <AutoTrustWorktreesRow />,
+        },
+        {
+          component: <NotificationSettingsCard />,
+        },
+        {
+          component: <UpdateCard />,
+        },
+      ],
+    },
+    account: {
+      title: 'Account',
+      description: 'Manage your Emdash account.',
+      sections: [{ component: <AccountTab /> }],
+    },
+    'clis-models': {
+      title: 'Agents',
+      description: 'Manage CLI agents and model configurations.',
+      sections: [
+        { component: <DefaultAgentSettingsCard /> },
+        {
+          title: 'Review Prompt',
+          action: <ReviewPromptResetButton />,
+          component: <ReviewPromptSettingsCard />,
+        },
+        {
+          title: 'CLI agents',
+          component: (
+            <div className="rounded-xl border border-border/60 bg-muted/10 p-2">
+              <CliAgentsList />
+            </div>
+          ),
+        },
+      ],
+    },
+    integrations: {
+      title: 'Integrations',
+      description: 'Connect external services and tools.',
+      sections: [{ title: 'Integrations', component: <IntegrationsCard /> }],
+    },
+    repository: {
+      title: 'Repository',
+      description: 'Configure repository and branch settings.',
+      sections: [{ title: 'Branch prefix', component: <RepositorySettingsCard /> }],
+    },
+    interface: {
+      title: 'Interface',
+      description: 'Customize the appearance and behavior of the app.',
+      sections: [
+        { component: <ThemeCard /> },
+        { component: <TerminalSettingsCard /> },
+        { title: 'Keyboard shortcuts', component: <KeyboardSettingsCard /> },
+        {
+          title: 'Tools',
+          component: <HiddenToolsSettingsCard />,
+        },
+      ],
+    },
+  };
+
+  const currentContent = tabContent[activeTab as keyof typeof tabContent];
+
+  return (
+    <div className="flex h-full min-h-0 w-full flex-1 flex-col overflow-hidden">
+      <div className="mx-auto flex h-full min-h-0 w-full max-w-[1060px] flex-col gap-6 px-8">
+        <div className="grid min-h-0 flex-1 grid-cols-[13rem_minmax(0,1fr)] gap-8 overflow-hidden">
+          <div className="py-10">
+            <nav className="flex min-h-0 w-52 flex-col gap-0.5 overflow-y-auto">
+              {tabs.map((tab) => {
+                const isActive = tab.id === activeTab && !tab.isExternal;
+                return (
+                  <button
+                    key={tab.id}
+                    type="button"
+                    onClick={() => {
+                      if (tab.isExternal) {
+                        handleDocsClick();
+                      } else {
+                        onTabChange(tab.id);
+                      }
+                    }}
+                    className={cn(
+                      'flex w-full items-center gap-2 hover:bg-background-1 text-foreground-muted hover:text-foreground rounded-md px-3 py-2 text-sm font-normal transition-colors',
+                      isActive &&
+                        'bg-background-2 text-foreground hover:bg-background-2 hover:text-foreground'
+                    )}
+                  >
+                    <span className="text-left">{tab.label}</span>
+                    {tab.isExternal && <ExternalLink className="h-4 w-4" />}
+                  </button>
+                );
+              })}
+            </nav>
+          </div>
+          {/* Content container */}
+          {currentContent && (
+            <div className="min-h-0 min-w-0 flex-1 justify-center overflow-x-hidden overflow-y-auto">
+              <div className="mx-auto w-full max-w-4xl space-y-8 py-10">
+                <div className="flex flex-col gap-6">
+                  <div className="flex flex-col gap-1">
+                    <h2 className="text-xl">{currentContent.title}</h2>
+                    <p className="text-sm text-foreground-muted">{currentContent.description}</p>
+                  </div>
+                  <Separator />
+                </div>
+                {currentContent.sections.map((section) => (
+                  <div key={section.title} className="flex flex-col gap-3">
+                    {section.title && (
+                      <div className="flex items-center justify-between">
+                        <h3 className="text-sm font-normal text-foreground">{section.title}</h3>
+                        {section.action && <div>{section.action}</div>}
+                      </div>
+                    )}
+                    {section.component}
+                  </div>
+                ))}
+              </div>
+            </div>
+          )}
+        </div>
+      </div>
+    </div>
+  );
+}
diff --git a/src/renderer/features/settings/components/TaskHoverActionCard.tsx b/src/renderer/features/settings/components/TaskHoverActionCard.tsx
new file mode 100644
index 0000000000..08c92299c1
--- /dev/null
+++ b/src/renderer/features/settings/components/TaskHoverActionCard.tsx
@@ -0,0 +1,46 @@
+import React from 'react';
+import { useAppSettingsKey } from '@renderer/features/settings/use-app-settings-key';
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from '@renderer/lib/ui/select';
+
+const TaskHoverActionCard: React.FC = () => {
+  const { value: iface, update, isLoading, isSaving } = useAppSettingsKey('interface');
+
+  const value = iface?.taskHoverAction ?? 'delete';
+
+  const handleChange = (next: 'delete' | 'archive') => {
+    update({ taskHoverAction: next });
+    window.dispatchEvent(new CustomEvent('taskHoverActionChanged', { detail: { value: next } }));
+  };
+
+  return (
+    <div className="flex items-center justify-between gap-4">
+      <div className="flex flex-1 flex-col gap-0.5">
+        <p className="text-sm font-medium text-foreground">Task hover action</p>
+        <p className="text-sm text-muted-foreground">
+          Primary action when hovering over tasks in the sidebar.
+        </p>
+      </div>
+      <Select
+        value={value}
+        onValueChange={(next) => handleChange(next as 'delete' | 'archive')}
+        disabled={isLoading || isSaving}
+      >
+        <SelectTrigger className="w-auto shrink-0 gap-2 [&>span]:line-clamp-none">
+          <SelectValue />
+        </SelectTrigger>
+        <SelectContent>
+          <SelectItem value="delete">Delete</SelectItem>
+          <SelectItem value="archive">Archive</SelectItem>
+        </SelectContent>
+      </Select>
+    </div>
+  );
+};
+
+export default TaskHoverActionCard;
diff --git a/src/renderer/features/settings/components/TaskSettingsCard.tsx b/src/renderer/features/settings/components/TaskSettingsCard.tsx
new file mode 100644
index 0000000000..bc7e8977a0
--- /dev/null
+++ b/src/renderer/features/settings/components/TaskSettingsCard.tsx
@@ -0,0 +1,13 @@
+import React from 'react';
+import { AutoGenerateTaskNamesRow, AutoTrustWorktreesRow } from './TaskSettingsRows';
+
+const TaskSettingsCard: React.FC = () => {
+  return (
+    <div className="flex flex-col gap-4">
+      <AutoGenerateTaskNamesRow />
+      <AutoTrustWorktreesRow />
+    </div>
+  );
+};
+
+export default TaskSettingsCard;
diff --git a/src/renderer/features/settings/components/TaskSettingsRows.tsx b/src/renderer/features/settings/components/TaskSettingsRows.tsx
new file mode 100644
index 0000000000..d8a56c218d
--- /dev/null
+++ b/src/renderer/features/settings/components/TaskSettingsRows.tsx
@@ -0,0 +1,88 @@
+import { Info } from 'lucide-react';
+import React from 'react';
+import { useTaskSettings } from '@renderer/features/tasks/hooks/useTaskSettings';
+import { Switch } from '@renderer/lib/ui/switch';
+import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@renderer/lib/ui/tooltip';
+import { ResetToDefaultButton } from './ResetToDefaultButton';
+import { SettingRow } from './SettingRow';
+
+function InfoTooltip({ label, content }: { label: string; content: React.ReactNode }) {
+  return (
+    <TooltipProvider delay={150}>
+      <Tooltip>
+        <TooltipTrigger>
+          <button
+            type="button"
+            className="inline-flex h-4 w-4 items-center justify-center text-muted-foreground hover:text-foreground"
+            aria-label={label}
+          >
+            <Info className="h-3.5 w-3.5" />
+          </button>
+        </TooltipTrigger>
+        <TooltipContent side="top" className="max-w-xs text-xs">
+          {content}
+        </TooltipContent>
+      </Tooltip>
+    </TooltipProvider>
+  );
+}
+
+export const AutoGenerateTaskNamesRow: React.FC = () => {
+  const taskSettings = useTaskSettings();
+
+  return (
+    <SettingRow
+      title="Auto-generate task names"
+      description="Automatically suggests a task name when creating a new task."
+      control={
+        <>
+          <ResetToDefaultButton
+            visible={taskSettings.isFieldOverridden('autoGenerateName')}
+            defaultLabel="on"
+            onReset={taskSettings.resetAutoGenerateName}
+            disabled={taskSettings.loading || taskSettings.saving}
+          />
+          <Switch
+            checked={taskSettings.autoGenerateName}
+            disabled={taskSettings.loading || taskSettings.saving}
+            onCheckedChange={taskSettings.updateAutoGenerateName}
+          />
+        </>
+      }
+    />
+  );
+};
+
+export const AutoTrustWorktreesRow: React.FC = () => {
+  const taskSettings = useTaskSettings();
+
+  return (
+    <SettingRow
+      title={
+        <div className="flex items-center gap-1.5">
+          Auto-trust worktree directories
+          <InfoTooltip
+            label="More info about auto-trust worktrees"
+            content="Only applies to Claude Code. Writes trust entries to ~/.claude.json before launching."
+          />
+        </div>
+      }
+      description="Skip the folder trust prompt in Claude Code for new tasks."
+      control={
+        <>
+          <ResetToDefaultButton
+            visible={taskSettings.isFieldOverridden('autoTrustWorktrees')}
+            defaultLabel="on"
+            onReset={taskSettings.resetAutoTrustWorktrees}
+            disabled={taskSettings.loading || taskSettings.saving}
+          />
+          <Switch
+            checked={taskSettings.autoTrustWorktrees}
+            disabled={taskSettings.loading || taskSettings.saving}
+            onCheckedChange={taskSettings.updateAutoTrustWorktrees}
+          />
+        </>
+      }
+    />
+  );
+};
diff --git a/src/renderer/features/settings/components/TelemetryCard.tsx b/src/renderer/features/settings/components/TelemetryCard.tsx
new file mode 100644
index 0000000000..59af8f9a3b
--- /dev/null
+++ b/src/renderer/features/settings/components/TelemetryCard.tsx
@@ -0,0 +1,63 @@
+import React from 'react';
+import { PRODUCT_NAME } from '@shared/app-identity';
+import { useTelemetryConsent } from '@renderer/lib/hooks/useTelemetryConsent';
+import { rpc } from '@renderer/lib/ipc';
+import { Button } from '@renderer/lib/ui/button';
+import { Switch } from '@renderer/lib/ui/switch';
+import { SettingRow } from './SettingRow';
+
+const TelemetryCard: React.FC = () => {
+  const { prefEnabled, envDisabled, hasKeyAndHost, loading, setTelemetryEnabled } =
+    useTelemetryConsent();
+
+  return (
+    <SettingRow
+      title="Privacy & Telemetry"
+      description={
+        <div>
+          <p>Help improve {PRODUCT_NAME} by sending anonymous usage data.</p>
+          <p>
+            <span>See </span>
+            <Button
+              type="button"
+              variant="link"
+              size="sm"
+              className="group inline-flex h-auto items-center gap-1 px-0 text-sm font-normal text-muted-foreground hover:text-foreground hover:no-underline focus-visible:outline-none focus-visible:ring-0"
+              onClick={() => rpc.app.openExternal('https://docs.emdash.sh/telemetry')}
+            >
+              <span className="transition-colors group-hover:text-foreground">
+                Telemetry information
+              </span>
+              <span className="text-sm text-muted-foreground transition-colors group-hover:text-foreground">
+                ↗
+              </span>
+            </Button>
+            <span> for details.</span>
+          </p>
+        </div>
+      }
+      control={
+        <div className="flex flex-col items-end gap-1">
+          <Switch
+            checked={prefEnabled}
+            onCheckedChange={async (checked) => {
+              void import('../../../utils/telemetryClient').then(({ captureTelemetry }) => {
+                captureTelemetry('setting_changed', { setting: 'telemetry' });
+              });
+              void setTelemetryEnabled(checked);
+            }}
+            disabled={loading || envDisabled}
+            aria-label="Enable anonymous telemetry"
+          />
+          {!hasKeyAndHost && (
+            <span className="text-[10px] text-muted-foreground">
+              Inactive in this build (no PostHog keys)
+            </span>
+          )}
+        </div>
+      }
+    />
+  );
+};
+
+export default TelemetryCard;
diff --git a/src/renderer/features/settings/components/TerminalSettingsCard.tsx b/src/renderer/features/settings/components/TerminalSettingsCard.tsx
new file mode 100644
index 0000000000..1bafd28319
--- /dev/null
+++ b/src/renderer/features/settings/components/TerminalSettingsCard.tsx
@@ -0,0 +1,283 @@
+import { Check, ChevronDown } from 'lucide-react';
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import { useAppSettingsKey } from '@renderer/features/settings/use-app-settings-key';
+import { rpc } from '@renderer/lib/ipc';
+import { Button } from '@renderer/lib/ui/button';
+import { Input } from '@renderer/lib/ui/input';
+import { Popover, PopoverContent, PopoverTrigger } from '@renderer/lib/ui/popover';
+import { Switch } from '@renderer/lib/ui/switch';
+import { SettingRow } from './SettingRow';
+
+type FontOption = {
+  id: string;
+  label: string;
+  fontValue: string;
+};
+
+const POPULAR_FONTS = [
+  'Menlo',
+  'SF Mono',
+  'JetBrains Mono',
+  'Fira Code',
+  'Cascadia Code',
+  'Iosevka',
+  'Source Code Pro',
+  'MesloLGS NF',
+];
+
+const toOptionId = (font: string) =>
+  `font-${font
+    .toLowerCase()
+    .replace(/[^a-z0-9]+/g, '-')
+    .replace(/(^-|-$)/g, '')}`;
+
+const dedupeAndSort = (fonts: string[]) =>
+  Array.from(new Set(fonts.map((font) => font.trim()).filter(Boolean))).sort((a, b) =>
+    a.localeCompare(b)
+  );
+
+const TerminalSettingsCard: React.FC = () => {
+  const {
+    value: terminal,
+    update,
+    isLoading: loading,
+    isSaving: saving,
+  } = useAppSettingsKey('terminal');
+  const [pickerOpen, setPickerOpen] = useState<boolean>(false);
+  const [search, setSearch] = useState<string>('');
+  const [installedFonts, setInstalledFonts] = useState<string[] | null>(null);
+  const [loadingFonts, setLoadingFonts] = useState<boolean>(false);
+
+  const fontFamily = terminal?.fontFamily ?? '';
+  const autoCopyOnSelection = terminal?.autoCopyOnSelection ?? false;
+
+  const popularOptions = useMemo<FontOption[]>(() => {
+    return [
+      { id: 'popular-default', label: 'Default (Menlo)', fontValue: '' },
+      ...POPULAR_FONTS.map((font) => ({
+        id: `popular-${toOptionId(font)}`,
+        label: font,
+        fontValue: font,
+      })),
+    ];
+  }, []);
+
+  const installedOptions = useMemo<FontOption[]>(() => {
+    const sourceFonts = dedupeAndSort(installedFonts ?? []);
+    return sourceFonts
+      .filter(
+        (font) =>
+          !POPULAR_FONTS.some((popular) => popular.toLowerCase() === font.toLowerCase()) &&
+          font.toLowerCase() !== 'menlo'
+      )
+      .map((font) => ({
+        id: `installed-${toOptionId(font)}`,
+        label: font,
+        fontValue: font,
+      }));
+  }, [installedFonts]);
+
+  const allOptions = useMemo<FontOption[]>(() => {
+    const byValue = new Map<string, FontOption>();
+    for (const option of [...popularOptions, ...installedOptions]) {
+      byValue.set(option.fontValue.toLowerCase(), option);
+    }
+    return Array.from(byValue.values());
+  }, [installedOptions, popularOptions]);
+
+  const findPreset = useCallback(
+    (font: string) => {
+      const normalized = font.trim().toLowerCase();
+      return allOptions.find((option) => option.fontValue.toLowerCase() === normalized) ?? null;
+    },
+    [allOptions]
+  );
+
+  const loadInstalledFonts = useCallback(async () => {
+    if (loadingFonts || installedFonts !== null) return;
+    setLoadingFonts(true);
+    try {
+      const result = await rpc.app.listInstalledFonts();
+      if (result?.success && Array.isArray(result.fonts) && result.fonts.length) {
+        setInstalledFonts(dedupeAndSort(result.fonts));
+      } else {
+        setInstalledFonts([]);
+      }
+    } catch {
+      setInstalledFonts([]);
+    } finally {
+      setLoadingFonts(false);
+    }
+  }, [installedFonts, loadingFonts]);
+
+  useEffect(() => {
+    if (pickerOpen) {
+      void loadInstalledFonts();
+    }
+  }, [loadInstalledFonts, pickerOpen]);
+
+  const applyFont = useCallback(
+    (next: string) => {
+      const normalized = next.trim();
+      update({ fontFamily: normalized });
+      window.dispatchEvent(
+        new CustomEvent('terminal-font-changed', { detail: { fontFamily: normalized } })
+      );
+    },
+    [update]
+  );
+
+  const toggleAutoCopy = useCallback(
+    (next: boolean) => {
+      update({ autoCopyOnSelection: next });
+      window.dispatchEvent(
+        new CustomEvent('terminal-auto-copy-changed', { detail: { autoCopyOnSelection: next } })
+      );
+    },
+    [update]
+  );
+
+  const selectedPreset = findPreset(fontFamily);
+  const pickerLabel = fontFamily.trim()
+    ? (selectedPreset?.label ?? `Custom: ${fontFamily.trim()}`)
+    : 'Default (Menlo)';
+
+  const filteredPopularOptions = useMemo(() => {
+    const query = search.trim().toLowerCase();
+    if (!query) return popularOptions;
+    return popularOptions.filter((option) => option.label.toLowerCase().includes(query));
+  }, [popularOptions, search]);
+
+  const filteredInstalledOptions = useMemo(() => {
+    const query = search.trim().toLowerCase();
+    if (!query) return installedOptions;
+    return installedOptions.filter((option) => option.label.toLowerCase().includes(query));
+  }, [installedOptions, search]);
+
+  const hasAnyResults = filteredPopularOptions.length > 0 || filteredInstalledOptions.length > 0;
+
+  return (
+    <div className="flex flex-col gap-4">
+      <SettingRow
+        title="Terminal font"
+        description="Choose the font family for the terminal."
+        control={
+          <div className="w-[183px] flex-shrink-0">
+            <Popover open={pickerOpen} onOpenChange={setPickerOpen}>
+              <PopoverTrigger>
+                <Button
+                  type="button"
+                  variant="outline"
+                  className="h-9 w-full justify-between text-sm font-normal"
+                  disabled={loading || saving}
+                >
+                  <span className="truncate text-left">{pickerLabel}</span>
+                  <ChevronDown className="ml-2 h-4 w-4 shrink-0 opacity-70" />
+                </Button>
+              </PopoverTrigger>
+              <PopoverContent align="start" className="w-[var(--anchor-width)] p-2">
+                <div className="grid gap-2">
+                  <Input
+                    value={search}
+                    onChange={(e) => setSearch(e.target.value)}
+                    onKeyDown={(e) => {
+                      if (e.key !== 'Enter') return;
+                      const typed = search.trim();
+                      if (!typed) return;
+                      setSearch('');
+                      setPickerOpen(false);
+                      applyFont(typed);
+                    }}
+                    placeholder="Search or type custom font"
+                    aria-label="Search font options"
+                    className="h-8"
+                  />
+                  <div className="max-h-56 overflow-auto">
+                    {filteredPopularOptions.length > 0 ? (
+                      <>
+                        <div className="px-2 py-1 text-[11px] font-medium uppercase tracking-wide text-muted-foreground">
+                          Popular
+                        </div>
+                        {filteredPopularOptions.map((option) => {
+                          const selected =
+                            selectedPreset?.fontValue.toLowerCase() ===
+                            option.fontValue.toLowerCase();
+                          return (
+                            <button
+                              key={option.id}
+                              type="button"
+                              className="flex w-full items-center justify-between rounded-md px-2 py-1.5 text-left text-sm hover:bg-accent"
+                              onClick={() => {
+                                setSearch('');
+                                setPickerOpen(false);
+                                applyFont(option.fontValue);
+                              }}
+                            >
+                              <span>{option.label}</span>
+                              {selected ? <Check className="h-4 w-4 opacity-80" /> : null}
+                            </button>
+                          );
+                        })}
+                      </>
+                    ) : null}
+
+                    {filteredInstalledOptions.length > 0 || loadingFonts ? (
+                      <div className="px-2 pb-1 pt-2 text-[11px] font-medium uppercase tracking-wide text-muted-foreground">
+                        Installed Fonts
+                      </div>
+                    ) : null}
+
+                    {loadingFonts ? (
+                      <div className="px-2 py-1.5 text-sm text-muted-foreground">
+                        Loading installed fonts...
+                      </div>
+                    ) : null}
+
+                    {filteredInstalledOptions.map((option) => {
+                      const selected =
+                        selectedPreset?.fontValue.toLowerCase() === option.fontValue.toLowerCase();
+                      return (
+                        <button
+                          key={option.id}
+                          type="button"
+                          className="flex w-full items-center justify-between rounded-md px-2 py-1.5 text-left text-sm hover:bg-accent"
+                          onClick={() => {
+                            setSearch('');
+                            setPickerOpen(false);
+                            applyFont(option.fontValue);
+                          }}
+                        >
+                          <span>{option.label}</span>
+                          {selected ? <Check className="h-4 w-4 opacity-80" /> : null}
+                        </button>
+                      );
+                    })}
+
+                    {!loadingFonts && !hasAnyResults ? (
+                      <div className="px-2 py-1.5 text-sm text-muted-foreground">
+                        No fonts found.
+                      </div>
+                    ) : null}
+                  </div>
+                </div>
+              </PopoverContent>
+            </Popover>
+          </div>
+        }
+      />
+      <SettingRow
+        title="Auto-copy selected text"
+        description="Automatically copy text to clipboard when you select it in the terminal."
+        control={
+          <Switch
+            checked={autoCopyOnSelection}
+            disabled={loading || saving}
+            onCheckedChange={toggleAutoCopy}
+          />
+        }
+      />
+    </div>
+  );
+};
+
+export default TerminalSettingsCard;
diff --git a/src/renderer/features/settings/components/ThemeCard.tsx b/src/renderer/features/settings/components/ThemeCard.tsx
new file mode 100644
index 0000000000..b971c3faa1
--- /dev/null
+++ b/src/renderer/features/settings/components/ThemeCard.tsx
@@ -0,0 +1,65 @@
+import { Monitor, Moon, Sun } from 'lucide-react';
+import React from 'react';
+import type { Theme } from '@shared/app-settings';
+import { useTheme } from '@renderer/lib/hooks/useTheme';
+import { captureTelemetry } from '@renderer/utils/telemetryClient';
+
+const ThemeCard: React.FC = () => {
+  const { theme, setTheme } = useTheme();
+
+  const handleSetTheme = (next: Theme) => {
+    if (theme !== next) {
+      captureTelemetry('setting_changed', { setting: 'theme' });
+    }
+    setTheme(next);
+  };
+
+  const buttonBase =
+    'flex min-h-24 flex-col items-center justify-center gap-2 rounded-lg border px-2 py-2.5 text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 focus-visible:ring-offset-background sm:px-3';
+  const activeClass = 'bg-background-2';
+  const inactiveClass =
+    'border-border/60 bg-background text-foreground-muted hover:bg-background-1';
+
+  return (
+    <div className="grid gap-3 text-sm">
+      <div>
+        <div className="font-medium text-foreground">Color mode</div>
+        <div className="text-foreground-muted">Choose how Emdash looks.</div>
+      </div>
+      <div className="grid grid-cols-[repeat(auto-fit,minmax(6.5rem,1fr))] gap-2">
+        <button
+          type="button"
+          onClick={() => handleSetTheme(null)}
+          className={`${buttonBase} ${theme === null ? activeClass : inactiveClass}`}
+          aria-pressed={theme === null}
+          aria-label="Set theme to system preference"
+        >
+          <Monitor className="h-4 w-4 shrink-0" aria-hidden="true" />
+          <span className="text-centert">System</span>
+        </button>
+        <button
+          type="button"
+          onClick={() => handleSetTheme('emlight')}
+          className={`${buttonBase} ${theme === 'emlight' ? activeClass : inactiveClass}`}
+          aria-pressed={theme === 'emlight'}
+          aria-label="Set theme to Emdash Light"
+        >
+          <Sun className="h-4 w-4 shrink-0" aria-hidden="true" />
+          <span className="text-center">Emdash Light</span>
+        </button>
+        <button
+          type="button"
+          onClick={() => handleSetTheme('emdark')}
+          className={`${buttonBase} ${theme === 'emdark' ? activeClass : inactiveClass}`}
+          aria-pressed={theme === 'emdark'}
+          aria-label="Set theme to Emdash Dark"
+        >
+          <Moon className="h-4 w-4 shrink-0" aria-hidden="true" />
+          <span className="text-center">Emdash Dark</span>
+        </button>
+      </div>
+    </div>
+  );
+};
+
+export default ThemeCard;
diff --git a/src/renderer/features/settings/components/UpdateCard.tsx b/src/renderer/features/settings/components/UpdateCard.tsx
new file mode 100644
index 0000000000..e2b683dbac
--- /dev/null
+++ b/src/renderer/features/settings/components/UpdateCard.tsx
@@ -0,0 +1,189 @@
+import { AlertCircle, CheckCircle2, Download, Loader2, RefreshCw } from 'lucide-react';
+import { observer } from 'mobx-react-lite';
+import React from 'react';
+import { PRODUCT_NAME } from '@shared/app-identity';
+import { appState } from '@renderer/lib/stores/app-state';
+import { Badge } from '@renderer/lib/ui/badge';
+import { Button } from '@renderer/lib/ui/button';
+import { formatBytes } from '@renderer/utils/formatBytes';
+import { SettingRow } from './SettingRow';
+
+export const UpdateCard = observer(function UpdateCard(): React.JSX.Element {
+  const update = appState.update;
+  const downloadProgress =
+    update.state.status === 'downloading' ? update.state.progress : undefined;
+  const hasByteProgress =
+    downloadProgress !== undefined &&
+    ((downloadProgress.total ?? 0) > 0 || (downloadProgress.transferred ?? 0) > 0);
+
+  const versionTitle = (
+    <div className="flex items-center gap-2">
+      Version
+      {update.currentVersion && (
+        <Badge variant="outline" className="h-5 px-2 font-mono text-xs">
+          v{update.currentVersion}
+        </Badge>
+      )}
+    </div>
+  );
+
+  return (
+    <div className="grid gap-3">
+      <SettingRow
+        title={versionTitle}
+        description={renderStatusMessage()}
+        control={
+          <div className="flex items-center gap-2">
+            {update.state.status !== 'downloaded' && update.state.status !== 'installing' && (
+              <Button
+                type="button"
+                variant="outline"
+                size="icon"
+                className="h-8 w-8"
+                onClick={() => update.check()}
+                disabled={update.state.status === 'checking'}
+                aria-label="Check for updates"
+              >
+                <RefreshCw
+                  className={`h-3 w-3 ${update.state.status === 'checking' ? 'animate-spin' : ''}`}
+                />
+              </Button>
+            )}
+            {renderAction()}
+          </div>
+        }
+      />
+
+      {update.state.status === 'downloading' && downloadProgress && (
+        <div className="space-y-2">
+          <div className="h-1.5 w-full overflow-hidden rounded-full bg-muted">
+            <div
+              className="h-full bg-primary transition-all duration-300 ease-out"
+              style={{ width: `${downloadProgress.percent || 0}%` }}
+            />
+          </div>
+          {hasByteProgress && (
+            <p className="text-xs text-muted-foreground">
+              {formatBytes(downloadProgress.transferred || 0)} /{' '}
+              {formatBytes(downloadProgress.total || 0)}
+            </p>
+          )}
+        </div>
+      )}
+    </div>
+  );
+
+  function renderStatusMessage() {
+    switch (update.state.status) {
+      case 'checking':
+        return (
+          <p className="flex items-center gap-1 text-sm text-muted-foreground">
+            <Loader2 className="h-3 w-3 animate-spin" />
+            Checking for updates...
+          </p>
+        );
+
+      case 'available':
+        if (update.state.info?.version) {
+          return (
+            <p className="text-sm text-muted-foreground">
+              Version {update.state.info.version} is available
+            </p>
+          );
+        }
+        return <p className="text-sm text-muted-foreground">An update is available</p>;
+
+      case 'downloading':
+        return (
+          <p className="text-sm text-muted-foreground">
+            Downloading update{update.progressLabel ? ` (${update.progressLabel})` : '...'}
+          </p>
+        );
+
+      case 'downloaded':
+        return (
+          <p className="flex items-center gap-1 text-sm text-green-600 dark:text-green-500">
+            <CheckCircle2 className="h-3 w-3" />
+            Update ready. Restart {PRODUCT_NAME} to use the new version.
+          </p>
+        );
+
+      case 'installing':
+        return (
+          <p className="flex items-center gap-1 text-sm text-muted-foreground">
+            <Loader2 className="h-3 w-3 animate-spin" />
+            Installing update. {PRODUCT_NAME} will close and restart automatically — this may take a
+            few seconds.
+          </p>
+        );
+
+      case 'error':
+        return (
+          <Badge
+            variant="outline"
+            className="border-amber-200 bg-amber-50 text-amber-700 dark:border-amber-800 dark:bg-amber-950/40 dark:text-amber-400"
+          >
+            <AlertCircle className="h-3 w-3" />
+            Update temporarily unavailable — please try again later
+          </Badge>
+        );
+
+      default:
+        return (
+          <p className="flex items-center gap-1 text-sm text-muted-foreground">
+            <CheckCircle2 className="h-3 w-3 text-green-600 dark:text-green-500" />
+            You're up to date.{' '}
+          </p>
+        );
+    }
+  }
+
+  function renderAction() {
+    switch (update.state.status) {
+      case 'available':
+        return (
+          <Button
+            size="sm"
+            variant="default"
+            onClick={() => update.download()}
+            className="h-7 text-xs"
+          >
+            <Download className="mr-1.5 h-3 w-3" />
+            Download
+          </Button>
+        );
+
+      case 'downloading':
+        return (
+          <Button size="sm" variant="outline" disabled className="h-7 text-xs">
+            <Loader2 className="mr-1.5 h-3 w-3 animate-spin" />
+            Downloading
+          </Button>
+        );
+
+      case 'downloaded':
+        return (
+          <Button
+            size="sm"
+            variant="default"
+            onClick={() => update.install()}
+            className="h-7 text-xs"
+          >
+            <RefreshCw className="mr-1.5 h-3 w-3" />
+            Restart
+          </Button>
+        );
+
+      case 'installing':
+        return (
+          <Button size="sm" variant="outline" disabled className="h-7 text-xs">
+            <Loader2 className="mr-1.5 h-3 w-3 animate-spin" />
+            Installing
+          </Button>
+        );
+
+      default:
+        return null;
+    }
+  }
+});
diff --git a/src/renderer/types/connections.ts b/src/renderer/features/settings/components/connections.ts
similarity index 100%
rename from src/renderer/types/connections.ts
rename to src/renderer/features/settings/components/connections.ts
diff --git a/src/renderer/features/settings/settings-view.tsx b/src/renderer/features/settings/settings-view.tsx
new file mode 100644
index 0000000000..2547114640
--- /dev/null
+++ b/src/renderer/features/settings/settings-view.tsx
@@ -0,0 +1,68 @@
+import { createContext, useCallback, useContext, type ReactNode } from 'react';
+import {
+  SettingsPage,
+  type SettingsPageTab,
+} from '@renderer/features/settings/components/SettingsPage';
+import { Titlebar } from '@renderer/lib/components/titlebar/Titlebar';
+import { useParams } from '@renderer/lib/layout/navigation-provider';
+
+const SettingsTabContext = createContext<{
+  tab: SettingsPageTab;
+  onTabChange: (tab: SettingsPageTab) => void;
+}>({ tab: 'general', onTabChange: () => {} });
+
+/** Minimal passthrough — exists so the registry can infer WrapParams<'settings'>. */
+export function SettingsViewWrapper({
+  children,
+  tab = 'general',
+}: {
+  children: ReactNode;
+  tab?: SettingsPageTab;
+}) {
+  const { setParams } = useParams('settings');
+  const handleTabChange = useCallback(
+    (tab: SettingsPageTab) => {
+      setParams({ tab });
+    },
+    [setParams]
+  );
+  return (
+    <SettingsTabContext.Provider value={{ tab, onTabChange: handleTabChange }}>
+      {children}
+    </SettingsTabContext.Provider>
+  );
+}
+
+export function useSettingsTab() {
+  if (!useContext(SettingsTabContext)) {
+    throw new Error('useSettingsTab must be used within a SettingsViewWrapper');
+  }
+  return useContext(SettingsTabContext);
+}
+
+export function SettingsTitlebar() {
+  return (
+    <Titlebar
+      leftSlot={
+        <div className="flex items-center px-2">
+          <span className="text-sm text-foreground-muted">Settings</span>
+        </div>
+      }
+    />
+  );
+}
+
+export function SettingsMainPanel() {
+  const { tab, onTabChange } = useSettingsTab();
+  return (
+    <div className="relative z-10 flex min-h-0 flex-1 overflow-hidden bg-background">
+      <SettingsPage tab={tab} onTabChange={onTabChange} />
+    </div>
+  );
+}
+
+export const settingsView = {
+  WrapView: SettingsViewWrapper,
+  TitlebarSlot: SettingsTitlebar,
+  MainPanel: SettingsMainPanel,
+};
diff --git a/src/renderer/features/settings/use-app-settings-key.tsx b/src/renderer/features/settings/use-app-settings-key.tsx
new file mode 100644
index 0000000000..b3baae4598
--- /dev/null
+++ b/src/renderer/features/settings/use-app-settings-key.tsx
@@ -0,0 +1,99 @@
+import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
+import type { AppSettings, AppSettingsKey } from '@shared/app-settings';
+import { rpc } from '@renderer/lib/ipc';
+
+type SettingsMeta<K extends AppSettingsKey> = {
+  value: AppSettings[K];
+  defaults: AppSettings[K];
+  overrides: Partial<AppSettings[K]>;
+};
+
+function mergeValue<K extends AppSettingsKey>(
+  current: AppSettings[K] | undefined,
+  partial: Partial<AppSettings[K]>
+): AppSettings[K] {
+  if (
+    typeof partial === 'object' &&
+    partial !== null &&
+    typeof current === 'object' &&
+    current !== null
+  ) {
+    return { ...current, ...partial } as AppSettings[K];
+  }
+  return partial as AppSettings[K];
+}
+
+export function useAppSettingsKey<K extends AppSettingsKey>(key: K) {
+  const queryClient = useQueryClient();
+
+  const { data, isLoading } = useQuery<SettingsMeta<K>>({
+    queryKey: ['appSettings', key, 'meta'] as const,
+    queryFn: () => rpc.appSettings.getWithMeta(key) as Promise<SettingsMeta<K>>,
+    staleTime: 5 * 60_000,
+  });
+
+  const updateMutation = useMutation<
+    void,
+    Error,
+    Partial<AppSettings[K]>,
+    { prev: SettingsMeta<K> | undefined }
+  >({
+    mutationFn: (partial) => {
+      const current = queryClient.getQueryData<SettingsMeta<K>>(['appSettings', key, 'meta']);
+      const merged = mergeValue(current?.value, partial);
+      return rpc.appSettings.update(key, merged) as Promise<void>;
+    },
+    onMutate: async (partial) => {
+      await queryClient.cancelQueries({ queryKey: ['appSettings', key, 'meta'] });
+      const prev = queryClient.getQueryData<SettingsMeta<K>>(['appSettings', key, 'meta']);
+      queryClient.setQueryData(['appSettings', key, 'meta'], (old: SettingsMeta<K> | undefined) =>
+        old ? { ...old, value: mergeValue(old.value, partial) } : old
+      );
+      queryClient.setQueryData(['appSettings', 'all'], (all: AppSettings | undefined) =>
+        all && prev ? ({ ...all, [key]: mergeValue(prev.value, partial) } as AppSettings) : all
+      );
+      return { prev };
+    },
+    onError: (_err, _partial, ctx) => {
+      if (ctx?.prev !== undefined) {
+        queryClient.setQueryData(['appSettings', key, 'meta'], ctx.prev);
+      }
+      queryClient.invalidateQueries({ queryKey: ['appSettings', key, 'meta'] });
+      queryClient.invalidateQueries({ queryKey: ['appSettings', 'all'] });
+    },
+    onSettled: () => {
+      queryClient.invalidateQueries({ queryKey: ['appSettings', key, 'meta'] });
+      queryClient.invalidateQueries({ queryKey: ['appSettings', 'all'] });
+    },
+  });
+
+  const resetMutation = useMutation<void, Error, void>({
+    mutationFn: () => rpc.appSettings.reset(key) as Promise<void>,
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ['appSettings', key, 'meta'] });
+      queryClient.invalidateQueries({ queryKey: ['appSettings', 'all'] });
+    },
+  });
+
+  const resetFieldMutation = useMutation<void, Error, keyof AppSettings[K]>({
+    mutationFn: (field) => rpc.appSettings.resetField(key, field as string) as Promise<void>,
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ['appSettings', key, 'meta'] });
+      queryClient.invalidateQueries({ queryKey: ['appSettings', 'all'] });
+    },
+  });
+
+  return {
+    value: data?.value,
+    defaults: data?.defaults,
+    overrides: data?.overrides,
+    isLoading,
+    isSaving: updateMutation.isPending,
+    isOverridden: !!(data?.overrides && Object.keys(data.overrides).length > 0),
+    isFieldOverridden: (field: keyof AppSettings[K]) =>
+      !!(data?.overrides && field in data.overrides),
+    update: updateMutation.mutate,
+    reset: resetMutation.mutate,
+    resetField: (field: keyof AppSettings[K]) => resetFieldMutation.mutate(field),
+  };
+}
diff --git a/src/renderer/features/settings/use-provider-settings.ts b/src/renderer/features/settings/use-provider-settings.ts
new file mode 100644
index 0000000000..eaf6e29962
--- /dev/null
+++ b/src/renderer/features/settings/use-provider-settings.ts
@@ -0,0 +1,49 @@
+import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
+import type { ProviderCustomConfig } from '@shared/app-settings';
+import { rpc } from '@renderer/lib/ipc';
+
+type ProviderSettingsMeta = {
+  value: ProviderCustomConfig;
+  defaults: ProviderCustomConfig;
+  overrides: Partial<ProviderCustomConfig>;
+} | null;
+
+export function useProviderSettings(providerId: string) {
+  const queryClient = useQueryClient();
+
+  const { data, isLoading } = useQuery<ProviderSettingsMeta>({
+    queryKey: ['providerSettings', providerId, 'meta'] as const,
+    queryFn: () =>
+      rpc.providerSettings.getItemWithMeta(providerId) as Promise<ProviderSettingsMeta>,
+    staleTime: 60_000,
+  });
+
+  const updateMutation = useMutation<void, Error, Partial<ProviderCustomConfig>>({
+    mutationFn: (config) => rpc.providerSettings.updateItem(providerId, config) as Promise<void>,
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ['providerSettings', providerId, 'meta'] });
+      queryClient.invalidateQueries({ queryKey: ['providerSettings', 'all'] });
+    },
+  });
+
+  const resetMutation = useMutation<void, Error, void>({
+    mutationFn: () => rpc.providerSettings.resetItem(providerId) as Promise<void>,
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ['providerSettings', providerId, 'meta'] });
+      queryClient.invalidateQueries({ queryKey: ['providerSettings', 'all'] });
+    },
+  });
+
+  return {
+    value: data?.value,
+    defaults: data?.defaults,
+    overrides: data?.overrides,
+    isLoading,
+    isSaving: updateMutation.isPending || resetMutation.isPending,
+    isOverridden: !!(data?.overrides && Object.keys(data.overrides).length > 0),
+    isFieldOverridden: (field: keyof ProviderCustomConfig) =>
+      !!(data?.overrides && field in data.overrides),
+    update: updateMutation.mutate,
+    reset: resetMutation.mutate,
+  };
+}
diff --git a/src/renderer/features/sidebar/left-sidebar.tsx b/src/renderer/features/sidebar/left-sidebar.tsx
new file mode 100644
index 0000000000..75cee08b4c
--- /dev/null
+++ b/src/renderer/features/sidebar/left-sidebar.tsx
@@ -0,0 +1,108 @@
+import { FolderPlus, MessageSquareShare, Plug, Puzzle, Settings } from 'lucide-react';
+import { observer } from 'mobx-react-lite';
+import React from 'react';
+import {
+  isCurrentView,
+  useNavigate,
+  useWorkspaceSlots,
+} from '@renderer/lib/layout/navigation-provider';
+import { useShowModal } from '@renderer/lib/modal/modal-provider';
+import { ShortcutHint } from '@renderer/lib/ui/shortcut-hint';
+import { SidebarPinnedTaskList } from './pinned-task-list';
+import { ProjectsGroupLabel } from './projects-group-label';
+import {
+  SidebarContainer,
+  SidebarContent,
+  SidebarFooter,
+  SidebarGroup,
+  SidebarGroupContent,
+  SidebarMenu,
+  SidebarMenuButton,
+} from './sidebar-primitives';
+import { SidebarSpace } from './sidebar-space';
+import { SidebarVirtualList } from './sidebar-virtual-list';
+import { UpdateSection } from './update-section';
+
+export const LeftSidebar: React.FC = observer(function LeftSidebar() {
+  const { navigate } = useNavigate();
+  const { currentView } = useWorkspaceSlots();
+
+  const showAddProjectModal = useShowModal('addProjectModal');
+  const showFeedbackModal = useShowModal('feedbackModal');
+
+  return (
+    <div className="flex flex-col h-full bg-background-tertiary text-foreground-tertiary-muted">
+      <SidebarSpace />
+      <SidebarContainer className="w-full border-r-0 flex-1 min-h-0">
+        <SidebarContent className="flex flex-col">
+          <SidebarPinnedTaskList />
+          <SidebarGroup className="mb-0 min-h-0 flex-1 flex flex-col">
+            <ProjectsGroupLabel />
+            <SidebarGroupContent className="min-h-0 flex-1 flex flex-col">
+              <SidebarMenu className="flex-1 min-h-0 flex flex-col">
+                <SidebarVirtualList />
+              </SidebarMenu>
+            </SidebarGroupContent>
+          </SidebarGroup>
+        </SidebarContent>
+        <SidebarFooter>
+          <SidebarMenu>
+            <SidebarMenuButton
+              isActive={false}
+              onClick={() => showAddProjectModal({})}
+              aria-label="Add Project"
+              className="w-full justify-between"
+            >
+              <span className="flex items-center gap-2 min-w-0 w-full">
+                <FolderPlus className="h-5 w-5 sm:h-4 sm:w-4 shrink-0" />
+                <span className="truncate min-w-0">Add Project</span>
+              </span>
+              <ShortcutHint settingsKey="newProject" />
+            </SidebarMenuButton>
+            <SidebarMenuButton
+              isActive={isCurrentView(currentView, 'skills')}
+              onClick={() => navigate('skills')}
+              aria-label="Skills"
+              className="w-full justify-start"
+            >
+              <Puzzle className="h-5 w-5 sm:h-4 sm:w-4" />
+              Skills
+            </SidebarMenuButton>
+            <SidebarMenuButton
+              isActive={isCurrentView(currentView, 'mcp')}
+              onClick={() => navigate('mcp')}
+              aria-label="MCP"
+              className="w-full justify-start"
+            >
+              <Plug className="h-5 w-5 sm:h-4 sm:w-4" />
+              MCP
+            </SidebarMenuButton>
+            <SidebarMenuButton
+              isActive={isCurrentView(currentView, 'settings')}
+              onClick={() => navigate('settings')}
+              aria-label="Settings"
+              className="w-full justify-between"
+            >
+              <span className="flex items-center gap-2">
+                <Settings className="h-5 w-5 sm:h-4 sm:w-4" />
+                Settings
+              </span>
+              <ShortcutHint settingsKey="settings" />
+            </SidebarMenuButton>
+          </SidebarMenu>
+        </SidebarFooter>
+        <div className="flex items-center gap-2 justify-between px-3 py-2 border-t border-border">
+          <button
+            type="button"
+            className="flex h-6 items-center min-w-0 w-full cursor-pointer gap-2 rounded-lg px-3 text-sm text-foreground-muted focus:outline-none focus-visible:outline-none"
+            onClick={() => showFeedbackModal({})}
+          >
+            <MessageSquareShare className="size-4 shrink-0" />
+            <span className="truncate">Give feedback</span>
+          </button>
+          <UpdateSection />
+        </div>
+      </SidebarContainer>
+    </div>
+  );
+});
diff --git a/src/renderer/features/sidebar/pinned-task-list.tsx b/src/renderer/features/sidebar/pinned-task-list.tsx
new file mode 100644
index 0000000000..d44744d469
--- /dev/null
+++ b/src/renderer/features/sidebar/pinned-task-list.tsx
@@ -0,0 +1,28 @@
+import { observer } from 'mobx-react-lite';
+import { sidebarStore } from '@renderer/lib/stores/app-state';
+import { MicroLabel } from '@renderer/lib/ui/label';
+import { SidebarGroup, SidebarMenu } from './sidebar-primitives';
+import { SidebarTaskItem } from './task-item';
+
+export const SidebarPinnedTaskList = observer(function SidebarPinnedTaskList() {
+  const entries = sidebarStore.pinnedSidebarEntries;
+  if (entries.length === 0) return null;
+
+  return (
+    <SidebarGroup className="shrink-0 flex flex-col">
+      <div className="flex items-center justify-between pl-5 pr-2.5 h-[40px]">
+        <MicroLabel className="text-foreground-tertiary-passive">Pinned</MicroLabel>
+      </div>
+      <SidebarMenu className="px-3 pb-2">
+        {entries.map(({ projectId, taskId }) => (
+          <SidebarTaskItem
+            key={`${projectId}:${taskId}`}
+            projectId={projectId}
+            taskId={taskId}
+            rowVariant="pinned"
+          />
+        ))}
+      </SidebarMenu>
+    </SidebarGroup>
+  );
+});
diff --git a/src/renderer/features/sidebar/project-item.tsx b/src/renderer/features/sidebar/project-item.tsx
new file mode 100644
index 0000000000..e3b6259c01
--- /dev/null
+++ b/src/renderer/features/sidebar/project-item.tsx
@@ -0,0 +1,256 @@
+import {
+  CableIcon,
+  ChevronRight,
+  FolderClosed,
+  FolderInput,
+  Loader2,
+  Plus,
+  RotateCcw,
+  Trash2,
+  TriangleAlert,
+} from 'lucide-react';
+import { observer } from 'mobx-react-lite';
+import React, { useCallback, useEffect } from 'react';
+import {
+  isUnregisteredProject,
+  UnregisteredProject,
+} from '@renderer/features/projects/stores/project';
+import {
+  getProjectManagerStore,
+  getProjectStore,
+  getRepositoryStore,
+  projectViewKind,
+} from '@renderer/features/projects/stores/project-selectors';
+import {
+  useNavigate,
+  useParams,
+  useWorkspaceSlots,
+} from '@renderer/lib/layout/navigation-provider';
+import { useShowModal } from '@renderer/lib/modal/modal-provider';
+import { appState, sidebarStore } from '@renderer/lib/stores/app-state';
+import {
+  ContextMenu,
+  ContextMenuContent,
+  ContextMenuItem,
+  ContextMenuSeparator,
+  ContextMenuTrigger,
+} from '@renderer/lib/ui/context-menu';
+import { Tooltip, TooltipContent, TooltipTrigger } from '@renderer/lib/ui/tooltip';
+import { cn } from '@renderer/utils/utils';
+import { SidebarItemMiniButton, SidebarMenuButton, SidebarMenuRow } from './sidebar-primitives';
+
+const UNREGISTERED_PHASE_LABEL: Record<UnregisteredProject['phase'], string> = {
+  'creating-repo': 'Creating repository…',
+  cloning: 'Cloning…',
+  registering: 'Registering…',
+  error: 'Failed',
+};
+
+export const SidebarProjectItem = observer(function SidebarProjectItem({
+  projectId,
+}: {
+  projectId: string;
+}) {
+  const { navigate } = useNavigate();
+  const { currentView } = useWorkspaceSlots();
+  const { params: projectParams } = useParams('project');
+  const { params: taskParams } = useParams('task');
+  const showCreateTaskModal = useShowModal('taskModal');
+  const showConfirmDeleteProject = useShowModal('confirmActionModal');
+  const showChangeConnectionModal = useShowModal('changeProjectConnectionModal');
+
+  const project = getProjectStore(projectId);
+
+  const prefetchRepository = useCallback(() => {
+    const repo = getRepositoryStore(projectId);
+    void repo?.localData.load();
+    void repo?.remoteData.load();
+  }, [projectId]);
+
+  const currentProjectId =
+    currentView === 'task'
+      ? taskParams.projectId
+      : currentView === 'project'
+        ? projectParams.projectId
+        : null;
+  const currentTaskId = currentView === 'task' ? taskParams.taskId : null;
+
+  const isProjectActive = currentProjectId === projectId && !currentTaskId;
+
+  useEffect(() => {
+    if (isProjectActive) prefetchRepository();
+  }, [isProjectActive, prefetchRepository]);
+
+  const isExpanded = sidebarStore.expandedProjectIds.has(projectId);
+
+  if (!project) return null;
+
+  const sshConnectionId = project.data?.type === 'ssh' ? project.data.connectionId : null;
+  const isSshProject = sshConnectionId !== null;
+  const sshConnectionState = sshConnectionId
+    ? appState.sshConnections.stateFor(sshConnectionId)
+    : null;
+  const canReconnect = sshConnectionState !== 'connected';
+  const ProjectIcon = isSshProject ? FolderInput : FolderClosed;
+  const isReconnecting =
+    sshConnectionState === 'connecting' || sshConnectionState === 'reconnecting';
+  const sshStateDotClass =
+    sshConnectionState === 'connected'
+      ? 'bg-emerald-500'
+      : isReconnecting
+        ? 'bg-blue-500'
+        : 'bg-red-500';
+
+  const renderSpinnerWithTooltip = () => {
+    if (!isUnregisteredProject(project)) return null;
+    const label = UNREGISTERED_PHASE_LABEL[project.phase] ?? 'Loading…';
+    return (
+      <Tooltip>
+        <TooltipTrigger>
+          <SidebarItemMiniButton type="button" disabled aria-label="Loading">
+            <Loader2 className="h-4 w-4 animate-spin text-foreground/60" />
+          </SidebarItemMiniButton>
+        </TooltipTrigger>
+        <TooltipContent>{label}</TooltipContent>
+      </Tooltip>
+    );
+  };
+
+  return (
+    <ContextMenu>
+      <ContextMenuTrigger>
+        <SidebarMenuRow
+          className={cn('group/row h-8 justify-between flex px-1')}
+          data-active={isProjectActive || undefined}
+          isActive={isProjectActive}
+          onMouseDown={(e) => e.preventDefault()}
+          onClick={() => navigate('project', { projectId })}
+        >
+          <div className="flex items-center gap-1 flex-1 min-w-0">
+            {project.state === 'unregistered' ? (
+              renderSpinnerWithTooltip()
+            ) : (
+              <SidebarItemMiniButton
+                type="button"
+                className="relative"
+                onClick={(e) => {
+                  e.stopPropagation();
+                  sidebarStore.toggleProjectExpanded(projectId);
+                }}
+              >
+                <ProjectIcon className="absolute h-4 w-4 transition-opacity duration-150 opacity-100 group-hover/row:opacity-0" />
+                <ChevronRight
+                  className={cn(
+                    'absolute h-4 w-4 transition-all duration-150 opacity-0 group-hover/row:opacity-100',
+                    isExpanded && 'rotate-90'
+                  )}
+                />
+              </SidebarItemMiniButton>
+            )}
+            <span
+              className={cn(
+                'flex-1 min-w-0 self-stretch flex items-center truncate text-left transition-colors select-none',
+                projectViewKind(getProjectStore(projectId)) === 'bootstrapping' &&
+                  'text-foreground-tertiary-passive'
+              )}
+            >
+              {isSshProject ? (
+                <span className="min-w-0 flex items-center gap-2">
+                  <span className="truncate">{project.name}</span>
+                  <span
+                    className={cn('h-1.5 w-1.5 shrink-0 rounded-full', sshStateDotClass)}
+                    aria-label={`SSH connection ${sshConnectionState ?? 'disconnected'}`}
+                    title={`SSH connection ${sshConnectionState ?? 'disconnected'}`}
+                  />
+                </span>
+              ) : (
+                <span className="min-w-0 flex items-center gap-1.5">
+                  <span className="truncate">{project.name}</span>
+                  {projectViewKind(project) === 'path_not_found' && (
+                    <Tooltip>
+                      <TooltipTrigger>
+                        <TriangleAlert className="h-3.5 w-3.5 shrink-0 text-foreground-destructive" />
+                      </TooltipTrigger>
+                      <TooltipContent>Project not found at path</TooltipContent>
+                    </Tooltip>
+                  )}
+                </span>
+              )}
+            </span>
+          </div>
+          <SidebarItemMiniButton
+            type="button"
+            className={'opacity-0 group-hover/row:opacity-100 transition-opacity duration-150'}
+            onPointerEnter={() => prefetchRepository()}
+            onClick={(e) => {
+              e.stopPropagation();
+              showCreateTaskModal({ projectId });
+            }}
+            disabled={project.state === 'unregistered'}
+          >
+            <Plus className="h-4 w-4" />
+          </SidebarItemMiniButton>
+        </SidebarMenuRow>
+      </ContextMenuTrigger>
+      <ContextMenuContent>
+        {sshConnectionId && (
+          <>
+            <ContextMenuItem
+              disabled={!canReconnect}
+              onClick={() => {
+                void appState.sshConnections.connect(sshConnectionId).catch(() => {});
+              }}
+            >
+              <RotateCcw className="size-4" />
+              Reconnect
+            </ContextMenuItem>
+            <ContextMenuItem
+              onClick={() => {
+                showChangeConnectionModal({
+                  projectId,
+                  currentConnectionId: sshConnectionId,
+                });
+              }}
+            >
+              <CableIcon className="size-4" />
+              Change SSH Connection
+            </ContextMenuItem>
+            <ContextMenuSeparator />
+          </>
+        )}
+        <ContextMenuItem
+          variant="destructive"
+          onClick={() => {
+            const projectLabel = project.name ?? 'this project';
+            showConfirmDeleteProject({
+              title: 'Delete project',
+              description: `"${projectLabel}" will be deleted. The project folder and worktrees will stay on the filesystem.`,
+              confirmLabel: 'Delete',
+              onSuccess: () => {
+                void getProjectManagerStore().deleteProject(projectId);
+                if (isProjectActive) navigate('home');
+              },
+            });
+          }}
+        >
+          <Trash2 className="size-4" />
+          Remove Project
+        </ContextMenuItem>
+      </ContextMenuContent>
+    </ContextMenu>
+  );
+});
+
+interface BaseProjectItemProps extends React.ButtonHTMLAttributes<HTMLButtonElement> {
+  isActive: boolean;
+}
+
+export function BaseProjectItem({ isActive, className, ...props }: BaseProjectItemProps) {
+  return (
+    <SidebarMenuButton
+      className={cn('justify-between flex item px-1 py-1', className)}
+      isActive={isActive}
+      {...props}
+    />
+  );
+}
diff --git a/src/renderer/features/sidebar/projects-group-label.tsx b/src/renderer/features/sidebar/projects-group-label.tsx
new file mode 100644
index 0000000000..39d538fe83
--- /dev/null
+++ b/src/renderer/features/sidebar/projects-group-label.tsx
@@ -0,0 +1,52 @@
+import { ListFilter } from 'lucide-react';
+import { observer } from 'mobx-react-lite';
+import { sidebarStore } from '@renderer/lib/stores/app-state';
+import { Button } from '@renderer/lib/ui/button';
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuGroup,
+  DropdownMenuLabel,
+  DropdownMenuRadioGroup,
+  DropdownMenuRadioItem,
+  DropdownMenuTrigger,
+} from '@renderer/lib/ui/dropdown-menu';
+import { MicroLabel } from '@renderer/lib/ui/label';
+
+export const ProjectsGroupLabel = observer(function ProjectsGroupLabel() {
+  return (
+    <div className="flex items-center justify-between pl-5 pr-2.5 h-[40px]">
+      <MicroLabel className="text-foreground-tertiary-passive">Projects</MicroLabel>
+      <DropdownMenu>
+        <DropdownMenuTrigger>
+          <Button
+            size="icon-xs"
+            variant="ghost"
+            className="hover:bg-transparent text-foreground-muted hover:text-foreground"
+          >
+            <ListFilter />
+          </Button>
+        </DropdownMenuTrigger>
+        <DropdownMenuContent className="min-w-48">
+          <DropdownMenuGroup>
+            <DropdownMenuLabel>Sort by</DropdownMenuLabel>
+            <DropdownMenuRadioGroup value={sidebarStore.taskSortBy}>
+              <DropdownMenuRadioItem
+                value="created-at"
+                onClick={() => sidebarStore.applySort('created-at')}
+              >
+                Created at
+              </DropdownMenuRadioItem>
+              <DropdownMenuRadioItem
+                value="updated-at"
+                onClick={() => sidebarStore.applySort('updated-at')}
+              >
+                Last used
+              </DropdownMenuRadioItem>
+            </DropdownMenuRadioGroup>
+          </DropdownMenuGroup>
+        </DropdownMenuContent>
+      </DropdownMenu>
+    </div>
+  );
+});
diff --git a/src/renderer/features/sidebar/sidebar-empty-state.tsx b/src/renderer/features/sidebar/sidebar-empty-state.tsx
new file mode 100644
index 0000000000..41cb9d4921
--- /dev/null
+++ b/src/renderer/features/sidebar/sidebar-empty-state.tsx
@@ -0,0 +1,64 @@
+import { FolderOpen } from 'lucide-react';
+import React from 'react';
+import { Button } from '@renderer/lib/ui/button';
+import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@renderer/lib/ui/card';
+
+type Props = {
+  title: string;
+  description?: string;
+  actionLabel?: string;
+  onAction?: () => void;
+  secondaryActionLabel?: string;
+  onSecondaryAction?: () => void;
+};
+
+const SidebarEmptyState: React.FC<Props> = ({
+  title,
+  description,
+  actionLabel,
+  onAction,
+  secondaryActionLabel,
+  onSecondaryAction,
+}) => {
+  return (
+    <div className="min-w-0 overflow-hidden">
+      <Card className="bg-muted/20">
+        <CardHeader className="p-4">
+          <CardTitle className="text-lg font-semibold leading-tight">{title}</CardTitle>
+          {description ? (
+            <CardDescription className="text-sm leading-relaxed">{description}</CardDescription>
+          ) : null}
+        </CardHeader>
+        {(actionLabel && onAction) || (secondaryActionLabel && onSecondaryAction) ? (
+          <CardContent className="space-y-2 p-4 pt-0">
+            {actionLabel && onAction && (
+              <Button
+                type="button"
+                variant="outline"
+                size="sm"
+                className="w-full justify-center"
+                onClick={onAction}
+              >
+                <FolderOpen className="mr-2 h-4 w-4" />
+                {actionLabel}
+              </Button>
+            )}
+            {secondaryActionLabel && onSecondaryAction && (
+              <Button
+                type="button"
+                variant="default"
+                size="sm"
+                className="w-full justify-center"
+                onClick={onSecondaryAction}
+              >
+                {secondaryActionLabel}
+              </Button>
+            )}
+          </CardContent>
+        ) : null}
+      </Card>
+    </div>
+  );
+};
+
+export default SidebarEmptyState;
diff --git a/src/renderer/features/sidebar/sidebar-primitives.tsx b/src/renderer/features/sidebar/sidebar-primitives.tsx
new file mode 100644
index 0000000000..7fae100b26
--- /dev/null
+++ b/src/renderer/features/sidebar/sidebar-primitives.tsx
@@ -0,0 +1,113 @@
+import * as React from 'react';
+import { cn } from '@renderer/utils/utils';
+
+export const SidebarContainer = React.forwardRef<
+  HTMLDivElement,
+  React.HTMLAttributes<HTMLDivElement>
+>(({ className, ...props }, ref) => (
+  <div
+    ref={ref}
+    className={cn('group/sidebar relative z-50 flex flex-col text-sm text-foreground', className)}
+    {...props}
+  />
+));
+SidebarContainer.displayName = 'SidebarContainer';
+
+export const SidebarHeader = React.forwardRef<HTMLDivElement, React.HTMLAttributes<HTMLDivElement>>(
+  ({ className, ...props }, ref) => (
+    <div ref={ref} className={cn('flex flex-col gap-1 border-b-0', className)} {...props} />
+  )
+);
+SidebarHeader.displayName = 'SidebarHeader';
+
+export const SidebarContent = React.forwardRef<
+  HTMLDivElement,
+  React.HTMLAttributes<HTMLDivElement>
+>(({ className, ...props }, ref) => (
+  <div
+    ref={ref}
+    className={cn('flex flex-1 flex-col overflow-hidden text-sm text-muted-foreground', className)}
+    {...props}
+  />
+));
+SidebarContent.displayName = 'SidebarContent';
+
+export const SidebarGroup = React.forwardRef<HTMLDivElement, React.HTMLAttributes<HTMLDivElement>>(
+  ({ className, ...props }, ref) => (
+    <div ref={ref} className={cn('mb-6 grid', className)} {...props} />
+  )
+);
+SidebarGroup.displayName = 'SidebarGroup';
+
+export const SidebarGroupContent = React.forwardRef<
+  HTMLDivElement,
+  React.HTMLAttributes<HTMLDivElement>
+>(({ className, ...props }, ref) => (
+  <div ref={ref} className={cn('grid gap-1', className)} {...props} />
+));
+SidebarGroupContent.displayName = 'SidebarGroupContent';
+
+export const SidebarFooter = React.forwardRef<HTMLDivElement, React.HTMLAttributes<HTMLDivElement>>(
+  ({ className, ...props }, ref) => (
+    <div
+      ref={ref}
+      className={cn('mt-auto flex flex-col border-t px-3 py-3', className)}
+      {...props}
+    />
+  )
+);
+SidebarFooter.displayName = 'SidebarFooter';
+
+export const SidebarMenu = React.forwardRef<HTMLDivElement, React.HTMLAttributes<HTMLDivElement>>(
+  ({ className, ...props }, ref) => <div ref={ref} className={cn('', className)} {...props} />
+);
+SidebarMenu.displayName = 'SidebarMenu';
+
+export const SidebarItemMiniButton = React.forwardRef<
+  HTMLButtonElement,
+  React.ButtonHTMLAttributes<HTMLButtonElement>
+>(({ className, ...props }, ref) => (
+  <button
+    ref={ref}
+    className={cn(
+      'w-6 h-6 flex items-center justify-center text-foreground-tertiary-muted hover:text-foreground-tertiary rounded-md hover:bg-background-tertiary-2 group-data-[active=true]/row:hover:bg-background-tertiary-3',
+      className
+    )}
+    onMouseDown={(e) => e.preventDefault()}
+    onPointerDown={(e) => e.stopPropagation()}
+    {...props}
+  />
+));
+SidebarItemMiniButton.displayName = 'SidebarItemMiniButton';
+
+const sidebarMenuItemClass =
+  'flex w-full font-normal text-foreground-tertiary-muted rounded-lg items-center hover:bg-background-tertiary-1 hover:text-foreground-tertiary gap-2 px-3 py-2 text-sm transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 data-[active=true]:bg-background-tertiary-2 data-[active=true]:text-foreground-tertiary';
+
+interface SidebarMenuButtonProps extends React.ButtonHTMLAttributes<HTMLButtonElement> {
+  isActive?: boolean;
+}
+export const SidebarMenuButton = React.forwardRef<HTMLButtonElement, SidebarMenuButtonProps>(
+  ({ className, isActive, ...props }, ref) => (
+    <button
+      ref={ref}
+      data-active={isActive || undefined}
+      className={cn(sidebarMenuItemClass, className)}
+      onMouseDown={(e) => e.preventDefault()}
+      {...props}
+    />
+  )
+);
+
+interface SidebarMenuRowProps extends React.HTMLAttributes<HTMLDivElement> {
+  isActive?: boolean;
+}
+export const SidebarMenuRow = React.forwardRef<HTMLDivElement, SidebarMenuRowProps>(
+  ({ className, isActive, ...props }, ref) => (
+    <div
+      ref={ref}
+      data-active={isActive || undefined}
+      className={cn(sidebarMenuItemClass, className)}
+      {...props}
+    />
+  )
+);
diff --git a/src/renderer/features/sidebar/sidebar-space.tsx b/src/renderer/features/sidebar/sidebar-space.tsx
new file mode 100644
index 0000000000..e8c2ad6eca
--- /dev/null
+++ b/src/renderer/features/sidebar/sidebar-space.tsx
@@ -0,0 +1,30 @@
+import { PanelLeft } from 'lucide-react';
+import { useWorkspaceLayoutContext } from '@renderer/lib/layout/layout-provider';
+import { ShortcutHint } from '@renderer/lib/ui/shortcut-hint';
+import { Toggle } from '@renderer/lib/ui/toggle';
+import { Tooltip, TooltipContent, TooltipTrigger } from '@renderer/lib/ui/tooltip';
+
+export function SidebarSpace() {
+  const { isLeftOpen, setCollapsed } = useWorkspaceLayoutContext();
+  return (
+    <div className="[-webkit-app-region:drag] flex h-10 w-full justify-end px-2">
+      <Tooltip>
+        <TooltipTrigger>
+          <Toggle
+            className="[-webkit-app-region:no-drag] size-7 bg-background-tertiary-3 hover:bg-background-tertiary-3 data-pressed:bg-background-tertiary-2"
+            variant="outline"
+            size="sm"
+            pressed={isLeftOpen}
+            onPressedChange={() => setCollapsed('left', isLeftOpen)}
+          >
+            <PanelLeft />
+          </Toggle>
+        </TooltipTrigger>
+        <TooltipContent>
+          Toggle left sidebar
+          <ShortcutHint settingsKey="toggleLeftSidebar" />
+        </TooltipContent>
+      </Tooltip>
+    </div>
+  );
+}
diff --git a/src/renderer/features/sidebar/sidebar-store.ts b/src/renderer/features/sidebar/sidebar-store.ts
new file mode 100644
index 0000000000..11bfe5626a
--- /dev/null
+++ b/src/renderer/features/sidebar/sidebar-store.ts
@@ -0,0 +1,233 @@
+import { computed, makeAutoObservable, observable, reaction, runInAction } from 'mobx';
+import { LocalProject, SshProject } from '@shared/projects';
+import type { SidebarSnapshot, SidebarTaskSortBy } from '@shared/view-state';
+import { ProjectStore, UnregisteredProject } from '@renderer/features/projects/stores/project';
+import type { ProjectManagerStore } from '@renderer/features/projects/stores/project-manager';
+import {
+  registeredTaskData,
+  unregisteredTaskData,
+  type TaskStore,
+} from '@renderer/features/tasks/stores/task';
+import type { Snapshottable } from '@renderer/lib/stores/snapshottable';
+
+function parseSidebarTaskSortBy(value: unknown): SidebarTaskSortBy | undefined {
+  return value === 'created-at' || value === 'updated-at' ? value : undefined;
+}
+
+export function getSortInstant(task: TaskStore, kind: 'created' | 'updated'): string {
+  const reg = registeredTaskData(task);
+  if (reg) {
+    if (kind === 'created') return reg.createdAt;
+    return reg.lastInteractedAt ?? reg.updatedAt;
+  }
+  const u = unregisteredTaskData(task);
+  if (u) {
+    if (kind === 'created') return u.createdAt;
+    return u.lastInteractedAt;
+  }
+  return '';
+}
+
+export type SidebarRow =
+  | { kind: 'project'; projectId: string }
+  | { kind: 'task'; projectId: string; taskId: string };
+
+export class SidebarStore implements Snapshottable<SidebarSnapshot> {
+  projectOrder: string[] = [];
+  taskOrderByProject: Record<string, string[]> = {};
+  expandedProjectIds = observable.set<string>();
+  taskSortBy: SidebarTaskSortBy = 'created-at';
+
+  constructor(private readonly projectManager: ProjectManagerStore) {
+    makeAutoObservable(this, {
+      expandedProjectIds: false,
+      sidebarRows: computed,
+      pinnedSidebarEntries: computed,
+    });
+
+    // Auto-expand a project when its task count goes from 0 to >0.
+    const prevTaskCounts = new Map<string, number>();
+    reaction(
+      () => {
+        const counts: [string, number][] = [];
+        for (const [id, project] of this.projectManager.projects) {
+          if (project.mountedProject) {
+            counts.push([id, project.mountedProject.taskManager.tasks.size]);
+          }
+        }
+        return counts;
+      },
+      (counts) => {
+        runInAction(() => {
+          for (const [id, count] of counts) {
+            const prev = prevTaskCounts.get(id) ?? 0;
+            if (prev === 0 && count > 0) {
+              this.ensureProjectExpanded(id);
+            }
+            prevTaskCounts.set(id, count);
+          }
+        });
+      }
+    );
+  }
+
+  get orderedProjects(): ProjectStore[] {
+    const all = Array.from(this.projectManager.projects.values());
+
+    const unregistered = all.filter((p): p is UnregisteredProject => p.state === 'unregistered');
+    const real = all.filter(
+      (p): p is ProjectStore & { data: LocalProject | SshProject } => p.state !== 'unregistered'
+    );
+
+    const sorted = [...real].sort((a, b) => {
+      const ai = this.projectOrder.indexOf(a.data.id);
+      const bi = this.projectOrder.indexOf(b.data.id);
+      if (ai === -1 && bi === -1) return 0;
+      if (ai === -1) return 1;
+      if (bi === -1) return -1;
+      return ai - bi;
+    });
+
+    return [...unregistered, ...sorted];
+  }
+
+  get sidebarRows(): SidebarRow[] {
+    const rows: SidebarRow[] = [];
+    for (const project of this.orderedProjects) {
+      const projectId = project.state === 'unregistered' ? project.id : project.data!.id;
+      rows.push({ kind: 'project', projectId });
+      if (this.expandedProjectIds.has(projectId) && project.mountedProject) {
+        const tasks = Array.from(project.mountedProject.taskManager.tasks.values()).filter(
+          (t) => t.state === 'unregistered' || !('archivedAt' in t.data && t.data.archivedAt)
+        );
+        const manualOrder = this.taskOrderByProject[projectId];
+        const ordered = manualOrder?.length
+          ? this.mergeTaskOrder(projectId, tasks)
+          : this.sortTasksForSidebar(tasks);
+        for (const task of ordered) {
+          if (task.data.isPinned) continue;
+          rows.push({ kind: 'task', projectId, taskId: task.data.id });
+        }
+      }
+    }
+    return rows;
+  }
+
+  /** Flat list of pinned tasks (all mounted projects), same sort rules as project tree tasks. */
+  get pinnedSidebarEntries(): { projectId: string; taskId: string }[] {
+    const pairs: { projectId: string; task: TaskStore }[] = [];
+    for (const project of this.projectManager.projects.values()) {
+      if (!project.mountedProject) continue;
+      const projectId = project.state === 'unregistered' ? project.id : project.data?.id;
+      if (!projectId) continue;
+      for (const task of project.mountedProject.taskManager.tasks.values()) {
+        const visible =
+          task.state === 'unregistered' || !('archivedAt' in task.data && task.data.archivedAt);
+        if (!visible || !task.data.isPinned) continue;
+        pairs.push({ projectId, task });
+      }
+    }
+    pairs.sort((a, b) => this.compareSidebarTasks(a.task, b.task));
+    return pairs.map(({ projectId, task }) => ({ projectId, taskId: task.data.id }));
+  }
+
+  get isEmpty(): boolean {
+    return this.projectManager.projects.size === 0;
+  }
+
+  get snapshot(): SidebarSnapshot {
+    return {
+      expandedProjectIds: [...this.expandedProjectIds],
+      projectOrder: [...this.projectOrder],
+      taskOrderByProject: { ...this.taskOrderByProject },
+      taskSortBy: this.taskSortBy,
+    };
+  }
+
+  restoreSnapshot(snapshot: Partial<SidebarSnapshot>): void {
+    if (snapshot.expandedProjectIds !== undefined) {
+      this.expandedProjectIds.replace(snapshot.expandedProjectIds);
+    }
+    if (snapshot.projectOrder !== undefined) {
+      this.projectOrder = [...snapshot.projectOrder];
+    }
+    if (snapshot.taskOrderByProject !== undefined) {
+      this.taskOrderByProject = { ...snapshot.taskOrderByProject };
+    }
+    if (snapshot.taskSortBy !== undefined) {
+      const v = parseSidebarTaskSortBy(snapshot.taskSortBy);
+      if (v !== undefined) this.taskSortBy = v;
+    }
+  }
+
+  /** Called on first load when no snapshot exists — expand all known projects. */
+  expandAllProjects(): void {
+    for (const project of this.orderedProjects) {
+      const projectId = project.state === 'unregistered' ? project.id : project.data!.id;
+      this.expandedProjectIds.add(projectId);
+    }
+  }
+
+  toggleProjectExpanded(projectId: string): void {
+    if (this.expandedProjectIds.has(projectId)) {
+      this.expandedProjectIds.delete(projectId);
+    } else {
+      this.expandedProjectIds.add(projectId);
+    }
+  }
+
+  ensureProjectExpanded(projectId: string): void {
+    this.expandedProjectIds.add(projectId);
+  }
+
+  setTaskSortBy(sortBy: SidebarTaskSortBy): void {
+    this.taskSortBy = sortBy;
+  }
+
+  /** Set the sort key and clear all manual task orders so the list fully re-sorts. */
+  applySort(sortBy: SidebarTaskSortBy): void {
+    this.taskSortBy = sortBy;
+    this.taskOrderByProject = {};
+  }
+
+  setProjectOrder(ids: string[]): void {
+    this.projectOrder = ids;
+  }
+
+  mergeTaskOrder(projectId: string, tasks: TaskStore[]): TaskStore[] {
+    const stored = this.taskOrderByProject[projectId] ?? [];
+    const byId = new Map(tasks.map((t) => [t.data.id, t] as const));
+    const seen = new Set<string>();
+    const result: TaskStore[] = [];
+    for (const id of stored) {
+      const t = byId.get(id);
+      if (t) {
+        result.push(t);
+        seen.add(id);
+      }
+    }
+    // New tasks (not in the manual order) are sorted by date and prepended so
+    // they always appear at the top rather than buried after manually-ordered tasks.
+    const newTasks = tasks
+      .filter((t) => !seen.has(t.data.id))
+      .sort((a, b) => this.compareSidebarTasks(a, b));
+    return [...newTasks, ...result];
+  }
+
+  setTaskOrder(projectId: string, orderedIds: string[]): void {
+    this.taskOrderByProject = { ...this.taskOrderByProject, [projectId]: orderedIds };
+  }
+
+  private compareSidebarTasks(a: TaskStore, b: TaskStore): number {
+    const kind: 'created' | 'updated' = this.taskSortBy === 'created-at' ? 'created' : 'updated';
+    const ia = getSortInstant(a, kind);
+    const ib = getSortInstant(b, kind);
+    const d = ib.localeCompare(ia);
+    if (d !== 0) return d;
+    return a.data.id.localeCompare(b.data.id);
+  }
+
+  private sortTasksForSidebar(tasks: TaskStore[]): TaskStore[] {
+    return [...tasks].sort((a, b) => this.compareSidebarTasks(a, b));
+  }
+}
diff --git a/src/renderer/features/sidebar/sidebar-virtual-list.tsx b/src/renderer/features/sidebar/sidebar-virtual-list.tsx
new file mode 100644
index 0000000000..8bf10abd0d
--- /dev/null
+++ b/src/renderer/features/sidebar/sidebar-virtual-list.tsx
@@ -0,0 +1,252 @@
+import {
+  closestCenter,
+  CollisionDetection,
+  DndContext,
+  DragEndEvent,
+  DragOverlay,
+  DragStartEvent,
+  PointerSensor,
+  useSensor,
+  useSensors,
+} from '@dnd-kit/core';
+import {
+  arrayMove,
+  SortableContext,
+  useSortable,
+  verticalListSortingStrategy,
+} from '@dnd-kit/sortable';
+import { CSS } from '@dnd-kit/utilities';
+import { useVirtualizer } from '@tanstack/react-virtual';
+import { observer } from 'mobx-react-lite';
+import { useEffect, useRef, useState } from 'react';
+import { SidebarRow } from '@renderer/features/sidebar/sidebar-store';
+import { getTaskStore } from '@renderer/features/tasks/stores/task-selectors';
+import { useParams, useWorkspaceSlots } from '@renderer/lib/layout/navigation-provider';
+import { sidebarStore } from '@renderer/lib/stores/app-state';
+import { SidebarProjectItem } from './project-item';
+import { SidebarTaskItem } from './task-item';
+
+const ROW_HEIGHT = 32;
+
+export const SidebarVirtualList = observer(function SidebarVirtualList() {
+  const rows = sidebarStore.sidebarRows;
+  const { currentView } = useWorkspaceSlots();
+  const { params: taskParams } = useParams('task');
+  const { params: projectParams } = useParams('project');
+
+  const scrollRef = useRef<HTMLDivElement>(null);
+  const [activeId, setActiveId] = useState<string | null>(null);
+
+  const sensors = useSensors(useSensor(PointerSensor, { activationConstraint: { distance: 6 } }));
+
+  // During a project drag, collapse its task children so the list is compact
+  // and project rows are adjacent — making cross-project reorder easier.
+  const draggingProjectId = activeId?.startsWith('proj::') ? activeId.slice(6) : null;
+  const displayRows = draggingProjectId
+    ? rows.filter((r) => !(r.kind === 'task' && r.projectId === draggingProjectId))
+    : rows;
+
+  const allDndIds = displayRows.map(rowToDndId);
+
+  const virtualizer = useVirtualizer({
+    count: displayRows.length,
+    getScrollElement: () => scrollRef.current,
+    estimateSize: () => ROW_HEIGHT,
+    overscan: 8,
+  });
+
+  // Expand the parent project when navigating to a task (not when `rows` changes —
+  // otherwise collapsing while staying on that task would immediately re-expand).
+  useEffect(() => {
+    if (currentView !== 'task') return;
+    const targetProjectId = taskParams.projectId;
+    const targetTaskId = taskParams.taskId;
+    if (!targetProjectId || !targetTaskId) return;
+    const activeTask = getTaskStore(targetProjectId, targetTaskId);
+    if (activeTask?.data.isPinned) return;
+    sidebarStore.ensureProjectExpanded(targetProjectId);
+  }, [currentView, taskParams.projectId, taskParams.taskId]);
+
+  // Scroll the active project/task into view when navigation or row layout changes.
+  useEffect(() => {
+    let targetProjectId: string | null = null;
+    let targetTaskId: string | null = null;
+
+    if (currentView === 'task') {
+      targetProjectId = taskParams.projectId;
+      targetTaskId = taskParams.taskId;
+    } else if (currentView === 'project') {
+      targetProjectId = projectParams.projectId;
+    }
+
+    if (!targetProjectId) return;
+
+    if (targetTaskId) {
+      const activeTask = getTaskStore(targetProjectId, targetTaskId);
+      if (activeTask?.data.isPinned) {
+        return;
+      }
+    }
+
+    const activeIndex = displayRows.findIndex((row) => {
+      if (targetTaskId) {
+        return (
+          row.kind === 'task' && row.taskId === targetTaskId && row.projectId === targetProjectId
+        );
+      }
+      return row.kind === 'project' && row.projectId === targetProjectId;
+    });
+
+    if (activeIndex >= 0) {
+      virtualizer.scrollToIndex(activeIndex, { align: 'auto' });
+    }
+  }, [
+    currentView,
+    taskParams.projectId,
+    taskParams.taskId,
+    projectParams.projectId,
+    displayRows,
+    virtualizer,
+  ]);
+
+  function handleDragStart(event: DragStartEvent) {
+    setActiveId(String(event.active.id));
+  }
+
+  function handleDragEnd(event: DragEndEvent) {
+    setActiveId(null);
+    const { active, over } = event;
+    if (!over || active.id === over.id) return;
+    const a = String(active.id);
+    const o = String(over.id);
+
+    if (a.startsWith('proj::') && o.startsWith('proj::')) {
+      const ids = sidebarStore.orderedProjects
+        .map((p) => (p.state === 'unregistered' ? p.id : (p.data?.id ?? '')))
+        .filter(Boolean);
+      const oldIdx = ids.indexOf(a.slice(6));
+      const newIdx = ids.indexOf(o.slice(6));
+      if (oldIdx !== -1 && newIdx !== -1) {
+        sidebarStore.setProjectOrder(arrayMove(ids, oldIdx, newIdx));
+      }
+    } else if (a.startsWith('task::') && o.startsWith('task::')) {
+      const [, aProjId, aTaskId] = a.split('::');
+      const [, oProjId, oTaskId] = o.split('::');
+      if (aProjId !== oProjId) return;
+      const taskIds = sidebarStore.sidebarRows
+        .filter((r) => r.kind === 'task' && r.projectId === aProjId)
+        .map((r) => (r as { taskId: string }).taskId);
+      const oldIdx = taskIds.indexOf(aTaskId);
+      const newIdx = taskIds.indexOf(oTaskId);
+      if (oldIdx !== -1 && newIdx !== -1) {
+        sidebarStore.setTaskOrder(aProjId, arrayMove(taskIds, oldIdx, newIdx));
+      }
+    }
+  }
+
+  function renderOverlayContent(id: string) {
+    if (id.startsWith('proj::')) {
+      return <SidebarProjectItem projectId={id.slice(6)} />;
+    }
+    if (id.startsWith('task::')) {
+      const [, projId, taskId] = id.split('::');
+      return <SidebarTaskItem projectId={projId} taskId={taskId} />;
+    }
+    return null;
+  }
+
+  return (
+    <DndContext
+      sensors={sensors}
+      collisionDetection={typeRestrictedCollision}
+      onDragStart={handleDragStart}
+      onDragEnd={handleDragEnd}
+    >
+      <SortableContext items={allDndIds} strategy={verticalListSortingStrategy}>
+        <div ref={scrollRef} className="overflow-y-auto min-h-0 flex-1 px-3 pt-1 pb-3">
+          <div style={{ height: virtualizer.getTotalSize(), position: 'relative' }}>
+            {virtualizer.getVirtualItems().map((vItem) => {
+              const row = displayRows[vItem.index];
+              if (!row) return null;
+              const dndId = rowToDndId(row);
+              const vStyle: React.CSSProperties = {
+                position: 'absolute',
+                top: vItem.start,
+                left: 0,
+                width: '100%',
+                height: `${vItem.size}px`,
+              };
+              if (row.kind === 'project') {
+                return (
+                  <SortableRow key={row.projectId} dndId={dndId} style={vStyle}>
+                    <SidebarProjectItem projectId={row.projectId} />
+                  </SortableRow>
+                );
+              }
+              return (
+                <SortableRow key={`${row.projectId}:${row.taskId}`} dndId={dndId} style={vStyle}>
+                  <SidebarTaskItem projectId={row.projectId} taskId={row.taskId} />
+                </SortableRow>
+              );
+            })}
+          </div>
+        </div>
+      </SortableContext>
+      <DragOverlay>
+        {activeId ? (
+          <div className="px-3">
+            <div className="rounded-lg bg-background-tertiary-2 shadow-md">
+              {renderOverlayContent(activeId)}
+            </div>
+          </div>
+        ) : null}
+      </DragOverlay>
+    </DndContext>
+  );
+});
+
+const toProjectDndId = (id: string) => `proj::${id}`;
+const toTaskDndId = (projectId: string, taskId: string) => `task::${projectId}::${taskId}`;
+
+function rowToDndId(row: SidebarRow): string {
+  if (row.kind === 'project') return toProjectDndId(row.projectId);
+  return toTaskDndId(row.projectId, row.taskId);
+}
+
+// Only allow dropping a project onto another project, and a task onto a task
+// within the same project. Prevents task rows from becoming drop targets during
+// project drags (which would cause the drag to silently no-op in onDragEnd).
+const typeRestrictedCollision: CollisionDetection = (args) => {
+  const activeId = String(args.active.id);
+  const prefix = activeId.startsWith('proj::') ? 'proj::' : `task::${activeId.split('::')[1]}::`;
+  return closestCenter({
+    ...args,
+    droppableContainers: args.droppableContainers.filter((c) => String(c.id).startsWith(prefix)),
+  });
+};
+
+interface SortableRowProps {
+  dndId: string;
+  style: React.CSSProperties;
+  children: React.ReactNode;
+}
+
+function SortableRow({ dndId, style, children }: SortableRowProps) {
+  const { setNodeRef, transform, transition, isDragging, listeners, attributes } = useSortable({
+    id: dndId,
+  });
+
+  const combinedStyle: React.CSSProperties = {
+    ...style,
+    transform: CSS.Transform.toString(transform),
+    transition,
+    opacity: isDragging ? 0.4 : 1,
+    zIndex: isDragging ? 1 : 'auto',
+  };
+
+  return (
+    <div ref={setNodeRef} style={combinedStyle} {...attributes} {...listeners}>
+      {children}
+    </div>
+  );
+}
diff --git a/src/renderer/features/sidebar/task-item.tsx b/src/renderer/features/sidebar/task-item.tsx
new file mode 100644
index 0000000000..f662085a91
--- /dev/null
+++ b/src/renderer/features/sidebar/task-item.tsx
@@ -0,0 +1,119 @@
+import { observer } from 'mobx-react-lite';
+import { selectCurrentPr } from '@shared/pull-requests';
+import { TaskSidebarAgentStatus } from '@renderer/features/sidebar/task-sidebar-agent-status';
+import { TaskContextMenu } from '@renderer/features/tasks/components/task-context-menu';
+import { TaskGitDiffStats } from '@renderer/features/tasks/components/task-git-diff-stats';
+import { TaskStore } from '@renderer/features/tasks/stores/task';
+import { getTaskManagerStore, getTaskStore } from '@renderer/features/tasks/stores/task-selectors';
+import {
+  useNavigate,
+  useParams,
+  useWorkspaceSlots,
+} from '@renderer/lib/layout/navigation-provider';
+import { useShowModal } from '@renderer/lib/modal/modal-provider';
+import { cn } from '@renderer/utils/utils';
+import { PrBadge } from '../../lib/components/pr-badge';
+import { SidebarMenuRow } from './sidebar-primitives';
+
+interface SidebarTaskItemProps {
+  taskId: string;
+  projectId: string;
+  /** Pinned strip uses tighter padding than tasks nested under a project. */
+  rowVariant?: 'underProject' | 'pinned';
+}
+
+export const SidebarTaskItem = observer(function SidebarTaskItem({
+  taskId,
+  projectId,
+  rowVariant = 'underProject',
+}: SidebarTaskItemProps) {
+  const { navigate } = useNavigate();
+  const showRename = useShowModal('renameTaskModal');
+  const showConfirm = useShowModal('confirmActionModal');
+
+  const { currentView } = useWorkspaceSlots();
+  const { params } = useParams('task');
+  const isActive =
+    currentView === 'task' && params.taskId === taskId && params.projectId === projectId;
+
+  const task = getTaskStore(projectId, taskId)!;
+  const taskManager = getTaskManagerStore(projectId);
+
+  const isBootstrapping =
+    task.state === 'unregistered' ||
+    (task.state === 'unprovisioned' &&
+      (task.phase === 'provision' || task.phase === 'provision-error'));
+
+  const taskName = task.data.name;
+
+  const handleProvision = () => {
+    if (task.state !== 'unprovisioned' || task.phase !== 'idle') return;
+    taskManager?.provisionTask(taskId);
+  };
+
+  const handleArchive = () => {
+    if (isActive) navigate('project', { projectId });
+    void taskManager?.archiveTask(taskId);
+  };
+
+  const handleRename = () => showRename({ projectId, taskId, currentName: taskName });
+
+  const handleDelete = () =>
+    showConfirm({
+      title: 'Delete task',
+      description: `"${taskName}" will be permanently deleted. This action cannot be undone.`,
+      confirmLabel: 'Delete',
+      onSuccess: () => {
+        void taskManager?.deleteTask(taskId);
+        if (isActive) navigate('project', { projectId });
+      },
+    });
+
+  const canPin = task.state !== 'unregistered';
+
+  return (
+    <TaskContextMenu
+      isPinned={task.data.isPinned}
+      canPin={canPin}
+      isArchived={false}
+      onPin={() => void task.setPinned(true)}
+      onUnpin={() => void task.setPinned(false)}
+      onRename={handleRename}
+      onArchive={handleArchive}
+      onDelete={handleDelete}
+    >
+      <SidebarMenuRow
+        className={cn(
+          'group/row flex items-center justify-between px-1 h-8 gap-1',
+          rowVariant === 'pinned' ? 'pl-2' : 'pl-8'
+        )}
+        isActive={isActive}
+        onMouseDown={(e) => e.preventDefault()}
+        onClick={() => {
+          handleProvision();
+          navigate('task', { projectId, taskId });
+        }}
+      >
+        <div className="flex min-w-0 flex-1 items-center gap-1 self-stretch overflow-hidden">
+          <span
+            className={cn(
+              'min-w-0 truncate text-left transition-colors',
+              isBootstrapping && 'text-foreground/40'
+            )}
+          >
+            {taskName}
+          </span>
+          <TaskGitDiffStats task={task} className="h-full shrink-0 flex items-center pr-1" />
+          <RenderPrBadge task={task} />
+        </div>
+        <TaskSidebarAgentStatus task={task} />
+      </SidebarMenuRow>
+    </TaskContextMenu>
+  );
+});
+
+const RenderPrBadge = observer(function RenderPrBadge({ task }: { task: TaskStore }) {
+  if (!('prs' in task.data)) return null;
+  const pr = selectCurrentPr(task.data.prs);
+  return pr ? <PrBadge variant="compact" pr={pr} /> : null;
+});
diff --git a/src/renderer/features/sidebar/task-sidebar-agent-status.tsx b/src/renderer/features/sidebar/task-sidebar-agent-status.tsx
new file mode 100644
index 0000000000..9328ed0fb1
--- /dev/null
+++ b/src/renderer/features/sidebar/task-sidebar-agent-status.tsx
@@ -0,0 +1,57 @@
+import { observer } from 'mobx-react-lite';
+import { AgentStatusIndicator } from '@renderer/features/tasks/components/agent-status-indicator';
+import { CLISpinner } from '@renderer/features/tasks/components/cliSpinner';
+import {
+  isUnprovisioned,
+  isUnregistered,
+  type TaskStore,
+} from '@renderer/features/tasks/stores/task';
+import { taskAgentStatus } from '@renderer/features/tasks/stores/task-selectors';
+import { useDelayedBoolean } from '@renderer/lib/hooks/use-delay-boolean';
+import { sidebarStore } from '@renderer/lib/stores/app-state';
+import { RelativeTime } from '@renderer/lib/ui/relative-time';
+import { Tooltip, TooltipContent, TooltipTrigger } from '@renderer/lib/ui/tooltip';
+import { getSortInstant } from './sidebar-store';
+
+/**
+ * Sidebar tail: spinner while bootstrapping, otherwise aggregate agent status indicator.
+ */
+export const TaskSidebarAgentStatus = observer(function TaskSidebarAgentStatus({
+  task,
+}: {
+  task: TaskStore;
+}) {
+  const isBootstrapping =
+    isUnregistered(task) ||
+    (isUnprovisioned(task) && (task.phase === 'provision' || task.phase === 'provision-error'));
+
+  const delayedIsBootstrapping = useDelayedBoolean(isBootstrapping, 500);
+  const status = taskAgentStatus(task);
+
+  if (delayedIsBootstrapping) {
+    return (
+      <Tooltip>
+        <TooltipTrigger>
+          <span className="size-6 flex justify-center items-center">
+            <CLISpinner variant="2" />
+          </span>
+        </TooltipTrigger>
+        <TooltipContent>Creating task workspace...</TooltipContent>
+      </Tooltip>
+    );
+  }
+
+  if (status) {
+    return <AgentStatusIndicator status={status} />;
+  }
+
+  const sortKind = sidebarStore.taskSortBy === 'created-at' ? 'created' : 'updated';
+
+  return (
+    <RelativeTime
+      value={getSortInstant(task, sortKind)}
+      className="text-xs text-foreground-passive font-mono pr-1 h-full flex items-center"
+      compact
+    />
+  );
+});
diff --git a/src/renderer/features/sidebar/update-section.tsx b/src/renderer/features/sidebar/update-section.tsx
new file mode 100644
index 0000000000..d49a6f3793
--- /dev/null
+++ b/src/renderer/features/sidebar/update-section.tsx
@@ -0,0 +1,32 @@
+import { observer } from 'mobx-react-lite';
+import { useNavigate } from '@renderer/lib/layout/navigation-provider';
+import { appState } from '@renderer/lib/stores/app-state';
+import { Button } from '@renderer/lib/ui/button';
+import { MicroLabel } from '@renderer/lib/ui/label';
+
+export const UpdateSection = observer(function UpdateSection() {
+  const update = appState.update;
+  const { navigate } = useNavigate();
+
+  if (update.hasUpdate) {
+    return (
+      <Button
+        variant="outline"
+        size="xs"
+        onClick={() =>
+          navigate('settings', {
+            tab: 'general',
+          })
+        }
+      >
+        Upgrade
+      </Button>
+    );
+  }
+
+  return (
+    <MicroLabel className="inline-flex h-6 items-center lowercase text-foreground-passive">
+      v{update.currentVersion}
+    </MicroLabel>
+  );
+});
diff --git a/src/renderer/features/skills/components/CreateSkillModal.tsx b/src/renderer/features/skills/components/CreateSkillModal.tsx
new file mode 100644
index 0000000000..aa3b83a970
--- /dev/null
+++ b/src/renderer/features/skills/components/CreateSkillModal.tsx
@@ -0,0 +1,151 @@
+import { useQueryClient } from '@tanstack/react-query';
+import React, { useState } from 'react';
+import { isValidSkillName } from '@shared/skills/validation';
+import { rpc } from '@renderer/lib/ipc';
+import { BaseModalProps } from '@renderer/lib/modal/modal-provider';
+import { useCloseGuard } from '@renderer/lib/modal/use-close-guard';
+import { Button } from '@renderer/lib/ui/button';
+import { ConfirmButton } from '@renderer/lib/ui/confirm-button';
+import {
+  DialogContentArea,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+} from '@renderer/lib/ui/dialog';
+import { Input } from '@renderer/lib/ui/input';
+import { Label } from '@renderer/lib/ui/label';
+import { Textarea } from '@renderer/lib/ui/textarea';
+import { captureTelemetry } from '@renderer/utils/telemetryClient';
+
+type Props = BaseModalProps<void>;
+
+export function CreateSkillModal({ onSuccess, onClose }: Props) {
+  const queryClient = useQueryClient();
+  const [name, setName] = useState('');
+  const [description, setDescription] = useState('');
+  const [content, setContent] = useState('');
+  const [createError, setCreateError] = useState<string | null>(null);
+  const [isCreating, setIsCreating] = useState(false);
+
+  useCloseGuard(isCreating);
+
+  const handleCreateSkill = async () => {
+    setCreateError(null);
+
+    const trimmedName = name.trim();
+    if (!isValidSkillName(trimmedName)) {
+      setCreateError('Name must be lowercase letters, numbers, and hyphens (2-64 chars).');
+      return;
+    }
+    if (!description.trim()) {
+      setCreateError('Description is required.');
+      return;
+    }
+
+    setIsCreating(true);
+    try {
+      const result = await rpc.skills.create({
+        name: trimmedName,
+        description: description.trim(),
+        content: content.trim(),
+      });
+
+      if (!result.success) {
+        setCreateError(result.error || 'Failed to create skill');
+        return;
+      }
+
+      captureTelemetry('skill_created');
+      onSuccess();
+      void queryClient.invalidateQueries({ queryKey: ['skills', 'catalog'] });
+    } catch (error) {
+      setCreateError(error instanceof Error ? error.message : 'Failed to create skill');
+    } finally {
+      setIsCreating(false);
+    }
+  };
+
+  return (
+    <>
+      <DialogHeader>
+        <div className="flex flex-col gap-0.5">
+          <DialogTitle>New Skill</DialogTitle>
+        </div>
+      </DialogHeader>
+
+      <DialogContentArea>
+        <div className="space-y-4">
+          <div className="space-y-2">
+            <Label htmlFor="skill-name" className="text-xs">
+              Name
+            </Label>
+            <Input
+              id="skill-name"
+              placeholder="my-skill"
+              value={name}
+              onChange={(e) => {
+                setName(e.target.value);
+                setCreateError(null);
+              }}
+              className="text-sm"
+            />
+            <p className="text-[10px] text-muted-foreground">
+              Lowercase letters, numbers, and hyphens
+            </p>
+          </div>
+
+          <div className="space-y-2">
+            <Label htmlFor="skill-desc" className="text-xs">
+              Description
+            </Label>
+            <Input
+              id="skill-desc"
+              placeholder="What does this skill do?"
+              value={description}
+              onChange={(e) => {
+                setDescription(e.target.value);
+                setCreateError(null);
+              }}
+              className="text-sm"
+            />
+          </div>
+
+          <div className="space-y-2">
+            <Label htmlFor="skill-content" className="text-xs">
+              Instructions
+            </Label>
+            <Textarea
+              id="skill-content"
+              placeholder="Write the skill instructions here. The YAML frontmatter (name and description) will be added automatically."
+              value={content}
+              onChange={(e) => {
+                setContent(e.target.value);
+                setCreateError(null);
+              }}
+              className="min-h-[200px] font-mono text-sm"
+            />
+            <p className="text-[10px] text-muted-foreground">
+              Define what this skill does and how agents should use it
+            </p>
+          </div>
+
+          {createError && <p className="text-xs text-destructive">{createError}</p>}
+        </div>
+      </DialogContentArea>
+
+      <DialogFooter className="gap-2 sm:gap-2">
+        <Button type="button" variant="outline" size="sm" onClick={onClose} disabled={isCreating}>
+          Cancel
+        </Button>
+        <ConfirmButton
+          type="button"
+          onClick={() => void handleCreateSkill()}
+          size="sm"
+          disabled={isCreating}
+        >
+          {isCreating ? 'Creating...' : 'Create'}
+        </ConfirmButton>
+      </DialogFooter>
+    </>
+  );
+}
diff --git a/src/renderer/features/skills/components/SkillCard.tsx b/src/renderer/features/skills/components/SkillCard.tsx
new file mode 100644
index 0000000000..0a74bf4b52
--- /dev/null
+++ b/src/renderer/features/skills/components/SkillCard.tsx
@@ -0,0 +1,59 @@
+import { motion } from 'framer-motion';
+import { Pencil, Plus } from 'lucide-react';
+import React from 'react';
+import type { CatalogSkill } from '@shared/skills/types';
+import SkillIconRenderer from './SkillIconRenderer';
+
+interface SkillCardProps {
+  skill: CatalogSkill;
+  onSelect: (skill: CatalogSkill) => void;
+  onInstall: (skillId: string) => void;
+}
+
+const SkillCard: React.FC<SkillCardProps> = ({ skill, onSelect, onInstall }) => {
+  return (
+    <motion.div
+      role="button"
+      tabIndex={0}
+      whileTap={{ scale: 0.97 }}
+      transition={{ duration: 0.1, ease: 'easeInOut' }}
+      onClick={() => onSelect(skill)}
+      onKeyDown={(e) => {
+        if (e.key === 'Enter' || e.key === ' ') {
+          e.preventDefault();
+          onSelect(skill);
+        }
+      }}
+      className="group flex w-full cursor-pointer items-center gap-3 rounded-lg border border-border bg-muted/20 p-4 text-left text-card-foreground shadow-sm transition-all hover:bg-muted/40 hover:shadow-md"
+    >
+      <SkillIconRenderer skill={skill} />
+
+      {/* Content */}
+      <div className="min-w-0 flex-1">
+        <h3 className="truncate text-sm font-semibold">{skill.displayName}</h3>
+        <p className="mt-0.5 line-clamp-1 text-xs text-muted-foreground">{skill.description}</p>
+      </div>
+
+      {/* Action */}
+      <div className="shrink-0 self-center">
+        {skill.installed ? (
+          <Pencil className="h-4 w-4 text-muted-foreground opacity-0 transition-opacity group-hover:opacity-100" />
+        ) : (
+          <button
+            type="button"
+            onClick={(e) => {
+              e.stopPropagation();
+              onInstall(skill.id);
+            }}
+            className="rounded-md p-1 text-muted-foreground transition-colors hover:bg-muted hover:text-foreground"
+            aria-label={`Install ${skill.displayName}`}
+          >
+            <Plus className="h-4 w-4" />
+          </button>
+        )}
+      </div>
+    </motion.div>
+  );
+};
+
+export default SkillCard;
diff --git a/src/renderer/features/skills/components/SkillDetailModal.tsx b/src/renderer/features/skills/components/SkillDetailModal.tsx
new file mode 100644
index 0000000000..cf27445277
--- /dev/null
+++ b/src/renderer/features/skills/components/SkillDetailModal.tsx
@@ -0,0 +1,149 @@
+import { FolderOpen, Trash2 } from 'lucide-react';
+import React, { useCallback, useState } from 'react';
+import type { CatalogSkill } from '@shared/skills/types';
+import { parseFrontmatter } from '@shared/skills/validation';
+import { Button } from '@renderer/lib/ui/button';
+import { ConfirmButton } from '@renderer/lib/ui/confirm-button';
+import {
+  Dialog,
+  DialogContent,
+  DialogContentArea,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+} from '@renderer/lib/ui/dialog';
+import { MarkdownRenderer } from '@renderer/lib/ui/markdown-renderer';
+import SkillIconRenderer from './SkillIconRenderer';
+
+interface SkillDetailModalProps {
+  skill: CatalogSkill | null;
+  isOpen: boolean;
+  onClose: () => void;
+  onInstall: (skillId: string) => Promise<boolean>;
+  onUninstall: (skillId: string) => Promise<boolean>;
+  onOpenTerminal?: (skillPath: string) => void;
+}
+
+const SkillDetailModal: React.FC<SkillDetailModalProps> = ({
+  skill,
+  isOpen,
+  onClose,
+  onInstall,
+  onUninstall,
+  onOpenTerminal,
+}) => {
+  const [isProcessing, setIsProcessing] = useState(false);
+
+  const handleInstall = useCallback(async () => {
+    if (!skill) return;
+    setIsProcessing(true);
+    try {
+      const success = await onInstall(skill.id);
+      if (success) onClose();
+    } finally {
+      setIsProcessing(false);
+    }
+  }, [skill, onInstall, onClose]);
+
+  const handleUninstall = useCallback(async () => {
+    if (!skill) return;
+    setIsProcessing(true);
+    try {
+      await onUninstall(skill.id);
+      onClose();
+    } finally {
+      setIsProcessing(false);
+    }
+  }, [skill, onUninstall, onClose]);
+
+  const handleOpen = useCallback(() => {
+    if (skill?.localPath && onOpenTerminal) {
+      onOpenTerminal(skill.localPath);
+    }
+  }, [skill, onOpenTerminal]);
+
+  if (!skill) return null;
+
+  const body = skill.skillMdContent ? parseFrontmatter(skill.skillMdContent).body.trim() : '';
+
+  return (
+    <Dialog open={isOpen} onOpenChange={(open) => !open && !isProcessing && onClose()}>
+      <DialogContent className="max-w-lg">
+        <DialogHeader>
+          <div className="flex items-center gap-3">
+            <SkillIconRenderer skill={skill} size="md" />
+            <div className="min-w-0 flex-1">
+              <DialogTitle className="text-base font-sans normal-case tracking-normal text-foreground">
+                {skill.displayName}
+              </DialogTitle>
+              {skill.source !== 'local' && (
+                <div className="mt-0.5 flex items-center gap-1.5 text-xs text-muted-foreground">
+                  <img
+                    src={
+                      skill.source === 'openai'
+                        ? 'https://github.com/openai.png'
+                        : 'https://github.com/anthropics.png'
+                    }
+                    alt=""
+                    className="h-4 w-4 rounded-sm"
+                  />
+                  <span>
+                    From {skill.source === 'openai' ? 'OpenAI' : 'Anthropic'} skill library
+                  </span>
+                </div>
+              )}
+            </div>
+          </div>
+        </DialogHeader>
+        <DialogContentArea>
+          {skill.defaultPrompt && (
+            <div className="space-y-1 rounded-md bg-muted/40 pb-2">
+              <p className="text-xs font-medium text-muted-foreground">Example prompt</p>
+              <pre className="whitespace-pre-wrap wrap-break-word text-xs text-foreground">
+                {skill.defaultPrompt}
+              </pre>
+            </div>
+          )}
+
+          {body && (
+            <MarkdownRenderer
+              content={body}
+              variant="compact"
+              className="max-h-60 overflow-y-auto rounded-md bg-muted/20  py-2 text-xs text-muted-foreground"
+            />
+          )}
+        </DialogContentArea>
+
+        <DialogFooter className="gap-2 sm:gap-2">
+          {skill.installed && (
+            <>
+              <Button
+                variant="ghost"
+                size="sm"
+                onClick={handleUninstall}
+                disabled={isProcessing}
+                className="text-destructive hover:text-destructive"
+              >
+                <Trash2 className="mr-1.5 h-3.5 w-3.5" />
+                Uninstall
+              </Button>
+              {skill.localPath && onOpenTerminal && (
+                <Button variant="outline" size="sm" onClick={handleOpen}>
+                  <FolderOpen className="mr-1.5 h-3.5 w-3.5" />
+                  Open
+                </Button>
+              )}
+            </>
+          )}
+          {!skill.installed && (
+            <ConfirmButton size="sm" onClick={() => void handleInstall()} disabled={isProcessing}>
+              {isProcessing ? 'Installing...' : 'Install'}
+            </ConfirmButton>
+          )}
+        </DialogFooter>
+      </DialogContent>
+    </Dialog>
+  );
+};
+
+export default SkillDetailModal;
diff --git a/src/renderer/features/skills/components/SkillIconRenderer.tsx b/src/renderer/features/skills/components/SkillIconRenderer.tsx
new file mode 100644
index 0000000000..3ed683bc5e
--- /dev/null
+++ b/src/renderer/features/skills/components/SkillIconRenderer.tsx
@@ -0,0 +1,73 @@
+import React, { useState } from 'react';
+import type { CatalogSkill } from '@shared/skills/types';
+import { useTheme } from '@renderer/lib/hooks/useTheme';
+import { resolveSkillIcon } from './skillIcons';
+
+type SkillIconSize = 'sm' | 'md';
+
+const sizeClasses: Record<SkillIconSize, { container: string; padding: string; text: string }> = {
+  sm: { container: 'h-10 w-10', padding: 'p-2', text: 'text-sm' },
+  md: { container: 'h-12 w-12', padding: 'p-2.5', text: 'text-base' },
+};
+
+function processSvg(raw: string, fillColor: string): string {
+  let svg = raw.replace(/\bwidth="[^"]*"/g, '').replace(/\bheight="[^"]*"/g, '');
+  svg = svg.replace('<svg ', `<svg fill="${fillColor}" `);
+  return svg.replace('<svg ', '<svg class="h-full w-full" ');
+}
+
+interface SkillIconRendererProps {
+  skill: CatalogSkill;
+  size?: SkillIconSize;
+}
+
+const SkillIconRenderer: React.FC<SkillIconRendererProps> = ({ skill, size = 'sm' }) => {
+  const [imgError, setImgError] = useState(false);
+  const { effectiveTheme } = useTheme();
+  const isDark = effectiveTheme === 'emdark';
+
+  const { container, padding, text } = sizeClasses[size];
+  const letter = skill.displayName.charAt(0).toUpperCase();
+
+  // 1. Bundled SVG
+  const svg = resolveSkillIcon(skill.id, skill.source);
+  if (svg) {
+    const html = processSvg(svg, isDark ? '#ffffff' : '#000000');
+    return (
+      <div
+        className={`flex ${container} shrink-0 items-center justify-center rounded-xl bg-muted/40 ${padding}`}
+        dangerouslySetInnerHTML={{ __html: html }}
+      />
+    );
+  }
+
+  // 2. Remote iconUrl
+  if (skill.iconUrl && !imgError) {
+    const filter = isDark ? 'brightness(0) invert(1)' : 'brightness(0)';
+    return (
+      <div
+        className={`flex ${container} shrink-0 items-center justify-center overflow-hidden rounded-xl bg-muted/40 p-1.5`}
+      >
+        <img
+          src={skill.iconUrl}
+          alt=""
+          className="h-full w-full rounded-lg object-contain"
+          style={{ filter }}
+          onError={() => setImgError(true)}
+          loading="lazy"
+        />
+      </div>
+    );
+  }
+
+  // 3. Letter fallback
+  return (
+    <div
+      className={`flex ${container} shrink-0 items-center justify-center rounded-xl bg-muted/40 ${text} font-semibold text-foreground/60`}
+    >
+      {letter}
+    </div>
+  );
+};
+
+export default SkillIconRenderer;
diff --git a/src/renderer/features/skills/components/SkillsProvider.ts b/src/renderer/features/skills/components/SkillsProvider.ts
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/renderer/features/skills/components/SkillsView.tsx b/src/renderer/features/skills/components/SkillsView.tsx
new file mode 100644
index 0000000000..b97b7b2cb0
--- /dev/null
+++ b/src/renderer/features/skills/components/SkillsView.tsx
@@ -0,0 +1,162 @@
+import { Loader2, Plus, RefreshCw, Search } from 'lucide-react';
+import React from 'react';
+import { rpc } from '@renderer/lib/ipc';
+import { useShowModal } from '@renderer/lib/modal/modal-provider';
+import { Button } from '@renderer/lib/ui/button';
+import { Input } from '@renderer/lib/ui/input';
+import SkillCard from './SkillCard';
+import SkillDetailModal from './SkillDetailModal';
+import { useSkills } from './useSkills';
+
+const SkillsView: React.FC = () => {
+  const {
+    isLoading,
+    isRefreshing,
+    searchQuery,
+    setSearchQuery,
+    selectedSkill,
+    showDetailModal,
+    installedSkills,
+    recommendedSkills,
+    refresh,
+    install,
+    uninstall,
+    openDetail,
+    closeDetail,
+  } = useSkills();
+  const showCreateSkillModal = useShowModal('createSkillModal');
+
+  const handleOpenTerminal = (skillPath: string) => {
+    rpc.app.openIn({ app: 'terminal', path: skillPath });
+  };
+
+  if (isLoading) {
+    return (
+      <div className="flex h-full items-center justify-center bg-background text-foreground">
+        <Loader2 className="h-6 w-6 animate-spin text-muted-foreground" />
+      </div>
+    );
+  }
+
+  return (
+    <div className="flex h-full flex-col overflow-y-auto bg-background text-foreground">
+      <div className="mx-auto w-full max-w-3xl px-8 py-8">
+        {/* Header */}
+        <div className="mb-6">
+          <h1 className="text-lg font-semibold">Skills</h1>
+          <p className="mt-1 text-xs text-muted-foreground">
+            Extend your agents with reusable skill modules
+          </p>
+        </div>
+
+        {/* Toolbar */}
+        <div className="mb-6 flex items-center gap-2">
+          <div className="relative flex-1">
+            <Search className="absolute left-2.5 top-1/2 h-4 w-4 -translate-y-1/2 text-muted-foreground" />
+            <Input
+              placeholder="Search skills..."
+              value={searchQuery}
+              onChange={(e) => setSearchQuery(e.target.value)}
+              className="pl-9"
+            />
+          </div>
+          <Button
+            variant="ghost"
+            size="icon"
+            onClick={refresh}
+            disabled={isRefreshing}
+            aria-label="Refresh catalog"
+          >
+            <RefreshCw
+              className={`h-4 w-4 text-muted-foreground ${isRefreshing ? 'animate-spin' : ''}`}
+            />
+          </Button>
+          <Button variant="outline" size="sm" onClick={() => showCreateSkillModal({})}>
+            <Plus className="mr-1.5 h-3.5 w-3.5" />
+            New Skill
+          </Button>
+        </div>
+
+        <div className="mb-4 flex items-start gap-3 rounded-lg border border-border bg-muted/20 px-4 py-3">
+          <p className="text-xs leading-relaxed text-muted-foreground">
+            Skills from the{' '}
+            <a
+              href="https://github.com/openai/skills"
+              target="_blank"
+              rel="noopener noreferrer"
+              className="font-medium text-foreground underline decoration-muted-foreground/40 underline-offset-2 hover:decoration-foreground"
+            >
+              OpenAI
+            </a>{' '}
+            and{' '}
+            <a
+              href="https://github.com/anthropics/skills"
+              target="_blank"
+              rel="noopener noreferrer"
+              className="font-medium text-foreground underline decoration-muted-foreground/40 underline-offset-2 hover:decoration-foreground"
+            >
+              Anthropic
+            </a>{' '}
+            catalogs. Install a skill to make it available across all your coding agents. Skills
+            follow the open{' '}
+            <a
+              href="https://agentskills.io"
+              target="_blank"
+              rel="noopener noreferrer"
+              className="font-medium text-foreground underline decoration-muted-foreground/40 underline-offset-2 hover:decoration-foreground"
+            >
+              Agent Skills
+            </a>{' '}
+            standard. If you want to use skills from another library, feel free to let us know
+            through the feedback modal.
+          </p>
+        </div>
+
+        {installedSkills.length > 0 && (
+          <div className="mb-6">
+            <h2 className="mb-3 text-xs font-medium tracking-wide text-muted-foreground">
+              Installed
+            </h2>
+            <div className="grid grid-cols-1 gap-3 sm:grid-cols-2">
+              {installedSkills.map((skill) => (
+                <SkillCard key={skill.id} skill={skill} onSelect={openDetail} onInstall={install} />
+              ))}
+            </div>
+          </div>
+        )}
+
+        {recommendedSkills.length > 0 && (
+          <div className="mb-6">
+            <h2 className="mb-3 text-xs font-medium tracking-wide text-muted-foreground">
+              Recommended
+            </h2>
+            <div className="grid grid-cols-1 gap-3 sm:grid-cols-2">
+              {recommendedSkills.map((skill) => (
+                <SkillCard key={skill.id} skill={skill} onSelect={openDetail} onInstall={install} />
+              ))}
+            </div>
+          </div>
+        )}
+
+        {installedSkills.length === 0 && recommendedSkills.length === 0 && (
+          <div className="py-12 text-center">
+            <p className="text-sm text-muted-foreground">
+              {searchQuery ? 'No skills match your search.' : 'No skills available.'}
+            </p>
+          </div>
+        )}
+      </div>
+
+      <SkillDetailModal
+        skill={selectedSkill}
+        isOpen={showDetailModal}
+        onClose={closeDetail}
+        onInstall={install}
+        onUninstall={uninstall}
+        onOpenTerminal={handleOpenTerminal}
+      />
+    </div>
+  );
+};
+
+export default SkillsView;
diff --git a/src/renderer/features/skills/components/skillIcons.ts b/src/renderer/features/skills/components/skillIcons.ts
new file mode 100644
index 0000000000..f77a2be712
--- /dev/null
+++ b/src/renderer/features/skills/components/skillIcons.ts
@@ -0,0 +1,110 @@
+const skillSvgs = import.meta.glob<string>('../../assets/images/skills/*.svg', {
+  query: '?raw',
+  import: 'default',
+  eager: true,
+});
+const mcpSvgs = import.meta.glob<string>('../../assets/images/mcp/*.svg', {
+  query: '?raw',
+  import: 'default',
+  eager: true,
+});
+
+const svgByName: Record<string, string> = {};
+for (const [path, raw] of [...Object.entries(skillSvgs), ...Object.entries(mcpSvgs)]) {
+  svgByName[path.split('/').pop()!.replace('.svg', '')] = raw;
+}
+
+const skillToIcon: Record<string, string> = {
+  // OpenAI curated skills
+  'cloudflare-deploy': 'cloudflare',
+  figma: 'figma',
+  'figma-implement-design': 'figma',
+  'gh-address-comments': 'github',
+  'gh-fix-ci': 'github',
+  'jupyter-notebook': 'jupyter',
+  linear: 'linear',
+  'netlify-deploy': 'netlify',
+  'notion-knowledge-capture': 'notion',
+  'notion-meeting-intelligence': 'notion',
+  'notion-research-documentation': 'notion',
+  'notion-spec-to-implementation': 'notion',
+  playwright: 'playwright',
+  'render-deploy': 'render',
+  sentry: 'sentry',
+  'vercel-deploy': 'vercel',
+  yeet: 'github',
+
+  // OpenAI generic skills
+  'openai-docs': 'openai',
+  sora: 'openai',
+  imagegen: 'openai',
+  'skill-creator': 'openai',
+  'skill-installer': 'openai',
+
+  // Commonly installed skills
+  cloudflare: 'cloudflare',
+  'durable-objects': 'cloudflare',
+  wrangler: 'cloudflare',
+  'ai-sdk': 'vercel',
+  'vercel-react-best-practices': 'vercel',
+  'gh-issue-fix-flow': 'github',
+  shadcn: 'shadcn',
+  mysql: 'mysql',
+  postgres: 'postgresql',
+  'react-doctor': 'react',
+  'react-email': 'react',
+  resend: 'resend',
+  'resend-design-skills': 'resend',
+  'resend-brand': 'resend',
+  elysiajs: 'bun',
+  'frontend-design': 'anthropic',
+  'webapp-testing': 'anthropic',
+  'web-artifacts-builder': 'anthropic',
+  'mcp-builder': 'anthropic',
+  'algorithmic-art': 'anthropic',
+  'canvas-design': 'anthropic',
+  'theme-factory': 'anthropic',
+  'brand-guidelines': 'anthropic',
+  'doc-coauthoring': 'anthropic',
+  'internal-comms': 'anthropic',
+  stripe: 'stripe',
+  slack: 'slack',
+  notion: 'notion',
+  netlify: 'netlify',
+};
+
+const keywordRules: Array<{ test: (id: string) => boolean; icon: string }> = [
+  { test: (id) => /^swiftui[-_]/.test(id) || id === 'swift-concurrency-expert', icon: 'swift' },
+  { test: (id) => /\b(ios|xcode)\b/.test(id) || id.startsWith('ios-'), icon: 'xcode' },
+  {
+    test: (id) => /\b(macos|app-store|appstore)\b/.test(id) || id.startsWith('macos-'),
+    icon: 'apple',
+  },
+  { test: (id) => id.startsWith('gh-') || id.includes('github'), icon: 'github' },
+  { test: (id) => id.includes('cloudflare') || id.includes('worker'), icon: 'cloudflare' },
+  {
+    test: (id) => id.includes('vercel') || id.includes('nextjs') || id.includes('next-js'),
+    icon: 'vercel',
+  },
+  { test: (id) => id.startsWith('react-') || id.startsWith('react:'), icon: 'react' },
+  { test: (id) => id.includes('notion'), icon: 'notion' },
+  { test: (id) => id.includes('figma'), icon: 'figma' },
+  { test: (id) => id.includes('sentry'), icon: 'sentry' },
+  { test: (id) => id.includes('linear'), icon: 'linear' },
+  { test: (id) => id.includes('stripe'), icon: 'stripe' },
+  { test: (id) => id.includes('resend'), icon: 'resend' },
+  { test: (id) => id.includes('postgres') || id.includes('postgresql'), icon: 'postgresql' },
+  { test: (id) => id.includes('mysql'), icon: 'mysql' },
+  { test: (id) => id.includes('playwright'), icon: 'playwright' },
+];
+
+const sourceIcons: Record<string, string> = {
+  openai: 'openai',
+  anthropic: 'anthropic',
+};
+
+export function resolveSkillIcon(skillId: string, source: string): string | undefined {
+  const name =
+    skillToIcon[skillId] ?? keywordRules.find((r) => r.test(skillId))?.icon ?? sourceIcons[source];
+  return name ? svgByName[name] : undefined;
+}
diff --git a/src/renderer/features/skills/components/useSkills.ts b/src/renderer/features/skills/components/useSkills.ts
new file mode 100644
index 0000000000..6874678e51
--- /dev/null
+++ b/src/renderer/features/skills/components/useSkills.ts
@@ -0,0 +1,179 @@
+import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
+import { useCallback, useMemo, useState } from 'react';
+import type { CatalogIndex, CatalogSkill } from '@shared/skills/types';
+import { useToast } from '@renderer/lib/hooks/use-toast';
+import { rpc } from '@renderer/lib/ipc';
+import { log } from '@renderer/utils/logger';
+import { captureTelemetry } from '@renderer/utils/telemetryClient';
+
+const CATALOG_QUERY_KEY = ['skills', 'catalog'] as const;
+
+export function useSkills() {
+  const { toast } = useToast();
+  const queryClient = useQueryClient();
+  const [searchQuery, setSearchQuery] = useState('');
+  const [selectedSkillId, setSelectedSkillId] = useState<string | null>(null);
+  const [showDetailModal, setShowDetailModal] = useState(false);
+
+  const { data: catalog = null, isPending: isLoading } = useQuery({
+    queryKey: CATALOG_QUERY_KEY,
+    queryFn: async () => {
+      const result = await rpc.skills.getCatalog();
+      if (result.success && result.data) return result.data;
+      throw new Error(result.error ?? 'Failed to load catalog');
+    },
+  });
+
+  const refreshMutation = useMutation({
+    mutationFn: async () => {
+      const result = await rpc.skills.refreshCatalog();
+      if (result.success && result.data) return result.data;
+      throw new Error(result.error ?? 'Failed to refresh catalog');
+    },
+    onSuccess: (data) => {
+      queryClient.setQueryData(CATALOG_QUERY_KEY, data);
+    },
+    onError: (error) => {
+      log.error('Failed to refresh catalog:', error);
+    },
+  });
+
+  const refresh = useCallback(() => refreshMutation.mutate(), [refreshMutation]);
+
+  const installMutation = useMutation({
+    mutationFn: async (skillId: string) => {
+      const result = await rpc.skills.install({ skillId });
+      if (!result.success) throw new Error(result.error ?? 'Could not install skill');
+      return skillId;
+    },
+    onError: (error) => {
+      toast({
+        title: 'Install failed',
+        description: error.message,
+        variant: 'destructive',
+      });
+    },
+    onSuccess: (skillId) => {
+      const skill = queryClient
+        .getQueryData<CatalogIndex>(CATALOG_QUERY_KEY)
+        ?.skills.find((s) => s.id === skillId);
+
+      captureTelemetry('skill_installed', { source: skill?.source });
+      toast({
+        title: 'Skill installed',
+        description: `${skillId} is now available across your agents`,
+      });
+      queryClient.invalidateQueries({ queryKey: CATALOG_QUERY_KEY });
+    },
+  });
+
+  const install = useCallback(
+    async (skillId: string): Promise<boolean> => {
+      try {
+        await installMutation.mutateAsync(skillId);
+        return true;
+      } catch {
+        return false;
+      }
+    },
+    [installMutation]
+  );
+
+  const uninstallMutation = useMutation({
+    mutationFn: async (skillId: string) => {
+      const result = await rpc.skills.uninstall({ skillId });
+      if (!result.success) throw new Error(result.error ?? 'Could not uninstall skill');
+      return skillId;
+    },
+    onError: (error) => {
+      toast({
+        title: 'Uninstall failed',
+        description: error.message,
+        variant: 'destructive',
+      });
+    },
+    onSuccess: () => {
+      captureTelemetry('skill_uninstalled');
+
+      toast({ title: 'Skill removed', description: 'Skill has been uninstalled' });
+      queryClient.invalidateQueries({ queryKey: CATALOG_QUERY_KEY });
+    },
+  });
+
+  const uninstall = useCallback(
+    async (skillId: string): Promise<boolean> => {
+      try {
+        await uninstallMutation.mutateAsync(skillId);
+        return true;
+      } catch {
+        return false;
+      }
+    },
+    [uninstallMutation]
+  );
+
+  const { data: detailData } = useQuery({
+    queryKey: ['skills', 'detail', selectedSkillId],
+    queryFn: async () => {
+      const result = await rpc.skills.getDetail({ skillId: selectedSkillId! });
+      if (result.success && result.data) return result.data;
+      throw new Error('Failed to load skill detail');
+    },
+    enabled: !!selectedSkillId && showDetailModal,
+  });
+
+  const selectedSkill = useMemo<CatalogSkill | null>(() => {
+    if (!selectedSkillId || !showDetailModal) return null;
+    return detailData ?? catalog?.skills.find((s) => s.id === selectedSkillId) ?? null;
+  }, [selectedSkillId, showDetailModal, detailData, catalog]);
+
+  const openDetail = useCallback((skill: CatalogSkill) => {
+    setSelectedSkillId(skill.id);
+    setShowDetailModal(true);
+  }, []);
+
+  const closeDetail = useCallback(() => {
+    setShowDetailModal(false);
+    setSelectedSkillId(null);
+  }, []);
+
+  const filteredSkills = useMemo(() => {
+    if (!catalog) return [];
+    const q = searchQuery.toLowerCase().trim();
+    if (!q) return catalog.skills;
+    return catalog.skills.filter(
+      (s) =>
+        s.displayName.toLowerCase().includes(q) ||
+        s.description.toLowerCase().includes(q) ||
+        s.id.toLowerCase().includes(q)
+    );
+  }, [catalog, searchQuery]);
+
+  const installedSkills = useMemo(
+    () => filteredSkills.filter((s) => s.installed),
+    [filteredSkills]
+  );
+
+  const recommendedSkills = useMemo(
+    () => filteredSkills.filter((s) => !s.installed),
+    [filteredSkills]
+  );
+
+  return {
+    catalog,
+    isLoading,
+    isRefreshing: refreshMutation.isPending,
+    searchQuery,
+    setSearchQuery,
+    selectedSkill,
+    showDetailModal,
+    filteredSkills,
+    installedSkills,
+    recommendedSkills,
+    refresh,
+    install,
+    uninstall,
+    openDetail,
+    closeDetail,
+  };
+}
diff --git a/src/renderer/features/skills/skills-view.tsx b/src/renderer/features/skills/skills-view.tsx
new file mode 100644
index 0000000000..bbb44060bf
--- /dev/null
+++ b/src/renderer/features/skills/skills-view.tsx
@@ -0,0 +1,15 @@
+import { Titlebar } from '@renderer/lib/components/titlebar/Titlebar';
+import SkillsView from './components/SkillsView';
+
+export function SkillsTitlebar() {
+  return <Titlebar />;
+}
+
+export function SkillsMainPanel() {
+  return <SkillsView />;
+}
+
+export const skillsView = {
+  TitlebarSlot: SkillsTitlebar,
+  MainPanel: SkillsMainPanel,
+};
diff --git a/src/renderer/features/tasks/add-remote-modal.tsx b/src/renderer/features/tasks/add-remote-modal.tsx
new file mode 100644
index 0000000000..f126240423
--- /dev/null
+++ b/src/renderer/features/tasks/add-remote-modal.tsx
@@ -0,0 +1,243 @@
+import { useQuery } from '@tanstack/react-query';
+import { ChevronsUpDownIcon } from 'lucide-react';
+import { useState } from 'react';
+import { getRepositoryStore } from '@renderer/features/projects/stores/project-selectors';
+import { rpc } from '@renderer/lib/ipc';
+import { type BaseModalProps } from '@renderer/lib/modal/modal-provider';
+import { ComboboxTrigger, ComboboxValue } from '@renderer/lib/ui/combobox';
+import { ComboboxPopover, type ComboboxSelectOption } from '@renderer/lib/ui/combobox-popover';
+import { ConfirmButton } from '@renderer/lib/ui/confirm-button';
+import {
+  DialogContentArea,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+} from '@renderer/lib/ui/dialog';
+import { Field, FieldGroup, FieldLabel } from '@renderer/lib/ui/field';
+import { Input } from '@renderer/lib/ui/input';
+import { Label } from '@renderer/lib/ui/label';
+import { ModalLayout } from '@renderer/lib/ui/modal-layout';
+import { RadioGroup, RadioGroupItem } from '@renderer/lib/ui/radio-group';
+import { ToggleGroup, ToggleGroupItem } from '@renderer/lib/ui/toggle-group';
+
+export type AddRemoteModalArgs = {
+  projectId: string;
+  projectName: string;
+  branchName: string;
+  workspaceId: string;
+};
+
+type Props = BaseModalProps<void> & AddRemoteModalArgs;
+type Tab = 'create' | 'link';
+
+function toErrorMessage(error: unknown, fallback: string): string {
+  if (typeof error === 'string' && error.length > 0) return error;
+  if (error instanceof Error && error.message.length > 0) return error.message;
+  return fallback;
+}
+
+export function AddRemoteModal({
+  projectId,
+  projectName,
+  workspaceId,
+  branchName,
+  onSuccess,
+}: Props) {
+  const [tab, setTab] = useState<Tab>('create');
+  const [isSubmitting, setIsSubmitting] = useState(false);
+  const [error, setError] = useState<string | null>(null);
+
+  const [repositoryName, setRepositoryName] = useState(projectName);
+  const [selectedOwner, setSelectedOwner] = useState<ComboboxSelectOption | null>(null);
+  const [visibility, setVisibility] = useState<'public' | 'private'>('private');
+  const [url, setUrl] = useState('');
+
+  const { data } = useQuery({
+    queryKey: ['owners'],
+    queryFn: () => rpc.github.getOwners(),
+  });
+  const selectedRemote = getRepositoryStore(projectId)?.configuredRemote.name ?? 'origin';
+
+  const owners = data?.owners?.map((o) => ({ value: o.login, label: o.login })) ?? [];
+  const owner = selectedOwner ?? owners[0] ?? null;
+
+  const isValid =
+    tab === 'create' ? repositoryName.trim().length > 0 && !!owner : url.trim().length > 0;
+
+  const handleSubmit = async () => {
+    setIsSubmitting(true);
+    setError(null);
+
+    try {
+      if (tab === 'create') {
+        if (!owner) {
+          setError('No repository owner available');
+          return;
+        }
+
+        const result = await rpc.github.createRepository({
+          name: repositoryName.trim(),
+          owner: owner.value,
+          isPrivate: visibility === 'private',
+        });
+
+        if (!result.success) {
+          setError(result.error ?? 'Failed to create repository');
+          return;
+        }
+
+        const cloneUrl = `https://github.com/${result.nameWithOwner}.git`;
+        const addRemoteResult = await rpc.repository.addRemote(projectId, selectedRemote, cloneUrl);
+
+        if (!addRemoteResult.success) {
+          setError(toErrorMessage(addRemoteResult.error, 'Failed to add remote'));
+          return;
+        }
+      } else {
+        const addRemoteResult = await rpc.repository.addRemote(
+          projectId,
+          selectedRemote,
+          url.trim()
+        );
+
+        if (!addRemoteResult.success) {
+          setError(toErrorMessage(addRemoteResult.error, 'Failed to add remote'));
+          return;
+        }
+      }
+
+      const fetchResult = await rpc.repository.fetch(projectId);
+      if (!fetchResult.success) {
+        setError(toErrorMessage(fetchResult.error, 'Failed to fetch remote'));
+        return;
+      }
+
+      const publishResult = await rpc.git.publishBranch(
+        projectId,
+        workspaceId,
+        branchName,
+        selectedRemote
+      );
+      if (!publishResult.success) {
+        if (publishResult.error.type === 'rejected') {
+          const repositoryStore = getRepositoryStore(projectId);
+          repositoryStore?.refreshLocal();
+          repositoryStore?.refreshRemote();
+          setError(
+            'Remote already has commits. Linking succeeded, but integrating histories must be resolved manually.'
+          );
+          return;
+        }
+        setError(toErrorMessage(publishResult.error, 'Failed to publish branch'));
+        return;
+      }
+
+      const repositoryStore = getRepositoryStore(projectId);
+      repositoryStore?.refreshLocal();
+      repositoryStore?.refreshRemote();
+      onSuccess();
+    } catch (e) {
+      setError(toErrorMessage(e, 'An error occurred'));
+    } finally {
+      setIsSubmitting(false);
+    }
+  };
+
+  return (
+    <ModalLayout
+      header={
+        <DialogHeader>
+          <DialogTitle>Add Remote</DialogTitle>
+        </DialogHeader>
+      }
+      footer={
+        <DialogFooter>
+          <ConfirmButton onClick={() => void handleSubmit()} disabled={!isValid || isSubmitting}>
+            {isSubmitting ? 'Adding...' : tab === 'create' ? 'Create & Publish' : 'Link & Publish'}
+          </ConfirmButton>
+        </DialogFooter>
+      }
+    >
+      <DialogContentArea className="gap-4">
+        <ToggleGroup
+          className="w-full"
+          value={[tab]}
+          onValueChange={([v]) => {
+            if (v) setTab(v as Tab);
+          }}
+        >
+          <ToggleGroupItem className="flex-1" value="create">
+            Create Repository
+          </ToggleGroupItem>
+          <ToggleGroupItem className="flex-1" value="link">
+            Link Existing
+          </ToggleGroupItem>
+        </ToggleGroup>
+
+        {tab === 'create' && (
+          <FieldGroup>
+            <Field>
+              <FieldLabel>Repository Name</FieldLabel>
+              <Input
+                autoFocus
+                value={repositoryName}
+                onChange={(e) => setRepositoryName(e.target.value)}
+              />
+            </Field>
+            <Field>
+              <FieldLabel>Owner</FieldLabel>
+              <ComboboxPopover
+                trigger={
+                  <ComboboxTrigger
+                    render={
+                      <button className="flex h-9 w-full min-w-0 items-center justify-between rounded-md border border-border px-2.5 py-1 text-left text-sm outline-none">
+                        <ComboboxValue />
+                        <ChevronsUpDownIcon className="size-4 shrink-0 text-muted-foreground" />
+                      </button>
+                    }
+                  />
+                }
+                items={owners}
+                defaultValue={owner}
+                value={owner}
+                onValueChange={setSelectedOwner}
+              />
+            </Field>
+            <Field>
+              <FieldLabel>Visibility</FieldLabel>
+              <RadioGroup
+                value={visibility}
+                onValueChange={(v) => setVisibility(v as 'public' | 'private')}
+              >
+                <div className="flex items-center gap-3">
+                  <RadioGroupItem value="private" />
+                  <Label className="cursor-pointer font-normal">Private</Label>
+                </div>
+                <div className="flex items-center gap-3">
+                  <RadioGroupItem value="public" />
+                  <Label className="cursor-pointer font-normal">Public</Label>
+                </div>
+              </RadioGroup>
+            </Field>
+          </FieldGroup>
+        )}
+
+        {tab === 'link' && (
+          <FieldGroup>
+            <Field>
+              <FieldLabel>Remote URL</FieldLabel>
+              <Input
+                autoFocus
+                placeholder="https://git.example.com/owner/repo.git"
+                value={url}
+                onChange={(e) => setUrl(e.target.value)}
+              />
+            </Field>
+          </FieldGroup>
+        )}
+
+        {error && <p className="text-sm text-destructive">{error}</p>}
+      </DialogContentArea>
+    </ModalLayout>
+  );
+}
diff --git a/src/renderer/features/tasks/components/agent-status-indicator.tsx b/src/renderer/features/tasks/components/agent-status-indicator.tsx
new file mode 100644
index 0000000000..5c942c2acb
--- /dev/null
+++ b/src/renderer/features/tasks/components/agent-status-indicator.tsx
@@ -0,0 +1,73 @@
+import { CLISpinner } from '@renderer/features/tasks/components/cliSpinner';
+import type { AgentStatus } from '@renderer/features/tasks/conversations/conversation-manager';
+import { Tooltip, TooltipContent, TooltipTrigger } from '@renderer/lib/ui/tooltip';
+import { cn } from '@renderer/utils/utils';
+
+export type AgentIndicatorStatus = AgentStatus | null;
+
+interface AgentStatusIndicatorProps {
+  status: AgentIndicatorStatus;
+  className?: string;
+  disableTooltip?: boolean;
+}
+
+const STATUS_LABELS = {
+  working: 'Agent is working',
+  'awaiting-input': 'Agent is awaiting input',
+  error: 'Agent error',
+  completed: 'Agent completed',
+};
+
+export function AgentStatusIndicator({
+  status,
+  className,
+  disableTooltip,
+}: AgentStatusIndicatorProps) {
+  if (!status || status === 'idle') return null;
+
+  const renderIndicator = () => {
+    switch (status) {
+      case 'working':
+        return <CLISpinner />;
+      case 'awaiting-input':
+        return (
+          <span
+            className={cn('rounded-full bg-blue-200 border size-2 border-blue-500', className)}
+            aria-label="Agent is awaiting input"
+            title="Agent is awaiting input"
+          />
+        );
+      case 'error':
+        return (
+          <span
+            className={cn('rounded-full bg-red-200 border size-2 border-red-500', className)}
+            aria-label="Agent error"
+            title="Agent error"
+          />
+        );
+      case 'completed':
+        return (
+          <span
+            className={cn('rounded-full bg-green-200 border size-2 border-green-500', className)}
+            aria-label="Agent completed"
+            title="Agent completed"
+          />
+        );
+      default:
+        return null;
+    }
+  };
+
+  const indicator = (
+    <span className="size-6 flex items-center justify-center">{renderIndicator()}</span>
+  );
+
+  if (disableTooltip) return indicator;
+
+  return (
+    <Tooltip>
+      <TooltipTrigger render={indicator} />
+      <TooltipContent>{STATUS_LABELS[status]}</TooltipContent>
+    </Tooltip>
+  );
+}
diff --git a/src/renderer/features/tasks/components/cliSpinner.tsx b/src/renderer/features/tasks/components/cliSpinner.tsx
new file mode 100644
index 0000000000..6c0fae8942
--- /dev/null
+++ b/src/renderer/features/tasks/components/cliSpinner.tsx
@@ -0,0 +1,46 @@
+import { useEffect, useState } from 'react';
+
+const FRAMES_1 = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
+const FRAMES_2 = [
+  '⠈',
+  '⠉',
+  '⠋',
+  '⠓',
+  '⠒',
+  '⠐',
+  '⠐',
+  '⠒',
+  '⠖',
+  '⠦',
+  '⠤',
+  '⠠',
+  '⠠',
+  '⠤',
+  '⠦',
+  '⠖',
+  '⠒',
+  '⠐',
+  '⠐',
+  '⠒',
+  '⠓',
+  '⠋',
+  '⠉',
+  '⠈',
+];
+
+export function CLISpinner({ variant = '1' }: { variant?: '1' | '2' }) {
+  const [index, setIndex] = useState(0);
+
+  useEffect(() => {
+    const interval = setInterval(() => {
+      setIndex((index + 1) % (variant === '1' ? FRAMES_1.length : FRAMES_2.length));
+    }, 80);
+    return () => clearInterval(interval);
+  }, [index, variant]);
+
+  return (
+    <span className="text-foreground/60">
+      {variant === '1' ? FRAMES_1[index] : FRAMES_2[index]}
+    </span>
+  );
+}
diff --git a/src/renderer/features/tasks/components/dev-server-pills.tsx b/src/renderer/features/tasks/components/dev-server-pills.tsx
new file mode 100644
index 0000000000..f66fd2fe98
--- /dev/null
+++ b/src/renderer/features/tasks/components/dev-server-pills.tsx
@@ -0,0 +1,49 @@
+import { ExternalLink, Globe } from 'lucide-react';
+import { observer } from 'mobx-react-lite';
+import { rpc } from '@renderer/lib/ipc';
+import { Tooltip, TooltipContent, TooltipTrigger } from '@renderer/lib/ui/tooltip';
+import { useProvisionedTask } from '../task-view-context';
+
+function formatUrl(url: string): string {
+  try {
+    const u = new URL(url);
+    return u.port ? `${u.hostname}:${u.port}` : u.hostname;
+  } catch {
+    return url;
+  }
+}
+
+export const DevServerPills = observer(function DevServerPills({
+  projectId: _projectId,
+  taskId: _taskId,
+}: {
+  projectId: string;
+  taskId: string;
+}) {
+  const urls = useProvisionedTask().devServers.urls;
+
+  if (urls.length === 0) return null;
+
+  return (
+    <>
+      {urls.map((url) => (
+        <Tooltip key={url}>
+          <TooltipTrigger>
+            <button
+              type="button"
+              onClick={() => rpc.app.openExternal(url)}
+              className="flex h-7 rounded-md items-center gap-1.5 border border-green-300 bg-green-50 px-2 py-1 text-xs text-foreground-muted transition-colors hover:border-green-400 hover:text-foreground"
+            >
+              <Globe className="size-3 shrink-0 text-green-700" />
+              <span className="text-green-700">{formatUrl(url)}</span>
+              <ExternalLink className="size-3 shrink-0 text-green-700" />
+            </button>
+          </TooltipTrigger>
+          <TooltipContent side="bottom" className="text-xs">
+            Dev server running at {url}
+          </TooltipContent>
+        </Tooltip>
+      ))}
+    </>
+  );
+});
diff --git a/src/renderer/features/tasks/components/file-icons.tsx b/src/renderer/features/tasks/components/file-icons.tsx
new file mode 100644
index 0000000000..d5b16d7f45
--- /dev/null
+++ b/src/renderer/features/tasks/components/file-icons.tsx
@@ -0,0 +1,450 @@
+import React, { Component, ErrorInfo, memo, ReactNode } from 'react';
+import { DiCoffeescript } from 'react-icons/di';
+import { FaFileImage } from 'react-icons/fa';
+import {
+  SiAngular,
+  SiBabel,
+  SiCplusplus,
+  SiCss3,
+  SiCypress,
+  SiDocker,
+  SiEslint,
+  SiGit,
+  SiGo,
+  SiGraphql,
+  SiHtml5,
+  SiJavascript,
+  SiJest,
+  SiKotlin,
+  SiLua,
+  SiMongodb,
+  SiNextdotjs,
+  SiNodedotjs,
+  SiNpm,
+  SiPhp,
+  SiPostgresql,
+  SiPrettier,
+  SiPython,
+  SiReact,
+  SiRedis,
+  SiRuby,
+  SiRust,
+  SiSass,
+  SiStorybook,
+  SiSvelte,
+  SiSwift,
+  SiTailwindcss,
+  SiTypescript,
+  SiVite,
+  SiVuedotjs,
+  SiWebpack,
+  SiYarn,
+} from 'react-icons/si';
+import {
+  VscDatabase,
+  VscError,
+  VscFile,
+  VscFileBinary,
+  VscFileCode,
+  VscFileMedia,
+  VscFilePdf,
+  VscFileZip,
+  VscFolder,
+  VscFolderOpened,
+  VscJson,
+  VscKey,
+  VscLock,
+  VscMarkdown,
+  VscSettingsGear,
+  VscSymbolMisc,
+  VscTable,
+  VscTerminal,
+} from 'react-icons/vsc';
+import { log } from '@renderer/utils/logger';
+
+// Icon mapping configuration
+const SPECIAL_FILES: Record<string, { icon: React.ElementType; color: string; label: string }> = {
+  'package.json': { icon: SiNpm, color: 'text-red-500', label: 'NPM package file' },
+  'package-lock.json': { icon: SiNpm, color: 'text-red-400', label: 'NPM lock file' },
+  'yarn.lock': { icon: SiYarn, color: 'text-blue-400', label: 'Yarn lock file' },
+  'pnpm-lock.yaml': { icon: SiNpm, color: 'text-orange-500', label: 'PNPM lock file' },
+  '.gitignore': { icon: SiGit, color: 'text-orange-600', label: 'Git ignore file' },
+  '.gitattributes': { icon: SiGit, color: 'text-orange-600', label: 'Git attributes file' },
+  '.gitmodules': { icon: SiGit, color: 'text-orange-600', label: 'Git modules file' },
+  dockerfile: { icon: SiDocker, color: 'text-blue-500', label: 'Docker file' },
+  'docker-compose.yml': { icon: SiDocker, color: 'text-blue-500', label: 'Docker compose file' },
+  'docker-compose.yaml': { icon: SiDocker, color: 'text-blue-500', label: 'Docker compose file' },
+  '.dockerignore': { icon: SiDocker, color: 'text-blue-400', label: 'Docker ignore file' },
+  '.env': {
+    icon: VscSettingsGear,
+    color: 'text-amber-700 dark:text-amber-300',
+    label: 'Environment variables file',
+  },
+  '.env.local': {
+    icon: VscSettingsGear,
+    color: 'text-amber-700 dark:text-amber-300',
+    label: 'Local environment file',
+  },
+  '.env.production': {
+    icon: VscSettingsGear,
+    color: 'text-amber-700 dark:text-amber-300',
+    label: 'Production environment file',
+  },
+  '.env.development': {
+    icon: VscSettingsGear,
+    color: 'text-amber-700 dark:text-amber-300',
+    label: 'Development environment file',
+  },
+  '.eslintrc': {
+    icon: SiEslint,
+    color: 'text-violet-600 dark:text-violet-400',
+    label: 'ESLint config',
+  },
+  '.eslintrc.js': {
+    icon: SiEslint,
+    color: 'text-violet-600 dark:text-violet-400',
+    label: 'ESLint config',
+  },
+  '.eslintrc.json': {
+    icon: SiEslint,
+    color: 'text-violet-600 dark:text-violet-400',
+    label: 'ESLint config',
+  },
+  '.prettierrc': {
+    icon: SiPrettier,
+    color: 'text-pink-600 dark:text-pink-400',
+    label: 'Prettier config',
+  },
+  '.prettierrc.js': {
+    icon: SiPrettier,
+    color: 'text-pink-600 dark:text-pink-400',
+    label: 'Prettier config',
+  },
+  '.prettierrc.json': {
+    icon: SiPrettier,
+    color: 'text-pink-600 dark:text-pink-400',
+    label: 'Prettier config',
+  },
+  'vite.config.js': {
+    icon: SiVite,
+    color: 'text-violet-600 dark:text-violet-400',
+    label: 'Vite config',
+  },
+  'vite.config.ts': {
+    icon: SiVite,
+    color: 'text-violet-600 dark:text-violet-400',
+    label: 'Vite config',
+  },
+  'webpack.config.js': {
+    icon: SiWebpack,
+    color: 'text-blue-700 dark:text-blue-400',
+    label: 'Webpack config',
+  },
+  'rollup.config.js': { icon: VscFileCode, color: 'text-red-600', label: 'Rollup config' },
+  'babel.config.js': { icon: SiBabel, color: 'text-yellow-500', label: 'Babel config' },
+  '.babelrc': { icon: SiBabel, color: 'text-yellow-500', label: 'Babel config' },
+  'jest.config.js': { icon: SiJest, color: 'text-red-600', label: 'Jest config' },
+  'cypress.config.js': { icon: SiCypress, color: 'text-green-600', label: 'Cypress config' },
+  'tailwind.config.js': {
+    icon: SiTailwindcss,
+    color: 'text-cyan-600 dark:text-cyan-400',
+    label: 'Tailwind config',
+  },
+  'postcss.config.js': {
+    icon: VscFileCode,
+    color: 'text-orange-700 dark:text-orange-400',
+    label: 'PostCSS config',
+  },
+  'next.config.js': {
+    icon: SiNextdotjs,
+    color: 'text-gray-800 dark:text-white',
+    label: 'Next.js config',
+  },
+  'nuxt.config.js': { icon: VscFileCode, color: 'text-green-600', label: 'Nuxt config' },
+  'angular.json': { icon: SiAngular, color: 'text-red-600', label: 'Angular config' },
+  'readme.md': { icon: VscMarkdown, color: 'text-blue-600', label: 'README file' },
+  license: { icon: VscLock, color: 'text-yellow-600', label: 'License file' },
+  'license.md': { icon: VscLock, color: 'text-yellow-600', label: 'License file' },
+  makefile: { icon: VscSettingsGear, color: 'text-orange-600', label: 'Makefile' },
+};
+
+const EXTENSION_ICONS: Record<string, { icon: React.ElementType; color: string; label: string }> = {
+  // JavaScript/TypeScript
+  ts: { icon: SiTypescript, color: 'text-blue-600', label: 'TypeScript file' },
+  tsx: { icon: SiReact, color: 'text-cyan-500', label: 'TypeScript React file' },
+  js: { icon: SiJavascript, color: 'text-yellow-500', label: 'JavaScript file' },
+  jsx: { icon: SiReact, color: 'text-cyan-500', label: 'JavaScript React file' },
+  mjs: { icon: SiJavascript, color: 'text-yellow-500', label: 'JavaScript module' },
+  cjs: { icon: SiNodedotjs, color: 'text-green-600', label: 'CommonJS module' },
+  coffee: { icon: DiCoffeescript, color: 'text-brown-600', label: 'CoffeeScript file' },
+
+  // Web
+  html: { icon: SiHtml5, color: 'text-orange-600', label: 'HTML file' },
+  htm: { icon: SiHtml5, color: 'text-orange-600', label: 'HTML file' },
+  css: { icon: SiCss3, color: 'text-blue-600', label: 'CSS file' },
+  scss: { icon: SiSass, color: 'text-pink-600', label: 'SCSS file' },
+  sass: { icon: SiSass, color: 'text-pink-600', label: 'Sass file' },
+  less: { icon: VscFileCode, color: 'text-blue-800', label: 'Less file' },
+  styl: { icon: VscFileCode, color: 'text-green-600', label: 'Stylus file' },
+
+  // Frameworks
+  vue: { icon: SiVuedotjs, color: 'text-green-600', label: 'Vue file' },
+  svelte: { icon: SiSvelte, color: 'text-orange-600', label: 'Svelte file' },
+
+  // Data
+  json: { icon: VscJson, color: 'text-amber-700 dark:text-amber-300', label: 'JSON file' },
+  jsonc: {
+    icon: VscJson,
+    color: 'text-amber-700 dark:text-amber-300',
+    label: 'JSON with comments',
+  },
+  json5: { icon: VscJson, color: 'text-amber-700 dark:text-amber-300', label: 'JSON5 file' },
+  xml: { icon: VscFileCode, color: 'text-orange-500', label: 'XML file' },
+  yaml: { icon: VscFileCode, color: 'text-rose-700 dark:text-rose-400', label: 'YAML file' },
+  yml: { icon: VscFileCode, color: 'text-rose-700 dark:text-rose-400', label: 'YAML file' },
+  toml: { icon: VscFileCode, color: 'text-slate-600 dark:text-slate-300', label: 'TOML file' },
+  ini: { icon: VscSettingsGear, color: 'text-slate-600 dark:text-slate-300', label: 'INI file' },
+  env: {
+    icon: VscSettingsGear,
+    color: 'text-amber-700 dark:text-amber-300',
+    label: 'Environment file',
+  },
+  graphql: { icon: SiGraphql, color: 'text-pink-600', label: 'GraphQL file' },
+  gql: { icon: SiGraphql, color: 'text-pink-600', label: 'GraphQL file' },
+
+  // Programming Languages
+  py: { icon: SiPython, color: 'text-blue-500', label: 'Python file' },
+  pyc: { icon: SiPython, color: 'text-blue-400', label: 'Python compiled' },
+  pyw: { icon: SiPython, color: 'text-blue-500', label: 'Python Windows file' },
+  pyx: { icon: SiPython, color: 'text-blue-600', label: 'Cython file' },
+  pyi: { icon: SiPython, color: 'text-yellow-600', label: 'Python interface' },
+  go: { icon: SiGo, color: 'text-cyan-600', label: 'Go file' },
+  rs: { icon: SiRust, color: 'text-orange-700', label: 'Rust file' },
+  java: { icon: VscFileCode, color: 'text-red-600', label: 'Java file' },
+  class: { icon: VscFileCode, color: 'text-red-500', label: 'Java class file' },
+  jar: { icon: VscFileCode, color: 'text-red-700', label: 'Java archive' },
+  c: { icon: VscFileCode, color: 'text-blue-800', label: 'C file' },
+  cpp: { icon: SiCplusplus, color: 'text-blue-600', label: 'C++ file' },
+  cc: { icon: SiCplusplus, color: 'text-blue-600', label: 'C++ file' },
+  cxx: { icon: SiCplusplus, color: 'text-blue-600', label: 'C++ file' },
+  h: { icon: VscFileCode, color: 'text-purple-600', label: 'Header file' },
+  hpp: { icon: SiCplusplus, color: 'text-purple-600', label: 'C++ header' },
+  php: { icon: SiPhp, color: 'text-purple-600', label: 'PHP file' },
+  rb: { icon: SiRuby, color: 'text-red-600', label: 'Ruby file' },
+  swift: { icon: SiSwift, color: 'text-orange-600', label: 'Swift file' },
+  kt: { icon: SiKotlin, color: 'text-purple-600', label: 'Kotlin file' },
+  lua: { icon: SiLua, color: 'text-blue-800', label: 'Lua file' },
+  r: { icon: VscFileCode, color: 'text-blue-600', label: 'R file' },
+  dart: { icon: VscFileCode, color: 'text-blue-500', label: 'Dart file' },
+  scala: { icon: VscFileCode, color: 'text-red-600', label: 'Scala file' },
+  sh: { icon: VscTerminal, color: 'text-gray-600', label: 'Shell script' },
+  bash: { icon: VscTerminal, color: 'text-gray-600', label: 'Bash script' },
+  zsh: { icon: VscTerminal, color: 'text-gray-600', label: 'ZSH script' },
+  fish: { icon: VscTerminal, color: 'text-gray-600', label: 'Fish script' },
+  ps1: { icon: VscTerminal, color: 'text-blue-600', label: 'PowerShell script' },
+  bat: { icon: VscTerminal, color: 'text-gray-700', label: 'Batch file' },
+  cmd: { icon: VscTerminal, color: 'text-gray-700', label: 'Command file' },
+
+  // Database
+  sql: { icon: SiPostgresql, color: 'text-blue-600', label: 'SQL file' },
+  db: { icon: VscDatabase, color: 'text-gray-600', label: 'Database file' },
+  sqlite: { icon: VscDatabase, color: 'text-blue-600', label: 'SQLite database' },
+  sqlite3: { icon: VscDatabase, color: 'text-blue-600', label: 'SQLite database' },
+  mongodb: { icon: SiMongodb, color: 'text-green-600', label: 'MongoDB file' },
+  redis: { icon: SiRedis, color: 'text-red-600', label: 'Redis file' },
+
+  // Documentation
+  md: { icon: VscMarkdown, color: 'text-blue-600', label: 'Markdown file' },
+  mdx: { icon: VscMarkdown, color: 'text-blue-700', label: 'MDX file' },
+  rst: { icon: VscFileCode, color: 'text-gray-600', label: 'reStructuredText file' },
+  txt: { icon: VscFile, color: 'text-gray-500', label: 'Text file' },
+  pdf: { icon: VscFilePdf, color: 'text-red-600', label: 'PDF document' },
+  doc: { icon: VscFileCode, color: 'text-blue-700', label: 'Word document' },
+  docx: { icon: VscFileCode, color: 'text-blue-700', label: 'Word document' },
+  xls: { icon: VscTable, color: 'text-green-700', label: 'Excel spreadsheet' },
+  xlsx: { icon: VscTable, color: 'text-green-700', label: 'Excel spreadsheet' },
+  csv: { icon: VscTable, color: 'text-green-600', label: 'CSV file' },
+
+  // Images
+  png: { icon: FaFileImage, color: 'text-purple-500', label: 'PNG image' },
+  jpg: { icon: FaFileImage, color: 'text-purple-500', label: 'JPEG image' },
+  jpeg: { icon: FaFileImage, color: 'text-purple-500', label: 'JPEG image' },
+  gif: { icon: FaFileImage, color: 'text-purple-500', label: 'GIF image' },
+  webp: { icon: FaFileImage, color: 'text-purple-500', label: 'WebP image' },
+  svg: { icon: VscFileCode, color: 'text-orange-500', label: 'SVG image' },
+  ico: { icon: FaFileImage, color: 'text-purple-400', label: 'Icon file' },
+  bmp: { icon: FaFileImage, color: 'text-purple-400', label: 'Bitmap image' },
+  tiff: { icon: FaFileImage, color: 'text-purple-400', label: 'TIFF image' },
+
+  // Media
+  mp3: { icon: VscFileMedia, color: 'text-purple-600', label: 'MP3 audio' },
+  mp4: { icon: VscFileMedia, color: 'text-purple-600', label: 'MP4 video' },
+  avi: { icon: VscFileMedia, color: 'text-purple-600', label: 'AVI video' },
+  mov: { icon: VscFileMedia, color: 'text-purple-600', label: 'MOV video' },
+  webm: { icon: VscFileMedia, color: 'text-purple-600', label: 'WebM video' },
+  wav: { icon: VscFileMedia, color: 'text-purple-600', label: 'WAV audio' },
+  flac: { icon: VscFileMedia, color: 'text-purple-600', label: 'FLAC audio' },
+  ogg: { icon: VscFileMedia, color: 'text-purple-600', label: 'OGG audio' },
+
+  // Archives
+  zip: { icon: VscFileZip, color: 'text-gray-600', label: 'ZIP archive' },
+  rar: { icon: VscFileZip, color: 'text-gray-600', label: 'RAR archive' },
+  tar: { icon: VscFileZip, color: 'text-gray-600', label: 'TAR archive' },
+  gz: { icon: VscFileZip, color: 'text-gray-600', label: 'GZIP archive' },
+  '7z': { icon: VscFileZip, color: 'text-gray-600', label: '7-Zip archive' },
+  bz2: { icon: VscFileZip, color: 'text-gray-600', label: 'BZIP2 archive' },
+  xz: { icon: VscFileZip, color: 'text-gray-600', label: 'XZ archive' },
+
+  // Security
+  key: { icon: VscKey, color: 'text-yellow-600', label: 'Key file' },
+  pem: { icon: VscKey, color: 'text-yellow-600', label: 'PEM certificate' },
+  crt: { icon: VscKey, color: 'text-yellow-600', label: 'Certificate' },
+  cer: { icon: VscKey, color: 'text-yellow-600', label: 'Certificate' },
+  pub: { icon: VscKey, color: 'text-green-600', label: 'Public key' },
+  lock: { icon: VscLock, color: 'text-red-600', label: 'Lock file' },
+
+  // Binary
+  exe: { icon: VscFileBinary, color: 'text-gray-700', label: 'Executable' },
+  dll: { icon: VscFileBinary, color: 'text-gray-700', label: 'DLL file' },
+  so: { icon: VscFileBinary, color: 'text-gray-700', label: 'Shared object' },
+  dylib: { icon: VscFileBinary, color: 'text-gray-700', label: 'Dynamic library' },
+  bin: { icon: VscFileBinary, color: 'text-gray-700', label: 'Binary file' },
+  wasm: { icon: VscFileBinary, color: 'text-purple-600', label: 'WebAssembly' },
+
+  // Misc
+  log: { icon: VscFile, color: 'text-gray-600', label: 'Log file' },
+  bak: { icon: VscFile, color: 'text-gray-500', label: 'Backup file' },
+  tmp: { icon: VscFile, color: 'text-gray-500', label: 'Temporary file' },
+  cache: { icon: VscFile, color: 'text-gray-500', label: 'Cache file' },
+  test: { icon: VscSymbolMisc, color: 'text-green-600', label: 'Test file' },
+  spec: { icon: VscSymbolMisc, color: 'text-green-600', label: 'Spec file' },
+};
+
+// Error boundary for icon failures
+class IconErrorBoundary extends Component<
+  { children: ReactNode; fallback?: ReactNode },
+  { hasError: boolean }
+> {
+  constructor(props: { children: ReactNode; fallback?: ReactNode }) {
+    super(props);
+    this.state = { hasError: false };
+  }
+
+  static getDerivedStateFromError(): { hasError: boolean } {
+    return { hasError: true };
+  }
+
+  componentDidCatch(error: Error, errorInfo: ErrorInfo): void {
+    log.debug('Icon loading error (suppressed by error boundary):', error, errorInfo);
+  }
+
+  render(): ReactNode {
+    if (this.state.hasError) {
+      return (
+        this.props.fallback || (
+          <VscError className="h-4 w-4 text-red-500" aria-label="Icon load error" />
+        )
+      );
+    }
+    return this.props.children;
+  }
+}
+
+interface FileIconProps {
+  filename: string;
+  isDirectory: boolean;
+  isExpanded?: boolean;
+  className?: string;
+  size?: number;
+  isLoading?: boolean;
+}
+
+// Memoized icon component for performance
+export const FileIcon = memo<FileIconProps>(
+  ({ filename, isDirectory, isExpanded = false, className = '', size = 16, isLoading = false }) => {
+    // Loading state
+    if (isLoading) {
+      return (
+        <div
+          className={`${className} animate-pulse rounded bg-gray-300 dark:bg-gray-600`}
+          style={{ width: size, height: size }}
+          role="img"
+          aria-label="Loading file icon"
+        />
+      );
+    }
+
+    const iconProps = {
+      className: `${className}`,
+      size,
+      style: { flexShrink: 0 },
+      role: 'img' as const,
+    };
+
+    // Handle directories
+    if (isDirectory) {
+      const label = isExpanded ? 'Expanded folder' : 'Folder';
+      const Icon = isExpanded ? VscFolderOpened : VscFolder;
+      return (
+        <IconErrorBoundary>
+          <Icon
+            {...iconProps}
+            className={`${className} text-blue-500/80`}
+            aria-label={label}
+            title={label}
+          />
+        </IconErrorBoundary>
+      );
+    }
+
+    const name = filename.toLowerCase();
+    const ext = filename.split('.').pop()?.toLowerCase();
+
+    // Get icon configuration
+    let iconConfig = SPECIAL_FILES[name];
+
+    // Check for special file patterns
+    if (!iconConfig) {
+      if (name.startsWith('dockerfile')) {
+        iconConfig = { icon: SiDocker, color: 'text-blue-500', label: 'Docker file' };
+      } else if (name.startsWith('.env')) {
+        iconConfig = {
+          icon: VscSettingsGear,
+          color: 'text-amber-700 dark:text-amber-300',
+          label: 'Environment file',
+        };
+      } else if (ext && EXTENSION_ICONS[ext]) {
+        iconConfig = EXTENSION_ICONS[ext];
+      } else if (name.includes('.test.') || name.includes('.spec.')) {
+        iconConfig = { icon: VscSymbolMisc, color: 'text-green-600', label: 'Test file' };
+      } else if (name.includes('.stories.')) {
+        iconConfig = { icon: SiStorybook, color: 'text-pink-600', label: 'Storybook file' };
+      } else {
+        // Default fallback
+        iconConfig = { icon: VscFile, color: 'text-gray-500', label: 'File' };
+      }
+    }
+
+    const { icon: IconComponent, color, label } = iconConfig;
+    const ariaLabel = `${label}: ${filename}`;
+
+    return (
+      <IconErrorBoundary
+        fallback={
+          <VscFile {...iconProps} className={`${className} text-gray-500`} aria-label={ariaLabel} />
+        }
+      >
+        <IconComponent
+          {...iconProps}
+          className={`${className} ${color}`}
+          aria-label={ariaLabel}
+          title={ariaLabel}
+        />
+      </IconErrorBoundary>
+    );
+  }
+);
+
+FileIcon.displayName = 'FileIcon';
+
+export default FileIcon;
diff --git a/src/renderer/features/tasks/components/inline-pr-selector.tsx b/src/renderer/features/tasks/components/inline-pr-selector.tsx
new file mode 100644
index 0000000000..c6fab54036
--- /dev/null
+++ b/src/renderer/features/tasks/components/inline-pr-selector.tsx
@@ -0,0 +1,219 @@
+import { useQuery } from '@tanstack/react-query';
+import { Check, ChevronDown } from 'lucide-react';
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { type PullRequest } from '@shared/pull-requests';
+import { rpc } from '@renderer/lib/ipc';
+import { InputGroup, InputGroupAddon, InputGroupInput } from '@renderer/lib/ui/input-group';
+import { Popover, PopoverContent, PopoverTrigger } from '@renderer/lib/ui/popover';
+import { ShortcutHint } from '@renderer/lib/ui/shortcut-hint';
+import { cn } from '@renderer/utils/utils';
+
+type StatusFilter = 'open' | 'not-open';
+
+export interface InlinePrSelectorProps {
+  value: PullRequest | null;
+  onValueChange: (pr: PullRequest | null) => void;
+  projectId?: string;
+  repositoryUrl?: string;
+  disabled?: boolean;
+}
+
+function PrRow({ pr }: { pr: PullRequest }) {
+  return (
+    <div className="flex flex-col min-w-0 gap-0.5">
+      <div className="flex items-center gap-1.5 min-w-0">
+        <span className="font-mono text-xs text-foreground-muted shrink-0">
+          {pr.identifier ?? ''}
+        </span>
+        {pr.isDraft && (
+          <span className="text-xs text-foreground-muted border border-border rounded px-1 shrink-0">
+            Draft
+          </span>
+        )}
+        <span className="truncate text-sm">{pr.title}</span>
+      </div>
+      <div className="flex items-center gap-1 text-xs text-foreground-muted">
+        <code className="text-xs">{pr.headRefName}</code>
+        {pr.author && (
+          <>
+            <span>·</span>
+            <span>{pr.author.userName}</span>
+          </>
+        )}
+      </div>
+    </div>
+  );
+}
+
+export function InlinePrSelector({
+  value,
+  onValueChange,
+  projectId,
+  repositoryUrl = '',
+  disabled,
+}: InlinePrSelectorProps) {
+  const [statusFilter, setStatusFilter] = useState<StatusFilter>('open');
+
+  const { data } = useQuery({
+    queryKey: ['pull-requests-inline', projectId, repositoryUrl, statusFilter],
+    queryFn: async () => {
+      const response = await rpc.pullRequests.listPullRequests(projectId!, {
+        limit: 50,
+        offset: 0,
+        filters: { status: statusFilter },
+      });
+      if (!response?.success) throw new Error(response?.error ?? 'Failed to load pull requests');
+      return (response.prs ?? []) as PullRequest[];
+    },
+    enabled: !!projectId && !!repositoryUrl,
+    staleTime: 30_000,
+  });
+
+  const [query, setQuery] = useState('');
+  const [highlightedIndex, setHighlightedIndex] = useState(0);
+  const inputRef = useRef<HTMLInputElement>(null);
+  const listRef = useRef<HTMLDivElement>(null);
+
+  const filteredPrs = useMemo(() => {
+    const prs = data ?? [];
+    if (!query.trim()) return prs;
+    const lower = query.trim().toLowerCase();
+    return prs.filter(
+      (pr) =>
+        pr.title.toLowerCase().includes(lower) ||
+        pr.headRefName.toLowerCase().includes(lower) ||
+        (pr.identifier ?? '').toLowerCase().includes(lower)
+    );
+  }, [data, query]);
+
+  useEffect(() => {
+    const list = listRef.current;
+    if (!list) return;
+    const item = list.children[highlightedIndex] as HTMLElement | undefined;
+    item?.scrollIntoView({ block: 'nearest' });
+  }, [highlightedIndex]);
+
+  const handleQueryChange = useCallback((e: React.ChangeEvent<HTMLInputElement>) => {
+    setQuery(e.target.value);
+    setHighlightedIndex(0);
+  }, []);
+
+  const handleKeyDown = useCallback(
+    (e: React.KeyboardEvent<HTMLInputElement>) => {
+      if (filteredPrs.length === 0) return;
+      switch (e.key) {
+        case 'ArrowDown':
+          e.preventDefault();
+          setHighlightedIndex((prev) => Math.min(prev + 1, filteredPrs.length - 1));
+          break;
+        case 'ArrowUp':
+          e.preventDefault();
+          setHighlightedIndex((prev) => Math.max(prev - 1, 0));
+          break;
+        case 'Enter': {
+          e.preventDefault();
+          const pr = filteredPrs[highlightedIndex];
+          if (pr) onValueChange(value?.url === pr.url ? null : pr);
+          break;
+        }
+        case 'Escape':
+          e.preventDefault();
+          if (query) {
+            setQuery('');
+            setHighlightedIndex(0);
+          }
+          break;
+      }
+    },
+    [filteredPrs, highlightedIndex, value, query, onValueChange]
+  );
+
+  return (
+    <div
+      className={cn(
+        'flex flex-col min-w-0 rounded-md border border-input overflow-hidden',
+        disabled && 'pointer-events-none'
+      )}
+    >
+      <InputGroup className="rounded-none border-0 border-b border-input shadow-none has-[[data-slot=input-group-control]:focus-visible]:ring-0 has-[[data-slot=input-group-control]:focus-visible]:border-input">
+        <InputGroupInput
+          ref={inputRef}
+          value={query}
+          onChange={handleQueryChange}
+          onKeyDown={handleKeyDown}
+          placeholder="Search pull requests…"
+          autoFocus
+        />
+        <InputGroupAddon align="inline-end">
+          <Popover>
+            <PopoverTrigger className="flex items-center gap-1 text-sm text-foreground-muted hover:text-foreground">
+              {statusFilter === 'open' ? 'Open' : 'Closed'}
+              <ChevronDown className="size-3.5" />
+            </PopoverTrigger>
+            <PopoverContent align="end" className="w-36 p-1">
+              {(['open', 'not-open'] as const).map((s) => (
+                <button
+                  key={s}
+                  type="button"
+                  className="flex w-full items-center gap-2 rounded px-2 py-1.5 text-sm hover:bg-muted"
+                  onClick={() => {
+                    setStatusFilter(s);
+                    setQuery('');
+                    setHighlightedIndex(0);
+                  }}
+                >
+                  <span className="flex-1 text-left">{s === 'open' ? 'Open' : 'Closed'}</span>
+                  {statusFilter === s && <Check className="size-3.5 shrink-0 text-foreground" />}
+                </button>
+              ))}
+            </PopoverContent>
+          </Popover>
+        </InputGroupAddon>
+      </InputGroup>
+
+      <div ref={listRef} className="overflow-y-auto overflow-x-hidden h-52 p-1">
+        {filteredPrs.length === 0 ? (
+          <div className="py-6 text-center text-sm text-muted-foreground">
+            {query
+              ? 'No pull requests found'
+              : statusFilter === 'open'
+                ? 'No open pull requests to show'
+                : 'No closed pull requests to show'}
+          </div>
+        ) : (
+          filteredPrs.map((pr, index) => {
+            const isSelected = value?.url === pr.url;
+            const isHighlighted = index === highlightedIndex;
+            return (
+              <button
+                key={pr.url}
+                type="button"
+                className={cn(
+                  'relative flex min-w-0 w-full cursor-default items-center gap-2 rounded-sm py-1.5 pl-2 pr-8 text-sm outline-none select-none',
+                  isHighlighted && 'bg-background-2',
+                  isSelected && 'bg-background-2'
+                )}
+                onMouseEnter={() => setHighlightedIndex(index)}
+                onClick={() => onValueChange(isSelected ? null : pr)}
+              >
+                <PrRow pr={pr} />
+                {isSelected && (
+                  <Check className="absolute right-2 size-3.5 shrink-0 text-foreground-muted" />
+                )}
+              </button>
+            );
+          })
+        )}
+      </div>
+
+      <div className="flex items-center justify-between h-6 px-2 text-xs bg-background-1 border-t border-border">
+        <div className="text-foreground-muted">Navigate with arrow keys</div>
+        <div className="text-foreground-muted">
+          <button className="flex items-center gap-2">
+            Select PR <ShortcutHint settingsKey="confirm" />
+          </button>
+        </div>
+      </div>
+    </div>
+  );
+}
diff --git a/src/renderer/features/tasks/components/issue-selector/inline-issue-selector.tsx b/src/renderer/features/tasks/components/issue-selector/inline-issue-selector.tsx
new file mode 100644
index 0000000000..e88faed05c
--- /dev/null
+++ b/src/renderer/features/tasks/components/issue-selector/inline-issue-selector.tsx
@@ -0,0 +1,204 @@
+import { Check, Loader2 } from 'lucide-react';
+import { useCallback, useEffect, useRef, useState } from 'react';
+import type { Issue } from '@shared/tasks';
+import {
+  ISSUE_PROVIDER_META,
+  ISSUE_PROVIDER_ORDER,
+} from '@renderer/features/integrations/issue-provider-meta';
+import { InputGroup, InputGroupAddon, InputGroupInput } from '@renderer/lib/ui/input-group';
+import { Select, SelectContent, SelectItem, SelectTrigger } from '@renderer/lib/ui/select';
+import { ShortcutHint } from '@renderer/lib/ui/shortcut-hint';
+import { cn } from '@renderer/utils/utils';
+import { ConnectIssueIntegrationPlaceholder, IssueRow, ProviderLogo } from './issue-selector';
+import { useIssueSearch } from './useIssueSearch';
+
+export interface InlineIssueSelectorProps {
+  value: Issue | null;
+  onValueChange: (issue: Issue | null) => void;
+  projectId?: string;
+  nameWithOwner?: string;
+  projectPath?: string;
+  disabled?: boolean;
+}
+
+export function InlineIssueSelector({
+  value,
+  onValueChange,
+  projectId,
+  nameWithOwner = '',
+  projectPath = '',
+  disabled,
+}: InlineIssueSelectorProps) {
+  const {
+    issues,
+    issueProvider,
+    hasAnyIntegration,
+    isProviderLoading,
+    isProviderDisabled,
+    connectedProviderCount,
+    handleSetSearchTerm,
+    setSelectedIssueProvider,
+  } = useIssueSearch(nameWithOwner, projectPath, projectId);
+
+  const [query, setQuery] = useState('');
+  const [highlightedIndex, setHighlightedIndex] = useState(0);
+  const inputRef = useRef<HTMLInputElement>(null);
+  const listRef = useRef<HTMLDivElement>(null);
+
+  // Scroll highlighted item into view whenever it changes
+  useEffect(() => {
+    const list = listRef.current;
+    if (!list) return;
+    const item = list.children[highlightedIndex] as HTMLElement | undefined;
+    item?.scrollIntoView({ block: 'nearest' });
+  }, [highlightedIndex]);
+
+  const handleQueryChange = useCallback(
+    (e: React.ChangeEvent<HTMLInputElement>) => {
+      const val = e.target.value;
+      setQuery(val);
+      handleSetSearchTerm(val);
+      setHighlightedIndex(0);
+    },
+    [handleSetSearchTerm]
+  );
+
+  const handleProviderChange = useCallback(
+    (provider: Issue['provider']) => {
+      setSelectedIssueProvider(provider);
+      if (value?.provider !== provider) {
+        onValueChange(null);
+      }
+      setHighlightedIndex(0);
+      requestAnimationFrame(() => inputRef.current?.focus());
+    },
+    [setSelectedIssueProvider, value, onValueChange]
+  );
+
+  const handleKeyDown = useCallback(
+    (e: React.KeyboardEvent<HTMLInputElement>) => {
+      if (issues.length === 0) return;
+      switch (e.key) {
+        case 'ArrowDown':
+          e.preventDefault();
+          setHighlightedIndex((prev) => Math.min(prev + 1, issues.length - 1));
+          break;
+        case 'ArrowUp':
+          e.preventDefault();
+          setHighlightedIndex((prev) => Math.max(prev - 1, 0));
+          break;
+        case 'Enter': {
+          e.preventDefault();
+          const issue = issues[highlightedIndex];
+          if (issue) onValueChange(issue === value ? null : issue);
+          break;
+        }
+        case 'Escape':
+          e.preventDefault();
+          if (query) {
+            setQuery('');
+            handleSetSearchTerm('');
+            setHighlightedIndex(0);
+          }
+          break;
+      }
+    },
+    [issues, highlightedIndex, value, query, onValueChange, handleSetSearchTerm]
+  );
+
+  const providerAddon = issueProvider ? (
+    isProviderLoading ? (
+      <Loader2 className="h-3.5 w-3.5 animate-spin text-foreground/60" />
+    ) : connectedProviderCount > 1 ? (
+      <Select
+        value={issueProvider}
+        onValueChange={(v) => v && handleProviderChange(v as Issue['provider'])}
+      >
+        <SelectTrigger
+          showChevron={false}
+          className="h-6 gap-0 border-none bg-transparent px-1.5 shadow-none focus:ring-0"
+        >
+          <ProviderLogo provider={issueProvider} className="h-3.5 w-3.5" />
+        </SelectTrigger>
+        <SelectContent>
+          {ISSUE_PROVIDER_ORDER.map((p) => (
+            <SelectItem key={p} value={p} disabled={isProviderDisabled(p)}>
+              <ProviderLogo provider={p} className="h-3.5 w-3.5" />
+              <span>{ISSUE_PROVIDER_META[p].displayName}</span>
+            </SelectItem>
+          ))}
+        </SelectContent>
+      </Select>
+    ) : (
+      <span className="mx-1.5 flex items-center">
+        <ProviderLogo provider={issueProvider} className="h-3.5 w-3.5" />
+      </span>
+    )
+  ) : null;
+
+  if (!hasAnyIntegration) {
+    return <ConnectIssueIntegrationPlaceholder />;
+  }
+
+  return (
+    <div
+      className={cn(
+        'flex flex-col min-w-0 rounded-md border border-input overflow-hidden',
+        disabled && 'pointer-events-none'
+      )}
+    >
+      {/* Search row */}
+      <InputGroup className="rounded-none border-0 border-b border-input shadow-none has-[[data-slot=input-group-control]:focus-visible]:ring-0 has-[[data-slot=input-group-control]:focus-visible]:border-input">
+        {providerAddon && <InputGroupAddon align="inline-start">{providerAddon}</InputGroupAddon>}
+        <InputGroupInput
+          ref={inputRef}
+          value={query}
+          onChange={handleQueryChange}
+          onKeyDown={handleKeyDown}
+          placeholder={`Search ${issueProvider ?? 'issues'}…`}
+          autoFocus
+        />
+      </InputGroup>
+
+      {/* Issue list */}
+      <div ref={listRef} className="overflow-y-auto overflow-x-hidden h-52 p-1">
+        {issues.length === 0 ? (
+          <div className="text-center text-sm text-foreground-passive flex items-center justify-center h-full">
+            {query ? 'No issues found' : `No ${issueProvider} issues to show`}
+          </div>
+        ) : (
+          issues.map((issue, index) => {
+            const isSelected = value?.identifier === issue.identifier;
+            const isHighlighted = index === highlightedIndex;
+            return (
+              <button
+                key={issue.identifier}
+                type="button"
+                className={cn(
+                  'relative flex min-w-0 w-full cursor-default items-center gap-2 rounded-sm py-1.5 pl-2 pr-8 text-sm outline-none select-none',
+                  isHighlighted && !isSelected && 'bg-background-2',
+                  isSelected && 'bg-background-2'
+                )}
+                onMouseEnter={() => setHighlightedIndex(index)}
+                onClick={() => onValueChange(isSelected ? null : issue)}
+              >
+                <IssueRow issue={issue} />
+                {isSelected && (
+                  <Check className="absolute right-2 size-3.5 shrink-0 text-foreground-muted" />
+                )}
+              </button>
+            );
+          })
+        )}
+      </div>
+      <div className="flex items-center justify-between h-6 px-2 text-xs bg-background-1 border-t border-border">
+        <div className="text-foreground-muted">Navigate with arrow keys</div>
+        <div className="text-foreground-muted">
+          <button className="flex items-center gap-2">
+            Select Issue <ShortcutHint settingsKey="confirm" />
+          </button>{' '}
+        </div>
+      </div>
+    </div>
+  );
+}
diff --git a/src/renderer/features/tasks/components/issue-selector/issue-selector.tsx b/src/renderer/features/tasks/components/issue-selector/issue-selector.tsx
new file mode 100644
index 0000000000..cbe8488d56
--- /dev/null
+++ b/src/renderer/features/tasks/components/issue-selector/issue-selector.tsx
@@ -0,0 +1,303 @@
+import { ExternalLink, Loader2 } from 'lucide-react';
+import { forwardRef, useCallback, useRef, useState } from 'react';
+import type { Issue } from '@shared/tasks';
+import {
+  ISSUE_PROVIDER_META,
+  ISSUE_PROVIDER_ORDER,
+} from '@renderer/features/integrations/issue-provider-meta';
+import { rpc } from '@renderer/lib/ipc';
+import { useNavigate } from '@renderer/lib/layout/navigation-provider';
+import { Badge } from '@renderer/lib/ui/badge';
+import { Button } from '@renderer/lib/ui/button';
+import {
+  Combobox,
+  ComboboxContent,
+  ComboboxEmpty,
+  ComboboxInput,
+  ComboboxItem,
+  ComboboxList,
+  ComboboxTrigger,
+  ComboboxValue,
+} from '@renderer/lib/ui/combobox';
+import { Select, SelectContent, SelectItem, SelectTrigger } from '@renderer/lib/ui/select';
+import { Tooltip, TooltipContent, TooltipTrigger } from '@renderer/lib/ui/tooltip';
+import { cn } from '@renderer/utils/utils';
+import { useIssueSearch } from './useIssueSearch';
+
+function getStatusColorClass(status?: string) {
+  if (!status) return '';
+  const s = status.toLowerCase();
+  if (
+    s.includes('done') ||
+    s.includes('closed') ||
+    s.includes('resolved') ||
+    s.includes('completed')
+  )
+    return 'bg-emerald-500 ';
+  if (s.includes('progress') || s.includes('review') || s.includes('open')) return 'bg-yellow-500';
+  if (s.includes('blocked') || s.includes('cancelled') || s.includes('canceled'))
+    return 'bg-red-500';
+  return 'bg-gray-300';
+}
+
+export function IssueIdentifier({ identifier }: { identifier: string }) {
+  return (
+    <span className="shrink-0 whitespace-nowrap font-medium text-muted-foreground group-hover:text-muted-foreground text-xs font-mono">
+      {identifier}
+    </span>
+  );
+}
+
+export const StatusDot = forwardRef<HTMLSpanElement, { status?: string }>(
+  ({ status, ...props }, ref) => {
+    if (!status) return null;
+    const color = getStatusColorClass(status);
+    return (
+      <span
+        ref={ref}
+        {...props}
+        className={cn('inline-block h-1.5 w-1.5 shrink-0 rounded-full', color)}
+      />
+    );
+  }
+);
+
+export function ProviderLogo({
+  provider,
+  className,
+}: {
+  provider: Issue['provider'];
+  className?: string;
+}) {
+  const meta = ISSUE_PROVIDER_META[provider];
+  const src = meta.logo;
+  const alt = meta.displayName;
+  return <img src={src} alt={alt} className={className ?? 'h-3.5 w-3.5'} />;
+}
+
+export function IssueRow({ issue }: { issue: Issue }) {
+  return (
+    <span className="flex min-w-0 items-center gap-2 w-full">
+      <Tooltip>
+        <TooltipTrigger render={<StatusDot status={issue.status} />} />
+        <TooltipContent>{issue.status}</TooltipContent>
+      </Tooltip>
+      <IssueIdentifier identifier={issue.identifier} />
+      {issue.title ? <span className="truncate text-foreground">{issue.title}</span> : null}
+    </span>
+  );
+}
+
+export interface IssueSelectorProps {
+  value: Issue | null;
+  onValueChange: (issue: Issue | null) => void;
+  projectId?: string;
+  nameWithOwner: string;
+  projectPath?: string;
+}
+
+export function IssueSelector({
+  projectId,
+  nameWithOwner,
+  projectPath = '',
+  value,
+  onValueChange,
+}: IssueSelectorProps) {
+  const {
+    issues,
+    issueProvider,
+    hasAnyIntegration,
+    isProviderLoading,
+    isProviderDisabled,
+    connectedProviderCount,
+    handleSetSearchTerm,
+    setSelectedIssueProvider,
+  } = useIssueSearch(nameWithOwner, projectPath, projectId);
+
+  const [comboboxOpen, setComboboxOpen] = useState(false);
+  const providerSelectOpenRef = useRef(false);
+  const inputRef = useRef<HTMLInputElement>(null);
+
+  const handleSelectIssueProvider = useCallback(
+    (provider: Issue['provider']) => {
+      setSelectedIssueProvider(provider);
+      if (value?.provider !== provider) {
+        onValueChange(null);
+      }
+    },
+    [setSelectedIssueProvider, value, onValueChange]
+  );
+
+  const leftAddon = issueProvider ? (
+    isProviderLoading ? (
+      <Loader2 className="h-3.5 w-3.5 animate-spin text-foreground/60" />
+    ) : connectedProviderCount > 1 ? (
+      <Select
+        value={issueProvider}
+        onValueChange={(v) => v && handleSelectIssueProvider(v as Issue['provider'])}
+        onOpenChange={(open) => {
+          providerSelectOpenRef.current = open;
+          if (open) {
+            setComboboxOpen(true);
+          } else {
+            requestAnimationFrame(() => inputRef.current?.focus());
+          }
+        }}
+      >
+        <SelectTrigger
+          showChevron={false}
+          className="h-6 gap-0 border-none bg-transparent px-1.5 shadow-none focus:ring-0"
+        >
+          <ProviderLogo provider={issueProvider} className="h-3.5 w-3.5" />
+        </SelectTrigger>
+        <SelectContent>
+          {ISSUE_PROVIDER_ORDER.map((p) => (
+            <SelectItem key={p} value={p} disabled={isProviderDisabled(p)}>
+              <ProviderLogo provider={p} className="h-3.5 w-3.5" />
+              <span>{ISSUE_PROVIDER_META[p].displayName}</span>
+            </SelectItem>
+          ))}
+        </SelectContent>
+      </Select>
+    ) : (
+      <span className="mx-1.5 flex items-center">
+        <ProviderLogo provider={issueProvider} className="h-3.5 w-3.5" />
+      </span>
+    )
+  ) : null;
+
+  return (
+    <div className="min-w-0 max-w-full overflow-hidden">
+      {hasAnyIntegration ? (
+        <Combobox
+          autoHighlight
+          items={issues}
+          filter={null}
+          itemToStringLabel={(issue: Issue | null) =>
+            issue ? `${issue.identifier} ${issue.title}` : ''
+          }
+          value={value}
+          onValueChange={(next: Issue | null) => onValueChange(next)}
+          onInputValueChange={(val: string, { reason }: { reason: string }) => {
+            if (reason !== 'item-press') handleSetSearchTerm(val);
+          }}
+          disabled={!hasAnyIntegration}
+          open={comboboxOpen}
+          onOpenChange={(open) => {
+            if (!open && providerSelectOpenRef.current) return;
+            setComboboxOpen(open);
+          }}
+        >
+          <ComboboxTrigger
+            render={
+              <button
+                className={cn(
+                  'flex min-w-0 w-full items-start border border-border hover:bg-muted/30 hover:shadow-xs rounded-md p-3 text-left text-sm outline-none',
+                  !value && 'border-dashed'
+                )}
+              >
+                <ComboboxValue
+                  placeholder={
+                    <div className="text-foreground-passive justify-center w-full text-sm text-center flex items-center gap-1 h-6">
+                      Click to link an issue
+                    </div>
+                  }
+                >
+                  {value ? <SelectedIssueValue issue={value} /> : null}
+                </ComboboxValue>
+              </button>
+            }
+          />
+          <ComboboxContent
+            side="bottom"
+            className="min-w-(--anchor-width) pb-1"
+            collisionAvoidance={{ side: 'shift' }}
+          >
+            <ComboboxInput
+              leftAddon={leftAddon}
+              inputRef={inputRef}
+              showClear={!!value}
+              showTrigger={false}
+              placeholder={`Search ${issueProvider ?? 'issues'}…`}
+              disabled={!hasAnyIntegration}
+            />
+            <ComboboxEmpty>
+              <span className="text-muted-foreground">No issues found</span>
+            </ComboboxEmpty>
+            <ComboboxList>
+              {(issue: Issue) => (
+                <ComboboxItem key={issue.identifier} value={issue} className="pr-2">
+                  <IssueRow issue={issue} />
+                </ComboboxItem>
+              )}
+            </ComboboxList>
+          </ComboboxContent>
+        </Combobox>
+      ) : (
+        <ConnectIssueIntegrationPlaceholder />
+      )}
+    </div>
+  );
+}
+
+export function SelectedIssueValue({ issue }: { issue: Issue }) {
+  return (
+    <div className="flex flex-col gap-2 w-full">
+      <div className="flex items-center justify-between w-full ">
+        <div className="flex items-center gap-2">
+          <ProviderLogo provider={issue.provider} className="h-3.5 w-3.5" />
+          <span>{`${ISSUE_PROVIDER_META[issue.provider].displayName} issue`}</span>
+          <IssueIdentifier identifier={issue.identifier} />
+        </div>
+        <Button
+          variant="ghost"
+          size="icon-xs"
+          disabled={!issue.url}
+          onClick={() => issue.url && rpc.app.openExternal(issue.url)}
+        >
+          <ExternalLink className="size-3" />
+        </Button>
+      </div>
+      {issue.title ? (
+        <div className="min-w-0 truncate text-muted-foreground">{issue.title}</div>
+      ) : null}
+      <div className="flex items-center justify-between gap-2 relative">
+        <Badge variant="outline" className="flex items-center gap-2 rounded-md font-normal text-xs">
+          <StatusDot status={issue.status} />
+          {issue.status}
+        </Badge>
+      </div>
+    </div>
+  );
+}
+
+export function ConnectIssueIntegrationPlaceholder() {
+  const { navigate } = useNavigate();
+
+  return (
+    <div className="flex flex-col gap-5 w-full border border-border border-dashed items-center justify-center rounded-md p-8">
+      <div className="flex items-center justify-center [&>span]:ring-2 [&>span]:ring-background-quaternary [&>span:not(:first-child)]:-ml-1.5">
+        {ISSUE_PROVIDER_ORDER.map((provider) => (
+          <span
+            key={provider}
+            className="relative flex items-center justify-center size-8 rounded-full bg-background-quaternary-2 overflow-hidden"
+          >
+            <ProviderLogo provider={provider} className="size-4" />
+          </span>
+        ))}
+      </div>
+      <p className="text-foreground-muted font-nomral text-sm text-center">
+        Connect with one of our issue integrations to link your issues to your tasks and use them as
+        context in your conversations.
+      </p>
+      <Button
+        variant="outline"
+        size="xs"
+        className="w-fit"
+        onClick={() => navigate('settings', { tab: 'integrations' })}
+      >
+        Configure integrations
+      </Button>
+    </div>
+  );
+}
diff --git a/src/renderer/features/tasks/components/issue-selector/useIssueSearch.ts b/src/renderer/features/tasks/components/issue-selector/useIssueSearch.ts
new file mode 100644
index 0000000000..a83c946041
--- /dev/null
+++ b/src/renderer/features/tasks/components/issue-selector/useIssueSearch.ts
@@ -0,0 +1,82 @@
+import { useCallback, useMemo, useState } from 'react';
+import type { ConnectionStatus } from '@shared/issue-providers';
+import type { Issue } from '@shared/tasks';
+import { useIntegrationsContext } from '@renderer/features/integrations/integrations-provider';
+import { ISSUE_PROVIDER_ORDER } from '@renderer/features/integrations/issue-provider-meta';
+import { useIssues } from '@renderer/features/integrations/use-issues';
+
+export type UseIssueSearchResult = ReturnType<typeof useIssueSearch>;
+
+function isProviderUsable(
+  status: ConnectionStatus | undefined,
+  context: { projectPath?: string; nameWithOwner?: string }
+): boolean {
+  if (!status?.connected) return false;
+  if (status.capabilities.requiresProjectPath && !context.projectPath) return false;
+  if (status.capabilities.requiresNameWithOwner && !context.nameWithOwner) return false;
+  return true;
+}
+
+export function useIssueSearch(nameWithOwner: string, projectPath = '', projectId?: string) {
+  const { connectionStatus, isCheckingConnections } = useIntegrationsContext();
+  const context = useMemo(() => ({ projectPath, nameWithOwner }), [projectPath, nameWithOwner]);
+
+  const [selectedIssueProvider, setSelectedIssueProvider] = useState<Issue['provider'] | null>(
+    null
+  );
+
+  const connectedProviders = useMemo(
+    () =>
+      ISSUE_PROVIDER_ORDER.filter((provider) =>
+        isProviderUsable(connectionStatus[provider], context)
+      ),
+    [connectionStatus, context]
+  );
+
+  const hasAnyIntegration = connectedProviders.length > 0;
+
+  const issueProvider = useMemo(() => {
+    if (
+      selectedIssueProvider &&
+      isProviderUsable(connectionStatus[selectedIssueProvider], context)
+    ) {
+      return selectedIssueProvider;
+    }
+
+    return connectedProviders[0] ?? null;
+  }, [connectedProviders, connectionStatus, context, selectedIssueProvider]);
+
+  const issuesHook = useIssues(issueProvider, {
+    projectId,
+    nameWithOwner,
+    projectPath,
+    enabled: !!issueProvider,
+  });
+
+  const handleSetSearchTerm = useCallback(
+    (term: string) => {
+      if (!issueProvider) return;
+      issuesHook.setSearchTerm(term);
+    },
+    [issueProvider, issuesHook]
+  );
+
+  const isProviderDisabled = useCallback(
+    (provider: Issue['provider']) => !isProviderUsable(connectionStatus[provider], context),
+    [connectionStatus, context]
+  );
+
+  const isProviderLoading =
+    (!!issueProvider && (issuesHook.isLoading || issuesHook.isSearching)) || isCheckingConnections;
+
+  return {
+    issues: issuesHook.issues,
+    issueProvider,
+    hasAnyIntegration,
+    isProviderLoading,
+    isProviderDisabled,
+    connectedProviderCount: connectedProviders.length,
+    handleSetSearchTerm,
+    setSelectedIssueProvider,
+  };
+}
diff --git a/src/renderer/features/tasks/components/lifecycleStatusIndicator.tsx b/src/renderer/features/tasks/components/lifecycleStatusIndicator.tsx
new file mode 100644
index 0000000000..39c7f694f7
--- /dev/null
+++ b/src/renderer/features/tasks/components/lifecycleStatusIndicator.tsx
@@ -0,0 +1,152 @@
+import { useState } from 'react';
+import { TaskLifecycleStatus } from '@shared/tasks';
+import {
+  Combobox,
+  ComboboxCollection,
+  ComboboxContent,
+  ComboboxInput,
+  ComboboxItem,
+  ComboboxList,
+  ComboboxTrigger,
+} from '@renderer/lib/ui/combobox';
+import { cn } from '@renderer/utils/utils';
+
+type StatusOption = { value: TaskLifecycleStatus; label: string };
+
+const STATUS_OPTIONS: StatusOption[] = [
+  { value: 'in_progress', label: 'In Progress' },
+  { value: 'review', label: 'Review' },
+  { value: 'done', label: 'Done' },
+  { value: 'cancelled', label: 'Cancelled' },
+];
+
+function StatusIcon({ status, className }: { status: TaskLifecycleStatus; className?: string }) {
+  switch (status) {
+    case 'todo':
+      return (
+        <svg
+          viewBox="0 0 16 16"
+          fill="none"
+          className={cn(
+            'size-3 text-foreground-tertiary-muted hover:text-foreground-tertiary',
+            className
+          )}
+          strokeWidth="1.5"
+        >
+          <circle cx="8" cy="8" r="7" stroke="currentColor" strokeWidth="1.5" />
+        </svg>
+      );
+    case 'done':
+      return (
+        <svg
+          xmlns="http://www.w3.org/2000/svg"
+          stroke="currentColor"
+          fill="currentColor"
+          strokeWidth="1.5"
+          viewBox="0 0 512 512"
+          className={cn('size-3 fill-status-done hover:fill-status-done-hover', className)}
+          height="1em"
+          width="1em"
+        >
+          <path d="M504 256c0 136.967-111.033 248-248 248S8 392.967 8 256 119.033 8 256 8s248 111.033 248 248zM227.314 387.314l184-184c6.248-6.248 6.248-16.379 0-22.627l-22.627-22.627c-6.248-6.249-16.379-6.249-22.628 0L216 308.118l-70.059-70.059c-6.248-6.248-16.379-6.248-22.628 0l-22.627 22.627c-6.248 6.248-6.248 16.379 0 22.627l104 104c6.249 6.249 16.379 6.249 22.628.001z" />
+        </svg>
+      );
+    case 'cancelled':
+      return (
+        <svg
+          stroke="currentColor"
+          fill="currentColor"
+          strokeWidth="1.5"
+          viewBox="0 0 512 512"
+          className={cn('size-3 fill-status-canceled hover:fill-status-canceled-hover', className)}
+          height="1em"
+          width="1em"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path d="M256 512A256 256 0 1 0 256 0a256 256 0 1 0 0 512zM175 175c9.4-9.4 24.6-9.4 33.9 0l47 47 47-47c9.4-9.4 24.6-9.4 33.9 0s9.4 24.6 0 33.9l-47 47 47 47c9.4 9.4 9.4 24.6 0 33.9s-24.6 9.4-33.9 0l-47-47-47 47c-9.4 9.4-24.6 9.4-33.9 0s-9.4-24.6 0-33.9l47-47-47-47c-9.4-9.4-9.4-24.6 0-33.9z"></path>
+        </svg>
+      );
+    case 'in_progress':
+      return (
+        <svg
+          viewBox="0 0 16 16"
+          fill="currentColor"
+          className={cn(
+            'size-3 text-status-in-progress hover:text-status-in-progress-hover',
+            className
+          )}
+          strokeWidth="1.5"
+        >
+          <circle cx="8" cy="8" r="7" stroke="currentColor" strokeWidth="1.5" fill="none"></circle>
+          <path d="M 8 3 A 5 5 0 0 1 8 13 L 8 8 Z" fill="currentColor"></path>
+        </svg>
+      );
+    case 'review':
+      return (
+        <svg
+          viewBox="0 0 16 16"
+          fill="currentColor"
+          className={cn(
+            'size-3 text-status-in-review hover:text-status-in-review-hover',
+            className
+          )}
+          strokeWidth="1.5"
+        >
+          <circle cx="8" cy="8" r="7" stroke="currentColor" strokeWidth="1.5" fill="none"></circle>
+          <path d="M 8 3 A 5 5 0 1 1 3 8 L 8 8 Z" fill="currentColor"></path>
+        </svg>
+      );
+    default:
+      return null;
+  }
+}
+
+export function LifecycleStatusIndicator({
+  lifecycleStatus,
+  onLifecycleStatusChange,
+}: {
+  lifecycleStatus: TaskLifecycleStatus;
+  onLifecycleStatusChange: (lifecycleStatus: TaskLifecycleStatus) => void;
+}) {
+  const [open, setOpen] = useState(false);
+  const selectedOption =
+    STATUS_OPTIONS.find((o) => o.value === lifecycleStatus) ?? STATUS_OPTIONS[0];
+
+  return (
+    <Combobox
+      items={STATUS_OPTIONS}
+      value={selectedOption}
+      onValueChange={(item) => {
+        if (item) {
+          onLifecycleStatusChange(item.value);
+          setOpen(false);
+        }
+      }}
+      open={open}
+      onOpenChange={setOpen}
+      isItemEqualToValue={(a: StatusOption, b: StatusOption) => a.value === b.value}
+      filter={(item: StatusOption, query) => item.label.toLowerCase().includes(query.toLowerCase())}
+      autoHighlight
+    >
+      <ComboboxTrigger
+        className="w-6 h-6 flex items-center justify-center rounded-md hover:bg-background-tertiary-2 group-data-[active=true]/row:hover:bg-background-tertiary-3"
+        onMouseDown={(e) => e.preventDefault()}
+      >
+        <StatusIcon status={lifecycleStatus} />
+      </ComboboxTrigger>
+      <ComboboxContent className="w-40" align="start">
+        <ComboboxInput showTrigger={false} placeholder="Search status..." />
+        <ComboboxList className="py-1">
+          <ComboboxCollection>
+            {(item: StatusOption) => (
+              <ComboboxItem key={item.value} value={item}>
+                <StatusIcon status={item.value} className="shrink-0" />
+                {item.label}
+              </ComboboxItem>
+            )}
+          </ComboboxCollection>
+        </ComboboxList>
+      </ComboboxContent>
+    </Combobox>
+  );
+}
diff --git a/src/renderer/features/tasks/components/task-context-menu.tsx b/src/renderer/features/tasks/components/task-context-menu.tsx
new file mode 100644
index 0000000000..b93400c799
--- /dev/null
+++ b/src/renderer/features/tasks/components/task-context-menu.tsx
@@ -0,0 +1,76 @@
+import { Archive, Pencil, Pin, PinOff, RotateCcw, Trash2 } from 'lucide-react';
+import React from 'react';
+import {
+  ContextMenu,
+  ContextMenuContent,
+  ContextMenuItem,
+  ContextMenuSeparator,
+  ContextMenuTrigger,
+} from '@renderer/lib/ui/context-menu';
+
+interface TaskContextMenuProps {
+  children: React.ReactNode;
+  isPinned: boolean;
+  canPin: boolean;
+  isArchived: boolean;
+  onPin: () => void;
+  onUnpin: () => void;
+  onRename: () => void;
+  onArchive: () => void;
+  onRestore?: () => void;
+  onDelete: () => void;
+}
+
+export function TaskContextMenu({
+  children,
+  isPinned,
+  canPin,
+  isArchived,
+  onPin,
+  onUnpin,
+  onRename,
+  onArchive,
+  onRestore,
+  onDelete,
+}: TaskContextMenuProps) {
+  return (
+    <ContextMenu>
+      <ContextMenuTrigger>{children}</ContextMenuTrigger>
+      <ContextMenuContent>
+        {canPin &&
+          (isPinned ? (
+            <ContextMenuItem onClick={onUnpin}>
+              <PinOff className="size-4" />
+              Unpin task
+            </ContextMenuItem>
+          ) : (
+            <ContextMenuItem onClick={onPin}>
+              <Pin className="size-4" />
+              Pin task
+            </ContextMenuItem>
+          ))}
+        <ContextMenuItem onClick={onRename}>
+          <Pencil className="size-4" />
+          Rename
+        </ContextMenuItem>
+        {!isArchived && (
+          <ContextMenuItem onClick={onArchive}>
+            <Archive className="size-4" />
+            Archive
+          </ContextMenuItem>
+        )}
+        {isArchived && onRestore && (
+          <ContextMenuItem onClick={onRestore}>
+            <RotateCcw className="size-4" />
+            Restore
+          </ContextMenuItem>
+        )}
+        <ContextMenuSeparator />
+        <ContextMenuItem variant="destructive" onClick={onDelete}>
+          <Trash2 className="size-4" />
+          Delete
+        </ContextMenuItem>
+      </ContextMenuContent>
+    </ContextMenu>
+  );
+}
diff --git a/src/renderer/features/tasks/components/task-git-diff-stats.tsx b/src/renderer/features/tasks/components/task-git-diff-stats.tsx
new file mode 100644
index 0000000000..6a45aa5cd1
--- /dev/null
+++ b/src/renderer/features/tasks/components/task-git-diff-stats.tsx
@@ -0,0 +1,39 @@
+import { observer } from 'mobx-react-lite';
+import type { TaskStore } from '@renderer/features/tasks/stores/task';
+import { asProvisioned } from '@renderer/features/tasks/stores/task-selectors';
+import { cn } from '@renderer/utils/utils';
+
+/**
+ * Working-tree line add/remove totals for a provisioned task (same source as GitStore / diff UI).
+ * Renders nothing when unprovisioned, loading, in error, or clean.
+ */
+export const TaskGitDiffStats = observer(function TaskGitDiffStats({
+  task,
+  className,
+}: {
+  task: TaskStore;
+  className?: string;
+}) {
+  const git = asProvisioned(task)?.workspace.git;
+  const linesAdded = git?.totalLinesAdded ?? 0;
+  const linesDeleted = git?.totalLinesDeleted ?? 0;
+  const visible = git !== undefined && !git.error && (linesAdded > 0 || linesDeleted > 0);
+
+  if (!visible) return null;
+
+  return (
+    <span
+      className={cn(
+        'shrink-0 tabular-nums leading-none text-muted-foreground flex items-center gap-1 text-xs',
+        className
+      )}
+      aria-label={`${linesAdded} lines added, ${linesDeleted} lines removed`}
+    >
+      {linesAdded > 0 ? <span className="text-foreground-diff-added">+{linesAdded}</span> : null}
+      {linesAdded > 0 && linesDeleted > 0 ? ' ' : null}
+      {linesDeleted > 0 ? (
+        <span className="text-foreground-diff-deleted">-{linesDeleted}</span>
+      ) : null}
+    </span>
+  );
+});
diff --git a/src/renderer/features/tasks/conversations/comments-popover.tsx b/src/renderer/features/tasks/conversations/comments-popover.tsx
new file mode 100644
index 0000000000..bee57b9d91
--- /dev/null
+++ b/src/renderer/features/tasks/conversations/comments-popover.tsx
@@ -0,0 +1,133 @@
+import { ArrowUp, MessageSquare, Trash2 } from 'lucide-react';
+import { observer } from 'mobx-react-lite';
+import { useMemo, useState } from 'react';
+import type { DraftComment } from '@renderer/features/tasks/diff-view/stores/draft-comments-store';
+import { Button } from '@renderer/lib/ui/button';
+import { Popover, PopoverContent, PopoverTrigger } from '@renderer/lib/ui/popover';
+import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@renderer/lib/ui/tooltip';
+
+interface CommentsPopoverProps {
+  comments: DraftComment[];
+  canApplyContext: boolean;
+  onApply: () => void | Promise<void>;
+  onDelete: (id: string) => void;
+}
+
+export const CommentsPopover = observer(function CommentsPopover({
+  comments,
+  canApplyContext,
+  onApply,
+  onDelete,
+}: CommentsPopoverProps) {
+  const [open, setOpen] = useState(false);
+
+  const groupedComments = useMemo(() => {
+    const groups = new Map<string, DraftComment[]>();
+    for (const comment of comments) {
+      const existing = groups.get(comment.filePath) ?? [];
+      existing.push(comment);
+      groups.set(comment.filePath, existing);
+    }
+    return groups;
+  }, [comments]);
+
+  const count = comments.length;
+
+  const handleApply = async () => {
+    onApply();
+    setOpen(false);
+  };
+
+  return (
+    <Popover open={open} onOpenChange={setOpen}>
+      <Tooltip>
+        <TooltipTrigger>
+          <PopoverTrigger className="relative self-center flex h-7 max-w-full items-center gap-1.5 rounded-md border border-border bg-background-1 px-2 text-xs font-normal text-foreground hover:bg-background-1/80">
+            <MessageSquare className="h-3.5 w-3.5 shrink-0" />
+            <span className="max-w-72 truncate">Comments</span>
+            <span className="ml-0.5 inline-flex h-4 min-w-4 items-center justify-center rounded-full border border-border bg-background-3 px-1 text-[10px] font-semibold text-foreground-muted">
+              {count}
+            </span>
+          </PopoverTrigger>
+        </TooltipTrigger>
+        <TooltipContent>
+          {canApplyContext
+            ? `${count} comment${count === 1 ? '' : 's'} pending`
+            : 'Create and select a conversation first'}
+        </TooltipContent>
+      </Tooltip>
+
+      <PopoverContent align="start" className="w-[min(460px,92vw)] gap-0 p-0">
+        <div className="border-b px-4 py-3 flex flex-row justify-between items-center">
+          <div>
+            <div className="text-sm font-semibold">Review comments</div>
+            <div className="text-xs text-muted-foreground">
+              {count} comment{count === 1 ? '' : 's'} ready to add to the chat input
+            </div>
+          </div>
+          <div>
+            <TooltipProvider>
+              <Tooltip>
+                <TooltipTrigger>
+                  <Button
+                    variant="outline"
+                    size="sm"
+                    className="ml-auto"
+                    disabled={!canApplyContext || count === 0}
+                    onClick={() => void handleApply()}
+                    aria-label="Add comments to chat input"
+                  >
+                    <ArrowUp className="h-3.5 w-3.5" />
+                  </Button>
+                </TooltipTrigger>
+                <TooltipContent side="bottom" className="text-xs">
+                  Add comments to chat input
+                </TooltipContent>
+              </Tooltip>
+            </TooltipProvider>
+          </div>
+        </div>
+
+        <div className="max-h-[min(360px,55vh)] overflow-y-auto">
+          <div className="divide-y">
+            {Array.from(groupedComments.entries()).map(([filePath, fileComments]) => (
+              <div key={filePath} className="py-2">
+                <div
+                  className="truncate px-4 pb-1 text-xs font-medium text-muted-foreground"
+                  title={filePath}
+                >
+                  {filePath}
+                </div>
+                <div className="space-y-1">
+                  {fileComments.map((comment) => (
+                    <div
+                      key={comment.id}
+                      className="flex items-start gap-2 px-4 py-2 transition-colors hover:bg-muted/40"
+                    >
+                      <div className="min-w-0 flex-1">
+                        <div className="text-xs text-muted-foreground">
+                          Line {comment.lineNumber}
+                        </div>
+                        <div className="line-clamp-2 break-words text-sm leading-snug">
+                          {comment.content}
+                        </div>
+                      </div>
+                      <Button
+                        variant="ghost"
+                        size="icon-xs"
+                        className="shrink-0 text-muted-foreground hover:text-destructive"
+                        onClick={() => onDelete(comment.id)}
+                      >
+                        <Trash2 className="h-3.5 w-3.5" />
+                      </Button>
+                    </div>
+                  ))}
+                </div>
+              </div>
+            ))}
+          </div>
+        </div>
+      </PopoverContent>
+    </Popover>
+  );
+});
diff --git a/src/renderer/features/tasks/conversations/context-actions.ts b/src/renderer/features/tasks/conversations/context-actions.ts
new file mode 100644
index 0000000000..ef7679832d
--- /dev/null
+++ b/src/renderer/features/tasks/conversations/context-actions.ts
@@ -0,0 +1,107 @@
+import type { Issue } from '@shared/tasks';
+import { ISSUE_PROVIDER_META } from '@renderer/features/integrations/issue-provider-meta';
+
+const MAX_LABEL_TITLE_LENGTH = 24;
+
+export type ContextActionKind = 'linked-issue' | 'draft-comments' | 'review-prompt';
+
+export interface ContextAction {
+  id: string;
+  kind: ContextActionKind;
+  label: string;
+  text: string;
+  provider?: Issue['provider'];
+}
+
+function normalizeWhitespace(value: string | undefined): string {
+  return (value ?? '').replace(/\s+/g, ' ').trim();
+}
+
+function truncate(text: string, maxLength: number): string {
+  if (text.length <= maxLength) return text;
+  return `${text.slice(0, maxLength - 1).trimEnd()}…`;
+}
+
+function issueLabel(issue: Issue): string {
+  const identifier = normalizeWhitespace(issue.identifier);
+  const title = truncate(normalizeWhitespace(issue.title), MAX_LABEL_TITLE_LENGTH);
+  if (identifier && title) return `${identifier} ${title}`;
+  if (identifier) return identifier;
+  if (title) return title;
+  return 'Linked issue';
+}
+
+function issueInjectionText(issue: Issue): string {
+  const providerDisplay = ISSUE_PROVIDER_META[issue.provider]?.displayName ?? issue.provider;
+  const parts = [
+    `Provider: ${providerDisplay}`,
+    `Identifier: ${normalizeWhitespace(issue.identifier)}`,
+    `Title: ${normalizeWhitespace(issue.title)}`,
+    `URL: ${normalizeWhitespace(issue.url)}`,
+    issue.description ? `Description: ${normalizeWhitespace(issue.description)}` : undefined,
+    issue.status ? `Status: ${normalizeWhitespace(issue.status)}` : undefined,
+    issue.assignees?.length
+      ? `Assignees: ${issue.assignees.map(normalizeWhitespace).filter(Boolean).join(', ')}`
+      : undefined,
+    issue.project ? `Project: ${normalizeWhitespace(issue.project)}` : undefined,
+  ].filter(Boolean);
+
+  if (parts.length === 0) {
+    return 'Linked issue context';
+  }
+
+  return parts.join(' | ');
+}
+
+export function buildLinkedIssueContextAction(issue?: Issue): ContextAction | null {
+  if (!issue) return null;
+  const normalizedIdentifier = normalizeWhitespace(issue.identifier) || 'unknown';
+  return {
+    id: `linked-issue:${issue.provider}:${normalizedIdentifier}`,
+    kind: 'linked-issue',
+    label: issueLabel(issue),
+    text: issueInjectionText(issue),
+    provider: issue.provider,
+  };
+}
+
+export function buildReviewPromptContextAction(reviewPrompt?: string): ContextAction | null {
+  const text = (reviewPrompt ?? '').trim();
+  if (!text) return null;
+  return {
+    id: 'review-prompt',
+    kind: 'review-prompt',
+    label: 'Review prompt',
+    text,
+  };
+}
+
+export function buildDraftCommentsContextAction(args: {
+  count: number;
+  formattedComments?: string;
+}): ContextAction | null {
+  const text = (args.formattedComments ?? '').trim();
+  if (!text || args.count <= 0) return null;
+
+  return {
+    id: 'draft-comments',
+    kind: 'draft-comments',
+    label: `Comments (${args.count})`,
+    text,
+  };
+}
+
+export function buildTaskContextActions(
+  linkedIssue?: Issue,
+  reviewPrompt?: string,
+  draftComments?: { count: number; formattedComments?: string }
+): ContextAction[] {
+  const linkedIssueAction = buildLinkedIssueContextAction(linkedIssue);
+  const draftCommentsAction = draftComments ? buildDraftCommentsContextAction(draftComments) : null;
+  const reviewPromptAction = buildReviewPromptContextAction(reviewPrompt);
+  const actions: ContextAction[] = [];
+  if (linkedIssueAction) actions.push(linkedIssueAction);
+  if (draftCommentsAction) actions.push(draftCommentsAction);
+  if (reviewPromptAction) actions.push(reviewPromptAction);
+  return actions;
+}
diff --git a/src/renderer/features/tasks/conversations/context-bar.tsx b/src/renderer/features/tasks/conversations/context-bar.tsx
new file mode 100644
index 0000000000..2aa951dd09
--- /dev/null
+++ b/src/renderer/features/tasks/conversations/context-bar.tsx
@@ -0,0 +1,118 @@
+import { ArrowUp, FileSearch } from 'lucide-react';
+import { observer } from 'mobx-react-lite';
+import { useMemo } from 'react';
+import { useAppSettingsKey } from '@renderer/features/settings/use-app-settings-key';
+import { getRegisteredTaskData } from '@renderer/features/tasks/stores/task-selectors';
+import { useProvisionedTask, useTaskViewContext } from '@renderer/features/tasks/task-view-context';
+import { rpc } from '@renderer/lib/ipc';
+import { pastePromptInjection } from '@renderer/lib/pty/prompt-injection';
+import { Button } from '@renderer/lib/ui/button';
+import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@renderer/lib/ui/tooltip';
+import { ProviderLogo } from '../components/issue-selector/issue-selector';
+import { CommentsPopover } from './comments-popover';
+import { buildTaskContextActions, type ContextAction } from './context-actions';
+
+export const ContextBar = observer(function ContextBar() {
+  const { projectId, taskId } = useTaskViewContext();
+  const provisioned = useProvisionedTask();
+  const task = getRegisteredTaskData(projectId, taskId);
+  const { value: reviewPrompt, isSaving: isSavingReviewPrompt } = useAppSettingsKey('reviewPrompt');
+  const conversationTabs = provisioned.taskView.conversationTabs;
+  const conversationStore = provisioned.conversations;
+  const draftComments = provisioned.draftComments;
+  const activeConversation = conversationTabs.activeTab;
+  const activeSessionId = activeConversation?.session.sessionId;
+  const canApplyContext = Boolean(activeSessionId);
+  const hasConversation = conversationStore.conversations.size > 0;
+  const formattedDraftComments = draftComments.formattedForAgent;
+
+  const actions = useMemo(
+    () =>
+      buildTaskContextActions(task?.linkedIssue, reviewPrompt, {
+        count: draftComments.count,
+        formattedComments: formattedDraftComments,
+      }),
+    [reviewPrompt, task?.linkedIssue, draftComments.count, formattedDraftComments]
+  );
+  const issueAction = actions.find((action) => action.kind === 'linked-issue') ?? null;
+  const reviewAction = actions.find((action) => action.kind === 'review-prompt') ?? null;
+  const draftCommentsAction = actions.find((action) => action.kind === 'draft-comments') ?? null;
+
+  if (!hasConversation || (!issueAction && !draftCommentsAction && !reviewAction)) return null;
+
+  const applyContext = async (action: ContextAction) => {
+    if (!activeSessionId) return;
+    if (!action.text) return;
+
+    await pastePromptInjection({
+      providerId: activeConversation?.data.providerId,
+      text: action.text,
+      sendInput: (data) => rpc.pty.sendInput(activeSessionId, data),
+    });
+
+    activeConversation?.session.pty?.terminal.focus();
+  };
+
+  return (
+    <TooltipProvider>
+      <div className="border-t border-border px-2 flex items-center gap-2 h-[41px]">
+        {reviewAction ? (
+          <Tooltip>
+            <TooltipTrigger>
+              <Button
+                variant="outline"
+                size="sm"
+                disabled={!canApplyContext || isSavingReviewPrompt}
+                onClick={() => void applyContext(reviewAction)}
+                className="h-7 max-w-full rounded-md bg-background-1 px-2 text-xs font-normal hover:bg-background-1/80"
+              >
+                <FileSearch className="size-3.5 shrink-0" />
+                <span className="max-w-72 truncate">{reviewAction.label}</span>
+                <ArrowUp className="size-3 shrink-0" />
+              </Button>
+            </TooltipTrigger>
+            <TooltipContent>
+              {canApplyContext
+                ? 'Add review prompt to the chat input'
+                : 'Create and select a conversation first'}
+            </TooltipContent>
+          </Tooltip>
+        ) : null}
+        {issueAction ? (
+          <Tooltip>
+            <TooltipTrigger>
+              <Button
+                variant="outline"
+                size="sm"
+                disabled={!canApplyContext}
+                onClick={() => void applyContext(issueAction)}
+                className="h-7 max-w-full rounded-md bg-background-1 px-2 text-xs font-normal hover:bg-background-1/80"
+              >
+                {issueAction.provider ? (
+                  <ProviderLogo provider={issueAction.provider} className="h-3.5 w-3.5" />
+                ) : null}
+                <span className="max-w-72 truncate">{issueAction.label}</span>
+                <ArrowUp className="size-3 shrink-0" />
+              </Button>
+            </TooltipTrigger>
+            <TooltipContent>
+              {canApplyContext
+                ? 'Add issue context to the chat input'
+                : 'Create and select a conversation first'}
+            </TooltipContent>
+          </Tooltip>
+        ) : null}
+        {draftCommentsAction ? (
+          <CommentsPopover
+            comments={draftComments.comments}
+            canApplyContext={canApplyContext}
+            onApply={() => {
+              void applyContext(draftCommentsAction).then(() => draftComments.consumeAll());
+            }}
+            onDelete={draftComments.deleteComment}
+          />
+        ) : null}
+      </div>
+    </TooltipProvider>
+  );
+});
diff --git a/src/renderer/features/tasks/conversations/conversation-manager.ts b/src/renderer/features/tasks/conversations/conversation-manager.ts
new file mode 100644
index 0000000000..64817d923a
--- /dev/null
+++ b/src/renderer/features/tasks/conversations/conversation-manager.ts
@@ -0,0 +1,232 @@
+import { action, computed, makeObservable, observable, onBecomeObserved, runInAction } from 'mobx';
+import { Conversation, CreateConversationParams } from '@shared/conversations';
+import {
+  agentEventChannel,
+  agentSessionExitedChannel,
+  isAttentionNotification,
+  type NotificationType,
+} from '@shared/events/agentEvents';
+import { makePtySessionId } from '@shared/ptySessionId';
+import { events, rpc } from '@renderer/lib/ipc';
+import { PtySession } from '@renderer/lib/pty/pty-session';
+import { soundPlayer } from '@renderer/utils/soundPlayer';
+
+export type AgentStatus = 'idle' | 'working' | 'awaiting-input' | 'error' | 'completed';
+
+export class ConversationManagerStore {
+  private _loaded = false;
+  private offAgentEvents: (() => void) | null = null;
+  private offSessionExited: (() => void) | null = null;
+  conversations = observable.map<string, ConversationStore>();
+
+  constructor(
+    private readonly projectId: string,
+    private readonly taskId: string
+  ) {
+    makeObservable(this, {
+      conversations: observable,
+      taskStatus: computed,
+    });
+    onBecomeObserved(this, 'conversations', () => {
+      if (this._loaded) return;
+      this.load();
+    });
+    this.offAgentEvents = this.listenToAgentEvents();
+    this.offSessionExited = this.listenToSessionExited();
+  }
+
+  private listenToAgentEvents(): () => void {
+    return events.on(agentEventChannel, ({ event, appFocused }) => {
+      if (event.taskId !== this.taskId) return;
+      const conversationStore = this.conversations.get(event.conversationId);
+      if (!conversationStore) return;
+      if (event.type === 'notification') {
+        const nt = event.payload.notificationType;
+        if (!isAttentionNotification(nt)) return;
+        conversationStore.setAwaitingInput(nt);
+        soundPlayer.play('needs_attention', appFocused);
+        return;
+      }
+      if (event.type === 'stop') {
+        conversationStore.setStatus('completed');
+        soundPlayer.play('task_complete', appFocused);
+        return;
+      }
+      if (event.type === 'error') {
+        conversationStore.setStatus('error');
+        return;
+      }
+    });
+  }
+
+  private listenToSessionExited(): () => void {
+    return events.on(agentSessionExitedChannel, (event) => {
+      if (event.taskId !== this.taskId) return;
+      const conversationStore = this.conversations.get(event.conversationId);
+      if (!conversationStore) return;
+      conversationStore.clearWorking();
+    });
+  }
+
+  get taskStatus(): AgentStatus | null {
+    let hasWorking = false;
+    let hasUnseenError = false;
+    let hasUnseenCompleted = false;
+    for (const conversation of this.conversations.values()) {
+      if (!conversation.seen && conversation.status === 'awaiting-input') return 'awaiting-input';
+      if (conversation.status === 'working') hasWorking = true;
+      if (!conversation.seen && conversation.status === 'error') hasUnseenError = true;
+      if (!conversation.seen && conversation.status === 'completed') hasUnseenCompleted = true;
+    }
+    if (hasWorking) return 'working';
+    if (hasUnseenError) return 'error';
+    if (hasUnseenCompleted) return 'completed';
+    return null;
+  }
+
+  async load() {
+    this._loaded = true;
+    const conversations = await rpc.conversations.getConversationsForTask(
+      this.projectId,
+      this.taskId
+    );
+    runInAction(() => {
+      for (const conversation of conversations) {
+        const store = new ConversationStore(conversation);
+        this.conversations.set(conversation.id, store);
+        void store.session.connect();
+      }
+    });
+  }
+
+  async createConversation(params: CreateConversationParams): Promise<Conversation> {
+    const conversation = await rpc.conversations.createConversation(params);
+    runInAction(() => {
+      const store = new ConversationStore(conversation);
+      this.conversations.set(conversation.id, store);
+      void store.session.connect();
+    });
+    return conversation;
+  }
+
+  async deleteConversation(conversationId: string): Promise<void> {
+    const snapshot = this.conversations.get(conversationId);
+    if (!snapshot) return;
+
+    runInAction(() => {
+      this.conversations.delete(conversationId);
+    });
+
+    try {
+      await rpc.conversations.deleteConversation(this.projectId, this.taskId, conversationId);
+      snapshot.dispose();
+    } catch (err) {
+      runInAction(() => {
+        this.conversations.set(conversationId, snapshot);
+      });
+      throw err;
+    }
+  }
+
+  async renameConversation(conversationId: string, name: string): Promise<void> {
+    const store = this.conversations.get(conversationId);
+    if (!store) return;
+
+    const previousTitle = store.data.title;
+
+    runInAction(() => {
+      store.data.title = name;
+    });
+
+    try {
+      await rpc.conversations.renameConversation(conversationId, name);
+    } catch (err) {
+      runInAction(() => {
+        store.data.title = previousTitle;
+      });
+      throw err;
+    }
+  }
+
+  dispose(): void {
+    this.offAgentEvents?.();
+    this.offAgentEvents = null;
+    this.offSessionExited?.();
+    this.offSessionExited = null;
+    for (const conversation of this.conversations.values()) {
+      conversation.dispose();
+    }
+  }
+}
+
+export class ConversationStore {
+  data: Conversation;
+  session: PtySession;
+  status: AgentStatus = 'idle';
+  seen = true;
+  lastNotificationType: NotificationType | null = null;
+
+  constructor(conversation: Conversation) {
+    this.data = conversation;
+    this.session = new PtySession(
+      makePtySessionId(conversation.projectId, conversation.taskId, conversation.id)
+    );
+    makeObservable(this, {
+      data: observable,
+      session: observable,
+      status: observable,
+      seen: observable,
+      lastNotificationType: observable,
+      setStatus: action,
+      setAwaitingInput: action,
+      setWorking: action,
+      clearWorking: action,
+      markSeen: action,
+      indicatorStatus: computed,
+    });
+  }
+
+  get indicatorStatus(): AgentStatus | null {
+    if (this.status === 'working') return 'working';
+    if (this.seen) return null;
+    if (this.status === 'awaiting-input') return 'awaiting-input';
+    if (this.status === 'error') return 'error';
+    if (this.status === 'completed') return 'completed';
+    return null;
+  }
+
+  setStatus(status: AgentStatus) {
+    this.status = status;
+    this.seen = status === 'idle' || status === 'working';
+    if (status !== 'awaiting-input') {
+      this.lastNotificationType = null;
+    }
+  }
+
+  setAwaitingInput(notificationType: NotificationType) {
+    this.lastNotificationType = notificationType;
+    this.setStatus('awaiting-input');
+  }
+
+  setWorking() {
+    if (this.status === 'awaiting-input' && this.lastNotificationType === 'permission_prompt') {
+      return;
+    }
+    this.lastNotificationType = null;
+    this.setStatus('working');
+  }
+
+  clearWorking() {
+    if (this.status === 'working') {
+      this.setStatus('idle');
+    }
+  }
+
+  markSeen() {
+    this.seen = true;
+  }
+
+  dispose() {
+    this.session.dispose();
+  }
+}
diff --git a/src/renderer/features/tasks/conversations/conversation-tab-view-store.ts b/src/renderer/features/tasks/conversations/conversation-tab-view-store.ts
new file mode 100644
index 0000000000..21cd0d51db
--- /dev/null
+++ b/src/renderer/features/tasks/conversations/conversation-tab-view-store.ts
@@ -0,0 +1,154 @@
+import { action, autorun, computed, makeObservable, observable, reaction } from 'mobx';
+import type { TabViewProvider, TabViewSnapshot } from '@renderer/lib/stores/generic-tab-view';
+import { Snapshottable } from '@renderer/lib/stores/snapshottable';
+import {
+  reorderTabIds,
+  setNextTabActive,
+  setPreviousTabActive,
+  setTabActive,
+  setTabActiveIndex,
+} from '@renderer/lib/stores/tab-utils';
+import { setTelemetryConversationScope } from '@renderer/utils/telemetry-scope';
+import type { ConversationManagerStore, ConversationStore } from './conversation-manager';
+
+export class ConversationTabViewStore
+  implements TabViewProvider<ConversationStore, never>, Snapshottable<TabViewSnapshot>
+{
+  tabOrder: string[] = [];
+  activeTabId: string | undefined = undefined;
+  isVisible = false;
+
+  private readonly resource: ConversationManagerStore;
+  private readonly disposers: (() => void)[] = [];
+
+  constructor(resource: ConversationManagerStore) {
+    this.resource = resource;
+    makeObservable(this, {
+      tabOrder: observable,
+      activeTabId: observable,
+      isVisible: observable,
+      tabs: computed,
+      activeTab: computed,
+      snapshot: computed,
+      addTab: action,
+      removeTab: action,
+      reorderTabs: action,
+      setNextTabActive: action,
+      setPreviousTabActive: action,
+      setTabActiveIndex: action,
+      setActiveTab: action,
+      setVisible: action,
+      restoreSnapshot: action,
+    });
+
+    this.disposers.push(
+      reaction(
+        () => Array.from(this.resource.conversations.keys()),
+        action((ids: string[]) => {
+          const idSet = new Set(ids);
+          // Remove deleted IDs
+          for (let i = this.tabOrder.length - 1; i >= 0; i--) {
+            if (!idSet.has(this.tabOrder[i])) {
+              this.tabOrder.splice(i, 1);
+            }
+          }
+          // Append new IDs
+          for (const id of ids) {
+            if (!this.tabOrder.includes(id)) {
+              this.tabOrder.push(id);
+            }
+          }
+          // Deselect removed active tab
+          if (this.activeTabId && !idSet.has(this.activeTabId)) {
+            this.activeTabId = this.tabOrder[0];
+          }
+          // Auto-select first if nothing is active
+          if (!this.activeTabId && this.tabOrder.length > 0) {
+            this.activeTabId = this.tabOrder[0];
+          }
+        })
+      )
+    );
+
+    this.disposers.push(
+      autorun(() => {
+        if (this.isVisible && this.activeTab && !this.activeTab.seen) {
+          this.activeTab.markSeen();
+        }
+      })
+    );
+
+    this.disposers.push(
+      reaction(
+        () => this.activeTabId,
+        (activeTabId) => {
+          if (this.isVisible) {
+            setTelemetryConversationScope(activeTabId ?? null);
+          }
+        }
+      )
+    );
+  }
+
+  get tabs(): ConversationStore[] {
+    return this.tabOrder
+      .map((id) => this.resource.conversations.get(id))
+      .filter(Boolean) as ConversationStore[];
+  }
+
+  get activeTab(): ConversationStore | undefined {
+    return this.activeTabId ? this.resource.conversations.get(this.activeTabId) : undefined;
+  }
+
+  get snapshot(): TabViewSnapshot {
+    return { tabOrder: this.tabOrder.slice(), activeTabId: this.activeTabId };
+  }
+
+  restoreSnapshot(snapshot: Partial<TabViewSnapshot>): void {
+    if (snapshot.tabOrder) this.tabOrder = snapshot.tabOrder;
+    if (snapshot.activeTabId !== undefined) this.activeTabId = snapshot.activeTabId;
+  }
+
+  setActiveTab(id: string): void {
+    setTabActive(this, id);
+    setTelemetryConversationScope(this.activeTabId ?? null);
+  }
+
+  reorderTabs(fromIndex: number, toIndex: number): void {
+    reorderTabIds(this, fromIndex, toIndex);
+  }
+
+  setNextTabActive(): void {
+    setNextTabActive(this);
+  }
+
+  setPreviousTabActive(): void {
+    setPreviousTabActive(this);
+  }
+
+  setTabActiveIndex(index: number): void {
+    setTabActiveIndex(this, index);
+  }
+
+  // addTab is required by TabViewProvider but conversations are created via modal
+  addTab(_args: never): void {}
+
+  removeTab(id: string): void {
+    void this.resource.deleteConversation(id);
+  }
+
+  closeActiveTab(): void {
+    if (this.activeTabId) this.removeTab(this.activeTabId);
+  }
+
+  setVisible(visible: boolean): void {
+    this.isVisible = visible;
+    if (visible) {
+      setTelemetryConversationScope(this.activeTabId ?? null);
+    }
+  }
+
+  dispose(): void {
+    for (const d of this.disposers) d();
+  }
+}
diff --git a/src/renderer/features/tasks/conversations/conversation-tabs.tsx b/src/renderer/features/tasks/conversations/conversation-tabs.tsx
new file mode 100644
index 0000000000..b52efe780e
--- /dev/null
+++ b/src/renderer/features/tasks/conversations/conversation-tabs.tsx
@@ -0,0 +1,80 @@
+import { Plus } from 'lucide-react';
+import { observer } from 'mobx-react-lite';
+import { asMounted, getProjectStore } from '@renderer/features/projects/stores/project-selectors';
+import { AgentStatusIndicator } from '@renderer/features/tasks/components/agent-status-indicator';
+import { ConversationStore } from '@renderer/features/tasks/conversations/conversation-manager';
+import { useProvisionedTask } from '@renderer/features/tasks/task-view-context';
+import AgentLogo from '@renderer/lib/components/agent-logo';
+import { useShowModal } from '@renderer/lib/modal/modal-provider';
+import { ShortcutHint } from '@renderer/lib/ui/shortcut-hint';
+import { TabBar } from '@renderer/lib/ui/tab-bar';
+import { Tooltip, TooltipContent, TooltipTrigger } from '@renderer/lib/ui/tooltip';
+import { agentConfig } from '@renderer/utils/agentConfig';
+import { formatConversationTitleForDisplay } from './conversation-title-utils';
+
+export const ConversationsTabs = observer(function ConversationsTabs({
+  projectId,
+  taskId,
+}: {
+  projectId: string;
+  taskId: string;
+}) {
+  const provisioned = useProvisionedTask();
+  const conversationMgr = provisioned.conversations;
+  const conversationTabs = provisioned.taskView.conversationTabs;
+  const showCreateConversationModal = useShowModal('createConversationModal');
+  const mountedProject = asMounted(getProjectStore(projectId));
+  const connectionId =
+    mountedProject?.data.type === 'ssh' ? mountedProject.data.connectionId : undefined;
+
+  return (
+    <TabBar<ConversationStore>
+      tabs={conversationTabs.tabs}
+      activeTabId={conversationTabs.activeTabId}
+      getId={(s) => s.data.id}
+      getLabel={(s) => formatConversationTitleForDisplay(s.data.providerId, s.data.title)}
+      onSelect={(id) => conversationTabs.setActiveTab(id)}
+      onRemove={(id) => {
+        conversationTabs.removeTab(id);
+      }}
+      renderTabPrefix={(s) => {
+        const config = agentConfig[s.data.providerId];
+        return (
+          <AgentLogo
+            logo={config.logo}
+            alt={config.alt}
+            isSvg={config.isSvg}
+            invertInDark={config.invertInDark}
+            className="size-4"
+          />
+        );
+      }}
+      renderTabSuffix={(s) => <AgentStatusIndicator status={s.indicatorStatus} disableTooltip />}
+      onRename={(id, name) => void conversationMgr.renameConversation(id, name)}
+      onReorder={(from, to) => conversationTabs.reorderTabs(from, to)}
+      actions={
+        <Tooltip>
+          <TooltipTrigger>
+            <button
+              className="size-10 justify-center items-center flex border-l hover:bg-background text-foreground-muted hover:text-foreground"
+              onClick={() =>
+                showCreateConversationModal({
+                  connectionId,
+                  projectId,
+                  taskId,
+                  onSuccess: ({ conversationId }) => conversationTabs.setActiveTab(conversationId),
+                })
+              }
+            >
+              <Plus className="size-4" />
+            </button>
+          </TooltipTrigger>
+          <TooltipContent>
+            Create conversation
+            <ShortcutHint settingsKey="newConversation" />
+          </TooltipContent>
+        </Tooltip>
+      }
+    />
+  );
+});
diff --git a/src/renderer/features/tasks/conversations/conversation-title-utils.ts b/src/renderer/features/tasks/conversations/conversation-title-utils.ts
new file mode 100644
index 0000000000..e44a959b9b
--- /dev/null
+++ b/src/renderer/features/tasks/conversations/conversation-title-utils.ts
@@ -0,0 +1,48 @@
+import { AgentProviderId } from '@shared/agent-provider-registry';
+
+type ConversationTitleInput = {
+  providerId: AgentProviderId;
+  title: string;
+};
+
+function capitalizeProviderId(providerId: AgentProviderId): string {
+  return `${providerId.charAt(0).toUpperCase()}${providerId.slice(1)}`;
+}
+
+function parseDefaultTitleIndex(title: string, providerId: AgentProviderId): number | null {
+  const match = title.match(new RegExp(`^${providerId} \\(([1-9]\\d*)\\)$`, 'i'));
+  if (!match) return null;
+
+  const rawIndex = match[1];
+  const index = Number(rawIndex);
+  if (!Number.isInteger(index) || index < 1) return null;
+  if (String(index) !== rawIndex) return null;
+  return index;
+}
+
+export function formatConversationTitleForDisplay(
+  providerId: AgentProviderId,
+  title: string
+): string {
+  const index = parseDefaultTitleIndex(title, providerId);
+  if (index === null) return title;
+  return `${capitalizeProviderId(providerId)} (${index})`;
+}
+
+export function nextDefaultConversationTitle(
+  providerId: AgentProviderId,
+  conversations: ConversationTitleInput[]
+): string {
+  const used = new Set<number>();
+
+  for (const conversation of conversations) {
+    if (conversation.providerId !== providerId) continue;
+    const index = parseDefaultTitleIndex(conversation.title, providerId);
+    if (index !== null) used.add(index);
+  }
+
+  let next = 1;
+  while (used.has(next)) next += 1;
+
+  return `${capitalizeProviderId(providerId)} (${next})`;
+}
diff --git a/src/renderer/features/tasks/conversations/conversations-panel.tsx b/src/renderer/features/tasks/conversations/conversations-panel.tsx
new file mode 100644
index 0000000000..e5d7a7d2ce
--- /dev/null
+++ b/src/renderer/features/tasks/conversations/conversations-panel.tsx
@@ -0,0 +1,102 @@
+import { useHotkey } from '@tanstack/react-hotkeys';
+import { MessageSquare } from 'lucide-react';
+import { observer } from 'mobx-react-lite';
+import { useEffect, useState } from 'react';
+import { asMounted, getProjectStore } from '@renderer/features/projects/stores/project-selectors';
+import { useAppSettingsKey } from '@renderer/features/settings/use-app-settings-key';
+import { useIsActiveTask } from '@renderer/features/tasks/hooks/use-is-active-task';
+import { TabbedPtyPanel } from '@renderer/features/tasks/tabbed-pty-panel';
+import { useProvisionedTask, useTaskViewContext } from '@renderer/features/tasks/task-view-context';
+import {
+  getEffectiveHotkey,
+  getHotkeyRegistration,
+} from '@renderer/lib/hooks/useKeyboardShortcuts';
+import { useTabShortcuts } from '@renderer/lib/hooks/useTabShortcuts';
+import { useShowModal } from '@renderer/lib/modal/modal-provider';
+import { Button } from '@renderer/lib/ui/button';
+import { EmptyState } from '@renderer/lib/ui/empty-state';
+import { ShortcutHint } from '@renderer/lib/ui/shortcut-hint';
+import { ContextBar } from './context-bar';
+import { ConversationStore } from './conversation-manager';
+import { ConversationsTabs } from './conversation-tabs';
+
+export const ConversationsPanel = observer(function ConversationsPanel() {
+  const { projectId, taskId } = useTaskViewContext();
+  const provisioned = useProvisionedTask();
+  const conversationTabs = provisioned.taskView.conversationTabs;
+  const showCreateConversationModal = useShowModal('createConversationModal');
+  const { value: keyboard } = useAppSettingsKey('keyboard');
+  const isActive = useIsActiveTask(taskId);
+  const [isPanelFocused, setIsPanelFocused] = useState(false);
+  const mountedProject = asMounted(getProjectStore(projectId));
+  const shouldSetWorkingOnEnter = mountedProject?.data.type !== 'ssh';
+  const remoteConnectionId =
+    mountedProject?.data.type === 'ssh' ? mountedProject.data.connectionId : undefined;
+  const newConversationHotkey = getEffectiveHotkey('newConversation', keyboard);
+
+  const autoFocus = isActive && provisioned.taskView.focusedRegion === 'main';
+
+  const handleCreate = () =>
+    showCreateConversationModal({
+      connectionId: remoteConnectionId,
+      projectId,
+      taskId,
+      onSuccess: ({ conversationId }) => {
+        conversationTabs.setActiveTab(conversationId);
+        provisioned.taskView.setFocusedRegion('main');
+      },
+    });
+
+  useTabShortcuts(conversationTabs, { focused: isPanelFocused });
+  useHotkey(getHotkeyRegistration('newConversation', keyboard), handleCreate, {
+    enabled: newConversationHotkey !== null,
+  });
+
+  useEffect(() => {
+    conversationTabs.setVisible(isActive);
+    return () => {
+      conversationTabs.setVisible(false);
+    };
+  }, [conversationTabs, isActive]);
+
+  return (
+    <div className="flex h-full flex-col">
+      <div className="min-h-0 flex-1">
+        <TabbedPtyPanel<ConversationStore>
+          autoFocus={autoFocus}
+          onFocusChange={(focused) => {
+            setIsPanelFocused(focused);
+            if (focused) provisioned.taskView.setFocusedRegion('main');
+          }}
+          store={conversationTabs}
+          paneId="conversations"
+          getSession={(s) => s.session}
+          onEnterPress={shouldSetWorkingOnEnter ? (s) => s.setWorking() : undefined}
+          onInterruptPress={(s) => s.clearWorking()}
+          mapShiftEnterToCtrlJ
+          remoteConnectionId={remoteConnectionId}
+          tabBar={<ConversationsTabs projectId={projectId} taskId={taskId} />}
+          emptyState={
+            <EmptyState
+              icon={<MessageSquare className="h-5 w-5 text-muted-foreground" />}
+              label="No conversations yet"
+              description="Create one to open a terminal session for this task and work with an agent."
+              action={
+                <Button
+                  size="sm"
+                  variant="outline"
+                  onClick={handleCreate}
+                  className="flex items-center gap-2"
+                >
+                  Create conversation
+                  <ShortcutHint settingsKey="newConversation" />
+                </Button>
+              }
+            />
+          }
+        />
+      </div>
+      <ContextBar />
+    </div>
+  );
+});
diff --git a/src/renderer/features/tasks/conversations/create-conversation-modal.tsx b/src/renderer/features/tasks/conversations/create-conversation-modal.tsx
new file mode 100644
index 0000000000..5ffff07101
--- /dev/null
+++ b/src/renderer/features/tasks/conversations/create-conversation-modal.tsx
@@ -0,0 +1,131 @@
+import { observer } from 'mobx-react-lite';
+import { useCallback, useState } from 'react';
+import {
+  AGENT_PROVIDER_IDS,
+  AgentProviderId,
+  isValidProviderId,
+} from '@shared/agent-provider-registry';
+import { useAppSettingsKey } from '@renderer/features/settings/use-app-settings-key';
+import { useAgentAutoApproveDefaults } from '@renderer/features/tasks/hooks/useAgentAutoApproveDefaults';
+import { asProvisioned, getTaskStore } from '@renderer/features/tasks/stores/task-selectors';
+import { AgentSelector } from '@renderer/lib/components/agent-selector/agent-selector';
+import { BaseModalProps } from '@renderer/lib/modal/modal-provider';
+import { getPaneContainer } from '@renderer/lib/pty/pane-sizing-context';
+import { measureDimensions } from '@renderer/lib/pty/pty-dimensions';
+import { appState } from '@renderer/lib/stores/app-state';
+import { ConfirmButton } from '@renderer/lib/ui/confirm-button';
+import {
+  DialogContentArea,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+} from '@renderer/lib/ui/dialog';
+import { Field, FieldGroup, FieldLabel } from '@renderer/lib/ui/field';
+import { Switch } from '@renderer/lib/ui/switch';
+import { nextDefaultConversationTitle } from './conversation-title-utils';
+import { resolveConversationProviderSelection } from './provider-selection';
+
+function getConversationsPaneSize() {
+  const container = getPaneContainer('conversations');
+  return container ? (measureDimensions(container, 8, 16) ?? undefined) : undefined;
+}
+
+export const CreateConversationModal = observer(function CreateConversationModal({
+  connectionId,
+  onSuccess,
+  projectId,
+  taskId,
+}: BaseModalProps<{ conversationId: string }> & {
+  connectionId?: string;
+  projectId: string;
+  taskId: string;
+}) {
+  const [providerOverride, setProviderOverride] = useState<AgentProviderId | null>(null);
+  const { value: defaultAgentValue } = useAppSettingsKey('defaultAgent');
+  const defaultProviderId: AgentProviderId = isValidProviderId(defaultAgentValue)
+    ? defaultAgentValue
+    : 'claude';
+
+  const dependencyResource = connectionId
+    ? appState.dependencies.getRemote(connectionId)
+    : appState.dependencies.local;
+  const availabilityKnown = dependencyResource.data !== null;
+  const installedProviderIds = AGENT_PROVIDER_IDS.filter(
+    (id) => dependencyResource.data?.[id]?.status === 'available'
+  );
+  const { providerId, createDisabled } = resolveConversationProviderSelection({
+    defaultProviderId,
+    providerOverride,
+    installedProviderIds,
+    availabilityKnown,
+  });
+  const conversationMgr = asProvisioned(getTaskStore(projectId, taskId))?.conversations;
+  const autoApproveDefaults = useAgentAutoApproveDefaults();
+  const skipPermissions = providerId ? autoApproveDefaults.getDefault(providerId) : false;
+  const titleProviderId = providerId ?? defaultProviderId;
+  const title = nextDefaultConversationTitle(
+    titleProviderId,
+    Array.from(conversationMgr?.conversations.values() ?? [], (conversation) => conversation.data)
+  );
+
+  const handleCreateConversation = useCallback(() => {
+    if (createDisabled || !conversationMgr || !providerId) return;
+    const id = crypto.randomUUID();
+    conversationMgr.createConversation({
+      projectId,
+      taskId,
+      id,
+      autoApprove: skipPermissions,
+      provider: providerId,
+      title,
+      initialSize: getConversationsPaneSize(),
+    });
+    onSuccess({ conversationId: id });
+  }, [
+    conversationMgr,
+    createDisabled,
+    providerId,
+    title,
+    onSuccess,
+    projectId,
+    taskId,
+    skipPermissions,
+  ]);
+
+  return (
+    <>
+      <DialogHeader>
+        <DialogTitle>Create Conversation</DialogTitle>
+      </DialogHeader>
+      <DialogContentArea>
+        <FieldGroup>
+          <Field>
+            <FieldLabel>Agent</FieldLabel>
+            <AgentSelector
+              value={providerId}
+              onChange={setProviderOverride}
+              connectionId={connectionId}
+            />
+          </Field>
+          <Field>
+            <div className="flex items-center gap-2">
+              <Switch
+                checked={skipPermissions}
+                disabled={!providerId || autoApproveDefaults.loading || autoApproveDefaults.saving}
+                onCheckedChange={(checked) => {
+                  if (providerId) autoApproveDefaults.setDefault(providerId, checked);
+                }}
+              />
+              <FieldLabel>Dangerously skip permissions</FieldLabel>
+            </div>
+          </Field>
+        </FieldGroup>
+      </DialogContentArea>
+      <DialogFooter>
+        <ConfirmButton onClick={handleCreateConversation} disabled={createDisabled}>
+          Create
+        </ConfirmButton>
+      </DialogFooter>
+    </>
+  );
+});
diff --git a/src/renderer/features/tasks/conversations/provider-selection.ts b/src/renderer/features/tasks/conversations/provider-selection.ts
new file mode 100644
index 0000000000..7104aa4b2d
--- /dev/null
+++ b/src/renderer/features/tasks/conversations/provider-selection.ts
@@ -0,0 +1,38 @@
+import { AGENT_PROVIDER_IDS, AgentProviderId } from '@shared/agent-provider-registry';
+
+type ResolveConversationProviderSelectionParams = {
+  defaultProviderId: AgentProviderId;
+  providerOverride: AgentProviderId | null;
+  installedProviderIds: AgentProviderId[];
+  availabilityKnown: boolean;
+};
+
+export type ConversationProviderSelection = {
+  providerId: AgentProviderId | null;
+  createDisabled: boolean;
+};
+
+export function resolveConversationProviderSelection({
+  defaultProviderId,
+  providerOverride,
+  installedProviderIds,
+  availabilityKnown,
+}: ResolveConversationProviderSelectionParams): ConversationProviderSelection {
+  const installedSet = new Set(installedProviderIds);
+  const fallbackProviderId =
+    availabilityKnown && !installedSet.has(defaultProviderId)
+      ? AGENT_PROVIDER_IDS.find((id) => installedSet.has(id))
+      : undefined;
+
+  const noInstalledAgents = availabilityKnown && installedSet.size === 0;
+  const effectiveDefaultProviderId = noInstalledAgents
+    ? null
+    : (fallbackProviderId ?? defaultProviderId);
+  const providerId = providerOverride ?? effectiveDefaultProviderId;
+  const providerInstalled = providerId ? installedSet.has(providerId) : false;
+
+  return {
+    providerId,
+    createDisabled: providerId === null || (availabilityKnown && !providerInstalled),
+  };
+}
diff --git a/src/renderer/features/tasks/create-task-modal/branch-picker-field.tsx b/src/renderer/features/tasks/create-task-modal/branch-picker-field.tsx
new file mode 100644
index 0000000000..13b903aa28
--- /dev/null
+++ b/src/renderer/features/tasks/create-task-modal/branch-picker-field.tsx
@@ -0,0 +1,90 @@
+import { ChevronDown, GitBranch } from 'lucide-react';
+import { BranchDisplay } from '@renderer/lib/components/branch-display';
+import { ProjectBranchSelector } from '@renderer/lib/components/project-branch-selector';
+import { Collapsible, CollapsibleContent, CollapsibleTrigger } from '@renderer/lib/ui/collapsible';
+import { ComboboxTrigger, ComboboxValue } from '@renderer/lib/ui/combobox';
+import { Field, FieldLabel } from '@renderer/lib/ui/field';
+import { Switch } from '@renderer/lib/ui/switch';
+import { cn } from '@renderer/utils/utils';
+import { BranchSelectionState } from './use-branch-selection';
+
+interface BranchPickerFieldProps {
+  state: BranchSelectionState;
+  projectId?: string;
+  currentBranch?: string | null;
+  label?: string;
+  className?: string;
+  isUnborn?: boolean;
+}
+
+export function BranchPickerField({
+  state,
+  projectId,
+  currentBranch,
+  label = 'From Branch',
+  className,
+  isUnborn = false,
+}: BranchPickerFieldProps) {
+  const { createBranchAndWorktree, setCreateBranchAndWorktree, pushBranch, setPushBranch } = state;
+
+  return (
+    <div className={cn('border border-border rounded-md overflow-hidden', className)}>
+      {!createBranchAndWorktree && currentBranch ? (
+        <BranchDisplay label={label} branchName={currentBranch} />
+      ) : projectId ? (
+        <ProjectBranchSelector
+          projectId={projectId}
+          value={state.selectedBranch}
+          onValueChange={state.setSelectedBranch}
+          trigger={
+            <ComboboxTrigger className="flex w-full items-center gap-2 justify-between hover:bg-background-1 data-popup-open:bg-background-1 p-2 outline-none">
+              <div className="flex flex-col text-left text-sm gap-0.5">
+                <span className="text-foreground-passive text-xs">{label}</span>
+                <span className="flex items-center gap-1">
+                  <GitBranch
+                    absoluteStrokeWidth
+                    strokeWidth={2}
+                    className="size-3.5 shrink-0 text-foreground-muted"
+                  />
+                  <ComboboxValue placeholder="Select a branch" />
+                </span>
+              </div>
+
+              <ChevronDown className="size-4 shrink-0 text-foreground-muted" />
+            </ComboboxTrigger>
+          }
+        />
+      ) : null}
+      {!isUnborn && (
+        <Collapsible className="border-t border-border">
+          <CollapsibleTrigger className="w-full p-2 hover:bg-background-1 data-open:bg-background-1 flex text-xs text-foreground-muted items-center gap-2 justify-between">
+            Should create and push feature branch
+            <ChevronDown className="size-4 shrink-0 text-foreground-muted" />
+          </CollapsibleTrigger>
+          <CollapsibleContent className="overflow-hidden h-(--collapsible-panel-height) transition-[height] duration-200 ease-out">
+            <div className="p-2 flex flex-col gap-2">
+              <Field orientation="horizontal">
+                <Switch
+                  checked={createBranchAndWorktree}
+                  onCheckedChange={setCreateBranchAndWorktree}
+                />
+                <FieldLabel>Create task branch and worktree</FieldLabel>
+              </Field>
+              {createBranchAndWorktree && (
+                <Field orientation="horizontal">
+                  <Switch checked={pushBranch} onCheckedChange={setPushBranch} />
+                  <FieldLabel>Push branch to remote</FieldLabel>
+                </Field>
+              )}
+            </div>
+          </CollapsibleContent>
+        </Collapsible>
+      )}
+      {isUnborn && (
+        <p className="border-t border-border bg-background-1 px-2 py-1 text-xs text-foreground-muted">
+          Create an initial commit to enable branch-based tasks.
+        </p>
+      )}
+    </div>
+  );
+}
diff --git a/src/renderer/features/tasks/create-task-modal/checkout-mode-group.tsx b/src/renderer/features/tasks/create-task-modal/checkout-mode-group.tsx
new file mode 100644
index 0000000000..c470468be8
--- /dev/null
+++ b/src/renderer/features/tasks/create-task-modal/checkout-mode-group.tsx
@@ -0,0 +1,43 @@
+import { Field, FieldLabel } from '@renderer/lib/ui/field';
+import { RadioGroup, RadioGroupItem } from '@renderer/lib/ui/radio-group';
+import { Switch } from '@renderer/lib/ui/switch';
+import { CheckoutMode } from './use-from-pull-request-mode';
+
+interface CheckoutModeGroupProps {
+  value: CheckoutMode;
+  onValueChange: (value: CheckoutMode) => void;
+  pushBranch: boolean;
+  onPushBranchChange: (value: boolean) => void;
+  disabled?: boolean;
+}
+
+export function CheckoutModeGroup({
+  value,
+  onValueChange,
+  pushBranch,
+  onPushBranchChange,
+  disabled,
+}: CheckoutModeGroupProps) {
+  const createBranchAndWorktree = value === 'new-branch';
+
+  return (
+    <div className="flex flex-col gap-2">
+      <RadioGroup value={value} onValueChange={(v) => onValueChange(v as CheckoutMode)}>
+        <Field orientation="horizontal">
+          <RadioGroupItem value="checkout" disabled={disabled} />
+          <FieldLabel>Checkout branch for review</FieldLabel>
+        </Field>
+        <Field orientation="horizontal">
+          <RadioGroupItem value="new-branch" disabled={disabled} />
+          <FieldLabel>Create task branch and worktree</FieldLabel>
+        </Field>
+      </RadioGroup>
+      {createBranchAndWorktree && (
+        <Field orientation="horizontal">
+          <Switch checked={pushBranch} onCheckedChange={onPushBranchChange} disabled={disabled} />
+          <FieldLabel>Push branch to remote</FieldLabel>
+        </Field>
+      )}
+    </div>
+  );
+}
diff --git a/src/renderer/features/tasks/create-task-modal/create-task-modal.tsx b/src/renderer/features/tasks/create-task-modal/create-task-modal.tsx
new file mode 100644
index 0000000000..da20962013
--- /dev/null
+++ b/src/renderer/features/tasks/create-task-modal/create-task-modal.tsx
@@ -0,0 +1,250 @@
+import { ChevronRight, FolderOpen } from 'lucide-react';
+import { observer } from 'mobx-react-lite';
+import { useCallback, useState } from 'react';
+import { getPrNumber, isForkPr, type PullRequest } from '@shared/pull-requests';
+import {
+  getProjectManagerStore,
+  getRepositoryStore,
+  mountedProjectData,
+} from '@renderer/features/projects/stores/project-selectors';
+import { ProjectSelector } from '@renderer/features/tasks/create-task-modal/project-selector';
+import { useNavigate } from '@renderer/lib/layout/navigation-provider';
+import { BaseModalProps } from '@renderer/lib/modal/modal-provider';
+import { appState } from '@renderer/lib/stores/app-state';
+import { AnimatedHeight } from '@renderer/lib/ui/animated-height';
+import { ComboboxTrigger, ComboboxValue } from '@renderer/lib/ui/combobox';
+import { ConfirmButton } from '@renderer/lib/ui/confirm-button';
+import {
+  DialogContentArea,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+} from '@renderer/lib/ui/dialog';
+import { ToggleGroup, ToggleGroupItem } from '@renderer/lib/ui/toggle-group';
+import {
+  resolveBranchLikeTaskStrategy,
+  resolvePullRequestTaskStrategy,
+} from './create-task-strategy';
+import { FromBranchContent } from './from-branch-content';
+import { FromIssueContent } from './from-issue-content';
+import { FromPrContent } from './from-pr-content';
+import { useFromBranchMode } from './use-from-branch-mode';
+import { useFromIssueMode } from './use-from-issue-mode';
+import { useFromPullRequestMode } from './use-from-pull-request-mode';
+
+type CreateTaskStrategy = 'from-branch' | 'from-issue' | 'from-pull-request';
+
+export const CreateTaskModal = observer(function CreateTaskModal({
+  projectId,
+  strategy = 'from-branch',
+  initialPR,
+  onClose,
+}: BaseModalProps & {
+  projectId?: string;
+  strategy?: CreateTaskStrategy;
+  initialPR?: PullRequest;
+}) {
+  const [selectedProjectId, setSelectedProjectId] = useState<string | undefined>(() => {
+    if (projectId) return projectId;
+    const nav = appState.navigation;
+    const navProjectId =
+      nav.currentViewId === 'task'
+        ? (nav.viewParamsStore['task'] as { projectId?: string } | undefined)?.projectId
+        : nav.currentViewId === 'project'
+          ? (nav.viewParamsStore['project'] as { projectId?: string } | undefined)?.projectId
+          : undefined;
+    return (
+      navProjectId ??
+      Array.from(getProjectManagerStore().projects.values())
+        .reverse()
+        .find((p) => p.state === 'mounted')?.data?.id
+    );
+  });
+  const [selectedStrategy, setSelectedStrategy] = useState<CreateTaskStrategy>(strategy);
+  const [isTransitioning, setIsTransitioning] = useState(false);
+  const repo = selectedProjectId ? getRepositoryStore(selectedProjectId) : undefined;
+  const defaultBranch = repo?.defaultBranch;
+  const isUnborn = repo?.isUnborn ?? false;
+  const currentBranch = repo?.currentBranch ?? null;
+  const { navigate } = useNavigate();
+
+  const projectData = selectedProjectId
+    ? mountedProjectData(getProjectManagerStore().projects.get(selectedProjectId))
+    : null;
+  const nameWithOwner = selectedProjectId
+    ? (getRepositoryStore(selectedProjectId)?.repositoryUrl ?? undefined)
+    : undefined;
+
+  const fromBranch = useFromBranchMode(selectedProjectId, defaultBranch, isUnborn, currentBranch);
+  const fromIssue = useFromIssueMode(selectedProjectId, defaultBranch, isUnborn, currentBranch);
+  const fromPR = useFromPullRequestMode(selectedProjectId, defaultBranch, isUnborn, initialPR);
+  const fromPrUnavailable = selectedStrategy === 'from-pull-request' && !nameWithOwner;
+
+  const activeMode = {
+    'from-branch': fromBranch,
+    'from-issue': fromIssue,
+    'from-pull-request': fromPR,
+  }[selectedStrategy];
+  const canCreate = !!selectedProjectId && activeMode.isValid && !fromPrUnavailable;
+
+  const handleCreateTask = useCallback(() => {
+    if (!selectedProjectId) return;
+    const id = crypto.randomUUID();
+    const projectStore = getProjectManagerStore().projects.get(selectedProjectId);
+    if (projectStore?.state !== 'mounted') return;
+
+    switch (selectedStrategy) {
+      case 'from-branch': {
+        if (!fromBranch.selectedBranch) return;
+        const taskStrategy = resolveBranchLikeTaskStrategy({
+          isUnborn,
+          createBranchAndWorktree: fromBranch.createBranchAndWorktree,
+          taskBranch: fromBranch.taskName,
+          pushBranch: fromBranch.pushBranch,
+        });
+        void projectStore.mountedProject!.taskManager.createTask({
+          id,
+          projectId: selectedProjectId,
+          name: fromBranch.taskName,
+          sourceBranch: fromBranch.selectedBranch,
+          strategy: taskStrategy,
+        });
+        break;
+      }
+      case 'from-issue': {
+        if (!fromIssue.selectedBranch) return;
+        const taskStrategy = resolveBranchLikeTaskStrategy({
+          isUnborn,
+          createBranchAndWorktree: fromIssue.createBranchAndWorktree,
+          taskBranch: fromIssue.taskName,
+          pushBranch: fromIssue.pushBranch,
+        });
+        void projectStore.mountedProject!.taskManager.createTask({
+          id,
+          projectId: selectedProjectId,
+          name: fromIssue.taskName,
+          sourceBranch: fromIssue.selectedBranch,
+          strategy: taskStrategy,
+          linkedIssue: fromIssue.linkedIssue ?? undefined,
+        });
+        break;
+      }
+      case 'from-pull-request': {
+        if (!fromPR.linkedPR) return;
+        const reviewBranch = fromPR.linkedPR.headRefName;
+        const taskStrategy = resolvePullRequestTaskStrategy({
+          checkoutMode: fromPR.checkoutMode,
+          prNumber: getPrNumber(fromPR.linkedPR) ?? 0,
+          headBranch: reviewBranch,
+          headRepositoryUrl: fromPR.linkedPR.headRepositoryUrl,
+          isFork: isForkPr(fromPR.linkedPR),
+          taskBranch: fromPR.taskName,
+          pushBranch: fromPR.branchSelection.pushBranch,
+        });
+        void projectStore.mountedProject!.taskManager.createTask({
+          id,
+          projectId: selectedProjectId,
+          name: fromPR.taskName,
+          sourceBranch: { type: 'local', branch: reviewBranch },
+          initialStatus:
+            fromPR.linkedPR.status === 'open' && !fromPR.linkedPR.isDraft ? 'review' : undefined,
+          strategy: taskStrategy,
+        });
+        break;
+      }
+    }
+
+    navigate('task', { projectId: selectedProjectId, taskId: id });
+    onClose();
+  }, [
+    selectedProjectId,
+    selectedStrategy,
+    fromBranch,
+    fromIssue,
+    fromPR,
+    isUnborn,
+    navigate,
+    onClose,
+  ]);
+
+  return (
+    <>
+      <DialogHeader className="flex items-center gap-2">
+        <ProjectSelector
+          value={selectedProjectId}
+          onChange={setSelectedProjectId}
+          trigger={
+            <ComboboxTrigger className="h-6 flex items-center gap-2 border border-border rounded-md px-2.5 py-1 text-sm outline-none">
+              <FolderOpen className="size-3.5 shrink-0 text-muted-foreground" />
+              <ComboboxValue placeholder="Select a project" />
+            </ComboboxTrigger>
+          }
+        />
+        <ChevronRight className="size-3.5 text-foreground-passive" />
+        <DialogTitle>Create Task</DialogTitle>
+      </DialogHeader>
+      <DialogContentArea className="gap-4">
+        <ToggleGroup
+          className="w-full"
+          value={[selectedStrategy]}
+          onValueChange={([value]) => {
+            if (value) {
+              setSelectedStrategy(value as CreateTaskStrategy);
+            }
+          }}
+        >
+          <ToggleGroupItem className="flex-1" value="from-branch">
+            From Branch
+          </ToggleGroupItem>
+          <ToggleGroupItem className="flex-1" value="from-issue">
+            From Issue
+          </ToggleGroupItem>
+          <ToggleGroupItem className="flex-1" value="from-pull-request">
+            From Pull Request
+          </ToggleGroupItem>
+        </ToggleGroup>
+        <AnimatedHeight onAnimatingChange={setIsTransitioning}>
+          {selectedStrategy === 'from-branch' && (
+            <FromBranchContent
+              state={fromBranch}
+              projectId={selectedProjectId}
+              currentBranch={currentBranch}
+              isUnborn={isUnborn}
+            />
+          )}
+          {selectedStrategy === 'from-issue' && (
+            <FromIssueContent
+              state={fromIssue}
+              projectId={selectedProjectId}
+              currentBranch={currentBranch}
+              nameWithOwner={nameWithOwner}
+              projectPath={projectData?.path}
+              disabled={isTransitioning}
+              isUnborn={isUnborn}
+            />
+          )}
+          {selectedStrategy === 'from-pull-request' && (
+            <div className="flex flex-col gap-3">
+              {!nameWithOwner && (
+                <p className="text-sm text-muted-foreground">
+                  Pull requests are currently available only for configured GitHub remotes.
+                </p>
+              )}
+              <FromPrContent
+                state={fromPR}
+                projectId={selectedProjectId}
+                nameWithOwner={nameWithOwner}
+                disabled={isTransitioning || fromPrUnavailable}
+              />
+            </div>
+          )}
+        </AnimatedHeight>
+      </DialogContentArea>
+      <DialogFooter>
+        <ConfirmButton size="sm" onClick={handleCreateTask} disabled={!canCreate}>
+          Create
+        </ConfirmButton>
+      </DialogFooter>
+    </>
+  );
+});
diff --git a/src/renderer/features/tasks/create-task-modal/create-task-strategy.ts b/src/renderer/features/tasks/create-task-modal/create-task-strategy.ts
new file mode 100644
index 0000000000..5f5267fb7b
--- /dev/null
+++ b/src/renderer/features/tasks/create-task-modal/create-task-strategy.ts
@@ -0,0 +1,51 @@
+import type { CreateTaskStrategy } from '@shared/tasks';
+
+type BranchLikeTaskStrategy = Extract<CreateTaskStrategy, { kind: 'new-branch' | 'no-worktree' }>;
+type PullRequestTaskStrategy = Extract<CreateTaskStrategy, { kind: 'from-pull-request' }>;
+
+export function resolveBranchLikeTaskStrategy(input: {
+  isUnborn: boolean;
+  createBranchAndWorktree: boolean;
+  taskBranch: string;
+  pushBranch: boolean;
+}): BranchLikeTaskStrategy {
+  if (input.isUnborn || !input.createBranchAndWorktree) {
+    return { kind: 'no-worktree' };
+  }
+
+  return {
+    kind: 'new-branch',
+    taskBranch: input.taskBranch,
+    pushBranch: input.pushBranch,
+  };
+}
+
+export function resolvePullRequestTaskStrategy(input: {
+  checkoutMode: 'checkout' | 'new-branch';
+  prNumber: number;
+  headBranch: string;
+  headRepositoryUrl: string;
+  isFork: boolean;
+  taskBranch: string;
+  pushBranch: boolean;
+}): PullRequestTaskStrategy {
+  if (input.checkoutMode === 'checkout') {
+    return {
+      kind: 'from-pull-request',
+      prNumber: input.prNumber,
+      headBranch: input.headBranch,
+      headRepositoryUrl: input.headRepositoryUrl,
+      isFork: input.isFork,
+    };
+  }
+
+  return {
+    kind: 'from-pull-request',
+    prNumber: input.prNumber,
+    headBranch: input.headBranch,
+    headRepositoryUrl: input.headRepositoryUrl,
+    isFork: input.isFork,
+    taskBranch: input.taskBranch,
+    pushBranch: input.pushBranch,
+  };
+}
diff --git a/src/renderer/features/tasks/create-task-modal/from-branch-content.tsx b/src/renderer/features/tasks/create-task-modal/from-branch-content.tsx
new file mode 100644
index 0000000000..e5e8460109
--- /dev/null
+++ b/src/renderer/features/tasks/create-task-modal/from-branch-content.tsx
@@ -0,0 +1,29 @@
+import { BranchPickerField } from './branch-picker-field';
+import { TaskNameField } from './task-name-field';
+import { FromBranchModeState } from './use-from-branch-mode';
+
+interface FromBranchContentProps {
+  state: FromBranchModeState;
+  projectId?: string;
+  currentBranch?: string | null;
+  isUnborn?: boolean;
+}
+
+export function FromBranchContent({
+  state,
+  projectId,
+  currentBranch,
+  isUnborn,
+}: FromBranchContentProps) {
+  return (
+    <div className="flex flex-col gap-4">
+      <BranchPickerField
+        state={state}
+        projectId={projectId}
+        currentBranch={currentBranch}
+        isUnborn={isUnborn}
+      />
+      <TaskNameField state={state} />
+    </div>
+  );
+}
diff --git a/src/renderer/features/tasks/create-task-modal/from-issue-content.tsx b/src/renderer/features/tasks/create-task-modal/from-issue-content.tsx
new file mode 100644
index 0000000000..173585cac8
--- /dev/null
+++ b/src/renderer/features/tasks/create-task-modal/from-issue-content.tsx
@@ -0,0 +1,70 @@
+import { useState } from 'react';
+import { InlineIssueSelector } from '../components/issue-selector/inline-issue-selector';
+import { SelectedIssueValue } from '../components/issue-selector/issue-selector';
+import { BranchPickerField } from './branch-picker-field';
+import { TaskNameField } from './task-name-field';
+import { FromIssueModeState } from './use-from-issue-mode';
+
+interface FromIssueContentProps {
+  state: FromIssueModeState;
+  projectId?: string;
+  currentBranch?: string | null;
+  nameWithOwner?: string;
+  projectPath?: string;
+  disabled?: boolean;
+  isUnborn?: boolean;
+}
+
+export function FromIssueContent({
+  state,
+  projectId,
+  currentBranch,
+  nameWithOwner = '',
+  projectPath = '',
+  disabled,
+  isUnborn,
+}: FromIssueContentProps) {
+  const [isSelecting, setIsSelecting] = useState(!state.linkedIssue);
+
+  const handleValueChange = (issue: Parameters<typeof state.setLinkedIssue>[0]) => {
+    state.setLinkedIssue(issue);
+    if (issue) setIsSelecting(false);
+  };
+
+  return (
+    <div className="flex flex-col gap-4">
+      {isSelecting || !state.linkedIssue ? (
+        <InlineIssueSelector
+          value={state.linkedIssue}
+          onValueChange={handleValueChange}
+          projectId={projectId}
+          nameWithOwner={nameWithOwner}
+          projectPath={projectPath}
+          disabled={disabled}
+        />
+      ) : (
+        <div className="rounded-md border border-border overflow-hidden flex flex-col gap-2">
+          <div className="flex flex-col gap-2 p-2">
+            <SelectedIssueValue issue={state.linkedIssue!} />
+          </div>
+          <div className="flex items-center justify-between h-6 px-2 text-xs bg-background-1 border-t border-border">
+            <div className="text-foreground-muted"></div>
+            <div className="text-foreground-muted">
+              <button className="flex items-center gap-2" onClick={() => setIsSelecting(true)}>
+                Select another Issue
+              </button>
+            </div>
+          </div>
+        </div>
+      )}
+
+      <BranchPickerField
+        state={state}
+        projectId={projectId}
+        currentBranch={currentBranch}
+        isUnborn={isUnborn}
+      />
+      <TaskNameField state={state} />
+    </div>
+  );
+}
diff --git a/src/renderer/features/tasks/create-task-modal/from-pr-content.tsx b/src/renderer/features/tasks/create-task-modal/from-pr-content.tsx
new file mode 100644
index 0000000000..87367a1fca
--- /dev/null
+++ b/src/renderer/features/tasks/create-task-modal/from-pr-content.tsx
@@ -0,0 +1,32 @@
+import { CheckoutModeGroup } from './checkout-mode-group';
+import { PrPickerField } from './pr-picker-field';
+import { TaskNameField } from './task-name-field';
+import { FromPullRequestModeState } from './use-from-pull-request-mode';
+
+interface FromPrContentProps {
+  state: FromPullRequestModeState;
+  projectId?: string;
+  nameWithOwner?: string;
+  disabled?: boolean;
+}
+
+export function FromPrContent({ state, projectId, nameWithOwner, disabled }: FromPrContentProps) {
+  return (
+    <div className="flex flex-col gap-4">
+      <PrPickerField
+        state={state}
+        projectId={projectId}
+        repositoryUrl={nameWithOwner}
+        disabled={disabled}
+      />
+      <CheckoutModeGroup
+        value={state.checkoutMode}
+        onValueChange={state.setCheckoutMode}
+        pushBranch={state.branchSelection.pushBranch}
+        onPushBranchChange={state.branchSelection.setPushBranch}
+        disabled={disabled}
+      />
+      <TaskNameField state={state} />
+    </div>
+  );
+}
diff --git a/src/renderer/features/tasks/create-task-modal/issue-task-name.test.ts b/src/renderer/features/tasks/create-task-modal/issue-task-name.test.ts
new file mode 100644
index 0000000000..ff79f7983b
--- /dev/null
+++ b/src/renderer/features/tasks/create-task-modal/issue-task-name.test.ts
@@ -0,0 +1,52 @@
+import { describe, expect, it } from 'vitest';
+import { getIssueTaskName } from './issue-task-name';
+
+describe('getIssueTaskName', () => {
+  it('normalizes a Linear branch name into a task name', () => {
+    expect(
+      getIssueTaskName({
+        provider: 'linear',
+        url: 'https://linear.app/general-action/issue/GEN-626',
+        title: 'Linear issue branch name creation',
+        identifier: 'GEN-626',
+        branchName: 'jona/gen-626-linear-issue-branch-name-creation',
+      })
+    ).toBe('jona-gen-626-linear-issue-branch-name-creation');
+  });
+
+  it('returns null for non-Linear issues', () => {
+    expect(
+      getIssueTaskName({
+        provider: 'jira',
+        url: 'https://example.atlassian.net/browse/APP-42',
+        title: 'Fix login bug',
+        identifier: 'APP-42',
+        branchName: 'jona/app-42-fix-login-bug',
+      })
+    ).toBeNull();
+  });
+
+  it('returns null when Linear did not provide a branch name', () => {
+    expect(
+      getIssueTaskName({
+        provider: 'linear',
+        url: 'https://linear.app/general-action/issue/GEN-626',
+        title: 'Linear issue branch name creation',
+        identifier: 'GEN-626',
+      })
+    ).toBeNull();
+  });
+
+  it('applies existing task-name length limits', () => {
+    expect(
+      getIssueTaskName({
+        provider: 'linear',
+        url: 'https://linear.app/general-action/issue/GEN-626',
+        title: 'Linear issue branch name creation',
+        identifier: 'GEN-626',
+        branchName:
+          'jona/gen-626-a-very-long-linear-issue-branch-name-that-should-be-truncated-for-task-name-display',
+      })
+    ).toHaveLength(64);
+  });
+});
diff --git a/src/renderer/features/tasks/create-task-modal/issue-task-name.ts b/src/renderer/features/tasks/create-task-modal/issue-task-name.ts
new file mode 100644
index 0000000000..9b9799feee
--- /dev/null
+++ b/src/renderer/features/tasks/create-task-modal/issue-task-name.ts
@@ -0,0 +1,16 @@
+import type { Issue } from '@shared/tasks';
+import { normalizeTaskName } from '@renderer/utils/taskNames';
+
+export function getIssueTaskName(issue: Issue | null | undefined): string | null {
+  if (issue?.provider !== 'linear') {
+    return null;
+  }
+
+  const branchName = issue.branchName?.trim();
+  if (!branchName) {
+    return null;
+  }
+
+  const normalized = normalizeTaskName(branchName.replace(/\//g, '-'));
+  return normalized || null;
+}
diff --git a/src/renderer/features/tasks/create-task-modal/pr-picker-field.tsx b/src/renderer/features/tasks/create-task-modal/pr-picker-field.tsx
new file mode 100644
index 0000000000..b779c1219a
--- /dev/null
+++ b/src/renderer/features/tasks/create-task-modal/pr-picker-field.tsx
@@ -0,0 +1,39 @@
+import { useState } from 'react';
+import { InlinePrSelector } from '../components/inline-pr-selector';
+import { SelectedPrCard } from './selected-pr-card';
+import { FromPullRequestModeState } from './use-from-pull-request-mode';
+
+interface PrPickerFieldProps {
+  state: FromPullRequestModeState;
+  projectId?: string;
+  repositoryUrl?: string;
+  disabled?: boolean;
+}
+
+export function PrPickerField({ state, projectId, repositoryUrl, disabled }: PrPickerFieldProps) {
+  const [isSelecting, setIsSelecting] = useState(!state.linkedPR);
+
+  const handleValueChange = (pr: Parameters<typeof state.setLinkedPR>[0]) => {
+    state.setLinkedPR(pr);
+    if (pr) setIsSelecting(false);
+  };
+
+  const handleDeselect = () => {
+    state.setLinkedPR(null);
+    setIsSelecting(true);
+  };
+
+  if (isSelecting || !state.linkedPR) {
+    return (
+      <InlinePrSelector
+        value={state.linkedPR}
+        onValueChange={handleValueChange}
+        projectId={projectId}
+        repositoryUrl={repositoryUrl}
+        disabled={disabled}
+      />
+    );
+  }
+
+  return <SelectedPrCard pr={state.linkedPR} onDeselect={handleDeselect} />;
+}
diff --git a/src/renderer/features/tasks/create-task-modal/project-selector.tsx b/src/renderer/features/tasks/create-task-modal/project-selector.tsx
new file mode 100644
index 0000000000..57383eb31e
--- /dev/null
+++ b/src/renderer/features/tasks/create-task-modal/project-selector.tsx
@@ -0,0 +1,88 @@
+import { observer } from 'mobx-react-lite';
+import React, { useState } from 'react';
+import {
+  asMounted,
+  getProjectManagerStore,
+} from '@renderer/features/projects/stores/project-selectors';
+import {
+  Combobox,
+  ComboboxCollection,
+  ComboboxContent,
+  ComboboxGroup,
+  ComboboxInput,
+  ComboboxItem,
+  ComboboxList,
+  ComboboxTrigger,
+  ComboboxValue,
+} from '@renderer/lib/ui/combobox';
+
+interface ProjectOption {
+  value: string;
+  label: string;
+}
+
+interface ProjectSelectorProps {
+  value: string | undefined;
+  onChange: (projectId: string) => void;
+  trigger?: React.ReactNode;
+}
+
+export const ProjectSelector = observer(function ProjectSelector({
+  value,
+  onChange,
+  trigger,
+}: ProjectSelectorProps) {
+  const [open, setOpen] = useState(false);
+
+  const options: ProjectOption[] = Array.from(getProjectManagerStore().projects.entries()).flatMap(
+    ([id, store]) => {
+      const mounted = asMounted(store);
+      return mounted ? [{ value: id, label: mounted.data.name }] : [];
+    }
+  );
+
+  const selectedOption = options.find((o) => o.value === value) ?? null;
+
+  function handleValueChange(item: ProjectOption | null) {
+    if (!item) return;
+    onChange(item.value);
+    setOpen(false);
+  }
+
+  return (
+    <Combobox
+      items={[{ value: 'options', items: options }]}
+      value={selectedOption}
+      onValueChange={handleValueChange}
+      open={open}
+      onOpenChange={setOpen}
+      isItemEqualToValue={(a: ProjectOption, b: ProjectOption) => a.value === b.value}
+      filter={(item: ProjectOption, query) =>
+        item.label.toLowerCase().includes(query.toLowerCase())
+      }
+      autoHighlight
+    >
+      {trigger ?? (
+        <ComboboxTrigger className="flex h-8 w-full min-w-0 items-center gap-2 rounded-md border border-border bg-transparent px-2.5 py-1 text-sm outline-none">
+          <ComboboxValue placeholder="Select a project" />
+        </ComboboxTrigger>
+      )}
+      <ComboboxContent className="w-auto min-w-(--anchor-width)">
+        <ComboboxInput showTrigger={false} placeholder="Search projects..." />
+        <ComboboxList className="pb-0">
+          {(group: { value: string; items: ProjectOption[] }) => (
+            <ComboboxGroup key={group.value} items={group.items} className="py-1">
+              <ComboboxCollection>
+                {(item: ProjectOption) => (
+                  <ComboboxItem key={item.value} value={item}>
+                    {item.label}
+                  </ComboboxItem>
+                )}
+              </ComboboxCollection>
+            </ComboboxGroup>
+          )}
+        </ComboboxList>
+      </ComboboxContent>
+    </Combobox>
+  );
+});
diff --git a/src/renderer/features/tasks/create-task-modal/selected-pr-card.tsx b/src/renderer/features/tasks/create-task-modal/selected-pr-card.tsx
new file mode 100644
index 0000000000..3e674abf06
--- /dev/null
+++ b/src/renderer/features/tasks/create-task-modal/selected-pr-card.tsx
@@ -0,0 +1,49 @@
+import { GitPullRequest } from 'lucide-react';
+import type { PullRequest } from '@shared/pull-requests';
+
+interface SelectedPrCardProps {
+  pr: PullRequest;
+  onDeselect: () => void;
+}
+
+export function SelectedPrCard({ pr, onDeselect }: SelectedPrCardProps) {
+  return (
+    <div className="rounded-md border border-border overflow-hidden flex flex-col gap-2">
+      <div className="flex flex-col gap-2 p-2">
+        <div className="flex items-start gap-2 min-w-0">
+          <GitPullRequest className="size-4 shrink-0 text-foreground-muted mt-0.5" />
+          <div className="flex flex-col min-w-0 gap-0.5">
+            <div className="flex items-center gap-1.5 min-w-0">
+              <span className="font-mono text-xs text-foreground-muted shrink-0">
+                {pr.identifier ?? ''}
+              </span>
+              {pr.isDraft && (
+                <span className="text-xs text-foreground-muted border border-border rounded px-1 shrink-0">
+                  Draft
+                </span>
+              )}
+              <span className="text-sm truncate font-medium">{pr.title}</span>
+            </div>
+            <div className="flex items-center gap-1 text-xs text-foreground-muted">
+              <code className="text-xs">{pr.headRefName}</code>
+              {pr.author && (
+                <>
+                  <span>·</span>
+                  <span>{pr.author.userName}</span>
+                </>
+              )}
+            </div>
+          </div>
+        </div>
+      </div>
+      <div className="flex items-center justify-between h-6 px-2 text-xs bg-background-1 border-t border-border">
+        <div className="text-foreground-muted"></div>
+        <div className="text-foreground-muted">
+          <button className="flex items-center gap-2" onClick={onDeselect}>
+            Select another PR
+          </button>
+        </div>
+      </div>
+    </div>
+  );
+}
diff --git a/src/renderer/features/tasks/create-task-modal/task-name-field.tsx b/src/renderer/features/tasks/create-task-modal/task-name-field.tsx
new file mode 100644
index 0000000000..e0d80c9c1f
--- /dev/null
+++ b/src/renderer/features/tasks/create-task-modal/task-name-field.tsx
@@ -0,0 +1,23 @@
+import { Field, FieldLabel } from '@renderer/lib/ui/field';
+import { Input } from '@renderer/lib/ui/input';
+import { TaskNameState } from './use-task-name';
+
+interface TaskNameFieldProps {
+  state: TaskNameState;
+}
+
+export function TaskNameField({ state }: TaskNameFieldProps) {
+  const { taskName, handleTaskNameChange, showSlugHint } = state;
+
+  return (
+    <Field>
+      <FieldLabel>Task name</FieldLabel>
+      <Input value={taskName} onChange={(e) => handleTaskNameChange(e.target.value)} />
+      {showSlugHint && (
+        <p className="text-xs text-muted-foreground mt-1">
+          Task names only allow lowercase letters, numbers, and hyphens.
+        </p>
+      )}
+    </Field>
+  );
+}
diff --git a/src/renderer/features/tasks/create-task-modal/use-branch-selection.ts b/src/renderer/features/tasks/create-task-modal/use-branch-selection.ts
new file mode 100644
index 0000000000..480e37e173
--- /dev/null
+++ b/src/renderer/features/tasks/create-task-modal/use-branch-selection.ts
@@ -0,0 +1,64 @@
+import { useCallback, useState } from 'react';
+import type { Branch } from '@shared/git';
+import { useAppSettingsKey } from '@renderer/features/settings/use-app-settings-key';
+
+export type BranchSelectionState = ReturnType<typeof useBranchSelection>;
+
+export function useBranchSelection(
+  selectedProjectId: string | undefined,
+  defaultBranch: Branch | undefined,
+  isUnborn: boolean,
+  currentBranchName?: string | null
+) {
+  const { value: localProject } = useAppSettingsKey('localProject');
+  const pushOnCreateByDefault = localProject?.pushOnCreate ?? true;
+
+  const [createBranchAndWorktreePreference, setCreateBranchAndWorktreePreference] = useState(true);
+  const [pushBranchOverride, setPushBranchOverride] = useState<boolean | undefined>(undefined);
+  const pushBranch = pushBranchOverride ?? pushOnCreateByDefault;
+  const createBranchAndWorktree = isUnborn ? false : createBranchAndWorktreePreference;
+
+  // Store the user's branch override alongside the project it belongs to.
+  // When the project changes the override is for a different project and is
+  // ignored, so defaultBranch takes effect automatically — no effect needed.
+  const [branchOverride, setBranchOverride] = useState<
+    { projectId: string; branch: Branch } | undefined
+  >(undefined);
+
+  const selectedBranch: Branch | undefined =
+    !createBranchAndWorktree && currentBranchName
+      ? { type: 'local', branch: currentBranchName }
+      : branchOverride !== undefined && branchOverride.projectId === selectedProjectId
+        ? branchOverride.branch
+        : defaultBranch;
+
+  const setSelectedBranch = useCallback(
+    (branch: Branch | undefined) => {
+      if (!selectedProjectId || !branch) {
+        setBranchOverride(undefined);
+        return;
+      }
+      setBranchOverride({ projectId: selectedProjectId, branch });
+    },
+    [selectedProjectId]
+  );
+  const setPushBranch = useCallback((value: boolean) => {
+    setPushBranchOverride(value);
+  }, []);
+  const setCreateBranchAndWorktree = useCallback(
+    (value: boolean) => {
+      if (isUnborn) return;
+      setCreateBranchAndWorktreePreference(value);
+    },
+    [isUnborn]
+  );
+
+  return {
+    selectedBranch,
+    setSelectedBranch,
+    createBranchAndWorktree,
+    setCreateBranchAndWorktree,
+    pushBranch,
+    setPushBranch,
+  };
+}
diff --git a/src/renderer/features/tasks/create-task-modal/use-from-branch-mode.ts b/src/renderer/features/tasks/create-task-modal/use-from-branch-mode.ts
new file mode 100644
index 0000000000..5775e181ee
--- /dev/null
+++ b/src/renderer/features/tasks/create-task-modal/use-from-branch-mode.ts
@@ -0,0 +1,50 @@
+import { useQuery } from '@tanstack/react-query';
+import { useMemo } from 'react';
+import { Branch } from '@shared/git';
+import { useTaskSettings } from '@renderer/features/tasks/hooks/useTaskSettings';
+import { rpc } from '@renderer/lib/ipc';
+import { useBranchSelection } from './use-branch-selection';
+import { useTaskName } from './use-task-name';
+
+export type FromBranchModeState = ReturnType<typeof useFromBranchMode>;
+
+export function useFromBranchMode(
+  selectedProjectId: string | undefined,
+  defaultBranch: Branch | undefined,
+  isUnborn: boolean,
+  currentBranchName?: string | null
+) {
+  const branchSelection = useBranchSelection(
+    selectedProjectId,
+    defaultBranch,
+    isUnborn,
+    currentBranchName
+  );
+  const { autoGenerateName } = useTaskSettings();
+
+  const stableKey = useMemo(() => crypto.randomUUID(), []);
+
+  const { data: generatedName, isPending: isGenerating } = useQuery({
+    queryKey: ['generateTaskName', 'random', stableKey],
+    queryFn: () => rpc.tasks.generateTaskName({}),
+    enabled: autoGenerateName,
+    refetchOnWindowFocus: false,
+  });
+
+  const taskName = useTaskName({
+    generatedName: autoGenerateName ? generatedName : undefined,
+    isPending: autoGenerateName && isGenerating,
+    resetKey: selectedProjectId,
+  });
+
+  const isValid =
+    taskName.taskName.trim().length > 0 &&
+    branchSelection.selectedBranch !== undefined &&
+    !taskName.isPending;
+
+  return {
+    ...branchSelection,
+    ...taskName,
+    isValid,
+  };
+}
diff --git a/src/renderer/features/tasks/create-task-modal/use-from-issue-mode.ts b/src/renderer/features/tasks/create-task-modal/use-from-issue-mode.ts
new file mode 100644
index 0000000000..3c0e4f1a0a
--- /dev/null
+++ b/src/renderer/features/tasks/create-task-modal/use-from-issue-mode.ts
@@ -0,0 +1,67 @@
+import { useQuery } from '@tanstack/react-query';
+import { useState } from 'react';
+import { Branch } from '@shared/git';
+import { Issue } from '@shared/tasks';
+import { useTaskSettings } from '@renderer/features/tasks/hooks/useTaskSettings';
+import { rpc } from '@renderer/lib/ipc';
+import { getIssueTaskName } from './issue-task-name';
+import { useBranchSelection } from './use-branch-selection';
+import { useTaskName } from './use-task-name';
+
+export type FromIssueModeState = ReturnType<typeof useFromIssueMode>;
+
+export function useFromIssueMode(
+  selectedProjectId: string | undefined,
+  defaultBranch: Branch | undefined,
+  isUnborn: boolean,
+  currentBranchName?: string | null
+) {
+  const branchSelection = useBranchSelection(
+    selectedProjectId,
+    defaultBranch,
+    isUnborn,
+    currentBranchName
+  );
+  const [linkedIssue, setLinkedIssue] = useState<Issue | null>(null);
+  const [prevProjectId, setPrevProjectId] = useState(selectedProjectId);
+  if (selectedProjectId !== prevProjectId) {
+    setPrevProjectId(selectedProjectId);
+    setLinkedIssue(null);
+  }
+  const { autoGenerateName } = useTaskSettings();
+  const generatedTaskNameFromIssue = getIssueTaskName(linkedIssue);
+
+  const shouldGenerate =
+    autoGenerateName && linkedIssue !== null && generatedTaskNameFromIssue === null;
+
+  const { data: generatedName, isPending: isGenerating } = useQuery({
+    queryKey: ['generateTaskName', linkedIssue?.title ?? null, linkedIssue?.description ?? null],
+    queryFn: () =>
+      rpc.tasks.generateTaskName({
+        title: linkedIssue!.title,
+        description: linkedIssue!.description,
+      }),
+    enabled: shouldGenerate,
+    refetchOnWindowFocus: false,
+  });
+
+  const taskName = useTaskName({
+    generatedName: generatedTaskNameFromIssue ?? (shouldGenerate ? generatedName : undefined),
+    isPending: shouldGenerate && isGenerating,
+    resetKey: selectedProjectId,
+  });
+
+  const isValid =
+    taskName.taskName.trim().length > 0 &&
+    linkedIssue !== null &&
+    branchSelection.selectedBranch !== undefined &&
+    !taskName.isPending;
+
+  return {
+    ...branchSelection,
+    ...taskName,
+    linkedIssue,
+    setLinkedIssue,
+    isValid,
+  };
+}
diff --git a/src/renderer/features/tasks/create-task-modal/use-from-pull-request-mode.ts b/src/renderer/features/tasks/create-task-modal/use-from-pull-request-mode.ts
new file mode 100644
index 0000000000..ca6f291514
--- /dev/null
+++ b/src/renderer/features/tasks/create-task-modal/use-from-pull-request-mode.ts
@@ -0,0 +1,61 @@
+import { useQuery } from '@tanstack/react-query';
+import { useState } from 'react';
+import { Branch } from '@shared/git';
+import type { PullRequest } from '@shared/pull-requests';
+import { useTaskSettings } from '@renderer/features/tasks/hooks/useTaskSettings';
+import { rpc } from '@renderer/lib/ipc';
+import { useBranchSelection } from './use-branch-selection';
+import { useTaskName } from './use-task-name';
+
+export type CheckoutMode = 'checkout' | 'new-branch';
+
+export type FromPullRequestModeState = ReturnType<typeof useFromPullRequestMode>;
+
+export function useFromPullRequestMode(
+  selectedProjectId: string | undefined,
+  defaultBranch: Branch | undefined,
+  isUnborn: boolean,
+  initialPR?: PullRequest
+) {
+  const [linkedPR, setLinkedPR] = useState<PullRequest | null>(initialPR ?? null);
+  const [checkoutMode, setCheckoutMode] = useState<CheckoutMode>('checkout');
+  const [prevProjectId, setPrevProjectId] = useState(selectedProjectId);
+  if (selectedProjectId !== prevProjectId) {
+    setPrevProjectId(selectedProjectId);
+    setLinkedPR(null);
+    setCheckoutMode('checkout');
+  }
+  const branchSelection = useBranchSelection(selectedProjectId, defaultBranch, isUnborn);
+  const { autoGenerateName } = useTaskSettings();
+
+  const shouldGenerate = autoGenerateName && linkedPR !== null;
+
+  const { data: generatedName, isPending: isGenerating } = useQuery({
+    queryKey: ['generateTaskName', linkedPR?.title ?? null, linkedPR?.description ?? null],
+    queryFn: () =>
+      rpc.tasks.generateTaskName({
+        title: linkedPR!.title,
+        description: linkedPR!.description ?? undefined,
+      }),
+    enabled: shouldGenerate,
+    refetchOnWindowFocus: false,
+  });
+
+  const taskName = useTaskName({
+    generatedName: shouldGenerate ? generatedName : undefined,
+    isPending: shouldGenerate && isGenerating,
+    resetKey: selectedProjectId,
+  });
+
+  const isValid = taskName.taskName.trim().length > 0 && linkedPR !== null && !taskName.isPending;
+
+  return {
+    ...taskName,
+    linkedPR,
+    setLinkedPR,
+    checkoutMode,
+    setCheckoutMode,
+    branchSelection,
+    isValid,
+  };
+}
diff --git a/src/renderer/features/tasks/create-task-modal/use-task-name.ts b/src/renderer/features/tasks/create-task-modal/use-task-name.ts
new file mode 100644
index 0000000000..a76fc4e0e2
--- /dev/null
+++ b/src/renderer/features/tasks/create-task-modal/use-task-name.ts
@@ -0,0 +1,43 @@
+import { useCallback, useState } from 'react';
+import { liveTransformTaskName } from '@renderer/utils/taskNames';
+
+export type TaskNameState = {
+  taskName: string;
+  handleTaskNameChange: (value: string) => void;
+  showSlugHint: boolean;
+  isPending: boolean;
+};
+
+export function useTaskName(opts?: {
+  generatedName?: string;
+  isPending?: boolean;
+  resetKey?: unknown;
+}): TaskNameState {
+  const { generatedName, isPending = false, resetKey } = opts ?? {};
+  const [taskName, setTaskName] = useState(generatedName ?? '');
+  const [showSlugHint, setShowSlugHint] = useState(false);
+  const [prevGeneratedName, setPrevGeneratedName] = useState(generatedName);
+  const [prevResetKey, setPrevResetKey] = useState(resetKey);
+
+  if (resetKey !== prevResetKey) {
+    setPrevResetKey(resetKey);
+    setPrevGeneratedName(generatedName);
+    setTaskName(generatedName ?? '');
+    setShowSlugHint(false);
+  } else if (generatedName !== prevGeneratedName) {
+    setPrevGeneratedName(generatedName);
+    if (generatedName !== undefined) {
+      setTaskName(generatedName);
+      setShowSlugHint(false);
+    }
+  }
+
+  const handleTaskNameChange = useCallback((value: string) => {
+    const transformed = liveTransformTaskName(value);
+    setTaskName(transformed);
+    const hasDroppedChars = /[^a-z0-9\s-]/i.test(value);
+    setShowSlugHint(hasDroppedChars);
+  }, []);
+
+  return { taskName, handleTaskNameChange, showSlugHint, isPending };
+}
diff --git a/src/renderer/features/tasks/diff-view/changes-panel/changes-panel.tsx b/src/renderer/features/tasks/diff-view/changes-panel/changes-panel.tsx
new file mode 100644
index 0000000000..6150edc640
--- /dev/null
+++ b/src/renderer/features/tasks/diff-view/changes-panel/changes-panel.tsx
@@ -0,0 +1,92 @@
+import { observer } from 'mobx-react-lite';
+import { useProvisionedTask } from '@renderer/features/tasks/task-view-context';
+import { ResizableHandle, ResizablePanel, ResizablePanelGroup } from '@renderer/lib/ui/resizable';
+import { cn } from '@renderer/utils/utils';
+import { GitStatusSection } from './git-status-section';
+import { SECTION_HEADER_HEIGHT, usePanelLayout } from './hooks/use-panel-layout';
+import { PullRequestsSection } from './pr-section';
+import { StagedSection } from './staged-section';
+import { UnstagedSection } from './unstaged-section';
+
+export const ChangesPanel = observer(function ChangesPanel() {
+  const provisioned = useProvisionedTask();
+  const changesView = provisioned.taskView.diffView.changesView;
+
+  const {
+    expanded,
+    toggleExpanded,
+    panelTransitionClass,
+    pointerHandlers,
+    unstagedRef,
+    stagedRef,
+    prRef,
+    spacerRef,
+  } = usePanelLayout(changesView);
+
+  if (!provisioned.workspace.git.hasData) return null;
+
+  return (
+    <div className="flex h-full flex-col">
+      <ResizablePanelGroup
+        orientation="vertical"
+        className="min-h-0 flex-1"
+        id="changes-panel-group"
+        disableCursor
+      >
+        <ResizablePanel
+          id="changes-unstaged"
+          panelRef={unstagedRef}
+          collapsible
+          collapsedSize={SECTION_HEADER_HEIGHT}
+          minSize="150px"
+          maxSize="100%"
+          defaultSize="33%"
+          className={cn('flex flex-col overflow-hidden', panelTransitionClass)}
+        >
+          <UnstagedSection />
+        </ResizablePanel>
+        <ResizableHandle disabled={!expanded.unstaged || !expanded.staged} {...pointerHandlers} />
+        <ResizablePanel
+          id="changes-staged"
+          panelRef={stagedRef}
+          collapsible
+          collapsedSize={SECTION_HEADER_HEIGHT}
+          minSize="150px"
+          maxSize="100%"
+          defaultSize="33%"
+          className={cn('flex flex-col overflow-hidden', panelTransitionClass)}
+        >
+          <StagedSection />
+        </ResizablePanel>
+        <ResizableHandle
+          disabled={!expanded.staged || !expanded.pullRequests}
+          {...pointerHandlers}
+        />
+        <ResizablePanel
+          id="changes-pr"
+          panelRef={prRef}
+          collapsible
+          collapsedSize={SECTION_HEADER_HEIGHT}
+          minSize="150px"
+          maxSize="100%"
+          defaultSize="33%"
+          className={cn('flex flex-col overflow-hidden', panelTransitionClass)}
+        >
+          <PullRequestsSection
+            onToggleCollapsed={() => toggleExpanded('pullRequests')}
+            collapsed={!expanded.pullRequests}
+          />
+        </ResizablePanel>
+        <ResizablePanel
+          id="changes-spacer"
+          panelRef={spacerRef}
+          minSize="0%"
+          maxSize="100%"
+          defaultSize="0%"
+          className="border-t border-border"
+        />
+      </ResizablePanelGroup>
+      <GitStatusSection />
+    </div>
+  );
+});
diff --git a/src/renderer/features/tasks/diff-view/changes-panel/components/action-card.tsx b/src/renderer/features/tasks/diff-view/changes-panel/components/action-card.tsx
new file mode 100644
index 0000000000..2ae5f694a3
--- /dev/null
+++ b/src/renderer/features/tasks/diff-view/changes-panel/components/action-card.tsx
@@ -0,0 +1,23 @@
+import { ReactNode } from 'react';
+
+interface ActionCardProps {
+  selectedCount: number;
+  selectionActions: ReactNode;
+  generalActions: ReactNode;
+}
+
+export function ActionCard({ selectedCount, selectionActions, generalActions }: ActionCardProps) {
+  const hasSelection = selectedCount > 0;
+  return (
+    <div className="shrink-0 mx-2 flex items-center justify-between rounded-lg border border-border bg-background-1 pl-2.5 pr-1.5 py-1.5">
+      <span className="text-xs text-foreground-muted truncate min-w-0">
+        {hasSelection
+          ? `${selectedCount} file${selectedCount !== 1 ? 's' : ''} selected`
+          : 'All files'}
+      </span>
+      <div className="flex items-center gap-1.5">
+        {hasSelection ? selectionActions : generalActions}
+      </div>
+    </div>
+  );
+}
diff --git a/src/renderer/features/tasks/diff-view/changes-panel/components/changes-list-item.tsx b/src/renderer/features/tasks/diff-view/changes-panel/components/changes-list-item.tsx
new file mode 100644
index 0000000000..0ab840d47c
--- /dev/null
+++ b/src/renderer/features/tasks/diff-view/changes-panel/components/changes-list-item.tsx
@@ -0,0 +1,87 @@
+import { SquareArrowRight, SquareDot, SquareMinus, SquarePlus, SquareX } from 'lucide-react';
+import { ButtonHTMLAttributes, forwardRef, useMemo } from 'react';
+import { GitChange, GitChangeStatus } from '@shared/git';
+import { splitPath } from '@renderer/features/tasks/utils';
+import { FileIcon } from '@renderer/lib/editor/file-icon';
+import { Checkbox } from '@renderer/lib/ui/checkbox';
+import { cn } from '@renderer/utils/utils';
+
+interface ChangesListItemProps extends ButtonHTMLAttributes<HTMLButtonElement> {
+  change: GitChange;
+  isSelected?: boolean;
+  isActive?: boolean;
+  onToggleSelect?: (path: string) => void;
+}
+
+export const ChangesListItem = forwardRef<HTMLButtonElement, ChangesListItemProps>(
+  ({ change, isSelected, isActive, onToggleSelect, className, ...props }, ref) => {
+    const { filename, directory } = useMemo(() => splitPath(change.path), [change.path]);
+    return (
+      <button
+        className={cn(
+          'group/item w-full flex items-center gap-2 justify-between px-2 py-1 hover:bg-background-1 h-7 rounded-md',
+          isActive && 'bg-background-2 hover:bg-background-2',
+          className
+        )}
+        ref={ref}
+        {...props}
+      >
+        <div className="flex items-center gap-1.5 min-w-0">
+          <FileIcon filename={filename} size={12} />
+          <span className="text-sm truncate">{filename}</span>
+          {directory && <span className="text-xs text-foreground-muted truncate">{directory}</span>}
+        </div>
+        <div className="relative size-4 shrink-0 flex items-center justify-center">
+          <span
+            className={cn(
+              'transition-opacity',
+              onToggleSelect && 'group-hover/item:opacity-0',
+              isSelected && 'opacity-0'
+            )}
+          >
+            <GitChangeStatusIcon status={change.status} className="size-4" />
+          </span>
+          {onToggleSelect && (
+            <span
+              className={cn(
+                'absolute inset-0 flex items-center justify-center transition-opacity',
+                'opacity-0 group-hover/item:opacity-100',
+                isSelected && 'opacity-100'
+              )}
+            >
+              <Checkbox
+                checked={isSelected ?? false}
+                onCheckedChange={() => onToggleSelect(change.path)}
+                onClick={(e) => e.stopPropagation()}
+                aria-label={`Select ${filename}`}
+              />
+            </span>
+          )}
+        </div>
+      </button>
+    );
+  }
+);
+
+function GitChangeStatusIcon({
+  status,
+  className,
+}: {
+  status: GitChangeStatus;
+  className?: string;
+}) {
+  switch (status) {
+    case 'added':
+      return <SquarePlus className={cn('size-4 text-foreground-diff-added', className)} />;
+    case 'modified':
+      return <SquareDot className={cn('size-4 text-foreground-diff-modified', className)} />;
+    case 'deleted':
+      return <SquareMinus className={cn('size-4 text-foreground-diff-deleted', className)} />;
+    case 'renamed':
+      return <SquareArrowRight className={cn('size-4 text-gray-500', className)} />;
+    case 'conflicted':
+      return <SquareX className={cn('size-4 text-orange-500', className)} />;
+    default:
+      return null;
+  }
+}
diff --git a/src/renderer/features/tasks/diff-view/changes-panel/components/commit-card.tsx b/src/renderer/features/tasks/diff-view/changes-panel/components/commit-card.tsx
new file mode 100644
index 0000000000..51a9d980b0
--- /dev/null
+++ b/src/renderer/features/tasks/diff-view/changes-panel/components/commit-card.tsx
@@ -0,0 +1,131 @@
+import { CheckCircle, Loader2 } from 'lucide-react';
+import { observer } from 'mobx-react-lite';
+import { useState } from 'react';
+import { useProvisionedTask } from '@renderer/features/tasks/task-view-context';
+import { Input } from '@renderer/lib/ui/input';
+import { SplitButton, type SplitButtonAction } from '@renderer/lib/ui/split-button';
+import { Textarea } from '@renderer/lib/ui/textarea';
+
+type CommitPhase = 'idle' | 'committing' | 'commit-only-done' | 'committed' | 'pushing' | 'pushed';
+
+interface CommitCardProps {
+  autoStage?: boolean;
+}
+
+export const CommitCard = observer(function CommitCard({ autoStage = false }: CommitCardProps) {
+  const provisioned = useProvisionedTask();
+  const git = provisioned.workspace.git;
+  const changesView = provisioned.taskView.diffView.changesView;
+  const hasPRs = changesView.expandedSections.pullRequests;
+  const [commitMessage, setCommitMessage] = useState('');
+  const [description, setDescription] = useState('');
+  const [phase, setPhase] = useState<CommitPhase>('idle');
+  const fullMessage = description ? `${commitMessage}\n\n${description}` : commitMessage;
+  const isInFlight = phase !== 'idle';
+
+  const doCommit = async () => {
+    setPhase('committing');
+    if (autoStage) {
+      changesView.suppressNextAutoExpand('staged');
+      await git.stageAllFiles();
+    }
+    const result = await git.commit(fullMessage);
+    if (!result.success) {
+      setPhase('idle');
+      return;
+    }
+    setCommitMessage('');
+    setDescription('');
+    if (!autoStage) {
+      changesView.setExpanded({ unstaged: true, staged: false, pullRequests: hasPRs });
+    }
+    setPhase('commit-only-done');
+    setTimeout(() => setPhase('idle'), 3000);
+  };
+
+  const doCommitAndPush = async () => {
+    setPhase('committing');
+    if (autoStage) {
+      changesView.suppressNextAutoExpand('staged');
+      await git.stageAllFiles();
+    }
+    const commitResult = await git.commit(fullMessage);
+    if (!commitResult.success) {
+      setPhase('idle');
+      return;
+    }
+    setCommitMessage('');
+    setDescription('');
+    if (!autoStage) {
+      changesView.setExpanded({ unstaged: true, staged: false, pullRequests: hasPRs });
+    }
+    setPhase('committed');
+    await new Promise((r) => setTimeout(r, 1000));
+    setPhase('pushing');
+    const pushResult = await git.push();
+    if (!pushResult.success) {
+      setPhase('idle');
+      return;
+    }
+    setPhase('pushed');
+    setTimeout(() => setPhase('idle'), 3000);
+  };
+
+  const actions: SplitButtonAction[] = [
+    { value: 'commit', label: 'Commit', action: doCommit },
+    { value: 'commit-push', label: 'Commit & Push', action: doCommitAndPush },
+  ];
+
+  const diffView = provisioned.taskView.diffView;
+
+  return (
+    <div className="shrink-0 mx-2 mb-2 flex flex-col gap-2 items-center justify-between rounded-xl border border-border bg-background-1 p-2">
+      <Input
+        placeholder="Commit message"
+        autoFocus
+        className="w-full bg-background"
+        value={commitMessage}
+        onChange={(e) => setCommitMessage(e.target.value)}
+        disabled={isInFlight}
+      />
+      <Textarea
+        placeholder="Description"
+        className="w-full bg-background"
+        value={description}
+        onChange={(e) => setDescription(e.target.value)}
+        disabled={isInFlight}
+      />
+      {phase === 'idle' && (
+        <SplitButton
+          actions={actions}
+          size="sm"
+          className="w-full"
+          disabled={!commitMessage.trim()}
+          defaultValue={diffView.effectiveCommitAction}
+          onValueChange={(value) => diffView.setCommitAction(value as 'commit' | 'commit-push')}
+        />
+      )}
+      {phase === 'committing' && (
+        <StatusRow icon={<Loader2 className="size-4 animate-spin" />} label="Committing…" />
+      )}
+      {(phase === 'commit-only-done' || phase === 'committed') && (
+        <StatusRow icon={<CheckCircle className="size-4 text-green-500" />} label="Committed" />
+      )}
+      {phase === 'pushing' && (
+        <StatusRow icon={<Loader2 className="size-4 animate-spin" />} label="Pushing…" />
+      )}
+      {phase === 'pushed' && (
+        <StatusRow icon={<CheckCircle className="size-4 text-green-500" />} label="Pushed" />
+      )}
+    </div>
+  );
+});
+
+function StatusRow({ icon, label }: { icon: React.ReactNode; label: string }) {
+  return (
+    <div className="flex w-full items-center justify-center gap-2 py-1 text-sm text-foreground-muted">
+      {icon}
+      <span>{label}</span>
+    </div>
+  );
+}
diff --git a/src/renderer/features/tasks/diff-view/changes-panel/components/pr-entry/base-branch.test.ts b/src/renderer/features/tasks/diff-view/changes-panel/components/pr-entry/base-branch.test.ts
new file mode 100644
index 0000000000..bf25bfb47d
--- /dev/null
+++ b/src/renderer/features/tasks/diff-view/changes-panel/components/pr-entry/base-branch.test.ts
@@ -0,0 +1,55 @@
+import { describe, expect, it } from 'vitest';
+import type { Branch } from '@shared/git';
+import { resolveInitialBaseBranch, toShortBranchName } from './base-branch';
+
+const originRemote = { name: 'origin', url: 'git@github.com:owner/repo.git' };
+
+describe('toShortBranchName', () => {
+  it('keeps exact branch names unchanged', () => {
+    const branches: Branch[] = [{ type: 'local', branch: 'feature/api-cleanup' }];
+
+    expect(toShortBranchName('feature/api-cleanup', branches)).toBe('feature/api-cleanup');
+  });
+
+  it('strips known remote prefixes from base refs', () => {
+    const branches: Branch[] = [
+      { type: 'remote', remote: originRemote, branch: 'main' },
+      { type: 'local', branch: 'main' },
+    ];
+
+    expect(toShortBranchName('origin/main', branches)).toBe('main');
+  });
+});
+
+describe('resolveInitialBaseBranch', () => {
+  it('prefers the task source branch when it exists', () => {
+    const branches: Branch[] = [
+      { type: 'remote', remote: originRemote, branch: 'main' },
+      { type: 'local', branch: 'release/v2' },
+      { type: 'local', branch: 'main' },
+    ];
+    const defaultBranch: Branch = { type: 'local', branch: 'main' };
+
+    expect(resolveInitialBaseBranch(branches, 'release/v2', defaultBranch)).toEqual({
+      type: 'local',
+      branch: 'release/v2',
+    });
+  });
+
+  it('falls back to repository default branch when preferred branch is unavailable', () => {
+    const branches: Branch[] = [{ type: 'remote', remote: originRemote, branch: 'main' }];
+    const defaultBranch: Branch = { type: 'remote', remote: originRemote, branch: 'main' };
+
+    expect(resolveInitialBaseBranch(branches, 'release/v2', defaultBranch)).toEqual({
+      type: 'remote',
+      remote: originRemote,
+      branch: 'main',
+    });
+  });
+
+  it('returns undefined when no preferred branch and no default branch', () => {
+    const branches: Branch[] = [{ type: 'remote', remote: originRemote, branch: 'main' }];
+
+    expect(resolveInitialBaseBranch(branches, undefined, undefined)).toBeUndefined();
+  });
+});
diff --git a/src/renderer/features/tasks/diff-view/changes-panel/components/pr-entry/base-branch.ts b/src/renderer/features/tasks/diff-view/changes-panel/components/pr-entry/base-branch.ts
new file mode 100644
index 0000000000..08fbcbd056
--- /dev/null
+++ b/src/renderer/features/tasks/diff-view/changes-panel/components/pr-entry/base-branch.ts
@@ -0,0 +1,53 @@
+import type { Branch } from '@shared/git';
+
+export function toShortBranchName(
+  baseRef: string | undefined,
+  branches: Branch[]
+): string | undefined {
+  const trimmed = baseRef?.trim();
+  if (!trimmed) return undefined;
+
+  if (branches.some((branch) => branch.branch === trimmed)) {
+    return trimmed;
+  }
+
+  const knownRemotes = new Set(
+    branches
+      .filter((branch): branch is Extract<Branch, { type: 'remote' }> => branch.type === 'remote')
+      .map((branch) => branch.remote.name)
+      .filter(Boolean)
+  );
+
+  for (const remote of knownRemotes) {
+    const prefix = `${remote}/`;
+    if (trimmed.startsWith(prefix)) {
+      const candidate = trimmed.slice(prefix.length);
+      if (candidate && branches.some((branch) => branch.branch === candidate)) {
+        return candidate;
+      }
+    }
+  }
+
+  return trimmed;
+}
+
+export function resolveInitialBaseBranch(
+  branches: Branch[],
+  preferredBaseRef: string | undefined,
+  defaultBranch: Branch | undefined
+): Branch | undefined {
+  const preferredName = toShortBranchName(preferredBaseRef, branches);
+  if (preferredName) {
+    const preferredLocal = branches.find(
+      (branch) => branch.type === 'local' && branch.branch === preferredName
+    );
+    if (preferredLocal) return preferredLocal;
+
+    const preferredRemote = branches.find(
+      (branch) => branch.type === 'remote' && branch.branch === preferredName
+    );
+    if (preferredRemote) return preferredRemote;
+  }
+
+  return defaultBranch;
+}
diff --git a/src/renderer/features/tasks/diff-view/changes-panel/components/pr-entry/checks-list.tsx b/src/renderer/features/tasks/diff-view/changes-panel/components/pr-entry/checks-list.tsx
new file mode 100644
index 0000000000..8ce6a61707
--- /dev/null
+++ b/src/renderer/features/tasks/diff-view/changes-panel/components/pr-entry/checks-list.tsx
@@ -0,0 +1,104 @@
+import { CheckCircle2, ExternalLink, Loader2, MinusCircle, XCircle } from 'lucide-react';
+import { observer } from 'mobx-react-lite';
+import { useMemo } from 'react';
+import type { PullRequest } from '@shared/pull-requests';
+import { useCheckRuns } from '@renderer/features/tasks/diff-view/state/use-check-runs';
+import { rpc } from '@renderer/lib/ipc';
+import { EmptyState } from '@renderer/lib/ui/empty-state';
+import {
+  computeCheckBucket,
+  formatCheckDuration,
+  type CheckRun,
+  type CheckRunBucket,
+} from '@renderer/utils/github';
+
+const bucketOrder: Record<CheckRunBucket, number> = {
+  fail: 0,
+  pending: 1,
+  pass: 2,
+  skipping: 3,
+  cancel: 4,
+};
+
+export function BucketIcon({ bucket }: { bucket: CheckRunBucket }) {
+  switch (bucket) {
+    case 'pass':
+      return <CheckCircle2 className="size-3.5 text-green-500 shrink-0" />;
+    case 'fail':
+      return <XCircle className="size-3.5 text-foreground-destructive shrink-0" />;
+    case 'pending':
+      return <Loader2 className="size-3.5 animate-spin text-amber-500 shrink-0" />;
+    case 'skipping':
+    case 'cancel':
+      return <MinusCircle className="size-3.5 text-foreground-muted shrink-0" />;
+  }
+}
+
+export function CheckRunItem({ check }: { check: CheckRun }) {
+  const bucket = computeCheckBucket(check);
+  const duration = formatCheckDuration(
+    check.startedAt ?? undefined,
+    check.completedAt ?? undefined
+  );
+  const subtitle = check.appName ?? check.workflowName;
+  return (
+    <button
+      className="group relative flex items-center gap-2 px-3 py-2 hover:bg-background-1 rounded-md"
+      onClick={() => rpc.app.openExternal(check.detailsUrl!)}
+    >
+      <div className="min-w-0 flex-1 flex flex-col gap-1">
+        <div className="flex items-center gap-2">
+          <BucketIcon bucket={bucket} />
+          <div className="truncate text-sm">{check.name}</div>
+          {check.appLogoUrl ? (
+            <img
+              src={check.appLogoUrl}
+              alt={check.appName ?? ''}
+              className="size-4 shrink-0 rounded opacity-60"
+            />
+          ) : null}
+        </div>
+        {subtitle && (
+          <div className="truncate text-xs text-foreground-passive w-full justify-start flex">
+            {subtitle}
+          </div>
+        )}
+      </div>
+      <div className="flex shrink-0 items-center gap-2">
+        {duration && <span className="text-xs text-foreground-passive">{duration}</span>}
+        {check.detailsUrl && (
+          <div className="absolute right-3 top-1/2 -translate-y-1/2 hidden group-hover:flex items-center justify-center bg-background-1 text-foreground-muted hover:text-foreground rounded px-1 py-0.5">
+            <ExternalLink className="size-3.5" />
+          </div>
+        )}
+      </div>
+    </button>
+  );
+}
+
+export function ChecksList({ checks }: { checks: CheckRun[] }) {
+  const sorted = useMemo(
+    () =>
+      [...checks].sort(
+        (a, b) => bucketOrder[computeCheckBucket(a)] - bucketOrder[computeCheckBucket(b)]
+      ),
+    [checks]
+  );
+
+  if (sorted.length === 0) {
+    return <EmptyState label="No checks" description="No checks available" />;
+  }
+
+  return (
+    <div className="flex flex-col gap-[1px] py-2">
+      {sorted.map((check, i) => (
+        <CheckRunItem key={`${check.name}-${i}`} check={check} />
+      ))}
+    </div>
+  );
+}
+
+export const PrChecksList = observer(function PrChecksList({ pr }: { pr: PullRequest }) {
+  const { checks } = useCheckRuns(pr);
+  return <ChecksList checks={checks} />;
+});
diff --git a/src/renderer/features/tasks/diff-view/changes-panel/components/pr-entry/commits-list.tsx b/src/renderer/features/tasks/diff-view/changes-panel/components/pr-entry/commits-list.tsx
new file mode 100644
index 0000000000..a19a6ddc10
--- /dev/null
+++ b/src/renderer/features/tasks/diff-view/changes-panel/components/pr-entry/commits-list.tsx
@@ -0,0 +1,108 @@
+import { useVirtualizer } from '@tanstack/react-virtual';
+import { observer } from 'mobx-react-lite';
+import { useRef } from 'react';
+import type { Commit } from '@shared/git';
+import { useProvisionedTask, useTaskViewContext } from '@renderer/features/tasks/task-view-context';
+import { EmptyState } from '@renderer/lib/ui/empty-state';
+import { RelativeTime } from '@renderer/lib/ui/relative-time';
+import { cn } from '@renderer/utils/utils';
+import { usePrCommits } from './use-pr-commits';
+
+const ITEM_HEIGHT = 43;
+
+export const PrCommitsList = observer(function PrCommitsList() {
+  const { projectId } = useTaskViewContext();
+  const task = useProvisionedTask();
+  const pr = task.workspace.pr.currentPr;
+  const { data, isFetchingNextPage, hasNextPage, fetchNextPage } = usePrCommits(
+    projectId,
+    task.workspaceId,
+    pr
+  );
+
+  const commits = data?.pages.flat() ?? [];
+  const parentRef = useRef<HTMLDivElement>(null);
+
+  // eslint-disable-next-line react-hooks/incompatible-library
+  const virtualizer = useVirtualizer({
+    count: commits.length,
+    getScrollElement: () => parentRef.current,
+    estimateSize: () => ITEM_HEIGHT,
+    overscan: 5,
+  });
+
+  if (commits.length === 0 && !isFetchingNextPage) {
+    return <EmptyState label="No commits" description="No commits available" />;
+  }
+
+  return (
+    <div ref={parentRef} className="h-full overflow-y-auto overflow-x-hidden py-2">
+      <div style={{ height: virtualizer.getTotalSize(), position: 'relative' }}>
+        {virtualizer.getVirtualItems().map((virtualItem) => {
+          const commit = commits[virtualItem.index]!;
+          return (
+            <div
+              key={commit.hash}
+              style={{
+                position: 'absolute',
+                top: virtualItem.start,
+                left: 0,
+                width: '100%',
+                height: ITEM_HEIGHT,
+              }}
+            >
+              <CommitItem
+                commit={commit}
+                isFirst={virtualItem.index === 0}
+                isLast={virtualItem.index === commits.length - 1}
+              />
+            </div>
+          );
+        })}
+      </div>
+      {hasNextPage && (
+        <div className="flex justify-center py-2">
+          <button
+            className="text-xs text-foreground-muted hover:text-foreground px-3 py-1 rounded-md hover:bg-surface-raised transition-colors"
+            onClick={() => void fetchNextPage()}
+            disabled={isFetchingNextPage}
+          >
+            {isFetchingNextPage ? 'Loading…' : 'Load more'}
+          </button>
+        </div>
+      )}
+    </div>
+  );
+});
+
+function CommitItem({
+  commit,
+  isFirst,
+  isLast,
+}: {
+  commit: Commit;
+  isFirst: boolean;
+  isLast: boolean;
+}) {
+  const shortHash = commit.hash.slice(0, 7);
+
+  return (
+    <div className="flex items-stretch">
+      <div className="flex w-3.5 shrink-0 flex-col items-center">
+        <div className={cn('w-px flex-1 bg-border', isFirst && 'invisible')} />
+        <div className="size-1.5 shrink-0 rounded-full bg-foreground-passive" />
+        <div className={cn('w-px flex-1 bg-border', isLast && 'invisible')} />
+      </div>
+      <div className="min-w-0 flex-1 py-1 px-2 rounded-md">
+        <div className="truncate text-sm">{commit.subject}</div>
+        <div className="flex items-center  gap-1 text-xs text-foreground-muted min-w-0">
+          <span className="truncate font-medium min-w-0">{commit.author}</span>
+          {'·'}
+          <RelativeTime compact value={commit.date} className="text-foreground-muted" />
+          {'·'}
+          <span className="font-mono text-foreground-passive">{shortHash}</span>
+        </div>
+      </div>
+    </div>
+  );
+}
diff --git a/src/renderer/features/tasks/diff-view/changes-panel/components/pr-entry/create-pr-modal.tsx b/src/renderer/features/tasks/diff-view/changes-panel/components/pr-entry/create-pr-modal.tsx
new file mode 100644
index 0000000000..6ef861bf31
--- /dev/null
+++ b/src/renderer/features/tasks/diff-view/changes-panel/components/pr-entry/create-pr-modal.tsx
@@ -0,0 +1,209 @@
+import { ChevronDown, CircleAlert, GitBranch } from 'lucide-react';
+import { observer } from 'mobx-react-lite';
+import { useState } from 'react';
+import type { Branch } from '@shared/git';
+import { getRepositoryStore } from '@renderer/features/projects/stores/project-selectors';
+import { getRegisteredTaskData } from '@renderer/features/tasks/stores/task-selectors';
+import { useTaskViewContext } from '@renderer/features/tasks/task-view-context';
+import { BranchDisplay } from '@renderer/lib/components/branch-display';
+import { ProjectBranchSelector } from '@renderer/lib/components/project-branch-selector';
+import { rpc } from '@renderer/lib/ipc';
+import { type BaseModalProps } from '@renderer/lib/modal/modal-provider';
+import { Alert, AlertDescription, AlertTitle } from '@renderer/lib/ui/alert';
+import { ComboboxTrigger, ComboboxValue } from '@renderer/lib/ui/combobox';
+import { ConfirmButton } from '@renderer/lib/ui/confirm-button';
+import {
+  DialogContentArea,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+} from '@renderer/lib/ui/dialog';
+import { Field, FieldGroup, FieldLabel } from '@renderer/lib/ui/field';
+import { Input } from '@renderer/lib/ui/input';
+import { Separator } from '@renderer/lib/ui/separator';
+import { SplitButton } from '@renderer/lib/ui/split-button';
+import { Textarea } from '@renderer/lib/ui/textarea';
+import { log } from '@renderer/utils/logger';
+import { resolveInitialBaseBranch } from './base-branch';
+
+export type CreatePrModalArgs = {
+  nameWithOwner: string; // kept as-is for modal registry compatibility; value is a repositoryUrl
+  branchName: string;
+  draft: boolean;
+  workspaceId: string;
+};
+
+type Props = BaseModalProps<void> & CreatePrModalArgs;
+
+export const CreatePrModal = observer(function CreatePrModal({
+  nameWithOwner: repositoryUrl,
+  branchName,
+  draft,
+  workspaceId,
+  onSuccess,
+}: Props) {
+  const { projectId, taskId } = useTaskViewContext();
+  const [title, setTitle] = useState(branchName);
+  const [description, setDescription] = useState('');
+  const [selectedBaseOverride, setSelectedBaseOverride] = useState<Branch | undefined>();
+  const [isCreating, setIsCreating] = useState(false);
+  const [error, setError] = useState<string | null>(null);
+  const repo = getRepositoryStore(projectId);
+  const defaultBranch = repo?.defaultBranch;
+  const taskPayload = getRegisteredTaskData(projectId, taskId);
+  const isOnRemote = repo?.isBranchOnRemote(branchName) ?? false;
+  const aheadCount = repo?.getBranchDivergence(branchName)?.ahead ?? 0;
+  const needsPush = !isOnRemote || aheadCount > 0;
+
+  const hasGitHubRemote = Boolean(repositoryUrl);
+  const selectedBase =
+    selectedBaseOverride ??
+    resolveInitialBaseBranch(
+      repo?.remoteBranches ?? [],
+      taskPayload?.sourceBranch?.branch,
+      defaultBranch
+    );
+
+  const doCreate = async (push: boolean) => {
+    if (!title.trim() || !repositoryUrl || !selectedBase?.branch) return;
+    setError(null);
+    setIsCreating(true);
+    try {
+      if (push) {
+        const pushResult = await rpc.git.push(
+          projectId,
+          workspaceId,
+          repo?.configuredRemote.name ?? 'origin'
+        );
+        if (!pushResult.success) {
+          log.error('Failed to push branch:', pushResult.error);
+          setError(
+            ('message' in pushResult.error && pushResult.error.message) || 'Failed to push branch'
+          );
+          return;
+        }
+      }
+
+      const result = await rpc.pullRequests.createPullRequest({
+        repositoryUrl,
+        head: branchName,
+        base: selectedBase.branch,
+        title: title.trim(),
+        body: description.trim() || undefined,
+        draft,
+      });
+
+      if (result.success) {
+        onSuccess();
+      } else {
+        setError(result.error);
+      }
+    } finally {
+      setIsCreating(false);
+    }
+  };
+
+  return (
+    <div className="flex flex-col overflow-hidden max-h-[70vh]">
+      <DialogHeader>
+        <DialogTitle>{draft ? 'Create Draft PR' : 'Create Pull Request'}</DialogTitle>
+      </DialogHeader>
+      <DialogContentArea className="space-y-4">
+        {!hasGitHubRemote && (
+          <p className="text-sm text-muted-foreground">
+            No GitHub remote detected. Configure a GitHub remote to create pull requests.
+          </p>
+        )}
+        <div className="flex items-center gap-2 flex-col">
+          <BranchDisplay
+            label="Head Branch"
+            branchName={branchName}
+            className="border border-border rounded-md"
+          />
+          <ProjectBranchSelector
+            projectId={projectId}
+            value={selectedBase}
+            onValueChange={setSelectedBaseOverride}
+            remoteOnly
+            trigger={
+              <ComboboxTrigger className="flex w-full items-center gap-2 justify-between border border-border rounded-md p-2 text-left outline-none">
+                <div className="flex flex-col text-left text-sm gap-0.5">
+                  <span className="text-foreground-passive text-xs">Base Branch</span>
+                  <span className="flex items-center gap-1">
+                    <GitBranch
+                      absoluteStrokeWidth
+                      strokeWidth={2}
+                      className="size-3.5 shrink-0 text-foreground-muted"
+                    />
+                    <ComboboxValue placeholder="Select a base branch" />
+                  </span>
+                </div>
+                <ChevronDown className="size-4 shrink-0 text-foreground-muted" />
+              </ComboboxTrigger>
+            }
+          />
+        </div>
+        <Separator />
+        <FieldGroup>
+          <Field>
+            <FieldLabel>Title</FieldLabel>
+            <Input
+              placeholder="PR title"
+              autoFocus
+              value={title}
+              onChange={(e) => setTitle(e.target.value)}
+              disabled={!hasGitHubRemote}
+            />
+          </Field>
+          <Field>
+            <FieldLabel>Description</FieldLabel>
+            <Textarea
+              value={description}
+              onChange={(e) => setDescription(e.target.value)}
+              rows={1}
+              disabled={!hasGitHubRemote}
+            />
+          </Field>
+        </FieldGroup>
+        {error && (
+          <Alert variant="destructive">
+            <CircleAlert />
+            <AlertTitle>Failed to create pull request</AlertTitle>
+            <AlertDescription>{error}</AlertDescription>
+          </Alert>
+        )}
+      </DialogContentArea>
+      <DialogFooter>
+        {needsPush ? (
+          <SplitButton
+            size="sm"
+            loading={isCreating}
+            loadingLabel="Creating..."
+            disabled={!hasGitHubRemote || !selectedBase?.branch || !title.trim()}
+            actions={[
+              {
+                value: 'push-and-create',
+                label: draft ? 'Push & Create Draft' : 'Push & Create PR',
+                action: () => void doCreate(true),
+              },
+              {
+                value: 'create-only',
+                label: draft ? 'Create Draft' : 'Create PR',
+                description: 'Skip push and open a PR from the current remote state',
+                action: () => void doCreate(false),
+              },
+            ]}
+          />
+        ) : (
+          <ConfirmButton
+            size="sm"
+            onClick={() => void doCreate(false)}
+            disabled={!hasGitHubRemote || !selectedBase?.branch || !title.trim() || isCreating}
+          >
+            {isCreating ? 'Creating...' : draft ? 'Create Draft' : 'Create PR'}
+          </ConfirmButton>
+        )}
+      </DialogFooter>
+    </div>
+  );
+});
diff --git a/src/renderer/features/tasks/diff-view/changes-panel/components/pr-entry/files-list.tsx b/src/renderer/features/tasks/diff-view/changes-panel/components/pr-entry/files-list.tsx
new file mode 100644
index 0000000000..c68e70e174
--- /dev/null
+++ b/src/renderer/features/tasks/diff-view/changes-panel/components/pr-entry/files-list.tsx
@@ -0,0 +1,52 @@
+import { observer } from 'mobx-react-lite';
+import { commitRef, remoteRef, type GitChange } from '@shared/git';
+import { getPrNumber, type PullRequest } from '@shared/pull-requests';
+import { getRepositoryStore } from '@renderer/features/projects/stores/project-selectors';
+import { usePrefetchDiffModels } from '@renderer/features/tasks/diff-view/changes-panel/hooks/use-prefetch-diff-models';
+import { useProvisionedTask, useTaskViewContext } from '@renderer/features/tasks/task-view-context';
+import { VirtualizedChangesList } from '../virtualized-changes-list';
+
+export const PrFilesList = observer(function PrFilesList({ pr }: { pr: PullRequest }) {
+  const { projectId } = useTaskViewContext();
+  const provisioned = useProvisionedTask();
+  const prStore = provisioned.workspace.pr;
+  const diffView = provisioned.taskView.diffView;
+
+  const repo = getRepositoryStore(projectId);
+  const baseRef = remoteRef(repo?.configuredRemote ?? 'origin', pr.baseRefName);
+  const modifiedRef = commitRef(pr.headRefOid);
+  const prFiles = prStore.getFiles(pr).data ?? [];
+
+  const prefetchPrDiff = usePrefetchDiffModels(
+    projectId,
+    provisioned.workspaceId,
+    'pr',
+    baseRef,
+    modifiedRef
+  );
+
+  // Use diffView.activeFile to derive the active path — avoids separate React state.
+  const activePath = diffView.activeFile?.group === 'pr' ? diffView.activeFile.path : undefined;
+
+  const handleSelectChange = (change: GitChange) => {
+    diffView.setActiveFile({
+      path: change.path,
+      type: 'git',
+      group: 'pr',
+      originalRef: baseRef,
+      modifiedRef,
+      prNumber: getPrNumber(pr) ?? undefined,
+    });
+    provisioned.taskView.setView('diff');
+  };
+
+  return (
+    <VirtualizedChangesList
+      className="py-3"
+      changes={prFiles}
+      activePath={activePath}
+      onSelectChange={handleSelectChange}
+      onPrefetch={(change) => prefetchPrDiff(change.path)}
+    />
+  );
+});
diff --git a/src/renderer/features/tasks/diff-view/changes-panel/components/pr-entry/merge-footer.tsx b/src/renderer/features/tasks/diff-view/changes-panel/components/pr-entry/merge-footer.tsx
new file mode 100644
index 0000000000..fbb0c061c3
--- /dev/null
+++ b/src/renderer/features/tasks/diff-view/changes-panel/components/pr-entry/merge-footer.tsx
@@ -0,0 +1,68 @@
+import {
+  AlertTriangle,
+  CheckCircle2,
+  GitMerge,
+  HelpCircle,
+  XCircle,
+  type LucideIcon,
+} from 'lucide-react';
+import { Button } from '@renderer/lib/ui/button';
+import { SplitButton, SplitButtonAction } from '@renderer/lib/ui/split-button';
+import { cn } from '@renderer/utils/utils';
+import { MergeSeverity, MergeUiState } from './pr-entry';
+
+const severityConfig: Record<MergeSeverity, SeverityConfig> = {
+  success: { icon: CheckCircle2, iconClass: 'text-green-600' },
+  warning: { icon: AlertTriangle, iconClass: 'text-amber-500' },
+  error: { icon: XCircle, iconClass: 'text-red-500' },
+  neutral: { icon: HelpCircle, iconClass: 'text-foreground-passive' },
+};
+
+type SeverityConfig = { icon: LucideIcon; iconClass: string };
+
+export function MergeFooter({
+  uiState,
+  mergeActions,
+  isMerging,
+
+  onMarkReady,
+}: {
+  uiState: MergeUiState;
+  mergeActions: SplitButtonAction[];
+  isMerging: boolean;
+
+  onMarkReady: () => void;
+}) {
+  const isDraft = uiState.kind === 'draft';
+  const { icon: MergeStatusIcon, iconClass } = severityConfig[uiState.severity];
+
+  return (
+    <div className="shrink-0 border-t border-border px-3 py-2.5 flex items-center gap-3">
+      <div className="flex-1 min-w-0 flex flex-col gap-0.5">
+        <div className="flex items-center gap-1.5 justify-between">
+          <div className="flex items-center gap-1.5 min-w-0">
+            <MergeStatusIcon className={cn('size-4 shrink-0', iconClass)} />
+            <p className="text-sm leading-tight text-foreground truncate">{uiState.title}</p>
+          </div>
+          <div className="flex items-center gap-1.5">
+            {isDraft ? (
+              <Button variant="outline" size="xs" onClick={onMarkReady}>
+                Mark ready
+              </Button>
+            ) : (
+              <SplitButton
+                size="xs"
+                variant="outline"
+                loading={isMerging}
+                loadingLabel="Merging..."
+                icon={<GitMerge className="size-3" />}
+                actions={mergeActions}
+                disabled={!uiState.canMerge && !isMerging}
+              />
+            )}
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+}
diff --git a/src/renderer/features/tasks/diff-view/changes-panel/components/pr-entry/pr-entry.tsx b/src/renderer/features/tasks/diff-view/changes-panel/components/pr-entry/pr-entry.tsx
new file mode 100644
index 0000000000..ae6be7d022
--- /dev/null
+++ b/src/renderer/features/tasks/diff-view/changes-panel/components/pr-entry/pr-entry.tsx
@@ -0,0 +1,224 @@
+import { ExternalLink } from 'lucide-react';
+import { observer } from 'mobx-react-lite';
+import { useState } from 'react';
+import { getPrNumber, type PullRequest } from '@shared/pull-requests';
+import { useProvisionedTask } from '@renderer/features/tasks/task-view-context';
+import { PrMergeLine } from '@renderer/lib/components/pr-merge-line';
+import { PrNumberBadge } from '@renderer/lib/components/pr-number-badge';
+import { StatusIcon } from '@renderer/lib/components/pr-status-icon';
+import { rpc } from '@renderer/lib/ipc';
+import { useShowModal } from '@renderer/lib/modal/modal-provider';
+import { SplitButtonAction } from '@renderer/lib/ui/split-button';
+import { ToggleGroup, ToggleGroupItem } from '@renderer/lib/ui/toggle-group';
+import { cn } from '@renderer/utils/utils';
+import { PrChecksList } from './checks-list';
+import { PrCommitsList } from './commits-list';
+import { PrFilesList } from './files-list';
+import { MergeFooter } from './merge-footer';
+
+export type MergeMode = 'merge' | 'squash' | 'rebase';
+
+export type MergeSeverity = 'success' | 'warning' | 'error' | 'neutral';
+
+export type MergeUiState = {
+  kind: 'ready' | 'draft' | 'conflicts' | 'behind' | 'blocked' | 'unstable' | 'unknown';
+  severity: MergeSeverity;
+  title: string;
+  detail?: string;
+  canMerge: boolean;
+};
+
+const mergeLabels: Record<MergeMode, string> = {
+  merge: 'Merge pull request',
+  squash: 'Squash and merge',
+  rebase: 'Rebase and merge',
+};
+
+const mergeDescriptions: Record<MergeMode, string> = {
+  merge: 'All commits from this branch will be added to the base branch via a merge commit.',
+  squash: 'All commits from this branch will be combined into one commit in the base branch.',
+  rebase: 'All commits from this branch will be rebased and added to the base branch.',
+};
+
+function computeMergeUiState(pr: PullRequest): MergeUiState {
+  if (pr.status !== 'open') {
+    return {
+      kind: 'unknown',
+      severity: 'neutral',
+      title: 'Merge status unknown',
+      detail: 'Refresh PR status and try again.',
+      canMerge: false,
+    };
+  }
+  if (pr.isDraft) {
+    return {
+      kind: 'draft',
+      severity: 'neutral',
+      title: 'Draft pull request',
+      detail: 'Mark ready for review to enable merging.',
+      canMerge: false,
+    };
+  }
+  switch (pr.mergeStateStatus) {
+    case 'CLEAN':
+      return {
+        kind: 'ready',
+        severity: 'success',
+        title: 'Ready to merge',
+        detail: 'No conflicts or required reviews.',
+        canMerge: true,
+      };
+    case 'DIRTY':
+      return {
+        kind: 'conflicts',
+        severity: 'error',
+        title: 'Merge conflicts',
+        detail: 'Resolve conflicts before merging.',
+        canMerge: false,
+      };
+    case 'BEHIND':
+      return {
+        kind: 'behind',
+        severity: 'warning',
+        title: 'Branch is out-of-date',
+        detail: 'Update branch before merging.',
+        canMerge: false,
+      };
+    case 'BLOCKED':
+      return {
+        kind: 'blocked',
+        severity: 'error',
+        title: 'Merging is blocked',
+        detail: 'Required reviews or branch protections not satisfied.',
+        canMerge: false,
+      };
+    case 'HAS_HOOKS':
+      return {
+        kind: 'blocked',
+        severity: 'error',
+        title: 'Merging is blocked',
+        detail: 'Required checks are not satisfied.',
+        canMerge: false,
+      };
+    case 'UNSTABLE':
+      return {
+        kind: 'unstable',
+        severity: 'warning',
+        title: 'Checks not passing',
+        detail: 'Review failing checks before merging.',
+        canMerge: false,
+      };
+    default:
+      return {
+        kind: 'unknown',
+        severity: 'neutral',
+        title: 'Merge status unknown',
+        detail: 'Refresh to try again.',
+        canMerge: false,
+      };
+  }
+}
+
+export const PullRequestEntry = observer(function PullRequestEntry({ pr }: { pr: PullRequest }) {
+  const task = useProvisionedTask();
+  const prStatus = pr.status;
+  const prStore = task.workspace.pr;
+  const diffView = task.taskView.diffView;
+  const showConfirm = useShowModal('confirmActionModal');
+  const [isMerging, setIsMerging] = useState(false);
+  const tab = diffView.effectivePrTab;
+  const isOpen = pr.status === 'open';
+
+  const uiState = computeMergeUiState(pr);
+
+  const doMerge = async (strategy: MergeMode) => {
+    setIsMerging(true);
+    try {
+      await prStore.mergePr(pr.url, { strategy, commitHeadOid: pr.headRefOid });
+    } finally {
+      setIsMerging(false);
+    }
+  };
+
+  const handleMergeClick = (strategy: MergeMode) => {
+    if (uiState.canMerge) {
+      void doMerge(strategy);
+    } else {
+      showConfirm({
+        title: 'Merge anyway?',
+        description: (uiState.detail ?? uiState.title) + ' Are you sure you want to proceed?',
+        confirmLabel: 'Merge anyway',
+        variant: 'destructive',
+        onSuccess: () => void doMerge(strategy),
+      });
+    }
+  };
+
+  const mergeActions: SplitButtonAction[] = (['merge', 'squash', 'rebase'] as const).map(
+    (strategy) => ({
+      value: strategy,
+      label: mergeLabels[strategy],
+      description: mergeDescriptions[strategy],
+      action: () => handleMergeClick(strategy),
+    })
+  );
+
+  return (
+    <div className={cn('flex min-h-0 flex-1 flex-col border-t border-border')}>
+      <div className="flex flex-col gap-2 p-2.5 w-full">
+        <div className="flex items-center gap-2 justify-between">
+          <button
+            className="relative flex gap-2 items-center min-w-0 group"
+            onClick={() => rpc.app.openExternal(pr.url)}
+          >
+            <StatusIcon className="size-4" status={prStatus} />
+            <span className="flex-1 min-w-0 truncate text-sm font-normal">{pr.title}</span>
+            <PrNumberBadge number={getPrNumber(pr) ?? 0} />
+            <span className="absolute right-0 flex items-center pl-4 pr-0.5 bg-linear-to-r from-transparent to-background opacity-0 group-hover:opacity-100 transition-opacity">
+              <ExternalLink className="size-3.5 text-foreground-muted" />
+            </span>
+          </button>
+        </div>
+        <PrMergeLine pr={pr} />
+      </div>
+      <div className="min-h-0 flex flex-1 flex-col px-2.5">
+        <ToggleGroup
+          value={[tab]}
+          size={'sm'}
+          className="w-full"
+          onValueChange={([value]) => {
+            if (value) {
+              diffView.setPrTab(value as 'files' | 'commits' | 'checks');
+            }
+          }}
+        >
+          <ToggleGroupItem className="flex-1" value="files" disabled={!isOpen}>
+            Files
+          </ToggleGroupItem>
+          <ToggleGroupItem className="flex-1" value="commits">
+            Commits
+          </ToggleGroupItem>
+          <ToggleGroupItem className="flex-1" value="checks">
+            Checks
+          </ToggleGroupItem>
+        </ToggleGroup>
+        <div className="min-h-0 flex-1 overflow-y-auto">
+          {tab === 'files' && <PrFilesList pr={pr} />}
+          {tab === 'commits' && <PrCommitsList />}
+          {tab === 'checks' && <PrChecksList pr={pr} />}
+        </div>
+      </div>
+      {pr.status === 'open' && (
+        <MergeFooter
+          uiState={uiState}
+          mergeActions={mergeActions}
+          isMerging={isMerging}
+          onRefresh={() => prStore.refresh(pr.url)}
+          onMarkReady={() => {
+            prStore.markReadyForReview(pr.url).catch(() => {});
+          }}
+        />
+      )}
+    </div>
+  );
+});
diff --git a/src/renderer/features/tasks/diff-view/changes-panel/components/pr-entry/use-pr-commits.ts b/src/renderer/features/tasks/diff-view/changes-panel/components/pr-entry/use-pr-commits.ts
new file mode 100644
index 0000000000..9a4c452567
--- /dev/null
+++ b/src/renderer/features/tasks/diff-view/changes-panel/components/pr-entry/use-pr-commits.ts
@@ -0,0 +1,34 @@
+import { useInfiniteQuery } from '@tanstack/react-query';
+import { commitRef } from '@shared/git';
+import type { PullRequest } from '@shared/pull-requests';
+import { rpc } from '@renderer/lib/ipc';
+
+const PAGE_SIZE = 50;
+
+export const prCommitsQueryKey = (workspaceId: string, headRefOid: string) =>
+  [workspaceId, 'pr-commits', headRefOid] as const;
+
+export function usePrCommits(projectId: string, workspaceId: string, pr: PullRequest | undefined) {
+  return useInfiniteQuery({
+    queryKey: prCommitsQueryKey(workspaceId, pr?.headRefOid ?? ''),
+    queryFn: async ({ pageParam }: { pageParam: number }) => {
+      const result = await rpc.git.getLog(
+        projectId,
+        workspaceId,
+        PAGE_SIZE,
+        pageParam,
+        undefined,
+        undefined,
+        pr ? commitRef(pr.baseRefOid) : undefined,
+        pr ? commitRef(pr.headRefOid) : undefined
+      );
+      if (!result.success) throw new Error('Failed to load commits');
+      return result.data.commits;
+    },
+    initialPageParam: 0,
+    getNextPageParam: (lastPage, _all, lastPageParam) =>
+      lastPage.length === PAGE_SIZE ? lastPageParam + PAGE_SIZE : undefined,
+    enabled: !!pr,
+    staleTime: 5 * 60_000,
+  });
+}
diff --git a/src/renderer/features/tasks/diff-view/changes-panel/components/push-card.tsx b/src/renderer/features/tasks/diff-view/changes-panel/components/push-card.tsx
new file mode 100644
index 0000000000..8156a64709
--- /dev/null
+++ b/src/renderer/features/tasks/diff-view/changes-panel/components/push-card.tsx
@@ -0,0 +1,21 @@
+import { ArrowUp } from 'lucide-react';
+import { observer } from 'mobx-react-lite';
+import { selectAheadCount } from '@renderer/features/tasks/diff-view/stores/diff-selectors';
+import { useProvisionedTask } from '@renderer/features/tasks/task-view-context';
+import { Badge } from '@renderer/lib/ui/badge';
+import { Button } from '@renderer/lib/ui/button';
+
+export const PushCard = observer(function PushCard() {
+  const git = useProvisionedTask().workspace.git;
+  const ahead = selectAheadCount(git);
+
+  return (
+    <div className="shrink-0 mx-2 mb-2 flex flex-col gap-2 items-center justify-between rounded-lg border border-border  p-2.5">
+      <Button variant="default" size="sm" className="w-full" onClick={() => git.push()}>
+        <ArrowUp className="size-3" />
+        Push changes
+        <Badge variant="secondary">{ahead}</Badge>
+      </Button>
+    </div>
+  );
+});
diff --git a/src/renderer/features/tasks/diff-view/changes-panel/components/section-header.tsx b/src/renderer/features/tasks/diff-view/changes-panel/components/section-header.tsx
new file mode 100644
index 0000000000..9bdc3f2b27
--- /dev/null
+++ b/src/renderer/features/tasks/diff-view/changes-panel/components/section-header.tsx
@@ -0,0 +1,117 @@
+import { ChevronDown, Plus, RefreshCw } from 'lucide-react';
+import { SelectionState } from '@renderer/features/tasks/diff-view/stores/changes-view-store';
+import { Badge } from '@renderer/lib/ui/badge';
+import { Button } from '@renderer/lib/ui/button';
+import { Checkbox } from '@renderer/lib/ui/checkbox';
+import { Tooltip, TooltipContent, TooltipTrigger } from '@renderer/lib/ui/tooltip';
+import { cn } from '@renderer/utils/utils';
+
+interface SectionHeaderProps {
+  label: string;
+  count: number;
+  selectionState: SelectionState;
+  onToggleAll: () => void;
+  actions?: React.ReactNode;
+  collapsed?: boolean;
+  onToggleCollapsed?: () => void;
+}
+
+export function SectionHeader({
+  label,
+  count,
+  selectionState,
+  onToggleAll,
+  actions,
+  collapsed,
+  onToggleCollapsed,
+}: SectionHeaderProps) {
+  return (
+    <div className="shrink-0 flex items-center justify-between px-2.5 h-10">
+      <div className="flex items-center gap-2 justify-between w-full">
+        <button onClick={onToggleCollapsed}>
+          <span className="text-sm text-foreground-muted flex items-center gap-2">
+            <span>{label}</span> <Badge variant="secondary">{count}</Badge>{' '}
+            <span className="p-2 text-foreground-muted hover:text-foreground">
+              <ChevronDown
+                className={cn(
+                  'size-4 transition-transform duration-200 ease-in-out',
+                  collapsed ? '-rotate-90' : 'rotate-0'
+                )}
+              />
+            </span>
+          </span>
+        </button>
+        <Checkbox
+          checked={selectionState === 'all'}
+          indeterminate={selectionState === 'partial'}
+          onCheckedChange={onToggleAll}
+          aria-label={`Select all ${label.toLowerCase()}`}
+          className="mr-0.5"
+        />
+      </div>
+      {actions}
+    </div>
+  );
+}
+
+export function PullRequestSectionHeader({
+  count,
+  collapsed,
+  onToggleCollapsed,
+  hasOpenPr,
+  onCreatePr,
+  onRefresh,
+  isRefreshing,
+}: {
+  count: number;
+  collapsed?: boolean;
+  onToggleCollapsed?: () => void;
+  hasOpenPr: boolean;
+  onCreatePr?: () => void;
+  onRefresh?: () => void;
+  isRefreshing?: boolean;
+}) {
+  return (
+    <div className="shrink-0 flex items-center justify-between px-2.5 h-10">
+      <div className="flex items-center gap-2 justify-between w-full min-w-0">
+        <button onClick={onToggleCollapsed} className="min-w-0">
+          <span className="text-sm text-foreground-muted flex items-center gap-2 min-w-0">
+            <span className="truncate">Pull Requests</span>{' '}
+            <Badge variant="secondary" className="shrink-0">
+              {count}
+            </Badge>
+            <span className="p-2 text-foreground-muted hover:text-foreground">
+              <ChevronDown
+                className={cn(
+                  'size-4 transition-transform duration-200 ease-in-out',
+                  collapsed ? '-rotate-90' : 'rotate-0'
+                )}
+              />
+            </span>
+          </span>
+        </button>
+        <div className="flex items-center gap-1.5">
+          <Tooltip>
+            <TooltipTrigger>
+              <Button variant="outline" size="xs" onClick={onCreatePr} disabled={hasOpenPr}>
+                <Plus className="size-3" />
+                Create PR
+              </Button>
+            </TooltipTrigger>
+            <TooltipContent>
+              {hasOpenPr ? 'A pull request is already open' : 'Create a pull request'}
+            </TooltipContent>
+          </Tooltip>
+          <Tooltip>
+            <TooltipTrigger>
+              <Button variant="outline" size="icon-xs" onClick={onRefresh} disabled={isRefreshing}>
+                <RefreshCw className={cn('size-3', isRefreshing && 'animate-spin')} />
+              </Button>
+            </TooltipTrigger>
+            <TooltipContent>Refresh pull requests</TooltipContent>
+          </Tooltip>
+        </div>
+      </div>
+    </div>
+  );
+}
diff --git a/src/renderer/features/tasks/diff-view/changes-panel/components/virtualized-changes-list.tsx b/src/renderer/features/tasks/diff-view/changes-panel/components/virtualized-changes-list.tsx
new file mode 100644
index 0000000000..534a19805b
--- /dev/null
+++ b/src/renderer/features/tasks/diff-view/changes-panel/components/virtualized-changes-list.tsx
@@ -0,0 +1,64 @@
+import { useVirtualizer } from '@tanstack/react-virtual';
+import { useRef } from 'react';
+import { GitChange } from '@shared/git';
+import { cn } from '@renderer/utils/utils';
+import { ChangesListItem } from './changes-list-item';
+
+export interface VirtualizedChangesListProps {
+  changes: GitChange[];
+  onSelectChange?: (change: GitChange) => void;
+  isSelected?: (path: string) => boolean;
+  onToggleSelect?: (path: string) => void;
+  onPrefetch?: (change: GitChange) => void;
+  activePath?: string;
+  className?: string;
+}
+
+const ITEM_HEIGHT = 28;
+
+export function VirtualizedChangesList({
+  changes,
+  onSelectChange,
+  isSelected,
+  onToggleSelect,
+  onPrefetch,
+  activePath,
+  className,
+}: VirtualizedChangesListProps) {
+  const parentRef = useRef<HTMLDivElement>(null);
+  // eslint-disable-next-line react-hooks/incompatible-library
+  const virtualizer = useVirtualizer({
+    count: changes.length,
+    gap: 2,
+    getScrollElement: () => parentRef.current,
+    estimateSize: () => ITEM_HEIGHT,
+    overscan: 5,
+  });
+  return (
+    <div ref={parentRef} className={cn('h-full overflow-y-auto overflow-x-hidden py-2', className)}>
+      <div style={{ height: virtualizer.getTotalSize(), position: 'relative' }}>
+        {virtualizer.getVirtualItems().map((virtualItem) => {
+          const change = changes[virtualItem.index]!;
+          return (
+            <ChangesListItem
+              key={change.path}
+              change={change}
+              isSelected={isSelected?.(change.path)}
+              isActive={change.path === activePath}
+              onToggleSelect={onToggleSelect}
+              style={{
+                position: 'absolute',
+                top: virtualItem.start,
+                left: 0,
+                width: '100%',
+                height: ITEM_HEIGHT,
+              }}
+              onClick={() => onSelectChange?.(change)}
+              onMouseEnter={() => onPrefetch?.(change)}
+            />
+          );
+        })}
+      </div>
+    </div>
+  );
+}
diff --git a/src/renderer/features/tasks/diff-view/changes-panel/git-status-section.tsx b/src/renderer/features/tasks/diff-view/changes-panel/git-status-section.tsx
new file mode 100644
index 0000000000..b7eae1830a
--- /dev/null
+++ b/src/renderer/features/tasks/diff-view/changes-panel/git-status-section.tsx
@@ -0,0 +1,150 @@
+import { ArrowDown, ArrowUp, GitBranch, RefreshCcw } from 'lucide-react';
+import { observer } from 'mobx-react-lite';
+import {
+  getProjectStore,
+  getRepositoryStore,
+  projectDisplayName,
+} from '@renderer/features/projects/stores/project-selectors';
+import {
+  asProvisioned,
+  getTaskGitStore,
+  getTaskStore,
+} from '@renderer/features/tasks/stores/task-selectors';
+import { useTaskViewContext } from '@renderer/features/tasks/task-view-context';
+import { useGitActions } from '@renderer/features/tasks/use-git-actions';
+import { useShowModal } from '@renderer/lib/modal/modal-provider';
+import { Button } from '@renderer/lib/ui/button';
+import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@renderer/lib/ui/tooltip';
+import { getBranchTooltipText, getPublishTooltipText } from './git-status-tooltips';
+
+export const GitStatusSection = observer(function GitStatusSection() {
+  const { projectId, taskId } = useTaskViewContext();
+  const workspaceId = asProvisioned(getTaskStore(projectId, taskId))?.workspaceId;
+  const branchName = getTaskGitStore(projectId, taskId)?.branchName;
+  const projectName = projectDisplayName(getProjectStore(projectId)) ?? 'repository';
+  const repositoryStore = getRepositoryStore(projectId);
+  const showAddRemoteModal = useShowModal('addRemoteModal');
+
+  const {
+    hasUpstream,
+    aheadCount,
+    behindCount,
+    fetch,
+    pull,
+    push,
+    publish,
+    isPublishing,
+    isFetching,
+    isPulling,
+    isPushing,
+  } = useGitActions(projectId, taskId);
+  const shouldOfferAddRemote = (repositoryStore?.remotes.length ?? 0) === 0;
+
+  const handlePublishClick = () => {
+    if (!branchName || !workspaceId) return;
+    if (shouldOfferAddRemote) {
+      showAddRemoteModal({
+        projectId,
+        projectName,
+        branchName,
+        workspaceId,
+      });
+      return;
+    }
+    publish();
+  };
+
+  return (
+    <TooltipProvider>
+      <div className="p-2 border-t border-border flex flex-col gap-2">
+        <div className="flex items-center gap-2 text-foreground-muted justify-between">
+          <Tooltip>
+            <TooltipTrigger className="flex min-w-0 items-center gap-2">
+              <GitBranch className="size-3 shrink-0" />
+              <span className="truncate text-xs">{branchName}</span>
+            </TooltipTrigger>
+            <TooltipContent side="bottom">{getBranchTooltipText(branchName)}</TooltipContent>
+          </Tooltip>
+          <div className="flex items-center gap-1">
+            {hasUpstream ? (
+              <>
+                <Tooltip>
+                  <TooltipTrigger>
+                    <Button
+                      variant="outline"
+                      size="icon-xs"
+                      disabled={isFetching}
+                      onClick={() => fetch()}
+                    >
+                      <RefreshCcw className="size-3" />
+                    </Button>
+                  </TooltipTrigger>
+                  <TooltipContent>{isFetching ? 'Fetching...' : 'Fetch changes'}</TooltipContent>
+                </Tooltip>
+                <Tooltip>
+                  <TooltipTrigger>
+                    <Button
+                      variant="outline"
+                      size="icon-xs"
+                      disabled={isPulling || behindCount === 0}
+                      onClick={() => pull()}
+                    >
+                      <ArrowDown className="size-3" />
+                    </Button>
+                  </TooltipTrigger>
+                  <TooltipContent>
+                    {isPulling
+                      ? 'Pulling...'
+                      : behindCount === 0
+                        ? 'Nothing to pull'
+                        : 'Pull changes'}
+                  </TooltipContent>
+                </Tooltip>
+                <Tooltip>
+                  <TooltipTrigger>
+                    <Button
+                      variant="outline"
+                      size="icon-xs"
+                      disabled={isPushing || aheadCount === 0}
+                      onClick={() => push()}
+                    >
+                      <ArrowUp className="size-3" />
+                    </Button>
+                  </TooltipTrigger>
+                  <TooltipContent>
+                    {isPushing
+                      ? 'Pushing...'
+                      : aheadCount === 0
+                        ? 'Nothing to push'
+                        : 'Push changes'}
+                  </TooltipContent>
+                </Tooltip>
+              </>
+            ) : (
+              <Tooltip>
+                <TooltipTrigger>
+                  <Button
+                    variant="outline"
+                    size="xs"
+                    disabled={isPublishing || !branchName}
+                    onClick={handlePublishClick}
+                  >
+                    <ArrowUp className="size-3" />
+                    {isPublishing
+                      ? 'Publishing...'
+                      : shouldOfferAddRemote
+                        ? 'Add Remote'
+                        : 'Publish'}
+                  </Button>
+                </TooltipTrigger>
+                <TooltipContent>
+                  {getPublishTooltipText({ isPublishing, branchName, shouldOfferAddRemote })}
+                </TooltipContent>
+              </Tooltip>
+            )}
+          </div>
+        </div>
+      </div>
+    </TooltipProvider>
+  );
+});
diff --git a/src/renderer/features/tasks/diff-view/changes-panel/git-status-tooltips.test.ts b/src/renderer/features/tasks/diff-view/changes-panel/git-status-tooltips.test.ts
new file mode 100644
index 0000000000..edf898cf35
--- /dev/null
+++ b/src/renderer/features/tasks/diff-view/changes-panel/git-status-tooltips.test.ts
@@ -0,0 +1,36 @@
+import { describe, expect, it } from 'vitest';
+import { getBranchTooltipText, getPublishTooltipText } from './git-status-tooltips';
+
+describe('git status tooltips', () => {
+  it('shows initial-commit guidance for missing branch tooltip', () => {
+    expect(getBranchTooltipText(undefined)).toBe('Create an initial commit first.');
+  });
+
+  it('shows initial-commit guidance for disabled publish/add-remote button when branch is missing', () => {
+    expect(
+      getPublishTooltipText({
+        isPublishing: false,
+        branchName: undefined,
+        shouldOfferAddRemote: true,
+      })
+    ).toBe('Create an initial commit first.');
+  });
+
+  it('preserves existing publish tooltip behavior when branch exists', () => {
+    expect(
+      getPublishTooltipText({
+        isPublishing: false,
+        branchName: 'main',
+        shouldOfferAddRemote: true,
+      })
+    ).toBe('Create or link a remote, then publish this branch');
+
+    expect(
+      getPublishTooltipText({
+        isPublishing: false,
+        branchName: 'main',
+        shouldOfferAddRemote: false,
+      })
+    ).toBe('Publish branch');
+  });
+});
diff --git a/src/renderer/features/tasks/diff-view/changes-panel/git-status-tooltips.ts b/src/renderer/features/tasks/diff-view/changes-panel/git-status-tooltips.ts
new file mode 100644
index 0000000000..13a7d9e9f1
--- /dev/null
+++ b/src/renderer/features/tasks/diff-view/changes-panel/git-status-tooltips.ts
@@ -0,0 +1,20 @@
+const INITIAL_COMMIT_TOOLTIP = 'Create an initial commit first.';
+
+export function getBranchTooltipText(branchName: string | null | undefined): string {
+  return branchName ? branchName : INITIAL_COMMIT_TOOLTIP;
+}
+
+export function getPublishTooltipText({
+  isPublishing,
+  branchName,
+  shouldOfferAddRemote,
+}: {
+  isPublishing: boolean;
+  branchName: string | null | undefined;
+  shouldOfferAddRemote: boolean;
+}): string {
+  if (isPublishing) return 'Publishing...';
+  if (!branchName) return INITIAL_COMMIT_TOOLTIP;
+  if (shouldOfferAddRemote) return 'Create or link a remote, then publish this branch';
+  return 'Publish branch';
+}
diff --git a/src/renderer/features/tasks/diff-view/changes-panel/hooks/use-panel-layout.ts b/src/renderer/features/tasks/diff-view/changes-panel/hooks/use-panel-layout.ts
new file mode 100644
index 0000000000..0e8ff9a414
--- /dev/null
+++ b/src/renderer/features/tasks/diff-view/changes-panel/hooks/use-panel-layout.ts
@@ -0,0 +1,79 @@
+import { useLayoutEffect, useState } from 'react';
+import { usePanelRef } from 'react-resizable-panels';
+import type {
+  ChangesViewStore,
+  ExpandedSections,
+} from '@renderer/features/tasks/diff-view/stores/changes-view-store';
+
+// Matches the SectionHeader height: outer py-2 (8+8px) + button p-2 (8+8px) + size-4 icon (16px) = 48px
+export const SECTION_HEADER_HEIGHT = '40px';
+
+type usePanelLayoutReturn = {
+  expanded: ExpandedSections;
+  toggleExpanded: (section: keyof ExpandedSections) => void;
+  setExpanded: (next: ExpandedSections | ((prev: ExpandedSections) => ExpandedSections)) => void;
+  panelTransitionClass: string | false;
+  pointerHandlers: {
+    onPointerDown: (e: React.PointerEvent<HTMLElement>) => void;
+    onPointerUp: () => void;
+    onPointerCancel: () => void;
+  };
+  unstagedRef: ReturnType<typeof usePanelRef>;
+  stagedRef: ReturnType<typeof usePanelRef>;
+  prRef: ReturnType<typeof usePanelRef>;
+  spacerRef: ReturnType<typeof usePanelRef>;
+};
+
+export function usePanelLayout(changesView: ChangesViewStore): usePanelLayoutReturn {
+  const unstagedRef = usePanelRef();
+  const stagedRef = usePanelRef();
+  const prRef = usePanelRef();
+  const spacerRef = usePanelRef();
+
+  const [isDragging, setIsDragging] = useState(false);
+
+  const panelTransitionClass = !isDragging && '[transition:flex-basis_200ms_ease-in-out]';
+  const pointerHandlers = {
+    onPointerDown: (e: React.PointerEvent<HTMLElement>) => {
+      e.currentTarget.setPointerCapture(e.pointerId);
+      setIsDragging(true);
+    },
+    onPointerUp: () => setIsDragging(false),
+    onPointerCancel: () => setIsDragging(false),
+  };
+
+  const expanded = changesView.expandedSections;
+
+  useLayoutEffect(() => {
+    const sections = [
+      { key: 'unstaged' as const, ref: unstagedRef },
+      { key: 'staged' as const, ref: stagedRef },
+      { key: 'pullRequests' as const, ref: prRef },
+    ];
+
+    const expandedCount = sections.filter((s) => expanded[s.key]).length;
+    const share = expandedCount > 0 ? `${100 / expandedCount}%` : '0%';
+
+    spacerRef.current?.resize(expandedCount === 0 ? '100%' : '0%');
+
+    sections.forEach(({ key, ref }) => {
+      if (expanded[key]) {
+        ref.current?.resize(share);
+      } else {
+        ref.current?.collapse();
+      }
+    });
+  }, [expanded, unstagedRef, stagedRef, prRef, spacerRef]);
+
+  return {
+    expanded,
+    toggleExpanded: (section) => changesView.toggleExpanded(section),
+    setExpanded: (next) => changesView.setExpanded(next),
+    panelTransitionClass,
+    pointerHandlers,
+    unstagedRef,
+    stagedRef,
+    prRef,
+    spacerRef,
+  };
+}
diff --git a/src/renderer/features/tasks/diff-view/changes-panel/hooks/use-prefetch-diff-models.ts b/src/renderer/features/tasks/diff-view/changes-panel/hooks/use-prefetch-diff-models.ts
new file mode 100644
index 0000000000..96f4ebf672
--- /dev/null
+++ b/src/renderer/features/tasks/diff-view/changes-panel/hooks/use-prefetch-diff-models.ts
@@ -0,0 +1,94 @@
+import { useCallback, useEffect, useRef } from 'react';
+import { HEAD_REF, STAGED_REF, type GitRef } from '@shared/git';
+import { isBinaryForDiff } from '@renderer/lib/editor/fileKind';
+import { modelRegistry } from '@renderer/lib/monaco/monaco-model-registry';
+import { buildMonacoModelPath } from '@renderer/lib/monaco/monacoModelPath';
+import { getLanguageFromPath } from '@renderer/utils/languageUtils';
+
+interface PrefetchEntry {
+  diskUri?: string;
+  gitUris: string[];
+}
+
+/**
+ * Returns a stable callback that pre-warms Monaco models on hover so that when the user
+ * clicks to open a diff the models are already loaded. Models are unregistered on unmount.
+ * TTL eviction (60 s after last subscriber leaves) handles any remaining cleanup.
+ *
+ * Pass `modifiedRef` for the 'pr' group to pre-warm the PR head SHA instead of HEAD.
+ */
+export function usePrefetchDiffModels(
+  projectId: string,
+  workspaceId: string,
+  group: 'disk' | 'staged' | 'git' | 'pr',
+  originalRef: GitRef,
+  modifiedRef?: GitRef
+) {
+  const prefetchedRef = useRef(new Map<string, PrefetchEntry>());
+
+  useEffect(() => {
+    const prefetched = prefetchedRef.current;
+    return () => {
+      for (const entry of prefetched.values()) {
+        if (entry.diskUri) modelRegistry.unregisterModel(entry.diskUri);
+        for (const gitUri of entry.gitUris) modelRegistry.unregisterModel(gitUri);
+      }
+    };
+  }, [workspaceId]);
+
+  return useCallback(
+    (filePath: string) => {
+      if (prefetchedRef.current.has(filePath)) return;
+      if (isBinaryForDiff(filePath)) return;
+      const language = getLanguageFromPath(filePath);
+      const root = `workspace:${workspaceId}`;
+      const uri = buildMonacoModelPath(root, filePath);
+      const entry: PrefetchEntry = { gitUris: [] };
+
+      if (group === 'disk') {
+        void modelRegistry
+          .registerModel(projectId, workspaceId, root, filePath, language, 'disk')
+          .catch(() => {});
+        void modelRegistry
+          .registerModel(projectId, workspaceId, root, filePath, language, 'git', originalRef)
+          .catch(() => {});
+        entry.diskUri = modelRegistry.toDiskUri(uri);
+        entry.gitUris = [modelRegistry.toGitUri(uri, originalRef)];
+      } else if (group === 'staged') {
+        void modelRegistry
+          .registerModel(projectId, workspaceId, root, filePath, language, 'git', HEAD_REF)
+          .catch(() => {});
+        void modelRegistry
+          .registerModel(projectId, workspaceId, root, filePath, language, 'git', STAGED_REF)
+          .catch(() => {});
+        entry.gitUris = [
+          modelRegistry.toGitUri(uri, HEAD_REF),
+          modelRegistry.toGitUri(uri, STAGED_REF),
+        ];
+      } else {
+        const effectiveModifiedRef = group === 'pr' && modifiedRef ? modifiedRef : HEAD_REF;
+        void modelRegistry
+          .registerModel(projectId, workspaceId, root, filePath, language, 'git', originalRef)
+          .catch(() => {});
+        void modelRegistry
+          .registerModel(
+            projectId,
+            workspaceId,
+            root,
+            filePath,
+            language,
+            'git',
+            effectiveModifiedRef
+          )
+          .catch(() => {});
+        entry.gitUris = [
+          modelRegistry.toGitUri(uri, originalRef),
+          modelRegistry.toGitUri(uri, effectiveModifiedRef),
+        ];
+      }
+
+      prefetchedRef.current.set(filePath, entry);
+    },
+    [projectId, workspaceId, group, originalRef, modifiedRef]
+  );
+}
diff --git a/src/renderer/features/tasks/diff-view/changes-panel/pr-section.tsx b/src/renderer/features/tasks/diff-view/changes-panel/pr-section.tsx
new file mode 100644
index 0000000000..4b9be93d21
--- /dev/null
+++ b/src/renderer/features/tasks/diff-view/changes-panel/pr-section.tsx
@@ -0,0 +1,70 @@
+import { observer } from 'mobx-react-lite';
+import { getPrSyncStore } from '@renderer/features/projects/stores/project-selectors';
+import { rpc } from '@renderer/lib/ipc';
+import { useShowModal } from '@renderer/lib/modal/modal-provider';
+import { EmptyState } from '@renderer/lib/ui/empty-state';
+import { useProvisionedTask, useTaskViewContext } from '../../task-view-context';
+import { PullRequestEntry } from './components/pr-entry/pr-entry';
+import { PullRequestSectionHeader } from './components/section-header';
+
+export const PullRequestsSection = observer(function PullRequestsSection({
+  collapsed,
+  onToggleCollapsed,
+}: {
+  collapsed: boolean;
+  onToggleCollapsed: () => void;
+}) {
+  const { projectId } = useTaskViewContext();
+  const provisioned = useProvisionedTask();
+  const { pr } = provisioned.workspace;
+  const repositoryUrl = provisioned.repositoryStore.repositoryUrl;
+  const taskBranch = provisioned.taskBranch;
+  const { pullRequests, currentPr } = pr;
+  const showCreatePrModal = useShowModal('createPrModal');
+
+  const hasOpenPr = pullRequests.some((p) => p.status === 'open');
+  const isRefreshing = repositoryUrl
+    ? (getPrSyncStore(projectId)?.isSyncing(repositoryUrl) ?? false)
+    : false;
+
+  return (
+    <>
+      <PullRequestSectionHeader
+        count={pullRequests.length}
+        collapsed={collapsed}
+        onToggleCollapsed={onToggleCollapsed}
+        hasOpenPr={hasOpenPr}
+        onCreatePr={
+          taskBranch
+            ? () =>
+                showCreatePrModal({
+                  nameWithOwner: repositoryUrl ?? '',
+                  branchName: taskBranch,
+                  draft: false,
+                  workspaceId: provisioned.workspaceId,
+                  onSuccess: () => {},
+                })
+            : undefined
+        }
+        onRefresh={() => {
+          void rpc.pullRequests.syncPullRequests(projectId);
+        }}
+        isRefreshing={isRefreshing}
+      />
+      <div className="flex min-h-0 flex-1 flex-col overflow-hidden">
+        {!repositoryUrl ? (
+          <EmptyState
+            label="Pull requests unavailable"
+            description="Pull requests are currently available only for configured GitHub remotes."
+          />
+        ) : pullRequests.length === 0 ? (
+          <EmptyState
+            label="No pull requests"
+            description="Push your branch and create a PR to start a review."
+          />
+        ) : null}
+        {repositoryUrl && currentPr && <PullRequestEntry key={currentPr.url} pr={currentPr} />}
+      </div>
+    </>
+  );
+});
diff --git a/src/renderer/features/tasks/diff-view/changes-panel/staged-section.tsx b/src/renderer/features/tasks/diff-view/changes-panel/staged-section.tsx
new file mode 100644
index 0000000000..633e33d059
--- /dev/null
+++ b/src/renderer/features/tasks/diff-view/changes-panel/staged-section.tsx
@@ -0,0 +1,106 @@
+import { Minus } from 'lucide-react';
+import { observer } from 'mobx-react-lite';
+import { commitRef, HEAD_REF } from '@shared/git';
+import { useProvisionedTask, useTaskViewContext } from '@renderer/features/tasks/task-view-context';
+import { Button } from '@renderer/lib/ui/button';
+import { EmptyState } from '@renderer/lib/ui/empty-state';
+import { ActionCard } from './components/action-card';
+import { CommitCard } from './components/commit-card';
+import { SectionHeader } from './components/section-header';
+import { VirtualizedChangesList } from './components/virtualized-changes-list';
+import { usePrefetchDiffModels } from './hooks/use-prefetch-diff-models';
+
+export const StagedSection = observer(function StagedSection() {
+  const { projectId } = useTaskViewContext();
+  const provisioned = useProvisionedTask();
+  const git = provisioned.workspace.git;
+  const changesView = provisioned.taskView.diffView.changesView;
+  const diffView = provisioned.taskView.diffView;
+
+  const changes = git.stagedFileChanges;
+  const hasChanges = changes.length > 0;
+  const selectedPaths = changesView.stagedSelection;
+  const selectionState = changesView.stagedSelectionState;
+  const activePath =
+    provisioned.taskView.view === 'diff' && diffView.activeFile?.group === 'staged'
+      ? diffView.activeFile.path
+      : undefined;
+
+  const prefetch = usePrefetchDiffModels(projectId, provisioned.workspaceId, 'staged', HEAD_REF);
+
+  const handleSelectChange = (path: string) => {
+    diffView.setActiveFile({ path, type: 'git', group: 'staged', originalRef: commitRef('HEAD') });
+    provisioned.taskView.setView('diff');
+  };
+
+  const handleUnstageSelection = () => {
+    const paths = [...selectedPaths];
+    void git.unstageFiles(paths);
+    changesView.clearStagedSelection();
+  };
+
+  const handleUnstageAll = () => {
+    void git.unstageAllFiles();
+  };
+
+  return (
+    <>
+      <SectionHeader
+        label="Staged"
+        count={changes.length}
+        selectionState={selectionState}
+        onToggleAll={() => changesView.toggleAllStaged()}
+        actions={undefined}
+        collapsed={!changesView.expandedSections.staged}
+        onToggleCollapsed={() => changesView.toggleExpanded('staged')}
+      />
+      {!hasChanges && (
+        <EmptyState
+          label="Nothing staged"
+          description="Stage files above to include them in a commit."
+        />
+      )}
+      <div className="flex min-h-0 flex-1 flex-col overflow-hidden">
+        {hasChanges && selectedPaths.size > 0 && (
+          <ActionCard
+            selectedCount={selectedPaths.size}
+            selectionActions={
+              <Button
+                variant="outline"
+                size="xs"
+                onClick={handleUnstageSelection}
+                title="Unstage selected files"
+              >
+                <Minus className="size-3" />
+                Unstage
+              </Button>
+            }
+            generalActions={
+              <Button
+                variant="ghost"
+                size="xs"
+                disabled={!hasChanges}
+                onClick={handleUnstageAll}
+                title="Unstage all files"
+              >
+                <Minus className="size-3" />
+                Unstage all
+              </Button>
+            }
+          />
+        )}
+        <div className="min-h-0 flex-1 px-1">
+          <VirtualizedChangesList
+            changes={changes}
+            isSelected={(path) => selectedPaths.has(path)}
+            onToggleSelect={(path) => changesView.toggleStagedItem(path)}
+            activePath={activePath}
+            onSelectChange={(change) => handleSelectChange(change.path)}
+            onPrefetch={(change) => prefetch(change.path)}
+          />
+        </div>
+        {hasChanges && <CommitCard />}
+      </div>
+    </>
+  );
+});
diff --git a/src/renderer/features/tasks/diff-view/changes-panel/unstaged-section.tsx b/src/renderer/features/tasks/diff-view/changes-panel/unstaged-section.tsx
new file mode 100644
index 0000000000..348c8be736
--- /dev/null
+++ b/src/renderer/features/tasks/diff-view/changes-panel/unstaged-section.tsx
@@ -0,0 +1,158 @@
+import { Plus, Undo2 } from 'lucide-react';
+import { observer } from 'mobx-react-lite';
+import { commitRef, HEAD_REF } from '@shared/git';
+import { useProvisionedTask, useTaskViewContext } from '@renderer/features/tasks/task-view-context';
+import { useShowModal } from '@renderer/lib/modal/modal-provider';
+import { Button } from '@renderer/lib/ui/button';
+import { EmptyState } from '@renderer/lib/ui/empty-state';
+import { ActionCard } from './components/action-card';
+import { CommitCard } from './components/commit-card';
+import { SectionHeader } from './components/section-header';
+import { VirtualizedChangesList } from './components/virtualized-changes-list';
+import { usePrefetchDiffModels } from './hooks/use-prefetch-diff-models';
+
+export const UnstagedSection = observer(function UnstagedSection() {
+  const { projectId } = useTaskViewContext();
+  const provisioned = useProvisionedTask();
+  const git = provisioned.workspace.git;
+  const changesView = provisioned.taskView.diffView.changesView;
+  const diffView = provisioned.taskView.diffView;
+
+  const changes = git.unstagedFileChanges;
+  const hasChanges = changes.length > 0;
+  const hasStagedChanges = git.stagedFileChanges.length > 0;
+  const selectedPaths = changesView.unstagedSelection;
+  const selectionState = changesView.unstagedSelectionState;
+
+  const activePath =
+    provisioned.taskView.view === 'diff' && diffView.activeFile?.group === 'disk'
+      ? diffView.activeFile.path
+      : undefined;
+
+  const prefetch = usePrefetchDiffModels(projectId, provisioned.workspaceId, 'disk', HEAD_REF);
+
+  const showConfirmActionModal = useShowModal('confirmActionModal');
+
+  const handleSelectChange = (path: string) => {
+    diffView.setActiveFile({ path, type: 'disk', group: 'disk', originalRef: commitRef('HEAD') });
+    provisioned.taskView.setView('diff');
+  };
+
+  const handleDiscardSelection = () => {
+    const paths = [...selectedPaths];
+    showConfirmActionModal({
+      title: 'Discard Files Changes',
+      variant: 'destructive',
+      description:
+        'Are you sure you want to discard the changes to the selected files? This can not be undone.',
+      onSuccess: async () => {
+        await git.discardFiles(paths);
+        changesView.clearUnstagedSelection();
+      },
+    });
+  };
+
+  const handleDiscardAll = () => {
+    showConfirmActionModal({
+      title: 'Discard All Changes',
+      variant: 'destructive',
+      description: 'Are you sure you want to discard all changes? This can not be undone.',
+      onSuccess: async () => {
+        await git.discardAllFiles();
+      },
+    });
+  };
+
+  const handleStageSelection = () => {
+    const paths = [...selectedPaths];
+    void git.stageFiles(paths);
+    changesView.clearUnstagedSelection();
+  };
+
+  const handleStageAll = () => {
+    void git.stageAllFiles();
+  };
+
+  return (
+    <>
+      <SectionHeader
+        label="Changed"
+        collapsed={!changesView.expandedSections.unstaged}
+        onToggleCollapsed={() => changesView.toggleExpanded('unstaged')}
+        count={changes.length}
+        selectionState={selectionState}
+        onToggleAll={() => changesView.toggleAllUnstaged()}
+        actions={undefined}
+      />
+      <div className="flex min-h-0 flex-1 flex-col overflow-hidden">
+        {!hasChanges && (
+          <EmptyState label="Working tree clean" description="No uncommitted file changes." />
+        )}
+        {hasChanges && (
+          <ActionCard
+            selectedCount={selectedPaths.size}
+            selectionActions={
+              <>
+                <Button
+                  variant="link"
+                  size="xs"
+                  onClick={handleDiscardSelection}
+                  title="Discard selected files"
+                  className="text-foreground-destructive"
+                >
+                  <Undo2 className="size-3" />
+                  Discard
+                </Button>
+                <Button
+                  variant="outline"
+                  size="xs"
+                  onClick={handleStageSelection}
+                  title="Stage selected files"
+                >
+                  <Plus className="size-3" />
+                  Stage
+                </Button>
+              </>
+            }
+            generalActions={
+              <>
+                <Button
+                  variant="link"
+                  size="xs"
+                  disabled={!hasChanges}
+                  onClick={handleDiscardAll}
+                  title="Discard all changes"
+                  className="text-foreground-destructive"
+                >
+                  <Undo2 className="size-3" />
+                  Discard all
+                </Button>
+                <Button
+                  variant="outline"
+                  size="xs"
+                  disabled={!hasChanges}
+                  onClick={handleStageAll}
+                  title="Stage all changes"
+                >
+                  <Plus className="size-3" />
+                  Stage all
+                </Button>
+              </>
+            }
+          />
+        )}
+        <div className="min-h-0 flex-1 px-1">
+          <VirtualizedChangesList
+            changes={changes}
+            isSelected={(path) => selectedPaths.has(path)}
+            onToggleSelect={(path) => changesView.toggleUnstagedItem(path)}
+            activePath={activePath}
+            onSelectChange={(change) => handleSelectChange(change.path)}
+            onPrefetch={(change) => prefetch(change.path)}
+          />
+        </div>
+        {hasChanges && !hasStagedChanges && <CommitCard autoStage />}
+      </div>
+    </>
+  );
+});
diff --git a/src/renderer/features/tasks/diff-view/comments/comment-card.tsx b/src/renderer/features/tasks/diff-view/comments/comment-card.tsx
new file mode 100644
index 0000000000..9f91023369
--- /dev/null
+++ b/src/renderer/features/tasks/diff-view/comments/comment-card.tsx
@@ -0,0 +1,119 @@
+import React, { forwardRef, useEffect } from 'react';
+import { Textarea, type TextareaProps } from '@renderer/lib/ui/textarea';
+import { cn } from '@renderer/utils/utils';
+
+export function useTextareaAutoFocus(
+  ref: React.RefObject<HTMLTextAreaElement | null>,
+  active: boolean
+) {
+  useEffect(() => {
+    if (!active) return;
+
+    const focusTextarea = () => {
+      const textarea = ref.current;
+      if (!textarea) return;
+      textarea.focus();
+      textarea.select();
+    };
+
+    let raf2: number | null = null;
+    const raf1 = requestAnimationFrame(() => {
+      raf2 = requestAnimationFrame(() => {
+        focusTextarea();
+      });
+    });
+    const timer = setTimeout(() => {
+      focusTextarea();
+    }, 80);
+
+    return () => {
+      cancelAnimationFrame(raf1);
+      if (raf2 !== null) cancelAnimationFrame(raf2);
+      clearTimeout(timer);
+    };
+  }, [active, ref]);
+}
+
+const CommentRoot = forwardRef<HTMLDivElement, React.HTMLAttributes<HTMLDivElement>>(
+  ({ className, ...props }, ref) => (
+    <div
+      ref={ref}
+      className={cn(
+        'flex h-[140px] w-full flex-col rounded-lg border border-border bg-background text-foreground shadow-sm',
+        className
+      )}
+      {...props}
+    />
+  )
+);
+CommentRoot.displayName = 'CommentRoot';
+
+const CommentHeader = forwardRef<HTMLDivElement, React.HTMLAttributes<HTMLDivElement>>(
+  ({ className, ...props }, ref) => (
+    <div
+      ref={ref}
+      className={cn(
+        'flex flex-row items-center justify-between space-y-0 px-6 py-4 pb-3',
+        className
+      )}
+      {...props}
+    />
+  )
+);
+CommentHeader.displayName = 'CommentHeader';
+
+const CommentTitle = forwardRef<HTMLDivElement, React.HTMLAttributes<HTMLDivElement>>(
+  ({ className, ...props }, ref) => (
+    <div ref={ref} className={cn('text-sm font-semibold leading-none', className)} {...props} />
+  )
+);
+CommentTitle.displayName = 'CommentTitle';
+
+const CommentMeta = forwardRef<HTMLSpanElement, React.HTMLAttributes<HTMLSpanElement>>(
+  ({ className, ...props }, ref) => (
+    <span
+      ref={ref}
+      className={cn('text-xs font-normal text-muted-foreground', className)}
+      {...props}
+    />
+  )
+);
+CommentMeta.displayName = 'CommentMeta';
+
+const CommentActions = forwardRef<HTMLDivElement, React.HTMLAttributes<HTMLDivElement>>(
+  ({ className, ...props }, ref) => (
+    <div ref={ref} className={cn('flex items-center gap-1.5', className)} {...props} />
+  )
+);
+CommentActions.displayName = 'CommentActions';
+
+const CommentBody = forwardRef<HTMLDivElement, React.HTMLAttributes<HTMLDivElement>>(
+  ({ className, ...props }, ref) => (
+    <div ref={ref} className={cn('flex-1 overflow-hidden px-6 pb-5 pt-0', className)} {...props} />
+  )
+);
+CommentBody.displayName = 'CommentBody';
+
+const CommentTextarea = forwardRef<HTMLTextAreaElement, TextareaProps>(
+  ({ className, ...props }, ref) => (
+    <Textarea
+      ref={ref}
+      className={cn(
+        'h-full resize-none border-border bg-background px-4 py-3 text-sm shadow-none focus-visible:ring-0 focus-visible:border-border focus-visible:outline-none',
+        className
+      )}
+      {...props}
+    />
+  )
+);
+CommentTextarea.displayName = 'CommentTextarea';
+
+export const Comment = {
+  Root: CommentRoot,
+  Header: CommentHeader,
+  Title: CommentTitle,
+  Meta: CommentMeta,
+  Actions: CommentActions,
+  Body: CommentBody,
+  Textarea: CommentTextarea,
+};
diff --git a/src/renderer/features/tasks/diff-view/comments/comment-input.tsx b/src/renderer/features/tasks/diff-view/comments/comment-input.tsx
new file mode 100644
index 0000000000..86bdb056bd
--- /dev/null
+++ b/src/renderer/features/tasks/diff-view/comments/comment-input.tsx
@@ -0,0 +1,84 @@
+import { Check, X } from 'lucide-react';
+import { useRef, useState } from 'react';
+import { Button } from '@renderer/lib/ui/button';
+import { Comment, useTextareaAutoFocus } from './comment-card';
+
+interface CommentInputProps {
+  lineNumber: number;
+  existingContent?: string;
+  onSubmit: (content: string) => void | Promise<void>;
+  onCancel: () => void;
+}
+
+export const CommentInput: React.FC<CommentInputProps> = ({
+  lineNumber,
+  existingContent,
+  onSubmit,
+  onCancel,
+}) => {
+  const [content, setContent] = useState(existingContent || '');
+  const textareaRef = useRef<HTMLTextAreaElement>(null);
+
+  useTextareaAutoFocus(textareaRef, true);
+
+  const handleSubmit = () => {
+    if (content.trim()) {
+      void onSubmit(content.trim());
+    }
+  };
+
+  const handleKeyDown = (e: React.KeyboardEvent) => {
+    if (e.key === 'Enter' && (e.metaKey || e.ctrlKey)) {
+      e.preventDefault();
+      handleSubmit();
+    }
+    if (e.key === 'Escape') {
+      onCancel();
+    }
+  };
+
+  return (
+    <Comment.Root>
+      <Comment.Header>
+        <Comment.Title>
+          {existingContent ? 'Edit comment' : 'Add comment'}
+          <Comment.Meta className="ml-2">(Line {lineNumber})</Comment.Meta>
+        </Comment.Title>
+        <Comment.Actions>
+          <Button
+            variant="ghost"
+            size="icon-sm"
+            className="h-8 w-8"
+            onClick={onCancel}
+            title="Cancel (Esc)"
+            aria-label="Cancel comment"
+          >
+            <X className="h-4 w-4" />
+          </Button>
+          <Button
+            variant="ghost"
+            size="icon-sm"
+            className="h-8 w-8"
+            onClick={handleSubmit}
+            disabled={!content.trim()}
+            title="Submit (Cmd/Ctrl+Enter)"
+            aria-label="Submit comment"
+          >
+            <Check className="h-4 w-4 text-emerald-600 dark:text-emerald-400" />
+          </Button>
+        </Comment.Actions>
+      </Comment.Header>
+
+      <Comment.Body>
+        <Comment.Textarea
+          ref={textareaRef}
+          value={content}
+          onChange={(e) => setContent(e.target.value)}
+          onKeyDown={handleKeyDown}
+          placeholder="Add a note about this line..."
+          autoFocus
+        />
+      </Comment.Body>
+    </Comment.Root>
+  );
+};
diff --git a/src/renderer/features/tasks/diff-view/comments/comment-widget.tsx b/src/renderer/features/tasks/diff-view/comments/comment-widget.tsx
new file mode 100644
index 0000000000..399d22c42c
--- /dev/null
+++ b/src/renderer/features/tasks/diff-view/comments/comment-widget.tsx
@@ -0,0 +1,134 @@
+import { Check, Pencil, Trash2, X } from 'lucide-react';
+import { useRef, useState } from 'react';
+import { Button } from '@renderer/lib/ui/button';
+import type { DraftComment } from '../stores/draft-comments-store';
+import { Comment, useTextareaAutoFocus } from './comment-card';
+
+interface CommentWidgetProps {
+  comment: DraftComment;
+  onEdit: (content: string) => void | Promise<void>;
+  onDelete: () => void | Promise<void>;
+}
+
+export const CommentWidget: React.FC<CommentWidgetProps> = ({ comment, onEdit, onDelete }) => {
+  const [isEditing, setIsEditing] = useState(false);
+  const [editContent, setEditContent] = useState(comment.content);
+  const editTextareaRef = useRef<HTMLTextAreaElement>(null);
+
+  useTextareaAutoFocus(editTextareaRef, isEditing);
+
+  const handleStartEditing = () => {
+    setEditContent(comment.content);
+    setIsEditing(true);
+  };
+
+  const handleSave = () => {
+    if (editContent.trim()) {
+      void onEdit(editContent.trim());
+      setIsEditing(false);
+      if (document.activeElement instanceof HTMLElement) {
+        document.activeElement.blur();
+      }
+    }
+  };
+
+  const handleCancel = () => {
+    setEditContent(comment.content);
+    setIsEditing(false);
+    if (document.activeElement instanceof HTMLElement) {
+      document.activeElement.blur();
+    }
+  };
+
+  const handleKeyDown = (e: React.KeyboardEvent) => {
+    if (e.key === 'Enter' && (e.metaKey || e.ctrlKey)) {
+      e.preventDefault();
+      handleSave();
+    }
+    if (e.key === 'Escape') {
+      handleCancel();
+    }
+  };
+
+  return (
+    <Comment.Root>
+      <Comment.Header>
+        <Comment.Title>
+          {isEditing ? 'Edit comment' : 'Comment'}
+          <Comment.Meta className="ml-2">(Line {comment.lineNumber})</Comment.Meta>
+        </Comment.Title>
+        <Comment.Actions>
+          {isEditing ? (
+            <>
+              <Button
+                variant="ghost"
+                size="icon-sm"
+                className="h-8 w-8"
+                onClick={handleCancel}
+                title="Cancel (Esc)"
+                aria-label="Cancel edit comment"
+              >
+                <X className="h-4 w-4" />
+              </Button>
+              <Button
+                variant="ghost"
+                size="icon-sm"
+                className="h-8 w-8"
+                onClick={handleSave}
+                disabled={!editContent.trim()}
+                title="Save (Cmd/Ctrl+Enter)"
+                aria-label="Save comment"
+              >
+                <Check className="h-4 w-4 text-emerald-600 dark:text-emerald-400" />
+              </Button>
+            </>
+          ) : (
+            <>
+              <Button
+                variant="ghost"
+                size="icon-sm"
+                className="h-8 w-8"
+                onClick={handleStartEditing}
+                title="Edit"
+                aria-label="Edit comment"
+              >
+                <Pencil className="h-4 w-4" />
+              </Button>
+              <Button
+                variant="ghost"
+                size="icon-sm"
+                className="h-8 w-8 text-destructive hover:text-destructive"
+                onClick={() => void onDelete()}
+                title="Delete"
+                aria-label="Delete comment"
+              >
+                <Trash2 className="h-4 w-4" />
+              </Button>
+            </>
+          )}
+        </Comment.Actions>
+      </Comment.Header>
+
+      <Comment.Body>
+        {!isEditing ? (
+          <Comment.Textarea
+            readOnly
+            value={comment.content}
+            onDoubleClick={handleStartEditing}
+            tabIndex={-1}
+            onMouseDown={(event) => event.preventDefault()}
+            onFocus={(event) => event.currentTarget.blur()}
+          />
+        ) : (
+          <Comment.Textarea
+            ref={editTextareaRef}
+            value={editContent}
+            onChange={(e) => setEditContent(e.target.value)}
+            onKeyDown={handleKeyDown}
+            placeholder="Update the note..."
+          />
+        )}
+      </Comment.Body>
+    </Comment.Root>
+  );
+};
diff --git a/src/renderer/features/tasks/diff-view/comments/monaco-comment-manager.ts b/src/renderer/features/tasks/diff-view/comments/monaco-comment-manager.ts
new file mode 100644
index 0000000000..c07d73307c
--- /dev/null
+++ b/src/renderer/features/tasks/diff-view/comments/monaco-comment-manager.ts
@@ -0,0 +1,345 @@
+import type * as monaco from 'monaco-editor';
+import React from 'react';
+import { createRoot, type Root } from 'react-dom/client';
+import type { DraftComment } from '../stores/draft-comments-store';
+import { CommentInput } from './comment-input';
+import { CommentWidget } from './comment-widget';
+
+const GUTTER_GLYPH_MARGIN = 2;
+const COMMENT_ZONE_HEIGHT_PX = 140 + 24;
+
+interface MonacoCommentManagerOptions {
+  onAddComment: (lineNumber: number, content: string, lineContent?: string) => void | Promise<void>;
+  onEditComment: (id: string, content: string) => void | Promise<void>;
+  onDeleteComment: (id: string) => void | Promise<void>;
+}
+
+export class MonacoCommentManager {
+  private readonly editor: monaco.editor.IStandaloneDiffEditor;
+  private readonly options: MonacoCommentManagerOptions;
+
+  private viewZoneRoots: Map<
+    string,
+    { zoneId: string; root: Root; domNode: HTMLElement; lineNumber: number }
+  > = new Map();
+
+  private decorationIds: string[] = [];
+  private hoverDecorationIds: string[] = [];
+  private pinnedDecorationIds: string[] = [];
+  private hoveredLine: number | null = null;
+
+  private inputZoneId: string | null = null;
+  private inputRoot: Root | null = null;
+  private inputDomNode: HTMLElement | null = null;
+  private activeInputLine: number | null = null;
+
+  private disposed = false;
+  private gutterClickDisposable: monaco.IDisposable | null = null;
+  private hoverMoveDisposable: monaco.IDisposable | null = null;
+  private hoverLeaveDisposable: monaco.IDisposable | null = null;
+
+  constructor(editor: monaco.editor.IStandaloneDiffEditor, options: MonacoCommentManagerOptions) {
+    this.editor = editor;
+    this.options = options;
+    this.setupGutterClickHandler();
+    this.setupHoverHandler();
+  }
+
+  private setupGutterClickHandler() {
+    const modifiedEditor = this.editor.getModifiedEditor();
+
+    this.gutterClickDisposable = modifiedEditor.onMouseDown((e) => {
+      if (e.target.type !== GUTTER_GLYPH_MARGIN) return;
+      const targetElement = e.target.element;
+      if (!targetElement?.classList.contains('comment-hover-icon')) return;
+
+      const lineNumber = e.target.position?.lineNumber;
+      if (!lineNumber) return;
+
+      e.event?.preventDefault();
+      e.event?.stopPropagation();
+
+      const model = modifiedEditor.getModel();
+      const lineContent = model?.getLineContent(lineNumber) ?? '';
+      this.showInputAt(lineNumber, lineContent);
+    });
+  }
+
+  private setupHoverHandler() {
+    const modifiedEditor = this.editor.getModifiedEditor();
+
+    this.hoverMoveDisposable = modifiedEditor.onMouseMove((e) => {
+      if (this.disposed) return;
+      const targetElement = e.target.element as HTMLElement | null;
+      if (targetElement?.closest?.('.comment-view-zone')) {
+        this.clearHoverDecoration();
+        this.hoveredLine = null;
+        return;
+      }
+
+      const lineNumber = e.target.position?.lineNumber;
+
+      if (lineNumber && lineNumber !== this.hoveredLine) {
+        if (lineNumber === this.activeInputLine) {
+          this.clearHoverDecoration();
+          this.hoveredLine = lineNumber;
+          return;
+        }
+        this.setHoverDecoration(lineNumber);
+        this.hoveredLine = lineNumber;
+      } else if (!lineNumber && this.hoveredLine !== null) {
+        this.clearHoverDecoration();
+        this.hoveredLine = null;
+      }
+    });
+
+    this.hoverLeaveDisposable = modifiedEditor.onMouseLeave(() => {
+      if (this.disposed) return;
+      this.clearHoverDecoration();
+      this.hoveredLine = null;
+    });
+  }
+
+  private setHoverDecoration(lineNumber: number) {
+    const modifiedEditor = this.editor.getModifiedEditor();
+
+    const decoration: monaco.editor.IModelDeltaDecoration = {
+      range: {
+        startLineNumber: lineNumber,
+        startColumn: 1,
+        endLineNumber: lineNumber,
+        endColumn: 1,
+      },
+      options: {
+        glyphMarginClassName: 'comment-hover-icon',
+      },
+    };
+
+    this.hoverDecorationIds = modifiedEditor.deltaDecorations(this.hoverDecorationIds, [
+      decoration,
+    ]);
+  }
+
+  private setPinnedDecoration(lineNumber: number) {
+    const modifiedEditor = this.editor.getModifiedEditor();
+
+    const decoration: monaco.editor.IModelDeltaDecoration = {
+      range: {
+        startLineNumber: lineNumber,
+        startColumn: 1,
+        endLineNumber: lineNumber,
+        endColumn: 1,
+      },
+      options: {
+        glyphMarginClassName: 'comment-hover-icon comment-hover-icon-pinned',
+      },
+    };
+
+    this.pinnedDecorationIds = modifiedEditor.deltaDecorations(this.pinnedDecorationIds, [
+      decoration,
+    ]);
+  }
+
+  private clearHoverDecoration() {
+    const modifiedEditor = this.editor.getModifiedEditor();
+    this.hoverDecorationIds = modifiedEditor.deltaDecorations(this.hoverDecorationIds, []);
+  }
+
+  private clearPinnedDecoration() {
+    const modifiedEditor = this.editor.getModifiedEditor();
+    this.pinnedDecorationIds = modifiedEditor.deltaDecorations(this.pinnedDecorationIds, []);
+  }
+
+  setComments(comments: DraftComment[]) {
+    if (this.disposed) return;
+
+    const modifiedEditor = this.editor.getModifiedEditor();
+    const nextById = new Map<string, DraftComment>(
+      comments.map((comment) => [comment.id, comment])
+    );
+
+    this.decorationIds = modifiedEditor.deltaDecorations(this.decorationIds, []);
+
+    modifiedEditor.changeViewZones((accessor) => {
+      for (const [commentId, zoneInfo] of Array.from(this.viewZoneRoots.entries())) {
+        if (!nextById.has(commentId)) {
+          accessor.removeZone(zoneInfo.zoneId);
+          zoneInfo.root.unmount();
+          this.viewZoneRoots.delete(commentId);
+        }
+      }
+
+      for (const comment of comments) {
+        const existing = this.viewZoneRoots.get(comment.id);
+        if (existing) {
+          existing.domNode.dataset.lineNumber = String(comment.lineNumber);
+          existing.domNode.style.padding = '12px';
+          existing.domNode.style.boxSizing = 'border-box';
+          existing.domNode.className = 'comment-view-zone bg-muted/40 border border-border';
+
+          existing.root.render(
+            React.createElement(CommentWidget, {
+              comment,
+              onEdit: (content) => this.options.onEditComment(comment.id, content),
+              onDelete: () => this.options.onDeleteComment(comment.id),
+            })
+          );
+
+          if (existing.lineNumber !== comment.lineNumber) {
+            accessor.removeZone(existing.zoneId);
+            const zoneId = accessor.addZone({
+              afterLineNumber: comment.lineNumber,
+              heightInPx: COMMENT_ZONE_HEIGHT_PX,
+              domNode: existing.domNode,
+              suppressMouseDown: false,
+              showInHiddenAreas: true,
+            });
+            this.viewZoneRoots.set(comment.id, {
+              ...existing,
+              zoneId,
+              lineNumber: comment.lineNumber,
+            });
+          }
+          continue;
+        }
+
+        const domNode = document.createElement('div');
+        domNode.style.padding = '12px';
+        domNode.style.boxSizing = 'border-box';
+        domNode.className = 'comment-view-zone bg-muted/40 border border-border';
+        domNode.style.pointerEvents = 'auto';
+        domNode.style.position = 'relative';
+        domNode.style.zIndex = '10';
+        domNode.style.width = '100%';
+        domNode.dataset.lineNumber = String(comment.lineNumber);
+
+        const root = createRoot(domNode);
+        root.render(
+          React.createElement(CommentWidget, {
+            comment,
+            onEdit: (content) => this.options.onEditComment(comment.id, content),
+            onDelete: () => this.options.onDeleteComment(comment.id),
+          })
+        );
+
+        const zoneId = accessor.addZone({
+          afterLineNumber: comment.lineNumber,
+          heightInPx: COMMENT_ZONE_HEIGHT_PX,
+          domNode,
+          suppressMouseDown: false,
+          showInHiddenAreas: true,
+        });
+
+        this.viewZoneRoots.set(comment.id, {
+          zoneId,
+          root,
+          domNode,
+          lineNumber: comment.lineNumber,
+        });
+      }
+    });
+  }
+
+  showInputAt(lineNumber: number, lineContent: string) {
+    if (this.activeInputLine === lineNumber && this.inputDomNode) {
+      const textarea = this.inputDomNode.querySelector('textarea');
+      if (textarea instanceof HTMLTextAreaElement) textarea.focus();
+      return;
+    }
+
+    this.hideInput();
+
+    const modifiedEditor = this.editor.getModifiedEditor();
+    this.activeInputLine = lineNumber;
+    this.setPinnedDecoration(lineNumber);
+
+    this.inputDomNode = document.createElement('div');
+    this.inputRoot = createRoot(this.inputDomNode);
+
+    this.inputRoot.render(
+      React.createElement(CommentInput, {
+        lineNumber,
+        onSubmit: async (content) => {
+          await this.options.onAddComment(lineNumber, content, lineContent);
+          this.hideInput();
+        },
+        onCancel: () => this.hideInput(),
+      })
+    );
+
+    this.inputDomNode.style.padding = '12px';
+    this.inputDomNode.style.boxSizing = 'border-box';
+    this.inputDomNode.className = 'comment-view-zone bg-muted/40 border border-border';
+    this.inputDomNode.style.pointerEvents = 'auto';
+    this.inputDomNode.style.position = 'relative';
+    this.inputDomNode.style.zIndex = '10';
+    this.inputDomNode.style.width = '100%';
+    this.inputDomNode.dataset.lineNumber = String(lineNumber);
+
+    modifiedEditor.changeViewZones((accessor) => {
+      this.inputZoneId = accessor.addZone({
+        afterLineNumber: lineNumber,
+        heightInPx: COMMENT_ZONE_HEIGHT_PX,
+        domNode: this.inputDomNode!,
+        suppressMouseDown: false,
+        showInHiddenAreas: true,
+      });
+    });
+
+    const focusTextarea = () => {
+      const textarea = this.inputDomNode?.querySelector('textarea');
+      if (textarea instanceof HTMLTextAreaElement) {
+        textarea.focus();
+        textarea.select();
+      }
+    };
+
+    requestAnimationFrame(() => {
+      requestAnimationFrame(() => {
+        focusTextarea();
+      });
+    });
+    setTimeout(() => {
+      focusTextarea();
+    }, 80);
+  }
+
+  hideInput() {
+    const modifiedEditor = this.editor.getModifiedEditor();
+    if (this.inputZoneId) {
+      modifiedEditor.changeViewZones((accessor) => {
+        accessor.removeZone(this.inputZoneId!);
+      });
+      this.inputZoneId = null;
+    }
+
+    this.inputRoot?.unmount();
+    this.inputRoot = null;
+    this.inputDomNode = null;
+    this.activeInputLine = null;
+    this.clearPinnedDecoration();
+  }
+
+  dispose() {
+    this.disposed = true;
+
+    this.gutterClickDisposable?.dispose();
+    this.hoverMoveDisposable?.dispose();
+    this.hoverLeaveDisposable?.dispose();
+
+    this.hideInput();
+
+    const modifiedEditor = this.editor.getModifiedEditor();
+    this.decorationIds = modifiedEditor.deltaDecorations(this.decorationIds, []);
+    this.hoverDecorationIds = modifiedEditor.deltaDecorations(this.hoverDecorationIds, []);
+    this.pinnedDecorationIds = modifiedEditor.deltaDecorations(this.pinnedDecorationIds, []);
+
+    modifiedEditor.changeViewZones((accessor) => {
+      for (const zone of this.viewZoneRoots.values()) {
+        accessor.removeZone(zone.zoneId);
+        zone.root.unmount();
+      }
+    });
+    this.viewZoneRoots.clear();
+  }
+}
diff --git a/src/renderer/features/tasks/diff-view/comments/use-diff-editor-comments.ts b/src/renderer/features/tasks/diff-view/comments/use-diff-editor-comments.ts
new file mode 100644
index 0000000000..b424867d11
--- /dev/null
+++ b/src/renderer/features/tasks/diff-view/comments/use-diff-editor-comments.ts
@@ -0,0 +1,53 @@
+import type * as monaco from 'monaco-editor';
+import { useEffect, useLayoutEffect, useMemo, useRef } from 'react';
+import type { DraftComment } from '../stores/draft-comments-store';
+import { MonacoCommentManager } from './monaco-comment-manager';
+
+interface UseDiffEditorCommentsOptions {
+  editor: monaco.editor.IStandaloneDiffEditor | null;
+  comments: DraftComment[];
+  onAddComment: (lineNumber: number, content: string, lineContent?: string) => void | Promise<void>;
+  onEditComment: (id: string, content: string) => void | Promise<void>;
+  onDeleteComment: (id: string) => void | Promise<void>;
+}
+
+export function useDiffEditorComments({
+  editor,
+  comments,
+  onAddComment,
+  onEditComment,
+  onDeleteComment,
+}: UseDiffEditorCommentsOptions): void {
+  const managerRef = useRef<MonacoCommentManager | null>(null);
+
+  const callbacks = useMemo(
+    () => ({
+      onAddComment,
+      onEditComment,
+      onDeleteComment,
+    }),
+    [onAddComment, onEditComment, onDeleteComment]
+  );
+
+  const commentsRef = useRef(comments);
+  useLayoutEffect(() => {
+    commentsRef.current = comments;
+  });
+
+  useEffect(() => {
+    if (!editor) return;
+
+    const manager = new MonacoCommentManager(editor, callbacks);
+    managerRef.current = manager;
+    manager.setComments(commentsRef.current);
+
+    return () => {
+      manager.dispose();
+      managerRef.current = null;
+    };
+  }, [editor, callbacks]);
+
+  useEffect(() => {
+    managerRef.current?.setComments(comments);
+  }, [comments]);
+}
diff --git a/src/renderer/features/tasks/diff-view/main-panel/diff-toolbar.tsx b/src/renderer/features/tasks/diff-view/main-panel/diff-toolbar.tsx
new file mode 100644
index 0000000000..96162d7ab3
--- /dev/null
+++ b/src/renderer/features/tasks/diff-view/main-panel/diff-toolbar.tsx
@@ -0,0 +1,61 @@
+import { AlignJustify, Columns2 } from 'lucide-react';
+import { observer } from 'mobx-react-lite';
+import { useMemo } from 'react';
+import { useProvisionedTask } from '@renderer/features/tasks/task-view-context';
+import { splitPath } from '@renderer/features/tasks/utils';
+import { FileIcon } from '@renderer/lib/editor/file-icon';
+import { Badge } from '@renderer/lib/ui/badge';
+import { ToggleGroup, ToggleGroupItem } from '@renderer/lib/ui/toggle-group';
+
+export const DiffToolbar = observer(function DiffToolbar() {
+  const diffView = useProvisionedTask().taskView.diffView;
+  const diffStyle = diffView.diffStyle;
+  const activeFile = diffView.activeFile;
+
+  const filePath = activeFile?.path ?? undefined;
+  const { filename, directory } = filePath ? splitPath(filePath) : { filename: '', directory: '' };
+
+  const diffSourceLabel = useMemo(() => {
+    if (activeFile?.group === 'staged') return 'Staged';
+    if (activeFile?.group === 'disk') return 'Changed';
+    if (activeFile?.group === 'pr') return 'PR';
+    if (activeFile?.group === 'git') return 'Git';
+    return undefined;
+  }, [activeFile?.group]);
+
+  return (
+    <div className="flex h-[41px] items-center gap-2 border-b border-border px-2 justify-between">
+      <div className="flex items-center gap-3">
+        {filePath && (
+          <div className="text-sm flex items-center gap-2">
+            <span className="flex items-center gap-1">
+              <FileIcon filename={filename} size={12} />
+              {filename}
+            </span>
+            <span className="text-foreground-muted text-xs">{directory}</span>
+          </div>
+        )}
+        {diffSourceLabel && <Badge variant="outline">{diffSourceLabel}</Badge>}
+      </div>
+      <div className="flex items-center gap-2">
+        <ToggleGroup
+          size="sm"
+          multiple={false}
+          value={[diffStyle]}
+          onValueChange={([value]) => {
+            if (value) {
+              diffView.setDiffStyle(value as 'unified' | 'split');
+            }
+          }}
+        >
+          <ToggleGroupItem value="unified">
+            <AlignJustify className="h-3.5 w-3.5" />
+          </ToggleGroupItem>
+          <ToggleGroupItem value="split">
+            <Columns2 className="h-3.5 w-3.5" />
+          </ToggleGroupItem>
+        </ToggleGroup>
+      </div>
+    </div>
+  );
+});
diff --git a/src/renderer/features/tasks/diff-view/main-panel/diff-view.tsx b/src/renderer/features/tasks/diff-view/main-panel/diff-view.tsx
new file mode 100644
index 0000000000..3494e476ca
--- /dev/null
+++ b/src/renderer/features/tasks/diff-view/main-panel/diff-view.tsx
@@ -0,0 +1,14 @@
+import { observer } from 'mobx-react-lite';
+import { DiffToolbar } from './diff-toolbar';
+import { FileDiffView } from './file-diff-view';
+
+export const DiffView = observer(function DiffView() {
+  return (
+    <div className="flex h-full flex-col">
+      <DiffToolbar />
+      <div className="min-h-0 flex-1">
+        <FileDiffView />
+      </div>
+    </div>
+  );
+});
diff --git a/src/renderer/features/tasks/diff-view/main-panel/file-diff-view.tsx b/src/renderer/features/tasks/diff-view/main-panel/file-diff-view.tsx
new file mode 100644
index 0000000000..2c032652a8
--- /dev/null
+++ b/src/renderer/features/tasks/diff-view/main-panel/file-diff-view.tsx
@@ -0,0 +1,172 @@
+import { observer } from 'mobx-react-lite';
+import type * as monaco from 'monaco-editor';
+import { useCallback, useEffect, useState } from 'react';
+import { HEAD_REF, STAGED_REF } from '@shared/git';
+import { useDiffEditorComments } from '@renderer/features/tasks/diff-view/comments/use-diff-editor-comments';
+import { useProvisionedTask, useTaskViewContext } from '@renderer/features/tasks/task-view-context';
+import { isBinaryForDiff } from '@renderer/lib/editor/fileKind';
+import { modelRegistry } from '@renderer/lib/monaco/monaco-model-registry';
+import { buildMonacoModelPath } from '@renderer/lib/monaco/monacoModelPath';
+import { StickyDiffEditor } from '@renderer/lib/monaco/sticky-diff-editor';
+import { EmptyState } from '@renderer/lib/ui/empty-state';
+import { getLanguageFromPath } from '@renderer/utils/languageUtils';
+
+export const FileDiffView = observer(function FileDiffView() {
+  const { projectId } = useTaskViewContext();
+  const provisioned = useProvisionedTask();
+  const { workspaceId } = provisioned;
+  const diffView = provisioned.taskView.diffView;
+  const draftComments = provisioned.draftComments;
+  const activeFile = diffView.activeFile;
+  const [editor, setEditor] = useState<monaco.editor.IStandaloneDiffEditor | null>(null);
+
+  const isBinary = activeFile ? isBinaryForDiff(activeFile.path) : false;
+  const showEditor = activeFile !== null && !isBinary;
+  const activeFilePath = activeFile?.path ?? '';
+
+  const comments = activeFilePath ? draftComments.getCommentsForFile(activeFilePath) : [];
+
+  const handleAddComment = useCallback(
+    (lineNumber: number, content: string, lineContent?: string) => {
+      if (!activeFilePath) return;
+      draftComments.addComment({
+        filePath: activeFilePath,
+        lineNumber,
+        lineContent: lineContent ?? null,
+        content,
+      });
+    },
+    [activeFilePath, draftComments]
+  );
+
+  const handleEditComment = useCallback(
+    (id: string, content: string) => {
+      draftComments.updateComment(id, content);
+    },
+    [draftComments]
+  );
+
+  const handleDeleteComment = useCallback(
+    (id: string) => {
+      draftComments.deleteComment(id);
+    },
+    [draftComments]
+  );
+
+  useDiffEditorComments({
+    editor: showEditor ? editor : null,
+    comments,
+    onAddComment: handleAddComment,
+    onEditComment: handleEditComment,
+    onDeleteComment: handleDeleteComment,
+  });
+
+  // Compute URIs from activeFile (same rules as DiffSlotStore).
+  const root = `workspace:${workspaceId}`;
+  const uri = activeFile ? buildMonacoModelPath(root, activeFile.path) : '';
+  const language = activeFile ? getLanguageFromPath(activeFile.path) : '';
+
+  const originalUri = (() => {
+    if (!activeFile || !uri) return '';
+    if (activeFile.group === 'git' || activeFile.group === 'pr') {
+      return modelRegistry.toGitUri(uri, activeFile.originalRef);
+    }
+    return modelRegistry.toGitUri(uri, HEAD_REF);
+  })();
+
+  const modifiedUri = (() => {
+    if (!activeFile || !uri) return '';
+    if (activeFile.group === 'staged') return modelRegistry.toGitUri(uri, STAGED_REF);
+    if (activeFile.group === 'pr') {
+      return modelRegistry.toGitUri(uri, activeFile.modifiedRef ?? HEAD_REF);
+    }
+    if (activeFile.group === 'git') {
+      return modelRegistry.toGitUri(uri, HEAD_REF);
+    }
+    return modelRegistry.toDiskUri(uri);
+  })();
+
+  // Register/unregister models whenever the active file changes.
+  useEffect(() => {
+    if (!activeFile || isBinary) return;
+
+    if (activeFile.group === 'disk') {
+      void modelRegistry
+        .registerModel(projectId, workspaceId, root, activeFile.path, language, 'disk')
+        .catch(() => {});
+      void modelRegistry
+        .registerModel(
+          projectId,
+          workspaceId,
+          root,
+          activeFile.path,
+          language,
+          'git',
+          activeFile.originalRef
+        )
+        .catch(() => {});
+    } else if (activeFile.group === 'staged') {
+      void modelRegistry
+        .registerModel(projectId, workspaceId, root, activeFile.path, language, 'git', HEAD_REF)
+        .catch(() => {});
+      void modelRegistry
+        .registerModel(projectId, workspaceId, root, activeFile.path, language, 'git', STAGED_REF)
+        .catch(() => {});
+    } else {
+      void modelRegistry
+        .registerModel(
+          projectId,
+          workspaceId,
+          root,
+          activeFile.path,
+          language,
+          'git',
+          activeFile.originalRef
+        )
+        .catch(() => {});
+      const effectiveModifiedRef =
+        activeFile.group === 'pr' ? (activeFile.modifiedRef ?? HEAD_REF) : HEAD_REF;
+      void modelRegistry
+        .registerModel(
+          projectId,
+          workspaceId,
+          root,
+          activeFile.path,
+          language,
+          'git',
+          effectiveModifiedRef
+        )
+        .catch(() => {});
+    }
+    return () => {
+      modelRegistry.unregisterModel(originalUri);
+      modelRegistry.unregisterModel(modifiedUri);
+    };
+  }, [isBinary, originalUri, modifiedUri, language, activeFile, projectId, workspaceId, root]);
+
+  return (
+    <div className="file-diff-view flex h-full flex-col">
+      <div className="relative min-h-0 flex-1">
+        {showEditor && (
+          <StickyDiffEditor
+            originalUri={originalUri}
+            modifiedUri={modifiedUri}
+            diffStyle={diffView.diffStyle}
+            onEditorChange={setEditor}
+          />
+        )}
+        {!activeFile && (
+          <EmptyState
+            label="Select a file to view changes"
+            description="Select a file to view changes"
+          />
+        )}
+        {isBinary && (
+          <div className="flex h-full items-center justify-center text-sm text-muted-foreground">
+            Binary file — no diff available
+          </div>
+        )}
+      </div>
+    </div>
+  );
+});
diff --git a/src/renderer/features/tasks/diff-view/main-panel/stacked-diff-view.tsx b/src/renderer/features/tasks/diff-view/main-panel/stacked-diff-view.tsx
new file mode 100644
index 0000000000..4d0a61d32a
--- /dev/null
+++ b/src/renderer/features/tasks/diff-view/main-panel/stacked-diff-view.tsx
@@ -0,0 +1,284 @@
+import { ChevronDown, ChevronRight } from 'lucide-react';
+import { reaction } from 'mobx';
+import { observer } from 'mobx-react-lite';
+import { Activity, useEffect, useMemo, useRef, useState } from 'react';
+import { HEAD_REF, STAGED_REF } from '@shared/git';
+import {
+  DiffSlotStore,
+  StackedDiffPanelStore,
+} from '@renderer/features/tasks/diff-view/stores/stacked-diff-panel-store';
+import { useProvisionedTask, useTaskViewContext } from '@renderer/features/tasks/task-view-context';
+import { FileIcon } from '@renderer/lib/editor/file-icon';
+import { modelRegistry } from '@renderer/lib/monaco/monaco-model-registry';
+import { StickyDiffEditor } from '@renderer/lib/monaco/sticky-diff-editor';
+import { EmptyState } from '@renderer/lib/ui/empty-state';
+import { cn } from '@renderer/utils/utils';
+
+const LARGE_DIFF_LINE_THRESHOLD = 1500;
+
+export const StackedDiffView = observer(function StackedDiffView() {
+  const { projectId } = useTaskViewContext();
+  const provisioned = useProvisionedTask();
+  const { workspaceId } = provisioned;
+  const diffView = provisioned.taskView.diffView;
+  const git = provisioned.workspace.git;
+  const pr = provisioned.workspace.pr;
+
+  const panelStore = useMemo(
+    () => new StackedDiffPanelStore(projectId, workspaceId, diffView, git, pr),
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    []
+  );
+
+  useEffect(() => {
+    return () => panelStore.dispose();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
+  return <StackedDiffPanel panelStore={panelStore} />;
+});
+
+interface StackedDiffPanelProps {
+  panelStore: StackedDiffPanelStore;
+}
+
+const StackedDiffPanel = observer(function StackedDiffPanel({ panelStore }: StackedDiffPanelProps) {
+  const provisioned = useProvisionedTask();
+  const diffView = provisioned.taskView.diffView;
+  const { visibleSlots } = panelStore;
+  const scrollRef = useRef<HTMLDivElement>(null);
+  const isProgrammaticScroll = useRef(false);
+  const scrollEndTimer = useRef<ReturnType<typeof setTimeout> | null>(null);
+
+  // Scroll to the active file whenever its path changes (e.g. sidebar click).
+  // isProgrammaticScroll suppresses the onScroll debounce while the jump is in flight.
+  useEffect(
+    () =>
+      reaction(
+        () => diffView.activeFile?.path,
+        (path) => {
+          if (!path || !scrollRef.current) return;
+          const el = scrollRef.current.querySelector<HTMLElement>(
+            `[data-file-path="${CSS.escape(path)}"]`
+          );
+          if (!el) return;
+          // Skip scroll if already visible — prevents the post-debounce jump where
+          // setActiveFile triggers the reaction even though the file is on screen.
+          const containerRect = scrollRef.current.getBoundingClientRect();
+          const elRect = el.getBoundingClientRect();
+          const alreadyVisible =
+            elRect.bottom > containerRect.top && elRect.top < containerRect.bottom;
+          if (alreadyVisible) return;
+          isProgrammaticScroll.current = true;
+          el.scrollIntoView({ block: 'nearest' });
+          requestAnimationFrame(() => {
+            isProgrammaticScroll.current = false;
+          });
+        }
+      ),
+    [diffView]
+  );
+
+  // Cleanup debounce timer on unmount.
+  useEffect(
+    () => () => {
+      if (scrollEndTimer.current) clearTimeout(scrollEndTimer.current);
+    },
+    []
+  );
+
+  function handleScroll() {
+    if (isProgrammaticScroll.current) return;
+    if (scrollEndTimer.current) clearTimeout(scrollEndTimer.current);
+    scrollEndTimer.current = setTimeout(() => {
+      const container = scrollRef.current;
+      if (!container) return;
+      const containerTop = container.getBoundingClientRect().top;
+      const el = [...container.querySelectorAll<HTMLElement>('[data-file-path]')].find(
+        (node) => node.getBoundingClientRect().bottom > containerTop
+      );
+      const path = el?.dataset.filePath;
+      if (!path) return;
+      const slot = panelStore.visibleSlots.find((s) => s.file?.path === path);
+      if (!slot?.file) return;
+      diffView.setActiveFile({
+        path: slot.file.path,
+        type: slot.diffType === 'disk' ? 'disk' : 'git',
+        group: slot.diffType,
+        originalRef: slot.originalRef,
+        modifiedRef: slot.diffType === 'pr' ? slot.modifiedRef : undefined,
+      });
+    }, 150);
+  }
+
+  if (visibleSlots.length === 0) {
+    return (
+      <EmptyState label="No changes" description="Select or make changes to files to see diffs." />
+    );
+  }
+
+  return (
+    <div ref={scrollRef} className="h-full overflow-y-auto p-2 shadow-xs" onScroll={handleScroll}>
+      {visibleSlots.map((slotStore, i) => (
+        // key=index is intentional: slots are stable by position; content swaps in-place.
+        <StackedFileSlot
+          key={i}
+          slotStore={slotStore}
+          panelStore={panelStore}
+          diffView={diffView}
+        />
+      ))}
+    </div>
+  );
+});
+
+interface StackedFileSlotProps {
+  slotStore: DiffSlotStore;
+  panelStore: StackedDiffPanelStore;
+  diffView: ReturnType<typeof useProvisionedTask>['taskView']['diffView'];
+}
+
+const MIN_EDITOR_HEIGHT = 100;
+
+const StackedFileSlot = observer(function StackedFileSlot({
+  slotStore,
+  panelStore,
+  diffView,
+}: StackedFileSlotProps) {
+  const [contentHeight, setContentHeight] = useState<number | null>(null);
+  const sectionRef = useRef<HTMLDivElement>(null);
+
+  const { file, originalUri, modifiedUri, language, isBinary, diffType, originalRef, modifiedRef } =
+    slotStore;
+
+  // Register/unregister models whenever URIs change (group switch, file change at slot).
+  // Runs even when file is null; isBinary guard inside skips registration cleanly.
+  useEffect(() => {
+    if (!file || isBinary) return;
+    const { projectId, workspaceId } = slotStore;
+    const root = `workspace:${workspaceId}`;
+
+    if (diffType === 'staged') {
+      void modelRegistry
+        .registerModel(projectId, workspaceId, root, file.path, language, 'git', HEAD_REF)
+        .catch(() => {});
+      void modelRegistry
+        .registerModel(projectId, workspaceId, root, file.path, language, 'git', STAGED_REF)
+        .catch(() => {});
+    } else if (diffType === 'git' || diffType === 'pr') {
+      const effectiveModifiedRef = diffType === 'pr' ? modifiedRef : HEAD_REF;
+      void modelRegistry
+        .registerModel(projectId, workspaceId, root, file.path, language, 'git', originalRef)
+        .catch(() => {});
+      void modelRegistry
+        .registerModel(
+          projectId,
+          workspaceId,
+          root,
+          file.path,
+          language,
+          'git',
+          effectiveModifiedRef
+        )
+        .catch(() => {});
+    } else {
+      void modelRegistry
+        .registerModel(projectId, workspaceId, root, file.path, language, 'disk')
+        .catch(() => {});
+      void modelRegistry
+        .registerModel(projectId, workspaceId, root, file.path, language, 'git', originalRef)
+        .catch(() => {});
+    }
+    return () => {
+      modelRegistry.unregisterModel(originalUri);
+      modelRegistry.unregisterModel(modifiedUri);
+    };
+  }, [
+    isBinary,
+    originalUri,
+    modifiedUri,
+    language,
+    diffType,
+    originalRef,
+    modifiedRef,
+    file,
+    slotStore,
+  ]);
+
+  if (!file) return null;
+
+  const expanded = panelStore.isExpanded(file.path);
+  const forceLoad = panelStore.isForceLoaded(file.path);
+  const totalDiffLines = file.additions + file.deletions;
+  const isLarge = totalDiffLines > LARGE_DIFF_LINE_THRESHOLD;
+  const diffStyle = diffView.diffStyle;
+
+  const editorHeight =
+    contentHeight != null ? Math.max(contentHeight, MIN_EDITOR_HEIGHT) : MIN_EDITOR_HEIGHT;
+
+  const parts = file.path.split('/');
+  const fileName = parts.pop() || file.path;
+  const dirPath = parts.length > 0 ? parts.join('/') + '/' : '';
+
+  return (
+    <div
+      ref={sectionRef}
+      data-file-path={file.path}
+      className="border-border mb-2 overflow-hidden rounded-lg border"
+    >
+      <div
+        className={cn(
+          'flex w-full items-center gap-1.5 px-3 py-2 text-sm hover:bg-background-1',
+          expanded && 'border-b border-border'
+        )}
+      >
+        <button
+          className="flex min-w-0 flex-1 items-center gap-1.5 text-left text-foreground-muted"
+          onClick={() => panelStore.toggleExpanded(file.path)}
+        >
+          {expanded ? (
+            <ChevronDown className="h-3.5 w-3.5 shrink-0" />
+          ) : (
+            <ChevronRight className="h-3.5 w-3.5 shrink-0" />
+          )}
+          <span className="flex items-center gap-1.5">
+            <FileIcon filename={fileName} size={12} />
+            <span className="text-foreground">{fileName}</span>
+          </span>
+          {dirPath && <span className="truncate text-xs text-foreground-muted">{dirPath}</span>}
+        </button>
+        <span className="shrink-0 text-xs">
+          <span className="text-green-500">+{file.additions}</span>{' '}
+          <span className="text-red-500">-{file.deletions}</span>
+        </span>
+      </div>
+
+      <Activity mode={expanded ? 'visible' : 'hidden'}>
+        <div style={{ height: isBinary || (isLarge && !forceLoad) ? 80 : editorHeight }}>
+          {isBinary ? (
+            <div className="flex h-full items-center justify-center text-sm text-foreground-passive">
+              Binary file
+            </div>
+          ) : isLarge && !forceLoad ? (
+            <div className="flex h-full flex-col items-center justify-center gap-2 text-sm text-foreground-passive">
+              <span>Large diff ({totalDiffLines} lines). Loading may be slow.</span>
+              <button
+                className="rounded-md border border-border px-3 py-1 text-xs font-medium hover:bg-background-1"
+                onClick={() => panelStore.setForceLoad(file.path)}
+              >
+                Load anyway
+              </button>
+            </div>
+          ) : (
+            <StickyDiffEditor
+              originalUri={originalUri}
+              modifiedUri={modifiedUri}
+              diffStyle={diffStyle}
+              onHeightChange={setContentHeight}
+            />
+          )}
+        </div>
+      </Activity>
+    </div>
+  );
+});
diff --git a/src/renderer/features/tasks/diff-view/state/use-check-runs.ts b/src/renderer/features/tasks/diff-view/state/use-check-runs.ts
new file mode 100644
index 0000000000..78e489520c
--- /dev/null
+++ b/src/renderer/features/tasks/diff-view/state/use-check-runs.ts
@@ -0,0 +1,20 @@
+import { useEffect, useMemo } from 'react';
+import type { PullRequest } from '@shared/pull-requests';
+import { rpc } from '@renderer/lib/ipc';
+import { computeCheckRunsSummary, type CheckRun } from '@renderer/utils/github';
+
+export function useCheckRuns(pr: PullRequest) {
+  const checks = useMemo(() => pr.checks as CheckRun[], [pr.checks]);
+  const summary = useMemo(() => computeCheckRunsSummary(checks), [checks]);
+
+  useEffect(() => {
+    void rpc.pullRequests.syncChecks(pr.url, pr.headRefOid);
+  }, [pr.url, pr.headRefOid]);
+
+  return {
+    checks,
+    summary,
+    allComplete: summary.pending === 0,
+    hasFailures: summary.failed > 0,
+  };
+}
diff --git a/src/renderer/features/tasks/diff-view/stores/changes-view-store.ts b/src/renderer/features/tasks/diff-view/stores/changes-view-store.ts
new file mode 100644
index 0000000000..a4b258086b
--- /dev/null
+++ b/src/renderer/features/tasks/diff-view/stores/changes-view-store.ts
@@ -0,0 +1,221 @@
+import { computed, makeObservable, observable, reaction, runInAction, when } from 'mobx';
+import { PrStore } from '@renderer/features/tasks/stores/pr-store';
+import { GitStore } from './git-store';
+
+export type SelectionState = 'all' | 'none' | 'partial';
+
+export interface ExpandedSections {
+  unstaged: boolean;
+  staged: boolean;
+  pullRequests: boolean;
+}
+
+export class ChangesViewStore {
+  unstagedSelection = observable.set<string>();
+  stagedSelection = observable.set<string>();
+  expandedSections: ExpandedSections = { unstaged: true, staged: true, pullRequests: true };
+
+  private _disposeReactions: Array<() => void> = [];
+  private _suppressAutoExpand = new Set<keyof ExpandedSections>();
+
+  constructor(
+    private readonly git: GitStore,
+    private readonly pr: PrStore
+  ) {
+    makeObservable(this, {
+      expandedSections: observable,
+      unstagedSelectionState: computed,
+      stagedSelectionState: computed,
+    });
+
+    // Prune stale paths from selections whenever the file lists change.
+    this._disposeReactions.push(
+      reaction(
+        () => ({
+          unstaged: this.git.unstagedFileChanges.map((c) => c.path),
+          staged: this.git.stagedFileChanges.map((c) => c.path),
+        }),
+        ({ unstaged, staged }) => {
+          const unstagedSet = new Set(unstaged);
+          const stagedSet = new Set(staged);
+          runInAction(() => {
+            for (const p of this.unstagedSelection) {
+              if (!unstagedSet.has(p)) this.unstagedSelection.delete(p);
+            }
+            for (const p of this.stagedSelection) {
+              if (!stagedSet.has(p)) this.stagedSelection.delete(p);
+            }
+          });
+        }
+      )
+    );
+
+    // Set sensible initial expanded state once the first git load completes.
+    this._disposeReactions.push(
+      when(
+        () => !this.git.isLoading && !this.git.error,
+        () => {
+          const hasUnstaged = this.git.unstagedFileChanges.length > 0;
+          const hasStaged = this.git.stagedFileChanges.length > 0;
+          const hasPullRequests = this.pr.pullRequests.length > 0;
+
+          runInAction(() => {
+            this.expandedSections = {
+              unstaged: hasUnstaged || (!hasStaged && !hasUnstaged && !hasPullRequests),
+              staged: hasStaged,
+              pullRequests: hasPullRequests,
+            };
+          });
+        }
+      )
+    );
+
+    // Auto-collapse when a section empties; auto-expand when it gains entries from zero.
+    this._disposeReactions.push(
+      reaction(
+        () => ({
+          unstaged: this.git.unstagedFileChanges.length,
+          staged: this.git.stagedFileChanges.length,
+          pullRequests: this.pr.pullRequests.length,
+        }),
+        (curr, prev) => {
+          runInAction(() => {
+            const next = { ...this.expandedSections };
+            let changed = false;
+
+            if (curr.unstaged === 0 && prev.unstaged > 0) {
+              next.unstaged = false;
+              changed = true;
+            } else if (curr.unstaged > 0 && prev.unstaged === 0) {
+              if (this._suppressAutoExpand.has('unstaged')) {
+                this._suppressAutoExpand.delete('unstaged');
+              } else {
+                next.unstaged = true;
+                changed = true;
+              }
+            }
+
+            if (curr.staged === 0 && prev.staged > 0) {
+              next.staged = false;
+              changed = true;
+            } else if (curr.staged > 0 && prev.staged === 0) {
+              if (this._suppressAutoExpand.has('staged')) {
+                this._suppressAutoExpand.delete('staged');
+              } else {
+                next.staged = true;
+                changed = true;
+              }
+            }
+
+            if (curr.pullRequests === 0 && prev.pullRequests > 0) {
+              next.pullRequests = false;
+              changed = true;
+            } else if (curr.pullRequests > 0 && prev.pullRequests === 0) {
+              if (this._suppressAutoExpand.has('pullRequests')) {
+                this._suppressAutoExpand.delete('pullRequests');
+              } else {
+                next.pullRequests = true;
+                changed = true;
+              }
+            }
+
+            if (changed) this.expandedSections = next;
+          });
+        }
+      )
+    );
+  }
+
+  get unstagedSelectionState(): SelectionState {
+    const total = this.git.unstagedFileChanges.length;
+    const selected = this.unstagedSelection.size;
+    if (total === 0 || selected === 0) return 'none';
+    if (selected === total) return 'all';
+    return 'partial';
+  }
+
+  get stagedSelectionState(): SelectionState {
+    const total = this.git.stagedFileChanges.length;
+    const selected = this.stagedSelection.size;
+    if (total === 0 || selected === 0) return 'none';
+    if (selected === total) return 'all';
+    return 'partial';
+  }
+
+  toggleUnstagedItem(path: string): void {
+    if (this.unstagedSelection.has(path)) {
+      this.unstagedSelection.delete(path);
+    } else {
+      this.unstagedSelection.add(path);
+    }
+  }
+
+  toggleAllUnstaged(): void {
+    if (this.unstagedSelectionState === 'all') {
+      this.unstagedSelection.clear();
+    } else {
+      for (const c of this.git.unstagedFileChanges) {
+        this.unstagedSelection.add(c.path);
+      }
+    }
+  }
+
+  clearUnstagedSelection(): void {
+    this.unstagedSelection.clear();
+  }
+
+  toggleStagedItem(path: string): void {
+    if (this.stagedSelection.has(path)) {
+      this.stagedSelection.delete(path);
+    } else {
+      this.stagedSelection.add(path);
+    }
+  }
+
+  toggleAllStaged(): void {
+    if (this.stagedSelectionState === 'all') {
+      this.stagedSelection.clear();
+    } else {
+      for (const c of this.git.stagedFileChanges) {
+        this.stagedSelection.add(c.path);
+      }
+    }
+  }
+
+  clearStagedSelection(): void {
+    this.stagedSelection.clear();
+  }
+
+  toggleExpanded(section: keyof ExpandedSections): void {
+    runInAction(() => {
+      this.expandedSections = {
+        ...this.expandedSections,
+        [section]: !this.expandedSections[section],
+      };
+    });
+  }
+
+  setExpanded(next: ExpandedSections | ((prev: ExpandedSections) => ExpandedSections)): void {
+    runInAction(() => {
+      this.expandedSections = typeof next === 'function' ? next(this.expandedSections) : next;
+    });
+  }
+
+  expandForActiveFileType(group: 'disk' | 'staged' | 'git' | 'pr'): void {
+    const section = group === 'disk' ? 'unstaged' : group === 'staged' ? 'staged' : 'pullRequests';
+    if (!this.expandedSections[section]) {
+      runInAction(() => {
+        this.expandedSections = { ...this.expandedSections, [section]: true };
+      });
+    }
+  }
+
+  suppressNextAutoExpand(section: keyof ExpandedSections): void {
+    this._suppressAutoExpand.add(section);
+  }
+
+  dispose(): void {
+    for (const dispose of this._disposeReactions) dispose();
+    this._disposeReactions = [];
+  }
+}
diff --git a/src/renderer/features/tasks/diff-view/stores/diff-selectors.ts b/src/renderer/features/tasks/diff-view/stores/diff-selectors.ts
new file mode 100644
index 0000000000..f57c2bd433
--- /dev/null
+++ b/src/renderer/features/tasks/diff-view/stores/diff-selectors.ts
@@ -0,0 +1,14 @@
+import type { ChangesViewStore, SelectionState } from './changes-view-store';
+import type { GitStore } from './git-store';
+
+export function selectUnstagedSelectionState(store: ChangesViewStore): SelectionState {
+  return store.unstagedSelectionState;
+}
+
+export function selectStagedSelectionState(store: ChangesViewStore): SelectionState {
+  return store.stagedSelectionState;
+}
+
+export function selectAheadCount(git: GitStore): number {
+  return git.aheadCount;
+}
diff --git a/src/renderer/features/tasks/diff-view/stores/diff-view-store.ts b/src/renderer/features/tasks/diff-view/stores/diff-view-store.ts
new file mode 100644
index 0000000000..5f292b1ee6
--- /dev/null
+++ b/src/renderer/features/tasks/diff-view/stores/diff-view-store.ts
@@ -0,0 +1,206 @@
+import { action, computed, makeObservable, observable, reaction } from 'mobx';
+import { commitRef, type GitObjectRef } from '@shared/git';
+import type { ActiveFile, DiffViewSnapshot } from '@shared/view-state';
+import { ChangesViewStore } from '@renderer/features/tasks/diff-view/stores/changes-view-store';
+import type { PrStore } from '@renderer/features/tasks/stores/pr-store';
+import { Snapshottable } from '@renderer/lib/stores/snapshottable';
+import { GitStore } from './git-store';
+
+export const MAX_STACKED_FILES = 8;
+
+const VALID_OBJECT_REF_KINDS = new Set(['branch', 'commit', 'tag']);
+
+function isValidGitObjectRef(raw: unknown): raw is GitObjectRef {
+  return (
+    raw !== null &&
+    typeof raw === 'object' &&
+    VALID_OBJECT_REF_KINDS.has((raw as Record<string, unknown>)['kind'] as string)
+  );
+}
+
+export class DiffViewStore implements Snapshottable<DiffViewSnapshot> {
+  activeFileOverride: ActiveFile | null = null;
+  diffStyle: 'unified' | 'split' = 'unified';
+  readonly viewMode = 'file' as const;
+  commitAction: 'commit' | 'commit-push' | null = null;
+  prTab: 'files' | 'commits' | 'checks' = 'files';
+
+  readonly changesView: ChangesViewStore;
+
+  /**
+   * Index of the override file within its source list at the time it was set.
+   * Used as a position hint when the file disappears so we can select a neighbor
+   * rather than always falling back to the first file. Not observable — always
+   * updated atomically with activeFileOverride inside setActiveFile.
+   */
+  private _activeFileOverrideIndex = -1;
+
+  private _disposeReactions: Array<() => void> = [];
+
+  constructor(
+    private readonly git: GitStore,
+    private readonly pr: PrStore
+  ) {
+    this.changesView = new ChangesViewStore(git, pr);
+
+    makeObservable(this, {
+      activeFileOverride: observable,
+      activeFile: computed,
+      effectivePrTab: computed,
+      diffStyle: observable,
+      commitAction: observable,
+      prTab: observable,
+      setActiveFile: action,
+      setDiffStyle: action,
+      setPrTab: action,
+    });
+
+    // Reset PR tab when the current PR changes (different PR URL).
+    this._disposeReactions.push(
+      reaction(
+        () => this.pr.currentPr?.url,
+        () => {
+          this.prTab = this.pr.currentPr?.status === 'open' ? 'files' : 'commits';
+        }
+      )
+    );
+
+    // Auto-expand the changes panel section that contains the newly selected file.
+    this._disposeReactions.push(
+      reaction(
+        () => this.activeFile,
+        (file) => {
+          if (!file || file.group === 'git' || file.group === 'pr') return;
+          this.changesView.expandForActiveFileType(file.group);
+        }
+      )
+    );
+  }
+
+  /**
+   * The effective active file. Derived from activeFileOverride by validating it
+   * against the current working-tree lists. Falls back to a neighbor or the
+   * default file when the override is stale. Always consistent with observable
+   * state — no reaction needed.
+   */
+  get activeFile(): ActiveFile | null {
+    const override = this.activeFileOverride;
+    if (!override) return this._defaultActiveFile;
+
+    // git/pr groups cannot be validated against working-tree lists — trust the override
+    if (override.group === 'git' || override.group === 'pr') return override;
+
+    const isStaged = override.group === 'staged';
+    const ownList = isStaged ? this.git.stagedFileChanges : this.git.unstagedFileChanges;
+    const otherList = isStaged ? this.git.unstagedFileChanges : this.git.stagedFileChanges;
+
+    // Override is still valid
+    if (ownList.some((f) => f.path === override.path)) return override;
+
+    // File moved to the other list (staged/unstaged while active)
+    if (otherList.some((f) => f.path === override.path)) {
+      return {
+        ...override,
+        type: isStaged ? 'disk' : 'git',
+        group: isStaged ? 'disk' : 'staged',
+        originalRef: commitRef('HEAD'),
+      };
+    }
+
+    // File completely gone — select position-based neighbor within the same group
+    const idx = Math.max(0, this._activeFileOverrideIndex);
+    const neighbor = ownList[Math.min(idx, ownList.length - 1)];
+    if (neighbor) return { ...override, path: neighbor.path };
+
+    // Same-group list is now empty — fall back to first file in the other group
+    if (otherList.length > 0) {
+      return {
+        ...override,
+        path: otherList[0]!.path,
+        type: isStaged ? 'disk' : 'git',
+        group: isStaged ? 'disk' : 'staged',
+        originalRef: commitRef('HEAD'),
+      };
+    }
+
+    return null;
+  }
+
+  get effectivePrTab(): 'files' | 'commits' | 'checks' {
+    if (this.pr.currentPr?.status !== 'open' && this.prTab === 'files') {
+      return 'commits';
+    }
+    return this.prTab;
+  }
+
+  get snapshot(): DiffViewSnapshot {
+    return {
+      diffStyle: this.diffStyle,
+      viewMode: 'file',
+      activeFile: this.activeFileOverride ?? undefined,
+      commitAction: this.commitAction,
+      prTab: this.prTab,
+    };
+  }
+
+  restoreSnapshot(snapshot: Partial<DiffViewSnapshot>): void {
+    if (snapshot.diffStyle) this.diffStyle = snapshot.diffStyle;
+    // viewMode is always 'file' — ignore any persisted value
+    if (snapshot.activeFile && isValidGitObjectRef(snapshot.activeFile.originalRef)) {
+      this.activeFileOverride = snapshot.activeFile;
+      // Index is unknown on restore; 0 means we pick the first file if the
+      // restored path is gone from the list.
+      this._activeFileOverrideIndex = 0;
+    }
+    // Snapshots with an unrecognised originalRef shape are discarded — the
+    // store falls back to _defaultActiveFile automatically.
+    if (snapshot.commitAction) this.commitAction = snapshot.commitAction;
+    if (snapshot.prTab) this.prTab = snapshot.prTab;
+  }
+
+  get effectiveCommitAction(): 'commit' | 'commit-push' {
+    if (this.commitAction !== null) return this.commitAction;
+    return this.git.isBranchPublished ? 'commit-push' : 'commit';
+  }
+
+  setCommitAction(action: 'commit' | 'commit-push' | null): void {
+    this.commitAction = action;
+  }
+
+  setActiveFile(file: ActiveFile | null): void {
+    this.activeFileOverride = file;
+    if (file?.group === 'disk' || file?.group === 'staged') {
+      const list =
+        file.group === 'staged' ? this.git.stagedFileChanges : this.git.unstagedFileChanges;
+      this._activeFileOverrideIndex = list.findIndex((f) => f.path === file.path);
+    } else {
+      this._activeFileOverrideIndex = -1;
+    }
+  }
+
+  setDiffStyle(style: 'unified' | 'split'): void {
+    this.diffStyle = style;
+  }
+
+  setPrTab(tab: 'files' | 'commits' | 'checks'): void {
+    this.prTab = tab;
+  }
+
+  dispose(): void {
+    for (const dispose of this._disposeReactions) dispose();
+    this._disposeReactions = [];
+    this.changesView.dispose();
+  }
+
+  private get _defaultActiveFile(): ActiveFile | null {
+    const first = this.git.unstagedFileChanges[0] ?? this.git.stagedFileChanges[0];
+    if (!first) return null;
+    const isUnstaged = !!this.git.unstagedFileChanges[0];
+    return {
+      path: first.path,
+      type: isUnstaged ? 'disk' : 'git',
+      group: isUnstaged ? 'disk' : 'staged',
+      originalRef: commitRef('HEAD'),
+    };
+  }
+}
diff --git a/src/renderer/features/tasks/diff-view/stores/draft-comments-store.ts b/src/renderer/features/tasks/diff-view/stores/draft-comments-store.ts
new file mode 100644
index 0000000000..68abfb77b9
--- /dev/null
+++ b/src/renderer/features/tasks/diff-view/stores/draft-comments-store.ts
@@ -0,0 +1,110 @@
+import { makeAutoObservable } from 'mobx';
+import { formatCommentsForAgent } from '@shared/lineComments';
+
+const MAX_COMMENTS_PER_TASK = 200;
+
+export type DraftComment = {
+  id: string;
+  taskId: string;
+  filePath: string;
+  lineNumber: number;
+  lineContent?: string | null;
+  content: string;
+  createdAt: string;
+  updatedAt: string;
+};
+
+type CreateDraftCommentInput = {
+  filePath: string;
+  lineNumber: number;
+  lineContent?: string | null;
+  content: string;
+};
+
+function byCreatedAtThenLine(a: DraftComment, b: DraftComment): number {
+  const byCreatedAt = a.createdAt.localeCompare(b.createdAt);
+  if (byCreatedAt !== 0) return byCreatedAt;
+  return a.lineNumber - b.lineNumber;
+}
+
+export class DraftCommentsStore {
+  readonly commentsById = new Map<string, DraftComment>();
+
+  constructor(readonly taskId: string) {
+    makeAutoObservable(this, { getCommentsForFile: false }, { autoBind: true });
+  }
+
+  get comments(): DraftComment[] {
+    return Array.from(this.commentsById.values()).sort(byCreatedAtThenLine);
+  }
+
+  get count(): number {
+    return this.commentsById.size;
+  }
+
+  get formattedForAgent(): string {
+    return formatCommentsForAgent(this.comments, { includeIntro: false });
+  }
+
+  getCommentsForFile(filePath: string): DraftComment[] {
+    return this.comments
+      .filter((comment) => comment.filePath === filePath)
+      .sort((a, b) => a.lineNumber - b.lineNumber || a.createdAt.localeCompare(b.createdAt));
+  }
+
+  addComment(input: CreateDraftCommentInput): string {
+    if (this.commentsById.size >= MAX_COMMENTS_PER_TASK) {
+      console.warn(
+        `DraftCommentsStore: reached ${MAX_COMMENTS_PER_TASK} comment limit for task ${this.taskId}`
+      );
+      return crypto.randomUUID();
+    }
+
+    const now = new Date().toISOString();
+    const id = crypto.randomUUID();
+
+    this.commentsById.set(id, {
+      id,
+      taskId: this.taskId,
+      filePath: input.filePath,
+      lineNumber: input.lineNumber,
+      lineContent: input.lineContent ?? null,
+      content: input.content,
+      createdAt: now,
+      updatedAt: now,
+    });
+
+    return id;
+  }
+
+  updateComment(id: string, content: string): boolean {
+    const existing = this.commentsById.get(id);
+    if (!existing) return false;
+
+    this.commentsById.set(id, {
+      ...existing,
+      content,
+      updatedAt: new Date().toISOString(),
+    });
+
+    return true;
+  }
+
+  deleteComment(id: string): boolean {
+    return this.commentsById.delete(id);
+  }
+
+  consumeAll(): string {
+    const formatted = this.formattedForAgent;
+    this.clear();
+    return formatted;
+  }
+
+  clear(): void {
+    this.commentsById.clear();
+  }
+
+  dispose(): void {
+    this.clear();
+  }
+}
diff --git a/src/renderer/features/tasks/diff-view/stores/git-store.ts b/src/renderer/features/tasks/diff-view/stores/git-store.ts
new file mode 100644
index 0000000000..7ac7841ab4
--- /dev/null
+++ b/src/renderer/features/tasks/diff-view/stores/git-store.ts
@@ -0,0 +1,396 @@
+import { computed, makeObservable } from 'mobx';
+import { toast } from 'sonner';
+import { fsWatchEventChannel } from '@shared/events/fsEvents';
+import { gitWorkspaceChangedChannel } from '@shared/events/gitEvents';
+import type { FullGitStatus, GitChange } from '@shared/git';
+import { err, ok } from '@shared/result';
+import type { RepositoryStore } from '@renderer/features/projects/stores/repository-store';
+import { events, rpc } from '@renderer/lib/ipc';
+import { Resource } from '@renderer/lib/stores/resource';
+
+const TOO_MANY_FILES_MSG = 'Too many files changed to display';
+
+export class GitStore {
+  readonly fullStatus: Resource<FullGitStatus>;
+
+  constructor(
+    private readonly projectId: string,
+    private readonly workspaceId: string,
+    private readonly repositoryStore: RepositoryStore
+  ) {
+    this.fullStatus = new Resource<FullGitStatus>(
+      () => this._fetchFullStatus(),
+      [
+        {
+          kind: 'event',
+          subscribe: (handler) =>
+            events.on(gitWorkspaceChangedChannel, (payload) => {
+              if (payload.workspaceId === this.workspaceId && payload.kind === 'head') {
+                handler();
+              }
+            }),
+          onEvent: 'reload',
+          debounceMs: 100,
+        },
+        {
+          kind: 'event',
+          subscribe: (handler) =>
+            events.on(gitWorkspaceChangedChannel, (payload) => {
+              if (payload.workspaceId === this.workspaceId && payload.kind === 'index') {
+                handler();
+              }
+            }),
+          onEvent: 'reload',
+          debounceMs: 300,
+        },
+        {
+          kind: 'event',
+          subscribe: (handler) => {
+            rpc.fs.watchSetPaths(projectId, workspaceId, [''], 'git-store-status').catch(() => {});
+            const unsub = events.on(fsWatchEventChannel, (payload) => {
+              if (payload.workspaceId !== workspaceId) return;
+              const relevant = payload.events.some((e) => {
+                if (e.path.startsWith('.git')) return false;
+                if (e.oldPath?.startsWith('.git')) return false;
+                return true;
+              });
+              if (relevant) handler();
+            });
+            return () => {
+              unsub();
+              rpc.fs.watchStop(projectId, workspaceId, 'git-store-status').catch(() => {});
+            };
+          },
+          onEvent: 'reload',
+          debounceMs: 500,
+        },
+      ]
+    );
+
+    makeObservable(this, {
+      fileChanges: computed,
+      stagedFileChanges: computed,
+      unstagedFileChanges: computed,
+      totalLinesAdded: computed,
+      totalLinesDeleted: computed,
+      hasData: computed,
+      isLoading: computed,
+      error: computed,
+      isBranchPublished: computed,
+      aheadCount: computed,
+      behindCount: computed,
+      branchName: computed,
+    });
+  }
+
+  /**
+   * One entry per path — combines staged + unstaged halves for paths in both (e.g. MM).
+   */
+  get fileChanges(): GitChange[] {
+    const m = new Map<string, { staged?: GitChange; unstaged?: GitChange }>();
+    for (const c of this.stagedFileChanges) {
+      m.set(c.path, { ...m.get(c.path), staged: c });
+    }
+    for (const c of this.unstagedFileChanges) {
+      m.set(c.path, { ...m.get(c.path), unstaged: c });
+    }
+    const out: GitChange[] = [];
+    for (const { staged, unstaged } of m.values()) {
+      if (staged && unstaged) {
+        out.push({
+          path: staged.path,
+          status: 'modified',
+          additions: staged.additions + unstaged.additions,
+          deletions: staged.deletions + unstaged.deletions,
+        });
+      } else if (staged) {
+        out.push(staged);
+      } else if (unstaged) {
+        out.push(unstaged);
+      }
+    }
+    return out;
+  }
+
+  get stagedFileChanges(): GitChange[] {
+    return this.fullStatus.data?.staged ?? [];
+  }
+
+  get unstagedFileChanges(): GitChange[] {
+    return this.fullStatus.data?.unstaged ?? [];
+  }
+
+  get totalLinesAdded(): number {
+    const full = this.fullStatus.data;
+    if (!full) return 0;
+    const u = full.unstaged.reduce((s, c) => s + c.additions, 0);
+    return full.totalAdded + u;
+  }
+
+  get totalLinesDeleted(): number {
+    const full = this.fullStatus.data;
+    if (!full) return 0;
+    const u = full.unstaged.reduce((s, c) => s + c.deletions, 0);
+    return full.totalDeleted + u;
+  }
+
+  /** True once the first successful load has completed. Remains true during subsequent reloads. */
+  get hasData(): boolean {
+    return this.fullStatus.data !== null;
+  }
+
+  get isLoading(): boolean {
+    return this.fullStatus.loading;
+  }
+
+  get error(): string | undefined {
+    return this.fullStatus.error;
+  }
+
+  get branchName(): string | null {
+    return this.fullStatus.data?.currentBranch ?? null;
+  }
+
+  /** True when this workspace's branch has a remote tracking ref. */
+  get isBranchPublished(): boolean {
+    const name = this.branchName;
+    return name ? this.repositoryStore.isBranchOnRemote(name) : false;
+  }
+
+  /** Commits this workspace's branch is ahead of its upstream. */
+  get aheadCount(): number {
+    const name = this.branchName;
+    return name ? (this.repositoryStore.getBranchDivergence(name)?.ahead ?? 0) : 0;
+  }
+
+  /** Commits this workspace's branch is behind its upstream. */
+  get behindCount(): number {
+    const name = this.branchName;
+    return name ? (this.repositoryStore.getBranchDivergence(name)?.behind ?? 0) : 0;
+  }
+
+  // ---------------------------------------------------------------------------
+  // Lifecycle
+  // ---------------------------------------------------------------------------
+
+  /**
+   * Start watching — triggers initial load and activates event strategies.
+   * Called from WorkspaceStore.activate().
+   */
+  startWatching(): void {
+    this.fullStatus.start();
+  }
+
+  dispose(): void {
+    this.fullStatus.dispose();
+  }
+
+  // ---------------------------------------------------------------------------
+  // Mutation methods — optimistic update then authoritative reload
+  // ---------------------------------------------------------------------------
+
+  /**
+   * Apply an optimistic transformation to fullStatus immediately, returning the
+   * previous value so callers can roll back on error.
+   */
+  private _applyOptimistic(fn: (prev: FullGitStatus) => FullGitStatus): FullGitStatus | null {
+    const prev = this.fullStatus.data;
+    if (prev) this.fullStatus.setValue(fn(prev));
+    return prev;
+  }
+
+  async stageFiles(paths: string[]): Promise<void> {
+    const pathSet = new Set(paths);
+    const previous = this._applyOptimistic((prev) => {
+      const moving = prev.unstaged.filter((c) => pathSet.has(c.path));
+      return {
+        ...prev,
+        staged: [...prev.staged, ...moving.map((c) => ({ ...c, isStaged: true }))],
+        unstaged: prev.unstaged.filter((c) => !pathSet.has(c.path)),
+        totalAdded: prev.totalAdded + moving.reduce((s, c) => s + c.additions, 0),
+        totalDeleted: prev.totalDeleted + moving.reduce((s, c) => s + c.deletions, 0),
+      };
+    });
+    try {
+      await rpc.git.stageFiles(this.projectId, this.workspaceId, paths);
+      this.fullStatus.invalidate();
+    } catch (e) {
+      if (previous) this.fullStatus.setValue(previous);
+      throw e;
+    }
+  }
+
+  async stageAllFiles(): Promise<void> {
+    const previous = this._applyOptimistic((prev) => {
+      const allStaged = [...prev.staged, ...prev.unstaged.map((c) => ({ ...c, isStaged: true }))];
+      return {
+        ...prev,
+        staged: allStaged,
+        unstaged: [],
+        totalAdded: allStaged.reduce((s, c) => s + c.additions, 0),
+        totalDeleted: allStaged.reduce((s, c) => s + c.deletions, 0),
+      };
+    });
+    try {
+      await rpc.git.stageAllFiles(this.projectId, this.workspaceId);
+      this.fullStatus.invalidate();
+    } catch (e) {
+      if (previous) this.fullStatus.setValue(previous);
+      throw e;
+    }
+  }
+
+  async unstageFiles(paths: string[]): Promise<void> {
+    const pathSet = new Set(paths);
+    const previous = this._applyOptimistic((prev) => {
+      const moving = prev.staged.filter((c) => pathSet.has(c.path));
+      return {
+        ...prev,
+        staged: prev.staged.filter((c) => !pathSet.has(c.path)),
+        unstaged: [...prev.unstaged, ...moving.map((c) => ({ ...c, isStaged: false }))],
+        totalAdded: prev.totalAdded - moving.reduce((s, c) => s + c.additions, 0),
+        totalDeleted: prev.totalDeleted - moving.reduce((s, c) => s + c.deletions, 0),
+      };
+    });
+    try {
+      await rpc.git.unstageFiles(this.projectId, this.workspaceId, paths);
+      this.fullStatus.invalidate();
+    } catch (e) {
+      if (previous) this.fullStatus.setValue(previous);
+      throw e;
+    }
+  }
+
+  async unstageAllFiles(): Promise<void> {
+    const previous = this._applyOptimistic((prev) => ({
+      ...prev,
+      staged: [],
+      unstaged: [...prev.unstaged, ...prev.staged.map((c) => ({ ...c, isStaged: false }))],
+      totalAdded: 0,
+      totalDeleted: 0,
+    }));
+    try {
+      await rpc.git.unstageAllFiles(this.projectId, this.workspaceId);
+      this.fullStatus.invalidate();
+    } catch (e) {
+      if (previous) this.fullStatus.setValue(previous);
+      throw e;
+    }
+  }
+
+  async discardFiles(paths: string[]): Promise<void> {
+    const pathSet = new Set(paths);
+    const previous = this._applyOptimistic((prev) => ({
+      ...prev,
+      unstaged: prev.unstaged.filter((c) => !pathSet.has(c.path)),
+    }));
+    try {
+      await rpc.git.revertFiles(this.projectId, this.workspaceId, paths);
+      this.fullStatus.invalidate();
+    } catch (e) {
+      if (previous) this.fullStatus.setValue(previous);
+      throw e;
+    }
+  }
+
+  async discardAllFiles(): Promise<void> {
+    const previous = this._applyOptimistic((prev) => ({ ...prev, unstaged: [] }));
+    try {
+      await rpc.git.revertAllFiles(this.projectId, this.workspaceId);
+      this.fullStatus.invalidate();
+    } catch (e) {
+      if (previous) this.fullStatus.setValue(previous);
+      throw e;
+    }
+  }
+
+  async commit(message: string) {
+    const result = await rpc.git.commit(this.projectId, this.workspaceId, message);
+    if (result.success) {
+      // Clear staged list immediately so the UI doesn't flash stale state
+      // while the authoritative reload is in flight.
+      this._applyOptimistic((prev) => ({
+        ...prev,
+        staged: [],
+        totalAdded: 0,
+        totalDeleted: 0,
+      }));
+      this.fullStatus.invalidate();
+      this.repositoryStore.refreshLocal(); // new commit → local branch ahead count changes
+      return ok();
+    } else {
+      toast.error(`Failed to commit changes: ${result.error.type} `);
+      return err(result.error);
+    }
+  }
+
+  async fetchRemote() {
+    const result = await rpc.repository.fetch(this.projectId);
+    if (result.success) {
+      this.repositoryStore.refreshRemote(); // fetch updates remote-tracking refs
+      return ok();
+    } else {
+      toast.error(`Failed to fetch remote changes: ${result.error.type} `);
+      return err(result.error);
+    }
+  }
+
+  async push() {
+    const remote = this.repositoryStore.configuredRemote.name;
+    const result = await rpc.git.push(this.projectId, this.workspaceId, remote);
+    if (result.success) {
+      this.repositoryStore.refreshLocal(); // divergence resets to 0
+      this.repositoryStore.refreshRemote(); // remote now has the commits
+      return ok();
+    } else {
+      const detail =
+        'message' in result.error ? (result.error.message ?? result.error.type) : result.error.type;
+      toast.error(`Failed to push: ${detail}`);
+      return err(result.error);
+    }
+  }
+
+  async publishBranch() {
+    const branchName = this.branchName;
+    if (!branchName) return err({ type: 'git_error' as const, message: 'No branch checked out' });
+    const remote = this.repositoryStore.configuredRemote.name;
+    const result = await rpc.git.publishBranch(
+      this.projectId,
+      this.workspaceId,
+      branchName,
+      remote
+    );
+    if (result.success) {
+      this.repositoryStore.refreshRemote(); // branch now exists on remote
+      return ok();
+    } else {
+      const detail =
+        'message' in result.error ? (result.error.message ?? result.error.type) : result.error.type;
+      toast.error(`Failed to publish branch: ${detail}`);
+      return err(result.error);
+    }
+  }
+
+  async pull() {
+    const result = await rpc.git.pull(this.projectId, this.workspaceId);
+    if (result.success) {
+      this.fullStatus.invalidate();
+      this.repositoryStore.refreshLocal(); // local branch updated with pulled commits
+      return ok();
+    } else {
+      toast.error(`Failed to pull changes: ${result.error.type} `);
+      return err(result.error);
+    }
+  }
+
+  private async _fetchFullStatus(): Promise<FullGitStatus> {
+    const result = await rpc.git.getFullStatus(this.projectId, this.workspaceId);
+    if (!result.success) {
+      if (result.error.type === 'too_many_files') {
+        throw new Error(TOO_MANY_FILES_MSG);
+      }
+      throw new Error(result.error.type);
+    }
+    return result.data;
+  }
+}
diff --git a/src/renderer/features/tasks/diff-view/stores/stacked-diff-panel-store.ts b/src/renderer/features/tasks/diff-view/stores/stacked-diff-panel-store.ts
new file mode 100644
index 0000000000..fc3f21818b
--- /dev/null
+++ b/src/renderer/features/tasks/diff-view/stores/stacked-diff-panel-store.ts
@@ -0,0 +1,192 @@
+import { action, computed, makeObservable, observable, reaction } from 'mobx';
+import { commitRef, HEAD_REF, STAGED_REF, type GitChange, type GitObjectRef } from '@shared/git';
+import { getPrNumber } from '@shared/pull-requests';
+import type { PrStore } from '@renderer/features/tasks/stores/pr-store';
+import { isBinaryForDiff } from '@renderer/lib/editor/fileKind';
+import { modelRegistry } from '@renderer/lib/monaco/monaco-model-registry';
+import { buildMonacoModelPath } from '@renderer/lib/monaco/monacoModelPath';
+import { getLanguageFromPath } from '@renderer/utils/languageUtils';
+import { MAX_STACKED_FILES, type DiffViewStore } from './diff-view-store';
+import type { GitStore } from './git-store';
+
+type DiffType = 'disk' | 'staged' | 'git' | 'pr';
+
+interface SlotContext {
+  files: GitChange[];
+  diffType: DiffType;
+  originalRef: GitObjectRef;
+  modifiedRef?: GitObjectRef;
+}
+
+export class DiffSlotStore {
+  file: GitChange | null = null;
+  diffType: DiffType = 'disk';
+  originalRef: GitObjectRef = commitRef('HEAD');
+  modifiedRef: GitObjectRef | undefined = undefined;
+
+  constructor(
+    readonly projectId: string,
+    readonly workspaceId: string
+  ) {
+    makeObservable(this, {
+      file: observable.ref,
+      diffType: observable,
+      originalRef: observable.ref,
+      modifiedRef: observable.ref,
+      uri: computed,
+      originalUri: computed,
+      modifiedUri: computed,
+      language: computed,
+      isBinary: computed,
+    });
+  }
+
+  get uri(): string {
+    if (!this.file) return '';
+    return buildMonacoModelPath(`workspace:${this.workspaceId}`, this.file.path);
+  }
+
+  get originalUri(): string {
+    if (!this.uri) return '';
+    if (this.diffType === 'git' || this.diffType === 'pr') {
+      return modelRegistry.toGitUri(this.uri, this.originalRef);
+    }
+    return modelRegistry.toGitUri(this.uri, HEAD_REF);
+  }
+
+  get modifiedUri(): string {
+    if (!this.uri) return '';
+    if (this.diffType === 'staged') return modelRegistry.toGitUri(this.uri, STAGED_REF);
+    if (this.diffType === 'pr')
+      return modelRegistry.toGitUri(this.uri, this.modifiedRef ?? HEAD_REF);
+    if (this.diffType === 'git') return modelRegistry.toGitUri(this.uri, HEAD_REF);
+    return modelRegistry.toDiskUri(this.uri);
+  }
+
+  get language(): string {
+    return this.file ? getLanguageFromPath(this.file.path) : '';
+  }
+
+  get isBinary(): boolean {
+    return this.file ? isBinaryForDiff(this.file.path) : false;
+  }
+}
+
+export class StackedDiffPanelStore {
+  private readonly _slots: DiffSlotStore[];
+
+  // _count is private so we include it via the AdditionalKeys type parameter.
+  private _count = 0;
+
+  /** Path-keyed expanded state — survives group switches for the same file path. */
+  private readonly _expanded = observable.map<string, boolean>();
+  /** Path-keyed force-load set for large diffs. */
+  private readonly _forceLoad = observable.set<string>();
+
+  private readonly _disposers: Array<() => void> = [];
+
+  constructor(
+    projectId: string,
+    workspaceId: string,
+    private readonly diffView: DiffViewStore,
+    private readonly git: GitStore,
+    private readonly pr: PrStore
+  ) {
+    this._slots = Array.from(
+      { length: MAX_STACKED_FILES },
+      () => new DiffSlotStore(projectId, workspaceId)
+    );
+
+    makeObservable<StackedDiffPanelStore, '_count'>(this, {
+      _count: observable,
+      visibleSlots: computed,
+      toggleExpanded: action,
+      setForceLoad: action,
+    });
+
+    this._disposers.push(
+      reaction(
+        () => this._currentContext(),
+        (ctx) => this._applyContext(ctx),
+        { fireImmediately: true }
+      )
+    );
+  }
+
+  get visibleSlots(): DiffSlotStore[] {
+    return this._slots.slice(0, this._count);
+  }
+
+  isExpanded(path: string): boolean {
+    return this._expanded.get(path) ?? true;
+  }
+
+  toggleExpanded(path: string): void {
+    this._expanded.set(path, !this.isExpanded(path));
+  }
+
+  isForceLoaded(path: string): boolean {
+    return this._forceLoad.has(path);
+  }
+
+  setForceLoad(path: string): void {
+    this._forceLoad.add(path);
+  }
+
+  dispose(): void {
+    for (const d of this._disposers) d();
+    this._disposers.length = 0;
+  }
+
+  private _currentContext(): SlotContext {
+    const activeFile = this.diffView.activeFile;
+
+    if (!activeFile) {
+      return { files: [], diffType: 'disk', originalRef: commitRef('HEAD') };
+    }
+
+    if (activeFile.group === 'pr') {
+      const activePr = this.pr.pullRequests.find(
+        (p) => activeFile.prNumber != null && getPrNumber(p) === activeFile.prNumber
+      );
+      return {
+        files: activePr ? (this.pr.getFiles(activePr).data ?? []) : [],
+        diffType: 'pr',
+        originalRef: activeFile.originalRef,
+        modifiedRef: activeFile.modifiedRef,
+      };
+    }
+
+    if (activeFile.group === 'git') {
+      return { files: [], diffType: 'git', originalRef: activeFile.originalRef };
+    }
+
+    const isStaged = activeFile.group === 'staged';
+    return {
+      files: isStaged ? this.git.stagedFileChanges : this.git.unstagedFileChanges,
+      diffType: isStaged ? 'staged' : 'disk',
+      originalRef: commitRef('HEAD'),
+    };
+  }
+
+  private _applyContext({ files, diffType, originalRef, modifiedRef }: SlotContext): void {
+    const count = Math.min(files.length, MAX_STACKED_FILES);
+    this._count = count;
+
+    for (let i = 0; i < count; i++) {
+      const slot = this._slots[i]!;
+      slot.file = files[i]!;
+      slot.diffType = diffType;
+      slot.originalRef = originalRef;
+      slot.modifiedRef = modifiedRef;
+    }
+
+    const currentPaths = new Set(files.map((f) => f.path));
+    for (const path of this._expanded.keys()) {
+      if (!currentPaths.has(path)) this._expanded.delete(path);
+    }
+    for (const path of this._forceLoad) {
+      if (!currentPaths.has(path)) this._forceLoad.delete(path);
+    }
+  }
+}
diff --git a/src/renderer/features/tasks/editor/conflict-dialog.tsx b/src/renderer/features/tasks/editor/conflict-dialog.tsx
new file mode 100644
index 0000000000..c3c031d8d7
--- /dev/null
+++ b/src/renderer/features/tasks/editor/conflict-dialog.tsx
@@ -0,0 +1,38 @@
+import { type BaseModalProps } from '@renderer/lib/modal/modal-provider';
+import { useCloseGuard } from '@renderer/lib/modal/use-close-guard';
+import { Button } from '@renderer/lib/ui/button';
+import {
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+} from '@renderer/lib/ui/dialog';
+
+export type ConflictDialogArgs = {
+  filePath: string;
+};
+
+type Props = BaseModalProps<boolean> & ConflictDialogArgs;
+
+export function ConflictDialog({ filePath, onSuccess }: Props) {
+  const shortPath = filePath.split('/').slice(-2).join('/');
+  useCloseGuard(true);
+
+  return (
+    <>
+      <DialogHeader showCloseButton={false}>
+        <DialogTitle>File Modified Externally</DialogTitle>
+        <DialogDescription>
+          <code className="rounded bg-muted px-1 py-0.5 text-xs">{shortPath}</code> was changed
+          outside the editor while you have unsaved edits. What would you like to do?
+        </DialogDescription>
+      </DialogHeader>
+      <DialogFooter className="gap-2">
+        <Button variant="outline" onClick={() => onSuccess(false)}>
+          Keep Mine
+        </Button>
+        <Button onClick={() => onSuccess(true)}>Accept Incoming</Button>
+      </DialogFooter>
+    </>
+  );
+}
diff --git a/src/renderer/features/tasks/editor/editor-file-tree.tsx b/src/renderer/features/tasks/editor/editor-file-tree.tsx
new file mode 100644
index 0000000000..3002356d9d
--- /dev/null
+++ b/src/renderer/features/tasks/editor/editor-file-tree.tsx
@@ -0,0 +1,189 @@
+import { useVirtualizer } from '@tanstack/react-virtual';
+import { ChevronDown, ChevronRight, Folder, FolderOpen } from 'lucide-react';
+import { observer } from 'mobx-react-lite';
+import React, { useRef } from 'react';
+import type { FileNode } from '@shared/fs';
+import { buildVisibleRows } from '@renderer/features/tasks/editor/stores/files-store-utils';
+import { useProvisionedTask } from '@renderer/features/tasks/task-view-context';
+import { FileIcon } from '@renderer/lib/editor/file-icon';
+import { cn } from '@renderer/utils/utils';
+
+const FileTreeRow = observer(function FileTreeRow({
+  node,
+  style,
+}: {
+  node: FileNode;
+  style: React.CSSProperties;
+}) {
+  const taskState = useProvisionedTask();
+  const { taskView } = taskState;
+  const editorView = taskView.editorView;
+
+  const isExpanded = editorView.expandedPaths.has(node.path);
+  const isSelected = taskView.view === 'editor' && editorView.activeFilePath === node.path;
+  const fileStatus = taskState.workspace.git.fileChanges?.find((c) => c.path === node.path)?.status;
+  const paddingLeft = node.depth * 12 + 4;
+
+  const handleClick = (e: React.MouseEvent) => {
+    e.stopPropagation();
+    if (taskView.view !== 'editor') {
+      taskView.setView('editor');
+    }
+    if (node.type === 'directory') {
+      toggleExpand();
+    } else {
+      editorView.openFilePreview(node.path);
+    }
+  };
+
+  const handleDoubleClick = (e: React.MouseEvent) => {
+    e.stopPropagation();
+    if (node.type === 'file') {
+      editorView.openFile(node.path);
+    }
+  };
+
+  const handleKeyDown = (e: React.KeyboardEvent) => {
+    if (e.key === 'Enter' || e.key === ' ') {
+      e.preventDefault();
+      if (node.type === 'directory') {
+        toggleExpand();
+      } else {
+        editorView.openFilePreview(node.path);
+      }
+    }
+  };
+
+  const toggleExpand = () => {
+    if (editorView.expandedPaths.has(node.path)) {
+      editorView.expandedPaths.delete(node.path);
+    } else {
+      editorView.expandedPaths.add(node.path);
+      if (!taskState.workspace.files.loadedPaths.has(node.path)) {
+        void taskState.workspace.files.loadDir(node.path);
+      }
+    }
+  };
+
+  return (
+    <div
+      style={{ ...style, paddingLeft }}
+      className={cn(
+        'flex h-7 cursor-pointer select-none items-center gap-1.5 rounded-md pr-2 hover:bg-background-1',
+        isSelected && 'bg-background-2 hover:bg-background-2',
+        node.isHidden && 'opacity-60'
+      )}
+      tabIndex={0}
+      onClick={handleClick}
+      onDoubleClick={handleDoubleClick}
+      onKeyDown={handleKeyDown}
+      role="treeitem"
+      aria-selected={isSelected}
+      aria-expanded={node.type === 'directory' ? isExpanded : undefined}
+    >
+      <span className="shrink-0 text-muted-foreground">
+        {node.type === 'directory' ? (
+          isExpanded ? (
+            <ChevronDown className="h-3.5 w-3.5" />
+          ) : (
+            <ChevronRight className="h-3.5 w-3.5" />
+          )
+        ) : (
+          <span className="inline-block w-3.5" />
+        )}
+      </span>
+
+      <span className="shrink-0">
+        {node.type === 'directory' ? (
+          isExpanded ? (
+            <FolderOpen className="h-3.5 w-3.5 text-muted-foreground" />
+          ) : (
+            <Folder className="h-3.5 w-3.5 text-muted-foreground" />
+          )
+        ) : (
+          <FileIcon filename={node.name} size={12} />
+        )}
+      </span>
+
+      <span
+        className={cn(
+          'min-w-0 flex-1 truncate text-sm',
+          fileStatus === 'added' && 'text-green-500',
+          fileStatus === 'modified' && 'text-amber-500',
+          fileStatus === 'deleted' && 'text-red-500 line-through',
+          fileStatus === 'renamed' && 'text-blue-500'
+        )}
+      >
+        {node.name}
+      </span>
+    </div>
+  );
+});
+
+export const EditorFileTree = observer(function EditorFileTree() {
+  const taskState = useProvisionedTask();
+  const files = taskState.workspace.files;
+  const editorView = taskState.taskView.editorView;
+
+  const visibleRows = files
+    ? buildVisibleRows(files.nodes, files.childIndex, editorView.expandedPaths)
+    : [];
+
+  const parentRef = useRef<HTMLDivElement>(null);
+
+  const virtualizer = useVirtualizer({
+    count: visibleRows.length,
+    getScrollElement: () => parentRef.current,
+    estimateSize: () => 28,
+    overscan: 10,
+  });
+
+  if (files?.isLoading) {
+    return (
+      <div className="flex h-full items-center justify-center text-xs text-muted-foreground">
+        Loading...
+      </div>
+    );
+  }
+
+  if (files?.error) {
+    return (
+      <div className="flex h-full items-center justify-center text-xs text-destructive">
+        {files.error}
+      </div>
+    );
+  }
+
+  if (visibleRows.length === 0) {
+    return (
+      <div className="flex h-full items-center justify-center text-xs text-muted-foreground">
+        No files
+      </div>
+    );
+  }
+
+  return (
+    <div className="flex h-full flex-col overflow-hidden">
+      <div ref={parentRef} className="flex-1 overflow-y-auto px-1 py-1" role="tree">
+        <div style={{ height: virtualizer.getTotalSize(), position: 'relative' }}>
+          {virtualizer.getVirtualItems().map((vItem) => {
+            const node = visibleRows[vItem.index] as FileNode;
+            return (
+              <FileTreeRow
+                key={node.path}
+                node={node}
+                style={{
+                  position: 'absolute',
+                  top: vItem.start,
+                  left: 0,
+                  width: '100%',
+                  height: `${vItem.size}px`,
+                }}
+              />
+            );
+          })}
+        </div>
+      </div>
+    </div>
+  );
+});
diff --git a/src/renderer/features/tasks/editor/editor-main-panel.tsx b/src/renderer/features/tasks/editor/editor-main-panel.tsx
new file mode 100644
index 0000000000..11c201cf38
--- /dev/null
+++ b/src/renderer/features/tasks/editor/editor-main-panel.tsx
@@ -0,0 +1,132 @@
+import { Eye, FileCode, Pencil } from 'lucide-react';
+import { observer } from 'mobx-react-lite';
+import { FileTabs } from '@renderer/features/tasks/editor/file-tabs';
+import { EditorViewStore } from '@renderer/features/tasks/editor/stores/editor-view-store';
+import { useProvisionedTask } from '@renderer/features/tasks/task-view-context';
+import { BinaryRenderer } from '@renderer/lib/editor/binary-renderer';
+import { ImageRenderer } from '@renderer/lib/editor/image-renderer';
+import { MarkdownEditorRenderer } from '@renderer/lib/editor/markdown-renderer';
+import { SvgRenderer } from '@renderer/lib/editor/svg-renderer';
+import { TooLargeRenderer } from '@renderer/lib/editor/too-large-renderer';
+import type { ManagedFile } from '@renderer/lib/editor/types';
+import { useTabShortcuts } from '@renderer/lib/hooks/useTabShortcuts';
+import { ToggleGroup, ToggleGroupItem } from '@renderer/lib/ui/toggle-group';
+import { useEditorContext } from './editor-provider';
+
+export const EditorMainPanel = observer(function EditorMainPanel() {
+  const { setEditorHost } = useEditorContext();
+
+  const editorView = useProvisionedTask().taskView.editorView;
+  useTabShortcuts(editorView);
+  const tabs = editorView.tabs;
+  const activeTab = editorView.activeTab;
+
+  const isMonacoActive =
+    activeTab &&
+    (activeTab.renderer.kind === 'text' ||
+      activeTab.renderer.kind === 'markdown-source' ||
+      activeTab.renderer.kind === 'svg-source');
+
+  if (tabs.length === 0) {
+    return (
+      <div className="flex min-h-0 flex-1 flex-col items-center justify-center gap-3 text-muted-foreground">
+        <FileCode className="h-10 w-10 opacity-20" />
+        <div className="text-center">
+          <p className="text-sm font-medium opacity-50">No file open</p>
+          <p className="mt-1 text-xs opacity-35">Select a file from the tree to open it here</p>
+        </div>
+      </div>
+    );
+  }
+
+  return (
+    <div className="flex min-h-0 flex-1 flex-col overflow-hidden">
+      <FileTabs
+        tabs={tabs}
+        activeTabId={editorView.activeTabId}
+        onTabClick={(tabId) => editorView.setActiveTab(tabId)}
+        onTabClose={(tabId) => editorView.removeTab(tabId)}
+        onPinTab={(tabId) => editorView.pinTab(tabId)}
+        onReorder={(from, to) => editorView.reorderTabs(from, to)}
+      />
+      <div className="relative min-h-0 flex-1 overflow-hidden">
+        {/* Stable Monaco host — always in DOM, shown/hidden by CSS only. Never re-parented. */}
+        <div
+          ref={setEditorHost}
+          className="absolute inset-0"
+          style={{ display: isMonacoActive ? 'flex' : 'none' }}
+        />
+        {/* Floating "View rendered" toggle shown when editing markdown/svg source */}
+        {isMonacoActive &&
+          activeTab &&
+          (activeTab.kind === 'markdown' || activeTab.kind === 'svg') && (
+            <SourceToggleOverlay
+              filePath={activeTab.path}
+              kind={activeTab.kind}
+              editorView={editorView}
+            />
+          )}
+        {/* Non-Monaco renderers */}
+        {!isMonacoActive && activeTab && <ActiveNonMonacoRenderer file={activeTab} />}
+      </div>
+    </div>
+  );
+});
+
+// ---------------------------------------------------------------------------
+// Floating "View rendered" toggle shown when editing markdown/svg source
+// ---------------------------------------------------------------------------
+
+interface SourceToggleOverlayProps {
+  filePath: string;
+  kind: 'markdown' | 'svg';
+  editorView: EditorViewStore;
+}
+
+function SourceToggleOverlay({ filePath, kind, editorView }: SourceToggleOverlayProps) {
+  const sourceKind = `${kind}-source` as 'markdown-source' | 'svg-source';
+  return (
+    <ToggleGroup
+      value={[sourceKind]}
+      onValueChange={(value) => {
+        if (value.includes(kind)) {
+          editorView.updateRenderer(filePath, () => ({ kind }));
+        }
+      }}
+      size="sm"
+      className="absolute right-3 top-3 z-10"
+    >
+      <ToggleGroupItem value={kind} aria-label={kind === 'markdown' ? 'Preview' : 'View rendered'}>
+        <Eye className="h-3.5 w-3.5" />
+      </ToggleGroupItem>
+      <ToggleGroupItem value={sourceKind} aria-label="Edit source">
+        <Pencil className="h-3.5 w-3.5" />
+      </ToggleGroupItem>
+    </ToggleGroup>
+  );
+}
+
+// ---------------------------------------------------------------------------
+// Non-Monaco renderer dispatcher
+// ---------------------------------------------------------------------------
+
+interface ActiveNonMonacoRendererProps {
+  file: ManagedFile;
+}
+
+function ActiveNonMonacoRenderer({ file }: ActiveNonMonacoRendererProps) {
+  switch (file.renderer.kind) {
+    case 'markdown':
+      return <MarkdownEditorRenderer filePath={file.path} />;
+    case 'svg':
+      return <SvgRenderer filePath={file.path} />;
+    case 'image':
+      return <ImageRenderer file={file} />;
+    case 'too-large':
+      return <TooLargeRenderer file={file} />;
+    case 'binary':
+      return <BinaryRenderer file={file} />;
+    default:
+      return null;
+  }
+}
diff --git a/src/renderer/features/tasks/editor/editor-provider.tsx b/src/renderer/features/tasks/editor/editor-provider.tsx
new file mode 100644
index 0000000000..25df29f2cc
--- /dev/null
+++ b/src/renderer/features/tasks/editor/editor-provider.tsx
@@ -0,0 +1,232 @@
+import { autorun, reaction } from 'mobx';
+import { observer } from 'mobx-react-lite';
+import type * as monacoNS from 'monaco-editor';
+import { createContext, ReactNode, useCallback, useContext, useEffect, useRef } from 'react';
+import { useProvisionedTask } from '@renderer/features/tasks/task-view-context';
+import { registerActiveCodeEditor } from '@renderer/lib/editor/activeCodeEditor';
+import { useTheme } from '@renderer/lib/hooks/useTheme';
+import { useShowModal } from '@renderer/lib/modal/modal-provider';
+import { codeEditorPool } from '@renderer/lib/monaco/monaco-code-pool';
+import {
+  addMonacoKeyboardShortcuts,
+  configureMonacoEditor,
+} from '@renderer/lib/monaco/monaco-config';
+import { modelRegistry } from '@renderer/lib/monaco/monaco-model-registry';
+import { defineMonacoThemes, getMonacoTheme } from '@renderer/lib/monaco/monaco-themes';
+import { buildMonacoModelPath } from '@renderer/lib/monaco/monacoModelPath';
+import { useMonacoLease } from '@renderer/lib/monaco/use-monaco-lease';
+import { useIsActiveTask } from '../hooks/use-is-active-task';
+
+interface EditorContextValue {
+  /**
+   * Ref callback that appends the task's stable Monaco editor container to the
+   * given DOM element. Called by EditorMainPanel to position the editor host.
+   */
+  setEditorHost: (el: HTMLElement | null) => void;
+}
+
+const EditorContext = createContext<EditorContextValue | null>(null);
+
+export function useEditorContext(): EditorContextValue {
+  const ctx = useContext(EditorContext);
+  if (!ctx) throw new Error('useEditorContext must be used within EditorProvider');
+  return ctx;
+}
+
+export const EditorProvider = observer(function EditorProvider({
+  children,
+  taskId,
+  projectId: _projectId,
+}: {
+  children: ReactNode;
+  taskId: string;
+  projectId: string;
+}) {
+  const provisionedTask = useProvisionedTask();
+  const editorView = provisionedTask.taskView.editorView;
+  const { effectiveTheme } = useTheme();
+  const isActive = useIsActiveTask(taskId);
+
+  // Conflict dialog — shown when editorView.pendingConflictUri is set.
+  const showConflictModal = useShowModal('conflictDialog');
+
+  // Lease is exposed as a MobX observable box — unified with activeFilePath and
+  // modelStatus in a single autorun for reliable model attachment.
+  const leaseBox = useMonacoLease(codeEditorPool);
+
+  // editorRef — shared with useDiffDecorations and the focus-restore effect.
+  // Updated reactively from leaseBox via a reaction below.
+  const editorRef = useRef<monacoNS.editor.IStandaloneCodeEditor | null>(null);
+  const focusPendingRef = useRef(false);
+
+  // Stable host element provided by EditorMainPanel via setEditorHost.
+  const hostRef = useRef<HTMLElement | null>(null);
+
+  // Tracks the previously-attached buffer URI so modelRegistry.attach can
+  // save view state before switching models.
+  const prevBufUriRef = useRef<string | undefined>(undefined);
+
+  // ---------------------------------------------------------------------------
+  // Theme sync — update editor theme when app theme changes.
+  // ---------------------------------------------------------------------------
+  useEffect(() => {
+    const m = codeEditorPool.getMonaco();
+    if (m) defineMonacoThemes(m as Parameters<typeof defineMonacoThemes>[0]);
+    codeEditorPool.setTheme(getMonacoTheme(effectiveTheme));
+  }, [effectiveTheme]);
+
+  // ---------------------------------------------------------------------------
+  // Editor setup — fires when the lease arrives. Configures the editor,
+  // registers keyboard shortcuts, updates editorRef, satisfies any pending
+  // focus request, and appends the container to the host.
+  // ---------------------------------------------------------------------------
+  useEffect(
+    () =>
+      reaction(
+        () => leaseBox.get(),
+        (lease) => {
+          editorRef.current = lease?.editor ?? null;
+
+          if (!lease) return;
+
+          lease.editor.updateOptions({ glyphMargin: true });
+          configureMonacoEditor(lease.editor);
+
+          const cleanupActive = registerActiveCodeEditor(lease.editor);
+          lease.disposables.push({ dispose: cleanupActive });
+
+          const monaco = codeEditorPool.getMonaco();
+          if (monaco) {
+            addMonacoKeyboardShortcuts(lease.editor, monaco as typeof monacoNS, {
+              onSave: () => {
+                void editorView.saveFile();
+              },
+              onSaveAll: () => {
+                void editorView.saveAllFiles();
+              },
+            });
+          }
+
+          lease.disposables.push(
+            lease.editor.onDidFocusEditorWidget(() => {
+              provisionedTask.taskView.setFocusedRegion('main');
+            })
+          );
+
+          // Satisfy any focus request that arrived before the lease resolved.
+          if (focusPendingRef.current && lease.editor.getModel()) {
+            focusPendingRef.current = false;
+            lease.editor.focus();
+          }
+
+          if (hostRef.current) {
+            hostRef.current.appendChild(lease.container);
+            lease.editor.layout();
+          }
+        }
+      ),
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    []
+  );
+
+  // ---------------------------------------------------------------------------
+  // Model attachment — single autorun that re-evaluates whenever any of the
+  // three inputs changes: lease, activeFilePath, or modelStatus.
+  // Replaces the reaction+onceBufferReady pattern and the restore-effect
+  // onceBufferReady. Covers: initial mount, remount, tab switching, and the
+  // async model-registration race on first file open.
+  // ---------------------------------------------------------------------------
+  useEffect(
+    () =>
+      autorun(() => {
+        const lease = leaseBox.get(); // reactive
+        const activePath = editorView.activeFilePath; // reactive
+
+        if (!lease) return;
+
+        const newBufUri = activePath
+          ? buildMonacoModelPath(editorView.modelRootPath, activePath)
+          : null;
+
+        if (!newBufUri) {
+          lease.editor.setModel(null);
+          prevBufUriRef.current = undefined;
+          return;
+        }
+
+        const status = modelRegistry.modelStatus.get(newBufUri); // reactive
+        if (status !== 'ready') return;
+
+        modelRegistry.attach(lease.editor, newBufUri, prevBufUriRef.current);
+        prevBufUriRef.current = newBufUri;
+      }),
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    []
+  );
+
+  // ---------------------------------------------------------------------------
+  // Restore — re-register Monaco models for persisted open tabs on mount.
+  // The autorun above handles attachment once model statuses become 'ready'.
+  // ---------------------------------------------------------------------------
+  useEffect(() => {
+    if (!taskId) return;
+    void editorView.restore();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [taskId]);
+
+  // ---------------------------------------------------------------------------
+  // Conflict dialog — reaction on pendingConflictUri shows the modal.
+  // ---------------------------------------------------------------------------
+  useEffect(
+    () =>
+      reaction(
+        () => editorView.pendingConflictUri,
+        (uri) => {
+          if (!uri) return;
+          const tab = editorView.tabs.find((t) => t.bufferUri === uri);
+          if (!tab) return;
+          showConflictModal({
+            filePath: tab.path,
+            onSuccess: async (accept) => {
+              await editorView.resolveConflict(accept);
+            },
+          });
+        }
+      ),
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    []
+  );
+
+  // ---------------------------------------------------------------------------
+  // Focus restore — when this task becomes active and focusedRegion is 'main',
+  // focus Monaco if an editable model is loaded; otherwise queue the intent so
+  // it is satisfied once the lease arrives (handled in the lease reaction above).
+  // ---------------------------------------------------------------------------
+  const focusedRegion = provisionedTask.taskView.focusedRegion;
+  useEffect(() => {
+    if (!isActive || focusedRegion !== 'main') return;
+    const editor = editorRef.current;
+    if (editor?.getModel()) {
+      editor.focus();
+    } else {
+      focusPendingRef.current = true;
+    }
+  }, [isActive, focusedRegion]);
+
+  // ---------------------------------------------------------------------------
+  // setEditorHost — called by EditorMainPanel to give the editor a stable DOM node.
+  // ---------------------------------------------------------------------------
+  const setEditorHost = useCallback(
+    (el: HTMLElement | null) => {
+      hostRef.current = el;
+      const lease = leaseBox.get();
+      if (el && lease) {
+        el.appendChild(lease.container);
+        lease.editor.layout();
+      }
+    },
+    [leaseBox]
+  );
+
+  return <EditorContext.Provider value={{ setEditorHost }}>{children}</EditorContext.Provider>;
+});
diff --git a/src/renderer/features/tasks/editor/file-tabs.tsx b/src/renderer/features/tasks/editor/file-tabs.tsx
new file mode 100644
index 0000000000..6d4eb2fd2a
--- /dev/null
+++ b/src/renderer/features/tasks/editor/file-tabs.tsx
@@ -0,0 +1,142 @@
+import { Loader2, X } from 'lucide-react';
+import { observer } from 'mobx-react-lite';
+import React from 'react';
+import { ReorderList } from '@renderer/lib/components/reorder-list';
+import { FileIcon } from '@renderer/lib/editor/file-icon';
+import { EditorTab } from '@renderer/lib/editor/types';
+import { useDelayedBoolean } from '@renderer/lib/hooks/use-delay-boolean';
+import { useModelStatus } from '@renderer/lib/monaco/use-model';
+import { Separator } from '@renderer/lib/ui/separator';
+import { cn } from '@renderer/utils/utils';
+
+export type RichTab = EditorTab & { isDirty: boolean; bufferUri: string };
+
+interface FileTabsProps {
+  tabs: RichTab[];
+  activeTabId: string | null;
+  onTabClick: (tabId: string) => void;
+  onTabClose: (tabId: string) => void;
+  onPinTab: (tabId: string) => void;
+  onReorder?: (fromIndex: number, toIndex: number) => void;
+}
+
+export const FileTabs: React.FC<FileTabsProps> = ({
+  tabs,
+  activeTabId,
+  onTabClick,
+  onTabClose,
+  onPinTab,
+  onReorder,
+}) => {
+  if (tabs.length === 0) {
+    return null;
+  }
+
+  const handleReorder = (newTabs: RichTab[]) => {
+    for (let toIdx = 0; toIdx < newTabs.length; toIdx++) {
+      const fromIdx = tabs.findIndex((t) => t.tabId === newTabs[toIdx].tabId);
+      if (fromIdx !== toIdx) {
+        onReorder?.(fromIdx, toIdx);
+        break;
+      }
+    }
+  };
+
+  const renderTab = (tab: RichTab) => (
+    <FileTab
+      key={tab.tabId}
+      tab={tab}
+      isActive={tab.tabId === activeTabId}
+      onClick={() => onTabClick(tab.tabId)}
+      onDoubleClick={() => onPinTab(tab.tabId)}
+      onClose={(e) => {
+        e.stopPropagation();
+        onTabClose(tab.tabId);
+      }}
+    />
+  );
+
+  return (
+    <div className="flex h-[41px] shrink-0 border-b border-border bg-background-secondary">
+      {onReorder ? (
+        <ReorderList
+          items={tabs}
+          onReorder={handleReorder}
+          axis="x"
+          className="flex overflow-x-auto w-full h-full"
+          itemClassName="list-none flex h-full"
+          getKey={(item) => item.tabId}
+        >
+          {renderTab}
+        </ReorderList>
+      ) : (
+        <div className="flex overflow-x-auto h-full">{tabs.map(renderTab)}</div>
+      )}
+    </div>
+  );
+};
+
+interface FileTabProps {
+  tab: RichTab;
+  isActive: boolean;
+  onClick: () => void;
+  onDoubleClick: () => void;
+  onClose: (e: React.MouseEvent) => void;
+}
+
+const FileTab: React.FC<FileTabProps> = observer(function FileTab({
+  tab,
+  isActive,
+  onClick,
+  onDoubleClick,
+  onClose,
+}) {
+  const fileName = tab.path.split('/').pop() || 'Untitled';
+  const isMonacoFile = tab.kind === 'text' || tab.kind === 'markdown' || tab.kind === 'svg';
+  const modelStatus = useModelStatus(tab.bufferUri);
+  const showSpinner = useDelayedBoolean(isMonacoFile && modelStatus === 'loading', 200);
+
+  return (
+    <>
+      <button
+        className={cn(
+          'group relative flex flex-col h-full text-sm hover:bg-muted',
+          isActive &&
+            'bg-background-secondary-1 opacity-100 [box-shadow:inset_0_1px_0_var(--primary)]'
+        )}
+        onClick={onClick}
+        onDoubleClick={onDoubleClick}
+        title={tab.isPreview ? `${tab.path} (preview — double-click to keep)` : tab.path}
+      >
+        <div className="flex items-center pl-3 pr-2 h-full gap-1.5">
+          <span className="shrink-0 [&>svg]:h-3 [&>svg]:w-3">
+            {showSpinner ? (
+              <Loader2 className="h-3 w-3 animate-spin" />
+            ) : (
+              <FileIcon filename={fileName} />
+            )}
+          </span>
+          <span className={cn('max-w-[200px] text-sm truncate p-1', tab.isPreview && 'italic')}>
+            {fileName}
+          </span>
+          <div className="relative size-5 flex items-center justify-center shrink-0">
+            {tab.isDirty && (
+              <div
+                className="size-2 rounded-full bg-foreground group-hover:opacity-0"
+                title="Unsaved changes"
+              />
+            )}
+            <button
+              className="absolute inset-0 hover:bg-background-2 text-foreground-muted flex items-center justify-center rounded-md opacity-0 group-hover:opacity-100"
+              onClick={onClose}
+              aria-label={`Close ${fileName}`}
+            >
+              <X className="size-4" />
+            </button>
+          </div>
+        </div>
+      </button>
+      <Separator orientation="vertical" />
+    </>
+  );
+});
diff --git a/src/renderer/features/tasks/editor/stores/editor-selectors.ts b/src/renderer/features/tasks/editor/stores/editor-selectors.ts
new file mode 100644
index 0000000000..84c4ddbbae
--- /dev/null
+++ b/src/renderer/features/tasks/editor/stores/editor-selectors.ts
@@ -0,0 +1,26 @@
+import { EditorTab } from '@renderer/lib/editor/types';
+import { modelRegistry } from '@renderer/lib/monaco/monaco-model-registry';
+import { buildMonacoModelPath } from '@renderer/lib/monaco/monacoModelPath';
+import { EditorViewStore } from './editor-view-store';
+
+export type RichEditorTab = EditorTab & { isDirty: boolean; bufferUri: string };
+
+/** Returns true when the buffer for `filePath` has unsaved changes. */
+export function selectTabIsDirty(store: EditorViewStore, filePath: string): boolean {
+  return modelRegistry.dirtyUris.has(buildMonacoModelPath(store.modelRootPath, filePath));
+}
+
+/** Returns the currently active tab, or undefined if no tab is active. */
+export function selectActiveTab(store: EditorViewStore): RichEditorTab | undefined {
+  return store.activeTab;
+}
+
+/** Returns the current preview tab (single-click, not yet pinned), or undefined. */
+export function selectPreviewTab(store: EditorViewStore): RichEditorTab | undefined {
+  return store.previewTab;
+}
+
+/** Returns all tabs that have unsaved changes. */
+export function selectDirtyTabs(store: EditorViewStore): RichEditorTab[] {
+  return store.tabs.filter((t) => t.isDirty);
+}
diff --git a/src/renderer/features/tasks/editor/stores/editor-view-store.ts b/src/renderer/features/tasks/editor/stores/editor-view-store.ts
new file mode 100644
index 0000000000..650475f2e6
--- /dev/null
+++ b/src/renderer/features/tasks/editor/stores/editor-view-store.ts
@@ -0,0 +1,392 @@
+import { makeAutoObservable, observable, runInAction } from 'mobx';
+import { HEAD_REF } from '@shared/git';
+import type { EditorViewSnapshot } from '@shared/view-state';
+import { FileRendererData } from '@renderer/features/tasks/types';
+import { getFileKind } from '@renderer/lib/editor/fileKind';
+import { getDefaultRenderer } from '@renderer/lib/editor/renderer-utils';
+import { EditorTab } from '@renderer/lib/editor/types';
+import { rpc } from '@renderer/lib/ipc';
+import { modelRegistry } from '@renderer/lib/monaco/monaco-model-registry';
+import { buildMonacoModelPath } from '@renderer/lib/monaco/monacoModelPath';
+import type { Snapshottable } from '@renderer/lib/stores/snapshottable';
+import { getMonacoLanguageId } from '@renderer/utils/diffUtils';
+import { log } from '@renderer/utils/logger';
+
+export class EditorViewStore implements Snapshottable<EditorViewSnapshot> {
+  readonly modelRootPath: string;
+
+  private readonly _tabs = observable.array<EditorTab>();
+  activeTabId: string | null = null;
+  isSaving = false;
+
+  /**
+   * Set to the buffer URI of a file that has a conflict pending resolution.
+   * EditorProvider watches this via a MobX reaction and shows the conflict modal.
+   */
+  pendingConflictUri: string | null = null;
+
+  /** Persisted navigation state for the file tree sidebar. */
+  expandedPaths = observable.set<string>();
+
+  constructor(
+    private readonly projectId: string,
+    private readonly workspaceId: string
+  ) {
+    this.modelRootPath = `workspace:${workspaceId}`;
+    makeAutoObservable(this, { modelRootPath: false });
+  }
+
+  get tabs(): Array<EditorTab & { isDirty: boolean; bufferUri: string }> {
+    return this._tabs.map((tab) => {
+      const bufferUri = buildMonacoModelPath(this.modelRootPath, tab.path);
+      return { ...tab, bufferUri, isDirty: modelRegistry.dirtyUris.has(bufferUri) };
+    });
+  }
+
+  get activeTab(): (EditorTab & { isDirty: boolean; bufferUri: string }) | undefined {
+    return this.tabs.find((t) => t.tabId === this.activeTabId);
+  }
+
+  get activeFilePath(): string | null {
+    return this.activeTab?.path ?? null;
+  }
+
+  get previewTab(): (EditorTab & { isDirty: boolean; bufferUri: string }) | undefined {
+    return this.tabs.find((t) => t.isPreview);
+  }
+
+  // ---------------------------------------------------------------------------
+  // Snapshottable
+  // ---------------------------------------------------------------------------
+
+  get snapshot(): EditorViewSnapshot {
+    return {
+      tabs: this._tabs.map((t) => ({ tabId: t.tabId, path: t.path, isPreview: t.isPreview })),
+      activeTabId: this.activeTabId,
+      expandedPaths: [...this.expandedPaths],
+    };
+  }
+
+  restoreSnapshot(snapshot: Partial<EditorViewSnapshot>): void {
+    if (snapshot.tabs) {
+      this._tabs.replace(snapshot.tabs.map((t) => this._makeTab(t.path, t.isPreview, t.tabId)));
+    }
+    if (snapshot.activeTabId !== undefined) this.activeTabId = snapshot.activeTabId;
+    if (snapshot.expandedPaths) {
+      this.expandedPaths.replace(snapshot.expandedPaths);
+    }
+  }
+
+  // ---------------------------------------------------------------------------
+  // Tab view interface
+  // ---------------------------------------------------------------------------
+
+  setActiveTab(tabId: string): void {
+    this.activeTabId = tabId;
+  }
+
+  reorderTabs(fromIndex: number, toIndex: number): void {
+    if (fromIndex === toIndex) return;
+    const [tab] = this._tabs.splice(fromIndex, 1);
+    this._tabs.splice(toIndex, 0, tab);
+  }
+
+  setNextTabActive(): void {
+    if (!this.activeTabId) return;
+    const idx = this._tabs.findIndex((t) => t.tabId === this.activeTabId);
+    const next = this._tabs[idx + 1];
+    if (next) this.activeTabId = next.tabId;
+  }
+
+  setPreviousTabActive(): void {
+    if (!this.activeTabId) return;
+    const idx = this._tabs.findIndex((t) => t.tabId === this.activeTabId);
+    const prev = this._tabs[idx - 1];
+    if (prev) this.activeTabId = prev.tabId;
+  }
+
+  setTabActiveIndex(index: number): void {
+    const tab = this._tabs[index];
+    if (tab) this.activeTabId = tab.tabId;
+  }
+
+  closeActiveTab(): void {
+    if (this.activeTabId) this.removeTab(this.activeTabId);
+  }
+
+  // ---------------------------------------------------------------------------
+  // File opening
+  // ---------------------------------------------------------------------------
+
+  /**
+   * Opens a file as a stable tab (double-click / explicit open).
+   * If the file is already open as a preview, promotes it to stable.
+   */
+  openFile(filePath: string): void {
+    const existing = this._tabs.find((t) => t.path === filePath);
+    if (existing) {
+      existing.isPreview = false;
+      this.activeTabId = existing.tabId;
+      return;
+    }
+    const tab = this._makeTab(filePath, false);
+    this._tabs.push(tab);
+    this.activeTabId = tab.tabId;
+    void this._registerModels(filePath);
+  }
+
+  /**
+   * Opens a file as an unstable preview tab (single-click).
+   * If a clean preview tab already exists, mutates it in place so that the
+   * same tabId stays in the list — React sees an update, not a remove+add, so
+   * there is no flash of two tabs.
+   */
+  openFilePreview(filePath: string): void {
+    const existing = this._tabs.find((t) => t.path === filePath);
+    if (existing) {
+      this.activeTabId = existing.tabId;
+      return;
+    }
+
+    const prevPreview = this._tabs.find((t) => t.isPreview);
+    const prevUri = prevPreview ? buildMonacoModelPath(this.modelRootPath, prevPreview.path) : null;
+    const canReplace = prevPreview && prevUri && !modelRegistry.isDirty(prevUri);
+
+    if (canReplace && prevPreview && prevUri) {
+      // Unregister the outgoing preview's models before mutating.
+      const oldFilePath = prevPreview.path;
+      this._unregisterModels(prevUri);
+      void rpc.editorBuffer.clearBuffer(this.projectId, this.workspaceId, oldFilePath);
+
+      const kind = getFileKind(filePath);
+      // Mutate in place — tabId unchanged, React sees one render with new content.
+      prevPreview.path = filePath;
+      prevPreview.kind = kind;
+      prevPreview.renderer = getDefaultRenderer(kind);
+      prevPreview.content = '';
+      prevPreview.isLoading = kind === 'image';
+      prevPreview.totalSize = null;
+      this.activeTabId = prevPreview.tabId;
+    } else {
+      const tab = this._makeTab(filePath, true);
+      this._tabs.push(tab);
+      this.activeTabId = tab.tabId;
+    }
+
+    void this._registerModels(filePath);
+  }
+
+  // ---------------------------------------------------------------------------
+  // Tab management
+  // ---------------------------------------------------------------------------
+
+  removeTab(tabId: string): void {
+    const idx = this._tabs.findIndex((t) => t.tabId === tabId);
+    if (idx === -1) return;
+    const tab = this._tabs[idx];
+    const uri = buildMonacoModelPath(this.modelRootPath, tab.path);
+    this._unregisterModels(uri);
+    void rpc.editorBuffer.clearBuffer(this.projectId, this.workspaceId, tab.path);
+    this._tabs.splice(idx, 1);
+    if (this.activeTabId === tabId) {
+      this.activeTabId = (this._tabs[idx] ?? this._tabs[idx - 1])?.tabId ?? null;
+    }
+  }
+
+  pinTab(tabId: string): void {
+    const tab = this._tabs.find((t) => t.tabId === tabId);
+    if (tab) tab.isPreview = false;
+  }
+
+  // ---------------------------------------------------------------------------
+  // Renderer
+  // ---------------------------------------------------------------------------
+
+  updateRenderer(filePath: string, updater: (prev: FileRendererData) => FileRendererData): void {
+    const tab = this._tabs.find((t) => t.path === filePath);
+    if (tab) tab.renderer = updater(tab.renderer);
+  }
+
+  // ---------------------------------------------------------------------------
+  // Save
+  // ---------------------------------------------------------------------------
+
+  async saveFile(filePath?: string): Promise<void> {
+    const targetPath = filePath ?? this.activeFilePath;
+    if (!targetPath) return;
+    const uri = buildMonacoModelPath(this.modelRootPath, targetPath);
+    if (!modelRegistry.isDirty(uri)) return;
+
+    if (modelRegistry.hasPendingConflict(uri)) {
+      runInAction(() => {
+        this.pendingConflictUri = uri;
+      });
+      return;
+    }
+
+    runInAction(() => {
+      this.isSaving = true;
+    });
+    try {
+      const result = await modelRegistry.saveFileToDisk(uri);
+      if (result === null) {
+        log.error('[EditorViewStore] Failed to save file:', targetPath);
+      }
+    } catch (error) {
+      log.error('[EditorViewStore] Error saving file:', error);
+    } finally {
+      runInAction(() => {
+        this.isSaving = false;
+      });
+    }
+  }
+
+  async saveAllFiles(): Promise<void> {
+    const dirtyPaths = this._tabs
+      .filter((t) => modelRegistry.isDirty(buildMonacoModelPath(this.modelRootPath, t.path)))
+      .map((t) => t.path);
+    for (const path of dirtyPaths) {
+      await this.saveFile(path);
+    }
+  }
+
+  /**
+   * Resolves a pending conflict: either reloads buffer from disk ("Accept Incoming")
+   * or writes the user's buffer to disk ("Keep Mine").
+   * Called from EditorProvider after the conflict dialog resolves.
+   */
+  async resolveConflict(accept: boolean): Promise<void> {
+    const uri = this.pendingConflictUri;
+    if (!uri) return;
+    const tab = this._tabs.find((t) => buildMonacoModelPath(this.modelRootPath, t.path) === uri);
+    runInAction(() => {
+      this.pendingConflictUri = null;
+    });
+    if (!tab) return;
+
+    if (accept) {
+      modelRegistry.reloadFromDisk(uri);
+      void rpc.editorBuffer.clearBuffer(this.projectId, this.workspaceId, tab.path);
+    } else {
+      runInAction(() => {
+        this.isSaving = true;
+      });
+      try {
+        await modelRegistry.saveFileToDisk(uri);
+      } finally {
+        runInAction(() => {
+          this.isSaving = false;
+        });
+      }
+    }
+  }
+
+  // ---------------------------------------------------------------------------
+  // Lifecycle
+  // ---------------------------------------------------------------------------
+
+  /**
+   * Re-registers Monaco models for all currently open tabs and restores any
+   * crash-recovery buffer content. Called by EditorProvider on mount so that
+   * Monaco models (which are ephemeral) are recreated after a remount.
+   */
+  async restore(): Promise<void> {
+    for (const tab of this._tabs) {
+      void this._registerModels(tab.path);
+    }
+    try {
+      const buffers = await rpc.editorBuffer.listBuffers(this.projectId, this.workspaceId);
+      for (const { filePath, content } of buffers) {
+        const uri = buildMonacoModelPath(this.modelRootPath, filePath);
+        const model = modelRegistry.getModelByUri(uri);
+        if (model) model.setValue(content);
+      }
+    } catch (e) {
+      log.warn('[EditorViewStore] Failed to restore buffers:', e);
+    }
+  }
+
+  dispose(): void {
+    for (const tab of this._tabs) {
+      const uri = buildMonacoModelPath(this.modelRootPath, tab.path);
+      this._unregisterModels(uri);
+    }
+  }
+
+  // ---------------------------------------------------------------------------
+  // Private helpers
+  // ---------------------------------------------------------------------------
+
+  private _makeTab(filePath: string, isPreview: boolean, tabId?: string): EditorTab {
+    const kind = getFileKind(filePath);
+    return {
+      tabId: tabId ?? crypto.randomUUID(),
+      path: filePath,
+      kind,
+      renderer: getDefaultRenderer(kind),
+      content: '',
+      isLoading: kind === 'image',
+      isPreview,
+    };
+  }
+
+  private async _registerModels(filePath: string): Promise<void> {
+    const kind = getFileKind(filePath);
+
+    if (kind === 'image') {
+      const result = await rpc.fs.readImage(this.projectId, this.workspaceId, filePath);
+      runInAction(() => {
+        const tab = this._tabs.find((t) => t.path === filePath);
+        if (tab) {
+          tab.content = result.success ? (result.data?.dataUrl ?? '') : '';
+          tab.isLoading = false;
+        }
+      });
+      return;
+    }
+
+    if (kind === 'text' || kind === 'markdown' || kind === 'svg') {
+      const language = getMonacoLanguageId(filePath);
+
+      // Preserve an existing non-default renderer (e.g. markdown-source) if it
+      // matches the file kind. Otherwise reset to the default.
+      const existingTab = this._tabs.find((t) => t.path === filePath);
+      if (existingTab && !existingTab.renderer.kind.startsWith(kind)) {
+        runInAction(() => {
+          existingTab.renderer = getDefaultRenderer(kind);
+        });
+      }
+
+      await modelRegistry.registerModel(
+        this.projectId,
+        this.workspaceId,
+        this.modelRootPath,
+        filePath,
+        language,
+        'disk'
+      );
+      await modelRegistry.registerModel(
+        this.projectId,
+        this.workspaceId,
+        this.modelRootPath,
+        filePath,
+        language,
+        'git'
+      );
+      await modelRegistry.registerModel(
+        this.projectId,
+        this.workspaceId,
+        this.modelRootPath,
+        filePath,
+        language,
+        'buffer'
+      );
+    }
+  }
+
+  private _unregisterModels(bufferUri: string): void {
+    modelRegistry.unregisterModel(bufferUri);
+    modelRegistry.unregisterModel(modelRegistry.toDiskUri(bufferUri));
+    modelRegistry.unregisterModel(modelRegistry.toGitUri(bufferUri, HEAD_REF));
+  }
+}
diff --git a/src/renderer/features/tasks/editor/stores/files-store-utils.ts b/src/renderer/features/tasks/editor/stores/files-store-utils.ts
new file mode 100644
index 0000000000..746fe9bbba
--- /dev/null
+++ b/src/renderer/features/tasks/editor/stores/files-store-utils.ts
@@ -0,0 +1,114 @@
+// ---------------------------------------------------------------------------
+// Excluded directory/file names — kept in sync with DEFAULT_TREE_EXCLUDE in
+// editor-file-tree.tsx so the flat tree and renderer agree on visibility.
+// ---------------------------------------------------------------------------
+
+import { FileNode } from '@shared/fs';
+
+const EXCLUDED_NAMES = new Set([
+  '.git',
+  'dist',
+  'build',
+  '.next',
+  'out',
+  '.turbo',
+  'coverage',
+  '.nyc_output',
+  '.cache',
+  'tmp',
+  'temp',
+  '.DS_Store',
+  'Thumbs.db',
+  '.vscode-test',
+  '.idea',
+  '__pycache__',
+  '.pytest_cache',
+  'venv',
+  '.venv',
+  'target',
+  '.terraform',
+  '.serverless',
+  '.checkouts',
+  'checkouts',
+  '.conductor',
+  '.cursor',
+  '.claude',
+  '.amp',
+  '.codex',
+  '.aider',
+  '.continue',
+  '.cody',
+  '.windsurf',
+  'worktrees',
+  '.worktrees',
+  '.emdash',
+  'node_modules',
+]);
+
+export function isExcluded(path: string): boolean {
+  return path.split('/').some((seg) => EXCLUDED_NAMES.has(seg));
+}
+
+// ---------------------------------------------------------------------------
+// Helpers for building FileNode from a raw entry path
+// ---------------------------------------------------------------------------
+
+export function makeNode(relPath: string, type: 'file' | 'directory', mtime?: Date): FileNode {
+  const parts = relPath.split('/').filter(Boolean);
+  const name = parts[parts.length - 1] ?? relPath;
+  const parentPath = parts.length > 1 ? parts.slice(0, -1).join('/') : null;
+  const depth = parts.length - 1;
+  const extension = type === 'file' && name.includes('.') ? name.split('.').pop() : undefined;
+
+  return {
+    path: relPath,
+    name,
+    parentPath,
+    depth,
+    type,
+    isHidden: name.startsWith('.'),
+    extension,
+    mtime,
+  };
+}
+
+// ---------------------------------------------------------------------------
+// Sorted insertion into childIndex
+// Directories come before files; within each group, alphabetical order.
+// ---------------------------------------------------------------------------
+
+export function sortedChildPaths(paths: string[], nodes: Map<string, FileNode>): string[] {
+  return [...paths].sort((a, b) => {
+    const na = nodes.get(a);
+    const nb = nodes.get(b);
+    if (!na || !nb) return 0;
+    if (na.type !== nb.type) return na.type === 'directory' ? -1 : 1;
+    return na.name.localeCompare(nb.name);
+  });
+}
+
+// ---------------------------------------------------------------------------
+// Visible rows derivation
+// ---------------------------------------------------------------------------
+
+export function buildVisibleRows(
+  nodes: Map<string, FileNode>,
+  childIndex: Map<string | null, string[]>,
+  expandedPaths: Set<string>
+): FileNode[] {
+  const rows: FileNode[] = [];
+
+  function walk(parent: string | null) {
+    for (const path of childIndex.get(parent) ?? []) {
+      const node = nodes.get(path);
+      if (!node) continue;
+      rows.push(node);
+      if (node.type === 'directory' && expandedPaths.has(path)) {
+        walk(path);
+      }
+    }
+  }
+
+  walk(null);
+  return rows;
+}
diff --git a/src/renderer/features/tasks/editor/stores/files-store.ts b/src/renderer/features/tasks/editor/stores/files-store.ts
new file mode 100644
index 0000000000..89d2af1068
--- /dev/null
+++ b/src/renderer/features/tasks/editor/stores/files-store.ts
@@ -0,0 +1,304 @@
+import { fsWatchEventChannel } from '@shared/events/fsEvents';
+import { FileNode, FileWatchEvent } from '@shared/fs';
+import {
+  isExcluded,
+  makeNode,
+  sortedChildPaths,
+} from '@renderer/features/tasks/editor/stores/files-store-utils';
+import { events, rpc } from '@renderer/lib/ipc';
+import { Resource } from '@renderer/lib/stores/resource';
+
+// ---------------------------------------------------------------------------
+// Types
+// ---------------------------------------------------------------------------
+
+export interface FilesData {
+  nodes: Map<string, FileNode>;
+  childIndex: Map<string | null, string[]>;
+}
+
+// ---------------------------------------------------------------------------
+// FilesStore
+// ---------------------------------------------------------------------------
+
+export class FilesStore {
+  // Non-observable imperative maps — tree.data drives reactive re-renders.
+  private readonly _nodes = new Map<string, FileNode>();
+  private readonly _childIndex = new Map<string | null, string[]>();
+  private readonly _loadedPaths = new Set<string>();
+  private readonly _pendingPaths = new Set<string>();
+  private _bumpTimer: ReturnType<typeof setTimeout> | null = null;
+
+  /**
+   * The reactive container for the file tree. Components observe `tree.data`
+   * (or access `nodes`/`childIndex` getters which read through `tree.data`).
+   * The data object reference is replaced whenever the tree structure changes,
+   * triggering MobX re-renders — replacing the old `generation` counter.
+   */
+  readonly tree: Resource<FilesData, FileWatchEvent[]>;
+
+  constructor(
+    private readonly projectId: string,
+    private readonly workspaceId: string
+  ) {
+    this.tree = new Resource<FilesData, FileWatchEvent[]>(
+      () => this._fetchAll(),
+      [
+        {
+          kind: 'event',
+          subscribe: (handler) => {
+            rpc.fs.watchSetPaths(projectId, workspaceId, [''], 'filetree').catch(() => {});
+            const unsub = events.on(fsWatchEventChannel, (data) => {
+              if (data.workspaceId !== workspaceId) return;
+              handler(data.events);
+            });
+            return () => {
+              unsub();
+              rpc.fs.watchStop(projectId, workspaceId, 'filetree').catch(() => {});
+            };
+          },
+          onEvent: (watchEvents, ctx) => {
+            if (!ctx.data) {
+              ctx.reload();
+              return;
+            }
+            const changed = this._applyWatchEventsInternal(watchEvents);
+            if (changed) ctx.set({ nodes: this._nodes, childIndex: this._childIndex });
+          },
+        },
+      ]
+    );
+  }
+
+  // ---------------------------------------------------------------------------
+  // Public reactive getters
+  // ---------------------------------------------------------------------------
+
+  /**
+   * Reading `nodes` establishes a MobX dependency on `tree.data`.
+   * When the tree structure changes (`tree.data` gets a new object reference),
+   * observer components re-render. The `??` fallback covers the initial null
+   * state; once set, `tree.data.nodes` and `_nodes` are the same Map instance.
+   */
+  get nodes(): Map<string, FileNode> {
+    return this.tree.data?.nodes ?? this._nodes;
+  }
+
+  get childIndex(): Map<string | null, string[]> {
+    return this.tree.data?.childIndex ?? this._childIndex;
+  }
+
+  get loadedPaths(): Set<string> {
+    return this._loadedPaths;
+  }
+
+  get pendingPaths(): Set<string> {
+    return this._pendingPaths;
+  }
+
+  get isLoading(): boolean {
+    return this.tree.loading;
+  }
+
+  get error(): string | undefined {
+    return this.tree.error;
+  }
+
+  // ---------------------------------------------------------------------------
+  // Lifecycle
+  // ---------------------------------------------------------------------------
+
+  /** Start watching — triggers initial load and subscribes to FS events. */
+  startWatching(): void {
+    this.tree.start();
+  }
+
+  dispose(): void {
+    if (this._bumpTimer) {
+      clearTimeout(this._bumpTimer);
+      this._bumpTimer = null;
+    }
+    this.tree.dispose();
+  }
+
+  // ---------------------------------------------------------------------------
+  // Public incremental loading (called from UI on expand/reveal)
+  // ---------------------------------------------------------------------------
+
+  async loadDir(dirPath: string, force = false): Promise<void> {
+    await this._loadDirInternal(dirPath, force);
+    this._bumpTreeDebounced();
+  }
+
+  async revealFile(filePath: string, expandedPaths: Set<string>): Promise<void> {
+    const parts = filePath.split('/').filter(Boolean);
+    const dirs: string[] = [];
+    for (let i = 1; i < parts.length; i++) {
+      dirs.push(parts.slice(0, i).join('/'));
+    }
+
+    for (const dir of dirs) {
+      await this._loadDirInternal(dir);
+    }
+
+    for (const dir of dirs) expandedPaths.add(dir);
+    this._bumpTree();
+  }
+
+  // ---------------------------------------------------------------------------
+  // Private helpers
+  // ---------------------------------------------------------------------------
+
+  /** Full recursive load used as the Resource's fetch function. */
+  private async _fetchAll(): Promise<FilesData> {
+    this._nodes.clear();
+    this._childIndex.clear();
+    this._loadedPaths.clear();
+    this._pendingPaths.clear();
+    await this._loadDirInternal('');
+    return { nodes: this._nodes, childIndex: this._childIndex };
+  }
+
+  /** Load a single directory level into the backing Maps. No reactivity bump. */
+  private async _loadDirInternal(dirPath: string, force = false): Promise<void> {
+    if (!force && (this._loadedPaths.has(dirPath) || this._pendingPaths.has(dirPath))) return;
+    this._pendingPaths.add(dirPath);
+
+    try {
+      const result = await rpc.fs.listFiles(this.projectId, this.workspaceId, dirPath || '.', {
+        recursive: false,
+        includeHidden: true,
+      });
+
+      if (!result.success) return;
+
+      this._applyEntries(dirPath, result.data.entries);
+
+      for (const entry of result.data.entries) {
+        if (entry.type === 'dir' && !isExcluded(entry.path)) {
+          void this._loadDirInternal(entry.path);
+        }
+      }
+
+      this._bumpTreeDebounced();
+    } catch {
+      // Silently ignore errors for individual directories
+    } finally {
+      this._pendingPaths.delete(dirPath);
+    }
+  }
+
+  private _applyEntries(
+    dirPath: string,
+    entries: Array<{ path: string; type: 'file' | 'dir'; mtime?: Date }>
+  ): void {
+    const affectedParents = new Set<string | null>();
+
+    for (const entry of entries) {
+      if (isExcluded(entry.path)) continue;
+      const node = makeNode(entry.path, entry.type === 'dir' ? 'directory' : 'file', entry.mtime);
+
+      this._nodes.set(node.path, node);
+
+      const parent = node.parentPath;
+      const siblings = this._childIndex.get(parent) ?? [];
+      if (!siblings.includes(node.path)) {
+        siblings.push(node.path);
+        this._childIndex.set(parent, siblings);
+      }
+      affectedParents.add(parent);
+    }
+
+    for (const parent of affectedParents) {
+      const children = this._childIndex.get(parent);
+      if (children) {
+        this._childIndex.set(parent, sortedChildPaths(children, this._nodes));
+      }
+    }
+
+    this._loadedPaths.add(dirPath);
+  }
+
+  private _addNode(node: FileNode): void {
+    this._nodes.set(node.path, node);
+    const parent = node.parentPath;
+    const existing = this._childIndex.get(parent) ?? [];
+    if (!existing.includes(node.path)) {
+      this._childIndex.set(parent, sortedChildPaths([...existing, node.path], this._nodes));
+    }
+  }
+
+  private _removeNode(path: string): void {
+    const node = this._nodes.get(path);
+    if (!node) return;
+
+    const siblings = this._childIndex.get(node.parentPath) ?? [];
+    this._childIndex.set(
+      node.parentPath,
+      siblings.filter((p) => p !== path)
+    );
+
+    const toRemove: string[] = [path];
+    while (toRemove.length) {
+      const p = toRemove.pop()!;
+      this._nodes.delete(p);
+      this._loadedPaths.delete(p);
+      const children = this._childIndex.get(p) ?? [];
+      toRemove.push(...children);
+      this._childIndex.delete(p);
+    }
+  }
+
+  /** Mutate the backing maps for watch events. Returns true if anything changed. */
+  private _applyWatchEventsInternal(watchEvents: FileWatchEvent[]): boolean {
+    let changed = false;
+
+    for (const evt of watchEvents) {
+      if (isExcluded(evt.path)) continue;
+
+      if (evt.type === 'create') {
+        const node = makeNode(evt.path, evt.entryType);
+        const parentLoaded = this._loadedPaths.has(node.parentPath ?? '');
+        if (parentLoaded && !this._nodes.has(evt.path)) {
+          this._addNode(node);
+          changed = true;
+        }
+      } else if (evt.type === 'delete') {
+        if (this._nodes.has(evt.path)) {
+          this._removeNode(evt.path);
+          changed = true;
+        }
+      } else if (evt.type === 'modify') {
+        const existing = this._nodes.get(evt.path);
+        if (existing) {
+          this._nodes.set(evt.path, { ...existing, mtime: new Date() });
+          changed = true;
+        }
+      } else if (evt.type === 'rename' && evt.oldPath) {
+        if (this._nodes.has(evt.oldPath)) {
+          this._removeNode(evt.oldPath);
+          changed = true;
+        }
+        const node = makeNode(evt.path, evt.entryType);
+        const parentLoaded = this._loadedPaths.has(node.parentPath ?? '');
+        if (parentLoaded) {
+          this._addNode(node);
+          changed = true;
+        }
+      }
+    }
+
+    return changed;
+  }
+
+  private _bumpTree(): void {
+    this.tree.setValue({ nodes: this._nodes, childIndex: this._childIndex });
+  }
+
+  private _bumpTreeDebounced(): void {
+    if (this._bumpTimer) clearTimeout(this._bumpTimer);
+    this._bumpTimer = setTimeout(() => {
+      this._bumpTree();
+    }, 50);
+  }
+}
diff --git a/src/renderer/features/tasks/hooks/use-is-active-task.ts b/src/renderer/features/tasks/hooks/use-is-active-task.ts
new file mode 100644
index 0000000000..f71cbb3b63
--- /dev/null
+++ b/src/renderer/features/tasks/hooks/use-is-active-task.ts
@@ -0,0 +1,7 @@
+import { useParams, useWorkspaceSlots } from '@renderer/lib/layout/navigation-provider';
+
+export function useIsActiveTask(taskId: string): boolean {
+  const { currentView } = useWorkspaceSlots();
+  const { params } = useParams('task');
+  return currentView === 'task' && params.taskId === taskId;
+}
diff --git a/src/renderer/features/tasks/hooks/use-task-view-navigation.tsx b/src/renderer/features/tasks/hooks/use-task-view-navigation.tsx
new file mode 100644
index 0000000000..d4d5a31c1d
--- /dev/null
+++ b/src/renderer/features/tasks/hooks/use-task-view-navigation.tsx
@@ -0,0 +1,42 @@
+import { useCallback, useTransition } from 'react';
+import { useProvisionedTask } from '@renderer/features/tasks/task-view-context';
+import { useWorkspaceLayoutContext } from '@renderer/lib/layout/layout-provider';
+
+export function useTaskViewNavigation() {
+  const provisionedTask = useProvisionedTask();
+  const { setCollapsed } = useWorkspaceLayoutContext();
+  const [isPending, startTransition] = useTransition();
+
+  const openAgentsView = useCallback(() => {
+    startTransition(() => {
+      const { taskView } = provisionedTask;
+      taskView.setView('agents');
+      if (taskView.rightPanelView === 'files') taskView.setRightPanelView('changes');
+    });
+  }, [provisionedTask]);
+
+  const openEditorView = useCallback(() => {
+    startTransition(() => {
+      const { taskView } = provisionedTask;
+      taskView.setView('editor');
+      taskView.setRightPanelView('files');
+    });
+    setCollapsed('right', false);
+  }, [provisionedTask, setCollapsed]);
+
+  const openDiffView = useCallback(() => {
+    startTransition(() => {
+      const { taskView } = provisionedTask;
+      taskView.setView('diff');
+      taskView.setRightPanelView('changes');
+    });
+    setCollapsed('right', false);
+  }, [provisionedTask, setCollapsed]);
+
+  return {
+    isPending,
+    openAgentsView,
+    openEditorView,
+    openDiffView,
+  };
+}
diff --git a/src/renderer/features/tasks/hooks/use-task-view-shortcuts.ts b/src/renderer/features/tasks/hooks/use-task-view-shortcuts.ts
new file mode 100644
index 0000000000..2cb915abc3
--- /dev/null
+++ b/src/renderer/features/tasks/hooks/use-task-view-shortcuts.ts
@@ -0,0 +1,66 @@
+import { useHotkey } from '@tanstack/react-hotkeys';
+import { useAppSettingsKey } from '@renderer/features/settings/use-app-settings-key';
+import { getTaskManagerStore } from '@renderer/features/tasks/stores/task-selectors';
+import { useTaskViewContext } from '@renderer/features/tasks/task-view-context';
+import {
+  getEffectiveHotkey,
+  getHotkeyRegistration,
+} from '@renderer/lib/hooks/useKeyboardShortcuts';
+import { useNavigate } from '@renderer/lib/layout/navigation-provider';
+import { useTaskViewNavigation } from './use-task-view-navigation';
+
+/**
+ * Mounts keyboard shortcuts that are scoped to the active task view:
+ * - Switch between task sub-views (conversations, diff, editor)
+ * - Navigate to the next / previous task within the same project
+ *
+ * Must be called inside a component that has access to TaskViewContext.
+ */
+export function useTaskViewShortcuts() {
+  const { value: keyboard } = useAppSettingsKey('keyboard');
+  const { projectId, taskId } = useTaskViewContext();
+  const { openAgentsView, openEditorView, openDiffView } = useTaskViewNavigation();
+  const { navigate } = useNavigate();
+  const taskMgr = getTaskManagerStore(projectId);
+  const agentsHotkey = getEffectiveHotkey('taskViewAgents', keyboard);
+  const diffHotkey = getEffectiveHotkey('taskViewDiff', keyboard);
+  const editorHotkey = getEffectiveHotkey('taskViewEditor', keyboard);
+  const nextTaskHotkey = getEffectiveHotkey('nextProject', keyboard);
+  const prevTaskHotkey = getEffectiveHotkey('prevProject', keyboard);
+
+  useHotkey(getHotkeyRegistration('taskViewAgents', keyboard), openAgentsView, {
+    enabled: agentsHotkey !== null,
+  });
+  useHotkey(getHotkeyRegistration('taskViewDiff', keyboard), openDiffView, {
+    enabled: diffHotkey !== null,
+  });
+  useHotkey(getHotkeyRegistration('taskViewEditor', keyboard), openEditorView, {
+    enabled: editorHotkey !== null,
+  });
+
+  useHotkey(
+    getHotkeyRegistration('nextProject', keyboard),
+    () => {
+      if (!taskMgr) return;
+      const ids = Array.from(taskMgr.tasks.keys());
+      const idx = ids.indexOf(taskId);
+      const nextId = ids[idx + 1];
+      if (nextId) navigate('task', { projectId, taskId: nextId });
+    },
+    { enabled: nextTaskHotkey !== null }
+  );
+
+  useHotkey(
+    getHotkeyRegistration('prevProject', keyboard),
+    () => {
+      if (!taskMgr) return;
+      const ids = Array.from(taskMgr.tasks.keys());
+      const idx = ids.indexOf(taskId);
+      if (idx > 0) {
+        const prevId = ids[idx - 1];
+        if (prevId) navigate('task', { projectId, taskId: prevId });
+      }
+    },
+    { enabled: prevTaskHotkey !== null }
+  );
+}
diff --git a/src/renderer/features/tasks/hooks/useAgentAutoApproveDefaults.ts b/src/renderer/features/tasks/hooks/useAgentAutoApproveDefaults.ts
new file mode 100644
index 0000000000..14a370e3c4
--- /dev/null
+++ b/src/renderer/features/tasks/hooks/useAgentAutoApproveDefaults.ts
@@ -0,0 +1,17 @@
+import { getAgentAutoApproveDefault } from '@shared/agent-auto-approve-defaults';
+import type { AgentProviderId } from '@shared/agent-provider-registry';
+import { useAppSettingsKey } from '@renderer/features/settings/use-app-settings-key';
+
+export function useAgentAutoApproveDefaults() {
+  const { value, isLoading, isSaving, update } = useAppSettingsKey('agentAutoApproveDefaults');
+  const defaults = value ?? {};
+
+  return {
+    defaults,
+    loading: isLoading,
+    saving: isSaving,
+    getDefault: (providerId: AgentProviderId) => getAgentAutoApproveDefault(defaults, providerId),
+    setDefault: (providerId: AgentProviderId, enabled: boolean) =>
+      update({ [providerId]: enabled }),
+  };
+}
diff --git a/src/renderer/features/tasks/hooks/useTaskSettings.ts b/src/renderer/features/tasks/hooks/useTaskSettings.ts
new file mode 100644
index 0000000000..68df0d4438
--- /dev/null
+++ b/src/renderer/features/tasks/hooks/useTaskSettings.ts
@@ -0,0 +1,36 @@
+import { useAppSettingsKey } from '@renderer/features/settings/use-app-settings-key';
+
+export interface TaskSettingsModel {
+  autoGenerateName: boolean;
+  autoTrustWorktrees: boolean;
+  loading: boolean;
+  saving: boolean;
+  isFieldOverridden: (field: 'autoGenerateName' | 'autoTrustWorktrees') => boolean;
+  updateAutoGenerateName: (next: boolean) => void;
+  updateAutoTrustWorktrees: (next: boolean) => void;
+  resetAutoGenerateName: () => void;
+  resetAutoTrustWorktrees: () => void;
+}
+
+export function useTaskSettings(): TaskSettingsModel {
+  const {
+    value: tasks,
+    isLoading: loading,
+    isSaving: saving,
+    isFieldOverridden,
+    update,
+    resetField,
+  } = useAppSettingsKey('tasks');
+
+  return {
+    autoGenerateName: tasks?.autoGenerateName ?? false,
+    autoTrustWorktrees: tasks?.autoTrustWorktrees ?? false,
+    loading,
+    saving,
+    isFieldOverridden,
+    updateAutoGenerateName: (next) => update({ autoGenerateName: next }),
+    updateAutoTrustWorktrees: (next) => update({ autoTrustWorktrees: next }),
+    resetAutoGenerateName: () => resetField('autoGenerateName'),
+    resetAutoTrustWorktrees: () => resetField('autoTrustWorktrees'),
+  };
+}
diff --git a/src/renderer/features/tasks/main-panel.tsx b/src/renderer/features/tasks/main-panel.tsx
new file mode 100644
index 0000000000..b1f4fa39ad
--- /dev/null
+++ b/src/renderer/features/tasks/main-panel.tsx
@@ -0,0 +1,108 @@
+import { Loader2 } from 'lucide-react';
+import { observer } from 'mobx-react-lite';
+import { Activity } from 'react';
+import {
+  getTaskStore,
+  taskErrorMessage,
+  taskViewKind,
+} from '@renderer/features/tasks/stores/task-selectors';
+import { useProvisionedTask, useTaskViewContext } from '@renderer/features/tasks/task-view-context';
+import { ConversationsPanel } from './conversations/conversations-panel';
+import { DiffView } from './diff-view/main-panel/diff-view';
+import { EditorMainPanel } from './editor/editor-main-panel';
+
+export const TaskMainPanel = observer(function TaskMainPanel() {
+  const { projectId, taskId } = useTaskViewContext();
+  const taskStore = getTaskStore(projectId, taskId);
+  const kind = taskViewKind(taskStore, projectId);
+
+  if (kind === 'creating') {
+    return (
+      <div className="flex h-full w-full flex-col items-center justify-center gap-3">
+        <Loader2 className="h-5 w-5 animate-spin text-foreground-muted" />
+        <p className="text-xs font-mono text-foreground-muted">Creating task</p>
+      </div>
+    );
+  }
+
+  if (kind === 'create-error') {
+    return (
+      <div className="flex h-full w-full flex-col items-center justify-center p-8">
+        <div className="flex max-w-xs flex-col items-center text-center gap-2">
+          <p className="text-sm font-medium font-mono text-foreground-destructive">
+            Error creating task
+          </p>
+          <p className="text-xs font-mono text-foreground-passive">{taskErrorMessage(taskStore)}</p>
+        </div>
+      </div>
+    );
+  }
+
+  if (kind === 'project-mounting' || kind === 'provisioning') {
+    return (
+      <div className="flex h-full w-full flex-col items-center justify-center gap-3">
+        <Loader2 className="h-5 w-5 animate-spin text-foreground-muted" />
+        <p className="text-xs font-mono text-foreground-muted">Setting up workspace…</p>
+      </div>
+    );
+  }
+
+  if (kind === 'provision-error' || kind === 'project-error') {
+    return (
+      <div className="flex h-full w-full flex-col items-center justify-center p-8">
+        <div className="flex max-w-xs flex-col items-center text-center gap-2">
+          <p className="text-sm font-medium font-mono text-foreground-destructive">
+            Failed to set up workspace
+          </p>
+          <p className="text-xs font-mono text-foreground-muted">{taskErrorMessage(taskStore)}</p>
+        </div>
+      </div>
+    );
+  }
+
+  if (kind === 'idle' || kind === 'teardown') {
+    return (
+      <div className="flex h-full w-full flex-col items-center justify-center gap-3">
+        <Loader2 className="h-5 w-5 animate-spin text-foreground-muted" />
+        <p className="text-xs font-mono text-foreground-muted">Setting up workspace…</p>
+      </div>
+    );
+  }
+
+  if (kind === 'teardown-error') {
+    return (
+      <div className="flex h-full w-full flex-col items-center justify-center p-8">
+        <div className="flex max-w-xs flex-col items-center text-center gap-2">
+          <p className="text-sm font-medium font-mono text-foreground-destructive">
+            Failed to tear down workspace
+          </p>
+          <p className="text-xs font-mono text-foreground-muted">{taskErrorMessage(taskStore)}</p>
+        </div>
+      </div>
+    );
+  }
+
+  if (kind === 'missing') {
+    return null;
+  }
+
+  return <ReadyTaskMainPanel />;
+});
+
+const ReadyTaskMainPanel = observer(function ReadyTaskMainPanel() {
+  const { taskView } = useProvisionedTask();
+
+  return (
+    <>
+      <Activity mode={taskView.view === 'agents' ? 'visible' : 'hidden'}>
+        <ConversationsPanel />
+      </Activity>
+      <Activity mode={taskView.view === 'editor' ? 'visible' : 'hidden'}>
+        <EditorMainPanel />
+      </Activity>
+      <Activity mode={taskView.view === 'diff' ? 'visible' : 'hidden'}>
+        <DiffView />
+      </Activity>
+    </>
+  );
+});
diff --git a/src/renderer/features/tasks/rename-task-modal.tsx b/src/renderer/features/tasks/rename-task-modal.tsx
new file mode 100644
index 0000000000..99144ba2c2
--- /dev/null
+++ b/src/renderer/features/tasks/rename-task-modal.tsx
@@ -0,0 +1,114 @@
+import { observer } from 'mobx-react-lite';
+import { useCallback, useState } from 'react';
+import { getTaskManagerStore } from '@renderer/features/tasks/stores/task-selectors';
+import { BaseModalProps } from '@renderer/lib/modal/modal-provider';
+import { Button } from '@renderer/lib/ui/button';
+import { ConfirmButton } from '@renderer/lib/ui/confirm-button';
+import {
+  DialogContentArea,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+} from '@renderer/lib/ui/dialog';
+import { Field, FieldGroup, FieldLabel } from '@renderer/lib/ui/field';
+import { Input } from '@renderer/lib/ui/input';
+import {
+  liveTransformTaskName,
+  MAX_TASK_NAME_LENGTH,
+  normalizeTaskName,
+} from '@renderer/utils/taskNames';
+
+type RenameTaskModalArgs = {
+  projectId: string;
+  taskId: string;
+  currentName: string;
+};
+
+type Props = BaseModalProps<void> & RenameTaskModalArgs;
+
+export const RenameTaskModal = observer(function RenameTaskModal({
+  projectId,
+  taskId,
+  currentName,
+  onSuccess,
+  onClose,
+}: Props) {
+  const [name, setName] = useState(currentName);
+  const [isSubmitting, setIsSubmitting] = useState(false);
+  const [error, setError] = useState<string | null>(null);
+
+  const taskManager = getTaskManagerStore(projectId);
+  const siblingNames = new Set(
+    Array.from(taskManager?.tasks.values() ?? [])
+      .filter((t) => t.state !== 'unregistered' && t.data.id !== taskId)
+      .map((t) => t.data.name)
+  );
+
+  const normalizedName = normalizeTaskName(name);
+  const isDuplicate = siblingNames.has(normalizedName);
+  const isUnchanged = normalizedName === currentName;
+  const isEmpty = normalizedName.length === 0;
+  const isValid = !isEmpty && !isDuplicate && !isUnchanged;
+
+  const validationMessage = isDuplicate
+    ? 'A task with this name already exists in this project.'
+    : isEmpty
+      ? 'Task name cannot be empty.'
+      : undefined;
+
+  const handleNameChange = useCallback((value: string) => {
+    setName(liveTransformTaskName(value));
+    setError(null);
+  }, []);
+
+  const handleSubmit = useCallback(async () => {
+    if (!isValid) return;
+    const task = taskManager?.tasks.get(taskId);
+    if (!task) return;
+    setIsSubmitting(true);
+    setError(null);
+    try {
+      await task.rename(normalizedName);
+      onSuccess();
+    } catch (e) {
+      setError(e instanceof Error ? e.message : 'Failed to rename task');
+      setIsSubmitting(false);
+    }
+  }, [isValid, taskManager, taskId, normalizedName, onSuccess]);
+
+  return (
+    <>
+      <DialogHeader showCloseButton={false}>
+        <DialogTitle>Rename task</DialogTitle>
+      </DialogHeader>
+      <DialogContentArea className="pt-0">
+        <FieldGroup>
+          <Field>
+            <FieldLabel>Task name</FieldLabel>
+            <Input
+              value={name}
+              onChange={(e) => handleNameChange(e.target.value)}
+              onKeyDown={(e) => {
+                if (e.key === 'Enter') void handleSubmit();
+              }}
+              maxLength={MAX_TASK_NAME_LENGTH}
+              autoFocus
+            />
+            {validationMessage && !isUnchanged && (
+              <p className="text-xs text-destructive mt-1">{validationMessage}</p>
+            )}
+            {error && <p className="text-xs text-destructive mt-1">{error}</p>}
+          </Field>
+        </FieldGroup>
+      </DialogContentArea>
+      <DialogFooter>
+        <Button variant="outline" onClick={onClose}>
+          Cancel
+        </Button>
+        <ConfirmButton onClick={() => void handleSubmit()} disabled={!isValid || isSubmitting}>
+          {isSubmitting ? 'Renaming...' : 'Rename'}
+        </ConfirmButton>
+      </DialogFooter>
+    </>
+  );
+});
diff --git a/src/renderer/features/tasks/right-panel.tsx b/src/renderer/features/tasks/right-panel.tsx
new file mode 100644
index 0000000000..1e004a79e6
--- /dev/null
+++ b/src/renderer/features/tasks/right-panel.tsx
@@ -0,0 +1,29 @@
+import { observer } from 'mobx-react-lite';
+import { useEffect, useRef } from 'react';
+import { useProvisionedTask } from '@renderer/features/tasks/task-view-context';
+import { useWorkspaceLayoutContext } from '@renderer/lib/layout/layout-provider';
+import { ChangesPanel } from './diff-view/changes-panel/changes-panel';
+import { EditorFileTree } from './editor/editor-file-tree';
+import { TerminalsPanel } from './terminals/terminal-panel';
+
+export const TaskRightSidebar = observer(function TaskRightSidebar() {
+  const { taskView } = useProvisionedTask();
+  const { isRightOpen } = useWorkspaceLayoutContext();
+
+  const prevIsRightOpenRef = useRef(isRightOpen);
+  useEffect(() => {
+    if (prevIsRightOpenRef.current && !isRightOpen) {
+      taskView.setFocusedRegion('main');
+    }
+    prevIsRightOpenRef.current = isRightOpen;
+  }, [isRightOpen, taskView]);
+
+  switch (taskView.rightPanelView) {
+    case 'changes':
+      return <ChangesPanel />;
+    case 'files':
+      return <EditorFileTree />;
+    case 'terminals':
+      return <TerminalsPanel />;
+  }
+});
diff --git a/src/renderer/features/tasks/stores/dev-server-store.ts b/src/renderer/features/tasks/stores/dev-server-store.ts
new file mode 100644
index 0000000000..3567743cdf
--- /dev/null
+++ b/src/renderer/features/tasks/stores/dev-server-store.ts
@@ -0,0 +1,49 @@
+import { hostPreviewEventChannel } from '@shared/events/hostPreviewEvents';
+import type { HostPreviewEvent } from '@shared/hostPreview';
+import { events } from '@renderer/lib/ipc';
+import { Resource } from '@renderer/lib/stores/resource';
+
+export class DevServerStore {
+  /**
+   * Event-driven resource — starts empty, updated by `hostPreviewEventChannel`
+   * events. Each event atomically replaces the map to trigger MobX reactivity.
+   */
+  readonly servers: Resource<Map<string, string>, HostPreviewEvent>;
+
+  constructor(taskId: string, workspaceId: string) {
+    this.servers = new Resource<Map<string, string>, HostPreviewEvent>(
+      null,
+      [
+        {
+          kind: 'event',
+          subscribe: (handler) =>
+            events.on(hostPreviewEventChannel, (event) => {
+              if (event.taskId === taskId || event.taskId === workspaceId) {
+                handler(event);
+              }
+            }),
+          onEvent: (event, ctx) => {
+            const next = new Map(ctx.data ?? []);
+            if (event.type === 'url' && event.terminalId && event.url) {
+              next.set(event.terminalId, event.url);
+            } else if (event.type === 'exit' && event.terminalId) {
+              next.delete(event.terminalId);
+            }
+            ctx.set(next);
+          },
+        },
+      ],
+      { init: new Map() }
+    );
+
+    this.servers.start();
+  }
+
+  get urls(): string[] {
+    return Array.from(this.servers.data?.values() ?? []);
+  }
+
+  dispose(): void {
+    this.servers.dispose();
+  }
+}
diff --git a/src/renderer/features/tasks/stores/lifecycle-scripts.test.ts b/src/renderer/features/tasks/stores/lifecycle-scripts.test.ts
new file mode 100644
index 0000000000..0661bdd8ed
--- /dev/null
+++ b/src/renderer/features/tasks/stores/lifecycle-scripts.test.ts
@@ -0,0 +1,65 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { ptyExitChannel } from '@shared/events/ptyEvents';
+import { LifecycleScriptStore } from './lifecycle-scripts';
+
+const eventHandlers = new Map<string, (data: unknown) => void>();
+const offPtyExit = vi.fn();
+
+vi.mock('@renderer/lib/ipc', () => ({
+  events: {
+    on: vi.fn((event: { name: string }, cb: (data: unknown) => void, topic?: string) => {
+      eventHandlers.set(`${event.name}.${topic ?? ''}`, cb);
+      return offPtyExit;
+    }),
+  },
+  rpc: {},
+}));
+
+vi.mock('@renderer/lib/pty/pty-session', () => ({
+  PtySession: class {
+    pty = null;
+    status = 'disconnected';
+
+    constructor(readonly sessionId: string) {}
+
+    connect = vi.fn(async () => {});
+    dispose = vi.fn();
+  },
+}));
+
+describe('LifecycleScriptStore', () => {
+  beforeEach(() => {
+    eventHandlers.clear();
+    offPtyExit.mockClear();
+  });
+
+  it('tracks a running script until its PTY exits', () => {
+    const store = new LifecycleScriptStore(
+      { id: 'script-id', type: 'run', label: 'Run', command: 'pnpm dev' },
+      'project-1',
+      'branch:feature'
+    );
+
+    expect(store.isRunning).toBe(false);
+
+    store.markRunning();
+
+    expect(store.isRunning).toBe(true);
+
+    eventHandlers.get(`${ptyExitChannel.name}.${store.session.sessionId}`)?.({ exitCode: 0 });
+
+    expect(store.isRunning).toBe(false);
+  });
+
+  it('unsubscribes from PTY exit events on dispose', () => {
+    const store = new LifecycleScriptStore(
+      { id: 'script-id', type: 'run', label: 'Run', command: 'pnpm dev' },
+      'project-1',
+      'branch:feature'
+    );
+
+    store.dispose();
+
+    expect(offPtyExit).toHaveBeenCalledTimes(1);
+  });
+});
diff --git a/src/renderer/features/tasks/stores/lifecycle-scripts.ts b/src/renderer/features/tasks/stores/lifecycle-scripts.ts
new file mode 100644
index 0000000000..0e24b82198
--- /dev/null
+++ b/src/renderer/features/tasks/stores/lifecycle-scripts.ts
@@ -0,0 +1,181 @@
+import { action, computed, makeObservable, observable, onBecomeObserved, runInAction } from 'mobx';
+import { ptyExitChannel } from '@shared/events/ptyEvents';
+import { makePtySessionId } from '@shared/ptySessionId';
+import { createScriptTerminalId } from '@shared/terminals';
+import { events, rpc } from '@renderer/lib/ipc';
+import { PtySession } from '@renderer/lib/pty/pty-session';
+import { TabViewProvider } from '@renderer/lib/stores/generic-tab-view';
+import {
+  addTabId,
+  setNextTabActive,
+  setPreviousTabActive,
+  setTabActive,
+  setTabActiveIndex,
+} from '@renderer/lib/stores/tab-utils';
+
+export type ScriptType = 'setup' | 'run' | 'teardown';
+
+export type LifecycleScriptData = {
+  id: string;
+  type: ScriptType;
+  label: string;
+  command: string;
+};
+
+export class LifecycleScriptStore {
+  data: LifecycleScriptData;
+  session: PtySession;
+  isRunning = false;
+  private offPtyExit: (() => void) | null = null;
+
+  constructor(data: LifecycleScriptData, projectId: string, workspaceId: string) {
+    this.data = data;
+    this.session = new PtySession(makePtySessionId(projectId, workspaceId, data.id));
+    this.offPtyExit = events.on(ptyExitChannel, () => this.markExited(), this.session.sessionId);
+    makeObservable(this, {
+      data: observable,
+      session: observable,
+      isRunning: observable,
+      markRunning: action,
+      markExited: action,
+    });
+  }
+
+  markRunning(): void {
+    this.isRunning = true;
+  }
+
+  markExited(): void {
+    this.isRunning = false;
+  }
+
+  dispose() {
+    this.offPtyExit?.();
+    this.offPtyExit = null;
+    this.session.dispose();
+  }
+}
+
+export class LifecycleScriptsStore implements TabViewProvider<LifecycleScriptStore, never> {
+  private readonly projectId: string;
+  private readonly workspaceId: string;
+  private _loaded = false;
+  scripts = observable.map<string, LifecycleScriptStore>();
+  tabOrder: string[] = [];
+  activeTabId: string | undefined = undefined;
+
+  constructor(projectId: string, workspaceId: string) {
+    this.projectId = projectId;
+    this.workspaceId = workspaceId;
+    makeObservable(this, {
+      scripts: observable,
+      tabOrder: observable,
+      activeTabId: observable,
+      tabs: computed,
+      activeTab: computed,
+      setNextTabActive: action,
+      setPreviousTabActive: action,
+      setTabActiveIndex: action,
+      setActiveTab: action,
+    });
+    onBecomeObserved(this, 'tabOrder', () => {
+      if (this._loaded) return;
+      void this.load();
+    });
+  }
+
+  get tabs(): LifecycleScriptStore[] {
+    return this.tabOrder
+      .map((id) => this.scripts.get(id))
+      .filter(Boolean) as LifecycleScriptStore[];
+  }
+
+  get activeTab(): LifecycleScriptStore | undefined {
+    return this.activeTabId ? this.scripts.get(this.activeTabId) : undefined;
+  }
+
+  setActiveTab(id: string): void {
+    setTabActive(this, id);
+  }
+
+  setNextTabActive(): void {
+    setNextTabActive(this);
+  }
+
+  setPreviousTabActive(): void {
+    setPreviousTabActive(this);
+  }
+
+  setTabActiveIndex(index: number): void {
+    setTabActiveIndex(this, index);
+  }
+
+  closeActiveTab(): void {
+    // lifecycle scripts are not closeable
+  }
+
+  addTab(_args: never): void {
+    // lifecycle scripts come from settings, not user actions
+  }
+
+  removeTab(_id: string): void {
+    // lifecycle scripts are not removeable
+  }
+
+  reorderTabs(_fromIndex: number, _toIndex: number): void {
+    // lifecycle scripts have a fixed order
+  }
+
+  private async load(): Promise<void> {
+    this._loaded = true;
+    const settings = await rpc.tasks.getWorkspaceSettings(this.projectId, this.workspaceId);
+
+    const entries: { type: ScriptType; command: string; label: string }[] = [];
+    if (settings.scripts?.setup) {
+      entries.push({ type: 'setup', command: settings.scripts.setup, label: 'Setup' });
+    }
+    if (settings.scripts?.run) {
+      entries.push({ type: 'run', command: settings.scripts.run, label: 'Run' });
+    }
+    if (settings.scripts?.teardown) {
+      entries.push({ type: 'teardown', command: settings.scripts.teardown, label: 'Teardown' });
+    }
+
+    const resolved = await Promise.all(
+      entries.map(async (entry) => {
+        const id = await createScriptTerminalId({
+          projectId: this.projectId,
+          scopeId: this.workspaceId,
+          type: entry.type,
+          script: entry.command,
+        });
+        return { ...entry, id };
+      })
+    );
+
+    runInAction(() => {
+      for (const entry of resolved) {
+        const store = new LifecycleScriptStore(
+          { id: entry.id, type: entry.type, label: entry.label, command: entry.command },
+          this.projectId,
+          this.workspaceId
+        );
+        this.scripts.set(entry.id, store);
+        addTabId(this, entry.id);
+        void store.session.connect();
+      }
+      if (!this.activeTabId && this.tabOrder.length > 0) {
+        this.activeTabId = this.tabOrder[0];
+      }
+    });
+  }
+
+  dispose(): void {
+    for (const script of this.scripts.values()) {
+      script.dispose();
+    }
+    this.scripts.clear();
+    this.tabOrder = [];
+    this.activeTabId = undefined;
+  }
+}
diff --git a/src/renderer/features/tasks/stores/pr-store.ts b/src/renderer/features/tasks/stores/pr-store.ts
new file mode 100644
index 0000000000..502c9c0500
--- /dev/null
+++ b/src/renderer/features/tasks/stores/pr-store.ts
@@ -0,0 +1,210 @@
+import { makeAutoObservable, type IObservableArray } from 'mobx';
+import { gitRefChangedChannel, gitWorkspaceChangedChannel } from '@shared/events/gitEvents';
+import { commitRef, mergeBaseRange, refsEqual, remoteRef, type GitChange } from '@shared/git';
+import { isForkPr, ownerFromUrl, selectCurrentPr, type PullRequest } from '@shared/pull-requests';
+import type { Task } from '@shared/tasks';
+import type { RepositoryStore } from '@renderer/features/projects/stores/repository-store';
+import { events, rpc } from '@renderer/lib/ipc';
+import { Resource } from '@renderer/lib/stores/resource';
+import { captureTelemetry } from '@renderer/utils/telemetryClient';
+import { isRegistered, type TaskStore } from './task';
+
+type MergeMode = 'merge' | 'squash' | 'rebase';
+export type MergeResult = { success: true } | { success: false; error: string };
+
+/** Extract the numeric PR number from the identifier field (e.g. "#123" → 123). */
+function prNumberFromIdentifier(identifier: string | null): number | null {
+  if (!identifier) return null;
+  const n = Number.parseInt(identifier.replace('#', ''), 10);
+  return Number.isNaN(n) ? null : n;
+}
+
+export class PrStore {
+  private readonly _prFiles = new Map<
+    string,
+    { resource: Resource<GitChange[]>; headRefOid: string }
+  >();
+
+  constructor(
+    private readonly projectId: string,
+    private readonly workspaceId: string,
+    private readonly repositoryStore: RepositoryStore,
+    private readonly tasks: IObservableArray<TaskStore>
+  ) {
+    makeAutoObservable(this);
+  }
+
+  get pullRequests(): PullRequest[] {
+    const task = this.tasks[0];
+    if (!task || !isRegistered(task)) return [];
+    return (task.data as Task).prs ?? [];
+  }
+
+  get currentPr(): PullRequest | undefined {
+    return selectCurrentPr(this.pullRequests);
+  }
+
+  getFiles(pr: PullRequest): Resource<GitChange[]> {
+    const key = pr.url;
+    const existing = this._prFiles.get(key);
+    if (existing && existing.headRefOid !== pr.headRefOid) {
+      existing.resource.dispose();
+      this._prFiles.delete(key);
+    }
+    if (!this._prFiles.has(key)) {
+      const resource = new Resource<GitChange[]>(
+        () => this._fetchPrFiles(pr),
+        [
+          { kind: 'poll', intervalMs: 60_000, pauseWhenHidden: true, demandGated: true },
+          {
+            kind: 'event',
+            subscribe: (handler) => {
+              const unsubHead = events.on(gitWorkspaceChangedChannel, (p) => {
+                if (p.workspaceId === this.workspaceId && p.kind === 'head') handler();
+              });
+              const unsubBaseRef = events.on(gitRefChangedChannel, (p) => {
+                if (p.projectId !== this.projectId || p.kind !== 'remote-refs') return;
+                const baseRef = remoteRef(this.repositoryStore.configuredRemote, pr.baseRefName);
+                const relevant = !p.changedRefs || p.changedRefs.some((r) => refsEqual(r, baseRef));
+                if (relevant) handler();
+              });
+              const unsubPrHead = events.on(gitRefChangedChannel, (p) => {
+                if (p.projectId !== this.projectId || p.kind !== 'remote-refs') return;
+                const sameRepoRef = remoteRef(
+                  this.repositoryStore.configuredRemote,
+                  pr.headRefName
+                );
+                const forkOwner = isForkPr(pr)
+                  ? (ownerFromUrl(pr.headRepositoryUrl) ?? null)
+                  : null;
+                const forkRef = forkOwner ? remoteRef(forkOwner, pr.headRefName) : null;
+                const relevant =
+                  !p.changedRefs ||
+                  p.changedRefs.some(
+                    (r) => refsEqual(r, sameRepoRef) || (forkRef != null && refsEqual(r, forkRef))
+                  );
+                if (relevant) handler();
+              });
+              return () => {
+                unsubHead();
+                unsubBaseRef();
+                unsubPrHead();
+              };
+            },
+            onEvent: 'reload',
+            debounceMs: 500,
+          },
+        ]
+      );
+      resource.start();
+      this._prFiles.set(key, { resource, headRefOid: pr.headRefOid });
+    }
+    return this._prFiles.get(key)!.resource;
+  }
+
+  async mergePr(
+    id: string,
+    options: { strategy: MergeMode; commitHeadOid?: string }
+  ): Promise<MergeResult> {
+    const pr = this.pullRequests.find((p) => p.url === id);
+    if (!pr) {
+      captureTelemetry('pr_merged', {
+        strategy: options.strategy,
+        success: false,
+        error_type: 'pr_not_found',
+        project_id: this.projectId,
+        task_id: this.workspaceId,
+      });
+      return { success: false, error: 'Pull request not found' };
+    }
+
+    const prNumber = prNumberFromIdentifier(pr.identifier);
+    if (!prNumber) return { success: false, error: 'Could not determine PR number' };
+
+    const result = await rpc.pullRequests.mergePullRequest(pr.repositoryUrl, prNumber, options);
+    if (result.success) {
+      captureTelemetry('pr_merged', {
+        strategy: options.strategy,
+        success: true,
+        project_id: this.projectId,
+        task_id: this.workspaceId,
+      });
+      return { success: true };
+    }
+
+    captureTelemetry('pr_merged', {
+      strategy: options.strategy,
+      success: false,
+      error_type: 'merge_failed',
+      project_id: this.projectId,
+      task_id: this.workspaceId,
+    });
+    return { success: false, error: result.error ?? 'Merge failed' };
+  }
+
+  async markReadyForReview(id: string): Promise<void> {
+    const pr = this.pullRequests.find((p) => p.url === id);
+    if (!pr) return;
+    const prNumber = prNumberFromIdentifier(pr.identifier);
+    if (!prNumber) return;
+    await rpc.pullRequests.markReadyForReview(pr.repositoryUrl, prNumber);
+  }
+
+  /**
+   * Trigger a single PR refresh from GitHub. The updated PR will arrive via
+   * `prUpdatedChannel` and be merged into `task.data.prs` by `TaskManagerStore`.
+   */
+  refresh(id: string): void {
+    const pr = this.pullRequests.find((p) => p.url === id);
+    if (!pr) return;
+
+    const prNumber = prNumberFromIdentifier(pr.identifier);
+    if (prNumber) {
+      void rpc.pullRequests.refreshPullRequest(pr.repositoryUrl, prNumber);
+    }
+
+    // Also trigger a check-run sync — the result arrives embedded in the
+    // next prUpdatedChannel event emitted by syncChecks.
+    void rpc.pullRequests.syncChecks(pr.url, pr.headRefOid);
+  }
+
+  dispose(): void {
+    for (const entry of this._prFiles.values()) entry.resource.dispose();
+  }
+
+  private async _fetchPrFiles(pr: PullRequest): Promise<GitChange[]> {
+    const remote = this.repositoryStore.configuredRemote;
+    // Dereference the MobX-observable Remote into a plain object — MobX proxies
+    // cannot be structured-cloned by Electron IPC and will throw.
+    const plainRemote = { name: remote.name, url: remote.url };
+    const baseRef = remoteRef(plainRemote, pr.baseRefName);
+    const headRef = commitRef(pr.headRefOid);
+    const range = mergeBaseRange(baseRef, headRef);
+
+    const tryRange = async (): Promise<GitChange[] | null> => {
+      const result = await rpc.git.getChangedFiles(this.projectId, this.workspaceId, range);
+      if (!result.success) return null;
+      const changes = result.data.changes;
+      const expectedChangedFiles = pr.changedFiles ?? 0;
+      if (expectedChangedFiles > 0 && changes.length === 0) return null;
+      if (expectedChangedFiles > 0 && changes.length > expectedChangedFiles * 2) return null;
+      return changes;
+    };
+
+    const first = await tryRange();
+    if (first) return first;
+
+    // headRefOid not available locally — fetch the PR branch then retry
+    const prNumber = prNumberFromIdentifier(pr.identifier);
+    if (prNumber) {
+      await rpc.repository.fetchPrForReview(
+        this.projectId,
+        prNumber,
+        pr.headRefName,
+        pr.headRepositoryUrl,
+        isForkPr(pr)
+      );
+    }
+    return (await tryRange()) ?? [];
+  }
+}
diff --git a/src/renderer/features/tasks/stores/task-manager.ts b/src/renderer/features/tasks/stores/task-manager.ts
new file mode 100644
index 0000000000..d819621c20
--- /dev/null
+++ b/src/renderer/features/tasks/stores/task-manager.ts
@@ -0,0 +1,411 @@
+import { makeObservable, observable, reaction, runInAction, toJS } from 'mobx';
+import { toast } from 'sonner';
+import { prSyncProgressChannel, prUpdatedChannel } from '@shared/events/prEvents';
+import { taskStatusUpdatedChannel } from '@shared/events/taskEvents';
+import type {
+  CreateTaskError,
+  CreateTaskParams,
+  CreateTaskWarning,
+  Task,
+  TaskLifecycleStatus,
+} from '@shared/tasks';
+import type { TaskViewSnapshot } from '@shared/view-state';
+import { getProjectManagerStore } from '@renderer/features/projects/stores/project-selectors';
+import type { RepositoryStore } from '@renderer/features/projects/stores/repository-store';
+import { events, rpc } from '@renderer/lib/ipc';
+import {
+  createUnprovisionedTask,
+  createUnregisteredTask,
+  isProvisioned,
+  isRegistered,
+  isUnprovisioned,
+  isUnregistered,
+  TaskStore,
+} from './task';
+
+function formatCreateTaskError(error: CreateTaskError): string {
+  switch (error.type) {
+    case 'project-not-found':
+      return 'Project not found.';
+    case 'initial-commit-required':
+      return 'Create an initial commit to enable branch-based tasks.';
+    case 'branch-create-failed': {
+      switch (error.error.type) {
+        case 'already_exists':
+          return `Branch "${error.error.name}" already exists. Try a different task name.`;
+        case 'invalid_base':
+          return `Source branch "${error.error.from}" is not a valid base. Check that it exists locally or on the selected remote.`;
+        case 'invalid_name':
+          return `Branch "${error.error.name}" is not a valid branch name.`;
+        case 'error':
+          return `Could not create branch "${error.branch}": ${error.error.message}`;
+      }
+    }
+    case 'pr-fetch-failed':
+      return error.error.type === 'not_found'
+        ? `PR #${error.error.prNumber} was not found on remote "${error.remote}".`
+        : `Could not fetch the pull request branch: ${error.error.message}`;
+    case 'branch-not-found':
+      return `Branch "${error.branch}" was not found locally or on the remote. Make sure the PR branch exists.`;
+    case 'worktree-setup-failed':
+      return error.message
+        ? `Could not set up the worktree for branch "${error.branch}": ${error.message}`
+        : `Could not set up the worktree for branch "${error.branch}".`;
+    case 'provision-failed':
+      return `Task could not be provisioned: ${error.message}`;
+  }
+}
+
+function formatCreateTaskWarning(warning: CreateTaskWarning): string {
+  switch (warning.type) {
+    case 'branch-publish-failed': {
+      const detail =
+        'message' in warning.error
+          ? (warning.error.message ?? warning.error.type)
+          : warning.error.type;
+      return `Failed to publish branch "${warning.branch}" to "${warning.remote}": ${detail}`;
+    }
+  }
+}
+
+export class TaskManagerStore {
+  private readonly projectId: string;
+  private readonly _repository: RepositoryStore;
+  private _loadPromise: Promise<void> | null = null;
+  private _teardownPromises = new Map<string, Promise<void>>();
+  private _provisionPromises = new Map<string, Promise<void>>();
+
+  private _unsubPrUpdated: (() => void) | null = null;
+  private _unsubPrSyncProgress: (() => void) | null = null;
+  private _disposeRepositoryReaction: (() => void) | null = null;
+
+  tasks = observable.map<string, TaskStore>();
+
+  constructor(projectId: string, repository: RepositoryStore) {
+    this.projectId = projectId;
+    this._repository = repository;
+    makeObservable(this, { tasks: observable });
+
+    events.on(taskStatusUpdatedChannel, ({ taskId, projectId: evtProjectId, status }) => {
+      if (evtProjectId !== this.projectId) return;
+      const store = this.tasks.get(taskId);
+      if (store && isProvisioned(store)) {
+        runInAction(() => {
+          store.data.status = status as TaskLifecycleStatus;
+        });
+      }
+    });
+
+    this._unsubPrUpdated = events.on(prUpdatedChannel, ({ prs }) => {
+      const repoUrl = this._repository.repositoryUrl;
+      if (!repoUrl) return;
+      for (const pr of prs) {
+        if (pr.repositoryUrl !== repoUrl) continue;
+        for (const [, store] of this.tasks) {
+          if (!isRegistered(store)) continue;
+          const task = store.data as Task;
+          if (task.taskBranch !== pr.headRefName) continue;
+          runInAction(() => {
+            const idx = task.prs.findIndex((p) => p.url === pr.url);
+            if (idx >= 0) {
+              task.prs.splice(idx, 1, pr);
+            } else {
+              task.prs.push(pr);
+            }
+          });
+        }
+      }
+    });
+
+    this._unsubPrSyncProgress = events.on(prSyncProgressChannel, (progress) => {
+      if (progress.status !== 'done') return;
+      const repoUrl = this._repository.repositoryUrl;
+      if (!repoUrl || progress.remoteUrl !== repoUrl) return;
+      for (const [, store] of this.tasks) {
+        if (isRegistered(store)) {
+          void this._reloadPrsForTask(store);
+        }
+      }
+    });
+
+    this._disposeRepositoryReaction = reaction(
+      () => this._repository.repositoryUrl,
+      () => {
+        for (const [, store] of this.tasks) {
+          if (isRegistered(store)) {
+            void this._reloadPrsForTask(store);
+          }
+        }
+      }
+    );
+  }
+
+  private async _reloadPrsForTask(store: TaskStore): Promise<void> {
+    if (!isRegistered(store)) return;
+    const result = await rpc.pullRequests.getPullRequestsForTask(this.projectId, store.data.id);
+    if (!result.success) return;
+    const prs = result.prs ?? [];
+    runInAction(() => {
+      if (isRegistered(store)) {
+        (store.data as Task).prs = prs;
+      }
+    });
+  }
+
+  loadTasks(): Promise<void> {
+    if (!this._loadPromise) {
+      this._loadPromise = rpc.tasks
+        .getTasks(this.projectId)
+        .then((tasks) => {
+          runInAction(() => {
+            for (const t of tasks) {
+              this.tasks.set(t.id, createUnprovisionedTask(t));
+            }
+          });
+          const reloadPromises = tasks.flatMap((t) => {
+            const store = this.tasks.get(t.id);
+            return store && isRegistered(store) ? [this._reloadPrsForTask(store)] : [];
+          });
+          void Promise.all(reloadPromises);
+        })
+        .catch((e) => {
+          console.error('Error loading tasks', e);
+        });
+    }
+    return this._loadPromise;
+  }
+
+  async createTask(params: CreateTaskParams) {
+    runInAction(() => {
+      this.tasks.set(
+        params.id,
+        createUnregisteredTask({
+          id: params.id,
+          lastInteractedAt: new Date().toISOString(),
+          createdAt: new Date().toISOString(),
+          name: params.name,
+          status: params.initialStatus ?? 'in_progress',
+          statusChangedAt: new Date().toISOString(),
+          isPinned: false,
+        })
+      );
+    });
+
+    const sourceBranch = structuredClone(toJS(params.sourceBranch));
+
+    const result = await rpc.tasks.createTask({ ...params, sourceBranch }).catch((e: unknown) => {
+      // Network/IPC-level failure — surface as a generic error.
+      const message = e instanceof Error ? e.message : String(e);
+      runInAction(() => {
+        const current = this.tasks.get(params.id);
+        if (current && isUnregistered(current)) {
+          current.phase = 'create-error';
+          current.errorMessage = message;
+        }
+      });
+      throw e;
+    });
+
+    if (!result.success) {
+      const message = formatCreateTaskError(result.error);
+      runInAction(() => {
+        const current = this.tasks.get(params.id);
+        if (current && isUnregistered(current)) {
+          current.phase = 'create-error';
+          current.errorMessage = message;
+        }
+      });
+      throw new Error(message);
+    }
+
+    runInAction(() => {
+      const current = this.tasks.get(params.id);
+      if (current && isUnregistered(current)) {
+        current.transitionToUnprovisioned(result.data.task, 'provision');
+      }
+    });
+
+    if (result.data.warning) {
+      toast.error(formatCreateTaskWarning(result.data.warning));
+    }
+
+    await this.provisionTask(params.id);
+  }
+
+  async provisionTask(taskId: string): Promise<void> {
+    await getProjectManagerStore().mountProject(this.projectId);
+    await this.loadTasks();
+
+    const inFlight = this._provisionPromises.get(taskId);
+    if (inFlight) return inFlight;
+
+    const task = this.tasks.get(taskId);
+    if (!task || !isUnprovisioned(task)) return;
+
+    runInAction(() => {
+      task.phase = 'provision';
+    });
+
+    const promise = Promise.all([
+      rpc.tasks.provisionTask(taskId),
+      rpc.viewState.get(`task:${taskId}`),
+    ])
+      .then(([result, savedSnapshot]) => {
+        runInAction(() => {
+          const current = this.tasks.get(taskId);
+          if (current && isUnprovisioned(current)) {
+            current.transitionToProvisioned(
+              { ...current.data, lastInteractedAt: new Date().toISOString() },
+              result.path,
+              this._repository,
+              savedSnapshot as TaskViewSnapshot | undefined
+            );
+            current.activate();
+          }
+        });
+      })
+      .catch((err: unknown) => {
+        runInAction(() => {
+          const current = this.tasks.get(taskId);
+          if (current && isUnprovisioned(current)) {
+            current.phase = 'provision-error';
+            current.errorMessage = err instanceof Error ? err.message : String(err);
+          }
+        });
+        throw err;
+      })
+      .finally(() => {
+        this._provisionPromises.delete(taskId);
+      });
+
+    this._provisionPromises.set(taskId, promise);
+    return promise;
+  }
+
+  async teardownTask(taskId: string): Promise<void> {
+    const inFlight = this._teardownPromises.get(taskId);
+    if (inFlight) return inFlight;
+
+    const task = this.tasks.get(taskId);
+    if (!task) return;
+
+    runInAction(() => {
+      const current = this.tasks.get(taskId);
+      if (!current) return;
+      if (isProvisioned(current)) {
+        current.transitionToUnprovisioned({ ...current.data }, 'teardown');
+      } else if (isUnprovisioned(current)) {
+        current.phase = 'teardown';
+      }
+    });
+
+    const promise = rpc.tasks
+      .teardownTask(this.projectId, taskId)
+      .then(() => {
+        runInAction(() => {
+          const current = this.tasks.get(taskId);
+          if (current && isUnprovisioned(current)) {
+            current.phase = 'idle';
+          }
+        });
+      })
+      .catch((err: unknown) => {
+        runInAction(() => {
+          const current = this.tasks.get(taskId);
+          if (current && isUnprovisioned(current)) {
+            current.phase = 'teardown-error';
+          }
+        });
+        throw err;
+      })
+      .finally(() => {
+        this._teardownPromises.delete(taskId);
+      });
+
+    this._teardownPromises.set(taskId, promise);
+    return promise;
+  }
+
+  async setTaskPinned(taskId: string, isPinned: boolean): Promise<void> {
+    const task = this.tasks.get(taskId);
+    if (!task) return;
+    await task.setPinned(isPinned);
+  }
+
+  async archiveTask(taskId: string): Promise<void> {
+    const currentTask = this.tasks.get(taskId);
+    if (!currentTask || !isRegistered(currentTask)) return;
+    const previousArchivedAt = currentTask.data.archivedAt;
+
+    try {
+      runInAction(() => {
+        const task = this.tasks.get(taskId);
+        if (task && isRegistered(task)) {
+          task.data.archivedAt = new Date().toISOString();
+        }
+      });
+      await rpc.tasks.archiveTask(this.projectId, taskId);
+      void this.teardownTask(taskId).catch(() => {});
+    } catch (e) {
+      runInAction(() => {
+        const task = this.tasks.get(taskId);
+        if (task && isRegistered(task)) {
+          task.data.archivedAt = previousArchivedAt;
+        }
+      });
+      throw e;
+    }
+  }
+
+  async restoreTask(taskId: string): Promise<void> {
+    const task = this.tasks.get(taskId);
+    if (!task || !isRegistered(task)) return;
+    const archivedAt = task.data.archivedAt;
+
+    try {
+      await rpc.tasks.restoreTask(taskId);
+      runInAction(() => {
+        const current = this.tasks.get(taskId);
+        if (current && isRegistered(current)) {
+          current.data.archivedAt = undefined;
+        }
+      });
+    } catch (e) {
+      runInAction(() => {
+        const current = this.tasks.get(taskId);
+        if (current && isRegistered(current)) {
+          current.data.archivedAt = archivedAt;
+        }
+      });
+      throw e;
+    }
+  }
+
+  async deleteTask(taskId: string): Promise<void> {
+    const task = this.tasks.get(taskId);
+    if (!task) return;
+
+    runInAction(() => {
+      this.tasks.delete(taskId);
+    });
+
+    try {
+      task.dispose();
+      await rpc.tasks.deleteTask(this.projectId, taskId);
+    } catch (e) {
+      runInAction(() => {
+        this.tasks.set(taskId, task);
+      });
+      throw e;
+    }
+  }
+
+  dispose(): void {
+    this._unsubPrUpdated?.();
+    this._unsubPrUpdated = null;
+    this._unsubPrSyncProgress?.();
+    this._unsubPrSyncProgress = null;
+    this._disposeRepositoryReaction?.();
+    this._disposeRepositoryReaction = null;
+  }
+}
diff --git a/src/renderer/features/tasks/stores/task-selectors.ts b/src/renderer/features/tasks/stores/task-selectors.ts
new file mode 100644
index 0000000000..1d5cda057d
--- /dev/null
+++ b/src/renderer/features/tasks/stores/task-selectors.ts
@@ -0,0 +1,146 @@
+import type { Task } from '@shared/tasks';
+import { isUnmountedProject } from '@renderer/features/projects/stores/project';
+import { getProjectManagerStore } from '@renderer/features/projects/stores/project-selectors';
+import type { AgentStatus } from '@renderer/features/tasks/conversations/conversation-manager';
+import type { DiffViewStore } from '@renderer/features/tasks/diff-view/stores/diff-view-store';
+import type { EditorViewStore } from '@renderer/features/tasks/editor/stores/editor-view-store';
+import {
+  isUnprovisioned,
+  isUnregistered,
+  ProvisionedTask,
+  registeredTaskData,
+  TaskStore,
+} from './task';
+import type { TaskManagerStore } from './task-manager';
+import type { TaskViewStore } from './task-view';
+
+/** Call only inside `observer` components (or other MobX reactions). */
+export function getTaskManagerStore(projectId: string): TaskManagerStore | undefined {
+  const p = getProjectManagerStore().projects.get(projectId);
+  return p?.mountedProject?.taskManager;
+}
+
+/** Call only inside `observer` components (or other MobX reactions). */
+export function getTaskStore(projectId: string, taskId: string): TaskStore | undefined {
+  return getTaskManagerStore(projectId)?.tasks.get(taskId);
+}
+
+/** Registered task payload (`Task`) when the row exists and is not unregistered; otherwise undefined. */
+export function getRegisteredTaskData(projectId: string, taskId: string): Task | undefined {
+  const store = getTaskStore(projectId, taskId);
+  if (!store) return undefined;
+  return registeredTaskData(store);
+}
+
+/** Call only inside `observer` components (or other MobX reactions). */
+export function getTaskView(projectId: string, taskId: string): TaskViewStore | undefined {
+  return asProvisioned(getTaskStore(projectId, taskId))?.taskView;
+}
+
+/** Call only inside `observer` components (or other MobX reactions). */
+export function getEditorView(projectId: string, taskId: string): EditorViewStore | undefined {
+  return getTaskView(projectId, taskId)?.editorView;
+}
+
+/** Call only inside `observer` components (or other MobX reactions). */
+export function getDiffView(projectId: string, taskId: string): DiffViewStore | undefined {
+  return getTaskView(projectId, taskId)?.diffView;
+}
+
+export function getTaskGitStore(projectId: string, taskId: string) {
+  return asProvisioned(getTaskStore(projectId, taskId))?.workspace.git;
+}
+
+export function taskAgentStatus(store: TaskStore): AgentStatus | null {
+  return asProvisioned(store)?.conversations.taskStatus ?? null;
+}
+
+export type TaskViewKind =
+  | 'missing'
+  | 'project-mounting' // project is still opening — task data not yet available
+  | 'project-error' // project failed to open
+  | 'creating'
+  | 'create-error'
+  | 'provisioning'
+  | 'provision-error'
+  | 'teardown'
+  | 'teardown-error'
+  | 'idle'
+  | 'ready';
+
+/**
+ * Derives the task view kind from the project + task store state.
+ *
+ * Pass `projectId` so that "project still opening" can be distinguished from
+ * "task genuinely missing". Call only inside `observer` components.
+ */
+export function taskViewKind(store: TaskStore | undefined, projectId: string): TaskViewKind {
+  const projectStore = getProjectManagerStore().projects.get(projectId);
+
+  // Project doesn't exist at all
+  if (!projectStore) return 'missing';
+
+  // Project is being opened — tasks won't be available yet
+  if (isUnmountedProject(projectStore)) {
+    if (projectStore.phase === 'opening') return 'project-mounting';
+    if (projectStore.phase === 'error') return 'project-error';
+    // idle/closing unmounted — still needs to be opened
+    return 'project-mounting';
+  }
+
+  // Project is still being created (unregistered)
+  if (projectStore.state === 'unregistered') return 'missing';
+
+  // Project is mounted — dispatch on task state
+  if (!store) return 'missing';
+
+  if (isUnregistered(store)) {
+    if (store.phase === 'creating') return 'creating';
+    return 'create-error';
+  }
+  if (isUnprovisioned(store)) {
+    if (store.phase === 'provision') return 'provisioning';
+    if (store.phase === 'provision-error') return 'provision-error';
+    if (store.phase === 'teardown') return 'teardown';
+    if (store.phase === 'teardown-error') return 'teardown-error';
+    return 'idle';
+  }
+  return 'ready';
+}
+
+/** Returns the provisioned task payload if ready, otherwise undefined. */
+export function asProvisioned(store: TaskStore | undefined): ProvisionedTask | undefined {
+  return store?.provisionedTask ?? undefined;
+}
+
+/** Returns the display name from any task store variant. */
+export function taskDisplayName(store: TaskStore | undefined): string | undefined {
+  if (!store) return undefined;
+  return store.data.name;
+}
+
+/** Returns the error message for error states. */
+export function taskErrorMessage(store: TaskStore | undefined): string | undefined {
+  if (!store) return undefined;
+  if (isUnregistered(store) && store.phase === 'create-error') {
+    return store.errorMessage ?? 'Failed to create task';
+  }
+  if (isUnprovisioned(store)) {
+    if (store.phase === 'provision-error') {
+      return store.errorMessage ?? 'Failed to set up workspace';
+    }
+    if (store.phase === 'teardown-error') {
+      return store.errorMessage ?? 'Failed to tear down task';
+    }
+  }
+  return undefined;
+}
+
+/** Returns the mount error message for the project. */
+export function projectMountErrorMessage(projectId: string): string {
+  const store = getProjectManagerStore().projects.get(projectId);
+  if (store && isUnmountedProject(store) && store.phase === 'error') {
+    return store.error ?? 'Failed to open project';
+  }
+  return 'Failed to open project';
+}
diff --git a/src/renderer/features/tasks/stores/task-view.tsx b/src/renderer/features/tasks/stores/task-view.tsx
new file mode 100644
index 0000000000..9282a97f47
--- /dev/null
+++ b/src/renderer/features/tasks/stores/task-view.tsx
@@ -0,0 +1,102 @@
+import { makeAutoObservable } from 'mobx';
+import type { TaskViewSnapshot } from '@shared/view-state';
+import type { ConversationManagerStore } from '@renderer/features/tasks/conversations/conversation-manager';
+import { ConversationTabViewStore } from '@renderer/features/tasks/conversations/conversation-tab-view-store';
+import { DiffViewStore } from '@renderer/features/tasks/diff-view/stores/diff-view-store';
+import type { GitStore } from '@renderer/features/tasks/diff-view/stores/git-store';
+import { EditorViewStore } from '@renderer/features/tasks/editor/stores/editor-view-store';
+import type { PrStore } from '@renderer/features/tasks/stores/pr-store';
+import type { TerminalManagerStore } from '@renderer/features/tasks/terminals/terminal-manager';
+import { TerminalTabViewStore } from '@renderer/features/tasks/terminals/terminal-tab-view-store';
+import { MainPanelView, RightPanelView } from '@renderer/features/tasks/types';
+import { focusTracker } from '@renderer/utils/focus-tracker';
+
+interface TaskViewResources {
+  conversations: ConversationManagerStore;
+  terminals: TerminalManagerStore;
+  git: GitStore;
+  pr: PrStore;
+  projectId: string;
+  workspaceId: string;
+}
+
+export class TaskViewStore {
+  view: MainPanelView;
+  rightPanelView: RightPanelView;
+  focusedRegion: 'main' | 'right';
+  readonly conversationTabs: ConversationTabViewStore;
+  readonly terminalTabs: TerminalTabViewStore;
+  readonly editorView: EditorViewStore;
+  readonly diffView: DiffViewStore;
+
+  constructor(resources: TaskViewResources, savedSnapshot?: TaskViewSnapshot) {
+    this.view = (savedSnapshot?.view as MainPanelView) ?? 'agents';
+    this.rightPanelView = (savedSnapshot?.rightPanelView as RightPanelView) ?? 'changes';
+    this.focusedRegion = savedSnapshot?.focusedRegion ?? 'main';
+
+    this.conversationTabs = new ConversationTabViewStore(resources.conversations);
+    this.terminalTabs = new TerminalTabViewStore(resources.terminals);
+    this.editorView = new EditorViewStore(resources.projectId, resources.workspaceId);
+    this.diffView = new DiffViewStore(resources.git, resources.pr);
+
+    if (savedSnapshot?.conversations) {
+      this.conversationTabs.restoreSnapshot(savedSnapshot.conversations);
+    }
+    if (savedSnapshot?.terminals) {
+      this.terminalTabs.restoreSnapshot(savedSnapshot.terminals);
+    }
+    if (savedSnapshot?.editor) {
+      this.editorView.restoreSnapshot(savedSnapshot.editor);
+    }
+    if (savedSnapshot?.diffView) {
+      this.diffView.restoreSnapshot(savedSnapshot.diffView);
+    }
+
+    makeAutoObservable(this, {
+      conversationTabs: false,
+      terminalTabs: false,
+      editorView: false,
+      diffView: false,
+    });
+  }
+
+  get snapshot(): TaskViewSnapshot {
+    return {
+      view: this.view,
+      rightPanelView: this.rightPanelView,
+      focusedRegion: this.focusedRegion,
+      conversations: this.conversationTabs.snapshot,
+      terminals: this.terminalTabs.snapshot,
+      editor: this.editorView.snapshot,
+      diffView: this.diffView.snapshot,
+    };
+  }
+
+  setView(v: MainPanelView): void {
+    if (this.view !== v) {
+      focusTracker.transition({ mainPanel: v }, 'panel_switch');
+    }
+    this.view = v;
+  }
+
+  setRightPanelView(v: RightPanelView): void {
+    if (this.rightPanelView !== v) {
+      focusTracker.transition({ rightPanel: v }, 'panel_switch');
+    }
+    this.rightPanelView = v;
+  }
+
+  setFocusedRegion(region: 'main' | 'right'): void {
+    if (this.focusedRegion !== region) {
+      focusTracker.transition({ focusedRegion: region }, 'region_switch');
+    }
+    this.focusedRegion = region;
+  }
+
+  dispose(): void {
+    this.conversationTabs.dispose();
+    this.terminalTabs.dispose();
+    this.editorView.dispose();
+    this.diffView.dispose();
+  }
+}
diff --git a/src/renderer/features/tasks/stores/task.ts b/src/renderer/features/tasks/stores/task.ts
new file mode 100644
index 0000000000..d452c072a7
--- /dev/null
+++ b/src/renderer/features/tasks/stores/task.ts
@@ -0,0 +1,342 @@
+import { makeAutoObservable, observable, runInAction } from 'mobx';
+import { Issue, Task, TaskLifecycleStatus } from '@shared/tasks';
+import type { TaskViewSnapshot } from '@shared/view-state';
+import { workspaceKey } from '@shared/workspace-key';
+import type { RepositoryStore } from '@renderer/features/projects/stores/repository-store';
+import { ConversationManagerStore } from '@renderer/features/tasks/conversations/conversation-manager';
+import { DraftCommentsStore } from '@renderer/features/tasks/diff-view/stores/draft-comments-store';
+import { DevServerStore } from '@renderer/features/tasks/stores/dev-server-store';
+import { TaskViewStore } from '@renderer/features/tasks/stores/task-view';
+import type { WorkspaceStore } from '@renderer/features/tasks/stores/workspace';
+import { workspaceRegistry } from '@renderer/features/tasks/stores/workspace-registry';
+import { TerminalManagerStore } from '@renderer/features/tasks/terminals/terminal-manager';
+import { rpc } from '@renderer/lib/ipc';
+import { snapshotRegistry } from '@renderer/lib/stores/snapshot-registry';
+import { log } from '@renderer/utils/logger';
+
+export type UnregisteredTaskPhase = 'creating' | 'create-error';
+
+export type UnprovisionedTaskPhase =
+  | 'provision'
+  | 'provision-error'
+  | 'teardown'
+  | 'teardown-error'
+  | 'idle';
+
+export type UnregisteredTaskData = {
+  id: string;
+  name: string;
+  status: TaskLifecycleStatus;
+  lastInteractedAt: string;
+  createdAt: string;
+  statusChangedAt: string;
+  isPinned: boolean;
+};
+
+export class ProvisionedTask {
+  readonly workspace: WorkspaceStore;
+  readonly devServers: DevServerStore;
+  readonly conversations: ConversationManagerStore;
+  readonly terminals: TerminalManagerStore;
+  readonly draftComments: DraftCommentsStore;
+  readonly taskView: TaskViewStore;
+  readonly repositoryStore: RepositoryStore;
+
+  readonly _taskData: Task;
+  readonly path: string;
+  readonly workspaceId: string;
+
+  private readonly _taskStore: TaskStore;
+  private _snapshotDisposer: (() => void) | null = null;
+
+  get snapshot(): TaskViewSnapshot {
+    return this.taskView.snapshot;
+  }
+
+  get taskBranch(): string | undefined {
+    return this._taskData.taskBranch;
+  }
+
+  constructor(
+    taskStore: TaskStore,
+    path: string,
+    repositoryStore: RepositoryStore,
+    savedSnapshot?: TaskViewSnapshot
+  ) {
+    this._taskStore = taskStore;
+    const taskData = taskStore.data as Task;
+    this._taskData = taskData;
+    this.path = path;
+    this.workspaceId = workspaceKey(taskData.taskBranch);
+    this.repositoryStore = repositoryStore;
+
+    this.workspace = workspaceRegistry.acquire(
+      taskData.projectId,
+      this.workspaceId,
+      taskStore,
+      repositoryStore
+    );
+    this.devServers = new DevServerStore(taskData.id, this.workspaceId);
+    this.conversations = new ConversationManagerStore(taskData.projectId, taskData.id);
+    this.terminals = new TerminalManagerStore(taskData.projectId, taskData.id);
+    this.draftComments = new DraftCommentsStore(taskData.id);
+    this.taskView = new TaskViewStore(
+      {
+        conversations: this.conversations,
+        terminals: this.terminals,
+        git: this.workspace.git,
+        pr: this.workspace.pr,
+        projectId: taskData.projectId,
+        workspaceId: this.workspaceId,
+      },
+      savedSnapshot
+    );
+
+    makeAutoObservable(this, {
+      workspace: false,
+      devServers: false,
+      conversations: false,
+      terminals: false,
+      draftComments: false,
+      taskView: false,
+      /** Owned by TaskStore.data — do not attach a second observable tree here */
+      _taskData: false,
+    });
+
+    this._snapshotDisposer = snapshotRegistry.register(`task:${taskData.id}`, () => this.snapshot);
+  }
+
+  activate(): void {
+    workspaceRegistry.activate(this._taskData.projectId, this.workspaceId);
+  }
+
+  dispose(): void {
+    this._snapshotDisposer?.();
+    this._snapshotDisposer = null;
+    workspaceRegistry.release(this._taskData.projectId, this.workspaceId, this._taskStore);
+    this.devServers.dispose();
+    this.draftComments.dispose();
+    this.taskView.dispose();
+    this.conversations.dispose();
+    for (const term of this.terminals.terminals.values()) {
+      term.dispose();
+    }
+  }
+}
+
+export class TaskStore {
+  state: 'unregistered' | 'unprovisioned' | 'provisioned';
+  data: UnregisteredTaskData | Task;
+  phase: UnregisteredTaskPhase | UnprovisionedTaskPhase | null;
+  errorMessage: string | undefined = undefined;
+  provisionedTask: ProvisionedTask | null = null;
+
+  get displayName(): string {
+    return this.data.name;
+  }
+
+  get isBootstrapping(): boolean {
+    return (
+      this.state === 'unregistered' ||
+      (this.state === 'unprovisioned' &&
+        (this.phase === 'provision' || this.phase === 'provision-error'))
+    );
+  }
+
+  constructor(
+    data: UnregisteredTaskData | Task,
+    state: TaskStore['state'],
+    phase: UnregisteredTaskPhase | UnprovisionedTaskPhase | null = null
+  ) {
+    this.state = state;
+    this.data = data;
+    this.phase = phase;
+    makeAutoObservable(this, {
+      provisionedTask: observable.ref,
+      /** Deep observable so nested fields (e.g. `status`) notify observers (e.g. sidebar). */
+      data: observable,
+    });
+  }
+
+  transitionToProvisioned(
+    data: Task,
+    path: string,
+    repositoryStore: RepositoryStore,
+    savedSnapshot?: TaskViewSnapshot
+  ): void {
+    this.data = data;
+    this.provisionedTask = new ProvisionedTask(this, path, repositoryStore, savedSnapshot);
+    this.state = 'provisioned';
+    this.phase = null;
+    this.errorMessage = undefined;
+  }
+
+  transitionToUnprovisioned(data: Task, phase: UnprovisionedTaskPhase = 'idle'): void {
+    this.provisionedTask?.dispose();
+    this.provisionedTask = null;
+    this.data = data;
+    this.state = 'unprovisioned';
+    this.phase = phase;
+    this.errorMessage = undefined;
+  }
+
+  transitionToUnregistered(data: UnregisteredTaskData): void {
+    this.provisionedTask?.dispose();
+    this.provisionedTask = null;
+    this.data = data;
+    this.state = 'unregistered';
+    this.phase = 'creating';
+    this.errorMessage = undefined;
+  }
+
+  activate(): void {
+    this.provisionedTask?.activate();
+  }
+
+  dispose(): void {
+    this.provisionedTask?.dispose();
+    this.provisionedTask = null;
+  }
+
+  get conversationStats(): Record<string, number> {
+    if (this.state === 'unregistered') {
+      return {};
+    }
+    if (this.state === 'provisioned' && this.provisionedTask) {
+      const counts: Record<string, number> = {};
+      for (const conv of this.provisionedTask.conversations.conversations.values()) {
+        const id = conv.data.providerId;
+        counts[id] = (counts[id] ?? 0) + 1;
+      }
+      return counts;
+    }
+    return (this.data as Task).conversations;
+  }
+
+  async rename(name: string): Promise<void> {
+    if (this.state !== 'provisioned') return;
+    const task = registeredTaskData(this);
+    if (!task) return;
+    try {
+      await rpc.tasks.renameTask(task.projectId, task.id, name);
+      runInAction(() => {
+        this.data.name = name;
+      });
+    } catch (e) {
+      runInAction(() => {
+        this.data.name = task.name;
+      });
+      log.error(e);
+      throw e;
+    }
+  }
+
+  async updateStatus(status: TaskLifecycleStatus): Promise<void> {
+    const previousStatus = this.data.status;
+    const previousStatusChangedAt = this.data.statusChangedAt;
+    const nextChangedAt = new Date().toISOString();
+    runInAction(() => {
+      this.data.status = status;
+      this.data.statusChangedAt = nextChangedAt;
+    });
+    try {
+      await rpc.tasks.updateTaskStatus(this.data.id, status);
+    } catch (e) {
+      runInAction(() => {
+        this.data.status = previousStatus;
+        this.data.statusChangedAt = previousStatusChangedAt;
+      });
+      log.error(e);
+      throw e;
+    }
+  }
+
+  async setPinned(isPinned: boolean): Promise<void> {
+    if (this.state === 'unregistered') return;
+    const task = registeredTaskData(this);
+    if (!task) return;
+    const previous = task.isPinned;
+    runInAction(() => {
+      task.isPinned = isPinned;
+    });
+    try {
+      await rpc.tasks.setTaskPinned(task.id, isPinned);
+    } catch (e) {
+      runInAction(() => {
+        task.isPinned = previous;
+      });
+      log.error(e);
+      throw e;
+    }
+  }
+
+  async updateLinkedIssue(issue?: Issue): Promise<void> {
+    if (this.state === 'unregistered') return;
+    const task = registeredTaskData(this);
+    if (!task) return;
+    const previousIssue = task.linkedIssue;
+    try {
+      await rpc.tasks.updateLinkedIssue(task.id, issue);
+      runInAction(() => {
+        task.linkedIssue = issue;
+      });
+    } catch (e) {
+      runInAction(() => {
+        task.linkedIssue = previousIssue;
+      });
+      console.error(e);
+      throw e;
+    }
+  }
+}
+
+export type UnregisteredTask = TaskStore & {
+  state: 'unregistered';
+  data: UnregisteredTaskData;
+  phase: UnregisteredTaskPhase;
+  errorMessage: string | undefined;
+};
+
+export type UnprovisionedTask = TaskStore & {
+  state: 'unprovisioned';
+  data: Task;
+  phase: UnprovisionedTaskPhase;
+  errorMessage: string | undefined;
+};
+
+export function isUnregistered(t: TaskStore): t is UnregisteredTask {
+  return t.state === 'unregistered';
+}
+
+export function isRegistered(
+  t: TaskStore
+): t is TaskStore & { state: 'unprovisioned' | 'provisioned'; data: Task } {
+  return t.state !== 'unregistered';
+}
+
+export function isUnprovisioned(t: TaskStore): t is UnprovisionedTask {
+  return t.state === 'unprovisioned';
+}
+
+export function isProvisioned(
+  t: TaskStore
+): t is TaskStore & { state: 'provisioned'; data: Task; provisionedTask: ProvisionedTask } {
+  return t.state === 'provisioned';
+}
+
+/** Full `Task` payload when registered (unprovisioned or provisioned); `undefined` when unregistered. */
+export function registeredTaskData(store: TaskStore): Task | undefined {
+  return isRegistered(store) ? store.data : undefined;
+}
+
+export function unregisteredTaskData(store: TaskStore): UnregisteredTaskData | undefined {
+  return isUnregistered(store) ? store.data : undefined;
+}
+
+export function createUnregisteredTask(data: UnregisteredTaskData): TaskStore {
+  return new TaskStore(data, 'unregistered', 'creating');
+}
+
+export function createUnprovisionedTask(data: Task): TaskStore {
+  return new TaskStore(data, 'unprovisioned', 'idle');
+}
diff --git a/src/renderer/features/tasks/stores/workspace-registry.ts b/src/renderer/features/tasks/stores/workspace-registry.ts
new file mode 100644
index 0000000000..bebd95b608
--- /dev/null
+++ b/src/renderer/features/tasks/stores/workspace-registry.ts
@@ -0,0 +1,63 @@
+import type { RepositoryStore } from '@renderer/features/projects/stores/repository-store';
+import type { TaskStore } from './task';
+import { WorkspaceStore } from './workspace';
+
+type WorkspaceRegistryEntry = {
+  store: WorkspaceStore;
+  refCount: number;
+  activated: boolean;
+};
+
+function makeKey(projectId: string, workspaceId: string): string {
+  return `${projectId}::${workspaceId}`;
+}
+
+export class WorkspaceRegistryStore {
+  private readonly entries = new Map<string, WorkspaceRegistryEntry>();
+
+  acquire(
+    projectId: string,
+    workspaceId: string,
+    taskStore: TaskStore,
+    repositoryStore: RepositoryStore
+  ): WorkspaceStore {
+    const key = makeKey(projectId, workspaceId);
+    const existing = this.entries.get(key);
+    if (existing) {
+      existing.refCount += 1;
+      existing.store.addTask(taskStore);
+      return existing.store;
+    }
+
+    const store = new WorkspaceStore(projectId, workspaceId, [taskStore], repositoryStore);
+    this.entries.set(key, { store, refCount: 1, activated: false });
+    return store;
+  }
+
+  activate(projectId: string, workspaceId: string): void {
+    const entry = this.entries.get(makeKey(projectId, workspaceId));
+    if (!entry || entry.activated) {
+      return;
+    }
+    entry.activated = true;
+    entry.store.activate();
+  }
+
+  release(projectId: string, workspaceId: string, taskStore: TaskStore): void {
+    const key = makeKey(projectId, workspaceId);
+    const entry = this.entries.get(key);
+    if (!entry) {
+      return;
+    }
+
+    entry.store.removeTask(taskStore);
+    entry.refCount -= 1;
+
+    if (entry.refCount <= 0) {
+      entry.store.dispose();
+      this.entries.delete(key);
+    }
+  }
+}
+
+export const workspaceRegistry = new WorkspaceRegistryStore();
diff --git a/src/renderer/features/tasks/stores/workspace.ts b/src/renderer/features/tasks/stores/workspace.ts
new file mode 100644
index 0000000000..bc6ee279e5
--- /dev/null
+++ b/src/renderer/features/tasks/stores/workspace.ts
@@ -0,0 +1,49 @@
+import { observable } from 'mobx';
+import type { RepositoryStore } from '@renderer/features/projects/stores/repository-store';
+import { GitStore } from '../diff-view/stores/git-store';
+import { FilesStore } from '../editor/stores/files-store';
+import { LifecycleScriptsStore } from './lifecycle-scripts';
+import { PrStore } from './pr-store';
+import type { TaskStore } from './task';
+
+export class WorkspaceStore {
+  readonly tasks = observable.array<TaskStore>();
+  git: GitStore;
+  files: FilesStore;
+  lifecycleScripts: LifecycleScriptsStore;
+  pr: PrStore;
+
+  constructor(
+    projectId: string,
+    workspaceId: string,
+    initialTasks: TaskStore[],
+    repositoryStore: RepositoryStore
+  ) {
+    this.tasks.replace(initialTasks);
+    this.git = new GitStore(projectId, workspaceId, repositoryStore);
+    this.files = new FilesStore(projectId, workspaceId);
+    this.lifecycleScripts = new LifecycleScriptsStore(projectId, workspaceId);
+    this.pr = new PrStore(projectId, workspaceId, repositoryStore, this.tasks);
+  }
+
+  addTask(task: TaskStore): void {
+    if (!this.tasks.includes(task)) this.tasks.push(task);
+  }
+
+  removeTask(task: TaskStore): void {
+    const idx = this.tasks.indexOf(task);
+    if (idx >= 0) this.tasks.splice(idx, 1);
+  }
+
+  activate(): void {
+    this.git.startWatching();
+    this.files.startWatching();
+  }
+
+  dispose(): void {
+    this.git.dispose();
+    this.files.dispose();
+    this.lifecycleScripts.dispose();
+    this.pr.dispose();
+  }
+}
diff --git a/src/renderer/features/tasks/tabbed-pty-panel-sessions.test.ts b/src/renderer/features/tasks/tabbed-pty-panel-sessions.test.ts
new file mode 100644
index 0000000000..37d3beb333
--- /dev/null
+++ b/src/renderer/features/tasks/tabbed-pty-panel-sessions.test.ts
@@ -0,0 +1,29 @@
+import { describe, expect, it } from 'vitest';
+import { getTabbedPtySessionId, getTabbedPtySessionIds } from './tabbed-pty-panel-sessions';
+
+describe('tabbed PTY panel session identity', () => {
+  it('uses the session-owned id instead of a recomputed entity id', () => {
+    const entity = {
+      data: { id: 'script-id' },
+      session: { sessionId: 'project:workspace:script-id' },
+    };
+
+    const recomputedId = `project:task:${entity.data.id}`;
+    const sessionId = getTabbedPtySessionId(entity, (item) => item.session);
+
+    expect(sessionId).toBe('project:workspace:script-id');
+    expect(sessionId).not.toBe(recomputedId);
+  });
+
+  it('derives all pane session ids from their owned sessions', () => {
+    const entities = [
+      { session: { sessionId: 'project:workspace:setup' }, recomputedId: 'project:task:setup' },
+      { session: { sessionId: 'project:workspace:run' }, recomputedId: 'project:task:run' },
+    ];
+
+    expect(getTabbedPtySessionIds(entities, (item) => item.session)).toEqual([
+      'project:workspace:setup',
+      'project:workspace:run',
+    ]);
+  });
+});
diff --git a/src/renderer/features/tasks/tabbed-pty-panel-sessions.ts b/src/renderer/features/tasks/tabbed-pty-panel-sessions.ts
new file mode 100644
index 0000000000..386bab59ba
--- /dev/null
+++ b/src/renderer/features/tasks/tabbed-pty-panel-sessions.ts
@@ -0,0 +1,17 @@
+export type SessionIdOwner = {
+  sessionId: string;
+};
+
+export function getTabbedPtySessionId<TEntity>(
+  entity: TEntity,
+  getSession: (entity: TEntity) => SessionIdOwner
+): string {
+  return getSession(entity).sessionId;
+}
+
+export function getTabbedPtySessionIds<TEntity>(
+  entities: TEntity[],
+  getSession: (entity: TEntity) => SessionIdOwner
+): string[] {
+  return entities.map((entity) => getTabbedPtySessionId(entity, getSession));
+}
diff --git a/src/renderer/features/tasks/tabbed-pty-panel.tsx b/src/renderer/features/tasks/tabbed-pty-panel.tsx
new file mode 100644
index 0000000000..a1c0acd9ee
--- /dev/null
+++ b/src/renderer/features/tasks/tabbed-pty-panel.tsx
@@ -0,0 +1,146 @@
+import { observer } from 'mobx-react-lite';
+import React, { useEffect, useMemo, useRef } from 'react';
+import { PaneSizingProvider } from '@renderer/lib/pty/pane-sizing-context';
+import { PtyPane } from '@renderer/lib/pty/pty-pane';
+import { PtySession } from '@renderer/lib/pty/pty-session';
+import { TerminalSearchOverlay } from '@renderer/lib/pty/terminal-search-overlay';
+import { useTerminalSearch } from '@renderer/lib/pty/use-terminal-search';
+import { TabViewProvider } from '@renderer/lib/stores/generic-tab-view';
+import { cn } from '@renderer/utils/utils';
+import { getTabbedPtySessionIds } from './tabbed-pty-panel-sessions';
+
+export interface TabbedPtyPanelProps<TEntity> {
+  store: TabViewProvider<TEntity, never> | undefined;
+  getSession: (entity: TEntity) => PtySession;
+  paneId: string;
+  tabBar: React.ReactNode;
+  emptyState: React.ReactNode;
+  autoFocus?: boolean;
+  onFocusChange?: (focused: boolean) => void;
+  onEnterPress?: (entity: TEntity) => void;
+  onInterruptPress?: (entity: TEntity) => void;
+  mapShiftEnterToCtrlJ?: boolean;
+  remoteConnectionId?: string;
+}
+
+export const TabbedPtyPanel = observer(function TabbedPtyPanel<TEntity>({
+  store,
+  getSession,
+  paneId,
+  tabBar,
+  emptyState,
+  autoFocus,
+  onFocusChange,
+  onEnterPress,
+  onInterruptPress,
+  mapShiftEnterToCtrlJ,
+  remoteConnectionId,
+}: TabbedPtyPanelProps<TEntity>) {
+  const tabs = useMemo(() => store?.tabs ?? [], [store?.tabs]);
+  const activeTab = store?.activeTab;
+
+  const allSessionIds = useMemo(
+    () => getTabbedPtySessionIds(tabs, getSession),
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [tabs, getSession]
+  );
+
+  const activeSession = activeTab ? getSession(activeTab) : null;
+  const activeSessionId = activeSession?.sessionId ?? null;
+  const activeOnEnterPress = activeTab && onEnterPress ? () => onEnterPress(activeTab) : undefined;
+  const activeOnInterruptPress =
+    activeTab && onInterruptPress ? () => onInterruptPress(activeTab) : undefined;
+
+  const containerRef = useRef<HTMLDivElement>(null);
+  const terminalContainerRef = useRef<HTMLDivElement>(null);
+  const terminalRef = useRef<{ focus: () => void }>(null);
+  const focusPendingRef = useRef(false);
+  const {
+    isSearchOpen,
+    searchQuery,
+    searchStatus,
+    searchInputRef,
+    closeSearch,
+    handleSearchQueryChange,
+    stepSearch,
+  } = useTerminalSearch({
+    terminal: activeSession?.pty?.terminal,
+    containerRef: terminalContainerRef,
+    enabled: Boolean(activeSession?.pty),
+    onCloseFocus: () => terminalRef.current?.focus(),
+  });
+
+  // Fire when autoFocus becomes true (task switch) or the active session changes.
+  // If the terminal is already mounted, focus immediately; otherwise hold focus on
+  // the container so keyboard input has a home while the PTY is connecting.
+  useEffect(() => {
+    if (!autoFocus) return;
+    if (terminalRef.current) {
+      terminalRef.current.focus();
+      focusPendingRef.current = false;
+    } else {
+      containerRef.current?.focus();
+      focusPendingRef.current = true;
+    }
+  }, [autoFocus, activeSessionId]);
+
+  // Fire when the session transitions to 'ready' (MobX observer re-renders automatically
+  // because activeSession?.status is read in the render body below).
+  const sessionStatus = activeSession?.status;
+  useEffect(() => {
+    if (sessionStatus === 'ready' && focusPendingRef.current) {
+      focusPendingRef.current = false;
+      terminalRef.current?.focus();
+    }
+  }, [sessionStatus]);
+
+  return (
+    <div
+      ref={containerRef}
+      tabIndex={-1}
+      className="flex h-full flex-col outline-none"
+      onFocus={() => {
+        onFocusChange?.(true);
+      }}
+      onBlur={(e) => {
+        if (!e.currentTarget.contains(e.relatedTarget as Node)) {
+          onFocusChange?.(false);
+        }
+      }}
+    >
+      <div className="shrink-0">{tabBar}</div>
+      <PaneSizingProvider paneId={paneId} sessionIds={allSessionIds}>
+        {tabs.length === 0 ? (
+          emptyState
+        ) : (
+          <div className={cn('flex min-h-0 flex-1 flex-col')}>
+            {activeSessionId && activeSession?.status === 'ready' && activeSession.pty ? (
+              <div ref={terminalContainerRef} className="relative flex h-full min-h-0 flex-1">
+                <TerminalSearchOverlay
+                  isOpen={isSearchOpen}
+                  fullWidth
+                  searchQuery={searchQuery}
+                  searchStatus={searchStatus}
+                  searchInputRef={searchInputRef}
+                  onQueryChange={handleSearchQueryChange}
+                  onStep={stepSearch}
+                  onClose={closeSearch}
+                />
+                <PtyPane
+                  ref={terminalRef}
+                  sessionId={activeSessionId}
+                  pty={activeSession.pty}
+                  className="h-full w-full"
+                  onEnterPress={activeOnEnterPress}
+                  onInterruptPress={activeOnInterruptPress}
+                  mapShiftEnterToCtrlJ={mapShiftEnterToCtrlJ}
+                  remoteConnectionId={remoteConnectionId}
+                />
+              </div>
+            ) : null}
+          </div>
+        )}
+      </PaneSizingProvider>
+    </div>
+  );
+}) as <TEntity>(props: TabbedPtyPanelProps<TEntity>) => React.ReactElement;
diff --git a/src/renderer/features/tasks/task-titlebar.tsx b/src/renderer/features/tasks/task-titlebar.tsx
new file mode 100644
index 0000000000..bb756ecfe3
--- /dev/null
+++ b/src/renderer/features/tasks/task-titlebar.tsx
@@ -0,0 +1,374 @@
+import {
+  ArrowDown,
+  ArrowUp,
+  ChevronDown,
+  FileDiff,
+  Files,
+  GitBranch,
+  GitCommit,
+  ListTree,
+  MessageSquare,
+  Pin,
+  RefreshCcw,
+  Terminal,
+} from 'lucide-react';
+import { observer } from 'mobx-react-lite';
+import {
+  asMounted,
+  getProjectStore,
+  projectDisplayName,
+} from '@renderer/features/projects/stores/project-selectors';
+import {
+  getRegisteredTaskData,
+  getTaskStore,
+  taskDisplayName,
+  taskViewKind,
+} from '@renderer/features/tasks/stores/task-selectors';
+import { useProvisionedTask, useTaskViewContext } from '@renderer/features/tasks/task-view-context';
+import { RightPanelView } from '@renderer/features/tasks/types';
+import { OpenInMenu } from '@renderer/lib/components/titlebar/open-in-menu';
+import { Titlebar } from '@renderer/lib/components/titlebar/Titlebar';
+import { useDelayedBoolean } from '@renderer/lib/hooks/use-delay-boolean';
+import { Badge } from '@renderer/lib/ui/badge';
+import { Button } from '@renderer/lib/ui/button';
+import { MicroLabel } from '@renderer/lib/ui/label';
+import { Popover, PopoverContent, PopoverTrigger } from '@renderer/lib/ui/popover';
+import { ShortcutHint } from '@renderer/lib/ui/shortcut-hint';
+import { ToggleGroup, ToggleGroupItem } from '@renderer/lib/ui/toggle-group';
+import { Tooltip, TooltipContent, TooltipTrigger } from '@renderer/lib/ui/tooltip';
+import { cn } from '@renderer/utils/utils';
+import { DevServerPills } from './components/dev-server-pills';
+import { IssueSelector } from './components/issue-selector/issue-selector';
+import { useTaskViewNavigation } from './hooks/use-task-view-navigation';
+import { useTaskViewShortcuts } from './hooks/use-task-view-shortcuts';
+import { useGitActions } from './use-git-actions';
+
+export const TaskTitlebar = observer(function TaskTitlebar() {
+  const { projectId, taskId } = useTaskViewContext();
+  const taskStore = getTaskStore(projectId, taskId);
+  const kind = taskViewKind(taskStore, projectId);
+
+  if (kind !== 'ready') {
+    return <PendingTaskTitlebar taskId={taskId} projectId={projectId} />;
+  }
+
+  return <ActiveTaskTitlebar taskId={taskId} projectId={projectId} />;
+});
+
+const PendingTaskTitlebar = observer(function PendingTaskTitlebar({
+  taskId,
+  projectId,
+}: {
+  taskId: string;
+  projectId: string;
+}) {
+  const taskStore = getTaskStore(projectId, taskId)!;
+  const projectName = projectDisplayName(getProjectStore(projectId));
+  const name = taskDisplayName(taskStore);
+
+  return (
+    <Titlebar
+      leftSlot={
+        <div className="flex items-center gap-1 px-2 text-sm text-foreground-muted">
+          <span className="flex items-center gap-1">
+            <span className="text-sm text-foreground-passive">{projectName}</span>
+            <span className="text-sm text-foreground-passive">/</span>
+            {name}
+          </span>
+        </div>
+      }
+    />
+  );
+});
+
+const ActiveTaskTitlebar = observer(function ActiveTaskTitlebar({
+  projectId,
+  taskId,
+}: {
+  projectId: string;
+  taskId: string;
+}) {
+  const taskStore = getTaskStore(projectId, taskId)!;
+  const taskPayload = getRegisteredTaskData(projectId, taskId)!;
+  const provisionedTask = useProvisionedTask();
+  const { taskView } = provisionedTask;
+  const { view, rightPanelView } = taskView;
+  const { openAgentsView, openEditorView, openDiffView, isPending } = useTaskViewNavigation();
+  const delayedIsPending = useDelayedBoolean(isPending, 200);
+  useTaskViewShortcuts();
+
+  const {
+    hasUpstream,
+    aheadCount,
+    behindCount,
+    fetch,
+    pull,
+    push,
+    publish,
+    isPublishing,
+    isFetching,
+    isPulling,
+    isPushing,
+  } = useGitActions(projectId, taskId);
+
+  const projectStore = asMounted(getProjectStore(projectId));
+
+  const projectName = projectDisplayName(getProjectStore(projectId));
+
+  const isRemoteProject = projectStore?.data.type === 'ssh';
+  return (
+    <Titlebar
+      leftSlot={
+        <div className="flex items-center gap-1 px-2">
+          <Popover>
+            <PopoverTrigger className="flex items-center gap-1 text-sm text-foreground-muted hover:text-foreground">
+              <span className="flex items-center gap-1">
+                <span className="text-sm text-foreground-passive">{projectName}</span>
+                <span className="text-sm text-foreground-passive">/</span>
+                {taskDisplayName(taskStore)}
+              </span>
+              <ChevronDown className="size-3.5 shrink-0" />
+            </PopoverTrigger>
+            <PopoverContent align="start" className="w-96 p-4 flex flex-col gap-2">
+              <div className="flex flex-col gap-1 w-full">
+                <MicroLabel className="text-foreground-passive items-center flex">Task</MicroLabel>
+                <span className="text-sm tracking-tight">{taskDisplayName(taskStore)}</span>
+              </div>
+              <OpenInMenu path={provisionedTask.path} />
+              <div className="flex flex-col gap-1 border border-border rounded-md p-2">
+                <span className="flex items-center gap-1 text-foreground-muted">
+                  <GitBranch className="size-3.5" />
+                  <span>{provisionedTask.workspace.git.branchName}</span>
+                </span>
+                {taskPayload.sourceBranch && (
+                  <span className="flex items-center gap-2 text-foreground-passive">
+                    Created from
+                    <span className="flex items-center gap-1 text-foreground-muted">
+                      <GitBranch className="size-3.5" /> {taskPayload.sourceBranch.branch}
+                    </span>
+                  </span>
+                )}
+                <div className="flex items-center gap-1 w-full">
+                  {hasUpstream ? (
+                    <>
+                      <Tooltip>
+                        <TooltipTrigger className="flex-1">
+                          <Button
+                            className="w-full"
+                            variant="outline"
+                            size="xs"
+                            disabled={isFetching}
+                            onClick={() => fetch()}
+                          >
+                            <RefreshCcw className="size-3" />
+                            {isFetching ? 'Fetching...' : 'Fetch'}
+                          </Button>
+                        </TooltipTrigger>
+                        <TooltipContent>
+                          {isFetching ? 'Fetching...' : 'Fetch changes'}
+                        </TooltipContent>
+                      </Tooltip>
+                      <Tooltip>
+                        <TooltipTrigger className="flex-1">
+                          <Button
+                            className="w-full"
+                            variant="outline"
+                            disabled={isPulling || behindCount === 0}
+                            size="xs"
+                            onClick={() => pull()}
+                          >
+                            <ArrowDown className="size-3" />
+                            {isPulling ? (
+                              'Pulling...'
+                            ) : (
+                              <span className="flex items-center gap-1">
+                                Pull
+                                <Badge variant="secondary" className="shrink-0">
+                                  {behindCount}
+                                </Badge>
+                              </span>
+                            )}
+                          </Button>
+                        </TooltipTrigger>
+                        <TooltipContent>
+                          {isPulling
+                            ? 'Pulling...'
+                            : behindCount === 0
+                              ? 'Nothing to pull'
+                              : 'Pull changes'}
+                        </TooltipContent>
+                      </Tooltip>
+                      <Tooltip>
+                        <TooltipTrigger className="flex-1">
+                          <Button
+                            className="w-full"
+                            variant="outline"
+                            disabled={isPushing || aheadCount === 0}
+                            size="xs"
+                            onClick={() => push()}
+                          >
+                            <ArrowUp className="size-3" />
+                            {isPushing ? (
+                              'Pushing...'
+                            ) : (
+                              <span className="flex items-center gap-1">
+                                Push
+                                <Badge variant="secondary" className="shrink-0">
+                                  {aheadCount}
+                                </Badge>
+                              </span>
+                            )}
+                          </Button>
+                        </TooltipTrigger>
+                        <TooltipContent>
+                          {isPushing
+                            ? 'Pushing...'
+                            : aheadCount === 0
+                              ? 'Nothing to push'
+                              : 'Push changes'}
+                        </TooltipContent>
+                      </Tooltip>
+                    </>
+                  ) : (
+                    <Tooltip>
+                      <TooltipTrigger className="flex-1">
+                        <Button
+                          className="w-full"
+                          variant="outline"
+                          disabled={isPublishing}
+                          size="xs"
+                          onClick={() => publish()}
+                        >
+                          <ArrowUp className="size-3" />
+                          {isPublishing ? 'Publishing...' : 'Publish'}
+                        </Button>
+                      </TooltipTrigger>
+                      <TooltipContent>
+                        {isPublishing ? 'Publishing...' : 'Publish branch'}
+                      </TooltipContent>
+                    </Tooltip>
+                  )}
+                </div>
+              </div>
+              <IssueSelector
+                value={taskPayload.linkedIssue ?? null}
+                onValueChange={(issue) => {
+                  taskStore.updateLinkedIssue(issue ?? undefined);
+                }}
+                projectId={projectId}
+                nameWithOwner={provisionedTask.repositoryStore.repositoryUrl ?? ''}
+                projectPath={provisionedTask.path}
+              />
+            </PopoverContent>
+          </Popover>
+          <button
+            className={cn(
+              'text-foreground-muted ml-1',
+              taskPayload.isPinned && 'text-muted-foreground'
+            )}
+            onClick={() => taskStore.setPinned(!taskPayload.isPinned)}
+          >
+            <Pin
+              className={cn('size-3.5', taskPayload.isPinned && 'text-foreground-muted')}
+              fill={taskPayload.isPinned ? 'currentColor' : 'none'}
+            />
+          </button>
+        </div>
+      }
+      rightSlot={
+        <div className="flex items-center gap-2 mr-2">
+          <DevServerPills projectId={projectId} taskId={taskId} />
+          {!isRemoteProject && (
+            <OpenInMenu path={provisionedTask.path} className="h-7  bg-background" />
+          )}
+          <ToggleGroup
+            disabled={delayedIsPending}
+            variant="outline"
+            value={[view]}
+            size="sm"
+            onValueChange={([value]) => {
+              if (value === 'agents') openAgentsView();
+              if (value === 'editor') openEditorView();
+              if (value === 'diff') openDiffView();
+            }}
+          >
+            <Tooltip>
+              <TooltipTrigger>
+                <ToggleGroupItem value="agents" size="sm">
+                  <MessageSquare className="size-3.5" />
+                </ToggleGroupItem>
+              </TooltipTrigger>
+              <TooltipContent>
+                <div className="flex flex-col gap-1">
+                  <span>Conversations view</span>
+                  <ShortcutHint settingsKey="taskViewAgents" />
+                </div>
+              </TooltipContent>
+            </Tooltip>
+            <Tooltip>
+              <TooltipTrigger>
+                <ToggleGroupItem value="diff" size="sm">
+                  <FileDiff className="size-3.5" />
+                </ToggleGroupItem>
+              </TooltipTrigger>
+              <TooltipContent>
+                <div className="flex flex-col gap-1">
+                  <span>Diff view</span>
+                  <ShortcutHint settingsKey="taskViewDiff" />
+                </div>
+              </TooltipContent>
+            </Tooltip>
+            <Tooltip>
+              <TooltipTrigger>
+                <ToggleGroupItem value="editor" size="sm">
+                  <Files className="size-3.5" />
+                </ToggleGroupItem>
+              </TooltipTrigger>
+              <TooltipContent>
+                <div className="flex flex-col gap-1">
+                  <span>File view</span>
+                  <ShortcutHint settingsKey="taskViewEditor" />
+                </div>
+              </TooltipContent>
+            </Tooltip>
+          </ToggleGroup>
+          <ToggleGroup
+            disabled={delayedIsPending}
+            variant="outline"
+            value={[rightPanelView]}
+            size="sm"
+            onValueChange={([value]) => {
+              if (!value) return;
+              taskView.setRightPanelView(value as RightPanelView);
+            }}
+          >
+            <Tooltip>
+              <TooltipTrigger>
+                <ToggleGroupItem value="changes" size="sm">
+                  <GitCommit className="size-3.5" />
+                </ToggleGroupItem>
+              </TooltipTrigger>
+              <TooltipContent>Git changes</TooltipContent>
+            </Tooltip>
+            <Tooltip>
+              <TooltipTrigger>
+                <ToggleGroupItem value="terminals" size="sm">
+                  <Terminal className="size-3.5" />
+                </ToggleGroupItem>
+              </TooltipTrigger>
+              <TooltipContent>Terminals</TooltipContent>
+            </Tooltip>
+            <Tooltip>
+              <TooltipTrigger>
+                <ToggleGroupItem value="files" size="sm">
+                  <ListTree className="size-3.5" />
+                </ToggleGroupItem>
+              </TooltipTrigger>
+              <TooltipContent>File explorer</TooltipContent>
+            </Tooltip>
+          </ToggleGroup>
+        </div>
+      }
+    />
+  );
+});
diff --git a/src/renderer/features/tasks/task-view-context.tsx b/src/renderer/features/tasks/task-view-context.tsx
new file mode 100644
index 0000000000..7a1a3a5e8f
--- /dev/null
+++ b/src/renderer/features/tasks/task-view-context.tsx
@@ -0,0 +1,86 @@
+import { observer } from 'mobx-react-lite';
+import { createContext, ReactNode, useContext } from 'react';
+import { ProjectViewWrapper } from '@renderer/features/projects/components/project-view-wrapper';
+import { type ProvisionedTask } from '@renderer/features/tasks/stores/task';
+import {
+  asProvisioned,
+  getTaskStore,
+  taskViewKind,
+  type TaskViewKind,
+} from '@renderer/features/tasks/stores/task-selectors';
+import { ViewLayoutOverrideContext } from '@renderer/lib/layout/navigation-provider';
+
+const ProvisionedTaskContext = createContext<ProvisionedTask | null>(null);
+
+export const ProvisionedTaskProvider = observer(function ProvisionedTaskProvider({
+  projectId,
+  taskId,
+  children,
+}: {
+  projectId: string;
+  taskId: string;
+  children: ReactNode;
+}) {
+  const provisioned = asProvisioned(getTaskStore(projectId, taskId));
+  if (!provisioned) return null;
+  return (
+    <ProvisionedTaskContext.Provider value={provisioned}>
+      {children}
+    </ProvisionedTaskContext.Provider>
+  );
+});
+
+/** Non-nullable. Only call inside a ProvisionedTaskProvider subtree (kind === 'ready'). */
+export function useProvisionedTask(): ProvisionedTask {
+  const ctx = useContext(ProvisionedTaskContext);
+  if (!ctx) {
+    throw new Error(
+      'useProvisionedTask must be used inside ProvisionedTaskProvider (kind === "ready")'
+    );
+  }
+  return ctx;
+}
+
+interface TaskViewContext {
+  projectId: string;
+  taskId: string;
+}
+
+const TaskViewContext = createContext<TaskViewContext | null>(null);
+
+export const TaskViewWrapper = observer(function TaskViewWrapper({
+  children,
+  projectId,
+  taskId,
+}: {
+  children: ReactNode;
+  projectId: string;
+  taskId: string;
+}) {
+  const taskStore = getTaskStore(projectId, taskId);
+  const kind = taskViewKind(taskStore, projectId);
+  const hideRightPanel = kind !== 'ready';
+
+  return (
+    <ViewLayoutOverrideContext.Provider value={{ hideRightPanel }}>
+      <ProjectViewWrapper projectId={projectId}>
+        <TaskViewContext.Provider value={{ projectId, taskId }}>
+          {children}
+        </TaskViewContext.Provider>
+      </ProjectViewWrapper>
+    </ViewLayoutOverrideContext.Provider>
+  );
+});
+
+export function useTaskViewContext(): TaskViewContext {
+  const context = useContext(TaskViewContext);
+  if (!context) {
+    throw new Error('useTaskViewContext must be used within a TaskViewContextProvider');
+  }
+  return context;
+}
+
+export function useTaskViewKind(): TaskViewKind {
+  const { projectId, taskId } = useTaskViewContext();
+  return taskViewKind(getTaskStore(projectId, taskId), projectId);
+}
diff --git a/src/renderer/features/tasks/terminals/terminal-manager.ts b/src/renderer/features/tasks/terminals/terminal-manager.ts
new file mode 100644
index 0000000000..20d2ba4db6
--- /dev/null
+++ b/src/renderer/features/tasks/terminals/terminal-manager.ts
@@ -0,0 +1,128 @@
+import { makeObservable, observable, onBecomeObserved, runInAction } from 'mobx';
+import { makePtySessionId } from '@shared/ptySessionId';
+import { CreateTerminalParams, Terminal } from '@shared/terminals';
+import { rpc } from '@renderer/lib/ipc';
+import { PtySession } from '@renderer/lib/pty/pty-session';
+
+export class TerminalManagerStore {
+  private readonly projectId: string;
+  private readonly taskId: string;
+  private _loaded = false;
+  terminals = observable.map<string, TerminalStore>();
+
+  constructor(projectId: string, taskId: string) {
+    this.projectId = projectId;
+    this.taskId = taskId;
+    makeObservable(this, {
+      terminals: observable,
+    });
+    onBecomeObserved(this, 'terminals', () => {
+      if (this._loaded) return;
+      this.load();
+    });
+  }
+
+  async load() {
+    this._loaded = true;
+    const terminals = await rpc.terminals.getTerminalsForTask(this.projectId, this.taskId);
+    runInAction(() => {
+      for (const terminal of terminals) {
+        const store = new TerminalStore(terminal);
+        this.terminals.set(terminal.id, store);
+        void store.session.connect();
+      }
+    });
+  }
+
+  async createTerminal(params: CreateTerminalParams): Promise<Terminal> {
+    const optimistic: Terminal = {
+      id: params.id,
+      projectId: params.projectId,
+      taskId: params.taskId,
+      name: params.name,
+    };
+
+    runInAction(() => {
+      const store = new TerminalStore(optimistic);
+      this.terminals.set(params.id, store);
+      void store.session.connect();
+    });
+
+    try {
+      const terminal = await rpc.terminals.createTerminal(params);
+      runInAction(() => {
+        const store = this.terminals.get(params.id);
+        if (store) {
+          Object.assign(store.data, terminal);
+        }
+      });
+      return terminal;
+    } catch (err) {
+      runInAction(() => {
+        this.terminals.get(params.id)?.dispose();
+        this.terminals.delete(params.id);
+      });
+      throw err;
+    }
+  }
+
+  async deleteTerminal(terminalId: string): Promise<void> {
+    const store = this.terminals.get(terminalId);
+    if (!store) return;
+
+    runInAction(() => {
+      this.terminals.delete(terminalId);
+    });
+
+    try {
+      await rpc.terminals.deleteTerminal({
+        projectId: this.projectId,
+        taskId: this.taskId,
+        terminalId,
+      });
+      store.dispose();
+    } catch (err) {
+      runInAction(() => {
+        this.terminals.set(terminalId, store);
+      });
+      throw err;
+    }
+  }
+
+  async renameTerminal(terminalId: string, name: string): Promise<void> {
+    const store = this.terminals.get(terminalId);
+    if (!store) return;
+
+    const previousName = store.data.name;
+
+    runInAction(() => {
+      store.data.name = name;
+    });
+
+    try {
+      await rpc.terminals.renameTerminal(terminalId, name);
+    } catch (err) {
+      runInAction(() => {
+        store.data.name = previousName;
+      });
+      throw err;
+    }
+  }
+}
+
+export class TerminalStore {
+  data: Terminal;
+  session: PtySession;
+
+  constructor(terminal: Terminal) {
+    this.data = terminal;
+    this.session = new PtySession(
+      makePtySessionId(terminal.projectId, terminal.taskId, terminal.id)
+    );
+    makeObservable(this, { data: observable, session: observable });
+  }
+
+  dispose() {
+    this.session.dispose();
+  }
+}
diff --git a/src/renderer/features/tasks/terminals/terminal-panel.tsx b/src/renderer/features/tasks/terminals/terminal-panel.tsx
new file mode 100644
index 0000000000..591288d92c
--- /dev/null
+++ b/src/renderer/features/tasks/terminals/terminal-panel.tsx
@@ -0,0 +1,228 @@
+import { useHotkey } from '@tanstack/react-hotkeys';
+import { LayoutList, Pause, Play, Terminal } from 'lucide-react';
+import { observer } from 'mobx-react-lite';
+import { useState } from 'react';
+import { asMounted, getProjectStore } from '@renderer/features/projects/stores/project-selectors';
+import { useAppSettingsKey } from '@renderer/features/settings/use-app-settings-key';
+import { TabbedPtyPanel } from '@renderer/features/tasks/tabbed-pty-panel';
+import { useProvisionedTask, useTaskViewContext } from '@renderer/features/tasks/task-view-context';
+import {
+  getEffectiveHotkey,
+  getHotkeyRegistration,
+} from '@renderer/lib/hooks/useKeyboardShortcuts';
+import { useTabShortcuts } from '@renderer/lib/hooks/useTabShortcuts';
+import { rpc } from '@renderer/lib/ipc';
+import { useWorkspaceLayoutContext } from '@renderer/lib/layout/layout-provider';
+import { PtySession } from '@renderer/lib/pty/pty-session';
+import { TabViewProvider } from '@renderer/lib/stores/generic-tab-view';
+import { Button } from '@renderer/lib/ui/button';
+import { EmptyState } from '@renderer/lib/ui/empty-state';
+import { ShortcutHint } from '@renderer/lib/ui/shortcut-hint';
+import { Tooltip, TooltipContent, TooltipTrigger } from '@renderer/lib/ui/tooltip';
+import { log } from '@renderer/utils/logger';
+import { cn } from '@renderer/utils/utils';
+import { useIsActiveTask } from '../hooks/use-is-active-task';
+import {
+  getTerminalsPaneSize,
+  nextTerminalName,
+  ScriptsTabs,
+  TerminalsTabs,
+} from './terminal-tabs';
+
+type PanelMode = 'terminals' | 'scripts';
+
+type AnyPtyEntity = { data: { id: string }; session: PtySession };
+
+export const TerminalsPanel = observer(function TerminalsPanel() {
+  const { projectId, taskId } = useTaskViewContext();
+  const provisionedTask = useProvisionedTask();
+  const terminalMgr = provisionedTask.terminals;
+  const terminalTabView = provisionedTask.taskView.terminalTabs;
+  const lifecycleScriptsMgr = provisionedTask.workspace.lifecycleScripts ?? null;
+  const { value: keyboard } = useAppSettingsKey('keyboard');
+  const { isRightOpen } = useWorkspaceLayoutContext();
+  const isActive = useIsActiveTask(taskId);
+  const mountedProject = asMounted(getProjectStore(projectId));
+  const remoteConnectionId =
+    mountedProject?.data.type === 'ssh' ? mountedProject.data.connectionId : undefined;
+  const [isPanelFocused, setIsPanelFocused] = useState(false);
+  const [mode, setMode] = useState<PanelMode>('terminals');
+  const newTerminalHotkey = getEffectiveHotkey('newTerminal', keyboard);
+
+  const autoFocus = isActive && isRightOpen && provisionedTask.taskView.focusedRegion === 'right';
+
+  const handleCreate = async () => {
+    if (!terminalMgr) return;
+    provisionedTask.taskView.setFocusedRegion('right');
+    const id = crypto.randomUUID();
+    const name = nextTerminalName((terminalTabView.tabs ?? []).map((s) => s.data.name));
+    try {
+      await terminalMgr.createTerminal({
+        id,
+        projectId,
+        taskId,
+        name,
+        initialSize: getTerminalsPaneSize(),
+      });
+      terminalTabView.setActiveTab(id);
+    } catch (error) {
+      log.error('Failed to create terminal:', error);
+    }
+  };
+
+  const handleRunScript = () => {
+    const activeScript = lifecycleScriptsMgr?.activeTab;
+    if (!activeScript) return;
+    activeScript.markRunning();
+    void rpc.terminals
+      .runLifecycleScript({
+        projectId,
+        workspaceId: provisionedTask.workspaceId,
+        type: activeScript.data.type,
+      })
+      .catch(() => {
+        activeScript.markExited();
+      });
+  };
+
+  const handleStopScript = () => {
+    const activeScript = lifecycleScriptsMgr?.activeTab;
+    if (!activeScript) return;
+    void rpc.pty.sendInput(activeScript.session.sessionId, '\x03');
+  };
+
+  const activeStore = mode === 'terminals' ? terminalTabView : lifecycleScriptsMgr;
+  useTabShortcuts(activeStore ?? undefined, { focused: isPanelFocused });
+  useHotkey(getHotkeyRegistration('newTerminal', keyboard), () => void handleCreate(), {
+    enabled: mode === 'terminals' && newTerminalHotkey !== null,
+  });
+
+  const runScriptButton = (
+    <Tooltip>
+      <TooltipTrigger>
+        <button
+          className="size-10 justify-center items-center flex border-l hover:bg-background text-foreground-muted hover:text-foreground"
+          onClick={lifecycleScriptsMgr?.activeTab?.isRunning ? handleStopScript : handleRunScript}
+        >
+          {lifecycleScriptsMgr?.activeTab?.isRunning ? (
+            <Pause className="size-4" />
+          ) : (
+            <Play className="size-4" />
+          )}
+        </button>
+      </TooltipTrigger>
+      <TooltipContent>
+        {lifecycleScriptsMgr?.activeTab?.isRunning ? 'Stop script' : 'Run script'}
+      </TooltipContent>
+    </Tooltip>
+  );
+
+  const toggleButton = lifecycleScriptsMgr ? (
+    <div className="flex items-center border-l">
+      <Tooltip>
+        <TooltipTrigger>
+          <button
+            className={cn(
+              'size-10 flex items-center justify-center',
+              mode === 'terminals'
+                ? 'text-foreground bg-background-2'
+                : 'text-foreground-muted hover:text-foreground'
+            )}
+            onClick={() => setMode('terminals')}
+          >
+            <Terminal className="size-3.5" />
+          </button>
+        </TooltipTrigger>
+        <TooltipContent>Terminals</TooltipContent>
+      </Tooltip>
+      <Tooltip>
+        <TooltipTrigger>
+          <button
+            className={cn(
+              'size-10 flex items-center justify-center',
+              mode === 'scripts'
+                ? 'text-foreground bg-background-2'
+                : 'text-foreground-muted hover:text-foreground'
+            )}
+            onClick={() => setMode('scripts')}
+          >
+            <LayoutList className="size-3.5" />
+          </button>
+        </TooltipTrigger>
+        <TooltipContent>Lifecycle Scripts</TooltipContent>
+      </Tooltip>
+    </div>
+  ) : null;
+
+  const store = (mode === 'terminals' ? terminalTabView : lifecycleScriptsMgr) as
+    | TabViewProvider<AnyPtyEntity, never>
+    | undefined;
+
+  const tabBar =
+    mode === 'terminals' ? (
+      <TerminalsTabs
+        projectId={projectId}
+        taskId={taskId}
+        terminalTabView={terminalTabView}
+        terminalMgr={terminalMgr}
+        actions={toggleButton}
+      />
+    ) : (
+      <ScriptsTabs
+        lifecycleScriptsMgr={lifecycleScriptsMgr}
+        actions={
+          <div className="flex items-center">
+            {lifecycleScriptsMgr?.tabs.length ? runScriptButton : null}
+            {toggleButton}
+          </div>
+        }
+      />
+    );
+
+  const emptyState =
+    mode === 'terminals' ? (
+      <EmptyState
+        icon={<Terminal className="h-5 w-5 text-muted-foreground" />}
+        label="No terminals yet"
+        description="Add a terminal to run shell commands in this task's working directory."
+        action={
+          <Button
+            size="sm"
+            variant="outline"
+            onClick={handleCreate}
+            className="flex items-center gap-2"
+          >
+            New terminal
+            <ShortcutHint settingsKey="newTerminal" />
+          </Button>
+        }
+      />
+    ) : (
+      <EmptyState
+        icon={<LayoutList className="h-5 w-5 text-muted-foreground" />}
+        label="No lifecycle scripts"
+        description="Add setup or run scripts to .emdash.json to see them here."
+        action={
+          <Button size="sm" variant="outline" onClick={() => setMode('terminals')}>
+            Back to terminals
+          </Button>
+        }
+      />
+    );
+
+  return (
+    <TabbedPtyPanel
+      autoFocus={autoFocus}
+      onFocusChange={(focused) => {
+        setIsPanelFocused(focused);
+        if (focused) provisionedTask.taskView.setFocusedRegion('right');
+      }}
+      store={store}
+      paneId={mode === 'terminals' ? 'terminals' : 'lifecycle-scripts'}
+      getSession={(s) => s.session}
+      remoteConnectionId={remoteConnectionId}
+      tabBar={tabBar}
+      emptyState={emptyState}
+    />
+  );
+});
diff --git a/src/renderer/features/tasks/terminals/terminal-tab-view-store.ts b/src/renderer/features/tasks/terminals/terminal-tab-view-store.ts
new file mode 100644
index 0000000000..c7175e688c
--- /dev/null
+++ b/src/renderer/features/tasks/terminals/terminal-tab-view-store.ts
@@ -0,0 +1,123 @@
+import { action, computed, makeObservable, observable, reaction } from 'mobx';
+import { TabViewProvider, TabViewSnapshot } from '@renderer/lib/stores/generic-tab-view';
+import type { Snapshottable } from '@renderer/lib/stores/snapshottable';
+import {
+  reorderTabIds,
+  setNextTabActive,
+  setPreviousTabActive,
+  setTabActive,
+  setTabActiveIndex,
+} from '@renderer/lib/stores/tab-utils';
+import type { TerminalManagerStore, TerminalStore } from './terminal-manager';
+
+export class TerminalTabViewStore
+  implements TabViewProvider<TerminalStore, never>, Snapshottable<TabViewSnapshot>
+{
+  tabOrder: string[] = [];
+  activeTabId: string | undefined = undefined;
+
+  private readonly resource: TerminalManagerStore;
+  private readonly disposers: (() => void)[] = [];
+
+  constructor(resource: TerminalManagerStore) {
+    this.resource = resource;
+    makeObservable(this, {
+      tabOrder: observable,
+      activeTabId: observable,
+      tabs: computed,
+      activeTab: computed,
+      snapshot: computed,
+      addTab: action,
+      removeTab: action,
+      reorderTabs: action,
+      setNextTabActive: action,
+      setPreviousTabActive: action,
+      setTabActiveIndex: action,
+      setActiveTab: action,
+      restoreSnapshot: action,
+    });
+
+    this.disposers.push(
+      reaction(
+        () => Array.from(this.resource.terminals.keys()),
+        action((ids: string[]) => {
+          const idSet = new Set(ids);
+          // Remove deleted IDs
+          for (let i = this.tabOrder.length - 1; i >= 0; i--) {
+            if (!idSet.has(this.tabOrder[i])) {
+              this.tabOrder.splice(i, 1);
+            }
+          }
+          // Append new IDs
+          for (const id of ids) {
+            if (!this.tabOrder.includes(id)) {
+              this.tabOrder.push(id);
+            }
+          }
+          // Deselect removed active tab
+          if (this.activeTabId && !idSet.has(this.activeTabId)) {
+            this.activeTabId = this.tabOrder[0];
+          }
+          // Auto-select first if nothing is active
+          if (!this.activeTabId && this.tabOrder.length > 0) {
+            this.activeTabId = this.tabOrder[0];
+          }
+        })
+      )
+    );
+  }
+
+  get tabs(): TerminalStore[] {
+    return this.tabOrder
+      .map((id) => this.resource.terminals.get(id))
+      .filter(Boolean) as TerminalStore[];
+  }
+
+  get activeTab(): TerminalStore | undefined {
+    return this.activeTabId ? this.resource.terminals.get(this.activeTabId) : undefined;
+  }
+
+  get snapshot(): TabViewSnapshot {
+    return { tabOrder: this.tabOrder.slice(), activeTabId: this.activeTabId };
+  }
+
+  restoreSnapshot(snapshot: Partial<TabViewSnapshot>): void {
+    if (snapshot.tabOrder) this.tabOrder = snapshot.tabOrder;
+    if (snapshot.activeTabId !== undefined) this.activeTabId = snapshot.activeTabId;
+  }
+
+  setActiveTab(id: string): void {
+    setTabActive(this, id);
+  }
+
+  reorderTabs(fromIndex: number, toIndex: number): void {
+    reorderTabIds(this, fromIndex, toIndex);
+  }
+
+  setNextTabActive(): void {
+    setNextTabActive(this);
+  }
+
+  setPreviousTabActive(): void {
+    setPreviousTabActive(this);
+  }
+
+  setTabActiveIndex(index: number): void {
+    setTabActiveIndex(this, index);
+  }
+
+  // addTab is required by TabViewProvider but terminals are created explicitly
+  addTab(_args: never): void {}
+
+  removeTab(id: string): void {
+    void this.resource.deleteTerminal(id);
+  }
+
+  closeActiveTab(): void {
+    if (this.activeTabId) this.removeTab(this.activeTabId);
+  }
+
+  dispose(): void {
+    for (const d of this.disposers) d();
+  }
+}
diff --git a/src/renderer/features/tasks/terminals/terminal-tabs.tsx b/src/renderer/features/tasks/terminals/terminal-tabs.tsx
new file mode 100644
index 0000000000..a49d8dea18
--- /dev/null
+++ b/src/renderer/features/tasks/terminals/terminal-tabs.tsx
@@ -0,0 +1,138 @@
+import { CircleFadingArrowUp, CirclePlayIcon, Plus, Terminal } from 'lucide-react';
+import { observer } from 'mobx-react-lite';
+import React from 'react';
+import {
+  LifecycleScriptsStore,
+  LifecycleScriptStore,
+  ScriptType,
+} from '@renderer/features/tasks/stores/lifecycle-scripts';
+import {
+  TerminalManagerStore,
+  TerminalStore,
+} from '@renderer/features/tasks/terminals/terminal-manager';
+import { TerminalTabViewStore } from '@renderer/features/tasks/terminals/terminal-tab-view-store';
+import { getPaneContainer } from '@renderer/lib/pty/pane-sizing-context';
+import { measureDimensions } from '@renderer/lib/pty/pty-dimensions';
+import { ShortcutHint } from '@renderer/lib/ui/shortcut-hint';
+import { TabBar } from '@renderer/lib/ui/tab-bar';
+import { Tooltip, TooltipContent, TooltipTrigger } from '@renderer/lib/ui/tooltip';
+import { log } from '@renderer/utils/logger';
+
+export function getTerminalsPaneSize() {
+  const container = getPaneContainer('terminals');
+  return container ? (measureDimensions(container, 8, 16) ?? undefined) : undefined;
+}
+
+export function nextTerminalName(names: string[]): string {
+  const taken = new Set(
+    names
+      .map((n) => /^Terminal (\d+)$/.exec(n)?.[1])
+      .filter(Boolean)
+      .map(Number)
+  );
+  let n = 1;
+  while (taken.has(n)) n++;
+  return `Terminal ${n}`;
+}
+
+function scriptIcon(type: ScriptType): React.ReactNode {
+  if (type === 'setup') return <CircleFadingArrowUp className="size-3.5" />;
+  if (type === 'run') return <CirclePlayIcon className="size-3.5" />;
+  return <CircleFadingArrowUp className="size-3.5 rotate-180" />;
+}
+
+interface TerminalsTabsProps {
+  projectId: string;
+  taskId: string;
+  terminalTabView: TerminalTabViewStore | null;
+  terminalMgr: TerminalManagerStore | null;
+  /** Extra content rendered in the right-side actions area (e.g. mode toggle button). */
+  actions?: React.ReactNode;
+}
+
+export const TerminalsTabs = observer(function TerminalsTabs({
+  projectId,
+  taskId,
+  terminalTabView,
+  terminalMgr,
+  actions,
+}: TerminalsTabsProps) {
+  if (!terminalTabView || !terminalMgr) return null;
+
+  const handleAdd = async () => {
+    const id = crypto.randomUUID();
+    const name = nextTerminalName(terminalTabView.tabs.map((s) => s.data.name));
+    try {
+      await terminalMgr.createTerminal({
+        id,
+        projectId,
+        taskId,
+        name,
+        initialSize: getTerminalsPaneSize(),
+      });
+      terminalTabView.setActiveTab(id);
+    } catch (error) {
+      log.error('Failed to create terminal:', error);
+    }
+  };
+
+  return (
+    <TabBar<TerminalStore>
+      tabs={terminalTabView.tabs}
+      activeTabId={terminalTabView.activeTabId}
+      getId={(s) => s.data.id}
+      getLabel={(s) => s.data.name}
+      onSelect={(id) => terminalTabView.setActiveTab(id)}
+      onRemove={(id) => {
+        terminalTabView.removeTab(id);
+      }}
+      renderTabPrefix={() => <Terminal className="size-3" />}
+      onRename={(id, name) => void terminalMgr.renameTerminal(id, name)}
+      onReorder={(from, to) => terminalTabView.reorderTabs(from, to)}
+      actions={
+        <div className="flex items-center">
+          <Tooltip>
+            <TooltipTrigger>
+              <button
+                className="size-10 justify-center items-center flex border-l hover:bg-background text-foreground-muted hover:text-foreground"
+                onClick={() => void handleAdd()}
+              >
+                <Plus className="size-4" />
+              </button>
+            </TooltipTrigger>
+            <TooltipContent>
+              Create terminal
+              <ShortcutHint settingsKey="newTerminal" />
+            </TooltipContent>
+          </Tooltip>
+          {actions}
+        </div>
+      }
+    />
+  );
+});
+
+interface ScriptsTabsProps {
+  lifecycleScriptsMgr: LifecycleScriptsStore | null;
+  /** Extra content rendered in the right-side actions area (e.g. mode toggle button). */
+  actions?: React.ReactNode;
+}
+
+export const ScriptsTabs = observer(function ScriptsTabs({
+  lifecycleScriptsMgr,
+  actions,
+}: ScriptsTabsProps) {
+  if (!lifecycleScriptsMgr) return null;
+
+  return (
+    <TabBar<LifecycleScriptStore>
+      tabs={lifecycleScriptsMgr.tabs}
+      activeTabId={lifecycleScriptsMgr.activeTabId}
+      getId={(s) => s.data.id}
+      getLabel={(s) => s.data.label}
+      onSelect={(id) => lifecycleScriptsMgr.setActiveTab(id)}
+      renderTabPrefix={(s) => scriptIcon(s.data.type)}
+      actions={actions}
+    />
+  );
+});
diff --git a/src/renderer/features/tasks/types.ts b/src/renderer/features/tasks/types.ts
new file mode 100644
index 0000000000..b5c8f1c550
--- /dev/null
+++ b/src/renderer/features/tasks/types.ts
@@ -0,0 +1,12 @@
+export type MainPanelView = 'agents' | 'editor' | 'diff';
+export type RightPanelView = 'changes' | 'files' | 'terminals';
+
+export type FileRendererData =
+  | { kind: 'text' }
+  | { kind: 'markdown' }
+  | { kind: 'markdown-source' }
+  | { kind: 'svg' }
+  | { kind: 'svg-source' }
+  | { kind: 'image' }
+  | { kind: 'binary' }
+  | { kind: 'too-large' };
diff --git a/src/renderer/features/tasks/use-git-actions.ts b/src/renderer/features/tasks/use-git-actions.ts
new file mode 100644
index 0000000000..4a4b1fcd90
--- /dev/null
+++ b/src/renderer/features/tasks/use-git-actions.ts
@@ -0,0 +1,38 @@
+import { useMutation } from '@tanstack/react-query';
+import { getTaskGitStore } from '@renderer/features/tasks/stores/task-selectors';
+
+export function useGitActions(projectId: string, taskId: string) {
+  const git = getTaskGitStore(projectId, taskId)!;
+
+  const hasUpstream = git?.isBranchPublished;
+
+  const gitFetchMutation = useMutation({
+    mutationFn: () => git.fetchRemote(),
+  });
+
+  const gitPullMutation = useMutation({
+    mutationFn: () => git.pull(),
+  });
+
+  const gitPushMutation = useMutation({
+    mutationFn: () => git?.push(),
+  });
+
+  const gitPublishMutation = useMutation({
+    mutationFn: () => git.publishBranch(),
+  });
+
+  return {
+    hasUpstream,
+    aheadCount: git.aheadCount,
+    behindCount: git.behindCount,
+    publish: () => gitPublishMutation.mutate(),
+    isPublishing: gitPublishMutation.isPending,
+    fetch: () => gitFetchMutation.mutate(),
+    isFetching: gitFetchMutation.isPending,
+    pull: () => gitPullMutation.mutate(),
+    isPulling: gitPullMutation.isPending,
+    push: () => gitPushMutation.mutate(),
+    isPushing: gitPushMutation.isPending,
+  };
+}
diff --git a/src/renderer/features/tasks/utils.ts b/src/renderer/features/tasks/utils.ts
new file mode 100644
index 0000000000..693051f490
--- /dev/null
+++ b/src/renderer/features/tasks/utils.ts
@@ -0,0 +1,35 @@
+export function extractErrorMessage(error: unknown): string {
+  if (error && typeof error === 'object' && 'message' in error) {
+    return String((error as { message: unknown }).message);
+  }
+  return 'Unknown error';
+}
+
+export function splitPath(filePath: string) {
+  const parts = filePath.split('/');
+  const filename = parts.pop() || filePath;
+  const directory = parts.length > 0 ? parts.join('/') : '';
+  return { filename, directory };
+}
+
+export function parseGithubNameWithOwner(remote: string): string | null {
+  const match = /github\.com[:/](.+?)(?:\.git)?$/.exec(remote);
+  return match?.[1] ?? null;
+}
+
+export function friendlyGitError(raw: string): string {
+  const s = raw.toLowerCase();
+  if (s.includes('non-fast-forward') || s.includes('tip of your current branch is behind'))
+    return 'Remote has new commits. Pull before pushing.';
+  if (s.includes('merge conflict') || s.includes('fix conflicts'))
+    return 'Merge conflicts detected. Resolve them in your editor.';
+  if (s.includes('permission denied') || s.includes('authentication'))
+    return 'Authentication failed. Check your credentials.';
+  if (s.includes('could not resolve host') || s.includes('unable to access'))
+    return 'Cannot reach remote. Check your network connection.';
+  if (s.includes('no such remote')) return 'No remote configured for this repository.';
+  if (s.includes('cannot undo the initial commit')) return 'Cannot undo the initial commit.';
+  if (s.includes('nothing to commit')) return 'Nothing to commit.';
+  const firstLine = raw.split('\n').find((l) => l.trim().length > 0) || raw;
+  return firstLine.length > 120 ? firstLine.slice(0, 120) + '...' : firstLine;
+}
diff --git a/src/renderer/features/tasks/view.tsx b/src/renderer/features/tasks/view.tsx
new file mode 100644
index 0000000000..ea27f03dba
--- /dev/null
+++ b/src/renderer/features/tasks/view.tsx
@@ -0,0 +1,66 @@
+import { observer } from 'mobx-react-lite';
+import { useEffect, type ReactNode } from 'react';
+import { ViewDefinition } from '@renderer/app/view-registry';
+import {
+  getTaskManagerStore,
+  getTaskStore,
+  taskViewKind,
+} from '@renderer/features/tasks/stores/task-selectors';
+import {
+  ProvisionedTaskProvider,
+  TaskViewWrapper,
+} from '@renderer/features/tasks/task-view-context';
+import { EditorProvider } from './editor/editor-provider';
+import { TaskMainPanel } from './main-panel';
+import { TaskRightSidebar } from './right-panel';
+import { TaskTitlebar } from './task-titlebar';
+
+const TaskViewWrapperWithProviders = observer(function TaskViewWrapperWithProviders({
+  children,
+  projectId,
+  taskId,
+}: {
+  children: ReactNode;
+  projectId: string;
+  taskId: string;
+}) {
+  const taskStore = getTaskStore(projectId, taskId);
+  const kind = taskViewKind(taskStore, projectId);
+
+  // Auto-provision when the task view is rendered with an idle task — covers
+  // session restore where the task wasn't in openTaskIds, direct navigation,
+  // and any other path that lands on the task view before provisioning runs.
+  useEffect(() => {
+    if (kind !== 'idle') return;
+    if (taskStore && 'archivedAt' in taskStore.data && taskStore.data.archivedAt) return;
+
+    getTaskManagerStore(projectId)
+      ?.provisionTask(taskId)
+      .catch(() => {});
+  }, [kind, projectId, taskId, taskStore]);
+
+  if (kind !== 'ready') {
+    return (
+      <TaskViewWrapper projectId={projectId} taskId={taskId}>
+        {children}
+      </TaskViewWrapper>
+    );
+  }
+
+  return (
+    <TaskViewWrapper projectId={projectId} taskId={taskId}>
+      <ProvisionedTaskProvider projectId={projectId} taskId={taskId}>
+        <EditorProvider key={taskId} taskId={taskId} projectId={projectId}>
+          {children}
+        </EditorProvider>
+      </ProvisionedTaskProvider>
+    </TaskViewWrapper>
+  );
+});
+
+export const taskView = {
+  WrapView: TaskViewWrapperWithProviders,
+  TitlebarSlot: TaskTitlebar,
+  MainPanel: TaskMainPanel,
+  RightPanel: TaskRightSidebar,
+} satisfies ViewDefinition<{ projectId: string; taskId: string }>;
diff --git a/src/renderer/globals.d.ts b/src/renderer/globals.d.ts
new file mode 100644
index 0000000000..ec5ccabbce
--- /dev/null
+++ b/src/renderer/globals.d.ts
@@ -0,0 +1,15 @@
+declare module 'react-syntax-highlighter';
+declare module 'react-syntax-highlighter/dist/esm/styles/prism';
+
+declare global {
+  interface Window {
+    electronAPI: {
+      invoke: (channel: string, ...args: unknown[]) => Promise<unknown>;
+      eventSend: (channel: string, data: unknown) => void;
+      eventOn: (channel: string, cb: (data: unknown) => void) => () => void;
+      getPathForFile: (file: File) => string;
+    };
+  }
+}
+
+export {};
diff --git a/src/renderer/hooks/use-toast.ts b/src/renderer/hooks/use-toast.ts
deleted file mode 100644
index c9ffe8b629..0000000000
--- a/src/renderer/hooks/use-toast.ts
+++ /dev/null
@@ -1,187 +0,0 @@
-'use client';
-
-import * as React from 'react';
-
-const TOAST_LIMIT = 1;
-const TOAST_REMOVE_DELAY = 1000000;
-
-type ToasterToast = {
-  id: string;
-  title?: React.ReactNode;
-  description?: React.ReactNode;
-  action?: React.ReactElement;
-  open?: boolean;
-  onOpenChange?: (open: boolean) => void;
-  variant?: 'default' | 'destructive';
-};
-
-const actionTypes = {
-  ADD_TOAST: 'ADD_TOAST',
-  UPDATE_TOAST: 'UPDATE_TOAST',
-  DISMISS_TOAST: 'DISMISS_TOAST',
-  REMOVE_TOAST: 'REMOVE_TOAST',
-} as const;
-
-let count = 0;
-
-function genId() {
-  count = (count + 1) % Number.MAX_SAFE_INTEGER;
-  return count.toString();
-}
-
-type ActionType = typeof actionTypes;
-
-type Action =
-  | {
-      type: ActionType['ADD_TOAST'];
-      toast: ToasterToast;
-    }
-  | {
-      type: ActionType['UPDATE_TOAST'];
-      toast: Partial<ToasterToast>;
-    }
-  | {
-      type: ActionType['DISMISS_TOAST'];
-      toastId?: ToasterToast['id'];
-    }
-  | {
-      type: ActionType['REMOVE_TOAST'];
-      toastId?: ToasterToast['id'];
-    };
-
-interface State {
-  toasts: ToasterToast[];
-}
-
-const toastTimeouts = new Map<string, ReturnType<typeof setTimeout>>();
-
-const addToRemoveQueue = (toastId: string) => {
-  if (toastTimeouts.has(toastId)) {
-    return;
-  }
-
-  const timeout = setTimeout(() => {
-    toastTimeouts.delete(toastId);
-    dispatch({
-      type: 'REMOVE_TOAST',
-      toastId: toastId,
-    });
-  }, TOAST_REMOVE_DELAY);
-
-  toastTimeouts.set(toastId, timeout);
-};
-
-export const reducer = (state: State, action: Action): State => {
-  switch (action.type) {
-    case 'ADD_TOAST':
-      return {
-        ...state,
-        toasts: [action.toast, ...state.toasts].slice(0, TOAST_LIMIT),
-      };
-
-    case 'UPDATE_TOAST':
-      return {
-        ...state,
-        toasts: state.toasts.map((t) => (t.id === action.toast.id ? { ...t, ...action.toast } : t)),
-      };
-
-    case 'DISMISS_TOAST': {
-      const { toastId } = action;
-
-      if (toastId) {
-        addToRemoveQueue(toastId);
-      } else {
-        state.toasts.forEach((toast) => {
-          addToRemoveQueue(toast.id);
-        });
-      }
-
-      return {
-        ...state,
-        toasts: state.toasts.map((t) =>
-          t.id === toastId || toastId === undefined
-            ? {
-                ...t,
-                open: false,
-              }
-            : t
-        ),
-      };
-    }
-    case 'REMOVE_TOAST':
-      if (action.toastId === undefined) {
-        return {
-          ...state,
-          toasts: [],
-        };
-      }
-      return {
-        ...state,
-        toasts: state.toasts.filter((t) => t.id !== action.toastId),
-      };
-  }
-};
-
-const listeners: Array<(state: State) => void> = [];
-
-let memoryState: State = { toasts: [] };
-
-function dispatch(action: Action) {
-  memoryState = reducer(memoryState, action);
-  listeners.forEach((listener) => {
-    listener(memoryState);
-  });
-}
-
-type Toast = Omit<ToasterToast, 'id'>;
-
-function toast({ ...props }: Toast) {
-  const id = genId();
-
-  const update = (props: ToasterToast) =>
-    dispatch({
-      type: 'UPDATE_TOAST',
-      toast: { ...props, id },
-    });
-  const dismiss = () => dispatch({ type: 'DISMISS_TOAST', toastId: id });
-
-  dispatch({
-    type: 'ADD_TOAST',
-    toast: {
-      ...props,
-      id,
-      open: true,
-      onOpenChange: (open) => {
-        if (!open) dismiss();
-      },
-    },
-  });
-
-  return {
-    id: id,
-    dismiss,
-    update,
-  };
-}
-
-function useToast() {
-  const [state, setState] = React.useState<State>(memoryState);
-
-  React.useEffect(() => {
-    listeners.push(setState);
-    return () => {
-      const index = listeners.indexOf(setState);
-      if (index > -1) {
-        listeners.splice(index, 1);
-      }
-    };
-  }, [state]);
-
-  return {
-    ...state,
-    toast,
-    dismiss: (toastId?: string) => dispatch({ type: 'DISMISS_TOAST', toastId }),
-  };
-}
-
-export { useToast, toast };
diff --git a/src/renderer/hooks/useAgentEvents.ts b/src/renderer/hooks/useAgentEvents.ts
deleted file mode 100644
index e6e9e0054a..0000000000
--- a/src/renderer/hooks/useAgentEvents.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { useEffect } from 'react';
-import type { AgentEvent, SoundEvent } from '@shared/agentEvents';
-import { soundPlayer } from '../lib/soundPlayer';
-
-function mapToSound(event: AgentEvent): SoundEvent | null {
-  if (event.type === 'stop') {
-    return 'task_complete';
-  }
-  if (event.type === 'notification') {
-    const nt = event.payload.notificationType;
-    if (nt === 'permission_prompt' || nt === 'idle_prompt' || nt === 'elicitation_dialog') {
-      return 'needs_attention';
-    }
-  }
-  return null;
-}
-
-export function useAgentEvents(onEvent?: (event: AgentEvent) => void): void {
-  useEffect(() => {
-    const cleanup = window.electronAPI.onAgentEvent(
-      (event: AgentEvent, meta: { appFocused: boolean }) => {
-        const sound = mapToSound(event);
-        if (sound) {
-          soundPlayer.play(sound, meta.appFocused);
-        }
-
-        onEvent?.(event);
-      }
-    );
-
-    return cleanup;
-  }, [onEvent]);
-}
diff --git a/src/renderer/hooks/useAgentPreference.ts b/src/renderer/hooks/useAgentPreference.ts
deleted file mode 100644
index 0e2c52a6a7..0000000000
--- a/src/renderer/hooks/useAgentPreference.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import { useEffect, useState } from 'react';
-
-export type AgentId = 'codex' | 'claude';
-
-export function useAgentPreference(
-  taskId: string,
-  conversationId: string | null,
-  initial: AgentId = 'codex'
-) {
-  const [agent, setAgent] = useState<AgentId>(initial);
-
-  // Reset to initial when switching tasks before conversation is available
-  useEffect(() => {
-    if (!conversationId) {
-      setAgent(initial);
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [taskId, conversationId]);
-
-  // Restore preferred agent for this conversation/task
-  useEffect(() => {
-    if (!conversationId) return;
-    try {
-      const convoKey = `conversationAgent:${conversationId}`;
-      const saved = localStorage.getItem(convoKey) as AgentId | null;
-      if (saved) {
-        setAgent(saved);
-        return;
-      }
-      const wkKey = `taskAgent:${taskId}`;
-      const wkSaved = localStorage.getItem(wkKey) as AgentId | null;
-      if (wkSaved) setAgent(wkSaved);
-    } catch {}
-  }, [conversationId, taskId]);
-
-  // Persist agent selection per conversation and task
-  useEffect(() => {
-    if (!conversationId) return;
-    try {
-      localStorage.setItem(`conversationAgent:${conversationId}`, agent);
-      localStorage.setItem(`taskAgent:${taskId}`, agent);
-    } catch {}
-  }, [agent, conversationId, taskId]);
-
-  return { agent, setAgent };
-}
diff --git a/src/renderer/hooks/useAutoCheckRunsRefresh.ts b/src/renderer/hooks/useAutoCheckRunsRefresh.ts
deleted file mode 100644
index feda6fefa4..0000000000
--- a/src/renderer/hooks/useAutoCheckRunsRefresh.ts
+++ /dev/null
@@ -1,77 +0,0 @@
-import { useEffect, useRef } from 'react';
-import { refreshCheckRuns, refreshAllSubscribedCheckRuns } from '../lib/checkRunsStore';
-import type { CheckRunsStatus } from '../lib/checkRunStatus';
-
-const FAST_POLLING_MS = 10000; // 10s when checks in progress
-const SLOW_POLLING_MS = 60000; // 60s when all complete
-const COOLDOWN_MS = 3000;
-
-export function useAutoCheckRunsRefresh(
-  activeTaskPath: string | undefined,
-  checkRunsStatus: CheckRunsStatus | null
-): void {
-  const lastFocusRefresh = useRef(0);
-  const lastVisibilityRefresh = useRef(0);
-
-  // Window focus refresh (all subscribed tasks, debounced)
-  useEffect(() => {
-    const handleFocus = () => {
-      const now = Date.now();
-      if (now - lastFocusRefresh.current < COOLDOWN_MS) return;
-      lastFocusRefresh.current = now;
-      refreshAllSubscribedCheckRuns().catch(() => {});
-    };
-
-    window.addEventListener('focus', handleFocus);
-    return () => window.removeEventListener('focus', handleFocus);
-  }, []);
-
-  // Adaptive polling for active task
-  const allComplete = checkRunsStatus?.allComplete ?? false;
-
-  useEffect(() => {
-    if (!activeTaskPath) return;
-
-    let intervalId: ReturnType<typeof setInterval> | null = null;
-
-    const interval = allComplete ? SLOW_POLLING_MS : FAST_POLLING_MS;
-
-    const startPolling = () => {
-      if (intervalId) clearInterval(intervalId);
-      intervalId = setInterval(() => {
-        refreshCheckRuns(activeTaskPath).catch(() => {});
-      }, interval);
-    };
-
-    const stopPolling = () => {
-      if (intervalId) {
-        clearInterval(intervalId);
-        intervalId = null;
-      }
-    };
-
-    const handleVisibilityChange = () => {
-      if (document.hidden) {
-        stopPolling();
-      } else {
-        const now = Date.now();
-        if (now - lastVisibilityRefresh.current >= COOLDOWN_MS) {
-          lastVisibilityRefresh.current = now;
-          refreshCheckRuns(activeTaskPath).catch(() => {});
-        }
-        startPolling();
-      }
-    };
-
-    if (!document.hidden) {
-      startPolling();
-    }
-
-    document.addEventListener('visibilitychange', handleVisibilityChange);
-
-    return () => {
-      stopPolling();
-      document.removeEventListener('visibilitychange', handleVisibilityChange);
-    };
-  }, [activeTaskPath, allComplete]);
-}
diff --git a/src/renderer/hooks/useAutoPrRefresh.ts b/src/renderer/hooks/useAutoPrRefresh.ts
deleted file mode 100644
index 1b8461d085..0000000000
--- a/src/renderer/hooks/useAutoPrRefresh.ts
+++ /dev/null
@@ -1,74 +0,0 @@
-import { useEffect, useRef } from 'react';
-import { refreshPrStatus, refreshAllSubscribedPrStatus } from '../lib/prStatusStore';
-
-const POLLING_INTERVAL_MS = 30000; // 30 seconds
-const COOLDOWN_MS = 5000; // 5 second debounce for rapid focus/visibility events
-
-/**
- * Auto-refreshes PR status via:
- * 1. Window focus - refreshes all subscribed tasks (debounced)
- * 2. Polling - refreshes active task every 30s (pauses when hidden)
- */
-export function useAutoPrRefresh(activeTaskPath: string | undefined): void {
-  const lastFocusRefresh = useRef(0);
-  const lastVisibilityRefresh = useRef(0);
-
-  // Window focus refresh (all subscribed tasks, debounced)
-  useEffect(() => {
-    const handleFocus = () => {
-      const now = Date.now();
-      if (now - lastFocusRefresh.current < COOLDOWN_MS) return;
-      lastFocusRefresh.current = now;
-      refreshAllSubscribedPrStatus().catch(() => {});
-    };
-
-    window.addEventListener('focus', handleFocus);
-    return () => window.removeEventListener('focus', handleFocus);
-  }, []);
-
-  // Polling for active task (pauses when window hidden)
-  useEffect(() => {
-    if (!activeTaskPath) return;
-
-    let intervalId: ReturnType<typeof setInterval> | null = null;
-
-    const startPolling = () => {
-      if (intervalId) return;
-      intervalId = setInterval(() => {
-        refreshPrStatus(activeTaskPath).catch(() => {});
-      }, POLLING_INTERVAL_MS);
-    };
-
-    const stopPolling = () => {
-      if (intervalId) {
-        clearInterval(intervalId);
-        intervalId = null;
-      }
-    };
-
-    const handleVisibilityChange = () => {
-      if (document.hidden) {
-        stopPolling();
-      } else {
-        const now = Date.now();
-        if (now - lastVisibilityRefresh.current >= COOLDOWN_MS) {
-          lastVisibilityRefresh.current = now;
-          refreshPrStatus(activeTaskPath).catch(() => {});
-        }
-        startPolling();
-      }
-    };
-
-    // Start polling if visible
-    if (!document.hidden) {
-      startPolling();
-    }
-
-    document.addEventListener('visibilitychange', handleVisibilityChange);
-
-    return () => {
-      stopPolling();
-      document.removeEventListener('visibilitychange', handleVisibilityChange);
-    };
-  }, [activeTaskPath]);
-}
diff --git a/src/renderer/hooks/useAutoScrollOnTaskSwitch.ts b/src/renderer/hooks/useAutoScrollOnTaskSwitch.ts
deleted file mode 100644
index 962c027e95..0000000000
--- a/src/renderer/hooks/useAutoScrollOnTaskSwitch.ts
+++ /dev/null
@@ -1,86 +0,0 @@
-import { useEffect, useRef, useCallback } from 'react';
-
-/**
- * Hook to auto-scroll terminal containers to bottom when task switches
- */
-type ScrollOptions = {
-  /**
-   * Only scroll if the user is already near the top of the pane (avoids yanking them
-   * away from where they were reading).
-   */
-  onlyIfNearTop?: boolean;
-};
-
-export function useAutoScrollOnTaskSwitch(isActive: boolean, taskId: string | null) {
-  const previousTaskIdRef = useRef<string | null>(null);
-  const scrollTimeoutRef = useRef<NodeJS.Timeout | null>(null);
-
-  const scrollToBottom = useCallback((options: ScrollOptions = {}) => {
-    const { onlyIfNearTop = true } = options;
-
-    // Restrict to terminal panes so we don't accidentally scroll unrelated panels.
-    const selectors = [
-      '.terminal-pane .xterm-viewport',
-      '.terminal-pane [data-terminal-container]',
-    ];
-    const containers = selectors.flatMap((selector) =>
-      Array.from(document.querySelectorAll<HTMLElement>(selector))
-    );
-
-    let scrolledAny = false;
-
-    containers.forEach((container) => {
-      const isVisible =
-        container.offsetParent !== null &&
-        container.getClientRects().length > 0 &&
-        container.clientHeight > 0;
-      const hasScrollableContent = container.scrollHeight > container.clientHeight;
-      const nearTop = container.scrollTop <= 32;
-
-      if (!isVisible || !hasScrollableContent) return;
-      if (onlyIfNearTop && !nearTop) return;
-
-      container.scrollTo({
-        top: container.scrollHeight,
-        left: 0,
-        behavior: 'instant',
-      });
-      scrolledAny = true;
-    });
-
-    if (process.env.NODE_ENV === 'development' && !scrolledAny) {
-      console.debug('[useAutoScrollOnTaskSwitch] No scrollable terminal containers found');
-    }
-  }, []);
-
-  useEffect(() => {
-    if (!isActive || !taskId) {
-      return;
-    }
-
-    // Check if task actually changed
-    if (previousTaskIdRef.current !== taskId) {
-      previousTaskIdRef.current = taskId;
-
-      // Clear any existing timeout
-      if (scrollTimeoutRef.current) {
-        clearTimeout(scrollTimeoutRef.current);
-      }
-
-      // Delay scroll to allow content to render
-      scrollTimeoutRef.current = setTimeout(() => {
-        scrollToBottom({ onlyIfNearTop: false });
-      }, 200);
-    }
-
-    return () => {
-      if (scrollTimeoutRef.current) {
-        clearTimeout(scrollTimeoutRef.current);
-        scrollTimeoutRef.current = null;
-      }
-    };
-  }, [isActive, taskId, scrollToBottom]);
-
-  // Expose a manual scroll function for external use
-  return { scrollToBottom };
-}
diff --git a/src/renderer/hooks/useCheckRuns.ts b/src/renderer/hooks/useCheckRuns.ts
deleted file mode 100644
index d347eb9241..0000000000
--- a/src/renderer/hooks/useCheckRuns.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import { useEffect, useState } from 'react';
-import { subscribeToCheckRuns, refreshCheckRuns } from '../lib/checkRunsStore';
-import type { CheckRunsStatus } from '../lib/checkRunStatus';
-
-const noopRefresh = async () => {};
-
-export function useCheckRuns(taskPath?: string, enabled = true) {
-  const [status, setStatus] = useState<CheckRunsStatus | null>(null);
-  const [isLoading, setIsLoading] = useState(!!taskPath && enabled);
-
-  const refresh = async () => {
-    if (!taskPath || !enabled) return;
-    setIsLoading(true);
-    try {
-      const result = await refreshCheckRuns(taskPath);
-      setStatus(result);
-    } finally {
-      setIsLoading(false);
-    }
-  };
-
-  useEffect(() => {
-    if (!enabled || !taskPath) {
-      setStatus(null);
-      setIsLoading(false);
-      return;
-    }
-
-    setStatus(null);
-    setIsLoading(true);
-    return subscribeToCheckRuns(taskPath, (newStatus) => {
-      setStatus(newStatus);
-      setIsLoading(false);
-    });
-  }, [taskPath, enabled]);
-
-  if (!enabled) {
-    return { status: null, refresh: noopRefresh, isLoading: false };
-  }
-
-  return { status, refresh, isLoading };
-}
diff --git a/src/renderer/hooks/useCliAgentDetection.ts b/src/renderer/hooks/useCliAgentDetection.ts
deleted file mode 100644
index 78bb544227..0000000000
--- a/src/renderer/hooks/useCliAgentDetection.ts
+++ /dev/null
@@ -1,134 +0,0 @@
-import { useCallback, useEffect, useState } from 'react';
-import { CliAgentStatus } from '../types/connections';
-import { BASE_CLI_AGENTS } from '../components/CliAgentsList';
-
-type CachedAgentStatus = {
-  installed: boolean;
-  path?: string | null;
-  version?: string | null;
-  lastChecked?: number;
-};
-
-const createDefaultCliAgents = (): CliAgentStatus[] =>
-  BASE_CLI_AGENTS.map((agent) => ({ ...agent }));
-
-const mergeCliAgents = (incoming: CliAgentStatus[]): CliAgentStatus[] => {
-  const mergedMap = new Map<string, CliAgentStatus>();
-
-  BASE_CLI_AGENTS.forEach((agent) => {
-    mergedMap.set(agent.id, { ...agent });
-  });
-
-  incoming.forEach((agent) => {
-    mergedMap.set(agent.id, {
-      ...(mergedMap.get(agent.id) ?? {}),
-      ...agent,
-    });
-  });
-
-  return Array.from(mergedMap.values());
-};
-
-const mapAgentStatusesToCli = (
-  statuses: Record<string, CachedAgentStatus | undefined>
-): CliAgentStatus[] => {
-  return Object.entries(statuses).reduce<CliAgentStatus[]>((acc, [agentId, status]) => {
-    if (!status) return acc;
-    const base = BASE_CLI_AGENTS.find((agent) => agent.id === agentId);
-    acc.push({
-      ...(base ?? {
-        id: agentId,
-        name: agentId,
-        status: 'missing' as const,
-        docUrl: null,
-        installCommand: null,
-      }),
-      id: agentId,
-      name: base?.name ?? agentId,
-      status: status.installed ? 'connected' : 'missing',
-      version: status.version ?? null,
-      command: status.path ?? null,
-    });
-    return acc;
-  }, []);
-};
-
-export function useCliAgentDetection() {
-  const [cliAgents, setCliAgents] = useState<CliAgentStatus[]>(() => createDefaultCliAgents());
-  const [cliError, setCliError] = useState<string | null>(null);
-  const [cliLoading, setCliLoading] = useState<boolean>(false);
-
-  useEffect(() => {
-    let cancelled = false;
-
-    const applyCachedStatuses = (statuses: Record<string, CachedAgentStatus> | undefined) => {
-      if (!statuses) return;
-      const agents = mapAgentStatusesToCli(statuses);
-      if (!agents.length) return;
-      setCliAgents((prev) => mergeCliAgents([...prev, ...agents]));
-    };
-
-    const loadCachedStatuses = async () => {
-      if (!window?.electronAPI?.getProviderStatuses) return;
-      try {
-        const result = await window.electronAPI.getProviderStatuses();
-        if (cancelled) return;
-        if (result?.success && result.statuses) {
-          applyCachedStatuses(result.statuses);
-        }
-      } catch (error) {
-        if (!cancelled) {
-          console.error('Failed to load cached CLI agent statuses:', error);
-        }
-      }
-    };
-
-    const off =
-      window?.electronAPI?.onProviderStatusUpdated?.(
-        (payload: { providerId: string; status: CachedAgentStatus }) => {
-          if (!payload?.providerId || !payload.status) return;
-          applyCachedStatuses({ [payload.providerId]: payload.status });
-        }
-      ) ?? null;
-
-    void loadCachedStatuses();
-
-    return () => {
-      cancelled = true;
-      off?.();
-    };
-  }, []);
-
-  const fetchCliAgents = useCallback(async () => {
-    if (!window?.electronAPI?.getProviderStatuses) {
-      setCliAgents(createDefaultCliAgents());
-      setCliError('Agent status detection is unavailable in this build.');
-      return;
-    }
-
-    setCliLoading(true);
-    setCliError(null);
-
-    try {
-      const result = await window.electronAPI.getProviderStatuses({ refresh: true });
-      if (result?.success && result.statuses) {
-        const agents = mapAgentStatusesToCli(result.statuses);
-        setCliAgents((prev) => mergeCliAgents([...prev, ...agents]));
-      } else {
-        setCliError(result?.error || 'Failed to detect CLI agents.');
-      }
-    } catch (error) {
-      console.error('CLI detection failed:', error);
-      setCliError('Unable to detect CLI agents.');
-    } finally {
-      setCliLoading(false);
-    }
-  }, []);
-
-  return {
-    cliAgents,
-    cliLoading,
-    cliError,
-    fetchCliAgents,
-  };
-}
diff --git a/src/renderer/hooks/useContentSearch.ts b/src/renderer/hooks/useContentSearch.ts
deleted file mode 100644
index d01b26b2bc..0000000000
--- a/src/renderer/hooks/useContentSearch.ts
+++ /dev/null
@@ -1,149 +0,0 @@
-import { useState, useCallback, useRef, useEffect } from 'react';
-
-// Constants - No magic numbers
-const SEARCH_DEBOUNCE_MS = 400; // Balanced for performance and responsiveness
-const DEFAULT_MAX_RESULTS = 10000; // Increased to match typical IDE search capabilities
-const MIN_SEARCH_LENGTH = 2; // Minimum 2 characters to search
-
-// Types
-export interface SearchMatch {
-  line: number;
-  column: number;
-  text: string;
-  preview: string;
-}
-
-export interface SearchResult {
-  file: string;
-  matches: SearchMatch[];
-}
-
-export interface UseContentSearchOptions {
-  debounceMs?: number;
-  maxResults?: number;
-  caseSensitive?: boolean;
-  connectionId?: string | null;
-  remotePath?: string | null;
-}
-
-export interface UseContentSearchReturn {
-  searchQuery: string;
-  searchResults: SearchResult[];
-  isSearching: boolean;
-  error: string | null;
-  handleSearchChange: (value: string) => void;
-  clearSearch: () => void;
-}
-
-/**
- * Custom hook for content search functionality
- * Encapsulates search logic with debouncing and error handling
- */
-export function useContentSearch(
-  rootPath: string,
-  options: UseContentSearchOptions = {}
-): UseContentSearchReturn {
-  const {
-    debounceMs = SEARCH_DEBOUNCE_MS,
-    maxResults = DEFAULT_MAX_RESULTS,
-    caseSensitive = false,
-    connectionId,
-    remotePath,
-  } = options;
-
-  // State management
-  const [searchQuery, setSearchQuery] = useState('');
-  const [searchResults, setSearchResults] = useState<SearchResult[]>([]);
-  const [isSearching, setIsSearching] = useState(false);
-  const [error, setError] = useState<string | null>(null);
-
-  // Ref to store debounce timer
-  const debounceTimerRef = useRef<NodeJS.Timeout | null>(null);
-
-  // Clear debounce timer on unmount
-  useEffect(() => {
-    return () => {
-      if (debounceTimerRef.current) {
-        clearTimeout(debounceTimerRef.current);
-      }
-    };
-  }, []);
-
-  // Perform the actual search
-  const performSearch = useCallback(
-    async (query: string) => {
-      setIsSearching(true);
-      setError(null);
-
-      try {
-        const remote = connectionId && remotePath ? { connectionId, remotePath } : undefined;
-        const result = await window.electronAPI.fsSearchContent(
-          rootPath,
-          query,
-          { caseSensitive, maxResults },
-          remote
-        );
-
-        if (!result.success) {
-          throw new Error(result.error || 'Search failed');
-        }
-
-        setSearchResults(result.results || []);
-      } catch (err) {
-        const errorMessage = err instanceof Error ? err.message : 'An unexpected error occurred';
-        setError(errorMessage);
-        setSearchResults([]);
-        console.error('Content search failed:', err);
-      } finally {
-        setIsSearching(false);
-      }
-    },
-    [rootPath, caseSensitive, maxResults, connectionId, remotePath]
-  );
-
-  // Handle search input changes with debouncing
-  const handleSearchChange = useCallback(
-    (value: string) => {
-      setSearchQuery(value);
-
-      // Clear previous timer
-      if (debounceTimerRef.current) {
-        clearTimeout(debounceTimerRef.current);
-      }
-
-      // Clear results if search is too short
-      if (value.trim().length < MIN_SEARCH_LENGTH) {
-        setSearchResults([]);
-        setError(null);
-        return;
-      }
-
-      // Set up new debounce timer
-      debounceTimerRef.current = setTimeout(() => {
-        performSearch(value);
-      }, debounceMs);
-    },
-    [performSearch, debounceMs]
-  );
-
-  // Clear search state
-  const clearSearch = useCallback(() => {
-    setSearchQuery('');
-    setSearchResults([]);
-    setError(null);
-
-    if (debounceTimerRef.current) {
-      clearTimeout(debounceTimerRef.current);
-      debounceTimerRef.current = null;
-    }
-  }, []);
-
-  return {
-    searchQuery,
-    searchResults,
-    isSearching,
-    error,
-    handleSearchChange,
-    clearSearch,
-  };
-}
diff --git a/src/renderer/hooks/useCreatePR.tsx b/src/renderer/hooks/useCreatePR.tsx
deleted file mode 100644
index f8af5a258e..0000000000
--- a/src/renderer/hooks/useCreatePR.tsx
+++ /dev/null
@@ -1,277 +0,0 @@
-import { useState } from 'react';
-import { useToast } from './use-toast';
-import { ToastAction } from '../components/ui/toast';
-import { ArrowUpRight } from 'lucide-react';
-import githubLogo from '../../assets/images/github.png';
-type CreatePROptions = {
-  taskPath: string;
-  commitMessage?: string;
-  createBranchIfOnDefault?: boolean;
-  branchPrefix?: string;
-  prOptions?: {
-    title?: string;
-    body?: string;
-    base?: string;
-    head?: string;
-    draft?: boolean;
-    web?: boolean;
-    fill?: boolean;
-  };
-  onSuccess?: () => Promise<void> | void;
-};
-
-export function useCreatePR() {
-  const { toast } = useToast();
-  const [creatingTaskPath, setCreatingTaskPath] = useState<string | null>(null);
-
-  const isCreatingForTaskPath = (path: string) => creatingTaskPath === path;
-
-  const createPR = async (opts: CreatePROptions) => {
-    const {
-      taskPath,
-      commitMessage: explicitCommitMessage,
-      createBranchIfOnDefault = true,
-      branchPrefix = 'orch',
-      prOptions,
-      onSuccess,
-    } = opts;
-
-    setCreatingTaskPath(taskPath);
-    try {
-      // Guard: ensure Electron bridge methods exist (prevents hard crashes in plain web builds)
-      const api: any = (window as any).electronAPI;
-      if (!api?.gitCommitAndPush || !api?.createPullRequest) {
-        const msg = 'PR creation is only available in the Electron app. Start via "pnpm run d".';
-        toast({ title: 'Create PR Unavailable', description: msg, variant: 'destructive' });
-        return { success: false, error: 'Electron bridge unavailable' } as any;
-      }
-
-      // Auto-generate PR title and description if not provided
-      const finalPrOptions = { ...(prOptions || {}) };
-
-      if (!finalPrOptions.title || !finalPrOptions.body) {
-        try {
-          // Get default branch for comparison
-          let defaultBranch = 'main';
-          try {
-            const branchStatus = await api.getBranchStatus?.({ taskPath });
-            if (branchStatus?.success && branchStatus.defaultBranch) {
-              defaultBranch = branchStatus.defaultBranch;
-            }
-          } catch {}
-
-          // Generate PR content
-          if (api.generatePrContent) {
-            const generated = await api.generatePrContent({
-              taskPath,
-              base: finalPrOptions.base || defaultBranch,
-            });
-
-            if (generated?.success && generated.title) {
-              finalPrOptions.title = finalPrOptions.title || generated.title;
-              finalPrOptions.body = finalPrOptions.body || generated.description || '';
-            }
-          }
-        } catch (error) {
-          // Non-fatal: continue with fallback title
-          // Silently fail - fallback title will be used
-        }
-      }
-
-      // Fallback to inferred title if still not set
-      if (!finalPrOptions.title) {
-        finalPrOptions.title = taskPath.split(/[/\\]/).filter(Boolean).pop() || 'Task';
-      }
-
-      // Use the generated PR title as commit message when no explicit one was provided
-      const commitMessage =
-        explicitCommitMessage || finalPrOptions.title || 'chore: apply task changes';
-
-      const commitRes = await api.gitCommitAndPush({
-        taskPath,
-        commitMessage,
-        createBranchIfOnDefault,
-        branchPrefix,
-      });
-
-      if (!commitRes?.success) {
-        toast({
-          title: 'Commit/Push Failed',
-          description: commitRes?.error || 'Unable to push changes.',
-          variant: 'destructive',
-        });
-        return { success: false, error: commitRes?.error || 'Commit/push failed' } as any;
-      }
-
-      const res = await api.createPullRequest({
-        taskPath,
-        fill: true,
-        ...finalPrOptions,
-      });
-
-      if (res?.success) {
-        void (async () => {
-          const { captureTelemetry } = await import('../lib/telemetryClient');
-          captureTelemetry('pr_created');
-        })();
-        const prUrl = res?.url;
-        toast({
-          title: 'Pull request created successfully!',
-          description: prUrl ? undefined : 'PR created but URL not available.',
-          action: prUrl ? (
-            <ToastAction
-              altText="View PR"
-              onClick={() => {
-                void (async () => {
-                  const { captureTelemetry } = await import('../lib/telemetryClient');
-                  captureTelemetry('pr_viewed');
-                })();
-                if (prUrl && window.electronAPI?.openExternal) {
-                  window.electronAPI.openExternal(prUrl);
-                }
-              }}
-            >
-              <span className="inline-flex items-center gap-1">
-                View PR
-                <ArrowUpRight className="h-3 w-3" />
-              </span>
-            </ToastAction>
-          ) : undefined,
-        });
-        try {
-          await onSuccess?.();
-        } catch {
-          // ignore onSuccess errors
-        }
-      } else {
-        // Check if PR creation failed because a PR already exists
-        const errorText = (res?.error || '').toLowerCase();
-        const outputText = (res?.output || '').toLowerCase();
-        const isPrAlreadyExists =
-          res?.code === 'PR_ALREADY_EXISTS' ||
-          errorText.includes('already exists') ||
-          errorText.includes('already has') ||
-          errorText.includes('pull request for branch') ||
-          outputText.includes('already exists') ||
-          outputText.includes('already has') ||
-          outputText.includes('pull request for branch');
-
-        // If PR already exists, the push was successful - show success message
-        if (isPrAlreadyExists) {
-          void (async () => {
-            const { captureTelemetry } = await import('../lib/telemetryClient');
-            captureTelemetry('pr_push_to_existing');
-          })();
-
-          // Try to extract PR URL from the error output
-          const urlMatch = (res?.output || '').match(/https?:\/\/github\.com\/[^\s]+\/pull\/\d+/);
-          const prUrl = urlMatch ? urlMatch[0] : null;
-
-          toast({
-            title: 'Changes pushed successfully!',
-            description: 'Your changes have been pushed to the existing pull request.',
-            action: prUrl ? (
-              <ToastAction
-                altText="View PR"
-                onClick={() => {
-                  void (async () => {
-                    const { captureTelemetry } = await import('../lib/telemetryClient');
-                    captureTelemetry('pr_viewed');
-                  })();
-                  if (prUrl && window.electronAPI?.openExternal) {
-                    window.electronAPI.openExternal(prUrl);
-                  }
-                }}
-              >
-                <span className="inline-flex items-center gap-1">
-                  View PR
-                  <ArrowUpRight className="h-3 w-3" />
-                </span>
-              </ToastAction>
-            ) : undefined,
-          });
-
-          try {
-            await onSuccess?.();
-          } catch {
-            // ignore onSuccess errors
-          }
-        } else {
-          // Show error for other failures
-          void (async () => {
-            const { captureTelemetry } = await import('../lib/telemetryClient');
-            captureTelemetry('pr_creation_failed', { error_type: res?.error || 'unknown' });
-          })();
-          const details =
-            res?.output && typeof res.output === 'string' ? `\n\nDetails:\n${res.output}` : '';
-          // Offer a browser fallback if org restricts the GitHub CLI app
-          const isOrgRestricted =
-            typeof res?.code === 'string' && res.code === 'ORG_AUTH_APP_RESTRICTED';
-
-          toast({
-            title: (
-              <span className="inline-flex items-center gap-2">
-                <img src={githubLogo} alt="GitHub" className="h-5 w-5 rounded-sm object-contain" />
-                Failed to Create PR
-              </span>
-            ),
-            description:
-              (res?.error || 'Unknown error') +
-              (isOrgRestricted
-                ? '\n\nYour organization restricts OAuth apps. You can either:\n' +
-                  '• Approve the GitHub CLI app in your org settings, or\n' +
-                  '• Authenticate gh with a Personal Access Token that has repo scope, or\n' +
-                  '• Create the PR in your browser.'
-                : '') +
-              details,
-            variant: 'destructive',
-            action: isOrgRestricted ? (
-              <ToastAction
-                altText="Open in browser"
-                onClick={() => {
-                  void (async () => {
-                    const { captureTelemetry } = await import('../lib/telemetryClient');
-                    captureTelemetry('pr_creation_retry_browser');
-                  })();
-                  // Retry using web flow
-                  void createPR({
-                    taskPath,
-                    commitMessage,
-                    createBranchIfOnDefault,
-                    branchPrefix,
-                    prOptions: { ...(prOptions || {}), web: true, fill: true },
-                    onSuccess,
-                  });
-                }}
-              >
-                <span className="inline-flex items-center gap-1">
-                  Open in browser
-                  <ArrowUpRight className="h-3 w-3" />
-                </span>
-              </ToastAction>
-            ) : undefined,
-          });
-        }
-      }
-
-      return res as any;
-    } catch (err: any) {
-      const message = err?.message || String(err) || 'Unknown error';
-      toast({
-        title: (
-          <span className="inline-flex items-center gap-2">
-            <img src={githubLogo} alt="GitHub" className="h-5 w-5 rounded-sm object-contain" />
-            Failed to Create PR
-          </span>
-        ),
-        description: message,
-        variant: 'destructive',
-      });
-      return { success: false, error: message } as any;
-    } finally {
-      setCreatingTaskPath(null);
-    }
-  };
-
-  return { isCreatingForTaskPath, createPR };
-}
diff --git a/src/renderer/hooks/useDeleteRisks.ts b/src/renderer/hooks/useDeleteRisks.ts
deleted file mode 100644
index d24b65319a..0000000000
--- a/src/renderer/hooks/useDeleteRisks.ts
+++ /dev/null
@@ -1,153 +0,0 @@
-import { useEffect, useMemo, useState } from 'react';
-import { isActivePr, PrInfo } from '../lib/prStatus';
-import { refreshPrStatus } from '../lib/prStatusStore';
-
-type TaskRef = { id: string; name: string; path: string };
-
-type RiskState = Record<
-  string,
-  {
-    staged: number;
-    unstaged: number;
-    untracked: number;
-    ahead: number;
-    behind: number;
-    error?: string;
-    pr?: PrInfo | null;
-  }
->;
-
-export function useDeleteRisks(tasks: TaskRef[], enabled: boolean) {
-  const [risks, setRisks] = useState<RiskState>({});
-  const [loading, setLoading] = useState(false);
-  const [loaded, setLoaded] = useState(false);
-
-  useEffect(() => {
-    if (!enabled || tasks.length === 0) {
-      setRisks({});
-      setLoading(false);
-      setLoaded(false);
-      return;
-    }
-    let cancelled = false;
-    const load = async () => {
-      setLoading(true);
-      const next: RiskState = {};
-      for (const ws of tasks) {
-        try {
-          const [statusRes, infoRes, rawPr] = await Promise.allSettled([
-            (window as any).electronAPI?.getGitStatus?.(ws.path),
-            (window as any).electronAPI?.getGitInfo?.(ws.path),
-            refreshPrStatus(ws.path),
-          ]);
-
-          let staged = 0;
-          let unstaged = 0;
-          let untracked = 0;
-          if (
-            statusRes.status === 'fulfilled' &&
-            statusRes.value?.success &&
-            statusRes.value.changes
-          ) {
-            for (const change of statusRes.value.changes) {
-              if (change.status === 'untracked') {
-                untracked += 1;
-              } else if (change.isStaged) {
-                staged += 1;
-              } else {
-                unstaged += 1;
-              }
-            }
-          }
-
-          const ahead =
-            infoRes.status === 'fulfilled' && typeof infoRes.value?.aheadCount === 'number'
-              ? infoRes.value.aheadCount
-              : 0;
-          const behind =
-            infoRes.status === 'fulfilled' && typeof infoRes.value?.behindCount === 'number'
-              ? infoRes.value.behindCount
-              : 0;
-          const prValue = rawPr.status === 'fulfilled' ? rawPr.value : null;
-          const pr = isActivePr(prValue) ? prValue : null;
-
-          next[ws.id] = {
-            staged,
-            unstaged,
-            untracked,
-            ahead,
-            behind,
-            error:
-              statusRes.status === 'fulfilled'
-                ? statusRes.value?.error
-                : statusRes.reason?.message || String(statusRes.reason || ''),
-            pr,
-          };
-        } catch (error: any) {
-          next[ws.id] = {
-            staged: 0,
-            unstaged: 0,
-            untracked: 0,
-            ahead: 0,
-            behind: 0,
-            error: error?.message || String(error),
-            pr: null,
-          };
-        }
-      }
-      if (!cancelled) {
-        setRisks(next);
-        setLoading(false);
-        setLoaded(true);
-      }
-    };
-    void load();
-    return () => {
-      cancelled = true;
-    };
-  }, [enabled, tasks]);
-
-  const hasData = loaded && Object.keys(risks).length > 0;
-  const summary = useMemo(() => {
-    const riskyIds = new Set<string>();
-    const summaries: Record<string, string> = {};
-    for (const ws of tasks) {
-      const status = risks[ws.id];
-      if (!status) continue;
-      const dirty =
-        status.staged > 0 ||
-        status.unstaged > 0 ||
-        status.untracked > 0 ||
-        status.ahead > 0 ||
-        !!status.error ||
-        (status.pr && isActivePr(status.pr));
-      if (dirty) {
-        riskyIds.add(ws.id);
-        const parts = [
-          status.staged > 0
-            ? `${status.staged} ${status.staged === 1 ? 'file' : 'files'} staged`
-            : null,
-          status.unstaged > 0
-            ? `${status.unstaged} ${status.unstaged === 1 ? 'file' : 'files'} unstaged`
-            : null,
-          status.untracked > 0
-            ? `${status.untracked} ${status.untracked === 1 ? 'file' : 'files'} untracked`
-            : null,
-          status.ahead > 0
-            ? `ahead by ${status.ahead} ${status.ahead === 1 ? 'commit' : 'commits'}`
-            : null,
-          status.behind > 0
-            ? `behind by ${status.behind} ${status.behind === 1 ? 'commit' : 'commits'}`
-            : null,
-          status.pr && isActivePr(status.pr) ? 'PR open' : null,
-        ]
-          .filter(Boolean)
-          .join(', ');
-        summaries[ws.id] = parts || status.error || 'Status unavailable';
-      }
-    }
-    return { riskyIds, summaries };
-  }, [risks, tasks]);
-
-  return { risks, loading, summary, hasData };
-}
diff --git a/src/renderer/hooks/useDiffEditorComments.ts b/src/renderer/hooks/useDiffEditorComments.ts
deleted file mode 100644
index 4725a81154..0000000000
--- a/src/renderer/hooks/useDiffEditorComments.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-import { useEffect, useRef, useMemo, useLayoutEffect } from 'react';
-import type * as monaco from 'monaco-editor';
-import { MonacoCommentManager } from '../lib/MonacoCommentManager';
-import { useLineComments } from './useLineComments';
-
-interface UseDiffEditorCommentsOptions {
-  editor: monaco.editor.IStandaloneDiffEditor | null;
-  taskId: string;
-  filePath: string;
-}
-
-export function useDiffEditorComments({ editor, taskId, filePath }: UseDiffEditorCommentsOptions) {
-  const { comments, addComment, updateComment, deleteComment } = useLineComments(taskId, filePath, {
-    includeSent: false,
-  });
-  const managerRef = useRef<MonacoCommentManager | null>(null);
-
-  // Memoize callbacks to pass to manager
-  const callbacks = useMemo(
-    () => ({
-      onAddComment: addComment,
-      onEditComment: updateComment,
-      onDeleteComment: deleteComment,
-    }),
-    [addComment, updateComment, deleteComment]
-  );
-
-  // Store comments in ref so we can access latest value in manager creation effect
-  // useLayoutEffect runs synchronously after render but before other effects
-  const commentsRef = useRef(comments);
-  useLayoutEffect(() => {
-    commentsRef.current = comments;
-  });
-
-  // Create manager when editor mounts
-  useEffect(() => {
-    if (!editor) return;
-
-    const manager = new MonacoCommentManager(editor, {
-      ...callbacks,
-    });
-    managerRef.current = manager;
-
-    // Immediately apply current comments when manager is created
-    manager.setComments(commentsRef.current);
-
-    return () => {
-      manager.dispose();
-      managerRef.current = null;
-    };
-  }, [editor, callbacks]);
-
-  // Update comments in manager when they change
-  useEffect(() => {
-    managerRef.current?.setComments(comments);
-  }, [comments]);
-
-  return { comments };
-}
diff --git a/src/renderer/hooks/useEditorDiffDecorations.ts b/src/renderer/hooks/useEditorDiffDecorations.ts
deleted file mode 100644
index cd6d3e87a0..0000000000
--- a/src/renderer/hooks/useEditorDiffDecorations.ts
+++ /dev/null
@@ -1,319 +0,0 @@
-import { useEffect, useRef, useCallback } from 'react';
-import { useTheme } from '@/hooks/useTheme';
-
-// Constants for timing and delays
-const DIFF_CONSTANTS = {
-  INITIAL_DELAY_MS: 100,
-  REFRESH_INTERVAL_MS: 2000,
-  DEBOUNCE_DELAY_MS: 500,
-  CACHE_TTL_MS: 5000, // Cache time-to-live: 5 seconds
-} as const;
-
-interface DiffLine {
-  lineNumber: number;
-  type: 'add' | 'modify' | 'delete';
-}
-
-interface DiffCacheEntry {
-  diff: DiffLine[];
-  timestamp: number;
-}
-
-interface UseEditorDiffDecorationsOptions {
-  editor: any; // Monaco editor instance
-  filePath: string;
-  taskPath: string;
-}
-
-/**
- * Custom hook for managing diff decorations in Monaco editor
- * Shows gutter indicators for added, modified, and deleted lines
- */
-export function useEditorDiffDecorations({
-  editor,
-  filePath,
-  taskPath,
-}: UseEditorDiffDecorationsOptions) {
-  const { effectiveTheme } = useTheme();
-  const decorationIdsRef = useRef<string[]>([]);
-  const lastDiffRef = useRef<DiffLine[]>([]);
-  const diffCacheRef = useRef<Map<string, DiffCacheEntry>>(new Map());
-
-  // Compute diff between original and current content
-  const computeDiff = useCallback(async (): Promise<DiffLine[]> => {
-    if (!filePath || !taskPath) {
-      return [];
-    }
-
-    // Ensure the file path is relative to the task path
-    let relativePath = filePath;
-    if (filePath.startsWith(taskPath)) {
-      relativePath = filePath.substring(taskPath.length);
-      if (relativePath.startsWith('/')) {
-        relativePath = relativePath.substring(1);
-      }
-    }
-
-    // Check cache first
-    const cacheKey = `${taskPath}:${relativePath}`;
-    const cached = diffCacheRef.current.get(cacheKey);
-    if (cached) {
-      const age = Date.now() - cached.timestamp;
-      if (age < DIFF_CONSTANTS.CACHE_TTL_MS) {
-        // Cache is still valid
-        return cached.diff;
-      }
-    }
-
-    try {
-      // Get the diff from git
-      const result = await window.electronAPI.getFileDiff({ taskPath, filePath: relativePath });
-
-      if (!result.success || !result.diff || !result.diff.lines) {
-        return [];
-      }
-
-      const lines = result.diff.lines;
-
-      // If all lines are marked as 'add', it might mean the file is untracked or new
-      // In that case, we should not show any decorations
-      const allAdded = lines.every((line) => line.type === 'add');
-      const allContext = lines.every((line) => line.type === 'context');
-
-      if (allAdded || allContext) {
-        // File appears to be untracked or has no changes
-        return [];
-      }
-
-      const diffLines: DiffLine[] = [];
-      let currentLineNumber = 1;
-      let pendingDelete = false;
-
-      // Parse the diff to determine which lines are added/modified/deleted
-      for (let i = 0; i < lines.length; i++) {
-        const line = lines[i];
-        const nextLine = lines[i + 1];
-
-        if (line.type === 'add') {
-          // Check if this add follows a delete (indicates modification)
-          if (pendingDelete) {
-            // This is a modification
-            diffLines.push({ lineNumber: currentLineNumber, type: 'modify' });
-            pendingDelete = false;
-          } else {
-            // This is a pure addition
-            diffLines.push({ lineNumber: currentLineNumber, type: 'add' });
-          }
-          currentLineNumber++;
-        } else if (line.type === 'del') {
-          // Check if next line is an add (modification pattern)
-          if (nextLine && nextLine.type === 'add') {
-            // Mark as pending delete - will be handled as modification with the add
-            pendingDelete = true;
-          } else {
-            // Pure deletion (no corresponding add)
-            // Note: we don't show decorations for pure deletions in the current file
-            pendingDelete = false;
-          }
-          // Don't increment line number for deletions
-        } else if (line.type === 'context') {
-          currentLineNumber++;
-          pendingDelete = false;
-        }
-      }
-
-      // Remove duplicates and sort by line number
-      const uniqueDiffLines = Array.from(
-        new Map(diffLines.map((item) => [`${item.lineNumber}-${item.type}`, item])).values()
-      ).sort((a, b) => a.lineNumber - b.lineNumber);
-
-      // Cache the result
-      diffCacheRef.current.set(cacheKey, {
-        diff: uniqueDiffLines,
-        timestamp: Date.now(),
-      });
-
-      return uniqueDiffLines;
-    } catch (error) {
-      console.error('Failed to compute diff:', error);
-      return [];
-    }
-  }, [filePath, taskPath]);
-
-  // Apply decorations to the editor
-  const applyDecorations = useCallback(
-    (diffLines: DiffLine[]) => {
-      if (!editor || !editor.getModel()) {
-        return;
-      }
-
-      const isDark = effectiveTheme === 'dark' || effectiveTheme === 'dark-black';
-      const newDecorations: any[] = [];
-
-      for (const diff of diffLines) {
-        let className = '';
-        let glyphMarginClassName = '';
-
-        if (diff.type === 'add') {
-          className = isDark ? 'diff-line-added-dark' : 'diff-line-added-light';
-          glyphMarginClassName = 'diff-glyph-added';
-        } else if (diff.type === 'modify') {
-          className = isDark ? 'diff-line-modified-dark' : 'diff-line-modified-light';
-          glyphMarginClassName = 'diff-glyph-modified';
-        } else if (diff.type === 'delete') {
-          className = isDark ? 'diff-line-deleted-dark' : 'diff-line-deleted-light';
-          glyphMarginClassName = 'diff-glyph-deleted';
-        }
-
-        newDecorations.push({
-          range: {
-            startLineNumber: diff.lineNumber,
-            startColumn: 1,
-            endLineNumber: diff.lineNumber,
-            endColumn: 1,
-          },
-          options: {
-            isWholeLine: true,
-            className: className,
-            glyphMarginClassName: glyphMarginClassName,
-            glyphMarginHoverMessage: {
-              value:
-                diff.type === 'add'
-                  ? 'Added line'
-                  : diff.type === 'modify'
-                    ? 'Modified line'
-                    : 'Deleted line',
-            },
-          },
-        });
-      }
-
-      // Update decorations
-      try {
-        decorationIdsRef.current = editor.deltaDecorations(
-          decorationIdsRef.current,
-          newDecorations
-        );
-      } catch (error) {
-        console.error('Failed to apply decorations:', error);
-      }
-    },
-    [editor, effectiveTheme]
-  );
-
-  // Helper function to compare diff arrays efficiently
-  const areDiffsEqual = (a: DiffLine[], b: DiffLine[]): boolean => {
-    if (a.length !== b.length) return false;
-    for (let i = 0; i < a.length; i++) {
-      if (a[i].lineNumber !== b[i].lineNumber || a[i].type !== b[i].type) {
-        return false;
-      }
-    }
-    return true;
-  };
-
-  // Update decorations when content changes
-  useEffect(() => {
-    if (!editor || !filePath) return;
-
-    const updateDecorations = async () => {
-      const diffLines = await computeDiff();
-
-      // Only update if diff has changed
-      if (!areDiffsEqual(diffLines, lastDiffRef.current)) {
-        lastDiffRef.current = diffLines;
-        applyDecorations(diffLines);
-      }
-    };
-
-    // Initial update with a small delay to ensure editor is ready
-    const initialTimer = setTimeout(updateDecorations, DIFF_CONSTANTS.INITIAL_DELAY_MS);
-
-    // Set up interval to check for changes periodically
-    const interval = setInterval(updateDecorations, DIFF_CONSTANTS.REFRESH_INTERVAL_MS);
-
-    // Listen for model content changes
-    let debounceTimer: NodeJS.Timeout | null = null;
-    const disposable = editor.onDidChangeModelContent?.(() => {
-      // Clear existing debounce timer
-      if (debounceTimer) {
-        clearTimeout(debounceTimer);
-      }
-      // Debounce the update
-      debounceTimer = setTimeout(updateDecorations, DIFF_CONSTANTS.DEBOUNCE_DELAY_MS);
-    });
-
-    return () => {
-      clearTimeout(initialTimer);
-      clearInterval(interval);
-      disposable?.dispose();
-      // Clear decorations on cleanup
-      if (editor && !editor.isDisposed?.()) {
-        try {
-          editor.deltaDecorations(decorationIdsRef.current, []);
-        } catch (e) {
-          // Ignore errors on cleanup
-        }
-      }
-      decorationIdsRef.current = [];
-    };
-  }, [editor, filePath, computeDiff, applyDecorations]);
-
-  // Clean up decorations when theme changes
-  useEffect(() => {
-    if (editor && lastDiffRef.current.length > 0) {
-      applyDecorations(lastDiffRef.current);
-    }
-  }, [effectiveTheme, applyDecorations]);
-
-  // Clean up cache periodically to prevent memory leaks
-  useEffect(() => {
-    const cleanupInterval = setInterval(() => {
-      const now = Date.now();
-      for (const [key, entry] of diffCacheRef.current.entries()) {
-        if (now - entry.timestamp > DIFF_CONSTANTS.CACHE_TTL_MS) {
-          diffCacheRef.current.delete(key);
-        }
-      }
-    }, DIFF_CONSTANTS.CACHE_TTL_MS * 2); // Clean up every 10 seconds
-
-    return () => clearInterval(cleanupInterval);
-  }, []);
-
-  // Helper to clear decorations immediately
-  const clearDecorations = useCallback(() => {
-    if (editor && !editor.isDisposed?.()) {
-      try {
-        decorationIdsRef.current = editor.deltaDecorations(decorationIdsRef.current, []);
-      } catch (error) {
-        // Ignore errors during cleanup
-      }
-    }
-  }, [editor]);
-
-  return {
-    refreshDecorations: async (invalidateCache = false) => {
-      // Clear cache if requested (e.g., after save)
-      if (invalidateCache && filePath) {
-        let relativePath = filePath;
-        if (filePath.startsWith(taskPath)) {
-          relativePath = filePath.substring(taskPath.length);
-          if (relativePath.startsWith('/')) {
-            relativePath = relativePath.substring(1);
-          }
-        }
-        const cacheKey = `${taskPath}:${relativePath}`;
-        diffCacheRef.current.delete(cacheKey);
-
-        // When invalidating cache on save, clear decorations first
-        // This prevents old markers from briefly appearing
-        clearDecorations();
-      }
-
-      const diffLines = await computeDiff();
-      lastDiffRef.current = diffLines;
-      applyDecorations(diffLines);
-    },
-    clearDecorations,
-  };
-}
diff --git a/src/renderer/hooks/useFileChanges.ts b/src/renderer/hooks/useFileChanges.ts
deleted file mode 100644
index 0b3ee08984..0000000000
--- a/src/renderer/hooks/useFileChanges.ts
+++ /dev/null
@@ -1,292 +0,0 @@
-import { useCallback, useEffect, useRef, useState } from 'react';
-import { subscribeToFileChanges } from '@/lib/fileChangeEvents';
-import { getCachedGitStatus } from '@/lib/gitStatusCache';
-
-export interface FileChange {
-  path: string;
-  status: 'added' | 'modified' | 'deleted' | 'renamed';
-  additions: number;
-  deletions: number;
-  isStaged: boolean;
-  diff?: string;
-}
-
-interface UseFileChangesOptions {
-  isActive?: boolean;
-  idleIntervalMs?: number;
-}
-
-export function useFileChanges(taskPath?: string, options: UseFileChangesOptions = {}) {
-  const [fileChanges, setFileChanges] = useState<FileChange[]>([]);
-  const [isLoading, setIsLoading] = useState(false);
-  const [error, setError] = useState<string | null>(null);
-  const [isDocumentVisible, setIsDocumentVisible] = useState(() => {
-    if (typeof document === 'undefined') return true;
-    return document.visibilityState === 'visible';
-  });
-  const [isWindowFocused, setIsWindowFocused] = useState(() => {
-    if (typeof document === 'undefined') return true;
-    return document.hasFocus();
-  });
-
-  const { isActive = true, idleIntervalMs = 60000 } = options;
-  const taskPathRef = useRef(taskPath);
-  const inFlightRef = useRef(false);
-  const hasLoadedRef = useRef(false);
-  const shouldPollRef = useRef(false);
-  const idleHandleRef = useRef<number | null>(null);
-  const idleHandleModeRef = useRef<'idle' | 'timeout' | null>(null);
-  const mountedRef = useRef(true);
-  const pendingRefreshRef = useRef(false);
-  const pendingInitialLoadRef = useRef(false);
-
-  useEffect(() => {
-    mountedRef.current = true;
-    return () => {
-      mountedRef.current = false;
-    };
-  }, []);
-
-  useEffect(() => {
-    setFileChanges([]); // Clear stale state immediately
-    if (taskPath) {
-      setIsLoading(true);
-    }
-    taskPathRef.current = taskPath;
-    hasLoadedRef.current = false;
-  }, [taskPath]);
-
-  useEffect(() => {
-    if (typeof document === 'undefined' || typeof window === 'undefined') return;
-
-    const handleVisibility = () => {
-      setIsDocumentVisible(document.visibilityState === 'visible');
-    };
-    const handleFocus = () => setIsWindowFocused(true);
-    const handleBlur = () => setIsWindowFocused(false);
-
-    document.addEventListener('visibilitychange', handleVisibility);
-    window.addEventListener('focus', handleFocus);
-    window.addEventListener('blur', handleBlur);
-
-    return () => {
-      document.removeEventListener('visibilitychange', handleVisibility);
-      window.removeEventListener('focus', handleFocus);
-      window.removeEventListener('blur', handleBlur);
-    };
-  }, []);
-
-  const queueRefresh = useCallback((shouldSetLoading: boolean) => {
-    pendingRefreshRef.current = true;
-    if (shouldSetLoading) {
-      pendingInitialLoadRef.current = true;
-      if (mountedRef.current) {
-        setIsLoading(true);
-        setError(null);
-      }
-    }
-  }, []);
-
-  const fetchFileChanges = useCallback(
-    async (isInitialLoad = false, options?: { force?: boolean }) => {
-      const currentPath = taskPathRef.current;
-      if (!currentPath) return;
-
-      if (inFlightRef.current) {
-        if (options?.force) {
-          queueRefresh(isInitialLoad);
-        }
-        return;
-      }
-
-      inFlightRef.current = true;
-      if (isInitialLoad && mountedRef.current) {
-        setIsLoading(true);
-        setError(null);
-      }
-
-      const requestPath = currentPath;
-
-      try {
-        const result = await getCachedGitStatus(requestPath, { force: options?.force });
-
-        if (!mountedRef.current) return;
-
-        if (requestPath !== taskPathRef.current) {
-          queueRefresh(true);
-          return;
-        }
-
-        if (result?.success && result.changes && result.changes.length > 0) {
-          const changes: FileChange[] = result.changes
-            .map((change) => ({
-              path: change.path,
-              status: change.status as 'added' | 'modified' | 'deleted' | 'renamed',
-              additions: change.additions || 0,
-              deletions: change.deletions || 0,
-              isStaged: change.isStaged || false,
-              diff: change.diff,
-            }))
-            .filter((c) => !c.path.startsWith('.emdash/') && c.path !== 'PLANNING.md');
-          setFileChanges(changes);
-        } else {
-          setFileChanges([]);
-        }
-      } catch (err) {
-        if (!mountedRef.current) return;
-        if (requestPath !== taskPathRef.current) {
-          queueRefresh(true);
-          return;
-        }
-        console.error('Failed to fetch file changes:', err);
-        if (isInitialLoad) {
-          setError('Failed to load file changes');
-        }
-        setFileChanges([]);
-      } finally {
-        const isCurrentPath = requestPath === taskPathRef.current;
-        if (mountedRef.current && isInitialLoad && !pendingInitialLoadRef.current) {
-          setIsLoading(false);
-        }
-        if (isCurrentPath) {
-          hasLoadedRef.current = true;
-        }
-        inFlightRef.current = false;
-
-        if (pendingRefreshRef.current) {
-          const nextInitialLoad = pendingInitialLoadRef.current;
-          pendingRefreshRef.current = false;
-          pendingInitialLoadRef.current = false;
-          void fetchFileChanges(nextInitialLoad, { force: true });
-        }
-      }
-    },
-    [queueRefresh]
-  );
-
-  const clearIdleHandle = useCallback(() => {
-    if (idleHandleRef.current === null) return;
-    if (idleHandleModeRef.current === 'idle') {
-      const cancelIdle = (window as any).cancelIdleCallback as ((id: number) => void) | undefined;
-      cancelIdle?.(idleHandleRef.current);
-    } else {
-      clearTimeout(idleHandleRef.current);
-    }
-    idleHandleRef.current = null;
-    idleHandleModeRef.current = null;
-  }, []);
-
-  const scheduleIdleRefresh = useCallback(() => {
-    if (!shouldPollRef.current) return;
-    clearIdleHandle();
-
-    const run = () => {
-      if (!shouldPollRef.current) return;
-      void fetchFileChanges(false);
-      scheduleIdleRefresh();
-    };
-
-    const requestIdle = (window as any).requestIdleCallback as
-      | ((cb: () => void, options?: { timeout: number }) => number)
-      | undefined;
-
-    if (requestIdle) {
-      idleHandleModeRef.current = 'idle';
-      idleHandleRef.current = requestIdle(run, { timeout: idleIntervalMs });
-    } else {
-      idleHandleModeRef.current = 'timeout';
-      idleHandleRef.current = window.setTimeout(run, idleIntervalMs);
-    }
-  }, [clearIdleHandle, fetchFileChanges, idleIntervalMs]);
-
-  const shouldPoll = Boolean(taskPath) && isActive && isDocumentVisible && isWindowFocused;
-
-  useEffect(() => {
-    shouldPollRef.current = shouldPoll;
-  }, [shouldPoll]);
-
-  useEffect(() => {
-    if (!taskPath || !shouldPoll) {
-      clearIdleHandle();
-      return;
-    }
-
-    void fetchFileChanges(!hasLoadedRef.current);
-    scheduleIdleRefresh();
-
-    return () => {
-      clearIdleHandle();
-    };
-  }, [taskPath, shouldPoll, fetchFileChanges, scheduleIdleRefresh, clearIdleHandle]);
-
-  useEffect(() => {
-    if (!taskPath) return undefined;
-
-    const unsubscribe = subscribeToFileChanges((event) => {
-      if (event.detail.taskPath === taskPath && shouldPollRef.current) {
-        void fetchFileChanges(false, { force: true });
-      }
-    });
-
-    return () => {
-      unsubscribe();
-    };
-  }, [taskPath, fetchFileChanges]);
-
-  useEffect(() => {
-    if (!taskPath) return;
-    const api = window.electronAPI;
-    let off: (() => void) | undefined;
-    let watchId: string | undefined;
-    let disposed = false;
-
-    const watchPromise = api.watchGitStatus
-      ? api.watchGitStatus(taskPath)
-      : Promise.resolve({ success: false });
-
-    watchPromise
-      .then((res: { success?: boolean; watchId?: string }) => {
-        if (disposed) {
-          if (res?.success && res.watchId && api.unwatchGitStatus) {
-            api.unwatchGitStatus(taskPath, res.watchId).catch(() => {});
-          }
-          return;
-        }
-        if (!res?.success) {
-          return;
-        }
-        watchId = res.watchId;
-        if (api.onGitStatusChanged) {
-          off = api.onGitStatusChanged((event) => {
-            if (event?.taskPath !== taskPath) return;
-            if (!shouldPollRef.current) return;
-            if (event?.error === 'watcher-error') {
-              void fetchFileChanges(false, { force: true });
-              return;
-            }
-            void fetchFileChanges(false, { force: true });
-          });
-        }
-      })
-      .catch(() => {});
-
-    return () => {
-      disposed = true;
-      off?.();
-      if (api.unwatchGitStatus && watchId) {
-        api.unwatchGitStatus(taskPath, watchId).catch(() => {});
-      }
-    };
-  }, [taskPath, fetchFileChanges]);
-
-  const refreshChanges = async () => {
-    await fetchFileChanges(true, { force: true });
-  };
-
-  return {
-    fileChanges,
-    isLoading,
-    error,
-    refreshChanges,
-  };
-}
diff --git a/src/renderer/hooks/useFileDiff.ts b/src/renderer/hooks/useFileDiff.ts
deleted file mode 100644
index c73858db73..0000000000
--- a/src/renderer/hooks/useFileDiff.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import { useEffect, useState } from 'react';
-
-export type DiffLine = { left?: string; right?: string; type: 'context' | 'add' | 'del' };
-
-export function useFileDiff(
-  taskPath: string | undefined,
-  filePath: string | undefined,
-  refreshKey: number = 0
-) {
-  const [lines, setLines] = useState<DiffLine[]>([]);
-  const [loading, setLoading] = useState(false);
-  const [error, setError] = useState<string | null>(null);
-
-  useEffect(() => {
-    let cancelled = false;
-    const run = async () => {
-      if (!taskPath || !filePath) return;
-      setLoading(true);
-      setError(null);
-      try {
-        const res = await window.electronAPI.getFileDiff({ taskPath, filePath });
-        if (!cancelled) {
-          if (res?.success && res.diff) setLines(res.diff.lines);
-          else setError(res?.error || 'Failed to load diff');
-        }
-      } catch (e: any) {
-        if (!cancelled) setError(e?.message || 'Failed to load diff');
-      } finally {
-        if (!cancelled) setLoading(false);
-      }
-    };
-    run();
-    return () => {
-      cancelled = true;
-    };
-  }, [taskPath, filePath, refreshKey]);
-
-  return { lines, loading, error };
-}
diff --git a/src/renderer/hooks/useFileIndex.ts b/src/renderer/hooks/useFileIndex.ts
deleted file mode 100644
index cea380e0e3..0000000000
--- a/src/renderer/hooks/useFileIndex.ts
+++ /dev/null
@@ -1,109 +0,0 @@
-import { useEffect, useRef, useState } from 'react';
-
-type Item = { path: string; type: 'file' | 'dir' };
-
-export function useFileIndex(rootPath: string | undefined) {
-  const [items, setItems] = useState<Item[]>([]);
-  const [loadedFor, setLoadedFor] = useState<string | undefined>(undefined);
-  const [loading, setLoading] = useState(false);
-  const [error, setError] = useState<string | null>(null);
-  const loadRequestedRef = useRef<string | null>(null);
-  const requestIdRef = useRef(0);
-
-  useEffect(() => {
-    if (!rootPath) return;
-    // Only load once per rootPath (lazy); can be reloaded manually
-    if (loadedFor === rootPath || loadRequestedRef.current === rootPath) return;
-    loadRequestedRef.current = rootPath;
-    const requestId = (requestIdRef.current += 1);
-    setLoading(true);
-    setError(null);
-    (async () => {
-      try {
-        const res = await window.electronAPI.fsList(rootPath, {
-          includeDirs: true,
-          maxEntries: 5000,
-        });
-        if (requestIdRef.current !== requestId) return;
-        if (res.canceled) {
-          if (loadRequestedRef.current === rootPath) {
-            loadRequestedRef.current = null;
-          }
-          return;
-        }
-        if (res.success && res.items) {
-          setItems(res.items);
-          setLoadedFor(rootPath);
-        } else {
-          setError(res.error || 'Failed to load files');
-        }
-      } catch (e) {
-        if (requestIdRef.current !== requestId) return;
-        setError('Failed to load files');
-      } finally {
-        if (requestIdRef.current === requestId) {
-          setLoading(false);
-        }
-      }
-    })();
-  }, [rootPath, loadedFor]);
-
-  const reload = async () => {
-    if (!rootPath) return;
-    const requestId = (requestIdRef.current += 1);
-    setLoading(true);
-    setError(null);
-    try {
-      const res = await window.electronAPI.fsList(rootPath, {
-        includeDirs: true,
-        maxEntries: 5000,
-      });
-      if (requestIdRef.current !== requestId) return;
-      if (res.canceled) {
-        return;
-      }
-      if (res.success && res.items) {
-        setItems(res.items);
-        setLoadedFor(rootPath);
-      } else {
-        setError(res.error || 'Failed to load files');
-      }
-    } catch (e) {
-      if (requestIdRef.current !== requestId) return;
-      setError('Failed to load files');
-    } finally {
-      if (requestIdRef.current === requestId) {
-        setLoading(false);
-      }
-    }
-  };
-
-  const search = (query: string, limit = 12): Item[] => {
-    if (!query) return items.slice(0, limit);
-    const q = query.toLowerCase();
-
-    // Basic scoring: startsWith > includes; shorter path wins
-    const scored = items
-      .map((it) => {
-        const p = it.path.toLowerCase();
-        let score = Infinity;
-        const idx = p.indexOf(q);
-        if (idx === 0) score = 0;
-        else if (idx > 0) score = 100 + idx;
-        else return null;
-        // prefer files a bit
-        if (it.type === 'file') score -= 1;
-        // shorter total path wins
-        score += p.length * 0.001;
-        return { it, score };
-      })
-      .filter((x): x is { it: Item; score: number } => x !== null)
-      .sort((a, b) => a.score - b.score)
-      .slice(0, limit)
-      .map((s) => s.it);
-
-    return scored;
-  };
-
-  return { items, loading, error, search, reload };
-}
diff --git a/src/renderer/hooks/useFileManager.ts b/src/renderer/hooks/useFileManager.ts
deleted file mode 100644
index b27eb85945..0000000000
--- a/src/renderer/hooks/useFileManager.ts
+++ /dev/null
@@ -1,334 +0,0 @@
-import { useState, useCallback, useEffect, useMemo, useRef } from 'react';
-import { AUTO_SAVE_DELAY } from '@/constants/file-explorer';
-import { dispatchFileChangeEvent, subscribeToFileChanges } from '@/lib/fileChangeEvents';
-import { getEditorState, saveEditorState } from '@/lib/editorStateStorage';
-
-export interface ManagedFile {
-  path: string;
-  content: string;
-  isDirty: boolean;
-  originalContent: string;
-}
-
-interface UseFileManagerOptions {
-  taskId: string;
-  taskPath: string;
-  autoSave?: boolean;
-  autoSaveDelay?: number;
-  onFileChange?: () => void;
-  connectionId?: string | null;
-  remotePath?: string | null;
-}
-
-interface UseFileManagerReturn {
-  openFiles: Map<string, ManagedFile>;
-  activeFilePath: string | null;
-  activeFile: ManagedFile | null;
-  hasUnsavedChanges: boolean;
-  isSaving: boolean;
-  loadFile: (filePath: string) => Promise<void>;
-  saveFile: (filePath?: string) => Promise<void>;
-  saveAllFiles: () => Promise<void>;
-  closeFile: (filePath: string) => void;
-  updateFileContent: (filePath: string, content: string) => void;
-  setActiveFile: (filePath: string | null) => void;
-}
-
-/**
- * Custom hook for managing file operations in the code editor
- * Handles loading, saving, and tracking file changes
- */
-export function useFileManager(options: UseFileManagerOptions): UseFileManagerReturn {
-  const {
-    taskId,
-    taskPath,
-    autoSave = true,
-    autoSaveDelay = AUTO_SAVE_DELAY,
-    onFileChange,
-    connectionId,
-    remotePath,
-  } = options;
-
-  const remote = useMemo(
-    () => (connectionId && remotePath ? { connectionId, remotePath } : undefined),
-    [connectionId, remotePath]
-  );
-
-  const restoringRef = useRef(false);
-  const [openFiles, setOpenFiles] = useState<Map<string, ManagedFile>>(new Map());
-  const [activeFilePath, setActiveFilePath] = useState<string | null>(null);
-  const [isSaving, setIsSaving] = useState(false);
-
-  const activeFile = activeFilePath ? openFiles.get(activeFilePath) || null : null;
-  const hasUnsavedChanges = Array.from(openFiles.values()).some((f) => f.isDirty);
-
-  /**
-   * Check if file is an image
-   */
-  const isImageFile = useCallback((filePath: string): boolean => {
-    const imageExtensions = ['png', 'jpg', 'jpeg', 'gif', 'webp', 'svg', 'ico', 'bmp'];
-    const ext = filePath.split('.').pop()?.toLowerCase();
-    return ext ? imageExtensions.includes(ext) : false;
-  }, []);
-
-  /**
-   * Load a file from disk
-   */
-  const loadFile = useCallback(
-    async (filePath: string) => {
-      try {
-        // For image files, load as base64
-        if (isImageFile(filePath)) {
-          const result = await window.electronAPI.fsReadImage(taskPath, filePath, remote);
-
-          if (result.success && result.dataUrl) {
-            const file: ManagedFile = {
-              path: filePath,
-              content: result.dataUrl,
-              originalContent: result.dataUrl,
-              isDirty: false,
-            };
-
-            setOpenFiles((prev) => new Map(prev).set(filePath, file));
-            setActiveFilePath(filePath);
-          } else {
-            // Handle error case
-            const errorFile: ManagedFile = {
-              path: filePath,
-              content: '[IMAGE_ERROR]',
-              originalContent: '[IMAGE_ERROR]',
-              isDirty: false,
-            };
-            setOpenFiles((prev) => new Map(prev).set(filePath, errorFile));
-            setActiveFilePath(filePath);
-          }
-          return;
-        }
-
-        // Load text file
-        const result = await window.electronAPI.fsRead(taskPath, filePath, undefined, remote);
-
-        if (result.success && result.content !== undefined) {
-          const file: ManagedFile = {
-            path: filePath,
-            content: result.content,
-            originalContent: result.content,
-            isDirty: false,
-          };
-
-          setOpenFiles((prev) => new Map(prev).set(filePath, file));
-          setActiveFilePath(filePath);
-        } else {
-          console.error('Failed to load file:', result.error);
-        }
-      } catch (error) {
-        console.error('Error loading file:', error);
-      }
-    },
-    [taskPath, isImageFile, remote]
-  );
-
-  /**
-   * Save a file to disk
-   */
-  const saveFile = useCallback(
-    async (filePath?: string) => {
-      const targetPath = filePath || activeFilePath;
-      if (!targetPath) return;
-
-      const file = openFiles.get(targetPath);
-      if (!file || !file.isDirty) return;
-
-      setIsSaving(true);
-
-      try {
-        const result = await window.electronAPI.fsWriteFile(
-          taskPath,
-          targetPath,
-          file.content,
-          true,
-          remote
-        );
-
-        if (result.success) {
-          setOpenFiles((prev) => {
-            const next = new Map(prev);
-            const updated = next.get(targetPath);
-            if (updated) {
-              updated.isDirty = false;
-              updated.originalContent = updated.content;
-            }
-            return next;
-          });
-
-          // Dispatch file change event for immediate UI updates
-          dispatchFileChangeEvent(taskPath, targetPath);
-
-          // Notify parent component that file has changed (if callback provided)
-          if (onFileChange) {
-            // Add a small delay to ensure Git detects the change
-            setTimeout(() => {
-              onFileChange();
-            }, 100);
-          }
-        } else {
-          console.error('Failed to save:', result.error);
-          alert(`Failed to save file: ${result.error}`);
-        }
-      } catch (error) {
-        console.error('Error saving file:', error);
-        alert(`Error saving file: ${error}`);
-      } finally {
-        setIsSaving(false);
-      }
-    },
-    [activeFilePath, openFiles, taskPath, onFileChange, remote]
-  );
-
-  /**
-   * Save all dirty files
-   */
-  const saveAllFiles = useCallback(async () => {
-    const dirtyFiles = Array.from(openFiles.entries()).filter(([_, file]) => file.isDirty);
-
-    for (const [path] of dirtyFiles) {
-      await saveFile(path);
-    }
-  }, [openFiles, saveFile]);
-
-  /**
-   * Update file content
-   */
-  const updateFileContent = useCallback((filePath: string, content: string) => {
-    setOpenFiles((prev) => {
-      const next = new Map(prev);
-      const file = next.get(filePath);
-      if (file) {
-        file.content = content;
-        file.isDirty = content !== file.originalContent;
-      }
-      return next;
-    });
-  }, []);
-
-  /**
-   * Close a file
-   */
-  const closeFile = useCallback(
-    (filePath: string) => {
-      setOpenFiles((prev) => {
-        const next = new Map(prev);
-        next.delete(filePath);
-        return next;
-      });
-
-      if (activeFilePath === filePath) {
-        const remaining = Array.from(openFiles.keys()).filter((p) => p !== filePath);
-        setActiveFilePath(remaining[0] || null);
-      }
-    },
-    [activeFilePath, openFiles]
-  );
-
-  /**
-   * Set active file
-   */
-  const setActiveFile = useCallback((filePath: string | null) => {
-    setActiveFilePath(filePath);
-  }, []);
-
-  /**
-   * Auto-save effect
-   */
-  useEffect(() => {
-    if (!autoSave || !activeFile?.isDirty) return;
-
-    const timer = setTimeout(() => {
-      saveFile();
-    }, autoSaveDelay);
-
-    return () => clearTimeout(timer);
-  }, [activeFile?.content, activeFile?.isDirty, autoSave, autoSaveDelay, saveFile]);
-
-  const loadFileRef = useRef(loadFile);
-  loadFileRef.current = loadFile;
-
-  useEffect(() => {
-    const state = getEditorState(taskId);
-    if (!state?.openFilePaths?.length) {
-      setOpenFiles(new Map());
-      setActiveFilePath(null);
-      return;
-    }
-
-    restoringRef.current = true;
-    setOpenFiles(new Map());
-    setActiveFilePath(null);
-
-    let cancelled = false;
-    const restore = async () => {
-      for (const path of state.openFilePaths) {
-        if (cancelled) return;
-        await loadFileRef.current(path);
-      }
-      if (cancelled) return;
-      const active =
-        state.activeFilePath && state.openFilePaths.includes(state.activeFilePath)
-          ? state.activeFilePath
-          : (state.openFilePaths[0] ?? null);
-      setActiveFilePath(active);
-      restoringRef.current = false;
-    };
-    void restore();
-    return () => {
-      cancelled = true;
-      restoringRef.current = false;
-    };
-  }, [taskId]);
-
-  useEffect(() => {
-    if (restoringRef.current) return;
-    const paths = Array.from(openFiles.keys());
-    saveEditorState(taskId, {
-      openFilePaths: paths,
-      activeFilePath,
-    });
-  }, [taskId, openFiles, activeFilePath]);
-
-  const openFilesRef = useRef(openFiles);
-  openFilesRef.current = openFiles;
-
-  useEffect(() => {
-    const unsubscribe = subscribeToFileChanges((event) => {
-      // Check if event matches our task
-      if (event.detail.taskPath !== taskPath) return;
-
-      const changedPath = event.detail.filePath;
-      if (!changedPath) return;
-
-      // Check if we have this file open
-      if (openFilesRef.current.has(changedPath)) {
-        // Reload content from disk
-        void loadFile(changedPath);
-      }
-    });
-
-    return () => {
-      unsubscribe();
-    };
-  }, [taskPath, loadFile]);
-
-  return {
-    openFiles,
-    activeFilePath,
-    activeFile,
-    hasUnsavedChanges,
-    isSaving,
-    loadFile,
-    saveFile,
-    saveAllFiles,
-    closeFile,
-    updateFileContent,
-    setActiveFile,
-  };
-}
diff --git a/src/renderer/hooks/useInitialPromptInjection.ts b/src/renderer/hooks/useInitialPromptInjection.ts
deleted file mode 100644
index 03fe9e1715..0000000000
--- a/src/renderer/hooks/useInitialPromptInjection.ts
+++ /dev/null
@@ -1,77 +0,0 @@
-import { useEffect } from 'react';
-import { initialPromptSentKey } from '../lib/keys';
-import { classifyActivity } from '../lib/activityClassifier';
-import { makePtyId } from '@shared/ptyId';
-import type { ProviderId } from '@shared/providers/registry';
-
-/**
- * Injects an initial prompt into the provider's terminal once the PTY is ready.
- * One-shot per task. Provider-agnostic.
- */
-export function useInitialPromptInjection(opts: {
-  taskId: string;
-  providerId: string; // codex | claude | ... used for PTY id prefix
-  prompt?: string | null;
-  enabled?: boolean;
-}) {
-  const { taskId, providerId, prompt, enabled = true } = opts;
-
-  useEffect(() => {
-    if (!enabled) return;
-    const trimmed = (prompt || '').trim();
-    if (!trimmed) return;
-    const sentKey = initialPromptSentKey(taskId, providerId);
-    if (localStorage.getItem(sentKey) === '1') return;
-
-    const ptyId = makePtyId(providerId as ProviderId, 'main', taskId);
-    let sent = false;
-    let idleSeen = false;
-    let silenceTimer: any = null;
-    const send = () => {
-      try {
-        if (sent) return;
-        (window as any).electronAPI?.ptyInput?.({ id: ptyId, data: trimmed + '\n' });
-        localStorage.setItem(sentKey, '1');
-        sent = true;
-      } catch {}
-    };
-
-    const offData = (window as any).electronAPI?.onPtyData?.(ptyId, (chunk: string) => {
-      // Debounce-based idle: send after a short period of silence
-      if (silenceTimer) clearTimeout(silenceTimer);
-      silenceTimer = setTimeout(() => {
-        if (!sent) send();
-      }, 1200);
-
-      // Heuristic: if classifier says idle, trigger a quicker send
-      try {
-        const signal = classifyActivity(providerId, chunk);
-        if (signal === 'idle' && !sent) {
-          idleSeen = true;
-          setTimeout(send, 250);
-        }
-      } catch {
-        // ignore classifier errors; rely on silence debounce
-      }
-    });
-    const offStarted = (window as any).electronAPI?.onPtyStarted?.((info: { id: string }) => {
-      if (info?.id === ptyId) {
-        // Start a silence timer in case no output arrives (rare but possible)
-        if (silenceTimer) clearTimeout(silenceTimer);
-        silenceTimer = setTimeout(() => {
-          if (!sent) send();
-        }, 2000);
-      }
-    });
-    // Global last-resort fallback if neither event fires
-    const t = setTimeout(() => {
-      if (!sent) send();
-    }, 10000);
-    return () => {
-      clearTimeout(t);
-      if (silenceTimer) clearTimeout(silenceTimer);
-      offStarted?.();
-      offData?.();
-    };
-  }, [enabled, taskId, providerId, prompt]);
-}
diff --git a/src/renderer/hooks/useKeyboardShortcuts.ts b/src/renderer/hooks/useKeyboardShortcuts.ts
deleted file mode 100644
index f0e7fc54dd..0000000000
--- a/src/renderer/hooks/useKeyboardShortcuts.ts
+++ /dev/null
@@ -1,540 +0,0 @@
-import { useEffect, useMemo } from 'react';
-import type {
-  ShortcutConfig,
-  GlobalShortcutHandlers,
-  ShortcutMapping,
-  ShortcutModifier,
-  KeyboardSettings,
-} from '../types/shortcuts';
-
-// Settings keys for keyboard shortcuts
-export type ShortcutSettingsKey =
-  | 'commandPalette'
-  | 'settings'
-  | 'toggleLeftSidebar'
-  | 'toggleRightSidebar'
-  | 'toggleTheme'
-  | 'toggleKanban'
-  | 'toggleEditor'
-  | 'closeModal'
-  | 'nextProject'
-  | 'prevProject'
-  | 'newTask'
-  | 'nextAgent'
-  | 'prevAgent'
-  | 'openInEditor';
-
-export interface AppShortcut {
-  key: string;
-  modifier?: ShortcutModifier;
-  label: string;
-  description: string;
-  category: string;
-  settingsKey: ShortcutSettingsKey;
-  hideFromSettings?: boolean;
-}
-
-const isMacPlatform =
-  typeof navigator !== 'undefined' && /Mac|iPod|iPhone|iPad/.test(navigator.platform);
-
-function getPlatformTaskSwitchDefaults(): { next: AppShortcut; prev: AppShortcut } {
-  if (isMacPlatform) {
-    return {
-      next: {
-        key: ']',
-        modifier: 'cmd',
-        label: 'Next Task',
-        description: 'Switch to the next task',
-        category: 'Navigation',
-        settingsKey: 'nextProject',
-      },
-      prev: {
-        key: '[',
-        modifier: 'cmd',
-        label: 'Previous Task',
-        description: 'Switch to the previous task',
-        category: 'Navigation',
-        settingsKey: 'prevProject',
-      },
-    };
-  }
-
-  return {
-    next: {
-      key: 'Tab',
-      modifier: 'ctrl',
-      label: 'Next Task',
-      description: 'Switch to the next task',
-      category: 'Navigation',
-      settingsKey: 'nextProject',
-    },
-    prev: {
-      key: 'Tab',
-      modifier: 'ctrl+shift',
-      label: 'Previous Task',
-      description: 'Switch to the previous task',
-      category: 'Navigation',
-      settingsKey: 'prevProject',
-    },
-  };
-}
-
-const TASK_SWITCH_SHORTCUTS = getPlatformTaskSwitchDefaults();
-
-export function normalizeShortcutKey(value: string): string {
-  const trimmed = value.trim();
-  const lower = trimmed.toLowerCase();
-
-  if (lower === 'esc' || lower === 'escape') return 'Escape';
-  if (lower === 'tab') return 'Tab';
-  if (lower === 'arrowleft' || lower === 'left') return 'ArrowLeft';
-  if (lower === 'arrowright' || lower === 'right') return 'ArrowRight';
-  if (lower === 'arrowup' || lower === 'up') return 'ArrowUp';
-  if (lower === 'arrowdown' || lower === 'down') return 'ArrowDown';
-  if (trimmed.length === 1) return trimmed.toLowerCase();
-  return trimmed;
-}
-
-export const APP_SHORTCUTS: Record<string, AppShortcut> = {
-  COMMAND_PALETTE: {
-    key: 'k',
-    modifier: 'cmd',
-    label: 'Command Palette',
-    description: 'Open the command palette to quickly search and navigate',
-    category: 'Navigation',
-    settingsKey: 'commandPalette',
-  },
-
-  SETTINGS: {
-    key: ',',
-    modifier: 'cmd',
-    label: 'Settings',
-    description: 'Open application settings',
-    category: 'Navigation',
-    settingsKey: 'settings',
-  },
-
-  TOGGLE_LEFT_SIDEBAR: {
-    key: 'b',
-    modifier: 'cmd',
-    label: 'Toggle Left Sidebar',
-    description: 'Show or hide the left sidebar',
-    category: 'View',
-    settingsKey: 'toggleLeftSidebar',
-  },
-
-  TOGGLE_RIGHT_SIDEBAR: {
-    key: '.',
-    modifier: 'cmd',
-    label: 'Toggle Right Sidebar',
-    description: 'Show or hide the right sidebar',
-    category: 'View',
-    settingsKey: 'toggleRightSidebar',
-  },
-
-  TOGGLE_THEME: {
-    key: 't',
-    modifier: 'cmd',
-    label: 'Toggle Theme',
-    description: 'Cycle through light, dark navy, and dark black themes',
-    category: 'View',
-    settingsKey: 'toggleTheme',
-  },
-
-  TOGGLE_KANBAN: {
-    key: 'p',
-    modifier: 'cmd',
-    label: 'Toggle Kanban',
-    description: 'Show or hide the Kanban board',
-    category: 'Navigation',
-    settingsKey: 'toggleKanban',
-  },
-
-  TOGGLE_EDITOR: {
-    key: 'e',
-    modifier: 'cmd',
-    label: 'Toggle Editor',
-    description: 'Show or hide the code editor',
-    category: 'View',
-    settingsKey: 'toggleEditor',
-  },
-
-  CLOSE_MODAL: {
-    key: 'Escape',
-    modifier: undefined,
-    label: 'Close Modal',
-    description: 'Close the current modal or dialog',
-    category: 'Navigation',
-    settingsKey: 'closeModal',
-    hideFromSettings: true,
-  },
-
-  NEXT_TASK: TASK_SWITCH_SHORTCUTS.next,
-
-  PREV_TASK: TASK_SWITCH_SHORTCUTS.prev,
-
-  NEW_TASK: {
-    key: 'n',
-    modifier: 'cmd',
-    label: 'New Task',
-    description: 'Create a new task',
-    category: 'Navigation',
-    settingsKey: 'newTask',
-  },
-
-  NEXT_AGENT: {
-    key: 'k',
-    modifier: 'cmd+shift',
-    label: 'Next Agent',
-    description: 'Cycle through agents on a task',
-    category: 'Navigation',
-    settingsKey: 'nextAgent',
-  },
-
-  PREV_AGENT: {
-    key: 'j',
-    modifier: 'cmd+shift',
-    label: 'Previous Agent',
-    description: 'Cycle through agents on a task',
-    category: 'Navigation',
-    settingsKey: 'prevAgent',
-  },
-
-  OPEN_IN_EDITOR: {
-    key: 'o',
-    modifier: 'cmd',
-    label: 'Open in Editor',
-    description: 'Open the project in the default editor',
-    category: 'Navigation',
-    settingsKey: 'openInEditor',
-  },
-};
-
-/**
- * ==============================================================================
- * HELPER FUNCTIONS
- * ==============================================================================
- */
-
-export function formatShortcut(shortcut: ShortcutConfig): string {
-  let modifier = '';
-  if (shortcut.modifier) {
-    switch (shortcut.modifier) {
-      case 'cmd':
-        modifier = '⌘';
-        break;
-      case 'option':
-        modifier = '⌥';
-        break;
-      case 'shift':
-        modifier = '⇧';
-        break;
-      case 'alt':
-        modifier = 'Alt';
-        break;
-      case 'ctrl':
-        modifier = 'Ctrl';
-        break;
-      case 'cmd+shift':
-        modifier = '⌘⇧';
-        break;
-      case 'ctrl+shift':
-        modifier = 'Ctrl⇧';
-        break;
-    }
-  }
-
-  let key = normalizeShortcutKey(shortcut.key);
-  if (key === 'Escape') key = 'Esc';
-  else if (key === 'Tab') key = 'Tab';
-  else if (key === 'ArrowLeft') key = '←';
-  else if (key === 'ArrowRight') key = '→';
-  else if (key === 'ArrowUp') key = '↑';
-  else if (key === 'ArrowDown') key = '↓';
-  else key = key.toUpperCase();
-
-  return modifier ? `${modifier}${key}` : key;
-}
-
-export function getShortcutsByCategory(): Record<string, ShortcutConfig[]> {
-  const shortcuts = Object.values(APP_SHORTCUTS);
-  const grouped: Record<string, ShortcutConfig[]> = {};
-
-  shortcuts.forEach((shortcut) => {
-    const category = shortcut.category || 'Other';
-    if (!grouped[category]) {
-      grouped[category] = [];
-    }
-    grouped[category].push(shortcut);
-  });
-
-  return grouped;
-}
-
-export function hasShortcutConflict(shortcut1: ShortcutConfig, shortcut2: ShortcutConfig): boolean {
-  return (
-    normalizeShortcutKey(shortcut1.key) === normalizeShortcutKey(shortcut2.key) &&
-    shortcut1.modifier === shortcut2.modifier
-  );
-}
-
-function matchesModifier(modifier: ShortcutModifier | undefined, event: KeyboardEvent): boolean {
-  if (!modifier) {
-    return !event.metaKey && !event.ctrlKey && !event.altKey && !event.shiftKey;
-  }
-
-  switch (modifier) {
-    case 'cmd':
-      // On macOS require the Command key; on other platforms allow Ctrl as the Command equivalent
-      // Also ensure shift is NOT pressed (to distinguish from cmd+shift)
-      return (
-        (isMacPlatform ? event.metaKey : event.metaKey || event.ctrlKey) &&
-        !event.shiftKey &&
-        !event.altKey
-      );
-    case 'ctrl':
-      // Require the Control key without treating Command as equivalent
-      return event.ctrlKey && !event.metaKey && !event.shiftKey && !event.altKey;
-    case 'alt':
-    case 'option':
-      return event.altKey && !event.metaKey && !event.ctrlKey && !event.shiftKey;
-    case 'shift':
-      return event.shiftKey && !event.metaKey && !event.ctrlKey && !event.altKey;
-    case 'cmd+shift':
-      // Compound modifier: Command + Shift
-      return (
-        (isMacPlatform ? event.metaKey : event.metaKey || event.ctrlKey) &&
-        event.shiftKey &&
-        !event.altKey
-      );
-    case 'ctrl+shift':
-      return event.ctrlKey && event.shiftKey && !event.metaKey && !event.altKey;
-    default:
-      return false;
-  }
-}
-
-/**
- * ==============================================================================
- * GLOBAL SHORTCUT HOOK
- * ==============================================================================
- */
-
-/**
- * Get effective shortcut config, applying custom settings if available
- */
-function getEffectiveConfig(
-  shortcut: AppShortcut,
-  customSettings?: KeyboardSettings
-): ShortcutConfig {
-  const custom = customSettings?.[shortcut.settingsKey];
-  if (custom) {
-    return {
-      key: custom.key,
-      modifier: custom.modifier,
-      description: shortcut.description,
-      category: shortcut.category,
-    };
-  }
-  return {
-    key: shortcut.key,
-    modifier: shortcut.modifier,
-    description: shortcut.description,
-    category: shortcut.category,
-  };
-}
-
-/**
- * Single global keyboard shortcuts hook
- * Call this once in your App component with all handlers
- */
-export function useKeyboardShortcuts(handlers: GlobalShortcutHandlers) {
-  // Compute effective shortcuts with custom settings applied
-  const effectiveShortcuts = useMemo(() => {
-    const custom = handlers.customKeyboardSettings;
-    return {
-      commandPalette: getEffectiveConfig(APP_SHORTCUTS.COMMAND_PALETTE, custom),
-      settings: getEffectiveConfig(APP_SHORTCUTS.SETTINGS, custom),
-      toggleLeftSidebar: getEffectiveConfig(APP_SHORTCUTS.TOGGLE_LEFT_SIDEBAR, custom),
-      toggleRightSidebar: getEffectiveConfig(APP_SHORTCUTS.TOGGLE_RIGHT_SIDEBAR, custom),
-      toggleTheme: getEffectiveConfig(APP_SHORTCUTS.TOGGLE_THEME, custom),
-      toggleKanban: getEffectiveConfig(APP_SHORTCUTS.TOGGLE_KANBAN, custom),
-      toggleEditor: getEffectiveConfig(APP_SHORTCUTS.TOGGLE_EDITOR, custom),
-      closeModal: getEffectiveConfig(APP_SHORTCUTS.CLOSE_MODAL, custom),
-      nextProject: getEffectiveConfig(APP_SHORTCUTS.NEXT_TASK, custom),
-      prevProject: getEffectiveConfig(APP_SHORTCUTS.PREV_TASK, custom),
-      newTask: getEffectiveConfig(APP_SHORTCUTS.NEW_TASK, custom),
-      nextAgent: getEffectiveConfig(APP_SHORTCUTS.NEXT_AGENT, custom),
-      prevAgent: getEffectiveConfig(APP_SHORTCUTS.PREV_AGENT, custom),
-      openInEditor: getEffectiveConfig(APP_SHORTCUTS.OPEN_IN_EDITOR, custom),
-    };
-  }, [handlers.customKeyboardSettings]);
-
-  useEffect(() => {
-    // Build dynamic shortcut mappings from config
-    const shortcuts: ShortcutMapping[] = [
-      {
-        config: effectiveShortcuts.commandPalette,
-        handler: () => handlers.onToggleCommandPalette?.(),
-        priority: 'global',
-        isCommandPalette: true,
-      },
-      {
-        config: effectiveShortcuts.settings,
-        handler: () => handlers.onOpenSettings?.(),
-        priority: 'global',
-        requiresClosed: true,
-      },
-      {
-        config: effectiveShortcuts.toggleLeftSidebar,
-        handler: () => handlers.onToggleLeftSidebar?.(),
-        priority: 'global',
-        requiresClosed: true,
-      },
-      {
-        config: effectiveShortcuts.toggleRightSidebar,
-        handler: () => handlers.onToggleRightSidebar?.(),
-        priority: 'global',
-        requiresClosed: true,
-      },
-      {
-        config: effectiveShortcuts.toggleTheme,
-        handler: () => handlers.onToggleTheme?.(),
-        priority: 'global',
-        requiresClosed: true,
-      },
-      {
-        config: effectiveShortcuts.toggleKanban,
-        handler: () => handlers.onToggleKanban?.(),
-        priority: 'global',
-        requiresClosed: true,
-      },
-      {
-        config: effectiveShortcuts.toggleEditor,
-        handler: () => handlers.onToggleEditor?.(),
-        priority: 'global',
-        requiresClosed: true,
-      },
-      {
-        config: effectiveShortcuts.closeModal,
-        handler: () => handlers.onCloseModal?.(),
-        priority: 'modal',
-      },
-      {
-        config: effectiveShortcuts.nextProject,
-        handler: () => handlers.onNextProject?.(),
-        priority: 'global',
-        requiresClosed: true,
-      },
-      {
-        config: effectiveShortcuts.prevProject,
-        handler: () => handlers.onPrevProject?.(),
-        priority: 'global',
-        requiresClosed: true,
-      },
-      {
-        config: effectiveShortcuts.newTask,
-        handler: () => handlers.onNewTask?.(),
-        priority: 'global',
-        requiresClosed: true,
-      },
-      {
-        config: effectiveShortcuts.nextAgent,
-        handler: () => handlers.onNextAgent?.(),
-        priority: 'global',
-        requiresClosed: true,
-      },
-      {
-        config: effectiveShortcuts.prevAgent,
-        handler: () => handlers.onPrevAgent?.(),
-        priority: 'global',
-        requiresClosed: true,
-      },
-      {
-        config: effectiveShortcuts.openInEditor,
-        handler: () => handlers.onOpenInEditor?.(),
-        priority: 'global',
-        requiresClosed: true,
-      },
-    ];
-
-    const handleKeyDown = (event: KeyboardEvent) => {
-      const key = normalizeShortcutKey(event.key);
-
-      // When the user is typing in an editable field (input, textarea,
-      // contenteditable), skip most shortcuts to avoid intercepting text
-      // input.  On Linux the 'cmd' modifier maps to Ctrl, so shortcuts
-      // like Ctrl+B (toggle sidebar) can fire when the OS or an input
-      // method reports an unexpected modifier state during normal typing.
-      // The command palette toggle is exempt so it remains reachable from
-      // any context.
-      const target = event.target as HTMLElement;
-      const isEditableTarget =
-        target?.tagName === 'INPUT' || target?.tagName === 'TEXTAREA' || target?.isContentEditable;
-
-      for (const shortcut of shortcuts) {
-        const shortcutKey = normalizeShortcutKey(shortcut.config.key);
-        const keyMatches = key === shortcutKey;
-
-        if (!keyMatches) continue;
-
-        // Check modifier requirements precisely (e.g., Cmd ≠ Ctrl on macOS)
-        if (!matchesModifier(shortcut.config.modifier, event)) continue;
-
-        // Skip non-command-palette shortcuts when typing in an input
-        if (isEditableTarget && !shortcut.isCommandPalette) continue;
-
-        // Command palette is blocking; settings behaves like a page and should
-        // not force-close for global shortcuts.
-        const isCommandPaletteOpen = Boolean(handlers.isCommandPaletteOpen);
-        const hasClosableView = Boolean(
-          handlers.isCommandPaletteOpen ||
-            handlers.isSettingsOpen ||
-            handlers.isBrowserOpen ||
-            handlers.isDiffViewerOpen ||
-            handlers.isEditorOpen ||
-            handlers.isKanbanOpen
-        );
-
-        // Modal-priority shortcuts (like Escape) only work when a closable view is open
-        if (shortcut.priority === 'modal' && !hasClosableView) continue;
-
-        // Global shortcuts
-        if (shortcut.priority === 'global') {
-          // Command palette toggle always works
-          if (shortcut.isCommandPalette) {
-            event.preventDefault();
-            shortcut.handler();
-            return;
-          }
-
-          // Other shortcuts: if command palette is open and they can close it
-          if (isCommandPaletteOpen && shortcut.requiresClosed) {
-            event.preventDefault();
-            handlers.onCloseModal?.();
-            setTimeout(() => shortcut.handler(), 100);
-            return;
-          }
-
-          // Normal execution when command palette is not open.
-          // This keeps settings open while allowing global view shortcuts.
-          if (!isCommandPaletteOpen) {
-            event.preventDefault();
-            shortcut.handler();
-            return;
-          }
-        }
-
-        // Execute modal shortcuts
-        if (shortcut.priority === 'modal') {
-          event.preventDefault();
-          shortcut.handler();
-          return;
-        }
-      }
-    };
-
-    window.addEventListener('keydown', handleKeyDown, true);
-    return () => window.removeEventListener('keydown', handleKeyDown, true);
-  }, [handlers, effectiveShortcuts]);
-}
diff --git a/src/renderer/hooks/useLineComments.ts b/src/renderer/hooks/useLineComments.ts
deleted file mode 100644
index 732ed7f6ce..0000000000
--- a/src/renderer/hooks/useLineComments.ts
+++ /dev/null
@@ -1,280 +0,0 @@
-import { useCallback, useEffect, useMemo, useSyncExternalStore } from 'react';
-import type { LineComment } from '../types/electron-api';
-import { formatCommentsForAgent } from '../lib/formatCommentsForAgent';
-
-type TaskState = {
-  comments: LineComment[];
-  isLoading: boolean;
-  error: string | null;
-  hasLoaded: boolean;
-};
-
-type CreateCommentInput = {
-  filePath: string;
-  lineNumber: number;
-  lineContent?: string;
-  content: string;
-};
-
-const EMPTY_STATE: TaskState = {
-  comments: [],
-  isLoading: false,
-  error: null,
-  hasLoaded: false,
-};
-
-class LineCommentsStore {
-  private states = new Map<string, TaskState>();
-  private listeners = new Map<string, Set<() => void>>();
-  private inFlight = new Map<string, Promise<void>>();
-
-  private ensureState(taskId: string): TaskState {
-    if (!taskId) return EMPTY_STATE;
-    const existing = this.states.get(taskId);
-    if (existing) return existing;
-    const next = { ...EMPTY_STATE };
-    this.states.set(taskId, next);
-    return next;
-  }
-
-  getSnapshot(taskId: string): TaskState {
-    return this.ensureState(taskId);
-  }
-
-  subscribe(taskId: string, listener: () => void): () => void {
-    if (!taskId) return () => {};
-    const set = this.listeners.get(taskId) ?? new Set<() => void>();
-    set.add(listener);
-    this.listeners.set(taskId, set);
-    return () => {
-      const current = this.listeners.get(taskId);
-      if (!current) return;
-      current.delete(listener);
-      if (current.size === 0) this.listeners.delete(taskId);
-    };
-  }
-
-  private emit(taskId: string) {
-    const set = this.listeners.get(taskId);
-    if (!set) return;
-    for (const listener of set) {
-      try {
-        listener();
-      } catch {}
-    }
-  }
-
-  private setState(taskId: string, updater: (prev: TaskState) => TaskState) {
-    const prev = this.ensureState(taskId);
-    const next = updater(prev);
-    this.states.set(taskId, next);
-    this.emit(taskId);
-  }
-
-  refresh(taskId: string): Promise<void> {
-    if (!taskId) return Promise.resolve();
-    const inflight = this.inFlight.get(taskId);
-    if (inflight) return inflight;
-
-    const request = (async () => {
-      this.setState(taskId, (prev) => ({ ...prev, isLoading: true, error: null }));
-      try {
-        const result = await window.electronAPI.lineCommentsGet({ taskId });
-        if (result.success && result.comments) {
-          const nextComments = result.comments ?? [];
-          this.setState(taskId, (prev) => ({
-            ...prev,
-            comments: nextComments,
-            isLoading: false,
-            error: null,
-            hasLoaded: true,
-          }));
-        } else {
-          this.setState(taskId, (prev) => ({
-            ...prev,
-            isLoading: false,
-            error: result.error ?? 'Failed to load comments',
-            hasLoaded: true,
-          }));
-        }
-      } catch (err) {
-        this.setState(taskId, (prev) => ({
-          ...prev,
-          isLoading: false,
-          error: (err as Error).message,
-          hasLoaded: true,
-        }));
-      }
-    })();
-
-    this.inFlight.set(taskId, request);
-    request.finally(() => {
-      this.inFlight.delete(taskId);
-    });
-    return request;
-  }
-
-  async createComment(taskId: string, input: CreateCommentInput): Promise<string | null> {
-    if (!taskId) return null;
-    const result = await window.electronAPI.lineCommentsCreate({
-      taskId,
-      filePath: input.filePath,
-      lineNumber: input.lineNumber,
-      lineContent: input.lineContent,
-      content: input.content,
-    });
-
-    if (result.success) {
-      await this.refresh(taskId);
-      return result.id ?? null;
-    }
-    return null;
-  }
-
-  async updateComment(taskId: string, id: string, content: string): Promise<boolean> {
-    if (!taskId) return false;
-    const result = await window.electronAPI.lineCommentsUpdate({ id, content });
-    if (result.success) {
-      await this.refresh(taskId);
-      return true;
-    }
-    return false;
-  }
-
-  async deleteComment(taskId: string, id: string): Promise<boolean> {
-    if (!taskId) return false;
-    const result = await window.electronAPI.lineCommentsDelete(id);
-    if (result.success) {
-      await this.refresh(taskId);
-      return true;
-    }
-    return false;
-  }
-
-  async markSent(taskId: string, commentIds: string[]): Promise<boolean> {
-    if (!taskId || commentIds.length === 0) return false;
-    const result = await window.electronAPI.lineCommentsMarkSent(commentIds);
-    if (result.success) {
-      await this.refresh(taskId);
-      return true;
-    }
-    return false;
-  }
-}
-
-const store = new LineCommentsStore();
-
-export function useTaskComments(taskId?: string) {
-  const resolvedTaskId = taskId ?? '';
-  const state = useSyncExternalStore(
-    useCallback((listener) => store.subscribe(resolvedTaskId, listener), [resolvedTaskId]),
-    useCallback(() => store.getSnapshot(resolvedTaskId), [resolvedTaskId]),
-    useCallback(() => store.getSnapshot(resolvedTaskId), [resolvedTaskId])
-  );
-
-  useEffect(() => {
-    if (!taskId) return;
-    void store.refresh(taskId);
-  }, [taskId]);
-
-  const comments = state.comments;
-  const unsentComments = useMemo(() => comments.filter((comment) => !comment.sentAt), [comments]);
-
-  const countsByFile = useMemo(() => {
-    const counts: Record<string, number> = {};
-    for (const comment of unsentComments) {
-      counts[comment.filePath] = (counts[comment.filePath] || 0) + 1;
-    }
-    return counts;
-  }, [unsentComments]);
-
-  const formatted = useMemo(
-    () => formatCommentsForAgent(comments, { includeIntro: false }),
-    [comments]
-  );
-  const formattedUnsent = useMemo(
-    () => formatCommentsForAgent(unsentComments, { includeIntro: false }),
-    [unsentComments]
-  );
-
-  const refresh = useCallback(() => store.refresh(resolvedTaskId), [resolvedTaskId]);
-
-  const createComment = useCallback(
-    (input: CreateCommentInput) => store.createComment(resolvedTaskId, input),
-    [resolvedTaskId]
-  );
-
-  const updateComment = useCallback(
-    (id: string, content: string) => store.updateComment(resolvedTaskId, id, content),
-    [resolvedTaskId]
-  );
-
-  const deleteComment = useCallback(
-    (id: string) => store.deleteComment(resolvedTaskId, id),
-    [resolvedTaskId]
-  );
-
-  const markSent = useCallback(
-    (commentIds: string[]) => store.markSent(resolvedTaskId, commentIds),
-    [resolvedTaskId]
-  );
-
-  return {
-    comments,
-    unsentComments,
-    unsentCount: unsentComments.length,
-    countsByFile,
-    formatted,
-    formattedUnsent,
-    isLoading: state.isLoading,
-    error: state.error,
-    hasLoaded: state.hasLoaded,
-    refresh,
-    createComment,
-    updateComment,
-    deleteComment,
-    markSent,
-  };
-}
-
-export function useLineComments(
-  taskId: string,
-  filePath?: string,
-  opts?: { includeSent?: boolean }
-) {
-  const includeSent = opts?.includeSent ?? true;
-  const taskComments = useTaskComments(taskId);
-  const { createComment, updateComment, deleteComment, refresh, isLoading, error } = taskComments;
-
-  const comments = useMemo(() => {
-    if (!filePath) return [] as LineComment[];
-    return taskComments.comments.filter((comment) => {
-      if (comment.filePath !== filePath) return false;
-      if (!includeSent && comment.sentAt) return false;
-      return true;
-    });
-  }, [filePath, includeSent, taskComments.comments]);
-
-  const addComment = useCallback(
-    (lineNumber: number, content: string, lineContent?: string) => {
-      if (!filePath) return Promise.resolve(null);
-      return createComment({
-        filePath,
-        lineNumber,
-        lineContent,
-        content,
-      });
-    },
-    [createComment, filePath]
-  );
-
-  return {
-    comments,
-    isLoading,
-    error,
-    addComment,
-    updateComment,
-    deleteComment,
-    refreshComments: refresh,
-  };
-}
diff --git a/src/renderer/hooks/useOpenInApps.ts b/src/renderer/hooks/useOpenInApps.ts
deleted file mode 100644
index 3cbd2ec03d..0000000000
--- a/src/renderer/hooks/useOpenInApps.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-import { useEffect, useMemo, useState } from 'react';
-import {
-  OPEN_IN_APPS,
-  getResolvedIconPath,
-  getResolvedLabel,
-  type OpenInAppId,
-  type PlatformKey,
-} from '@shared/openInApps';
-import { useAppSettings } from '@/contexts/AppSettingsProvider';
-
-export interface UseOpenInAppsResult {
-  icons: Partial<Record<OpenInAppId, string>>;
-  labels: Partial<Record<OpenInAppId, string>>;
-  availability: Record<string, boolean>;
-  installedApps: typeof OPEN_IN_APPS;
-  loading: boolean;
-}
-
-export function useOpenInApps(): UseOpenInAppsResult {
-  const { settings, isLoading: settingsLoading } = useAppSettings();
-  const [icons, setIcons] = useState<Partial<Record<OpenInAppId, string>>>({});
-  const [labels, setLabels] = useState<Partial<Record<OpenInAppId, string>>>({});
-  const [availability, setAvailability] = useState<Record<string, boolean>>({});
-  const [availabilityLoading, setAvailabilityLoading] = useState(true);
-
-  const loading = settingsLoading || availabilityLoading;
-
-  // Load platform-resolved icons and labels
-  useEffect(() => {
-    const load = async () => {
-      let platform: PlatformKey = 'darwin';
-      try {
-        platform = ((await window.electronAPI?.getPlatform?.()) as PlatformKey) || 'darwin';
-      } catch {}
-
-      const loadedIcons: Partial<Record<OpenInAppId, string>> = {};
-      const loadedLabels: Partial<Record<OpenInAppId, string>> = {};
-      for (const app of OPEN_IN_APPS) {
-        const iconPath = getResolvedIconPath(app, platform);
-        loadedLabels[app.id] = getResolvedLabel(app, platform);
-        try {
-          loadedIcons[app.id] = new URL(`../../assets/images/${iconPath}`, import.meta.url).href;
-        } catch (e) {
-          console.error(`Failed to load icon for ${app.id}:`, e);
-        }
-      }
-      setIcons(loadedIcons);
-      setLabels(loadedLabels);
-    };
-    void load();
-  }, []);
-
-  // Fetch app availability
-  useEffect(() => {
-    const fetchAvailability = async () => {
-      try {
-        const apps = await window.electronAPI?.checkInstalledApps?.();
-        if (apps) setAvailability(apps);
-      } catch (e) {
-        console.error('Failed to check installed apps:', e);
-      } finally {
-        setAvailabilityLoading(false);
-      }
-    };
-    void fetchAvailability();
-  }, []);
-
-  // Filter to only installed and visible apps (return all while loading)
-  const installedApps = useMemo(() => {
-    const hiddenApps: OpenInAppId[] = settings?.hiddenOpenInApps ?? [];
-    if (loading) return OPEN_IN_APPS;
-    return OPEN_IN_APPS.filter((app) => availability[app.id] && !hiddenApps.includes(app.id));
-  }, [availability, loading, settings?.hiddenOpenInApps]);
-
-  return { icons, labels, availability, installedApps, loading };
-}
diff --git a/src/renderer/hooks/usePanelLayout.ts b/src/renderer/hooks/usePanelLayout.ts
deleted file mode 100644
index 52eff123d6..0000000000
--- a/src/renderer/hooks/usePanelLayout.ts
+++ /dev/null
@@ -1,303 +0,0 @@
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
-import type { ImperativePanelHandle } from 'react-resizable-panels';
-import { loadPanelSizes, savePanelSizes } from '../lib/persisted-layout';
-import {
-  PANEL_LAYOUT_STORAGE_KEY,
-  DEFAULT_PANEL_LAYOUT,
-  clampLeftSidebarSize,
-  clampRightSidebarSize,
-} from '../constants/layout';
-import { rpc } from '@/lib/rpc';
-
-export interface UsePanelLayoutOptions {
-  showEditorMode: boolean;
-  showDiffViewer: boolean;
-  isInitialLoadComplete: boolean;
-  showHomeView: boolean;
-  selectedProject: { id: string } | null;
-  activeTask: { id: string } | null;
-}
-
-export function usePanelLayout(opts: UsePanelLayoutOptions) {
-  const {
-    showEditorMode,
-    showDiffViewer,
-    isInitialLoadComplete,
-    showHomeView,
-    selectedProject,
-    activeTask,
-  } = opts;
-
-  const defaultPanelLayout = useMemo(() => {
-    const stored = loadPanelSizes(PANEL_LAYOUT_STORAGE_KEY, DEFAULT_PANEL_LAYOUT);
-    const [storedLeft = DEFAULT_PANEL_LAYOUT[0], , storedRight = DEFAULT_PANEL_LAYOUT[2]] =
-      Array.isArray(stored) && stored.length === 3
-        ? (stored as [number, number, number])
-        : DEFAULT_PANEL_LAYOUT;
-    const left = clampLeftSidebarSize(storedLeft);
-    const right = clampRightSidebarSize(storedRight);
-    const middle = Math.max(0, 100 - left - right);
-    return [left, middle, right] as [number, number, number];
-  }, []);
-
-  const rightSidebarDefaultWidth = useMemo(
-    () => clampRightSidebarSize(defaultPanelLayout[2]),
-    [defaultPanelLayout]
-  );
-
-  const leftSidebarPanelRef = useRef<ImperativePanelHandle | null>(null);
-  const rightSidebarPanelRef = useRef<ImperativePanelHandle | null>(null);
-  const lastLeftSidebarSizeRef = useRef<number>(defaultPanelLayout[0]);
-  const leftSidebarWasCollapsedBeforeEditor = useRef<boolean>(false);
-  const leftSidebarWasCollapsedBeforeDiffViewer = useRef<boolean>(false);
-  const rightSidebarWasCollapsedBeforeDiffViewer = useRef<boolean>(false);
-  const lastRightSidebarSizeRef = useRef<number>(rightSidebarDefaultWidth);
-  const leftSidebarSetOpenRef = useRef<((next: boolean) => void) | null>(null);
-  const leftSidebarIsMobileRef = useRef<boolean>(false);
-  const leftSidebarOpenRef = useRef<boolean>(true);
-  const rightSidebarSetCollapsedRef = useRef<((next: boolean) => void) | null>(null);
-  const [rightSidebarCollapsed, setRightSidebarCollapsed] = useState<boolean>(false);
-  const [autoRightSidebarBehavior, setAutoRightSidebarBehavior] = useState<boolean>(false);
-
-  const handlePanelLayout = useCallback((sizes: number[]) => {
-    if (!Array.isArray(sizes) || sizes.length < 3) {
-      return;
-    }
-
-    if (leftSidebarIsMobileRef.current) {
-      return;
-    }
-
-    const [leftSize, , rightSize] = sizes;
-    const rightCollapsed = typeof rightSize === 'number' && rightSize <= 0.5;
-
-    let storedLeft = lastLeftSidebarSizeRef.current;
-    if (typeof leftSize === 'number') {
-      if (leftSize <= 0.5) {
-        leftSidebarSetOpenRef.current?.(false);
-        leftSidebarOpenRef.current = false;
-      } else {
-        leftSidebarSetOpenRef.current?.(true);
-        leftSidebarOpenRef.current = true;
-        if (!rightCollapsed) {
-          storedLeft = clampLeftSidebarSize(leftSize);
-          lastLeftSidebarSizeRef.current = storedLeft;
-        }
-      }
-    }
-
-    let storedRight = lastRightSidebarSizeRef.current;
-    if (typeof rightSize === 'number') {
-      if (rightSize <= 0.5) {
-        rightSidebarSetCollapsedRef.current?.(true);
-      } else {
-        storedRight = clampRightSidebarSize(rightSize);
-        lastRightSidebarSizeRef.current = storedRight;
-        rightSidebarSetCollapsedRef.current?.(false);
-      }
-    }
-
-    const middle = Math.max(0, 100 - storedLeft - storedRight);
-    savePanelSizes(PANEL_LAYOUT_STORAGE_KEY, [storedLeft, middle, storedRight]);
-  }, []);
-
-  const handleSidebarContextChange = useCallback(
-    ({
-      open,
-      isMobile,
-      setOpen,
-    }: {
-      open: boolean;
-      isMobile: boolean;
-      setOpen: (next: boolean) => void;
-    }) => {
-      leftSidebarSetOpenRef.current = setOpen;
-      leftSidebarIsMobileRef.current = isMobile;
-      leftSidebarOpenRef.current = open;
-      const panel = leftSidebarPanelRef.current;
-      if (!panel) {
-        return;
-      }
-
-      // Prevent sidebar from opening when in editor mode
-      if (showEditorMode && open) {
-        setOpen(false);
-        return;
-      }
-
-      if (isMobile) {
-        const currentSize = panel.getSize();
-        if (typeof currentSize === 'number' && currentSize > 0) {
-          lastLeftSidebarSizeRef.current = clampLeftSidebarSize(currentSize);
-        }
-        panel.collapse();
-        return;
-      }
-
-      if (open) {
-        const target = clampLeftSidebarSize(
-          lastLeftSidebarSizeRef.current || DEFAULT_PANEL_LAYOUT[0]
-        );
-        panel.expand();
-        panel.resize(target);
-      } else {
-        const currentSize = panel.getSize();
-        if (typeof currentSize === 'number' && currentSize > 0) {
-          lastLeftSidebarSizeRef.current = clampLeftSidebarSize(currentSize);
-        }
-        panel.collapse();
-      }
-    },
-    [showEditorMode]
-  );
-
-  const handleRightSidebarCollapsedChange = useCallback((collapsed: boolean) => {
-    setRightSidebarCollapsed(collapsed);
-  }, []);
-
-  // Handle left sidebar visibility when Editor mode changes
-  useEffect(() => {
-    const panel = leftSidebarPanelRef.current;
-    if (!panel) return;
-
-    if (showEditorMode) {
-      // Store current collapsed state before hiding
-      leftSidebarWasCollapsedBeforeEditor.current = panel.isCollapsed();
-      // Collapse the left sidebar when Editor mode opens
-      if (!panel.isCollapsed()) {
-        panel.collapse();
-      }
-    } else {
-      // Restore previous state when Editor mode closes
-      if (!leftSidebarWasCollapsedBeforeEditor.current && panel.isCollapsed()) {
-        panel.expand();
-      }
-    }
-  }, [showEditorMode]);
-
-  // Handle both sidebars visibility when Diff Viewer opens/closes
-  useEffect(() => {
-    const leftPanel = leftSidebarPanelRef.current;
-    const rightPanel = rightSidebarPanelRef.current;
-
-    if (showDiffViewer) {
-      // Save and collapse left sidebar
-      if (leftPanel) {
-        leftSidebarWasCollapsedBeforeDiffViewer.current = leftPanel.isCollapsed();
-        if (!leftPanel.isCollapsed()) {
-          leftPanel.collapse();
-        }
-      }
-      // Save and collapse right sidebar
-      if (rightPanel) {
-        rightSidebarWasCollapsedBeforeDiffViewer.current = rightPanel.isCollapsed();
-        if (!rightPanel.isCollapsed()) {
-          rightPanel.collapse();
-        }
-      }
-    } else {
-      // Restore left sidebar
-      if (
-        leftPanel &&
-        !leftSidebarWasCollapsedBeforeDiffViewer.current &&
-        leftPanel.isCollapsed()
-      ) {
-        leftPanel.expand();
-      }
-      // Restore right sidebar
-      if (
-        rightPanel &&
-        !rightSidebarWasCollapsedBeforeDiffViewer.current &&
-        rightPanel.isCollapsed()
-      ) {
-        const targetRight = clampRightSidebarSize(
-          lastRightSidebarSizeRef.current || DEFAULT_PANEL_LAYOUT[2]
-        );
-        rightPanel.expand();
-        rightPanel.resize(targetRight);
-      }
-    }
-  }, [showDiffViewer]);
-
-  // Load autoRightSidebarBehavior setting on mount and listen for changes
-  useEffect(() => {
-    (async () => {
-      try {
-        const settings = await rpc.appSettings.get();
-        setAutoRightSidebarBehavior(Boolean(settings.interface?.autoRightSidebarBehavior ?? false));
-      } catch (error) {
-        console.error('Failed to load right sidebar settings:', error);
-      }
-    })();
-
-    // Listen for setting changes from RightSidebarSettingsCard
-    const handleSettingChange = (event: Event) => {
-      const customEvent = event as CustomEvent<{ enabled: boolean }>;
-      setAutoRightSidebarBehavior(customEvent.detail.enabled);
-    };
-    window.addEventListener('autoRightSidebarBehaviorChanged', handleSettingChange);
-    return () => {
-      window.removeEventListener('autoRightSidebarBehaviorChanged', handleSettingChange);
-    };
-  }, []);
-
-  // Auto-collapse/expand right sidebar based on current view
-  useEffect(() => {
-    // Defer sidebar behavior until initial load completes to prevent flash
-    if (!autoRightSidebarBehavior || !isInitialLoadComplete) return;
-
-    const isHomePage = showHomeView;
-    const isRepoHomePage = selectedProject !== null && activeTask === null;
-    const shouldCollapse = isHomePage || isRepoHomePage;
-
-    if (shouldCollapse) {
-      rightSidebarSetCollapsedRef.current?.(true);
-    } else if (activeTask !== null) {
-      rightSidebarSetCollapsedRef.current?.(false);
-    }
-  }, [autoRightSidebarBehavior, isInitialLoadComplete, showHomeView, selectedProject, activeTask]);
-
-  // Sync right sidebar panel with collapsed state
-  useEffect(() => {
-    const rightPanel = rightSidebarPanelRef.current;
-    if (rightPanel) {
-      if (rightSidebarCollapsed) {
-        rightPanel.collapse();
-      } else {
-        const targetRight = clampRightSidebarSize(
-          lastRightSidebarSizeRef.current || DEFAULT_PANEL_LAYOUT[2]
-        );
-        lastRightSidebarSizeRef.current = targetRight;
-        rightPanel.expand();
-        rightPanel.resize(targetRight);
-      }
-    }
-
-    if (leftSidebarIsMobileRef.current || !leftSidebarOpenRef.current) {
-      return;
-    }
-
-    const leftPanel = leftSidebarPanelRef.current;
-    if (!leftPanel) {
-      return;
-    }
-
-    const targetLeft = clampLeftSidebarSize(
-      lastLeftSidebarSizeRef.current || DEFAULT_PANEL_LAYOUT[0]
-    );
-    lastLeftSidebarSizeRef.current = targetLeft;
-    leftPanel.expand();
-    leftPanel.resize(targetLeft);
-  }, [rightSidebarCollapsed]);
-
-  return {
-    defaultPanelLayout,
-    leftSidebarPanelRef,
-    rightSidebarPanelRef,
-    rightSidebarSetCollapsedRef,
-    rightSidebarCollapsed,
-    handlePanelLayout,
-    handleSidebarContextChange,
-    handleRightSidebarCollapsedChange,
-  };
-}
diff --git a/src/renderer/hooks/usePendingInjection.ts b/src/renderer/hooks/usePendingInjection.ts
deleted file mode 100644
index db0fd76677..0000000000
--- a/src/renderer/hooks/usePendingInjection.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import { useState, useEffect, useCallback } from 'react';
-import { pendingInjectionManager } from '../lib/PendingInjectionManager';
-
-/**
- * React hook for accessing the pending injection manager
- * Provides reactive state that updates when pending text changes
- */
-export function usePendingInjection() {
-  const [pendingText, setPendingText] = useState<string | null>(
-    pendingInjectionManager.getPending()
-  );
-
-  useEffect(() => {
-    // Subscribe to changes
-    const unsubscribe = pendingInjectionManager.subscribe(() => {
-      setPendingText(pendingInjectionManager.getPending());
-    });
-    return unsubscribe;
-  }, []);
-
-  const setPending = useCallback((text: string) => {
-    pendingInjectionManager.setPending(text);
-  }, []);
-
-  const clear = useCallback(() => {
-    pendingInjectionManager.clear();
-  }, []);
-
-  const sendNow = useCallback(async (ptyId: string, text: string) => {
-    // Use carriage return to mimic Enter key for immediate submit.
-    await window.electronAPI.ptyInput({ id: ptyId, data: text + '\r' });
-  }, []);
-
-  const onInjectionUsed = useCallback((callback: () => void) => {
-    return pendingInjectionManager.onInjectionUsed(callback);
-  }, []);
-
-  return {
-    pendingText,
-    hasPending: pendingText !== null,
-    setPending,
-    clear,
-    sendNow,
-    onInjectionUsed,
-  };
-}
diff --git a/src/renderer/hooks/usePrComments.ts b/src/renderer/hooks/usePrComments.ts
deleted file mode 100644
index 17cb1cb00e..0000000000
--- a/src/renderer/hooks/usePrComments.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import { useEffect, useState } from 'react';
-import { subscribeToPrComments, refreshPrComments } from '../lib/prCommentsStore';
-import type { PrCommentsStatus } from '../lib/prCommentsStatus';
-
-export function usePrComments(taskPath?: string, prNumber?: number) {
-  const [status, setStatus] = useState<PrCommentsStatus | null>(null);
-  const [isLoading, setIsLoading] = useState(false);
-
-  const refresh = async () => {
-    if (!taskPath) return;
-    setIsLoading(true);
-    try {
-      const result = await refreshPrComments(taskPath);
-      setStatus(result);
-    } finally {
-      setIsLoading(false);
-    }
-  };
-
-  useEffect(() => {
-    if (!taskPath) {
-      setStatus(null);
-      return;
-    }
-
-    setStatus(null);
-    return subscribeToPrComments(taskPath, prNumber, setStatus);
-  }, [taskPath, prNumber]);
-
-  return { status, refresh, isLoading };
-}
diff --git a/src/renderer/hooks/usePrStatus.ts b/src/renderer/hooks/usePrStatus.ts
deleted file mode 100644
index b8813371ed..0000000000
--- a/src/renderer/hooks/usePrStatus.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import { useEffect, useState } from 'react';
-import { subscribeToPrStatus, refreshPrStatus } from '../lib/prStatusStore';
-import type { PrStatus } from '../lib/prStatus';
-
-const noopRefresh = async () => {};
-
-export function usePrStatus(taskPath?: string, enabled = true) {
-  const [pr, setPr] = useState<PrStatus | null>(null);
-  const [isLoading, setIsLoading] = useState<boolean>(true);
-  const [prevTaskPath, setPrevTaskPath] = useState(taskPath);
-
-  // Synchronously clear stale pr when taskPath changes (before effects run)
-  if (taskPath !== prevTaskPath) {
-    setPrevTaskPath(taskPath);
-    if (pr !== null) {
-      setPr(null);
-    }
-  }
-
-  const refresh = async () => {
-    if (!taskPath || !enabled) return;
-    setIsLoading(true);
-    const result = await refreshPrStatus(taskPath);
-    setPr(result);
-    setIsLoading(false);
-  };
-
-  useEffect(() => {
-    if (!enabled || !taskPath) {
-      setPr(null);
-      setIsLoading(false);
-      return;
-    }
-
-    setIsLoading(true);
-
-    return subscribeToPrStatus(taskPath, (newPr, newLoading) => {
-      setPr(newPr);
-      setIsLoading(newLoading);
-    });
-  }, [taskPath, enabled]);
-
-  if (!enabled) {
-    return { pr: null, isLoading: false, refresh: noopRefresh };
-  }
-
-  return { pr, isLoading, refresh };
-}
diff --git a/src/renderer/hooks/useProjectManagement.tsx b/src/renderer/hooks/useProjectManagement.tsx
deleted file mode 100644
index 840938284f..0000000000
--- a/src/renderer/hooks/useProjectManagement.tsx
+++ /dev/null
@@ -1,642 +0,0 @@
-import { useCallback, useEffect, useState, useRef } from 'react';
-import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
-import { ToastAction } from '@radix-ui/react-toast';
-import { pickDefaultBranch } from '../components/BranchSelect';
-import { saveActiveIds } from '../constants/layout';
-import {
-  computeBaseRef,
-  getProjectRepoKey,
-  normalizePathForComparison,
-  resolveProjectGithubInfo,
-  withRepoKey,
-} from '../lib/projectUtils';
-import type { Project } from '../types/app';
-import { rpc } from '../lib/rpc';
-import { useModalContext } from '../contexts/ModalProvider';
-import { useAppContext } from '../contexts/AppContextProvider';
-import { useGithubContext } from '../contexts/GithubContextProvider';
-import { useToast } from './use-toast';
-
-// ---------------------------------------------------------------------------
-// Shared helper — build a Project object from a local git path.
-// Returns null when the path is not a git repository.
-// ---------------------------------------------------------------------------
-async function buildProjectFromGitPath(
-  gitPath: string,
-  platform: string,
-  isAuthenticated: boolean
-): Promise<{
-  projectToSave: Project;
-  remoteUrl: string;
-  repoKey: string;
-  isGitRepo: boolean;
-} | null> {
-  const gitInfo = await window.electronAPI.getGitInfo(gitPath);
-  const selectedPath = gitInfo.path || gitPath;
-  const repoCanonicalPath = gitInfo.rootPath || selectedPath;
-  const repoKey = normalizePathForComparison(repoCanonicalPath, platform);
-  const remoteUrl = gitInfo.remote || '';
-  const projectName = selectedPath.split(/[/\\]/).filter(Boolean).pop() || 'Unknown Project';
-
-  if (!gitInfo.isGitRepo) {
-    return { projectToSave: null as unknown as Project, remoteUrl, repoKey, isGitRepo: false };
-  }
-
-  const baseProject: Project = {
-    id: Date.now().toString(),
-    name: projectName,
-    path: selectedPath,
-    repoKey,
-    gitInfo: {
-      isGitRepo: true,
-      remote: gitInfo.remote || undefined,
-      branch: gitInfo.branch || undefined,
-      baseRef: computeBaseRef(gitInfo.baseRef, gitInfo.remote, gitInfo.branch),
-    },
-    tasks: [],
-  };
-
-  const ghInfo = await resolveProjectGithubInfo(
-    selectedPath,
-    remoteUrl,
-    isAuthenticated,
-    window.electronAPI.connectToGitHub
-  );
-
-  const projectToSave = withRepoKey(
-    {
-      ...baseProject,
-      githubInfo: {
-        repository: ghInfo.repository,
-        connected: ghInfo.connected,
-      },
-    },
-    platform
-  );
-
-  return { projectToSave, remoteUrl, repoKey, isGitRepo: true };
-}
-
-export const useProjectManagement = () => {
-  const { platform } = useAppContext();
-  const {
-    authenticated: isAuthenticated,
-    installed: ghInstalled,
-    handleGithubConnect,
-  } = useGithubContext();
-  const { toast } = useToast();
-  const { showModal } = useModalContext();
-  const queryClient = useQueryClient();
-
-  const [selectedProject, setSelectedProject] = useState<Project | null>(null);
-
-  const activeProjectIdRef = useRef<string | null>(null);
-  activeProjectIdRef.current = selectedProject?.id || null;
-
-  // Always start on home view (e.g. after app restart)
-  const [showHomeView, setShowHomeView] = useState<boolean>(true);
-  const [showSkillsView, setShowSkillsView] = useState(false);
-  const [showEditorMode, setShowEditorMode] = useState(false);
-  const [showKanban, setShowKanban] = useState(false);
-  // Trigger counters — incremented to signal task management to reset active task / auto-open modal
-  const [resetTaskTrigger, setResetTaskTrigger] = useState(0);
-  const [autoOpenTaskModalTrigger, setAutoOpenTaskModalTrigger] = useState(0);
-  const [projectBranchOptions, setProjectBranchOptions] = useState<
-    Array<{ value: string; label: string }>
-  >([]);
-  const [projectDefaultBranch, setProjectDefaultBranch] = useState<string>('main');
-  const [isLoadingBranches, setIsLoadingBranches] = useState(false);
-  const [hasResolvedBranchOptions, setHasResolvedBranchOptions] = useState(false);
-
-  // ---------------------------------------------------------------------------
-  // Project list query — React Query is the single source of truth
-  // ---------------------------------------------------------------------------
-  const { data: rawProjects } = useQuery({
-    queryKey: ['projects'],
-    queryFn: async () => {
-      const projs = await rpc.db.getProjects();
-      return projs.map((p) => withRepoKey(p, platform ?? ''));
-    },
-    enabled: !!platform,
-    staleTime: Infinity,
-  });
-
-  const projects = rawProjects ?? [];
-  const isInitialLoadComplete = rawProjects !== undefined;
-
-  // ---------------------------------------------------------------------------
-  // Mutations — all project writes go through here
-  // ---------------------------------------------------------------------------
-  const addProjectMutation = useMutation({
-    mutationFn: (project: Project) => rpc.db.saveProject(project),
-    onMutate: (project) => {
-      queryClient.setQueryData<Project[]>(['projects'], (old = []) => [project, ...old]);
-    },
-    onSettled: () => queryClient.invalidateQueries({ queryKey: ['projects'] }),
-  });
-
-  const deleteProjectMutation = useMutation({
-    mutationFn: async (project: Project) => {
-      await window.electronAPI
-        .worktreeRemoveReserve({
-          projectId: project.id,
-          projectPath: project.path,
-          isRemote: project.isRemote,
-        })
-        .catch(() => {});
-      await rpc.db.deleteProject(project.id);
-    },
-    onMutate: (project) => {
-      // Optimistically remove from cache
-      queryClient.setQueryData<Project[]>(['projects'], (old = []) =>
-        old.filter((p) => p.id !== project.id)
-      );
-      if (selectedProject?.id === project.id) {
-        setSelectedProject(null);
-        setResetTaskTrigger((t) => t + 1);
-        setShowHomeView(true);
-        saveActiveIds(null, null);
-      }
-    },
-    onError: (_err, project, _ctx) => {
-      // Rollback optimistic removal
-      queryClient.invalidateQueries({ queryKey: ['projects'] });
-      void import('../lib/logger').then(({ log }) => {
-        log.error('Delete project failed:', _err as any);
-      });
-      toast({
-        title: 'Error',
-        description:
-          _err instanceof Error
-            ? _err.message
-            : 'Could not delete project. See console for details.',
-        variant: 'destructive',
-      });
-    },
-    onSuccess: (_, project) => {
-      void import('../lib/telemetryClient').then(({ captureTelemetry }) => {
-        captureTelemetry('project_deleted');
-      });
-      queryClient.invalidateQueries({ queryKey: ['projects'] });
-      toast({ title: 'Project deleted', description: `"${project.name}" was removed.` });
-    },
-  });
-
-  // ---------------------------------------------------------------------------
-  // Helpers
-  // ---------------------------------------------------------------------------
-  const prewarmReserveForBaseRef = useCallback(
-    (projectId: string, projectPath: string, isGitRepo: boolean | undefined, baseRef?: string) => {
-      if (!isGitRepo) return;
-      const requestedBaseRef = (baseRef || '').trim() || 'HEAD';
-      window.electronAPI
-        .worktreeEnsureReserve({
-          projectId,
-          projectPath,
-          baseRef: requestedBaseRef,
-        })
-        .catch(() => {});
-    },
-    []
-  );
-
-  const activateProjectView = useCallback(
-    (project: Project) => {
-      void import('../lib/telemetryClient').then(({ captureTelemetry }) => {
-        captureTelemetry('project_view_opened');
-      });
-      setSelectedProject(project);
-      setShowHomeView(false);
-      setShowSkillsView(false);
-      setResetTaskTrigger((t) => t + 1);
-      setShowEditorMode(false);
-      setShowKanban(false);
-      saveActiveIds(project.id, null);
-      prewarmReserveForBaseRef(
-        project.id,
-        project.path,
-        project.gitInfo?.isGitRepo,
-        project.gitInfo?.baseRef || 'HEAD'
-      );
-    },
-    [prewarmReserveForBaseRef]
-  );
-
-  // ---------------------------------------------------------------------------
-  // Navigation
-  // ---------------------------------------------------------------------------
-  const handleGoHome = () => {
-    setSelectedProject(null);
-    setShowHomeView(true);
-    setShowSkillsView(false);
-    setResetTaskTrigger((t) => t + 1);
-    setShowEditorMode(false);
-    setShowKanban(false);
-    saveActiveIds(null, null);
-  };
-
-  const handleGoToSkills = () => {
-    void import('../lib/telemetryClient').then(({ captureTelemetry }) => {
-      captureTelemetry('skills_view_opened');
-    });
-    setSelectedProject(null);
-    setShowHomeView(false);
-    setShowSkillsView(true);
-    setResetTaskTrigger((t) => t + 1);
-    setShowEditorMode(false);
-    setShowKanban(false);
-    saveActiveIds(null, null);
-  };
-
-  const handleSelectProject = (project: Project) => {
-    activateProjectView(project);
-  };
-
-  // ---------------------------------------------------------------------------
-  // Project actions — open / new / clone / remote
-  // ---------------------------------------------------------------------------
-  const handleOpenProject = async () => {
-    void import('../lib/telemetryClient').then(({ captureTelemetry }) => {
-      captureTelemetry('project_add_clicked');
-    });
-    try {
-      const result = await window.electronAPI.openProject();
-      if (result.success && result.path) {
-        try {
-          const built = await buildProjectFromGitPath(result.path, platform ?? '', isAuthenticated);
-          if (!built) return;
-
-          if (!built.isGitRepo) {
-            toast({
-              title: 'Project Opened',
-              description: `This directory is not a Git repository. Path: ${result.path}`,
-              variant: 'destructive',
-            });
-            return;
-          }
-
-          const existingProject = projects.find(
-            (p) => getProjectRepoKey(p, platform) === built.repoKey
-          );
-          if (existingProject) {
-            activateProjectView(existingProject);
-            toast({
-              title: 'Project already open',
-              description: `"${existingProject.name}" is already in the sidebar.`,
-            });
-            return;
-          }
-
-          await addProjectMutation.mutateAsync(built.projectToSave);
-          void import('../lib/telemetryClient').then(({ captureTelemetry }) => {
-            captureTelemetry('project_added_success', { source: 'open' });
-          });
-          activateProjectView(built.projectToSave);
-        } catch (error) {
-          const { log } = await import('../lib/logger');
-          log.error('Git detection error:', error as any);
-          toast({
-            title: 'Project Opened',
-            description: `Could not detect Git information. Path: ${result.path}`,
-            variant: 'destructive',
-          });
-        }
-      } else if (result.error) {
-        if (result.error === 'No directory selected') return;
-        toast({
-          title: 'Failed to Open Project',
-          description: result.error,
-          variant: 'destructive',
-        });
-      }
-    } catch (error) {
-      const { log } = await import('../lib/logger');
-      log.error('Open project error:', error as any);
-      toast({
-        title: 'Failed to Open Project',
-        description: 'Please check the console for details.',
-        variant: 'destructive',
-      });
-    }
-  };
-
-  const handleNewProjectClick = async () => {
-    void import('../lib/telemetryClient').then(({ captureTelemetry }) => {
-      captureTelemetry('project_create_clicked');
-    });
-    if (!isAuthenticated || !ghInstalled) {
-      toast({
-        title: 'GitHub authentication required',
-        variant: 'destructive',
-        action: (
-          <ToastAction altText="Connect GitHub" onClick={handleGithubConnect}>
-            Connect GitHub
-          </ToastAction>
-        ),
-      });
-      return;
-    }
-    showModal('newProjectModal', { onSuccess: handleNewProjectSuccess });
-  };
-
-  const handleCloneProjectClick = async () => {
-    void import('../lib/telemetryClient').then(({ captureTelemetry }) => {
-      captureTelemetry('project_clone_clicked');
-    });
-    showModal('cloneFromUrlModal', { onSuccess: handleCloneSuccess });
-  };
-
-  const handleCloneSuccess = useCallback(
-    async (projectPath: string) => {
-      void import('../lib/telemetryClient').then(({ captureTelemetry }) => {
-        captureTelemetry('project_cloned');
-      });
-      try {
-        const built = await buildProjectFromGitPath(projectPath, platform ?? '', isAuthenticated);
-        if (!built || !built.isGitRepo) return;
-
-        const existingProject = projects.find(
-          (p) => getProjectRepoKey(p, platform) === built.repoKey
-        );
-        if (existingProject) {
-          activateProjectView(existingProject);
-          return;
-        }
-
-        await addProjectMutation.mutateAsync(built.projectToSave);
-        void import('../lib/telemetryClient').then(({ captureTelemetry }) => {
-          captureTelemetry('project_clone_success');
-          captureTelemetry('project_added_success', { source: 'clone' });
-        });
-        activateProjectView(built.projectToSave);
-      } catch (error) {
-        const { log } = await import('../lib/logger');
-        log.error('Failed to load cloned project:', error);
-        toast({
-          title: 'Project Cloned',
-          description: 'Repository cloned but failed to load. Please try opening it manually.',
-          variant: 'destructive',
-        });
-      }
-    },
-    [projects, isAuthenticated, activateProjectView, platform, toast, addProjectMutation]
-  );
-
-  const handleNewProjectSuccess = useCallback(
-    async (projectPath: string) => {
-      void import('../lib/telemetryClient').then(({ captureTelemetry }) => {
-        captureTelemetry('new_project_created');
-      });
-      try {
-        const built = await buildProjectFromGitPath(projectPath, platform ?? '', isAuthenticated);
-        if (!built || !built.isGitRepo) return;
-
-        const existingProject = projects.find(
-          (p) => getProjectRepoKey(p, platform) === built.repoKey
-        );
-        if (existingProject) {
-          activateProjectView(existingProject);
-          return;
-        }
-
-        await addProjectMutation.mutateAsync(built.projectToSave);
-        void import('../lib/telemetryClient').then(({ captureTelemetry }) => {
-          captureTelemetry('project_create_success');
-          captureTelemetry('project_added_success', { source: 'new_project' });
-        });
-        toast({
-          title: 'Project created successfully!',
-          description: `${built.projectToSave.name} has been added to your projects.`,
-        });
-        activateProjectView(built.projectToSave);
-
-        const isGithubRemote = /github\.com[:/]/i.test(built.remoteUrl);
-        if (!isAuthenticated || !isGithubRemote) {
-          setAutoOpenTaskModalTrigger((t) => t + 1);
-        }
-      } catch (error) {
-        const { log } = await import('../lib/logger');
-        log.error('Failed to load new project:', error);
-        toast({
-          title: 'Project Created',
-          description: 'Repository created but failed to load. Please try opening it manually.',
-          variant: 'destructive',
-        });
-      }
-    },
-    [projects, isAuthenticated, activateProjectView, platform, toast, addProjectMutation]
-  );
-
-  const handleDeleteProject = (project: Project) => {
-    deleteProjectMutation.mutate(project);
-  };
-
-  interface RemoteProjectInput {
-    id: string;
-    name: string;
-    path: string;
-    host: string;
-    connectionId: string;
-  }
-
-  const handleRemoteProjectSuccess = useCallback(
-    async (remoteProject: RemoteProjectInput) => {
-      void import('../lib/telemetryClient').then(({ captureTelemetry }) => {
-        captureTelemetry('remote_project_created');
-      });
-      try {
-        const repoKey = `${remoteProject.host}:${remoteProject.path}`;
-        const existingProject = projects.find((p) => getProjectRepoKey(p) === repoKey);
-
-        if (existingProject) {
-          activateProjectView(existingProject);
-          toast({
-            title: 'Project already open',
-            description: `"${existingProject.name}" is already in the sidebar.`,
-          });
-          return;
-        }
-
-        const project: Project = {
-          id: remoteProject.id,
-          name: remoteProject.name,
-          path: remoteProject.path,
-          repoKey,
-          gitInfo: { isGitRepo: true },
-          tasks: [],
-          isRemote: true,
-          sshConnectionId: remoteProject.connectionId,
-          remotePath: remoteProject.path,
-        } as Project;
-
-        await addProjectMutation.mutateAsync(project);
-        void import('../lib/telemetryClient').then(({ captureTelemetry }) => {
-          captureTelemetry('project_create_success');
-          captureTelemetry('project_added_success', { source: 'remote' });
-        });
-        toast({
-          title: 'Remote project added successfully!',
-          description: `${project.name} on ${remoteProject.host} has been added to your projects.`,
-        });
-        activateProjectView(project);
-      } catch (error) {
-        const { log } = await import('../lib/logger');
-        log.error('Failed to save remote project:', error);
-        toast({
-          title: 'Failed to add remote project',
-          description: 'An error occurred while saving the project.',
-          variant: 'destructive',
-        });
-      }
-    },
-    [projects, activateProjectView, toast, addProjectMutation]
-  );
-
-  const handleAddRemoteProject = useCallback(() => {
-    showModal('addRemoteProjectModal', { onSuccess: handleRemoteProjectSuccess });
-  }, [showModal, handleRemoteProjectSuccess]);
-
-  const refreshBranches = useCallback(async () => {
-    if (!selectedProject) return;
-
-    const originProjectId = selectedProject.id;
-
-    setIsLoadingBranches(true);
-    try {
-      let options: { value: string; label: string }[];
-
-      if (selectedProject.isRemote && selectedProject.sshConnectionId) {
-        // Load branches over SSH for remote projects
-        const result = await window.electronAPI.sshExecuteCommand(
-          selectedProject.sshConnectionId,
-          'git branch -a --format="%(refname:short)"',
-          selectedProject.path
-        );
-        if (result.exitCode === 0 && result.stdout) {
-          const branches = result.stdout
-            .split('\n')
-            .map((b) => b.trim())
-            .filter((b) => b.length > 0 && !b.includes('HEAD'));
-          options = branches.map((b) => ({
-            value: b,
-            label: b,
-          }));
-        } else {
-          options = [];
-        }
-      } else {
-        const res = await window.electronAPI.listRemoteBranches({
-          projectPath: selectedProject.path,
-        });
-        if (res.success && res.branches) {
-          options = res.branches.map((b) => ({
-            value: b.ref,
-            label: b.remote ? b.label : `${b.branch} (local)`,
-          }));
-        } else {
-          options = [];
-        }
-      }
-
-      if (activeProjectIdRef.current !== originProjectId) {
-        return;
-      }
-
-      // Only update state if we found branches
-      if (options.length > 0) {
-        setProjectBranchOptions(options);
-        const currentRef = selectedProject.gitInfo?.baseRef;
-        const defaultBranch = pickDefaultBranch(options, currentRef);
-        setProjectDefaultBranch(defaultBranch ?? currentRef ?? 'main');
-      }
-    } catch (error) {
-      console.error('Failed to load branches:', error);
-    } finally {
-      if (activeProjectIdRef.current === originProjectId) {
-        setIsLoadingBranches(false);
-        setHasResolvedBranchOptions(true);
-      }
-    }
-  }, [selectedProject]);
-
-  // Initial load when project changes
-  useEffect(() => {
-    if (!selectedProject) {
-      setProjectBranchOptions([]);
-      setProjectDefaultBranch('main');
-      setHasResolvedBranchOptions(false);
-      return;
-    }
-
-    const currentRef = selectedProject.gitInfo?.baseRef;
-    const initialBranch = currentRef || 'main';
-    setProjectBranchOptions([{ value: initialBranch, label: initialBranch }]);
-    setProjectDefaultBranch(initialBranch);
-    setHasResolvedBranchOptions(false);
-
-    void refreshBranches();
-  }, [selectedProject, refreshBranches]);
-
-  // Keep reserves warm for the currently selected base ref.
-  useEffect(() => {
-    if (!selectedProject) return;
-    if (!hasResolvedBranchOptions) return;
-    if (isLoadingBranches) return;
-    const preferredBaseRef = (projectDefaultBranch || '').trim();
-    const hasPreferredRef = projectBranchOptions.some(
-      (option) => option.value === preferredBaseRef
-    );
-    const fallbackBaseRef = (selectedProject.gitInfo?.baseRef || '').trim() || 'HEAD';
-    const baseRefForPrewarm = hasPreferredRef ? preferredBaseRef : fallbackBaseRef;
-    prewarmReserveForBaseRef(
-      selectedProject.id,
-      selectedProject.path,
-      selectedProject.gitInfo?.isGitRepo,
-      baseRefForPrewarm
-    );
-  }, [
-    selectedProject?.id,
-    selectedProject?.path,
-    selectedProject?.gitInfo?.isGitRepo,
-    selectedProject?.gitInfo?.baseRef,
-    hasResolvedBranchOptions,
-    isLoadingBranches,
-    projectDefaultBranch,
-    projectBranchOptions,
-    prewarmReserveForBaseRef,
-  ]);
-
-  return {
-    projects,
-    selectedProject,
-    setSelectedProject,
-    showHomeView,
-    setShowHomeView,
-    showSkillsView,
-    setShowSkillsView,
-    showEditorMode,
-    setShowEditorMode,
-    showKanban,
-    setShowKanban,
-    resetTaskTrigger,
-    autoOpenTaskModalTrigger,
-    handleGoToSkills,
-    projectBranchOptions,
-    projectDefaultBranch,
-    setProjectDefaultBranch,
-    isLoadingBranches,
-    refreshBranches,
-    activateProjectView,
-    handleGoHome,
-    handleSelectProject,
-    handleOpenProject,
-    handleNewProjectClick,
-    handleCloneProjectClick,
-    handleCloneSuccess,
-    handleNewProjectSuccess,
-    handleDeleteProject,
-    handleRemoteProjectSuccess,
-    handleAddRemoteProject,
-    isInitialLoadComplete,
-  };
-};
diff --git a/src/renderer/hooks/useProjectRemoteInfo.ts b/src/renderer/hooks/useProjectRemoteInfo.ts
deleted file mode 100644
index 49116c28fc..0000000000
--- a/src/renderer/hooks/useProjectRemoteInfo.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import { useMemo } from 'react';
-import { useAppContext } from '../contexts/AppContextProvider';
-import { useProjectManagementContext } from '../contexts/ProjectManagementProvider';
-
-/**
- * Derives SSH connection info for the currently selected project.
- * Works for both projects that explicitly store remote fields and for
- * legacy projects where remoteness is inferred from the path heuristic.
- */
-export function useProjectRemoteInfo(): {
-  connectionId: string | null;
-  remotePath: string | null;
-} {
-  const { platform } = useAppContext();
-  const { selectedProject } = useProjectManagementContext();
-
-  const connectionId = useMemo((): string | null => {
-    if (!selectedProject) return null;
-    if (selectedProject.sshConnectionId) return selectedProject.sshConnectionId;
-
-    const alias = selectedProject.name;
-    if (typeof alias !== 'string' || !/^[a-zA-Z0-9._-]+$/.test(alias)) return null;
-
-    // Back-compat: on macOS/Windows a /home/... path is almost certainly remote.
-    const p = selectedProject.path || '';
-    const looksRemoteByPath =
-      platform === 'darwin' || platform === 'win32' ? p.startsWith('/home/') : false;
-
-    if (selectedProject.isRemote || looksRemoteByPath) {
-      return `ssh-config:${encodeURIComponent(alias)}`;
-    }
-    return null;
-  }, [selectedProject, platform]);
-
-  const remotePath = useMemo((): string | null => {
-    if (!selectedProject) return null;
-    if (selectedProject.remotePath) return selectedProject.remotePath;
-    if (connectionId) return selectedProject.path;
-    return selectedProject.isRemote ? selectedProject.path : null;
-  }, [selectedProject, connectionId]);
-
-  return { connectionId, remotePath };
-}
diff --git a/src/renderer/hooks/usePullRequests.ts b/src/renderer/hooks/usePullRequests.ts
deleted file mode 100644
index 07bdddaec3..0000000000
--- a/src/renderer/hooks/usePullRequests.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-import { useCallback, useEffect, useState } from 'react';
-
-export interface PullRequestSummary {
-  number: number;
-  title: string;
-  headRefName: string;
-  baseRefName: string;
-  url: string;
-  isDraft?: boolean;
-  updatedAt?: string | null;
-  authorLogin?: string | null;
-}
-
-export function usePullRequests(projectPath?: string, enabled: boolean = true) {
-  const [prs, setPrs] = useState<PullRequestSummary[]>([]);
-  const [loading, setLoading] = useState(false);
-  const [error, setError] = useState<string | null>(null);
-
-  const fetchPrs = useCallback(async () => {
-    if (!projectPath || !enabled) {
-      setPrs([]);
-      setError(null);
-      return;
-    }
-
-    setLoading(true);
-    setError(null);
-    try {
-      const response = await window.electronAPI.githubListPullRequests(projectPath);
-      if (response?.success) {
-        const items = Array.isArray(response.prs) ? response.prs : [];
-        const mapped = items
-          .map((item: any) => ({
-            number: Number(item?.number) || 0,
-            title: String(item?.title || `PR #${item?.number ?? 'unknown'}`),
-            headRefName: String(item?.headRefName || ''),
-            baseRefName: String(item?.baseRefName || ''),
-            url: String(item?.url || ''),
-            isDraft: !!item?.isDraft,
-            updatedAt: item?.updatedAt ? String(item.updatedAt) : null,
-            authorLogin:
-              typeof item?.author === 'object' && item?.author
-                ? String(item.author.login || item.author.name || '')
-                : null,
-          }))
-          .filter((item) => item.number > 0);
-        setPrs(mapped);
-      } else {
-        setError(response?.error || 'Failed to load pull requests');
-        setPrs([]);
-      }
-    } catch (err: any) {
-      setError(err?.message || String(err));
-      setPrs([]);
-    } finally {
-      setLoading(false);
-    }
-  }, [projectPath, enabled]);
-
-  useEffect(() => {
-    if (!enabled) return;
-    fetchPrs();
-  }, [enabled, fetchPrs]);
-
-  return { prs, loading, error, refresh: fetchPrs };
-}
diff --git a/src/renderer/hooks/useRemoteProject.ts b/src/renderer/hooks/useRemoteProject.ts
deleted file mode 100644
index 0a9f43ddf0..0000000000
--- a/src/renderer/hooks/useRemoteProject.ts
+++ /dev/null
@@ -1,246 +0,0 @@
-import { useState, useEffect, useCallback, useRef } from 'react';
-import type { ConnectionState } from '../components/ssh';
-import type { Project } from '../types/app';
-
-export interface UseRemoteProjectResult {
-  isRemote: boolean;
-  connectionState: ConnectionState;
-  connectionId: string | null;
-  host: string | null;
-  error: Error | null;
-  isLoading: boolean;
-  connect: () => Promise<void>;
-  disconnect: () => Promise<void>;
-  reconnect: () => Promise<void>;
-}
-
-// Connection state cache to persist across component unmounts
-const connectionStateCache = new Map<string, ConnectionState>();
-const connectionAttempts = new Map<string, number>();
-const MAX_RETRY_ATTEMPTS = 3;
-
-/**
- * Module-level set of connection IDs that currently have an in-flight
- * connect() call. Prevents multiple hooks (or re-renders) from firing
- * parallel TCP connections for the same remote host.
- */
-const connectingIds = new Set<string>();
-
-export function useRemoteProject(project: Project | null): UseRemoteProjectResult {
-  const [connectionState, setConnectionState] = useState<ConnectionState>(() => {
-    if (!project) return 'disconnected';
-    // Check if this is a remote project
-    const isRemote = (project as any).isRemote || (project as any).sshConnectionId;
-    if (!isRemote) return 'disconnected';
-    return connectionStateCache.get(project.id) || 'disconnected';
-  });
-  const [error, setError] = useState<Error | null>(null);
-  const [isLoading, setIsLoading] = useState(false);
-  const [host, setHost] = useState<string | null>(null);
-  const healthCheckIntervalRef = useRef<NodeJS.Timeout | null>(null);
-  const isMountedRef = useRef(true);
-
-  // Determine if this is a remote project
-  const isRemote = Boolean(
-    project && ((project as any).isRemote || (project as any).sshConnectionId)
-  );
-  const connectionId =
-    project && (project as any).sshConnectionId ? (project as any).sshConnectionId : null;
-
-  // Update connection state and cache
-  const updateConnectionState = useCallback(
-    (state: ConnectionState) => {
-      if (project) {
-        connectionStateCache.set(project.id, state);
-      }
-      setConnectionState(state);
-    },
-    [project]
-  );
-
-  // Connect to the remote project
-  const connect = useCallback(async () => {
-    if (!connectionId) return;
-
-    // Deduplicate: skip if this connectionId already has an in-flight connect
-    if (connectingIds.has(connectionId)) return;
-
-    connectingIds.add(connectionId);
-    setIsLoading(true);
-    setError(null);
-    updateConnectionState('connecting');
-
-    try {
-      // The API returns the connectionId string directly
-      const result = await window.electronAPI.sshConnect(connectionId);
-
-      if (!isMountedRef.current) return;
-
-      // sshConnect returns the connectionId on success, throws on error
-      if (result) {
-        updateConnectionState('connected');
-        connectionAttempts.set(connectionId, 0);
-      } else {
-        throw new Error('Connection failed');
-      }
-    } catch (err) {
-      if (!isMountedRef.current) return;
-
-      const error = err instanceof Error ? err : new Error('Connection failed');
-      setError(error);
-      updateConnectionState('error');
-      console.error('Failed to connect to remote project:', error);
-    } finally {
-      connectingIds.delete(connectionId);
-      if (isMountedRef.current) {
-        setIsLoading(false);
-      }
-    }
-  }, [connectionId, updateConnectionState]);
-
-  // Disconnect from the remote project
-  const disconnect = useCallback(async () => {
-    if (!connectionId) return;
-
-    setIsLoading(true);
-    try {
-      await window.electronAPI.sshDisconnect(connectionId);
-      if (isMountedRef.current) {
-        updateConnectionState('disconnected');
-        setError(null);
-      }
-    } catch (err) {
-      if (isMountedRef.current) {
-        console.error('Failed to disconnect:', err);
-      }
-    } finally {
-      if (isMountedRef.current) {
-        setIsLoading(false);
-      }
-    }
-  }, [connectionId, updateConnectionState]);
-
-  // Reconnect with retry logic
-  const reconnect = useCallback(async () => {
-    if (!connectionId) return;
-
-    const attempts = connectionAttempts.get(connectionId) || 0;
-    if (attempts >= MAX_RETRY_ATTEMPTS) {
-      setError(
-        new Error(`Max retry attempts (${MAX_RETRY_ATTEMPTS}) reached. Please try again later.`)
-      );
-      return;
-    }
-
-    connectionAttempts.set(connectionId, attempts + 1);
-    updateConnectionState('reconnecting');
-
-    // Brief delay before reconnecting
-    await new Promise((resolve) => setTimeout(resolve, 1000));
-
-    await connect();
-  }, [connectionId, connect, updateConnectionState]);
-
-  // Fetch connection details (host)
-  useEffect(() => {
-    if (!isRemote || !connectionId) {
-      setHost(null);
-      return;
-    }
-
-    const fetchConnectionDetails = async () => {
-      try {
-        // The API returns an array directly
-        const result = (await window.electronAPI.sshGetConnections()) as Array<{
-          id: string;
-          host: string;
-        }>;
-        if (Array.isArray(result)) {
-          const conn = result.find((c) => c.id === connectionId);
-          if (conn) {
-            setHost(conn.host);
-          }
-        }
-      } catch (err) {
-        console.warn('Failed to fetch connection details:', err);
-      }
-    };
-
-    fetchConnectionDetails();
-  }, [isRemote, connectionId]);
-
-  // Auto-connect on mount if this is a remote project
-  useEffect(() => {
-    isMountedRef.current = true;
-
-    if (isRemote && connectionId && connectionState === 'disconnected') {
-      // Small delay to allow UI to settle
-      const timeout = setTimeout(() => {
-        connect();
-      }, 500);
-
-      return () => {
-        clearTimeout(timeout);
-        isMountedRef.current = false;
-      };
-    }
-
-    return () => {
-      isMountedRef.current = false;
-    };
-  }, [isRemote, connectionId, connect, connectionState]);
-
-  // Health check - poll connection state from the main process monitor.
-  // Reconnection is handled exclusively by the main-process
-  // SshConnectionMonitor (via ssh2 keepalive + exponential backoff).
-  // This effect only syncs the UI state.
-  useEffect(() => {
-    if (!isRemote || !connectionId) return;
-
-    const checkHealth = async () => {
-      try {
-        // The API returns the state string directly
-        const state = (await window.electronAPI.sshGetState(connectionId)) as ConnectionState;
-        if (isMountedRef.current && state !== connectionState) {
-          updateConnectionState(state);
-        }
-      } catch (err) {
-        // Silently ignore health check errors
-      }
-    };
-
-    // Check immediately if connected
-    if (connectionState === 'connected') {
-      checkHealth();
-      healthCheckIntervalRef.current = setInterval(checkHealth, 10000); // Check every 10s when connected
-    } else {
-      healthCheckIntervalRef.current = setInterval(checkHealth, 5000); // Check every 5s otherwise
-    }
-
-    return () => {
-      if (healthCheckIntervalRef.current) {
-        clearInterval(healthCheckIntervalRef.current);
-      }
-    };
-  }, [isRemote, connectionId, connectionState, updateConnectionState]);
-
-  // Cleanup on unmount
-  useEffect(() => {
-    return () => {
-      // Don't disconnect on unmount - let the service manage connections
-      isMountedRef.current = false;
-    };
-  }, []);
-
-  return {
-    isRemote,
-    connectionState,
-    connectionId,
-    host,
-    error,
-    isLoading,
-    connect,
-    disconnect,
-    reconnect,
-  };
-}
diff --git a/src/renderer/hooks/useSshConnections.ts b/src/renderer/hooks/useSshConnections.ts
deleted file mode 100644
index 23755bf60f..0000000000
--- a/src/renderer/hooks/useSshConnections.ts
+++ /dev/null
@@ -1,298 +0,0 @@
-import { useState, useEffect, useCallback, useRef } from 'react';
-import type { SshConnection, SshConnectionConfig } from '../components/ssh';
-import type { ConnectionState, SshConfigHost } from '../../shared/ssh/types';
-
-export interface UseSshConnectionsResult {
-  connections: SshConnection[];
-  isLoading: boolean;
-  error: Error | null;
-  createConnection: (name: string, config: SshConnectionConfig) => Promise<SshConnection>;
-  updateConnection: (id: string, updates: Partial<SshConnection>) => Promise<SshConnection>;
-  deleteConnection: (id: string) => Promise<void>;
-  testConnection: (id: string) => Promise<{ success: boolean; message?: string }>;
-  refresh: () => Promise<void>;
-  getConnectionState: (id: string) => ConnectionState;
-  getSshConfigHost: (hostAlias: string) => Promise<SshConfigHost | null>;
-}
-
-// Cache for connection states to avoid flickering
-const stateCache = new Map<string, ConnectionState>();
-
-export function useSshConnections(): UseSshConnectionsResult {
-  const [connections, setConnections] = useState<SshConnection[]>([]);
-  const [isLoading, setIsLoading] = useState(false);
-  const [error, setError] = useState<Error | null>(null);
-  const [connectionStates, setConnectionStates] = useState<Map<string, ConnectionState>>(
-    () => new Map(stateCache)
-  );
-  const refreshIntervalRef = useRef<NodeJS.Timeout | null>(null);
-
-  // Fetch all connections
-  const fetchConnections = useCallback(async () => {
-    try {
-      // The API returns an array directly, not wrapped in { success, connections }
-      const result = (await window.electronAPI.sshGetConnections()) as unknown as SshConnection[];
-      if (Array.isArray(result)) {
-        // Merge with cached states
-        const mergedConnections = result.map((conn: SshConnection) => ({
-          ...conn,
-          state: stateCache.get(conn.id) || 'disconnected',
-        }));
-        setConnections(mergedConnections);
-      }
-    } catch (err) {
-      console.error('Failed to fetch SSH connections:', err);
-      throw err;
-    }
-  }, []);
-
-  // Refresh function
-  const refresh = useCallback(async () => {
-    setIsLoading(true);
-    setError(null);
-    try {
-      await fetchConnections();
-    } catch (err) {
-      setError(err instanceof Error ? err : new Error('Failed to fetch connections'));
-    } finally {
-      setIsLoading(false);
-    }
-  }, [fetchConnections]);
-
-  // Initial load
-  useEffect(() => {
-    refresh();
-  }, [refresh]);
-
-  // Poll connection states periodically
-  useEffect(() => {
-    const pollStates = async () => {
-      if (connections.length === 0) return;
-
-      const newStates = new Map(connectionStates);
-      let hasChanges = false;
-
-      for (const conn of connections) {
-        try {
-          // The API returns the state string directly
-          const state = (await window.electronAPI.sshGetState(conn.id)) as ConnectionState;
-          if (state && stateCache.get(conn.id) !== state) {
-            stateCache.set(conn.id, state);
-            newStates.set(conn.id, state);
-            hasChanges = true;
-          }
-        } catch (err) {
-          // Silently ignore state fetch errors
-          console.warn(`Failed to get state for connection ${conn.id}:`, err);
-        }
-      }
-
-      if (hasChanges) {
-        setConnectionStates(newStates);
-        // Update connections with new states
-        setConnections((prev) =>
-          prev.map((conn) => ({
-            ...conn,
-            state: newStates.get(conn.id) || conn.state,
-          }))
-        );
-      }
-    };
-
-    // Poll immediately
-    pollStates();
-
-    // Set up interval
-    refreshIntervalRef.current = setInterval(pollStates, 5000);
-
-    return () => {
-      if (refreshIntervalRef.current) {
-        clearInterval(refreshIntervalRef.current);
-      }
-    };
-  }, [connections.length]);
-
-  // Create a new connection
-  const createConnection = useCallback(
-    async (name: string, config: SshConnectionConfig): Promise<SshConnection> => {
-      setIsLoading(true);
-      setError(null);
-      try {
-        const saveConfig = {
-          ...config,
-          name,
-        };
-        // The API returns the connection directly, not wrapped in { success, connection }
-        const result = (await window.electronAPI.sshSaveConnection(
-          saveConfig
-        )) as unknown as SshConnection;
-
-        if (result && result.id) {
-          await fetchConnections(); // Refresh the list
-          return result;
-        } else {
-          throw new Error('Failed to save connection');
-        }
-      } catch (err) {
-        const error = err instanceof Error ? err : new Error('Failed to create connection');
-        setError(error);
-        throw error;
-      } finally {
-        setIsLoading(false);
-      }
-    },
-    [fetchConnections]
-  );
-
-  // Update an existing connection
-  const updateConnection = useCallback(
-    async (id: string, updates: Partial<SshConnection>): Promise<SshConnection> => {
-      setIsLoading(true);
-      setError(null);
-      try {
-        // Find the existing connection
-        const existing = connections.find((c) => c.id === id);
-        if (!existing) {
-          throw new Error('Connection not found');
-        }
-
-        // Merge updates
-        const updated = {
-          ...existing,
-          ...updates,
-        };
-
-        // The API returns the connection directly
-        const result = (await window.electronAPI.sshSaveConnection(
-          updated
-        )) as unknown as SshConnection;
-
-        if (result && result.id) {
-          await fetchConnections(); // Refresh the list
-          return result;
-        } else {
-          throw new Error('Failed to update connection');
-        }
-      } catch (err) {
-        const error = err instanceof Error ? err : new Error('Failed to update connection');
-        setError(error);
-        throw error;
-      } finally {
-        setIsLoading(false);
-      }
-    },
-    [connections, fetchConnections]
-  );
-
-  // Delete a connection
-  const deleteConnection = useCallback(
-    async (id: string): Promise<void> => {
-      setIsLoading(true);
-      setError(null);
-      try {
-        await window.electronAPI.sshDeleteConnection(id);
-
-        // Remove from cache
-        stateCache.delete(id);
-        setConnectionStates((prev) => {
-          const next = new Map(prev);
-          next.delete(id);
-          return next;
-        });
-        await fetchConnections(); // Refresh the list
-      } catch (err) {
-        const error = err instanceof Error ? err : new Error('Failed to delete connection');
-        setError(error);
-        throw error;
-      } finally {
-        setIsLoading(false);
-      }
-    },
-    [fetchConnections]
-  );
-
-  // Test a connection
-  const testConnection = useCallback(
-    async (id: string): Promise<{ success: boolean; message?: string }> => {
-      try {
-        const connection = connections.find((c) => c.id === id);
-        if (!connection) {
-          return { success: false, message: 'Connection not found' };
-        }
-
-        // Get full connection details for testing
-        const testConfig = {
-          id: connection.id,
-          name: connection.name,
-          host: connection.host,
-          port: connection.port,
-          username: connection.username,
-          authType: connection.authType,
-          privateKeyPath: connection.privateKeyPath,
-          useAgent: connection.useAgent,
-        };
-
-        // sshTestConnection returns { success, error?, latency? }
-        const result = (await window.electronAPI.sshTestConnection(testConfig)) as {
-          success: boolean;
-          error?: string;
-        };
-
-        return {
-          success: result.success,
-          message: result.error || (result.success ? 'Connection successful' : 'Connection failed'),
-        };
-      } catch (err) {
-        return {
-          success: false,
-          message: err instanceof Error ? err.message : 'Test failed',
-        };
-      }
-    },
-    [connections]
-  );
-
-  // Get connection state
-  const getConnectionState = useCallback(
-    (id: string): ConnectionState => {
-      return connectionStates.get(id) || stateCache.get(id) || 'disconnected';
-    },
-    [connectionStates]
-  );
-
-  // Get SSH config host by alias
-  const getSshConfigHost = useCallback(async (hostAlias: string): Promise<SshConfigHost | null> => {
-    try {
-      if (!hostAlias || typeof hostAlias !== 'string') {
-        return null;
-      }
-
-      const result = (await window.electronAPI.sshGetSshConfigHost(hostAlias)) as {
-        success: boolean;
-        host?: SshConfigHost;
-        error?: string;
-      };
-
-      if (result.success && result.host) {
-        return result.host;
-      }
-      return null;
-    } catch (err) {
-      console.warn(`Failed to get SSH config host ${hostAlias}:`, err);
-      return null;
-    }
-  }, []);
-
-  return {
-    connections,
-    isLoading,
-    error,
-    createConnection,
-    updateConnection,
-    deleteConnection,
-    testConnection,
-    refresh,
-    getConnectionState,
-    getSshConfigHost,
-  };
-}
diff --git a/src/renderer/hooks/useTaskAgentNames.ts b/src/renderer/hooks/useTaskAgentNames.ts
deleted file mode 100644
index 2fd8a0efc0..0000000000
--- a/src/renderer/hooks/useTaskAgentNames.ts
+++ /dev/null
@@ -1,80 +0,0 @@
-import { useEffect, useState } from 'react';
-import { getProvider } from '@shared/providers/registry';
-import type { ProviderId } from '@shared/providers/registry';
-import { rpc } from '../lib/rpc';
-
-interface AgentNameInfo {
-  primaryName: string;
-  additionalCount: number;
-  displayLabel: string;
-  providerIds: string[];
-}
-
-const FALLBACK: AgentNameInfo = {
-  primaryName: '',
-  additionalCount: 0,
-  displayLabel: '',
-  providerIds: [],
-};
-
-export function useTaskAgentNames(taskId: string, fallbackAgentId?: string): AgentNameInfo {
-  const [info, setInfo] = useState<AgentNameInfo>(FALLBACK);
-
-  useEffect(() => {
-    let cancelled = false;
-
-    async function load() {
-      try {
-        const conversations = await rpc.db.getConversations(taskId);
-        if (cancelled) return;
-        const providerIds = [
-          ...new Set(conversations.map((c) => c.provider ?? undefined).filter(Boolean) as string[]),
-        ];
-
-        if (providerIds.length === 0 && fallbackAgentId) {
-          const provider = getProvider(fallbackAgentId as ProviderId);
-          const name = provider?.name ?? fallbackAgentId;
-          setInfo({
-            primaryName: name,
-            additionalCount: 0,
-            displayLabel: name,
-            providerIds: [fallbackAgentId],
-          });
-          return;
-        }
-
-        if (providerIds.length === 0) {
-          setInfo(FALLBACK);
-          return;
-        }
-
-        const primaryProvider = getProvider(providerIds[0] as ProviderId);
-        const primaryName = primaryProvider?.name ?? providerIds[0];
-        const totalChats = conversations.filter((c) => c.provider).length;
-        const additionalCount = Math.max(0, totalChats - 1);
-        const displayLabel =
-          additionalCount > 0 ? `${primaryName} +${additionalCount}` : primaryName;
-
-        setInfo({ primaryName, additionalCount, displayLabel, providerIds });
-      } catch {
-        if (!cancelled && fallbackAgentId) {
-          const provider = getProvider(fallbackAgentId as ProviderId);
-          const name = provider?.name ?? fallbackAgentId;
-          setInfo({
-            primaryName: name,
-            additionalCount: 0,
-            displayLabel: name,
-            providerIds: [fallbackAgentId],
-          });
-        }
-      }
-    }
-
-    void load();
-    return () => {
-      cancelled = true;
-    };
-  }, [taskId, fallbackAgentId]);
-
-  return info;
-}
diff --git a/src/renderer/hooks/useTaskBusy.ts b/src/renderer/hooks/useTaskBusy.ts
deleted file mode 100644
index b76d5c736b..0000000000
--- a/src/renderer/hooks/useTaskBusy.ts
+++ /dev/null
@@ -1,91 +0,0 @@
-import { useCallback, useEffect, useMemo, useState } from 'react';
-import { activityStore } from '../lib/activityStore';
-import { rpc } from '../lib/rpc';
-
-const CONVERSATIONS_CHANGED_EVENT = 'emdash:conversations-changed';
-
-export function useTaskBusy(taskId: string) {
-  const [mainBusy, setMainBusy] = useState(false);
-  const [chatBusyById, setChatBusyById] = useState<Record<string, boolean>>({});
-  const chatBusy = useMemo(() => Object.values(chatBusyById).some(Boolean), [chatBusyById]);
-
-  const reloadChats = useCallback(async () => {
-    try {
-      const conversations = await rpc.db.getConversations(taskId);
-      return conversations
-        .filter((c: any) => c && !Boolean(c.isMain))
-        .map((c: any) => String(c.id));
-    } catch {
-      return [];
-    }
-  }, [taskId]);
-
-  useEffect(() => activityStore.subscribe(taskId, setMainBusy, { kinds: ['main'] }), [taskId]);
-
-  useEffect(() => {
-    let cancelled = false;
-    const chatUnsubsById = new Map<string, () => void>();
-    let loadSeq = 0;
-
-    const syncChatIds = (chatIds: string[]) => {
-      if (cancelled) return;
-      const nextIds = new Set(chatIds);
-
-      for (const [id, off] of Array.from(chatUnsubsById.entries())) {
-        if (nextIds.has(id)) continue;
-        try {
-          off?.();
-        } catch {}
-        chatUnsubsById.delete(id);
-      }
-
-      for (const id of nextIds) {
-        if (chatUnsubsById.has(id)) continue;
-        const off = activityStore.subscribe(
-          id,
-          (busy) => {
-            if (cancelled) return;
-            setChatBusyById((prev) => {
-              if (prev[id] === busy) return prev;
-              return { ...prev, [id]: busy };
-            });
-          },
-          { kinds: ['chat'] }
-        );
-        chatUnsubsById.set(id, off);
-      }
-
-      setChatBusyById((prev) => {
-        const next: Record<string, boolean> = {};
-        for (const id of nextIds) next[id] = prev[id] ?? false;
-        return next;
-      });
-    };
-
-    const load = async () => {
-      const seq = ++loadSeq;
-      const chatIds = await reloadChats();
-      if (cancelled || seq !== loadSeq) return;
-      syncChatIds(chatIds);
-    };
-
-    void load();
-
-    const onChanged = (event: Event) => {
-      const custom = event as CustomEvent<{ taskId?: string }>;
-      if (custom.detail?.taskId !== taskId) return;
-      void load();
-    };
-    window.addEventListener(CONVERSATIONS_CHANGED_EVENT, onChanged);
-
-    return () => {
-      cancelled = true;
-      window.removeEventListener(CONVERSATIONS_CHANGED_EVENT, onChanged);
-      try {
-        for (const off of chatUnsubsById.values()) off?.();
-      } catch {}
-    };
-  }, [taskId, reloadChats]);
-
-  return mainBusy || chatBusy;
-}
diff --git a/src/renderer/hooks/useTaskChanges.ts b/src/renderer/hooks/useTaskChanges.ts
deleted file mode 100644
index 7551e425c4..0000000000
--- a/src/renderer/hooks/useTaskChanges.ts
+++ /dev/null
@@ -1,288 +0,0 @@
-import { useCallback, useEffect, useRef, useState } from 'react';
-import { getCachedGitStatus } from '@/lib/gitStatusCache';
-
-export interface TaskChange {
-  path: string;
-  status: string;
-  additions: number;
-  deletions: number;
-  diff?: string;
-}
-
-export interface TaskChanges {
-  taskId: string;
-  changes: TaskChange[];
-  totalAdditions: number;
-  totalDeletions: number;
-  isLoading: boolean;
-  error?: string;
-}
-
-interface UseTaskChangesOptions {
-  isActive?: boolean;
-  idleIntervalMs?: number;
-}
-
-export function useTaskChanges(
-  taskPath: string,
-  taskId: string,
-  options: UseTaskChangesOptions = {}
-) {
-  const [changes, setChanges] = useState<TaskChanges>({
-    taskId,
-    changes: [],
-    totalAdditions: 0,
-    totalDeletions: 0,
-    isLoading: true,
-  });
-  const [isDocumentVisible, setIsDocumentVisible] = useState(() => {
-    if (typeof document === 'undefined') return true;
-    return document.visibilityState === 'visible';
-  });
-  const [isWindowFocused, setIsWindowFocused] = useState(() => {
-    if (typeof document === 'undefined') return true;
-    return document.hasFocus();
-  });
-
-  const { isActive = true, idleIntervalMs = 60000 } = options;
-  const taskPathRef = useRef(taskPath);
-  const inFlightRef = useRef(false);
-  const hasLoadedRef = useRef(false);
-  const shouldPollRef = useRef(false);
-  const idleHandleRef = useRef<number | null>(null);
-  const idleHandleModeRef = useRef<'idle' | 'timeout' | null>(null);
-  const mountedRef = useRef(true);
-  const pendingRefreshRef = useRef(false);
-  const pendingInitialLoadRef = useRef(false);
-
-  useEffect(() => {
-    mountedRef.current = true;
-    return () => {
-      mountedRef.current = false;
-    };
-  }, []);
-
-  useEffect(() => {
-    taskPathRef.current = taskPath;
-    hasLoadedRef.current = false;
-  }, [taskPath]);
-
-  useEffect(() => {
-    if (typeof document === 'undefined' || typeof window === 'undefined') return;
-
-    const handleVisibility = () => {
-      setIsDocumentVisible(document.visibilityState === 'visible');
-    };
-    const handleFocus = () => setIsWindowFocused(true);
-    const handleBlur = () => setIsWindowFocused(false);
-
-    document.addEventListener('visibilitychange', handleVisibility);
-    window.addEventListener('focus', handleFocus);
-    window.addEventListener('blur', handleBlur);
-
-    return () => {
-      document.removeEventListener('visibilitychange', handleVisibility);
-      window.removeEventListener('focus', handleFocus);
-      window.removeEventListener('blur', handleBlur);
-    };
-  }, []);
-
-  const queueRefresh = useCallback((shouldSetLoading: boolean) => {
-    pendingRefreshRef.current = true;
-    if (shouldSetLoading) {
-      pendingInitialLoadRef.current = true;
-      if (mountedRef.current) {
-        setChanges((prev) => ({ ...prev, isLoading: true, error: undefined }));
-      }
-    }
-  }, []);
-
-  const fetchChanges = useCallback(
-    async (isInitialLoad = false, options?: { force?: boolean }) => {
-      const currentPath = taskPathRef.current;
-      if (!currentPath) return;
-
-      if (inFlightRef.current) {
-        if (options?.force) {
-          queueRefresh(isInitialLoad);
-        }
-        return;
-      }
-
-      inFlightRef.current = true;
-      try {
-        if (isInitialLoad) {
-          setChanges((prev) => ({ ...prev, isLoading: true, error: undefined }));
-        }
-
-        const requestPath = currentPath;
-        const result = await getCachedGitStatus(requestPath, { force: options?.force });
-
-        if (!mountedRef.current) return;
-
-        if (requestPath !== taskPathRef.current) {
-          queueRefresh(true);
-          return;
-        }
-
-        if (result?.success && result.changes) {
-          const filtered = result.changes.filter(
-            (c) => !c.path.startsWith('.emdash/') && c.path !== 'PLANNING.md'
-          );
-          const totalAdditions = filtered.reduce((sum, change) => sum + (change.additions || 0), 0);
-          const totalDeletions = filtered.reduce((sum, change) => sum + (change.deletions || 0), 0);
-
-          setChanges({
-            taskId,
-            changes: filtered,
-            totalAdditions,
-            totalDeletions,
-            isLoading: false,
-          });
-        } else {
-          setChanges({
-            taskId,
-            changes: [],
-            totalAdditions: 0,
-            totalDeletions: 0,
-            isLoading: false,
-            error: result?.error || 'Failed to fetch changes',
-          });
-        }
-      } catch (error) {
-        if (!mountedRef.current) return;
-        if (currentPath !== taskPathRef.current) {
-          queueRefresh(true);
-          return;
-        }
-        setChanges({
-          taskId,
-          changes: [],
-          totalAdditions: 0,
-          totalDeletions: 0,
-          isLoading: false,
-          error: error instanceof Error ? error.message : 'Unknown error',
-        });
-      } finally {
-        const isCurrentPath = currentPath === taskPathRef.current;
-        if (isCurrentPath) {
-          hasLoadedRef.current = true;
-        }
-        inFlightRef.current = false;
-
-        if (pendingRefreshRef.current) {
-          const nextInitialLoad = pendingInitialLoadRef.current;
-          pendingRefreshRef.current = false;
-          pendingInitialLoadRef.current = false;
-          void fetchChanges(nextInitialLoad, { force: true });
-        }
-      }
-    },
-    [taskId, queueRefresh]
-  );
-
-  const clearIdleHandle = useCallback(() => {
-    if (idleHandleRef.current === null) return;
-    if (idleHandleModeRef.current === 'idle') {
-      const cancelIdle = (window as any).cancelIdleCallback as ((id: number) => void) | undefined;
-      cancelIdle?.(idleHandleRef.current);
-    } else {
-      clearTimeout(idleHandleRef.current);
-    }
-    idleHandleRef.current = null;
-    idleHandleModeRef.current = null;
-  }, []);
-
-  const scheduleIdleRefresh = useCallback(() => {
-    if (!shouldPollRef.current) return;
-    clearIdleHandle();
-
-    const run = () => {
-      if (!shouldPollRef.current) return;
-      void fetchChanges(false);
-      scheduleIdleRefresh();
-    };
-
-    const requestIdle = (window as any).requestIdleCallback as
-      | ((cb: () => void, options?: { timeout: number }) => number)
-      | undefined;
-
-    if (requestIdle) {
-      idleHandleModeRef.current = 'idle';
-      idleHandleRef.current = requestIdle(run, { timeout: idleIntervalMs });
-    } else {
-      idleHandleModeRef.current = 'timeout';
-      idleHandleRef.current = window.setTimeout(run, idleIntervalMs);
-    }
-  }, [clearIdleHandle, fetchChanges, idleIntervalMs]);
-
-  const shouldPoll = Boolean(taskPath) && isActive && isDocumentVisible && isWindowFocused;
-
-  useEffect(() => {
-    shouldPollRef.current = shouldPoll;
-  }, [shouldPoll]);
-
-  useEffect(() => {
-    if (!taskPath || !shouldPoll) {
-      clearIdleHandle();
-      return;
-    }
-
-    void fetchChanges(!hasLoadedRef.current);
-    scheduleIdleRefresh();
-
-    return () => {
-      clearIdleHandle();
-    };
-  }, [taskPath, shouldPoll, fetchChanges, scheduleIdleRefresh, clearIdleHandle]);
-
-  useEffect(() => {
-    if (!taskPath) return;
-    const api = window.electronAPI;
-    let off: (() => void) | undefined;
-    let watchId: string | undefined;
-    let disposed = false;
-
-    const watchPromise = api.watchGitStatus
-      ? api.watchGitStatus(taskPath)
-      : Promise.resolve({ success: false });
-
-    watchPromise
-      .then((res: { success?: boolean; watchId?: string }) => {
-        if (disposed) {
-          if (res?.success && res.watchId && api.unwatchGitStatus) {
-            api.unwatchGitStatus(taskPath, res.watchId).catch(() => {});
-          }
-          return;
-        }
-        if (!res?.success) {
-          return;
-        }
-        watchId = res.watchId;
-        if (api.onGitStatusChanged) {
-          off = api.onGitStatusChanged((event) => {
-            if (event?.taskPath !== taskPath) return;
-            if (!shouldPollRef.current) return;
-            if (event?.error === 'watcher-error') {
-              void fetchChanges(false, { force: true });
-              return;
-            }
-            void fetchChanges(false, { force: true });
-          });
-        }
-      })
-      .catch(() => {});
-
-    return () => {
-      disposed = true;
-      off?.();
-      if (api.unwatchGitStatus && watchId) {
-        api.unwatchGitStatus(taskPath, watchId).catch(() => {});
-      }
-    };
-  }, [taskPath, fetchChanges]);
-
-  return {
-    ...changes,
-  };
-}
diff --git a/src/renderer/hooks/useTaskCommentCounts.ts b/src/renderer/hooks/useTaskCommentCounts.ts
deleted file mode 100644
index 9a8df97ad7..0000000000
--- a/src/renderer/hooks/useTaskCommentCounts.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { useTaskComments } from './useLineComments';
-
-/**
- * Hook to fetch unsent comment counts per file for a task.
- */
-export function useTaskCommentCounts(taskId: string) {
-  const { countsByFile, refresh } = useTaskComments(taskId);
-  return { counts: countsByFile, refreshCounts: refresh };
-}
diff --git a/src/renderer/hooks/useTaskManagement.ts b/src/renderer/hooks/useTaskManagement.ts
deleted file mode 100644
index 5b42131f3f..0000000000
--- a/src/renderer/hooks/useTaskManagement.ts
+++ /dev/null
@@ -1,1003 +0,0 @@
-import { useState, useMemo, useCallback, useRef, useEffect } from 'react';
-import { useQueries, useMutation, useQueryClient } from '@tanstack/react-query';
-import { TERMINAL_PROVIDER_IDS } from '../constants/agents';
-import { makePtyId } from '@shared/ptyId';
-import type { ProviderId } from '@shared/providers/registry';
-import { saveActiveIds, getStoredActiveIds } from '../constants/layout';
-import { getAgentForTask } from '../lib/getAgentForTask';
-import { disposeTaskTerminals } from '../lib/taskTerminalsStore';
-import { terminalSessionRegistry } from '../terminal/SessionRegistry';
-import type { Agent } from '../types';
-import type { Project, Task } from '../types/app';
-import type { GitHubIssueLink, AgentRun } from '../types/chat';
-import type { LinearIssueSummary } from '../types/linear';
-import type { GitHubIssueSummary } from '../types/github';
-import type { JiraIssueSummary } from '../types/jira';
-import { rpc } from '../lib/rpc';
-import { createTask } from '../lib/taskCreationService';
-import { useProjectManagementContext } from '../contexts/ProjectManagementProvider';
-import { useToast } from './use-toast';
-import { useModalContext } from '../contexts/ModalProvider';
-
-const LIFECYCLE_TEARDOWN_TIMEOUT_MS = 15000;
-type LifecycleTarget = { taskId: string; taskPath: string; label: string };
-
-const getLifecycleTaskIds = (task: Task): string[] => {
-  const ids = new Set<string>([task.id]);
-  const variants = task.metadata?.multiAgent?.variants || [];
-  for (const variant of variants) {
-    if (variant?.worktreeId) {
-      ids.add(variant.worktreeId);
-    }
-  }
-  return [...ids];
-};
-
-const getLifecycleTargets = (task: Task): LifecycleTarget[] => {
-  const variants = task.metadata?.multiAgent?.variants || [];
-  if (variants.length > 0) {
-    const validVariantTargets = variants
-      .filter((variant) => variant?.worktreeId && variant?.path)
-      .map((variant) => ({
-        taskId: variant.worktreeId,
-        taskPath: variant.path,
-        label: variant.name || variant.worktreeId,
-      }));
-    if (validVariantTargets.length > 0) {
-      return validVariantTargets;
-    }
-  }
-
-  return [{ taskId: task.id, taskPath: task.path, label: task.name }];
-};
-
-const runSetupForTask = async (task: Task, projectPath: string): Promise<void> => {
-  const targets = getLifecycleTargets(task);
-  await Promise.allSettled(
-    targets.map((target) =>
-      window.electronAPI.lifecycleSetup({
-        taskId: target.taskId,
-        taskPath: target.taskPath,
-        projectPath,
-        taskName: target.label,
-      })
-    )
-  );
-};
-
-const buildLinkedGithubIssueMap = (tasks?: Task[] | null): Map<number, GitHubIssueLink> => {
-  const linked = new Map<number, GitHubIssueLink>();
-  if (!tasks?.length) return linked;
-  for (const task of tasks) {
-    const issueNumber = task.metadata?.githubIssue?.number;
-    if (typeof issueNumber !== 'number' || linked.has(issueNumber)) continue;
-    linked.set(issueNumber, {
-      number: issueNumber,
-      taskId: task.id,
-      taskName: task.name,
-    });
-  }
-  return linked;
-};
-
-const cleanupPtyResources = async (task: Task): Promise<void> => {
-  try {
-    const variants = task.metadata?.multiAgent?.variants || [];
-    const mainSessionIds: string[] = [];
-    if (variants.length > 0) {
-      for (const v of variants) {
-        const id = `${v.worktreeId}-main`;
-        mainSessionIds.push(id);
-        try {
-          window.electronAPI.ptyKill?.(id);
-        } catch {}
-      }
-    } else {
-      for (const provider of TERMINAL_PROVIDER_IDS) {
-        const id = makePtyId(provider, 'main', task.id);
-        mainSessionIds.push(id);
-        try {
-          window.electronAPI.ptyKill?.(id);
-        } catch {}
-      }
-    }
-
-    const chatSessionIds: string[] = [];
-    try {
-      const conversations = await rpc.db.getConversations(task.id);
-      for (const conv of conversations) {
-        if (!conv.isMain && conv.provider) {
-          const chatId = makePtyId(conv.provider as ProviderId, 'chat', conv.id);
-          chatSessionIds.push(chatId);
-          try {
-            window.electronAPI.ptyKill?.(chatId);
-          } catch {}
-        }
-      }
-    } catch {}
-
-    const sessionIds = [...mainSessionIds, ...chatSessionIds];
-    await Promise.allSettled(
-      sessionIds.map(async (sessionId) => {
-        try {
-          terminalSessionRegistry.dispose(sessionId);
-        } catch {}
-        try {
-          await window.electronAPI.ptyClearSnapshot({ id: sessionId });
-        } catch {}
-      })
-    );
-
-    const variantPaths = (task.metadata?.multiAgent?.variants || []).map((v) => v.path);
-    const pathsToClean = variantPaths.length > 0 ? variantPaths : [task.path];
-    for (const path of pathsToClean) {
-      disposeTaskTerminals(`${task.id}::${path}`);
-      if (task.useWorktree !== false) {
-        disposeTaskTerminals(`global::${path}`);
-      }
-    }
-    disposeTaskTerminals(task.id);
-  } catch (err) {
-    const { log } = await import('../lib/logger');
-    log.error('Error cleaning up PTY resources:', err as any);
-  }
-};
-
-export function useTaskManagement() {
-  const {
-    projects,
-    selectedProject,
-    setSelectedProject,
-    setShowHomeView,
-    setShowSkillsView,
-    setShowEditorMode,
-    setShowKanban,
-    activateProjectView,
-    resetTaskTrigger,
-    autoOpenTaskModalTrigger,
-  } = useProjectManagementContext();
-
-  const { toast } = useToast();
-  const { showModal } = useModalContext();
-  const queryClient = useQueryClient();
-
-  // ---------------------------------------------------------------------------
-  // Task queries — one per project via useQueries
-  // ---------------------------------------------------------------------------
-  const taskResults = useQueries({
-    queries: projects.map((project) => ({
-      queryKey: ['tasks', project.id],
-      queryFn: () => rpc.db.getTasks(project.id) as Promise<Task[]>,
-      enabled: !!project.id,
-      staleTime: Infinity,
-    })),
-  });
-
-  const tasksByProjectId = useMemo(() => {
-    const map: Record<string, Task[]> = {};
-    projects.forEach((p, i) => {
-      map[p.id] = taskResults[i]?.data ?? [];
-    });
-    return map;
-  }, [projects, taskResults]);
-
-  const archivedTaskResults = useQueries({
-    queries: projects.map((project) => ({
-      queryKey: ['archivedTasks', project.id],
-      queryFn: () => rpc.db.getArchivedTasks(project.id) as Promise<Task[]>,
-      enabled: !!project.id,
-      staleTime: Infinity,
-    })),
-  });
-
-  const archivedTasksByProjectId = useMemo(() => {
-    const map: Record<string, Task[]> = {};
-    projects.forEach((p, i) => {
-      map[p.id] = archivedTaskResults[i]?.data ?? [];
-    });
-    return map;
-  }, [projects, archivedTaskResults]);
-
-  const allTasks = useMemo(
-    () =>
-      projects.flatMap((p) => (tasksByProjectId[p.id] ?? []).map((task) => ({ task, project: p }))),
-    [projects, tasksByProjectId]
-  );
-
-  const linkedGithubIssueMap = useMemo(
-    () => buildLinkedGithubIssueMap(selectedProject ? tasksByProjectId[selectedProject.id] : null),
-    [selectedProject, tasksByProjectId]
-  );
-
-  // ---------------------------------------------------------------------------
-  // Local UI state
-  // ---------------------------------------------------------------------------
-  const [activeTask, setActiveTask] = useState<Task | null>(null);
-  const [activeTaskAgent, setActiveTaskAgent] = useState<Agent | null>(null);
-  const [isCreatingTask, setIsCreatingTask] = useState(false);
-  const deletingTaskIdsRef = useRef<Set<string>>(new Set());
-  const restoringTaskIdsRef = useRef<Set<string>>(new Set());
-  const archivingTaskIdsRef = useRef<Set<string>>(new Set());
-  const openTaskModalImplRef = useRef<() => void>(() => {});
-  const openTaskModal = useCallback(() => openTaskModalImplRef.current(), []);
-
-  // Reset active task when project management signals a navigation away
-  useEffect(() => {
-    if (resetTaskTrigger > 0) {
-      setActiveTask(null);
-      setActiveTaskAgent(null);
-    }
-  }, [resetTaskTrigger]);
-
-  // ---------------------------------------------------------------------------
-  // Cache helpers
-  // ---------------------------------------------------------------------------
-  const updateTaskCache = useCallback(
-    (projectId: string, updater: (old: Task[]) => Task[]) => {
-      queryClient.setQueryData<Task[]>(['tasks', projectId], (old = []) => updater(old));
-    },
-    [queryClient]
-  );
-
-  const removeTaskFromCache = useCallback(
-    (projectId: string, taskId: string, wasActive: boolean) => {
-      updateTaskCache(projectId, (old) => old.filter((t) => t.id !== taskId));
-      const stored = getStoredActiveIds();
-      if (stored.taskId === taskId) {
-        saveActiveIds(stored.projectId, null);
-      }
-      if (wasActive) {
-        setActiveTask(null);
-        setActiveTaskAgent(null);
-      }
-    },
-    [updateTaskCache]
-  );
-
-  // ---------------------------------------------------------------------------
-  // Lifecycle helpers
-  // ---------------------------------------------------------------------------
-  const runLifecycleTeardownBestEffort = async (
-    targetProject: Project,
-    task: Task,
-    action: 'archive' | 'delete',
-    options?: { silent?: boolean }
-  ): Promise<void> => {
-    const continueLabel = action === 'archive' ? 'archiving' : 'deletion';
-    const lifecycleTargets = getLifecycleTargets(task);
-    const issues: string[] = [];
-
-    await Promise.allSettled(
-      lifecycleTargets.map((target) =>
-        window.electronAPI.lifecycleRunStop({ taskId: target.taskId })
-      )
-    );
-
-    for (const target of lifecycleTargets) {
-      try {
-        const teardownPromise = window.electronAPI.lifecycleTeardown({
-          taskId: target.taskId,
-          taskPath: target.taskPath,
-          projectPath: targetProject.path,
-          taskName: target.label,
-        });
-        const timeoutPromise = new Promise<'timeout'>((resolve) => {
-          window.setTimeout(() => resolve('timeout'), LIFECYCLE_TEARDOWN_TIMEOUT_MS);
-        });
-        const result = await Promise.race([teardownPromise, timeoutPromise]);
-
-        if (result === 'timeout') {
-          issues.push(`${target.label}: timeout`);
-          continue;
-        }
-        if (!result?.success && !result?.skipped) {
-          issues.push(`${target.label}: ${result?.error || 'teardown script failed'}`);
-        }
-      } catch (error) {
-        const message = error instanceof Error ? error.message : String(error);
-        issues.push(`${target.label}: ${message}`);
-      }
-    }
-
-    if (issues.length > 0) {
-      const { log } = await import('../lib/logger');
-      log.warn(
-        `Lifecycle teardown issues for "${task.name}"; continuing ${continueLabel}.`,
-        issues.join(' | ')
-      );
-      if (!options?.silent) {
-        toast({
-          title: 'Teardown issues',
-          description: `Continuing ${continueLabel} (${issues.length} issue${issues.length === 1 ? '' : 's'}).`,
-        });
-      }
-    }
-  };
-
-  // ---------------------------------------------------------------------------
-  // Navigation helpers
-  // ---------------------------------------------------------------------------
-  const handleSelectTask = (task: Task) => {
-    const taskProject = projects.find((project) => project.id === task.projectId);
-    const isProjectSwitch = !selectedProject || selectedProject.id !== task.projectId;
-    if (isProjectSwitch) {
-      setShowEditorMode(false);
-    }
-    if (taskProject && selectedProject?.id !== taskProject.id) {
-      setSelectedProject(taskProject);
-    }
-    setShowHomeView(false);
-    setShowSkillsView(false);
-    setShowKanban(false);
-    setActiveTask(task);
-    setActiveTaskAgent(getAgentForTask(task));
-    saveActiveIds(task.projectId, task.id);
-  };
-
-  const handleNextTask = useCallback(() => {
-    if (allTasks.length === 0) return;
-    const currentIndex = activeTask
-      ? allTasks.findIndex((t: { task: Task; project: Project }) => t.task.id === activeTask.id)
-      : -1;
-    const nextIndex = (currentIndex + 1) % allTasks.length;
-    const { task, project } = allTasks[nextIndex];
-    if (!selectedProject || selectedProject.id !== project.id) {
-      setShowEditorMode(false);
-      setShowKanban(false);
-    }
-    setSelectedProject(project);
-    setShowHomeView(false);
-    setShowSkillsView(false);
-    setActiveTask(task);
-    setActiveTaskAgent(getAgentForTask(task));
-    saveActiveIds(project.id, task.id);
-  }, [allTasks, activeTask, selectedProject]);
-
-  const handlePrevTask = useCallback(() => {
-    if (allTasks.length === 0) return;
-    const currentIndex = activeTask
-      ? allTasks.findIndex((t: { task: Task; project: Project }) => t.task.id === activeTask.id)
-      : -1;
-    const prevIndex = currentIndex <= 0 ? allTasks.length - 1 : currentIndex - 1;
-    const { task, project } = allTasks[prevIndex];
-    if (!selectedProject || selectedProject.id !== project.id) {
-      setShowEditorMode(false);
-      setShowKanban(false);
-    }
-    setSelectedProject(project);
-    setShowHomeView(false);
-    setShowSkillsView(false);
-    setActiveTask(task);
-    setActiveTaskAgent(getAgentForTask(task));
-    saveActiveIds(project.id, task.id);
-  }, [allTasks, activeTask, selectedProject]);
-
-  const handleNewTask = useCallback(() => {
-    if (selectedProject) {
-      openTaskModal();
-    }
-  }, [selectedProject, openTaskModal]);
-
-  const handleStartCreateTaskFromSidebar = useCallback(
-    (project: Project) => {
-      const targetProject = projects.find((p) => p.id === project.id) || project;
-      activateProjectView(targetProject);
-      openTaskModal();
-    },
-    [activateProjectView, projects, openTaskModal]
-  );
-
-  // ---------------------------------------------------------------------------
-  // Delete task mutation
-  // ---------------------------------------------------------------------------
-  const deleteTaskMutation = useMutation({
-    mutationFn: async ({
-      project,
-      task,
-      options,
-    }: {
-      project: Project;
-      task: Task;
-      options?: { silent?: boolean };
-    }) => {
-      await runLifecycleTeardownBestEffort(project, task, 'delete', options);
-
-      try {
-        const { initialPromptSentKey } = await import('../lib/keys');
-        try {
-          localStorage.removeItem(initialPromptSentKey(task.id));
-        } catch {}
-        try {
-          for (const p of TERMINAL_PROVIDER_IDS) {
-            localStorage.removeItem(initialPromptSentKey(task.id, p));
-          }
-        } catch {}
-      } catch {}
-
-      const variants = task.metadata?.multiAgent?.variants || [];
-      const mainSessionIds: string[] = [];
-      if (variants.length > 0) {
-        for (const v of variants) {
-          const id = `${v.worktreeId}-main`;
-          mainSessionIds.push(id);
-          try {
-            window.electronAPI.ptyKill?.(id);
-          } catch {}
-        }
-      } else {
-        for (const provider of TERMINAL_PROVIDER_IDS) {
-          const id = makePtyId(provider, 'main', task.id);
-          mainSessionIds.push(id);
-          try {
-            window.electronAPI.ptyKill?.(id);
-          } catch {}
-        }
-      }
-
-      const chatSessionIds: string[] = [];
-      try {
-        const conversations = await rpc.db.getConversations(task.id);
-        for (const conv of conversations) {
-          if (!conv.isMain && conv.provider) {
-            const chatId = makePtyId(conv.provider as ProviderId, 'chat', conv.id);
-            chatSessionIds.push(chatId);
-            try {
-              window.electronAPI.ptyKill?.(chatId);
-            } catch {}
-          }
-        }
-      } catch {}
-
-      const sessionIds = [...mainSessionIds, ...chatSessionIds];
-      await Promise.allSettled(
-        sessionIds.map(async (sessionId) => {
-          try {
-            terminalSessionRegistry.dispose(sessionId);
-          } catch {}
-          try {
-            await window.electronAPI.ptyClearSnapshot({ id: sessionId });
-          } catch {}
-        })
-      );
-
-      const variantPaths = (task.metadata?.multiAgent?.variants || []).map((v) => v.path);
-      const pathsToClean = variantPaths.length > 0 ? variantPaths : [task.path];
-      for (const path of pathsToClean) {
-        disposeTaskTerminals(`${task.id}::${path}`);
-        if (task.useWorktree !== false) {
-          disposeTaskTerminals(`global::${path}`);
-        }
-      }
-      disposeTaskTerminals(task.id);
-
-      const shouldRemoveWorktree = task.useWorktree !== false;
-      const promises: Promise<any>[] = [rpc.db.deleteTask(task.id)];
-
-      if (shouldRemoveWorktree) {
-        if (task.path === project.path) {
-          console.warn(
-            `Task "${task.name}" appears to be running on main repo, skipping worktree removal`
-          );
-        } else {
-          promises.unshift(
-            window.electronAPI.worktreeRemove({
-              projectPath: project.path,
-              worktreeId: task.id,
-              worktreePath: task.path,
-              branch: task.branch,
-              taskName: task.name,
-            })
-          );
-        }
-      }
-
-      const results = await Promise.allSettled(promises);
-
-      if (shouldRemoveWorktree) {
-        const removeResult = results[0];
-        if (removeResult.status !== 'fulfilled' || !removeResult.value?.success) {
-          const errorMsg =
-            removeResult.status === 'fulfilled'
-              ? removeResult.value?.error || 'Failed to remove worktree'
-              : removeResult.reason?.message || String(removeResult.reason);
-          throw new Error(errorMsg);
-        }
-      }
-
-      const deleteResult = shouldRemoveWorktree ? results[1] : results[0];
-      if (deleteResult.status !== 'fulfilled') {
-        throw new Error(
-          deleteResult.reason?.message || String(deleteResult.reason) || 'Failed to delete task'
-        );
-      }
-
-      for (const lifecycleTaskId of getLifecycleTaskIds(task)) {
-        try {
-          await window.electronAPI.lifecycleClearTask({ taskId: lifecycleTaskId });
-        } catch {}
-      }
-
-      void import('../lib/telemetryClient').then(({ captureTelemetry }) => {
-        captureTelemetry('task_deleted');
-      });
-    },
-    onMutate: ({ project, task }) => {
-      if (deletingTaskIdsRef.current.has(task.id)) return { blocked: true };
-      deletingTaskIdsRef.current.add(task.id);
-      const wasActive = activeTask?.id === task.id;
-      removeTaskFromCache(project.id, task.id, wasActive);
-      return { task, wasActive, blocked: false };
-    },
-    onError: async (_err, { project, task }, context) => {
-      if (context?.blocked) return;
-      deletingTaskIdsRef.current.delete(task.id);
-      const { log } = await import('../lib/logger');
-      log.error('Failed to delete task:', _err as any);
-      toast({
-        title: 'Error',
-        description:
-          _err instanceof Error
-            ? _err.message
-            : 'Could not delete task. Check the console for details.',
-        variant: 'destructive',
-      });
-      // Rollback: refresh from DB
-      queryClient.invalidateQueries({ queryKey: ['tasks', project.id] });
-      if (context?.wasActive && context.task) handleSelectTask(context.task);
-    },
-    onSuccess: (_, { project, task }, context) => {
-      if (context?.blocked) return;
-      deletingTaskIdsRef.current.delete(task.id);
-      queryClient.invalidateQueries({ queryKey: ['tasks', project.id] });
-      queryClient.invalidateQueries({ queryKey: ['archivedTasks', project.id] });
-    },
-  });
-
-  const handleDeleteTask = useCallback(
-    async (
-      targetProject: Project,
-      task: Task,
-      options?: { silent?: boolean }
-    ): Promise<boolean> => {
-      if (deletingTaskIdsRef.current.has(task.id)) {
-        toast({
-          title: 'Deletion in progress',
-          description: `"${task.name}" is already being removed.`,
-        });
-        return false;
-      }
-      try {
-        await deleteTaskMutation.mutateAsync({ project: targetProject, task, options });
-        return true;
-      } catch {
-        return false;
-      }
-    },
-    [deleteTaskMutation, toast]
-  );
-
-  // ---------------------------------------------------------------------------
-  // Archive task mutation
-  // ---------------------------------------------------------------------------
-  const archiveTaskMutation = useMutation({
-    mutationFn: async ({
-      project,
-      task,
-      options,
-    }: {
-      project: Project;
-      task: Task;
-      options?: { silent?: boolean };
-    }) => {
-      // PTY cleanup in background — don't block the UI
-      void cleanupPtyResources(task);
-
-      await runLifecycleTeardownBestEffort(project, task, 'archive', options);
-      await rpc.db.archiveTask(task.id);
-
-      for (const lifecycleTaskId of getLifecycleTaskIds(task)) {
-        try {
-          await window.electronAPI.lifecycleClearTask({ taskId: lifecycleTaskId });
-        } catch {}
-      }
-
-      void import('../lib/telemetryClient').then(({ captureTelemetry }) => {
-        captureTelemetry('task_archived');
-      });
-    },
-    onMutate: ({ project, task }) => {
-      if (archivingTaskIdsRef.current.has(task.id)) return { blocked: true };
-      archivingTaskIdsRef.current.add(task.id);
-      const wasActive = activeTask?.id === task.id;
-      removeTaskFromCache(project.id, task.id, wasActive);
-      return { task, wasActive, blocked: false };
-    },
-    onError: async (_err, { project, task }, context) => {
-      if (context?.blocked) return;
-      archivingTaskIdsRef.current.delete(task.id);
-      const { log } = await import('../lib/logger');
-      log.error('Failed to archive task:', _err as any);
-      // Rollback: refresh from DB
-      queryClient.invalidateQueries({ queryKey: ['tasks', project.id] });
-      if (context?.wasActive && context.task) handleSelectTask(context.task);
-      toast({
-        title: 'Error',
-        description: _err instanceof Error ? _err.message : 'Could not archive task.',
-        variant: 'destructive',
-      });
-    },
-    onSuccess: (_, { project, task, options }, context) => {
-      if (context?.blocked) return;
-      archivingTaskIdsRef.current.delete(task.id);
-      queryClient.invalidateQueries({ queryKey: ['tasks', project.id] });
-      queryClient.invalidateQueries({ queryKey: ['archivedTasks', project.id] });
-      if (!options?.silent) {
-        toast({ title: 'Task archived', description: task.name });
-      }
-    },
-  });
-
-  const handleArchiveTask = useCallback(
-    async (
-      targetProject: Project,
-      task: Task,
-      options?: { silent?: boolean }
-    ): Promise<boolean> => {
-      if (archivingTaskIdsRef.current.has(task.id)) return false;
-      try {
-        await archiveTaskMutation.mutateAsync({ project: targetProject, task, options });
-        return true;
-      } catch {
-        return false;
-      }
-    },
-    [archiveTaskMutation]
-  );
-
-  // ---------------------------------------------------------------------------
-  // Restore task mutation
-  // ---------------------------------------------------------------------------
-  const restoreTaskMutation = useMutation({
-    mutationFn: async ({ project, task }: { project: Project; task: Task }) => {
-      await rpc.db.restoreTask(task.id);
-      const refreshedTasks = (await rpc.db.getTasks(project.id)) as Task[];
-      const restoredTask = refreshedTasks.find((t) => t.id === task.id) ?? {
-        ...task,
-        archivedAt: null,
-      };
-
-      if (restoredTask) {
-        try {
-          await runSetupForTask(restoredTask, project.path);
-        } catch {}
-      }
-
-      void import('../lib/telemetryClient').then(({ captureTelemetry }) => {
-        captureTelemetry('task_restored');
-      });
-
-      return { refreshedTasks, restoredTask };
-    },
-    onMutate: ({ project, task }) => {
-      if (restoringTaskIdsRef.current.has(task.id)) return { blocked: true };
-      restoringTaskIdsRef.current.add(task.id);
-      return { blocked: false };
-    },
-    onError: async (_err, _vars, context) => {
-      if (context?.blocked) return;
-      restoringTaskIdsRef.current.delete(_vars.task.id);
-      const { log } = await import('../lib/logger');
-      log.error('Failed to restore task:', _err as any);
-      toast({
-        title: 'Error',
-        description: _err instanceof Error ? _err.message : 'Could not restore task.',
-        variant: 'destructive',
-      });
-    },
-    onSuccess: ({ refreshedTasks }, { project, task }, context) => {
-      if (context?.blocked) return;
-      restoringTaskIdsRef.current.delete(task.id);
-      queryClient.setQueryData<Task[]>(['tasks', project.id], refreshedTasks);
-      queryClient.invalidateQueries({ queryKey: ['archivedTasks', project.id] });
-      toast({ title: 'Task restored', description: task.name });
-    },
-  });
-
-  const handleRestoreTask = useCallback(
-    async (targetProject: Project, task: Task): Promise<void> => {
-      if (restoringTaskIdsRef.current.has(task.id)) return;
-      try {
-        await restoreTaskMutation.mutateAsync({ project: targetProject, task });
-      } catch {}
-    },
-    [restoreTaskMutation]
-  );
-
-  // ---------------------------------------------------------------------------
-  // Rename task mutation
-  // ---------------------------------------------------------------------------
-  const renameTaskMutation = useMutation({
-    mutationFn: async ({
-      project,
-      task,
-      newName,
-      newBranch,
-    }: {
-      project: Project;
-      task: Task;
-      newName: string;
-      newBranch: string;
-    }) => {
-      const oldBranch = task.branch;
-      let branchRenamed = false;
-
-      if (newBranch !== oldBranch) {
-        const branchResult = await window.electronAPI.renameBranch({
-          repoPath: task.path,
-          oldBranch,
-          newBranch,
-        });
-        if (!branchResult?.success) {
-          throw new Error(branchResult?.error || 'Failed to rename branch');
-        }
-        branchRenamed = true;
-      }
-
-      const updatedMetadata = task.metadata?.nameGenerated
-        ? { ...task.metadata, nameGenerated: null }
-        : task.metadata;
-
-      try {
-        await rpc.db.saveTask({
-          ...task,
-          name: newName,
-          branch: newBranch,
-          metadata: updatedMetadata,
-        });
-      } catch (err) {
-        if (branchRenamed) {
-          try {
-            await window.electronAPI.renameBranch({
-              repoPath: task.path,
-              oldBranch: newBranch,
-              newBranch: oldBranch,
-            });
-          } catch (rollbackErr) {
-            const { log } = await import('../lib/logger');
-            log.error('Failed to rollback branch rename:', rollbackErr as any);
-          }
-        }
-        throw err;
-      }
-    },
-    onMutate: ({ project, task, newName, newBranch }) => {
-      // Optimistic cache update
-      updateTaskCache(project.id, (old) =>
-        old.map((t) => {
-          if (t.id !== task.id) return t;
-          const updated = { ...t, name: newName, branch: newBranch };
-          if (updated.metadata?.nameGenerated) {
-            updated.metadata = { ...updated.metadata, nameGenerated: null };
-          }
-          return updated;
-        })
-      );
-      setActiveTask((prev) => {
-        if (prev?.id !== task.id) return prev;
-        const updated = { ...prev, name: newName, branch: newBranch };
-        if (updated.metadata?.nameGenerated) {
-          updated.metadata = { ...updated.metadata, nameGenerated: null };
-        }
-        return updated;
-      });
-      return { task }; // snapshot for rollback
-    },
-    onError: async (_err, { project, task }, context) => {
-      const { log } = await import('../lib/logger');
-      log.error('Failed to rename task:', _err as any);
-      // Rollback optimistic update
-      queryClient.invalidateQueries({ queryKey: ['tasks', project.id] });
-      setActiveTask((prev) => (prev?.id === task.id ? (context?.task ?? prev) : prev));
-      toast({
-        title: 'Error',
-        description: _err instanceof Error ? _err.message : 'Could not rename task.',
-        variant: 'destructive',
-      });
-    },
-    onSuccess: (_, { project }) => {
-      queryClient.invalidateQueries({ queryKey: ['tasks', project.id] });
-    },
-  });
-
-  const handleRenameTask = useCallback(
-    async (targetProject: Project, task: Task, newName: string) => {
-      const oldBranch = task.branch;
-      let newBranch: string;
-      const branchMatch = oldBranch.match(/^([^/]+)\/(.+)-([a-z0-9]+)$/i);
-      if (branchMatch) {
-        const [, prefix, , hash] = branchMatch;
-        const sluggedName = newName
-          .toLowerCase()
-          .replace(/[^a-z0-9]+/g, '-')
-          .replace(/^-|-$/g, '');
-        newBranch = `${prefix}/${sluggedName}-${hash}`;
-      } else {
-        newBranch = oldBranch;
-      }
-      await renameTaskMutation.mutateAsync({
-        project: targetProject,
-        task,
-        newName,
-        newBranch,
-      });
-    },
-    [renameTaskMutation]
-  );
-
-  // ---------------------------------------------------------------------------
-  // Create task mutation
-  // ---------------------------------------------------------------------------
-  const createTaskMutation = useMutation({
-    mutationFn: (params: Parameters<typeof createTask>[0]) => createTask(params),
-    onMutate: (params) => {
-      const totalRuns = params.agentRuns.reduce((sum, ar) => sum + ar.runs, 0);
-      const isMultiAgent = totalRuns > 1;
-      const primaryAgent = params.agentRuns[0]?.agent || 'claude';
-      const optimisticId = `optimistic-${Date.now()}`;
-
-      const optimisticTask: Task = {
-        id: optimisticId,
-        projectId: params.project.id,
-        name: params.taskName,
-        branch: params.project.gitInfo.branch || 'main',
-        path: params.project.path,
-        status: 'idle',
-        agentId: primaryAgent,
-        metadata: isMultiAgent
-          ? {
-              multiAgent: {
-                enabled: true,
-                maxAgents: 4,
-                agentRuns: params.agentRuns,
-                variants: [],
-                selectedAgent: null,
-              },
-            }
-          : null,
-        useWorktree: params.useWorktree,
-      };
-
-      updateTaskCache(params.project.id, (old) => [optimisticTask, ...old]);
-      setActiveTask(optimisticTask);
-      setActiveTaskAgent(isMultiAgent ? null : getAgentForTask(optimisticTask));
-      saveActiveIds(params.project.id, optimisticId);
-      return { optimisticTask };
-    },
-    onSuccess: ({ task, warning }, params, context) => {
-      const { optimisticTask } = context ?? {};
-      // Replace the optimistic placeholder with the real task
-      updateTaskCache(params.project.id, (old) =>
-        old.map((t) => (t.id === optimisticTask?.id ? task : t))
-      );
-      setActiveTask((current) => (current?.id === optimisticTask?.id ? task : current));
-      setActiveTaskAgent(getAgentForTask(task));
-      saveActiveIds(task.projectId, task.id);
-      queryClient.invalidateQueries({ queryKey: ['tasks', params.project.id] });
-      if (warning) {
-        toast({ title: 'Warning', description: warning });
-      }
-    },
-    onError: (_err, params, context) => {
-      const { optimisticTask } = context ?? {};
-      if (optimisticTask) {
-        updateTaskCache(params.project.id, (old) => old.filter((t) => t.id !== optimisticTask.id));
-        setActiveTask((current) => (current?.id === optimisticTask.id ? null : current));
-      }
-      queryClient.invalidateQueries({ queryKey: ['tasks', params.project.id] });
-      setIsCreatingTask(false);
-      toast({
-        title: 'Error',
-        description:
-          _err instanceof Error ? _err.message : 'Failed to create task. Please check the console.',
-        variant: 'destructive',
-      });
-    },
-  });
-
-  const handleCreateTask = useCallback(
-    (
-      taskName: string,
-      initialPrompt?: string,
-      agentRuns: AgentRun[] = [{ agent: 'claude', runs: 1 }],
-      linkedLinearIssue: LinearIssueSummary | null = null,
-      linkedGithubIssue: GitHubIssueSummary | null = null,
-      linkedJiraIssue: JiraIssueSummary | null = null,
-      autoApprove?: boolean,
-      useWorktree: boolean = true,
-      baseRef?: string,
-      nameGenerated?: boolean
-    ) => {
-      if (!selectedProject) return;
-      setIsCreatingTask(true);
-      createTaskMutation.mutate({
-        project: selectedProject,
-        taskName,
-        initialPrompt,
-        agentRuns,
-        linkedLinearIssue,
-        linkedGithubIssue,
-        linkedJiraIssue,
-        autoApprove,
-        nameGenerated,
-        useWorktree,
-        baseRef,
-      });
-    },
-    [selectedProject, createTaskMutation]
-  );
-
-  const handleTaskInterfaceReady = useCallback(() => {
-    setIsCreatingTask(false);
-  }, []);
-
-  // isCreatingTask safety-net: clear after 30s if task interface never signals ready
-  useEffect(() => {
-    if (!isCreatingTask) return;
-    const timeout = window.setTimeout(() => {
-      setIsCreatingTask(false);
-    }, 30000);
-    return () => {
-      window.clearTimeout(timeout);
-    };
-  }, [isCreatingTask]);
-
-  // Wire up openTaskModal with the latest handleCreateTask
-  openTaskModalImplRef.current = () => {
-    showModal('taskModal', {
-      onSuccess: (result) =>
-        handleCreateTask(
-          result.name,
-          result.initialPrompt,
-          result.agentRuns,
-          result.linkedLinearIssue ?? null,
-          result.linkedGithubIssue ?? null,
-          result.linkedJiraIssue ?? null,
-          result.autoApprove,
-          result.useWorktree,
-          result.baseRef,
-          result.nameGenerated
-        ),
-    });
-  };
-
-  // Auto-open task modal when project management requests it
-  useEffect(() => {
-    if (autoOpenTaskModalTrigger > 0) {
-      openTaskModal();
-    }
-  }, [autoOpenTaskModalTrigger, openTaskModal]);
-
-  return {
-    activeTask,
-    setActiveTask,
-    activeTaskAgent,
-    setActiveTaskAgent,
-    allTasks,
-    tasksByProjectId,
-    archivedTasksByProjectId,
-    linkedGithubIssueMap,
-    isCreatingTask,
-    handleCreateTask,
-    handleTaskInterfaceReady,
-    openTaskModal,
-    handleSelectTask,
-    handleNextTask,
-    handlePrevTask,
-    handleNewTask,
-    handleStartCreateTaskFromSidebar,
-    handleDeleteTask,
-    handleRenameTask,
-    handleArchiveTask,
-    handleRestoreTask,
-  };
-}
diff --git a/src/renderer/hooks/useTaskSettings.ts b/src/renderer/hooks/useTaskSettings.ts
deleted file mode 100644
index 16d030afae..0000000000
--- a/src/renderer/hooks/useTaskSettings.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { useAppSettings } from '@/contexts/AppSettingsProvider';
-
-export type TaskSettingsErrorScope =
-  | 'autoGenerateName'
-  | 'autoApproveByDefault'
-  | 'autoTrustWorktrees'
-  | 'load'
-  | null;
-
-export interface TaskSettingsModel {
-  autoGenerateName: boolean;
-  autoApproveByDefault: boolean;
-  autoTrustWorktrees: boolean;
-  loading: boolean;
-  saving: boolean;
-  error: string | null;
-  errorScope: TaskSettingsErrorScope;
-  updateAutoGenerateName: (next: boolean) => void;
-  updateAutoApproveByDefault: (next: boolean) => void;
-  updateAutoTrustWorktrees: (next: boolean) => void;
-}
-
-export function useTaskSettings(): TaskSettingsModel {
-  const { settings, updateSettings, isLoading: loading, isSaving: saving } = useAppSettings();
-  const tasks = settings?.tasks;
-  return {
-    autoGenerateName: tasks?.autoGenerateName ?? true,
-    autoApproveByDefault: tasks?.autoApproveByDefault ?? false,
-    autoTrustWorktrees: tasks?.autoTrustWorktrees ?? true,
-    loading,
-    saving,
-    error: null,
-    errorScope: null,
-    updateAutoGenerateName: (next) => updateSettings({ tasks: { autoGenerateName: next } }),
-    updateAutoApproveByDefault: (next) => updateSettings({ tasks: { autoApproveByDefault: next } }),
-    updateAutoTrustWorktrees: (next) => updateSettings({ tasks: { autoTrustWorktrees: next } }),
-  };
-}
diff --git a/src/renderer/hooks/useTelemetryConsent.ts b/src/renderer/hooks/useTelemetryConsent.ts
deleted file mode 100644
index b409c2a40a..0000000000
--- a/src/renderer/hooks/useTelemetryConsent.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-import { useCallback, useEffect, useState } from 'react';
-
-type TelemetryState = {
-  prefEnabled: boolean;
-  envDisabled: boolean;
-  hasKeyAndHost: boolean;
-  loading: boolean;
-};
-
-const initialState: TelemetryState = {
-  prefEnabled: true,
-  envDisabled: false,
-  hasKeyAndHost: true,
-  loading: true,
-};
-
-export function useTelemetryConsent() {
-  const [state, setState] = useState<TelemetryState>(initialState);
-
-  const refresh = useCallback(async () => {
-    setState((prev) => ({ ...prev, loading: true }));
-    try {
-      const res = await window.electronAPI.getTelemetryStatus?.();
-      if (res?.success && res.status) {
-        const { envDisabled: envOff, userOptOut, hasKeyAndHost } = res.status;
-        setState({
-          prefEnabled: !Boolean(envOff) && userOptOut !== true,
-          envDisabled: Boolean(envOff),
-          hasKeyAndHost: Boolean(hasKeyAndHost),
-          loading: false,
-        });
-        return;
-      }
-    } catch {
-      // ignore and fall through to loading reset
-    }
-    setState((prev) => ({ ...prev, loading: false }));
-  }, []);
-
-  const setTelemetryEnabled = useCallback(
-    async (enabled: boolean) => {
-      setState((prev) => ({ ...prev, prefEnabled: enabled }));
-      try {
-        await window.electronAPI.setTelemetryEnabled(enabled);
-      } catch {
-        // ignore, refresh will reconcile
-      }
-      await refresh();
-    },
-    [refresh]
-  );
-
-  // eslint-disable-next-line react-hooks/set-state-in-effect
-  useEffect(() => {
-    void refresh();
-  }, [refresh]);
-
-  return {
-    ...state,
-    refresh,
-    setTelemetryEnabled,
-  };
-}
diff --git a/src/renderer/hooks/useUpdateNotifier.tsx b/src/renderer/hooks/useUpdateNotifier.tsx
deleted file mode 100644
index 62c9e738f3..0000000000
--- a/src/renderer/hooks/useUpdateNotifier.tsx
+++ /dev/null
@@ -1,79 +0,0 @@
-import { useEffect } from 'react';
-import { useToast } from './use-toast';
-import { ToastAction } from '@/components/ui/toast';
-
-type Options = {
-  checkOnMount?: boolean;
-  onOpenSettings?: () => void;
-  snoozeHours?: number;
-};
-
-const LAST_NOTIFIED_KEY = 'emdash:update:lastNotified'; // JSON: { version: string, at: number }
-
-export function useUpdateNotifier(opts: Options = {}) {
-  const { checkOnMount = true, onOpenSettings, snoozeHours = 6 } = opts;
-  const { toast } = useToast();
-
-  useEffect(() => {
-    if (typeof window === 'undefined') return;
-
-    const shouldNotify = (availableVersion?: string) => {
-      try {
-        const raw = localStorage.getItem(LAST_NOTIFIED_KEY);
-        if (!raw) return true;
-        const parsed = JSON.parse(raw || '{}') as { version?: string; at?: number };
-        if (availableVersion && parsed.version && parsed.version === availableVersion) {
-          const at = parsed.at || 0;
-          if (Date.now() - at < Math.max(1, snoozeHours) * 3600_000) return false;
-        }
-        return true;
-      } catch {
-        return true;
-      }
-    };
-
-    const rememberNotified = (version?: string) => {
-      try {
-        localStorage.setItem(
-          LAST_NOTIFIED_KEY,
-          JSON.stringify({ version: version || 'unknown', at: Date.now() })
-        );
-      } catch {}
-    };
-
-    const off = window.electronAPI?.onUpdateEvent?.((evt) => {
-      if (evt?.type === 'available') {
-        const v = evt?.payload?.version || evt?.payload?.tag || undefined;
-        if (!shouldNotify(v)) return;
-        try {
-          toast({
-            title: 'Update Available',
-            description: `Version ${v || 'new'} is ready. Open Settings to review and download when convenient.`,
-            action: (
-              <ToastAction altText="Open Settings" onClick={() => onOpenSettings?.()}>
-                Open Settings
-              </ToastAction>
-            ),
-          });
-          rememberNotified(v);
-        } catch {}
-      }
-    });
-
-    if (checkOnMount) {
-      (async () => {
-        try {
-          await window.electronAPI.checkForUpdates?.();
-        } catch {}
-      })();
-    }
-
-    return () => {
-      try {
-        off?.();
-      } catch {}
-    };
-  }, [checkOnMount, onOpenSettings, snoozeHours, toast]);
-}
-
-export default useUpdateNotifier;
diff --git a/src/renderer/hooks/useUpdater.ts b/src/renderer/hooks/useUpdater.ts
deleted file mode 100644
index 001e38181a..0000000000
--- a/src/renderer/hooks/useUpdater.ts
+++ /dev/null
@@ -1,147 +0,0 @@
-import { useEffect, useMemo, useState, useCallback } from 'react';
-
-type DownloadProgress = { percent?: number; transferred?: number; total?: number };
-
-export type UpdateState =
-  | { status: 'idle' }
-  | { status: 'checking' }
-  | { status: 'available'; info?: any }
-  | { status: 'not-available' }
-  | { status: 'downloading'; progress?: DownloadProgress }
-  | { status: 'downloaded' }
-  | { status: 'installing' }
-  | { status: 'error'; message: string };
-
-export const UPDATE_API_UNAVAILABLE_ERROR = 'Update API unavailable' as const;
-export { EMDASH_RELEASES_URL } from '@shared/urls';
-
-export function updaterUnavailableResult(setState: (state: UpdateState) => void): {
-  success: false;
-  error: typeof UPDATE_API_UNAVAILABLE_ERROR;
-} {
-  setState({ status: 'error', message: UPDATE_API_UNAVAILABLE_ERROR });
-  return { success: false, error: UPDATE_API_UNAVAILABLE_ERROR };
-}
-
-export function useUpdater() {
-  const [state, setState] = useState<UpdateState>({ status: 'idle' });
-
-  useEffect(() => {
-    const off = window.electronAPI?.onUpdateEvent?.((evt) => {
-      switch (evt.type) {
-        case 'checking':
-          setState({ status: 'checking' });
-          break;
-        case 'available':
-          setState({ status: 'available', info: evt.payload });
-          break;
-        case 'not-available':
-          setState({ status: 'not-available' });
-          break;
-        case 'downloading':
-          setState({ status: 'downloading' });
-          break;
-        case 'download-progress':
-          setState({ status: 'downloading', progress: evt.payload });
-          break;
-        case 'downloaded':
-          setState({ status: 'downloaded' });
-          break;
-        case 'installing':
-          setState({ status: 'installing' });
-          break;
-        case 'error':
-          setState({ status: 'error', message: evt.payload?.message || 'Update error' });
-          break;
-        default:
-          break;
-      }
-    });
-    return () => {
-      try {
-        off?.();
-      } catch {}
-    };
-  }, []);
-
-  const check = useCallback(async () => {
-    setState({ status: 'checking' });
-    const res: any = await window.electronAPI?.checkForUpdates?.();
-    if (!res) {
-      return updaterUnavailableResult(setState);
-    }
-    if (!res.success) {
-      const hint = res?.devDisabled
-        ? 'Updates are disabled in development.'
-        : res.error || 'Failed to check for updates';
-      setState({ status: 'error', message: hint });
-    }
-    return res;
-  }, []);
-
-  const download = useCallback(async () => {
-    // Don't change state to downloading immediately - wait for backend confirmation
-    const res: any = await window.electronAPI?.downloadUpdate?.();
-    if (!res) {
-      return updaterUnavailableResult(setState);
-    }
-    if (!res.success) {
-      const hint = res?.devDisabled
-        ? 'Cannot download updates in development unless EMDASH_DEV_UPDATES=true is set.'
-        : res.error || 'Failed to download update';
-      setState({ status: 'error', message: hint });
-    }
-    return res;
-  }, []);
-
-  const install = useCallback(async () => {
-    setState({ status: 'installing' });
-    const res: any = await window.electronAPI?.quitAndInstallUpdate?.();
-    if (!res) {
-      return updaterUnavailableResult(setState);
-    }
-    if (!res.success) {
-      setState({ status: 'error', message: res.error || 'Failed to install update' });
-    }
-    return res;
-  }, []);
-
-  const openLatest = useCallback(async () => {
-    const res: any = await window.electronAPI?.openLatestDownload?.();
-    if (!res) {
-      return updaterUnavailableResult(setState);
-    }
-    return res;
-  }, []);
-
-  const startChecking = useCallback(() => {
-    setState({ status: 'checking' });
-  }, []);
-
-  const applyBackendState = useCallback((data: any) => {
-    const s = data?.status;
-    if (s === 'downloaded') setState({ status: 'downloaded' });
-    else if (s === 'downloading')
-      setState({ status: 'downloading', progress: data.downloadProgress });
-    else if (s === 'available') setState({ status: 'available', info: data.updateInfo });
-    else if (s === 'checking') setState({ status: 'checking' });
-    else if (s === 'installing') setState({ status: 'installing' });
-  }, []);
-
-  const progressLabel = useMemo(() => {
-    if (state.status !== 'downloading') return '';
-    const p = state.progress?.percent ?? 0;
-    return `${p.toFixed(0)}%`;
-  }, [state]);
-
-  return {
-    state,
-    check,
-    download,
-    install,
-    openLatest,
-    progressLabel,
-    startChecking,
-    applyBackendState,
-  };
-}
diff --git a/src/types/images.d.ts b/src/renderer/images.d.ts
similarity index 100%
rename from src/types/images.d.ts
rename to src/renderer/images.d.ts
diff --git a/src/renderer/index.css b/src/renderer/index.css
index 0b419cff9b..e4ecd8d596 100644
--- a/src/renderer/index.css
+++ b/src/renderer/index.css
@@ -1,4 +1,115 @@
+@import 'tailwindcss';
+@import 'tw-animate-css';
 @import '@xterm/xterm/css/xterm.css';
+@import 'allotment/dist/style.css';
+
+@custom-variant dark (&:is(.dark *));
+@custom-variant dark-black (&:is(.dark-black *));
+@custom-variant emlight (&:is(.emlight *));
+@custom-variant emdark (&:is(.emdark *));
+
+@theme inline {
+  --font-sans:
+    -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Fira Sans',
+    'Droid Sans', 'Helvetica Neue', sans-serif;
+  --font-mono: Menlo, Monaco, Consolas, 'Liberation Mono', 'Courier New', monospace;
+
+  --text-code: 13px;
+  --text-code--line-height: 1.2;
+  --text-tiny: 11px;
+  --text-tiny--line-height: 1.3;
+  --text-micro: 10px;
+  --text-micro--line-height: 1.2;
+
+  --color-background: var(--background);
+  --color-background-1: var(--background-1);
+  --color-background-2: var(--background-2);
+  --color-background-3: var(--background-3);
+
+  --color-foreground: var(--foreground);
+  --color-foreground-inverse: var(--foreground-inverse);
+  --color-foreground-muted: var(--foreground-muted);
+  --color-foreground-passive: var(--foreground-passive);
+
+  --color-background-secondary: var(--background-secondary);
+  --color-background-secondary-1: var(--background-secondary-1);
+  --color-background-secondary-2: var(--background-secondary-2);
+  --color-background-secondary-3: var(--background-secondary-3);
+
+  --color-foreground-secondary: var(--foreground-secondary);
+  --color-foreground-secondary-muted: var(--foreground-secondary-muted);
+  --color-foreground-secondary-passive: var(--foreground-secondary-passive);
+
+  --color-background-tertiary: var(--background-tertiary);
+  --color-background-tertiary-1: var(--background-tertiary-1);
+  --color-background-tertiary-2: var(--background-tertiary-2);
+  --color-background-tertiary-3: var(--background-tertiary-3);
+
+  --color-foreground-tertiary: var(--foreground-tertiary);
+  --color-foreground-tertiary-muted: var(--foreground-tertiary-muted);
+  --color-foreground-tertiary-passive: var(--foreground-tertiary-passive);
+
+  --color-background-destructive: var(--background-destructive);
+  --color-foreground-destructive: var(--foreground-destructive);
+
+  --color-background-quaternary: var(--background-quaternary);
+  --color-background-quaternary-1: var(--background-quaternary-1);
+  --color-background-quaternary-2: var(--background-quaternary-2);
+
+  --color-background-neutral: var(--background-neutral);
+  --color-foreground-neutral: var(--foreground-neutral);
+
+  --color-primary-button-background: var(--primary-button-background);
+  --color-primary-button-background-hover: var(--primary-button-background-hover);
+  --color-primary-button-foreground: var(--primary-button-foreground);
+  --color-primary-button-border: var(--primary-button-border);
+
+  --color-foreground-diff-added: var(--foreground-diff-added);
+  --color-foreground-diff-modified: var(--foreground-diff-modified);
+  --color-foreground-diff-deleted: var(--foreground-diff-deleted);
+
+  --color-border: var(--border);
+  --color-border-1: var(--border-1);
+  --color-border-2: var(--border-2);
+  --color-border-destructive: var(--border-destructive);
+  --color-border-primary: var(--border-primary);
+
+  --color-status-in-progress: var(--status-in-progress);
+  --color-status-in-review: var(--status-in-review);
+  --color-status-done: var(--status-done);
+  --color-status-todo: var(--status-todo);
+  --color-status-cancelled: var(--status-cancelled);
+
+  --radius-lg: var(--radius);
+  --radius-md: calc(var(--radius) - 2px);
+  --radius-sm: calc(var(--radius) - 4px);
+
+  --animate-accordion-down: accordion-down 0.2s ease-out;
+  --animate-accordion-up: accordion-up 0.2s ease-out;
+
+  @keyframes accordion-down {
+    from {
+      height: 0;
+    }
+    to {
+      height: var(--accordion-panel-height);
+    }
+  }
+
+  @keyframes accordion-up {
+    from {
+      height: var(--accordion-panel-height);
+    }
+    to {
+      height: 0;
+    }
+  }
+}
+
+::selection {
+  background: var(--selection);
+  color: var(--selection-foreground);
+}
 
 /* Hide xterm viewport scrollbars in embedded terminals */
 .xterm .xterm-viewport {
@@ -11,97 +122,197 @@
   height: 0 !important;
 }
 
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
-
 @layer base {
-  :root {
-    --background: 0 0% 100%;
-    --foreground: 0 0% 3.9%;
-    --card: 0 0% 100%;
-    --card-foreground: 0 0% 3.9%;
-    --popover: 0 0% 100%;
-    --popover-foreground: 0 0% 3.9%;
-    --primary: 0 0% 9%;
-    --primary-foreground: 0 0% 98%;
-    --secondary: 0 0% 96.1%;
-    --secondary-foreground: 0 0% 9%;
-    --muted: 0 0% 96.1%;
-    --muted-foreground: 0 0% 45.1%;
-    --accent: 0 0% 96.1%;
-    --accent-foreground: 0 0% 9%;
-    --destructive: 0 84.2% 60.2%;
-    --destructive-foreground: 0 0% 98%;
-    --border: 0 0% 89.8%;
-    --input: 0 0% 89.8%;
-    --ring: 0 0% 3.9%;
+  .emlight {
+    --background: color(display-p3 0.988 0.988 0.988);
+    --background-1: color(display-p3 0.975 0.975 0.975);
+    --background-2: color(display-p3 0.939 0.939 0.939);
+    --background-3: color(display-p3 0.908 0.908 0.908);
+
+    --foreground: color(display-p3 0.125 0.125 0.125);
+    --foreground-inverse: white;
+    --foreground-muted: color(display-p3 0.392 0.392 0.392);
+    --foreground-passive: color(display-p3 0.732 0.732 0.732);
+
+    --background-secondary: var(--background-1);
+    --background-secondary-1: var(--background);
+    --background-secondary-2: color(display-p3 0.88 0.88 0.88);
+    --background-secondary-3: color(display-p3 0.849 0.849 0.849);
+
+    --foreground-secondary: color(display-p3 0.125 0.125 0.125);
+    --foreground-secondary-muted: color(display-p3 0.392 0.392 0.392);
+    --foreground-secondary-passive: color(display-p3 0.732 0.732 0.732);
+
+    --background-tertiary: color(display-p3 0.939 0.939 0.939);
+    --background-tertiary-1: color(display-p3 0.908 0.908 0.908);
+    --background-tertiary-2: color(display-p3 0.88 0.88 0.88);
+    --background-tertiary-3: color(display-p3 0.849 0.849 0.849);
+
+    --foreground-tertiary: color(display-p3 0.125 0.125 0.125);
+    --foreground-tertiary-muted: color(display-p3 0.392 0.392 0.392);
+    --foreground-tertiary-passive: color(display-p3 0.732 0.732 0.732);
+
+    --background-quaternary: var(--background);
+    --background-quaternary-1: var(--background-1);
+    --background-quaternary-2: var(--background-2);
+
+    --background-destructive: color(display-p3 0.995 0.971 0.971);
+    --foreground-destructive: color(display-p3 0.744 0.234 0.222);
+
+    --background-neutral: color(display-p3 0.125 0.125 0.125);
+    --foreground-neutral: color(display-p3 0.988 0.988 0.988);
+
+    --primary-button-background: color(display-p3 0.142 0.229 0.194);
+    --primary-button-background-hover: color(display-p3 0.15 0.5 0.37);
+    --primary-button-foreground: color(display-p3 0.962 0.983 0.969);
+    --primary-button-border: transparent;
+
+    --border: color(display-p3 0.88 0.88 0.88);
+    --border-1: color(display-p3 0.732 0.732 0.732);
+    --border-2: color(display-p3 0.553 0.553 0.553);
+    --border-destructive: color(display-p3 0.872 0.575 0.572);
+    --border-primary: color(display-p3 0.553 0.553 0.553);
+
+    --ring: hsl(0 0% 3.9%);
+    --radius: 0.5rem;
+
+    --selection: color(display-p3 0.709 0.843 0.976);
+    --selection-foreground: color(display-p3 0.102 0.193 0.379);
+
+    --status-in-progress: color(display-p3 0.64 0.4 0);
+    --status-in-review: color(display-p3 0.344 0.598 0.342);
+    --status-done: color(display-p3 0.553 0.553 0.553);
+    --status-todo: color(display-p3 0.553 0.553 0.553);
+    --status-cancelled: color(display-p3 0.553 0.553 0.553);
+
+    /* Monaco editor */
+    --monaco-bg: var(--background);
+    --monaco-fg: var(--foreground);
+    --monaco-error-fg: var(--foreground-destructive);
+
+    --monaco-line-highlight: var(--background-2);
+    --monaco-line-number: var(--foreground-passive);
+    --monaco-gutter: var(--monaco-bg);
+    --monaco-inserted-text-bg: color(display-p3 0.063 0.725 0.506 / 0.251);
+    --monaco-inserted-line-bg: color(display-p3 0.925 0.992 0.961 / 0.502);
+    --monaco-removed-text-bg: color(display-p3 0.957 0.247 0.369 / 0.251);
+    --monaco-removed-line-bg: color(display-p3 1 0.945 0.949 / 0.502);
+    --monaco-unchanged-region-bg: color(display-p3 0.886 0.91 0.941);
+    --monaco-diff-diagonal-fill: var(--background-2);
+    --monaco-selection-bg: var(--selection);
+    --monaco-selection-fg: var(--selection-foreground);
+    --monaco-inactive-selection-bg: color-mix(in srgb, var(--selection) 15.3%, transparent);
+
+    /* xterm terminals */
+    --xterm-bg: var(--background);
+    --xterm-fg: #1f2937;
+    --xterm-cursor: #1e293b;
+    --xterm-cursor-accent: #ffffff;
+    --xterm-selection-bg: rgba(96, 165, 250, 0.3);
+    --xterm-selection-fg: #0f172a;
+    --xterm-bg-mistral: #ffffff;
+
+    --foreground-diff-added: color(display-p3 0.426 0.694 0.426);
+    --foreground-diff-modified: color(display-p3 1 0.77 0.26);
+    --foreground-diff-deleted: color(display-p3 0.83 0.329 0.324);
+  }
+
+  .emdark {
+    --background: color(display-p3 0.067 0.067 0.067);
+    --background-1: color(display-p3 0.098 0.098 0.098);
+    --background-2: color(display-p3 0.135 0.135 0.135);
+    --background-3: color(display-p3 0.163 0.163 0.163);
+
+    --foreground: color(display-p3 0.933 0.933 0.933);
+    --foreground-inverse: color(display-p3 0.067 0.067 0.067);
+    --foreground-muted: color(display-p3 0.706 0.706 0.706);
+    --foreground-passive: color(display-p3 0.431 0.431 0.431);
+
+    --background-secondary: var(--background);
+    --background-secondary-1: var(--background-1);
+    --background-secondary-2: var(--background-2);
+    --background-secondary-3: var(--background-3);
+
+    --foreground-secondary: var(--foreground);
+    --foreground-secondary-muted: var(--foreground-muted);
+    --foreground-secondary-passive: var(--foreground-passive);
+
+    --background-tertiary: var(--background);
+    --background-tertiary-1: var(--background-1);
+    --background-tertiary-2: var(--background-2);
+    --background-tertiary-3: var(--background-3);
+
+    --foreground-tertiary: var(--foreground);
+    --foreground-tertiary-muted: var(--foreground-muted);
+    --foreground-tertiary-passive: var(--foreground-passive);
+
+    --background-quaternary: var(--background-1);
+    --background-quaternary-1: var(--background-2);
+    --background-quaternary-2: var(--background-3);
+
+    --background-destructive: color(display-p3 0.211 0.081 0.099);
+    --background-destructive-1: color(display-p3 0.25 0.102 0.122);
+    --foreground-destructive: color(display-p3 0.83 0.329 0.324);
+    --foreground-destructive-muted: color(display-p3 0.661 0.263 0.26);
+
+    --background-neutral: color(display-p3 0.933 0.933 0.933);
+    --foreground-neutral: color(display-p3 0.067 0.067 0.067);
+
+    --primary-button-background: color(display-p3 0.102 0.228 0.177);
+    --primary-button-background-hover: color(display-p3 0.133 0.279 0.221);
+    --primary-button-foreground: color(display-p3 0.734 0.934 0.838);
+    --primary-button-border: color(display-p3 0.219 0.402 0.335);
+
+    --border: color(display-p3 0.228 0.228 0.228);
+    --border-1: color(display-p3 0.283 0.283 0.283);
+    --border-2: color(display-p3 0.375 0.375 0.375);
+    --border-destructive: color(display-p3 0.659 0.298 0.297);
+    --border-primary: color(display-p3 0.553 0.553 0.553);
+
+    --ring: hsl(0 0% 3.9%);
     --radius: 0.5rem;
-    --chart-1: 12 76% 61%;
-    --chart-2: 173 58% 39%;
-    --chart-3: 197 37% 24%;
-    --chart-4: 43 74% 66%;
-    --chart-5: 27 87% 67%;
-    --selection: 217 91% 60%;
-    --selection-foreground: 0 0% 12%;
-  }
-
-  .dark {
-    --background: 215 28% 17%; /* gray-800: #1f2937 */
-    --foreground: 220 9% 96%; /* gray-100: #f3f4f6 */
-    --card: 215 28% 17%; /* gray-800: #1f2937 */
-    --card-foreground: 220 9% 96%;
-    --popover: 220 24% 21%; /* gray-750: slightly lighter than bg */
-    --popover-foreground: 220 9% 96%;
-    --primary: 220 9% 96%;
-    --primary-foreground: 215 28% 17%;
-    --secondary: 217 23% 27%; /* gray-700: #374151 */
-    --secondary-foreground: 220 9% 96%;
-    --muted: 217 23% 27%; /* gray-700: #374151 */
-    --muted-foreground: 220 9% 70%; /* gray-400: #9ca3af */
-    --accent: 217 23% 27%;
-    --accent-foreground: 220 9% 96%;
-    --destructive: 0 62.8% 50%;
-    --destructive-foreground: 0 0% 98%;
-    --border: 217 17% 32%; /* gray-650: between 700 and 600 */
-    --input: 217 17% 32%;
-    --ring: 220 9% 70%;
-    --chart-1: 220 70% 50%;
-    --chart-2: 160 60% 45%;
-    --chart-3: 30 80% 55%;
-    --chart-4: 280 65% 60%;
-    --chart-5: 340 75% 55%;
-    --selection: 217 92% 80%;
-    --selection-foreground: 0 0% 98%;
-  }
-
-  .dark-black {
-    --background: 0 0% 0%; /* pure black #000000 */
-    --foreground: 0 0% 95%; /* near white #f2f2f2 */
-    --card: 0 0% 4%; /* very dark gray #0a0a0a */
-    --card-foreground: 0 0% 95%;
-    --popover: 0 0% 8%; /* slightly lighter gray #141414 */
-    --popover-foreground: 0 0% 95%;
-    --primary: 0 0% 95%;
-    --primary-foreground: 0 0% 0%;
-    --secondary: 0 0% 12%; /* dark gray #1f1f1f */
-    --secondary-foreground: 0 0% 95%;
-    --muted: 0 0% 15%; /* muted gray #262626 */
-    --muted-foreground: 0 0% 65%; /* lighter muted text #a6a6a6 */
-    --accent: 0 0% 15%;
-    --accent-foreground: 0 0% 95%;
-    --destructive: 0 62.8% 50%;
-    --destructive-foreground: 0 0% 98%;
-    --border: 0 0% 20%; /* border gray #333333 */
-    --input: 0 0% 20%;
-    --ring: 0 0% 60%;
-    --chart-1: 220 70% 50%;
-    --chart-2: 160 60% 45%;
-    --chart-3: 30 80% 55%;
-    --chart-4: 280 65% 60%;
-    --chart-5: 340 75% 55%;
-    --selection: 217 92% 70%;
-    --selection-foreground: 0 0% 95%;
+
+    --selection: color(display-p3 0.709 0.843 0.976);
+    --selection-foreground: color(display-p3 0.102 0.193 0.379);
+
+    --status-in-progress: color(display-p3 0.64 0.4 0);
+    --status-in-review: color(display-p3 0.344 0.598 0.342);
+    --status-done: color(display-p3 0.553 0.553 0.553);
+    --status-todo: color(display-p3 0.553 0.553 0.553);
+    --status-cancelled: color(display-p3 0.553 0.553 0.553);
+
+    /* Monaco editor */
+    --monaco-bg: color(display-p3 0.098 0.098 0.098);
+    --monaco-fg: color(display-p3 0.706 0.706 0.706);
+    --monaco-error-fg: color(display-p3 1 0.592 0.49);
+
+    --monaco-line-highlight: color(display-p3 0.192 0.192 0.192);
+    --monaco-line-number: color(display-p3 0.227 0.227 0.227);
+    --monaco-gutter: var(--monaco-bg);
+    --monaco-inserted-text-bg: color(display-p3 0.145 0.282 0.176);
+    --monaco-inserted-line-bg: color(display-p3 0.106 0.165 0.118);
+    --monaco-inserted-text-border: color(display-p3 0.145 0.282 0.176);
+    --monaco-removed-text-bg: color(display-p3 0.38 0.086 0.137);
+    --monaco-removed-line-bg: color(display-p3 0.231 0.071 0.098);
+    --monaco-removed-text-border: color(display-p3 0.38 0.086 0.137);
+    --monaco-unchanged-region-bg: color(display-p3 0.165 0.165 0.165);
+    --monaco-diff-border: color(display-p3 0.227 0.227 0.227);
+    --monaco-diff-diagonal-fill: color(display-p3 0.165 0.165 0.165);
+    --monaco-selection-bg: color(display-p3 0 0.2 0.384);
+    --monaco-selection-fg: color(display-p3 0.439 0.722 1);
+    --monaco-inactive-selection-bg: color(display-p3 1 1 1 / 0.133);
+
+    /* xterm terminals */
+    --xterm-bg: var(--background-1);
+    --xterm-fg: var(--foreground) --xterm-cursor: #1e293b;
+    --xterm-cursor-accent: color(display-p3 0.484 0.484 0.484);
+    --xterm-selection-bg: color(display-p3 0.033 0.197 0.37);
+    --xterm-selection-fg: color(display-p3 0.49 0.72 1);
+    --xterm-bg-mistral: #ffffff;
+
+    --foreground-diff-added: color(display-p3 0.426 0.694 0.426);
+    --foreground-diff-modified: color(display-p3 1 0.77 0.26);
+    --foreground-diff-deleted: color(display-p3 0.83 0.329 0.324);
   }
 }
 
@@ -109,24 +320,33 @@
   * {
     @apply border-border;
   }
+  html,
+  body {
+    height: 100%;
+    overflow: hidden;
+  }
+  #root {
+    height: 100%;
+    overflow: hidden;
+  }
   body {
     @apply bg-background text-foreground;
   }
 
   ::selection {
-    background-color: hsl(var(--selection) / 0.35);
-    color: hsl(var(--selection-foreground));
+    background-color: color-mix(in srgb, var(--selection) 35%, transparent);
+    color: var(--selection-foreground);
   }
 
   ::-moz-selection {
-    background-color: hsl(var(--selection) / 0.35);
-    color: hsl(var(--selection-foreground));
+    background-color: color-mix(in srgb, var(--selection) 35%, transparent);
+    color: var(--selection-foreground);
   }
 
   /* Scrollbar styles for light and dark mode */
   * {
     scrollbar-width: thin;
-    scrollbar-color: hsl(var(--border)) transparent;
+    scrollbar-color: var(--border) transparent;
   }
 
   *::-webkit-scrollbar {
@@ -139,30 +359,30 @@
   }
 
   *::-webkit-scrollbar-thumb {
-    background-color: hsl(var(--border));
+    background-color: var(--border);
     border-radius: 4px;
     border: 2px solid transparent;
     background-clip: content-box;
   }
 
   *::-webkit-scrollbar-thumb:hover {
-    background-color: hsl(var(--muted-foreground) / 0.5);
+    background-color: color-mix(in srgb, var(--muted-foreground) 50%, transparent);
   }
 
   .dark *::-webkit-scrollbar-thumb {
-    background-color: hsl(var(--border));
+    background-color: var(--border);
   }
 
   .dark *::-webkit-scrollbar-thumb:hover {
-    background-color: hsl(var(--muted-foreground) / 0.5);
+    background-color: color-mix(in srgb, var(--muted-foreground) 50%, transparent);
   }
 
   .dark-black *::-webkit-scrollbar-thumb {
-    background-color: hsl(var(--border));
+    background-color: var(--border);
   }
 
   .dark-black *::-webkit-scrollbar-thumb:hover {
-    background-color: hsl(var(--muted-foreground) / 0.4);
+    background-color: color-mix(in srgb, var(--muted-foreground) 40%, transparent);
   }
 }
 
@@ -248,4 +468,116 @@
       opacity: 0;
     }
   }
+
+  /* Diff decorations for Monaco editor gutter and line highlights */
+  .diff-glyph-added::before,
+  .diff-glyph-modified::before,
+  .diff-glyph-deleted::before {
+    content: '';
+    position: absolute;
+    left: 3px;
+    width: 3px;
+    height: 100%;
+    border-radius: 1px;
+  }
+
+  .diff-glyph-added::before {
+    background-color: var(--diff-added);
+  }
+
+  .diff-glyph-modified::before {
+    background-color: var(--diff-modified);
+  }
+
+  .diff-glyph-deleted::before {
+    background-color: var(--diff-deleted);
+  }
+
+  .diff-glyph-added:hover::before,
+  .diff-glyph-modified:hover::before,
+  .diff-glyph-deleted:hover::before {
+    width: 4px;
+    left: 2px;
+    transition:
+      width 0.1s ease-in-out,
+      left 0.1s ease-in-out;
+  }
+
+  .diff-line-added {
+    background-color: var(--diff-added-bg);
+  }
+
+  .diff-line-modified {
+    background-color: var(--diff-modified-bg);
+  }
+
+  .diff-line-deleted {
+    background-color: var(--diff-deleted-bg);
+  }
+
+  /* Monaco diff comment UI */
+  .file-diff-view .monaco-editor .margin-view-overlays .glyph-margin {
+    width: 20px !important;
+  }
+
+  .file-diff-view .monaco-editor .margin {
+    background-color: transparent !important;
+  }
+
+  .file-diff-view .comment-hover-icon {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 22px;
+    height: 22px;
+    margin: 1px auto;
+    border-radius: 6px;
+    border: 1px solid transparent;
+    background: transparent;
+    cursor: pointer;
+    pointer-events: auto;
+    transition:
+      background-color 0.15s ease,
+      border-color 0.15s ease;
+  }
+
+  .file-diff-view .comment-hover-icon::before {
+    content: '';
+    display: block;
+    width: 12px;
+    height: 12px;
+    background-color: currentColor;
+    color: var(--foreground-muted);
+    -webkit-mask-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='currentColor' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cline x1='12' y1='5' x2='12' y2='19'%3E%3C/line%3E%3Cline x1='5' y1='12' x2='19' y2='12'%3E%3C/line%3E%3C/svg%3E");
+    mask-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='currentColor' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cline x1='12' y1='5' x2='12' y2='19'%3E%3C/line%3E%3Cline x1='5' y1='12' x2='19' y2='12'%3E%3C/line%3E%3C/svg%3E");
+    -webkit-mask-size: contain;
+    mask-size: contain;
+    -webkit-mask-repeat: no-repeat;
+    mask-repeat: no-repeat;
+    -webkit-mask-position: center;
+    mask-position: center;
+  }
+
+  .file-diff-view .comment-hover-icon:hover,
+  .file-diff-view .comment-hover-icon.comment-hover-icon-pinned {
+    background-color: var(--background-2);
+    border-color: var(--border);
+  }
+
+  .file-diff-view .comment-hover-icon:hover::before,
+  .file-diff-view .comment-hover-icon.comment-hover-icon-pinned::before {
+    color: var(--foreground);
+  }
+
+  .file-diff-view .monaco-editor .glyph-margin > div {
+    border: none !important;
+    outline: none !important;
+    box-shadow: none !important;
+  }
+
+  .file-diff-view .monaco-editor .view-zones,
+  .file-diff-view .monaco-editor .view-zone,
+  .file-diff-view .comment-view-zone {
+    pointer-events: auto !important;
+  }
 }
diff --git a/src/renderer/index.html b/src/renderer/index.html
index 66a1fefb02..6b2065b94b 100644
--- a/src/renderer/index.html
+++ b/src/renderer/index.html
@@ -4,6 +4,21 @@
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Emdash</title>
+    <script>
+      (function () {
+        try {
+          var raw = localStorage.getItem('emdash-theme');
+          var pref = raw ? JSON.parse(raw) : null;
+          var effective =
+            pref === 'emlight' || pref === 'emdark'
+              ? pref
+              : window.matchMedia('(prefers-color-scheme: dark)').matches
+                ? 'emdark'
+                : 'emlight';
+          document.documentElement.classList.add(effective);
+        } catch (_) {}
+      })();
+    </script>
   </head>
   <body>
     <div id="root"></div>
diff --git a/src/renderer/lib/MonacoCommentManager.ts b/src/renderer/lib/MonacoCommentManager.ts
deleted file mode 100644
index b53a14435a..0000000000
--- a/src/renderer/lib/MonacoCommentManager.ts
+++ /dev/null
@@ -1,392 +0,0 @@
-import type * as monaco from 'monaco-editor';
-import { createRoot, Root } from 'react-dom/client';
-import React from 'react';
-import { CommentWidget } from '../components/diff/comments/CommentWidget';
-import { CommentInput } from '../components/diff/comments/CommentInput';
-import type { LineComment } from '../types/electron-api';
-
-interface MonacoCommentManagerOptions {
-  onAddComment: (
-    lineNumber: number,
-    content: string,
-    lineContent?: string
-  ) => Promise<string | null | undefined>;
-  onEditComment: (id: string, content: string) => Promise<boolean>;
-  onDeleteComment: (id: string) => Promise<boolean>;
-}
-
-export class MonacoCommentManager {
-  private editor: monaco.editor.IStandaloneDiffEditor;
-  private options: MonacoCommentManagerOptions;
-  private viewZoneRoots: Map<
-    string,
-    { zoneId: string; root: Root; domNode: HTMLElement; lineNumber: number }
-  > = new Map();
-  private decorationIds: string[] = [];
-  private hoverDecorationIds: string[] = [];
-  private pinnedDecorationIds: string[] = [];
-  private hoveredLine: number | null = null;
-  private commentedLines: Set<number> = new Set();
-  private inputZoneId: string | null = null;
-  private inputRoot: Root | null = null;
-  private inputDomNode: HTMLElement | null = null;
-  private activeInputLine: number | null = null;
-  private disposed = false;
-  private gutterClickDisposable: monaco.IDisposable | null = null;
-  private hoverMoveDisposable: monaco.IDisposable | null = null;
-  private hoverLeaveDisposable: monaco.IDisposable | null = null;
-
-  constructor(editor: monaco.editor.IStandaloneDiffEditor, options: MonacoCommentManagerOptions) {
-    this.editor = editor;
-    this.options = options;
-    this.setupGutterClickHandler();
-    this.setupHoverHandler();
-  }
-
-  private setupGutterClickHandler() {
-    const modifiedEditor = this.editor.getModifiedEditor();
-
-    this.gutterClickDisposable = modifiedEditor.onMouseDown((e) => {
-      if (e.target.type !== 2) return;
-      const targetElement = e.target.element;
-      if (!targetElement?.classList.contains('comment-hover-icon')) return;
-
-      const lineNumber = e.target.position?.lineNumber;
-      if (!lineNumber) return;
-
-      e.event?.preventDefault();
-      e.event?.stopPropagation();
-
-      const model = modifiedEditor.getModel();
-      const lineContent = model?.getLineContent(lineNumber) ?? '';
-      this.showInputAt(lineNumber, lineContent);
-    });
-  }
-
-  private setupHoverHandler() {
-    const modifiedEditor = this.editor.getModifiedEditor();
-
-    this.hoverMoveDisposable = modifiedEditor.onMouseMove((e) => {
-      if (this.disposed) return;
-      const targetElement = e.target.element as HTMLElement | null;
-      if (targetElement?.closest?.('.comment-view-zone')) {
-        this.clearHoverDecoration();
-        this.hoveredLine = null;
-        return;
-      }
-
-      // Get line number from any target that has a position
-      // Types: 2=GUTTER_GLYPH_MARGIN, 3=GUTTER_LINE_NUMBERS, 4=GUTTER_LINE_DECORATIONS,
-      // 6=CONTENT_TEXT, 7=CONTENT_EMPTY
-      const lineNumber = e.target.position?.lineNumber;
-
-      if (lineNumber && lineNumber !== this.hoveredLine) {
-        if (lineNumber === this.activeInputLine) {
-          this.clearHoverDecoration();
-          this.hoveredLine = lineNumber;
-          return;
-        }
-        // Always show hover icon - users can add multiple comments to the same line
-        this.setHoverDecoration(lineNumber);
-        this.hoveredLine = lineNumber;
-      } else if (!lineNumber && this.hoveredLine !== null) {
-        // Mouse moved to area without a line (e.g., scrollbar, minimap)
-        this.clearHoverDecoration();
-        this.hoveredLine = null;
-      }
-    });
-
-    this.hoverLeaveDisposable = modifiedEditor.onMouseLeave(() => {
-      if (this.disposed) return;
-      this.clearHoverDecoration();
-      this.hoveredLine = null;
-    });
-  }
-
-  private setHoverDecoration(lineNumber: number) {
-    const modifiedEditor = this.editor.getModifiedEditor();
-
-    const decoration: monaco.editor.IModelDeltaDecoration = {
-      range: {
-        startLineNumber: lineNumber,
-        startColumn: 1,
-        endLineNumber: lineNumber,
-        endColumn: 1,
-      },
-      options: {
-        glyphMarginClassName: 'comment-hover-icon',
-      },
-    };
-
-    this.hoverDecorationIds = modifiedEditor.deltaDecorations(this.hoverDecorationIds, [
-      decoration,
-    ]);
-  }
-
-  private setPinnedDecoration(lineNumber: number) {
-    const modifiedEditor = this.editor.getModifiedEditor();
-
-    const decoration: monaco.editor.IModelDeltaDecoration = {
-      range: {
-        startLineNumber: lineNumber,
-        startColumn: 1,
-        endLineNumber: lineNumber,
-        endColumn: 1,
-      },
-      options: {
-        glyphMarginClassName: 'comment-hover-icon comment-hover-icon-pinned',
-      },
-    };
-
-    this.pinnedDecorationIds = modifiedEditor.deltaDecorations(this.pinnedDecorationIds, [
-      decoration,
-    ]);
-  }
-
-  private clearHoverDecoration() {
-    const modifiedEditor = this.editor.getModifiedEditor();
-    this.hoverDecorationIds = modifiedEditor.deltaDecorations(this.hoverDecorationIds, []);
-  }
-
-  private clearPinnedDecoration() {
-    const modifiedEditor = this.editor.getModifiedEditor();
-    this.pinnedDecorationIds = modifiedEditor.deltaDecorations(this.pinnedDecorationIds, []);
-  }
-
-  private focusInputTextarea() {
-    const textarea = this.inputDomNode?.querySelector('textarea');
-    if (textarea instanceof HTMLTextAreaElement) {
-      textarea.focus();
-    }
-  }
-
-  setComments(comments: LineComment[]) {
-    if (this.disposed) return;
-
-    const modifiedEditor = this.editor.getModifiedEditor();
-
-    // Group comments by line
-    const commentsByLine = new Map<number, LineComment[]>();
-    for (const comment of comments) {
-      const existing = commentsByLine.get(comment.lineNumber) ?? [];
-      existing.push(comment);
-      commentsByLine.set(comment.lineNumber, existing);
-    }
-
-    // Update decorations (glyph margin icons)
-    this.updateDecorations(commentsByLine);
-
-    const nextById = new Map<string, LineComment>(comments.map((comment) => [comment.id, comment]));
-
-    // Update view zones with minimal churn to avoid flicker.
-    modifiedEditor.changeViewZones((accessor) => {
-      // Remove stale zones
-      for (const [commentId, zoneInfo] of Array.from(this.viewZoneRoots.entries())) {
-        if (!nextById.has(commentId)) {
-          accessor.removeZone(zoneInfo.zoneId);
-          zoneInfo.root.unmount();
-          this.viewZoneRoots.delete(commentId);
-        }
-      }
-
-      // Add or update zones for current comments
-      for (const comment of comments) {
-        const existing = this.viewZoneRoots.get(comment.id);
-        if (existing) {
-          existing.domNode.dataset.lineNumber = String(comment.lineNumber);
-          existing.domNode.style.padding = '12px';
-          existing.domNode.style.boxSizing = 'border-box';
-          existing.domNode.className = 'comment-view-zone bg-muted/40 border border-border';
-
-          existing.root.render(
-            React.createElement(CommentWidget, {
-              comment,
-              onEdit: (content) => this.options.onEditComment(comment.id, content),
-              onDelete: () => this.options.onDeleteComment(comment.id),
-            })
-          );
-
-          if (existing.lineNumber !== comment.lineNumber) {
-            accessor.removeZone(existing.zoneId);
-            const zoneId = accessor.addZone({
-              afterLineNumber: comment.lineNumber,
-              heightInPx: 140 + 24,
-              domNode: existing.domNode,
-              suppressMouseDown: false,
-              showInHiddenAreas: true,
-            });
-            this.viewZoneRoots.set(comment.id, {
-              ...existing,
-              zoneId,
-              lineNumber: comment.lineNumber,
-            });
-          }
-          continue;
-        }
-
-        const domNode = document.createElement('div');
-        domNode.style.padding = '12px'; // Space around comments
-        domNode.style.boxSizing = 'border-box';
-        domNode.className = 'comment-view-zone bg-muted/40 border border-border';
-        domNode.style.pointerEvents = 'auto'; // Ensure clicks work
-        domNode.style.position = 'relative';
-        domNode.style.zIndex = '10';
-        domNode.style.width = '100%';
-        domNode.dataset.lineNumber = String(comment.lineNumber);
-
-        const root = createRoot(domNode);
-        root.render(
-          React.createElement(CommentWidget, {
-            comment,
-            onEdit: (content) => this.options.onEditComment(comment.id, content),
-            onDelete: () => this.options.onDeleteComment(comment.id),
-          })
-        );
-
-        const zoneId = accessor.addZone({
-          afterLineNumber: comment.lineNumber,
-          heightInPx: 140 + 24,
-          domNode,
-          suppressMouseDown: false,
-          showInHiddenAreas: true,
-        });
-
-        this.viewZoneRoots.set(comment.id, {
-          zoneId,
-          root,
-          domNode,
-          lineNumber: comment.lineNumber,
-        });
-      }
-    });
-  }
-
-  private updateDecorations(commentsByLine: Map<number, LineComment[]>) {
-    const modifiedEditor = this.editor.getModifiedEditor();
-
-    // Update the set of commented lines for hover logic
-    // No glyph margin icon needed - the comment widget itself is the indicator
-    this.commentedLines.clear();
-    for (const [lineNumber] of commentsByLine) {
-      this.commentedLines.add(lineNumber);
-    }
-
-    // Clear any existing decorations (we don't show icons for commented lines)
-    this.decorationIds = modifiedEditor.deltaDecorations(this.decorationIds, []);
-  }
-
-  showInputAt(lineNumber: number, lineContent: string) {
-    if (this.activeInputLine === lineNumber && this.inputDomNode) {
-      this.focusInputTextarea();
-      return;
-    }
-
-    this.hideInput();
-
-    const modifiedEditor = this.editor.getModifiedEditor();
-    this.activeInputLine = lineNumber;
-    this.setPinnedDecoration(lineNumber);
-
-    this.inputDomNode = document.createElement('div');
-    this.inputRoot = createRoot(this.inputDomNode);
-
-    this.inputRoot.render(
-      React.createElement(CommentInput, {
-        lineNumber,
-        onSubmit: async (content) => {
-          await this.options.onAddComment(lineNumber, content, lineContent);
-          this.hideInput();
-        },
-        onCancel: () => this.hideInput(),
-      })
-    );
-
-    this.inputDomNode.style.padding = '12px';
-    this.inputDomNode.style.boxSizing = 'border-box';
-    this.inputDomNode.className = 'comment-view-zone bg-muted/40 border border-border';
-    this.inputDomNode.style.pointerEvents = 'auto';
-    this.inputDomNode.style.position = 'relative';
-    this.inputDomNode.style.zIndex = '10';
-    this.inputDomNode.style.width = '100%';
-    this.inputDomNode.dataset.lineNumber = String(lineNumber);
-
-    const initialHeight = 140;
-    modifiedEditor.changeViewZones((accessor) => {
-      this.inputZoneId = accessor.addZone({
-        afterLineNumber: lineNumber,
-        heightInPx: initialHeight + 24,
-        domNode: this.inputDomNode!,
-        suppressMouseDown: false,
-        showInHiddenAreas: true,
-      });
-    });
-
-    const focusTextarea = () => {
-      const textarea = this.inputDomNode?.querySelector('textarea');
-      if (textarea instanceof HTMLTextAreaElement) {
-        textarea.focus();
-        textarea.select();
-      }
-    };
-
-    requestAnimationFrame(() => {
-      requestAnimationFrame(() => {
-        focusTextarea();
-      });
-    });
-    setTimeout(() => {
-      focusTextarea();
-    }, 80);
-  }
-
-  hideInput() {
-    if (this.inputZoneId) {
-      const modifiedEditor = this.editor.getModifiedEditor();
-      modifiedEditor.changeViewZones((accessor) => {
-        if (this.inputZoneId) accessor.removeZone(this.inputZoneId);
-      });
-      this.inputZoneId = null;
-    }
-    if (this.inputRoot) {
-      this.inputRoot.unmount();
-      this.inputRoot = null;
-    }
-    this.inputDomNode = null;
-    const hoveredLine = this.hoveredLine;
-    this.activeInputLine = null;
-    this.clearPinnedDecoration();
-    if (hoveredLine) {
-      this.setHoverDecoration(hoveredLine);
-    }
-  }
-
-  dispose() {
-    this.disposed = true;
-    this.gutterClickDisposable?.dispose();
-    this.gutterClickDisposable = null;
-    this.hoverMoveDisposable?.dispose();
-    this.hoverMoveDisposable = null;
-    this.hoverLeaveDisposable?.dispose();
-    this.hoverLeaveDisposable = null;
-    this.hideInput();
-
-    // Cleanup view zones
-    const modifiedEditor = this.editor.getModifiedEditor();
-    modifiedEditor.changeViewZones((accessor) => {
-      for (const [, zoneInfo] of this.viewZoneRoots) {
-        accessor.removeZone(zoneInfo.zoneId);
-        zoneInfo.root.unmount();
-      }
-    });
-    this.viewZoneRoots.clear();
-
-    // Clear all decorations
-    modifiedEditor.deltaDecorations(this.decorationIds, []);
-    modifiedEditor.deltaDecorations(this.hoverDecorationIds, []);
-    modifiedEditor.deltaDecorations(this.pinnedDecorationIds, []);
-    this.decorationIds = [];
-    this.hoverDecorationIds = [];
-    this.pinnedDecorationIds = [];
-    this.commentedLines.clear();
-  }
-}
diff --git a/src/renderer/lib/activityClassifier.ts b/src/renderer/lib/activityClassifier.ts
deleted file mode 100644
index 1777af8f3f..0000000000
--- a/src/renderer/lib/activityClassifier.ts
+++ /dev/null
@@ -1,289 +0,0 @@
-export type ActivitySignal = 'busy' | 'idle' | 'neutral';
-
-function stripAnsi(s: string): string {
-  // Remove ANSI escape codes and carriage returns
-  return s
-    .replace(/\x1b\[[0-9;]*[A-Za-z]/g, '')
-    .replace(/\r/g, '')
-    .replace(/\x1b\][^\x07]*\x07/g, '');
-}
-
-export function classifyActivity(
-  provider: string | null | undefined,
-  chunk: string
-): ActivitySignal {
-  let text = (chunk || '').toString();
-  text = stripAnsi(text);
-  if (!text) return 'neutral';
-
-  const p = (provider || '').toLowerCase();
-
-  // Providers in alphabetical order for better maintenance
-
-  if (p === 'auggie') {
-    // Auggie CLI patterns
-    if (/Thinking|Processing|Analyzing|Working/i.test(text)) return 'busy';
-    if (/Running|Executing|Generating|Building/i.test(text)) return 'busy';
-    if (/\[.*ing\]/i.test(text)) return 'busy';
-    // Idle patterns
-    if (/Ready|Awaiting|Press Enter|Next command/i.test(text)) return 'idle';
-    if (/auggie\s*>/i.test(text)) return 'idle';
-    if (/What.*\?|How can I|Please provide/i.test(text)) return 'idle';
-  }
-
-  if (p === 'charm' || p === 'crush') {
-    // Charm/Crush CLI patterns
-    if (/Processing|Generating|Running|Executing/i.test(text)) return 'busy';
-    if (/Thinking|Working|Analyzing|Building/i.test(text)) return 'busy';
-    if (/⠋|⠙|⠹|⠸|⠼|⠴|⠦|⠧|⠇|⠏/i.test(text)) return 'busy'; // Spinner chars
-    // Idle patterns
-    if (/Ready|Awaiting|Press Enter/i.test(text)) return 'idle';
-    if (/crush\s*>/i.test(text)) return 'idle';
-    if (/What.*\?|Choose|Select/i.test(text)) return 'idle';
-  }
-
-  if (p === 'claude') {
-    // Busy cues seen in Claude Code CLI
-    if (/esc\s*to\s*interrupt/i.test(text)) return 'busy';
-    if (
-      /wrangling|crafting|thinking|reasoning|analyzing|planning|reading|scanning|applying/i.test(
-        text
-      )
-    )
-      return 'busy';
-    // Idle cues
-    if (/Ready|Awaiting|Next command|Use \/login/i.test(text)) return 'idle';
-  }
-
-  if (p === 'codex') {
-    // Busy cues: generic explicit signal while generating
-    if (/Esc to interrupt/i.test(text)) return 'busy';
-    // Busy cues: active response lines often include a timer (e.g., 43s or 1m12s)
-    if (/\(\s*(?:\d+\s*m\s*)?\d+\s*s\s*•\s*Esc to interrupt\s*\)/i.test(text)) return 'busy';
-    if (/Responding to\b/i.test(text)) return 'busy';
-    if (
-      /Executing|Running|Thinking|Working|Analyzing|Identifying|Inspecting|Summarizing|Refactoring|Applying|Updating|Generating|Scanning|Parsing|Checking/i.test(
-        text
-      )
-    )
-      return 'busy';
-    // Idle footers/prompts
-    if (/Ready|Awaiting input|Press Enter/i.test(text)) return 'idle';
-    if (/\b\/(status|approvals|model)\b/i.test(text)) return 'idle';
-    if (/send\s+\S*\s*newline|transcript|quit/i.test(text)) return 'idle';
-  }
-
-  if (p === 'copilot') {
-    if (/Thinking|Working|Generating/i.test(text)) return 'busy';
-    if (
-      /Ready|Press Enter|Next step/i.test(text) ||
-      /Do you want to/i.test(text) ||
-      /Confirm with number keys/i.test(text) ||
-      /approve all file operations/i.test(text) ||
-      /Yes, and approve/i.test(text)
-    )
-      return 'idle';
-  }
-
-  if (p === 'gemini' || p === 'droid') {
-    // Gemini/Droid "esc to cancel" during generation
-    if (/esc\s*to\s*cancel/i.test(text)) return 'busy';
-    // Common progress words
-    if (/Thinking\.{0,3}/i.test(text)) return 'busy';
-    if (/[\u2800-\u28FF]/.test(text) && /Thinking/i.test(text)) return 'busy';
-    if (/Running|Working|Executing|Generating|Applying|Planning|Analyzing/i.test(text))
-      return 'busy';
-    if (/Ready|Awaiting|Press Enter/i.test(text)) return 'idle';
-  }
-
-  if (p === 'amp') {
-    // Amp CLI busy cues observed in UI: "Thinking...", "waiting for response", and "esc to cancel"
-    if (/Thinking\.{0,3}/i.test(text)) return 'busy';
-    if (/waiting\s+for\s+response/i.test(text)) return 'busy';
-    if (/esc\s*to\s*cancel/i.test(text)) return 'busy';
-    // Idle cues: generic ready prompts
-    if (/Ready|Awaiting|Press Enter|Next command|Type your message/i.test(text)) return 'idle';
-  }
-
-  if (p === 'opencode') {
-    // OpenCode CLI default TUI when run without args; similar cues to AMP
-    if (/Thinking\.{0,3}/i.test(text)) return 'busy';
-    if (/waiting\s+for\s+response/i.test(text)) return 'busy';
-    if (/esc\s*to\s*cancel/i.test(text)) return 'busy';
-    if (/Ready|Awaiting|Press Enter|Next command|Type your message/i.test(text)) return 'idle';
-  }
-
-  if (p === 'kimi') {
-    // Kimi CLI (Moonshot AI) technical preview: generic cues
-    if (/Thinking\.{0,3}/i.test(text)) return 'busy';
-    if (/esc\s*to\s*(cancel|interrupt)/i.test(text)) return 'busy';
-    if (/Running|Working|Executing|Generating|Applying|Planning|Analyzing/i.test(text))
-      return 'busy';
-    if (/Ready|Awaiting|Press Enter|Next command|\/help|\/setup/i.test(text)) return 'idle';
-  }
-
-  if (p === 'kiro') {
-    if (/Kiro CLI|Thinking\.{0,3}/i.test(text)) return 'busy';
-    if (/esc\s*to\s*(cancel|interrupt)/i.test(text)) return 'busy';
-    if (/Running|Working|Executing|Generating|Applying|Planning|Analyzing/i.test(text))
-      return 'busy';
-    if (/Ready|Awaiting|Press Enter|Next command|Kiro CLI/i.test(text)) return 'idle';
-  }
-
-  if (p === 'rovo') {
-    if (/rovodev/i.test(text) && /auth|run|session|connecting/i.test(text)) return 'busy';
-    if (/Thinking\.{0,3}/i.test(text)) return 'busy';
-    if (/Running|Working|Executing|Generating|Applying|Planning|Analyzing/i.test(text))
-      return 'busy';
-    if (/Ready|Awaiting|Press Enter|Next command|rovodev/i.test(text)) return 'idle';
-  }
-
-  if (p === 'mistral') {
-    // Mistral Vibe CLI patterns
-
-    // Busy patterns
-    if (/Thinking\.{0,3}/i.test(text)) return 'busy';
-    if (/Processing|Generating|Running|Executing|Analyzing|Working on/i.test(text)) return 'busy';
-    // Tool execution patterns
-    if (/Tool:|Executing tool:|Running tool:/i.test(text)) return 'busy';
-    if (/\[.*ing\]|\[.*ING\]/i.test(text)) return 'busy'; // [Running], [Processing], etc.
-    // Spinner or progress indicators
-    if (/[\u2800-\u28FF]/.test(text)) return 'busy'; // Braille spinner
-    if (/[\u25A0-\u25FF]/.test(text) && /\d+%/.test(text)) return 'busy'; // Progress bar
-    if (/⠋|⠙|⠹|⠸|⠼|⠴|⠦|⠧|⠇|⠏/i.test(text)) return 'busy'; // Common spinner chars
-
-    // Idle patterns
-    // Task completion
-    if (/✓|✔|Completed|Finished|Done\./i.test(text)) return 'idle';
-    if (/Task completed/i.test(text)) return 'idle';
-
-    // Input prompts
-    if (/Type.*message|Enter.*prompt/i.test(text)) return 'idle';
-    if (/What would you like|How can I help/i.test(text)) return 'idle';
-    if (/What.*\?|Please.*:/i.test(text)) return 'idle';
-
-    // Standard prompts
-    if (/Ready|Awaiting|Press Enter|Next command/i.test(text)) return 'idle';
-    if (/\bvibe\s*>/i.test(text)) return 'idle'; // Vibe prompt
-    if (/›|»|>/i.test(text) && text.length < 10) return 'idle'; // Short prompt indicators
-
-    // Confirmation prompts
-    if (/\[y\/n\]|\[Y\/N\]|Continue\?/i.test(text)) return 'idle';
-    if (/Approve|Reject|Cancel/i.test(text)) return 'idle';
-  }
-
-  if (p === 'kilocode') {
-    // Kilocode CLI patterns
-
-    // Busy patterns
-    if (/Thinking\.{0,3}/i.test(text)) return 'busy';
-    if (/Processing|Working|Generating|Analyzing|Building|Compiling|Searching/i.test(text))
-      return 'busy';
-    if (/Running|Executing|Applying|Planning|Investigating/i.test(text)) return 'busy';
-    // Tool/action indicators
-    if (/\[.*ing\]|\[.*ING\]/i.test(text)) return 'busy'; // [Running], [Processing], etc.
-    // Mode-specific busy patterns
-    if (/architect mode|code mode|debug mode/i.test(text) && /working|processing/i.test(text))
-      return 'busy';
-
-    // Idle patterns - EXPANDED
-    // Task completion indicators
-    if (/✓\s*Task Completed/i.test(text)) return 'idle';
-    if (/Task Completed/i.test(text)) return 'idle';
-    if (/Checkpoint Saved/i.test(text)) return 'idle';
-
-    // Input prompts and questions
-    if (/Type a message or \/command/i.test(text)) return 'idle';
-    if (/What would you like to work on/i.test(text)) return 'idle';
-    if (/What.*\?|How can I|Please provide/i.test(text)) return 'idle';
-    if (/Hi there!/i.test(text)) return 'idle'; // Greeting response
-
-    // Menu/help indicators
-    if (/\/help for commands/i.test(text)) return 'idle';
-    if (/\/mode to switch mode/i.test(text)) return 'idle';
-    if (/! for shell mode/i.test(text)) return 'idle';
-
-    // Standard prompts
-    if (/Ready|Awaiting|Press Enter|Next command/i.test(text)) return 'idle';
-    if (/kilocode\s*>/i.test(text)) return 'idle'; // Kilocode prompt
-    if (/\[y\/n\]|\[Y\/N\]/i.test(text)) return 'idle'; // Confirmation prompts
-
-    // UI status bar patterns (workspace info at bottom)
-    if (/\(git.*worktree\)/i.test(text)) return 'idle';
-    if (/xAI.*Grok/i.test(text)) return 'idle'; // Model indicator in status
-  }
-
-  if (p === 'cline') {
-    // Cline CLI patterns
-    if (/Thinking|Processing|Analyzing|Working/i.test(text)) return 'busy';
-    if (/Running|Executing|Generating|Building/i.test(text)) return 'busy';
-    if (/Applying|Planning|Searching|Evaluating/i.test(text)) return 'busy';
-    // Idle patterns
-    if (/Ready|Awaiting|Press Enter|Next command/i.test(text)) return 'idle';
-    if (/cline\s*>/i.test(text)) return 'idle';
-    if (/What.*\?|How can I|Please.*:/i.test(text)) return 'idle';
-    if (/Task completed|Done\./i.test(text)) return 'idle';
-  }
-
-  if (p === 'codebuff') {
-    // Codebuff CLI patterns
-    if (/Thinking|Processing|Working|Analyzing/i.test(text)) return 'busy';
-    if (/Generating|Building|Compiling|Running/i.test(text)) return 'busy';
-    if (/Buffering|Loading|Fetching/i.test(text)) return 'busy';
-    // Idle patterns
-    if (/Ready|Awaiting|Press Enter/i.test(text)) return 'idle';
-    if (/codebuff\s*>/i.test(text)) return 'idle';
-    if (/What.*\?|Enter.*command/i.test(text)) return 'idle';
-  }
-
-  if (p === 'continue' || p === 'cn') {
-    // Continue CLI patterns
-    if (/Thinking|Processing|Analyzing|Working/i.test(text)) return 'busy';
-    if (/Running|Executing|Generating|Applying/i.test(text)) return 'busy';
-    if (/Continuing|Resuming|Loading/i.test(text)) return 'busy';
-    // Idle patterns
-    if (/Ready|Awaiting|Press Enter/i.test(text)) return 'idle';
-    if (/cn\s*>|continue\s*>/i.test(text)) return 'idle';
-    if (/What.*\?|How can I|Next step/i.test(text)) return 'idle';
-  }
-
-  if (p === 'cursor') {
-    // Cursor CLI patterns
-    if (/^[\s\S]*?Generating\.?/im.test(text)) return 'busy';
-    if (/\bWorking\b|\bExecuting\b|\bRunning\b/i.test(text)) return 'busy';
-    if (/Add a follow-up/i.test(text)) return 'idle';
-    if (/Auto\s*[\r\n]+\s*\/\s*commands/i.test(text)) return 'idle';
-  }
-
-  if (p === 'goose') {
-    // Goose CLI patterns
-    if (/Thinking|Processing|Analyzing|Working/i.test(text)) return 'busy';
-    if (/Running|Executing|Generating|Planning/i.test(text)) return 'busy';
-    if (/Investigating|Searching|Building/i.test(text)) return 'busy';
-    // Idle patterns
-    if (/Ready|Awaiting|Press Enter/i.test(text)) return 'idle';
-    if (/goose\s*>/i.test(text)) return 'idle';
-    if (/What.*\?|How can I|Choose/i.test(text)) return 'idle';
-    if (/Session.*started|Session.*resumed/i.test(text)) return 'idle';
-  }
-
-  if (p === 'qwen') {
-    // Qwen Code CLI patterns
-    if (/Thinking|Processing|Analyzing|Working/i.test(text)) return 'busy';
-    if (/Running|Executing|Generating|Compiling/i.test(text)) return 'busy';
-    if (/Computing|Calculating|Optimizing/i.test(text)) return 'busy';
-    if (/\[.*ing\]/i.test(text)) return 'busy';
-    // Idle patterns
-    if (/Ready|Awaiting|Press Enter|Next command/i.test(text)) return 'idle';
-    if (/qwen\s*>/i.test(text)) return 'idle';
-    if (/What.*\?|How can I|Please.*:/i.test(text)) return 'idle';
-    if (/Task completed|Finished/i.test(text)) return 'idle';
-  }
-
-  // Generic signals
-  if (/esc\s*to\s*(cancel|interrupt)/i.test(text)) return 'busy';
-  if (/(^|\b)(Generating|Working|Executing|Running|Applying|Thinking)(\b|\.)/i.test(text))
-    return 'busy';
-  if (/Add a follow-up|Ready|Awaiting|Press Enter|Next command/i.test(text)) return 'idle';
-  return 'neutral';
-}
diff --git a/src/renderer/lib/activityConstants.ts b/src/renderer/lib/activityConstants.ts
deleted file mode 100644
index 60104d92b1..0000000000
--- a/src/renderer/lib/activityConstants.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-export const USER_WINDOW_MS = 30_000;
-// How long we keep spinner ON after a busy signal if idle/neutral flickers
-export const BUSY_HOLD_MS = 2_000;
-// How long we wait on neutral output before clearing busy if no further busy arrives
-export const CLEAR_BUSY_MS = 6_000;
-export const INJECT_ON_DATA_DELAY_MS = 150;
-export const INJECT_ON_STARTED_DELAY_MS = 250;
-export const INJECT_FALLBACK_MS = 2_000;
-export const INJECT_ENTER_DELAY_MS = 50;
diff --git a/src/renderer/lib/activityStore.ts b/src/renderer/lib/activityStore.ts
deleted file mode 100644
index 5226607c94..0000000000
--- a/src/renderer/lib/activityStore.ts
+++ /dev/null
@@ -1,181 +0,0 @@
-import { classifyActivity } from './activityClassifier';
-import { CLEAR_BUSY_MS, BUSY_HOLD_MS } from './activityConstants';
-import { type PtyIdKind, parsePtyId, makePtyId } from '@shared/ptyId';
-import { PROVIDER_IDS } from '@shared/providers/registry';
-import type { AgentEvent } from '@shared/agentEvents';
-
-type Listener = (busy: boolean) => void;
-
-class ActivityStore {
-  private listeners = new Map<string, Set<Listener>>();
-  private states = new Map<string, boolean>();
-  private timers = new Map<string, ReturnType<typeof setTimeout>>();
-  private busySince = new Map<string, number>();
-  private subscribed = false;
-  private subscribedIds = new Set<string>();
-
-  private ensureSubscribed() {
-    if (this.subscribed) return;
-    this.subscribed = true;
-    const api: any = (window as any).electronAPI;
-    api?.onPtyActivity?.((info: { id: string; chunk?: string }) => {
-      try {
-        const id = String(info?.id || '');
-        // Match any subscribed task id by suffix
-        for (const wsId of this.subscribedIds) {
-          if (!id.endsWith(wsId)) continue;
-          const prov = parsePtyId(id)?.providerId || '';
-          const signal = classifyActivity(prov, info?.chunk || '');
-          if (signal === 'busy') {
-            this.setBusy(wsId, true, true);
-          } else if (signal === 'idle') {
-            this.setBusy(wsId, false, true);
-          } else {
-            // neutral: keep current but set soft clear timer
-            if (this.states.get(wsId)) this.armTimer(wsId);
-          }
-        }
-      } catch {}
-    });
-    api?.onPtyExitGlobal?.((info: { id: string }) => {
-      try {
-        const id = String(info?.id || '');
-        for (const wsId of this.subscribedIds) {
-          if (id.endsWith(wsId)) this.setBusy(wsId, false, true);
-        }
-      } catch {}
-    });
-  }
-
-  private armTimer(wsId: string) {
-    const prev = this.timers.get(wsId);
-    if (prev) clearTimeout(prev);
-    const t = setTimeout(() => this.setBusy(wsId, false, true), CLEAR_BUSY_MS);
-    this.timers.set(wsId, t);
-  }
-
-  private setBusy(wsId: string, busy: boolean, fromEvent = false) {
-    const current = this.states.get(wsId) || false;
-    // If setting busy: clear timers and record start
-    if (busy) {
-      const prev = this.timers.get(wsId);
-      if (prev) clearTimeout(prev);
-      this.timers.delete(wsId);
-      this.busySince.set(wsId, Date.now());
-      if (!current) {
-        this.states.set(wsId, true);
-        this.emit(wsId, true);
-      }
-      return;
-    }
-
-    // busy === false: honor hold window so spinner is visible
-    const started = this.busySince.get(wsId) || 0;
-    const elapsed = started ? Date.now() - started : BUSY_HOLD_MS;
-    const remaining = elapsed < BUSY_HOLD_MS ? BUSY_HOLD_MS - elapsed : 0;
-
-    const clearNow = () => {
-      const prev = this.timers.get(wsId);
-      if (prev) clearTimeout(prev);
-      this.timers.delete(wsId);
-      this.busySince.delete(wsId);
-      if (this.states.get(wsId) !== false) {
-        this.states.set(wsId, false);
-        this.emit(wsId, false);
-      }
-    };
-
-    if (remaining > 0) {
-      const prev = this.timers.get(wsId);
-      if (prev) clearTimeout(prev);
-      const t = setTimeout(clearNow, remaining);
-      this.timers.set(wsId, t);
-    } else {
-      clearNow();
-    }
-  }
-
-  private emit(wsId: string, busy: boolean) {
-    const ls = this.listeners.get(wsId);
-    if (!ls) return;
-    for (const fn of ls) {
-      try {
-        fn(busy);
-      } catch {}
-    }
-  }
-
-  setTaskBusy(wsId: string, busy: boolean) {
-    this.setBusy(wsId, busy, false);
-  }
-
-  handleAgentEvent(event: AgentEvent) {
-    const wsId = event.taskId;
-    if (!wsId) return;
-
-    if (event.type === 'notification') {
-      const nt = event.payload.notificationType;
-      // Agent is waiting for user input — mark idle
-      if (nt === 'permission_prompt' || nt === 'idle_prompt' || nt === 'elicitation_dialog') {
-        this.setBusy(wsId, false, true);
-      }
-    } else if (event.type === 'stop') {
-      this.setBusy(wsId, false, true);
-    }
-  }
-
-  subscribe(wsId: string, fn: Listener, opts?: { kinds?: PtyIdKind[] }) {
-    this.ensureSubscribed();
-    this.subscribedIds.add(wsId);
-    const set = this.listeners.get(wsId) || new Set<Listener>();
-    set.add(fn);
-    this.listeners.set(wsId, set);
-    // emit current
-    fn(this.states.get(wsId) || false);
-    // Fallback: also listen directly to PTY data in case global broadcast is missing.
-    // `kinds` can be narrowed by callers for performance:
-    // - task-level busy: { kinds: ['main'] } (default)
-    // - conversation-level busy: { kinds: ['chat'] }
-    const offDirect: Array<() => void> = [];
-    const offExitDirect: Array<() => void> = [];
-    const kinds = opts?.kinds?.length ? opts.kinds : (['main'] as const);
-    try {
-      const api: any = (window as any).electronAPI;
-      for (const prov of PROVIDER_IDS) {
-        for (const kind of kinds) {
-          const ptyId = makePtyId(prov, kind, wsId);
-          const off = api?.onPtyData?.(ptyId, (chunk: string) => {
-            try {
-              const signal = classifyActivity(prov, chunk || '');
-              if (signal === 'busy') this.setBusy(wsId, true, true);
-              else if (signal === 'idle') this.setBusy(wsId, false, true);
-              else if (this.states.get(wsId)) this.armTimer(wsId);
-            } catch {}
-          });
-          if (off) offDirect.push(off);
-          const offExit = api?.onPtyExit?.(ptyId, () => {
-            try {
-              this.setBusy(wsId, false, true);
-            } catch {}
-          });
-          if (offExit) offExitDirect.push(offExit);
-        }
-      }
-    } catch {}
-
-    return () => {
-      const s = this.listeners.get(wsId);
-      if (s) {
-        s.delete(fn);
-        if (s.size === 0) this.listeners.delete(wsId);
-      }
-      try {
-        for (const off of offDirect) off?.();
-        for (const off of offExitDirect) off?.();
-      } catch {}
-      // keep subscribedIds to avoid thrash; optional cleanup could remove when no listeners
-    };
-  }
-}
-
-export const activityStore = new ActivityStore();
diff --git a/src/renderer/lib/attachments.ts b/src/renderer/lib/attachments.ts
deleted file mode 100644
index 7ef0f91587..0000000000
--- a/src/renderer/lib/attachments.ts
+++ /dev/null
@@ -1,81 +0,0 @@
-// Helpers for extracting @mentions and assembling attachment blocks
-
-export function extractMentions(text: string): string[] {
-  const re = /@[\w\-.\/]+/g;
-  const set = new Set<string>();
-  let m: RegExpExecArray | null;
-  while ((m = re.exec(text))) {
-    const token = m[0].slice(1);
-    if (token) set.add(token);
-  }
-  return Array.from(set);
-}
-
-export function getFenceLang(p: string): string {
-  const ext = p.split('.').pop()?.toLowerCase() || '';
-  if (ext === 'tsx') return 'tsx';
-  if (ext === 'jsx') return 'jsx';
-  if (ext === 'ts') return 'ts';
-  if (ext === 'js') return 'js';
-  if (ext === 'json') return 'json';
-  if (ext === 'md') return 'md';
-  if (ext === 'css' || ext === 'scss' || ext === 'less') return 'css';
-  if (ext === 'html') return 'html';
-  if (ext === 'yml' || ext === 'yaml') return 'yaml';
-  if (ext === 'sh' || ext === 'bash' || ext === 'zsh') return 'bash';
-  return '';
-}
-
-export function stripMentions(text: string): string {
-  if (!text) return '';
-  const re = /@[\w\-.\/]+/g;
-  return text
-    .replace(re, '')
-    .replace(/\s{2,}/g, ' ')
-    .trim();
-}
-
-export async function buildAttachmentsSection(
-  rootPath: string,
-  text: string,
-  opts?: { maxFiles?: number; maxBytesPerFile?: number }
-): Promise<string> {
-  const mentions = extractMentions(text);
-  const MAX_FILES = Math.max(1, Math.min(opts?.maxFiles ?? 6, 20));
-  const MAX_BYTES_PER_FILE = Math.max(
-    1024,
-    Math.min(opts?.maxBytesPerFile ?? 200 * 1024, 5 * 1024 * 1024)
-  );
-  const limited = mentions.slice(0, MAX_FILES);
-
-  const parts: string[] = [];
-  for (const rel of limited) {
-    try {
-      const res = await window.electronAPI.fsRead(rootPath, rel, MAX_BYTES_PER_FILE);
-      if (res.success && typeof res.content === 'string') {
-        const lang = getFenceLang(rel);
-        const header = `File: ${rel}${res.truncated ? ` (truncated to ${MAX_BYTES_PER_FILE} bytes)` : ''}`;
-        parts.push(`${header}\n\n\`\`\`${lang}\n${res.content}\n\`\`\``);
-      }
-    } catch {
-      // Ignore unreadable files
-    }
-  }
-
-  if (parts.length === 0) return '';
-  return `\n\n---\nAttached files (from task):\n\n${parts.join('\n\n')}\n`;
-}
-
-export function buildImageAttachmentsSection(taskPath: string, relPaths: string[]): string {
-  if (!relPaths || relPaths.length === 0) return '';
-  const lines: string[] = [];
-  for (const rel of relPaths) {
-    const name = rel.split(/[\\/]/).pop() || 'image';
-    const sep = taskPath.endsWith('/') ? '' : '/';
-    const absPath = (taskPath + sep + rel).replace(/\\/g, '/');
-    // Markdown image referencing a file URL; many CLIs that support images accept this pattern
-    const url = `file://${absPath}`;
-    lines.push(`![${name}](${url})`);
-  }
-  return `\n\n---\nAttached images (from task):\n\n${lines.join('\n')}\n`;
-}
diff --git a/src/renderer/lib/branchNameGenerator.ts b/src/renderer/lib/branchNameGenerator.ts
deleted file mode 100644
index 5536770a02..0000000000
--- a/src/renderer/lib/branchNameGenerator.ts
+++ /dev/null
@@ -1,101 +0,0 @@
-import { BranchNameGenerator } from 'nbranch';
-import type { LinearIssueSummary } from '../types/linear';
-import type { GitHubIssueSummary } from '../types/github';
-import type { JiraIssueSummary } from '../types/jira';
-
-const MAX_NAME_LENGTH = 64;
-const MIN_INPUT_LENGTH = 10;
-const MAX_KEYWORDS = 3;
-
-const generator = new BranchNameGenerator({ maxLength: 128, addRandomSuffix: false });
-
-/**
- * Returns true if the input is unlikely to produce a meaningful task name.
- * Skips slash commands, very short inputs, and single short tokens.
- */
-function isSkippableInput(text: string): boolean {
-  const trimmed = text.trim();
-  if (!trimmed || trimmed.length < MIN_INPUT_LENGTH) return true;
-  if (trimmed.startsWith('/')) return true;
-  // Single word under 10 chars
-  const words = trimmed.split(/\s+/).filter(Boolean);
-  if (words.length === 1 && words[0].length < MIN_INPUT_LENGTH) return true;
-  return false;
-}
-
-/**
- * Generate a slug-style task name from a natural language description.
- * Returns `null` if the input is too short or otherwise unsuitable.
- *
- * Example: "Fix the login page on mobile" → "fix-login-page-mobile"
- */
-export function generateTaskName(description: string): string | null {
-  if (isSkippableInput(description)) return null;
-
-  try {
-    const result = generator.generate(description);
-    const keywords = result.keywords?.slice(0, MAX_KEYWORDS) ?? [];
-    if (keywords.length === 0) return null;
-
-    // Prefix with the commit type when available (fix, feat, etc.)
-    const parts = result.type ? [result.type, ...keywords] : keywords;
-    const slug = parts
-      .join('-')
-      .toLowerCase()
-      .replace(/[^a-z0-9-]/g, '')
-      .replace(/-+/g, '-')
-      .replace(/^-|-$/g, '')
-      .slice(0, MAX_NAME_LENGTH);
-
-    return slug || null;
-  } catch {
-    return null;
-  }
-}
-
-export interface TaskNameContext {
-  initialPrompt?: string | null;
-  linearIssue?: LinearIssueSummary | null;
-  githubIssue?: GitHubIssueSummary | null;
-  jiraIssue?: JiraIssueSummary | null;
-}
-
-/**
- * Generate a task name from the best available context.
- * Priority: linked issue title+description > initial prompt.
- * Returns `null` if no usable context is available.
- */
-export function generateTaskNameFromContext(context: TaskNameContext): string | null {
-  // Try linked issues first — they have the richest context
-  const issueText = getIssueText(context);
-  if (issueText) {
-    const name = generateTaskName(issueText);
-    if (name) return name;
-  }
-
-  // Fall back to initial prompt
-  if (context.initialPrompt) {
-    return generateTaskName(context.initialPrompt);
-  }
-
-  return null;
-}
-
-function getIssueText(context: TaskNameContext): string | null {
-  if (context.linearIssue) {
-    const { title, description } = context.linearIssue as any;
-    const parts = [title, description].filter(Boolean);
-    return parts.length > 0 ? parts.join(' ') : null;
-  }
-  if (context.githubIssue) {
-    const { title, body } = context.githubIssue as any;
-    const parts = [title, body].filter(Boolean);
-    return parts.length > 0 ? parts.join(' ') : null;
-  }
-  if (context.jiraIssue) {
-    const { summary, description } = context.jiraIssue as any;
-    const parts = [summary, description].filter(Boolean);
-    return parts.length > 0 ? parts.join(' ') : null;
-  }
-  return null;
-}
diff --git a/src/renderer/lib/checkRunStatus.ts b/src/renderer/lib/checkRunStatus.ts
deleted file mode 100644
index 13d2f208de..0000000000
--- a/src/renderer/lib/checkRunStatus.ts
+++ /dev/null
@@ -1,87 +0,0 @@
-export type CheckRunBucket = 'pass' | 'fail' | 'pending' | 'skipping' | 'cancel';
-
-export interface CheckRun {
-  name: string;
-  state: string;
-  bucket: CheckRunBucket;
-  description?: string;
-  link?: string;
-  workflow?: string;
-  event?: string;
-  startedAt?: string;
-  completedAt?: string;
-}
-
-export interface CheckRunsSummary {
-  total: number;
-  passed: number;
-  failed: number;
-  pending: number;
-  skipped: number;
-  cancelled: number;
-}
-
-export interface CheckRunsStatus {
-  checks: CheckRun[];
-  summary: CheckRunsSummary;
-  allComplete: boolean;
-  hasFailures: boolean;
-}
-
-export function computeCheckRunsSummary(checks: CheckRun[]): CheckRunsSummary {
-  const summary: CheckRunsSummary = {
-    total: checks.length,
-    passed: 0,
-    failed: 0,
-    pending: 0,
-    skipped: 0,
-    cancelled: 0,
-  };
-  for (const c of checks) {
-    switch (c.bucket) {
-      case 'pass':
-        summary.passed++;
-        break;
-      case 'fail':
-        summary.failed++;
-        break;
-      case 'pending':
-        summary.pending++;
-        break;
-      case 'skipping':
-        summary.skipped++;
-        break;
-      case 'cancel':
-        summary.cancelled++;
-        break;
-    }
-  }
-  return summary;
-}
-
-export function buildCheckRunsStatus(checks: CheckRun[]): CheckRunsStatus {
-  const summary = computeCheckRunsSummary(checks);
-  return {
-    checks,
-    summary,
-    allComplete: summary.pending === 0,
-    hasFailures: summary.failed > 0,
-  };
-}
-
-export function formatCheckDuration(startedAt?: string, completedAt?: string): string | null {
-  if (!startedAt || !completedAt) return null;
-  const start = new Date(startedAt).getTime();
-  const end = new Date(completedAt).getTime();
-  if (isNaN(start) || isNaN(end)) return null;
-  const diffMs = end - start;
-  if (diffMs < 0) return null;
-
-  const totalSeconds = Math.floor(diffMs / 1000);
-  const hours = Math.floor(totalSeconds / 3600);
-  const minutes = Math.floor((totalSeconds % 3600) / 60);
-
-  if (hours > 0) return `${hours}h ${minutes}m`;
-  if (minutes > 0) return `${minutes}m ${totalSeconds % 60}s`;
-  return '<1m';
-}
diff --git a/src/renderer/lib/checkRunsStore.ts b/src/renderer/lib/checkRunsStore.ts
deleted file mode 100644
index bde0578a4b..0000000000
--- a/src/renderer/lib/checkRunsStore.ts
+++ /dev/null
@@ -1,79 +0,0 @@
-import type { CheckRunsStatus, CheckRun } from './checkRunStatus';
-import { buildCheckRunsStatus } from './checkRunStatus';
-
-type Listener = (status: CheckRunsStatus | null) => void;
-
-const cache = new Map<string, CheckRunsStatus | null>();
-const listeners = new Map<string, Set<Listener>>();
-const pending = new Map<string, Promise<CheckRunsStatus | null>>();
-
-async function fetchCheckRuns(taskPath: string): Promise<CheckRunsStatus | null> {
-  try {
-    const res = await window.electronAPI.getCheckRuns({ taskPath });
-    if (res?.success && res.checks) {
-      return buildCheckRunsStatus(res.checks as CheckRun[]);
-    }
-    return null;
-  } catch {
-    return null;
-  }
-}
-
-export async function refreshCheckRuns(taskPath: string): Promise<CheckRunsStatus | null> {
-  const inFlight = pending.get(taskPath);
-  if (inFlight) return inFlight;
-
-  const promise = fetchCheckRuns(taskPath);
-  pending.set(taskPath, promise);
-
-  try {
-    const status = await promise;
-    cache.set(taskPath, status);
-
-    const taskListeners = listeners.get(taskPath);
-    if (taskListeners) {
-      for (const listener of taskListeners) {
-        try {
-          listener(status);
-        } catch {}
-      }
-    }
-
-    return status;
-  } finally {
-    pending.delete(taskPath);
-  }
-}
-
-export async function refreshAllSubscribedCheckRuns(): Promise<void> {
-  const paths = Array.from(listeners.keys());
-  await Promise.all(paths.map(refreshCheckRuns));
-}
-
-export function subscribeToCheckRuns(taskPath: string, listener: Listener): () => void {
-  const set = listeners.get(taskPath) || new Set<Listener>();
-  set.add(listener);
-  listeners.set(taskPath, set);
-
-  const cached = cache.get(taskPath);
-  if (cached !== undefined) {
-    try {
-      listener(cached);
-    } catch {}
-  }
-
-  if (!cache.has(taskPath) && !pending.has(taskPath)) {
-    refreshCheckRuns(taskPath);
-  }
-
-  return () => {
-    const taskListeners = listeners.get(taskPath);
-    if (taskListeners) {
-      taskListeners.delete(listener);
-      if (taskListeners.size === 0) {
-        listeners.delete(taskPath);
-        cache.delete(taskPath);
-      }
-    }
-  };
-}
diff --git a/src/renderer/lib/commit-history-invalidation.ts b/src/renderer/lib/commit-history-invalidation.ts
new file mode 100644
index 0000000000..ac309ae8a2
--- /dev/null
+++ b/src/renderer/lib/commit-history-invalidation.ts
@@ -0,0 +1,12 @@
+import { gitRefChangedChannel } from '@shared/events/gitEvents';
+import { events } from '@renderer/lib/ipc';
+import { queryClient } from '@renderer/lib/query-client';
+
+export function wireCommitHistoryInvalidation(): void {
+  events.on(gitRefChangedChannel, (p) => {
+    if (p.kind !== 'remote-refs') return;
+    queryClient.invalidateQueries({
+      predicate: (query) => query.queryKey[1] === 'pr-commits',
+    });
+  });
+}
diff --git a/src/renderer/lib/components/add-ssh-conn-modal.tsx b/src/renderer/lib/components/add-ssh-conn-modal.tsx
new file mode 100644
index 0000000000..2fdfa51ea5
--- /dev/null
+++ b/src/renderer/lib/components/add-ssh-conn-modal.tsx
@@ -0,0 +1,457 @@
+import { useForm } from '@tanstack/react-form';
+import {
+  ArrowLeftIcon,
+  CheckCircle2,
+  ChevronDown,
+  ChevronUp,
+  LoaderCircle,
+  XCircle,
+} from 'lucide-react';
+import { useState } from 'react';
+import * as z from 'zod';
+import type { ConnectionTestResult, SshConfig } from '@shared/ssh';
+import type { BaseModalProps } from '@renderer/lib/modal/modal-provider';
+import { appState } from '@renderer/lib/stores/app-state';
+import { Button } from '@renderer/lib/ui/button';
+import { ConfirmButton } from '@renderer/lib/ui/confirm-button';
+import {
+  DialogContentArea,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+} from '@renderer/lib/ui/dialog';
+import {
+  Field,
+  FieldDescription,
+  FieldError,
+  FieldGroup,
+  FieldLabel,
+  FieldLegend,
+  FieldSet,
+} from '@renderer/lib/ui/field';
+import { Input } from '@renderer/lib/ui/input';
+import { ModalLayout } from '@renderer/lib/ui/modal-layout';
+import { RadioGroup, RadioGroupItem } from '@renderer/lib/ui/radio-group';
+
+export interface AddSshConnModalProps extends BaseModalProps<{ connectionId: string }> {
+  initialConfig?: SshConfig;
+}
+
+const formSchema = z
+  .object({
+    name: z.string().min(1, 'Name is required'),
+    host: z
+      .string()
+      .min(1, 'Host is required')
+      .regex(/^[a-zA-Z0-9._\-[\]:]+$/, 'Invalid hostname or IP address'),
+    port: z
+      .number()
+      .int()
+      .min(1, 'Port must be at least 1')
+      .max(65535, 'Port must be at most 65535'),
+    username: z.string().min(1, 'Username is required'),
+    authType: z.enum(['password', 'key', 'agent']),
+    password: z.string(),
+    privateKeyPath: z.string(),
+    passphrase: z.string(),
+    isEditing: z.boolean(),
+  })
+  .superRefine((val, ctx) => {
+    if (val.authType === 'password' && !val.password && !val.isEditing) {
+      ctx.addIssue({
+        code: z.ZodIssueCode.custom,
+        message: 'Password is required',
+        path: ['password'],
+      });
+    }
+    if (val.authType === 'key' && !val.privateKeyPath) {
+      ctx.addIssue({
+        code: z.ZodIssueCode.custom,
+        message: 'Private key path is required',
+        path: ['privateKeyPath'],
+      });
+    }
+  });
+
+type AuthType = 'password' | 'key' | 'agent';
+type TestState = 'idle' | 'testing' | 'success' | 'error';
+
+export function AddSshConnModal({ onSuccess, onClose, initialConfig }: AddSshConnModalProps) {
+  const sshConnections = appState.sshConnections;
+  const isEditing = !!initialConfig;
+
+  const [testState, setTestState] = useState<TestState>('idle');
+  const [testResult, setTestResult] = useState<ConnectionTestResult | null>(null);
+  const [showDebugLogs, setShowDebugLogs] = useState(false);
+  const [isSubmitting, setIsSubmitting] = useState(false);
+
+  const form = useForm({
+    defaultValues: {
+      name: initialConfig?.name ?? '',
+      host: initialConfig?.host ?? '',
+      port: initialConfig?.port ?? 22,
+      username: initialConfig?.username ?? '',
+      authType: (initialConfig?.authType ?? 'password') as AuthType,
+      password: '',
+      privateKeyPath: initialConfig?.privateKeyPath ?? '',
+      passphrase: '',
+      isEditing,
+    },
+    validators: {
+      onSubmit: formSchema,
+    },
+    onSubmit: async ({ value }) => {
+      setIsSubmitting(true);
+      try {
+        const config: Partial<Pick<SshConfig, 'id'>> &
+          Omit<SshConfig, 'id'> & { password?: string; passphrase?: string } = {
+          id: initialConfig?.id,
+          name: value.name,
+          host: value.host,
+          port: value.port,
+          username: value.username,
+          authType: value.authType,
+          privateKeyPath: value.authType === 'key' ? value.privateKeyPath : undefined,
+          useAgent: value.authType === 'agent',
+          password: value.authType === 'password' ? value.password : undefined,
+          passphrase: value.authType === 'key' ? value.passphrase : undefined,
+        };
+        const saved = await sshConnections.saveConnection(config);
+        onSuccess({ connectionId: saved.id });
+      } finally {
+        setIsSubmitting(false);
+      }
+    },
+  });
+
+  const buildTestConfig = (): SshConfig & { password?: string; passphrase?: string } => {
+    const v = form.state.values;
+    return {
+      id: '',
+      name: v.name,
+      host: v.host,
+      port: v.port,
+      username: v.username,
+      authType: v.authType,
+      privateKeyPath: v.authType === 'key' ? v.privateKeyPath : undefined,
+      useAgent: v.authType === 'agent',
+      password: v.authType === 'password' ? v.password : undefined,
+      passphrase: v.authType === 'key' ? v.passphrase : undefined,
+    };
+  };
+
+  const handleTestConnection = async () => {
+    setTestState('testing');
+    setTestResult(null);
+    setShowDebugLogs(false);
+    try {
+      const result = await sshConnections.testConnection(buildTestConfig());
+      setTestResult(result);
+      setTestState(result.success ? 'success' : 'error');
+    } catch (err) {
+      setTestState('error');
+      setTestResult({ success: false, error: String(err) });
+    }
+  };
+
+  return (
+    <ModalLayout
+      header={
+        <DialogHeader
+          showCloseButton={false}
+          className="flex-row items-center gap-2 -mt-2 w-full justify-between"
+        >
+          <div className="flex items-center gap-2 -ml-2">
+            <Button variant="ghost" size="icon-sm" onClick={onClose}>
+              <ArrowLeftIcon className="w-4 h-4" />
+            </Button>
+            <DialogTitle>{isEditing ? 'Edit SSH Connection' : 'Add SSH Connection'}</DialogTitle>
+          </div>
+        </DialogHeader>
+      }
+      footer={
+        <DialogFooter className="sm:justify-between">
+          <Button
+            type="button"
+            variant="outline"
+            onClick={handleTestConnection}
+            disabled={testState === 'testing'}
+          >
+            {testState === 'testing' ? (
+              <>
+                <LoaderCircle className="size-4 animate-spin" />
+                Testing…
+              </>
+            ) : (
+              'Test Connection'
+            )}
+          </Button>
+          <div className="flex gap-2">
+            <ConfirmButton type="submit" form="add-ssh-conn-form" disabled={isSubmitting}>
+              {isSubmitting ? (
+                <>
+                  <LoaderCircle className="size-4 animate-spin" />
+                  Saving…
+                </>
+              ) : (
+                'Save'
+              )}
+            </ConfirmButton>
+          </div>
+        </DialogFooter>
+      }
+    >
+      <DialogContentArea>
+        <form
+          id="add-ssh-conn-form"
+          onSubmit={(e) => {
+            e.preventDefault();
+            form.handleSubmit();
+          }}
+        >
+          <FieldGroup>
+            {/* Connection name */}
+            <form.Field name="name">
+              {(field) => {
+                const isInvalid = field.state.meta.isTouched && !field.state.meta.isValid;
+                return (
+                  <Field data-invalid={isInvalid}>
+                    <FieldLabel htmlFor={field.name}>Connection Name</FieldLabel>
+                    <Input
+                      id={field.name}
+                      name={field.name}
+                      value={field.state.value}
+                      onBlur={field.handleBlur}
+                      onChange={(e) => field.handleChange(e.target.value)}
+                      aria-invalid={isInvalid}
+                      placeholder="My Server"
+                    />
+                    {isInvalid && <FieldError errors={field.state.meta.errors} />}
+                  </Field>
+                );
+              }}
+            </form.Field>
+
+            {/* Host + Port */}
+            <div className="grid grid-cols-[1fr_6rem] gap-3">
+              <form.Field name="host">
+                {(field) => {
+                  const isInvalid = field.state.meta.isTouched && !field.state.meta.isValid;
+                  return (
+                    <Field data-invalid={isInvalid}>
+                      <FieldLabel htmlFor={field.name}>Host</FieldLabel>
+                      <Input
+                        id={field.name}
+                        name={field.name}
+                        value={field.state.value}
+                        onBlur={field.handleBlur}
+                        onChange={(e) => field.handleChange(e.target.value)}
+                        aria-invalid={isInvalid}
+                        placeholder="example.com"
+                      />
+                      {isInvalid && <FieldError errors={field.state.meta.errors} />}
+                    </Field>
+                  );
+                }}
+              </form.Field>
+              <form.Field name="port">
+                {(field) => {
+                  const isInvalid = field.state.meta.isTouched && !field.state.meta.isValid;
+                  return (
+                    <Field data-invalid={isInvalid}>
+                      <FieldLabel htmlFor={field.name}>Port</FieldLabel>
+                      <Input
+                        id={field.name}
+                        name={field.name}
+                        type="number"
+                        value={field.state.value}
+                        onBlur={field.handleBlur}
+                        onChange={(e) => field.handleChange(Number(e.target.value))}
+                        aria-invalid={isInvalid}
+                      />
+                      {isInvalid && <FieldError errors={field.state.meta.errors} />}
+                    </Field>
+                  );
+                }}
+              </form.Field>
+            </div>
+
+            {/* Username */}
+            <form.Field name="username">
+              {(field) => {
+                const isInvalid = field.state.meta.isTouched && !field.state.meta.isValid;
+                return (
+                  <Field data-invalid={isInvalid}>
+                    <FieldLabel htmlFor={field.name}>Username</FieldLabel>
+                    <Input
+                      id={field.name}
+                      name={field.name}
+                      value={field.state.value}
+                      onBlur={field.handleBlur}
+                      onChange={(e) => field.handleChange(e.target.value)}
+                      aria-invalid={isInvalid}
+                      placeholder="ubuntu"
+                      autoComplete="off"
+                    />
+                    {isInvalid && <FieldError errors={field.state.meta.errors} />}
+                  </Field>
+                );
+              }}
+            </form.Field>
+
+            {/* Auth type */}
+            <form.Field name="authType">
+              {(field) => (
+                <FieldSet>
+                  <FieldLegend variant="label">Authentication</FieldLegend>
+                  <RadioGroup
+                    value={field.state.value}
+                    onValueChange={(v) => field.handleChange(v as AuthType)}
+                    className="grid-cols-3"
+                  >
+                    {(['password', 'key', 'agent'] as const).map((type) => (
+                      <label
+                        key={type}
+                        className="flex cursor-pointer items-center gap-2 text-sm font-normal"
+                      >
+                        <RadioGroupItem value={type} />
+                        {type === 'password' ? 'Password' : type === 'key' ? 'SSH Key' : 'Agent'}
+                      </label>
+                    ))}
+                  </RadioGroup>
+                </FieldSet>
+              )}
+            </form.Field>
+
+            {/* Auth credential fields — reactive to authType */}
+            <form.Subscribe selector={(state) => state.values.authType}>
+              {(authType) => {
+                if (authType === 'password') {
+                  return (
+                    <form.Field name="password">
+                      {(field) => {
+                        const isInvalid = field.state.meta.isTouched && !field.state.meta.isValid;
+                        return (
+                          <Field data-invalid={isInvalid}>
+                            <FieldLabel htmlFor={field.name}>Password</FieldLabel>
+                            <Input
+                              id={field.name}
+                              name={field.name}
+                              type="password"
+                              value={field.state.value ?? ''}
+                              onBlur={field.handleBlur}
+                              onChange={(e) => field.handleChange(e.target.value)}
+                              aria-invalid={isInvalid}
+                              autoComplete="current-password"
+                              placeholder={isEditing ? 'Leave blank to keep existing' : undefined}
+                            />
+                            {isInvalid && <FieldError errors={field.state.meta.errors} />}
+                          </Field>
+                        );
+                      }}
+                    </form.Field>
+                  );
+                }
+
+                if (authType === 'key') {
+                  return (
+                    <>
+                      <form.Field name="privateKeyPath">
+                        {(field) => {
+                          const isInvalid = field.state.meta.isTouched && !field.state.meta.isValid;
+                          return (
+                            <Field data-invalid={isInvalid}>
+                              <FieldLabel htmlFor={field.name}>Private Key Path</FieldLabel>
+                              <Input
+                                id={field.name}
+                                name={field.name}
+                                value={field.state.value ?? ''}
+                                onBlur={field.handleBlur}
+                                onChange={(e) => field.handleChange(e.target.value)}
+                                aria-invalid={isInvalid}
+                                placeholder="~/.ssh/id_rsa"
+                              />
+                              {isInvalid && <FieldError errors={field.state.meta.errors} />}
+                            </Field>
+                          );
+                        }}
+                      </form.Field>
+                      <form.Field name="passphrase">
+                        {(field) => (
+                          <Field>
+                            <FieldLabel htmlFor={field.name}>Passphrase</FieldLabel>
+                            <Input
+                              id={field.name}
+                              name={field.name}
+                              type="password"
+                              value={field.state.value ?? ''}
+                              onBlur={field.handleBlur}
+                              onChange={(e) => field.handleChange(e.target.value)}
+                              placeholder={isEditing ? 'Leave blank to keep existing' : 'Optional'}
+                              autoComplete="off"
+                            />
+                            {!isEditing && (
+                              <FieldDescription>
+                                Leave empty if your key has no passphrase.
+                              </FieldDescription>
+                            )}
+                          </Field>
+                        )}
+                      </form.Field>
+                    </>
+                  );
+                }
+
+                return (
+                  <FieldDescription>
+                    The SSH agent running on this machine will be used for authentication. Make sure
+                    your key is loaded into the agent.
+                  </FieldDescription>
+                );
+              }}
+            </form.Subscribe>
+          </FieldGroup>
+        </form>
+        {/* Test connection result */}
+        {testState !== 'idle' && (
+          <div className="rounded-md border border-input px-3 py-2 text-sm">
+            <div className="flex items-center gap-2">
+              {testState === 'testing' && (
+                <LoaderCircle className="size-4 animate-spin text-muted-foreground" />
+              )}
+              {testState === 'success' && <CheckCircle2 className="size-4 text-green-500" />}
+              {testState === 'error' && <XCircle className="size-4 text-destructive" />}
+              <span className="flex-1 font-medium">
+                {testState === 'testing' && 'Testing connection…'}
+                {testState === 'success' &&
+                  'Connected' + (testResult?.latency ? ' (' + testResult.latency + 'ms)' : '')}
+                {testState === 'error' && (testResult?.error ?? 'Connection failed')}
+              </span>
+              {testState === 'error' &&
+                testResult?.debugLogs &&
+                testResult.debugLogs.length > 0 && (
+                  <button
+                    type="button"
+                    onClick={() => setShowDebugLogs((v) => !v)}
+                    className="flex items-center gap-1 text-xs text-muted-foreground hover:text-foreground"
+                  >
+                    {showDebugLogs ? (
+                      <ChevronUp className="size-3" />
+                    ) : (
+                      <ChevronDown className="size-3" />
+                    )}
+                    Logs
+                  </button>
+                )}
+            </div>
+            {showDebugLogs && testResult?.debugLogs && (
+              <pre className="mt-2 max-h-32 overflow-y-auto rounded bg-muted px-2 py-1.5 text-xs text-muted-foreground">
+                {testResult.debugLogs.join('\n')}
+              </pre>
+            )}
+          </div>
+        )}
+      </DialogContentArea>
+    </ModalLayout>
+  );
+}
diff --git a/src/renderer/lib/components/agent-logo.tsx b/src/renderer/lib/components/agent-logo.tsx
new file mode 100644
index 0000000000..dfddf662e9
--- /dev/null
+++ b/src/renderer/lib/components/agent-logo.tsx
@@ -0,0 +1,53 @@
+import React from 'react';
+import { useTheme } from '../hooks/useTheme';
+
+interface AgentLogoProps {
+  logo: string;
+  alt: string;
+  isSvg?: boolean;
+  invertInDark?: boolean;
+  className?: string;
+  grayscale?: boolean;
+}
+
+/** Renders an agent logo — handles both raw SVG strings and image URLs with theme awareness. */
+const AgentLogo: React.FC<AgentLogoProps> = ({
+  logo,
+  alt,
+  isSvg,
+  invertInDark,
+  className = 'h-4 w-4',
+  grayscale,
+}) => {
+  const { effectiveTheme } = useTheme();
+  const isDark = effectiveTheme === 'emdark';
+
+  const resolvedIsSvg = isSvg ?? logo.trimStart().startsWith('<svg');
+
+  if (resolvedIsSvg) {
+    const processed = isDark
+      ? logo
+          .replace(/\bfill="[^"]*"/g, 'fill="currentColor"')
+          .replace(/\bstroke="[^"]*"/g, 'stroke="currentColor"')
+      : logo;
+
+    return (
+      <span
+        role="img"
+        aria-label={alt}
+        className={`inline-flex shrink-0 items-center justify-center [&_svg]:h-full [&_svg]:w-full [&_svg]:shrink-0 ${isDark ? 'text-primary' : ''} ${grayscale ? 'grayscale' : ''} ${className}`}
+        dangerouslySetInnerHTML={{ __html: processed }}
+      />
+    );
+  }
+
+  return (
+    <img
+      src={logo}
+      alt={alt}
+      className={`shrink-0 object-contain ${invertInDark ? 'dark:invert' : ''} ${grayscale ? 'grayscale' : ''} ${className}`}
+    />
+  );
+};
+
+export default AgentLogo;
diff --git a/src/renderer/lib/components/agent-selector/agent-info-card.tsx b/src/renderer/lib/components/agent-selector/agent-info-card.tsx
new file mode 100644
index 0000000000..fd443934b3
--- /dev/null
+++ b/src/renderer/lib/components/agent-selector/agent-info-card.tsx
@@ -0,0 +1,125 @@
+import { ArrowUpRight, Check, Copy } from 'lucide-react';
+import React, { useEffect, useRef, useState } from 'react';
+import {
+  getDescriptionForProvider,
+  getDocUrlForProvider,
+  getInstallCommandForProvider,
+  getProvider,
+} from '@shared/agent-provider-registry';
+import AgentLogo from '@renderer/lib/components/agent-logo';
+import { type UiAgent } from '@renderer/lib/providers/meta';
+import { Button } from '@renderer/lib/ui/button';
+import { agentConfig } from '@renderer/utils/agentConfig';
+
+type Props = {
+  id: UiAgent;
+};
+
+export const AgentInfoCard: React.FC<Props> = ({ id }) => {
+  const provider = getProvider(id);
+  const config = agentConfig[id];
+  const description = getDescriptionForProvider(id);
+  const installCommand = getInstallCommandForProvider(id) ?? 'npm install -g @openai/codex';
+  const docUrl = getDocUrlForProvider(id);
+  const title = provider?.name ?? id;
+  const [copied, setCopied] = useState(false);
+  const copyResetRef = useRef<number | null>(null);
+
+  useEffect(() => {
+    return () => {
+      if (copyResetRef.current !== null) {
+        window.clearTimeout(copyResetRef.current);
+      }
+    };
+  }, []);
+
+  const handleCopyClick = async () => {
+    if (typeof navigator === 'undefined' || !navigator.clipboard?.writeText) {
+      return;
+    }
+
+    try {
+      await navigator.clipboard.writeText(installCommand);
+      setCopied(true);
+      if (copyResetRef.current !== null) {
+        window.clearTimeout(copyResetRef.current);
+      }
+      copyResetRef.current = window.setTimeout(() => {
+        setCopied(false);
+        copyResetRef.current = null;
+      }, 2000);
+    } catch (error) {
+      console.error('Failed to copy install command', error);
+      setCopied(false);
+    }
+  };
+
+  const CopyIndicatorIcon = copied ? Check : Copy;
+
+  return (
+    <div className="w-80 max-w-[20rem] rounded-lg border border-border bg-background p-3 text-foreground shadow-md">
+      <div className="mb-2 flex items-center gap-2">
+        <AgentLogo
+          logo={config.logo}
+          alt={config.alt}
+          isSvg={config.isSvg}
+          invertInDark={config.invertInDark}
+          className="h-5 w-5 rounded-sm"
+        />
+        <div className="flex items-baseline gap-1 text-sm leading-none">
+          <span className="text-foreground-muted">{config.name}</span>
+          <span className="text-foreground-muted">/</span>
+          <strong className="font-medium text-foreground">{title}</strong>
+        </div>
+      </div>
+
+      {description ? (
+        <p className="mb-2 text-xs leading-relaxed text-foreground-muted">{description}</p>
+      ) : null}
+
+      {docUrl ? (
+        <div className="mb-2">
+          <a
+            href={docUrl}
+            target="_blank"
+            rel="noreferrer noopener"
+            className="inline-flex items-center gap-1 rounded-md border border-border px-2 py-1 text-xs text-foreground hover:bg-background-1"
+          >
+            <span>Docs</span>
+            <ArrowUpRight className="h-3.5 w-3.5" aria-hidden="true" />
+          </a>
+        </div>
+      ) : null}
+
+      <div className="mb-2">
+        <a
+          href="https://artificialanalysis.ai/insights/coding-agents-comparison"
+          target="_blank"
+          rel="noreferrer noopener"
+          className="inline-flex items-center gap-1 rounded-md border border-border px-2 py-1 text-xs text-foreground hover:bg-background-1"
+        >
+          <span>Compare agents</span>
+          <ArrowUpRight className="h-3.5 w-3.5" aria-hidden="true" />
+        </a>
+      </div>
+
+      <div className="mb-2 flex h-8 items-center justify-between rounded-md border border-border px-2 text-xs text-foreground">
+        <code className="max-w-[calc(100%-2.5rem)] truncate font-mono leading-none">
+          {installCommand}
+        </code>
+        <Button
+          variant="ghost"
+          size="icon-sm"
+          onClick={() => {
+            void handleCopyClick();
+          }}
+          className="ml-2 text-foreground-muted"
+          aria-label={`Copy install command for ${title}`}
+          title={copied ? 'Copied' : 'Copy command'}
+        >
+          <CopyIndicatorIcon className="h-3.5 w-3.5" aria-hidden="true" />
+        </Button>
+      </div>
+    </div>
+  );
+};
diff --git a/src/renderer/lib/components/agent-selector/agent-install-button.tsx b/src/renderer/lib/components/agent-selector/agent-install-button.tsx
new file mode 100644
index 0000000000..ae5560b569
--- /dev/null
+++ b/src/renderer/lib/components/agent-selector/agent-install-button.tsx
@@ -0,0 +1,70 @@
+import { Download, Loader2 } from 'lucide-react';
+import type React from 'react';
+import type { AgentProviderId } from '@shared/agent-provider-registry';
+import { Button } from '@renderer/lib/ui/button';
+import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@renderer/lib/ui/tooltip';
+import { cn } from '@renderer/utils/utils';
+import { getAgentInstallActionState } from './agent-install';
+
+type TooltipSide = 'top' | 'right' | 'bottom' | 'left';
+
+type AgentInstallButtonProps = {
+  agentId: AgentProviderId;
+  canInstall: boolean;
+  isInstalled: boolean;
+  isInstalling: boolean;
+  onInstall: (event: React.MouseEvent<HTMLButtonElement>) => void;
+  disabled?: boolean;
+  className?: string;
+  tooltipSide?: TooltipSide;
+};
+
+export function AgentInstallButton({
+  agentId,
+  canInstall,
+  isInstalled,
+  isInstalling,
+  onInstall,
+  disabled = false,
+  className,
+  tooltipSide = 'right',
+}: AgentInstallButtonProps) {
+  const state = getAgentInstallActionState({
+    agentId,
+    canInstall,
+    isInstalled,
+    isInstalling,
+  });
+
+  if (!state.render) {
+    return null;
+  }
+
+  const InstallIcon = state.installing ? Loader2 : Download;
+
+  return (
+    <TooltipProvider delay={150}>
+      <Tooltip>
+        <TooltipTrigger>
+          <Button
+            type="button"
+            variant="ghost"
+            size="icon-xs"
+            disabled={disabled || state.disabled}
+            aria-label={state.label}
+            onClick={onInstall}
+            className={cn('ml-auto cursor-pointer', className)}
+          >
+            <InstallIcon
+              className={cn('h-3 w-3', state.installing && 'animate-spin')}
+              aria-hidden="true"
+            />
+          </Button>
+        </TooltipTrigger>
+        <TooltipContent side={tooltipSide} className="text-xs">
+          {state.label}
+        </TooltipContent>
+      </Tooltip>
+    </TooltipProvider>
+  );
+}
diff --git a/src/renderer/lib/components/agent-selector/agent-install.ts b/src/renderer/lib/components/agent-selector/agent-install.ts
new file mode 100644
index 0000000000..0963d5a454
--- /dev/null
+++ b/src/renderer/lib/components/agent-selector/agent-install.ts
@@ -0,0 +1,46 @@
+import type { AgentProviderId } from '@shared/agent-provider-registry';
+import type { DependencyInstallError } from '@shared/dependencies';
+import { agentConfig } from '@renderer/utils/agentConfig';
+
+export type AgentInstallActionState = {
+  render: boolean;
+  disabled: boolean;
+  installing: boolean;
+  label: string;
+};
+
+export function getAgentInstallErrorMessage(error: DependencyInstallError): string {
+  switch (error.type) {
+    case 'permission-denied':
+      return error.message;
+    case 'command-failed':
+      return error.output ? `${error.message} ${error.output}` : error.message;
+    case 'pty-open-failed':
+      return error.message;
+    case 'unknown-dependency':
+      return `Unknown dependency: ${error.id}`;
+    case 'no-install-command':
+      return `No install command is available for ${error.id}.`;
+    case 'not-detected-after-install':
+      return 'The agent was not detected after installation.';
+  }
+}
+
+export function getAgentInstallActionState({
+  agentId,
+  canInstall,
+  isInstalled,
+  isInstalling,
+}: {
+  agentId: AgentProviderId;
+  canInstall: boolean;
+  isInstalled: boolean;
+  isInstalling: boolean;
+}): AgentInstallActionState {
+  return {
+    render: canInstall && !isInstalled,
+    disabled: isInstalling,
+    installing: isInstalling,
+    label: `Install ${agentConfig[agentId].name}`,
+  };
+}
diff --git a/src/renderer/lib/components/agent-selector/agent-selector-options.ts b/src/renderer/lib/components/agent-selector/agent-selector-options.ts
new file mode 100644
index 0000000000..1595dcfd40
--- /dev/null
+++ b/src/renderer/lib/components/agent-selector/agent-selector-options.ts
@@ -0,0 +1,67 @@
+import type { AgentProviderId } from '@shared/agent-provider-registry';
+import { agentConfig } from '@renderer/utils/agentConfig';
+import { getAgentInstallActionState } from './agent-install';
+
+export interface AgentOption {
+  value: string;
+  label: string;
+  agentId: AgentProviderId;
+  disabled: boolean;
+}
+
+export interface AgentGroup {
+  value: string;
+  label: string;
+  items: AgentOption[];
+}
+
+export function buildAgentGroups(
+  installedAgents: string[],
+  assumedInstalledAgents: string[] = []
+): AgentGroup[] {
+  const installedSet = new Set(
+    [...installedAgents, ...assumedInstalledAgents].filter((id) => id in agentConfig)
+  );
+  const allAgentIds = Object.keys(agentConfig) as AgentProviderId[];
+
+  const installedOptions: AgentOption[] = allAgentIds
+    .filter((id) => installedSet.has(id))
+    .map((id) => ({ value: id, label: agentConfig[id].name, agentId: id, disabled: false }));
+
+  const notInstalledOptions: AgentOption[] = allAgentIds
+    .filter((id) => !installedSet.has(id))
+    .map((id) => ({ value: id, label: agentConfig[id].name, agentId: id, disabled: true }));
+
+  return [
+    { value: 'installed', label: 'Installed', items: installedOptions },
+    { value: 'not-installed', label: 'Not installed', items: notInstalledOptions },
+  ].filter((group) => group.items.length > 0);
+}
+
+export function canInstallAgentOption(item: AgentOption, allowInstall: boolean): boolean {
+  return allowInstall && item.disabled;
+}
+
+export function getAssumedInstalledAgents(
+  value: AgentProviderId | null,
+  dependencyData: Record<string, unknown> | null
+): AgentProviderId[] {
+  return value && dependencyData?.[value] === undefined ? [value] : [];
+}
+
+export function isComboboxOptionDisabled(item: AgentOption): boolean {
+  return item.disabled;
+}
+
+export function getInstallButtonState(
+  item: AgentOption,
+  allowInstall: boolean,
+  installingAgents: ReadonlySet<AgentProviderId>
+): { render: boolean; disabled: boolean; installing: boolean; label: string } {
+  return getAgentInstallActionState({
+    agentId: item.agentId,
+    canInstall: allowInstall,
+    isInstalled: !item.disabled,
+    isInstalling: installingAgents.has(item.agentId),
+  });
+}
diff --git a/src/renderer/lib/components/agent-selector/agent-selector.test.ts b/src/renderer/lib/components/agent-selector/agent-selector.test.ts
new file mode 100644
index 0000000000..cee1599b7a
--- /dev/null
+++ b/src/renderer/lib/components/agent-selector/agent-selector.test.ts
@@ -0,0 +1,149 @@
+import { describe, expect, it } from 'vitest';
+import { getAgentInstallActionState, getAgentInstallErrorMessage } from './agent-install';
+import {
+  buildAgentGroups,
+  canInstallAgentOption,
+  getAssumedInstalledAgents,
+  getInstallButtonState,
+  isComboboxOptionDisabled,
+} from './agent-selector-options';
+
+describe('buildAgentGroups', () => {
+  it('marks installed agents selectable and uninstalled agents disabled', () => {
+    const groups = buildAgentGroups(['codex']);
+
+    expect(groups.find((group) => group.value === 'installed')?.items).toEqual(
+      expect.arrayContaining([expect.objectContaining({ agentId: 'codex', disabled: false })])
+    );
+    expect(groups.find((group) => group.value === 'not-installed')?.items).toEqual(
+      expect.arrayContaining([expect.objectContaining({ agentId: 'claude', disabled: true })])
+    );
+  });
+
+  it('keeps the selected agent installed while availability is still unknown', () => {
+    const groups = buildAgentGroups([], ['codex']);
+
+    expect(groups.find((group) => group.value === 'installed')?.items).toEqual([
+      expect.objectContaining({ agentId: 'codex', disabled: false }),
+    ]);
+    expect(groups.find((group) => group.value === 'not-installed')?.items).not.toEqual(
+      expect.arrayContaining([expect.objectContaining({ agentId: 'codex' })])
+    );
+  });
+
+  it('keeps the selected agent installed when dependency data is partial', () => {
+    const assumedInstalledAgents = getAssumedInstalledAgents('codex', {
+      claude: {
+        id: 'claude',
+        category: 'agent',
+        status: 'available',
+        version: '1.0.0',
+        path: '/bin/claude',
+        checkedAt: 1,
+      },
+    });
+    const groups = buildAgentGroups(['claude'], assumedInstalledAgents);
+
+    expect(groups.find((group) => group.value === 'installed')?.items).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({ agentId: 'claude', disabled: false }),
+        expect.objectContaining({ agentId: 'codex', disabled: false }),
+      ])
+    );
+    expect(groups.find((group) => group.value === 'not-installed')?.items).not.toEqual(
+      expect.arrayContaining([expect.objectContaining({ agentId: 'codex' })])
+    );
+  });
+
+  it('keeps inline-install rows disabled while allowing install actions', () => {
+    const item = buildAgentGroups(['codex'])
+      .find((group) => group.value === 'not-installed')
+      ?.items.find((option) => option.agentId === 'claude');
+
+    expect(item).toBeDefined();
+    expect(canInstallAgentOption(item!, true)).toBe(true);
+    expect(isComboboxOptionDisabled(item!)).toBe(true);
+    expect(getInstallButtonState(item!, true, new Set())).toEqual({
+      render: true,
+      disabled: false,
+      installing: false,
+      label: 'Install Claude Code',
+    });
+  });
+
+  it('maps permission install errors to friendly copy', () => {
+    expect(
+      getAgentInstallErrorMessage({
+        type: 'permission-denied',
+        message: 'User does not have sufficient permissions.',
+        output: 'permission denied',
+        exitCode: 243,
+      })
+    ).toBe('User does not have sufficient permissions.');
+  });
+
+  it('supports non-combobox install actions', () => {
+    expect(
+      getAgentInstallActionState({
+        agentId: 'cursor',
+        canInstall: true,
+        isInstalled: false,
+        isInstalling: true,
+      })
+    ).toEqual({
+      render: true,
+      disabled: true,
+      installing: true,
+      label: 'Install Cursor',
+    });
+
+    expect(
+      getAgentInstallActionState({
+        agentId: 'cursor',
+        canInstall: true,
+        isInstalled: true,
+        isInstalling: false,
+      }).render
+    ).toBe(false);
+  });
+
+  it('only disables the actively installing agent button', () => {
+    const notInstalledItems =
+      buildAgentGroups(['codex']).find((group) => group.value === 'not-installed')?.items ?? [];
+    const claude = notInstalledItems.find((option) => option.agentId === 'claude')!;
+    const qwen = notInstalledItems.find((option) => option.agentId === 'qwen')!;
+
+    expect(getInstallButtonState(claude, true, new Set(['claude']))).toEqual({
+      render: true,
+      disabled: true,
+      installing: true,
+      label: 'Install Claude Code',
+    });
+    expect(getInstallButtonState(qwen, true, new Set(['claude']))).toEqual({
+      render: true,
+      disabled: false,
+      installing: false,
+      label: 'Install Qwen Code',
+    });
+  });
+
+  it('supports multiple active installs at the same time', () => {
+    const notInstalledItems =
+      buildAgentGroups(['codex']).find((group) => group.value === 'not-installed')?.items ?? [];
+    const claude = notInstalledItems.find((option) => option.agentId === 'claude')!;
+    const qwen = notInstalledItems.find((option) => option.agentId === 'qwen')!;
+
+    expect(getInstallButtonState(claude, true, new Set(['claude', 'qwen']))).toEqual({
+      render: true,
+      disabled: true,
+      installing: true,
+      label: 'Install Claude Code',
+    });
+    expect(getInstallButtonState(qwen, true, new Set(['claude', 'qwen']))).toEqual({
+      render: true,
+      disabled: true,
+      installing: true,
+      label: 'Install Qwen Code',
+    });
+  });
+});
diff --git a/src/renderer/lib/components/agent-selector/agent-selector.tsx b/src/renderer/lib/components/agent-selector/agent-selector.tsx
new file mode 100644
index 0000000000..6798b004da
--- /dev/null
+++ b/src/renderer/lib/components/agent-selector/agent-selector.tsx
@@ -0,0 +1,160 @@
+import { observer } from 'mobx-react-lite';
+import React, { useMemo, useState } from 'react';
+import { AgentProviderId } from '@shared/agent-provider-registry';
+import AgentLogo from '@renderer/lib/components/agent-logo';
+import {
+  Combobox,
+  ComboboxCollection,
+  ComboboxContent,
+  ComboboxGroup,
+  ComboboxInput,
+  ComboboxItem,
+  ComboboxLabel,
+  ComboboxList,
+  ComboboxTrigger,
+} from '@renderer/lib/ui/combobox';
+import { agentConfig } from '@renderer/utils/agentConfig';
+import { cn } from '@renderer/utils/utils';
+import { AgentInstallButton } from './agent-install-button';
+import {
+  canInstallAgentOption,
+  isComboboxOptionDisabled,
+  type AgentGroup,
+  type AgentOption,
+} from './agent-selector-options';
+import { AgentTooltipRow } from './agent-tooltip-row';
+import { useAgentAvailability } from './use-agent-availability';
+
+interface AgentSelectorProps {
+  value: AgentProviderId | null;
+  onChange: (agent: AgentProviderId) => void;
+  disabled?: boolean;
+  className?: string;
+  connectionId?: string;
+  installable?: boolean;
+}
+
+export const AgentSelector: React.FC<AgentSelectorProps> = observer(
+  ({ value, onChange, disabled = false, className = '', connectionId, installable = true }) => {
+    const [open, setOpen] = useState(false);
+    const { groups, installingAgents, installAgent } = useAgentAvailability({
+      connectionId,
+      value,
+    });
+    const allOptions = useMemo(() => groups.flatMap((group) => group.items), [groups]);
+
+    const selectedConfig = value ? agentConfig[value] : null;
+    const selectedOption = value ? allOptions.find((o) => o.value === value) : null;
+
+    function handleValueChange(item: AgentOption | null) {
+      if (!item || disabled || item.disabled) return;
+      onChange(item.agentId);
+      setOpen(false);
+    }
+
+    return (
+      <div className={cn('relative block min-w-0', className)}>
+        <Combobox
+          items={groups}
+          value={selectedOption ?? null}
+          onValueChange={handleValueChange}
+          open={open}
+          onOpenChange={disabled ? undefined : setOpen}
+          isItemEqualToValue={(a: AgentOption, b: AgentOption) => a.value === b.value}
+          filter={(item: AgentOption, query) =>
+            item.label.toLowerCase().includes(query.toLowerCase())
+          }
+          autoHighlight
+        >
+          <ComboboxTrigger
+            disabled={disabled}
+            className={cn(
+              'flex h-9 w-full min-w-0 items-center gap-2 rounded-md border border-border bg-transparent px-2.5 py-1 text-sm outline-none',
+              disabled && 'cursor-not-allowed opacity-60'
+            )}
+          >
+            {selectedConfig ? (
+              <>
+                <AgentLogo
+                  logo={selectedConfig.logo}
+                  alt={selectedConfig.alt}
+                  isSvg={selectedConfig.isSvg}
+                  invertInDark={selectedConfig.invertInDark}
+                  className="h-4 w-4 shrink-0 rounded-sm"
+                />
+                <span className="flex-1 truncate text-left">{selectedConfig.name}</span>
+              </>
+            ) : (
+              <span className="flex-1 truncate text-foreground-muted">No agent installed</span>
+            )}
+          </ComboboxTrigger>
+          <ComboboxContent className="min-w-(--anchor-width)">
+            <ComboboxInput showTrigger={false} placeholder="Search agents..." />
+            <ComboboxList className="pb-0">
+              {(group: AgentGroup) => (
+                <ComboboxGroup key={group.value} items={group.items} className="py-1">
+                  <ComboboxLabel>{group.label}</ComboboxLabel>
+                  <ComboboxCollection>
+                    {(item: AgentOption) => {
+                      const config = agentConfig[item.agentId];
+                      const showInstall = canInstallAgentOption(item, installable);
+                      return (
+                        <AgentTooltipRow key={item.value} id={item.agentId}>
+                          <ComboboxItem
+                            value={item}
+                            disabled={isComboboxOptionDisabled(item)}
+                            className={cn(
+                              'group/agent-row',
+                              item.disabled &&
+                                'data-disabled:pointer-events-auto data-disabled:cursor-not-allowed',
+                              showInstall && 'data-disabled:opacity-100'
+                            )}
+                          >
+                            {config && (
+                              <AgentLogo
+                                logo={config.logo}
+                                alt={config.alt}
+                                isSvg={config.isSvg}
+                                invertInDark={config.invertInDark}
+                                className={cn(
+                                  'h-4 w-4 shrink-0 rounded-sm',
+                                  showInstall && 'opacity-50'
+                                )}
+                              />
+                            )}
+                            <span
+                              className={cn(
+                                'min-w-0 flex-1 truncate',
+                                showInstall && 'text-foreground-muted'
+                              )}
+                            >
+                              {item.label}
+                            </span>
+                            <AgentInstallButton
+                              agentId={item.agentId}
+                              canInstall={installable}
+                              isInstalled={!item.disabled}
+                              isInstalling={installingAgents.has(item.agentId)}
+                              disabled={disabled}
+                              className="size-6"
+                              onInstall={(event) => {
+                                event.preventDefault();
+                                event.stopPropagation();
+                                if (disabled) return;
+                                void installAgent(item.agentId);
+                              }}
+                            />
+                          </ComboboxItem>
+                        </AgentTooltipRow>
+                      );
+                    }}
+                  </ComboboxCollection>
+                </ComboboxGroup>
+              )}
+            </ComboboxList>
+          </ComboboxContent>
+        </Combobox>
+      </div>
+    );
+  }
+);
diff --git a/src/renderer/lib/components/agent-selector/agent-tooltip-row.tsx b/src/renderer/lib/components/agent-selector/agent-tooltip-row.tsx
new file mode 100644
index 0000000000..708235e551
--- /dev/null
+++ b/src/renderer/lib/components/agent-selector/agent-tooltip-row.tsx
@@ -0,0 +1,32 @@
+import React from 'react';
+import { type UiAgent } from '@renderer/lib/providers/meta';
+import { Popover, PopoverContent, PopoverTrigger } from '@renderer/lib/ui/popover';
+import { AgentInfoCard } from './agent-info-card';
+
+interface AgentTooltipRowProps {
+  id: UiAgent;
+  children: React.ReactElement;
+  side?: 'top' | 'bottom' | 'left' | 'right';
+  align?: 'start' | 'center' | 'end';
+}
+
+export const AgentTooltipRow: React.FC<AgentTooltipRowProps> = ({
+  id,
+  children,
+  side = 'right',
+  align = 'start',
+}) => {
+  return (
+    <Popover>
+      <PopoverTrigger openOnHover nativeButton={false} delay={0} closeDelay={0} render={children} />
+      <PopoverContent
+        side={side}
+        align={align}
+        sideOffset={8}
+        className="w-auto border border-border bg-background p-0 text-foreground shadow-lg"
+      >
+        <AgentInfoCard id={id} />
+      </PopoverContent>
+    </Popover>
+  );
+};
diff --git a/src/renderer/lib/components/agent-selector/use-agent-availability.ts b/src/renderer/lib/components/agent-selector/use-agent-availability.ts
new file mode 100644
index 0000000000..32f202404e
--- /dev/null
+++ b/src/renderer/lib/components/agent-selector/use-agent-availability.ts
@@ -0,0 +1,71 @@
+import { useMemo } from 'react';
+import type { AgentProviderId } from '@shared/agent-provider-registry';
+import { useToast } from '@renderer/lib/hooks/use-toast';
+import { appState } from '@renderer/lib/stores/app-state';
+import { agentConfig } from '@renderer/utils/agentConfig';
+import { getAgentInstallErrorMessage } from './agent-install';
+import { buildAgentGroups, getAssumedInstalledAgents } from './agent-selector-options';
+
+export function useAgentAvailability({
+  connectionId,
+  value,
+}: {
+  connectionId?: string;
+  value: AgentProviderId | null;
+}) {
+  const dependencyResource = connectionId
+    ? appState.dependencies.getRemote(connectionId)
+    : appState.dependencies.local;
+  const dependencyData = dependencyResource.data;
+  const { toast } = useToast();
+
+  const installedAgents = useMemo(
+    () =>
+      dependencyData
+        ? Object.entries(dependencyData)
+            .filter(([, state]) => state.category === 'agent' && state.status === 'available')
+            .map(([id]) => id)
+        : [],
+    [dependencyData]
+  );
+
+  const assumedInstalledAgents = useMemo(
+    () => getAssumedInstalledAgents(value, dependencyData),
+    [value, dependencyData]
+  );
+
+  const groups = useMemo(
+    () => buildAgentGroups(installedAgents, assumedInstalledAgents),
+    [installedAgents, assumedInstalledAgents]
+  );
+  const installingAgents = new Set<AgentProviderId>();
+  for (const group of groups) {
+    for (const item of group.items) {
+      if (appState.dependencies.isInstalling(item.agentId, connectionId)) {
+        installingAgents.add(item.agentId);
+      }
+    }
+  }
+
+  async function installAgent(agentId: AgentProviderId): Promise<void> {
+    if (appState.dependencies.isInstalling(agentId, connectionId)) return;
+    const result = await appState.dependencies.install(agentId, connectionId);
+    if (!result.success) {
+      toast({
+        title: 'Install failed',
+        description: getAgentInstallErrorMessage(result.error),
+        variant: 'destructive',
+      });
+      return;
+    }
+
+    toast({ title: 'Agent installed', description: `${agentConfig[agentId].name} is ready.` });
+  }
+
+  return {
+    groups,
+    dependencyData,
+    installingAgents,
+    installAgent,
+  };
+}
diff --git a/src/renderer/lib/components/app-keyboard-shortcuts.tsx b/src/renderer/lib/components/app-keyboard-shortcuts.tsx
new file mode 100644
index 0000000000..be1239df1e
--- /dev/null
+++ b/src/renderer/lib/components/app-keyboard-shortcuts.tsx
@@ -0,0 +1,85 @@
+import { useHotkey } from '@tanstack/react-hotkeys';
+import { useAppSettingsKey } from '@renderer/features/settings/use-app-settings-key';
+import { toast } from '@renderer/lib/hooks/use-toast';
+import {
+  getEffectiveHotkey,
+  getHotkeyRegistration,
+} from '@renderer/lib/hooks/useKeyboardShortcuts';
+import { useTheme } from '@renderer/lib/hooks/useTheme';
+import { useWorkspaceLayoutContext } from '@renderer/lib/layout/layout-provider';
+import {
+  useNavigate,
+  useParams,
+  useWorkspaceSlots,
+} from '@renderer/lib/layout/navigation-provider';
+import { useShowModal } from '@renderer/lib/modal/modal-provider';
+
+/**
+ * Mounts global keyboard shortcut handlers for the entire application.
+ * Renders nothing — exists only to register useHotkey() calls that are always active.
+ * Must be mounted inside all relevant providers (ModalProvider, WorkspaceLayoutContext, etc.).
+ */
+export function AppKeyboardShortcuts() {
+  const { value: keyboard } = useAppSettingsKey('keyboard');
+  const showNewProject = useShowModal('addProjectModal');
+  const showCreateTask = useShowModal('taskModal');
+  const { toggleLeft, toggleRight } = useWorkspaceLayoutContext();
+  const { toggleTheme } = useTheme();
+  const { navigate } = useNavigate();
+  const commandPaletteHotkey = getEffectiveHotkey('commandPalette', keyboard);
+  const settingsHotkey = getEffectiveHotkey('settings', keyboard);
+  const toggleLeftSidebarHotkey = getEffectiveHotkey('toggleLeftSidebar', keyboard);
+  const toggleRightSidebarHotkey = getEffectiveHotkey('toggleRightSidebar', keyboard);
+  const toggleThemeHotkey = getEffectiveHotkey('toggleTheme', keyboard);
+  const newProjectHotkey = getEffectiveHotkey('newProject', keyboard);
+  const newTaskHotkey = getEffectiveHotkey('newTask', keyboard);
+
+  // Resolve current project context from whichever view is active
+  const { currentView } = useWorkspaceSlots();
+  const { params: taskParams } = useParams('task');
+  const { params: projectParams } = useParams('project');
+  const currentProjectId =
+    currentView === 'task'
+      ? taskParams.projectId
+      : currentView === 'project'
+        ? projectParams.projectId
+        : undefined;
+
+  useHotkey(
+    getHotkeyRegistration('commandPalette', keyboard),
+    () => toast({ title: 'CMDK coming soon' }),
+    { enabled: commandPaletteHotkey !== null }
+  );
+
+  useHotkey(getHotkeyRegistration('settings', keyboard), () => navigate('settings'), {
+    enabled: settingsHotkey !== null,
+  });
+
+  useHotkey(getHotkeyRegistration('toggleLeftSidebar', keyboard), () => toggleLeft(), {
+    enabled: toggleLeftSidebarHotkey !== null,
+  });
+
+  useHotkey(getHotkeyRegistration('toggleRightSidebar', keyboard), () => toggleRight(), {
+    enabled: toggleRightSidebarHotkey !== null,
+  });
+
+  useHotkey(getHotkeyRegistration('toggleTheme', keyboard), () => toggleTheme(), {
+    enabled: toggleThemeHotkey !== null,
+  });
+
+  useHotkey(
+    getHotkeyRegistration('newProject', keyboard),
+    () => showNewProject({ strategy: 'local', mode: 'pick' }),
+    { enabled: newProjectHotkey !== null }
+  );
+
+  useHotkey(
+    getHotkeyRegistration('newTask', keyboard),
+    () => {
+      if (currentProjectId) showCreateTask({ projectId: currentProjectId });
+    },
+    { enabled: !!currentProjectId && newTaskHotkey !== null }
+  );
+
+  return null;
+}
diff --git a/src/renderer/lib/components/branch-display.tsx b/src/renderer/lib/components/branch-display.tsx
new file mode 100644
index 0000000000..d4fd08500a
--- /dev/null
+++ b/src/renderer/lib/components/branch-display.tsx
@@ -0,0 +1,31 @@
+import { GitBranch } from 'lucide-react';
+import { cn } from '@renderer/utils/utils';
+
+interface BranchDisplayProps {
+  label: string;
+  branchName: string;
+  className?: string;
+}
+
+export function BranchDisplay({ label, branchName, className }: BranchDisplayProps) {
+  return (
+    <div
+      className={cn(
+        'flex w-full items-center gap-2 justify-between p-2 opacity-60 cursor-not-allowed',
+        className
+      )}
+    >
+      <div className="flex flex-col text-left text-sm gap-0.5">
+        <span className="text-foreground-passive text-xs">{label}</span>
+        <span className="flex items-center gap-1">
+          <GitBranch
+            absoluteStrokeWidth
+            strokeWidth={2}
+            className="size-3.5 shrink-0 text-foreground-muted"
+          />
+          <span>{branchName}</span>
+        </span>
+      </div>
+    </div>
+  );
+}
diff --git a/src/renderer/lib/components/branch-selector.tsx b/src/renderer/lib/components/branch-selector.tsx
new file mode 100644
index 0000000000..52cd0d0dcc
--- /dev/null
+++ b/src/renderer/lib/components/branch-selector.tsx
@@ -0,0 +1,146 @@
+import { GitBranch, RefreshCw } from 'lucide-react';
+import React, { useMemo, useState } from 'react';
+import { Branch } from '@shared/git';
+import { Badge } from '@renderer/lib/ui/badge';
+import {
+  Combobox,
+  ComboboxContent,
+  ComboboxEmpty,
+  ComboboxInput,
+  ComboboxItem,
+  ComboboxList,
+  ComboboxTrigger,
+  ComboboxValue,
+} from '@renderer/lib/ui/combobox';
+import { InputGroupButton } from '@renderer/lib/ui/input-group';
+import { ToggleGroup, ToggleGroupItem } from '@renderer/lib/ui/toggle-group';
+import { cn } from '@renderer/utils/utils';
+import { Tooltip, TooltipContent, TooltipTrigger } from '../ui/tooltip';
+
+interface BranchSelectorProps {
+  branches: Branch[];
+  value?: Branch;
+  onValueChange: (value: Branch) => void;
+  remoteOnly?: boolean;
+  trigger?: React.ReactNode;
+  onRefresh?: () => void;
+  isRefreshing?: boolean;
+}
+
+export function BranchSelector({
+  branches,
+  value,
+  onValueChange,
+  remoteOnly = false,
+  trigger,
+  onRefresh,
+  isRefreshing = false,
+}: BranchSelectorProps) {
+  const [tab, setTab] = useState<'local' | 'remote'>(remoteOnly ? 'remote' : 'local');
+  const inputRef = React.useRef<HTMLInputElement>(null);
+
+  const localCount = useMemo(() => branches.filter((b) => b.type === 'local').length, [branches]);
+  const remoteCount = useMemo(() => branches.filter((b) => b.type === 'remote').length, [branches]);
+
+  const filteredBranches = useMemo(() => branches.filter((b) => b.type === tab), [branches, tab]);
+
+  const options = useMemo(
+    () => filteredBranches.map((branch) => ({ value: branch, label: branch.branch })),
+    [filteredBranches]
+  );
+
+  return (
+    <Combobox
+      items={options}
+      autoHighlight
+      value={value ? { value: value, label: value.branch } : undefined}
+      onValueChange={(v) => v !== null && onValueChange(v.value)}
+      isItemEqualToValue={(a, b) => {
+        if (a.value.type !== b.value.type) return false;
+        if (a.value.branch !== b.value.branch) return false;
+        if (a.value.type === 'remote' && b.value.type === 'remote') {
+          return a.value.remote.name === b.value.remote.name;
+        }
+        return true;
+      }}
+    >
+      {trigger ?? (
+        <ComboboxTrigger className="border flex border-border h-9 hover:bg-muted/30 rounded-md px-2.5 py-1 text-left text-sm outline-none items-center justify-between">
+          <div className="flex items-center gap-2 text-muted-foreground">
+            <GitBranch />
+            <ComboboxValue placeholder="Select a branch" />
+          </div>
+        </ComboboxTrigger>
+      )}
+      <ComboboxContent className="min-w-(--anchor-width) pb-1 border">
+        {!remoteOnly && (
+          <ToggleGroup
+            value={[tab]}
+            onValueChange={([value]) => {
+              if (value) {
+                setTab(value as 'local' | 'remote');
+                inputRef.current?.focus();
+              }
+            }}
+            className="w-full border-0 border-b border-border rounded-b-none bg-transparent"
+          >
+            <ToggleGroupItem
+              value="local"
+              className="group flex-1 flex items-center gap-1 hover:bg-background-quaternary-1 data-pressed:bg-background-quaternary-2"
+              disabled={localCount === 0}
+            >
+              Local
+              <Badge
+                variant="secondary"
+                className="shrink-0 bg-background-2 transition-colors hover:bg-background-quaternary-1 group-data-pressed:bg-background-quaternary-3"
+              >
+                {localCount}
+              </Badge>
+            </ToggleGroupItem>
+            <ToggleGroupItem
+              value="remote"
+              className="group flex-1 flex items-center gap-1 hover:bg-background-quaternary-1 data-pressed:bg-background-quaternary-2"
+              disabled={remoteCount === 0}
+            >
+              Remote
+              <Badge variant="secondary" className="shrink-0 bg-background-2 transition-colors">
+                {remoteCount}
+              </Badge>
+            </ToggleGroupItem>
+          </ToggleGroup>
+        )}
+        <ComboboxInput
+          showTrigger={false}
+          placeholder="Search branches"
+          inputRef={inputRef}
+          rightAddon={
+            onRefresh && (
+              <Tooltip>
+                <TooltipTrigger>
+                  <InputGroupButton
+                    size="icon-xs"
+                    className="text-foreground-muted hover:text-foreground"
+                    onClick={onRefresh}
+                    disabled={isRefreshing}
+                    aria-label="Refresh branches"
+                  >
+                    <RefreshCw className={cn('size-3', isRefreshing && 'animate-spin')} />
+                  </InputGroupButton>
+                </TooltipTrigger>
+                <TooltipContent>Refresh branches</TooltipContent>
+              </Tooltip>
+            )
+          }
+        />
+        <ComboboxList>
+          {(item) => (
+            <ComboboxItem value={item} disabled={item.label.startsWith('_reserve')}>
+              {item.label}
+            </ComboboxItem>
+          )}
+        </ComboboxList>
+        <ComboboxEmpty>{branches.length === 0 ? 'no branches exist' : 'no results'}</ComboboxEmpty>
+      </ComboboxContent>
+    </Combobox>
+  );
+}
diff --git a/src/renderer/lib/components/change-project-connection-modal.tsx b/src/renderer/lib/components/change-project-connection-modal.tsx
new file mode 100644
index 0000000000..4d31929d99
--- /dev/null
+++ b/src/renderer/lib/components/change-project-connection-modal.tsx
@@ -0,0 +1,108 @@
+import { useState } from 'react';
+import { SshConnectionSelector } from '@renderer/features/projects/components/add-project-modal/ssh-connection-selector';
+import { getProjectManagerStore } from '@renderer/features/projects/stores/project-selectors';
+import { useShowModal, type BaseModalProps } from '@renderer/lib/modal/modal-provider';
+import { appState } from '@renderer/lib/stores/app-state';
+import { Button } from '@renderer/lib/ui/button';
+import { ConfirmButton } from '@renderer/lib/ui/confirm-button';
+import {
+  DialogContentArea,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+} from '@renderer/lib/ui/dialog';
+import { Field, FieldLabel } from '@renderer/lib/ui/field';
+import { ModalLayout } from '@renderer/lib/ui/modal-layout';
+
+export interface ChangeProjectConnectionModalProps {
+  projectId: string;
+  currentConnectionId: string;
+}
+
+export function ChangeProjectConnectionModal({
+  projectId,
+  currentConnectionId,
+  onSuccess,
+  onClose,
+}: ChangeProjectConnectionModalProps & BaseModalProps<void>) {
+  const [selectedConnectionId, setSelectedConnectionId] = useState(currentConnectionId);
+  const [isSaving, setIsSaving] = useState(false);
+
+  const showSshConnModal = useShowModal('addSshConnModal');
+  const showChangeConnectionModal = useShowModal('changeProjectConnectionModal');
+
+  const handleAddConnection = () => {
+    showSshConnModal({
+      onSuccess: (result: unknown) => {
+        const newId = (result as { connectionId: string }).connectionId;
+        showChangeConnectionModal({ projectId, currentConnectionId: newId });
+      },
+      onClose: () => {
+        showChangeConnectionModal({ projectId, currentConnectionId: selectedConnectionId });
+      },
+    });
+  };
+
+  const handleEditConnection = (id: string) => {
+    const conn = appState.sshConnections.connections.find((c) => c.id === id);
+    if (!conn) return;
+    showSshConnModal({
+      initialConfig: conn,
+      onSuccess: () => {
+        showChangeConnectionModal({ projectId, currentConnectionId: id });
+      },
+      onClose: () => {
+        showChangeConnectionModal({ projectId, currentConnectionId: id });
+      },
+    });
+  };
+
+  const handleSave = async () => {
+    if (selectedConnectionId === currentConnectionId) {
+      onClose();
+      return;
+    }
+    setIsSaving(true);
+    try {
+      await getProjectManagerStore()?.updateProjectConnection(projectId, selectedConnectionId);
+      onSuccess();
+    } finally {
+      setIsSaving(false);
+    }
+  };
+
+  return (
+    <ModalLayout
+      header={
+        <DialogHeader>
+          <DialogTitle>Change SSH Connection</DialogTitle>
+        </DialogHeader>
+      }
+      footer={
+        <DialogFooter>
+          <Button variant="outline" onClick={onClose} disabled={isSaving}>
+            Cancel
+          </Button>
+          <ConfirmButton
+            onClick={() => void handleSave()}
+            disabled={isSaving || !selectedConnectionId}
+          >
+            {isSaving ? 'Saving…' : 'Save'}
+          </ConfirmButton>
+        </DialogFooter>
+      }
+    >
+      <DialogContentArea>
+        <Field>
+          <FieldLabel>SSH Connection</FieldLabel>
+          <SshConnectionSelector
+            connectionId={selectedConnectionId}
+            onConnectionIdChange={setSelectedConnectionId}
+            onAddConnection={handleAddConnection}
+            onEditConnection={handleEditConnection}
+          />
+        </Field>
+      </DialogContentArea>
+    </ModalLayout>
+  );
+}
diff --git a/src/renderer/lib/components/confirm-action-dialog.tsx b/src/renderer/lib/components/confirm-action-dialog.tsx
new file mode 100644
index 0000000000..f86b72319e
--- /dev/null
+++ b/src/renderer/lib/components/confirm-action-dialog.tsx
@@ -0,0 +1,46 @@
+import type { BaseModalProps } from '@renderer/lib/modal/modal-provider';
+import { Button } from '@renderer/lib/ui/button';
+import { ConfirmButton } from '@renderer/lib/ui/confirm-button';
+import {
+  DialogContentArea,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+} from '@renderer/lib/ui/dialog';
+
+export type ConfirmActionDialogArgs = {
+  title: string;
+  description: string;
+  confirmLabel?: string;
+  variant?: 'destructive' | 'default';
+};
+
+type Props = BaseModalProps<void> & ConfirmActionDialogArgs;
+
+export function ConfirmActionDialog({
+  title,
+  description,
+  confirmLabel = 'Confirm',
+  variant = 'destructive',
+  onSuccess,
+  onClose,
+}: Props) {
+  return (
+    <>
+      <DialogHeader showCloseButton={false}>
+        <DialogTitle>{title}</DialogTitle>
+      </DialogHeader>
+      <DialogContentArea className="pt-0">
+        <p>{description}</p>
+      </DialogContentArea>
+      <DialogFooter>
+        <Button variant="outline" onClick={onClose}>
+          Cancel
+        </Button>
+        <ConfirmButton variant={variant} onClick={() => onSuccess()}>
+          {confirmLabel}
+        </ConfirmButton>
+      </DialogFooter>
+    </>
+  );
+}
diff --git a/src/renderer/lib/components/error-boundary.tsx b/src/renderer/lib/components/error-boundary.tsx
new file mode 100644
index 0000000000..87ac39e518
--- /dev/null
+++ b/src/renderer/lib/components/error-boundary.tsx
@@ -0,0 +1,64 @@
+import React from 'react';
+import { captureComponentError } from '../../_legacy/errorTracking';
+import { rpc } from '../ipc';
+import { Button } from '../ui/button';
+
+type ErrorBoundaryState = {
+  hasError: boolean;
+  error: Error | null;
+};
+
+type ErrorBoundaryProps = {
+  children?: React.ReactNode;
+  componentName?: string;
+};
+
+function ErrorFallback({ message, onReload }: { message: string; onReload: () => void }) {
+  return (
+    <div className="flex h-screen w-screen items-center justify-center bg-background p-6">
+      <div className="max-w-xl rounded-md border border-border bg-card p-6 text-card-foreground shadow-sm">
+        <h1 className="mb-2 text-lg font-semibold">Something went wrong</h1>
+        <p className="mb-4 break-all text-sm text-muted-foreground">{message}</p>
+        <Button variant="default" onClick={onReload}>
+          Reload
+        </Button>
+      </div>
+    </div>
+  );
+}
+
+export class ErrorBoundary extends React.Component<ErrorBoundaryProps, ErrorBoundaryState> {
+  constructor(props: ErrorBoundaryProps) {
+    super(props);
+    this.state = { hasError: false, error: null };
+  }
+
+  static getDerivedStateFromError(error: Error): ErrorBoundaryState {
+    return { hasError: true, error };
+  }
+
+  componentDidCatch(error: Error, info: React.ErrorInfo) {
+    try {
+      // Track error with PostHog
+      captureComponentError(error, this.props.componentName || 'App', {
+        component_stack: info.componentStack,
+        error_boundary: true,
+        severity: 'critical',
+      });
+    } catch {}
+  }
+
+  handleReload = () => {
+    void rpc.viewState.reset().finally(() => {
+      try {
+        window.location.reload();
+      } catch {}
+    });
+  };
+
+  render() {
+    if (!this.state.hasError) return this.props.children as React.ReactElement;
+    const message = this.state.error?.message || 'An unexpected error occurred.';
+    return <ErrorFallback message={message} onReload={this.handleReload} />;
+  }
+}
diff --git a/src/renderer/lib/components/feedback-modal/feedback-modal.tsx b/src/renderer/lib/components/feedback-modal/feedback-modal.tsx
new file mode 100644
index 0000000000..29de0f6efb
--- /dev/null
+++ b/src/renderer/lib/components/feedback-modal/feedback-modal.tsx
@@ -0,0 +1,191 @@
+import { Paperclip } from 'lucide-react';
+import React, { useCallback } from 'react';
+import { useAttachments } from '@renderer/lib/hooks/use-attachments';
+import { BaseModalProps } from '@renderer/lib/modal/modal-provider';
+import { useGithubContext } from '@renderer/lib/providers/github-context-provider';
+import { appState } from '@renderer/lib/stores/app-state';
+import { Button } from '@renderer/lib/ui/button';
+import { ConfirmButton } from '@renderer/lib/ui/confirm-button';
+import {
+  DialogContentArea,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+} from '@renderer/lib/ui/dialog';
+import { Input } from '@renderer/lib/ui/input';
+import { Spinner } from '@renderer/lib/ui/spinner';
+import { Textarea } from '@renderer/lib/ui/textarea';
+import { useFeedbackSubmit } from './use-feedback-submit';
+
+type FeedbackModalArgs = {
+  blurb?: string;
+};
+
+type Props = BaseModalProps<void> & FeedbackModalArgs;
+
+export function FeedbackModal({ onSuccess, blurb }: Props) {
+  const { user: githubUser } = useGithubContext();
+  const appVersion = appState.update.currentVersion;
+  const {
+    attachments,
+    fileInputRef,
+    removeAttachment,
+    openFilePicker,
+    handleFileInputChange,
+    handlePaste,
+    handleDrop,
+    handleDragOver,
+    reset: resetAttachments,
+  } = useAttachments();
+
+  const {
+    feedbackDetails,
+    setFeedbackDetails,
+    contactEmail,
+    setContactEmail,
+    submitting,
+    errorMessage,
+    clearError,
+    handleSubmit,
+    canSubmit,
+  } = useFeedbackSubmit({
+    githubUser,
+    appVersion,
+    onSuccess: () => {
+      resetAttachments();
+      onSuccess();
+    },
+  });
+
+  const handleFormSubmit = useCallback(
+    async (event: React.FormEvent<HTMLFormElement>) => {
+      event.preventDefault();
+      await handleSubmit(attachments);
+    },
+    [handleSubmit, attachments]
+  );
+
+  return (
+    <>
+      <DialogHeader>
+        <div className="flex flex-col gap-0.5">
+          <DialogTitle>Feedback</DialogTitle>
+          {blurb ? <DialogDescription className="text-xs">{blurb}</DialogDescription> : null}
+        </div>
+      </DialogHeader>
+      <DialogContentArea>
+        <form
+          id="feedback-form"
+          className="space-y-4"
+          onSubmit={handleFormSubmit}
+          onDrop={handleDrop}
+          onDragOver={handleDragOver}
+        >
+          <div className="space-y-1.5">
+            <label htmlFor="feedback-details" className="sr-only">
+              Feedback details
+            </label>
+            <Textarea
+              id="feedback-details"
+              autoFocus
+              rows={5}
+              placeholder="What do you like? How can we improve?"
+              className="resize-none"
+              value={feedbackDetails}
+              onChange={(event) => {
+                setFeedbackDetails(event.target.value);
+                if (errorMessage) clearError();
+              }}
+              onPaste={handlePaste}
+            />
+          </div>
+
+          <div className="space-y-1.5">
+            <label htmlFor="feedback-contact" className="sr-only">
+              Contact email
+            </label>
+            <Input
+              id="feedback-contact"
+              type="text"
+              placeholder="productive@example.com (optional)"
+              value={contactEmail}
+              onChange={(event) => {
+                setContactEmail(event.target.value);
+                if (errorMessage) clearError();
+              }}
+            />
+          </div>
+
+          <div className="space-y-2">
+            <input
+              ref={fileInputRef}
+              type="file"
+              accept="image/*"
+              className="hidden"
+              multiple
+              onChange={handleFileInputChange}
+              disabled={submitting}
+            />
+            {attachments.length > 0 ? (
+              <ul className="space-y-1 text-sm">
+                {attachments.map((file, index) => (
+                  <li
+                    key={`${file.name}-${index}`}
+                    className="flex items-center justify-between rounded-md border border-dashed border-border px-3 py-2 text-foreground"
+                  >
+                    <span className="truncate">{file.name}</span>
+                    <Button
+                      type="button"
+                      variant="ghost"
+                      size="sm"
+                      onClick={() => removeAttachment(index)}
+                      disabled={submitting}
+                      className="text-xs text-muted-foreground hover:text-foreground"
+                    >
+                      Remove
+                    </Button>
+                  </li>
+                ))}
+              </ul>
+            ) : null}
+          </div>
+
+          {errorMessage ? (
+            <p className="text-sm text-destructive" role="alert">
+              {errorMessage}
+            </p>
+          ) : null}
+        </form>
+      </DialogContentArea>
+      <DialogFooter className="sm:justify-between">
+        <Button
+          type="button"
+          variant="outline"
+          onClick={openFilePicker}
+          className="gap-2"
+          disabled={submitting}
+        >
+          <Paperclip className="h-4 w-4" aria-hidden="true" />
+          <span>Attach image</span>
+        </Button>
+        <ConfirmButton
+          type="submit"
+          form="feedback-form"
+          className="gap-2 px-4"
+          disabled={!canSubmit}
+          aria-busy={submitting}
+        >
+          {submitting ? (
+            <>
+              <Spinner size="sm" />
+              <span>Sending...</span>
+            </>
+          ) : (
+            <span>Send Feedback</span>
+          )}
+        </ConfirmButton>
+      </DialogFooter>
+    </>
+  );
+}
diff --git a/src/renderer/lib/components/feedback-modal/use-feedback-submit.test.ts b/src/renderer/lib/components/feedback-modal/use-feedback-submit.test.ts
new file mode 100644
index 0000000000..7fefce769f
--- /dev/null
+++ b/src/renderer/lib/components/feedback-modal/use-feedback-submit.test.ts
@@ -0,0 +1,29 @@
+import { describe, expect, it } from 'vitest';
+import { buildFeedbackContent } from './use-feedback-submit';
+
+describe('buildFeedbackContent', () => {
+  it('includes feedback, metadata, and app version when provided', () => {
+    const content = buildFeedbackContent({
+      feedback: 'Great app',
+      contactEmail: 'person@example.com',
+      githubUser: { login: 'octocat', name: 'Octo Cat' },
+      appVersion: '1.2.3',
+    });
+
+    expect(content).toContain('Great app');
+    expect(content).toContain('Contact: person@example.com');
+    expect(content).toContain('GitHub: Octo Cat (@octocat)');
+    expect(content).toContain('Emdash Version: 1.2.3');
+  });
+
+  it('omits empty metadata fields', () => {
+    const content = buildFeedbackContent({
+      feedback: 'Needs improvement',
+      contactEmail: '   ',
+      githubUser: null,
+      appVersion: '',
+    });
+
+    expect(content).toBe('Needs improvement');
+  });
+});
diff --git a/src/renderer/lib/components/feedback-modal/use-feedback-submit.ts b/src/renderer/lib/components/feedback-modal/use-feedback-submit.ts
new file mode 100644
index 0000000000..46ec080617
--- /dev/null
+++ b/src/renderer/lib/components/feedback-modal/use-feedback-submit.ts
@@ -0,0 +1,150 @@
+import { useCallback, useState } from 'react';
+import { useToast } from '@renderer/lib/hooks/use-toast';
+import { log } from '@renderer/utils/logger';
+
+const DISCORD_WEBHOOK_URL =
+  'https://discord.com/api/webhooks/1473390363388416230/eRIo1UhylapH94KpqUUp5PDzkLhjBvcnjjyE_JezfHiAyfN3QEbRyEIJaSl8QQUz7Mak';
+
+interface GithubUser {
+  login?: string;
+  name?: string;
+  html_url?: string;
+  email?: string;
+}
+
+interface FeedbackSubmitOptions {
+  githubUser?: GithubUser | null;
+  appVersion?: string | null;
+  onSuccess: () => void;
+}
+
+interface BuildFeedbackContentOptions {
+  feedback: string;
+  contactEmail: string;
+  githubUser?: GithubUser | null;
+  appVersion?: string | null;
+}
+
+export function buildFeedbackContent({
+  feedback,
+  contactEmail,
+  githubUser,
+  appVersion,
+}: BuildFeedbackContentOptions): string {
+  const trimmedFeedback = feedback.trim();
+  const trimmedContact = contactEmail.trim();
+  const metadataLines: string[] = [];
+
+  if (trimmedContact) {
+    metadataLines.push(`Contact: ${trimmedContact}`);
+  }
+
+  const githubLogin = githubUser?.login?.trim();
+  const githubName = githubUser?.name?.trim();
+  if (githubLogin || githubName) {
+    const parts: string[] = [];
+    if (githubName && githubLogin) {
+      parts.push(`${githubName} (@${githubLogin})`);
+    } else if (githubName) {
+      parts.push(githubName);
+    } else if (githubLogin) {
+      parts.push(`@${githubLogin}`);
+    }
+    metadataLines.push(`GitHub: ${parts.join(' ')}`);
+  }
+
+  const trimmedAppVersion = appVersion?.trim();
+  if (trimmedAppVersion) {
+    metadataLines.push(`Emdash Version: ${trimmedAppVersion}`);
+  }
+
+  return [trimmedFeedback, metadataLines.join('\n')].filter(Boolean).join('\n\n');
+}
+
+export function useFeedbackSubmit({ githubUser, appVersion, onSuccess }: FeedbackSubmitOptions) {
+  const [feedbackDetails, setFeedbackDetails] = useState('');
+  const [contactEmail, setContactEmail] = useState('');
+  const [submitting, setSubmitting] = useState(false);
+  const [errorMessage, setErrorMessage] = useState<string | null>(null);
+  const { toast } = useToast();
+
+  const clearError = useCallback(() => {
+    setErrorMessage(null);
+  }, []);
+
+  const reset = useCallback(() => {
+    setFeedbackDetails('');
+    setContactEmail('');
+    setSubmitting(false);
+    setErrorMessage(null);
+  }, []);
+
+  const handleSubmit = useCallback(
+    async (attachments: File[]) => {
+      const trimmedFeedback = feedbackDetails.trim();
+      if (!trimmedFeedback) {
+        setErrorMessage('Please enter some feedback before sending.');
+        return;
+      }
+
+      setSubmitting(true);
+      setErrorMessage(null);
+
+      const content = buildFeedbackContent({
+        feedback: trimmedFeedback,
+        contactEmail,
+        githubUser,
+        appVersion,
+      });
+
+      try {
+        let response: Response;
+        if (attachments.length > 0) {
+          const formData = new FormData();
+          formData.append('content', content);
+          attachments.forEach((file, index) => {
+            formData.append(`file${index}`, file);
+          });
+          response = await fetch(DISCORD_WEBHOOK_URL, { method: 'POST', body: formData });
+        } else {
+          response = await fetch(DISCORD_WEBHOOK_URL, {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({ content }),
+          });
+        }
+
+        if (!response.ok) {
+          throw new Error(`Discord webhook returned ${response.status}`);
+        }
+
+        onSuccess();
+        toast({ title: 'Feedback sent', description: 'Thanks for your feedback!' });
+      } catch (error) {
+        log.error('Failed to submit feedback:', error);
+        setErrorMessage('Unable to send feedback. Please try again.');
+        toast({
+          title: 'Failed to send feedback',
+          description: 'Please try again.',
+          variant: 'destructive',
+        });
+      } finally {
+        setSubmitting(false);
+      }
+    },
+    [appVersion, contactEmail, feedbackDetails, githubUser, onSuccess, toast]
+  );
+
+  return {
+    feedbackDetails,
+    setFeedbackDetails,
+    contactEmail,
+    setContactEmail,
+    submitting,
+    errorMessage,
+    clearError,
+    reset,
+    handleSubmit,
+    canSubmit: feedbackDetails.trim().length > 0 && !submitting,
+  };
+}
diff --git a/src/renderer/lib/components/github-device-flow-modal.tsx b/src/renderer/lib/components/github-device-flow-modal.tsx
new file mode 100644
index 0000000000..e28019af07
--- /dev/null
+++ b/src/renderer/lib/components/github-device-flow-modal.tsx
@@ -0,0 +1,398 @@
+import { AlertCircle, Check, Copy, ExternalLink } from 'lucide-react';
+import { useCallback, useEffect, useRef, useState } from 'react';
+import emdashLogo from '@/assets/images/emdash/emdash_logo_white.svg';
+import {
+  githubAuthDeviceCodeChannel,
+  githubAuthErrorChannel,
+  githubAuthSuccessChannel,
+} from '@shared/events/githubEvents';
+import type { GitHubUser } from '@shared/github';
+import { useToast } from '@renderer/lib/hooks/use-toast';
+import { events, rpc } from '@renderer/lib/ipc';
+import type { BaseModalProps } from '@renderer/lib/modal/modal-provider';
+import { useGithubContext } from '@renderer/lib/providers/github-context-provider';
+import { Button } from '@renderer/lib/ui/button';
+import { Spinner } from '@renderer/lib/ui/spinner';
+import { log } from '@renderer/utils/logger';
+
+interface GithubDeviceFlowModalProps {
+  onClose: () => void;
+  onError?: (error: string) => void;
+}
+
+type GithubDeviceFlowOverlayExtraProps = {
+  onError?: (error: string) => void;
+};
+
+export function GithubDeviceFlowModalOverlay({
+  onClose,
+  onError,
+}: GithubDeviceFlowOverlayExtraProps & BaseModalProps<unknown>) {
+  return (
+    <GithubDeviceFlowModal
+      onClose={onClose}
+      onError={(error) => {
+        onError?.(error);
+        onClose();
+      }}
+    />
+  );
+}
+
+export function GithubDeviceFlowModal({ onClose, onError }: GithubDeviceFlowModalProps) {
+  const { toast } = useToast();
+  const { cancelGithubConnect } = useGithubContext();
+
+  // Presentational state - updated via IPC events from main process
+  const [userCode, setUserCode] = useState<string>('');
+  const [verificationUri, setVerificationUri] = useState<string>('');
+  const [timeRemaining, setTimeRemaining] = useState<number>(900);
+  const [copied, setCopied] = useState(false);
+  const [success, setSuccess] = useState(false);
+  const [error, setError] = useState<string | null>(null);
+  const [user, setUser] = useState<GitHubUser | null>(null);
+  const [browserOpening, setBrowserOpening] = useState(false);
+  const [browserOpenCountdown, setBrowserOpenCountdown] = useState(3);
+
+  const countdownIntervalRef = useRef<NodeJS.Timeout | null>(null);
+  const hasAutocopied = useRef(false);
+  const hasOpenedBrowser = useRef(false);
+  const authSucceededRef = useRef(false);
+
+  // Cancel the auth flow if the modal is dismissed before auth completes
+  useEffect(() => {
+    return () => {
+      if (!authSucceededRef.current) {
+        cancelGithubConnect();
+      }
+    };
+  }, [cancelGithubConnect]);
+
+  // Countdown timer for code expiration
+  useEffect(() => {
+    if (success || error) return;
+
+    countdownIntervalRef.current = setInterval(() => {
+      setTimeRemaining((prev) => {
+        if (prev <= 1) {
+          setError('Code expired. Please try again.');
+          return 0;
+        }
+        return prev - 1;
+      });
+    }, 1000);
+
+    return () => {
+      if (countdownIntervalRef.current) {
+        clearInterval(countdownIntervalRef.current);
+        countdownIntervalRef.current = null;
+      }
+    };
+  }, [success, error]);
+
+  // Reset state on mount (new auth flow)
+  useEffect(() => {
+    setSuccess(false);
+    setError(null);
+    setUser(null);
+    setCopied(false);
+    hasAutocopied.current = false;
+    hasOpenedBrowser.current = false;
+  }, []);
+
+  const copyToClipboard = useCallback(
+    async (code: string, isAutomatic = false) => {
+      try {
+        if (navigator.clipboard && navigator.clipboard.writeText) {
+          await navigator.clipboard.writeText(code);
+        } else {
+          // Fallback for older browsers
+          const textArea = document.createElement('textarea');
+          textArea.value = code;
+          textArea.style.position = 'fixed';
+          textArea.style.left = '-999999px';
+          document.body.appendChild(textArea);
+          textArea.select();
+          document.execCommand('copy');
+          document.body.removeChild(textArea);
+        }
+
+        setCopied(true);
+
+        if (!isAutomatic) {
+          toast({
+            title: '✓ Code copied',
+            description: 'Paste it in GitHub to authorize',
+          });
+        }
+
+        setTimeout(() => setCopied(false), 2000);
+      } catch (err) {
+        log.error('Failed to copy:', err);
+        if (!isAutomatic) {
+          toast({
+            title: 'Copy failed',
+            description: 'Please copy the code manually',
+            variant: 'destructive',
+          });
+        }
+      }
+    },
+    [toast]
+  );
+
+  const openGitHub = useCallback(() => {
+    if (verificationUri) {
+      rpc.app.openExternal(verificationUri);
+    }
+  }, [verificationUri]);
+
+  // Subscribe to auth events from main process
+  useEffect(() => {
+    // Device code received - display to user
+    const cleanupDeviceCode = events.on(githubAuthDeviceCodeChannel, (data) => {
+      setUserCode(data.userCode);
+      setVerificationUri(data.verificationUri);
+      setTimeRemaining(data.expiresIn);
+
+      // Auto-copy code
+      if (!hasAutocopied.current) {
+        hasAutocopied.current = true;
+        copyToClipboard(data.userCode, true);
+
+        // Show countdown and open browser after 3 seconds
+        setBrowserOpening(true);
+        let countdown = 3;
+        const countdownTimer = setInterval(() => {
+          countdown--;
+          setBrowserOpenCountdown(countdown);
+          if (countdown <= 0) {
+            clearInterval(countdownTimer);
+          }
+        }, 1000);
+
+        setTimeout(() => {
+          setBrowserOpening(false);
+          if (!hasOpenedBrowser.current) {
+            hasOpenedBrowser.current = true;
+            rpc.app.openExternal(data.verificationUri);
+          }
+        }, 3000);
+      }
+    });
+
+    // Auth successful
+    const cleanupSuccess = events.on(githubAuthSuccessChannel, (data) => {
+      authSucceededRef.current = true;
+      setSuccess(true);
+      setUser(data.user);
+
+      // Auto-close after showing success animation
+      setTimeout(() => {
+        onClose();
+      }, 1000); // 1 second is enough to see success
+    });
+
+    // Auth error
+    const cleanupError = events.on(githubAuthErrorChannel, (data) => {
+      setError(data.message || data.error);
+
+      if (onError) {
+        onError(data.error);
+      }
+
+      toast({
+        title: 'Authentication Failed',
+        description: data.message || 'An error occurred',
+        variant: 'destructive',
+      });
+    });
+
+    // Cleanup listeners on unmount
+    return () => {
+      cleanupDeviceCode();
+      cleanupSuccess();
+      cleanupError();
+    };
+  }, [copyToClipboard, onError, onClose, toast]);
+
+  const handleClose = () => {
+    onClose();
+  };
+
+  const formatTime = (seconds: number) => {
+    const mins = Math.floor(seconds / 60);
+    const secs = seconds % 60;
+    return `${mins}:${secs.toString().padStart(2, '0')}`;
+  };
+
+  // Keyboard shortcuts (Escape is handled by DialogContent's onEscapeKeyDown)
+  useEffect(() => {
+    const handleKeyDown = (e: KeyboardEvent) => {
+      if ((e.metaKey || e.ctrlKey) && e.key === 'c') {
+        e.preventDefault();
+        copyToClipboard(userCode);
+      } else if (e.key === 'Enter') {
+        openGitHub();
+      } else if ((e.metaKey || e.ctrlKey) && e.key === 'r') {
+        e.preventDefault();
+        openGitHub();
+      }
+    };
+
+    window.addEventListener('keydown', handleKeyDown);
+    return () => window.removeEventListener('keydown', handleKeyDown);
+  }, [copyToClipboard, openGitHub, userCode]);
+
+  return (
+    <>
+      <div className="flex flex-col items-center px-8 py-12">
+        <img src={emdashLogo} alt="Emdash" className="mb-8 h-8 opacity-90" />
+
+        {success ? (
+          // Success State
+          <div className="flex flex-col items-center space-y-6 duration-300 animate-in fade-in zoom-in">
+            <div className="flex h-16 w-16 items-center justify-center rounded-full bg-green-500 duration-500 animate-in zoom-in">
+              <Check className="h-8 w-8 text-white" strokeWidth={3} />
+            </div>
+            <div className="space-y-2 text-center">
+              <h2 className="text-2xl font-semibold">Success!</h2>
+              <p className="text-sm text-muted-foreground">You're connected to GitHub</p>
+              {user && (
+                <div className="mt-4 flex items-center justify-center gap-2">
+                  {user.avatar_url && (
+                    <img src={user.avatar_url} alt={user.name} className="h-10 w-10 rounded-full" />
+                  )}
+                  <div className="text-left">
+                    <p className="text-sm font-medium">{user.name || user.login}</p>
+                    <p className="text-xs text-muted-foreground">@{user.login}</p>
+                  </div>
+                </div>
+              )}
+            </div>
+          </div>
+        ) : error ? (
+          // Error State
+          <div className="flex w-full flex-col items-center space-y-6">
+            <div className="flex h-16 w-16 items-center justify-center rounded-full bg-red-500/20">
+              <AlertCircle className="h-8 w-8 text-red-500" />
+            </div>
+            <div className="space-y-2 text-center">
+              <h2 className="text-xl font-semibold">Authentication Failed</h2>
+              <p className="text-sm text-muted-foreground">{error}</p>
+            </div>
+            <Button onClick={handleClose} variant="outline" className="w-full">
+              Close
+            </Button>
+          </div>
+        ) : (
+          // Waiting State
+          <div className="flex w-full flex-col items-center space-y-6">
+            <div className="space-y-2 text-center">
+              <h2 className="text-2xl font-semibold">Connect to GitHub</h2>
+              <p className="text-sm text-muted-foreground">
+                Follow these steps to authorize Emdash
+              </p>
+            </div>
+
+            {userCode && (
+              <>
+                <div className="w-full space-y-3 rounded-lg bg-muted/30 p-6">
+                  <p className="text-center text-xs font-medium text-muted-foreground">Your code</p>
+                  <p className="select-all text-center font-mono text-4xl font-bold tracking-wider">
+                    {userCode}
+                  </p>
+                </div>
+
+                <Button
+                  onClick={() => copyToClipboard(userCode)}
+                  variant="outline"
+                  className="w-full"
+                  disabled={copied}
+                >
+                  {copied ? (
+                    <>
+                      <Check className="mr-2 h-4 w-4" />
+                      Copied!
+                    </>
+                  ) : (
+                    <>
+                      <Copy className="mr-2 h-4 w-4" />
+                      Copy Code
+                    </>
+                  )}
+                </Button>
+              </>
+            )}
+
+            <div className="w-full space-y-3 text-sm">
+              <div className="flex items-start gap-3">
+                <div className="flex h-6 w-6 flex-shrink-0 items-center justify-center rounded-full bg-primary/10 text-xs font-semibold">
+                  1
+                </div>
+                <p className="text-muted-foreground">
+                  Paste the code in GitHub{' '}
+                  <span className="font-medium text-foreground">(already copied!)</span>
+                </p>
+              </div>
+              <div className="flex items-start gap-3">
+                <div className="flex h-6 w-6 flex-shrink-0 items-center justify-center rounded-full bg-primary/10 text-xs font-semibold">
+                  2
+                </div>
+                <p className="text-muted-foreground">Click Authorize</p>
+              </div>
+            </div>
+
+            {browserOpening && (
+              <div className="w-full rounded-lg border border-blue-500/20 bg-blue-500/10 p-4">
+                <p className="text-center text-sm text-blue-600 dark:text-blue-400">
+                  Opening GitHub in {browserOpenCountdown}s...
+                </p>
+              </div>
+            )}
+
+            <div className="flex flex-col items-center gap-2 text-center">
+              <Spinner className="h-5 w-5 text-muted-foreground" />
+              <p className="text-sm text-muted-foreground">Waiting for authorization...</p>
+              {timeRemaining > 0 && (
+                <p className="text-xs text-muted-foreground">
+                  Code expires in {formatTime(timeRemaining)}
+                </p>
+              )}
+            </div>
+
+            {verificationUri && !browserOpening && (
+              <Button onClick={openGitHub} className="w-full" size="lg">
+                <ExternalLink className="mr-2 h-4 w-4" />
+                Open GitHub
+              </Button>
+            )}
+
+            <div className="w-full border-t pt-4">
+              <p className="text-center text-xs text-muted-foreground">
+                Having{' '}
+                <button
+                  onClick={() =>
+                    rpc.app.openExternal('https://github.com/generalaction/emdash/issues')
+                  }
+                  className="text-primary hover:underline focus:underline focus:outline-none"
+                >
+                  trouble
+                </button>
+                ?
+              </p>
+            </div>
+
+            <div className="space-x-3 text-center text-xs text-muted-foreground">
+              <span>⌘C to copy</span>
+              <span>•</span>
+              <span>⌘R to reopen</span>
+              <span>•</span>
+              <span>Esc to cancel</span>
+            </div>
+          </div>
+        )}
+      </div>
+    </>
+  );
+}
diff --git a/src/renderer/lib/components/list-popover-card.tsx b/src/renderer/lib/components/list-popover-card.tsx
new file mode 100644
index 0000000000..0647ba474c
--- /dev/null
+++ b/src/renderer/lib/components/list-popover-card.tsx
@@ -0,0 +1,23 @@
+import { ReactNode } from 'react';
+import { cn } from '@renderer/utils/utils';
+
+export function ListPopoverCard({
+  children,
+  className,
+}: {
+  children: ReactNode;
+  className?: string;
+}) {
+  return (
+    <div className="absolute bottom-4 left-6 right-6">
+      <div
+        className={cn(
+          'flex items-center gap-2 rounded-md border border-border bg-background-1 px-3 py-2 text-sm',
+          className
+        )}
+      >
+        {children}
+      </div>
+    </div>
+  );
+}
diff --git a/src/renderer/lib/components/pr-badge.tsx b/src/renderer/lib/components/pr-badge.tsx
new file mode 100644
index 0000000000..5bb6b545fe
--- /dev/null
+++ b/src/renderer/lib/components/pr-badge.tsx
@@ -0,0 +1,81 @@
+import { ExternalLink } from 'lucide-react';
+import { getPrNumber, type PullRequest } from '@shared/pull-requests';
+import { PrMergeLine } from '@renderer/lib/components/pr-merge-line';
+import { Popover, PopoverContent, PopoverTrigger } from '@renderer/lib/ui/popover';
+import { cn } from '@renderer/utils/utils';
+import { rpc } from '../ipc';
+import { Button } from '../ui/button';
+import { RelativeTime } from '../ui/relative-time';
+import { Tooltip, TooltipContent, TooltipTrigger } from '../ui/tooltip';
+import { PrNumberBadge } from './pr-number-badge';
+import { StatusIcon } from './pr-status-icon';
+
+interface PrBadgeProps {
+  variant?: 'default' | 'compact';
+  pr: PullRequest;
+  className?: string;
+}
+
+export function PrBadge({ variant = 'default', pr, className }: PrBadgeProps) {
+  const renderBadge = () => {
+    switch (variant) {
+      case 'default':
+        return (
+          <div
+            className={cn(
+              'flex items-center gap-2 px-1.5 py-0.5 rounded-md bg-background-2 max-w-52',
+              className
+            )}
+          >
+            <StatusIcon className="size-3" status={pr.status} disableTooltip />
+            <PrNumberBadge number={getPrNumber(pr) ?? 0} className="text-[10px]" />
+            <span className="text-xs text-foreground-muted truncate">{pr.title}</span>
+          </div>
+        );
+      case 'compact':
+        return (
+          <div className={cn('px-1 flex items-center justify-center', className)}>
+            <StatusIcon className="size-3" status={pr.status} disableTooltip />
+          </div>
+        );
+    }
+  };
+
+  return (
+    <Popover>
+      <PopoverTrigger openOnHover>{renderBadge()}</PopoverTrigger>
+      <PopoverContent>
+        <div className="flex flex-col gap-2">
+          <div className="flex items-center gap-2 justify-between no-wrap">
+            <div className="flex items-center gap-2  min-w-0">
+              <StatusIcon status={pr.status} className="size-3" />
+              <span className="text-sm text-foreground leading-snug truncate min-w-0">
+                {pr.title}
+              </span>
+              <PrNumberBadge number={getPrNumber(pr) ?? 0} />
+              <Tooltip>
+                <TooltipTrigger>
+                  <Button
+                    variant="ghost"
+                    size="icon-xs"
+                    className="opacity-0 group-hover:opacity-100 transition-opacity"
+                    onClick={() => rpc.app.openExternal(pr.url)}
+                  >
+                    <ExternalLink className="size-3.5" />
+                  </Button>
+                </TooltipTrigger>
+                <TooltipContent>Open PR on github</TooltipContent>
+              </Tooltip>
+            </div>
+            <RelativeTime
+              value={pr.createdAt}
+              className="text-xs text-foreground-passive"
+              compact
+            />
+          </div>
+          <PrMergeLine pr={pr} />
+        </div>
+      </PopoverContent>
+    </Popover>
+  );
+}
diff --git a/src/renderer/lib/components/pr-merge-line.tsx b/src/renderer/lib/components/pr-merge-line.tsx
new file mode 100644
index 0000000000..6b39b27617
--- /dev/null
+++ b/src/renderer/lib/components/pr-merge-line.tsx
@@ -0,0 +1,45 @@
+import { GitBranch } from 'lucide-react';
+import { ownerFromUrl, type PullRequest } from '@shared/pull-requests';
+import { Tooltip, TooltipContent, TooltipTrigger } from '@renderer/lib/ui/tooltip';
+import { cn } from '@renderer/utils/utils';
+
+/**
+ * Renders the GitHub-style merge summary line, e.g.:
+ * "lucasmerlin wants to merge into generalaction:main from lucasmerlin:feat/my-branch"
+ */
+export function PrMergeLine({ pr, className }: { pr: PullRequest; className?: string }) {
+  const author = pr.author?.userName;
+  const baseOwner = ownerFromUrl(pr.repositoryUrl);
+  const baseBranch = pr.baseRefName;
+  const headOwner = ownerFromUrl(pr.headRepositoryUrl) ?? author;
+  const headBranch = pr.headRefName;
+
+  return (
+    <p className={cn('text-xs text-foreground-muted flex items-center gap-1 min-w-0', className)}>
+      {author && <span className="font-medium shrink-0">{author}</span>}
+      {author && ' '}
+      <span className="shrink-0">wants to merge into </span>
+      <PrBranchBadge owner={baseOwner} branch={baseBranch} />
+      <span className="shrink-0"> from </span>
+      <PrBranchBadge owner={headOwner} branch={headBranch} />
+    </p>
+  );
+}
+
+function PrBranchBadge({ owner, branch }: { owner?: string; branch: string }) {
+  return (
+    <Tooltip>
+      <TooltipTrigger className="min-w-0 overflow-hidden">
+        <span className="font-mono text-[10px] font-medium flex items-center gap-1 min-w-0 bg-background-2 px-1 py-0.5 rounded-md">
+          <GitBranch className="size-3 shrink-0" />
+          <span className="truncate">
+            {owner}:{branch}
+          </span>
+        </span>
+      </TooltipTrigger>
+      <TooltipContent>
+        {owner}:{branch}
+      </TooltipContent>
+    </Tooltip>
+  );
+}
diff --git a/src/renderer/lib/components/pr-number-badge.tsx b/src/renderer/lib/components/pr-number-badge.tsx
new file mode 100644
index 0000000000..32f39b4f4d
--- /dev/null
+++ b/src/renderer/lib/components/pr-number-badge.tsx
@@ -0,0 +1,11 @@
+import { cn } from '@renderer/utils/utils';
+
+export function PrNumberBadge({ number, className }: { number: number; className?: string }) {
+  return (
+    <span
+      className={cn('font-mono text-xs text-foreground-muted shrink-0 tracking-wide', className)}
+    >
+      #{number}
+    </span>
+  );
+}
diff --git a/src/renderer/lib/components/pr-status-icon.tsx b/src/renderer/lib/components/pr-status-icon.tsx
new file mode 100644
index 0000000000..d943ba73c0
--- /dev/null
+++ b/src/renderer/lib/components/pr-status-icon.tsx
@@ -0,0 +1,42 @@
+import { GitMerge, GitPullRequestArrow, GitPullRequestClosed } from 'lucide-react';
+import { ReactNode } from 'react';
+import { PullRequest } from '@shared/pull-requests';
+import { Tooltip, TooltipContent, TooltipTrigger } from '@renderer/lib/ui/tooltip';
+import { cn } from '@renderer/utils/utils';
+
+export function StatusIcon({
+  status,
+  className,
+  disableTooltip = false,
+}: {
+  disableTooltip?: boolean;
+  status: PullRequest['status'];
+  className?: string;
+}) {
+  const renderTooltip = (children: ReactNode, text: string) => {
+    if (disableTooltip) return children;
+    return (
+      <Tooltip>
+        <TooltipTrigger>{children}</TooltipTrigger>
+        <TooltipContent>{text}</TooltipContent>
+      </Tooltip>
+    );
+  };
+
+  if (status === 'merged') {
+    return renderTooltip(
+      <GitMerge className={cn('size-4 shrink-0 text-purple-500', className)} />,
+      'Merged'
+    );
+  }
+  if (status === 'closed') {
+    return renderTooltip(
+      <GitPullRequestClosed className={cn('size-4 shrink-0 text-red-500', className)} />,
+      'Closed'
+    );
+  }
+  return renderTooltip(
+    <GitPullRequestArrow className={cn('size-4 shrink-0 text-green-600', className)} />,
+    'Open'
+  );
+}
diff --git a/src/renderer/lib/components/project-branch-selector.tsx b/src/renderer/lib/components/project-branch-selector.tsx
new file mode 100644
index 0000000000..a370cb67e9
--- /dev/null
+++ b/src/renderer/lib/components/project-branch-selector.tsx
@@ -0,0 +1,42 @@
+import { observer } from 'mobx-react-lite';
+import React from 'react';
+import type { Branch } from '@shared/git';
+import { getRepositoryStore } from '@renderer/features/projects/stores/project-selectors';
+import { BranchSelector } from './branch-selector';
+
+export interface ProjectBranchSelectorProps {
+  projectId: string;
+  value?: Branch;
+  onValueChange: (value: Branch) => void;
+  remoteOnly?: boolean;
+  trigger?: React.ReactNode;
+}
+
+export const ProjectBranchSelector = observer(function ProjectBranchSelector({
+  projectId,
+  value,
+  onValueChange,
+  remoteOnly,
+  trigger,
+}: ProjectBranchSelectorProps) {
+  const repo = getRepositoryStore(projectId);
+  const configuredRemoteName = repo?.configuredRemote.name ?? 'origin';
+
+  const branches: Branch[] = repo
+    ? repo.branches.filter(
+        (b) => b.type === 'local' || (b.type === 'remote' && b.remote.name === configuredRemoteName)
+      )
+    : [];
+
+  return (
+    <BranchSelector
+      branches={branches}
+      value={value}
+      onValueChange={onValueChange}
+      remoteOnly={remoteOnly}
+      trigger={trigger}
+      onRefresh={() => repo?.refresh()}
+      isRefreshing={repo?.loading ?? false}
+    />
+  );
+});
diff --git a/src/renderer/lib/components/reorder-list.tsx b/src/renderer/lib/components/reorder-list.tsx
new file mode 100644
index 0000000000..f9ba844c8f
--- /dev/null
+++ b/src/renderer/lib/components/reorder-list.tsx
@@ -0,0 +1,53 @@
+import { HTMLElements, Reorder } from 'motion/react';
+import React from 'react';
+
+type Axis = 'x' | 'y';
+type ReorderTag = keyof HTMLElements;
+
+interface ReorderListProps<T> {
+  items: T[];
+  onReorder: (items: T[]) => void;
+  axis?: Axis;
+  className?: string;
+  itemClassName?: string;
+  layoutScroll?: boolean;
+  as?: ReorderTag;
+  getKey?: (item: T, index: number) => string | number;
+  children: (item: T, index: number) => React.ReactNode;
+}
+
+export function ReorderList<T>({
+  items,
+  onReorder,
+  axis = 'y',
+  className,
+  itemClassName,
+  layoutScroll = true,
+  as = 'div',
+  getKey,
+  children,
+}: ReorderListProps<T>) {
+  return (
+    <Reorder.Group<T, typeof as>
+      as={as}
+      axis={axis}
+      values={items}
+      onReorder={onReorder}
+      layoutScroll={layoutScroll}
+      className={className}
+    >
+      {items.map((item, index) => (
+        <Reorder.Item<T>
+          key={getKey ? getKey(item, index) : index}
+          value={item}
+          className={itemClassName}
+          transition={{ layout: { duration: 0 } }}
+        >
+          {children(item, index)}
+        </Reorder.Item>
+      ))}
+    </Reorder.Group>
+  );
+}
+
+export default ReorderList;
diff --git a/src/renderer/lib/components/titlebar/SidebarLeftToggleButton.tsx b/src/renderer/lib/components/titlebar/SidebarLeftToggleButton.tsx
new file mode 100644
index 0000000000..5857e28525
--- /dev/null
+++ b/src/renderer/lib/components/titlebar/SidebarLeftToggleButton.tsx
@@ -0,0 +1,54 @@
+import { PanelLeft } from 'lucide-react';
+import React from 'react';
+import { useWorkspaceLayoutContext } from '@renderer/lib/layout/layout-provider';
+import { Button } from '@renderer/lib/ui/button';
+import { ShortcutHint } from '@renderer/lib/ui/shortcut-hint';
+import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@renderer/lib/ui/tooltip';
+
+interface SidebarLeftToggleButtonProps {
+  isDisabled?: boolean;
+}
+
+const SidebarLeftToggleButton: React.FC<SidebarLeftToggleButtonProps> = ({
+  isDisabled = false,
+}) => {
+  const { toggleLeft, isLeftOpen } = useWorkspaceLayoutContext();
+
+  const handleClick = async () => {
+    if (isDisabled) return;
+    const newState = !isLeftOpen;
+    void import('../../../utils/telemetryClient').then(({ captureTelemetry }) => {
+      captureTelemetry('sidebar_toggled', { side: 'left', state: newState ? 'open' : 'closed' });
+    });
+    toggleLeft();
+  };
+
+  return (
+    <TooltipProvider delay={200}>
+      <Tooltip>
+        <TooltipTrigger>
+          <Button
+            type="button"
+            variant="ghost"
+            size="icon"
+            onClick={handleClick}
+            disabled={isDisabled}
+            className="h-8 w-8 text-muted-foreground transition-colors [-webkit-app-region:no-drag] hover:bg-transparent hover:text-foreground disabled:cursor-not-allowed disabled:opacity-50"
+            aria-label="Toggle left sidebar"
+            aria-disabled={isDisabled}
+          >
+            <PanelLeft className="h-4 w-4" />
+          </Button>
+        </TooltipTrigger>
+        <TooltipContent side="bottom" align="end" sideOffset={8} className="text-xs font-medium">
+          <div className="flex flex-col gap-1">
+            <span>{isDisabled ? 'Sidebar disabled in editor mode' : 'Toggle left sidebar'}</span>
+            {!isDisabled && <ShortcutHint settingsKey="toggleLeftSidebar" />}
+          </div>
+        </TooltipContent>
+      </Tooltip>
+    </TooltipProvider>
+  );
+};
+
+export default SidebarLeftToggleButton;
diff --git a/src/renderer/lib/components/titlebar/SidebarRightToggleButton.tsx b/src/renderer/lib/components/titlebar/SidebarRightToggleButton.tsx
new file mode 100644
index 0000000000..0c4fd632e6
--- /dev/null
+++ b/src/renderer/lib/components/titlebar/SidebarRightToggleButton.tsx
@@ -0,0 +1,48 @@
+import { PanelRight } from 'lucide-react';
+import React from 'react';
+import { Button } from '@renderer/lib/ui/button';
+import { useRightSidebar } from '@renderer/lib/ui/right-sidebar';
+import { ShortcutHint } from '@renderer/lib/ui/shortcut-hint';
+import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@renderer/lib/ui/tooltip';
+import { captureTelemetry } from '@renderer/utils/telemetryClient';
+
+const SidebarRightToggleButton: React.FC = () => {
+  const { toggle, collapsed } = useRightSidebar();
+
+  const label = 'Toggle right sidebar';
+
+  const handleClick = async () => {
+    const nextCollapsed = !collapsed;
+    const nextState = nextCollapsed ? 'closed' : 'open';
+    captureTelemetry('sidebar_toggled', { side: 'right', state: nextState });
+
+    toggle();
+  };
+
+  return (
+    <TooltipProvider delay={200}>
+      <Tooltip>
+        <TooltipTrigger>
+          <Button
+            type="button"
+            variant="ghost"
+            size="icon"
+            onClick={handleClick}
+            className="h-8 w-8 text-muted-foreground transition-colors [-webkit-app-region:no-drag] hover:bg-transparent hover:text-foreground"
+            aria-label={label}
+          >
+            <PanelRight className="h-4 w-4" />
+          </Button>
+        </TooltipTrigger>
+        <TooltipContent side="bottom" align="end" sideOffset={8} className="text-xs font-medium">
+          <div className="flex flex-col gap-1">
+            <span>Toggle right sidebar</span>
+            <ShortcutHint settingsKey="toggleRightSidebar" />
+          </div>
+        </TooltipContent>
+      </Tooltip>
+    </TooltipProvider>
+  );
+};
+
+export default SidebarRightToggleButton;
diff --git a/src/renderer/lib/components/titlebar/Titlebar.tsx b/src/renderer/lib/components/titlebar/Titlebar.tsx
new file mode 100644
index 0000000000..8fd915c035
--- /dev/null
+++ b/src/renderer/lib/components/titlebar/Titlebar.tsx
@@ -0,0 +1,69 @@
+import { PanelLeft, PanelRight } from 'lucide-react';
+import { ReactNode } from 'react';
+import { useWorkspaceLayoutContext } from '@renderer/lib/layout/layout-provider';
+import { useWorkspaceSlots } from '@renderer/lib/layout/navigation-provider';
+import { ShortcutHint } from '@renderer/lib/ui/shortcut-hint';
+import { Toggle } from '@renderer/lib/ui/toggle';
+import { Tooltip, TooltipContent, TooltipTrigger } from '@renderer/lib/ui/tooltip';
+import { cn } from '@renderer/utils/utils';
+
+export function Titlebar({ leftSlot, rightSlot }: { leftSlot?: ReactNode; rightSlot?: ReactNode }) {
+  const { isRightOpen, setCollapsed, isLeftOpen } = useWorkspaceLayoutContext();
+  const { RightPanel } = useWorkspaceSlots();
+  return (
+    <header
+      className={cn(
+        'flex h-10 shrink-0 items-center bg-background-secondary pr-2 border-b border-border [-webkit-app-region:drag] dark:bg-background',
+        !isLeftOpen && 'pl-17'
+      )}
+    >
+      <div className="pointer-events-auto flex w-full items-center gap-1">
+        {!isLeftOpen && <div className="[-webkit-app-region:no-drag]"></div>}
+        <div className="flex w-full items-center justify-between">
+          <div className="flex items-center justify-start [-webkit-app-region:no-drag]">
+            {!isLeftOpen && (
+              <Tooltip>
+                <TooltipTrigger>
+                  <Toggle
+                    pressed={isLeftOpen}
+                    variant="outline"
+                    size="sm"
+                    className="ml-2 size-7"
+                    onPressedChange={() => setCollapsed('left', isLeftOpen)}
+                  >
+                    <PanelLeft className="h-4 w-4" />
+                  </Toggle>
+                </TooltipTrigger>
+                <TooltipContent>
+                  Toggle left sidebar
+                  <ShortcutHint settingsKey="toggleLeftSidebar" />
+                </TooltipContent>
+              </Tooltip>
+            )}
+            {leftSlot}
+          </div>
+          <div className="flex items-center justify-end [-webkit-app-region:no-drag]">
+            {rightSlot}
+            <Tooltip>
+              <TooltipTrigger>
+                <Toggle
+                  disabled={!RightPanel}
+                  pressed={isRightOpen}
+                  size="sm"
+                  variant="outline"
+                  onPressedChange={() => setCollapsed('right', isRightOpen)}
+                >
+                  <PanelRight className="size-3.5" />
+                </Toggle>
+              </TooltipTrigger>
+              <TooltipContent>
+                Toggle right sidebar
+                <ShortcutHint settingsKey="toggleRightSidebar" />
+              </TooltipContent>
+            </Tooltip>
+          </div>
+        </div>
+      </div>
+    </header>
+  );
+}
diff --git a/src/renderer/lib/components/titlebar/open-in-menu.tsx b/src/renderer/lib/components/titlebar/open-in-menu.tsx
new file mode 100644
index 0000000000..0018cec886
--- /dev/null
+++ b/src/renderer/lib/components/titlebar/open-in-menu.tsx
@@ -0,0 +1,191 @@
+import { useHotkey } from '@tanstack/react-hotkeys';
+import { ChevronDown } from 'lucide-react';
+import React, { useCallback, useMemo } from 'react';
+import { getAppById, isValidOpenInAppId, type OpenInAppId } from '@shared/openInApps';
+import { useAppSettingsKey } from '@renderer/features/settings/use-app-settings-key';
+import { useToast } from '@renderer/lib/hooks/use-toast';
+import {
+  getEffectiveHotkey,
+  getHotkeyRegistration,
+} from '@renderer/lib/hooks/useKeyboardShortcuts';
+import { useOpenInApps } from '@renderer/lib/hooks/useOpenInApps';
+import { rpc } from '@renderer/lib/ipc';
+import { Select, SelectContent, SelectItem, SelectTrigger } from '@renderer/lib/ui/select';
+import { ShortcutHint } from '@renderer/lib/ui/shortcut-hint';
+import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@renderer/lib/ui/tooltip';
+import { cn } from '@renderer/utils/utils';
+
+interface OpenInMenuProps {
+  path: string;
+  isRemote?: boolean;
+  sshConnectionId?: string | null;
+  className?: string;
+}
+
+export const OpenInMenu: React.FC<OpenInMenuProps> = ({
+  path,
+  className,
+  isRemote = false,
+  sshConnectionId = null,
+}) => {
+  const { toast } = useToast();
+  const { icons, labels, installedApps, availability, loading } = useOpenInApps();
+  const { value: openIn, update } = useAppSettingsKey('openIn');
+  const { value: keyboard } = useAppSettingsKey('keyboard');
+  const openInHotkey = getEffectiveHotkey('openInEditor', keyboard);
+
+  const defaultApp: OpenInAppId | null =
+    openIn?.default && isValidOpenInAppId(openIn.default) ? openIn.default : null;
+
+  const persistPreferredApp = useCallback(
+    (appId: OpenInAppId) => {
+      update({ default: appId });
+    },
+    [update]
+  );
+
+  const triggerOpenIn = useCallback(
+    async (appId: OpenInAppId) => {
+      const label = labels[appId] || appId;
+      try {
+        const res = await rpc.app.openIn({
+          app: appId,
+          path,
+          isRemote,
+          sshConnectionId: sshConnectionId ?? undefined,
+        });
+        if (!res?.success) {
+          toast({
+            title: `Open in ${label} failed`,
+            description: res?.error || 'Application not available.',
+            variant: 'destructive',
+          });
+        }
+      } catch (e: unknown) {
+        toast({
+          title: `Open in ${label} failed`,
+          description: e instanceof Error ? e.message : String(e),
+          variant: 'destructive',
+        });
+      }
+    },
+    [labels, path, isRemote, sshConnectionId, toast]
+  );
+
+  const sortedApps = useMemo(() => {
+    if (!defaultApp) return installedApps;
+    return [...installedApps].sort((a, b) => {
+      if (a.id === defaultApp) return -1;
+      if (b.id === defaultApp) return 1;
+      return 0;
+    });
+  }, [defaultApp, installedApps]);
+
+  const menuApps = useMemo(
+    () => sortedApps.filter((app) => !app.hideIfUnavailable || availability[app.id]),
+    [availability, sortedApps]
+  );
+
+  const buttonAppId = useMemo(() => {
+    if (defaultApp && menuApps.some((app) => app.id === defaultApp)) {
+      return defaultApp;
+    }
+    return menuApps[0]?.id;
+  }, [defaultApp, menuApps]);
+
+  const buttonAppLabel = buttonAppId ? (labels[buttonAppId] ?? buttonAppId) : null;
+
+  useHotkey(
+    getHotkeyRegistration('openInEditor', keyboard),
+    () => {
+      if (!buttonAppId) return;
+      void triggerOpenIn(buttonAppId);
+    },
+    { enabled: !!buttonAppId && !loading && openInHotkey !== null }
+  );
+
+  const shortenedPath = useMemo(() => path.split('/').slice(-2).join('/'), [path]);
+
+  return (
+    <div
+      className={cn(
+        'border border-border rounded-md h-6 flex items-center text-foreground-muted overflow-hidden',
+        className
+      )}
+    >
+      <TooltipProvider delay={0}>
+        <Tooltip>
+          <TooltipTrigger className="flex-1 flex min-w-0">
+            <button
+              type="button"
+              className="group flex items-center w-full min-w-0 gap-1.5 border-r border-border truncate rounded-r-none px-2 text-xs transition-colors hover:bg-background-1 hover:text-foreground"
+              onClick={() => {
+                if (!buttonAppId) return;
+                void triggerOpenIn(buttonAppId);
+              }}
+              disabled={!buttonAppId || loading}
+              aria-label={buttonAppLabel ? `Open in ${buttonAppLabel}` : 'Open'}
+            >
+              {buttonAppId && icons[buttonAppId] && (
+                <img
+                  src={icons[buttonAppId]}
+                  alt={labels[buttonAppId] || buttonAppId}
+                  className={`size-3.5 rounded ${
+                    getAppById(buttonAppId)?.invertInDark ? 'dark:invert' : ''
+                  }`}
+                />
+              )}
+              <span>{shortenedPath}</span>
+            </button>
+          </TooltipTrigger>
+          <TooltipContent side="bottom">
+            <div className="flex flex-col gap-1">
+              <span>Open in {buttonAppLabel || 'editor'}</span>
+              <ShortcutHint settingsKey="openInEditor" />
+            </div>
+          </TooltipContent>
+        </Tooltip>
+      </TooltipProvider>
+      <Select
+        value={defaultApp ?? undefined}
+        onValueChange={(value) => {
+          if (isValidOpenInAppId(value)) {
+            persistPreferredApp(value as OpenInAppId);
+          }
+        }}
+      >
+        <Tooltip>
+          <TooltipTrigger
+            render={
+              <SelectTrigger
+                showChevron={false}
+                className="group shrink-0 size-6 border-none bg-transparent flex items-center justify-center transition-colors hover:bg-background-1 hover:text-foreground"
+                aria-label="Open in options"
+              >
+                <ChevronDown className="size-3.5" />
+              </SelectTrigger>
+            }
+          ></TooltipTrigger>
+          <TooltipContent side="bottom">Select open in app</TooltipContent>
+        </Tooltip>
+        <SelectContent align="end" alignItemWithTrigger={false} sideOffset={6}>
+          {menuApps.map((app) => {
+            const isAvailable = loading ? availability[app.id] === true : true;
+            return (
+              <SelectItem key={app.id} value={app.id} disabled={!isAvailable}>
+                {icons[app.id] && (
+                  <img
+                    src={icons[app.id]}
+                    alt={labels[app.id] || app.label}
+                    className={`h-4 w-4 rounded ${app.invertInDark ? 'dark:invert' : ''}`}
+                  />
+                )}
+                {labels[app.id] || app.label}
+              </SelectItem>
+            );
+          })}
+        </SelectContent>
+      </Select>
+    </div>
+  );
+};
diff --git a/src/renderer/lib/activeCodeEditor.ts b/src/renderer/lib/editor/activeCodeEditor.ts
similarity index 80%
rename from src/renderer/lib/activeCodeEditor.ts
rename to src/renderer/lib/editor/activeCodeEditor.ts
index 39d0efbec5..c9c67306c1 100644
--- a/src/renderer/lib/activeCodeEditor.ts
+++ b/src/renderer/lib/editor/activeCodeEditor.ts
@@ -1,6 +1,8 @@
-let activeEditor: any | null = null;
+import type * as monaco from 'monaco-editor';
 
-function isEditorFocused(editor: any): boolean {
+let activeEditor: monaco.editor.ICodeEditor | null = null;
+
+function isEditorFocused(editor: monaco.editor.ICodeEditor | null): boolean {
   if (!editor) return false;
 
   try {
@@ -14,7 +16,7 @@ function isEditorFocused(editor: any): boolean {
   return false;
 }
 
-export function registerActiveCodeEditor(editor: any): () => void {
+export function registerActiveCodeEditor(editor: monaco.editor.ICodeEditor | null): () => void {
   if (!editor) return () => {};
 
   const focusDisposable = editor.onDidFocusEditorText?.(() => {
diff --git a/src/renderer/lib/editor/binary-renderer.tsx b/src/renderer/lib/editor/binary-renderer.tsx
new file mode 100644
index 0000000000..255d03cb99
--- /dev/null
+++ b/src/renderer/lib/editor/binary-renderer.tsx
@@ -0,0 +1,23 @@
+import { FileQuestion } from 'lucide-react';
+import { ManagedFile } from './types';
+
+interface BinaryRendererProps {
+  file: ManagedFile;
+}
+
+/** Shown for binary or otherwise unsupported files. */
+export function BinaryRenderer({ file }: BinaryRendererProps) {
+  const fileName = file.path.split('/').pop() ?? file.path;
+  const ext = file.path.split('.').pop()?.toUpperCase();
+
+  return (
+    <div className="flex h-full flex-col items-center justify-center gap-3 text-muted-foreground">
+      <FileQuestion className="h-10 w-10 opacity-30" />
+      <div className="text-center">
+        <p className="text-sm font-medium">{fileName}</p>
+        {ext && <p className="mt-0.5 text-xs opacity-50">{ext} file</p>}
+        <p className="mt-1 text-xs opacity-70">Binary file — no preview available</p>
+      </div>
+    </div>
+  );
+}
diff --git a/src/renderer/lib/editor/file-icon.tsx b/src/renderer/lib/editor/file-icon.tsx
new file mode 100644
index 0000000000..0a96c3f9bd
--- /dev/null
+++ b/src/renderer/lib/editor/file-icon.tsx
@@ -0,0 +1,93 @@
+import { File } from 'lucide-react';
+
+/** Maps a file extension (or full filename for extensionless files) to a devicon class name. */
+const EXTENSION_MAP: Record<string, string> = {
+  // TypeScript / JavaScript
+  ts: 'devicon-typescript-plain colored',
+  tsx: 'devicon-react-original colored',
+  js: 'devicon-javascript-plain colored',
+  jsx: 'devicon-react-original colored',
+  mjs: 'devicon-javascript-plain colored',
+  cjs: 'devicon-javascript-plain colored',
+
+  // Web
+  html: 'devicon-html5-plain colored',
+  css: 'devicon-css3-plain colored',
+  scss: 'devicon-sass-original colored',
+  sass: 'devicon-sass-original colored',
+
+  // Data / config
+  json: 'devicon-json-plain colored',
+  yaml: 'devicon-yaml-plain colored',
+  yml: 'devicon-yaml-plain colored',
+
+  // Markup
+  md: 'devicon-markdown-original',
+  mdx: 'devicon-markdown-original',
+
+  // Python
+  py: 'devicon-python-plain colored',
+
+  // Go
+  go: 'devicon-go-original colored',
+
+  // Rust
+  rs: 'devicon-rust-original',
+
+  // PHP
+  php: 'devicon-php-plain colored',
+
+  // Ruby
+  rb: 'devicon-ruby-plain colored',
+
+  // Java
+  java: 'devicon-java-plain colored',
+
+  // C family
+  c: 'devicon-c-plain colored',
+  cpp: 'devicon-cplusplus-plain colored',
+  cc: 'devicon-cplusplus-plain colored',
+  cxx: 'devicon-cplusplus-plain colored',
+  cs: 'devicon-csharp-plain colored',
+
+  // Shell
+  sh: 'devicon-bash-plain colored',
+  bash: 'devicon-bash-plain colored',
+  zsh: 'devicon-bash-plain colored',
+
+  // Frontend frameworks
+  vue: 'devicon-vuejs-plain colored',
+  svelte: 'devicon-svelte-plain colored',
+};
+
+/** Full-filename overrides for extensionless files. */
+const FILENAME_MAP: Record<string, string> = {
+  Dockerfile: 'devicon-docker-plain colored',
+  dockerfile: 'devicon-docker-plain colored',
+  '.gitignore': 'devicon-git-plain colored',
+  '.gitattributes': 'devicon-git-plain colored',
+  '.gitmodules': 'devicon-git-plain colored',
+};
+
+function getExtension(filename: string): string {
+  const dot = filename.lastIndexOf('.');
+  return dot >= 0 ? filename.slice(dot + 1).toLowerCase() : '';
+}
+
+interface FileIconProps {
+  filename: string;
+  className?: string;
+  size?: number;
+}
+
+export function FileIcon({ filename, className, size = 12 }: FileIconProps) {
+  const deviconClass = FILENAME_MAP[filename] ?? EXTENSION_MAP[getExtension(filename)];
+
+  if (deviconClass) {
+    return (
+      <i className={deviconClass} style={{ fontSize: size, lineHeight: 1 }} aria-hidden="true" />
+    );
+  }
+
+  return <File className={className ?? 'size-3.5 text-foreground-passive shrink-0'} />;
+}
diff --git a/src/renderer/lib/editor/fileKind.ts b/src/renderer/lib/editor/fileKind.ts
new file mode 100644
index 0000000000..93a4286215
--- /dev/null
+++ b/src/renderer/lib/editor/fileKind.ts
@@ -0,0 +1,78 @@
+import type { ManagedFileKind } from './types';
+
+/** Raster image extensions — rendered with <img>, not Monaco. */
+export const RASTER_EXTS = new Set(['png', 'jpg', 'jpeg', 'gif', 'webp', 'ico', 'bmp']);
+
+/**
+ * Known binary / non-text extensions — shown as "unsupported" instead of
+ * attempting to load into Monaco.
+ */
+export const BINARY_EXTS = new Set([
+  'exe',
+  'dll',
+  'so',
+  'dylib',
+  'wasm',
+  'zip',
+  'tar',
+  'gz',
+  'bz2',
+  '7z',
+  'rar',
+  'pdf',
+  'db',
+  'sqlite',
+  'sqlite3',
+  'class',
+  'jar',
+  'pyc',
+  'o',
+  'a',
+  'lib',
+  'bin',
+  'dat',
+  'pkg',
+  'dmg',
+  'iso',
+  'ttf',
+  'otf',
+  'woff',
+  'woff2',
+  'eot',
+  'mp3',
+  'mp4',
+  'wav',
+  'ogg',
+  'webm',
+  'mov',
+  'avi',
+]);
+
+/**
+ * Determine the kind of a file purely from its extension, with no I/O.
+ * Returns everything except `'too-large'`, which is set after reading the file
+ * and checking the `truncated` flag from the FS layer.
+ */
+export function getFileKind(filePath: string): Exclude<ManagedFileKind, 'too-large'> {
+  const ext = filePath.split('.').pop()?.toLowerCase() ?? '';
+  if (RASTER_EXTS.has(ext)) return 'image';
+  if (ext === 'svg') return 'svg';
+  if (ext === 'md' || ext === 'mdx') return 'markdown';
+  if (BINARY_EXTS.has(ext)) return 'binary';
+  return 'text';
+}
+
+/** True for file kinds that default to rendered/preview mode. */
+export function isPreviewableKind(kind: ManagedFileKind): boolean {
+  return kind === 'svg' || kind === 'markdown';
+}
+
+/**
+ * Returns true if the file should be treated as binary for diff views.
+ * Binary and image files cannot be shown in Monaco; callers should skip
+ * model registration and show a "Binary file" placeholder instead.
+ */
+export function isBinaryForDiff(filePath: string): boolean {
+  const kind = getFileKind(filePath);
+  return kind === 'binary' || kind === 'image';
+}
diff --git a/src/renderer/lib/editor/image-renderer.tsx b/src/renderer/lib/editor/image-renderer.tsx
new file mode 100644
index 0000000000..4d2e9be76f
--- /dev/null
+++ b/src/renderer/lib/editor/image-renderer.tsx
@@ -0,0 +1,16 @@
+import type { ManagedFile } from './types';
+
+interface ImageRendererProps {
+  file: ManagedFile;
+}
+
+/** Renders raster image files (png, jpg, gif, webp, ico, bmp). */
+export function ImageRenderer({ file }: ImageRendererProps) {
+  const fileName = file.path.split('/').pop() ?? file.path;
+
+  return (
+    <div className="flex h-full items-center justify-center overflow-auto p-4">
+      <img src={file.content} alt={fileName} className="max-h-full max-w-full object-contain" />
+    </div>
+  );
+}
diff --git a/src/renderer/lib/editor/loading-renderer.tsx b/src/renderer/lib/editor/loading-renderer.tsx
new file mode 100644
index 0000000000..33a3d091b2
--- /dev/null
+++ b/src/renderer/lib/editor/loading-renderer.tsx
@@ -0,0 +1,26 @@
+import { useEffect, useState } from 'react';
+
+/** Delay before showing the spinner to avoid flash on fast local reads. */
+const SPINNER_DELAY_MS = 300;
+
+/**
+ * Shown while a file's content is being fetched.
+ * Renders nothing for the first 300ms to avoid a spinner flash on fast
+ * local reads; only appears for noticeably slow loads (e.g. SSH).
+ */
+export function LoadingRenderer() {
+  const [visible, setVisible] = useState(false);
+
+  useEffect(() => {
+    const timer = setTimeout(() => setVisible(true), SPINNER_DELAY_MS);
+    return () => clearTimeout(timer);
+  }, []);
+
+  if (!visible) return null;
+
+  return (
+    <div className="flex h-full items-center justify-center">
+      <div className="h-5 w-5 animate-spin rounded-full border-2 border-muted-foreground border-t-transparent" />
+    </div>
+  );
+}
diff --git a/src/renderer/lib/editor/markdown-renderer.tsx b/src/renderer/lib/editor/markdown-renderer.tsx
new file mode 100644
index 0000000000..6bf1eefceb
--- /dev/null
+++ b/src/renderer/lib/editor/markdown-renderer.tsx
@@ -0,0 +1,70 @@
+import { Eye, Pencil } from 'lucide-react';
+import { observer } from 'mobx-react-lite';
+import { useCallback } from 'react';
+import { useProvisionedTask, useTaskViewContext } from '@renderer/features/tasks/task-view-context';
+import { rpc } from '@renderer/lib/ipc';
+import { modelRegistry } from '@renderer/lib/monaco/monaco-model-registry';
+import { buildMonacoModelPath } from '@renderer/lib/monaco/monacoModelPath';
+import { MarkdownRenderer } from '@renderer/lib/ui/markdown-renderer';
+import { ToggleGroup, ToggleGroupItem } from '@renderer/lib/ui/toggle-group';
+
+interface MarkdownEditorRendererProps {
+  filePath: string;
+}
+
+/**
+ * Renders a markdown file as a formatted preview.
+ * A floating "Edit source" button in the top-right corner toggles to Monaco source view.
+ */
+export const MarkdownEditorRenderer = observer(function MarkdownEditorRenderer({
+  filePath,
+}: MarkdownEditorRendererProps) {
+  const { projectId } = useTaskViewContext();
+  const provisioned = useProvisionedTask();
+  const { workspaceId } = provisioned;
+  const editorView = provisioned.taskView.editorView;
+  const bufferUri = buildMonacoModelPath(editorView.modelRootPath, filePath);
+  // Reading bufferVersions creates a MobX tracking dependency so this observer()
+  // component re-renders whenever the buffer content changes or is first populated.
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  const _version = modelRegistry.bufferVersions.get(bufferUri);
+  const content = modelRegistry.getValue(bufferUri) ?? '';
+  const fileDir = filePath.includes('/') ? filePath.substring(0, filePath.lastIndexOf('/')) : '';
+
+  const resolveImage = useCallback(
+    async (src: string): Promise<string | null> => {
+      const imagePath = fileDir ? `${fileDir}/${src}` : src;
+      const result = await rpc.fs.readImage(projectId, workspaceId, imagePath);
+      return result.success ? (result.data?.dataUrl ?? null) : null;
+    },
+    [projectId, workspaceId, fileDir]
+  );
+
+  return (
+    <div className="relative h-full overflow-y-auto bg-background-secondary-1">
+      <ToggleGroup
+        value={['markdown']}
+        onValueChange={(value) => {
+          if (value.includes('markdown-source')) {
+            editorView.updateRenderer(filePath, () => ({ kind: 'markdown-source' }));
+          }
+        }}
+        size="sm"
+        className="sticky top-3 z-10 float-right mr-3"
+      >
+        <ToggleGroupItem value="markdown" aria-label="Preview">
+          <Eye className="h-3.5 w-3.5" />
+        </ToggleGroupItem>
+        <ToggleGroupItem value="markdown-source" aria-label="Edit source">
+          <Pencil className="h-3.5 w-3.5" />
+        </ToggleGroupItem>
+      </ToggleGroup>
+      <MarkdownRenderer
+        content={content}
+        variant="full"
+        className="w-full max-w-3xl px-8 py-8"
+        resolveImage={resolveImage}
+      />
+    </div>
+  );
+});
diff --git a/src/renderer/lib/editor/renderer-utils.ts b/src/renderer/lib/editor/renderer-utils.ts
new file mode 100644
index 0000000000..65a0d883a3
--- /dev/null
+++ b/src/renderer/lib/editor/renderer-utils.ts
@@ -0,0 +1,14 @@
+import { FileRendererData } from '@renderer/features/tasks/types';
+import { getFileKind } from './fileKind';
+
+/** Returns the default renderer for a file based on its kind. */
+export function getDefaultRenderer(kind: ReturnType<typeof getFileKind>): FileRendererData {
+  switch (kind) {
+    case 'markdown':
+      return { kind: 'markdown' };
+    case 'svg':
+      return { kind: 'svg' };
+    default:
+      return { kind } as FileRendererData;
+  }
+}
diff --git a/src/renderer/lib/editor/svg-renderer.tsx b/src/renderer/lib/editor/svg-renderer.tsx
new file mode 100644
index 0000000000..29f03432b2
--- /dev/null
+++ b/src/renderer/lib/editor/svg-renderer.tsx
@@ -0,0 +1,47 @@
+import { Pencil } from 'lucide-react';
+import { useEffect, useMemo } from 'react';
+import { useProvisionedTask } from '@renderer/features/tasks/task-view-context';
+import { modelRegistry } from '@renderer/lib/monaco/monaco-model-registry';
+import { buildMonacoModelPath } from '@renderer/lib/monaco/monacoModelPath';
+
+interface SvgRendererProps {
+  filePath: string;
+}
+
+/**
+ * Renders an SVG file as an image.
+ * A floating "Edit source" button in the top-right corner toggles to Monaco source view.
+ */
+export function SvgRenderer({ filePath }: SvgRendererProps) {
+  const editorView = useProvisionedTask().taskView.editorView;
+
+  const content =
+    modelRegistry.getValue(buildMonacoModelPath(editorView.modelRootPath, filePath)) ?? '';
+
+  const svgUrl = useMemo(
+    () => (content ? URL.createObjectURL(new Blob([content], { type: 'image/svg+xml' })) : ''),
+    [content]
+  );
+
+  useEffect(() => {
+    return () => {
+      if (svgUrl) URL.revokeObjectURL(svgUrl);
+    };
+  }, [svgUrl]);
+
+  const fileName = filePath.split('/').pop() ?? filePath;
+
+  return (
+    <div className="relative flex h-full items-center justify-center overflow-auto p-4">
+      <img src={svgUrl} alt={fileName} className="max-h-full max-w-full object-contain" />
+      <button
+        className="absolute right-3 top-3 z-10 rounded p-1 bg-background/80 hover:bg-accent text-muted-foreground hover:text-foreground"
+        onClick={() => editorView.updateRenderer(filePath, () => ({ kind: 'svg-source' }))}
+        title="Edit source"
+        aria-label="Edit source"
+      >
+        <Pencil className="h-3.5 w-3.5" />
+      </button>
+    </div>
+  );
+}
diff --git a/src/renderer/lib/editor/too-large-renderer.tsx b/src/renderer/lib/editor/too-large-renderer.tsx
new file mode 100644
index 0000000000..db60291950
--- /dev/null
+++ b/src/renderer/lib/editor/too-large-renderer.tsx
@@ -0,0 +1,30 @@
+import { FileX } from 'lucide-react';
+import type { ManagedFile } from './types';
+
+interface TooLargeRendererProps {
+  file: ManagedFile;
+}
+
+function formatBytes(bytes: number): string {
+  if (bytes < 1024) return `${bytes} B`;
+  if (bytes < 1024 * 1024) return `${(bytes / 1024).toFixed(1)} KB`;
+  return `${(bytes / (1024 * 1024)).toFixed(1)} MB`;
+}
+
+/** Shown when a file exceeds the editor's read limit. */
+export function TooLargeRenderer({ file }: TooLargeRendererProps) {
+  const fileName = file.path.split('/').pop() ?? file.path;
+
+  return (
+    <div className="flex h-full flex-col items-center justify-center gap-3 text-muted-foreground">
+      <FileX className="h-10 w-10 opacity-30" />
+      <div className="text-center">
+        <p className="text-sm font-medium">{fileName}</p>
+        <p className="mt-1 text-xs opacity-70">File too large to display in the editor</p>
+        {file.totalSize != null && (
+          <p className="mt-0.5 text-xs opacity-50">{formatBytes(file.totalSize)}</p>
+        )}
+      </div>
+    </div>
+  );
+}
diff --git a/src/renderer/lib/editor/types.ts b/src/renderer/lib/editor/types.ts
new file mode 100644
index 0000000000..3015ef7ae5
--- /dev/null
+++ b/src/renderer/lib/editor/types.ts
@@ -0,0 +1,31 @@
+import { FileRendererData } from '@renderer/features/tasks/types';
+
+/** All possible states a file can be in once opened by the editor. */
+export type ManagedFileKind = 'text' | 'markdown' | 'svg' | 'image' | 'too-large' | 'binary';
+
+/** A file that has been opened by the editor and is tracked in the task view store. */
+export interface ManagedFile {
+  path: string;
+  kind: ManagedFileKind;
+  /** Data-URL for images; empty string for Monaco-backed files (content lives in Monaco model). */
+  content: string;
+  /** True only for image files while the data-URL is being fetched. */
+  isLoading: boolean;
+  /** Only set for `kind === 'too-large'` files. */
+  totalSize?: number | null;
+  /** Stable UUID assigned once on first open — used as React key. */
+  tabId: string;
+  /** Renderer kind and its display state. */
+  renderer: FileRendererData;
+}
+
+/**
+ * A tab entry in the EditorViewStore tab list.
+ * Extends ManagedFile with the isPreview flag so that a single-click preview
+ * tab can be promoted to a stable tab without removing and re-adding it
+ * (same tabId → same React key → no flash).
+ */
+export interface EditorTab extends ManagedFile {
+  /** True when opened via single-click; double-click or an edit promotes it to stable. */
+  isPreview: boolean;
+}
diff --git a/src/renderer/lib/editor/utils.ts b/src/renderer/lib/editor/utils.ts
new file mode 100644
index 0000000000..116681db81
--- /dev/null
+++ b/src/renderer/lib/editor/utils.ts
@@ -0,0 +1,31 @@
+const MARKDOWN_EXTENSIONS = ['md', 'mdx'];
+
+/** Returns true if the file path points to a markdown file. */
+export function isMarkdownPath(filePath: string): boolean {
+  const ext = filePath.split('.').pop()?.toLowerCase();
+  return ext ? MARKDOWN_EXTENSIONS.includes(ext) : false;
+}
+
+/** Alias for {@link isMarkdownPath}. */
+export const isMarkdownFile = isMarkdownPath;
+
+// ---------------------------------------------------------------------------
+// Monaco editor options
+// ---------------------------------------------------------------------------
+
+/** Default Monaco editor options shared across all editor instances. */
+export const DEFAULT_EDITOR_OPTIONS = {
+  minimap: { enabled: true },
+  fontSize: 13,
+  padding: { top: 12, bottom: 12 },
+  lineNumbers: 'on' as const,
+  rulers: [],
+  wordWrap: 'on' as const,
+  automaticLayout: true,
+  scrollBeyondLastLine: false,
+  renderWhitespace: 'selection' as const,
+  cursorBlinking: 'smooth' as const,
+  smoothScrolling: true,
+  formatOnPaste: true,
+  formatOnType: true,
+};
diff --git a/src/renderer/lib/editorStateStorage.ts b/src/renderer/lib/editorStateStorage.ts
deleted file mode 100644
index cfeddbcc29..0000000000
--- a/src/renderer/lib/editorStateStorage.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-export interface EditorState {
-  expandedPaths: string[];
-  openFilePaths: string[];
-  activeFilePath: string | null;
-  pinnedFiles?: string[];
-}
-
-const KEY_PREFIX = 'emdash:editorState:';
-
-function getKey(taskId: string): string {
-  return `${KEY_PREFIX}${taskId}`;
-}
-
-export function getEditorState(taskId: string | null): EditorState | null {
-  if (!taskId) return null;
-  try {
-    const raw = localStorage.getItem(getKey(taskId));
-    if (!raw) return null;
-    const parsed = JSON.parse(raw) as Partial<EditorState>;
-    if (!parsed || typeof parsed !== 'object') return null;
-    return {
-      expandedPaths: Array.isArray(parsed.expandedPaths) ? parsed.expandedPaths : [],
-      openFilePaths: Array.isArray(parsed.openFilePaths) ? parsed.openFilePaths : [],
-      activeFilePath:
-        typeof parsed.activeFilePath === 'string' || parsed.activeFilePath === null
-          ? parsed.activeFilePath
-          : null,
-      pinnedFiles: Array.isArray(parsed.pinnedFiles) ? parsed.pinnedFiles : [],
-    };
-  } catch {
-    return null;
-  }
-}
-
-export function saveEditorState(taskId: string | null, partial: Partial<EditorState>): void {
-  if (!taskId) return;
-  try {
-    const existing = getEditorState(taskId) || {
-      expandedPaths: [],
-      openFilePaths: [],
-      activeFilePath: null,
-      pinnedFiles: [],
-    };
-    const next: EditorState = {
-      expandedPaths:
-        partial.expandedPaths !== undefined ? partial.expandedPaths : existing.expandedPaths,
-      openFilePaths:
-        partial.openFilePaths !== undefined ? partial.openFilePaths : existing.openFilePaths,
-      activeFilePath:
-        partial.activeFilePath !== undefined ? partial.activeFilePath : existing.activeFilePath,
-      pinnedFiles: partial.pinnedFiles !== undefined ? partial.pinnedFiles : existing.pinnedFiles,
-    };
-    localStorage.setItem(getKey(taskId), JSON.stringify(next));
-  } catch {
-    // ignore
-  }
-}
diff --git a/src/renderer/lib/errorTracking.ts b/src/renderer/lib/errorTracking.ts
deleted file mode 100644
index 8309fbc604..0000000000
--- a/src/renderer/lib/errorTracking.ts
+++ /dev/null
@@ -1,337 +0,0 @@
-interface ErrorContext {
-  // Component/UI context
-  component?: string;
-  action?: string;
-
-  // User interaction context
-  user_action?: string;
-
-  // Operation context
-  operation?: string;
-  endpoint?: string;
-
-  // Error classification
-  error_type?: string;
-  severity?: 'low' | 'medium' | 'high' | 'critical';
-
-  // Task/Project context
-  task_id?: string;
-  project_id?: string;
-  provider?: string;
-
-  // Additional debugging info
-  [key: string]: any;
-}
-
-class RendererErrorTracking {
-  private sessionErrors: number = 0;
-  private lastErrorTimestamp: number = 0;
-
-  /**
-   * Capture an exception in the renderer process
-   */
-  captureException(error: Error | unknown, context?: ErrorContext): void {
-    try {
-      // Rate limiting
-      const now = Date.now();
-      if (now - this.lastErrorTimestamp < 100) {
-        return; // Skip if error happened within 100ms
-      }
-      this.lastErrorTimestamp = now;
-      this.sessionErrors++;
-
-      // Build error object
-      const errorObj = error instanceof Error ? error : new Error(String(error));
-      const errorMessage = errorObj.message || 'Unknown error';
-      const errorStack = errorObj.stack || '';
-
-      // Determine severity if not provided
-      const severity = context?.severity || this.determineSeverity(errorMessage, context);
-
-      // Build error properties following PostHog's $exception format
-      const properties: Record<string, any> = {
-        // PostHog required fields for error tracking
-        $exception_message: errorMessage.slice(0, 500),
-        $exception_type: context?.error_type || this.classifyError(errorMessage),
-        $exception_stack_trace_raw: errorStack.slice(0, 2000),
-        $exception_fingerprint: `${context?.component || 'renderer'}_${context?.operation || context?.action || 'unknown'}_${this.classifyError(errorMessage)}`,
-
-        // Additional context
-        severity,
-
-        // Component/UI context
-        component: context?.component || 'renderer',
-        action: context?.action,
-        user_action: context?.user_action,
-
-        // Operation context
-        operation: context?.operation,
-        endpoint: context?.endpoint,
-
-        // Task/Project context
-        task_id: context?.task_id,
-        project_id: context?.project_id,
-        provider: context?.provider,
-
-        // Session info
-        session_errors: this.sessionErrors,
-        error_timestamp: new Date().toISOString(),
-
-        // Browser info
-        user_agent: navigator.userAgent,
-        viewport: `${window.innerWidth}x${window.innerHeight}`,
-
-        // Additional custom context
-        ...this.sanitizeContext(context),
-      };
-
-      // Filter out undefined/null values
-      const cleanProperties = Object.fromEntries(
-        Object.entries(properties).filter(([_, v]) => v !== undefined && v !== null)
-      );
-
-      // Send to main process as $exception event (required for PostHog error tracking)
-      this.sendToMainProcess('$exception', cleanProperties);
-
-      // Also log to console for debugging
-      console.error('[ErrorTracking]', errorMessage, {
-        severity,
-        component: context?.component,
-        action: context?.action,
-      });
-    } catch (trackingError) {
-      // Never let error tracking crash the renderer
-      console.warn('Failed to capture exception:', trackingError);
-    }
-  }
-
-  /**
-   * Capture a critical error that might affect app stability
-   */
-  captureCriticalError(error: Error | unknown, context?: ErrorContext): void {
-    this.captureException(error, {
-      ...context,
-      severity: 'critical',
-    });
-  }
-
-  /**
-   * Track API/network errors
-   */
-  captureApiError(
-    error: Error | unknown,
-    endpoint: string,
-    operation: string,
-    additionalContext?: Partial<ErrorContext>
-  ): void {
-    this.captureException(error, {
-      error_type: 'api_error',
-      severity: 'medium',
-      endpoint,
-      operation,
-      ...additionalContext,
-    });
-  }
-
-  /**
-   * Track component render errors
-   */
-  captureComponentError(
-    error: Error | unknown,
-    componentName: string,
-    additionalContext?: Partial<ErrorContext>
-  ): void {
-    this.captureException(error, {
-      error_type: 'render_error',
-      severity: 'high',
-      component: componentName,
-      ...additionalContext,
-    });
-  }
-
-  /**
-   * Track user action errors
-   */
-  captureUserActionError(
-    error: Error | unknown,
-    action: string,
-    additionalContext?: Partial<ErrorContext>
-  ): void {
-    this.captureException(error, {
-      error_type: 'user_action_error',
-      severity: 'medium',
-      user_action: action,
-      ...additionalContext,
-    });
-  }
-
-  // Private helper methods
-
-  private sendToMainProcess(event: string, properties: Record<string, any>): void {
-    try {
-      const api = (window as any).electronAPI;
-      if (api?.captureTelemetry) {
-        void api.captureTelemetry(event, properties);
-      }
-    } catch {
-      // Silent fail - telemetry might not be available
-    }
-  }
-
-  private determineSeverity(
-    errorMessage: string,
-    context?: ErrorContext
-  ): ErrorContext['severity'] {
-    // Critical errors
-    if (
-      errorMessage.includes('FATAL') ||
-      errorMessage.includes('CRASH') ||
-      errorMessage.includes('Maximum update depth exceeded') ||
-      context?.error_type === 'render_error'
-    ) {
-      return 'critical';
-    }
-
-    // High severity
-    if (
-      errorMessage.includes('Cannot read') ||
-      errorMessage.includes('Cannot access') ||
-      errorMessage.includes('is not defined') ||
-      errorMessage.includes('Network request failed')
-    ) {
-      return 'high';
-    }
-
-    // Low severity
-    if (
-      errorMessage.includes('canceled') ||
-      errorMessage.includes('aborted') ||
-      errorMessage.includes('ResizeObserver')
-    ) {
-      return 'low';
-    }
-
-    return 'medium';
-  }
-
-  private classifyError(errorMessage: string): string {
-    if (
-      errorMessage.includes('fetch') ||
-      errorMessage.includes('network') ||
-      errorMessage.includes('API')
-    ) {
-      return 'network_error';
-    }
-    if (
-      errorMessage.includes('render') ||
-      errorMessage.includes('component') ||
-      errorMessage.includes('React')
-    ) {
-      return 'render_error';
-    }
-    if (
-      errorMessage.includes('TypeError') ||
-      errorMessage.includes('undefined') ||
-      errorMessage.includes('null')
-    ) {
-      return 'type_error';
-    }
-    if (errorMessage.includes('ReferenceError')) {
-      return 'reference_error';
-    }
-    if (errorMessage.includes('SyntaxError')) {
-      return 'syntax_error';
-    }
-    return 'unknown_error';
-  }
-
-  private sanitizeContext(context?: ErrorContext): Record<string, any> {
-    if (!context) return {};
-
-    const sanitized: Record<string, any> = {};
-    const sensitiveKeys = ['password', 'token', 'secret', 'key', 'auth'];
-    const skipKeys = [
-      'severity',
-      'component',
-      'action',
-      'user_action',
-      'operation',
-      'endpoint',
-      'error_type',
-    ];
-
-    for (const [key, value] of Object.entries(context)) {
-      // Skip already processed or sensitive keys
-      if (skipKeys.includes(key)) continue;
-      if (sensitiveKeys.some((sensitive) => key.toLowerCase().includes(sensitive))) continue;
-
-      // Sanitize value
-      if (typeof value === 'string') {
-        sanitized[key] = value.slice(0, 200);
-      } else if (typeof value === 'number' || typeof value === 'boolean') {
-        sanitized[key] = value;
-      } else if (value === null || value === undefined) {
-        // Skip null/undefined
-      } else {
-        // Convert objects to string with limit
-        try {
-          sanitized[key] = JSON.stringify(value).slice(0, 200);
-        } catch {
-          // Skip if can't stringify
-        }
-      }
-    }
-
-    return sanitized;
-  }
-}
-
-// Export singleton instance
-export const errorTracking = new RendererErrorTracking();
-
-// Export convenience functions
-export function captureException(error: Error | unknown, context?: ErrorContext) {
-  errorTracking.captureException(error, context);
-}
-
-export function captureApiError(
-  error: Error | unknown,
-  endpoint: string,
-  operation: string,
-  context?: Partial<ErrorContext>
-) {
-  errorTracking.captureApiError(error, endpoint, operation, context);
-}
-
-export function captureComponentError(
-  error: Error | unknown,
-  componentName: string,
-  context?: Partial<ErrorContext>
-) {
-  errorTracking.captureComponentError(error, componentName, context);
-}
-
-// Set up global error handlers
-if (typeof window !== 'undefined') {
-  // Catch unhandled errors
-  window.addEventListener('error', (event) => {
-    errorTracking.captureException(event.error || new Error(event.message), {
-      error_type: 'unhandled_error',
-      severity: 'critical',
-      component: 'global',
-      filename: event.filename,
-      lineno: event.lineno,
-      colno: event.colno,
-    });
-  });
-
-  // Catch unhandled promise rejections
-  window.addEventListener('unhandledrejection', (event) => {
-    errorTracking.captureException(event.reason || new Error('Unhandled Promise Rejection'), {
-      error_type: 'unhandled_rejection',
-      severity: 'high',
-      component: 'global',
-      promise: event.promise,
-    });
-  });
-}
diff --git a/src/renderer/lib/fileChangeEvents.ts b/src/renderer/lib/fileChangeEvents.ts
deleted file mode 100644
index 4480c8ad21..0000000000
--- a/src/renderer/lib/fileChangeEvents.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * File change event system for notifying components when files are saved
- * This allows the CodeEditor to notify the FileChangesPanel to refresh immediately
- */
-
-export const FILE_CHANGE_EVENT = 'file-change-notification';
-
-export interface FileChangeEvent {
-  taskPath: string;
-  filePath?: string;
-}
-
-/**
- * Dispatch a file change event to notify listeners that files have been saved
- */
-export function dispatchFileChangeEvent(taskPath: string, filePath?: string): void {
-  const event = new CustomEvent(FILE_CHANGE_EVENT, {
-    detail: { taskPath, filePath },
-  });
-  window.dispatchEvent(event);
-}
-
-/**
- * Subscribe to file change events
- * Returns a cleanup function to remove the listener
- */
-export function subscribeToFileChanges(
-  callback: (event: CustomEvent<FileChangeEvent>) => void
-): () => void {
-  const handler = (e: Event) => {
-    callback(e as CustomEvent<FileChangeEvent>);
-  };
-  window.addEventListener(FILE_CHANGE_EVENT, handler);
-  return () => window.removeEventListener(FILE_CHANGE_EVENT, handler);
-}
diff --git a/src/renderer/lib/filters.ts b/src/renderer/lib/filters.ts
deleted file mode 100644
index 4074be52cb..0000000000
--- a/src/renderer/lib/filters.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-export interface FilterContext {
-  phase: 'chunk' | 'final' | 'historical';
-  taskId: string;
-  conversationId?: string | null;
-}
-
-export type Filter = (input: string, ctx: FilterContext) => string;
-
-export const noOp: Filter = (input) => input;
-
-export const composeFilters = (filters: Filter[]): Filter => {
-  if (filters.length === 0) {
-    return noOp;
-  }
-
-  return (input, ctx) => filters.reduce((acc, filter) => filter(acc, ctx), input);
-};
-
-export const defaultPipeline = composeFilters([noOp]);
diff --git a/src/renderer/lib/formatCommentsForAgent.ts b/src/renderer/lib/formatCommentsForAgent.ts
deleted file mode 100644
index 2a2d3105c9..0000000000
--- a/src/renderer/lib/formatCommentsForAgent.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export { formatCommentsForAgent } from '@shared/lineComments';
-export type { LineCommentLike } from '@shared/lineComments';
diff --git a/src/renderer/lib/getAgentForTask.ts b/src/renderer/lib/getAgentForTask.ts
deleted file mode 100644
index 4cce34f94b..0000000000
--- a/src/renderer/lib/getAgentForTask.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { type Agent } from '../types';
-import type { Task } from '../types/app';
-
-export const getAgentForTask = (task: Task): Agent | null => {
-  if ((task.metadata as any)?.multiAgent?.enabled) {
-    return null;
-  }
-  return (task.agentId as Agent) || 'codex';
-};
diff --git a/src/renderer/lib/gitStatusCache.ts b/src/renderer/lib/gitStatusCache.ts
deleted file mode 100644
index ddf1c76753..0000000000
--- a/src/renderer/lib/gitStatusCache.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-export type GitStatusChange = {
-  path: string;
-  status: string;
-  additions: number;
-  deletions: number;
-  isStaged: boolean;
-  diff?: string;
-};
-
-export type GitStatusResult = {
-  success: boolean;
-  changes?: GitStatusChange[];
-  error?: string;
-};
-
-const CACHE_TTL_MS = 30000;
-
-const cache = new Map<string, { timestamp: number; result: GitStatusResult }>();
-const inFlight = new Map<string, { id: number; promise: Promise<GitStatusResult> }>();
-const latestRequestId = new Map<string, number>();
-let requestCounter = 0;
-
-export async function getCachedGitStatus(
-  taskPath: string,
-  options?: { force?: boolean }
-): Promise<GitStatusResult> {
-  if (!taskPath) return { success: false, error: 'workspace-unavailable' };
-  const force = options?.force ?? false;
-  const now = Date.now();
-
-  if (!force) {
-    const cached = cache.get(taskPath);
-    if (cached && now - cached.timestamp < CACHE_TTL_MS) {
-      return cached.result;
-    }
-  }
-
-  const existing = inFlight.get(taskPath);
-  if (!force && existing) return existing.promise;
-
-  const requestId = (requestCounter += 1);
-  latestRequestId.set(taskPath, requestId);
-  const promise = (async () => {
-    try {
-      const res = await window.electronAPI.getGitStatus(taskPath);
-      const result = res ?? {
-        success: false,
-        error: 'Failed to load git status',
-      };
-      if (latestRequestId.get(taskPath) === requestId) {
-        cache.set(taskPath, { timestamp: Date.now(), result });
-      }
-      return result;
-    } catch (error) {
-      const result = {
-        success: false,
-        error: error instanceof Error ? error.message : 'Failed to load git status',
-      };
-      if (latestRequestId.get(taskPath) === requestId) {
-        cache.set(taskPath, { timestamp: Date.now(), result });
-      }
-      return result;
-    } finally {
-      const current = inFlight.get(taskPath);
-      if (current?.id === requestId) {
-        inFlight.delete(taskPath);
-      }
-    }
-  })();
-
-  inFlight.set(taskPath, { id: requestId, promise });
-  return promise;
-}
diff --git a/src/renderer/lib/hooks/use-attachments.ts b/src/renderer/lib/hooks/use-attachments.ts
new file mode 100644
index 0000000000..e2a047813b
--- /dev/null
+++ b/src/renderer/lib/hooks/use-attachments.ts
@@ -0,0 +1,76 @@
+import React, { useCallback, useRef, useState } from 'react';
+
+export function useAttachments() {
+  const fileInputRef = useRef<HTMLInputElement | null>(null);
+  const [attachments, setAttachments] = useState<File[]>([]);
+
+  const addFiles = useCallback((files: File[]) => {
+    if (files.length > 0) {
+      setAttachments((prev) => [...prev, ...files]);
+    }
+  }, []);
+
+  const removeAttachment = useCallback((index: number) => {
+    setAttachments((prev) => prev.filter((_, i) => i !== index));
+  }, []);
+
+  const openFilePicker = useCallback(() => {
+    fileInputRef.current?.click();
+  }, []);
+
+  const handleFileInputChange = useCallback(
+    (event: React.ChangeEvent<HTMLInputElement>) => {
+      addFiles(Array.from(event.target.files ?? []));
+      event.target.value = '';
+    },
+    [addFiles]
+  );
+
+  const handlePaste = useCallback(
+    (event: React.ClipboardEvent<HTMLTextAreaElement>) => {
+      const items = event.clipboardData?.items;
+      if (!items) return;
+
+      const imageFiles: File[] = [];
+      for (const item of items) {
+        if (item.type.startsWith('image/')) {
+          const file = item.getAsFile();
+          if (file) imageFiles.push(file);
+        }
+      }
+      addFiles(imageFiles);
+    },
+    [addFiles]
+  );
+
+  const handleDrop = useCallback(
+    (event: React.DragEvent<HTMLFormElement>) => {
+      event.preventDefault();
+      event.stopPropagation();
+      const files = Array.from(event.dataTransfer?.files ?? []);
+      addFiles(files.filter((file) => file.type.startsWith('image/')));
+    },
+    [addFiles]
+  );
+
+  const handleDragOver = useCallback((event: React.DragEvent<HTMLFormElement>) => {
+    event.preventDefault();
+    event.stopPropagation();
+  }, []);
+
+  const reset = useCallback(() => {
+    setAttachments([]);
+  }, []);
+
+  return {
+    attachments,
+    fileInputRef,
+    removeAttachment,
+    openFilePicker,
+    handleFileInputChange,
+    handlePaste,
+    handleDrop,
+    handleDragOver,
+    reset,
+  };
+}
diff --git a/src/renderer/lib/hooks/use-delay-boolean.ts b/src/renderer/lib/hooks/use-delay-boolean.ts
new file mode 100644
index 0000000000..7e84a387d4
--- /dev/null
+++ b/src/renderer/lib/hooks/use-delay-boolean.ts
@@ -0,0 +1,11 @@
+import { useEffect, useState } from 'react';
+
+export function useDelayedBoolean(value: boolean, delayMs: number): boolean {
+  const [delayed, setDelayed] = useState(false);
+  useEffect(() => {
+    const delay = value ? delayMs : 0;
+    const timer = setTimeout(() => setDelayed(value), delay);
+    return () => clearTimeout(timer);
+  }, [value, delayMs]);
+  return delayed;
+}
diff --git a/src/renderer/lib/hooks/use-toast.ts b/src/renderer/lib/hooks/use-toast.ts
new file mode 100644
index 0000000000..6db8b8414b
--- /dev/null
+++ b/src/renderer/lib/hooks/use-toast.ts
@@ -0,0 +1,31 @@
+import { toast as sonnerToast } from 'sonner';
+
+type ToastAction = {
+  label: string;
+  onClick: () => void;
+};
+
+type Toast = {
+  title?: string;
+  description?: string;
+  variant?: 'default' | 'destructive';
+  action?: ToastAction;
+};
+
+function toast({ title, description, variant, action }: Toast) {
+  const options = {
+    description,
+    ...(action && { action: { label: action.label, onClick: action.onClick } }),
+  };
+
+  if (variant === 'destructive') {
+    return sonnerToast.error(title, options);
+  }
+  return sonnerToast(title ?? '', options);
+}
+
+function useToast() {
+  return { toast };
+}
+
+export { toast, useToast };
diff --git a/src/renderer/lib/hooks/useAccount.ts b/src/renderer/lib/hooks/useAccount.ts
new file mode 100644
index 0000000000..5ea8453216
--- /dev/null
+++ b/src/renderer/lib/hooks/useAccount.ts
@@ -0,0 +1,53 @@
+import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
+import { rpc } from '@renderer/lib/ipc';
+
+export const ACCOUNT_SESSION_KEY = ['account:session'] as const;
+const ACCOUNT_HEALTH_KEY = ['account:health'] as const;
+
+export function useAccountSession() {
+  return useQuery({
+    queryKey: ACCOUNT_SESSION_KEY,
+    queryFn: () => rpc.account.getSession(),
+    staleTime: 30_000,
+    refetchOnWindowFocus: true,
+  });
+}
+
+export function useAccountSignIn() {
+  const queryClient = useQueryClient();
+  return useMutation({
+    mutationFn: (provider: string | undefined) => rpc.account.signIn(provider),
+    onSuccess: () => {
+      void queryClient.invalidateQueries({ queryKey: [...ACCOUNT_SESSION_KEY] });
+      void queryClient.invalidateQueries({ queryKey: ['github:status'] });
+    },
+  });
+}
+
+export function useAccountSignOut() {
+  const queryClient = useQueryClient();
+  return useMutation({
+    mutationFn: () => rpc.account.signOut(),
+    onSuccess: () => {
+      void queryClient.invalidateQueries({ queryKey: [...ACCOUNT_SESSION_KEY] });
+    },
+  });
+}
+
+export function useAccountHealth() {
+  return useQuery({
+    queryKey: ACCOUNT_HEALTH_KEY,
+    queryFn: () => rpc.account.checkHealth(),
+    staleTime: 60_000,
+  });
+}
+
+export function useFetchAccountHealth() {
+  const queryClient = useQueryClient();
+  return () =>
+    queryClient.fetchQuery({
+      queryKey: ACCOUNT_HEALTH_KEY,
+      queryFn: () => rpc.account.checkHealth(),
+      staleTime: 0,
+    });
+}
diff --git a/src/renderer/lib/hooks/useKeyboardShortcuts.ts b/src/renderer/lib/hooks/useKeyboardShortcuts.ts
new file mode 100644
index 0000000000..6eeef3a278
--- /dev/null
+++ b/src/renderer/lib/hooks/useKeyboardShortcuts.ts
@@ -0,0 +1,183 @@
+/**
+ * APP_SHORTCUTS — central registry of keyboard shortcut metadata.
+ *
+ * `defaultHotkey` uses TanStack Hotkeys string format (e.g. 'Mod+K').
+ * Defaults are resolved here in the renderer rather than in schema.ts because
+ * some are platform-specific.
+ *
+ * All event handling is done in AppKeyboardShortcuts.tsx via useHotkey().
+ */
+import type { Hotkey } from '@tanstack/react-hotkeys';
+
+export interface AppShortcutDef {
+  defaultHotkey: string;
+  label: string;
+  description: string;
+  category: string;
+  hideFromSettings?: boolean;
+}
+
+type ShortcutOverrides = Partial<Record<ShortcutSettingsKey, string | null>>;
+
+/**
+ * Preserves literal key types for `keyof` inference while widening each value
+ * to the full `AppShortcutDef` interface (so optional fields like
+ * `hideFromSettings` are accessible on every entry without a union problem).
+ */
+function defineShortcuts<T extends Record<string, AppShortcutDef>>(
+  shortcuts: T
+): Record<keyof T, AppShortcutDef> {
+  return shortcuts as Record<keyof T, AppShortcutDef>;
+}
+
+export const APP_SHORTCUTS = defineShortcuts({
+  commandPalette: {
+    defaultHotkey: 'Mod+K',
+    label: 'Command Palette',
+    description: 'Open the command palette to quickly search and navigate',
+    category: 'Navigation',
+  },
+  settings: {
+    defaultHotkey: 'Mod+,',
+    label: 'Settings',
+    description: 'Open application settings',
+    category: 'Navigation',
+  },
+  toggleLeftSidebar: {
+    defaultHotkey: 'Mod+B',
+    label: 'Toggle Left Sidebar',
+    description: 'Show or hide the left sidebar',
+    category: 'View',
+  },
+  toggleRightSidebar: {
+    defaultHotkey: 'Mod+.',
+    label: 'Toggle Right Sidebar',
+    description: 'Show or hide the right sidebar',
+    category: 'View',
+  },
+  toggleTheme: {
+    defaultHotkey: 'Mod+T',
+    label: 'Toggle Theme',
+    description: 'Cycle through light, dark navy, and dark black themes',
+    category: 'View',
+  },
+  closeModal: {
+    defaultHotkey: 'Escape',
+    label: 'Close Modal',
+    description: 'Close the current modal or dialog',
+    category: 'Navigation',
+    hideFromSettings: true,
+  },
+  nextProject: {
+    defaultHotkey: 'Mod+]',
+    label: 'Next Task',
+    description: 'Switch to the next task',
+    category: 'Navigation',
+  },
+  prevProject: {
+    defaultHotkey: 'Mod+[',
+    label: 'Previous Task',
+    description: 'Switch to the previous task',
+    category: 'Navigation',
+  },
+  newTask: {
+    defaultHotkey: 'Mod+N',
+    label: 'New Task',
+    description: 'Create a new task',
+    category: 'Navigation',
+  },
+  newProject: {
+    defaultHotkey: 'Mod+Shift+N',
+    label: 'New Project',
+    description: 'Create a new project',
+    category: 'Navigation',
+  },
+  openInEditor: {
+    defaultHotkey: 'Mod+O',
+    label: 'Open in Editor',
+    description: 'Open the project in the default editor',
+    category: 'Navigation',
+  },
+  taskViewAgents: {
+    defaultHotkey: 'Mod+Shift+1',
+    label: 'Conversations view',
+    description: 'Switch to the conversations view in the task panel',
+    category: 'Task View',
+  },
+  taskViewDiff: {
+    defaultHotkey: 'Mod+Shift+2',
+    label: 'Diff view',
+    description: 'Switch to the diff view in the task panel',
+    category: 'Task View',
+  },
+  taskViewEditor: {
+    defaultHotkey: 'Mod+Shift+3',
+    label: 'Editor view',
+    description: 'Switch to the editor view in the task panel',
+    category: 'Task View',
+  },
+  tabNext: {
+    defaultHotkey: 'Mod+Alt+ArrowRight',
+    label: 'Next Tab',
+    description: 'Switch to the next tab',
+    category: 'Tab Navigation',
+  },
+  tabPrev: {
+    defaultHotkey: 'Mod+Alt+ArrowLeft',
+    label: 'Previous Tab',
+    description: 'Switch to the previous tab',
+    category: 'Tab Navigation',
+  },
+  tabClose: {
+    defaultHotkey: 'Mod+W',
+    label: 'Close Tab',
+    description: 'Close the active tab',
+    category: 'Tab Navigation',
+  },
+  newConversation: {
+    defaultHotkey: 'Mod+Shift+C',
+    label: 'New Conversation',
+    description: 'Create a new conversation in the current task',
+    category: 'Task View',
+  },
+  newTerminal: {
+    defaultHotkey: 'Mod+Shift+T',
+    label: 'New Terminal',
+    description: 'Create a new terminal in the current task',
+    category: 'Task View',
+  },
+  confirm: {
+    defaultHotkey: 'Mod+Enter',
+    label: 'Confirm',
+    description: 'Confirm the current dialog action',
+    category: 'Navigation',
+  },
+});
+
+/** All valid shortcut keys — inferred directly from the registry, never redeclared. */
+export type ShortcutSettingsKey = keyof typeof APP_SHORTCUTS;
+
+/**
+ * Returns the currently assigned hotkey for an action.
+ * - `undefined` override -> falls back to default
+ * - `null` override -> unassigned (disabled)
+ */
+export function getEffectiveHotkey(
+  key: ShortcutSettingsKey,
+  custom?: ShortcutOverrides
+): Hotkey | null {
+  const configured = custom?.[key];
+  if (configured === null) return null;
+  return (configured ?? APP_SHORTCUTS[key].defaultHotkey) as Hotkey;
+}
+
+/**
+ * Always returns a valid hotkey string for hook registration.
+ * Pair this with `getEffectiveHotkey(...) !== null` in `enabled`.
+ */
+export function getHotkeyRegistration(
+  key: ShortcutSettingsKey,
+  custom?: ShortcutOverrides
+): Hotkey {
+  return (getEffectiveHotkey(key, custom) ?? APP_SHORTCUTS[key].defaultHotkey) as Hotkey;
+}
diff --git a/src/renderer/lib/hooks/useLegacyPort.ts b/src/renderer/lib/hooks/useLegacyPort.ts
new file mode 100644
index 0000000000..a28b15a052
--- /dev/null
+++ b/src/renderer/lib/hooks/useLegacyPort.ts
@@ -0,0 +1,32 @@
+import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
+import { rpc } from '@renderer/lib/ipc';
+
+export const LEGACY_PORT_STATUS_KEY = ['legacyPort:status'] as const;
+const LEGACY_PORT_PREVIEW_KEY = ['legacyPort:preview'] as const;
+
+export function useLegacyPortStatus() {
+  return useQuery({
+    queryKey: LEGACY_PORT_STATUS_KEY,
+    queryFn: () => rpc.legacyPort.checkStatus(),
+    staleTime: 30_000,
+  });
+}
+
+export function useLegacyPortPreview(enabled: boolean) {
+  return useQuery({
+    queryKey: LEGACY_PORT_PREVIEW_KEY,
+    queryFn: () => rpc.legacyPort.getPreview(),
+    enabled,
+    staleTime: Infinity,
+  });
+}
+
+export function useLegacyPortImport() {
+  const queryClient = useQueryClient();
+  return useMutation({
+    mutationFn: () => rpc.legacyPort.runImport(),
+    onSuccess: () => {
+      void queryClient.invalidateQueries({ queryKey: [...LEGACY_PORT_STATUS_KEY] });
+    },
+  });
+}
diff --git a/src/renderer/hooks/useLocalStorage.ts b/src/renderer/lib/hooks/useLocalStorage.ts
similarity index 94%
rename from src/renderer/hooks/useLocalStorage.ts
rename to src/renderer/lib/hooks/useLocalStorage.ts
index 731edf5c44..d47bdfc229 100644
--- a/src/renderer/hooks/useLocalStorage.ts
+++ b/src/renderer/lib/hooks/useLocalStorage.ts
@@ -1,4 +1,4 @@
-import { useState, useCallback } from 'react';
+import { useCallback, useState } from 'react';
 
 export function useLocalStorage<T>(
   key: string,
diff --git a/src/renderer/lib/hooks/useOpenInApps.ts b/src/renderer/lib/hooks/useOpenInApps.ts
new file mode 100644
index 0000000000..80b52acc66
--- /dev/null
+++ b/src/renderer/lib/hooks/useOpenInApps.ts
@@ -0,0 +1,79 @@
+import { useQuery } from '@tanstack/react-query';
+import { useMemo } from 'react';
+import {
+  getResolvedIconPath,
+  getResolvedLabel,
+  OPEN_IN_APPS,
+  type OpenInAppConfig,
+  type OpenInAppId,
+  type PlatformKey,
+} from '@shared/openInApps';
+import { useAppSettingsKey } from '@renderer/features/settings/use-app-settings-key';
+import { rpc } from '@renderer/lib/ipc';
+
+const iconModules = import.meta.glob('../../../assets/images/*', {
+  eager: true,
+  query: '?url',
+  import: 'default',
+}) as Record<string, string>;
+
+function getIconUrl(iconPath: string): string | undefined {
+  return iconModules[`../../../assets/images/${iconPath}`];
+}
+
+export interface UseOpenInAppsResult {
+  icons: Partial<Record<OpenInAppId, string>>;
+  labels: Partial<Record<OpenInAppId, string>>;
+  availability: Record<string, boolean>;
+  installedApps: OpenInAppConfig[];
+  loading: boolean;
+}
+
+export function useOpenInApps(): UseOpenInAppsResult {
+  const { value: openIn, isLoading: settingsLoading } = useAppSettingsKey('openIn');
+
+  const { data: platform = 'darwin' } = useQuery({
+    queryKey: ['app', 'platform'],
+    queryFn: () => rpc.app.getPlatform() as Promise<PlatformKey>,
+    staleTime: Infinity,
+  });
+
+  const { data: availability = {}, isLoading: availabilityLoading } = useQuery({
+    queryKey: ['app', 'installedApps'],
+    queryFn: async () => {
+      const apps = await rpc.app.checkInstalledApps();
+      return (apps ?? {}) as Record<string, boolean>;
+    },
+    staleTime: 5 * 60 * 1000,
+  });
+
+  const loading = settingsLoading || availabilityLoading;
+
+  const labels = useMemo(() => {
+    const result: Partial<Record<OpenInAppId, string>> = {};
+    for (const app of Object.values(OPEN_IN_APPS)) {
+      result[app.id] = getResolvedLabel(app, platform);
+    }
+    return result;
+  }, [platform]);
+
+  const icons = useMemo(() => {
+    const result: Partial<Record<OpenInAppId, string>> = {};
+    for (const app of Object.values(OPEN_IN_APPS)) {
+      const iconPath = getResolvedIconPath(app, platform);
+      const url = getIconUrl(iconPath);
+      if (url) result[app.id] = url;
+    }
+    return result;
+  }, [platform]);
+
+  const installedApps = useMemo(() => {
+    const hiddenApps: OpenInAppId[] = openIn?.hidden ?? [];
+    if (loading) return Object.values(OPEN_IN_APPS);
+    return Object.values(OPEN_IN_APPS).filter(
+      (app) => availability[app.id] && !hiddenApps.includes(app.id)
+    );
+  }, [availability, loading, openIn?.hidden]);
+
+  return { icons, labels, availability, installedApps, loading };
+}
diff --git a/src/renderer/lib/hooks/useTabShortcuts.ts b/src/renderer/lib/hooks/useTabShortcuts.ts
new file mode 100644
index 0000000000..77b2636b24
--- /dev/null
+++ b/src/renderer/lib/hooks/useTabShortcuts.ts
@@ -0,0 +1,144 @@
+import { useHotkey } from '@tanstack/react-hotkeys';
+import { useAppSettingsKey } from '@renderer/features/settings/use-app-settings-key';
+import { getEffectiveHotkey, getHotkeyRegistration } from './useKeyboardShortcuts';
+
+/**
+ * Minimal interface required for tab navigation shortcuts.
+ * Both TabViewProvider stores and EditorViewStore satisfy this shape.
+ */
+export interface TabNavigationProvider {
+  setNextTabActive: () => void;
+  setPreviousTabActive: () => void;
+  setTabActiveIndex: (index: number) => void;
+  closeActiveTab: () => void;
+}
+
+export interface UseTabShortcutsOptions {
+  /**
+   * When false, all tab shortcuts are disabled. Use this to scope shortcuts
+   * to a specific panel so they only fire when that panel is focused.
+   * Defaults to true (always enabled when store is present).
+   */
+  focused?: boolean;
+}
+
+/**
+ * Registers keyboard shortcuts for tab navigation within any TabNavigationProvider.
+ *
+ * Shortcuts:
+ *   tabNext   (default Mod+Alt+ArrowRight)  — next tab
+ *   tabPrev   (default Mod+Alt+ArrowLeft)  — previous tab
+ *   tabClose  (default Mod+W)      — close active tab
+ *   Mod+1–9                        — jump to tab by index (not configurable)
+ *
+ * Note: Mod+] and Mod+[ are reserved for task-level navigation
+ * (nextProject / prevProject) in useKeyboardShortcuts.ts.
+ *
+ * Pass `focused: false` to disable shortcuts when the panel is not focused,
+ * preventing conflicts when multiple tab panels are mounted simultaneously.
+ */
+export function useTabShortcuts(
+  store: TabNavigationProvider | undefined,
+  options?: UseTabShortcutsOptions
+): void {
+  const { value: keyboard } = useAppSettingsKey('keyboard');
+  const enabled = !!store && (options?.focused ?? true);
+  const tabNextHotkey = getEffectiveHotkey('tabNext', keyboard);
+  const tabPrevHotkey = getEffectiveHotkey('tabPrev', keyboard);
+  const tabCloseHotkey = getEffectiveHotkey('tabClose', keyboard);
+
+  useHotkey(
+    getHotkeyRegistration('tabNext', keyboard),
+    () => {
+      store?.setNextTabActive();
+    },
+    { enabled: enabled && tabNextHotkey !== null, conflictBehavior: 'allow' }
+  );
+  useHotkey(
+    getHotkeyRegistration('tabPrev', keyboard),
+    () => {
+      store?.setPreviousTabActive();
+    },
+    { enabled: enabled && tabPrevHotkey !== null, conflictBehavior: 'allow' }
+  );
+  useHotkey(
+    getHotkeyRegistration('tabClose', keyboard),
+    (e) => {
+      e.preventDefault();
+      store?.closeActiveTab();
+    },
+    { enabled: enabled && tabCloseHotkey !== null, conflictBehavior: 'allow' }
+  );
+  useHotkey(
+    'Mod+1',
+    (e) => {
+      e.preventDefault();
+      store?.setTabActiveIndex(0);
+    },
+    { enabled, conflictBehavior: 'allow' }
+  );
+  useHotkey(
+    'Mod+2',
+    (e) => {
+      e.preventDefault();
+      store?.setTabActiveIndex(1);
+    },
+    { enabled, conflictBehavior: 'allow' }
+  );
+  useHotkey(
+    'Mod+3',
+    (e) => {
+      e.preventDefault();
+      store?.setTabActiveIndex(2);
+    },
+    { enabled, conflictBehavior: 'allow' }
+  );
+  useHotkey(
+    'Mod+4',
+    (e) => {
+      e.preventDefault();
+      store?.setTabActiveIndex(3);
+    },
+    { enabled, conflictBehavior: 'allow' }
+  );
+  useHotkey(
+    'Mod+5',
+    (e) => {
+      e.preventDefault();
+      store?.setTabActiveIndex(4);
+    },
+    { enabled, conflictBehavior: 'allow' }
+  );
+  useHotkey(
+    'Mod+6',
+    (e) => {
+      e.preventDefault();
+      store?.setTabActiveIndex(5);
+    },
+    { enabled, conflictBehavior: 'allow' }
+  );
+  useHotkey(
+    'Mod+7',
+    (e) => {
+      e.preventDefault();
+      store?.setTabActiveIndex(6);
+    },
+    { enabled, conflictBehavior: 'allow' }
+  );
+  useHotkey(
+    'Mod+8',
+    (e) => {
+      e.preventDefault();
+      store?.setTabActiveIndex(7);
+    },
+    { enabled, conflictBehavior: 'allow' }
+  );
+  useHotkey(
+    'Mod+9',
+    (e) => {
+      e.preventDefault();
+      store?.setTabActiveIndex(8);
+    },
+    { enabled, conflictBehavior: 'allow' }
+  );
+}
diff --git a/src/renderer/lib/hooks/useTelemetryConsent.ts b/src/renderer/lib/hooks/useTelemetryConsent.ts
new file mode 100644
index 0000000000..a4df620916
--- /dev/null
+++ b/src/renderer/lib/hooks/useTelemetryConsent.ts
@@ -0,0 +1,80 @@
+import { useCallback, useEffect, useState } from 'react';
+import { rpc } from '@renderer/lib/ipc';
+
+type TelemetryState = {
+  prefEnabled: boolean;
+  envDisabled: boolean;
+  hasKeyAndHost: boolean;
+  loading: boolean;
+};
+
+const initialState: TelemetryState = {
+  prefEnabled: true,
+  envDisabled: false,
+  hasKeyAndHost: true,
+  loading: true,
+};
+
+export function useTelemetryConsent() {
+  const [state, setState] = useState<TelemetryState>(initialState);
+
+  const applyStatus = useCallback(
+    (res: Awaited<ReturnType<typeof rpc.telemetry.getStatus>> | null) => {
+      if (res?.status) {
+        const { envDisabled: envOff, userOptOut, hasKeyAndHost } = res.status;
+        setState({
+          prefEnabled: !envOff && userOptOut !== true,
+          envDisabled: !!envOff,
+          hasKeyAndHost: !!hasKeyAndHost,
+          loading: false,
+        });
+      } else {
+        setState((prev) => ({ ...prev, loading: false }));
+      }
+    },
+    []
+  );
+
+  const refresh = useCallback(async () => {
+    setState((prev) => ({ ...prev, loading: true }));
+    try {
+      applyStatus(await rpc.telemetry.getStatus());
+    } catch {
+      setState((prev) => ({ ...prev, loading: false }));
+    }
+  }, [applyStatus]);
+
+  const setTelemetryEnabled = useCallback(
+    async (enabled: boolean) => {
+      setState((prev) => ({ ...prev, prefEnabled: enabled, loading: true }));
+      try {
+        await rpc.telemetry.setEnabled(enabled);
+      } catch {
+        // ignore, refresh will reconcile
+      }
+      await refresh();
+    },
+    [refresh]
+  );
+
+  useEffect(() => {
+    let cancelled = false;
+    rpc.telemetry
+      .getStatus()
+      .then((res) => {
+        if (!cancelled) applyStatus(res);
+      })
+      .catch(() => {
+        if (!cancelled) setState((prev) => ({ ...prev, loading: false }));
+      });
+    return () => {
+      cancelled = true;
+    };
+  }, [applyStatus]);
+
+  return {
+    ...state,
+    refresh,
+    setTelemetryEnabled,
+  };
+}
diff --git a/src/renderer/hooks/useTheme.ts b/src/renderer/lib/hooks/useTheme.ts
similarity index 79%
rename from src/renderer/hooks/useTheme.ts
rename to src/renderer/lib/hooks/useTheme.ts
index 628e1a416e..dfc2e1b0c5 100644
--- a/src/renderer/hooks/useTheme.ts
+++ b/src/renderer/lib/hooks/useTheme.ts
@@ -1,5 +1,5 @@
 import { useContext } from 'react';
-import { ThemeContext } from '../components/ThemeProvider';
+import { ThemeContext } from '../providers/theme-provider';
 
 export function useTheme() {
   const context = useContext(ThemeContext);
diff --git a/src/renderer/lib/ipc.ts b/src/renderer/lib/ipc.ts
new file mode 100644
index 0000000000..c04512886f
--- /dev/null
+++ b/src/renderer/lib/ipc.ts
@@ -0,0 +1,20 @@
+import { createEventEmitter, type EmitterAdapter } from '@shared/ipc/events';
+import { createRPCClient } from '@shared/ipc/rpc';
+import type { RpcRouter } from '@main/rpc';
+
+export const rpc = createRPCClient<RpcRouter>(window.electronAPI.invoke);
+
+function createRendererAdapter(): EmitterAdapter {
+  return {
+    emit: (eventName: string, data: unknown, topic?: string) => {
+      const channel = topic ? `${eventName}.${topic}` : eventName;
+      window.electronAPI.eventSend(channel, data);
+    },
+    on: (eventName: string, cb: (data: unknown) => void, topic?: string) => {
+      const channel = topic ? `${eventName}.${topic}` : eventName;
+      return window.electronAPI.eventOn(channel, cb);
+    },
+  };
+}
+
+export const events = createEventEmitter(createRendererAdapter());
diff --git a/src/renderer/lib/kanbanStore.ts b/src/renderer/lib/kanbanStore.ts
deleted file mode 100644
index c646b98716..0000000000
--- a/src/renderer/lib/kanbanStore.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-export type KanbanStatus = 'todo' | 'in-progress' | 'done';
-
-const STORAGE_KEY = 'emdash:kanban:statusByTask';
-
-type MapShape = Record<string, KanbanStatus>;
-
-let cache: MapShape | null = null;
-
-function read(): MapShape {
-  if (cache) return cache;
-  try {
-    const raw = localStorage.getItem(STORAGE_KEY);
-    if (raw) {
-      const parsed = JSON.parse(raw);
-      if (parsed && typeof parsed === 'object') {
-        cache = parsed as MapShape;
-        return cache;
-      }
-    }
-  } catch {}
-  cache = {};
-  return cache;
-}
-
-function write(next: MapShape) {
-  cache = next;
-  try {
-    localStorage.setItem(STORAGE_KEY, JSON.stringify(next));
-  } catch {}
-}
-
-export function getStatus(taskId: string): KanbanStatus {
-  const map = read();
-  return (map[taskId] as KanbanStatus) || 'todo';
-}
-
-export function setStatus(taskId: string, status: KanbanStatus): void {
-  const map = { ...read(), [taskId]: status };
-  write(map);
-}
-
-export function getAll(): MapShape {
-  return { ...read() };
-}
-
-export function clearAll(): void {
-  write({});
-}
diff --git a/src/renderer/lib/keys.ts b/src/renderer/lib/keys.ts
deleted file mode 100644
index 2e32e35f1d..0000000000
--- a/src/renderer/lib/keys.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-// If providerId is supplied, scope the flag per provider; otherwise fall back to legacy key.
-export const initialPromptSentKey = (taskId: string, providerId?: string) =>
-  providerId && providerId.trim()
-    ? `initialPromptSent:${taskId}:${providerId.trim()}`
-    : `initialPromptSent:${taskId}`;
diff --git a/src/renderer/lib/layout/layout-provider.tsx b/src/renderer/lib/layout/layout-provider.tsx
new file mode 100644
index 0000000000..27f00967ef
--- /dev/null
+++ b/src/renderer/lib/layout/layout-provider.tsx
@@ -0,0 +1,108 @@
+import {
+  createContext,
+  ReactNode,
+  RefObject,
+  useCallback,
+  useContext,
+  useEffect,
+  useRef,
+  useState,
+} from 'react';
+import { usePanelRef, type PanelImperativeHandle } from 'react-resizable-panels';
+import { panelDragStore } from './panel-drag-store';
+
+export interface WorkspaceLayoutContextValue {
+  isLeftOpen: boolean;
+  isRightOpen: boolean;
+  leftPanelRef: RefObject<PanelImperativeHandle | null>;
+  rightPanelRef: RefObject<PanelImperativeHandle | null>;
+  setIsLeftOpen: (open: boolean) => void;
+  setIsRightOpen: (open: boolean) => void;
+  handleDragging: (side: 'left' | 'right', dragging: boolean) => void;
+  setCollapsed: (side: 'left' | 'right', collapsed: boolean) => void;
+  toggleLeft: () => void;
+  toggleRight: () => void;
+}
+
+const WorkspaceLayoutContext = createContext<WorkspaceLayoutContextValue | undefined>(undefined);
+
+export function useWorkspaceLayoutService() {
+  const leftPanelRef = usePanelRef();
+  const rightPanelRef = usePanelRef();
+
+  const [isLeftOpen, setIsLeftOpen] = useState(true);
+  const [isRightOpen, setIsRightOpen] = useState(true);
+
+  const draggingRef = useRef({ left: false, right: false });
+
+  const handleDragging = useCallback((side: 'left' | 'right', dragging: boolean) => {
+    if (draggingRef.current[side] === dragging) return;
+    const wasDragging = draggingRef.current.left || draggingRef.current.right;
+    draggingRef.current[side] = dragging;
+    const isDragging = draggingRef.current.left || draggingRef.current.right;
+    if (wasDragging !== isDragging) {
+      panelDragStore.setDragging(isDragging);
+    }
+  }, []);
+
+  useEffect(() => {
+    const dragging = draggingRef.current;
+    return () => {
+      if (dragging.left || dragging.right) {
+        panelDragStore.setDragging(false);
+      }
+    };
+  }, []);
+
+  const setCollapsed = useCallback(
+    (side: 'left' | 'right', collapsed: boolean) => {
+      const panel = side === 'left' ? leftPanelRef.current : rightPanelRef.current;
+      if (panel) {
+        if (collapsed) {
+          panel.collapse();
+        } else {
+          panel.expand();
+        }
+      }
+    },
+    [leftPanelRef, rightPanelRef]
+  );
+
+  const toggleLeft = useCallback(() => {
+    setCollapsed('left', isLeftOpen);
+  }, [setCollapsed, isLeftOpen]);
+
+  const toggleRight = useCallback(() => {
+    setCollapsed('right', isRightOpen);
+  }, [setCollapsed, isRightOpen]);
+
+  return {
+    leftPanelRef,
+    rightPanelRef,
+    handleDragging,
+    setIsLeftOpen,
+    setIsRightOpen,
+    isLeftOpen,
+    isRightOpen,
+    setCollapsed,
+    toggleLeft,
+    toggleRight,
+  };
+}
+
+export function WorkspaceLayoutContextProvider({ children }: { children: ReactNode }) {
+  const value = useWorkspaceLayoutService();
+  return (
+    <WorkspaceLayoutContext.Provider value={value}>{children}</WorkspaceLayoutContext.Provider>
+  );
+}
+
+export function useWorkspaceLayoutContext() {
+  const context = useContext(WorkspaceLayoutContext);
+  if (!context) {
+    throw new Error(
+      'useWorkspaceLayoutContext must be used within a WorkspaceLayoutContextProvider'
+    );
+  }
+  return context;
+}
diff --git a/src/renderer/lib/layout/navigation-provider.tsx b/src/renderer/lib/layout/navigation-provider.tsx
new file mode 100644
index 0000000000..30c8c54846
--- /dev/null
+++ b/src/renderer/lib/layout/navigation-provider.tsx
@@ -0,0 +1,112 @@
+import { ComponentType, createContext, useCallback, useContext, type ReactNode } from 'react';
+import type { ViewId, WrapParams } from '@renderer/app/view-registry';
+
+/**
+ * NavArgs makes the params argument optional when all fields are optional,
+ * and omits it entirely for views with no params (home, skills).
+ */
+export type NavArgs<TId extends ViewId> = keyof WrapParams<TId> extends never
+  ? [viewId: TId]
+  : Partial<WrapParams<TId>> extends WrapParams<TId>
+    ? [viewId: TId, params?: WrapParams<TId>]
+    : [viewId: TId, params: WrapParams<TId>];
+
+/** Higher-rank navigate function — generic at the call site, not at the hook call site. */
+export type NavigateFnTyped = <TId extends ViewId>(...args: NavArgs<TId>) => void;
+
+export type UpdateViewParamsFn = <TId extends ViewId>(
+  viewId: TId,
+  update: Partial<WrapParams<TId>> | ((prev: WrapParams<TId>) => WrapParams<TId>)
+) => void;
+
+export type SlotsContextValue = {
+  WrapView: ComponentType<{ children: ReactNode } & Record<string, unknown>>;
+  TitlebarSlot: ComponentType;
+  MainPanel: ComponentType;
+  RightPanel: ComponentType | null;
+  currentView: string;
+};
+
+export type WrapParamsContextValue = {
+  wrapParams: Record<string, unknown>;
+};
+
+export type ViewParamsStoreContextValue = {
+  viewParamsStore: Partial<{ [K in ViewId]: WrapParams<K> }>;
+};
+
+export const WorkspaceNavigateContext = createContext<NavigateFnTyped | undefined>(undefined);
+export const WorkspaceSlotsContext = createContext<SlotsContextValue | undefined>(undefined);
+export const WorkspaceWrapParamsContext = createContext<WrapParamsContextValue | undefined>(
+  undefined
+);
+
+export const WorkspaceViewParamsStoreContext = createContext<
+  ViewParamsStoreContextValue | undefined
+>(undefined);
+export const WorkspaceUpdateViewParamsContext = createContext<UpdateViewParamsFn | undefined>(
+  undefined
+);
+
+export function useNavigate(): { navigate: NavigateFnTyped } {
+  const navigate = useContext(WorkspaceNavigateContext);
+  if (!navigate) {
+    throw new Error('useNavigate must be used within a WorkspaceViewProvider');
+  }
+  return { navigate };
+}
+
+export function useWorkspaceSlots(): SlotsContextValue {
+  const context = useContext(WorkspaceSlotsContext);
+  if (!context) {
+    throw new Error('useWorkspaceSlots must be used within a WorkspaceViewProvider');
+  }
+  return context;
+}
+
+export function useWorkspaceWrapParams(): WrapParamsContextValue {
+  const context = useContext(WorkspaceWrapParamsContext);
+  if (!context) {
+    throw new Error('useWorkspaceWrapParams must be used within a WorkspaceViewProvider');
+  }
+  return context;
+}
+
+export function useParams<TId extends ViewId>(
+  viewId: TId
+): {
+  params: WrapParams<TId>;
+  setParams: (
+    update: Partial<WrapParams<TId>> | ((prev: WrapParams<TId>) => WrapParams<TId>)
+  ) => void;
+} {
+  const storeCtx = useContext(WorkspaceViewParamsStoreContext);
+  const updateFn = useContext(WorkspaceUpdateViewParamsContext);
+  if (!storeCtx || !updateFn) {
+    throw new Error('useViewParams must be used within a WorkspaceViewProvider');
+  }
+  const params = (storeCtx.viewParamsStore[viewId] ?? {}) as WrapParams<TId>;
+  const setParams = useCallback(
+    (update: Partial<WrapParams<TId>> | ((prev: WrapParams<TId>) => WrapParams<TId>)) => {
+      updateFn(viewId, update);
+    },
+    // viewId is a stable string literal
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [updateFn, viewId]
+  );
+  return { params, setParams };
+}
+
+export function isCurrentView(currentView: string | null | undefined, target: string): boolean {
+  return currentView === target;
+}
+
+export type ViewLayoutOverride = {
+  hideRightPanel?: boolean;
+};
+
+export const ViewLayoutOverrideContext = createContext<ViewLayoutOverride>({});
+
+export function useViewLayoutOverride(): ViewLayoutOverride {
+  return useContext(ViewLayoutOverrideContext);
+}
diff --git a/src/renderer/lib/layout/panel-drag-store.ts b/src/renderer/lib/layout/panel-drag-store.ts
new file mode 100644
index 0000000000..9c1800f842
--- /dev/null
+++ b/src/renderer/lib/layout/panel-drag-store.ts
@@ -0,0 +1,32 @@
+/**
+ * Tiny external store for panel-drag state, compatible with useSyncExternalStore.
+ *
+ * Written to by layout-provider.tsx (via handleDragging) and read by
+ * use-terminals.ts so terminals can suppress fitAddon.fit() during a drag and
+ * fire exactly one fit+PTY-resize when the drag ends — without a global window
+ * event.
+ */
+
+type Listener = () => void;
+
+let isDragging = false;
+const listeners = new Set<Listener>();
+
+function subscribe(listener: Listener): () => void {
+  listeners.add(listener);
+  return () => {
+    listeners.delete(listener);
+  };
+}
+
+function getSnapshot(): boolean {
+  return isDragging;
+}
+
+function setDragging(value: boolean): void {
+  if (isDragging === value) return;
+  isDragging = value;
+  for (const listener of listeners) listener();
+}
+
+export const panelDragStore = { subscribe, getSnapshot, setDragging };
diff --git a/src/renderer/lib/layout/provider.tsx b/src/renderer/lib/layout/provider.tsx
new file mode 100644
index 0000000000..9797087a11
--- /dev/null
+++ b/src/renderer/lib/layout/provider.tsx
@@ -0,0 +1,186 @@
+import { runInAction } from 'mobx';
+import {
+  ComponentType,
+  Fragment,
+  useCallback,
+  useEffect,
+  useMemo,
+  useState,
+  useTransition,
+  type ReactNode,
+} from 'react';
+import {
+  views,
+  type ViewDefinition,
+  type ViewId,
+  type WrapParams,
+} from '@renderer/app/view-registry';
+import { useModalContext } from '@renderer/lib/modal/modal-provider';
+import { appState } from '@renderer/lib/stores/app-state';
+import { focusTracker } from '@renderer/utils/focus-tracker';
+import { clearTelemetryTaskScope, setTelemetryTaskScope } from '@renderer/utils/telemetry-scope';
+import { captureTelemetry } from '@renderer/utils/telemetryClient';
+import {
+  WorkspaceNavigateContext,
+  WorkspaceSlotsContext,
+  WorkspaceUpdateViewParamsContext,
+  WorkspaceViewParamsStoreContext,
+  WorkspaceWrapParamsContext,
+  type NavigateFnTyped,
+  type SlotsContextValue,
+  type UpdateViewParamsFn,
+  type WrapParamsContextValue,
+} from './navigation-provider';
+
+type ViewParamsStore = Partial<{ [K in ViewId]: WrapParams<K> }>;
+
+function syncTelemetryScope(currentViewId: ViewId, viewParamsStore: ViewParamsStore): void {
+  if (currentViewId !== 'task') {
+    clearTelemetryTaskScope();
+    return;
+  }
+
+  const taskParams = viewParamsStore.task;
+  if (
+    taskParams &&
+    typeof taskParams.projectId === 'string' &&
+    typeof taskParams.taskId === 'string'
+  ) {
+    setTelemetryTaskScope({ projectId: taskParams.projectId, taskId: taskParams.taskId });
+    return;
+  }
+
+  clearTelemetryTaskScope();
+}
+
+const viewEvents: Record<
+  ViewId,
+  | 'home_viewed'
+  | 'project_viewed'
+  | 'task_viewed'
+  | 'settings_viewed'
+  | 'skills_viewed'
+  | 'mcp_viewed'
+> = {
+  home: 'home_viewed',
+  project: 'project_viewed',
+  task: 'task_viewed',
+  settings: 'settings_viewed',
+  skills: 'skills_viewed',
+  mcp: 'mcp_viewed',
+};
+
+export function WorkspaceViewProvider({ children }: { children: ReactNode }) {
+  const { closeModal } = useModalContext();
+  const [currentViewId, setCurrentViewId] = useState<ViewId>(() => {
+    const v = appState.navigation.currentViewId;
+    return v;
+  });
+  const [viewParamsStore, setViewParamsStore] = useState<ViewParamsStore>(
+    () => appState.navigation.viewParamsStore as ViewParamsStore
+  );
+  const [_, startTransition] = useTransition();
+
+  // Sync React state back to the MobX persistence mirror after every commit.
+  // The SnapshotRegistry reaction then debounces the RPC write by 1 s.
+  useEffect(() => {
+    runInAction(() => appState.navigation.sync(currentViewId, viewParamsStore));
+  }, [currentViewId, viewParamsStore]);
+
+  useEffect(() => {
+    const initialViewId = appState.navigation.currentViewId;
+    focusTracker.initialize({ view: initialViewId });
+    syncTelemetryScope(initialViewId, appState.navigation.viewParamsStore as ViewParamsStore);
+    captureTelemetry(viewEvents[initialViewId], { from_view: null });
+  }, []);
+
+  useEffect(() => {
+    syncTelemetryScope(currentViewId, viewParamsStore);
+  }, [currentViewId, viewParamsStore]);
+
+  const navigate = useCallback(
+    (...args: unknown[]) => {
+      const [viewId, params] = args as [ViewId, Record<string, unknown> | undefined];
+      if (viewId !== currentViewId) {
+        const transition = focusTracker.transition(
+          viewId === 'task'
+            ? { view: viewId }
+            : {
+                view: viewId,
+                mainPanel: null,
+                rightPanel: null,
+                focusedRegion: null,
+              },
+          'navigation'
+        );
+
+        captureTelemetry(viewEvents[viewId], {
+          from_view: transition?.previous.view ?? null,
+        });
+      }
+
+      startTransition(() => {
+        setCurrentViewId(viewId);
+        // Only overwrite stored params when the caller explicitly passes them;
+        // navigating without params preserves whatever was stored for that view.
+        if (params !== undefined) {
+          setViewParamsStore((prev) => ({ ...prev, [viewId]: params }));
+        }
+        closeModal();
+      });
+    },
+    [closeModal, currentViewId]
+  ) as NavigateFnTyped;
+
+  const updateViewParams = useCallback(
+    <TId extends ViewId>(
+      viewId: TId,
+      update: Partial<WrapParams<TId>> | ((prev: WrapParams<TId>) => WrapParams<TId>)
+    ) => {
+      setViewParamsStore((prev) => {
+        const current = (prev[viewId] ?? {}) as WrapParams<TId>;
+        const next = typeof update === 'function' ? update(current) : { ...current, ...update };
+        return { ...prev, [viewId]: next };
+      });
+    },
+    []
+  ) as UpdateViewParamsFn;
+
+  const slotsValue = useMemo((): SlotsContextValue => {
+    const def = (views as unknown as Record<string, ViewDefinition<Record<string, unknown>>>)[
+      currentViewId
+    ];
+    return {
+      WrapView: (def.WrapView ?? Fragment) as ComponentType<
+        { children: ReactNode } & Record<string, unknown>
+      >,
+      TitlebarSlot: def.TitlebarSlot ?? (() => null),
+      MainPanel: def.MainPanel,
+      RightPanel: def.RightPanel ?? null,
+      currentView: currentViewId,
+    };
+  }, [currentViewId]);
+
+  const wrapParamsValue = useMemo(
+    (): WrapParamsContextValue => ({
+      wrapParams: (viewParamsStore[currentViewId] ?? {}) as Record<string, unknown>,
+    }),
+    [viewParamsStore, currentViewId]
+  );
+
+  const viewParamsStoreValue = useMemo(() => ({ viewParamsStore }), [viewParamsStore]);
+
+  return (
+    <WorkspaceNavigateContext.Provider value={navigate}>
+      <WorkspaceSlotsContext.Provider value={slotsValue}>
+        <WorkspaceWrapParamsContext.Provider value={wrapParamsValue}>
+          <WorkspaceViewParamsStoreContext.Provider value={viewParamsStoreValue}>
+            <WorkspaceUpdateViewParamsContext.Provider value={updateViewParams}>
+              {children}
+            </WorkspaceUpdateViewParamsContext.Provider>
+          </WorkspaceViewParamsStoreContext.Provider>
+        </WorkspaceWrapParamsContext.Provider>
+      </WorkspaceSlotsContext.Provider>
+    </WorkspaceNavigateContext.Provider>
+  );
+}
diff --git a/src/renderer/lib/layout/workspace-layout.tsx b/src/renderer/lib/layout/workspace-layout.tsx
new file mode 100644
index 0000000000..9dc8da3c49
--- /dev/null
+++ b/src/renderer/lib/layout/workspace-layout.tsx
@@ -0,0 +1,131 @@
+import { ReactNode } from 'react';
+import { useDefaultLayout } from 'react-resizable-panels';
+import { useWorkspaceLayoutContext } from '@renderer/lib/layout/layout-provider';
+import { ResizableHandle, ResizablePanel, ResizablePanelGroup } from '@renderer/lib/ui/resizable';
+import { cn } from '@renderer/utils/utils';
+
+const LEFT_PANEL_DEFAULT_SIZE = '20%';
+const RIGHT_PANEL_DEFAULT_SIZE = '25%';
+const LEFT_SIDEBAR_MIN_SIZE = '16%';
+const LEFT_SIDEBAR_MAX_SIZE = '30%';
+const MAIN_PANEL_MIN_SIZE = '30%';
+const RIGHT_SIDEBAR_MIN_SIZE = '250px';
+const RIGHT_SIDEBAR_MAX_SIZE = '50%';
+
+interface WorkspaceLayoutProps {
+  leftSidebar: ReactNode;
+  mainContent: ReactNode;
+}
+
+export function WorkspaceLayout({ leftSidebar, mainContent }: WorkspaceLayoutProps) {
+  const { leftPanelRef, handleDragging, setIsLeftOpen, isLeftOpen } = useWorkspaceLayoutContext();
+  const { defaultLayout, onLayoutChanged } = useDefaultLayout({
+    id: 'workspace-outer',
+    storage: localStorage,
+  });
+
+  return (
+    <ResizablePanelGroup
+      id="workspace-outer"
+      orientation="horizontal"
+      className="h-full w-full overflow-hidden"
+      defaultLayout={defaultLayout}
+      onLayoutChanged={onLayoutChanged}
+    >
+      <ResizablePanel
+        id="workspace-left"
+        panelRef={leftPanelRef}
+        defaultSize={`${LEFT_PANEL_DEFAULT_SIZE}%`}
+        minSize={`${LEFT_SIDEBAR_MIN_SIZE}%`}
+        maxSize={`${LEFT_SIDEBAR_MAX_SIZE}%`}
+        collapsedSize="0%"
+        onResize={() => setIsLeftOpen(!leftPanelRef.current?.isCollapsed())}
+        collapsible
+      >
+        {leftSidebar}
+      </ResizablePanel>
+      <ResizableHandle
+        onPointerDown={(e) => {
+          e.currentTarget.setPointerCapture(e.pointerId);
+          handleDragging('left', true);
+        }}
+        onPointerUp={() => handleDragging('left', false)}
+        onPointerCancel={() => handleDragging('left', false)}
+        className={cn(
+          'items-center justify-center transition-colors hover:bg-border/80',
+          isLeftOpen ? 'flex' : 'hidden'
+        )}
+      />
+      <ResizablePanel id="workspace-main" minSize={`${MAIN_PANEL_MIN_SIZE}%`}>
+        {mainContent}
+      </ResizablePanel>
+    </ResizablePanelGroup>
+  );
+}
+
+interface WorkspaceContentLayoutProps {
+  titlebarSlot: ReactNode;
+  mainPanel: ReactNode;
+  rightPanel?: ReactNode;
+}
+
+export function WorkspaceContentLayout({
+  titlebarSlot,
+  mainPanel,
+  rightPanel = null,
+}: WorkspaceContentLayoutProps) {
+  const { rightPanelRef, handleDragging, setIsRightOpen, isRightOpen } =
+    useWorkspaceLayoutContext();
+
+  const hasRight = Boolean(rightPanel);
+
+  const { defaultLayout, onLayoutChanged } = useDefaultLayout({
+    id: 'workspace-inner',
+    storage: localStorage,
+  });
+
+  return (
+    <div className="flex h-full flex-col bg-background text-foreground">
+      {titlebarSlot}
+      <ResizablePanelGroup
+        id="workspace-inner"
+        orientation="horizontal"
+        className="flex-1 overflow-hidden"
+        defaultLayout={defaultLayout}
+        onLayoutChanged={onLayoutChanged}
+      >
+        <ResizablePanel id="workspace-inner-main" minSize={`${MAIN_PANEL_MIN_SIZE}%`}>
+          <div className="flex h-full flex-col overflow-hidden">{mainPanel}</div>
+        </ResizablePanel>
+        {hasRight && (
+          <>
+            <ResizableHandle
+              onPointerDown={(e) => {
+                e.currentTarget.setPointerCapture(e.pointerId);
+                handleDragging('right', true);
+              }}
+              onPointerUp={() => handleDragging('right', false)}
+              onPointerCancel={() => handleDragging('right', false)}
+              className={cn(
+                'items-center justify-center transition-colors hover:bg-border/80',
+                isRightOpen ? 'flex' : 'hidden'
+              )}
+            />
+            <ResizablePanel
+              id="workspace-inner-right"
+              panelRef={rightPanelRef}
+              defaultSize={RIGHT_PANEL_DEFAULT_SIZE}
+              minSize={RIGHT_SIDEBAR_MIN_SIZE}
+              maxSize={RIGHT_SIDEBAR_MAX_SIZE}
+              collapsedSize="0%"
+              onResize={() => setIsRightOpen(!rightPanelRef.current?.isCollapsed())}
+              collapsible
+            >
+              {rightPanel}
+            </ResizablePanel>
+          </>
+        )}
+      </ResizablePanelGroup>
+    </div>
+  );
+}
diff --git a/src/renderer/lib/lifecycleUi.ts b/src/renderer/lib/lifecycleUi.ts
deleted file mode 100644
index e5e0d20433..0000000000
--- a/src/renderer/lib/lifecycleUi.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-export const shouldDisablePlay = ({
-  runActionBusy,
-  hasProjectPath,
-  isRunSelection,
-  canStartRun,
-}: {
-  runActionBusy: boolean;
-  hasProjectPath: boolean;
-  isRunSelection: boolean;
-  canStartRun: boolean;
-}): boolean => runActionBusy || !hasProjectPath || (isRunSelection && !canStartRun);
diff --git a/src/renderer/lib/logger.ts b/src/renderer/lib/logger.ts
deleted file mode 100644
index d68e907bd9..0000000000
--- a/src/renderer/lib/logger.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-type Level = 'debug' | 'info' | 'warn' | 'error';
-
-function envLevel(): Level {
-  try {
-    const ls = typeof window !== 'undefined' ? window.localStorage.getItem('emdash:debug') : null;
-    if (ls === '1' || ls === 'true') return 'debug';
-  } catch {}
-  // Default to warn in open-source builds without env
-  return 'warn';
-}
-
-function enabled(target: Level, current: Level): boolean {
-  const order: Record<Level, number> = { debug: 10, info: 20, warn: 30, error: 40 };
-  return order[target] >= order[current];
-}
-
-const current = envLevel();
-
-export const log = {
-  debug: (...args: any[]) => {
-    if (enabled('debug', current)) {
-      // eslint-disable-next-line no-console
-      console.debug(...args);
-    }
-  },
-  info: (...args: any[]) => {
-    if (enabled('info', current)) {
-      // eslint-disable-next-line no-console
-      console.info(...args);
-    }
-  },
-  warn: (...args: any[]) => {
-    if (enabled('warn', current)) {
-      // eslint-disable-next-line no-console
-      console.warn(...args);
-    }
-  },
-  error: (...args: any[]) => {
-    // Always log errors
-    // eslint-disable-next-line no-console
-    console.error(...args);
-  },
-};
diff --git a/src/renderer/lib/menuUndoRedo.ts b/src/renderer/lib/menuUndoRedo.ts
deleted file mode 100644
index 510cdf0df8..0000000000
--- a/src/renderer/lib/menuUndoRedo.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { performActiveEditorRedo, performActiveEditorUndo } from './activeCodeEditor';
-
-function runAfterFocusRestores(action: () => void): void {
-  // Native menu clicks can transiently blur the editor/input while the menu is open.
-  // Run one frame later so focus has a chance to return before dispatching undo/redo.
-  requestAnimationFrame(() => {
-    action();
-  });
-}
-
-export function handleMenuUndo(): void {
-  runAfterFocusRestores(() => {
-    if (performActiveEditorUndo()) return;
-    void window.electronAPI.undo();
-  });
-}
-
-export function handleMenuRedo(): void {
-  runAfterFocusRestores(() => {
-    if (performActiveEditorRedo()) return;
-    void window.electronAPI.redo();
-  });
-}
diff --git a/src/renderer/lib/modal/modal-provider.tsx b/src/renderer/lib/modal/modal-provider.tsx
new file mode 100644
index 0000000000..f6e2a6ebf0
--- /dev/null
+++ b/src/renderer/lib/modal/modal-provider.tsx
@@ -0,0 +1,106 @@
+import { observer } from 'mobx-react-lite';
+import { createContext, ReactNode, useCallback, useContext } from 'react';
+import { modalRegistry } from '@renderer/app/modal-registry';
+import { modalStore } from './modal-store';
+
+export interface BaseModalProps<TResult = unknown> {
+  onSuccess: (result: TResult) => void;
+  onClose: () => void;
+}
+
+type UserArgs<MId extends ModalId> = Omit<ModalArgs<MId>, 'onSuccess' | 'onClose'> & {
+  onSuccess?: (
+    result: ModalArgs<MId> extends { onSuccess: (result: infer R) => void } ? R : unknown
+  ) => void;
+  onClose?: () => void;
+};
+
+export type ModalComponent<TProps = unknown, TResult = unknown> = (
+  props: TProps & BaseModalProps<TResult>
+) => ReactNode | Promise<ReactNode>;
+
+type ModalId = keyof typeof modalRegistry;
+
+type ModalArgs<TId extends ModalId> = Parameters<(typeof modalRegistry)[TId]['component']>[0];
+
+type ModalContext = {
+  closeModal: () => void;
+  showModal: <TId extends ModalId>(modal: TId, args: UserArgs<TId>) => void;
+  transitionModal: <TId extends ModalId>(modal: TId, args: UserArgs<TId>) => void;
+  hasActiveCloseGuard: boolean;
+  setCloseGuard: (active: boolean) => void;
+};
+
+const ModalContext = createContext<ModalContext | undefined>(undefined);
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+function wrapArgs<TId extends ModalId>(args: UserArgs<TId>): Record<string, any> {
+  return {
+    ...args,
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    onSuccess: (result: any) => {
+      modalStore.closeModal('completed');
+      args.onSuccess?.(result);
+    },
+    onClose: () => {
+      modalStore.closeModal('dismissed');
+      args.onClose?.();
+    },
+  };
+}
+
+export const ModalProvider = observer(function ModalProvider({
+  children,
+}: {
+  children: ReactNode;
+}) {
+  const showModal = useCallback(<TId extends ModalId>(id: TId, args: UserArgs<TId>) => {
+    modalStore.setModal(id, wrapArgs(args));
+    window.dispatchEvent(new CustomEvent('emdash:overlay:changed', { detail: { open: true } }));
+  }, []);
+
+  const transitionModal = useCallback(<TId extends ModalId>(id: TId, args: UserArgs<TId>) => {
+    modalStore.setModal(id, wrapArgs(args));
+    // No overlay event — the dialog stays open; AnimatedHeight handles the content swap.
+  }, []);
+
+  const closeModal = useCallback(() => {
+    modalStore.closeModal('dismissed');
+  }, []);
+
+  const setCloseGuard = useCallback((active: boolean) => {
+    modalStore.closeGuardActive = active;
+  }, []);
+
+  return (
+    <ModalContext.Provider
+      value={{
+        closeModal,
+        showModal,
+        transitionModal,
+        hasActiveCloseGuard: modalStore.closeGuardActive,
+        setCloseGuard,
+      }}
+    >
+      {children}
+    </ModalContext.Provider>
+  );
+});
+
+export function useModalContext() {
+  const context = useContext(ModalContext);
+  if (!context) {
+    throw new Error('useWorkspaceOverlayContext must be used within a WorkspaceOverlayProvider');
+  }
+  return context;
+}
+
+export function useShowModal<MId extends ModalId>(id: MId) {
+  const { showModal } = useModalContext();
+  return (args: UserArgs<MId>) => showModal(id, args);
+}
+
+export function useTransitionModal<MId extends ModalId>(id: MId) {
+  const { transitionModal } = useModalContext();
+  return (args: UserArgs<MId>) => transitionModal(id, args);
+}
diff --git a/src/renderer/lib/modal/modal-renderer.tsx b/src/renderer/lib/modal/modal-renderer.tsx
new file mode 100644
index 0000000000..b24d42f702
--- /dev/null
+++ b/src/renderer/lib/modal/modal-renderer.tsx
@@ -0,0 +1,80 @@
+import { Dialog as DialogPrimitive } from '@base-ui/react/dialog';
+import { observer } from 'mobx-react-lite';
+import { useRef } from 'react';
+import {
+  modalRegistry,
+  type ModalRegistryEntry,
+  type ModalSize,
+} from '@renderer/app/modal-registry';
+import { Dialog, DialogOverlay, DialogPortal } from '@renderer/lib/ui/dialog';
+import { cn } from '@renderer/utils/utils';
+import { modalStore } from './modal-store';
+
+const SIZE_CLASSES: Record<ModalSize, string> = {
+  xs: 'sm:max-w-xs',
+  sm: 'sm:max-w-sm',
+  md: 'sm:max-w-lg',
+  lg: 'sm:max-w-2xl',
+};
+
+export const ModalRenderer = observer(function ModalRenderer() {
+  const entry = (
+    modalStore.activeModalId
+      ? modalRegistry[modalStore.activeModalId as keyof typeof modalRegistry]
+      : null
+  ) as ModalRegistryEntry | null;
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  const Component = entry?.component as React.ComponentType<any> | undefined;
+
+  // Preserve the last rendered content and entry config so the close animation plays with the
+  // correct dimensions and full content rather than collapsing while the popup fades out.
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  const lastComponentRef = useRef<React.ComponentType<any> | null>(null);
+  const lastArgsRef = useRef<Record<string, unknown> | null>(null);
+  const lastEntryRef = useRef<ModalRegistryEntry | null>(null);
+
+  if (modalStore.isOpen && Component && modalStore.activeModalArgs) {
+    lastComponentRef.current = Component;
+    lastArgsRef.current = modalStore.activeModalArgs;
+    lastEntryRef.current = entry;
+  }
+
+  const DisplayComponent = lastComponentRef.current;
+  const displayArgs = lastArgsRef.current;
+  const displayEntry = lastEntryRef.current;
+
+  const handleOpenChange = (
+    open: boolean,
+    eventDetails: DialogPrimitive.Root.ChangeEventDetails
+  ) => {
+    if (!open && modalStore.isOpen) {
+      const isPassiveDismiss =
+        eventDetails.reason === 'outside-press' || eventDetails.reason === 'escape-key';
+      if (modalStore.closeGuardActive && isPassiveDismiss) return;
+      modalStore.closeModal();
+    }
+  };
+
+  return (
+    <Dialog open={modalStore.isOpen} onOpenChange={handleOpenChange}>
+      <DialogPortal>
+        <DialogOverlay />
+        <DialogPrimitive.Popup
+          finalFocus={false}
+          data-slot="dialog-content"
+          onKeyDownCapture={(e) => {
+            if ((e.metaKey || e.ctrlKey || e.altKey) && e.key === 'Enter') {
+              e.preventDefault();
+            }
+          }}
+          className={cn(
+            'fixed top-1/2 left-1/2 z-50 flex flex-col w-full max-w-[calc(100%-2rem)] -translate-x-1/2 -translate-y-1/2 bg-background-quaternary text-sm ring-1 ring-foreground/10 duration-100 outline-none data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 data-closed:animate-out rounded-xl overflow-hidden data-closed:fade-out-0 data-closed:zoom-out-95',
+            SIZE_CLASSES[displayEntry?.size ?? 'md']
+          )}
+        >
+          {DisplayComponent && displayArgs ? <DisplayComponent {...displayArgs} /> : null}
+        </DialogPrimitive.Popup>
+      </DialogPortal>
+    </Dialog>
+  );
+});
diff --git a/src/renderer/lib/modal/modal-store.ts b/src/renderer/lib/modal/modal-store.ts
new file mode 100644
index 0000000000..33ddbbc06b
--- /dev/null
+++ b/src/renderer/lib/modal/modal-store.ts
@@ -0,0 +1,31 @@
+import { makeAutoObservable } from 'mobx';
+
+class ModalStore {
+  activeModalId: string | null = null;
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  activeModalArgs: Record<string, any> | null = null;
+  closeGuardActive = false;
+
+  constructor() {
+    makeAutoObservable(this);
+  }
+
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  setModal(id: string, args: Record<string, any>) {
+    this.activeModalId = id;
+    this.activeModalArgs = args;
+  }
+
+  closeModal(_outcome: 'completed' | 'dismissed' = 'dismissed') {
+    this.closeGuardActive = false;
+    this.activeModalId = null;
+    this.activeModalArgs = null;
+    window.dispatchEvent(new CustomEvent('emdash:overlay:changed', { detail: { open: false } }));
+  }
+
+  get isOpen(): boolean {
+    return this.activeModalId !== null;
+  }
+}
+
+export const modalStore = new ModalStore();
diff --git a/src/renderer/lib/modal/use-close-guard.ts b/src/renderer/lib/modal/use-close-guard.ts
new file mode 100644
index 0000000000..899c733ff4
--- /dev/null
+++ b/src/renderer/lib/modal/use-close-guard.ts
@@ -0,0 +1,18 @@
+import { useEffect } from 'react';
+import { useModalContext } from '@renderer/lib/modal/modal-provider';
+
+/**
+ * Activates a close guard on the currently open modal while `isActive` is true,
+ * preventing it from being dismissed via escape key or clicking outside.
+ * Does not block explicit close button clicks.
+ */
+export function useCloseGuard(isActive: boolean) {
+  const { setCloseGuard } = useModalContext();
+
+  useEffect(() => {
+    setCloseGuard(isActive);
+    return () => {
+      if (isActive) setCloseGuard(false);
+    };
+  }, [isActive, setCloseGuard]);
+}
diff --git a/src/renderer/lib/monaco-config.ts b/src/renderer/lib/monaco-config.ts
deleted file mode 100644
index 32d94e1bd2..0000000000
--- a/src/renderer/lib/monaco-config.ts
+++ /dev/null
@@ -1,204 +0,0 @@
-/**
- * Monaco Editor configuration for TypeScript/JavaScript support
- * Configures language services to match project's tsconfig.json
- */
-
-// TypeScript target and module constants
-const TYPESCRIPT_TARGETS = {
-  ES2020: 99, // Monaco's ES2020 enum value
-};
-
-const MODULE_KINDS = {
-  ESNext: 99,
-};
-
-const MODULE_RESOLUTIONS = {
-  NodeJs: 2,
-};
-
-const JSX_EMIT = {
-  React: 2,
-  ReactJSX: 4,
-};
-
-// Diagnostic codes to ignore for cleaner editor experience
-const DIAGNOSTIC_CODES_TO_IGNORE = [
-  2307, // Cannot find module (for project-specific imports)
-  2792, // Cannot find module (for path aliases)
-  2304, // Cannot find name (for global types)
-  1149, // File name differs from already included file (case sensitivity)
-];
-
-// TypeScript compiler options matching tsconfig.json
-const TYPESCRIPT_COMPILER_OPTIONS = {
-  target: TYPESCRIPT_TARGETS.ES2020,
-  lib: ['es2020', 'dom', 'dom.iterable'],
-  allowJs: false,
-  skipLibCheck: true,
-  esModuleInterop: true,
-  allowSyntheticDefaultImports: true,
-  strict: true,
-  forceConsistentCasingInFileNames: true,
-  module: MODULE_KINDS.ESNext,
-  moduleResolution: MODULE_RESOLUTIONS.NodeJs,
-  resolveJsonModule: true,
-  isolatedModules: true,
-  noEmit: true,
-  jsx: JSX_EMIT.ReactJSX,
-  baseUrl: '.',
-  paths: {
-    '@/*': ['./src/renderer/*'],
-    '@shared/*': ['./src/shared/*'],
-    '#types/*': ['./src/types/*'],
-    '#types': ['./src/types/index.ts'],
-  },
-  typeRoots: ['./node_modules/@types'],
-  types: ['react', 'react-dom', 'node'],
-};
-
-// JavaScript compiler options
-const JAVASCRIPT_COMPILER_OPTIONS = {
-  target: TYPESCRIPT_TARGETS.ES2020,
-  lib: ['es2020', 'dom', 'dom.iterable'],
-  allowJs: true,
-  checkJs: false,
-  jsx: JSX_EMIT.React,
-  module: MODULE_KINDS.ESNext,
-  moduleResolution: MODULE_RESOLUTIONS.NodeJs,
-};
-
-// Diagnostics options for better error reporting
-const DIAGNOSTICS_OPTIONS = {
-  noSemanticValidation: false,
-  noSyntaxValidation: false,
-  diagnosticCodesToIgnore: DIAGNOSTIC_CODES_TO_IGNORE,
-};
-
-/**
- * Configure Monaco editor's TypeScript language services
- * @param monaco - Monaco editor instance
- */
-export function configureMonacoTypeScript(monaco: any): void {
-  try {
-    configureTypeScriptDefaults(monaco);
-    configureJavaScriptDefaults(monaco);
-  } catch (error) {
-    console.warn('Failed to configure Monaco TypeScript settings:', error);
-  }
-}
-
-/**
- * Configure TypeScript language defaults
- */
-function configureTypeScriptDefaults(monaco: any): void {
-  if (!monaco?.languages?.typescript?.typescriptDefaults) {
-    return;
-  }
-
-  const tsDefaults = monaco.languages.typescript.typescriptDefaults;
-
-  // Apply compiler options with safe fallbacks
-  const compilerOptions = { ...TYPESCRIPT_COMPILER_OPTIONS };
-
-  // Use Monaco's enum values if available, otherwise use numeric fallbacks
-  if (monaco.languages.typescript.ScriptTarget?.ES2020) {
-    compilerOptions.target = monaco.languages.typescript.ScriptTarget.ES2020;
-  }
-  if (monaco.languages.typescript.ModuleKind?.ESNext) {
-    compilerOptions.module = monaco.languages.typescript.ModuleKind.ESNext;
-  }
-  if (monaco.languages.typescript.ModuleResolutionKind?.NodeJs) {
-    compilerOptions.moduleResolution = monaco.languages.typescript.ModuleResolutionKind.NodeJs;
-  }
-  if (monaco.languages.typescript.JsxEmit?.ReactJSX) {
-    compilerOptions.jsx = monaco.languages.typescript.JsxEmit.ReactJSX;
-  }
-
-  tsDefaults.setCompilerOptions(compilerOptions);
-  tsDefaults.setDiagnosticsOptions(DIAGNOSTICS_OPTIONS);
-  tsDefaults.setEagerModelSync(true);
-}
-
-/**
- * Configure JavaScript language defaults
- */
-function configureJavaScriptDefaults(monaco: any): void {
-  if (!monaco?.languages?.typescript?.javascriptDefaults) {
-    return;
-  }
-
-  const jsDefaults = monaco.languages.typescript.javascriptDefaults;
-
-  // Apply compiler options with safe fallbacks
-  const compilerOptions = { ...JAVASCRIPT_COMPILER_OPTIONS };
-
-  // Use Monaco's enum values if available
-  if (monaco.languages.typescript.ScriptTarget?.ES2020) {
-    compilerOptions.target = monaco.languages.typescript.ScriptTarget.ES2020;
-  }
-  if (monaco.languages.typescript.ModuleKind?.ESNext) {
-    compilerOptions.module = monaco.languages.typescript.ModuleKind.ESNext;
-  }
-  if (monaco.languages.typescript.ModuleResolutionKind?.NodeJs) {
-    compilerOptions.moduleResolution = monaco.languages.typescript.ModuleResolutionKind.NodeJs;
-  }
-  if (monaco.languages.typescript.JsxEmit?.React) {
-    compilerOptions.jsx = monaco.languages.typescript.JsxEmit.React;
-  }
-
-  jsDefaults.setCompilerOptions(compilerOptions);
-  jsDefaults.setEagerModelSync(true);
-}
-
-/**
- * Configure Monaco editor instance options
- * @param editor - Monaco editor instance
- * @param monaco - Monaco namespace
- */
-export function configureMonacoEditor(editor: any, monaco: any): void {
-  editor.updateOptions({
-    quickSuggestions: {
-      other: true,
-      comments: false,
-      strings: true,
-    },
-    suggestOnTriggerCharacters: true,
-    parameterHints: {
-      enabled: true,
-    },
-    wordBasedSuggestions: false,
-    suggest: {
-      showKeywords: true,
-      showSnippets: true,
-      showClasses: true,
-      showFunctions: true,
-      showVariables: true,
-    },
-  });
-}
-
-/**
- * Add keyboard shortcuts to editor
- * @param editor - Monaco editor instance
- * @param monaco - Monaco namespace
- * @param handlers - Keyboard shortcut handlers
- */
-export function addMonacoKeyboardShortcuts(
-  editor: any,
-  monaco: any,
-  handlers: {
-    onSave?: () => void;
-    onSaveAll?: () => void;
-  }
-): void {
-  if (handlers.onSave) {
-    editor.addCommand(monaco.KeyMod.CtrlCmd | monaco.KeyCode.KeyS, handlers.onSave);
-  }
-
-  if (handlers.onSaveAll) {
-    editor.addCommand(
-      monaco.KeyMod.CtrlCmd | monaco.KeyMod.Shift | monaco.KeyCode.KeyS,
-      handlers.onSaveAll
-    );
-  }
-}
diff --git a/src/renderer/lib/monaco-themes.ts b/src/renderer/lib/monaco-themes.ts
deleted file mode 100644
index ab6fdc0121..0000000000
--- a/src/renderer/lib/monaco-themes.ts
+++ /dev/null
@@ -1,85 +0,0 @@
-/**
- * Monaco Editor theme configurations
- * Centralized theme definitions for all Monaco instances in the app
- */
-
-import type { Monaco } from '@monaco-editor/react';
-
-// Track registration per Monaco instance. Some views initialize Monaco independently.
-const registeredMonacoInstances = new WeakSet<object>();
-
-/**
- * Define custom themes for Monaco editor
- * This function is idempotent - calling it multiple times is safe
- */
-export function defineMonacoThemes(monaco: Monaco): void {
-  if (registeredMonacoInstances.has(monaco as object)) return;
-
-  // Dark theme matching app's dark mode
-  monaco.editor.defineTheme('custom-dark', {
-    base: 'vs-dark',
-    inherit: true,
-    rules: [],
-    colors: {
-      'editor.background': '#1e293b', // slate-800 - matches app dark background
-      'editor.foreground': '#e2e8f0',
-      'editor.lineHighlightBackground': '#334155',
-      'editorLineNumber.foreground': '#64748b',
-      'editorGutter.background': '#1e293b',
-    },
-  });
-
-  // Pure black theme for OLED displays
-  monaco.editor.defineTheme('custom-black', {
-    base: 'vs-dark',
-    inherit: true,
-    rules: [],
-    colors: {
-      'editor.background': '#000000', // pure black
-      'editor.foreground': '#f2f2f2',
-      'editor.lineHighlightBackground': '#1a1a1a',
-      'editorLineNumber.foreground': '#666666',
-      'editorGutter.background': '#000000',
-    },
-  });
-
-  // Light theme matching app's light mode
-  monaco.editor.defineTheme('custom-light', {
-    base: 'vs',
-    inherit: true,
-    rules: [],
-    colors: {
-      'editor.background': '#f8fafc', // slate-50 - matches app light background
-      'editor.foreground': '#1e293b',
-      'editor.lineHighlightBackground': '#f1f5f9',
-      'editorLineNumber.foreground': '#94a3b8',
-      'editorGutter.background': '#f8fafc',
-    },
-  });
-
-  registeredMonacoInstances.add(monaco as object);
-}
-
-/**
- * Get the appropriate Monaco theme name based on the app's effective theme
- */
-export function getMonacoTheme(effectiveTheme: string): string {
-  switch (effectiveTheme) {
-    case 'dark-black':
-      return 'custom-black';
-    case 'dark':
-      return 'custom-dark';
-    case 'light':
-    default:
-      return 'custom-light';
-  }
-}
-
-/**
- * Configure Monaco editor with themes and return theme name
- * Convenience function that combines theme definition and selection
- */
-export function setupMonacoTheme(monaco: Monaco, effectiveTheme: string): string {
-  defineMonacoThemes(monaco);
-  return getMonacoTheme(effectiveTheme);
-}
diff --git a/src/renderer/components/diff-viewer/editorConfig.ts b/src/renderer/lib/monaco/editorConfig.ts
similarity index 92%
rename from src/renderer/components/diff-viewer/editorConfig.ts
rename to src/renderer/lib/monaco/editorConfig.ts
index bdbfe18ac4..edb2293633 100644
--- a/src/renderer/components/diff-viewer/editorConfig.ts
+++ b/src/renderer/lib/monaco/editorConfig.ts
@@ -10,6 +10,7 @@ export const DIFF_EDITOR_BASE_OPTIONS: editor.IDiffEditorConstructionOptions = {
   wordWrap: 'on',
   lineNumbers: 'on',
   lineNumbersMinChars: 2,
+  readOnly: true,
   renderIndicators: false,
   overviewRulerLanes: 3,
   renderOverviewRuler: true,
@@ -35,4 +36,6 @@ export const DIFF_EDITOR_BASE_OPTIONS: editor.IDiffEditorConstructionOptions = {
   cursorSmoothCaretAnimation: 'on',
   padding: { top: 8, bottom: 8 },
   folding: false,
+  useInlineViewWhenSpaceIsLimited: false,
+  glyphMargin: true,
 };
diff --git a/src/renderer/lib/monaco/invalidation-bridges.ts b/src/renderer/lib/monaco/invalidation-bridges.ts
new file mode 100644
index 0000000000..4041a6a996
--- /dev/null
+++ b/src/renderer/lib/monaco/invalidation-bridges.ts
@@ -0,0 +1,80 @@
+import { fsWatchEventChannel } from '@shared/events/fsEvents';
+import { gitRefChangedChannel, gitWorkspaceChangedChannel } from '@shared/events/gitEvents';
+import type { FileWatchEvent } from '@shared/fs';
+import { HEAD_REF, STAGED_REF } from '@shared/git';
+import { events } from '@renderer/lib/ipc';
+import type { MonacoModelRegistry } from './monaco-model-registry';
+
+/** Disk models for paths affected by a watch event (atomic saves often use create/delete, not modify). */
+function diskUrisForFsWatchEvent(
+  registry: MonacoModelRegistry,
+  workspaceId: string,
+  e: FileWatchEvent
+): string[] {
+  if (e.path.startsWith('.git')) return [];
+  if (e.oldPath?.startsWith('.git')) return [];
+
+  if (e.type === 'rename' && e.oldPath) {
+    return [
+      ...registry.findDiskUris({ workspaceId, filePath: e.path }),
+      ...registry.findDiskUris({ workspaceId, filePath: e.oldPath }),
+    ];
+  }
+
+  if (e.entryType !== 'file') return [];
+  if (e.type === 'modify' || e.type === 'create' || e.type === 'delete') {
+    return registry.findDiskUris({ workspaceId, filePath: e.path });
+  }
+  return [];
+}
+
+/**
+ * Wire all three invalidation bridges for the given registry. Returns a
+ * teardown function that removes all event subscriptions.
+ *
+ * Call once in `bootstrap()` after Monaco pool initialization.
+ */
+export function wireModelRegistryInvalidation(registry: MonacoModelRegistry): () => void {
+  // Disk file modifications → invalidate matching disk:// models.
+  const unsubFs = events.on(fsWatchEventChannel, ({ workspaceId, events: fsEvents }) => {
+    for (const e of fsEvents) {
+      const skippedGit = e.path.startsWith('.git') || e.oldPath?.startsWith('.git');
+      const uris = skippedGit ? [] : diskUrisForFsWatchEvent(registry, workspaceId, e);
+      if (skippedGit) continue;
+      for (const uri of uris) {
+        void registry.invalidateModel(uri);
+      }
+    }
+  });
+
+  // Workspace index/HEAD changes → invalidate staged or HEAD git:// models.
+  const unsubWorkspace = events.on(gitWorkspaceChangedChannel, ({ workspaceId, kind }) => {
+    const ref = kind === 'index' ? STAGED_REF : HEAD_REF;
+    for (const uri of registry.findGitUris({ workspaceId, ref })) {
+      void registry.invalidateModel(uri);
+    }
+  });
+
+  // Local/remote ref changes → invalidate matching git:// models (exact ref when known).
+  const unsubRefs = events.on(gitRefChangedChannel, ({ projectId, kind, changedRefs }) => {
+    if (kind === 'config') return;
+    if (changedRefs) {
+      for (const ref of changedRefs) {
+        for (const uri of registry.findGitUris({ projectId, ref })) {
+          void registry.invalidateModel(uri);
+        }
+      }
+    } else {
+      const refKind = 'branch'; // Both local and remote branches now share kind:'branch'
+      for (const uri of registry.findGitUris({ projectId, refKind })) {
+        void registry.invalidateModel(uri);
+      }
+    }
+  });
+
+  return () => {
+    unsubFs();
+    unsubWorkspace();
+    unsubRefs();
+  };
+}
diff --git a/src/renderer/lib/monaco/monaco-code-pool.ts b/src/renderer/lib/monaco/monaco-code-pool.ts
new file mode 100644
index 0000000000..2ce20ee7a7
--- /dev/null
+++ b/src/renderer/lib/monaco/monaco-code-pool.ts
@@ -0,0 +1,23 @@
+import type * as monaco from 'monaco-editor';
+import { DEFAULT_EDITOR_OPTIONS } from '@renderer/lib/editor/utils';
+import { configureMonacoTypeScript } from '@renderer/lib/monaco/monaco-config';
+import { modelRegistry } from '@renderer/lib/monaco/monaco-model-registry';
+import { MonacoPool, type PoolEntry as GenericPoolEntry } from '@renderer/lib/monaco/monaco-pool';
+import { defineMonacoThemes } from '@renderer/lib/monaco/monaco-themes';
+
+export type CodePoolEntry = GenericPoolEntry<monaco.editor.IStandaloneCodeEditor>;
+
+export const codeEditorPool = new MonacoPool<monaco.editor.IStandaloneCodeEditor>({
+  poolId: 'monaco-code-pool',
+  reserveTarget: 1,
+  createEditor: (m, container) => m.editor.create(container, { ...DEFAULT_EDITOR_OPTIONS }),
+  cleanupOnRelease: (editor) => {
+    editor.updateOptions({ readOnly: false, glyphMargin: false });
+    editor.setModel(null);
+  },
+  onInit: async (m) => {
+    modelRegistry.notifyMonacoReady(m);
+    defineMonacoThemes(m as Parameters<typeof defineMonacoThemes>[0]);
+    configureMonacoTypeScript(m);
+  },
+});
diff --git a/src/renderer/lib/monaco/monaco-config.ts b/src/renderer/lib/monaco/monaco-config.ts
new file mode 100644
index 0000000000..c70c3a5480
--- /dev/null
+++ b/src/renderer/lib/monaco/monaco-config.ts
@@ -0,0 +1,132 @@
+/**
+ * Monaco Editor configuration for TypeScript/JavaScript support
+ * Configures language services to match project's tsconfig.json
+ */
+import type * as monaco from 'monaco-editor';
+import { log } from '@renderer/utils/logger';
+
+const DIAGNOSTICS_OPTIONS: monaco.typescript.DiagnosticsOptions = {
+  // Monaco runs without the full project/type environment here, so semantic
+  // errors are often misleading in the file editor.
+  noSemanticValidation: true,
+  noSyntaxValidation: false,
+};
+
+/**
+ * Configure Monaco editor's TypeScript language services
+ * @param monacoInstance - Monaco namespace
+ */
+export function configureMonacoTypeScript(monacoInstance: typeof monaco): void {
+  try {
+    configureTypeScriptDefaults(monacoInstance);
+    configureJavaScriptDefaults(monacoInstance);
+  } catch (error) {
+    log.warn('Failed to configure Monaco TypeScript settings:', error);
+  }
+}
+
+/**
+ * Configure TypeScript language defaults
+ */
+function configureTypeScriptDefaults(monacoInstance: typeof monaco): void {
+  const ts = monacoInstance.typescript;
+
+  ts.typescriptDefaults.setCompilerOptions({
+    target: ts.ScriptTarget.ES2020,
+    lib: ['es2020', 'dom', 'dom.iterable'],
+    allowJs: false,
+    skipLibCheck: true,
+    esModuleInterop: true,
+    allowSyntheticDefaultImports: true,
+    strict: true,
+    forceConsistentCasingInFileNames: true,
+    module: ts.ModuleKind.ESNext,
+    moduleResolution: ts.ModuleResolutionKind.NodeJs,
+    resolveJsonModule: true,
+    isolatedModules: true,
+    noEmit: true,
+    jsx: ts.JsxEmit.ReactJSX,
+    baseUrl: '.',
+    paths: {
+      '@/*': ['./src/renderer/*'],
+      '@shared/*': ['./src/shared/*'],
+      '#types/*': ['./src/types/*'],
+      '#types': ['./src/types/index.ts'],
+    },
+    typeRoots: ['./node_modules/@types'],
+    types: ['react', 'react-dom', 'node'],
+  });
+  ts.typescriptDefaults.setDiagnosticsOptions(DIAGNOSTICS_OPTIONS);
+  ts.typescriptDefaults.setEagerModelSync(true);
+}
+
+/**
+ * Configure JavaScript language defaults
+ */
+function configureJavaScriptDefaults(monacoInstance: typeof monaco): void {
+  const ts = monacoInstance.typescript;
+
+  ts.javascriptDefaults.setCompilerOptions({
+    target: ts.ScriptTarget.ES2020,
+    lib: ['es2020', 'dom', 'dom.iterable'],
+    allowJs: true,
+    checkJs: false,
+    jsx: ts.JsxEmit.React,
+    module: ts.ModuleKind.ESNext,
+    moduleResolution: ts.ModuleResolutionKind.NodeJs,
+  });
+  ts.javascriptDefaults.setDiagnosticsOptions(DIAGNOSTICS_OPTIONS);
+  ts.javascriptDefaults.setEagerModelSync(true);
+}
+
+/**
+ * Configure Monaco editor instance options
+ * @param editor - Monaco editor instance
+ */
+export function configureMonacoEditor(editor: monaco.editor.IStandaloneCodeEditor): void {
+  editor.updateOptions({
+    quickSuggestions: {
+      other: true,
+      comments: false,
+      strings: true,
+    },
+    suggestOnTriggerCharacters: true,
+    parameterHints: {
+      enabled: true,
+    },
+    wordBasedSuggestions: 'off',
+    suggest: {
+      showKeywords: true,
+      showSnippets: true,
+      showClasses: true,
+      showFunctions: true,
+      showVariables: true,
+    },
+  });
+}
+
+/**
+ * Add keyboard shortcuts to editor
+ * @param editor - Monaco editor instance
+ * @param monacoInstance - Monaco namespace
+ * @param handlers - Keyboard shortcut handlers
+ */
+export function addMonacoKeyboardShortcuts(
+  editor: monaco.editor.IStandaloneCodeEditor,
+  monacoInstance: typeof monaco,
+  handlers: {
+    onSave?: () => void;
+    onSaveAll?: () => void;
+  }
+): void {
+  if (handlers.onSave) {
+    editor.addCommand(monacoInstance.KeyMod.CtrlCmd | monacoInstance.KeyCode.KeyS, handlers.onSave);
+  }
+
+  if (handlers.onSaveAll) {
+    editor.addCommand(
+      monacoInstance.KeyMod.CtrlCmd | monacoInstance.KeyMod.Shift | monacoInstance.KeyCode.KeyS,
+      handlers.onSaveAll
+    );
+  }
+}
diff --git a/src/renderer/lib/monaco/monaco-diff-pool.ts b/src/renderer/lib/monaco/monaco-diff-pool.ts
new file mode 100644
index 0000000000..271ff56dfd
--- /dev/null
+++ b/src/renderer/lib/monaco/monaco-diff-pool.ts
@@ -0,0 +1,94 @@
+import type * as monaco from 'monaco-editor';
+import { DIFF_EDITOR_BASE_OPTIONS } from '@renderer/lib/monaco/editorConfig';
+import { log } from '@renderer/utils/logger';
+import { modelRegistry } from './monaco-model-registry';
+import { MonacoPool, type PoolEntry as GenericPoolEntry } from './monaco-pool';
+import { defineMonacoThemes, getMonacoTheme } from './monaco-themes';
+
+export type DiffPoolEntry = GenericPoolEntry<monaco.editor.IStandaloneDiffEditor>;
+
+const diffPool = new MonacoPool<monaco.editor.IStandaloneDiffEditor>({
+  poolId: 'monaco-diff-pool',
+  reserveTarget: 3,
+  createEditor: (m, container) =>
+    m.editor.createDiffEditor(container, {
+      ...DIFF_EDITOR_BASE_OPTIONS,
+      renderSideBySide: true,
+    }),
+  cleanupOnRelease: (editor) => {
+    try {
+      const model = editor.getModel();
+      editor.setModel(null);
+      // Only dispose models this pool created (inmemory:// scheme).
+      // Registry-owned models (file://, disk://, git://) are managed by the registry.
+      if (model?.original.uri.scheme === 'inmemory') model.original.dispose();
+      if (model?.modified.uri.scheme === 'inmemory') model.modified.dispose();
+    } catch (err) {
+      log.debug('[monaco-diff-pool] model disposal error (suppressed):', err);
+    }
+  },
+  onInit: async (m) => {
+    modelRegistry.notifyMonacoReady(m);
+    defineMonacoThemes(m as Parameters<typeof defineMonacoThemes>[0]);
+  },
+});
+
+export const diffEditorPool = {
+  init(reserveTarget?: number): Promise<void> {
+    return diffPool.init(reserveTarget);
+  },
+
+  /** Resolves with the Monaco namespace once init has completed. */
+  async whenReady(): Promise<typeof monaco> {
+    return diffPool.init(0).then(() => diffPool.getMonaco()!);
+  },
+
+  lease(): Promise<DiffPoolEntry> {
+    return diffPool.lease();
+  },
+
+  release(entry: DiffPoolEntry): void {
+    diffPool.release(entry);
+  },
+
+  setTheme(effectiveTheme: string): void {
+    const m = diffPool.getMonaco();
+    if (m) defineMonacoThemes(m as Parameters<typeof defineMonacoThemes>[0]);
+    diffPool.setTheme(getMonacoTheme(effectiveTheme));
+  },
+
+  /**
+   * Apply typed-URI models to a diff editor.
+   *
+   * @param originalUri — URI for the left (original/before) side — typically git://
+   * @param modifiedUri — URI for the right (modified/after) side — disk://, git://, etc.
+   * @param language — Monaco language identifier (used only as a fallback safety net)
+   */
+  applyContent(
+    entry: DiffPoolEntry,
+    originalUri: string,
+    modifiedUri: string,
+    language: string
+  ): void {
+    const m = diffPool.getMonaco();
+    if (!m) return;
+
+    // Clean up previous models (respecting ownership, same as cleanupOnRelease).
+    const prev = entry.editor.getModel();
+    if (prev) {
+      entry.editor.setModel(null);
+      if (prev.original.uri.scheme === 'inmemory') prev.original.dispose();
+      if (prev.modified.uri.scheme === 'inmemory') prev.modified.dispose();
+    }
+
+    // Original side: use the registered model, fall back to empty inmemory.
+    const originalModel =
+      modelRegistry.getModelByUri(originalUri) ?? m.editor.createModel('', language);
+
+    // Modified side: disk://, git://, or any other registered URI scheme.
+    const modifiedModel =
+      modelRegistry.getModelByUri(modifiedUri) ?? m.editor.createModel('', language);
+
+    entry.editor.setModel({ original: originalModel, modified: modifiedModel });
+  },
+};
diff --git a/src/renderer/lib/monaco/monaco-model-registry.ts b/src/renderer/lib/monaco/monaco-model-registry.ts
new file mode 100644
index 0000000000..6d3db47e7a
--- /dev/null
+++ b/src/renderer/lib/monaco/monaco-model-registry.ts
@@ -0,0 +1,811 @@
+import { observable, runInAction } from 'mobx';
+import type * as monaco from 'monaco-editor';
+import { gitRefToString, HEAD_REF, refsEqual, type GitRef } from '@shared/git';
+import { rpc } from '@renderer/lib/ipc';
+import { buildMonacoModelPath } from './monacoModelPath';
+
+const BUFFER_DEBOUNCE_MS = 2000;
+
+// ---------------------------------------------------------------------------
+// Discriminated-union entry types
+// ---------------------------------------------------------------------------
+
+interface BufferModelEntry {
+  type: 'buffer';
+  model: monaco.editor.ITextModel;
+  /** Monaco cursor/scroll/folding state, saved between tab switches. */
+  viewState: monaco.editor.ICodeEditorViewState | null;
+  refs: number;
+  projectId: string;
+  workspaceId: string;
+  filePath: string;
+  language: string;
+}
+
+interface DiskModelEntry {
+  type: 'disk';
+  model: monaco.editor.ITextModel;
+  refs: number;
+  projectId: string;
+  workspaceId: string;
+  filePath: string;
+  language: string;
+}
+
+interface GitModelEntry {
+  type: 'git';
+  model: monaco.editor.ITextModel;
+  refs: number;
+  projectId: string;
+  workspaceId: string;
+  filePath: string;
+  language: string;
+  /** The git ref — HEAD for the current commit; structured ref for PR/merge-target diffs. */
+  ref: GitRef;
+}
+
+type ModelEntry = BufferModelEntry | DiskModelEntry | GitModelEntry;
+export type ModelType = 'buffer' | 'disk' | 'git';
+export type ModelStatus = 'loading' | 'ready' | 'error';
+
+/**
+ * Manages up to three Monaco ITextModel instances per open file using a single
+ * unified map keyed by Monaco URI string.
+ *
+ *   buffer  (file://)  — writable; shown in the code editor; holds user edits + undo stack
+ *   disk    (disk://)  — read-only mirror of the current on-disk content; updated by watcher
+ *   git     (git://)   — read-only snapshot of a git ref (HEAD or arbitrary ref)
+ *
+ * ### Lifecycle
+ *
+ * **Registration** (`registerModel` / `unregisterModel`): ref-counted. Models are kept in memory
+ * for 60 s after the last `unregisterModel` call, then evicted. Re-registering before the timer
+ * fires cancels the eviction.
+ *
+ * **Invalidation**: the registry is a pure SWR cache — it does not subscribe to any events.
+ * Callers must wire external invalidation bridges (see `invalidation-bridges.ts`) that translate
+ * FS/git events into `invalidateModel(uri)` calls. Use `findGitUris` / `findDiskUris` to query
+ * which URIs are affected by a given event.
+ *
+ * Binary files must be filtered by callers before registering (use `getFileKind` from fileKind.ts).
+ */
+export class MonacoModelRegistry {
+  /**
+   * Unified model map. Key is the Monaco URI string (scheme encodes entry type).
+   *   file://  → BufferModelEntry
+   *   disk://  → DiskModelEntry
+   *   git://   → GitModelEntry
+   *
+   * Plain Map — Monaco ITextModel instances are imperative/mutable; not observable.
+   */
+  private modelMap = new Map<string, ModelEntry>();
+
+  // ---------------------------------------------------------------------------
+  // Monaco readiness — awaited before creating any ITextModel instance.
+  // ---------------------------------------------------------------------------
+
+  /**
+   * Resolves with the Monaco namespace once a pool has finished initialization.
+   * Both codeEditorPool and diffEditorPool call notifyMonacoReady() from their
+   * onInit hooks, whichever resolves first wins (the promise is idempotent after
+   * the first resolution).
+   */
+  private readonly monacoReadyPromise: Promise<typeof monaco>;
+  private resolveMonacoReady!: (m: typeof monaco) => void;
+  private monacoResolved = false;
+
+  constructor() {
+    this.monacoReadyPromise = new Promise<typeof monaco>((resolve) => {
+      this.resolveMonacoReady = resolve;
+    });
+  }
+
+  /**
+   * Called by MonacoPool instances after Monaco finishes loading.
+   * Safe to call multiple times — only the first call has any effect.
+   */
+  notifyMonacoReady(m: typeof monaco): void {
+    if (this.monacoResolved) return;
+    this.monacoResolved = true;
+    this.resolveMonacoReady(m);
+  }
+
+  private reloadingFromDisk = new Set<string>();
+
+  /**
+   * URIs where the file was externally modified while the buffer had unsaved edits.
+   * The conflict dialog is deferred until the user attempts to save the file.
+   * Observable so future UI can react to conflict state if needed.
+   */
+  readonly pendingConflicts = observable.set<string>();
+
+  private bufferReadyCallbacks = new Map<string, Array<() => void>>();
+
+  /**
+   * In-flight fetch deduplication. Prevents duplicate RPCs when two callers
+   * register the same file concurrently before either resolves.
+   * Key: `{projectId}:{workspaceId}:{filePath}:disk` or `…:git:{ref}`
+   */
+  private pendingFetches = new Map<string, Promise<string | null>>();
+
+  // ---------------------------------------------------------------------------
+  // MobX reactive state
+  // ---------------------------------------------------------------------------
+
+  /**
+   * Model loading status — observable. Drives useModelStatus() in observer() components.
+   */
+  readonly modelStatus = observable.map<string, ModelStatus>();
+
+  /**
+   * Set of buffer URIs (file://) that have unsaved changes relative to disk.
+   * Drives useIsDirty() in observer() components.
+   */
+  readonly dirtyUris = observable.set<string>();
+
+  /**
+   * Monotonically-increasing content version for each buffer URI (file://).
+   * Incremented on every content change and set to 1 on initial buffer creation.
+   * Observable so components that read buffer text (e.g. MarkdownEditorRenderer)
+   * can subscribe reactively without polling — read this before calling getValue().
+   */
+  readonly bufferVersions = observable.map<string, number>();
+
+  /**
+   * 60 s TTL timers. Started in unregisterModel when refs drop to 0.
+   * Cancelled if the model is re-registered before the timer fires.
+   */
+  private evictionTimers = new Map<string, ReturnType<typeof setTimeout>>();
+
+  /** Debounce timers for crash-recovery buffer autosave, keyed by buffer URI. */
+  private bufferAutosaveTimers = new Map<string, ReturnType<typeof setTimeout>>();
+
+  /** model.onDidChangeContent disposables for each registered buffer, keyed by buffer URI. */
+  private bufferContentDisposables = new Map<string, { dispose(): void }>();
+
+  // ---------------------------------------------------------------------------
+  // URI helpers (public)
+  // ---------------------------------------------------------------------------
+
+  toDiskUri(bufferUri: string): string {
+    return bufferUri.replace(/^file:\/\//, 'disk://');
+  }
+
+  /**
+   * Convert a buffer URI (file://) to a git:// URI for the given ref.
+   * Ref is percent-encoded so slashes in branch names (e.g. origin/main) are safe.
+   * Example: file://workspace:abc/src/index.ts + HEAD_REF → git://workspace:abc/HEAD/src/index.ts
+   */
+  toGitUri(bufferUri: string, ref: GitRef): string {
+    const refStr = gitRefToString(ref);
+    const withoutScheme = bufferUri.replace(/^file:\/\//, '');
+    const slashIdx = withoutScheme.indexOf('/');
+    if (slashIdx < 0) return bufferUri;
+    const root = withoutScheme.slice(0, slashIdx);
+    const filePath = withoutScheme.slice(slashIdx + 1);
+    return `git://${root}/${encodeURIComponent(refStr)}/${filePath}`;
+  }
+
+  // ---------------------------------------------------------------------------
+  // Dedup fetch
+  // ---------------------------------------------------------------------------
+
+  private dedupFetch(key: string, fn: () => Promise<string | null>): Promise<string | null> {
+    const existing = this.pendingFetches.get(key);
+    if (existing) return existing;
+    const p = fn().finally(() => this.pendingFetches.delete(key));
+    this.pendingFetches.set(key, p);
+    return p;
+  }
+
+  // ---------------------------------------------------------------------------
+  // Register (public API)
+  // ---------------------------------------------------------------------------
+
+  /**
+   * Register (or increment the reference count of) a model for `filePath`.
+   *
+   * - `'disk'`   — fetches disk content via RPC, creates `disk://` model.
+   * - `'git'`    — fetches git content via RPC; creates `git://` model.
+   * - `'buffer'` — seeds from the existing disk model (disk must be registered first).
+   *               Creates `file://` model, fires any queued `onceBufferReady` callbacks.
+   *
+   * Idempotent: if the model already exists, just increments ref count and returns the URI.
+   *
+   * @returns the buffer URI string (same for all three types of the same file)
+   */
+  async registerModel(
+    projectId: string,
+    workspaceId: string,
+    modelRootPath: string,
+    filePath: string,
+    language: string,
+    type: ModelType,
+    ref: GitRef = HEAD_REF
+  ): Promise<string> {
+    const uri = buildMonacoModelPath(modelRootPath, filePath);
+
+    switch (type) {
+      case 'disk':
+        return this.registerDisk(projectId, workspaceId, uri, filePath, language);
+      case 'git':
+        return this.registerGit(projectId, workspaceId, uri, filePath, language, ref);
+      case 'buffer':
+        return this.registerBuffer(uri, language);
+    }
+  }
+
+  private async registerDisk(
+    projectId: string,
+    workspaceId: string,
+    uri: string,
+    filePath: string,
+    language: string
+  ): Promise<string> {
+    const diskUri = this.toDiskUri(uri);
+    const existing = this.modelMap.get(diskUri);
+
+    if (existing?.type === 'disk') {
+      existing.refs += 1;
+      const timer = this.evictionTimers.get(diskUri);
+      if (timer !== undefined) {
+        clearTimeout(timer);
+        this.evictionTimers.delete(diskUri);
+      }
+      return uri;
+    }
+
+    this.modelStatus.set(diskUri, 'loading');
+
+    // Run the RPC fetch and Monaco initialization in parallel — no need to wait
+    // for Monaco before fetching file content from the main process.
+    let content: string;
+    let m: typeof monaco;
+    try {
+      const fetchKey = `${projectId}:${workspaceId}:${filePath}:disk`;
+      [content, m] = await Promise.all([
+        this.dedupFetch(fetchKey, async () => {
+          const res = await rpc.fs.readFile(projectId, workspaceId, filePath);
+          if (!res.success)
+            throw new Error(`registerModel(disk): readFile failed for ${filePath}: ${res.error}`);
+          const result = res.data.content;
+          if (result === null) throw new Error(`registerModel(disk): null content for ${filePath}`);
+          return result;
+        }) as Promise<string>,
+        this.monacoReadyPromise,
+      ]);
+    } catch (err) {
+      this.modelStatus.set(diskUri, 'error');
+      throw err;
+    }
+
+    const diskMonacoUri = m.Uri.parse(diskUri);
+    let model = m.editor.getModel(diskMonacoUri);
+    if (!model) model = m.editor.createModel(content, language, diskMonacoUri);
+    const entry: DiskModelEntry = {
+      type: 'disk',
+      model,
+      refs: 1,
+      projectId,
+      workspaceId,
+      filePath,
+      language,
+    };
+    this.modelMap.set(diskUri, entry);
+
+    this.modelStatus.set(diskUri, 'ready');
+
+    return uri;
+  }
+
+  private async registerGit(
+    projectId: string,
+    workspaceId: string,
+    uri: string,
+    filePath: string,
+    language: string,
+    ref: GitRef
+  ): Promise<string> {
+    const gitUri = this.toGitUri(uri, ref);
+    const existing = this.modelMap.get(gitUri);
+
+    if (existing?.type === 'git') {
+      existing.refs += 1;
+      const timer = this.evictionTimers.get(gitUri);
+      if (timer !== undefined) {
+        clearTimeout(timer);
+        this.evictionTimers.delete(gitUri);
+      }
+      return uri;
+    }
+
+    this.modelStatus.set(gitUri, 'loading');
+
+    // Run the RPC fetch and Monaco initialization in parallel.
+    const fetchKey = `${projectId}:${workspaceId}:${filePath}:git:${gitRefToString(ref)}`;
+    const [content, m] = await Promise.all([
+      this.dedupFetch(fetchKey, async () => {
+        if (ref.kind === 'staged') {
+          const res = await rpc.git.getFileAtIndex(projectId, workspaceId, filePath);
+          return res.success ? res.data.content : null;
+        }
+        const res = await rpc.git.getFileAtRef(
+          projectId,
+          workspaceId,
+          filePath,
+          gitRefToString(ref)
+        );
+        return res.success ? res.data.content : null;
+      }),
+      this.monacoReadyPromise,
+    ]);
+
+    const gitMonacoUri = m.Uri.parse(gitUri);
+    let model = m.editor.getModel(gitMonacoUri);
+    if (!model) model = m.editor.createModel(content ?? '', language, gitMonacoUri);
+    const entry: GitModelEntry = {
+      type: 'git',
+      model,
+      refs: 1,
+      projectId,
+      workspaceId,
+      filePath,
+      language,
+      ref,
+    };
+    this.modelMap.set(gitUri, entry);
+
+    this.modelStatus.set(gitUri, 'ready');
+
+    return uri;
+  }
+
+  private async registerBuffer(uri: string, language: string): Promise<string> {
+    const existing = this.modelMap.get(uri);
+
+    if (existing?.type === 'buffer') {
+      existing.refs += 1;
+      const timer = this.evictionTimers.get(uri);
+      if (timer !== undefined) {
+        clearTimeout(timer);
+        this.evictionTimers.delete(uri);
+      }
+      // Re-attach the content-change listener if it was eagerly disposed when
+      // refs previously dropped to 0 (tab close), but the model survived the
+      // 60 s eviction window and is now being re-registered.
+      if (!this.bufferContentDisposables.has(uri)) {
+        const disposable = existing.model.onDidChangeContent(() => {
+          if (this.reloadingFromDisk.has(uri)) return;
+          runInAction(() => {
+            if (this.computeIsDirtyRaw(uri)) this.dirtyUris.add(uri);
+            else this.dirtyUris.delete(uri);
+            this.bufferVersions.set(uri, (this.bufferVersions.get(uri) ?? 0) + 1);
+          });
+          const existingTimer = this.bufferAutosaveTimers.get(uri);
+          if (existingTimer) clearTimeout(existingTimer);
+          this.bufferAutosaveTimers.set(
+            uri,
+            setTimeout(() => {
+              this.bufferAutosaveTimers.delete(uri);
+              const currentEntry = this.modelMap.get(uri);
+              if (!currentEntry || currentEntry.type !== 'buffer') return;
+              if (!this.isDirty(uri)) return;
+              const value = currentEntry.model.getValue();
+              void rpc.editorBuffer.saveBuffer(
+                currentEntry.projectId,
+                currentEntry.workspaceId,
+                currentEntry.filePath,
+                value
+              );
+            }, BUFFER_DEBOUNCE_MS)
+          );
+        });
+        this.bufferContentDisposables.set(uri, disposable);
+      }
+      return uri;
+    }
+
+    const m = await this.monacoReadyPromise;
+
+    const diskEntry = this.modelMap.get(this.toDiskUri(uri));
+    const seedContent = diskEntry?.type === 'disk' ? diskEntry.model.getValue() : '';
+    const projectId = diskEntry?.projectId ?? '';
+    const workspaceId = diskEntry?.workspaceId ?? '';
+    const filePath = diskEntry?.filePath ?? '';
+
+    {
+      const bufferMonacoUri = m.Uri.parse(uri);
+      let model = m.editor.getModel(bufferMonacoUri);
+      if (!model) model = m.editor.createModel(seedContent, language, bufferMonacoUri);
+      const entry: BufferModelEntry = {
+        type: 'buffer',
+        model,
+        refs: 1,
+        projectId,
+        workspaceId,
+        filePath,
+        language,
+        viewState: null,
+      };
+      this.modelMap.set(uri, entry);
+
+      // Attach content-change listener for dirty tracking and crash-recovery autosave.
+      const disposable = model.onDidChangeContent(() => {
+        if (this.reloadingFromDisk.has(uri)) return;
+
+        // Update reactive dirty set and bump content version so observer()
+        // components that render buffer text (e.g. markdown preview) re-render.
+        runInAction(() => {
+          if (this.computeIsDirtyRaw(uri)) this.dirtyUris.add(uri);
+          else this.dirtyUris.delete(uri);
+          this.bufferVersions.set(uri, (this.bufferVersions.get(uri) ?? 0) + 1);
+        });
+
+        // Debounced crash-recovery save — persists unsaved edits across app restarts.
+        const existingTimer = this.bufferAutosaveTimers.get(uri);
+        if (existingTimer) clearTimeout(existingTimer);
+        this.bufferAutosaveTimers.set(
+          uri,
+          setTimeout(() => {
+            this.bufferAutosaveTimers.delete(uri);
+            const currentEntry = this.modelMap.get(uri);
+            if (!currentEntry || currentEntry.type !== 'buffer') return;
+            if (!this.isDirty(uri)) return;
+            const value = currentEntry.model.getValue();
+            void rpc.editorBuffer.saveBuffer(
+              currentEntry.projectId,
+              currentEntry.workspaceId,
+              currentEntry.filePath,
+              value
+            );
+          }, BUFFER_DEBOUNCE_MS)
+        );
+      });
+      this.bufferContentDisposables.set(uri, disposable);
+    }
+
+    this.modelStatus.set(uri, 'ready');
+    // Mark the buffer as having content so markdown/other renderers that depend
+    // on bufferVersions can react to the initial population.
+    runInAction(() => {
+      this.bufferVersions.set(uri, 1);
+    });
+
+    const callbacks = this.bufferReadyCallbacks.get(uri);
+    if (callbacks?.length) {
+      callbacks.forEach((cb) => cb());
+      this.bufferReadyCallbacks.delete(uri);
+    }
+
+    return uri;
+  }
+
+  // ---------------------------------------------------------------------------
+  // Unregister (public API)
+  // ---------------------------------------------------------------------------
+
+  /**
+   * Decrement the reference count for a model by its typed URI.
+   * Disposes the Monaco model and cleans up subscriptions when count reaches 0.
+   *
+   * Pass the typed URI directly:
+   *   buffer → the file:// buffer URI (same as returned by registerModel)
+   *   disk   → toDiskUri(bufferUri)
+   *   git    → toGitUri(bufferUri, ref)
+   */
+  unregisterModel(uri: string): void {
+    const entry = this.modelMap.get(uri);
+    if (!entry) return;
+
+    entry.refs -= 1;
+    if (entry.refs > 0) return;
+
+    // refs === 0 — start 60 s cleanup timer. If the model is re-registered before
+    // the timer fires, the timer is cancelled in the register* methods above.
+    const t = setTimeout(() => {
+      this.evictionTimers.delete(uri);
+      const e = this.modelMap.get(uri);
+      if (!e || e.refs > 0) return;
+      if (!e.model.isDisposed()) e.model.dispose();
+      this.modelMap.delete(uri);
+      this.modelStatus.delete(uri);
+      if (e.type === 'buffer') {
+        this.bufferContentDisposables.get(uri)?.dispose();
+        this.bufferContentDisposables.delete(uri);
+        const autosaveTimer = this.bufferAutosaveTimers.get(uri);
+        if (autosaveTimer !== undefined) {
+          clearTimeout(autosaveTimer);
+          this.bufferAutosaveTimers.delete(uri);
+        }
+        this.bufferReadyCallbacks.delete(uri);
+        this.pendingConflicts.delete(uri);
+        runInAction(() => {
+          this.dirtyUris.delete(uri);
+          this.bufferVersions.delete(uri);
+        });
+      }
+    }, 60_000);
+    this.evictionTimers.set(uri, t);
+
+    // Eagerly clean up buffer-specific in-memory state immediately (content disposables,
+    // autosave timers) so that edits made in a closing tab don't fire after close.
+    if (entry.type === 'buffer') {
+      this.bufferContentDisposables.get(uri)?.dispose();
+      this.bufferContentDisposables.delete(uri);
+      const autosaveTimer = this.bufferAutosaveTimers.get(uri);
+      if (autosaveTimer !== undefined) {
+        clearTimeout(autosaveTimer);
+        this.bufferAutosaveTimers.delete(uri);
+      }
+    }
+  }
+
+  // ---------------------------------------------------------------------------
+  // Attach / view state
+  // ---------------------------------------------------------------------------
+
+  /**
+   * Attach the buffer model to a leased code editor.
+   * Saves view state for `previousUri` and restores it for `newUri`.
+   */
+  attach(editor: monaco.editor.IStandaloneCodeEditor, newUri: string, previousUri?: string): void {
+    if (previousUri && previousUri !== newUri) {
+      const prev = this.modelMap.get(previousUri);
+      if (prev?.type === 'buffer') prev.viewState = editor.saveViewState();
+    }
+
+    const entry = this.modelMap.get(newUri);
+    if (entry?.type === 'buffer') {
+      editor.setModel(entry.model);
+      if (entry.viewState) {
+        editor.restoreViewState(entry.viewState);
+      }
+    }
+  }
+
+  /**
+   * Register a one-shot callback that fires when the buffer model for `uri` is created.
+   * If the model already exists, fires immediately.
+   * Returns a cleanup function that cancels the pending callback.
+   */
+  onceBufferReady(uri: string, cb: () => void): () => void {
+    if (this.modelMap.has(uri)) {
+      cb();
+      return () => {};
+    }
+    const cbs = this.bufferReadyCallbacks.get(uri) ?? [];
+    cbs.push(cb);
+    this.bufferReadyCallbacks.set(uri, cbs);
+    return () => {
+      const current = this.bufferReadyCallbacks.get(uri);
+      if (!current) return;
+      const filtered = current.filter((c) => c !== cb);
+      if (filtered.length === 0) {
+        this.bufferReadyCallbacks.delete(uri);
+      } else {
+        this.bufferReadyCallbacks.set(uri, filtered);
+      }
+    };
+  }
+
+  // ---------------------------------------------------------------------------
+  // Dirty state
+  // ---------------------------------------------------------------------------
+
+  /** Returns true if the buffer has unsaved changes relative to on-disk content. */
+  isDirty(uri: string): boolean {
+    return this.dirtyUris.has(uri);
+  }
+
+  /** Computes actual dirty state by comparing model values. Used internally to populate dirtyUris. */
+  private computeIsDirtyRaw(uri: string): boolean {
+    const buf = this.modelMap.get(uri);
+    const disk = this.modelMap.get(this.toDiskUri(uri));
+    if (!buf || buf.type !== 'buffer' || !disk || disk.type !== 'disk') return false;
+    return buf.model.getValue() !== disk.model.getValue();
+  }
+
+  /**
+   * Mark the current buffer content as saved.
+   * Syncs the disk model to match the buffer so isDirty() returns false.
+   */
+  markSaved(uri: string): void {
+    const buf = this.modelMap.get(uri);
+    const disk = this.modelMap.get(this.toDiskUri(uri));
+    if (buf?.type === 'buffer' && disk?.type === 'disk') {
+      disk.model.setValue(buf.model.getValue());
+      runInAction(() => {
+        this.dirtyUris.delete(uri);
+      });
+    }
+  }
+
+  // ---------------------------------------------------------------------------
+  // Content access
+  // ---------------------------------------------------------------------------
+
+  /**
+   * Returns the ITextModel stored at the given typed URI, or undefined.
+   * Use toDiskUri / toGitUri to construct typed URIs for disk/git entries.
+   */
+  getModelByUri(uri: string): monaco.editor.ITextModel | undefined {
+    return this.modelMap.get(uri)?.model;
+  }
+
+  /** Current text content of the buffer model. */
+  getValue(uri: string): string | null {
+    const entry = this.modelMap.get(uri);
+    return entry?.type === 'buffer' ? entry.model.getValue() : null;
+  }
+
+  /** Current text content of the disk model. */
+  getDiskValue(uri: string): string | null {
+    const entry = this.modelMap.get(this.toDiskUri(uri));
+    return entry?.type === 'disk' ? entry.model.getValue() : null;
+  }
+
+  /** True if a buffer model is registered for this URI. */
+  hasModel(uri: string): boolean {
+    return this.modelMap.get(uri)?.type === 'buffer';
+  }
+
+  /** True while a programmatic disk reload is in progress (suppresses false dirty flag). */
+  isReloadingFromDisk(uri: string): boolean {
+    return this.reloadingFromDisk.has(uri);
+  }
+
+  // ---------------------------------------------------------------------------
+  // Conflict state
+  // ---------------------------------------------------------------------------
+
+  hasPendingConflict(uri: string): boolean {
+    return this.pendingConflicts.has(uri);
+  }
+
+  // ---------------------------------------------------------------------------
+  // Reload from disk (called after "Accept Incoming" in conflict dialog)
+  // ---------------------------------------------------------------------------
+
+  /**
+   * Copy disk model content into the buffer model.
+   * Sets reloadingFromDisk so the registry's onDidChangeContent listener
+   * skips treating this as a user edit.
+   */
+  reloadFromDisk(uri: string): void {
+    const buf = this.modelMap.get(uri);
+    const disk = this.modelMap.get(this.toDiskUri(uri));
+    if (buf?.type === 'buffer' && disk?.type === 'disk') {
+      this.reloadingFromDisk.add(uri);
+      buf.model.setValue(disk.model.getValue());
+      this.reloadingFromDisk.delete(uri);
+      runInAction(() => {
+        this.dirtyUris.delete(uri);
+      });
+    }
+    this.pendingConflicts.delete(uri);
+  }
+
+  /**
+   * Write the buffer content to disk, sync the disk model, and clear the
+   * crash-recovery buffer entry.
+   *
+   * @returns the saved content string on success, or `null` on failure.
+   */
+  async saveFileToDisk(uri: string): Promise<string | null> {
+    const buf = this.modelMap.get(uri);
+    if (!buf || buf.type !== 'buffer') return null;
+
+    const content = buf.model.getValue();
+    const result = await rpc.fs.writeFile(buf.projectId, buf.workspaceId, buf.filePath, content);
+    if (!result.success) return null;
+
+    this.markSaved(uri);
+    this.pendingConflicts.delete(uri);
+    void rpc.editorBuffer.clearBuffer(buf.projectId, buf.workspaceId, buf.filePath);
+    return content;
+  }
+
+  // ---------------------------------------------------------------------------
+  // Manual invalidation
+  // ---------------------------------------------------------------------------
+
+  /**
+   * Re-fetch the model at `uri` from its source (disk or git). No-op for buffers.
+   * Bypasses dedup cache — always fires a fresh RPC.
+   */
+  async invalidateModel(uri: string): Promise<void> {
+    const entry = this.modelMap.get(uri);
+    if (!entry) return;
+    if (entry.type === 'disk') {
+      const res = await rpc.fs.readFile(entry.projectId, entry.workspaceId, entry.filePath);
+      if (res.success) this.applyDiskUpdate(uri, entry, res.data.content);
+    } else if (entry.type === 'git') {
+      const res =
+        entry.ref.kind === 'staged'
+          ? await rpc.git.getFileAtIndex(entry.projectId, entry.workspaceId, entry.filePath)
+          : await rpc.git.getFileAtRef(
+              entry.projectId,
+              entry.workspaceId,
+              entry.filePath,
+              gitRefToString(entry.ref)
+            );
+      if (res.success && res.data.content !== null) {
+        entry.model.setValue(res.data.content);
+      }
+    }
+  }
+
+  // ---------------------------------------------------------------------------
+  // Query methods — used by invalidation bridges to find affected URIs
+  // ---------------------------------------------------------------------------
+
+  /**
+   * Return all registered git:// URIs matching the given filter.
+   * Used by invalidation bridges to find which models to invalidate after an event.
+   * Any filter field left undefined is treated as a wildcard.
+   */
+  findGitUris(filter: {
+    workspaceId?: string;
+    projectId?: string;
+    ref?: GitRef;
+    refKind?: GitRef['kind'];
+  }): string[] {
+    const result: string[] = [];
+    for (const [uri, entry] of this.modelMap) {
+      if (entry.type !== 'git') continue;
+      if (filter.workspaceId !== undefined && entry.workspaceId !== filter.workspaceId) continue;
+      if (filter.projectId !== undefined && entry.projectId !== filter.projectId) continue;
+      if (filter.refKind !== undefined && entry.ref.kind !== filter.refKind) continue;
+      if (filter.ref !== undefined && !refsEqual(filter.ref, entry.ref)) continue;
+      result.push(uri);
+    }
+    return result;
+  }
+
+  /**
+   * Return all registered disk:// URIs for the given workspace and file path.
+   * Used by the FS-event invalidation bridge.
+   */
+  findDiskUris(filter: { workspaceId: string; filePath: string }): string[] {
+    const result: string[] = [];
+    for (const [uri, entry] of this.modelMap) {
+      if (entry.type !== 'disk') continue;
+      if (entry.workspaceId !== filter.workspaceId) continue;
+      if (entry.filePath !== filter.filePath) continue;
+      result.push(uri);
+    }
+    return result;
+  }
+
+  // ---------------------------------------------------------------------------
+  // Disk update helper (used by invalidateModel)
+  // ---------------------------------------------------------------------------
+
+  private applyDiskUpdate(diskUri: string, entry: DiskModelEntry, newContent: string): void {
+    const bufferUri = diskUri.replace(/^disk:\/\//, 'file://');
+    const bufEntry = this.modelMap.get(bufferUri);
+    const bufValue = bufEntry?.type === 'buffer' ? bufEntry.model.getValue() : undefined;
+    const wasDirty = this.dirtyUris.has(bufferUri);
+    const newMatchesBuffer = bufValue === newContent;
+
+    entry.model.setValue(newContent);
+
+    if (!wasDirty || newMatchesBuffer) {
+      if (bufEntry?.type === 'buffer' && !newMatchesBuffer) {
+        this.reloadingFromDisk.add(bufferUri);
+        const fullRange = bufEntry.model.getFullModelRange();
+        bufEntry.model.applyEdits([{ range: fullRange, text: newContent }], false);
+        this.reloadingFromDisk.delete(bufferUri);
+      }
+      // Clear dirty state — disk now matches buffer (either buffer was synced to disk, or
+      // new disk content already matched existing buffer edits).
+      runInAction(() => {
+        this.dirtyUris.delete(bufferUri);
+      });
+    } else {
+      this.pendingConflicts.add(bufferUri);
+    }
+  }
+}
+
+export const modelRegistry = new MonacoModelRegistry();
diff --git a/src/renderer/lib/monaco/monaco-pool.ts b/src/renderer/lib/monaco/monaco-pool.ts
new file mode 100644
index 0000000000..74e5cfc0ba
--- /dev/null
+++ b/src/renderer/lib/monaco/monaco-pool.ts
@@ -0,0 +1,176 @@
+import { loader } from '@monaco-editor/react';
+import type * as monaco from 'monaco-editor';
+import { log } from '@renderer/utils/logger';
+
+export type PoolEntry<TEditor> = {
+  editor: TEditor;
+  container: HTMLDivElement;
+  status: 'idle' | 'leased';
+  /** Per-lease event disposables — cleared on release. */
+  disposables: monaco.IDisposable[];
+};
+
+export type MonacoPoolOptions<TEditor> = {
+  /** Used as the DOM root element ID for this pool's off-screen container. */
+  poolId: string;
+  /** Number of idle instances to keep pre-warmed. Default: 1. */
+  reserveTarget?: number;
+  /** Factory: create a new editor instance inside the given container. */
+  createEditor: (m: typeof monaco, container: HTMLDivElement) => TEditor;
+  /**
+   * Called during release before the container is reparented.
+   * Use to dispose models, reset options, etc.
+   */
+  cleanupOnRelease: (editor: TEditor) => void;
+  /** Called once after Monaco loads, before pre-warming entries. */
+  onInit?: (m: typeof monaco) => Promise<void>;
+};
+
+const DEFAULT_RESERVE = 2;
+
+export class MonacoPool<TEditor> {
+  private pool: PoolEntry<TEditor>[] = [];
+  private monacoInstance: typeof monaco | null = null;
+  private reserveTarget: number;
+  private initPromise: Promise<void> | null = null;
+  private readonly options: MonacoPoolOptions<TEditor>;
+
+  constructor(options: MonacoPoolOptions<TEditor>) {
+    this.options = options;
+    this.reserveTarget = options.reserveTarget ?? DEFAULT_RESERVE;
+  }
+
+  /**
+   * Load Monaco, run onInit, and pre-create idle entries.
+   * Safe to call multiple times — subsequent calls return the same promise.
+   */
+  init(reserveTarget?: number): Promise<void> {
+    if (reserveTarget !== undefined) {
+      this.reserveTarget = reserveTarget;
+    }
+    if (this.initPromise) return this.initPromise;
+
+    this.initPromise = (async () => {
+      const m = await loader.init();
+      this.monacoInstance = m;
+      // Expose Monaco globally so module-level singletons (e.g. MonacoModelRegistry)
+      // can access it without a direct import dependency on the pool.
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      (globalThis as any).__monaco = m;
+      if (this.options.onInit) {
+        await this.options.onInit(m);
+      }
+      for (let i = 0; i < this.reserveTarget; i++) {
+        this.createEntry(m);
+      }
+    })();
+
+    return this.initPromise;
+  }
+
+  /**
+   * Lease an idle editor instance. Creates one on-demand if none are available.
+   * Schedules background replenishment after returning.
+   */
+  async lease(): Promise<PoolEntry<TEditor>> {
+    if (!this.monacoInstance) {
+      await this.init();
+    }
+
+    const idle = this.pool.find((e) => e.status === 'idle');
+    if (idle) {
+      idle.status = 'leased';
+      void this.replenish();
+      return idle;
+    }
+
+    const entry = this.createEntry(this.monacoInstance!);
+    entry.status = 'leased';
+    void this.replenish();
+    return entry;
+  }
+
+  /**
+   * Return a leased entry to the pool.
+   * Disposes per-lease disposables, calls cleanupOnRelease, reparents container.
+   */
+  release(entry: PoolEntry<TEditor>): void {
+    for (const d of entry.disposables) {
+      try {
+        d.dispose();
+      } catch {
+        // ignore
+      }
+    }
+    entry.disposables = [];
+
+    try {
+      this.options.cleanupOnRelease(entry.editor);
+    } catch (err) {
+      log.debug(`[${this.options.poolId}] cleanupOnRelease error (suppressed):`, err);
+    }
+
+    try {
+      this.getPoolRoot().appendChild(entry.container);
+    } catch (err) {
+      log.debug(`[${this.options.poolId}] container reparent error (suppressed):`, err);
+    }
+
+    entry.status = 'idle';
+  }
+
+  /**
+   * Set the global Monaco theme (affects all instances simultaneously).
+   * Pass the resolved theme name (e.g. 'custom-dark'), not the app theme key.
+   */
+  setTheme(themeName: string): void {
+    this.monacoInstance?.editor.setTheme(themeName);
+  }
+
+  /** Returns the underlying Monaco instance, or null if not yet initialised. */
+  getMonaco(): typeof monaco | null {
+    return this.monacoInstance;
+  }
+
+  private createEntry(m: typeof monaco): PoolEntry<TEditor> {
+    const root = this.getPoolRoot();
+    const container = document.createElement('div');
+    container.style.cssText = 'width:100%;height:100%;';
+    root.appendChild(container);
+
+    const editor = this.options.createEditor(m, container);
+    const entry: PoolEntry<TEditor> = {
+      editor,
+      container,
+      status: 'idle',
+      disposables: [],
+    };
+    this.pool.push(entry);
+    return entry;
+  }
+
+  private async replenish(): Promise<void> {
+    if (!this.monacoInstance) return;
+    const idleCount = this.pool.filter((e) => e.status === 'idle').length;
+    const needed = this.reserveTarget - idleCount;
+    for (let i = 0; i < needed; i++) {
+      this.createEntry(this.monacoInstance);
+    }
+  }
+
+  private getPoolRoot(): HTMLDivElement {
+    const id = this.options.poolId;
+    let root = document.getElementById(id) as HTMLDivElement | null;
+    if (!root) {
+      root = document.createElement('div');
+      root.id = id;
+      // Off-screen but still in the DOM so Monaco's ResizeObserver works correctly.
+      // visibility:hidden with real dimensions avoids display:none breaking layout measurement.
+      root.style.cssText =
+        'position:fixed;top:-10000px;left:-10000px;width:800px;height:600px;' +
+        'pointer-events:none;overflow:hidden;visibility:hidden;';
+      document.body.appendChild(root);
+    }
+    return root;
+  }
+}
diff --git a/src/renderer/lib/monaco/monaco-themes.test.ts b/src/renderer/lib/monaco/monaco-themes.test.ts
new file mode 100644
index 0000000000..5a6b1e41d4
--- /dev/null
+++ b/src/renderer/lib/monaco/monaco-themes.test.ts
@@ -0,0 +1,142 @@
+// @vitest-environment jsdom
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import { defineMonacoThemes, getMonacoTheme } from './monaco-themes';
+
+function makeCanvasMock(r: number, g: number, b: number, a = 255) {
+  return {
+    width: 0,
+    height: 0,
+    getContext: () => ({
+      fillStyle: '',
+      fillRect: vi.fn(),
+      getImageData: () => ({ data: [r, g, b, a] }),
+    }),
+  };
+}
+
+describe('defineMonacoThemes', () => {
+  let appendSpy: ReturnType<typeof vi.spyOn>;
+  let canvasCallCount: number;
+
+  beforeEach(() => {
+    canvasCallCount = 0;
+
+    vi.spyOn(document, 'createElement').mockImplementation((tag: string) => {
+      if (tag === 'canvas') {
+        canvasCallCount++;
+        // Alternate: odd canvas calls return a "dark" pixel, even return a "light" pixel.
+        const isDark = canvasCallCount % 2 === 1;
+        return makeCanvasMock(
+          isDark ? 25 : 248,
+          isDark ? 25 : 250,
+          isDark ? 25 : 252
+        ) as unknown as HTMLElement;
+      }
+      const el = {
+        className: '',
+        style: { cssText: '' },
+        remove: vi.fn(),
+      };
+      return el as unknown as HTMLElement;
+    });
+
+    vi.spyOn(window, 'getComputedStyle').mockImplementation(() => {
+      return {
+        getPropertyValue: (prop: string) => {
+          const vars: Record<string, string> = {
+            '--monaco-bg': 'color(display-p3 0.098 0.098 0.098)',
+            '--monaco-fg': 'color(display-p3 0.706 0.706 0.706)',
+            '--monaco-line-highlight': 'color(display-p3 0.192 0.192 0.192)',
+            '--monaco-line-number': 'color(display-p3 0.227 0.227 0.227)',
+            '--monaco-gutter': 'color(display-p3 0.973 0.980 0.988)',
+            '--monaco-inserted-text-bg': 'color(display-p3 0.145 0.282 0.176)',
+            '--monaco-inserted-line-bg': 'color(display-p3 0.106 0.165 0.118)',
+            '--monaco-inserted-text-border': 'color(display-p3 0.145 0.282 0.176)',
+            '--monaco-removed-text-bg': 'color(display-p3 0.380 0.086 0.137)',
+            '--monaco-removed-line-bg': 'color(display-p3 0.231 0.071 0.098)',
+            '--monaco-removed-text-border': 'color(display-p3 0.380 0.086 0.137)',
+            '--monaco-unchanged-region-bg': 'color(display-p3 0.165 0.165 0.165)',
+            '--monaco-diff-border': 'color(display-p3 0.227 0.227 0.227)',
+            '--monaco-diff-diagonal-fill': 'color(display-p3 0.165 0.165 0.165)',
+          };
+          return vars[prop] ?? '';
+        },
+      } as unknown as CSSStyleDeclaration;
+    });
+
+    appendSpy = vi.spyOn(document.body, 'appendChild').mockReturnValue({} as Node);
+  });
+
+  afterEach(() => {
+    vi.restoreAllMocks();
+  });
+
+  it('defines exactly two Monaco themes', () => {
+    const defineTheme = vi.fn();
+    const monaco = { editor: { defineTheme } };
+
+    defineMonacoThemes(monaco as Parameters<typeof defineMonacoThemes>[0]);
+
+    expect(defineTheme).toHaveBeenCalledTimes(2);
+  });
+
+  it('defines custom-dark with vs-dark base', () => {
+    const defineTheme = vi.fn();
+    const monaco = { editor: { defineTheme } };
+
+    defineMonacoThemes(monaco as Parameters<typeof defineMonacoThemes>[0]);
+
+    expect(defineTheme).toHaveBeenNthCalledWith(
+      1,
+      'custom-dark',
+      expect.objectContaining({ base: 'vs-dark', inherit: true })
+    );
+  });
+
+  it('defines custom-light with vs base', () => {
+    const defineTheme = vi.fn();
+    const monaco = { editor: { defineTheme } };
+
+    defineMonacoThemes(monaco as Parameters<typeof defineMonacoThemes>[0]);
+
+    expect(defineTheme).toHaveBeenNthCalledWith(
+      2,
+      'custom-light',
+      expect.objectContaining({ base: 'vs', inherit: true })
+    );
+  });
+
+  it('reads CSS vars and converts them to hex colors', () => {
+    const defineTheme = vi.fn();
+    const monaco = { editor: { defineTheme } };
+
+    defineMonacoThemes(monaco as Parameters<typeof defineMonacoThemes>[0]);
+
+    const darkCall = defineTheme.mock.calls[0][1];
+    expect(darkCall.colors['editor.background']).toMatch(/^#[0-9a-f]{6}$/i);
+    expect(darkCall.colors['editor.foreground']).toMatch(/^#[0-9a-f]{6}$/i);
+  });
+
+  it('creates and appends a temp DOM element for each theme', () => {
+    const defineTheme = vi.fn();
+    const monaco = { editor: { defineTheme } };
+
+    defineMonacoThemes(monaco as Parameters<typeof defineMonacoThemes>[0]);
+
+    expect(appendSpy).toHaveBeenCalledTimes(2);
+  });
+});
+
+describe('getMonacoTheme', () => {
+  it('maps emlight to custom-light', () => {
+    expect(getMonacoTheme('emlight')).toBe('custom-light');
+  });
+
+  it('maps emdark to custom-dark', () => {
+    expect(getMonacoTheme('emdark')).toBe('custom-dark');
+  });
+
+  it('defaults unknown themes to custom-dark', () => {
+    expect(getMonacoTheme('unknown')).toBe('custom-dark');
+  });
+});
diff --git a/src/renderer/lib/monaco/monaco-themes.ts b/src/renderer/lib/monaco/monaco-themes.ts
new file mode 100644
index 0000000000..0a590bfd33
--- /dev/null
+++ b/src/renderer/lib/monaco/monaco-themes.ts
@@ -0,0 +1,84 @@
+import type { Monaco } from '@monaco-editor/react';
+
+type MonacoColors = Record<string, string>;
+
+/**
+ * Converts any CSS color string (hex, hsl, color(display-p3 ...), etc.) to a
+ * Monaco-compatible hex string by painting a 1×1 canvas pixel and reading back
+ * the sRGB bytes. Out-of-gamut p3 values are clamped to sRGB, which is
+ * imperceptible for editor chrome colors.
+ */
+function cssColorToHex(cssColor: string): string {
+  const canvas = document.createElement('canvas');
+  canvas.width = canvas.height = 1;
+  const ctx = canvas.getContext('2d')!;
+  ctx.fillStyle = cssColor.trim();
+  ctx.fillRect(0, 0, 1, 1);
+  const [r, g, b, a] = ctx.getImageData(0, 0, 1, 1).data;
+  const hex = (n: number) => n.toString(16).padStart(2, '0');
+  return a < 255 ? `#${hex(r)}${hex(g)}${hex(b)}${hex(a)}` : `#${hex(r)}${hex(g)}${hex(b)}`;
+}
+
+/**
+ * Reads all --monaco-* CSS custom properties from an element bearing the given
+ * theme class, converts each value to a hex string, and returns a Monaco color
+ * token map. Entries where the variable is not defined for that theme are
+ * omitted.
+ */
+function readMonacoVarsForTheme(cssClass: 'emlight' | 'emdark'): MonacoColors {
+  const el = document.createElement('div');
+  el.className = cssClass;
+  el.style.cssText = 'position:absolute;visibility:hidden;pointer-events:none;';
+  document.body.appendChild(el);
+  const style = getComputedStyle(el);
+
+  const get = (v: string) => style.getPropertyValue(v).trim();
+
+  const mapping: Array<[string, string]> = [
+    ['--monaco-bg', 'editor.background'],
+    ['--monaco-fg', 'editor.foreground'],
+    ['--monaco-line-highlight', 'editor.lineHighlightBackground'],
+    ['--monaco-line-number', 'editorLineNumber.foreground'],
+    ['--monaco-gutter', 'editorGutter.background'],
+    ['--monaco-inserted-text-bg', 'diffEditor.insertedTextBackground'],
+    ['--monaco-inserted-line-bg', 'diffEditor.insertedLineBackground'],
+    ['--monaco-inserted-text-border', 'diffEditor.insertedTextBorder'],
+    ['--monaco-removed-text-bg', 'diffEditor.removedTextBackground'],
+    ['--monaco-removed-line-bg', 'diffEditor.removedLineBackground'],
+    ['--monaco-removed-text-border', 'diffEditor.removedTextBorder'],
+    ['--monaco-unchanged-region-bg', 'diffEditor.unchangedRegionBackground'],
+    ['--monaco-diff-border', 'diffEditor.border'],
+    ['--monaco-diff-diagonal-fill', 'diffEditor.diagonalFill'],
+  ];
+
+  const colors: MonacoColors = {};
+  for (const [cssVar, monacoToken] of mapping) {
+    const value = get(cssVar);
+    if (value) {
+      colors[monacoToken] = cssColorToHex(value);
+    }
+  }
+
+  el.remove();
+  return colors;
+}
+
+export function defineMonacoThemes(monaco: Monaco): void {
+  monaco.editor.defineTheme('custom-dark', {
+    base: 'vs-dark',
+    inherit: true,
+    rules: [],
+    colors: readMonacoVarsForTheme('emdark'),
+  });
+
+  monaco.editor.defineTheme('custom-light', {
+    base: 'vs',
+    inherit: true,
+    rules: [],
+    colors: readMonacoVarsForTheme('emlight'),
+  });
+}
+
+export function getMonacoTheme(effectiveTheme: string): string {
+  return effectiveTheme === 'emlight' ? 'custom-light' : 'custom-dark';
+}
diff --git a/src/renderer/lib/monacoModelPath.ts b/src/renderer/lib/monaco/monacoModelPath.ts
similarity index 100%
rename from src/renderer/lib/monacoModelPath.ts
rename to src/renderer/lib/monaco/monacoModelPath.ts
diff --git a/src/renderer/lib/monaco/sticky-diff-editor.tsx b/src/renderer/lib/monaco/sticky-diff-editor.tsx
new file mode 100644
index 0000000000..4b4d1a1851
--- /dev/null
+++ b/src/renderer/lib/monaco/sticky-diff-editor.tsx
@@ -0,0 +1,129 @@
+import { autorun, observable, runInAction } from 'mobx';
+import type * as monaco from 'monaco-editor';
+import { useEffect, useRef } from 'react';
+import { useTheme } from '@renderer/lib/hooks/useTheme';
+import { diffEditorPool } from '@renderer/lib/monaco/monaco-diff-pool';
+import { modelRegistry } from '@renderer/lib/monaco/monaco-model-registry';
+import { DIFF_EDITOR_BASE_OPTIONS } from './editorConfig';
+
+export interface StickyDiffEditorProps {
+  /** URI for the left (original/before) side — typically git:// */
+  originalUri: string;
+  /** URI for the right (modified/after) side — disk://, git://, etc. */
+  modifiedUri: string;
+  diffStyle: 'unified' | 'split';
+  /** Called whenever the content height changes, for auto-sizing parent containers. */
+  onHeightChange?: (height: number) => void;
+  /** Called when the diff editor instance is created/disposed. */
+  onEditorChange?: (editor: monaco.editor.IStandaloneDiffEditor | null) => void;
+}
+
+/**
+ * Mounts a Monaco diff editor directly into a div (no pool lease/release).
+ * The editor instance lives for the lifetime of this component; content is swapped
+ * in-place via a MobX autorun when originalUri/modifiedUri change or models become ready.
+ *
+ * Requires Monaco to already be initialized (guaranteed by bootstrap awaiting
+ * diffEditorPool.init before React renders).
+ */
+export function StickyDiffEditor({
+  originalUri,
+  modifiedUri,
+  diffStyle,
+  onHeightChange,
+  onEditorChange,
+}: StickyDiffEditorProps) {
+  const mountRef = useRef<HTMLDivElement>(null);
+
+  // Observable box so the autorun can react to the editor arriving after async mount.
+  const editorBox = useRef(
+    observable.box<monaco.editor.IStandaloneDiffEditor | null>(null)
+  ).current;
+
+  const onHeightChangeRef = useRef(onHeightChange);
+  onHeightChangeRef.current = onHeightChange;
+
+  const onEditorChangeRef = useRef(onEditorChange);
+  onEditorChangeRef.current = onEditorChange;
+
+  const { effectiveTheme } = useTheme();
+
+  // Create editor once on mount, dispose on unmount.
+  // Monaco is guaranteed ready because bootstrap awaited diffEditorPool.init().
+  useEffect(() => {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const m = (globalThis as any).__monaco as typeof monaco;
+    if (!m || !mountRef.current) return;
+
+    const editor = m.editor.createDiffEditor(mountRef.current, {
+      ...DIFF_EDITOR_BASE_OPTIONS,
+      renderSideBySide: diffStyle === 'split',
+    });
+    onEditorChangeRef.current?.(editor);
+
+    const modifiedEditor = editor.getModifiedEditor();
+    const heightDisposable = modifiedEditor.onDidContentSizeChange(
+      (e: { contentHeightChanged: boolean; contentHeight: number }) => {
+        if (e.contentHeightChanged) {
+          onHeightChangeRef.current?.(e.contentHeight);
+        }
+      }
+    );
+
+    runInAction(() => editorBox.set(editor));
+
+    return () => {
+      onEditorChangeRef.current?.(null);
+      heightDisposable.dispose();
+      runInAction(() => editorBox.set(null));
+      editor.dispose();
+    };
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
+  // Sync diffStyle changes to the mounted editor.
+  useEffect(() => {
+    editorBox.get()?.updateOptions({ renderSideBySide: diffStyle === 'split' });
+  }, [diffStyle, editorBox]);
+
+  // Sync global Monaco theme (affects all editor instances simultaneously).
+  useEffect(() => {
+    diffEditorPool.setTheme(effectiveTheme);
+  }, [effectiveTheme]);
+
+  // Reactive content application — recreated when URIs change.
+  // The autorun waits for both models to be 'ready' in the registry, then calls
+  // setModel in-place without remounting the editor component.
+  useEffect(
+    () =>
+      autorun(() => {
+        const editor = editorBox.get(); // reactive: waits for editor to exist
+        if (!editor) return;
+
+        const origStatus = modelRegistry.modelStatus.get(originalUri); // reactive
+        const modStatus = modelRegistry.modelStatus.get(modifiedUri); // reactive
+        if (origStatus !== 'ready' || modStatus !== 'ready') return;
+
+        const origModel = modelRegistry.getModelByUri(originalUri);
+        const modModel = modelRegistry.getModelByUri(modifiedUri);
+        if (!origModel || !modModel) return;
+
+        // Clean up any previous inmemory models to avoid leaks (mirrors applyContent).
+        const prev = editor.getModel();
+        if (prev) {
+          editor.setModel(null);
+          if (prev.original.uri.scheme === 'inmemory') prev.original.dispose();
+          if (prev.modified.uri.scheme === 'inmemory') prev.modified.dispose();
+        }
+
+        editor.setModel({ original: origModel, modified: modModel });
+        editor.layout();
+        onHeightChangeRef.current?.(editor.getModifiedEditor().getContentHeight());
+      }),
+    // editorBox is a stable ref created once; only URI changes recreate the autorun.
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [originalUri, modifiedUri]
+  );
+
+  return <div ref={mountRef} className="h-full" />;
+}
diff --git a/src/renderer/lib/monaco/use-model.ts b/src/renderer/lib/monaco/use-model.ts
new file mode 100644
index 0000000000..e4557fbec2
--- /dev/null
+++ b/src/renderer/lib/monaco/use-model.ts
@@ -0,0 +1,30 @@
+import { modelRegistry, type ModelStatus } from './monaco-model-registry';
+
+/**
+ * Returns the loading status of a registered model, updating reactively via MobX.
+ * Gates diff/code editor rendering: wait for `'ready'` before rendering editors.
+ *
+ * Also activates FS watching for the URI's task while the component is mounted —
+ * the first observer of a URI triggers onBecomeObserved which starts FS watch + polling;
+ * the last observer unmounting triggers onBecomeUnobserved which stops them.
+ *
+ * Calling component must be wrapped with `observer()` from `mobx-react-lite`.
+ *
+ * @param uri — a typed URI: disk://, git://, or file:// buffer URI
+ */
+export function useModelStatus(uri: string): ModelStatus {
+  return modelRegistry.modelStatus.get(uri) ?? 'loading';
+}
+
+/**
+ * Returns true when the buffer model at `bufferUri` has unsaved changes relative
+ * to the on-disk content. Updates reactively whenever the buffer is edited, saved,
+ * or reloaded from disk.
+ *
+ * Calling component must be wrapped with `observer()` from `mobx-react-lite`.
+ *
+ * @param bufferUri — a file:// buffer URI
+ */
+export function useIsDirty(bufferUri: string): boolean {
+  return modelRegistry.dirtyUris.has(bufferUri);
+}
diff --git a/src/renderer/lib/monaco/use-monaco-lease.ts b/src/renderer/lib/monaco/use-monaco-lease.ts
new file mode 100644
index 0000000000..2b877834e3
--- /dev/null
+++ b/src/renderer/lib/monaco/use-monaco-lease.ts
@@ -0,0 +1,39 @@
+import { observable, runInAction, type IObservableValue } from 'mobx';
+import { useEffect, useRef } from 'react';
+import type { PoolEntry } from './monaco-pool';
+
+/**
+ * Leases one editor from `pool` on mount and releases it on unmount.
+ * Returns a stable MobX observable box whose value is the active lease entry
+ * (or null before it arrives / after unmount). This lets MobX `autorun` and
+ * `reaction` consumers react to the lease arriving without any manual callback
+ * coordination — the box is just another observable input alongside
+ * `activeFile` and `modelRegistry.modelStatus`.
+ */
+export function useMonacoLease<T>(pool: {
+  lease(): Promise<PoolEntry<T>>;
+  release(entry: PoolEntry<T>): void;
+}): IObservableValue<PoolEntry<T> | null> {
+  // Stable box — created once per component mount, never replaced.
+  const box = useRef(observable.box<PoolEntry<T> | null>(null)).current;
+
+  useEffect(() => {
+    let cancelled = false;
+    pool.lease().then((entry) => {
+      if (cancelled) {
+        pool.release(entry);
+        return;
+      }
+      runInAction(() => box.set(entry));
+    });
+    return () => {
+      cancelled = true;
+      const entry = box.get();
+      runInAction(() => box.set(null));
+      if (entry) pool.release(entry);
+    };
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
+  return box;
+}
diff --git a/src/renderer/lib/monacoDiffColors.ts b/src/renderer/lib/monacoDiffColors.ts
deleted file mode 100644
index fbbb0c8cc1..0000000000
--- a/src/renderer/lib/monacoDiffColors.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * Monaco Editor diff color constants
- * Shared Monaco Editor diff color constants used by DiffViewer and other diff views
- * Colors are defined here for maintainability and consistency
- */
-
-export const MONACO_DIFF_COLORS = {
-  dark: {
-    editorBackground: '#1e293b', // slate-800 dark grey/blue
-    // Emerald (green) for additions - emerald-900 at 30% opacity
-    insertedTextBackground: '#064e3b4D', // emerald-900 (#064e3b) with 30% opacity
-    insertedLineBackground: '#064e3b66', // emerald-900 with 40% opacity for lines
-    // Rose (red) for deletions - rose-900 at 30% opacity
-    removedTextBackground: '#8813374D', // rose-900 (#881337) with 30% opacity
-    removedLineBackground: '#88133766', // rose-900 with 40% opacity for lines
-  },
-  'dark-black': {
-    editorBackground: '#000000', // pure black
-    // Emerald (green) for additions with adjusted opacity for black background
-    insertedTextBackground: '#064e3b5C', // emerald-900 with slightly higher opacity for black bg
-    insertedLineBackground: '#064e3b73', // emerald-900 with 45% opacity for lines
-    // Rose (red) for deletions with adjusted opacity for black background
-    removedTextBackground: '#8813375C', // rose-900 with slightly higher opacity for black bg
-    removedLineBackground: '#88133773', // rose-900 with 45% opacity for lines
-  },
-  light: {
-    editorBackground: '#f8fafc', // slate-50 - light grey/white background
-    // Emerald (green) for additions - emerald-50
-    insertedTextBackground: '#10b98140', // emerald-500 with 25% opacity for subtle text highlight
-    insertedLineBackground: '#ecfdf580', // emerald-50 (#ecfdf5) with 50% opacity for line background
-    // Rose (red) for deletions - rose-50
-    removedTextBackground: '#f43f5e40', // rose-500 with 25% opacity for subtle text highlight
-    removedLineBackground: '#fff1f280', // rose-50 (#fff1f2) with 50% opacity for line background
-  },
-} as const;
diff --git a/src/renderer/lib/monacoDiffConfig.ts b/src/renderer/lib/monacoDiffConfig.ts
deleted file mode 100644
index e387ccda23..0000000000
--- a/src/renderer/lib/monacoDiffConfig.ts
+++ /dev/null
@@ -1,102 +0,0 @@
-/**
- * Monaco Diff Editor Configuration
- *
- *
- * This configuration is specifically for diff viewers where:
- * - Code is read-only (viewing changes, not editing)
- * - Worktrees may lack dependencies (no node_modules)
- * - Diff context may show partial/incomplete code
- */
-
-import type * as monaco from 'monaco-editor';
-
-/**
- * Error codes to suppress in diff viewers (if using targeted suppression)
- * Currently unused as we disable all validation, but kept for future reference
- */
-const DIFF_VIEWER_IGNORED_DIAGNOSTICS = [
-  2307, // Cannot find module
-  2792, // Cannot find module (path aliases)
-  2304, // Cannot find name (global types)
-  1005, // ':' expected
-  2365, // Operator '<' cannot be applied (JSX confusion)
-  17004, // Cannot use JSX unless '--jsx' flag provided
-  1161, // Unterminated regular expression literal
-  1003, // Identifier expected
-  1109, // Expression expected
-  1160, // Unterminated template literal
-];
-
-/**
- * Configures a Monaco diff editor instance to suppress common validation warnings
- *
- * @param editor - The Monaco diff editor instance
- * @param monaco - The Monaco namespace
- * @param options - Configuration options
- */
-export function configureDiffEditorDiagnostics(
-  editor: monaco.editor.IStandaloneDiffEditor,
-  monaco: any,
-  options: {
-    /** Completely disable validation (aggressive but effective) */
-    disableAllValidation?: boolean;
-    /** Only suppress specific error codes (more targeted) */
-    suppressSpecificErrors?: boolean;
-  } = {}
-): void {
-  const { disableAllValidation = false, suppressSpecificErrors = true } = options;
-
-  // Get the modified editor (right side) which is where users review changes
-  const modifiedEditor = editor.getModifiedEditor();
-  const model = modifiedEditor.getModel();
-
-  if (!model) return;
-
-  // Create diagnostic options based on configuration
-  const diagnosticOptions = {
-    noSemanticValidation: disableAllValidation,
-    noSyntaxValidation: disableAllValidation,
-    diagnosticCodesToIgnore: suppressSpecificErrors ? DIFF_VIEWER_IGNORED_DIAGNOSTICS : [],
-  };
-
-  // Apply configuration to this specific model's language
-  const language = model.getLanguageId();
-
-  if (language === 'typescript' || language === 'typescriptreact') {
-    // For TypeScript files, we need to configure the language service
-    // Note: This still affects global defaults, but we limit it to when diff viewers are used
-    monaco.languages.typescript.typescriptDefaults.setDiagnosticsOptions(diagnosticOptions);
-  } else if (language === 'javascript' || language === 'javascriptreact') {
-    // For JavaScript files
-    monaco.languages.typescript.javascriptDefaults.setDiagnosticsOptions(diagnosticOptions);
-  }
-
-  try {
-    if (monaco.editor.setModelMarkers) {
-      // Clear existing markers for this model
-      monaco.editor.setModelMarkers(model, 'typescript', []);
-    }
-  } catch {
-    // Older Monaco version, ignore
-  }
-}
-
-/**
- * Resets diagnostic options to defaults (for cleanup)
- * Call this when closing diff modals to restore normal validation
- */
-export function resetDiagnosticOptions(monaco: any): void {
-  const defaultOptions = {
-    noSemanticValidation: false,
-    noSyntaxValidation: false,
-    diagnosticCodesToIgnore: [],
-  };
-
-  if (monaco?.languages?.typescript?.typescriptDefaults) {
-    monaco.languages.typescript.typescriptDefaults.setDiagnosticsOptions(defaultOptions);
-  }
-
-  if (monaco?.languages?.typescript?.javascriptDefaults) {
-    monaco.languages.typescript.javascriptDefaults.setDiagnosticsOptions(defaultOptions);
-  }
-}
diff --git a/src/renderer/lib/monacoDiffThemes.ts b/src/renderer/lib/monacoDiffThemes.ts
deleted file mode 100644
index 4975b5dad3..0000000000
--- a/src/renderer/lib/monacoDiffThemes.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-import { loader } from '@monaco-editor/react';
-import { MONACO_DIFF_COLORS } from './monacoDiffColors';
-
-let themesRegistered = false;
-
-export async function registerDiffThemes(): Promise<void> {
-  if (themesRegistered) return;
-
-  const monacoInstance = await loader.init();
-
-  monacoInstance.editor.defineTheme('custom-diff-dark', {
-    base: 'vs-dark',
-    inherit: true,
-    rules: [],
-    colors: {
-      'editor.background': MONACO_DIFF_COLORS.dark.editorBackground,
-      'editorGutter.background': MONACO_DIFF_COLORS.dark.editorBackground,
-      'diffEditor.insertedTextBackground': MONACO_DIFF_COLORS.dark.insertedTextBackground,
-      'diffEditor.insertedLineBackground': MONACO_DIFF_COLORS.dark.insertedLineBackground,
-      'diffEditor.removedTextBackground': MONACO_DIFF_COLORS.dark.removedTextBackground,
-      'diffEditor.removedLineBackground': MONACO_DIFF_COLORS.dark.removedLineBackground,
-      'diffEditor.unchangedRegionBackground': '#1a2332',
-    },
-  });
-
-  monacoInstance.editor.defineTheme('custom-diff-black', {
-    base: 'vs-dark',
-    inherit: true,
-    rules: [],
-    colors: {
-      'editor.background': MONACO_DIFF_COLORS['dark-black'].editorBackground,
-      'editorGutter.background': MONACO_DIFF_COLORS['dark-black'].editorBackground,
-      'diffEditor.insertedTextBackground': MONACO_DIFF_COLORS['dark-black'].insertedTextBackground,
-      'diffEditor.insertedLineBackground': MONACO_DIFF_COLORS['dark-black'].insertedLineBackground,
-      'diffEditor.removedTextBackground': MONACO_DIFF_COLORS['dark-black'].removedTextBackground,
-      'diffEditor.removedLineBackground': MONACO_DIFF_COLORS['dark-black'].removedLineBackground,
-      'diffEditor.unchangedRegionBackground': '#0a0a0a',
-    },
-  });
-
-  monacoInstance.editor.defineTheme('custom-diff-light', {
-    base: 'vs',
-    inherit: true,
-    rules: [],
-    colors: {
-      'diffEditor.insertedTextBackground': MONACO_DIFF_COLORS.light.insertedTextBackground,
-      'diffEditor.insertedLineBackground': MONACO_DIFF_COLORS.light.insertedLineBackground,
-      'diffEditor.removedTextBackground': MONACO_DIFF_COLORS.light.removedTextBackground,
-      'diffEditor.removedLineBackground': MONACO_DIFF_COLORS.light.removedLineBackground,
-      'diffEditor.unchangedRegionBackground': '#e2e8f0',
-    },
-  });
-
-  themesRegistered = true;
-}
-
-export function getDiffThemeName(effectiveTheme: string): string {
-  if (effectiveTheme === 'dark-black') return 'custom-diff-black';
-  if (effectiveTheme === 'light') return 'custom-diff-light';
-  return 'custom-diff-dark';
-}
diff --git a/src/renderer/lib/persisted-layout.ts b/src/renderer/lib/persisted-layout.ts
deleted file mode 100644
index abb66a80c1..0000000000
--- a/src/renderer/lib/persisted-layout.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-const isNumberArray = (value: unknown): value is number[] =>
-  Array.isArray(value) && value.every((item) => typeof item === 'number' && Number.isFinite(item));
-
-export const loadPanelSizes = (storageKey: string, fallbackSizes: number[]): number[] => {
-  if (typeof window === 'undefined') {
-    return fallbackSizes;
-  }
-
-  try {
-    const storedValue = window.localStorage.getItem(storageKey);
-    if (!storedValue) {
-      return fallbackSizes;
-    }
-
-    const parsed = JSON.parse(storedValue);
-    return isNumberArray(parsed) ? parsed : fallbackSizes;
-  } catch (error) {
-    console.warn('Failed to load panel sizes from localStorage', error);
-    return fallbackSizes;
-  }
-};
-
-export const savePanelSizes = (storageKey: string, sizes: number[]): void => {
-  if (typeof window === 'undefined') {
-    return;
-  }
-
-  try {
-    window.localStorage.setItem(storageKey, JSON.stringify(sizes));
-  } catch (error) {
-    console.warn('Failed to save panel sizes to localStorage', error);
-  }
-};
diff --git a/src/renderer/lib/pr-cache-invalidation.ts b/src/renderer/lib/pr-cache-invalidation.ts
new file mode 100644
index 0000000000..13f3044759
--- /dev/null
+++ b/src/renderer/lib/pr-cache-invalidation.ts
@@ -0,0 +1,13 @@
+import { prSyncProgressChannel } from '@shared/events/prEvents';
+import { events } from '@renderer/lib/ipc';
+import { queryClient } from '@renderer/lib/query-client';
+
+export function wirePrCacheInvalidation(): void {
+  events.on(prSyncProgressChannel, (progress) => {
+    if (progress.status !== 'running' && progress.status !== 'done') return;
+    queryClient.invalidateQueries({
+      predicate: (query) =>
+        query.queryKey[0] === 'pull-requests' && query.queryKey[2] === progress.remoteUrl,
+    });
+  });
+}
diff --git a/src/renderer/lib/prCommentsStatus.ts b/src/renderer/lib/prCommentsStatus.ts
deleted file mode 100644
index 9478399633..0000000000
--- a/src/renderer/lib/prCommentsStatus.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-export interface PrCommentAuthor {
-  login: string;
-  avatarUrl?: string;
-}
-
-export interface PrComment {
-  id: string;
-  author: PrCommentAuthor;
-  body: string;
-  createdAt: string;
-  type: 'comment' | 'review';
-  reviewState?: 'APPROVED' | 'CHANGES_REQUESTED' | 'COMMENTED' | 'DISMISSED';
-}
-
-export interface PrCommentsStatus {
-  comments: PrComment[];
-}
-
-export function buildPrCommentsStatus(
-  rawComments: Array<{ id: string; author: PrCommentAuthor; body: string; createdAt: string }>,
-  rawReviews: Array<{
-    id: string;
-    author: PrCommentAuthor;
-    body: string;
-    submittedAt: string;
-    state: string;
-  }>
-): PrCommentsStatus {
-  const comments: PrComment[] = rawComments.map((c) => ({
-    id: c.id,
-    author: c.author,
-    body: c.body,
-    createdAt: c.createdAt,
-    type: 'comment',
-  }));
-
-  const reviews: PrComment[] = rawReviews
-    .filter((r) => r.body || r.state === 'APPROVED' || r.state === 'CHANGES_REQUESTED')
-    .map((r) => ({
-      id: r.id,
-      author: r.author,
-      body: r.body,
-      createdAt: r.submittedAt,
-      type: 'review',
-      reviewState: r.state as PrComment['reviewState'],
-    }));
-
-  const all = [...comments, ...reviews].sort(
-    (a, b) => new Date(a.createdAt).getTime() - new Date(b.createdAt).getTime()
-  );
-
-  return { comments: all };
-}
-
-export function formatRelativeTime(dateStr: string): string {
-  const now = Date.now();
-  const date = new Date(dateStr).getTime();
-  if (isNaN(date)) return '';
-  const diffMs = now - date;
-  if (diffMs < 0) return 'just now';
-
-  const seconds = Math.floor(diffMs / 1000);
-  if (seconds < 60) return 'just now';
-  const minutes = Math.floor(seconds / 60);
-  if (minutes < 60) return `${minutes}m ago`;
-  const hours = Math.floor(minutes / 60);
-  if (hours < 24) return `${hours}h ago`;
-  const days = Math.floor(hours / 24);
-  if (days < 30) return `${days}d ago`;
-  const months = Math.floor(days / 30);
-  return `${months}mo ago`;
-}
diff --git a/src/renderer/lib/prCommentsStore.ts b/src/renderer/lib/prCommentsStore.ts
deleted file mode 100644
index e673fdd9b1..0000000000
--- a/src/renderer/lib/prCommentsStore.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-import type { PrCommentsStatus } from './prCommentsStatus';
-import { buildPrCommentsStatus } from './prCommentsStatus';
-
-type Listener = (status: PrCommentsStatus | null) => void;
-
-const cache = new Map<string, PrCommentsStatus | null>();
-const listeners = new Map<string, Set<Listener>>();
-const pending = new Map<string, Promise<PrCommentsStatus | null>>();
-const prNumbers = new Map<string, number>();
-
-async function fetchPrComments(taskPath: string): Promise<PrCommentsStatus | null> {
-  try {
-    const prNumber = prNumbers.get(taskPath);
-    const res = await window.electronAPI.getPrComments({ taskPath, prNumber });
-    if (res?.success) {
-      return buildPrCommentsStatus(res.comments || [], res.reviews || []);
-    }
-    return null;
-  } catch {
-    return null;
-  }
-}
-
-export async function refreshPrComments(taskPath: string): Promise<PrCommentsStatus | null> {
-  const inFlight = pending.get(taskPath);
-  if (inFlight) return inFlight;
-
-  const promise = fetchPrComments(taskPath);
-  pending.set(taskPath, promise);
-
-  try {
-    const status = await promise;
-    cache.set(taskPath, status);
-
-    const taskListeners = listeners.get(taskPath);
-    if (taskListeners) {
-      for (const listener of taskListeners) {
-        try {
-          listener(status);
-        } catch {}
-      }
-    }
-
-    return status;
-  } finally {
-    pending.delete(taskPath);
-  }
-}
-
-export function subscribeToPrComments(
-  taskPath: string,
-  prNumber: number | undefined,
-  listener: Listener
-): () => void {
-  const prevPrNumber = prNumbers.get(taskPath);
-  if (prNumber) {
-    prNumbers.set(taskPath, prNumber);
-  }
-  if (prNumber && prevPrNumber && prevPrNumber !== prNumber) {
-    cache.delete(taskPath);
-  }
-
-  const set = listeners.get(taskPath) || new Set<Listener>();
-  set.add(listener);
-  listeners.set(taskPath, set);
-
-  const cached = cache.get(taskPath);
-  if (cached !== undefined) {
-    try {
-      listener(cached);
-    } catch {}
-  }
-
-  if (!cache.has(taskPath) && !pending.has(taskPath)) {
-    refreshPrComments(taskPath);
-  }
-
-  return () => {
-    const taskListeners = listeners.get(taskPath);
-    if (taskListeners) {
-      taskListeners.delete(listener);
-      if (taskListeners.size === 0) {
-        listeners.delete(taskPath);
-        cache.delete(taskPath);
-        prNumbers.delete(taskPath);
-      }
-    }
-  };
-}
diff --git a/src/renderer/lib/prStatus.ts b/src/renderer/lib/prStatus.ts
deleted file mode 100644
index f21d3a9eda..0000000000
--- a/src/renderer/lib/prStatus.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-export type PrInfo = {
-  number?: number;
-  title?: string;
-  url?: string;
-  state?: string | null;
-  isDraft?: boolean;
-};
-
-export type PrStatus = PrInfo & {
-  mergeStateStatus?: string;
-  headRefName?: string;
-  baseRefName?: string;
-  additions?: number;
-  deletions?: number;
-  changedFiles?: number;
-};
-
-export const isActivePr = (pr?: PrInfo | null): pr is PrInfo => {
-  if (!pr) return false;
-  const state = typeof pr?.state === 'string' ? pr.state.toLowerCase() : '';
-  if (state === 'merged' || state === 'closed') return false;
-  return true;
-};
diff --git a/src/renderer/lib/prStatusStore.ts b/src/renderer/lib/prStatusStore.ts
deleted file mode 100644
index 388bd9c8c6..0000000000
--- a/src/renderer/lib/prStatusStore.ts
+++ /dev/null
@@ -1,98 +0,0 @@
-import type { PrStatus } from './prStatus';
-
-type Listener = (pr: PrStatus | null, isLoading: boolean) => void;
-
-const cache = new Map<string, PrStatus | null>();
-const listeners = new Map<string, Set<Listener>>();
-const pending = new Map<string, Promise<PrStatus | null>>();
-
-async function fetchPrStatus(taskPath: string): Promise<PrStatus | null> {
-  try {
-    const res = await window.electronAPI.getPrStatus({ taskPath });
-    if (res?.success && res.pr) {
-      return res.pr as PrStatus;
-    }
-    return null;
-  } catch (error) {
-    return null;
-  }
-}
-
-function notifyListeners(taskPath: string, pr: PrStatus | null, isLoading: boolean) {
-  const taskListeners = listeners.get(taskPath);
-  if (taskListeners) {
-    for (const listener of taskListeners) {
-      try {
-        listener(pr, isLoading);
-      } catch {}
-    }
-  }
-}
-
-export async function refreshPrStatus(taskPath: string): Promise<PrStatus | null> {
-  // Deduplicate concurrent requests
-  const inFlight = pending.get(taskPath);
-  if (inFlight) return inFlight;
-
-  // Verify we actually need to change state before notifying
-  const cached = cache.get(taskPath);
-  notifyListeners(taskPath, cached ?? null, !cache.has(taskPath));
-
-  const promise = fetchPrStatus(taskPath);
-  pending.set(taskPath, promise);
-
-  try {
-    const pr = await promise;
-    cache.set(taskPath, pr);
-    notifyListeners(taskPath, pr, false);
-    return pr;
-  } finally {
-    pending.delete(taskPath);
-  }
-}
-
-/**
- * Refresh PR status for all currently subscribed task paths.
- * Used on window focus to update all visible PR buttons.
- */
-export async function refreshAllSubscribedPrStatus(): Promise<void> {
-  const paths = Array.from(listeners.keys());
-  await Promise.all(paths.map(refreshPrStatus));
-}
-
-export function subscribeToPrStatus(taskPath: string, listener: Listener): () => void {
-  const set = listeners.get(taskPath) || new Set<Listener>();
-  set.add(listener);
-  listeners.set(taskPath, set);
-
-  // Emit current cached value if available
-  const cached = cache.get(taskPath);
-  const isPending = pending.has(taskPath);
-
-  if (cached !== undefined) {
-    try {
-      listener(cached, false);
-    } catch {}
-  } else if (isPending) {
-    // If pending but no cache (first load), emit undefined pr with loading=true
-    try {
-      listener(null, true);
-    } catch {}
-  }
-
-  // Trigger fetch if not cached and not pending
-  if (!cache.has(taskPath) && !pending.has(taskPath)) {
-    refreshPrStatus(taskPath);
-  }
-
-  return () => {
-    const taskListeners = listeners.get(taskPath);
-    if (taskListeners) {
-      taskListeners.delete(listener);
-      if (taskListeners.size === 0) {
-        listeners.delete(taskPath);
-        cache.delete(taskPath); // Clear cache when no subscribers
-      }
-    }
-  };
-}
diff --git a/src/renderer/lib/previewNetwork.ts b/src/renderer/lib/previewNetwork.ts
deleted file mode 100644
index 0f9cf4cccc..0000000000
--- a/src/renderer/lib/previewNetwork.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-export const PROBE_TIMEOUT_MS = 900;
-export const SPINNER_MAX_MS = 30000;
-export const FALLBACK_DELAY_MS = 5000;
-
-export async function isReachable(
-  url?: string | null,
-  timeoutMs: number = PROBE_TIMEOUT_MS
-): Promise<boolean> {
-  const u = (url || '').trim();
-  if (!u) return false;
-  const c = new AbortController();
-  const t = setTimeout(() => c.abort(), timeoutMs);
-  try {
-    await fetch(u, { method: 'GET', mode: 'no-cors', signal: c.signal });
-    clearTimeout(t);
-    return true;
-  } catch {
-    clearTimeout(t);
-    return false;
-  }
-}
-
-export function isAppPort(url: string, appPort: number): boolean {
-  try {
-    const p = Number(new URL(url).port || 0);
-    return appPort !== 0 && p === appPort;
-  } catch {
-    return false;
-  }
-}
diff --git a/src/renderer/lib/previewStorage.ts b/src/renderer/lib/previewStorage.ts
deleted file mode 100644
index 652aa40251..0000000000
--- a/src/renderer/lib/previewStorage.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-export const LAST_URL_KEY = (id: string) => `emdash:browser:lastUrl:${id}`;
-export const RUNNING_KEY = (id: string) => `emdash:preview:running:${id}`;
-export const INSTALLED_KEY = (id: string) => `emdash:preview:installed:${id}`;
-
-export function getLastUrl(id: string): string | null {
-  try {
-    return localStorage.getItem(LAST_URL_KEY(id));
-  } catch {
-    return null;
-  }
-}
-export function setLastUrl(id: string, url: string): void {
-  try {
-    localStorage.setItem(LAST_URL_KEY(id), url);
-  } catch {}
-}
-export function isRunning(id: string): boolean {
-  try {
-    return localStorage.getItem(RUNNING_KEY(id)) === '1';
-  } catch {
-    return false;
-  }
-}
-export function setRunning(id: string, on: boolean): void {
-  try {
-    if (on) localStorage.setItem(RUNNING_KEY(id), '1');
-    else localStorage.removeItem(RUNNING_KEY(id));
-  } catch {}
-}
-export function isInstalled(id: string): boolean {
-  try {
-    return localStorage.getItem(INSTALLED_KEY(id)) === '1';
-  } catch {
-    return false;
-  }
-}
-export function setInstalled(id: string, on: boolean): void {
-  try {
-    if (on) localStorage.setItem(INSTALLED_KEY(id), '1');
-    else localStorage.removeItem(INSTALLED_KEY(id));
-  } catch {}
-}
-export function clear(id: string): void {
-  try {
-    localStorage.removeItem(LAST_URL_KEY(id));
-    localStorage.removeItem(RUNNING_KEY(id));
-    localStorage.removeItem(INSTALLED_KEY(id));
-  } catch {}
-}
diff --git a/src/renderer/lib/probePreview.ts b/src/renderer/lib/probePreview.ts
deleted file mode 100644
index eb2e9d1f3a..0000000000
--- a/src/renderer/lib/probePreview.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-export async function probeLocalUrls(
-  candidates: string[],
-  perProbeMs = 900,
-  totalBudgetMs = 6000,
-  excludePorts: number[] = []
-): Promise<string | null> {
-  const start = Date.now();
-  const excluded = new Set(excludePorts.map((n) => Number(n)).filter((n) => Number.isFinite(n)));
-  const tryUrl = async (u: string): Promise<boolean> => {
-    const c = new AbortController();
-    const t = setTimeout(() => c.abort(), perProbeMs);
-    try {
-      const res = await fetch(u, { method: 'GET', mode: 'no-cors', signal: c.signal });
-      // mode: 'no-cors' will resolve regardless of CORS; if it resolves, the server is there.
-      clearTimeout(t);
-      return true;
-    } catch {
-      clearTimeout(t);
-      return false;
-    }
-  };
-  const tried = new Set<string>();
-  while (Date.now() - start < totalBudgetMs) {
-    for (const u of candidates) {
-      try {
-        const portStr = new URL(u).port;
-        const port = Number(portStr || 0);
-        if (excluded.has(port)) continue;
-      } catch {}
-      if (tried.has(u)) continue;
-      tried.add(u);
-      if (await tryUrl(u)) return u;
-    }
-    await new Promise((r) => setTimeout(r, 250));
-  }
-  return null;
-}
diff --git a/src/renderer/lib/projectUtils.ts b/src/renderer/lib/projectUtils.ts
deleted file mode 100644
index 6b2ed48811..0000000000
--- a/src/renderer/lib/projectUtils.ts
+++ /dev/null
@@ -1,127 +0,0 @@
-import type { Project } from '../types/app';
-
-/**
- * Normalizes file paths for cross-platform comparison.
- * On Windows, paths are case-insensitive. On Unix, they are case-sensitive.
- */
-export function normalizePathForComparison(
-  input: string | null | undefined,
-  platform?: string
-): string {
-  if (!input) return '';
-
-  let normalized = input.replace(/\\/g, '/');
-  normalized = normalized.replace(/\/+/g, '/');
-
-  if (normalized.length > 1 && normalized.endsWith('/')) {
-    normalized = normalized.replace(/\/+$/, '');
-  }
-
-  const platformKey =
-    platform && platform.length > 0
-      ? platform
-      : typeof process !== 'undefined'
-        ? process.platform
-        : '';
-  return platformKey.toLowerCase().startsWith('win') ? normalized.toLowerCase() : normalized;
-}
-
-/**
- * Computes the base ref for a git repository.
- * Priority: baseRef > branch > default to origin/main (or just 'main' if no remote)
- *
- * When a value doesn't contain a '/', it's assumed to be a branch name and will be
- * prefixed with the remote name (unless remote is empty, indicating local-only repo)
- */
-export function computeBaseRef(
-  baseRef?: string | null,
-  remote?: string | null,
-  branch?: string | null
-): string {
-  const remoteName = (() => {
-    const trimmed = (remote ?? '').trim();
-    if (!trimmed) return ''; // Empty string indicates no remote
-    if (/^[A-Za-z0-9._-]+$/.test(trimmed) && !trimmed.includes('://')) return trimmed;
-    return 'origin';
-  })();
-
-  const normalize = (value?: string | null): string | undefined => {
-    if (!value) return undefined;
-    const trimmed = value.trim();
-    if (!trimmed || trimmed.includes('://')) return undefined;
-
-    // If already contains '/', use as-is (e.g., "origin/main" or "main/feature")
-    if (trimmed.includes('/')) {
-      const [head, ...rest] = trimmed.split('/');
-      const branchPart = rest.join('/').replace(/^\/+/, '');
-      if (head && branchPart) return `${head}/${branchPart}`;
-      if (!head && branchPart) {
-        // Leading slash - prepend remote if available
-        return remoteName ? `${remoteName}/${branchPart}` : branchPart;
-      }
-      return undefined;
-    }
-
-    // Plain branch name - prepend remote only if one exists
-    const suffix = trimmed.startsWith('/') ? trimmed.slice(1) : trimmed;
-    return remoteName ? `${remoteName}/${suffix}` : suffix;
-  };
-
-  // Default: use origin/main if remote exists, otherwise just 'main'
-  const defaultBranch = remoteName ? `${remoteName}/main` : 'main';
-  return normalize(baseRef) ?? normalize(branch) ?? defaultBranch;
-}
-
-/**
- * Gets the unique repository key for a project.
- * Uses the explicit repoKey if available, otherwise normalizes the path.
- */
-export function getProjectRepoKey(
-  project: Pick<Project, 'path' | 'repoKey'>,
-  platform?: string
-): string {
-  return project.repoKey ?? normalizePathForComparison(project.path, platform);
-}
-
-/**
- * Returns a project with a computed repoKey if it doesn't already have one.
- * This ensures all projects have a consistent unique identifier.
- */
-export function withRepoKey(project: Project, platform?: string): Project {
-  const repoKey = getProjectRepoKey(project, platform);
-  if (project.repoKey === repoKey) {
-    return project;
-  }
-  return { ...project, repoKey };
-}
-
-/**
- * Determines the GitHub connection info for a project being added.
- * Returns connected: true only when the user is authenticated, the remote
- * is a GitHub URL, and connectToGitHub succeeds. Otherwise falls through
- * to a disconnected local result so the project is never blocked from
- * being added.
- */
-export async function resolveProjectGithubInfo(
-  projectPath: string,
-  remoteUrl: string,
-  isAuthenticated: boolean,
-  connectToGitHub: (
-    path: string
-  ) => Promise<{ success: boolean; repository?: string; error?: string }>
-): Promise<{ connected: boolean; repository: string; source: 'github' | 'local' }> {
-  const isGithubRemote = /github\.com[:/]/i.test(remoteUrl);
-
-  if (isAuthenticated && isGithubRemote) {
-    try {
-      const result = await connectToGitHub(projectPath);
-      if (result.success) {
-        return { connected: true, repository: result.repository || '', source: 'github' };
-      }
-    } catch {
-      // Fall through — never block the project from being added.
-    }
-  }
-
-  return { connected: false, repository: '', source: 'local' };
-}
diff --git a/src/renderer/lib/providers/github-context-provider.tsx b/src/renderer/lib/providers/github-context-provider.tsx
new file mode 100644
index 0000000000..d638b6c0e2
--- /dev/null
+++ b/src/renderer/lib/providers/github-context-provider.tsx
@@ -0,0 +1,256 @@
+import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
+import React, { createContext, useCallback, useContext, useEffect, useRef, useState } from 'react';
+import {
+  githubAuthErrorChannel,
+  githubAuthSuccessChannel,
+  githubAuthUserUpdatedChannel,
+} from '@shared/events/githubEvents';
+import type {
+  GitHubAuthResponse,
+  GitHubStatusResponse,
+  GitHubTokenSource,
+  GitHubUser,
+} from '@shared/github';
+import { events, rpc } from '@renderer/lib/ipc';
+import { log } from '@renderer/utils/logger';
+import { useToast } from '../hooks/use-toast';
+import { useAccountSession, useFetchAccountHealth } from '../hooks/useAccount';
+import { useModalContext } from '../modal/modal-provider';
+
+type GithubContextValue = {
+  authenticated: boolean;
+  user: GitHubUser | null;
+  tokenSource: GitHubTokenSource;
+  isLoading: boolean;
+  isInitialized: boolean;
+  githubLoading: boolean;
+  githubStatusMessage: string | undefined;
+  needsGhAuth: boolean;
+  handleGithubConnect: () => Promise<void>;
+  cancelGithubConnect: () => void;
+  login: () => Promise<GitHubAuthResponse>;
+  logout: () => Promise<void>;
+  checkStatus: () => Promise<GitHubStatusResponse>;
+};
+
+const GITHUB_STATUS_KEY = ['github:status'] as const;
+const ISSUE_CONNECTION_STATUS_QUERY_KEY = ['issues:connection-status'] as const;
+
+const GithubContext = createContext<GithubContextValue | null>(null);
+
+export function GithubContextProvider({ children }: { children: React.ReactNode }) {
+  const { toast } = useToast();
+  const queryClient = useQueryClient();
+  const { showModal } = useModalContext();
+  const { data: accountSession } = useAccountSession();
+  const hasAccount = accountSession?.hasAccount === true;
+  const fetchAccountHealth = useFetchAccountHealth();
+
+  const [githubLoading, setGithubLoading] = useState(false);
+  const [githubStatusMessage, setGithubStatusMessage] = useState<string | undefined>();
+
+  const {
+    data: statusData,
+    isFetching,
+    isSuccess,
+  } = useQuery<GitHubStatusResponse>({
+    queryKey: GITHUB_STATUS_KEY,
+    queryFn: () => rpc.github.getStatus(),
+    staleTime: 30_000,
+    refetchOnWindowFocus: true,
+  });
+
+  const authenticated = statusData?.authenticated ?? false;
+  const user: GitHubUser | null = statusData?.user ?? null;
+  const tokenSource: GitHubTokenSource = statusData?.tokenSource ?? null;
+  const isInitialized = isSuccess;
+
+  const needsGhAuth = isInitialized && !authenticated;
+
+  const prevAuthenticatedRef = useRef<boolean | undefined>(undefined);
+  useEffect(() => {
+    if (!isInitialized) return;
+    if (prevAuthenticatedRef.current === authenticated) return;
+    prevAuthenticatedRef.current = authenticated;
+    log.info('[GithubContext] auth state changed', {
+      authenticated,
+      user: user?.login ?? null,
+      tokenSource,
+    });
+  }, [authenticated, isInitialized, tokenSource, user]);
+
+  const loginMutation = useMutation({
+    mutationFn: () => rpc.github.auth(),
+  });
+
+  const logoutMutation = useMutation({
+    mutationFn: () => rpc.github.logout(),
+    onSettled: () => {
+      void queryClient.invalidateQueries({ queryKey: GITHUB_STATUS_KEY });
+      void queryClient.invalidateQueries({ queryKey: ISSUE_CONNECTION_STATUS_QUERY_KEY });
+    },
+  });
+
+  const isLoading = isFetching || loginMutation.isPending || logoutMutation.isPending;
+
+  const checkStatus = useCallback(async () => {
+    return queryClient.fetchQuery<GitHubStatusResponse>({
+      queryKey: GITHUB_STATUS_KEY,
+      queryFn: () => rpc.github.getStatus(),
+      staleTime: 0,
+    });
+  }, [queryClient]);
+
+  const login = useCallback(() => loginMutation.mutateAsync(), [loginMutation]);
+
+  const logout = useCallback(async () => {
+    await logoutMutation.mutateAsync();
+  }, [logoutMutation]);
+
+  const handleDeviceFlowSuccess = useCallback(
+    async (flowUser: GitHubUser) => {
+      log.info('[GithubContext] auth success via device flow', { user: flowUser?.login });
+      void checkStatus();
+      setTimeout(() => void checkStatus(), 500);
+      void queryClient.invalidateQueries({ queryKey: ISSUE_CONNECTION_STATUS_QUERY_KEY });
+      toast({
+        title: 'Connected to GitHub',
+        description: `Signed in as ${flowUser?.login || flowUser?.name || 'user'}`,
+      });
+    },
+    [checkStatus, queryClient, toast]
+  );
+
+  const handleDeviceFlowError = useCallback(
+    (error: string) => {
+      toast({
+        title: 'Authentication Failed',
+        description: error,
+        variant: 'destructive',
+      });
+    },
+    [toast]
+  );
+
+  // Subscribe to GitHub auth IPC events from the main process
+  useEffect(() => {
+    const cleanupSuccess = events.on(githubAuthSuccessChannel, (data) => {
+      log.info('[GithubContext] received githubAuthSuccessChannel event', {
+        user: data.user?.login,
+      });
+      void handleDeviceFlowSuccess(data.user);
+    });
+    const cleanupError = events.on(githubAuthErrorChannel, (data) => {
+      log.info('[GithubContext] received githubAuthErrorChannel event', {
+        message: data.message || data.error,
+      });
+      handleDeviceFlowError(data.message || data.error);
+    });
+    const cleanupUserUpdated = events.on(githubAuthUserUpdatedChannel, () => {
+      log.info('[GithubContext] received githubAuthUserUpdatedChannel event');
+      void checkStatus();
+    });
+
+    return () => {
+      cleanupSuccess();
+      cleanupError();
+      cleanupUserUpdated();
+    };
+  }, [handleDeviceFlowSuccess, handleDeviceFlowError, checkStatus]);
+
+  const handleGithubConnect = useCallback(async () => {
+    setGithubLoading(true);
+    setGithubStatusMessage(undefined);
+
+    try {
+      const freshStatus = await checkStatus();
+      if (freshStatus?.authenticated) {
+        setGithubLoading(false);
+        setGithubStatusMessage(undefined);
+        return;
+      }
+
+      const isServerUp = hasAccount && (await fetchAccountHealth());
+      if (hasAccount && isServerUp) {
+        setGithubStatusMessage('Connecting via Emdash account...');
+        const oauthResult = await rpc.github.connectOAuth();
+        if (oauthResult?.success) {
+          await checkStatus();
+          void queryClient.invalidateQueries({ queryKey: ISSUE_CONNECTION_STATUS_QUERY_KEY });
+          if (oauthResult.user) {
+            toast({
+              title: 'Connected to GitHub',
+              description: `Signed in as ${oauthResult.user.login || oauthResult.user.name || 'user'}`,
+            });
+          }
+          setGithubLoading(false);
+          setGithubStatusMessage(undefined);
+          return;
+        }
+      }
+
+      setGithubLoading(false);
+      setGithubStatusMessage(undefined);
+
+      showModal('githubDeviceFlowModal', {
+        onError: handleDeviceFlowError,
+      });
+      void login();
+    } catch (error) {
+      log.error('GitHub connection error:', error);
+      setGithubLoading(false);
+      setGithubStatusMessage(undefined);
+      toast({
+        title: 'Connection Failed',
+        description: 'Failed to connect to GitHub. Please try again.',
+        variant: 'destructive',
+      });
+    }
+  }, [
+    toast,
+    checkStatus,
+    login,
+    showModal,
+    handleDeviceFlowError,
+    hasAccount,
+    fetchAccountHealth,
+    queryClient,
+  ]);
+
+  const cancelGithubConnect = useCallback(() => {
+    const flowLabel = githubStatusMessage ? 'OAuth flow' : 'Device flow';
+    setGithubLoading(false);
+    setGithubStatusMessage(undefined);
+    rpc.github.authCancel();
+    toast({
+      title: 'GitHub connection unsuccessful',
+      description: `${flowLabel} was canceled`,
+    });
+  }, [githubStatusMessage, toast]);
+
+  const value: GithubContextValue = {
+    authenticated,
+    user,
+    tokenSource,
+    isLoading,
+    isInitialized,
+    githubLoading,
+    githubStatusMessage,
+    needsGhAuth,
+    handleGithubConnect,
+    cancelGithubConnect,
+    login,
+    logout,
+    checkStatus,
+  };
+
+  return <GithubContext.Provider value={value}>{children}</GithubContext.Provider>;
+}
+
+export function useGithubContext() {
+  const ctx = useContext(GithubContext);
+  if (!ctx) {
+    throw new Error('useGithubContext must be used inside GithubContextProvider');
+  }
+  return ctx;
+}
diff --git a/src/renderer/lib/providers/meta.ts b/src/renderer/lib/providers/meta.ts
new file mode 100644
index 0000000000..096af94c09
--- /dev/null
+++ b/src/renderer/lib/providers/meta.ts
@@ -0,0 +1,88 @@
+import ampcodeIcon from '@/assets/images/ampcode.png';
+import atlassianIcon from '@/assets/images/atlassian.png';
+import augmentcodeIcon from '@/assets/images/Auggie.svg?raw';
+import autohandIcon from '@/assets/images/autohand.svg?raw';
+import charmIcon from '@/assets/images/charm.png';
+import claudeIcon from '@/assets/images/claude.png';
+import clineIcon from '@/assets/images/cline.png';
+import codebuffIcon from '@/assets/images/codebuff.png';
+import continueIcon from '@/assets/images/continue.png';
+import cursorlogoIcon from '@/assets/images/cursor.svg?raw';
+import factorydroidIcon from '@/assets/images/droid.svg?raw';
+import geminiIcon from '@/assets/images/gemini.png';
+import ghcopilotIcon from '@/assets/images/gh-copilot.svg?raw';
+import gooseIcon from '@/assets/images/goose.png';
+import kilocodeIcon from '@/assets/images/kilocode.png';
+import kimiIcon from '@/assets/images/kimi.png';
+import kiroIcon from '@/assets/images/kiro.png';
+import mistralIcon from '@/assets/images/mistral.png';
+import openaiIcon from '@/assets/images/openai.svg?raw';
+import opencodeIcon from '@/assets/images/opencode.png';
+import piIcon from '@/assets/images/pi.png';
+import qwenIcon from '@/assets/images/qwen.png';
+import { AGENT_PROVIDERS, type AgentProviderId } from '@shared/agent-provider-registry';
+
+export type UiAgent = AgentProviderId;
+
+const ICONS: Record<string, string> = {
+  'Auggie.svg': augmentcodeIcon,
+  'qwen.png': qwenIcon,
+  'charm.png': charmIcon,
+  'opencode.png': opencodeIcon,
+  'ampcode.png': ampcodeIcon,
+  'openai.svg': openaiIcon,
+  'claude.png': claudeIcon,
+  'droid.svg': factorydroidIcon,
+  'gemini.png': geminiIcon,
+  'cursor.svg': cursorlogoIcon,
+  'gh-copilot.svg': ghcopilotIcon,
+  'goose.png': gooseIcon,
+  'kimi.png': kimiIcon,
+  'kilocode.png': kilocodeIcon,
+  'kiro.png': kiroIcon,
+  'atlassian.png': atlassianIcon,
+  'cline.png': clineIcon,
+  'continue.png': continueIcon,
+  'codebuff.png': codebuffIcon,
+  'mistral.png': mistralIcon,
+  'pi.png': piIcon,
+  'autohand.svg': autohandIcon,
+};
+
+export type AgentMeta = {
+  label: string;
+  icon?: string;
+  /** True when the icon is a raw SVG string rather than an image URL. */
+  isSvg?: boolean;
+  /** When true, the icon should be colour-inverted in dark mode. */
+  invertInDark?: boolean;
+  /** Accessible alt text for the provider logo. */
+  alt?: string;
+  terminalOnly: boolean;
+  cli?: string;
+  planActivate?: string;
+  autoStartCommand?: string;
+  autoApproveFlag?: string;
+  initialPromptFlag?: string;
+  useKeystrokeInjection?: boolean;
+};
+
+export const agentMeta: Record<UiAgent, AgentMeta> = Object.fromEntries(
+  AGENT_PROVIDERS.map((p) => [
+    p.id,
+    {
+      label: p.name,
+      icon: p.icon ? ICONS[p.icon] : undefined,
+      isSvg: p.icon ? p.icon.endsWith('.svg') : undefined,
+      invertInDark: p.invertInDark,
+      alt: p.alt,
+      terminalOnly: p.terminalOnly ?? true,
+      cli: p.cli,
+      planActivate: p.planActivateCommand,
+      autoStartCommand: p.autoStartCommand,
+      autoApproveFlag: p.autoApproveFlag,
+      initialPromptFlag: p.initialPromptFlag,
+      useKeystrokeInjection: p.useKeystrokeInjection,
+    },
+  ])
+) as Record<UiAgent, AgentMeta>;
diff --git a/src/renderer/lib/providers/theme-provider.tsx b/src/renderer/lib/providers/theme-provider.tsx
new file mode 100644
index 0000000000..ab9fe8f40b
--- /dev/null
+++ b/src/renderer/lib/providers/theme-provider.tsx
@@ -0,0 +1,81 @@
+import { createContext, useEffect, useLayoutEffect, type ReactNode } from 'react';
+import type { Theme } from '@shared/app-settings';
+import { useAppSettingsKey } from '@renderer/features/settings/use-app-settings-key';
+import { useLocalStorage } from '@renderer/lib/hooks/useLocalStorage';
+import { applyThemeToAll } from '@renderer/lib/pty/pty';
+
+type EffectiveTheme = 'emlight' | 'emdark';
+
+function getSystemTheme(): EffectiveTheme {
+  if (typeof window === 'undefined') return 'emlight';
+  return window.matchMedia('(prefers-color-scheme: dark)').matches ? 'emdark' : 'emlight';
+}
+
+function applyTheme(effective: EffectiveTheme) {
+  if (typeof document === 'undefined') return;
+  const root = document.documentElement;
+  root.classList.remove('emlight', 'emdark');
+  root.classList.add(effective);
+}
+
+interface ThemeContextType {
+  theme: Theme;
+  setTheme: (theme: Theme) => void;
+  toggleTheme: () => void;
+  effectiveTheme: EffectiveTheme;
+}
+
+export const ThemeContext = createContext<ThemeContextType | undefined>(undefined);
+
+export function ThemeProvider({ children }: { children: ReactNode }) {
+  const { value: themeValue, isLoading, update } = useAppSettingsKey('theme');
+  const [, setCachedTheme] = useLocalStorage<Theme>('emdash-theme', null);
+
+  const theme: Theme = themeValue ?? null;
+  const effectiveTheme: EffectiveTheme = theme ?? getSystemTheme();
+
+  useLayoutEffect(() => {
+    if (isLoading) return;
+    applyTheme(effectiveTheme);
+  }, [effectiveTheme, isLoading]);
+
+  useEffect(() => {
+    if (isLoading) return;
+    setCachedTheme(theme);
+  }, [theme, isLoading, setCachedTheme]);
+
+  // Subscribe to system color scheme changes when no explicit preference is set.
+  useEffect(() => {
+    if (theme !== null) return;
+
+    const mq = window.matchMedia('(prefers-color-scheme: dark)');
+    const handler = () => {
+      if (isLoading) return;
+      const newEffective = mq.matches ? 'emdark' : 'emlight';
+      applyTheme(newEffective);
+      applyThemeToAll();
+    };
+    mq.addEventListener('change', handler);
+    return () => mq.removeEventListener('change', handler);
+  }, [theme, isLoading]);
+
+  // Re-apply xterm theme after CSS classes have been updated by the effect above.
+  useEffect(() => {
+    applyThemeToAll();
+  }, [effectiveTheme]);
+
+  const setTheme = (newTheme: Theme) => {
+    update(newTheme);
+  };
+
+  const toggleTheme = () => {
+    const next = effectiveTheme === 'emlight' ? 'emdark' : 'emlight';
+    setTheme(next);
+  };
+
+  return (
+    <ThemeContext.Provider value={{ theme, setTheme, toggleTheme, effectiveTheme }}>
+      {children}
+    </ThemeContext.Provider>
+  );
+}
diff --git a/src/renderer/lib/pty/pane-sizing-context.tsx b/src/renderer/lib/pty/pane-sizing-context.tsx
new file mode 100644
index 0000000000..6d58c002a2
--- /dev/null
+++ b/src/renderer/lib/pty/pane-sizing-context.tsx
@@ -0,0 +1,200 @@
+/**
+ * PaneSizingContext — owns PTY resize for every session that belongs to a pane.
+ *
+ * The active TerminalPane calls reportDimensions(cols, rows) whenever its
+ * terminal resizes.  The provider then forwards that resize to ALL registered
+ * sessions (active + background), so background agents always have the correct
+ * terminal width even when they are off-screen.
+ *
+ * Each provider renders a wrapper <div> that fills its parent and registers
+ * itself in the module-level paneRegistry under its paneId.  This lets any
+ * code outside the React tree (e.g. hover pre-warm, cross-pane coordination)
+ * call getPaneContainer(paneId) to measure the pane's pixel dimensions without
+ * needing a mounted terminal.
+ *
+ * Usage:
+ *   <PaneSizingProvider paneId="conversations" sessionIds={allConversationSessionIds}>
+ *     ...
+ *     <TerminalPane sessionId={activeSessionId} />
+ *   </PaneSizingProvider>
+ *
+ * For split panes (e.g. conversation pane + right-panel terminal pane), each
+ * pane gets its own <PaneSizingProvider> with a distinct paneId.  No other
+ * changes required.
+ */
+
+import {
+  createContext,
+  ReactNode,
+  useCallback,
+  useContext,
+  useEffect,
+  useMemo,
+  useRef,
+} from 'react';
+import { rpc } from '@renderer/lib/ipc';
+import { measureDimensions, type TerminalDimensions } from './pty-dimensions';
+
+const PTY_RESIZE_DEBOUNCE_MS = 60;
+const MIN_TERMINAL_COLS = 2;
+const MIN_TERMINAL_ROWS = 1;
+
+// ── Module-level pane registry ────────────────────────────────────────────────
+// Maps paneId → the provider's container HTMLDivElement.  Survives renders and
+// is accessible from anywhere in the renderer process (e.g. sidebar hover
+// handlers, cross-pane coordinators).
+const paneRegistry = new Map<string, HTMLDivElement>();
+
+/**
+ * Returns the container element for the given pane, or null if the pane is not
+ * currently mounted.  Use this to measure pane pixel dimensions from outside
+ * the React tree.
+ */
+export function getPaneContainer(paneId: string): HTMLDivElement | null {
+  return paneRegistry.get(paneId) ?? null;
+}
+
+// ── Context interface ─────────────────────────────────────────────────────────
+
+export interface PaneSizingContextValue {
+  /**
+   * Called by the active terminal after every resize.  Broadcasts the
+   * dimensions to all registered sessions (active + background) after a short
+   * debounce.
+   */
+  reportDimensions: (cols: number, rows: number) => void;
+  /**
+   * Returns the last dimensions reported to this pane, or null if no terminal
+   * has reported dimensions yet.  Used as a fallback when cell metrics are
+   * unavailable (very first mount).
+   */
+  getCurrentDimensions: () => { cols: number; rows: number } | null;
+  /**
+   * Ref to the provider's own wrapper div.  Always reflects the pane's current
+   * pixel size; suitable as the container argument to measureDimensions().
+   */
+  containerRef: React.RefObject<HTMLDivElement | null>;
+  /**
+   * Measures the pane container using the provided cell metrics and returns
+   * cols/rows, or null if the container is not yet sized.  More accurate than
+   * getCurrentDimensions() when cell metrics are available because it reads the
+   * live DOM instead of a cached value.
+   */
+  measureCurrentDimensions: (cellWidth: number, cellHeight: number) => TerminalDimensions | null;
+}
+
+const PaneSizingContext = createContext<PaneSizingContextValue | null>(null);
+
+/**
+ * Returns the nearest PaneSizingContext value, or null when the terminal is
+ * not inside a PaneSizingProvider (e.g. standalone chat terminals).
+ */
+export function usePaneSizingContext(): PaneSizingContextValue | null {
+  return useContext(PaneSizingContext);
+}
+
+// ── Provider ──────────────────────────────────────────────────────────────────
+
+interface PaneSizingProviderProps {
+  /** Stable identifier for this pane.  Used to register in the module-level
+   *  paneRegistry so code outside the React tree can measure this pane. */
+  paneId: string;
+  /** All session IDs that belong to this pane (active + background). */
+  sessionIds: string[];
+  children: ReactNode;
+}
+
+export function PaneSizingProvider({ paneId, sessionIds, children }: PaneSizingProviderProps) {
+  const containerRef = useRef<HTMLDivElement>(null);
+  const sessionsRef = useRef<string[]>([]);
+  const lastDimensionsRef = useRef<{ cols: number; rows: number } | null>(null);
+  const pendingTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
+  const pendingDimsRef = useRef<{ cols: number; rows: number } | null>(null);
+
+  // Register/unregister this pane in the module-level registry.
+  useEffect(() => {
+    const el = containerRef.current;
+    if (!el) return;
+    paneRegistry.set(paneId, el);
+    return () => {
+      paneRegistry.delete(paneId);
+    };
+  }, [paneId]);
+
+  // When sessionIds change, send the current known dimensions to any sessions
+  // that are newly added (e.g. a conversation was just created).
+  useEffect(() => {
+    const prev = sessionsRef.current;
+    const added = sessionIds.filter((id) => !prev.includes(id));
+    sessionsRef.current = sessionIds;
+    const dims = lastDimensionsRef.current;
+    if (dims && added.length > 0) {
+      for (const id of added) {
+        rpc.pty.resize(id, dims.cols, dims.rows);
+      }
+    }
+  }, [sessionIds]);
+
+  // Clear debounce timer on unmount.
+  useEffect(() => {
+    return () => {
+      if (pendingTimerRef.current) {
+        clearTimeout(pendingTimerRef.current);
+      }
+    };
+  }, []);
+
+  const flush = useCallback(() => {
+    const dims = pendingDimsRef.current;
+    pendingDimsRef.current = null;
+    if (!dims) return;
+    lastDimensionsRef.current = dims;
+    for (const id of sessionsRef.current) {
+      rpc.pty.resize(id, dims.cols, dims.rows);
+    }
+  }, []);
+
+  const reportDimensions = useCallback(
+    (cols: number, rows: number) => {
+      const c = Math.max(MIN_TERMINAL_COLS, cols);
+      const r = Math.max(MIN_TERMINAL_ROWS, rows);
+      // No dedup here: a newly active session's PTY may not have received the
+      // resize yet even if the pane dimensions are unchanged, so we always
+      // broadcast.  The debounce timer coalesces rapid calls.
+      pendingDimsRef.current = { cols: c, rows: r };
+      if (pendingTimerRef.current) clearTimeout(pendingTimerRef.current);
+      pendingTimerRef.current = setTimeout(() => {
+        pendingTimerRef.current = null;
+        flush();
+      }, PTY_RESIZE_DEBOUNCE_MS);
+    },
+    [flush]
+  );
+
+  const getCurrentDimensions = useCallback(
+    (): { cols: number; rows: number } | null => lastDimensionsRef.current,
+    []
+  );
+
+  const measureCurrentDimensions = useCallback(
+    (cellWidth: number, cellHeight: number): TerminalDimensions | null => {
+      const el = containerRef.current;
+      if (!el) return null;
+      return measureDimensions(el, cellWidth, cellHeight);
+    },
+    []
+  );
+
+  const value = useMemo(
+    () => ({ reportDimensions, getCurrentDimensions, containerRef, measureCurrentDimensions }),
+    [reportDimensions, getCurrentDimensions, measureCurrentDimensions]
+  );
+
+  return (
+    <PaneSizingContext.Provider value={value}>
+      <div ref={containerRef} className="flex min-h-0 flex-1 flex-col">
+        {children}
+      </div>
+    </PaneSizingContext.Provider>
+  );
+}
diff --git a/src/renderer/lib/pty/prompt-injection.ts b/src/renderer/lib/pty/prompt-injection.ts
new file mode 100644
index 0000000000..da4e555d38
--- /dev/null
+++ b/src/renderer/lib/pty/prompt-injection.ts
@@ -0,0 +1,27 @@
+export function buildPromptInjectionPayload(args: {
+  providerId: string | undefined;
+  text: string;
+}): string {
+  const trimmed = args.text.trim();
+  const hasMultilinePayload = trimmed.includes('\n');
+  const shouldUseBracketedPaste = args.providerId !== 'claude' && hasMultilinePayload;
+  if (!shouldUseBracketedPaste) return trimmed;
+  return `\x1b[200~${trimmed}\x1b[201~`;
+}
+
+type SendInput = (data: string) => Promise<unknown>;
+
+type InjectPromptArgs = {
+  providerId: string | undefined;
+  text: string;
+  sendInput: SendInput;
+};
+
+export async function pastePromptInjection(args: InjectPromptArgs): Promise<void> {
+  const payload = buildPromptInjectionPayload({
+    providerId: args.providerId,
+    text: args.text,
+  });
+  if (!payload) return;
+  await args.sendInput(payload);
+}
diff --git a/src/renderer/lib/pty/pty-dimensions.ts b/src/renderer/lib/pty/pty-dimensions.ts
new file mode 100644
index 0000000000..660b6cebdf
--- /dev/null
+++ b/src/renderer/lib/pty/pty-dimensions.ts
@@ -0,0 +1,42 @@
+/**
+ * Standalone terminal dimension measurement utility.
+ *
+ * Extracted from FitAddon.proposeDimensions() but decoupled from any specific
+ * terminal instance — accepts a container element and cell metrics directly.
+ * This lets callers measure any DOM element (e.g. PaneSizingProvider's
+ * container) without first mounting a terminal inside it.
+ */
+
+const MINIMUM_COLS = 2;
+const MINIMUM_ROWS = 1;
+
+export interface TerminalDimensions {
+  cols: number;
+  rows: number;
+}
+
+/**
+ * Compute terminal cols/rows from a container element's pixel dimensions and
+ * the terminal's CSS cell size.
+ *
+ * @param container  The element whose CSS width/height defines the available area.
+ * @param cellWidth  Terminal cell width in CSS pixels (terminal.dimensions.css.cell.width).
+ * @param cellHeight Terminal cell height in CSS pixels (terminal.dimensions.css.cell.height).
+ * @param scrollbarWidth Width in pixels to subtract for the scrollbar (0 when scrollback=0).
+ */
+export function measureDimensions(
+  container: HTMLElement,
+  cellWidth: number,
+  cellHeight: number,
+  scrollbarWidth = 0
+): TerminalDimensions | null {
+  if (cellWidth === 0 || cellHeight === 0) return null;
+  const style = window.getComputedStyle(container);
+  const width = Math.max(0, Number.parseInt(style.width));
+  const height = Number.parseInt(style.height);
+  if (Number.isNaN(width) || Number.isNaN(height) || height === 0) return null;
+  return {
+    cols: Math.max(MINIMUM_COLS, Math.floor((width - scrollbarWidth) / cellWidth)),
+    rows: Math.max(MINIMUM_ROWS, Math.floor(height / cellHeight)),
+  };
+}
diff --git a/src/renderer/lib/pty/pty-input-buffer.ts b/src/renderer/lib/pty/pty-input-buffer.ts
new file mode 100644
index 0000000000..ea19ee3fdc
--- /dev/null
+++ b/src/renderer/lib/pty/pty-input-buffer.ts
@@ -0,0 +1,301 @@
+/**
+ * One-shot capture of the user's first "real" terminal message.
+ *
+ * Accumulates keystrokes, strips ANSI escapes, handles backspace,
+ * and fires the `onCapture` callback once when a confirmed submit
+ * passes validation. After firing, the buffer disables itself.
+ */
+
+/** Strings that look like non-task-related input (confirmations, slash commands, etc.) */
+const SKIP_PATTERNS = [
+  /^\//,
+  /^y(es)?$/i,
+  /^n(o)?$/i,
+  /^ok$/i,
+  /^q(uit)?$/i,
+  /^exit$/i,
+  /^help$/i,
+  /^\d+$/,
+];
+
+const MIN_MESSAGE_LENGTH = 2;
+const HAS_ALPHA = /[A-Za-z]/;
+
+type SanitizerMode = 'normal' | 'escape' | 'csi' | 'osc' | 'osc-escape' | 'ss3';
+type InputAction =
+  | { type: 'insert'; text: string }
+  | { type: 'submit' }
+  | { type: 'backspace' }
+  | { type: 'delete' }
+  | { type: 'kill-line' }
+  | { type: 'move-home' }
+  | { type: 'move-end' }
+  | { type: 'move-left'; count: number }
+  | { type: 'move-right'; count: number };
+
+const MAX_CSI_PAYLOAD_LENGTH = 256;
+
+function isCsiFinalByte(ch: string): boolean {
+  return ch >= '@' && ch <= '~';
+}
+
+class AnsiDecoder {
+  private mode: SanitizerMode = 'normal';
+  private csiBuffer = '';
+
+  private readCount(payload: string): number {
+    const raw = payload.split(';', 1)[0] ?? '';
+    const value = Number.parseInt(raw, 10);
+    if (!Number.isFinite(value) || value <= 0) return 1;
+    return value;
+  }
+
+  private decodePlainChar(ch: string): InputAction[] {
+    if (ch === '\r' || ch === '\n') return [{ type: 'submit' }];
+    if (ch === '\x7f' || ch === '\b') return [{ type: 'backspace' }];
+    if (ch === '\x04') return [{ type: 'delete' }];
+    if (ch === '\x15') return [{ type: 'kill-line' }];
+    if (ch === '\x01') return [{ type: 'move-home' }];
+    if (ch === '\x05') return [{ type: 'move-end' }];
+    if (ch === '\x02') return [{ type: 'move-left', count: 1 }];
+    if (ch === '\x06') return [{ type: 'move-right', count: 1 }];
+    if (ch.charCodeAt(0) >= 32) return [{ type: 'insert', text: ch }];
+    return [];
+  }
+
+  private decodeCsi(payload: string, finalByte: string): InputAction[] {
+    if (finalByte === 'u') {
+      const codepoint = Number.parseInt(payload.split(';', 1)[0] ?? '', 10);
+      if (codepoint === 8 || codepoint === 127) return [{ type: 'backspace' }];
+      if (codepoint === 13) return [{ type: 'submit' }];
+      if (codepoint === 21) return [{ type: 'kill-line' }];
+      if (codepoint === 1) return [{ type: 'move-home' }];
+      if (codepoint === 5) return [{ type: 'move-end' }];
+      return [];
+    }
+
+    if (finalByte === 'D') return [{ type: 'move-left', count: this.readCount(payload) }];
+    if (finalByte === 'C') return [{ type: 'move-right', count: this.readCount(payload) }];
+    if (finalByte === 'H') return [{ type: 'move-home' }];
+    if (finalByte === 'F') return [{ type: 'move-end' }];
+
+    if (finalByte === '~') {
+      const code = Number.parseInt(payload.split(';', 1)[0] ?? '', 10);
+      if (code === 3) return [{ type: 'delete' }];
+      if (code === 1 || code === 7) return [{ type: 'move-home' }];
+      if (code === 4 || code === 8) return [{ type: 'move-end' }];
+    }
+
+    return [];
+  }
+
+  private decodeSs3(finalByte: string): InputAction[] {
+    if (finalByte === 'D') return [{ type: 'move-left', count: 1 }];
+    if (finalByte === 'C') return [{ type: 'move-right', count: 1 }];
+    if (finalByte === 'H') return [{ type: 'move-home' }];
+    if (finalByte === 'F') return [{ type: 'move-end' }];
+    return [];
+  }
+
+  feed(chunk: string): InputAction[] {
+    const actions: InputAction[] = [];
+
+    for (const ch of chunk) {
+      switch (this.mode) {
+        case 'normal':
+          if (ch === '\x1b') {
+            this.mode = 'escape';
+            continue;
+          }
+          actions.push(...this.decodePlainChar(ch));
+          continue;
+        case 'escape':
+          if (ch === '[') {
+            this.mode = 'csi';
+            this.csiBuffer = '';
+            continue;
+          }
+          if (ch === ']') {
+            this.mode = 'osc';
+            continue;
+          }
+          if (ch === 'O') {
+            this.mode = 'ss3';
+            continue;
+          }
+          this.mode = 'normal';
+          if (ch === '\x1b') {
+            this.mode = 'escape';
+            continue;
+          }
+          actions.push(...this.decodePlainChar(ch));
+          continue;
+        case 'csi':
+          if (isCsiFinalByte(ch)) {
+            actions.push(...this.decodeCsi(this.csiBuffer, ch));
+            this.mode = 'normal';
+            this.csiBuffer = '';
+            continue;
+          }
+          if (this.csiBuffer.length < MAX_CSI_PAYLOAD_LENGTH) {
+            this.csiBuffer += ch;
+          }
+          continue;
+        case 'osc':
+          if (ch === '\x07') {
+            this.mode = 'normal';
+            continue;
+          }
+          if (ch === '\x1b') {
+            this.mode = 'osc-escape';
+          }
+          continue;
+        case 'osc-escape':
+          if (ch === '\\') {
+            this.mode = 'normal';
+            continue;
+          }
+          this.mode = ch === '\x1b' ? 'osc-escape' : 'osc';
+          continue;
+        case 'ss3':
+          actions.push(...this.decodeSs3(ch));
+          this.mode = 'normal';
+          continue;
+      }
+    }
+
+    return actions;
+  }
+}
+
+class LineEditor {
+  private lineBuffer = '';
+  private cursor = 0;
+
+  apply(actions: InputAction[]): string[] {
+    const submitted: string[] = [];
+
+    for (const action of actions) {
+      switch (action.type) {
+        case 'insert':
+          this.lineBuffer =
+            this.lineBuffer.slice(0, this.cursor) +
+            action.text +
+            this.lineBuffer.slice(this.cursor);
+          this.cursor += action.text.length;
+          break;
+        case 'submit': {
+          const message = this.lineBuffer.trim();
+          if (message) submitted.push(message);
+          this.lineBuffer = '';
+          this.cursor = 0;
+          break;
+        }
+        case 'backspace':
+          if (this.cursor > 0) {
+            this.lineBuffer =
+              this.lineBuffer.slice(0, this.cursor - 1) + this.lineBuffer.slice(this.cursor);
+            this.cursor -= 1;
+          }
+          break;
+        case 'delete':
+          if (this.cursor < this.lineBuffer.length) {
+            this.lineBuffer =
+              this.lineBuffer.slice(0, this.cursor) + this.lineBuffer.slice(this.cursor + 1);
+          }
+          break;
+        case 'kill-line':
+          this.clearLine();
+          break;
+        case 'move-home':
+          this.cursor = 0;
+          break;
+        case 'move-end':
+          this.cursor = this.lineBuffer.length;
+          break;
+        case 'move-left':
+          this.cursor = Math.max(0, this.cursor - action.count);
+          break;
+        case 'move-right':
+          this.cursor = Math.min(this.lineBuffer.length, this.cursor + action.count);
+          break;
+      }
+    }
+
+    return submitted;
+  }
+
+  clearLine(): void {
+    this.lineBuffer = '';
+    this.cursor = 0;
+  }
+}
+
+export class SubmittedInputBuffer {
+  private readonly decoder = new AnsiDecoder();
+  private readonly editor = new LineEditor();
+
+  feed(data: string): string[] {
+    return this.editor.apply(this.decoder.feed(data));
+  }
+
+  clearLine(): void {
+    this.editor.clearLine();
+  }
+}
+
+/** Returns true if the message looks like a real task description. */
+export function isRealTaskInput(message: string): boolean {
+  const trimmed = message.trim();
+  if (!trimmed || trimmed.length < MIN_MESSAGE_LENGTH) return false;
+  if (!HAS_ALPHA.test(trimmed)) return false;
+  for (const pattern of SKIP_PATTERNS) {
+    if (pattern.test(trimmed)) return false;
+  }
+  return true;
+}
+
+export class TerminalInputBuffer {
+  private readonly submittedInput = new SubmittedInputBuffer();
+  private pendingMessage: string | null = null;
+  private captured = false;
+  private readonly onCapture: (message: string) => void;
+
+  constructor(onCapture: (message: string) => void) {
+    this.onCapture = onCapture;
+  }
+
+  /** Feed raw terminal input data (keystrokes). */
+  feed(data: string): void {
+    if (this.captured) return;
+    const submittedMessages = this.submittedInput.feed(data);
+    if (submittedMessages.length > 0) {
+      this.pendingMessage = submittedMessages.at(-1) ?? null;
+    }
+  }
+
+  /**
+   * Called when PTY output indicates the agent is "busy" (processing).
+   * If we have a pending message that passes validation, fire the callback.
+   */
+  confirmSubmit(): void {
+    if (this.captured) return;
+    if (!this.pendingMessage) return;
+
+    if (isRealTaskInput(this.pendingMessage)) {
+      this.captured = true;
+      const message = this.pendingMessage;
+      this.pendingMessage = null;
+      this.submittedInput.clearLine();
+      this.onCapture(message);
+    } else {
+      // Not a real task input — discard and keep listening
+      this.pendingMessage = null;
+    }
+  }
+
+  /** Whether the buffer has already fired its callback. */
+  get isComplete(): boolean {
+    return this.captured;
+  }
+}
diff --git a/src/renderer/lib/pty/pty-keybindings.ts b/src/renderer/lib/pty/pty-keybindings.ts
new file mode 100644
index 0000000000..5e6c8abc14
--- /dev/null
+++ b/src/renderer/lib/pty/pty-keybindings.ts
@@ -0,0 +1,99 @@
+export type KeyEventLike = {
+  type: string;
+  key: string;
+  shiftKey?: boolean;
+  ctrlKey?: boolean;
+  metaKey?: boolean;
+  altKey?: boolean;
+};
+
+// Ctrl+J sends line feed (LF) to the PTY, which CLI agents interpret as a newline
+export const CTRL_J_ASCII = '\x0A';
+
+// Ctrl+U (unix-line-discard) kills from cursor to beginning of line
+export const CTRL_U_ASCII = '\x15';
+
+export function shouldMapShiftEnterToCtrlJ(event: KeyEventLike): boolean {
+  return (
+    event.type === 'keydown' &&
+    event.key === 'Enter' &&
+    event.shiftKey === true &&
+    !event.ctrlKey &&
+    !event.metaKey &&
+    !event.altKey
+  );
+}
+
+export function shouldHandleInterruptFromTerminal(event: KeyEventLike): boolean {
+  return (
+    event.type === 'keydown' &&
+    event.key === 'Escape' &&
+    !event.ctrlKey &&
+    !event.metaKey &&
+    !event.altKey
+  );
+}
+
+export function shouldCopySelectionFromTerminal(
+  event: KeyEventLike,
+  isMacPlatform: boolean,
+  hasSelection: boolean
+): boolean {
+  if (!hasSelection) return false;
+  if (event.type !== 'keydown') return false;
+  if (event.key.toLowerCase() !== 'c') return false;
+
+  const ctrl = event.ctrlKey === true;
+  const meta = event.metaKey === true;
+  const alt = event.altKey === true;
+  const shift = event.shiftKey === true;
+
+  // Ctrl+Shift+C should copy on all platforms
+  if (ctrl && shift && !meta && !alt) return true;
+
+  // Platform-specific default copy shortcuts
+  if (isMacPlatform) {
+    return meta && !ctrl && !shift && !alt;
+  }
+
+  return ctrl && !meta && !shift && !alt;
+}
+
+/**
+ * Detect Cmd+Backspace on macOS for "kill to beginning of line".
+ * We send Ctrl+U (\x15) to the PTY, which readline-compatible shells
+ * and most CLI agents interpret as unix-line-discard.
+ *
+ * Only intercepted on macOS — on Linux/Windows, Ctrl+U already reaches
+ * the PTY natively for the same effect.
+ */
+export function shouldKillLineFromTerminal(event: KeyEventLike, isMacPlatform: boolean): boolean {
+  if (!isMacPlatform) return false;
+  if (event.type !== 'keydown') return false;
+  if (event.key !== 'Backspace') return false;
+
+  return event.metaKey === true && !event.ctrlKey && !event.shiftKey && !event.altKey;
+}
+
+/**
+ * Detect Ctrl+Shift+V paste shortcut on Linux.
+ * Linux terminals use Ctrl+Shift+V as the standard paste shortcut,
+ * unlike Windows/macOS which use Ctrl+V/Cmd+V.
+ */
+export function shouldPasteToTerminal(event: KeyEventLike, isMacPlatform: boolean): boolean {
+  if (event.type !== 'keydown') return false;
+  if (event.key.toLowerCase() !== 'v') return false;
+
+  const ctrl = event.ctrlKey === true;
+  const meta = event.metaKey === true;
+  const alt = event.altKey === true;
+  const shift = event.shiftKey === true;
+
+  // Ctrl+Shift+V is the standard paste shortcut in Linux terminals
+  // Only apply on non-Mac platforms (Linux/Windows with Linux-style terminals)
+  if (!isMacPlatform && ctrl && shift && !meta && !alt) {
+    return true;
+  }
+
+  return false;
+}
diff --git a/src/renderer/lib/pty/pty-pane.tsx b/src/renderer/lib/pty/pty-pane.tsx
new file mode 100644
index 0000000000..06f01eec8a
--- /dev/null
+++ b/src/renderer/lib/pty/pty-pane.tsx
@@ -0,0 +1,142 @@
+import React, { forwardRef, useImperativeHandle, useRef } from 'react';
+import { rpc } from '@renderer/lib/ipc';
+import { log } from '@renderer/utils/logger';
+import type { FrontendPty, SessionTheme } from './pty';
+import { usePty } from './use-pty';
+
+type Props = {
+  /**
+   * Deterministic PTY session ID: `makePtySessionId(projectId, scopeId, leafId)`.
+   */
+  sessionId: string;
+  /** Pre-connected FrontendPty owned by the entity's PtySession store. */
+  pty: FrontendPty;
+  className?: string;
+  themeOverride?: SessionTheme['override'];
+  contentFilter?: string;
+  mapShiftEnterToCtrlJ?: boolean;
+  /** SSH connection ID — used for remote file drag-and-drop only. */
+  remoteConnectionId?: string;
+  onActivity?: () => void;
+  onExit?: (info: { exitCode: number | undefined; signal?: number }) => void;
+  onFirstMessage?: (message: string) => void;
+  onEnterPress?: (message: string) => void;
+  onInterruptPress?: () => void;
+};
+
+const PtyPaneComponent = forwardRef<{ focus: () => void }, Props>(
+  (
+    {
+      sessionId,
+      pty,
+      className,
+      themeOverride,
+      contentFilter,
+      mapShiftEnterToCtrlJ,
+      remoteConnectionId,
+      onActivity,
+      onExit,
+      onFirstMessage,
+      onEnterPress,
+      onInterruptPress,
+    },
+    ref
+  ) => {
+    const containerRef = useRef<HTMLDivElement | null>(null);
+
+    const theme: SessionTheme = { override: themeOverride };
+
+    const { focus, sendInput } = usePty(
+      {
+        sessionId,
+        pty,
+        theme,
+        mapShiftEnterToCtrlJ,
+        onActivity,
+        onExit,
+        onFirstMessage,
+        onEnterPress,
+        onInterruptPress,
+      },
+      containerRef
+    );
+
+    useImperativeHandle(ref, () => ({ focus }), [focus]);
+
+    const handleFocus = () => {
+      focus();
+    };
+
+    const handleDrop: React.DragEventHandler<HTMLDivElement> = async (event) => {
+      try {
+        event.preventDefault();
+        const dt = event.dataTransfer;
+        if (!dt?.files?.length) return;
+
+        const paths: string[] = [];
+        for (const file of Array.from(dt.files)) {
+          const path = window.electronAPI.getPathForFile(file).trim();
+          if (path) paths.push(path);
+        }
+        if (paths.length === 0) return;
+
+        if (remoteConnectionId) {
+          try {
+            const result = await rpc.pty.uploadFiles({ sessionId, localPaths: paths });
+            if (result.success && result.data?.remotePaths) {
+              const escaped = result.data.remotePaths
+                .map((p: string) => `'${p.replace(/'/g, "'\\''")}'`)
+                .join(' ');
+              sendInput(`${escaped} `);
+            }
+          } catch (error) {
+            log.warn('SSH file transfer failed', { error });
+          }
+        } else {
+          const escaped = paths.map((p) => `'${p.replace(/'/g, "'\\''")}'`).join(' ');
+          sendInput(`${escaped} `);
+        }
+        focus();
+      } catch (error) {
+        log.warn('Terminal drop failed', { error });
+      }
+    };
+
+    return (
+      <div
+        className={['terminal-pane flex h-full w-full min-w-0', className]
+          .filter(Boolean)
+          .join(' ')}
+        style={{
+          width: '100%',
+          height: '100%',
+          minHeight: 0,
+          backgroundColor: themeOverride?.background ?? 'var(--background)',
+          boxSizing: 'border-box',
+        }}
+      >
+        <div
+          ref={containerRef}
+          data-terminal-container
+          className="p-2 bg-background-secondary-1"
+          style={{
+            width: '100%',
+            height: '100%',
+
+            minHeight: 0,
+            overflow: 'hidden',
+            filter: contentFilter || undefined,
+          }}
+          onClick={handleFocus}
+          onMouseDown={handleFocus}
+          onDragOver={(event) => event.preventDefault()}
+          onDrop={handleDrop}
+        />
+      </div>
+    );
+  }
+);
+
+PtyPaneComponent.displayName = 'TerminalPane';
+
+export const PtyPane = React.memo(PtyPaneComponent);
diff --git a/src/renderer/lib/pty/pty-pool-provider.tsx b/src/renderer/lib/pty/pty-pool-provider.tsx
new file mode 100644
index 0000000000..bc523d0739
--- /dev/null
+++ b/src/renderer/lib/pty/pty-pool-provider.tsx
@@ -0,0 +1,14 @@
+import { useEffect, type ReactNode } from 'react';
+import { disposeAllPtys } from './pty';
+import { ensureXtermHost } from './xterm-host';
+
+export function TerminalPoolProvider({ children }: { children: ReactNode }) {
+  useEffect(() => {
+    ensureXtermHost();
+    return () => {
+      disposeAllPtys();
+    };
+  }, []);
+
+  return <>{children}</>;
+}
diff --git a/src/renderer/lib/pty/pty-session.ts b/src/renderer/lib/pty/pty-session.ts
new file mode 100644
index 0000000000..828f3b3fac
--- /dev/null
+++ b/src/renderer/lib/pty/pty-session.ts
@@ -0,0 +1,40 @@
+import { makeAutoObservable, onBecomeObserved, runInAction } from 'mobx';
+import { FrontendPty } from '@renderer/lib/pty/pty';
+
+export type PtySessionStatus = 'disconnected' | 'connecting' | 'ready';
+
+export class PtySession {
+  pty: FrontendPty | null = null;
+  status: PtySessionStatus = 'disconnected';
+
+  constructor(readonly sessionId: string) {
+    makeAutoObservable(this, {
+      pty: false,
+    });
+    // Safety net: auto-connect the first time any observer reads status.
+    // Eager connect in manager store load() is the primary path; this covers edge cases.
+    onBecomeObserved(this, 'status', () => {
+      if (this.status === 'disconnected') void this.connect();
+    });
+  }
+
+  async connect() {
+    if (this.pty) return;
+    this.pty = new FrontendPty(this.sessionId);
+    runInAction(() => {
+      this.status = 'connecting';
+    });
+    await this.pty.connect();
+    runInAction(() => {
+      this.status = 'ready';
+    });
+  }
+
+  dispose() {
+    this.pty?.dispose();
+    runInAction(() => {
+      this.pty = null;
+      this.status = 'disconnected';
+    });
+  }
+}
diff --git a/src/renderer/lib/pty/pty.ts b/src/renderer/lib/pty/pty.ts
new file mode 100644
index 0000000000..742b14efc1
--- /dev/null
+++ b/src/renderer/lib/pty/pty.ts
@@ -0,0 +1,202 @@
+import { CanvasAddon } from '@xterm/addon-canvas';
+import { WebLinksAddon } from '@xterm/addon-web-links';
+import { Terminal, type ITerminalOptions } from '@xterm/xterm';
+import { ptyDataChannel } from '@shared/events/ptyEvents';
+import { events, rpc } from '@renderer/lib/ipc';
+import { cssVar } from '@renderer/utils/cssVars';
+import { log } from '@renderer/utils/logger';
+import { ensureXtermHost } from './xterm-host';
+
+const SCROLLBACK_LINES = 100_000;
+
+// ── Theme helpers ─────────────────────────────────────────────────────────────
+
+export interface SessionTheme {
+  override?: ITerminalOptions['theme'];
+}
+
+export function readXtermCssVars(): ITerminalOptions['theme'] {
+  return {
+    background: cssVar('--xterm-bg'),
+    foreground: cssVar('--xterm-fg'),
+    cursor: cssVar('--xterm-cursor'),
+    cursorAccent: cssVar('--xterm-cursor-accent'),
+    selectionBackground: cssVar('--xterm-selection-bg'),
+    selectionForeground: cssVar('--xterm-selection-fg'),
+  };
+}
+
+export function buildTheme(theme?: SessionTheme): ITerminalOptions['theme'] {
+  if (theme?.override) return { ...readXtermCssVars(), ...theme.override };
+  return readXtermCssVars();
+}
+
+// ── FrontendPty ───────────────────────────────────────────────────────────────
+
+/**
+ * Frontend counterpart to the main-process Pty interface.
+ *
+ * Owns the xterm Terminal instance for the full lifetime of the session.
+ * The terminal is created synchronously during construction and opened into
+ * an off-screen container. Call connect() to subscribe to the main-process
+ * ring buffer and live IPC events — this writes historical output directly
+ * to xterm and sets up ongoing data delivery without any renderer-side buffer.
+ *
+ * DOM management is handled via mount() / unmount():
+ *  - mount()   → appends ownedContainer to the visible mount target
+ *  - unmount() → moves ownedContainer back to the off-screen host
+ *
+ * Lifecycle: created and owned by PtySession (stores/pty-session.ts), one per
+ * live session. Survives React component unmounts (e.g. navigating away from a
+ * task), and is disposed only when the entity (terminal or conversation) is
+ * explicitly deleted.
+ */
+export class FrontendPty {
+  /** All live FrontendPty instances — used for app-wide operations (e.g. theme updates). */
+  static readonly all = new Set<FrontendPty>();
+  readonly terminal: Terminal;
+  readonly ownedContainer: HTMLDivElement;
+  private offData: (() => void) | null = null;
+  /** Last { cols, rows } sent to rpc.pty.resize(). Used by PaneSizingContext to skip redundant IPC calls. */
+  lastSentDims: { cols: number; rows: number } | null = null;
+
+  constructor(
+    readonly sessionId: string,
+    theme?: SessionTheme
+  ) {
+    this.ownedContainer = document.createElement('div');
+    Object.assign(this.ownedContainer.style, {
+      width: '100%',
+      height: '100%',
+    });
+
+    this.terminal = new Terminal({
+      cols: 120,
+      rows: 32,
+      scrollback: SCROLLBACK_LINES,
+      convertEol: true,
+      fontSize: 13,
+      lineHeight: 1.2,
+      letterSpacing: 0,
+      allowProposedApi: true,
+      scrollOnUserInput: false,
+      linkHandler: {
+        activate: (_event: MouseEvent, text: string) => {
+          rpc.app.openExternal(text).catch((error) => {
+            log.warn('FrontendPty: failed to open external link', { text, error });
+          });
+        },
+      },
+      theme: buildTheme(theme),
+    });
+
+    const canvasAddon = new CanvasAddon();
+    const webLinksAddon = new WebLinksAddon((event, uri) => {
+      event.preventDefault();
+      rpc.app.openExternal(uri).catch(() => {});
+    });
+
+    this.terminal.loadAddon(canvasAddon);
+    this.terminal.loadAddon(webLinksAddon);
+    this.terminal.open(this.ownedContainer);
+
+    const el = (this.terminal as unknown as { element?: HTMLElement }).element;
+    if (el) {
+      el.style.width = '100%';
+      el.style.height = '100%';
+      el.style.backgroundColor = 'transparent';
+    }
+
+    ensureXtermHost().appendChild(this.ownedContainer);
+    FrontendPty.all.add(this);
+  }
+
+  /**
+   * Subscribe to the session: fetches the ring buffer from the main process,
+   * writes it directly to xterm, then sets up a live IPC listener for future
+   * data. Marks status as 'ready' once complete.
+   *
+   * The main process guarantees atomicity: subscribe() snapshots the ring
+   * buffer and registers the consumer in one synchronous tick, so no data
+   * can slip between the snapshot and the first live IPC event.
+   */
+  async connect(): Promise<void> {
+    const result = await rpc.pty.subscribe(this.sessionId);
+    const historical = result.success ? result.data.buffer : '';
+    if (historical) this.terminal.write(historical);
+    this.offData = events.on(
+      ptyDataChannel,
+      (data: string) => {
+        this.terminal.write(data);
+      },
+      this.sessionId
+    );
+  }
+
+  /**
+   * Append ownedContainer to a visible mount target.
+   * If targetDims are provided the terminal is resized BEFORE the appendChild
+   * to eliminate the flash caused by a post-mount resize.
+   */
+  mount(mountTarget: HTMLElement, targetDims?: { cols: number; rows: number }): void {
+    if (
+      targetDims &&
+      (this.terminal.cols !== targetDims.cols || this.terminal.rows !== targetDims.rows)
+    ) {
+      this.terminal.resize(targetDims.cols, targetDims.rows);
+    }
+    mountTarget.appendChild(this.ownedContainer);
+    // Force a Canvas2D repaint after reparenting in the DOM.
+    const t = this.terminal;
+    requestAnimationFrame(() => {
+      try {
+        if ((t as unknown as { _isDisposed?: boolean })._isDisposed) return;
+        t.refresh(0, t.rows - 1);
+      } catch {}
+    });
+  }
+
+  /**
+   * Move ownedContainer back to the off-screen host (tab deactivated /
+   * TerminalPane unmounting).  Must be called after all ResizeObservers on
+   * the visible mount target have been disconnected.
+   */
+  unmount(): void {
+    ensureXtermHost().appendChild(this.ownedContainer);
+  }
+
+  /**
+   * Permanently dispose this session (terminal or conversation deleted).
+   * Unsubscribes from the main process, tears down the IPC data listener,
+   * disposes the xterm Terminal, and removes the owned container from the DOM.
+   */
+  dispose(): void {
+    FrontendPty.all.delete(this);
+    this.offData?.();
+    this.offData = null;
+    rpc.pty.unsubscribe(this.sessionId).catch(() => {});
+    try {
+      this.terminal.dispose();
+    } catch {}
+    try {
+      this.ownedContainer.remove();
+    } catch {}
+  }
+}
+
+// ── App-wide helpers ──────────────────────────────────────────────────────────
+
+/** Apply a theme to all live terminals. Called on app-level theme change. */
+export function applyThemeToAll(theme?: SessionTheme): void {
+  const xTermTheme = buildTheme(theme);
+  for (const pty of FrontendPty.all) {
+    pty.terminal.options.theme = xTermTheme;
+  }
+}
+
+/** Dispose all live FrontendPty instances. Called on app teardown. */
+export function disposeAllPtys(): void {
+  for (const pty of [...FrontendPty.all]) {
+    pty.dispose();
+  }
+}
diff --git a/src/renderer/lib/pty/terminal-search-overlay.tsx b/src/renderer/lib/pty/terminal-search-overlay.tsx
new file mode 100644
index 0000000000..3fa25b3ed9
--- /dev/null
+++ b/src/renderer/lib/pty/terminal-search-overlay.tsx
@@ -0,0 +1,100 @@
+import { ChevronDown, ChevronUp, Search, X } from 'lucide-react';
+import React, { type RefObject } from 'react';
+import { Button } from '@renderer/lib/ui/button';
+import { Input } from '@renderer/lib/ui/input';
+import { cn } from '@renderer/utils/utils';
+import type { TerminalSearchStatus } from './use-terminal-search';
+
+interface Props {
+  isOpen: boolean;
+  fullWidth?: boolean;
+  searchQuery: string;
+  searchStatus: TerminalSearchStatus;
+  searchInputRef: RefObject<HTMLInputElement | null>;
+  onQueryChange: (value: string) => void;
+  onStep: (direction: 'next' | 'prev') => void;
+  onClose: () => void;
+}
+
+export function TerminalSearchOverlay({
+  isOpen,
+  fullWidth = false,
+  searchQuery,
+  searchStatus,
+  searchInputRef,
+  onQueryChange,
+  onStep,
+  onClose,
+}: Props) {
+  if (!isOpen) return null;
+
+  return (
+    <div
+      className={cn(
+        'absolute top-3 z-20 flex items-center gap-1 rounded-md border border-border bg-background/95 p-1.5 shadow-lg backdrop-blur',
+        fullWidth ? 'left-3 right-3 w-auto max-w-none' : 'right-3 w-[min(28rem,calc(100%-1.5rem))]'
+      )}
+    >
+      <div className="relative min-w-0 flex-1">
+        <Search className="pointer-events-none absolute left-2.5 top-1/2 size-3.5 -translate-y-1/2 text-foreground-muted" />
+        <Input
+          ref={searchInputRef}
+          value={searchQuery}
+          onChange={(event) => onQueryChange(event.target.value)}
+          onKeyDown={(event) => {
+            if (event.key === 'Enter') {
+              event.preventDefault();
+              onStep(event.shiftKey ? 'prev' : 'next');
+              return;
+            }
+            if (event.key === 'Escape') {
+              event.preventDefault();
+              event.stopPropagation();
+              onClose();
+            }
+          }}
+          placeholder="Find in terminal..."
+          className="h-8 min-w-0 border-0 bg-transparent pl-8 pr-2 text-xs shadow-none focus-visible:ring-0"
+          aria-label="Find in terminal"
+        />
+      </div>
+      <div className="ml-auto flex shrink-0 items-center gap-0.5">
+        <span className="min-w-10 shrink-0 px-1 text-center text-[11px] text-foreground-muted">
+          {searchQuery ? `${searchStatus.currentIndex}/${searchStatus.total}` : '0/0'}
+        </span>
+        <Button
+          type="button"
+          variant="ghost"
+          size="icon-xs"
+          onClick={() => onStep('prev')}
+          disabled={!searchQuery || searchStatus.total === 0}
+          className="shrink-0 text-foreground-muted"
+          aria-label="Previous terminal match"
+        >
+          <ChevronUp className="size-3.5" />
+        </Button>
+        <Button
+          type="button"
+          variant="ghost"
+          size="icon-xs"
+          onClick={() => onStep('next')}
+          disabled={!searchQuery || searchStatus.total === 0}
+          className="shrink-0 text-foreground-muted"
+          aria-label="Next terminal match"
+        >
+          <ChevronDown className="size-3.5" />
+        </Button>
+        <Button
+          type="button"
+          variant="ghost"
+          size="icon-xs"
+          onClick={onClose}
+          className="shrink-0 text-foreground-muted"
+          aria-label="Close terminal search"
+        >
+          <X className="size-3.5" />
+        </Button>
+      </div>
+    </div>
+  );
+}
diff --git a/src/renderer/lib/pty/terminal-search.ts b/src/renderer/lib/pty/terminal-search.ts
new file mode 100644
index 0000000000..2ceb69316e
--- /dev/null
+++ b/src/renderer/lib/pty/terminal-search.ts
@@ -0,0 +1,163 @@
+export interface TerminalSearchBufferLineLike {
+  isWrapped?: boolean;
+  translateToString(trimRight?: boolean, startColumn?: number, endColumn?: number): string;
+}
+
+export interface TerminalSearchBufferLike {
+  length: number;
+  getLine(index: number): TerminalSearchBufferLineLike | undefined;
+}
+
+export interface TerminalSearchMatch {
+  row: number;
+  col: number;
+  length: number;
+}
+
+interface PhysicalLineSegment {
+  row: number;
+  startIndex: number;
+}
+
+interface LogicalLine {
+  text: string;
+  segments: PhysicalLineSegment[];
+}
+
+function buildLogicalLines(buffer: TerminalSearchBufferLike): LogicalLine[] {
+  const logicalLines: LogicalLine[] = [];
+  let current: LogicalLine | null = null;
+
+  for (let index = 0; index < buffer.length; index += 1) {
+    const line = buffer.getLine(index);
+    if (!line) continue;
+
+    const text = line.translateToString(false);
+    if (!current || !line.isWrapped) {
+      if (current) logicalLines.push(current);
+      current = { text: '', segments: [] };
+    }
+
+    current.segments.push({
+      row: index,
+      startIndex: current.text.length,
+    });
+    current.text += text;
+  }
+
+  if (current) logicalLines.push(current);
+
+  return logicalLines;
+}
+
+function resolveMatchStart(
+  segments: PhysicalLineSegment[],
+  startIndex: number
+): TerminalSearchMatch {
+  for (let index = segments.length - 1; index >= 0; index -= 1) {
+    const segment = segments[index];
+    if (startIndex >= segment.startIndex) {
+      return {
+        row: segment.row,
+        col: startIndex - segment.startIndex,
+        length: 0,
+      };
+    }
+  }
+
+  const firstSegment = segments[0];
+  return {
+    row: firstSegment?.row ?? 0,
+    col: 0,
+    length: 0,
+  };
+}
+
+export function collectTerminalSearchMatches(
+  buffer: TerminalSearchBufferLike,
+  query: string
+): TerminalSearchMatch[] {
+  if (!query) return [];
+
+  const normalizedQuery = query.toLocaleLowerCase();
+  if (!normalizedQuery) return [];
+
+  const matches: TerminalSearchMatch[] = [];
+  const logicalLines = buildLogicalLines(buffer);
+
+  for (const logicalLine of logicalLines) {
+    const haystack = logicalLine.text.toLocaleLowerCase();
+    let fromIndex = 0;
+
+    while (fromIndex <= haystack.length - normalizedQuery.length) {
+      const matchIndex = haystack.indexOf(normalizedQuery, fromIndex);
+      if (matchIndex === -1) break;
+
+      const start = resolveMatchStart(logicalLine.segments, matchIndex);
+      matches.push({
+        row: start.row,
+        col: start.col,
+        length: query.length,
+      });
+
+      fromIndex = matchIndex + Math.max(1, normalizedQuery.length);
+    }
+  }
+
+  return matches;
+}
+
+function compareMatchPosition(left: TerminalSearchMatch, right: TerminalSearchMatch): number {
+  if (left.row !== right.row) return left.row - right.row;
+  if (left.col !== right.col) return left.col - right.col;
+  return left.length - right.length;
+}
+
+function findExactCurrentMatchIndex(
+  matches: TerminalSearchMatch[],
+  currentMatch: TerminalSearchMatch | null
+): number {
+  if (!currentMatch) return -1;
+
+  return matches.findIndex(
+    (candidate) =>
+      candidate.row === currentMatch.row &&
+      candidate.col === currentMatch.col &&
+      candidate.length === currentMatch.length
+  );
+}
+
+export function getNextTerminalSearchIndex(
+  matches: TerminalSearchMatch[],
+  currentMatch: TerminalSearchMatch | null,
+  direction: 'next' | 'prev'
+): number {
+  if (matches.length === 0) return -1;
+
+  const currentMatchIndex = findExactCurrentMatchIndex(matches, currentMatch);
+  if (currentMatchIndex === -1 && currentMatch) {
+    if (direction === 'prev') {
+      for (let index = matches.length - 1; index >= 0; index -= 1) {
+        if (compareMatchPosition(matches[index], currentMatch) < 0) {
+          return index;
+        }
+      }
+      return matches.length - 1;
+    }
+
+    const nextIndex = matches.findIndex(
+      (candidate) => compareMatchPosition(candidate, currentMatch) > 0
+    );
+    return nextIndex === -1 ? 0 : nextIndex;
+  }
+
+  if (currentMatchIndex === -1) {
+    return direction === 'prev' ? matches.length - 1 : 0;
+  }
+
+  if (direction === 'prev') {
+    return currentMatchIndex === 0 ? matches.length - 1 : currentMatchIndex - 1;
+  }
+
+  return currentMatchIndex === matches.length - 1 ? 0 : currentMatchIndex + 1;
+}
diff --git a/src/renderer/lib/pty/use-pty.ts b/src/renderer/lib/pty/use-pty.ts
new file mode 100644
index 0000000000..a1f4017885
--- /dev/null
+++ b/src/renderer/lib/pty/use-pty.ts
@@ -0,0 +1,602 @@
+import { Terminal } from '@xterm/xterm';
+import { useCallback, useEffect, useRef, useSyncExternalStore } from 'react';
+import type { AppSettings } from '@shared/app-settings';
+import { appPasteChannel } from '@shared/events/appEvents';
+import { ptyDataChannel, ptyExitChannel } from '@shared/events/ptyEvents';
+import { events, rpc } from '@renderer/lib/ipc';
+import { panelDragStore } from '@renderer/lib/layout/panel-drag-store';
+import { log } from '@renderer/utils/logger';
+import { usePaneSizingContext } from './pane-sizing-context';
+import { buildTheme, type FrontendPty, type SessionTheme } from './pty';
+import { measureDimensions } from './pty-dimensions';
+import { isRealTaskInput, SubmittedInputBuffer } from './pty-input-buffer';
+import {
+  CTRL_J_ASCII,
+  CTRL_U_ASCII,
+  shouldCopySelectionFromTerminal,
+  shouldHandleInterruptFromTerminal,
+  shouldKillLineFromTerminal,
+  shouldMapShiftEnterToCtrlJ,
+  shouldPasteToTerminal,
+} from './pty-keybindings';
+
+// xterm's proposed API and internal fields are not in the public TypeScript
+// types. Both code paths are necessary: the proposed `dimensions` API works in
+// xterm 5.x, while xterm 6.x exposes cell metrics only via `_core`.
+interface XtermCellDimensions {
+  css: { cell: { width: number; height: number } };
+}
+interface XtermInternals {
+  dimensions?: XtermCellDimensions;
+  _core?: {
+    _renderService?: { dimensions?: XtermCellDimensions };
+    renderService?: { dimensions?: XtermCellDimensions };
+  };
+}
+
+function getCellMetrics(terminal: Terminal): { width: number; height: number } | null {
+  const t = terminal as unknown as XtermInternals;
+  // Proposed API (xterm 5.x). Undefined on the public Terminal in xterm 6.x.
+  const dims = t.dimensions;
+  if (dims && dims.css.cell.width !== 0 && dims.css.cell.height !== 0) {
+    return { width: dims.css.cell.width, height: dims.css.cell.height };
+  }
+  // xterm 6.x: the public Terminal delegates to `_core` (the internal Terminal instance).
+  // FitAddon receives this same internal object via addon.activate(terminal).
+  const coreDims = t._core?._renderService?.dimensions ?? t._core?.renderService?.dimensions;
+  if (coreDims?.css?.cell?.width && coreDims.css.cell.height) {
+    return { width: coreDims.css.cell.width, height: coreDims.css.cell.height };
+  }
+  return null;
+}
+
+const PTY_RESIZE_DEBOUNCE_MS = 120;
+const MIN_TERMINAL_COLS = 2;
+const MIN_TERMINAL_ROWS = 1;
+const IS_MAC_PLATFORM =
+  typeof navigator !== 'undefined' && /Mac|iPod|iPhone|iPad/.test(navigator.platform);
+
+export interface UsePtyOptions {
+  /** Deterministic PTY session ID: makePtySessionId(projectId, scopeId, leafId). */
+  sessionId: string;
+  /** Pre-connected FrontendPty instance owned by the entity's PtySession store. */
+  pty: FrontendPty;
+  theme?: SessionTheme;
+  mapShiftEnterToCtrlJ?: boolean;
+  onActivity?: () => void;
+  onExit?: (info: { exitCode: number | undefined; signal?: number }) => void;
+  onFirstMessage?: (message: string) => void;
+  onEnterPress?: (message: string) => void;
+  onInterruptPress?: () => void;
+}
+
+export interface UseTerminalReturn {
+  focus: () => void;
+  setTheme: (theme: SessionTheme) => void;
+  sendInput: (data: string, options?: { track?: boolean }) => void;
+}
+
+/**
+ * React hook that manages a full xterm.js terminal instance attached to
+ * `containerRef`, wired to a PTY session via the deterministic `sessionId`.
+ *
+ * Each session owns a persistent FrontendPty (terminal + Canvas2D renderer)
+ * for its full lifetime.  On unmount the terminal's ownedContainer is
+ * reparented to the off-screen xterm host rather than disposed, so scrollback
+ * is preserved across tab switches.
+ *
+ * For sessions pre-registered via PtySessionProvider the mount is effectively
+ * synchronous (no await needed).  Standalone sessions (not pre-registered)
+ * are auto-registered inside an async IIFE, awaiting the historical buffer
+ * fetch before mounting.
+ *
+ * When inside a PaneSizingProvider the terminal is pre-resized to the pane's
+ * current dimensions BEFORE being appended to the visible DOM, eliminating
+ * the flash caused by a post-mount resize.
+ */
+export function usePty(
+  options: UsePtyOptions,
+  containerRef: React.RefObject<HTMLElement | null>
+): UseTerminalReturn {
+  const {
+    sessionId,
+    pty,
+    theme,
+    mapShiftEnterToCtrlJ,
+    onActivity,
+    onExit,
+    onFirstMessage,
+    onEnterPress,
+    onInterruptPress,
+  } = options;
+
+  // Stable refs for callbacks so the effect doesn't re-run on every render.
+  const onActivityRef = useRef(onActivity);
+  onActivityRef.current = onActivity;
+  const onExitRef = useRef(onExit);
+  onExitRef.current = onExit;
+  const onFirstMessageRef = useRef(onFirstMessage);
+  onFirstMessageRef.current = onFirstMessage;
+  const onEnterPressRef = useRef(onEnterPress);
+  onEnterPressRef.current = onEnterPress;
+  const onInterruptPressRef = useRef(onInterruptPress);
+  onInterruptPressRef.current = onInterruptPress;
+  const themeRef = useRef(theme);
+  themeRef.current = theme;
+
+  // When inside a PaneSizingProvider, PTY resizes are broadcast to ALL sessions
+  // in the pane (including background ones).  Falls back to per-session resize
+  // for standalone terminals (chat, task terminal panel, etc.).
+  const paneSizing = usePaneSizingContext();
+  // Ref so the main effect (which only re-runs on sessionId change) always
+  // accesses the latest context value without needing it as a dependency.
+  const paneSizingRef = useRef(paneSizing);
+  paneSizingRef.current = paneSizing;
+
+  // Subscribe to panel drag state so ResizeObserver skips fits while dragging.
+  const isPanelDragging = useSyncExternalStore(
+    panelDragStore.subscribe,
+    panelDragStore.getSnapshot
+  );
+  // Keep a ref in sync so the ResizeObserver callback (inside the main effect)
+  // always reads the latest value without re-running the effect.
+  const isPanelDraggingRef = useRef(isPanelDragging);
+  isPanelDraggingRef.current = isPanelDragging;
+
+  // Core xterm.js reference, kept alive across renders.
+  const termRef = useRef<Terminal | null>(null);
+
+  // Resize debounce state.
+  const pendingResizeTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
+  const lastSentResizeRef = useRef<{ cols: number; rows: number } | null>(null);
+
+  // First-message capture state.
+  const firstMessageSentRef = useRef(false);
+  const inputBufferRef = useRef('');
+
+  // Tracks submitted user input while filtering terminal control traffic.
+  const submittedInputBufferRef = useRef(new SubmittedInputBuffer());
+
+  // Track whether the PTY has started (to filter focus reporting escape sequences).
+  const ptyStartedRef = useRef(false);
+
+  // Auto-copy on selection
+  const autoCopyOnSelectionRef = useRef(false);
+
+  // ─── Helpers ───────────────────────────────────────────────────────────────
+
+  const queuePtyResize = useCallback(
+    (newCols: number, newRows: number) => {
+      const c = Math.max(MIN_TERMINAL_COLS, Math.floor(newCols));
+      const r = Math.max(MIN_TERMINAL_ROWS, Math.floor(newRows));
+      const last = lastSentResizeRef.current;
+      if (last?.cols === c && last?.rows === r) return;
+      if (pendingResizeTimerRef.current) clearTimeout(pendingResizeTimerRef.current);
+      pendingResizeTimerRef.current = setTimeout(() => {
+        pendingResizeTimerRef.current = null;
+        lastSentResizeRef.current = { cols: c, rows: r };
+        rpc.pty.resize(sessionId, c, r);
+      }, PTY_RESIZE_DEBOUNCE_MS);
+    },
+    [sessionId]
+  );
+
+  // Stable ref so measureAndResize can always call the latest queuePtyResize
+  // without needing it as a useCallback dependency.
+  const queuePtyResizeRef = useRef(queuePtyResize);
+  queuePtyResizeRef.current = queuePtyResize;
+
+  // measureAndResize is the single entry point for all DOM measurement + PTY
+  // resize work.  Mirrors xterm's FitAddon.proposeDimensions() by measuring
+  // terminal.element.parentElement (the FrontendPty's ownedContainer) — the
+  // exact space the terminal occupies — rather than a distant ancestor div.
+  // Reports to PaneSizingContext (which broadcasts to ALL sessions in the pane)
+  // or directly via queuePtyResize for standalone terminals.
+  const measureAndResize = useCallback(
+    (retries = 0) => {
+      if (!termRef.current) return;
+      requestAnimationFrame(() => {
+        try {
+          const term = termRef.current;
+          if (!term) return;
+          const pane = paneSizingRef.current;
+
+          const cell = getCellMetrics(term);
+          if (!cell) {
+            // Cold-path: terminal was opened off-DOM so xterm's font measurement
+            // hasn't populated yet.  Retry up to 5 times to avoid an infinite loop.
+            if (retries < 5) {
+              setTimeout(() => measureAndResizeRef.current(retries + 1), 100);
+            }
+            return;
+          }
+
+          // Measure the terminal's immediate parent (the FrontendPty's ownedContainer),
+          // matching FitAddon.proposeDimensions().  Fall back to the mount-target
+          // container for standalone terminals not using the pool.
+          const termParent = (term as unknown as { element?: HTMLElement }).element?.parentElement;
+          const measureTarget = termParent ?? (containerRef.current as HTMLElement | null);
+          if (!measureTarget) return;
+
+          const dims = measureDimensions(measureTarget, cell.width, cell.height);
+          if (!dims) return;
+          const { cols: targetCols, rows: targetRows } = dims;
+
+          if (term.cols !== targetCols || term.rows !== targetRows) {
+            term.resize(targetCols, targetRows);
+          }
+
+          if (pane) {
+            pane.reportDimensions(targetCols, targetRows);
+          } else {
+            queuePtyResizeRef.current(targetCols, targetRows);
+          }
+        } catch (e) {
+          log.warn('useTerminal: measureAndResize failed', { sessionId, error: e });
+        }
+      });
+    },
+    [sessionId, containerRef]
+  );
+
+  // Stable ref so the retry setTimeout inside measureAndResize always calls
+  // the latest version without creating a circular useCallback dependency.
+  const measureAndResizeRef = useRef(measureAndResize);
+  measureAndResizeRef.current = measureAndResize;
+
+  const applyTheme = useCallback((t?: SessionTheme) => {
+    if (!termRef.current) return;
+    termRef.current.options.theme = buildTheme(t);
+  }, []);
+
+  const setTheme = useCallback(
+    (t: SessionTheme) => {
+      applyTheme(t);
+    },
+    [applyTheme]
+  );
+
+  const focus = useCallback(() => {
+    if (document.activeElement?.closest('[role="dialog"]')) return;
+    termRef.current?.focus();
+  }, []);
+
+  const copySelectionToClipboard = useCallback(() => {
+    const selection = termRef.current?.getSelection();
+    if (selection) {
+      navigator.clipboard.writeText(selection).catch(() => {});
+    }
+  }, []);
+
+  const sendInput = useCallback(
+    (data: string, options?: { track?: boolean }) => {
+      const shouldTrack = options?.track ?? true;
+      if (shouldTrack) {
+        const submittedMessages = submittedInputBufferRef.current.feed(data);
+        for (const message of submittedMessages) {
+          if (isRealTaskInput(message)) {
+            onEnterPressRef.current?.(message);
+          }
+        }
+      }
+      void rpc.pty.sendInput(sessionId, data);
+    },
+    [sessionId]
+  );
+
+  const pasteFromClipboard = useCallback(() => {
+    navigator.clipboard
+      .readText()
+      .then((text) => {
+        if (text) sendInput(text);
+      })
+      .catch(() => {});
+  }, [sendInput]);
+
+  // ─── Main effect: mount terminal once per sessionId ────────────────────────
+
+  useEffect(() => {
+    const container = containerRef.current;
+    if (!container) return;
+
+    // ── Compute targetDims synchronously ─────────────────────────────────────
+    // Reads the previous session's terminal cell metrics before overwriting
+    // termRef. PaneSizingContext dimensions are also sampled here so the
+    // pre-resize happens against the live pane dimensions.
+    const pane = paneSizingRef.current;
+    const prevCell = termRef.current ? getCellMetrics(termRef.current) : null;
+    let targetDims: { cols: number; rows: number } | undefined;
+
+    if (pane?.containerRef.current && prevCell) {
+      const measured = measureDimensions(
+        pane.containerRef.current,
+        prevCell.width,
+        prevCell.height
+      );
+      if (measured) targetDims = measured;
+    }
+
+    if (!targetDims && pane) {
+      targetDims = pane.getCurrentDimensions() ?? undefined;
+    }
+
+    // ── Mount ─────────────────────────────────────────────────────────────────
+    // pty is pre-connected by PtySession before TerminalPane renders, so no
+    // async work is needed here.
+    const cleanups: (() => void)[] = [];
+
+    {
+      const frontendPty = pty;
+      termRef.current = frontendPty.terminal;
+
+      // Apply current theme before mounting (in case it differs from the
+      // theme the terminal was constructed with).
+      frontendPty.terminal.options.theme = buildTheme(themeRef.current);
+
+      // Mount: pre-resize then appendChild (flash-free).
+      frontendPty.mount(container as HTMLElement, targetDims);
+
+      // Always sync after mounting — targetDims may be stale if the pane was
+      // resized while this session was off-screen.  measureAndResize defers to
+      // rAF so it reads the live DOM and only calls term.resize() when needed.
+      measureAndResize();
+
+      // ── Load settings ──────────────────────────────────────────────────────
+      let customFontFamily = '';
+      void (rpc.appSettings.get('terminal') as Promise<AppSettings['terminal']>).then(
+        (terminalSettings) => {
+          if (terminalSettings?.fontFamily) {
+            customFontFamily = terminalSettings.fontFamily.trim();
+            if (customFontFamily) frontendPty.terminal.options.fontFamily = customFontFamily;
+          }
+          autoCopyOnSelectionRef.current = terminalSettings?.autoCopyOnSelection ?? false;
+        }
+      );
+
+      // ── DECRQM xterm.js 6.0 bug workaround ────────────────────────────────
+      const terminal = frontendPty.terminal;
+      try {
+        const parser = (
+          terminal as unknown as {
+            parser?: { registerCsiHandler?: (...args: unknown[]) => { dispose(): void } };
+          }
+        ).parser;
+        if (parser?.registerCsiHandler) {
+          const ansiDisp = parser.registerCsiHandler(
+            { intermediates: '$', final: 'p' },
+            (params: (number | number[])[]) => {
+              const mode = (params[0] as number) ?? 0;
+              sendInput(`\x1b[${mode};0$y`, { track: false });
+              return true;
+            }
+          );
+          const decDisp = parser.registerCsiHandler(
+            { prefix: '?', intermediates: '$', final: 'p' },
+            (params: (number | number[])[]) => {
+              const mode = (params[0] as number) ?? 0;
+              sendInput(`\x1b[?${mode};0$y`, { track: false });
+              return true;
+            }
+          );
+          cleanups.push(
+            () => ansiDisp.dispose(),
+            () => decDisp.dispose()
+          );
+        }
+      } catch (err) {
+        log.warn('useTerminal: failed to register DECRQM workaround', { error: err });
+      }
+
+      // ── Keyboard shortcuts ─────────────────────────────────────────────────
+      terminal.attachCustomKeyEventHandler((event: KeyboardEvent) => {
+        if (document.querySelector('[role="dialog"]')) return false;
+
+        if (shouldCopySelectionFromTerminal(event, IS_MAC_PLATFORM, terminal.hasSelection())) {
+          event.preventDefault();
+          event.stopImmediatePropagation();
+          event.stopPropagation();
+          copySelectionToClipboard();
+          return false;
+        }
+
+        if (shouldPasteToTerminal(event, IS_MAC_PLATFORM)) {
+          event.preventDefault();
+          event.stopImmediatePropagation();
+          event.stopPropagation();
+          pasteFromClipboard();
+          return false;
+        }
+
+        if (mapShiftEnterToCtrlJ && shouldMapShiftEnterToCtrlJ(event)) {
+          event.preventDefault();
+          event.stopImmediatePropagation();
+          event.stopPropagation();
+          sendInput(CTRL_J_ASCII);
+          return false;
+        }
+
+        if (shouldKillLineFromTerminal(event, IS_MAC_PLATFORM)) {
+          event.preventDefault();
+          event.stopImmediatePropagation();
+          event.stopPropagation();
+          sendInput(CTRL_U_ASCII);
+          return false;
+        }
+
+        if (shouldHandleInterruptFromTerminal(event)) {
+          onInterruptPressRef.current?.();
+          return true;
+        }
+
+        if (
+          IS_MAC_PLATFORM &&
+          event.metaKey &&
+          !event.ctrlKey &&
+          !event.shiftKey &&
+          !event.altKey
+        ) {
+          if (event.key === 'ArrowLeft') {
+            event.preventDefault();
+            event.stopImmediatePropagation();
+            event.stopPropagation();
+            sendInput('\x01');
+            return false;
+          }
+          if (event.key === 'ArrowRight') {
+            event.preventDefault();
+            event.stopImmediatePropagation();
+            event.stopPropagation();
+            sendInput('\x05');
+            return false;
+          }
+        }
+
+        return true;
+      });
+
+      // ── Handle terminal input ──────────────────────────────────────────────
+      const handleTerminalInput = (data: string) => {
+        onActivityRef.current?.();
+
+        let filtered = data;
+        if (!ptyStartedRef.current) {
+          filtered = data.replace(/\x1b\[I|\x1b\[O/g, '');
+        }
+        if (!filtered) return;
+
+        // First-message capture
+        if (!firstMessageSentRef.current && onFirstMessageRef.current) {
+          inputBufferRef.current += filtered;
+          const newlineIndex = inputBufferRef.current.indexOf('\r');
+          if (newlineIndex !== -1) {
+            const message = inputBufferRef.current.slice(0, newlineIndex);
+            onFirstMessageRef.current(message);
+            firstMessageSentRef.current = true;
+          }
+        }
+
+        sendInput(filtered);
+      };
+
+      const inputDisposable = terminal.onData((data) => handleTerminalInput(data));
+      cleanups.push(() => inputDisposable.dispose());
+
+      // ── ptyStartedRef — detect first PTY output ────────────────────────────
+      // FrontendPty owns the data subscription and writes directly to the
+      // terminal.  We add a lightweight IPC listener here solely to flip the
+      // ptyStartedRef flag, which is used to suppress focus-reporting escape
+      // sequences before the PTY shell has initialised.
+      const offPtyData = events.on(
+        ptyDataChannel,
+        () => {
+          ptyStartedRef.current = true;
+        },
+        sessionId
+      );
+      cleanups.push(offPtyData);
+
+      // ── Auto-copy on selection ─────────────────────────────────────────────
+      let selectionDebounceTimer: ReturnType<typeof setTimeout> | null = null;
+      const selectionDisposable = terminal.onSelectionChange(() => {
+        if (!autoCopyOnSelectionRef.current) return;
+        if (!terminal.hasSelection()) return;
+        if (selectionDebounceTimer) clearTimeout(selectionDebounceTimer);
+        selectionDebounceTimer = setTimeout(() => {
+          if (terminal.hasSelection()) copySelectionToClipboard();
+        }, 150);
+      });
+      cleanups.push(() => {
+        selectionDisposable.dispose();
+        if (selectionDebounceTimer) clearTimeout(selectionDebounceTimer);
+      });
+
+      // ── Paste from app menu ────────────────────────────────────────────────
+      const offPaste = events.on(appPasteChannel, () => {
+        pasteFromClipboard();
+      });
+      cleanups.push(offPaste);
+
+      // ── PTY exit subscription ──────────────────────────────────────────────
+      const offExit = events.on(
+        ptyExitChannel,
+        (info) => {
+          onExitRef.current?.(info as { exitCode: number | undefined; signal?: number });
+        },
+        sessionId
+      );
+      cleanups.push(offExit);
+
+      // ── Font / setting change events ───────────────────────────────────────
+      const handleFontChange = (e: Event) => {
+        const detail = (e as CustomEvent<{ fontFamily?: string }>).detail;
+        customFontFamily = detail?.fontFamily?.trim() ?? '';
+        terminal.options.fontFamily = customFontFamily || undefined;
+        measureAndResize();
+      };
+      const handleAutoCopyChange = (e: Event) => {
+        const detail = (e as CustomEvent<{ autoCopyOnSelection?: boolean }>).detail;
+        autoCopyOnSelectionRef.current = detail?.autoCopyOnSelection ?? false;
+      };
+      window.addEventListener('terminal-font-changed', handleFontChange);
+      window.addEventListener('terminal-auto-copy-changed', handleAutoCopyChange);
+      cleanups.push(
+        () => window.removeEventListener('terminal-font-changed', handleFontChange),
+        () => window.removeEventListener('terminal-auto-copy-changed', handleAutoCopyChange)
+      );
+
+      // ── ResizeObserver (observes the mount-target, not the owned container) ─
+      // Skips measuring while a panel drag is in progress; the drag-end effect
+      // below fires one measure once the drag completes.
+      const resizeObserver = new ResizeObserver(() => {
+        if (!isPanelDraggingRef.current) measureAndResize();
+      });
+      resizeObserver.observe(container);
+      cleanups.push(() => resizeObserver.disconnect());
+    }
+
+    // ── Cleanup ───────────────────────────────────────────────────────────────
+    return () => {
+      if (pendingResizeTimerRef.current) {
+        clearTimeout(pendingResizeTimerRef.current);
+        pendingResizeTimerRef.current = null;
+      }
+      // Reset dedup so the next session always gets a resize on mount.
+      lastSentResizeRef.current = null;
+      // ResizeObserver.disconnect() and other cleanups run BEFORE unmount —
+      // preserving the invariant that the ResizeObserver is torn down before
+      // the ownedContainer is reparented off-screen.
+      for (const fn of cleanups) {
+        try {
+          fn();
+        } catch {}
+      }
+      // Return terminal's ownedContainer to the off-screen host.
+      pty.unmount();
+      termRef.current = null;
+      ptyStartedRef.current = false;
+      firstMessageSentRef.current = false;
+      inputBufferRef.current = '';
+      submittedInputBufferRef.current = new SubmittedInputBuffer();
+    };
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [sessionId, pty]); // Re-run only when the session changes
+
+  // ── Theme update (after initial mount) ──────────────────────────────────────
+  useEffect(() => {
+    applyTheme(theme);
+  }, [theme, applyTheme]);
+
+  // ── Measure once when a panel drag ends ─────────────────────────────────────
+  // The ResizeObserver skips measurements during the drag; this effect fires a
+  // single measurement (which resizes the terminal and notifies PTYs) when done.
+  const prevIsPanelDraggingRef = useRef(isPanelDragging);
+  useEffect(() => {
+    const wasDragging = prevIsPanelDraggingRef.current;
+    prevIsPanelDraggingRef.current = isPanelDragging;
+    if (wasDragging && !isPanelDragging) {
+      measureAndResize();
+    }
+  }, [isPanelDragging, measureAndResize]);
+
+  return { focus, setTheme, sendInput };
+}
diff --git a/src/renderer/lib/pty/use-terminal-search.tsx b/src/renderer/lib/pty/use-terminal-search.tsx
new file mode 100644
index 0000000000..5480e3acf1
--- /dev/null
+++ b/src/renderer/lib/pty/use-terminal-search.tsx
@@ -0,0 +1,255 @@
+import type { Terminal } from '@xterm/xterm';
+import { useCallback, useEffect, useRef, useState, type RefObject } from 'react';
+import {
+  collectTerminalSearchMatches,
+  getNextTerminalSearchIndex,
+  type TerminalSearchBufferLike,
+  type TerminalSearchMatch,
+} from './terminal-search';
+
+export type TerminalSearchStatus = {
+  found: boolean;
+  currentIndex: number;
+  total: number;
+};
+
+const EMPTY_SEARCH_STATUS: TerminalSearchStatus = {
+  found: false,
+  currentIndex: 0,
+  total: 0,
+};
+
+const IS_MAC_PLATFORM =
+  typeof navigator !== 'undefined' && /Mac|iPod|iPhone|iPad/.test(navigator.platform);
+
+interface UseTerminalSearchOptions {
+  terminal: Terminal | null | undefined;
+  containerRef: RefObject<HTMLElement | null>;
+  enabled: boolean;
+  onCloseFocus?: () => void;
+}
+
+export function useTerminalSearch({
+  terminal,
+  containerRef,
+  enabled,
+  onCloseFocus,
+}: UseTerminalSearchOptions) {
+  const searchInputRef = useRef<HTMLInputElement>(null);
+  const searchedTerminalRef = useRef<Terminal | null>(null);
+  const activeSearchQueryRef = useRef('');
+  const activeSearchMatchRef = useRef<TerminalSearchMatch | null>(null);
+  const [isSearchOpen, setIsSearchOpen] = useState(false);
+  const [searchQuery, setSearchQuery] = useState('');
+  const [searchStatus, setSearchStatus] = useState<TerminalSearchStatus>(EMPTY_SEARCH_STATUS);
+
+  const resetSearchState = useCallback(() => {
+    setSearchQuery('');
+    setSearchStatus(EMPTY_SEARCH_STATUS);
+    setIsSearchOpen(false);
+  }, []);
+
+  const clearTerminalSelection = useCallback((target?: Terminal | null) => {
+    const candidate = target ?? searchedTerminalRef.current;
+    if (!candidate) return;
+    try {
+      candidate.clearSelection();
+    } catch {}
+    if (candidate === searchedTerminalRef.current) {
+      searchedTerminalRef.current = null;
+      activeSearchQueryRef.current = '';
+      activeSearchMatchRef.current = null;
+    }
+  }, []);
+
+  const runTerminalSearch = useCallback(
+    (
+      query: string,
+      options: {
+        direction?: 'next' | 'prev';
+        reset?: boolean;
+      } = {}
+    ): TerminalSearchStatus => {
+      if (!enabled || !terminal) {
+        setSearchStatus(EMPTY_SEARCH_STATUS);
+        return EMPTY_SEARCH_STATUS;
+      }
+
+      if (searchedTerminalRef.current && searchedTerminalRef.current !== terminal) {
+        clearTerminalSelection(searchedTerminalRef.current);
+      }
+
+      if (!query) {
+        clearTerminalSelection(terminal);
+        setSearchStatus(EMPTY_SEARCH_STATUS);
+        return EMPTY_SEARCH_STATUS;
+      }
+
+      const buffer = terminal.buffer?.active as TerminalSearchBufferLike | undefined;
+      if (!buffer) {
+        searchedTerminalRef.current = terminal;
+        activeSearchQueryRef.current = query;
+        activeSearchMatchRef.current = null;
+        setSearchStatus(EMPTY_SEARCH_STATUS);
+        return EMPTY_SEARCH_STATUS;
+      }
+
+      const matches = collectTerminalSearchMatches(buffer, query);
+      if (matches.length === 0) {
+        searchedTerminalRef.current = terminal;
+        activeSearchQueryRef.current = query;
+        activeSearchMatchRef.current = null;
+        try {
+          terminal.clearSelection();
+        } catch {}
+        setSearchStatus(EMPTY_SEARCH_STATUS);
+        return EMPTY_SEARCH_STATUS;
+      }
+
+      const direction = options.direction ?? 'next';
+      const currentMatch =
+        !options.reset && activeSearchQueryRef.current === query
+          ? activeSearchMatchRef.current
+          : null;
+      const matchIndex = getNextTerminalSearchIndex(matches, currentMatch, direction);
+      const match = matches[matchIndex];
+
+      searchedTerminalRef.current = terminal;
+      activeSearchQueryRef.current = query;
+      activeSearchMatchRef.current = match;
+
+      try {
+        terminal.select(match.col, match.row, match.length);
+        const contextRows = Math.max(0, Math.floor(terminal.rows / 2));
+        terminal.scrollToLine(Math.max(0, match.row - contextRows));
+      } catch {}
+
+      const result = {
+        found: true,
+        currentIndex: matchIndex + 1,
+        total: matches.length,
+      };
+      setSearchStatus(result);
+      return result;
+    },
+    [clearTerminalSelection, enabled, terminal]
+  );
+
+  const closeSearch = useCallback(() => {
+    clearTerminalSelection();
+    resetSearchState();
+    onCloseFocus?.();
+  }, [clearTerminalSelection, onCloseFocus, resetSearchState]);
+
+  const openSearch = useCallback(() => {
+    if (!enabled) return;
+    setIsSearchOpen(true);
+  }, [enabled]);
+
+  const handleSearchQueryChange = useCallback(
+    (nextQuery: string) => {
+      setSearchQuery(nextQuery);
+      if (!nextQuery) {
+        clearTerminalSelection();
+        setSearchStatus(EMPTY_SEARCH_STATUS);
+        return;
+      }
+      runTerminalSearch(nextQuery, { direction: 'next', reset: true });
+    },
+    [clearTerminalSelection, runTerminalSearch]
+  );
+
+  const stepSearch = useCallback(
+    (direction: 'next' | 'prev') => {
+      if (!searchQuery) return;
+      runTerminalSearch(searchQuery, { direction, reset: false });
+    },
+    [runTerminalSearch, searchQuery]
+  );
+
+  useEffect(() => {
+    if (!isSearchOpen) return;
+    const id = requestAnimationFrame(() => {
+      searchInputRef.current?.focus();
+      searchInputRef.current?.select();
+    });
+    return () => cancelAnimationFrame(id);
+  }, [isSearchOpen]);
+
+  useEffect(() => {
+    if (enabled || !isSearchOpen) return;
+    const id = requestAnimationFrame(() => {
+      clearTerminalSelection();
+      resetSearchState();
+      onCloseFocus?.();
+    });
+    return () => cancelAnimationFrame(id);
+  }, [clearTerminalSelection, enabled, isSearchOpen, onCloseFocus, resetSearchState]);
+
+  useEffect(() => {
+    if (searchedTerminalRef.current && searchedTerminalRef.current !== terminal) {
+      const id = requestAnimationFrame(() => {
+        clearTerminalSelection(searchedTerminalRef.current);
+        setSearchStatus(EMPTY_SEARCH_STATUS);
+      });
+      return () => cancelAnimationFrame(id);
+    }
+  }, [clearTerminalSelection, terminal]);
+
+  useEffect(() => {
+    if (!enabled || !isSearchOpen || !searchQuery || !terminal) return;
+    const id = requestAnimationFrame(() => {
+      runTerminalSearch(searchQuery, { direction: 'next', reset: true });
+    });
+    return () => cancelAnimationFrame(id);
+  }, [enabled, isSearchOpen, runTerminalSearch, searchQuery, terminal]);
+
+  useEffect(() => {
+    if (!enabled) return;
+
+    const handleSearchShortcut = (event: KeyboardEvent) => {
+      const key = event.key.toLowerCase();
+      const hasPlatformModifier = IS_MAC_PLATFORM
+        ? event.metaKey && !event.ctrlKey
+        : event.ctrlKey && !event.metaKey;
+      if (!hasPlatformModifier || event.altKey || event.shiftKey || key !== 'f') {
+        return;
+      }
+
+      const container = containerRef.current;
+      if (!container) return;
+
+      const activeElement = document.activeElement;
+      if (!activeElement || !container.contains(activeElement)) return;
+
+      event.preventDefault();
+      event.stopImmediatePropagation();
+      event.stopPropagation();
+
+      if (isSearchOpen) {
+        searchInputRef.current?.focus();
+        searchInputRef.current?.select();
+        return;
+      }
+
+      openSearch();
+    };
+
+    window.addEventListener('keydown', handleSearchShortcut, true);
+    return () => window.removeEventListener('keydown', handleSearchShortcut, true);
+  }, [containerRef, enabled, isSearchOpen, openSearch]);
+
+  useEffect(() => {
+    return () => clearTerminalSelection();
+  }, [clearTerminalSelection]);
+
+  return {
+    isSearchOpen,
+    searchQuery,
+    searchStatus,
+    searchInputRef,
+    closeSearch,
+    handleSearchQueryChange,
+    stepSearch,
+  };
+}
diff --git a/src/renderer/lib/pty/xterm-host.ts b/src/renderer/lib/pty/xterm-host.ts
new file mode 100644
index 0000000000..a023df345d
--- /dev/null
+++ b/src/renderer/lib/pty/xterm-host.ts
@@ -0,0 +1,20 @@
+let hostElement: HTMLDivElement | null = null;
+
+export function ensureXtermHost(): HTMLDivElement {
+  if (hostElement) return hostElement;
+  const el = document.createElement('div');
+  el.setAttribute('data-terminal-host', 'true');
+  Object.assign(el.style, {
+    position: 'fixed',
+    left: '-10000px',
+    top: '0px',
+    width: '1px',
+    height: '1px',
+    overflow: 'hidden',
+    pointerEvents: 'none',
+    zIndex: '-1',
+  } as CSSStyleDeclaration);
+  document.body.appendChild(el);
+  hostElement = el;
+  return el;
+}
diff --git a/src/renderer/lib/query-client.ts b/src/renderer/lib/query-client.ts
new file mode 100644
index 0000000000..6d46de5917
--- /dev/null
+++ b/src/renderer/lib/query-client.ts
@@ -0,0 +1,3 @@
+import { QueryClient } from '@tanstack/react-query';
+
+export const queryClient = new QueryClient();
diff --git a/src/renderer/lib/quickPreview.ts b/src/renderer/lib/quickPreview.ts
deleted file mode 100644
index cac92c1d96..0000000000
--- a/src/renderer/lib/quickPreview.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-declare const window: Window & {
-  electronAPI: any;
-};
-
-export async function isNodeProject(taskPath?: string): Promise<boolean> {
-  if (!taskPath) return false;
-  try {
-    const res = await window.electronAPI.fsRead(taskPath, 'package.json', 64 * 1024);
-    return !!(res?.success && typeof res.content === 'string' && res.content.includes('{'));
-  } catch {
-    return false;
-  }
-}
-
-export async function ensureCompose(taskPath?: string): Promise<boolean> {
-  if (!taskPath) return false;
-  try {
-    const candidates = ['docker-compose.yml', 'docker-compose.yaml', 'compose.yml', 'compose.yaml'];
-    for (const file of candidates) {
-      const res = await window.electronAPI.fsRead(taskPath, file, 1);
-      if (res?.success) return true;
-    }
-  } catch {}
-  // Write a minimal compose to run npm dev quickly
-  const content = `services:\n  web:\n    image: node:20\n    working_dir: /workspace\n    volumes:\n      - ./:/workspace\n    environment:\n      - HOST=0.0.0.0\n      - PORT=3000\n    command: bash -lc \"if [ -f package-lock.json ]; then npm ci; else npm install --no-package-lock; fi && npm run dev\"\n    expose:\n      - \"3000\"\n      - \"5173\"\n      - \"8080\"\n      - \"8000\"\n`;
-  try {
-    const res = await window.electronAPI.fsWriteFile(
-      taskPath,
-      'docker-compose.yml',
-      content,
-      false
-    );
-    return !!res?.success;
-  } catch {
-    return false;
-  }
-}
-
-export async function quickStartPreview(args: {
-  taskId: string;
-  taskPath: string;
-  onPreviewUrl?: (url: string) => void;
-}): Promise<{ ok: boolean; error?: string }> {
-  const { taskId, taskPath } = args;
-  try {
-    const node = await isNodeProject(taskPath);
-    if (!node) return { ok: false, error: 'Not a Node.js project (no package.json).' };
-    await ensureCompose(taskPath);
-    return { ok: true };
-  } catch (e: any) {
-    return { ok: false, error: e?.message || String(e) };
-  }
-}
diff --git a/src/renderer/lib/rpc.ts b/src/renderer/lib/rpc.ts
deleted file mode 100644
index 7be7e4cb30..0000000000
--- a/src/renderer/lib/rpc.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { createRPCClient } from '../../shared/ipc/rpc';
-import type { RpcRouter } from '../../main/ipc';
-
-const invoke = (
-  window.electronAPI as unknown as {
-    invoke: (channel: string, ...args: unknown[]) => Promise<unknown>;
-  }
-).invoke;
-
-export const rpc = createRPCClient<RpcRouter>(invoke);
diff --git a/src/renderer/lib/stores/app-state.ts b/src/renderer/lib/stores/app-state.ts
new file mode 100644
index 0000000000..3ee5e37341
--- /dev/null
+++ b/src/renderer/lib/stores/app-state.ts
@@ -0,0 +1,38 @@
+import { ProjectManagerStore } from '@renderer/features/projects/stores/project-manager';
+import { SidebarStore } from '@renderer/features/sidebar/sidebar-store';
+import { DependenciesStore } from './dependencies-store';
+import { NavigationStore } from './navigation-store';
+import { snapshotRegistry, SnapshotRegistry } from './snapshot-registry';
+import { SshConnectionStore } from './ssh-connection-store';
+import { UpdateStore } from './update-store';
+
+class AppState {
+  readonly update: UpdateStore;
+  readonly projects: ProjectManagerStore;
+  readonly sidebar: SidebarStore;
+  readonly snapshots: SnapshotRegistry;
+  readonly navigation: NavigationStore;
+  readonly dependencies: DependenciesStore;
+  readonly sshConnections: SshConnectionStore;
+
+  constructor() {
+    this.snapshots = snapshotRegistry;
+    this.update = new UpdateStore();
+    this.projects = new ProjectManagerStore();
+    this.sidebar = new SidebarStore(this.projects);
+    this.navigation = new NavigationStore();
+    this.dependencies = new DependenciesStore();
+    this.sshConnections = new SshConnectionStore({
+      onConnectionReady: (connectionId) => void this.dependencies.refreshAgents(connectionId),
+    });
+    snapshotRegistry.register('navigation', () => this.navigation.snapshot);
+    snapshotRegistry.register('sidebar', () => this.sidebar.snapshot);
+    this.dependencies.start();
+    this.sshConnections.start();
+  }
+}
+
+export const appState = new AppState();
+
+// Re-export for callers that previously imported sidebarStore from sidebar-store.ts.
+export const sidebarStore = appState.sidebar;
diff --git a/src/renderer/lib/stores/dependencies-store.test.ts b/src/renderer/lib/stores/dependencies-store.test.ts
new file mode 100644
index 0000000000..051def86f1
--- /dev/null
+++ b/src/renderer/lib/stores/dependencies-store.test.ts
@@ -0,0 +1,185 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import type { AgentProviderId } from '@shared/agent-provider-registry';
+import type { DependencyState, DependencyStatusUpdatedEvent } from '@shared/dependencies';
+import { err, ok } from '@shared/result';
+import { DependenciesStore } from './dependencies-store';
+
+let dependencyEventHandler: ((event: DependencyStatusUpdatedEvent) => void) | null = null;
+
+vi.mock('../../lib/ipc', () => ({
+  events: {
+    on: vi.fn((_channel, handler) => {
+      dependencyEventHandler = handler;
+      return () => {};
+    }),
+  },
+  rpc: {
+    dependencies: {
+      getAll: vi.fn(async () => ({})),
+      install: vi.fn(),
+      probeAll: vi.fn(async () => {}),
+      probeCategory: vi.fn(async () => {}),
+    },
+  },
+}));
+
+const { rpc } = await import('../../lib/ipc');
+
+function availableAgent(id: AgentProviderId): DependencyState {
+  return {
+    id,
+    category: 'agent' as const,
+    status: 'available' as const,
+    version: '1.0.0',
+    path: `/bin/${id}`,
+    checkedAt: 1,
+  };
+}
+
+describe('DependenciesStore install', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+    dependencyEventHandler = null;
+  });
+
+  it('updates local dependency state after a local install', async () => {
+    vi.mocked(rpc.dependencies.install).mockResolvedValueOnce(ok(availableAgent('codex')));
+    vi.mocked(rpc.dependencies.getAll).mockResolvedValueOnce({ codex: availableAgent('codex') });
+    const store = new DependenciesStore();
+
+    const result = await store.install('codex');
+
+    expect(result.success).toBe(true);
+    expect(rpc.dependencies.install).toHaveBeenCalledWith('codex', undefined);
+    expect(rpc.dependencies.probeCategory).toHaveBeenCalledWith('agent', undefined);
+    expect(store.local.data?.codex?.status).toBe('available');
+  });
+
+  it('does not update local dependency state after a failed install result', async () => {
+    vi.mocked(rpc.dependencies.install).mockResolvedValueOnce(
+      err({
+        type: 'permission-denied' as const,
+        message: 'User does not have sufficient permissions.',
+        output: 'permission denied',
+        exitCode: 243,
+      })
+    );
+    const store = new DependenciesStore();
+
+    const result = await store.install('codex');
+
+    expect(result.success).toBe(false);
+    expect(store.local.data?.codex).toBeUndefined();
+  });
+
+  it('updates remote dependency state after a remote install', async () => {
+    vi.mocked(rpc.dependencies.install).mockResolvedValueOnce(ok(availableAgent('claude')));
+    vi.mocked(rpc.dependencies.getAll).mockResolvedValueOnce({ claude: availableAgent('claude') });
+    const store = new DependenciesStore();
+    const remote = store.getRemote('ssh-1');
+    remote.setValue({});
+
+    await store.install('claude', 'ssh-1');
+
+    expect(rpc.dependencies.install).toHaveBeenCalledWith('claude', 'ssh-1');
+    expect(remote.data?.claude?.status).toBe('available');
+    expect(store.local.data?.claude).toBeUndefined();
+  });
+
+  it('preserves existing remote dependency state after a remote install', async () => {
+    vi.mocked(rpc.dependencies.install).mockResolvedValueOnce(ok(availableAgent('claude')));
+    vi.mocked(rpc.dependencies.getAll).mockResolvedValueOnce({
+      codex: availableAgent('codex'),
+      claude: availableAgent('claude'),
+    });
+    const store = new DependenciesStore();
+    const remote = store.getRemote('ssh-1');
+    remote.setValue({ codex: availableAgent('codex') });
+
+    await store.install('claude', 'ssh-1');
+
+    expect(remote.data?.codex?.status).toBe('available');
+    expect(remote.data?.claude?.status).toBe('available');
+  });
+
+  it('refreshes all remote agent states after an install when the remote state was unknown', async () => {
+    vi.mocked(rpc.dependencies.install).mockResolvedValueOnce(ok(availableAgent('claude')));
+    vi.mocked(rpc.dependencies.getAll).mockResolvedValueOnce({
+      codex: availableAgent('codex'),
+      claude: availableAgent('claude'),
+    });
+    const store = new DependenciesStore();
+
+    await store.install('claude', 'ssh-1');
+
+    expect(rpc.dependencies.probeCategory).toHaveBeenCalledWith('agent', 'ssh-1');
+    expect(rpc.dependencies.getAll).toHaveBeenCalledWith('ssh-1');
+    expect(store.getRemote('ssh-1').data?.codex?.status).toBe('available');
+    expect(store.getRemote('ssh-1').data?.claude?.status).toBe('available');
+  });
+
+  it('refreshes an existing remote dependency resource on reconnect', async () => {
+    vi.mocked(rpc.dependencies.getAll).mockResolvedValueOnce({
+      codex: availableAgent('codex'),
+      claude: availableAgent('claude'),
+    });
+    const store = new DependenciesStore();
+    const remote = store.getRemote('ssh-1');
+    remote.setValue({ codex: availableAgent('codex') });
+
+    await store.refreshAgents('ssh-1');
+
+    expect(rpc.dependencies.probeCategory).toHaveBeenCalledWith('agent', 'ssh-1');
+    expect(remote.data?.codex?.status).toBe('available');
+    expect(remote.data?.claude?.status).toBe('available');
+  });
+
+  it('creates and refreshes a remote dependency resource on reconnect', async () => {
+    vi.mocked(rpc.dependencies.getAll).mockResolvedValueOnce({
+      codex: availableAgent('codex'),
+      claude: availableAgent('claude'),
+    });
+    const store = new DependenciesStore();
+
+    await store.refreshAgents('ssh-1');
+
+    expect(rpc.dependencies.probeCategory).toHaveBeenCalledWith('agent', 'ssh-1');
+    expect(store.getRemote('ssh-1').data?.codex?.status).toBe('available');
+    expect(store.getRemote('ssh-1').data?.claude?.status).toBe('available');
+  });
+
+  it('applies streamed remote dependency events to the matching remote resource', () => {
+    const store = new DependenciesStore();
+    store.start();
+
+    dependencyEventHandler?.({
+      id: 'claude',
+      connectionId: 'ssh-1',
+      state: availableAgent('claude'),
+    });
+
+    expect(store.getRemote('ssh-1').data?.claude?.status).toBe('available');
+    expect(store.local.data?.claude).toBeUndefined();
+  });
+
+  it('tracks in-flight installs by dependency and connection', async () => {
+    let resolveInstall: (value: Awaited<ReturnType<typeof rpc.dependencies.install>>) => void;
+    vi.mocked(rpc.dependencies.install).mockReturnValueOnce(
+      new Promise((resolve) => {
+        resolveInstall = resolve;
+      })
+    );
+    vi.mocked(rpc.dependencies.getAll).mockResolvedValueOnce({ codex: availableAgent('codex') });
+    const store = new DependenciesStore();
+
+    const install = store.install('codex', 'ssh-1');
+
+    expect(store.isInstalling('codex', 'ssh-1')).toBe(true);
+    expect(store.isInstalling('codex')).toBe(false);
+
+    resolveInstall!(ok(availableAgent('codex')));
+    await install;
+
+    expect(store.isInstalling('codex', 'ssh-1')).toBe(false);
+  });
+});
diff --git a/src/renderer/lib/stores/dependencies-store.ts b/src/renderer/lib/stores/dependencies-store.ts
new file mode 100644
index 0000000000..8471c7bfca
--- /dev/null
+++ b/src/renderer/lib/stores/dependencies-store.ts
@@ -0,0 +1,184 @@
+import { action, computed, makeObservable, observable, runInAction } from 'mobx';
+import type {
+  DependencyId,
+  DependencyInstallResult,
+  DependencyState,
+  DependencyStatusMap,
+  DependencyStatusUpdatedEvent,
+} from '@shared/dependencies';
+import { dependencyStatusUpdatedChannel } from '@shared/events/appEvents';
+import { events, rpc } from '../../lib/ipc';
+import { Resource } from './resource';
+
+export class DependenciesStore {
+  readonly local: Resource<DependencyStatusMap, DependencyStatusUpdatedEvent>;
+
+  private readonly _remoteStores = new Map<string, Resource<DependencyStatusMap>>();
+  private readonly _installingDependencyKeys = observable.set<string>();
+  private readonly _inFlightInstalls = new Map<string, Promise<DependencyInstallResult>>();
+
+  constructor() {
+    makeObservable<this, '_installingDependencyKeys'>(this, {
+      _installingDependencyKeys: observable,
+      allStatuses: computed,
+      agentStatuses: computed,
+      localInstalledAgents: computed,
+      install: action,
+      probeAll: action,
+    });
+
+    this.local = new Resource<DependencyStatusMap, DependencyStatusUpdatedEvent>(async () => {
+      const result = await rpc.dependencies.getAll();
+      return (result ?? {}) as DependencyStatusMap;
+    }, [
+      {
+        kind: 'event',
+        subscribe: (handler) => events.on(dependencyStatusUpdatedChannel, handler),
+        onEvent: ({ id, state, connectionId }, ctx) => {
+          if (connectionId) {
+            const remote = this.getRemote(connectionId);
+            remote.setValue({ ...(remote.data ?? {}), [id]: state as DependencyState });
+            return;
+          }
+          ctx.set({ ...(ctx.data ?? {}), [id]: state as DependencyState });
+        },
+      },
+    ]);
+  }
+
+  // ---------------------------------------------------------------------------
+  // Computed
+  // ---------------------------------------------------------------------------
+
+  get allStatuses(): DependencyStatusMap {
+    return this.local.data ?? {};
+  }
+
+  get agentStatuses(): DependencyStatusMap {
+    return Object.fromEntries(
+      Object.entries(this.allStatuses).filter(([, s]) => s.category === 'agent')
+    );
+  }
+
+  get localInstalledAgents(): string[] {
+    return Object.entries(this.agentStatuses)
+      .filter(([, s]) => s.status === 'available')
+      .map(([id]) => id);
+  }
+
+  // ---------------------------------------------------------------------------
+  // Remote (per SSH connection)
+  // ---------------------------------------------------------------------------
+
+  /**
+   * Returns (and lazily creates) a demand-loaded Resource for a remote connection.
+   * The resource probes all agent-category dependencies over SSH then fetches
+   * the results. It loads on first observer attachment.
+   */
+  getRemote(connectionId: string): Resource<DependencyStatusMap> {
+    let store = this._remoteStores.get(connectionId);
+    if (!store) {
+      store = new Resource<DependencyStatusMap>(
+        () => this.loadAgentStatuses(connectionId),
+        [{ kind: 'demand' }]
+      );
+      this._remoteStores.set(connectionId, store);
+    }
+    return store;
+  }
+
+  /**
+   * Returns the installed agent IDs for a remote connection.
+   * Reads from the demand-loaded resource; returns [] while loading.
+   */
+  remoteInstalledAgents(connectionId: string): string[] {
+    const data = this.getRemote(connectionId).data;
+    if (!data) return [];
+    return Object.entries(data)
+      .filter(([, s]) => s.status === 'available')
+      .map(([id]) => id);
+  }
+
+  // ---------------------------------------------------------------------------
+  // Actions
+  // ---------------------------------------------------------------------------
+
+  isInstalling(id: DependencyId, connectionId?: string): boolean {
+    return this._installingDependencyKeys.has(this.installKey(id, connectionId));
+  }
+
+  async install(id: DependencyId, connectionId?: string): Promise<DependencyInstallResult> {
+    const key = this.installKey(id, connectionId);
+    const existing = this._inFlightInstalls.get(key);
+    if (existing) return existing;
+
+    const install = this.runInstall(id, connectionId, key);
+    this._inFlightInstalls.set(key, install);
+    return install;
+  }
+
+  private async runInstall(
+    id: DependencyId,
+    connectionId: string | undefined,
+    key: string
+  ): Promise<DependencyInstallResult> {
+    runInAction(() => {
+      this._installingDependencyKeys.add(key);
+    });
+
+    try {
+      const result = (await rpc.dependencies.install(id, connectionId)) as DependencyInstallResult;
+      if (!result.success) return result;
+
+      await this.refreshAgents(connectionId);
+      return result;
+    } finally {
+      this._inFlightInstalls.delete(key);
+      runInAction(() => {
+        this._installingDependencyKeys.delete(key);
+      });
+    }
+  }
+
+  async probeAll(): Promise<void> {
+    await rpc.dependencies.probeAll();
+    this.local.invalidate();
+  }
+
+  async refreshAgents(connectionId?: string): Promise<void> {
+    const statuses = await this.loadAgentStatuses(connectionId);
+    if (connectionId) {
+      this.getRemote(connectionId).setValue(statuses);
+      return;
+    }
+    this.local.setValue(statuses);
+  }
+
+  // ---------------------------------------------------------------------------
+  // Lifecycle
+  // ---------------------------------------------------------------------------
+
+  /** Activate the event subscription and trigger the initial local fetch. */
+  start(): void {
+    this.local.start();
+  }
+
+  /** Dispose all resources (timers, event listeners). */
+  dispose(): void {
+    this.local.dispose();
+    for (const store of this._remoteStores.values()) {
+      store.dispose();
+    }
+    this._remoteStores.clear();
+  }
+
+  private installKey(id: DependencyId, connectionId?: string): string {
+    return `${connectionId ?? 'local'}:${id}`;
+  }
+
+  private async loadAgentStatuses(connectionId?: string): Promise<DependencyStatusMap> {
+    await rpc.dependencies.probeCategory('agent', connectionId);
+    const all = await rpc.dependencies.getAll(connectionId);
+    return (all ?? {}) as DependencyStatusMap;
+  }
+}
diff --git a/src/renderer/lib/stores/generic-tab-view.ts b/src/renderer/lib/stores/generic-tab-view.ts
new file mode 100644
index 0000000000..3dd4c93047
--- /dev/null
+++ b/src/renderer/lib/stores/generic-tab-view.ts
@@ -0,0 +1,17 @@
+export interface TabViewProvider<TEntity, TArgs> {
+  removeTab: (tabId: string) => void;
+  addTab: (args: TArgs) => void;
+  reorderTabs: (fromIndex: number, toIndex: number) => void;
+  setNextTabActive: () => void;
+  setPreviousTabActive: () => void;
+  setTabActiveIndex: (index: number) => void;
+  setActiveTab: (id: string) => void;
+  activeTabId: string | undefined;
+  activeTab: TEntity | undefined;
+  tabs: TEntity[];
+}
+
+export type TabViewSnapshot = {
+  tabOrder: string[];
+  activeTabId: string | undefined;
+};
diff --git a/src/renderer/lib/stores/navigation-store.ts b/src/renderer/lib/stores/navigation-store.ts
new file mode 100644
index 0000000000..86946cdd45
--- /dev/null
+++ b/src/renderer/lib/stores/navigation-store.ts
@@ -0,0 +1,32 @@
+import { makeAutoObservable, toJS } from 'mobx';
+import type { NavigationSnapshot } from '@shared/view-state';
+import { ViewId, WrapParams } from '@renderer/app/view-registry';
+import type { Snapshottable } from './snapshottable';
+
+type ViewParamsStore = Partial<{ [K in ViewId]: WrapParams<K> }>;
+
+export class NavigationStore implements Snapshottable<NavigationSnapshot> {
+  currentViewId: ViewId = 'home';
+  viewParamsStore: ViewParamsStore = {};
+
+  constructor() {
+    makeAutoObservable(this);
+  }
+
+  sync(viewId: ViewId, paramsStore: ViewParamsStore): void {
+    this.currentViewId = viewId;
+    this.viewParamsStore = paramsStore;
+  }
+
+  get snapshot(): NavigationSnapshot {
+    return {
+      currentViewId: this.currentViewId,
+      viewParams: toJS(this.viewParamsStore) as Record<string, unknown>,
+    };
+  }
+
+  restoreSnapshot(snapshot: Partial<NavigationSnapshot>): void {
+    if (snapshot.currentViewId) this.currentViewId = snapshot.currentViewId as ViewId;
+    if (snapshot.viewParams) this.viewParamsStore = snapshot.viewParams as ViewParamsStore;
+  }
+}
diff --git a/src/renderer/lib/stores/resource.ts b/src/renderer/lib/stores/resource.ts
new file mode 100644
index 0000000000..0539fc7a39
--- /dev/null
+++ b/src/renderer/lib/stores/resource.ts
@@ -0,0 +1,293 @@
+import {
+  makeObservable,
+  observable,
+  onBecomeObserved,
+  onBecomeUnobserved,
+  runInAction,
+} from 'mobx';
+
+export type ResourceStrategy<T, TEventData = void> =
+  | { kind: 'demand' }
+  | {
+      kind: 'poll';
+      intervalMs: number;
+      /** Pause the interval while document.hidden */
+      pauseWhenHidden?: boolean;
+      /**
+       * Only run the interval while `data` has at least one MobX observer.
+       * The initial load still runs when the first observer attaches.
+       */
+      demandGated?: boolean;
+    }
+  | {
+      kind: 'event';
+      /** Subscribe to an event source; return an unsubscribe function. */
+      subscribe: (handler: (event: TEventData) => void) => () => void;
+      /**
+       * What to do when an event fires:
+       *   'reload'  — call load() (with optional debounce)
+       *   function  — run a custom handler inside runInAction
+       */
+      onEvent: 'reload' | ((event: TEventData, ctx: ResourceContext<T>) => void);
+      debounceMs?: number;
+    };
+
+export interface ResourceContext<T> {
+  readonly data: T | null;
+  /** Trigger a fresh fetch (debounced/deduped). */
+  reload(): void;
+  /** Replace data with a new value inside runInAction. */
+  set(newData: T): void;
+  /**
+   * Mutate data in-place inside runInAction.
+   * Only safe when T contains MobX observable collections; otherwise MobX
+   * will not detect the change — use set() for plain objects/arrays.
+   */
+  mutate(updater: (data: T) => void): void;
+}
+
+export class Resource<T, TEventData = void> {
+  data: T | null;
+  loading = false;
+  error: string | undefined = undefined;
+  lastUpdatedAt = 0;
+
+  private readonly _fetch: (() => Promise<T>) | null;
+  private readonly _strategies: ResourceStrategy<T, TEventData>[];
+  private _inFlight: Promise<void> | null = null;
+  private _stopFns: Array<() => void> = [];
+  private readonly _ctx: ResourceContext<T>;
+
+  constructor(
+    fetch: (() => Promise<T>) | null,
+    strategies: ResourceStrategy<T, TEventData>[],
+    options?: { init?: T }
+  ) {
+    this._fetch = fetch;
+    this._strategies = strategies;
+    this.data = options?.init ?? null;
+
+    makeObservable(this, {
+      data: observable,
+      loading: observable,
+      error: observable,
+      lastUpdatedAt: observable,
+    });
+
+    // Build the context object once using arrow functions that capture `this`.
+    this._ctx = {
+      get data(): T | null {
+        // Intentionally returns the resource's current data value; the getter
+        // is evaluated lazily each time the handler reads ctx.data.
+        return null; // overridden below
+      },
+      reload: () => this.invalidate(),
+      set: (newData: T) => {
+        runInAction(() => {
+          this.data = newData;
+          this.lastUpdatedAt = Date.now();
+        });
+      },
+      mutate: (updater: (data: T) => void) => {
+        runInAction(() => {
+          if (this.data !== null) updater(this.data);
+        });
+      },
+    };
+    // Replace the placeholder getter with one that reads the live field.
+    Object.defineProperty(this._ctx, 'data', {
+      get: () => this.data,
+      enumerable: true,
+      configurable: true,
+    });
+
+    // Wire demand and demandGated strategies in the constructor so
+    // onBecomeObserved fires even before start() is called.
+    for (const strategy of this._strategies) {
+      if (strategy.kind === 'demand') {
+        onBecomeObserved(this, 'data', () => {
+          void this.load();
+        });
+      } else if (strategy.kind === 'poll' && strategy.demandGated) {
+        this._wireDemandGatedPoll(strategy);
+      }
+    }
+  }
+
+  /** Fetch data, deduplicating concurrent calls. */
+  async load(): Promise<void> {
+    if (!this._fetch) return;
+    if (this._inFlight) return this._inFlight;
+
+    runInAction(() => {
+      this.loading = true;
+    });
+
+    this._inFlight = this._fetch()
+      .then((data) => {
+        runInAction(() => {
+          this.data = data;
+          this.loading = false;
+          this.error = undefined;
+          this.lastUpdatedAt = Date.now();
+        });
+      })
+      .catch((e: unknown) => {
+        runInAction(() => {
+          this.error = e instanceof Error ? e.message : String(e);
+          this.loading = false;
+        });
+      })
+      .finally(() => {
+        this._inFlight = null;
+      });
+
+    return this._inFlight;
+  }
+
+  /** Schedule a fresh load (fire-and-forget). */
+  invalidate(): void {
+    void this.load();
+  }
+
+  /**
+   * Directly replace data without going through the fetch function.
+   * Useful for stores that manage incremental data structures (e.g. FilesStore)
+   * where the caller handles the update and needs to signal MobX observers.
+   */
+  setValue(data: T): void {
+    runInAction(() => {
+      this.data = data;
+      this.lastUpdatedAt = Date.now();
+    });
+  }
+
+  /**
+   * Activate non-demand strategies (poll without demandGated, event).
+   * Call this from the owning store's start() / activate() method.
+   * Also triggers an initial load for active strategies.
+   */
+  start(): void {
+    for (const strategy of this._strategies) {
+      if (strategy.kind === 'poll' && !strategy.demandGated) {
+        this._startPoll(strategy);
+        void this.load();
+      } else if (strategy.kind === 'event') {
+        this._startEvent(strategy);
+        if (this._fetch) void this.load();
+      }
+    }
+  }
+
+  /** Stop all timers and unsubscribe all listeners. */
+  dispose(): void {
+    for (const stop of this._stopFns) stop();
+    this._stopFns = [];
+  }
+
+  private _wireDemandGatedPoll(
+    strategy: Extract<ResourceStrategy<T, TEventData>, { kind: 'poll' }>
+  ): void {
+    let timer: ReturnType<typeof setInterval> | null = null;
+    let visibilityHandler: (() => void) | null = null;
+
+    const startTimer = () => {
+      if (timer) return;
+      timer = setInterval(() => void this.load(), strategy.intervalMs);
+    };
+
+    const stopTimer = () => {
+      if (timer) {
+        clearInterval(timer);
+        timer = null;
+      }
+    };
+
+    onBecomeObserved(this, 'data', () => {
+      void this.load();
+
+      if (strategy.pauseWhenHidden) {
+        if (!document.hidden) startTimer();
+        visibilityHandler = () => {
+          if (document.hidden) stopTimer();
+          else startTimer();
+        };
+        document.addEventListener('visibilitychange', visibilityHandler);
+      } else {
+        startTimer();
+      }
+    });
+
+    onBecomeUnobserved(this, 'data', () => {
+      stopTimer();
+      if (visibilityHandler) {
+        document.removeEventListener('visibilitychange', visibilityHandler);
+        visibilityHandler = null;
+      }
+    });
+  }
+
+  private _startPoll(strategy: Extract<ResourceStrategy<T, TEventData>, { kind: 'poll' }>): void {
+    let timer: ReturnType<typeof setInterval> | null = null;
+
+    const startTimer = () => {
+      if (timer) return;
+      timer = setInterval(() => void this.load(), strategy.intervalMs);
+    };
+
+    const stopTimer = () => {
+      if (timer) {
+        clearInterval(timer);
+        timer = null;
+      }
+    };
+
+    if (strategy.pauseWhenHidden) {
+      if (!document.hidden) startTimer();
+      const handleVisibility = () => {
+        if (document.hidden) stopTimer();
+        else startTimer();
+      };
+      document.addEventListener('visibilitychange', handleVisibility);
+      this._stopFns.push(() => {
+        stopTimer();
+        document.removeEventListener('visibilitychange', handleVisibility);
+      });
+    } else {
+      startTimer();
+      this._stopFns.push(stopTimer);
+    }
+  }
+
+  private _startEvent(strategy: Extract<ResourceStrategy<T, TEventData>, { kind: 'event' }>): void {
+    let debounceTimer: ReturnType<typeof setTimeout> | null = null;
+
+    const rawHandler = (event: TEventData) => {
+      if (strategy.onEvent === 'reload') {
+        if (strategy.debounceMs) {
+          if (debounceTimer) clearTimeout(debounceTimer);
+          debounceTimer = setTimeout(() => void this.load(), strategy.debounceMs);
+        } else {
+          void this.load();
+        }
+      } else {
+        runInAction(() => {
+          (strategy.onEvent as (event: TEventData, ctx: ResourceContext<T>) => void)(
+            event,
+            this._ctx
+          );
+        });
+      }
+    };
+
+    const unsubscribe = strategy.subscribe(rawHandler);
+
+    this._stopFns.push(() => {
+      unsubscribe();
+      if (debounceTimer) {
+        clearTimeout(debounceTimer);
+        debounceTimer = null;
+      }
+    });
+  }
+}
diff --git a/src/renderer/lib/stores/snapshot-registry.ts b/src/renderer/lib/stores/snapshot-registry.ts
new file mode 100644
index 0000000000..0ebf04ce93
--- /dev/null
+++ b/src/renderer/lib/stores/snapshot-registry.ts
@@ -0,0 +1,40 @@
+import { comparer, reaction } from 'mobx';
+import { rpc } from '@renderer/lib/ipc';
+
+export class SnapshotRegistry {
+  private readonly disposers = new Map<string, () => void>();
+
+  /**
+   * Register an entity's snapshot with the registry.
+   *
+   * A MobX reaction is started that watches `getSnapshot()` and persists the
+   * result via RPC after a 1 second debounce whenever it structurally changes.
+   *
+   * Call this AFTER restoring saved state so the initial value does not trigger
+   * a spurious write (fireImmediately is false).
+   *
+   * @returns A disposer function — call it when the entity is torn down to stop
+   *          the reaction and clean up the entry.
+   */
+  register(key: string, getSnapshot: () => unknown): () => void {
+    // Clean up any stale reaction for this key before creating a new one.
+    this.disposers.get(key)?.();
+
+    const disposer = reaction(
+      () => getSnapshot(),
+      (snapshot) => {
+        void rpc.viewState.save(key, snapshot);
+      },
+      { equals: comparer.structural, delay: 1000, fireImmediately: false }
+    );
+
+    this.disposers.set(key, disposer);
+
+    return () => {
+      disposer();
+      this.disposers.delete(key);
+    };
+  }
+}
+
+export const snapshotRegistry = new SnapshotRegistry();
diff --git a/src/renderer/lib/stores/snapshottable.ts b/src/renderer/lib/stores/snapshottable.ts
new file mode 100644
index 0000000000..15edffb156
--- /dev/null
+++ b/src/renderer/lib/stores/snapshottable.ts
@@ -0,0 +1,4 @@
+export interface Snapshottable<T> {
+  readonly snapshot: T;
+  restoreSnapshot: (snapshot: Partial<T>) => void;
+}
diff --git a/src/renderer/lib/stores/ssh-connection-store.test.ts b/src/renderer/lib/stores/ssh-connection-store.test.ts
new file mode 100644
index 0000000000..ccc819befa
--- /dev/null
+++ b/src/renderer/lib/stores/ssh-connection-store.test.ts
@@ -0,0 +1,58 @@
+import { describe, expect, it, vi } from 'vitest';
+import type { SshConnectionEvent } from '@shared/events/sshEvents';
+import { SshConnectionStore } from './ssh-connection-store';
+
+let sshEventHandler: ((event: SshConnectionEvent) => void) | null = null;
+
+vi.mock('@renderer/lib/ipc', () => ({
+  events: {
+    on: vi.fn((_channel, handler: (event: SshConnectionEvent) => void) => {
+      sshEventHandler = handler;
+      return () => {};
+    }),
+  },
+  rpc: {
+    ssh: {
+      connect: vi.fn(async () => {}),
+      deleteConnection: vi.fn(async () => {}),
+      getConnections: vi.fn(async () => []),
+      getConnectionState: vi.fn(async () => ({})),
+      renameConnection: vi.fn(async () => {}),
+      saveConnection: vi.fn(async (config) => ({ ...config, id: 'ssh-1' })),
+      testConnection: vi.fn(async () => ({ success: true })),
+    },
+  },
+}));
+
+const { rpc } = await import('@renderer/lib/ipc');
+
+describe('SshConnectionStore', () => {
+  it('notifies when an SSH connection becomes ready', () => {
+    const onConnectionReady = vi.fn();
+    const store = new SshConnectionStore({ onConnectionReady });
+    store.start();
+
+    sshEventHandler?.({ type: 'connected', connectionId: 'ssh-1' });
+    sshEventHandler?.({ type: 'reconnected', connectionId: 'ssh-1' });
+    sshEventHandler?.({ type: 'disconnected', connectionId: 'ssh-1' });
+
+    expect(onConnectionReady).toHaveBeenCalledTimes(2);
+    expect(onConnectionReady).toHaveBeenNthCalledWith(1, 'ssh-1');
+    expect(onConnectionReady).toHaveBeenNthCalledWith(2, 'ssh-1');
+  });
+
+  it('notifies for initially connected SSH connections', async () => {
+    vi.mocked(rpc.ssh.getConnectionState).mockResolvedValueOnce({
+      'ssh-1': 'connected',
+      'ssh-2': 'disconnected',
+    });
+    const onConnectionReady = vi.fn();
+    const store = new SshConnectionStore({ onConnectionReady });
+
+    store.start();
+    await store.connectionStatesResource.load();
+
+    expect(onConnectionReady).toHaveBeenCalledWith('ssh-1');
+    expect(onConnectionReady).not.toHaveBeenCalledWith('ssh-2');
+  });
+});
diff --git a/src/renderer/lib/stores/ssh-connection-store.ts b/src/renderer/lib/stores/ssh-connection-store.ts
new file mode 100644
index 0000000000..ab4ced79f4
--- /dev/null
+++ b/src/renderer/lib/stores/ssh-connection-store.ts
@@ -0,0 +1,182 @@
+import { action, computed, makeObservable, observable, runInAction } from 'mobx';
+import { sshConnectionEventChannel, type SshConnectionEvent } from '@shared/events/sshEvents';
+import type { ConnectionState, ConnectionTestResult, SshConfig } from '@shared/ssh';
+import { events, rpc } from '@renderer/lib/ipc';
+import { Resource } from './resource';
+
+type SaveConnectionInput = Partial<Pick<SshConfig, 'id'>> &
+  Omit<SshConfig, 'id'> & { password?: string; passphrase?: string };
+
+type SshConnectionStoreOptions = {
+  onConnectionReady?: (connectionId: string) => void;
+};
+
+function toConnectionState(event: SshConnectionEvent): ConnectionState {
+  switch (event.type) {
+    case 'connected':
+    case 'reconnected':
+      return 'connected';
+    case 'connecting':
+      return 'connecting';
+    case 'reconnecting':
+      return 'reconnecting';
+    case 'disconnected':
+    case 'reconnect-failed':
+      return 'disconnected';
+    case 'error':
+      return 'error';
+  }
+}
+
+export class SshConnectionStore {
+  readonly connectionsResource: Resource<SshConfig[]>;
+  readonly connectionStatesResource: Resource<Record<string, ConnectionState>, SshConnectionEvent>;
+
+  private pendingMutations = 0;
+  private started = false;
+  private readonly onConnectionReady?: (connectionId: string) => void;
+
+  constructor({ onConnectionReady }: SshConnectionStoreOptions = {}) {
+    this.onConnectionReady = onConnectionReady;
+    this.connectionsResource = new Resource<SshConfig[]>(() => rpc.ssh.getConnections(), []);
+
+    this.connectionStatesResource = new Resource<
+      Record<string, ConnectionState>,
+      SshConnectionEvent
+    >(async () => {
+      const states = await rpc.ssh.getConnectionState();
+      for (const [connectionId, state] of Object.entries(states)) {
+        if (state === 'connected') this.onConnectionReady?.(connectionId);
+      }
+      return states;
+    }, [
+      {
+        kind: 'event',
+        subscribe: (handler) => events.on(sshConnectionEventChannel, handler),
+        onEvent: (event, ctx) => {
+          const next = { ...(ctx.data ?? {}) };
+          next[event.connectionId] = toConnectionState(event);
+          ctx.set(next);
+          if (event.type === 'connected' || event.type === 'reconnected') {
+            this.onConnectionReady?.(event.connectionId);
+          }
+        },
+      },
+    ]);
+
+    makeObservable<SshConnectionStore, 'pendingMutations'>(this, {
+      pendingMutations: observable,
+      connections: computed,
+      connectionStates: computed,
+      isLoading: computed,
+      start: action,
+      dispose: action,
+    });
+  }
+
+  get connections(): SshConfig[] {
+    return this.connectionsResource.data ?? [];
+  }
+
+  get connectionStates(): Record<string, ConnectionState> {
+    return this.connectionStatesResource.data ?? {};
+  }
+
+  get isLoading(): boolean {
+    return (
+      this.connectionsResource.loading ||
+      this.connectionStatesResource.loading ||
+      this.pendingMutations > 0
+    );
+  }
+
+  start(): void {
+    if (this.started) return;
+    this.started = true;
+    this.connectionStatesResource.start();
+    void this.connectionsResource.load();
+  }
+
+  dispose(): void {
+    this.connectionsResource.dispose();
+    this.connectionStatesResource.dispose();
+    this.started = false;
+  }
+
+  stateFor(connectionId: string): ConnectionState {
+    return this.connectionStates[connectionId] ?? 'disconnected';
+  }
+
+  async connect(connectionId: string): Promise<void> {
+    const state = this.stateFor(connectionId);
+    if (state === 'connected' || state === 'connecting' || state === 'reconnecting') {
+      return;
+    }
+    await rpc.ssh.connect(connectionId);
+  }
+
+  async saveConnection(config: SaveConnectionInput): Promise<SshConfig> {
+    return await this.withMutation(async () => {
+      const savedConnection = await rpc.ssh.saveConnection(config);
+      this.connectionsResource.setValue(this.upsertConnection(savedConnection));
+      return savedConnection;
+    });
+  }
+
+  async renameConnection(id: string, name: string): Promise<void> {
+    await this.withMutation(async () => {
+      await rpc.ssh.renameConnection(id, name);
+      const current = this.connectionsResource.data ?? [];
+      this.connectionsResource.setValue(
+        current.map((connection) => (connection.id === id ? { ...connection, name } : connection))
+      );
+    });
+  }
+
+  async deleteConnection(id: string): Promise<void> {
+    await this.withMutation(async () => {
+      await rpc.ssh.deleteConnection(id);
+
+      const currentConnections = this.connectionsResource.data ?? [];
+      this.connectionsResource.setValue(
+        currentConnections.filter((connection) => connection.id !== id)
+      );
+
+      const currentStates = this.connectionStatesResource.data ?? {};
+      if (id in currentStates) {
+        const { [id]: _removed, ...rest } = currentStates;
+        this.connectionStatesResource.setValue(rest);
+      }
+    });
+  }
+
+  async testConnection(
+    config: SshConfig & { password?: string; passphrase?: string }
+  ): Promise<ConnectionTestResult> {
+    return await rpc.ssh.testConnection(config);
+  }
+
+  private upsertConnection(savedConnection: SshConfig): SshConfig[] {
+    const current = this.connectionsResource.data ?? [];
+    const index = current.findIndex((connection) => connection.id === savedConnection.id);
+    if (index === -1) return [...current, savedConnection];
+
+    const next = [...current];
+    next[index] = savedConnection;
+    return next;
+  }
+
+  private async withMutation<T>(run: () => Promise<T>): Promise<T> {
+    runInAction(() => {
+      this.pendingMutations += 1;
+    });
+
+    try {
+      return await run();
+    } finally {
+      runInAction(() => {
+        this.pendingMutations = Math.max(0, this.pendingMutations - 1);
+      });
+    }
+  }
+}
diff --git a/src/renderer/lib/stores/tab-utils.ts b/src/renderer/lib/stores/tab-utils.ts
new file mode 100644
index 0000000000..0edb196b71
--- /dev/null
+++ b/src/renderer/lib/stores/tab-utils.ts
@@ -0,0 +1,50 @@
+export interface TabOrderState {
+  tabOrder: string[];
+  activeTabId: string | undefined;
+}
+
+export function addTabId(state: TabOrderState, id: string): void {
+  if (!state.tabOrder.includes(id)) {
+    state.tabOrder.push(id);
+  }
+}
+
+export function removeTabId(state: TabOrderState, id: string): void {
+  const idx = state.tabOrder.indexOf(id);
+  if (idx === -1) return;
+  state.tabOrder.splice(idx, 1);
+  if (state.activeTabId === id) {
+    state.activeTabId = state.tabOrder[idx] ?? state.tabOrder[idx - 1];
+  }
+}
+
+export function setTabActive(state: TabOrderState, id: string): void {
+  state.activeTabId = id;
+}
+
+export function reorderTabIds(state: TabOrderState, fromIndex: number, toIndex: number): void {
+  if (fromIndex === toIndex) return;
+  const [tab] = state.tabOrder.splice(fromIndex, 1);
+  state.tabOrder.splice(toIndex, 0, tab);
+}
+
+export function setNextTabActive(state: TabOrderState): void {
+  if (!state.activeTabId) return;
+  const next = state.tabOrder[state.tabOrder.indexOf(state.activeTabId) + 1];
+  if (next) state.activeTabId = next;
+}
+
+export function setPreviousTabActive(state: TabOrderState): void {
+  if (!state.activeTabId) return;
+  const prev = state.tabOrder[state.tabOrder.indexOf(state.activeTabId) - 1];
+  if (prev) state.activeTabId = prev;
+}
+
+export function setTabActiveIndex(state: TabOrderState, index: number): void {
+  if (index < 0 || state.tabOrder.length === 0) return;
+  if (index >= state.tabOrder.length) {
+    state.activeTabId = state.tabOrder[state.tabOrder.length - 1];
+  } else {
+    state.activeTabId = state.tabOrder[index];
+  }
+}
diff --git a/src/renderer/lib/stores/update-store.ts b/src/renderer/lib/stores/update-store.ts
new file mode 100644
index 0000000000..449f720cb2
--- /dev/null
+++ b/src/renderer/lib/stores/update-store.ts
@@ -0,0 +1,251 @@
+import { action, computed, makeObservable, observable, runInAction } from 'mobx';
+import { toast } from 'sonner';
+import { menuCheckForUpdatesChannel } from '@shared/events/appEvents';
+import {
+  updateAvailableEvent,
+  updateCheckingEvent,
+  updateDownloadedEvent,
+  updateDownloadingEvent,
+  updateErrorEvent,
+  updateInstallingEvent,
+  updateNotAvailableEvent,
+  updateProgressEvent,
+} from '@shared/events/updateEvents';
+import { events, rpc } from '@renderer/lib/ipc';
+
+const LAST_NOTIFIED_KEY = 'emdash:update:lastNotified';
+const SNOOZE_HOURS = 6;
+
+type DownloadProgress = {
+  percent?: number;
+  transferred?: number;
+  total?: number;
+  bytesPerSecond?: number;
+};
+
+export type UpdateState =
+  | { status: 'idle' }
+  | { status: 'checking' }
+  | { status: 'available'; info?: { version: string } }
+  | { status: 'not-available' }
+  | { status: 'downloading'; progress?: DownloadProgress }
+  | { status: 'downloaded' }
+  | { status: 'installing' }
+  | { status: 'error'; message: string };
+
+export class UpdateStore {
+  state: UpdateState = { status: 'idle' };
+  currentVersion = '';
+  availableVersion: string | undefined = undefined;
+
+  constructor() {
+    makeObservable(this, {
+      state: observable,
+      currentVersion: observable,
+      availableVersion: observable,
+      setState: action,
+      hasUpdate: computed,
+      progressLabel: computed,
+    });
+  }
+
+  get hasUpdate(): boolean {
+    const { status } = this.state;
+    return status === 'available' || status === 'downloading' || status === 'downloaded';
+  }
+
+  setState(state: UpdateState): void {
+    this.state = state;
+  }
+
+  get progressLabel(): string {
+    if (this.state.status !== 'downloading') return '';
+    const p = this.state.progress?.percent ?? 0;
+    return `${p.toFixed(0)}%`;
+  }
+
+  start(): void {
+    rpc.app.getAppVersion().then((v) => {
+      runInAction(() => {
+        this.currentVersion = v;
+      });
+    });
+
+    events.on(updateCheckingEvent, () => {
+      runInAction(() => {
+        this.state = { status: 'checking' };
+      });
+    });
+
+    events.on(updateAvailableEvent, (d) => {
+      runInAction(() => {
+        this.availableVersion = d.version;
+        this.state = { status: 'available', info: { version: d.version } };
+      });
+      this._maybeToastAvailable(d.version);
+    });
+
+    events.on(updateNotAvailableEvent, () => {
+      runInAction(() => {
+        this.state = { status: 'not-available' };
+      });
+    });
+
+    events.on(updateDownloadingEvent, (_d) => {
+      runInAction(() => {
+        this.state = { status: 'downloading', progress: { percent: 0 } };
+      });
+    });
+
+    events.on(updateProgressEvent, (d) => {
+      runInAction(() => {
+        this.state = {
+          status: 'downloading',
+          progress: {
+            percent: d.percent,
+            transferred: d.transferred,
+            total: d.total,
+            bytesPerSecond: d.bytesPerSecond,
+          },
+        };
+      });
+    });
+
+    events.on(updateDownloadedEvent, () => {
+      runInAction(() => {
+        this.state = { status: 'downloaded' };
+      });
+    });
+
+    events.on(updateInstallingEvent, () => {
+      runInAction(() => {
+        this.state = { status: 'installing' };
+      });
+    });
+
+    events.on(updateErrorEvent, (d) => {
+      runInAction(() => {
+        this.state = { status: 'error', message: d.message };
+      });
+    });
+
+    events.on(menuCheckForUpdatesChannel, () => {
+      rpc.update.check().catch(() => {});
+    });
+
+    rpc.update.check().catch(() => {});
+  }
+
+  async check(): Promise<void> {
+    runInAction(() => {
+      this.state = { status: 'checking' };
+    });
+    try {
+      const res = await rpc.update.check();
+      if (!res) {
+        runInAction(() => {
+          this.state = { status: 'error', message: 'Update API unavailable' };
+        });
+        return;
+      }
+      if (!res.success) {
+        runInAction(() => {
+          this.state = { status: 'error', message: res.error ?? 'Failed to check for updates' };
+        });
+      } else if (res.result === null) {
+        runInAction(() => {
+          this.state = { status: 'idle' };
+        });
+      }
+    } catch {
+      runInAction(() => {
+        this.state = { status: 'error', message: 'Failed to check for updates' };
+      });
+    }
+  }
+
+  async download(): Promise<void> {
+    try {
+      const res = await rpc.update.download();
+      if (!res) {
+        runInAction(() => {
+          this.state = { status: 'error', message: 'Update API unavailable' };
+        });
+        return;
+      }
+      if (!res.success) {
+        const message = res.error ?? 'Failed to download update';
+        runInAction(() => {
+          this.state = { status: 'error', message };
+        });
+      }
+    } catch {
+      runInAction(() => {
+        this.state = { status: 'error', message: 'Failed to download update' };
+      });
+    }
+  }
+
+  async install(): Promise<void> {
+    runInAction(() => {
+      this.state = { status: 'installing' };
+    });
+    try {
+      const res = await rpc.update.quitAndInstall();
+      if (!res) {
+        runInAction(() => {
+          this.state = { status: 'error', message: 'Update API unavailable' };
+        });
+        return;
+      }
+      if (!res.success) {
+        runInAction(() => {
+          this.state = { status: 'error', message: res.error ?? 'Failed to install update' };
+        });
+      }
+    } catch {
+      runInAction(() => {
+        this.state = { status: 'error', message: 'Failed to install update' };
+      });
+    }
+  }
+
+  async openLatest(): Promise<void> {
+    try {
+      await rpc.update.openLatest();
+    } catch {
+      // openLatest quits the app — errors are best-effort
+    }
+  }
+
+  private _maybeToastAvailable(version: string): void {
+    if (!this._shouldNotify(version)) return;
+    toast('Update Available', {
+      description: `Version ${version} is ready. Go to Settings to upgrade.`,
+    });
+    this._rememberNotified(version);
+  }
+
+  private _shouldNotify(version: string): boolean {
+    try {
+      const raw = localStorage.getItem(LAST_NOTIFIED_KEY);
+      if (!raw) return true;
+      const parsed = JSON.parse(raw) as { version?: string; at?: number };
+      if (parsed.version === version) {
+        const at = parsed.at ?? 0;
+        if (Date.now() - at < Math.max(1, SNOOZE_HOURS) * 3_600_000) return false;
+      }
+      return true;
+    } catch {
+      return true;
+    }
+  }
+
+  private _rememberNotified(version: string): void {
+    try {
+      localStorage.setItem(LAST_NOTIFIED_KEY, JSON.stringify({ version, at: Date.now() }));
+    } catch {
+      // localStorage may be unavailable
+    }
+  }
+}
diff --git a/src/renderer/lib/taskCreationService.ts b/src/renderer/lib/taskCreationService.ts
deleted file mode 100644
index 0a0fdab008..0000000000
--- a/src/renderer/lib/taskCreationService.ts
+++ /dev/null
@@ -1,459 +0,0 @@
-import type { Agent } from '../types';
-import type { Project, Task } from '../types/app';
-import type { AgentRun, TaskMetadata } from '../types/chat';
-import { type GitHubIssueSummary } from '../types/github';
-import { type JiraIssueSummary } from '../types/jira';
-import { type LinearIssueSummary } from '../types/linear';
-import { rpc } from './rpc';
-
-export interface CreateTaskParams {
-  project: Project;
-  taskName: string;
-  initialPrompt?: string;
-  agentRuns: AgentRun[];
-  linkedLinearIssue: LinearIssueSummary | null;
-  linkedGithubIssue: GitHubIssueSummary | null;
-  linkedJiraIssue: JiraIssueSummary | null;
-  autoApprove?: boolean;
-  nameGenerated?: boolean;
-  useWorktree: boolean;
-  baseRef?: string;
-}
-
-export interface CreateTaskResult {
-  task: Task;
-  /** Non-fatal warning to surface in a toast (e.g. base-ref switch failure). */
-  warning?: string;
-}
-
-async function runSetupOnCreate(
-  taskId: string,
-  taskPath: string,
-  projectPath: string,
-  taskName: string
-): Promise<void> {
-  try {
-    const result = await window.electronAPI.lifecycleSetup({
-      taskId,
-      taskPath,
-      projectPath,
-      taskName,
-    });
-    if (!result?.success && !result?.skipped) {
-      const { log } = await import('./logger');
-      log.warn(`Setup script failed for task "${taskName}"`, result?.error);
-    }
-  } catch (error) {
-    const { log } = await import('./logger');
-    log.warn(`Setup script error for task "${taskName}"`, error as any);
-  }
-}
-
-// ---------------------------------------------------------------------------
-// Seed conversation with issue context after task creation (fire-and-forget).
-// ---------------------------------------------------------------------------
-function seedIssueContext(taskId: string, taskMetadata: TaskMetadata | null): void {
-  void (async () => {
-    const hasIssueContext =
-      taskMetadata?.linearIssue || taskMetadata?.githubIssue || taskMetadata?.jiraIssue;
-    if (!hasIssueContext) return;
-
-    let conversationId: string | undefined;
-    try {
-      const conversation = await rpc.db.getOrCreateDefaultConversation(taskId);
-      if (conversation?.id) conversationId = conversation.id;
-    } catch (error) {
-      const { log } = await import('./logger');
-      log.error('Failed to get or create default conversation:', error as any);
-    }
-    if (!conversationId) return;
-
-    if (taskMetadata?.linearIssue) {
-      try {
-        const issue = taskMetadata.linearIssue;
-        const detailParts: string[] = [];
-        const stateName = issue.state?.name?.trim();
-        const assigneeName = issue.assignee?.displayName?.trim() || issue.assignee?.name?.trim();
-        const teamKey = issue.team?.key?.trim();
-        const projectName = issue.project?.name?.trim();
-        if (stateName) detailParts.push(`State: ${stateName}`);
-        if (assigneeName) detailParts.push(`Assignee: ${assigneeName}`);
-        if (teamKey) detailParts.push(`Team: ${teamKey}`);
-        if (projectName) detailParts.push(`Project: ${projectName}`);
-        const lines = [`Linked Linear issue: ${issue.identifier} — ${issue.title}`];
-        if (detailParts.length) lines.push(`Details: ${detailParts.join(' • ')}`);
-        if (issue.url) lines.push(`URL: ${issue.url}`);
-        if ((issue as any)?.description) {
-          lines.push('');
-          lines.push('Issue Description:');
-          lines.push(String((issue as any).description).trim());
-        }
-        await rpc.db.saveMessage({
-          id: `linear-context-${taskId}`,
-          conversationId,
-          content: lines.join('\n'),
-          sender: 'agent',
-          metadata: JSON.stringify({ isLinearContext: true, linearIssue: issue }),
-        });
-      } catch (seedError) {
-        const { log } = await import('./logger');
-        log.error('Failed to seed task with Linear issue context:', seedError as any);
-      }
-    }
-
-    if (taskMetadata?.githubIssue) {
-      try {
-        const issue = taskMetadata.githubIssue;
-        const detailParts: string[] = [];
-        const stateName = issue.state?.toString()?.trim();
-        const assignees = Array.isArray(issue.assignees)
-          ? issue.assignees
-              .map((a) => a?.name || a?.login)
-              .filter(Boolean)
-              .join(', ')
-          : '';
-        const labels = Array.isArray(issue.labels)
-          ? issue.labels
-              .map((l) => l?.name)
-              .filter(Boolean)
-              .join(', ')
-          : '';
-        if (stateName) detailParts.push(`State: ${stateName}`);
-        if (assignees) detailParts.push(`Assignees: ${assignees}`);
-        if (labels) detailParts.push(`Labels: ${labels}`);
-        const lines = [`Linked GitHub issue: #${issue.number} — ${issue.title}`];
-        if (detailParts.length) lines.push(`Details: ${detailParts.join(' • ')}`);
-        if (issue.url) lines.push(`URL: ${issue.url}`);
-        if ((issue as any)?.body) {
-          lines.push('');
-          lines.push('Issue Description:');
-          lines.push(String((issue as any).body).trim());
-        }
-        await rpc.db.saveMessage({
-          id: `github-context-${taskId}`,
-          conversationId,
-          content: lines.join('\n'),
-          sender: 'agent',
-          metadata: JSON.stringify({ isGitHubContext: true, githubIssue: issue }),
-        });
-      } catch (seedError) {
-        const { log } = await import('./logger');
-        log.error('Failed to seed task with GitHub issue context:', seedError as any);
-      }
-    }
-
-    if (taskMetadata?.jiraIssue) {
-      try {
-        const issue: any = taskMetadata.jiraIssue;
-        const lines: string[] = [];
-        const line1 =
-          `Linked Jira issue: ${issue.key || ''}${issue.summary ? ` — ${issue.summary}` : ''}`.trim();
-        if (line1) lines.push(line1);
-        const details: string[] = [];
-        if (issue.status?.name) details.push(`Status: ${issue.status.name}`);
-        if (issue.assignee?.displayName || issue.assignee?.name)
-          details.push(`Assignee: ${issue.assignee?.displayName || issue.assignee?.name}`);
-        if (issue.project?.key) details.push(`Project: ${issue.project.key}`);
-        if (details.length) lines.push(`Details: ${details.join(' • ')}`);
-        if (issue.url) lines.push(`URL: ${issue.url}`);
-        await rpc.db.saveMessage({
-          id: `jira-context-${taskId}`,
-          conversationId,
-          content: lines.join('\n'),
-          sender: 'agent',
-          metadata: JSON.stringify({ isJiraContext: true, jiraIssue: issue }),
-        });
-      } catch (seedError) {
-        const { log } = await import('./logger');
-        log.error('Failed to seed task with Jira issue context:', seedError as any);
-      }
-    }
-  })();
-}
-
-// ---------------------------------------------------------------------------
-// Core task creation — pure backend function, no cache/UI knowledge.
-// Throws on unrecoverable errors; returns a warning string for soft failures.
-// ---------------------------------------------------------------------------
-export async function createTask(params: CreateTaskParams): Promise<CreateTaskResult> {
-  const {
-    project,
-    taskName,
-    initialPrompt,
-    agentRuns,
-    linkedLinearIssue,
-    linkedGithubIssue,
-    linkedJiraIssue,
-    autoApprove,
-    nameGenerated,
-    useWorktree,
-    baseRef,
-  } = params;
-
-  // Build prompt prefix from linked issues
-  let preparedPrompt: string | undefined;
-  if (initialPrompt && initialPrompt.trim()) {
-    const parts: string[] = [];
-    if (linkedLinearIssue) {
-      parts.push(`Linear: ${linkedLinearIssue.identifier} — ${linkedLinearIssue.title}`);
-      if (linkedLinearIssue.url) parts.push(`URL: ${linkedLinearIssue.url}`);
-      parts.push('');
-    }
-    if (linkedGithubIssue) {
-      parts.push(`GitHub: #${linkedGithubIssue.number} — ${linkedGithubIssue.title}`);
-      if (linkedGithubIssue.url) parts.push(`URL: ${linkedGithubIssue.url}`);
-      parts.push('');
-    }
-    parts.push(initialPrompt.trim());
-    preparedPrompt = parts.join('\n');
-  }
-
-  const taskMetadata: TaskMetadata | null =
-    linkedLinearIssue ||
-    linkedJiraIssue ||
-    linkedGithubIssue ||
-    preparedPrompt ||
-    autoApprove ||
-    nameGenerated
-      ? {
-          linearIssue: linkedLinearIssue ?? null,
-          jiraIssue: linkedJiraIssue ?? null,
-          githubIssue: linkedGithubIssue ?? null,
-          initialPrompt: preparedPrompt ?? null,
-          autoApprove: autoApprove ?? null,
-          nameGenerated: nameGenerated ?? null,
-        }
-      : null;
-
-  const totalRuns = agentRuns.reduce((sum, ar) => sum + ar.runs, 0);
-  const isMultiAgent = totalRuns > 1;
-  const primaryAgent = agentRuns[0]?.agent || 'claude';
-
-  // ---------------------------------------------------------------------------
-  // Multi-agent path
-  // ---------------------------------------------------------------------------
-  if (isMultiAgent) {
-    const groupId = `ws-${taskName}-${Date.now()}`;
-    const variants: Array<{
-      id: string;
-      agent: Agent;
-      name: string;
-      branch: string;
-      path: string;
-      worktreeId: string;
-    }> = [];
-
-    try {
-      for (const { agent, runs } of agentRuns) {
-        for (let instanceIdx = 1; instanceIdx <= runs; instanceIdx++) {
-          const instanceSuffix = runs > 1 ? `-${instanceIdx}` : '';
-          const variantName = `${taskName}-${agent.toLowerCase()}${instanceSuffix}`;
-
-          let branch: string;
-          let path: string;
-          let worktreeId: string;
-
-          if (useWorktree) {
-            const worktreeResult = await window.electronAPI.worktreeCreate({
-              projectPath: project.path,
-              taskName: variantName,
-              projectId: project.id,
-              baseRef,
-            });
-            if (!worktreeResult?.success || !worktreeResult.worktree) {
-              throw new Error(
-                worktreeResult?.error || `Failed to create worktree for ${agent}${instanceSuffix}`
-              );
-            }
-            const worktree = worktreeResult.worktree;
-            branch = worktree.branch;
-            path = worktree.path;
-            worktreeId = worktree.id;
-          } else {
-            branch = project.gitInfo.branch || 'main';
-            path = project.path;
-            worktreeId = `direct-${taskName}-${agent.toLowerCase()}${instanceSuffix}`;
-          }
-
-          variants.push({
-            id: `${taskName}-${agent.toLowerCase()}${instanceSuffix}`,
-            agent,
-            name: variantName,
-            branch,
-            path,
-            worktreeId,
-          });
-        }
-      }
-    } catch (error) {
-      // Clean up any worktrees created before the failure
-      for (const variant of variants) {
-        if (variant.worktreeId && !variant.worktreeId.startsWith('direct-')) {
-          window.electronAPI
-            .worktreeRemove({ projectPath: project.path, worktreeId: variant.worktreeId })
-            .catch(() => {});
-        }
-      }
-      const { log } = await import('./logger');
-      log.error('Failed to create multi-agent worktrees:', error as Error);
-      throw error;
-    }
-
-    const finalMeta: TaskMetadata = {
-      ...(taskMetadata || {}),
-      multiAgent: {
-        enabled: true,
-        maxAgents: 4,
-        agentRuns,
-        variants,
-        selectedAgent: null,
-      },
-    };
-
-    const finalTask: Task = {
-      id: groupId,
-      projectId: project.id,
-      name: taskName,
-      branch: variants[0]?.branch || project.gitInfo.branch || 'main',
-      path: variants[0]?.path || project.path,
-      status: 'idle',
-      agentId: primaryAgent,
-      metadata: finalMeta,
-      useWorktree,
-    };
-
-    try {
-      await rpc.db.saveTask({
-        ...finalTask,
-        agentId: primaryAgent,
-        metadata: finalMeta,
-        useWorktree,
-      });
-    } catch (saveErr) {
-      const { log } = await import('./logger');
-      log.error('Failed to save multi-agent task:', saveErr);
-      for (const variant of variants) {
-        if (variant.worktreeId && !variant.worktreeId.startsWith('direct-')) {
-          window.electronAPI
-            .worktreeRemove({ projectPath: project.path, worktreeId: variant.worktreeId })
-            .catch(() => {});
-        }
-      }
-      throw saveErr;
-    }
-
-    // Background: setup per variant + telemetry
-    for (const variant of variants) {
-      void runSetupOnCreate(variant.worktreeId, variant.path, project.path, variant.name);
-    }
-    void import('./telemetryClient').then(({ captureTelemetry }) => {
-      captureTelemetry('task_created', {
-        provider: 'multi',
-        has_initial_prompt: !!taskMetadata?.initialPrompt,
-      });
-      if (linkedGithubIssue) captureTelemetry('task_created_with_issue', { source: 'github' });
-      if (linkedLinearIssue) captureTelemetry('task_created_with_issue', { source: 'linear' });
-      if (linkedJiraIssue) captureTelemetry('task_created_with_issue', { source: 'jira' });
-    });
-
-    return { task: finalTask };
-  }
-
-  // ---------------------------------------------------------------------------
-  // Single-agent path
-  // ---------------------------------------------------------------------------
-  let branch: string;
-  let path: string;
-  let taskId: string;
-  let taskPersistedInClaim = false;
-  let warning: string | undefined;
-
-  if (useWorktree) {
-    const claimAndSaveResult = await window.electronAPI.worktreeClaimReserveAndSaveTask({
-      projectId: project.id,
-      projectPath: project.path,
-      taskName,
-      baseRef,
-      task: {
-        projectId: project.id,
-        name: taskName,
-        status: 'idle',
-        agentId: primaryAgent,
-        metadata: taskMetadata,
-        useWorktree,
-      },
-    });
-
-    if (claimAndSaveResult.success && claimAndSaveResult.worktree) {
-      const worktree = claimAndSaveResult.worktree;
-      branch = worktree.branch;
-      path = worktree.path;
-      taskId = worktree.id;
-      taskPersistedInClaim = true;
-      if (claimAndSaveResult.needsBaseRefSwitch) {
-        warning = `Could not switch to ${baseRef}. Task created on default branch.`;
-      }
-    } else {
-      const worktreeResult = await window.electronAPI.worktreeCreate({
-        projectPath: project.path,
-        taskName,
-        projectId: project.id,
-        baseRef,
-      });
-      if (!worktreeResult.success) {
-        throw new Error(worktreeResult.error || 'Failed to create worktree');
-      }
-      const worktree = worktreeResult.worktree;
-      branch = worktree.branch;
-      path = worktree.path;
-      taskId = worktree.id;
-    }
-  } else {
-    branch = project.gitInfo.branch || 'main';
-    path = project.path;
-    taskId = `direct-${taskName}-${Date.now()}`;
-  }
-
-  const newTask: Task = {
-    id: taskId,
-    projectId: project.id,
-    name: taskName,
-    branch,
-    path,
-    status: 'idle',
-    agentId: primaryAgent,
-    metadata: taskMetadata,
-    useWorktree,
-  };
-
-  if (!taskPersistedInClaim) {
-    try {
-      await rpc.db.saveTask({
-        ...newTask,
-        agentId: primaryAgent,
-        metadata: taskMetadata,
-        useWorktree,
-      });
-    } catch (saveErr) {
-      const { log } = await import('./logger');
-      log.error('Failed to save task:', saveErr);
-      // Non-fatal: task is created in memory and will work this session
-      warning = 'Task created but may not persist after restart. Try again if it disappears.';
-    }
-  }
-
-  // Background: setup, telemetry, issue seeding
-  void runSetupOnCreate(newTask.id, newTask.path, project.path, newTask.name);
-  void import('./telemetryClient').then(({ captureTelemetry }) => {
-    captureTelemetry('task_created', {
-      provider: (newTask.agentId as string) || 'codex',
-      has_initial_prompt: !!taskMetadata?.initialPrompt,
-    });
-    if (linkedGithubIssue) captureTelemetry('task_created_with_issue', { source: 'github' });
-    if (linkedLinearIssue) captureTelemetry('task_created_with_issue', { source: 'linear' });
-    if (linkedJiraIssue) captureTelemetry('task_created_with_issue', { source: 'jira' });
-  });
-  seedIssueContext(newTask.id, taskMetadata);
-
-  return { task: newTask, warning };
-}
diff --git a/src/renderer/lib/taskNames.ts b/src/renderer/lib/taskNames.ts
deleted file mode 100644
index 2dd3ba7775..0000000000
--- a/src/renderer/lib/taskNames.ts
+++ /dev/null
@@ -1,151 +0,0 @@
-import { humanId } from 'human-id';
-
-export type TaskNameGenerator = (
-  existingNames: Iterable<string>,
-  options?: { seed?: number }
-) => string;
-
-const ADJECTIVES = [
-  'curious',
-  'brisk',
-  'mellow',
-  'vivid',
-  'bright',
-  'calm',
-  'daring',
-  'eager',
-  'gentle',
-  'keen',
-  'lively',
-  'nimble',
-  'quiet',
-  'rapid',
-  'steady',
-  'swift',
-  'tidy',
-  'bold',
-  'clever',
-  'fresh',
-] as const;
-
-const NOUNS = [
-  'branch',
-  'pixel',
-  'thread',
-  'anchor',
-  'beacon',
-  'circuit',
-  'delta',
-  'ember',
-  'harbor',
-  'lantern',
-  'meadow',
-  'moment',
-  'quill',
-  'signal',
-  'spark',
-  'stride',
-  'trail',
-  'vector',
-  'weave',
-  'whisper',
-] as const;
-
-export const MAX_TASK_NAME_LENGTH = 64;
-
-export const normalizeTaskName = (input: string): string =>
-  input
-    .trim()
-    .toLowerCase()
-    .replace(/\s+/g, '-')
-    .replace(/[^a-z0-9-]/g, '')
-    .replace(/-+/g, '-')
-    .replace(/^-+|-+$/g, '')
-    .slice(0, MAX_TASK_NAME_LENGTH);
-
-export const ensureUniqueTaskName = (
-  baseName: string,
-  existingNames: Iterable<string>,
-  maxAttempts = 6
-): string => {
-  const normalizedExisting = new Set(
-    Array.from(existingNames, (name) => normalizeTaskName(name)).filter(Boolean)
-  );
-  const base = normalizeTaskName(baseName);
-  if (base && !normalizedExisting.has(base)) return base;
-
-  for (let i = 2; i < 2 + maxAttempts; i++) {
-    const candidate = normalizeTaskName(`${baseName}-${i}`);
-    if (candidate && !normalizedExisting.has(candidate)) {
-      return candidate;
-    }
-  }
-
-  const fallback = normalizeTaskName(`${baseName}-${Date.now().toString(36)}`);
-  return fallback || base;
-};
-
-const pick = (list: readonly string[], rnd: () => number) =>
-  list[Math.floor(rnd() * list.length)] || '';
-
-const wordlistGenerator: TaskNameGenerator = (existingNames, options) => {
-  const taken = new Set(
-    Array.from(existingNames || [], (n) => normalizeTaskName(n)).filter(Boolean)
-  );
-
-  let currentSeed = options?.seed ?? Math.random();
-  const rng = () => {
-    currentSeed = (currentSeed * 9301 + 49297) % 233280;
-    return currentSeed / 233280;
-  };
-
-  for (let i = 0; i < 8; i++) {
-    const candidate = `${pick(ADJECTIVES, rng)}-${pick(NOUNS, rng)}`;
-    const normalized = normalizeTaskName(candidate);
-    if (normalized && !taken.has(normalized)) {
-      return candidate;
-    }
-  }
-
-  return 'task';
-};
-
-const humanIdGenerator: TaskNameGenerator = () => {
-  // human-id already filters for SFW words; leave normalization/uniqueness to the wrapper
-  return humanId({ separator: '-', capitalize: false });
-};
-
-let activeGenerator: TaskNameGenerator = humanIdGenerator;
-
-export const setTaskNameGenerator = (generator: TaskNameGenerator | null | undefined) => {
-  activeGenerator = generator || humanIdGenerator;
-};
-
-export const generateFriendlyTaskName = (
-  existingNames: Iterable<string> = [],
-  options?: { generator?: TaskNameGenerator; seed?: number }
-): string => {
-  const generator = options?.generator || activeGenerator;
-  const seed = options?.seed;
-
-  const existingArray = Array.from(existingNames || []);
-
-  const runGenerator = (gen: TaskNameGenerator): string => {
-    try {
-      const raw = gen(existingArray, { seed });
-      const normalized = normalizeTaskName(raw);
-      if (normalized) {
-        return ensureUniqueTaskName(normalized, existingArray);
-      }
-    } catch {
-      // fall through to fallback
-    }
-    const fallbackRaw = wordlistGenerator(existingArray, { seed });
-    return ensureUniqueTaskName(fallbackRaw, existingArray);
-  };
-
-  const primary = runGenerator(generator);
-  if (primary) return primary;
-
-  return runGenerator(wordlistGenerator);
-};
diff --git a/src/renderer/lib/taskStatus.ts b/src/renderer/lib/taskStatus.ts
deleted file mode 100644
index 2527e3e0f1..0000000000
--- a/src/renderer/lib/taskStatus.ts
+++ /dev/null
@@ -1,136 +0,0 @@
-// Lightweight derived status store for tasks based on agent activity
-// - Derives 'busy' when we receive stream output for a task
-// - Derives 'idle' after a short inactivity window or when a 'complete' event fires
-
-type Derived = 'idle' | 'busy';
-import { activityStore } from './activityStore';
-
-type Listener = (status: Derived) => void;
-
-const statusByTask = new Map<string, Derived>();
-const listenersByTask = new Map<string, Set<Listener>>();
-const lastActivity = new Map<string, number>();
-
-// Inactivity delay before flipping back to idle
-const IDLE_AFTER_MS = 12_000;
-let tickStarted = false;
-
-function ensureTicker() {
-  if (tickStarted) return;
-  tickStarted = true;
-  setInterval(() => {
-    const now = Date.now();
-    for (const [tid, ts] of lastActivity.entries()) {
-      const cur = statusByTask.get(tid) || 'idle';
-      if (cur === 'busy' && now - ts > IDLE_AFTER_MS) {
-        setStatusInternal(tid, 'idle');
-      }
-    }
-  }, 2_000);
-}
-
-function setStatusInternal(taskId: string, next: Derived) {
-  const prev = statusByTask.get(taskId) || 'idle';
-  if (prev === next) return;
-  statusByTask.set(taskId, next);
-  const ls = listenersByTask.get(taskId);
-  if (ls)
-    for (const fn of Array.from(ls)) {
-      try {
-        fn(next);
-      } catch {}
-    }
-}
-
-// Wire global event listeners once
-let wired = false;
-function wireGlobal() {
-  if (wired) return;
-  wired = true;
-  ensureTicker();
-  const api: any = (window as any).electronAPI;
-  // Agent streams removed; PTY and container activity drive status.
-}
-
-export function getDerivedStatus(taskId: string): Derived {
-  wireGlobal();
-  return statusByTask.get(taskId) || 'idle';
-}
-
-export function subscribeDerivedStatus(taskId: string, listener: Listener): () => void {
-  wireGlobal();
-  let set = listenersByTask.get(taskId);
-  if (!set) {
-    set = new Set<Listener>();
-    listenersByTask.set(taskId, set);
-  }
-  set.add(listener);
-  // Emit current immediately
-  try {
-    listener(getDerivedStatus(taskId));
-  } catch {}
-  return () => {
-    const set2 = listenersByTask.get(taskId);
-    if (!set2) return;
-    set2.delete(listener);
-    if (set2.size === 0) listenersByTask.delete(taskId);
-  };
-}
-
-// Observe PTY activity (all current providers emit via PTY).
-// Call once per task to ensure terminal output marks the task busy.
-// Kept as a separate watcher so future non‑PTY providers can remain decoupled.
-const ptyUnsubs = new Map<string, () => void>();
-export function watchTaskPty(taskId: string): () => void {
-  wireGlobal();
-  if (ptyUnsubs.has(taskId)) return ptyUnsubs.get(taskId)!;
-  const api: any = (window as any).electronAPI;
-  let off: (() => void) | null = null;
-  let offExit: (() => void) | null = null;
-  let offStarted: (() => void) | null = null;
-  try {
-    off = api?.onPtyData?.(taskId, (_chunk: string) => {
-      lastActivity.set(taskId, Date.now());
-      setStatusInternal(taskId, 'busy');
-    });
-  } catch {}
-  try {
-    offStarted = api?.onPtyStarted?.((payload: { id: string }) => {
-      if (payload?.id !== taskId) return;
-      lastActivity.set(taskId, Date.now());
-      setStatusInternal(taskId, 'busy');
-    });
-  } catch {}
-  try {
-    offExit = api?.onPtyExit?.(taskId, () => {
-      lastActivity.set(taskId, Date.now());
-      setStatusInternal(taskId, 'idle');
-    });
-  } catch {}
-  const cleanup = () => {
-    try {
-      off?.();
-    } catch {}
-    try {
-      offExit?.();
-    } catch {}
-    try {
-      offStarted?.();
-    } catch {}
-    ptyUnsubs.delete(taskId);
-  };
-  ptyUnsubs.set(taskId, cleanup);
-  return cleanup;
-}
-
-// Align with the app's activity indicator (left sidebar).
-// Subscribes to the shared activityStore which understands provider-specific PTY IDs
-// and classifies chunks as busy/idle with debouncing.
-export function watchTaskActivity(taskId: string): () => void {
-  wireGlobal();
-  const off = activityStore.subscribe(taskId, (isBusy) => {
-    lastActivity.set(taskId, Date.now());
-    setStatusInternal(taskId, isBusy ? 'busy' : 'idle');
-  });
-  return off;
-}
diff --git a/src/renderer/lib/taskTerminalsStore.ts b/src/renderer/lib/taskTerminalsStore.ts
deleted file mode 100644
index 8d585eaf4d..0000000000
--- a/src/renderer/lib/taskTerminalsStore.ts
+++ /dev/null
@@ -1,367 +0,0 @@
-import { useMemo, useSyncExternalStore } from 'react';
-import { terminalSessionRegistry } from '../terminal/SessionRegistry';
-
-type TaskTerminal = {
-  id: string;
-  title: string;
-  cwd?: string;
-  shell?: string;
-  createdAt: number;
-};
-
-type TaskTerminalsState = {
-  terminals: TaskTerminal[];
-  activeId: string | null;
-  counter: number;
-};
-
-type TaskSnapshot = {
-  terminals: TaskTerminal[];
-  activeTerminalId: string | null;
-};
-
-const STORAGE_PREFIX = 'emdash:taskTerminals:v1';
-
-const taskStates = new Map<string, TaskTerminalsState>();
-const taskListeners = new Map<string, Set<() => void>>();
-const taskSnapshots = new Map<string, TaskSnapshot>();
-
-const EMPTY_SNAPSHOT: TaskSnapshot = {
-  terminals: [],
-  activeTerminalId: null,
-};
-
-const storageAvailable = (() => {
-  if (typeof window === 'undefined') return false;
-  try {
-    const key = '__emdash_terminal_test__';
-    window.localStorage.setItem(key, '1');
-    window.localStorage.removeItem(key);
-    return true;
-  } catch {
-    return false;
-  }
-})();
-
-function storageKey(taskId: string) {
-  return `${STORAGE_PREFIX}:${taskId}`;
-}
-
-function cloneState(state: TaskTerminalsState): TaskTerminalsState {
-  return {
-    terminals: state.terminals.map((terminal) => ({ ...terminal })),
-    activeId: state.activeId,
-    counter: state.counter,
-  };
-}
-
-function loadFromStorage(taskId: string): TaskTerminalsState | null {
-  if (!storageAvailable) return null;
-  try {
-    const raw = window.localStorage.getItem(storageKey(taskId));
-    if (!raw) return null;
-    const parsed = JSON.parse(raw);
-    if (!parsed || typeof parsed !== 'object') return null;
-
-    const terminals = Array.isArray(parsed.terminals)
-      ? parsed.terminals
-          .map((item: any) => {
-            if (!item || typeof item !== 'object') return null;
-            const id = typeof item.id === 'string' && item.id ? item.id : null;
-            const title = typeof item.title === 'string' && item.title ? item.title : null;
-            if (!id || !title) return null;
-            return {
-              id,
-              title,
-              cwd: typeof item.cwd === 'string' && item.cwd ? item.cwd : undefined,
-              shell: typeof item.shell === 'string' && item.shell ? item.shell : undefined,
-              createdAt:
-                typeof item.createdAt === 'number' && Number.isFinite(item.createdAt)
-                  ? item.createdAt
-                  : Date.now(),
-            } satisfies TaskTerminal;
-          })
-          .filter((x: TaskTerminal | null): x is TaskTerminal => Boolean(x))
-      : [];
-
-    const counter =
-      typeof parsed.counter === 'number' && Number.isFinite(parsed.counter)
-        ? Math.max(parsed.counter, terminals.length)
-        : terminals.length;
-
-    let activeId: string | null = null;
-    if (typeof parsed.activeId === 'string' && parsed.activeId) {
-      activeId = terminals.some((terminal: TaskTerminal) => terminal.id === parsed.activeId)
-        ? parsed.activeId
-        : (terminals[0]?.id ?? null);
-    } else {
-      activeId = terminals[0]?.id ?? null;
-    }
-
-    if (!terminals.length) return null;
-
-    return {
-      terminals,
-      activeId,
-      counter,
-    };
-  } catch {
-    return null;
-  }
-}
-
-function saveToStorage(taskId: string, state: TaskTerminalsState) {
-  if (!storageAvailable) return;
-  try {
-    const payload = JSON.stringify({
-      terminals: state.terminals,
-      activeId: state.activeId,
-      counter: state.counter,
-    });
-    window.localStorage.setItem(storageKey(taskId), payload);
-  } catch {
-    // ignore storage errors
-  }
-}
-
-function makeTerminalId(taskId: string): string {
-  const rnd = Math.random().toString(16).slice(2, 10);
-  return `${taskId}::term::${Date.now().toString(16)}::${rnd}`;
-}
-
-function createDefaultState(taskId: string, taskPath?: string): TaskTerminalsState {
-  const terminalId = makeTerminalId(taskId);
-  const firstTerminal: TaskTerminal = {
-    id: terminalId,
-    title: 'Terminal 1',
-    cwd: taskPath,
-    createdAt: Date.now(),
-  };
-  return {
-    terminals: [firstTerminal],
-    activeId: terminalId,
-    counter: 1,
-  };
-}
-
-function ensureSnapshot(taskId: string, state: TaskTerminalsState) {
-  const current = taskSnapshots.get(taskId);
-  if (
-    !current ||
-    current.terminals !== state.terminals ||
-    current.activeTerminalId !== state.activeId
-  ) {
-    taskSnapshots.set(taskId, {
-      terminals: state.terminals,
-      activeTerminalId: state.activeId,
-    });
-  }
-  return taskSnapshots.get(taskId)!;
-}
-
-function ensureTaskState(taskId: string, taskPath?: string): TaskTerminalsState {
-  let state = taskStates.get(taskId);
-  if (state) {
-    ensureSnapshot(taskId, state);
-    return state;
-  }
-
-  state = loadFromStorage(taskId) ?? createDefaultState(taskId, taskPath);
-  taskStates.set(taskId, state);
-  ensureSnapshot(taskId, state);
-  return state;
-}
-
-function emit(taskId: string) {
-  const listeners = taskListeners.get(taskId);
-  if (!listeners) return;
-  for (const listener of listeners) {
-    try {
-      listener();
-    } catch {
-      // ignore listener errors
-    }
-  }
-}
-
-function updateTaskState(
-  taskId: string,
-  taskPath: string | undefined,
-  mutate: (draft: TaskTerminalsState) => void
-) {
-  const current = ensureTaskState(taskId, taskPath);
-  const draft = cloneState(current);
-  mutate(draft);
-  // Ensure state remains valid
-  if (!draft.terminals.length) {
-    const fallback = createDefaultState(taskId, taskPath);
-    taskStates.set(taskId, fallback);
-    ensureSnapshot(taskId, fallback);
-    saveToStorage(taskId, fallback);
-    emit(taskId);
-    return;
-  }
-  if (typeof draft.activeId !== 'string' || !draft.terminals.some((t) => t.id === draft.activeId)) {
-    draft.activeId = draft.terminals[0].id;
-  }
-  draft.counter = Math.max(draft.counter, draft.terminals.length);
-  taskStates.set(taskId, draft);
-  ensureSnapshot(taskId, draft);
-  saveToStorage(taskId, draft);
-  emit(taskId);
-}
-
-function getSnapshot(taskId: string | null, taskPath?: string): TaskSnapshot {
-  if (!taskId) return EMPTY_SNAPSHOT;
-  const state = ensureTaskState(taskId, taskPath);
-  return ensureSnapshot(taskId, state);
-}
-
-function subscribe(
-  taskId: string | null,
-  taskPath: string | undefined,
-  listener: () => void
-): () => void {
-  const id = taskId || 'global';
-  ensureTaskState(id, taskPath);
-  let set = taskListeners.get(id);
-  if (!set) {
-    set = new Set();
-    taskListeners.set(id, set);
-  }
-  set.add(listener);
-  return () => {
-    const listeners = taskListeners.get(id);
-    if (!listeners) return;
-    listeners.delete(listener);
-    if (listeners.size === 0) {
-      taskListeners.delete(id);
-    }
-  };
-}
-
-function createTerminal(
-  taskId: string,
-  taskPath?: string,
-  options?: { title?: string; cwd?: string }
-): string {
-  const newId = makeTerminalId(taskId);
-  updateTaskState(taskId, taskPath, (draft) => {
-    const nextIndex = draft.counter + 1;
-    draft.counter = nextIndex;
-    draft.activeId = newId;
-    draft.terminals = [
-      ...draft.terminals,
-      {
-        id: newId,
-        title: options?.title || `Terminal ${nextIndex}`,
-        cwd: options?.cwd || taskPath,
-        createdAt: Date.now(),
-      },
-    ];
-  });
-  return newId;
-}
-
-function setActive(taskId: string, terminalId: string, taskPath?: string) {
-  updateTaskState(taskId, taskPath, (draft) => {
-    if (draft.terminals.some((terminal) => terminal.id === terminalId)) {
-      draft.activeId = terminalId;
-    }
-  });
-}
-
-function closeTerminal(taskId: string, terminalId: string, taskPath?: string) {
-  const state = ensureTaskState(taskId, taskPath);
-  if (state.terminals.length <= 1) {
-    return;
-  }
-  const exists = state.terminals.some((terminal) => terminal.id === terminalId);
-  if (!exists) return;
-
-  updateTaskState(taskId, taskPath, (draft) => {
-    const idx = draft.terminals.findIndex((terminal) => terminal.id === terminalId);
-    draft.terminals = draft.terminals.filter((terminal) => terminal.id !== terminalId);
-    if (draft.activeId === terminalId) {
-      const fallback = draft.terminals[idx] ?? draft.terminals[idx - 1] ?? draft.terminals[0];
-      draft.activeId = fallback?.id ?? null;
-    }
-  });
-
-  try {
-    const api: any = (window as any).electronAPI;
-    api?.ptyKill?.(terminalId);
-  } catch {
-    // ignore kill errors
-  }
-}
-
-export function disposeTaskTerminals(taskKey: string): void {
-  const state = taskStates.get(taskKey) ?? loadFromStorage(taskKey);
-  if (state) {
-    for (const terminal of state.terminals) {
-      try {
-        (window as any).electronAPI?.ptyKill?.(terminal.id);
-      } catch {
-        // ignore kill errors
-      }
-      try {
-        terminalSessionRegistry.dispose(terminal.id);
-      } catch {
-        // ignore dispose errors
-      }
-      try {
-        (window as any).electronAPI?.ptyClearSnapshot?.({ id: terminal.id });
-      } catch {
-        // ignore snapshot errors
-      }
-    }
-  }
-
-  taskStates.delete(taskKey);
-  taskSnapshots.delete(taskKey);
-  taskListeners.delete(taskKey);
-
-  if (storageAvailable) {
-    try {
-      window.localStorage.removeItem(storageKey(taskKey));
-    } catch {
-      // ignore storage errors
-    }
-  }
-}
-
-export function useTaskTerminals(
-  taskId: string | null,
-  taskPath?: string,
-  opts?: { defaultCwd?: string }
-) {
-  const resolvedId = taskId || 'global';
-  const resolvedPath = taskPath || opts?.defaultCwd;
-  const snapshot = useSyncExternalStore(
-    (listener) => subscribe(resolvedId, resolvedPath, listener),
-    () => getSnapshot(resolvedId, resolvedPath),
-    () => getSnapshot(resolvedId, resolvedPath)
-  );
-
-  const actions = useMemo(() => {
-    return {
-      createTerminal: (options?: { title?: string; cwd?: string }): string =>
-        createTerminal(resolvedId, options?.cwd || resolvedPath, options),
-      setActiveTerminal: (terminalId: string) => setActive(resolvedId, terminalId, resolvedPath),
-      closeTerminal: (terminalId: string) => closeTerminal(resolvedId, terminalId, resolvedPath),
-    };
-  }, [resolvedId, resolvedPath]);
-
-  const activeTerminal =
-    snapshot.terminals.find((terminal) => terminal.id === snapshot.activeTerminalId) ?? null;
-
-  return {
-    terminals: snapshot.terminals,
-    activeTerminalId: snapshot.activeTerminalId,
-    activeTerminal,
-    ...actions,
-  };
-}
-
-export type { TaskTerminal };
diff --git a/src/renderer/lib/telemetryClient.ts b/src/renderer/lib/telemetryClient.ts
deleted file mode 100644
index ba85ba4834..0000000000
--- a/src/renderer/lib/telemetryClient.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * Simple telemetry client for renderer process.
- * Captures events and sends them to the main process via IPC.
- */
-
-export function captureTelemetry(event: string, properties?: Record<string, any>): void {
-  try {
-    const api = (window as any).electronAPI;
-    if (api?.captureTelemetry) {
-      void api.captureTelemetry(event, properties);
-    }
-  } catch {
-    // Telemetry failures never break the app
-  }
-}
diff --git a/src/renderer/lib/ui/accordion.tsx b/src/renderer/lib/ui/accordion.tsx
new file mode 100644
index 0000000000..ebcecd8449
--- /dev/null
+++ b/src/renderer/lib/ui/accordion.tsx
@@ -0,0 +1,69 @@
+import { Accordion as AccordionPrimitive } from '@base-ui/react/accordion';
+import { ChevronDownIcon, ChevronUpIcon } from 'lucide-react';
+import { cn } from '@renderer/utils/utils';
+
+function Accordion({ className, ...props }: AccordionPrimitive.Root.Props) {
+  return (
+    <AccordionPrimitive.Root
+      data-slot="accordion"
+      className={cn('flex w-full flex-col', className)}
+      {...props}
+    />
+  );
+}
+
+function AccordionItem({ className, ...props }: AccordionPrimitive.Item.Props) {
+  return (
+    <AccordionPrimitive.Item
+      data-slot="accordion-item"
+      className={cn('not-last:border-b', className)}
+      {...props}
+    />
+  );
+}
+
+function AccordionTrigger({ className, children, ...props }: AccordionPrimitive.Trigger.Props) {
+  return (
+    <AccordionPrimitive.Header className="flex">
+      <AccordionPrimitive.Trigger
+        data-slot="accordion-trigger"
+        className={cn(
+          'group/accordion-trigger relative flex flex-1 items-start justify-between rounded-md border border-transparent py-4 text-left text-sm font-medium transition-all outline-none hover:underline focus-visible:border-ring focus-visible:ring-3 focus-visible:ring-ring/50 focus-visible:after:border-ring aria-disabled:pointer-events-none aria-disabled:opacity-50 **:data-[slot=accordion-trigger-icon]:ml-auto **:data-[slot=accordion-trigger-icon]:size-4 **:data-[slot=accordion-trigger-icon]:text-muted-foreground',
+          className
+        )}
+        {...props}
+      >
+        {children}
+        <ChevronDownIcon
+          data-slot="accordion-trigger-icon"
+          className="pointer-events-none shrink-0 group-aria-expanded/accordion-trigger:hidden"
+        />
+        <ChevronUpIcon
+          data-slot="accordion-trigger-icon"
+          className="pointer-events-none hidden shrink-0 group-aria-expanded/accordion-trigger:inline"
+        />
+      </AccordionPrimitive.Trigger>
+    </AccordionPrimitive.Header>
+  );
+}
+
+function AccordionContent({ className, children, ...props }: AccordionPrimitive.Panel.Props) {
+  return (
+    <AccordionPrimitive.Panel
+      data-slot="accordion-content"
+      className="overflow-hidden text-sm data-open:animate-accordion-down data-closed:animate-accordion-up"
+      {...props}
+    >
+      <div
+        className={cn(
+          'h-(--accordion-panel-height) pt-0 pb-4 data-ending-style:h-0 data-starting-style:h-0 [&_a]:underline [&_a]:underline-offset-3 [&_a]:hover:text-foreground [&_p:not(:last-child)]:mb-4',
+          className
+        )}
+      >
+        {children}
+      </div>
+    </AccordionPrimitive.Panel>
+  );
+}
+
+export { Accordion, AccordionItem, AccordionTrigger, AccordionContent };
diff --git a/src/renderer/lib/ui/alert-dialog.tsx b/src/renderer/lib/ui/alert-dialog.tsx
new file mode 100644
index 0000000000..6bc1c601f4
--- /dev/null
+++ b/src/renderer/lib/ui/alert-dialog.tsx
@@ -0,0 +1,161 @@
+'use client';
+
+import { AlertDialog as AlertDialogPrimitive } from '@base-ui/react/alert-dialog';
+import * as React from 'react';
+import { Button } from '@renderer/lib/ui/button';
+import { cn } from '@renderer/utils/utils';
+
+function AlertDialog({ ...props }: AlertDialogPrimitive.Root.Props) {
+  return <AlertDialogPrimitive.Root data-slot="alert-dialog" {...props} />;
+}
+
+function AlertDialogTrigger({ ...props }: AlertDialogPrimitive.Trigger.Props) {
+  return <AlertDialogPrimitive.Trigger data-slot="alert-dialog-trigger" {...props} />;
+}
+
+function AlertDialogPortal({ ...props }: AlertDialogPrimitive.Portal.Props) {
+  return <AlertDialogPrimitive.Portal data-slot="alert-dialog-portal" {...props} />;
+}
+
+function AlertDialogOverlay({ className, ...props }: AlertDialogPrimitive.Backdrop.Props) {
+  return (
+    <AlertDialogPrimitive.Backdrop
+      data-slot="alert-dialog-overlay"
+      className={cn(
+        'fixed inset-0 isolate z-50 bg-black/10 duration-100 supports-backdrop-filter:backdrop-blur-xs data-open:animate-in data-open:fade-in-0 data-closed:animate-out data-closed:fade-out-0',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+function AlertDialogContent({
+  className,
+  size = 'default',
+  ...props
+}: AlertDialogPrimitive.Popup.Props & {
+  size?: 'default' | 'sm';
+}) {
+  return (
+    <AlertDialogPortal>
+      <AlertDialogOverlay />
+      <AlertDialogPrimitive.Popup
+        data-slot="alert-dialog-content"
+        data-size={size}
+        className={cn(
+          'group/alert-dialog-content fixed top-1/2 left-1/2 z-50 grid w-full -translate-x-1/2 -translate-y-1/2 gap-6 rounded-xl bg-background p-6 ring-1 ring-foreground/10 duration-100 outline-none data-[size=default]:max-w-xs data-[size=sm]:max-w-xs data-[size=default]:sm:max-w-lg data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 data-closed:animate-out data-closed:fade-out-0 data-closed:zoom-out-95',
+          className
+        )}
+        {...props}
+      />
+    </AlertDialogPortal>
+  );
+}
+
+function AlertDialogHeader({ className, ...props }: React.ComponentProps<'div'>) {
+  return (
+    <div
+      data-slot="alert-dialog-header"
+      className={cn(
+        'grid grid-rows-[auto_1fr] place-items-center gap-1.5 text-center has-data-[slot=alert-dialog-media]:grid-rows-[auto_auto_1fr] has-data-[slot=alert-dialog-media]:gap-x-6 sm:group-data-[size=default]/alert-dialog-content:place-items-start sm:group-data-[size=default]/alert-dialog-content:text-left sm:group-data-[size=default]/alert-dialog-content:has-data-[slot=alert-dialog-media]:grid-rows-[auto_1fr]',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+function AlertDialogFooter({ className, ...props }: React.ComponentProps<'div'>) {
+  return (
+    <div
+      data-slot="alert-dialog-footer"
+      className={cn(
+        'flex flex-col-reverse gap-2 group-data-[size=sm]/alert-dialog-content:grid group-data-[size=sm]/alert-dialog-content:grid-cols-2 sm:flex-row sm:justify-end',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+function AlertDialogMedia({ className, ...props }: React.ComponentProps<'div'>) {
+  return (
+    <div
+      data-slot="alert-dialog-media"
+      className={cn(
+        "mb-2 inline-flex size-16 items-center justify-center rounded-md bg-muted sm:group-data-[size=default]/alert-dialog-content:row-span-2 *:[svg:not([class*='size-'])]:size-8",
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+function AlertDialogTitle({
+  className,
+  ...props
+}: React.ComponentProps<typeof AlertDialogPrimitive.Title>) {
+  return (
+    <AlertDialogPrimitive.Title
+      data-slot="alert-dialog-title"
+      className={cn(
+        'text-lg font-medium sm:group-data-[size=default]/alert-dialog-content:group-has-data-[slot=alert-dialog-media]/alert-dialog-content:col-start-2',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+function AlertDialogDescription({
+  className,
+  ...props
+}: React.ComponentProps<typeof AlertDialogPrimitive.Description>) {
+  return (
+    <AlertDialogPrimitive.Description
+      data-slot="alert-dialog-description"
+      className={cn(
+        'text-sm text-balance text-muted-foreground md:text-pretty *:[a]:underline *:[a]:underline-offset-3 *:[a]:hover:text-foreground',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+function AlertDialogAction({ className, ...props }: React.ComponentProps<typeof Button>) {
+  return <Button data-slot="alert-dialog-action" className={cn(className)} {...props} />;
+}
+
+function AlertDialogCancel({
+  className,
+  variant = 'outline',
+  size = 'default',
+  ...props
+}: AlertDialogPrimitive.Close.Props &
+  Pick<React.ComponentProps<typeof Button>, 'variant' | 'size'>) {
+  return (
+    <AlertDialogPrimitive.Close
+      data-slot="alert-dialog-cancel"
+      className={cn(className)}
+      render={<Button variant={variant} size={size} />}
+      {...props}
+    />
+  );
+}
+
+export {
+  AlertDialog,
+  AlertDialogAction,
+  AlertDialogCancel,
+  AlertDialogContent,
+  AlertDialogDescription,
+  AlertDialogFooter,
+  AlertDialogHeader,
+  AlertDialogMedia,
+  AlertDialogOverlay,
+  AlertDialogPortal,
+  AlertDialogTitle,
+  AlertDialogTrigger,
+};
diff --git a/src/renderer/lib/ui/alert.tsx b/src/renderer/lib/ui/alert.tsx
new file mode 100644
index 0000000000..545938e445
--- /dev/null
+++ b/src/renderer/lib/ui/alert.tsx
@@ -0,0 +1,72 @@
+import { cva, type VariantProps } from 'class-variance-authority';
+import * as React from 'react';
+import { cn } from '@renderer/utils/utils';
+
+const alertVariants = cva(
+  "group/alert relative grid w-full gap-0.5 rounded-lg border px-4 py-3 text-left text-sm has-data-[slot=alert-action]:relative has-data-[slot=alert-action]:pr-18 has-[>svg]:grid-cols-[auto_1fr] has-[>svg]:gap-x-2.5 *:[svg]:row-span-2 *:[svg]:translate-y-0.5 *:[svg]:text-current *:[svg:not([class*='size-'])]:size-4",
+  {
+    variants: {
+      variant: {
+        default: 'bg-card text-foreground',
+        destructive:
+          'bg-card text-foreground-destructive *:data-[slot=alert-description]:text-destructive/90 *:[svg]:text-current',
+      },
+    },
+    defaultVariants: {
+      variant: 'default',
+    },
+  }
+);
+
+function Alert({
+  className,
+  variant,
+  ...props
+}: React.ComponentProps<'div'> & VariantProps<typeof alertVariants>) {
+  return (
+    <div
+      data-slot="alert"
+      role="alert"
+      className={cn(alertVariants({ variant }), className)}
+      {...props}
+    />
+  );
+}
+
+function AlertTitle({ className, ...props }: React.ComponentProps<'div'>) {
+  return (
+    <div
+      data-slot="alert-title"
+      className={cn(
+        'text-sm group-has-[>svg]/alert:col-start-2 [&_a]:underline [&_a]:underline-offset-3 [&_a]:hover:text-foreground',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+function AlertDescription({ className, ...props }: React.ComponentProps<'div'>) {
+  return (
+    <div
+      data-slot="alert-description"
+      className={cn(
+        'text-xs text-balance text-foreground-muted md:text-pretty [&_a]:underline [&_a]:underline-offset-3 [&_a]:hover:text-foreground [&_p:not(:last-child)]:mb-4',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+function AlertAction({ className, ...props }: React.ComponentProps<'div'>) {
+  return (
+    <div
+      data-slot="alert-action"
+      className={cn('absolute top-2.5 right-3', className)}
+      {...props}
+    />
+  );
+}
+
+export { Alert, AlertTitle, AlertDescription, AlertAction };
diff --git a/src/renderer/lib/ui/animated-height.tsx b/src/renderer/lib/ui/animated-height.tsx
new file mode 100644
index 0000000000..3e82fd9b89
--- /dev/null
+++ b/src/renderer/lib/ui/animated-height.tsx
@@ -0,0 +1,59 @@
+import { motion } from 'framer-motion';
+import { useEffect, useLayoutEffect, useRef, useState } from 'react';
+import { cn } from '@renderer/utils/utils';
+
+export function AnimatedHeight({
+  children,
+  className,
+  onAnimatingChange,
+}: {
+  children: React.ReactNode;
+  className?: string;
+  onAnimatingChange?: (isAnimating: boolean) => void;
+}) {
+  const contentRef = useRef<HTMLDivElement>(null);
+  const [height, setHeight] = useState<number | undefined>(undefined);
+  const [isAnimating, setIsAnimating] = useState(false);
+
+  // Measure the initial height synchronously before the first paint so
+  // framer-motion starts with an explicit pixel value rather than 'auto'.
+  // This prevents the auto→pixel animation that would otherwise run on mount.
+  useLayoutEffect(() => {
+    const el = contentRef.current;
+    if (!el) return;
+    setHeight(el.offsetHeight);
+  }, []);
+
+  useEffect(() => {
+    const el = contentRef.current;
+    if (!el) return;
+    // Skip the ResizeObserver's initial callback — the height was already
+    // captured synchronously above, so the first observation is never new.
+    let isFirstCallback = true;
+    const ro = new ResizeObserver(() => {
+      if (isFirstCallback) {
+        isFirstCallback = false;
+        return;
+      }
+      setHeight(el.offsetHeight);
+      setIsAnimating(true);
+    });
+    ro.observe(el);
+    return () => ro.disconnect();
+  }, []);
+
+  useEffect(() => {
+    onAnimatingChange?.(isAnimating);
+  }, [isAnimating, onAnimatingChange]);
+
+  return (
+    <motion.div
+      animate={{ height: height ?? 'auto' }}
+      transition={{ duration: 0.25, ease: 'easeInOut' }}
+      className={cn('w-full', isAnimating ? 'overflow-hidden' : 'overflow-visible', className)}
+      onAnimationComplete={() => setIsAnimating(false)}
+    >
+      <div ref={contentRef}>{children}</div>
+    </motion.div>
+  );
+}
diff --git a/src/renderer/lib/ui/badge.tsx b/src/renderer/lib/ui/badge.tsx
new file mode 100644
index 0000000000..beac87e3f3
--- /dev/null
+++ b/src/renderer/lib/ui/badge.tsx
@@ -0,0 +1,48 @@
+import { mergeProps } from '@base-ui/react/merge-props';
+import { useRender } from '@base-ui/react/use-render';
+import { cva, type VariantProps } from 'class-variance-authority';
+import { cn } from '@renderer/utils/utils';
+
+const badgeVariants = cva(
+  'group/badge inline-flex h-4.5 font-medium w-fit shrink-0 text-[10px] items-center justify-center gap-1 overflow-hidden rounded-full border border-transparent px-1.5 py-0.5 font-medium whitespace-nowrap transition-all focus-visible:border-ring focus-visible:ring-[3px] focus-visible:ring-ring/50 has-data-[icon=inline-end]:pr-1.5 has-data-[icon=inline-start]:pl-1.5 aria-invalid:border-destructive aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 [&>svg]:pointer-events-none [&>svg]:size-3!',
+  {
+    variants: {
+      variant: {
+        default: 'bg-background text-primary-foreground [a]:hover:bg-primary/80',
+        secondary: 'bg-background-2 text-foreground-muted [a]:hover:bg-background-2',
+        destructive:
+          'bg-destructive/10 text-destructive focus-visible:ring-destructive/20 dark:bg-destructive/20 dark:focus-visible:ring-destructive/40 [a]:hover:bg-destructive/20',
+        outline: 'border-border text-foreground [a]:hover:bg-muted [a]:hover:text-muted-foreground',
+        ghost: 'hover:bg-muted hover:text-muted-foreground dark:hover:bg-muted/50',
+        link: 'text-primary underline-offset-4 hover:underline',
+      },
+    },
+    defaultVariants: {
+      variant: 'default',
+    },
+  }
+);
+
+function Badge({
+  className,
+  variant = 'default',
+  render,
+  ...props
+}: useRender.ComponentProps<'span'> & VariantProps<typeof badgeVariants>) {
+  return useRender({
+    defaultTagName: 'span',
+    props: mergeProps<'span'>(
+      {
+        className: cn(badgeVariants({ variant }), className),
+      },
+      props
+    ),
+    render,
+    state: {
+      slot: 'badge',
+      variant,
+    },
+  });
+}
+
+export { Badge, badgeVariants };
diff --git a/src/renderer/lib/ui/breadcrumb.tsx b/src/renderer/lib/ui/breadcrumb.tsx
new file mode 100644
index 0000000000..7bdbd54b1e
--- /dev/null
+++ b/src/renderer/lib/ui/breadcrumb.tsx
@@ -0,0 +1,102 @@
+import { mergeProps } from '@base-ui/react/merge-props';
+import { useRender } from '@base-ui/react/use-render';
+import { ChevronRightIcon, MoreHorizontalIcon } from 'lucide-react';
+import * as React from 'react';
+import { cn } from '@renderer/utils/utils';
+
+function Breadcrumb({ className, ...props }: React.ComponentProps<'nav'>) {
+  return (
+    <nav aria-label="breadcrumb" data-slot="breadcrumb" className={cn(className)} {...props} />
+  );
+}
+
+function BreadcrumbList({ className, ...props }: React.ComponentProps<'ol'>) {
+  return (
+    <ol
+      data-slot="breadcrumb-list"
+      className={cn(
+        'flex flex-wrap items-center gap-1.5 text-sm wrap-break-word text-muted-foreground sm:gap-2.5',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+function BreadcrumbItem({ className, ...props }: React.ComponentProps<'li'>) {
+  return (
+    <li
+      data-slot="breadcrumb-item"
+      className={cn('inline-flex items-center gap-1.5', className)}
+      {...props}
+    />
+  );
+}
+
+function BreadcrumbLink({ className, render, ...props }: useRender.ComponentProps<'a'>) {
+  return useRender({
+    defaultTagName: 'a',
+    props: mergeProps<'a'>(
+      {
+        className: cn('transition-colors hover:text-foreground', className),
+      },
+      props
+    ),
+    render,
+    state: {
+      slot: 'breadcrumb-link',
+    },
+  });
+}
+
+function BreadcrumbPage({ className, ...props }: React.ComponentProps<'span'>) {
+  return (
+    <span
+      data-slot="breadcrumb-page"
+      role="link"
+      aria-disabled="true"
+      aria-current="page"
+      className={cn('font-normal text-foreground', className)}
+      {...props}
+    />
+  );
+}
+
+function BreadcrumbSeparator({ children, className, ...props }: React.ComponentProps<'li'>) {
+  return (
+    <li
+      data-slot="breadcrumb-separator"
+      role="presentation"
+      aria-hidden="true"
+      className={cn('[&>svg]:size-3.5', className)}
+      {...props}
+    >
+      {children ?? <ChevronRightIcon />}
+    </li>
+  );
+}
+
+function BreadcrumbEllipsis({ className, ...props }: React.ComponentProps<'span'>) {
+  return (
+    <span
+      data-slot="breadcrumb-ellipsis"
+      role="presentation"
+      aria-hidden="true"
+      className={cn('flex size-5 items-center justify-center [&>svg]:size-4', className)}
+      {...props}
+    >
+      <MoreHorizontalIcon />
+      <span className="sr-only">More</span>
+    </span>
+  );
+}
+
+export {
+  Breadcrumb,
+  BreadcrumbList,
+  BreadcrumbItem,
+  BreadcrumbLink,
+  BreadcrumbPage,
+  BreadcrumbSeparator,
+  BreadcrumbEllipsis,
+};
diff --git a/src/renderer/lib/ui/button.tsx b/src/renderer/lib/ui/button.tsx
new file mode 100644
index 0000000000..c8018e1bf0
--- /dev/null
+++ b/src/renderer/lib/ui/button.tsx
@@ -0,0 +1,58 @@
+import { Button as ButtonPrimitive } from '@base-ui/react/button';
+import { cva, type VariantProps } from 'class-variance-authority';
+import { cn } from '@renderer/utils/utils';
+
+const buttonVariants = cva(
+  "group/button inline-flex shrink-0 items-center  justify-center rounded-md border border-transparent bg-clip-padding text-sm font-normal whitespace-nowrap transition-all outline-none select-none focus-visible:border-ring focus-visible:ring-3 focus-visible:ring-ring/50 disabled:pointer-events-none disabled:opacity-50 aria-invalid:border-destructive aria-invalid:ring-3 aria-invalid:ring-destructive/20 dark:aria-invalid:border-destructive/50 dark:aria-invalid:ring-destructive/40 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
+  {
+    variants: {
+      variant: {
+        default:
+          'bg-primary-button-background text-primary-button-foreground hover:bg-primary-button-background-hover border border-primary-button-border',
+        outline:
+          'border-border bg-background hover:bg-background-1 hover:text-foreground aria-expanded:bg-background-1 aria-expanded:text-foreground dark:border-input dark:bg-input/30 dark:hover:bg-input/50',
+        secondary:
+          'bg-background-2 text-foreground-muted hover:bg-background-2 aria-expanded:bg-background-2 aria-expanded:text-foreground-muted',
+        ghost:
+          'hover:bg-background-1 hover:text-foreground text-foreground-muted aria-expanded:bg-muted aria-expanded:text-foreground dark:hover:bg-muted/50',
+        destructive:
+          'bg-background-destructive border border-border-destructive text-foreground-destructive hover:bg-destructive/20 focus-visible:border-destructive/40 focus-visible:ring-destructive/20 dark:bg-destructive/20 dark:hover:bg-destructive/30 dark:focus-visible:ring-destructive/40',
+        link: 'text-primary',
+      },
+      size: {
+        default:
+          'h-8 gap-1.5 px-2.5 in-data-[slot=button-group]:rounded-md has-data-[icon=inline-end]:pr-2 has-data-[icon=inline-start]:pl-2',
+        xs: "h-6 gap-1 rounded-[min(var(--radius-md),8px)] px-2 text-xs in-data-[slot=button-group]:rounded-md has-data-[icon=inline-end]:pr-1.5 has-data-[icon=inline-start]:pl-1.5 [&_svg:not([class*='size-'])]:size-3",
+        sm: 'h-7 gap-1 rounded-[min(var(--radius-md),10px)] px-2.5 in-data-[slot=button-group]:rounded-md has-data-[icon=inline-end]:pr-1.5 has-data-[icon=inline-start]:pl-1.5',
+        lg: 'h-10 gap-1.5 px-2.5 has-data-[icon=inline-end]:pr-3 has-data-[icon=inline-start]:pl-3',
+        icon: 'size-9',
+        'icon-xs':
+          "size-6 rounded-[min(var(--radius-md),8px)] in-data-[slot=button-group]:rounded-md [&_svg:not([class*='size-'])]:size-3",
+        'icon-sm':
+          'size-8 rounded-[min(var(--radius-md),10px)] in-data-[slot=button-group]:rounded-md',
+        'icon-lg': 'size-10',
+      },
+    },
+    defaultVariants: {
+      variant: 'default',
+      size: 'default',
+    },
+  }
+);
+
+function Button({
+  className,
+  variant = 'default',
+  size = 'default',
+  ...props
+}: ButtonPrimitive.Props & VariantProps<typeof buttonVariants>) {
+  return (
+    <ButtonPrimitive
+      data-slot="button"
+      className={cn(buttonVariants({ variant, size, className }))}
+      {...props}
+    />
+  );
+}
+
+export { Button, buttonVariants };
diff --git a/src/renderer/lib/ui/card.tsx b/src/renderer/lib/ui/card.tsx
new file mode 100644
index 0000000000..d616e7410b
--- /dev/null
+++ b/src/renderer/lib/ui/card.tsx
@@ -0,0 +1,91 @@
+import * as React from 'react';
+import { cn } from '@renderer/utils/utils';
+
+function Card({
+  className,
+  size = 'default',
+  ...props
+}: React.ComponentProps<'div'> & { size?: 'default' | 'sm' }) {
+  return (
+    <div
+      data-slot="card"
+      data-size={size}
+      className={cn(
+        'group/card flex flex-col gap-6 overflow-hidden rounded-xl bg-card py-6 text-sm text-card-foreground shadow-xs ring-1 ring-foreground/10 has-[>img:first-child]:pt-0 data-[size=sm]:gap-4 data-[size=sm]:py-4 *:[img:first-child]:rounded-t-xl *:[img:last-child]:rounded-b-xl',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+function CardHeader({ className, ...props }: React.ComponentProps<'div'>) {
+  return (
+    <div
+      data-slot="card-header"
+      className={cn(
+        'group/card-header @container/card-header grid auto-rows-min items-start gap-1 rounded-t-xl px-6 group-data-[size=sm]/card:px-4 has-data-[slot=card-action]:grid-cols-[1fr_auto] has-data-[slot=card-description]:grid-rows-[auto_auto] [.border-b]:pb-6 group-data-[size=sm]/card:[.border-b]:pb-4',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+function CardTitle({ className, ...props }: React.ComponentProps<'div'>) {
+  return (
+    <div
+      data-slot="card-title"
+      className={cn(
+        'text-base leading-normal font-medium group-data-[size=sm]/card:text-sm',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+function CardDescription({ className, ...props }: React.ComponentProps<'div'>) {
+  return (
+    <div
+      data-slot="card-description"
+      className={cn('text-sm text-muted-foreground', className)}
+      {...props}
+    />
+  );
+}
+
+function CardAction({ className, ...props }: React.ComponentProps<'div'>) {
+  return (
+    <div
+      data-slot="card-action"
+      className={cn('col-start-2 row-span-2 row-start-1 self-start justify-self-end', className)}
+      {...props}
+    />
+  );
+}
+
+function CardContent({ className, ...props }: React.ComponentProps<'div'>) {
+  return (
+    <div
+      data-slot="card-content"
+      className={cn('px-6 group-data-[size=sm]/card:px-4', className)}
+      {...props}
+    />
+  );
+}
+
+function CardFooter({ className, ...props }: React.ComponentProps<'div'>) {
+  return (
+    <div
+      data-slot="card-footer"
+      className={cn(
+        'flex items-center rounded-b-xl px-6 group-data-[size=sm]/card:px-4 [.border-t]:pt-6 group-data-[size=sm]/card:[.border-t]:pt-4',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+export { Card, CardHeader, CardFooter, CardTitle, CardAction, CardDescription, CardContent };
diff --git a/src/renderer/lib/ui/checkbox.tsx b/src/renderer/lib/ui/checkbox.tsx
new file mode 100644
index 0000000000..f887dd4cc6
--- /dev/null
+++ b/src/renderer/lib/ui/checkbox.tsx
@@ -0,0 +1,25 @@
+import { Checkbox as CheckboxPrimitive } from '@base-ui/react/checkbox';
+import { CheckIcon } from 'lucide-react';
+import { cn } from '@renderer/utils/utils';
+
+function Checkbox({ className, ...props }: CheckboxPrimitive.Root.Props) {
+  return (
+    <CheckboxPrimitive.Root
+      data-slot="checkbox"
+      className={cn(
+        'peer relative flex size-4 shrink-0 items-center justify-center rounded-[4px] border border-border-1 outline-none group-has-disabled/field:opacity-50 after:absolute after:-inset-x-3 after:-inset-y-2 focus-visible:border-ring focus-visible:ring-3 focus-visible:ring-ring/50 disabled:cursor-not-allowed disabled:opacity-50 aria-invalid:border-destructive aria-invalid:ring-3 aria-invalid:ring-destructive/20 aria-invalid:aria-checked:border-primary data-checked:border-primary data-checked:bg-background-neutral data-checked:text-foreground-neutral',
+        className
+      )}
+      {...props}
+    >
+      <CheckboxPrimitive.Indicator
+        data-slot="checkbox-indicator"
+        className="grid place-content-center text-current transition-none [&>svg]:size-3"
+      >
+        <CheckIcon absoluteStrokeWidth strokeWidth={3} />
+      </CheckboxPrimitive.Indicator>
+    </CheckboxPrimitive.Root>
+  );
+}
+
+export { Checkbox };
diff --git a/src/renderer/lib/ui/collapsible.tsx b/src/renderer/lib/ui/collapsible.tsx
new file mode 100644
index 0000000000..772c3d5412
--- /dev/null
+++ b/src/renderer/lib/ui/collapsible.tsx
@@ -0,0 +1,17 @@
+'use client';
+
+import { Collapsible as CollapsiblePrimitive } from '@base-ui/react/collapsible';
+
+function Collapsible({ ...props }: CollapsiblePrimitive.Root.Props) {
+  return <CollapsiblePrimitive.Root data-slot="collapsible" {...props} />;
+}
+
+function CollapsibleTrigger({ ...props }: CollapsiblePrimitive.Trigger.Props) {
+  return <CollapsiblePrimitive.Trigger data-slot="collapsible-trigger" {...props} />;
+}
+
+function CollapsibleContent({ ...props }: CollapsiblePrimitive.Panel.Props) {
+  return <CollapsiblePrimitive.Panel data-slot="collapsible-content" {...props} />;
+}
+
+export { Collapsible, CollapsibleTrigger, CollapsibleContent };
diff --git a/src/renderer/lib/ui/combobox-popover.tsx b/src/renderer/lib/ui/combobox-popover.tsx
new file mode 100644
index 0000000000..b46d452246
--- /dev/null
+++ b/src/renderer/lib/ui/combobox-popover.tsx
@@ -0,0 +1,157 @@
+import { ReactNode, useState } from 'react';
+import { cn } from '@renderer/utils/utils';
+import {
+  Combobox,
+  ComboboxCollection,
+  ComboboxContent,
+  ComboboxGroup,
+  ComboboxInput,
+  ComboboxItem,
+  ComboboxList,
+} from './combobox';
+
+// ─── Public types ─────────────────────────────────────────────────────────────
+
+export interface ComboboxSelectOption {
+  value: string;
+  label: string;
+}
+
+export interface ComboboxAction {
+  id: string;
+  label: string;
+  icon?: ReactNode;
+  onClick: () => void;
+}
+
+export interface ComboboxPopoverProps<T extends ComboboxSelectOption> {
+  /** The trigger element — should be a ComboboxTrigger */
+  trigger: ReactNode;
+  items: T[];
+  actions?: ComboboxAction[];
+  value?: T | null;
+  defaultValue?: T;
+  onValueChange?: (item: T) => void;
+  placeholder?: string;
+  contentClassName?: string;
+}
+
+// ─── Internals ────────────────────────────────────────────────────────────────
+
+// Action items get a `value` field (required by ComboboxItem) and a `_type`
+// discriminator so the filter and onValueChange can tell them apart from options.
+type ActionItem = ComboboxAction & { value: string; _type: 'action' };
+
+// Matches Base UI's Group<Item> = { value: unknown; items: Item[] }
+type OptionsGroup<T> = { value: 'options'; items: T[] };
+type ActionsGroup = { value: 'actions'; items: ActionItem[] };
+type ItemGroup<T> = OptionsGroup<T> | ActionsGroup;
+
+function buildGroups<T extends ComboboxSelectOption>(
+  items: T[],
+  actions: ComboboxAction[]
+): ItemGroup<T>[] {
+  const groups: ItemGroup<T>[] = [{ value: 'options', items }];
+  if (actions.length > 0) {
+    groups.push({
+      value: 'actions',
+      items: actions.map((a) => ({
+        ...a,
+        value: `__action__:${a.id}`,
+        _type: 'action' as const,
+      })),
+    });
+  }
+  return groups;
+}
+
+// Using `unknown` input so this can safely narrow any runtime value,
+// including items typed as T that are actually ActionItems at runtime.
+function isActionItem(item: unknown): item is ActionItem {
+  return (
+    typeof item === 'object' &&
+    item !== null &&
+    '_type' in item &&
+    (item as ActionItem)._type === 'action'
+  );
+}
+
+// ─── Component ────────────────────────────────────────────────────────────────
+
+export function ComboboxPopover<T extends ComboboxSelectOption>({
+  trigger,
+  items,
+  actions = [],
+  value,
+  defaultValue,
+  onValueChange,
+  placeholder = 'Search...',
+  contentClassName,
+}: ComboboxPopoverProps<T>) {
+  const groups = buildGroups(items, actions);
+
+  const [internalItem, setInternalItem] = useState<T | null>(() => defaultValue ?? null);
+  const [open, setOpen] = useState(false);
+
+  const isControlled = value !== undefined;
+  const selectedItem = isControlled ? (value ?? null) : internalItem;
+
+  function handleValueChange(item: T | null) {
+    if (!item) return;
+    if (isActionItem(item)) {
+      item.onClick();
+      setOpen(false);
+    } else {
+      if (!isControlled) setInternalItem(item);
+      onValueChange?.(item);
+    }
+  }
+
+  return (
+    <Combobox
+      items={groups}
+      value={selectedItem}
+      onValueChange={handleValueChange}
+      open={open}
+      onOpenChange={setOpen}
+      isItemEqualToValue={(a: T, b: T) => a.value === b.value}
+      filter={(item: T, query) =>
+        isActionItem(item) || item.label.toLowerCase().includes(query.toLowerCase())
+      }
+      autoHighlight
+    >
+      {trigger}
+      <ComboboxContent className={cn('min-w-(--anchor-width)', contentClassName)}>
+        <ComboboxInput showTrigger={false} placeholder={placeholder} />
+        <ComboboxList className={'pb-0'}>
+          {(group: ItemGroup<T>) => (
+            <ComboboxGroup
+              key={group.value as string}
+              items={group.items}
+              className={
+                group.value === 'actions'
+                  ? 'sticky bottom-0 -mx-1 px-1 border-t border-border bg-popover pt-1 pb-1 rounded-b-md'
+                  : 'py-1'
+              }
+            >
+              <ComboboxCollection>
+                {(item: T | ActionItem) =>
+                  isActionItem(item) ? (
+                    <ComboboxItem key={item.id} value={item as unknown as T}>
+                      {item.icon}
+                      {item.label}
+                    </ComboboxItem>
+                  ) : (
+                    <ComboboxItem key={(item as T).value} value={item as T}>
+                      {(item as T).label}
+                    </ComboboxItem>
+                  )
+                }
+              </ComboboxCollection>
+            </ComboboxGroup>
+          )}
+        </ComboboxList>
+      </ComboboxContent>
+    </Combobox>
+  );
+}
diff --git a/src/renderer/lib/ui/combobox.tsx b/src/renderer/lib/ui/combobox.tsx
new file mode 100644
index 0000000000..3a0faa2c30
--- /dev/null
+++ b/src/renderer/lib/ui/combobox.tsx
@@ -0,0 +1,289 @@
+import { Combobox as ComboboxPrimitive } from '@base-ui/react';
+import { CheckIcon, XIcon } from 'lucide-react';
+import * as React from 'react';
+import { Button } from '@renderer/lib/ui/button';
+import {
+  InputGroup,
+  InputGroupAddon,
+  InputGroupButton,
+  InputGroupInput,
+} from '@renderer/lib/ui/input-group';
+import { cn } from '@renderer/utils/utils';
+
+const Combobox = ComboboxPrimitive.Root;
+
+function ComboboxValue({ ...props }: ComboboxPrimitive.Value.Props) {
+  return <ComboboxPrimitive.Value data-slot="combobox-value" {...props} />;
+}
+
+function ComboboxTrigger({ className, children, ...props }: ComboboxPrimitive.Trigger.Props) {
+  return (
+    <ComboboxPrimitive.Trigger
+      data-slot="combobox-trigger"
+      className={cn("[&_svg:not([class*='size-'])]:size-4", className)}
+      {...props}
+    >
+      {children}
+    </ComboboxPrimitive.Trigger>
+  );
+}
+
+function ComboboxClear({ className, ...props }: ComboboxPrimitive.Clear.Props) {
+  return (
+    <ComboboxPrimitive.Clear
+      data-slot="combobox-clear"
+      render={<InputGroupButton variant="ghost" size="icon-xs" />}
+      className={cn(className)}
+      {...props}
+    >
+      <XIcon className="pointer-events-none" />
+    </ComboboxPrimitive.Clear>
+  );
+}
+
+function ComboboxInput({
+  className,
+  children,
+  disabled = false,
+  showTrigger = true,
+  showClear = false,
+  leftAddon,
+  rightAddon,
+  inputRef,
+  ...props
+}: ComboboxPrimitive.Input.Props & {
+  showTrigger?: boolean;
+  showClear?: boolean;
+  leftAddon?: React.ReactNode;
+  rightAddon?: React.ReactNode;
+  inputRef?: React.RefObject<HTMLInputElement | null>;
+}) {
+  return (
+    <InputGroup
+      className={cn(
+        'w-auto has-[[data-slot=input-group-control]:focus-visible]:ring-0 has-[[data-slot=input-group-control]:focus-visible]:border-input',
+        className
+      )}
+    >
+      {leftAddon && <InputGroupAddon align="inline-start">{leftAddon}</InputGroupAddon>}
+      <ComboboxPrimitive.Input
+        render={<InputGroupInput ref={inputRef} disabled={disabled} />}
+        {...props}
+      />
+      <InputGroupAddon align="inline-end">
+        {rightAddon}
+        {showTrigger && (
+          <InputGroupButton
+            size="icon-xs"
+            variant="ghost"
+            render={<ComboboxTrigger />}
+            data-slot="input-group-button"
+            className="group-has-data-[slot=combobox-clear]/input-group:hidden data-pressed:bg-transparent"
+            disabled={disabled}
+          />
+        )}
+        {showClear && <ComboboxClear disabled={disabled} />}
+      </InputGroupAddon>
+      {children}
+    </InputGroup>
+  );
+}
+
+function ComboboxContent({
+  className,
+  side = 'bottom',
+  sideOffset = 6,
+  align = 'start',
+  alignOffset = 0,
+  anchor,
+  collisionAvoidance,
+  finalFocus = false,
+  ...props
+}: ComboboxPrimitive.Popup.Props &
+  Pick<
+    ComboboxPrimitive.Positioner.Props,
+    'side' | 'align' | 'sideOffset' | 'alignOffset' | 'anchor' | 'collisionAvoidance'
+  >) {
+  return (
+    <ComboboxPrimitive.Portal>
+      <ComboboxPrimitive.Positioner
+        side={side}
+        sideOffset={sideOffset}
+        align={align}
+        alignOffset={alignOffset}
+        anchor={anchor}
+        collisionAvoidance={collisionAvoidance}
+        className="isolate z-50"
+      >
+        <ComboboxPrimitive.Popup
+          data-slot="combobox-content"
+          data-chips={!!anchor}
+          finalFocus={finalFocus}
+          className={cn(
+            'group/combobox-content relative max-h-(--available-height) w-(--anchor-width) max-w-(--available-width) min-w-[var(--anchor-width)] origin-(--transform-origin) overflow-hidden rounded-md bg-background-quaternary text-foreground shadow-sm ring-1 ring-foreground/10 duration-100 data-[chips=true]:min-w-(--anchor-width) data-[side=bottom]:slide-in-from-top-2 data-[side=inline-end]:slide-in-from-left-2 data-[side=inline-start]:slide-in-from-right-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 *:data-[slot=input-group]:m-0 *:data-[slot=input-group]:h-9 *:data-[slot=input-group]:border-t-0 *:data-[slot=input-group]:border-x-0 *:data-[slot=input-group]:border-b *:data-[slot=input-group]:border-border *:data-[slot=input-group]:rounded-none *:data-[slot=input-group]:bg-transparent *:data-[slot=input-group]:shadow-none *:data-[slot=input-group]:focus-within:ring-0 *:data-[slot=input-group]:focus-within:border-inherit data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 data-closed:animate-out data-closed:fade-out-0 data-closed:zoom-out-95',
+            className
+          )}
+          {...props}
+        />
+      </ComboboxPrimitive.Positioner>
+    </ComboboxPrimitive.Portal>
+  );
+}
+
+function ComboboxList({ className, ...props }: ComboboxPrimitive.List.Props) {
+  return (
+    <ComboboxPrimitive.List
+      data-slot="combobox-list"
+      className={cn(
+        'no-scrollbar max-h-[min(calc(--spacing(72)---spacing(9)),calc(var(--available-height)---spacing(9)))] scroll-py-1 overflow-y-auto overscroll-contain p-1 data-empty:p-0',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+function ComboboxItem({ className, children, ...props }: ComboboxPrimitive.Item.Props) {
+  return (
+    <ComboboxPrimitive.Item
+      data-slot="combobox-item"
+      className={cn(
+        "relative flex w-full cursor-default items-center gap-2 rounded-sm py-1.5 pr-8 pl-2 text-sm outline-hidden select-none not-data-selected:data-highlighted:bg-background-quaternary-1 data-selected:bg-background-quaternary-2 data-highlighted:text-foreground not-data-[variant=destructive]:data-highlighted:**:text-accent-foreground data-disabled:pointer-events-none data-disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
+        className
+      )}
+      {...props}
+    >
+      {children}
+      <ComboboxPrimitive.ItemIndicator
+        render={
+          <span className="pointer-events-none absolute right-2 flex size-3.5 items-center justify-center" />
+        }
+      >
+        <CheckIcon className="pointer-events-none" absoluteStrokeWidth strokeWidth={3} />
+      </ComboboxPrimitive.ItemIndicator>
+    </ComboboxPrimitive.Item>
+  );
+}
+
+function ComboboxGroup({ className, ...props }: ComboboxPrimitive.Group.Props) {
+  return (
+    <ComboboxPrimitive.Group data-slot="combobox-group" className={cn(className)} {...props} />
+  );
+}
+
+function ComboboxLabel({ className, ...props }: ComboboxPrimitive.GroupLabel.Props) {
+  return (
+    <ComboboxPrimitive.GroupLabel
+      data-slot="combobox-label"
+      className={cn('px-2 py-1.5 text-xs text-foreground-muted', className)}
+      {...props}
+    />
+  );
+}
+
+function ComboboxCollection({ ...props }: ComboboxPrimitive.Collection.Props) {
+  return <ComboboxPrimitive.Collection data-slot="combobox-collection" {...props} />;
+}
+
+function ComboboxEmpty({ className, ...props }: ComboboxPrimitive.Empty.Props) {
+  return (
+    <ComboboxPrimitive.Empty
+      data-slot="combobox-empty"
+      className={cn(
+        'hidden w-full justify-center py-2 text-center text-sm text-foreground-muted group-data-empty/combobox-content:flex',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+function ComboboxSeparator({ className, ...props }: ComboboxPrimitive.Separator.Props) {
+  return (
+    <ComboboxPrimitive.Separator
+      data-slot="combobox-separator"
+      className={cn('-mx-1 my-1 h-px bg-border', className)}
+      {...props}
+    />
+  );
+}
+
+function ComboboxChips({
+  className,
+  ...props
+}: React.ComponentPropsWithRef<typeof ComboboxPrimitive.Chips> & ComboboxPrimitive.Chips.Props) {
+  return (
+    <ComboboxPrimitive.Chips
+      data-slot="combobox-chips"
+      className={cn(
+        'flex min-h-9 flex-wrap items-center gap-1.5 rounded-md border border-input bg-transparent bg-clip-padding px-2.5 py-1.5 text-sm shadow-xs transition-[color,box-shadow] focus-within:border-ring focus-within:ring-3 focus-within:ring-ring/50 has-aria-invalid:border-destructive has-aria-invalid:ring-3 has-aria-invalid:ring-destructive/20 has-data-[slot=combobox-chip]:px-1.5 dark:bg-input/30 dark:has-aria-invalid:border-destructive/50 dark:has-aria-invalid:ring-destructive/40',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+function ComboboxChip({
+  className,
+  children,
+  showRemove = true,
+  ...props
+}: ComboboxPrimitive.Chip.Props & {
+  showRemove?: boolean;
+}) {
+  return (
+    <ComboboxPrimitive.Chip
+      data-slot="combobox-chip"
+      className={cn(
+        'flex h-[calc(--spacing(5.5))] w-fit items-center justify-center gap-1 rounded-sm bg-muted px-1.5 text-xs font-medium whitespace-nowrap text-foreground has-disabled:pointer-events-none has-disabled:cursor-not-allowed has-disabled:opacity-50 has-data-[slot=combobox-chip-remove]:pr-0',
+        className
+      )}
+      {...props}
+    >
+      {children}
+      {showRemove && (
+        <ComboboxPrimitive.ChipRemove
+          render={<Button variant="ghost" size="icon-xs" />}
+          className="-ml-1 opacity-50 hover:opacity-100"
+          data-slot="combobox-chip-remove"
+        >
+          <XIcon className="pointer-events-none" />
+        </ComboboxPrimitive.ChipRemove>
+      )}
+    </ComboboxPrimitive.Chip>
+  );
+}
+
+function ComboboxChipsInput({ className, ...props }: ComboboxPrimitive.Input.Props) {
+  return (
+    <ComboboxPrimitive.Input
+      data-slot="combobox-chip-input"
+      className={cn('min-w-16 flex-1 outline-none', className)}
+      {...props}
+    />
+  );
+}
+
+function useComboboxAnchor() {
+  return React.useRef<HTMLDivElement | null>(null);
+}
+
+export {
+  Combobox,
+  ComboboxInput,
+  ComboboxContent,
+  ComboboxList,
+  ComboboxItem,
+  ComboboxGroup,
+  ComboboxLabel,
+  ComboboxCollection,
+  ComboboxEmpty,
+  ComboboxSeparator,
+  ComboboxChips,
+  ComboboxChip,
+  ComboboxChipsInput,
+  ComboboxTrigger,
+  ComboboxValue,
+  useComboboxAnchor,
+};
diff --git a/src/renderer/lib/ui/combox-input-trigger.tsx b/src/renderer/lib/ui/combox-input-trigger.tsx
new file mode 100644
index 0000000000..5eb2f353c9
--- /dev/null
+++ b/src/renderer/lib/ui/combox-input-trigger.tsx
@@ -0,0 +1,20 @@
+import { ChevronsUpDownIcon } from 'lucide-react';
+import { type ReactNode } from 'react';
+
+export function ComboxInputTrigger({
+  children,
+  ref,
+}: {
+  children: ReactNode;
+  ref?: React.RefObject<HTMLButtonElement>;
+}) {
+  return (
+    <button
+      ref={ref}
+      className="flex h-9 w-full min-w-0 items-center justify-between rounded-md border border-border px-2.5 py-1 text-left text-sm outline-none"
+    >
+      {children}
+      <ChevronsUpDownIcon className="size-4 shrink-0 text-muted-foreground" />
+    </button>
+  );
+}
diff --git a/src/renderer/lib/ui/confirm-button.tsx b/src/renderer/lib/ui/confirm-button.tsx
new file mode 100644
index 0000000000..543f389fe3
--- /dev/null
+++ b/src/renderer/lib/ui/confirm-button.tsx
@@ -0,0 +1,32 @@
+import type { Button as ButtonPrimitive } from '@base-ui/react/button';
+import { useHotkey } from '@tanstack/react-hotkeys';
+import type { VariantProps } from 'class-variance-authority';
+import { useRef } from 'react';
+import { useAppSettingsKey } from '@renderer/features/settings/use-app-settings-key';
+import {
+  getEffectiveHotkey,
+  getHotkeyRegistration,
+} from '@renderer/lib/hooks/useKeyboardShortcuts';
+import { Button, buttonVariants } from './button';
+import { ShortcutHint } from './shortcut-hint';
+
+type ConfirmButtonProps = ButtonPrimitive.Props & VariantProps<typeof buttonVariants>;
+
+export function ConfirmButton({ disabled, children, ...props }: ConfirmButtonProps) {
+  const ref = useRef<HTMLButtonElement>(null);
+  const { value: keyboard } = useAppSettingsKey('keyboard');
+  const confirmHotkey = getEffectiveHotkey('confirm', keyboard);
+
+  useHotkey(getHotkeyRegistration('confirm', keyboard), () => ref.current?.click(), {
+    enabled: !disabled && confirmHotkey !== null,
+  });
+
+  return (
+    <Button ref={ref} disabled={disabled} {...props}>
+      <span className="flex items-center gap-2">
+        {children}
+        <ShortcutHint settingsKey="confirm" />
+      </span>
+    </Button>
+  );
+}
diff --git a/src/renderer/lib/ui/context-menu.tsx b/src/renderer/lib/ui/context-menu.tsx
new file mode 100644
index 0000000000..e6e77d824b
--- /dev/null
+++ b/src/renderer/lib/ui/context-menu.tsx
@@ -0,0 +1,244 @@
+'use client';
+
+import { ContextMenu as ContextMenuPrimitive } from '@base-ui/react/context-menu';
+import { CheckIcon, ChevronRightIcon } from 'lucide-react';
+import * as React from 'react';
+import { cn } from '@renderer/utils/utils';
+
+function ContextMenu({ ...props }: ContextMenuPrimitive.Root.Props) {
+  return <ContextMenuPrimitive.Root data-slot="context-menu" {...props} />;
+}
+
+function ContextMenuPortal({ ...props }: ContextMenuPrimitive.Portal.Props) {
+  return <ContextMenuPrimitive.Portal data-slot="context-menu-portal" {...props} />;
+}
+
+function ContextMenuTrigger({ className, ...props }: ContextMenuPrimitive.Trigger.Props) {
+  return (
+    <ContextMenuPrimitive.Trigger
+      data-slot="context-menu-trigger"
+      className={cn('select-none', className)}
+      {...props}
+    />
+  );
+}
+
+function ContextMenuContent({
+  className,
+  align = 'start',
+  alignOffset = 4,
+  side = 'right',
+  sideOffset = 0,
+  ...props
+}: ContextMenuPrimitive.Popup.Props &
+  Pick<ContextMenuPrimitive.Positioner.Props, 'align' | 'alignOffset' | 'side' | 'sideOffset'>) {
+  return (
+    <ContextMenuPrimitive.Portal>
+      <ContextMenuPrimitive.Positioner
+        className="isolate z-50 outline-none"
+        align={align}
+        alignOffset={alignOffset}
+        side={side}
+        sideOffset={sideOffset}
+      >
+        <ContextMenuPrimitive.Popup
+          data-slot="context-menu-content"
+          className={cn(
+            'z-50 max-h-(--available-height) min-w-36 origin-(--transform-origin) overflow-x-hidden overflow-y-auto rounded-md bg-background p-1 text-foreground-muted shadow-md ring-1 ring-foreground/10 duration-100 outline-none data-[side=bottom]:slide-in-from-top-2 data-[side=inline-end]:slide-in-from-left-2 data-[side=inline-start]:slide-in-from-right-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 data-closed:animate-out data-closed:fade-out-0 data-closed:zoom-out-95',
+            className
+          )}
+          {...props}
+        />
+      </ContextMenuPrimitive.Positioner>
+    </ContextMenuPrimitive.Portal>
+  );
+}
+
+function ContextMenuGroup({ ...props }: ContextMenuPrimitive.Group.Props) {
+  return <ContextMenuPrimitive.Group data-slot="context-menu-group" {...props} />;
+}
+
+function ContextMenuLabel({
+  className,
+  inset,
+  ...props
+}: ContextMenuPrimitive.GroupLabel.Props & {
+  inset?: boolean;
+}) {
+  return (
+    <ContextMenuPrimitive.GroupLabel
+      data-slot="context-menu-label"
+      data-inset={inset}
+      className={cn(
+        'px-2 py-1.5 text-xs font-medium text-foreground-muted data-inset:pl-8',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+function ContextMenuItem({
+  className,
+  inset,
+  variant = 'default',
+  ...props
+}: ContextMenuPrimitive.Item.Props & {
+  inset?: boolean;
+  variant?: 'default' | 'destructive';
+}) {
+  return (
+    <ContextMenuPrimitive.Item
+      data-slot="context-menu-item"
+      data-inset={inset}
+      data-variant={variant}
+      className={cn(
+        "group/context-menu-item relative flex cursor-default items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-hidden select-none focus:bg-background-2 focus:text-foreground data-inset:pl-8 data-[variant=destructive]:text-destructive data-[variant=destructive]:focus:bg-destructive/10 data-[variant=destructive]:focus:text-destructive dark:data-[variant=destructive]:focus:bg-destructive/20 data-disabled:pointer-events-none data-disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4 focus:*:[svg]:text-accent-foreground data-[variant=destructive]:*:[svg]:text-destructive",
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+function ContextMenuSub({ ...props }: ContextMenuPrimitive.SubmenuRoot.Props) {
+  return <ContextMenuPrimitive.SubmenuRoot data-slot="context-menu-sub" {...props} />;
+}
+
+function ContextMenuSubTrigger({
+  className,
+  inset,
+  children,
+  ...props
+}: ContextMenuPrimitive.SubmenuTrigger.Props & {
+  inset?: boolean;
+}) {
+  return (
+    <ContextMenuPrimitive.SubmenuTrigger
+      data-slot="context-menu-sub-trigger"
+      data-inset={inset}
+      className={cn(
+        "flex cursor-default items-center rounded-sm px-2 py-1.5 text-sm outline-hidden select-none focus:bg-accent focus:text-accent-foreground data-inset:pl-8 data-open:bg-accent data-open:text-accent-foreground [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
+        className
+      )}
+      {...props}
+    >
+      {children}
+      <ChevronRightIcon className="ml-auto" />
+    </ContextMenuPrimitive.SubmenuTrigger>
+  );
+}
+
+function ContextMenuSubContent({ ...props }: React.ComponentProps<typeof ContextMenuContent>) {
+  return (
+    <ContextMenuContent
+      data-slot="context-menu-sub-content"
+      className="shadow-lg"
+      side="right"
+      {...props}
+    />
+  );
+}
+
+function ContextMenuCheckboxItem({
+  className,
+  children,
+  checked,
+  inset,
+  ...props
+}: ContextMenuPrimitive.CheckboxItem.Props & {
+  inset?: boolean;
+}) {
+  return (
+    <ContextMenuPrimitive.CheckboxItem
+      data-slot="context-menu-checkbox-item"
+      data-inset={inset}
+      className={cn(
+        "relative flex cursor-default items-center gap-2 rounded-sm py-1.5 pr-8 pl-2 text-sm outline-hidden select-none focus:bg-accent focus:text-accent-foreground data-inset:pl-8 data-disabled:pointer-events-none data-disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
+        className
+      )}
+      checked={checked}
+      {...props}
+    >
+      <span className="pointer-events-none absolute right-2">
+        <ContextMenuPrimitive.CheckboxItemIndicator>
+          <CheckIcon />
+        </ContextMenuPrimitive.CheckboxItemIndicator>
+      </span>
+      {children}
+    </ContextMenuPrimitive.CheckboxItem>
+  );
+}
+
+function ContextMenuRadioGroup({ ...props }: ContextMenuPrimitive.RadioGroup.Props) {
+  return <ContextMenuPrimitive.RadioGroup data-slot="context-menu-radio-group" {...props} />;
+}
+
+function ContextMenuRadioItem({
+  className,
+  children,
+  inset,
+  ...props
+}: ContextMenuPrimitive.RadioItem.Props & {
+  inset?: boolean;
+}) {
+  return (
+    <ContextMenuPrimitive.RadioItem
+      data-slot="context-menu-radio-item"
+      data-inset={inset}
+      className={cn(
+        "relative flex cursor-default items-center gap-2 rounded-sm py-1.5 pr-8 pl-2 text-sm outline-hidden select-none focus:bg-accent focus:text-accent-foreground data-inset:pl-8 data-disabled:pointer-events-none data-disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
+        className
+      )}
+      {...props}
+    >
+      <span className="pointer-events-none absolute right-2">
+        <ContextMenuPrimitive.RadioItemIndicator>
+          <CheckIcon />
+        </ContextMenuPrimitive.RadioItemIndicator>
+      </span>
+      {children}
+    </ContextMenuPrimitive.RadioItem>
+  );
+}
+
+function ContextMenuSeparator({ className, ...props }: ContextMenuPrimitive.Separator.Props) {
+  return (
+    <ContextMenuPrimitive.Separator
+      data-slot="context-menu-separator"
+      className={cn('-mx-1 my-1 h-px bg-border', className)}
+      {...props}
+    />
+  );
+}
+
+function ContextMenuShortcut({ className, ...props }: React.ComponentProps<'span'>) {
+  return (
+    <span
+      data-slot="context-menu-shortcut"
+      className={cn(
+        'ml-auto text-xs tracking-widest text-muted-foreground group-focus/context-menu-item:text-accent-foreground',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+export {
+  ContextMenu,
+  ContextMenuTrigger,
+  ContextMenuContent,
+  ContextMenuItem,
+  ContextMenuCheckboxItem,
+  ContextMenuRadioItem,
+  ContextMenuLabel,
+  ContextMenuSeparator,
+  ContextMenuShortcut,
+  ContextMenuGroup,
+  ContextMenuPortal,
+  ContextMenuSub,
+  ContextMenuSubContent,
+  ContextMenuSubTrigger,
+  ContextMenuRadioGroup,
+};
diff --git a/src/renderer/lib/ui/dialog.tsx b/src/renderer/lib/ui/dialog.tsx
new file mode 100644
index 0000000000..3177915485
--- /dev/null
+++ b/src/renderer/lib/ui/dialog.tsx
@@ -0,0 +1,166 @@
+import { Dialog as DialogPrimitive } from '@base-ui/react/dialog';
+import { XIcon } from 'lucide-react';
+import * as React from 'react';
+import { Button } from '@renderer/lib/ui/button';
+import { cn } from '@renderer/utils/utils';
+
+function Dialog({ ...props }: DialogPrimitive.Root.Props) {
+  return <DialogPrimitive.Root data-slot="dialog" {...props} />;
+}
+
+function DialogTrigger({ ...props }: DialogPrimitive.Trigger.Props) {
+  return <DialogPrimitive.Trigger data-slot="dialog-trigger" {...props} />;
+}
+
+function DialogPortal({ ...props }: DialogPrimitive.Portal.Props) {
+  return <DialogPrimitive.Portal data-slot="dialog-portal" {...props} />;
+}
+
+function DialogClose({ ...props }: DialogPrimitive.Close.Props) {
+  return <DialogPrimitive.Close data-slot="dialog-close" {...props} />;
+}
+
+function DialogOverlay({ className, ...props }: DialogPrimitive.Backdrop.Props) {
+  return (
+    <DialogPrimitive.Backdrop
+      data-slot="dialog-overlay"
+      className={cn(
+        'fixed inset-0 isolate z-50 bg-black/30 duration-100  data-open:animate-in data-open:fade-in-0 data-closed:animate-out data-closed:fade-out-0',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+function DialogContent({
+  className,
+  children,
+  ...props
+}: DialogPrimitive.Popup.Props & { showCloseButton?: boolean }) {
+  return (
+    <DialogPortal>
+      <DialogOverlay />
+      <DialogPrimitive.Popup
+        finalFocus={false}
+        data-slot="dialog-content"
+        onKeyDownCapture={(e) => {
+          if ((e.metaKey || e.ctrlKey || e.altKey) && e.key === 'Enter') {
+            e.preventDefault();
+          }
+        }}
+        className={cn(
+          'fixed top-1/2 left-1/2 z-50 flex flex-col w-full max-w-[calc(100%-2rem)] -translate-x-1/2 -translate-y-1/2 bg-background text-sm ring-1 ring-foreground/10 duration-100 outline-none sm:max-w-lg data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 data-closed:animate-out rounded-xl overflow-hidden data-closed:fade-out-0 data-closed:zoom-out-95',
+          className
+        )}
+        {...props}
+      >
+        {children}
+      </DialogPrimitive.Popup>
+    </DialogPortal>
+  );
+}
+
+function DialogHeader({
+  className,
+  children,
+  showCloseButton = true,
+  ...props
+}: React.ComponentProps<'div'> & { showCloseButton?: boolean }) {
+  return (
+    <div
+      data-slot="dialog-header"
+      className="flex items-center gap-2 p-6 justify-between"
+      {...props}
+    >
+      <div className={cn('flex items-center gap-2', className)}>{children}</div>
+      {showCloseButton && (
+        <DialogPrimitive.Close
+          data-slot="dialog-close"
+          render={
+            <button className="p-0  text-foreground-tertiary-muted hover:text-foreground-tertiary hover:bg-transparent bg-transparent" />
+          }
+        >
+          <XIcon className="size-4" />
+          <span className="sr-only">Close</span>
+        </DialogPrimitive.Close>
+      )}
+    </div>
+  );
+}
+
+function DialogFooter({
+  className,
+  showCloseButton = false,
+  children,
+  ...props
+}: React.ComponentProps<'div'> & {
+  showCloseButton?: boolean;
+}) {
+  return (
+    <div
+      data-slot="dialog-footer"
+      className={cn(
+        'flex flex-col-reverse gap-2 p-3 border-t border-border bg-background-quaternary-1 sm:flex-row sm:justify-end',
+        className
+      )}
+      {...props}
+    >
+      {children}
+      {showCloseButton && (
+        <DialogPrimitive.Close render={<Button variant="outline" />}>Close</DialogPrimitive.Close>
+      )}
+    </div>
+  );
+}
+
+function DialogTitle({ className, ...props }: DialogPrimitive.Title.Props) {
+  return (
+    <DialogPrimitive.Title
+      data-slot="dialog-title"
+      className={cn(
+        'text-xs font-mono tracking-wider uppercase text-foreground-tertiary-passive',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+function DialogDescription({ className, ...props }: DialogPrimitive.Description.Props) {
+  return (
+    <DialogPrimitive.Description
+      data-slot="dialog-description"
+      className={cn(
+        'text-sm text-muted-foreground *:[a]:underline *:[a]:underline-offset-3 *:[a]:hover:text-foreground',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+export function DialogContentArea({
+  className,
+  children,
+}: {
+  className?: string;
+  children: React.ReactNode;
+}) {
+  return (
+    <div className={cn('flex flex-col gap-2 w-full min-h-0 p-6 pt-0', className)}>{children}</div>
+  );
+}
+
+export {
+  Dialog,
+  DialogClose,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogOverlay,
+  DialogPortal,
+  DialogTitle,
+  DialogTrigger,
+};
diff --git a/src/renderer/lib/ui/dot.tsx b/src/renderer/lib/ui/dot.tsx
new file mode 100644
index 0000000000..c290e67031
--- /dev/null
+++ b/src/renderer/lib/ui/dot.tsx
@@ -0,0 +1,9 @@
+import { cn } from '@renderer/utils/utils';
+
+export function SeparatorDot({ className }: { className?: string }) {
+  return (
+    <div className={cn('px-0.5 flex items-center', className)}>
+      <span className="inline-block size-0.5 shrink-0 rounded-full bg-foreground-passive" />
+    </div>
+  );
+}
diff --git a/src/renderer/lib/ui/dropdown-menu.tsx b/src/renderer/lib/ui/dropdown-menu.tsx
new file mode 100644
index 0000000000..b877829ac0
--- /dev/null
+++ b/src/renderer/lib/ui/dropdown-menu.tsx
@@ -0,0 +1,255 @@
+import { Menu as MenuPrimitive } from '@base-ui/react/menu';
+import { CheckIcon, ChevronRightIcon } from 'lucide-react';
+import * as React from 'react';
+import { cn } from '@renderer/utils/utils';
+
+function DropdownMenu({ ...props }: MenuPrimitive.Root.Props) {
+  return <MenuPrimitive.Root data-slot="dropdown-menu" {...props} />;
+}
+
+function DropdownMenuPortal({ ...props }: MenuPrimitive.Portal.Props) {
+  return <MenuPrimitive.Portal data-slot="dropdown-menu-portal" {...props} />;
+}
+
+function DropdownMenuTrigger({ ...props }: MenuPrimitive.Trigger.Props) {
+  return <MenuPrimitive.Trigger data-slot="dropdown-menu-trigger" {...props} />;
+}
+
+function DropdownMenuContent({
+  align = 'start',
+  alignOffset = 0,
+  side = 'bottom',
+  sideOffset = 4,
+  className,
+  ...props
+}: MenuPrimitive.Popup.Props &
+  Pick<MenuPrimitive.Positioner.Props, 'align' | 'alignOffset' | 'side' | 'sideOffset'>) {
+  return (
+    <MenuPrimitive.Portal>
+      <MenuPrimitive.Positioner
+        className="isolate z-50 outline-none"
+        align={align}
+        alignOffset={alignOffset}
+        side={side}
+        sideOffset={sideOffset}
+      >
+        <MenuPrimitive.Popup
+          data-slot="dropdown-menu-content"
+          className={cn(
+            'z-50 max-h-(--available-height) w-(--anchor-width) min-w-32 origin-(--transform-origin) overflow-x-hidden overflow-y-auto rounded-md bg-background-quaternary p-1 text-foreground shadow-md ring-1 ring-foreground/10 duration-100 outline-none data-[side=bottom]:slide-in-from-top-2 data-[side=inline-end]:slide-in-from-left-2 data-[side=inline-start]:slide-in-from-right-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 data-closed:animate-out data-closed:overflow-hidden data-closed:fade-out-0 data-closed:zoom-out-95',
+            className
+          )}
+          {...props}
+        />
+      </MenuPrimitive.Positioner>
+    </MenuPrimitive.Portal>
+  );
+}
+
+function DropdownMenuGroup({ ...props }: MenuPrimitive.Group.Props) {
+  return <MenuPrimitive.Group data-slot="dropdown-menu-group" {...props} />;
+}
+
+function DropdownMenuLabel({
+  className,
+  inset,
+  ...props
+}: MenuPrimitive.GroupLabel.Props & {
+  inset?: boolean;
+}) {
+  return (
+    <MenuPrimitive.GroupLabel
+      data-slot="dropdown-menu-label"
+      data-inset={inset}
+      className={cn(
+        'px-2 py-1.5 text-xs font-medium text-foreground-muted data-inset:pl-8',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+function DropdownMenuItem({
+  className,
+  inset,
+  variant = 'default',
+  ...props
+}: MenuPrimitive.Item.Props & {
+  inset?: boolean;
+  variant?: 'default' | 'destructive';
+}) {
+  return (
+    <MenuPrimitive.Item
+      data-slot="dropdown-menu-item"
+      data-inset={inset}
+      data-variant={variant}
+      className={cn(
+        "group/dropdown-menu-item relative flex cursor-default items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-hidden select-none focus:bg-background-quaternary-1 focus:text-foreground not-data-[variant=destructive]:focus:**:text-accent-foreground data-inset:pl-8 data-[variant=destructive]:text-foreground-destructive data-[variant=destructive]:focus:bg-background-destructive data-[variant=destructive]:focus:text-foreground-destructive dark:data-[variant=destructive]:focus:bg-destructive/20 data-disabled:pointer-events-none data-disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4 data-[variant=destructive]:*:[svg]:text-destructive",
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+function DropdownMenuSub({ ...props }: MenuPrimitive.SubmenuRoot.Props) {
+  return <MenuPrimitive.SubmenuRoot data-slot="dropdown-menu-sub" {...props} />;
+}
+
+function DropdownMenuSubTrigger({
+  className,
+  inset,
+  children,
+  ...props
+}: MenuPrimitive.SubmenuTrigger.Props & {
+  inset?: boolean;
+}) {
+  return (
+    <MenuPrimitive.SubmenuTrigger
+      data-slot="dropdown-menu-sub-trigger"
+      data-inset={inset}
+      className={cn(
+        "flex cursor-default items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-hidden select-none focus:bg-accent focus:text-accent-foreground not-data-[variant=destructive]:focus:**:text-accent-foreground data-inset:pl-8 data-popup-open:bg-accent data-popup-open:text-accent-foreground data-open:bg-accent data-open:text-accent-foreground [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
+        className
+      )}
+      {...props}
+    >
+      {children}
+      <ChevronRightIcon className="ml-auto" />
+    </MenuPrimitive.SubmenuTrigger>
+  );
+}
+
+function DropdownMenuSubContent({
+  align = 'start',
+  alignOffset = -3,
+  side = 'right',
+  sideOffset = 0,
+  className,
+  ...props
+}: React.ComponentProps<typeof DropdownMenuContent>) {
+  return (
+    <DropdownMenuContent
+      data-slot="dropdown-menu-sub-content"
+      className={cn(
+        'w-auto min-w-[96px] rounded-md bg-popover p-1 text-popover-foreground shadow-lg ring-1 ring-foreground/10 duration-100 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 data-closed:animate-out data-closed:fade-out-0 data-closed:zoom-out-95',
+        className
+      )}
+      align={align}
+      alignOffset={alignOffset}
+      side={side}
+      sideOffset={sideOffset}
+      {...props}
+    />
+  );
+}
+
+function DropdownMenuCheckboxItem({
+  className,
+  children,
+  checked,
+  inset,
+  ...props
+}: MenuPrimitive.CheckboxItem.Props & {
+  inset?: boolean;
+}) {
+  return (
+    <MenuPrimitive.CheckboxItem
+      data-slot="dropdown-menu-checkbox-item"
+      data-inset={inset}
+      className={cn(
+        "relative flex cursor-default data-checked:text-foreground data-checked:bg-background-quaternary-2 text-foreground-muted items-center gap-2 rounded-sm py-1.5 pr-8 pl-2 text-sm outline-hidden select-none focus:bg-background-quaternary-1 focus:text-foreground focus:**:text-muted-foreground data-inset:pl-8 data-disabled:pointer-events-none data-disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
+        className
+      )}
+      checked={checked}
+      {...props}
+    >
+      <span
+        className="pointer-events-none absolute right-2 flex items-center justify-center"
+        data-slot="dropdown-menu-checkbox-item-indicator"
+      >
+        <MenuPrimitive.CheckboxItemIndicator>
+          <CheckIcon strokeWidth={3} absoluteStrokeWidth />
+        </MenuPrimitive.CheckboxItemIndicator>
+      </span>
+      {children}
+    </MenuPrimitive.CheckboxItem>
+  );
+}
+
+function DropdownMenuRadioGroup({ ...props }: MenuPrimitive.RadioGroup.Props) {
+  return <MenuPrimitive.RadioGroup data-slot="dropdown-menu-radio-group" {...props} />;
+}
+
+function DropdownMenuRadioItem({
+  className,
+  children,
+  inset,
+  ...props
+}: MenuPrimitive.RadioItem.Props & {
+  inset?: boolean;
+}) {
+  return (
+    <MenuPrimitive.RadioItem
+      data-slot="dropdown-menu-radio-item"
+      data-inset={inset}
+      className={cn(
+        "relative flex cursor-default data-checked:text-foreground data-checked:bg-background-quaternary-2 items-center gap-2 rounded-sm py-1.5 pr-8 pl-2 text-sm outline-hidden select-none focus:bg-background-quaternary-1 focus:text-foreground focus:**:text-foreground text-foreground-muted data-inset:pl-8 data-disabled:pointer-events-none data-disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
+        className
+      )}
+      {...props}
+    >
+      <span
+        className="pointer-events-none absolute right-2 flex items-center justify-center"
+        data-slot="dropdown-menu-radio-item-indicator"
+      >
+        <MenuPrimitive.RadioItemIndicator>
+          <CheckIcon strokeWidth={3} absoluteStrokeWidth />
+        </MenuPrimitive.RadioItemIndicator>
+      </span>
+      {children}
+    </MenuPrimitive.RadioItem>
+  );
+}
+
+function DropdownMenuSeparator({ className, ...props }: MenuPrimitive.Separator.Props) {
+  return (
+    <MenuPrimitive.Separator
+      data-slot="dropdown-menu-separator"
+      className={cn('-mx-1 my-1 h-px bg-border', className)}
+      {...props}
+    />
+  );
+}
+
+function DropdownMenuShortcut({ className, ...props }: React.ComponentProps<'span'>) {
+  return (
+    <span
+      data-slot="dropdown-menu-shortcut"
+      className={cn(
+        'ml-auto text-xs tracking-widest text-muted-foreground group-focus/dropdown-menu-item:text-accent-foreground',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+export {
+  DropdownMenu,
+  DropdownMenuPortal,
+  DropdownMenuTrigger,
+  DropdownMenuContent,
+  DropdownMenuGroup,
+  DropdownMenuLabel,
+  DropdownMenuItem,
+  DropdownMenuCheckboxItem,
+  DropdownMenuRadioGroup,
+  DropdownMenuRadioItem,
+  DropdownMenuSeparator,
+  DropdownMenuShortcut,
+  DropdownMenuSub,
+  DropdownMenuSubTrigger,
+  DropdownMenuSubContent,
+};
diff --git a/src/renderer/lib/ui/empty-state.tsx b/src/renderer/lib/ui/empty-state.tsx
new file mode 100644
index 0000000000..22f0152447
--- /dev/null
+++ b/src/renderer/lib/ui/empty-state.tsx
@@ -0,0 +1,22 @@
+interface EmptyStateProps {
+  label: string;
+  description?: string;
+  icon?: React.ReactNode;
+  action?: React.ReactNode;
+}
+
+export function EmptyState({ label, description, action }: EmptyStateProps) {
+  return (
+    <div className="flex h-full min-h-0 w-full flex-col items-center justify-center p-8 bg-background">
+      <div className="flex max-w-xs flex-col items-center text-center">
+        <h2 className="text-sm font-medium font-mono text-foreground-muted">{label}</h2>
+        {description && (
+          <p className="mt-1.5 text-xs font-normal tracking-tight leading-relaxed text-foreground-passive">
+            {description}
+          </p>
+        )}
+        {action && <div className="mt-5">{action}</div>}
+      </div>
+    </div>
+  );
+}
diff --git a/src/renderer/lib/ui/field.tsx b/src/renderer/lib/ui/field.tsx
new file mode 100644
index 0000000000..cd6f8276da
--- /dev/null
+++ b/src/renderer/lib/ui/field.tsx
@@ -0,0 +1,230 @@
+import { cva, type VariantProps } from 'class-variance-authority';
+import { useMemo } from 'react';
+import { Label } from '@renderer/lib/ui/label';
+import { Separator } from '@renderer/lib/ui/separator';
+import { cn } from '@renderer/utils/utils';
+
+function FieldSet({ className, ...props }: React.ComponentProps<'fieldset'>) {
+  return (
+    <fieldset
+      data-slot="field-set"
+      className={cn(
+        'flex flex-col gap-6 has-[>[data-slot=checkbox-group]]:gap-3 has-[>[data-slot=radio-group]]:gap-3',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+function FieldLegend({
+  className,
+  variant = 'legend',
+  ...props
+}: React.ComponentProps<'legend'> & { variant?: 'legend' | 'label' }) {
+  return (
+    <legend
+      data-slot="field-legend"
+      data-variant={variant}
+      className={cn(
+        'mb-3 font-medium data-[variant=label]:text-sm data-[variant=legend]:text-base',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+function FieldGroup({ className, ...props }: React.ComponentProps<'div'>) {
+  return (
+    <div
+      data-slot="field-group"
+      className={cn(
+        'group/field-group @container/field-group flex w-full flex-col gap-4 data-[slot=checkbox-group]:gap-3 *:data-[slot=field-group]:gap-4',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+const fieldVariants = cva('group/field flex w-full gap-2 data-[invalid=true]:text-destructive', {
+  variants: {
+    orientation: {
+      vertical: 'flex-col *:w-full [&>.sr-only]:w-auto',
+      horizontal:
+        'flex-row items-center has-[>[data-slot=field-content]]:items-start *:data-[slot=field-label]:flex-auto has-[>[data-slot=field-content]]:[&>[role=checkbox],[role=radio]]:mt-px',
+      responsive:
+        'flex-col *:w-full @md/field-group:flex-row @md/field-group:items-center @md/field-group:*:w-auto @md/field-group:has-[>[data-slot=field-content]]:items-start @md/field-group:*:data-[slot=field-label]:flex-auto [&>.sr-only]:w-auto @md/field-group:has-[>[data-slot=field-content]]:[&>[role=checkbox],[role=radio]]:mt-px',
+    },
+  },
+  defaultVariants: {
+    orientation: 'vertical',
+  },
+});
+
+function Field({
+  className,
+  orientation = 'vertical',
+  ...props
+}: React.ComponentProps<'div'> & VariantProps<typeof fieldVariants>) {
+  return (
+    <div
+      role="group"
+      data-slot="field"
+      data-orientation={orientation}
+      className={cn(fieldVariants({ orientation }), className)}
+      {...props}
+    />
+  );
+}
+
+function FieldContent({ className, ...props }: React.ComponentProps<'div'>) {
+  return (
+    <div
+      data-slot="field-content"
+      className={cn('group/field-content flex flex-1 flex-col gap-1 leading-snug', className)}
+      {...props}
+    />
+  );
+}
+
+function FieldLabel({ className, ...props }: React.ComponentProps<typeof Label>) {
+  return (
+    <Label
+      data-slot="field-label"
+      className={cn(
+        'group/field-label peer/field-label flex w-fit gap-2 leading-snug group-data-[disabled=true]/field:opacity-50 has-data-checked:border-primary/30 has-data-checked:bg-primary/5 has-[>[data-slot=field]]:rounded-md has-[>[data-slot=field]]:border *:data-[slot=field]:p-3 dark:has-data-checked:border-primary/20 dark:has-data-checked:bg-primary/10',
+        'has-[>[data-slot=field]]:w-full has-[>[data-slot=field]]:flex-col',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+function FieldTitle({ className, ...props }: React.ComponentProps<'div'>) {
+  return (
+    <div
+      data-slot="field-label"
+      className={cn(
+        'flex w-fit items-center gap-2 text-sm leading-snug font-medium group-data-[disabled=true]/field:opacity-50',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+function FieldDescription({ className, ...props }: React.ComponentProps<'p'>) {
+  return (
+    <p
+      data-slot="field-description"
+      className={cn(
+        'text-left text-sm leading-normal font-normal text-muted-foreground group-has-data-horizontal/field:text-balance [[data-variant=legend]+&]:-mt-1.5',
+        'last:mt-0 nth-last-2:-mt-1',
+        '[&>a]:underline [&>a]:underline-offset-4 [&>a:hover]:text-primary',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+function FieldSeparator({
+  children,
+  className,
+  ...props
+}: React.ComponentProps<'div'> & {
+  children?: React.ReactNode;
+}) {
+  return (
+    <div
+      data-slot="field-separator"
+      data-content={!!children}
+      className={cn(
+        'relative -my-2 h-5 text-sm group-data-[variant=outline]/field-group:-mb-2',
+        className
+      )}
+      {...props}
+    >
+      <Separator className="absolute inset-0 top-1/2" />
+      {children && (
+        <span
+          className="relative mx-auto block w-fit bg-background px-2 text-muted-foreground"
+          data-slot="field-separator-content"
+        >
+          {children}
+        </span>
+      )}
+    </div>
+  );
+}
+
+function FieldError({
+  className,
+  children,
+  errors,
+  ...props
+}: React.ComponentProps<'div'> & {
+  errors?: Array<{ message?: string } | undefined>;
+}) {
+  const content = useMemo(() => {
+    if (children) {
+      return children;
+    }
+
+    if (!errors?.length) {
+      return null;
+    }
+
+    const uniqueErrors = [...new Map(errors.map((error) => [error?.message, error])).values()];
+
+    if (uniqueErrors?.length == 1) {
+      return uniqueErrors[0]?.message;
+    }
+
+    return (
+      <ul className="ml-4 flex list-disc flex-col gap-1">
+        {uniqueErrors.map((error, index) => error?.message && <li key={index}>{error.message}</li>)}
+      </ul>
+    );
+  }, [children, errors]);
+
+  if (!content) {
+    return null;
+  }
+
+  return (
+    <div
+      role="alert"
+      data-slot="field-error"
+      className={cn('text-sm font-normal text-destructive', className)}
+      {...props}
+    >
+      {content}
+    </div>
+  );
+}
+
+export function FieldSetHeader({ title, description }: { title: string; description: string }) {
+  return (
+    <div className="flex flex-col gap-1">
+      <FieldLabel className="text-lg text-foreground">{title}</FieldLabel>
+      <FieldDescription className="text-sm text-foreground-muted">{description}</FieldDescription>
+    </div>
+  );
+}
+
+export {
+  Field,
+  FieldLabel,
+  FieldDescription,
+  FieldError,
+  FieldGroup,
+  FieldLegend,
+  FieldSeparator,
+  FieldSet,
+  FieldContent,
+  FieldTitle,
+};
diff --git a/src/renderer/lib/ui/input-group.tsx b/src/renderer/lib/ui/input-group.tsx
new file mode 100644
index 0000000000..25af51d04e
--- /dev/null
+++ b/src/renderer/lib/ui/input-group.tsx
@@ -0,0 +1,145 @@
+'use client';
+
+import { cva, type VariantProps } from 'class-variance-authority';
+import * as React from 'react';
+import { Button } from '@renderer/lib/ui/button';
+import { Input } from '@renderer/lib/ui/input';
+import { Textarea } from '@renderer/lib/ui/textarea';
+import { cn } from '@renderer/utils/utils';
+
+function InputGroup({ className, ...props }: React.ComponentProps<'div'>) {
+  return (
+    <div
+      data-slot="input-group"
+      role="group"
+      className={cn(
+        'group/input-group relative flex h-9 w-full min-w-0 items-center rounded-md border border-input shadow-xs transition-[color,box-shadow] outline-none in-data-[slot=combobox-content]:focus-within:border-inherit in-data-[slot=combobox-content]:focus-within:ring-0 has-[[data-slot=input-group-control]:focus-visible]:border-ring has-[[data-slot=input-group-control]:focus-visible]:ring-3 has-[[data-slot=input-group-control]:focus-visible]:ring-ring/50 has-[[data-slot][aria-invalid=true]]:border-destructive has-[[data-slot][aria-invalid=true]]:ring-3 has-[[data-slot][aria-invalid=true]]:ring-destructive/20 has-[>[data-align=block-end]]:h-auto has-[>[data-align=block-end]]:flex-col has-[>[data-align=block-start]]:h-auto has-[>[data-align=block-start]]:flex-col has-[>textarea]:h-auto dark:bg-input/30 dark:has-[[data-slot][aria-invalid=true]]:ring-destructive/40 has-[>[data-align=block-end]]:[&>input]:pt-3 has-[>[data-align=block-start]]:[&>input]:pb-3 has-[>[data-align=inline-end]]:[&>input]:pr-1.5 has-[>[data-align=inline-start]]:[&>input]:pl-1.5',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+const inputGroupAddonVariants = cva(
+  "flex h-auto cursor-text items-center justify-center gap-2 py-1.5 text-sm font-medium text-muted-foreground select-none group-data-[disabled=true]/input-group:opacity-50 [&>kbd]:rounded-[calc(var(--radius)-5px)] [&>svg:not([class*='size-'])]:size-4",
+  {
+    variants: {
+      align: {
+        'inline-start': 'order-first pl-2 has-[>button]:-ml-1 has-[>kbd]:ml-[-0.15rem]',
+        'inline-end': 'order-last pr-2 has-[>button]:-mr-1 has-[>kbd]:mr-[-0.15rem]',
+        'block-start':
+          'order-first w-full justify-start px-2.5 pt-2 group-has-[>input]/input-group:pt-2 [.border-b]:pb-2',
+        'block-end':
+          'order-last w-full justify-start px-2.5 pb-2 group-has-[>input]/input-group:pb-2 [.border-t]:pt-2',
+      },
+    },
+    defaultVariants: {
+      align: 'inline-start',
+    },
+  }
+);
+
+function InputGroupAddon({
+  className,
+  align = 'inline-start',
+  ...props
+}: React.ComponentProps<'div'> & VariantProps<typeof inputGroupAddonVariants>) {
+  return (
+    <div
+      role="group"
+      data-slot="input-group-addon"
+      data-align={align}
+      className={cn(inputGroupAddonVariants({ align }), className)}
+      onClick={(e) => {
+        if ((e.target as HTMLElement).closest('button')) {
+          return;
+        }
+        e.currentTarget.parentElement?.querySelector('input')?.focus();
+      }}
+      {...props}
+    />
+  );
+}
+
+const inputGroupButtonVariants = cva('flex items-center gap-2 text-sm shadow-none', {
+  variants: {
+    size: {
+      xs: "h-6 gap-1 rounded-[calc(var(--radius)-5px)] px-1.5 [&>svg:not([class*='size-'])]:size-3.5",
+      sm: '',
+      'icon-xs': 'size-6 rounded-[calc(var(--radius)-5px)] p-0 has-[>svg]:p-0',
+      'icon-sm': 'size-8 p-0 has-[>svg]:p-0',
+    },
+  },
+  defaultVariants: {
+    size: 'xs',
+  },
+});
+
+function InputGroupButton({
+  className,
+  type = 'button',
+  variant = 'ghost',
+  size = 'xs',
+  ...props
+}: Omit<React.ComponentProps<typeof Button>, 'size' | 'type'> &
+  VariantProps<typeof inputGroupButtonVariants> & {
+    type?: 'button' | 'submit' | 'reset';
+  }) {
+  return (
+    <Button
+      type={type}
+      data-size={size}
+      variant={variant}
+      className={cn(inputGroupButtonVariants({ size }), className)}
+      {...props}
+    />
+  );
+}
+
+function InputGroupText({ className, ...props }: React.ComponentProps<'span'>) {
+  return (
+    <span
+      className={cn(
+        "flex items-center gap-2 text-sm text-muted-foreground [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4",
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+function InputGroupInput({ className, ...props }: React.ComponentProps<'input'>) {
+  return (
+    <Input
+      data-slot="input-group-control"
+      className={cn(
+        'flex-1 rounded-none border-0 bg-transparent shadow-none ring-0 focus-visible:ring-0! focus-visible:border-0! aria-invalid:ring-0! dark:bg-transparent',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+function InputGroupTextarea({ className, ...props }: React.ComponentProps<'textarea'>) {
+  return (
+    <Textarea
+      data-slot="input-group-control"
+      className={cn(
+        'flex-1 resize-none rounded-none border-0 bg-transparent py-2 shadow-none ring-0 focus-visible:ring-0 aria-invalid:ring-0 dark:bg-transparent',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+export {
+  InputGroup,
+  InputGroupAddon,
+  InputGroupButton,
+  InputGroupText,
+  InputGroupInput,
+  InputGroupTextarea,
+};
diff --git a/src/renderer/lib/ui/input.tsx b/src/renderer/lib/ui/input.tsx
new file mode 100644
index 0000000000..d4ca5551f9
--- /dev/null
+++ b/src/renderer/lib/ui/input.tsx
@@ -0,0 +1,24 @@
+import { Input as InputPrimitive } from '@base-ui/react/input';
+import * as React from 'react';
+import { cn } from '@renderer/utils/utils';
+
+function Input({ className, type, ...props }: React.ComponentProps<'input'>) {
+  return (
+    <InputPrimitive
+      type={type}
+      data-slot="input"
+      className={cn(
+        'h-8 w-full min-w-0 hover:border-border-1 rounded-md border focus-visible:ring-2 focus-visible:ring-primary/30 border-border bg-transparent px-2.5 py-1 text-sm transition-[color,box-shadow] outline-none placeholder:text-foreground-passive focus-visible:border focus-visible:border-border-primary disabled:pointer-events-none disabled:cursor-not-allowed disabled:opacity-50 aria-invalid:border-destructive aria-invalid:ring-3 aria-invalid:ring-destructive/20 md:text-sm dark:bg-input/30 dark:aria-invalid:border-destructive/50 dark:aria-invalid:ring-destructive/40',
+        className
+      )}
+      onKeyDown={(e) => {
+        if (e.key === 'Escape') {
+          e.currentTarget.blur();
+        }
+      }}
+      {...props}
+    />
+  );
+}
+
+export { Input };
diff --git a/src/renderer/lib/ui/kbd.tsx b/src/renderer/lib/ui/kbd.tsx
new file mode 100644
index 0000000000..4cbc392b9f
--- /dev/null
+++ b/src/renderer/lib/ui/kbd.tsx
@@ -0,0 +1,26 @@
+import { cn } from '@renderer/utils/utils';
+
+function Kbd({ className, ...props }: React.ComponentProps<'kbd'>) {
+  return (
+    <kbd
+      data-slot="kbd"
+      className={cn(
+        "pointer-events-none inline-flex h-4 w-fit min-w-4 items-center justify-center gap-1 rounded-sm bg-muted px-1 font-sans text-xs font-medium text-muted-foreground select-none in-data-[slot=tooltip-content]:bg-background/20 in-data-[slot=tooltip-content]:text-background dark:in-data-[slot=tooltip-content]:bg-background/10 [&_svg:not([class*='size-'])]:size-3",
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+function KbdGroup({ className, ...props }: React.ComponentProps<'div'>) {
+  return (
+    <kbd
+      data-slot="kbd-group"
+      className={cn('inline-flex items-center gap-1', className)}
+      {...props}
+    />
+  );
+}
+
+export { Kbd, KbdGroup };
diff --git a/src/renderer/lib/ui/label.tsx b/src/renderer/lib/ui/label.tsx
new file mode 100644
index 0000000000..7e36144031
--- /dev/null
+++ b/src/renderer/lib/ui/label.tsx
@@ -0,0 +1,30 @@
+import * as React from 'react';
+import { cn } from '@renderer/utils/utils';
+
+function Label({ className, ...props }: React.ComponentProps<'label'>) {
+  return (
+    <label
+      data-slot="label"
+      className={cn(
+        'flex items-center gap-2 text-sm font-normal  tracking-tight leading-none text-foreground-muted select-none group-data-[disabled=true]:pointer-events-none group-data-[disabled=true]:opacity-50 peer-disabled:cursor-not-allowed peer-disabled:opacity-50',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+export function MicroLabel({ className, ...props }: React.ComponentProps<'label'>) {
+  return (
+    <label
+      data-slot="label"
+      className={cn(
+        'cursor-default uppercase font-mono tracking-widest select-none text-xs',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+export { Label };
diff --git a/src/renderer/lib/ui/markdown-renderer.tsx b/src/renderer/lib/ui/markdown-renderer.tsx
new file mode 100644
index 0000000000..cb217eacf4
--- /dev/null
+++ b/src/renderer/lib/ui/markdown-renderer.tsx
@@ -0,0 +1,293 @@
+import React, { useEffect, useMemo, useState } from 'react';
+import Markdown from 'react-markdown';
+import { Prism as SyntaxHighlighter } from 'react-syntax-highlighter';
+import { oneDark, oneLight } from 'react-syntax-highlighter/dist/esm/styles/prism';
+import rehypeRaw from 'rehype-raw';
+import rehypeSanitize, { defaultSchema } from 'rehype-sanitize';
+import remarkGfm from 'remark-gfm';
+import type { PluggableList } from 'unified';
+import { useTheme } from '@renderer/lib/hooks/useTheme';
+import { rpc } from '@renderer/lib/ipc';
+import { cn } from '@renderer/utils/utils';
+
+type Variant = 'full' | 'compact';
+
+interface MarkdownRendererProps {
+  content: string;
+  variant?: Variant;
+  className?: string;
+  /**
+   * Optional callback for resolving non-external image src values (e.g. relative
+   * paths inside a workspace). Should return a `data:` URI string, or `null` to
+   * render a "not found" placeholder. When omitted, local images are not resolved.
+   */
+  resolveImage?: (src: string) => Promise<string | null>;
+}
+
+/** Sanitize schema that also allows data: URIs on images */
+const sanitizeSchema = {
+  ...defaultSchema,
+  protocols: {
+    ...defaultSchema.protocols,
+    src: [...(defaultSchema.protocols?.src || []), 'data'],
+  },
+};
+
+/** Resolves a local image src via the provided callback and renders as a base64 data URI. */
+const ResolvedImage: React.FC<{
+  src: string;
+  alt: string;
+  resolveImage: (src: string) => Promise<string | null>;
+}> = ({ src, alt, resolveImage }) => {
+  const [dataUrl, setDataUrl] = useState<string | null>(null);
+  const [error, setError] = useState(false);
+
+  useEffect(() => {
+    let cancelled = false;
+    resolveImage(src)
+      .then((result) => {
+        if (cancelled) return;
+        if (result) {
+          setDataUrl(result);
+        } else {
+          setError(true);
+        }
+      })
+      .catch(() => {
+        if (!cancelled) setError(true);
+      });
+    return () => {
+      cancelled = true;
+    };
+  }, [src, resolveImage]);
+
+  if (error) {
+    return (
+      <span className="my-3 inline-block text-xs text-muted-foreground">
+        [Image not found: {src}]
+      </span>
+    );
+  }
+  if (!dataUrl) {
+    return (
+      <span className="my-3 inline-block text-xs text-muted-foreground">Loading image...</span>
+    );
+  }
+  return <img src={dataUrl} alt={alt} className="my-3 max-w-full rounded" />;
+};
+
+type WithChildren = { children?: React.ReactNode };
+type WithChildrenAndClass = { children?: React.ReactNode; className?: string };
+type AnchorProps = { href?: string; children?: React.ReactNode };
+type ImgProps = { src?: string; alt?: string };
+
+function useFullComponents(
+  isDark: boolean,
+  resolveImage?: (src: string) => Promise<string | null>
+) {
+  return useMemo(
+    () => ({
+      h1: ({ children }: WithChildren) => (
+        <h1 className="mb-4 mt-6 border-b border-border pb-2 text-2xl font-semibold text-foreground first:mt-0">
+          {children}
+        </h1>
+      ),
+      h2: ({ children }: WithChildren) => (
+        <h2 className="mb-3 mt-6 border-b border-border pb-2 text-xl font-semibold text-foreground first:mt-0">
+          {children}
+        </h2>
+      ),
+      h3: ({ children }: WithChildren) => (
+        <h3 className="mb-2 mt-4 text-lg font-semibold text-foreground">{children}</h3>
+      ),
+      h4: ({ children }: WithChildren) => (
+        <h4 className="mb-2 mt-4 text-base font-semibold text-foreground">{children}</h4>
+      ),
+      h5: ({ children }: WithChildren) => (
+        <h5 className="mb-1 mt-3 text-sm font-semibold text-foreground">{children}</h5>
+      ),
+      h6: ({ children }: WithChildren) => (
+        <h6 className="mb-1 mt-3 text-sm font-semibold text-muted-foreground">{children}</h6>
+      ),
+      p: ({ children }: WithChildren) => (
+        <p className="mb-3 text-sm leading-relaxed text-foreground">{children}</p>
+      ),
+      ul: ({ children }: WithChildren) => (
+        <ul className="mb-3 ml-6 list-disc space-y-1 text-sm text-foreground">{children}</ul>
+      ),
+      ol: ({ children }: WithChildren) => (
+        <ol className="mb-3 ml-6 list-decimal space-y-1 text-sm text-foreground">{children}</ol>
+      ),
+      li: ({ children }: WithChildren) => <li className="leading-relaxed">{children}</li>,
+      code: ({ children, className }: WithChildrenAndClass) => {
+        const match = /language-(\w+)/.exec(className || '');
+        const language = match ? match[1] : '';
+        const isBlock = className?.includes('language-');
+
+        if (isBlock) {
+          return (
+            <SyntaxHighlighter
+              style={isDark ? oneDark : oneLight}
+              language={language}
+              PreTag="div"
+              className="!my-0 !rounded-md !text-xs"
+            >
+              {String(children).replace(/\n$/, '')}
+            </SyntaxHighlighter>
+          );
+        }
+
+        return <code className="rounded bg-muted px-1.5 py-0.5 text-xs">{children}</code>;
+      },
+      pre: ({ children }: WithChildren) => (
+        <pre className="mb-3 overflow-x-auto rounded-md border border-border">{children}</pre>
+      ),
+      a: ({ href, children }: AnchorProps) => {
+        const isHttp = typeof href === 'string' && /^https?:\/\//i.test(href);
+        const handleClick = (e: React.MouseEvent) => {
+          if (isHttp) {
+            e.preventDefault();
+            rpc.app.openExternal(href).catch(() => {});
+          }
+        };
+        return (
+          <a
+            href={href}
+            className="text-primary underline decoration-primary/50 hover:decoration-primary"
+            target="_blank"
+            rel="noopener noreferrer"
+            onClick={handleClick}
+          >
+            {children}
+          </a>
+        );
+      },
+      blockquote: ({ children }: WithChildren) => (
+        <blockquote className="mb-3 border-l-4 border-border bg-muted/30 py-1 pl-4 text-sm italic text-muted-foreground">
+          {children}
+        </blockquote>
+      ),
+      table: ({ children }: WithChildren) => (
+        <div className="mb-3 overflow-x-auto">
+          <table className="w-full border-collapse text-sm">{children}</table>
+        </div>
+      ),
+      thead: ({ children }: WithChildren) => (
+        <thead className="border-b border-border bg-muted/30">{children}</thead>
+      ),
+      th: ({ children }: WithChildren) => (
+        <th className="px-3 py-2 text-left font-semibold text-foreground">{children}</th>
+      ),
+      td: ({ children }: WithChildren) => (
+        <td className="border-t border-border px-3 py-2 text-foreground">{children}</td>
+      ),
+      hr: () => <hr className="my-6 border-border" />,
+      img: ({ src, alt }: ImgProps) => {
+        const isExternal = typeof src === 'string' && /^https?:\/\//i.test(src);
+        if (!isExternal && resolveImage && src) {
+          return <ResolvedImage src={src} alt={alt || ''} resolveImage={resolveImage} />;
+        }
+        return <img src={src} alt={alt || ''} className="my-3 max-w-full rounded" />;
+      },
+      strong: ({ children }: WithChildren) => (
+        <strong className="font-semibold text-foreground">{children}</strong>
+      ),
+      input: ({ checked, ...props }: React.ComponentPropsWithoutRef<'input'>) => (
+        <input
+          type="checkbox"
+          checked={checked}
+          disabled
+          className="mr-2 align-middle"
+          {...props}
+        />
+      ),
+    }),
+    [isDark, resolveImage]
+  );
+}
+
+function useCompactComponents() {
+  return useMemo(
+    () => ({
+      h1: ({ children }: WithChildren) => (
+        <h2 className="mb-1 mt-3 text-sm font-semibold text-foreground first:mt-0">{children}</h2>
+      ),
+      h2: ({ children }: WithChildren) => (
+        <h3 className="mb-1 mt-3 text-sm font-semibold text-foreground first:mt-0">{children}</h3>
+      ),
+      h3: ({ children }: WithChildren) => (
+        <h4 className="mb-1 mt-2 text-xs font-semibold text-foreground">{children}</h4>
+      ),
+      p: ({ children }: WithChildren) => <p className="mb-2 leading-relaxed">{children}</p>,
+      ul: ({ children }: WithChildren) => (
+        <ul className="mb-2 ml-4 list-disc space-y-0.5">{children}</ul>
+      ),
+      ol: ({ children }: WithChildren) => (
+        <ol className="mb-2 ml-4 list-decimal space-y-0.5">{children}</ol>
+      ),
+      li: ({ children }: WithChildren) => <li className="leading-relaxed">{children}</li>,
+      code: ({ children, className }: WithChildrenAndClass) => {
+        const isBlock = className?.includes('language-');
+        return isBlock ? (
+          <code className="block overflow-x-auto rounded bg-muted/60 p-2 text-[11px]">
+            {children}
+          </code>
+        ) : (
+          <code className="rounded bg-muted/60 px-1 py-0.5 text-[11px]">{children}</code>
+        );
+      },
+      pre: ({ children }: WithChildren) => <pre className="mb-2 overflow-x-auto">{children}</pre>,
+      strong: ({ children }: WithChildren) => (
+        <strong className="font-semibold text-foreground">{children}</strong>
+      ),
+      a: ({ href, children }: AnchorProps) => {
+        const isHttp = typeof href === 'string' && /^https?:\/\//i.test(href);
+        const handleClick = (e: React.MouseEvent) => {
+          if (isHttp) {
+            e.preventDefault();
+            rpc.app.openExternal(href).catch(() => {});
+          }
+        };
+        return (
+          <a
+            href={href}
+            className="text-primary underline"
+            target="_blank"
+            rel="noopener noreferrer"
+            onClick={handleClick}
+          >
+            {children}
+          </a>
+        );
+      },
+    }),
+    []
+  );
+}
+
+export const MarkdownRenderer: React.FC<MarkdownRendererProps> = ({
+  content,
+  variant = 'full',
+  className,
+  resolveImage,
+}) => {
+  const { effectiveTheme } = useTheme();
+  const isDark = effectiveTheme === 'emdark';
+
+  const fullComponents = useFullComponents(isDark, resolveImage);
+  const compactComponents = useCompactComponents();
+
+  const components = variant === 'full' ? fullComponents : compactComponents;
+  const rehypePlugins: PluggableList =
+    variant === 'full'
+      ? [rehypeRaw, [rehypeSanitize, sanitizeSchema]]
+      : [[rehypeSanitize, sanitizeSchema]];
+
+  return (
+    <div className={cn(className)}>
+      <Markdown remarkPlugins={[remarkGfm]} rehypePlugins={rehypePlugins} components={components}>
+        {content}
+      </Markdown>
+    </div>
+  );
+};
diff --git a/src/renderer/lib/ui/modal-layout.tsx b/src/renderer/lib/ui/modal-layout.tsx
new file mode 100644
index 0000000000..6f9de4dbc5
--- /dev/null
+++ b/src/renderer/lib/ui/modal-layout.tsx
@@ -0,0 +1,20 @@
+import type { ReactNode } from 'react';
+import { AnimatedHeight } from './animated-height';
+
+export function ModalLayout({
+  header,
+  footer,
+  children,
+}: {
+  header: ReactNode;
+  footer: ReactNode;
+  children: ReactNode;
+}) {
+  return (
+    <>
+      {header}
+      <AnimatedHeight>{children}</AnimatedHeight>
+      {footer}
+    </>
+  );
+}
diff --git a/src/renderer/components/ui/motion.ts b/src/renderer/lib/ui/motion.ts
similarity index 100%
rename from src/renderer/components/ui/motion.ts
rename to src/renderer/lib/ui/motion.ts
diff --git a/src/renderer/lib/ui/popover.tsx b/src/renderer/lib/ui/popover.tsx
new file mode 100644
index 0000000000..be47100fb9
--- /dev/null
+++ b/src/renderer/lib/ui/popover.tsx
@@ -0,0 +1,88 @@
+'use client';
+
+import { Popover as PopoverPrimitive } from '@base-ui/react/popover';
+import * as React from 'react';
+import { cn } from '@renderer/utils/utils';
+
+function Popover({ ...props }: PopoverPrimitive.Root.Props) {
+  return <PopoverPrimitive.Root data-slot="popover" {...props} />;
+}
+
+function PopoverTrigger({ ...props }: PopoverPrimitive.Trigger.Props) {
+  return <PopoverPrimitive.Trigger data-slot="popover-trigger" {...props} />;
+}
+
+function PopoverContent({
+  className,
+  align = 'center',
+  alignOffset = 0,
+  side = 'bottom',
+  sideOffset = 4,
+  ...props
+}: PopoverPrimitive.Popup.Props &
+  Pick<PopoverPrimitive.Positioner.Props, 'align' | 'alignOffset' | 'side' | 'sideOffset'>) {
+  return (
+    <PopoverPrimitive.Portal>
+      <PopoverPrimitive.Positioner
+        align={align}
+        alignOffset={alignOffset}
+        side={side}
+        sideOffset={sideOffset}
+        className="isolate z-50"
+      >
+        <PopoverPrimitive.Popup
+          data-slot="popover-content"
+          className={cn(
+            'z-50 flex w-72 origin-(--transform-origin) flex-col gap-4 rounded-md bg-background-quaternary p-4 text-sm text-foreground shadow-md ring-1 ring-foreground/10 outline-hidden duration-100 data-[side=bottom]:slide-in-from-top-2 data-[side=inline-end]:slide-in-from-left-2 data-[side=inline-start]:slide-in-from-right-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 data-closed:animate-out data-closed:fade-out-0 data-closed:zoom-out-95',
+            className
+          )}
+          {...props}
+        />
+      </PopoverPrimitive.Positioner>
+    </PopoverPrimitive.Portal>
+  );
+}
+
+function PopoverHeader({ className, ...props }: React.ComponentProps<'div'>) {
+  return (
+    <div
+      data-slot="popover-header"
+      className={cn('flex flex-col gap-1 text-sm', className)}
+      {...props}
+    />
+  );
+}
+
+function PopoverTitle({ className, ...props }: PopoverPrimitive.Title.Props) {
+  return (
+    <PopoverPrimitive.Title
+      data-slot="popover-title"
+      className={cn('font-medium', className)}
+      {...props}
+    />
+  );
+}
+
+function PopoverDescription({ className, ...props }: PopoverPrimitive.Description.Props) {
+  return (
+    <PopoverPrimitive.Description
+      data-slot="popover-description"
+      className={cn('text-muted-foreground', className)}
+      {...props}
+    />
+  );
+}
+
+function PopoverClose({ ...props }: PopoverPrimitive.Close.Props) {
+  return <PopoverPrimitive.Close data-slot="popover-close" {...props} />;
+}
+
+export {
+  Popover,
+  PopoverClose,
+  PopoverContent,
+  PopoverDescription,
+  PopoverHeader,
+  PopoverTitle,
+  PopoverTrigger,
+};
diff --git a/src/renderer/components/ui/pr-status-skeleton.tsx b/src/renderer/lib/ui/pr-status-skeleton.tsx
similarity index 100%
rename from src/renderer/components/ui/pr-status-skeleton.tsx
rename to src/renderer/lib/ui/pr-status-skeleton.tsx
diff --git a/src/renderer/lib/ui/progress.tsx b/src/renderer/lib/ui/progress.tsx
new file mode 100644
index 0000000000..b18bfa35f3
--- /dev/null
+++ b/src/renderer/lib/ui/progress.tsx
@@ -0,0 +1,65 @@
+'use client';
+
+import { Progress as ProgressPrimitive } from '@base-ui/react/progress';
+import { cn } from '@renderer/utils/utils';
+
+function Progress({ className, children, value, ...props }: ProgressPrimitive.Root.Props) {
+  return (
+    <ProgressPrimitive.Root
+      value={value}
+      data-slot="progress"
+      className={cn('flex flex-wrap gap-3', className)}
+      {...props}
+    >
+      {children}
+      <ProgressTrack>
+        <ProgressIndicator />
+      </ProgressTrack>
+    </ProgressPrimitive.Root>
+  );
+}
+
+function ProgressTrack({ className, ...props }: ProgressPrimitive.Track.Props) {
+  return (
+    <ProgressPrimitive.Track
+      className={cn(
+        'relative flex h-1.5 w-full items-center overflow-x-hidden rounded-full bg-muted',
+        className
+      )}
+      data-slot="progress-track"
+      {...props}
+    />
+  );
+}
+
+function ProgressIndicator({ className, ...props }: ProgressPrimitive.Indicator.Props) {
+  return (
+    <ProgressPrimitive.Indicator
+      data-slot="progress-indicator"
+      className={cn('h-full bg-primary transition-all', className)}
+      {...props}
+    />
+  );
+}
+
+function ProgressLabel({ className, ...props }: ProgressPrimitive.Label.Props) {
+  return (
+    <ProgressPrimitive.Label
+      className={cn('text-sm font-medium', className)}
+      data-slot="progress-label"
+      {...props}
+    />
+  );
+}
+
+function ProgressValue({ className, ...props }: ProgressPrimitive.Value.Props) {
+  return (
+    <ProgressPrimitive.Value
+      className={cn('ml-auto text-sm text-muted-foreground tabular-nums', className)}
+      data-slot="progress-value"
+      {...props}
+    />
+  );
+}
+
+export { Progress, ProgressTrack, ProgressIndicator, ProgressLabel, ProgressValue };
diff --git a/src/renderer/lib/ui/radio-group.tsx b/src/renderer/lib/ui/radio-group.tsx
new file mode 100644
index 0000000000..0f249a71d1
--- /dev/null
+++ b/src/renderer/lib/ui/radio-group.tsx
@@ -0,0 +1,35 @@
+import { Radio as RadioPrimitive } from '@base-ui/react/radio';
+import { RadioGroup as RadioGroupPrimitive } from '@base-ui/react/radio-group';
+import { cn } from '@renderer/utils/utils';
+
+function RadioGroup({ className, ...props }: RadioGroupPrimitive.Props) {
+  return (
+    <RadioGroupPrimitive
+      data-slot="radio-group"
+      className={cn('grid w-full gap-3', className)}
+      {...props}
+    />
+  );
+}
+
+function RadioGroupItem({ className, ...props }: RadioPrimitive.Root.Props) {
+  return (
+    <RadioPrimitive.Root
+      data-slot="radio-group-item"
+      className={cn(
+        'group/radio-group-item peer relative flex aspect-square size-4 shrink-0 rounded-full border border-border-1 outline-none after:absolute after:-inset-x-3 after:-inset-y-2 focus-visible:border-ring focus-visible:ring-3 focus-visible:ring-ring/50 disabled:cursor-not-allowed disabled:opacity-50 aria-invalid:border-destructive aria-invalid:ring-3 aria-invalid:ring-destructive/20 aria-invalid:aria-checked:border-primary data-checked:border-primary data-checked:bg-background-neutral data-checked:text-primary-foreground ',
+        className
+      )}
+      {...props}
+    >
+      <RadioPrimitive.Indicator
+        data-slot="radio-group-indicator"
+        className="flex size-4 items-center justify-center"
+      >
+        <span className="absolute top-1/2 left-1/2 size-2 -translate-x-1/2 -translate-y-1/2 rounded-full bg-foreground-inverse" />
+      </RadioPrimitive.Indicator>
+    </RadioPrimitive.Root>
+  );
+}
+
+export { RadioGroup, RadioGroupItem };
diff --git a/src/renderer/lib/ui/relative-time.tsx b/src/renderer/lib/ui/relative-time.tsx
new file mode 100644
index 0000000000..866b953e2c
--- /dev/null
+++ b/src/renderer/lib/ui/relative-time.tsx
@@ -0,0 +1,70 @@
+import { formatDistanceToNowStrict } from 'date-fns';
+import React, { useEffect, useMemo, useState } from 'react';
+
+type RelativeTimeProps = {
+  value: string | number | Date;
+  className?: string;
+  /** Renders an abbreviated form (e.g. "3d", "5mo") with a tooltip showing the full text. */
+  compact?: boolean;
+  ago?: boolean;
+};
+
+function parseTimestamp(input: string | number | Date): Date | null {
+  if (input instanceof Date) return input;
+  if (typeof input === 'number') {
+    const d = new Date(input);
+    return Number.isNaN(d.getTime()) ? null : d;
+  }
+
+  const raw = String(input).trim();
+  if (!raw) return null;
+
+  const normalized = raw.includes('Z') || raw.includes('+') ? raw : raw.replace(' ', 'T') + 'Z';
+
+  const d = new Date(normalized);
+  return Number.isNaN(d.getTime()) ? null : d;
+}
+
+function toCompactLabel(date: Date): string {
+  if (Date.now() - date.getTime() < 60_000) return 'now';
+  return formatDistanceToNowStrict(date, { roundingMethod: 'floor', addSuffix: false })
+    .replace(/ seconds?/, 's')
+    .replace(/ minutes?/, 'm')
+    .replace(/ hours?/, 'h')
+    .replace(/ days?/, 'd')
+    .replace(/ months?/, 'mo')
+    .replace(/ years?/, 'y');
+}
+
+export const RelativeTime: React.FC<RelativeTimeProps> = ({ value, className, compact, ago }) => {
+  const [, setTick] = useState(0);
+
+  useEffect(() => {
+    const timer = setInterval(() => setTick((t) => t + 1), 60_000);
+    return () => clearInterval(timer);
+  }, []);
+
+  const date = useMemo(() => parseTimestamp(value), [value]);
+  if (!date) {
+    return <span className={className}>—</span>;
+  }
+
+  if (compact) {
+    const short = toCompactLabel(date);
+
+    return (
+      <time className={className} dateTime={date.toISOString()}>
+        {short}
+        {ago && <span className="text-foreground-muted"> ago</span>}
+      </time>
+    );
+  }
+
+  const label = formatDistanceToNowStrict(date, { addSuffix: true });
+  return (
+    <time className={className} dateTime={date.toISOString()}>
+      {label}
+      {ago && 'ago'}
+    </time>
+  );
+};
diff --git a/src/renderer/lib/ui/resizable.tsx b/src/renderer/lib/ui/resizable.tsx
new file mode 100644
index 0000000000..e77a04e356
--- /dev/null
+++ b/src/renderer/lib/ui/resizable.tsx
@@ -0,0 +1,65 @@
+import { useRef } from 'react';
+import * as ResizablePrimitive from 'react-resizable-panels';
+import { cn } from '@renderer/utils/utils';
+
+function ResizablePanelGroup({ className, ...props }: ResizablePrimitive.GroupProps) {
+  return (
+    <ResizablePrimitive.Group
+      data-slot="resizable-panel-group"
+      className={cn('flex h-full w-full aria-[orientation=vertical]:flex-col', className)}
+      {...props}
+    />
+  );
+}
+
+function ResizablePanel({ ...props }: ResizablePrimitive.PanelProps) {
+  return <ResizablePrimitive.Panel data-slot="resizable-panel" {...props} />;
+}
+
+function ResizableHandle({
+  className,
+  onFocus,
+  onPointerDown,
+  onPointerUp,
+  onPointerCancel,
+  ...props
+}: ResizablePrimitive.SeparatorProps & {
+  withHandle?: boolean;
+}) {
+  const previousFocusRef = useRef<HTMLElement | null>(null);
+
+  const restoreFocus = () => {
+    previousFocusRef.current?.focus();
+    previousFocusRef.current = null;
+  };
+
+  return (
+    <ResizablePrimitive.Separator
+      data-slot="resizable-handle"
+      className={cn(
+        'relative flex w-px cursor-col-resize items-center justify-center bg-border ring-offset-background after:absolute after:inset-y-0 after:left-1/2 after:w-1 after:-translate-x-1/2  focus-visible:outline-hidden aria-[orientation=horizontal]:h-px aria-[orientation=horizontal]:w-full aria-[orientation=horizontal]:cursor-row-resize aria-[orientation=horizontal]:after:left-0 aria-[orientation=horizontal]:after:h-1 aria-[orientation=horizontal]:after:w-full aria-[orientation=horizontal]:after:translate-x-0 aria-[orientation=horizontal]:after:-translate-y-1/2 [&[aria-orientation=horizontal]>div]:rotate-90 aria-disabled:cursor-default!',
+        className
+      )}
+      onFocus={(e) => {
+        // `document.activeElement` is already the separator on pointerdown; use
+        // relatedTarget to capture the element that was focused before the handle.
+        if (e.relatedTarget instanceof HTMLElement) {
+          previousFocusRef.current = e.relatedTarget;
+        }
+        onFocus?.(e);
+      }}
+      onPointerUp={(e) => {
+        restoreFocus();
+        onPointerUp?.(e);
+      }}
+      onPointerCancel={(e) => {
+        restoreFocus();
+        onPointerCancel?.(e);
+      }}
+      onPointerDown={onPointerDown}
+      {...props}
+    ></ResizablePrimitive.Separator>
+  );
+}
+
+export { ResizableHandle, ResizablePanel, ResizablePanelGroup };
diff --git a/src/renderer/components/ui/right-sidebar.tsx b/src/renderer/lib/ui/right-sidebar.tsx
similarity index 100%
rename from src/renderer/components/ui/right-sidebar.tsx
rename to src/renderer/lib/ui/right-sidebar.tsx
diff --git a/src/renderer/lib/ui/scroll-area.tsx b/src/renderer/lib/ui/scroll-area.tsx
new file mode 100644
index 0000000000..b73cd2458f
--- /dev/null
+++ b/src/renderer/lib/ui/scroll-area.tsx
@@ -0,0 +1,50 @@
+'use client';
+
+import { ScrollArea as ScrollAreaPrimitive } from '@base-ui/react/scroll-area';
+import * as React from 'react';
+import { cn } from '@renderer/utils/utils';
+
+function ScrollArea({ className, children, ...props }: ScrollAreaPrimitive.Root.Props) {
+  return (
+    <ScrollAreaPrimitive.Root
+      data-slot="scroll-area"
+      className={cn('relative', className)}
+      {...props}
+    >
+      <ScrollAreaPrimitive.Viewport
+        data-slot="scroll-area-viewport"
+        className="size-full rounded-[inherit] transition-[color,box-shadow] outline-none focus-visible:ring-[3px] focus-visible:ring-ring/50 focus-visible:outline-1"
+      >
+        {children}
+      </ScrollAreaPrimitive.Viewport>
+      <ScrollBar />
+      <ScrollAreaPrimitive.Corner />
+    </ScrollAreaPrimitive.Root>
+  );
+}
+
+function ScrollBar({
+  className,
+  orientation = 'vertical',
+  ...props
+}: ScrollAreaPrimitive.Scrollbar.Props) {
+  return (
+    <ScrollAreaPrimitive.Scrollbar
+      data-slot="scroll-area-scrollbar"
+      data-orientation={orientation}
+      orientation={orientation}
+      className={cn(
+        'flex touch-none p-px transition-colors select-none data-horizontal:h-2.5 data-horizontal:flex-col data-horizontal:border-t data-horizontal:border-t-transparent data-vertical:h-full data-vertical:w-2.5 data-vertical:border-l data-vertical:border-l-transparent',
+        className
+      )}
+      {...props}
+    >
+      <ScrollAreaPrimitive.Thumb
+        data-slot="scroll-area-thumb"
+        className="relative flex-1 rounded-full bg-border"
+      />
+    </ScrollAreaPrimitive.Scrollbar>
+  );
+}
+
+export { ScrollArea, ScrollBar };
diff --git a/src/renderer/lib/ui/search-input.tsx b/src/renderer/lib/ui/search-input.tsx
new file mode 100644
index 0000000000..2a4f23ecbe
--- /dev/null
+++ b/src/renderer/lib/ui/search-input.tsx
@@ -0,0 +1,25 @@
+import { useHotkey } from '@tanstack/react-hotkeys';
+import { Search } from 'lucide-react';
+import * as React from 'react';
+import { Input } from '@renderer/lib/ui/input';
+import { cn } from '@renderer/utils/utils';
+
+function SearchInput({ className, ...props }: React.ComponentProps<'input'>) {
+  const inputRef = React.useRef<HTMLInputElement>(null);
+
+  useHotkey(
+    'Mod+F',
+    () => {
+      inputRef.current?.focus();
+    },
+    { enabled: true }
+  );
+  return (
+    <div className="relative flex items-center">
+      <Search className="absolute left-2.5 size-3.5 shrink-0 text-foreground-muted pointer-events-none" />
+      <Input className={cn('pl-8', className)} {...props} ref={inputRef} />
+    </div>
+  );
+}
+
+export { SearchInput };
diff --git a/src/renderer/lib/ui/select.tsx b/src/renderer/lib/ui/select.tsx
new file mode 100644
index 0000000000..827f7ad276
--- /dev/null
+++ b/src/renderer/lib/ui/select.tsx
@@ -0,0 +1,193 @@
+'use client';
+
+import { Select as SelectPrimitive } from '@base-ui/react/select';
+import { CheckIcon, ChevronDownIcon, ChevronUpIcon } from 'lucide-react';
+import * as React from 'react';
+import { cn } from '@renderer/utils/utils';
+
+const Select = SelectPrimitive.Root;
+
+function SelectGroup({ className, ...props }: SelectPrimitive.Group.Props) {
+  return (
+    <SelectPrimitive.Group
+      data-slot="select-group"
+      className={cn('scroll-my-1 p-1', className)}
+      {...props}
+    />
+  );
+}
+
+function SelectValue({ className, ...props }: SelectPrimitive.Value.Props) {
+  return (
+    <SelectPrimitive.Value
+      data-slot="select-value"
+      className={cn('flex flex-1 text-left', className)}
+      {...props}
+    />
+  );
+}
+
+function SelectTrigger({
+  className,
+  size = 'default',
+  showChevron = true,
+  children,
+  ...props
+}: SelectPrimitive.Trigger.Props & {
+  size?: 'sm' | 'default';
+  showChevron?: boolean;
+}) {
+  return (
+    <SelectPrimitive.Trigger
+      data-slot="select-trigger"
+      data-size={size}
+      className={cn(
+        "flex w-fit items-center justify-between gap-1.5 rounded-md border border-border bg-transparent py-2 pr-2 pl-2.5 text-sm whitespace-nowrap transition-[color,box-shadow] outline-none focus-visible:border-ring focus-visible:ring-3 focus-visible:ring-ring/50 disabled:cursor-not-allowed disabled:opacity-50 aria-invalid:border-destructive aria-invalid:ring-3 aria-invalid:ring-destructive/20 data-placeholder:text-muted-foreground data-[size=default]:h-8 data-[size=sm]:h-7 *:data-[slot=select-value]:line-clamp-1 *:data-[slot=select-value]:flex *:data-[slot=select-value]:items-center *:data-[slot=select-value]:gap-1.5 dark:bg-input/30 dark:hover:bg-input/50 dark:aria-invalid:border-destructive/50 dark:aria-invalid:ring-destructive/40 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
+        className
+      )}
+      {...props}
+    >
+      {children}
+      {showChevron && (
+        <SelectPrimitive.Icon
+          render={<ChevronDownIcon className="pointer-events-none size-4 text-foreground-muted" />}
+        />
+      )}
+    </SelectPrimitive.Trigger>
+  );
+}
+
+function SelectContent({
+  className,
+  children,
+  side = 'bottom',
+  sideOffset = 4,
+  align = 'center',
+  alignOffset = 0,
+  alignItemWithTrigger = true,
+  ...props
+}: SelectPrimitive.Popup.Props &
+  Pick<
+    SelectPrimitive.Positioner.Props,
+    'align' | 'alignOffset' | 'side' | 'sideOffset' | 'alignItemWithTrigger'
+  >) {
+  return (
+    <SelectPrimitive.Portal>
+      <SelectPrimitive.Positioner
+        side={side}
+        sideOffset={sideOffset}
+        align={align}
+        alignOffset={alignOffset}
+        alignItemWithTrigger={alignItemWithTrigger}
+        className="isolate z-50"
+      >
+        <SelectPrimitive.Popup
+          data-slot="select-content"
+          data-align-trigger={alignItemWithTrigger}
+          className={cn(
+            'relative isolate z-50 max-h-(--available-height) w-(--anchor-width) min-w-36 origin-(--transform-origin) overflow-x-hidden overflow-y-auto rounded-md bg-background-quaternary text-popover-foreground shadow-md ring-1 ring-foreground/10 duration-100 data-[align-trigger=true]:animate-none data-[side=bottom]:slide-in-from-top-2 data-[side=inline-end]:slide-in-from-left-2 data-[side=inline-start]:slide-in-from-right-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 data-closed:animate-out data-closed:fade-out-0 data-closed:zoom-out-95',
+            className
+          )}
+          {...props}
+        >
+          <SelectScrollUpButton />
+          <SelectPrimitive.List>{children}</SelectPrimitive.List>
+          <SelectScrollDownButton />
+        </SelectPrimitive.Popup>
+      </SelectPrimitive.Positioner>
+    </SelectPrimitive.Portal>
+  );
+}
+
+function SelectLabel({ className, ...props }: SelectPrimitive.GroupLabel.Props) {
+  return (
+    <SelectPrimitive.GroupLabel
+      data-slot="select-label"
+      className={cn('px-2 py-1.5 text-xs text-muted-foreground', className)}
+      {...props}
+    />
+  );
+}
+
+function SelectItem({ className, children, ...props }: SelectPrimitive.Item.Props) {
+  return (
+    <SelectPrimitive.Item
+      data-slot="select-item"
+      className={cn(
+        "relative flex w-full cursor-default items-center gap-2 rounded-sm py-1.5 pr-8 pl-2 text-sm outline-hidden select-none focus:bg-background-quaternary-1 focus:text-accent-foreground not-data-[variant=destructive]:focus:**:text-accent-foreground data-disabled:pointer-events-none data-disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4 *:[span]:last:flex *:[span]:last:items-center *:[span]:last:gap-2",
+        className
+      )}
+      {...props}
+    >
+      <SelectPrimitive.ItemText className="flex flex-1 shrink-0 gap-2 whitespace-nowrap">
+        {children}
+      </SelectPrimitive.ItemText>
+      <SelectPrimitive.ItemIndicator
+        render={
+          <span className="pointer-events-none absolute right-2 flex size-4 items-center justify-center" />
+        }
+      >
+        <CheckIcon className="pointer-events-none" />
+      </SelectPrimitive.ItemIndicator>
+    </SelectPrimitive.Item>
+  );
+}
+
+function SelectSeparator({ className, ...props }: SelectPrimitive.Separator.Props) {
+  return (
+    <SelectPrimitive.Separator
+      data-slot="select-separator"
+      className={cn('pointer-events-none -mx-1 my-1 h-px bg-border', className)}
+      {...props}
+    />
+  );
+}
+
+function SelectScrollUpButton({
+  className,
+  ...props
+}: React.ComponentProps<typeof SelectPrimitive.ScrollUpArrow>) {
+  return (
+    <SelectPrimitive.ScrollUpArrow
+      data-slot="select-scroll-up-button"
+      className={cn(
+        "top-0 z-10 flex w-full cursor-default items-center justify-center bg-popover py-1 [&_svg:not([class*='size-'])]:size-4",
+        className
+      )}
+      {...props}
+    >
+      <ChevronUpIcon />
+    </SelectPrimitive.ScrollUpArrow>
+  );
+}
+
+function SelectScrollDownButton({
+  className,
+  ...props
+}: React.ComponentProps<typeof SelectPrimitive.ScrollDownArrow>) {
+  return (
+    <SelectPrimitive.ScrollDownArrow
+      data-slot="select-scroll-down-button"
+      className={cn(
+        "bottom-0 z-10 flex w-full cursor-default items-center justify-center bg-popover py-1 [&_svg:not([class*='size-'])]:size-4",
+        className
+      )}
+      {...props}
+    >
+      <ChevronDownIcon />
+    </SelectPrimitive.ScrollDownArrow>
+  );
+}
+
+export {
+  Select,
+  SelectContent,
+  SelectGroup,
+  SelectItem,
+  SelectLabel,
+  SelectScrollDownButton,
+  SelectScrollUpButton,
+  SelectSeparator,
+  SelectTrigger,
+  SelectValue,
+};
diff --git a/src/renderer/lib/ui/separator.tsx b/src/renderer/lib/ui/separator.tsx
new file mode 100644
index 0000000000..32ed1b6d5a
--- /dev/null
+++ b/src/renderer/lib/ui/separator.tsx
@@ -0,0 +1,18 @@
+import { Separator as SeparatorPrimitive } from '@base-ui/react/separator';
+import { cn } from '@renderer/utils/utils';
+
+function Separator({ className, orientation = 'horizontal', ...props }: SeparatorPrimitive.Props) {
+  return (
+    <SeparatorPrimitive
+      data-slot="separator"
+      orientation={orientation}
+      className={cn(
+        'shrink-0 bg-border data-[orientation=horizontal]:h-px data-[orientation=horizontal]:w-full data-[orientation=vertical]:w-px data-[orientation=vertical]:self-stretch',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+export { Separator };
diff --git a/src/renderer/lib/ui/shortcut-hint.tsx b/src/renderer/lib/ui/shortcut-hint.tsx
new file mode 100644
index 0000000000..1e035cb763
--- /dev/null
+++ b/src/renderer/lib/ui/shortcut-hint.tsx
@@ -0,0 +1,31 @@
+import { formatForDisplay } from '@tanstack/react-hotkeys';
+import React from 'react';
+import { useAppSettingsKey } from '@renderer/features/settings/use-app-settings-key';
+import {
+  getEffectiveHotkey,
+  type ShortcutSettingsKey,
+} from '@renderer/lib/hooks/useKeyboardShortcuts';
+import { Kbd, KbdGroup } from './kbd';
+
+interface ShortcutHintProps {
+  settingsKey: ShortcutSettingsKey;
+  className?: string;
+}
+
+export const ShortcutHint: React.FC<ShortcutHintProps> = ({ settingsKey, className }) => {
+  const { value: keyboard } = useAppSettingsKey('keyboard');
+  const hotkey = getEffectiveHotkey(settingsKey, keyboard);
+  const display = hotkey ? formatForDisplay(hotkey) : '';
+
+  if (!display) return null;
+
+  return (
+    <span className={`flex items-center gap-1 text-xs text-muted-foreground ${className ?? ''}`}>
+      <KbdGroup>
+        {display.split('+').map((key, _) => (
+          <Kbd key={key}>{key.trim()}</Kbd>
+        ))}
+      </KbdGroup>
+    </span>
+  );
+};
diff --git a/src/renderer/components/ui/slug-input.tsx b/src/renderer/lib/ui/slug-input.tsx
similarity index 94%
rename from src/renderer/components/ui/slug-input.tsx
rename to src/renderer/lib/ui/slug-input.tsx
index b7d3c42658..a9e6d61002 100644
--- a/src/renderer/components/ui/slug-input.tsx
+++ b/src/renderer/lib/ui/slug-input.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
+import { useToast } from '@renderer/lib/hooks/use-toast';
+import { cn } from '@renderer/utils/utils';
 import { Input } from './input';
-import { useToast } from '../../hooks/use-toast';
-import { cn } from '@/lib/utils';
 
 export interface SlugInputProps
   extends Omit<React.InputHTMLAttributes<HTMLInputElement>, 'onChange'> {
@@ -38,14 +38,6 @@ const normalizeForTyping = (input: string): string =>
     .replace(/\s+/g, '-')
     .replace(/[^a-z0-9-]/g, '')
     .replace(/-+/g, '-');
-
-/**
- * Fully normalizes to a final slug (strict - for submission):
- * - All of normalizeForTyping plus removes leading/trailing hyphens
- */
-const normalizeToSlug = (input: string): string =>
-  normalizeForTyping(input).replace(/^-+|-+$/g, '');
-
 /**
  * Checks if a character is valid for a slug
  */
diff --git a/src/renderer/lib/ui/sonner.tsx b/src/renderer/lib/ui/sonner.tsx
new file mode 100644
index 0000000000..82f976616d
--- /dev/null
+++ b/src/renderer/lib/ui/sonner.tsx
@@ -0,0 +1,23 @@
+import { Toaster as SonnerToaster } from 'sonner';
+import { useTheme } from '@renderer/lib/hooks/useTheme';
+
+export function Toaster() {
+  const { effectiveTheme } = useTheme();
+  const theme = effectiveTheme === 'emlight' ? 'light' : 'dark';
+
+  return (
+    <SonnerToaster
+      theme={theme}
+      className="toaster group"
+      toastOptions={{
+        classNames: {
+          toast: 'group toast bg-background text-foreground border border-border shadow-lg',
+          description: 'text-muted-foreground',
+          actionButton: 'bg-primary text-primary-foreground',
+          cancelButton: 'bg-muted text-muted-foreground',
+          error: 'text-destructive border-destructive/50',
+        },
+      }}
+    />
+  );
+}
diff --git a/src/renderer/components/ui/spinner.tsx b/src/renderer/lib/ui/spinner.tsx
similarity index 95%
rename from src/renderer/components/ui/spinner.tsx
rename to src/renderer/lib/ui/spinner.tsx
index 895b31ac19..4da6f55ab5 100644
--- a/src/renderer/components/ui/spinner.tsx
+++ b/src/renderer/lib/ui/spinner.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { cn } from '@/lib/utils';
+import { cn } from '@renderer/utils/utils';
 
 const Spinner = React.forwardRef<
   SVGSVGElement,
diff --git a/src/renderer/lib/ui/split-button.tsx b/src/renderer/lib/ui/split-button.tsx
new file mode 100644
index 0000000000..15e1b35f0c
--- /dev/null
+++ b/src/renderer/lib/ui/split-button.tsx
@@ -0,0 +1,122 @@
+import type { VariantProps } from 'class-variance-authority';
+import { ChevronDown } from 'lucide-react';
+import { useState, type ReactNode } from 'react';
+import { cn } from '@renderer/utils/utils';
+import { Button, buttonVariants } from './button';
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuRadioGroup,
+  DropdownMenuRadioItem,
+  DropdownMenuTrigger,
+} from './dropdown-menu';
+
+export interface SplitButtonAction {
+  value: string;
+  label: string;
+  description?: string;
+  action: () => void;
+}
+
+type SplitButtonSize = 'xs' | 'sm' | 'default';
+
+interface SplitButtonProps {
+  actions: SplitButtonAction[];
+  defaultValue?: string;
+  disabled?: boolean;
+  loading?: boolean;
+  loadingLabel?: string;
+  icon?: ReactNode;
+  variant?: VariantProps<typeof buttonVariants>['variant'];
+  size?: SplitButtonSize;
+  className?: string;
+  dropdownContentClassName?: string;
+  onValueChange?: (value: string) => void;
+}
+
+const chevronConfig: Record<SplitButtonSize, { px: string; iconSize: string }> = {
+  xs: { px: 'px-1', iconSize: 'size-3' },
+  sm: { px: 'px-1.5', iconSize: 'size-3.5' },
+  default: { px: 'px-2', iconSize: 'size-4' },
+};
+
+export function SplitButton({
+  actions,
+  defaultValue,
+  disabled,
+  loading,
+  loadingLabel,
+  icon,
+  variant = 'default',
+  size = 'default',
+  className,
+  dropdownContentClassName,
+  onValueChange,
+}: SplitButtonProps) {
+  const [selectedValue, setSelectedValue] = useState(defaultValue ?? actions[0]?.value);
+  const [open, setOpen] = useState(false);
+
+  const selectedAction = actions.find((a) => a.value === selectedValue) ?? actions[0];
+  if (!selectedAction) return null;
+
+  const { px, iconSize } = chevronConfig[size];
+  const isDisabled = disabled || loading;
+
+  return (
+    <div className={cn('flex items-center', className)}>
+      <Button
+        variant={variant}
+        size={size}
+        className="flex-1 min-w-0 shrink rounded-r-none"
+        onClick={selectedAction.action}
+        disabled={isDisabled}
+      >
+        {icon}
+        {loading ? (loadingLabel ?? 'Loading...') : selectedAction.label}
+      </Button>
+      <DropdownMenu open={open} onOpenChange={setOpen}>
+        <DropdownMenuTrigger
+          render={
+            <Button
+              variant={variant}
+              size={size}
+              className={cn('rounded-l-none border-l', px)}
+              disabled={isDisabled}
+            />
+          }
+        >
+          <ChevronDown className={iconSize} />
+        </DropdownMenuTrigger>
+        <DropdownMenuContent align="end" className={cn('w-64', dropdownContentClassName)}>
+          <DropdownMenuRadioGroup
+            value={selectedValue}
+            onValueChange={(value) => {
+              if (value) {
+                setSelectedValue(value);
+                onValueChange?.(value);
+                setTimeout(() => {
+                  setOpen(false);
+                }, 50);
+              }
+            }}
+          >
+            {actions.map((action) => (
+              <DropdownMenuRadioItem
+                key={action.value}
+                value={action.value}
+                className="flex-col items-start gap-1 py-2"
+              >
+                <span className="text-sm">{action.label}</span>
+                {action.description && (
+                  <span className="text-xs text-foreground-muted whitespace-normal">
+                    {action.description}
+                  </span>
+                )}
+              </DropdownMenuRadioItem>
+            ))}
+          </DropdownMenuRadioGroup>
+        </DropdownMenuContent>
+      </DropdownMenu>
+    </div>
+  );
+}
diff --git a/src/renderer/lib/ui/switch.tsx b/src/renderer/lib/ui/switch.tsx
new file mode 100644
index 0000000000..013ee4d640
--- /dev/null
+++ b/src/renderer/lib/ui/switch.tsx
@@ -0,0 +1,34 @@
+import { Switch as SwitchPrimitive } from '@base-ui/react/switch';
+import { cn } from '@renderer/utils/utils';
+
+function Switch({
+  className,
+  size = 'default',
+  ...props
+}: SwitchPrimitive.Root.Props & {
+  size?: 'sm' | 'default';
+}) {
+  return (
+    <SwitchPrimitive.Root
+      data-slot="switch"
+      data-size={size}
+      className={cn(
+        'peer group/switch relative inline-flex shrink-0 items-center rounded-full border border-border-1 transition-all outline-none after:absolute after:-inset-x-3 after:-inset-y-2 focus-visible:border-ring focus-visible:ring-3 focus-visible:ring-ring/50 aria-invalid:border-destructive aria-invalid:ring-3 aria-invalid:ring-destructive/20 data-[size=default]:h-[18.4px] data-[size=default]:w-[32px] data-[size=sm]:h-[14px] data-[size=sm]:w-[24px] dark:aria-invalid:ring-destructive/40 data-checked:bg-background-neutral data-unchecked:bg-background data-disabled:cursor-not-allowed data-disabled:opacity-50',
+        className
+      )}
+      onKeyDown={(e) => {
+        if ((e.metaKey || e.ctrlKey || e.altKey) && (e.key === 'Enter' || e.key === ' ')) {
+          e.preventBaseUIHandler?.();
+        }
+      }}
+      {...props}
+    >
+      <SwitchPrimitive.Thumb
+        data-slot="switch-thumb"
+        className="pointer-events-none block rounded-full group-data-checked/switch:bg-background-3 bg-background-neutral/50 ring-0 transition-transform group-data-[size=default]/switch:size-4 group-data-[size=sm]/switch:size-3 group-data-[size=default]/switch:data-checked:translate-x-[calc(100%-2px)] group-data-[size=sm]/switch:data-checked:translate-x-[calc(100%-2px)] group-data-[size=default]/switch:data-unchecked:translate-x-0 group-data-[size=sm]/switch:data-unchecked:translate-x-0"
+      />
+    </SwitchPrimitive.Root>
+  );
+}
+
+export { Switch };
diff --git a/src/renderer/lib/ui/tab-bar.tsx b/src/renderer/lib/ui/tab-bar.tsx
new file mode 100644
index 0000000000..7241b0ff4a
--- /dev/null
+++ b/src/renderer/lib/ui/tab-bar.tsx
@@ -0,0 +1,164 @@
+import { X } from 'lucide-react';
+import { observer, Observer } from 'mobx-react-lite';
+import { useEffect, useRef, useState } from 'react';
+import { ReorderList } from '@renderer/lib/components/reorder-list';
+import { cn } from '@renderer/utils/utils';
+import { Separator } from './separator';
+
+function InlineEditInput({
+  initialValue,
+  onConfirm,
+  onCancel,
+}: {
+  initialValue: string;
+  onConfirm: (value: string) => void;
+  onCancel: () => void;
+}) {
+  const [value, setValue] = useState(initialValue);
+  const ref = useRef<HTMLInputElement>(null);
+
+  useEffect(() => {
+    ref.current?.focus();
+    ref.current?.select();
+  }, []);
+
+  return (
+    <input
+      ref={ref}
+      className="max-w-16 bg-transparent outline-none text-sm border border-border p-1 rounded-md text-foreground"
+      value={value}
+      onChange={(e) => setValue(e.target.value)}
+      onBlur={() => onConfirm(value)}
+      onKeyDown={(e) => {
+        if (e.key === 'Enter') onConfirm(value);
+        if (e.key === 'Escape') onCancel();
+        e.stopPropagation();
+      }}
+      onClick={(e) => e.stopPropagation()}
+    />
+  );
+}
+
+export interface TabBarProps<TEntity> {
+  tabs: TEntity[];
+  activeTabId: string | undefined;
+  getId: (entity: TEntity) => string;
+  getLabel: (entity: TEntity) => string;
+  onSelect: (id: string) => void;
+  onRemove?: (id: string) => void;
+  renderTabPrefix?: (entity: TEntity) => React.ReactNode;
+  renderTabSuffix?: (entity: TEntity) => React.ReactNode;
+  onRename?: (id: string, newName: string) => void;
+  onReorder?: (fromIndex: number, toIndex: number) => void;
+  /** Rendered in the right-side area. Caller is responsible for all buttons and their click handlers. */
+  actions?: React.ReactNode;
+}
+
+export const TabBar = observer(function TabBar<TEntity>({
+  tabs,
+  activeTabId,
+  getId,
+  getLabel,
+  onSelect,
+  onRemove,
+  renderTabPrefix,
+  renderTabSuffix,
+  onRename,
+  onReorder,
+  actions,
+}: TabBarProps<TEntity>) {
+  const [editingId, setEditingId] = useState<string | null>(null);
+
+  const renderTab = (entity: TEntity) => {
+    const id = getId(entity);
+    const label = getLabel(entity);
+    const isActive = activeTabId === id;
+    const isEditing = editingId === id;
+
+    return (
+      <>
+        <button
+          key={id}
+          onClick={() => onSelect(id)}
+          onDoubleClick={() => onRename && setEditingId(id)}
+          className={cn(
+            'group relative bg-background-secondary flex flex-col h-full text-sm text-foreground-muted hover:bg-background-secondary-1/40',
+            isActive &&
+              'bg-background-secondary-1 opacity-100 text-foreground hover:bg-background-secondary-1 '
+          )}
+        >
+          <div className={cn('flex items-center pl-3 pr-1 h-full', !onRemove && 'pr-3')}>
+            <span className="flex items-center gap-1">
+              {renderTabPrefix?.(entity)}
+              {isEditing ? (
+                <InlineEditInput
+                  initialValue={label}
+                  onConfirm={(newLabel) => {
+                    setEditingId(null);
+                    const trimmed = newLabel.trim();
+                    if (trimmed && trimmed !== label) {
+                      onRename?.(id, trimmed);
+                    }
+                  }}
+                  onCancel={() => setEditingId(null)}
+                />
+              ) : (
+                <span className="max-w-24 truncate p-1">{label}</span>
+              )}
+            </span>
+            {onRemove && (
+              <div className="relative size-5 flex items-center justify-center">
+                {renderTabSuffix && (
+                  <span className="transition-opacity group-hover:opacity-0">
+                    {renderTabSuffix(entity)}
+                  </span>
+                )}
+                <button
+                  disabled={isEditing}
+                  className="absolute inset-0 hover:bg-background-2 text-foreground-muted flex items-center justify-center rounded-md opacity-0 group-hover:opacity-100 transition-opacity"
+                  onClick={(e) => {
+                    e.stopPropagation();
+                    onRemove(id);
+                  }}
+                >
+                  <X className="size-4" />
+                </button>
+              </div>
+            )}
+          </div>
+        </button>
+        <Separator orientation="vertical" />
+      </>
+    );
+  };
+
+  const handleReorder = (newTabs: TEntity[]) => {
+    for (let toIdx = 0; toIdx < newTabs.length; toIdx++) {
+      const fromIdx = tabs.findIndex((t) => getId(t) === getId(newTabs[toIdx]));
+      if (fromIdx !== toIdx) {
+        onReorder?.(fromIdx, toIdx);
+        break;
+      }
+    }
+  };
+
+  return (
+    <div className="flex items-center justify-between h-[41px] border-b border-border bg-background-secondary">
+      {onReorder ? (
+        <ReorderList
+          items={tabs}
+          onReorder={handleReorder}
+          axis="x"
+          className="flex overflow-x-auto w-full h-full"
+          itemClassName="list-none flex h-full"
+          getKey={(item) => getId(item)}
+        >
+          {(entity) => <Observer>{() => renderTab(entity)}</Observer>}
+        </ReorderList>
+      ) : (
+        <div className="flex overflow-x-auto h-full">{tabs.map((entity) => renderTab(entity))}</div>
+      )}
+      {actions && <div className="shrink-0">{actions}</div>}
+    </div>
+  );
+}) as <TEntity>(props: TabBarProps<TEntity>) => React.ReactElement;
diff --git a/src/renderer/lib/ui/tabs.tsx b/src/renderer/lib/ui/tabs.tsx
new file mode 100644
index 0000000000..c89e53aa9f
--- /dev/null
+++ b/src/renderer/lib/ui/tabs.tsx
@@ -0,0 +1,72 @@
+import { Tabs as TabsPrimitive } from '@base-ui/react/tabs';
+import { cva, type VariantProps } from 'class-variance-authority';
+import { cn } from '@renderer/utils/utils';
+
+function Tabs({ className, orientation = 'horizontal', ...props }: TabsPrimitive.Root.Props) {
+  return (
+    <TabsPrimitive.Root
+      data-slot="tabs"
+      data-orientation={orientation}
+      className={cn('group/tabs flex gap-2 data-horizontal:flex-col', className)}
+      {...props}
+    />
+  );
+}
+
+const tabsListVariants = cva(
+  'group/tabs-list inline-flex w-fit items-center justify-center rounded-lg p-[3px] text-muted-foreground group-data-horizontal/tabs:h-9 group-data-vertical/tabs:h-fit group-data-vertical/tabs:flex-col data-[variant=line]:rounded-none',
+  {
+    variants: {
+      variant: {
+        default: 'bg-muted',
+        line: 'gap-1 bg-transparent',
+      },
+    },
+    defaultVariants: {
+      variant: 'default',
+    },
+  }
+);
+
+function TabsList({
+  className,
+  variant = 'default',
+  ...props
+}: TabsPrimitive.List.Props & VariantProps<typeof tabsListVariants>) {
+  return (
+    <TabsPrimitive.List
+      data-slot="tabs-list"
+      data-variant={variant}
+      className={cn(tabsListVariants({ variant }), className)}
+      {...props}
+    />
+  );
+}
+
+function TabsTrigger({ className, ...props }: TabsPrimitive.Tab.Props) {
+  return (
+    <TabsPrimitive.Tab
+      data-slot="tabs-trigger"
+      className={cn(
+        "relative inline-flex h-[calc(100%-1px)] flex-1 items-center justify-center gap-1.5 rounded-md border border-transparent px-2 py-1 text-sm font-medium whitespace-nowrap text-foreground/60 transition-all group-data-vertical/tabs:w-full group-data-vertical/tabs:justify-start hover:text-foreground focus-visible:border-ring focus-visible:ring-[3px] focus-visible:ring-ring/50 focus-visible:outline-1 focus-visible:outline-ring disabled:pointer-events-none disabled:opacity-50 aria-disabled:pointer-events-none aria-disabled:opacity-50 dark:text-muted-foreground dark:hover:text-foreground group-data-[variant=default]/tabs-list:data-active:shadow-sm group-data-[variant=line]/tabs-list:data-active:shadow-none [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
+        'group-data-[variant=line]/tabs-list:bg-transparent group-data-[variant=line]/tabs-list:data-active:bg-transparent dark:group-data-[variant=line]/tabs-list:data-active:border-transparent dark:group-data-[variant=line]/tabs-list:data-active:bg-transparent',
+        'data-active:bg-background data-active:text-foreground dark:data-active:border-input dark:data-active:bg-input/30 dark:data-active:text-foreground',
+        'after:absolute after:bg-foreground after:opacity-0 after:transition-opacity group-data-horizontal/tabs:after:inset-x-0 group-data-horizontal/tabs:after:bottom-[-5px] group-data-horizontal/tabs:after:h-0.5 group-data-vertical/tabs:after:inset-y-0 group-data-vertical/tabs:after:-right-1 group-data-vertical/tabs:after:w-0.5 group-data-[variant=line]/tabs-list:data-active:after:opacity-100',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+function TabsContent({ className, ...props }: TabsPrimitive.Panel.Props) {
+  return (
+    <TabsPrimitive.Panel
+      data-slot="tabs-content"
+      className={cn('flex-1 text-sm outline-none', className)}
+      {...props}
+    />
+  );
+}
+
+export { Tabs, TabsList, TabsTrigger, TabsContent, tabsListVariants };
diff --git a/src/renderer/lib/ui/textarea.tsx b/src/renderer/lib/ui/textarea.tsx
new file mode 100644
index 0000000000..60d3781c60
--- /dev/null
+++ b/src/renderer/lib/ui/textarea.tsx
@@ -0,0 +1,19 @@
+import * as React from 'react';
+import { cn } from '@renderer/utils/utils';
+
+function Textarea({ className, ...props }: React.ComponentProps<'textarea'>) {
+  return (
+    <textarea
+      data-slot="textarea"
+      className={cn(
+        'flex field-sizing-content min-h-16 w-full rounded-md border border-border bg-transparent px-2.5 py-2 text-sm transition-[color,box-shadow] outline-none placeholder:text-foreground-passive hover:border-border-1 focus-visible:border focus-visible:border-border-primary focus-visible:ring-2 focus-visible:ring-primary/30 disabled:pointer-events-none disabled:cursor-not-allowed disabled:opacity-50 aria-invalid:border-destructive aria-invalid:ring-3 aria-invalid:ring-destructive/20 md:text-sm dark:bg-input/30 dark:aria-invalid:border-destructive/50 dark:aria-invalid:ring-destructive/40',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+export type TextareaProps = React.ComponentProps<'textarea'>;
+
+export { Textarea };
diff --git a/src/renderer/lib/ui/toaster.tsx b/src/renderer/lib/ui/toaster.tsx
new file mode 100644
index 0000000000..95f46e6909
--- /dev/null
+++ b/src/renderer/lib/ui/toaster.tsx
@@ -0,0 +1 @@
+export { Toaster } from './sonner';
diff --git a/src/renderer/lib/ui/toggle-group.tsx b/src/renderer/lib/ui/toggle-group.tsx
new file mode 100644
index 0000000000..a4a6335bdd
--- /dev/null
+++ b/src/renderer/lib/ui/toggle-group.tsx
@@ -0,0 +1,85 @@
+import { Toggle as TogglePrimitive } from '@base-ui/react/toggle';
+import { ToggleGroup as ToggleGroupPrimitive } from '@base-ui/react/toggle-group';
+import { type VariantProps } from 'class-variance-authority';
+import * as React from 'react';
+import { toggleVariants } from '@renderer/lib/ui/toggle';
+import { cn } from '@renderer/utils/utils';
+
+const ToggleGroupContext = React.createContext<
+  VariantProps<typeof toggleVariants> & {
+    spacing?: number;
+    orientation?: 'horizontal' | 'vertical';
+  }
+>({
+  size: 'default',
+  variant: 'default',
+  spacing: 0,
+  orientation: 'horizontal',
+});
+
+function ToggleGroup({
+  className,
+  variant,
+  size,
+  spacing = 0,
+  orientation = 'horizontal',
+  children,
+  ...props
+}: ToggleGroupPrimitive.Props &
+  VariantProps<typeof toggleVariants> & {
+    spacing?: number;
+    orientation?: 'horizontal' | 'vertical';
+  }) {
+  return (
+    <ToggleGroupPrimitive
+      data-slot="toggle-group"
+      data-variant={variant}
+      data-size={size}
+      data-spacing={spacing}
+      data-orientation={orientation}
+      style={{ '--gap': spacing } as React.CSSProperties}
+      className={cn(
+        'group/toggle-group border border-border bg-background overflow-hidden flex h-8 data-[size=sm]:h-6 data-vertical:h-auto w-fit flex-row items-center gap-[--spacing(var(--gap))] rounded-md data-vertical:flex-col data-vertical:items-stretch',
+        className
+      )}
+      {...props}
+    >
+      <ToggleGroupContext.Provider value={{ variant, size, spacing, orientation }}>
+        {children}
+      </ToggleGroupContext.Provider>
+    </ToggleGroupPrimitive>
+  );
+}
+
+function ToggleGroupItem({
+  className,
+  children,
+  variant = 'default',
+  size = 'default',
+  ...props
+}: TogglePrimitive.Props & VariantProps<typeof toggleVariants>) {
+  const context = React.useContext(ToggleGroupContext);
+
+  return (
+    <TogglePrimitive
+      data-slot="toggle-group-item"
+      data-variant={context.variant || variant}
+      data-size={context.size || size}
+      data-spacing={context.spacing}
+      className={cn(
+        'shrink-0 group-data-[spacing=0]/toggle-group:rounded-none group-data-[spacing=0]/toggle-group:px-2 group-data-[spacing=0]/toggle-group:shadow-none focus:z-10 focus-visible:z-10 group-data-horizontal/toggle-group:data-[spacing=0]:first:rounded-l-md group-data-vertical/toggle-group:data-[spacing=0]:first:rounded-t-md group-data-horizontal/toggle-group:data-[spacing=0]:last:rounded-r-md group-data-vertical/toggle-group:data-[spacing=0]:last:rounded-b-md data-[state=on]:bg-muted group-data-horizontal/toggle-group:data-[spacing=0]:data-[variant=outline]:border-l-0 group-data-vertical/toggle-group:data-[spacing=0]:data-[variant=outline]:border-t-0 group-data-horizontal/toggle-group:data-[spacing=0]:data-[variant=outline]:first:border-l group-data-vertical/toggle-group:data-[spacing=0]:data-[variant=outline]:first:border-t',
+        toggleVariants({
+          variant: context.variant || variant,
+          size: context.size || size,
+        }),
+        className,
+        'h-full border-none'
+      )}
+      {...props}
+    >
+      {children}
+    </TogglePrimitive>
+  );
+}
+
+export { ToggleGroup, ToggleGroupItem };
diff --git a/src/renderer/lib/ui/toggle.tsx b/src/renderer/lib/ui/toggle.tsx
new file mode 100644
index 0000000000..c03e8edcfb
--- /dev/null
+++ b/src/renderer/lib/ui/toggle.tsx
@@ -0,0 +1,42 @@
+'use client';
+
+import { Toggle as TogglePrimitive } from '@base-ui/react/toggle';
+import { cva, type VariantProps } from 'class-variance-authority';
+import { cn } from '@renderer/utils/utils';
+
+const toggleVariants = cva(
+  "group/toggle inline-flex items-center text-foreground-muted data-pressed:text-foreground justify-center gap-1 rounded-lg  font-normal whitespace-nowrap transition-[color,box-shadow] outline-none hover:bg-background-1 hover:text-foreground data-pressed:bg-background-2 focus-visible:border-ring focus-visible:ring-[3px] focus-visible:ring-ring/50 disabled:pointer-events-none disabled:opacity-50 aria-invalid:border-destructive aria-invalid:ring-destructive/20 aria-pressed:bg-muted dark:aria-invalid:ring-destructive/40 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-3.5",
+  {
+    variants: {
+      variant: {
+        default: 'bg-transparent',
+        outline: 'border border-border',
+      },
+      size: {
+        default: 'h-8 min-w-8 px-2 text-sm',
+        sm: 'h-7 min-w-7 px-1.5 text-xs',
+      },
+    },
+    defaultVariants: {
+      variant: 'default',
+      size: 'default',
+    },
+  }
+);
+
+function Toggle({
+  className,
+  variant = 'default',
+  size = 'default',
+  ...props
+}: TogglePrimitive.Props & VariantProps<typeof toggleVariants>) {
+  return (
+    <TogglePrimitive
+      data-slot="toggle"
+      className={cn(toggleVariants({ variant, size, className }))}
+      {...props}
+    />
+  );
+}
+
+export { Toggle, toggleVariants };
diff --git a/src/renderer/lib/ui/tooltip.tsx b/src/renderer/lib/ui/tooltip.tsx
new file mode 100644
index 0000000000..6ed7a389dc
--- /dev/null
+++ b/src/renderer/lib/ui/tooltip.tsx
@@ -0,0 +1,62 @@
+import { Tooltip as TooltipPrimitive } from '@base-ui/react/tooltip';
+import { cn } from '@renderer/utils/utils';
+
+function TooltipProvider({ delay = 0, ...props }: TooltipPrimitive.Provider.Props) {
+  return <TooltipPrimitive.Provider data-slot="tooltip-provider" delay={delay} {...props} />;
+}
+
+function Tooltip({ ...props }: TooltipPrimitive.Root.Props) {
+  return <TooltipPrimitive.Root data-slot="tooltip" {...props} />;
+}
+
+function TooltipTrigger({ className, ...props }: TooltipPrimitive.Trigger.Props) {
+  return (
+    <TooltipPrimitive.Trigger
+      data-slot="tooltip-trigger"
+      className={cn('h-full', className)}
+      {...props}
+    />
+  );
+}
+
+function TooltipContent({
+  className,
+  side = 'top',
+  sideOffset = 4,
+  align = 'center',
+  alignOffset = 0,
+  showArrow = true,
+  children,
+  ...props
+}: TooltipPrimitive.Popup.Props &
+  Pick<TooltipPrimitive.Positioner.Props, 'align' | 'alignOffset' | 'side' | 'sideOffset'> & {
+    showArrow?: boolean;
+  }) {
+  return (
+    <TooltipPrimitive.Portal>
+      <TooltipPrimitive.Positioner
+        align={align}
+        alignOffset={alignOffset}
+        side={side}
+        sideOffset={sideOffset}
+        className="isolate z-50"
+      >
+        <TooltipPrimitive.Popup
+          data-slot="tooltip-content"
+          className={cn(
+            'z-50 inline-flex w-fit max-w-xs origin-(--transform-origin) items-center gap-1.5 rounded-md bg-foreground px-3 py-1.5 text-xs text-background has-data-[slot=kbd]:pr-1.5 data-[side=bottom]:slide-in-from-top-2 data-[side=inline-end]:slide-in-from-left-2 data-[side=inline-start]:slide-in-from-right-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 **:data-[slot=kbd]:relative **:data-[slot=kbd]:isolate **:data-[slot=kbd]:z-50 **:data-[slot=kbd]:rounded-sm data-[state=delayed-open]:animate-in data-[state=delayed-open]:fade-in-0 data-[state=delayed-open]:zoom-in-95 data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 data-closed:animate-out data-closed:fade-out-0 data-closed:zoom-out-95',
+            className
+          )}
+          {...props}
+        >
+          {children}
+          {showArrow ? (
+            <TooltipPrimitive.Arrow className="z-50 size-2.5 translate-y-[calc(-50%-2px)] rotate-45 rounded-[2px] bg-foreground fill-foreground data-[side=bottom]:top-1 data-[side=inline-end]:top-1/2! data-[side=inline-end]:-left-1 data-[side=inline-end]:-translate-y-1/2 data-[side=inline-start]:top-1/2! data-[side=inline-start]:-right-1 data-[side=inline-start]:-translate-y-1/2 data-[side=left]:top-1/2! data-[side=left]:-right-1 data-[side=left]:-translate-y-1/2 data-[side=right]:top-1/2! data-[side=right]:-left-1 data-[side=right]:-translate-y-1/2 data-[side=top]:-bottom-2.5" />
+          ) : null}
+        </TooltipPrimitive.Popup>
+      </TooltipPrimitive.Positioner>
+    </TooltipPrimitive.Portal>
+  );
+}
+
+export { Tooltip, TooltipTrigger, TooltipContent, TooltipProvider };
diff --git a/src/renderer/lib/utils.ts b/src/renderer/lib/utils.ts
deleted file mode 100644
index f278405424..0000000000
--- a/src/renderer/lib/utils.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { clsx, type ClassValue } from 'clsx';
-import { DeepPartial } from 'src/main/settings';
-import { twMerge } from 'tailwind-merge';
-
-export function cn(...inputs: ClassValue[]) {
-  return twMerge(clsx(inputs));
-}
-
-export function deepMerge<T>(base: T, update: DeepPartial<T>): T {
-  const result = { ...(base as object) } as Record<string, unknown>;
-  for (const [key, value] of Object.entries(update as Record<string, unknown>)) {
-    if (
-      value !== null &&
-      typeof value === 'object' &&
-      !Array.isArray(value) &&
-      typeof result[key] === 'object'
-    ) {
-      result[key] = deepMerge(result[key], value as DeepPartial<unknown>);
-    } else if (value !== undefined) {
-      result[key] = value;
-    }
-  }
-  return result as T;
-}
diff --git a/src/renderer/main.tsx b/src/renderer/main.tsx
index 36c6051af3..3fcda69c69 100644
--- a/src/renderer/main.tsx
+++ b/src/renderer/main.tsx
@@ -1,9 +1,59 @@
-import React from 'react';
 import ReactDOM from 'react-dom/client';
 import { App } from './App';
+import { ErrorBoundary } from './lib/components/error-boundary';
 import './index.css';
+import 'devicon/devicon.min.css';
+import type { NavigationSnapshot, SidebarSnapshot } from '@shared/view-state';
+import { wireCommitHistoryInvalidation } from '@renderer/lib/commit-history-invalidation';
+import { rpc } from '@renderer/lib/ipc';
+import { wireModelRegistryInvalidation } from '@renderer/lib/monaco/invalidation-bridges';
+import { codeEditorPool } from '@renderer/lib/monaco/monaco-code-pool';
+import { diffEditorPool } from '@renderer/lib/monaco/monaco-diff-pool';
+import { modelRegistry } from '@renderer/lib/monaco/monaco-model-registry';
+import { wirePrCacheInvalidation } from '@renderer/lib/pr-cache-invalidation';
+import { log } from '@renderer/utils/logger';
+import { initSoundPlayer } from '@renderer/utils/soundPlayer';
+import { appState } from './lib/stores/app-state';
 
-const root = ReactDOM.createRoot(document.getElementById('root') as HTMLElement);
+async function bootstrap() {
+  // Wire invalidation bridges so FS and git events flow into the model registry.
+  wireModelRegistryInvalidation(modelRegistry);
+  wirePrCacheInvalidation();
+  wireCommitHistoryInvalidation();
 
-// Avoid double-mount in dev which can duplicate PTY sessions
-root.render(<App />);
+  appState.update.start();
+  initSoundPlayer();
+
+  // Initialize Monaco and load app data in parallel. Awaiting Monaco here
+  // guarantees __monaco is set before React renders, so StickyDiffEditor can
+  // create editors synchronously on mount without any async coordination.
+  const [, , navResult, sidebarResult] = await Promise.all([
+    codeEditorPool.init(0).catch((error: unknown) => {
+      log.warn('[monaco-code-pool] init failed:', error);
+    }),
+    diffEditorPool.init(0).catch((error: unknown) => {
+      log.warn('[monaco-diff-pool] init failed:', error);
+    }),
+    rpc.viewState.get('navigation') as Promise<NavigationSnapshot> | null,
+    rpc.viewState.get('sidebar'),
+    appState.projects.load(),
+  ]);
+
+  if (navResult) appState.navigation.restoreSnapshot(navResult);
+  if (sidebarResult) {
+    appState.sidebar.restoreSnapshot(sidebarResult as Partial<SidebarSnapshot>);
+  } else {
+    appState.sidebar.expandAllProjects();
+  }
+
+  // Avoid double-mount in dev which can duplicate PTY sessions
+  ReactDOM.createRoot(document.getElementById('root') as HTMLElement).render(
+    <ErrorBoundary>
+      <App />
+    </ErrorBoundary>
+  );
+}
+
+bootstrap().catch((error: unknown) => {
+  log.error('Renderer bootstrap failed:', error);
+});
diff --git a/src/renderer/mcp/context7.ts b/src/renderer/mcp/context7.ts
deleted file mode 100644
index f93022e46a..0000000000
--- a/src/renderer/mcp/context7.ts
+++ /dev/null
@@ -1,285 +0,0 @@
-import type { Agent } from '../types';
-
-export type Context7ProviderId = Agent;
-
-export interface Context7SetupSnippet {
-  label: string;
-  language: 'json' | 'bash' | 'toml' | 'text';
-  content: string;
-}
-
-export interface Context7ProviderConfig {
-  invocation?: string;
-  setup: Context7SetupSnippet[];
-}
-
-export interface Context7IntegrationMeta {
-  id: 'context7';
-  label: string;
-  docsUrl: string;
-  defaultInvocation: string;
-  byProvider: Partial<Record<Context7ProviderId, Context7ProviderConfig>>;
-}
-
-// Shared snippets
-const SNIPPETS = {
-  cursorRemote: {
-    label: 'Cursor – Remote (HTTP)',
-    language: 'json' as const,
-    content: `{
-  "mcpServers": {
-    "context7": {
-      "url": "https://mcp.context7.com/mcp",
-      "headers": { "CONTEXT7_API_KEY": "YOUR_API_KEY" }
-    }
-  }
-}`,
-  },
-  cursorLocal: {
-    label: 'Cursor – Local (npx stdio)',
-    language: 'json' as const,
-    content: `{
-  "mcpServers": {
-    "context7": {
-      "command": "npx",
-      "args": ["-y", "@upstash/context7-mcp", "--api-key", "YOUR_API_KEY"]
-    }
-  }
-}`,
-  },
-  claudeRemote: {
-    label: 'Claude Code – Remote (HTTP)',
-    language: 'bash' as const,
-    content:
-      'claude mcp add --transport http context7 https://mcp.context7.com/mcp \\\n+  --header "CONTEXT7_API_KEY: YOUR_API_KEY"',
-  },
-  claudeLocal: {
-    label: 'Claude Code – Local (npx stdio)',
-    language: 'bash' as const,
-    content: 'claude mcp add context7 -- npx -y @upstash/context7-mcp --api-key YOUR_API_KEY',
-  },
-  codexTomlLocal: {
-    label: 'OpenAI Codex – Local (npx)',
-    language: 'toml' as const,
-    content: `[mcp_servers.context7]
-command = "npx"
-args = ["-y", "@upstash/context7-mcp", "--api-key", "YOUR_API_KEY"]`,
-  },
-  codexTomlRemote: {
-    label: 'OpenAI Codex – Remote (HTTP)',
-    language: 'toml' as const,
-    content: `[mcp_servers.context7]
-url = "https://mcp.context7.com/mcp"
-http_headers = { "CONTEXT7_API_KEY" = "YOUR_API_KEY" }`,
-  },
-  ampRemote: {
-    label: 'Amp – Remote (HTTP)',
-    language: 'bash' as const,
-    content:
-      'amp mcp add context7 --header "CONTEXT7_API_KEY=YOUR_API_KEY" https://mcp.context7.com/mcp',
-  },
-  ampNoKey: {
-    label: 'Amp – Remote (No API key)',
-    language: 'bash' as const,
-    content: 'amp mcp add context7 https://mcp.context7.com/mcp',
-  },
-  copilotRemote: {
-    label: 'Copilot CLI – Remote (HTTP)',
-    language: 'json' as const,
-    content: `{
-  "mcpServers": {
-    "context7": {
-      "type": "http",
-      "url": "https://mcp.context7.com/mcp",
-      "headers": { "CONTEXT7_API_KEY": "YOUR_API_KEY" },
-      "tools": ["get-library-docs", "resolve-library-id"]
-    }
-  }
-}`,
-  },
-  copilotLocal: {
-    label: 'Copilot CLI – Local (npx)',
-    language: 'json' as const,
-    content: `{
-  "mcpServers": {
-    "context7": {
-      "type": "local",
-      "command": "npx",
-      "tools": ["get-library-docs", "resolve-library-id"],
-      "args": ["-y", "@upstash/context7-mcp", "--api-key", "YOUR_API_KEY"]
-    }
-  }
-}`,
-  },
-  qwenRemote: {
-    label: 'Qwen Coder – Remote (HTTP)',
-    language: 'json' as const,
-    content: `{
-  "mcpServers": {
-    "context7": {
-      "httpUrl": "https://mcp.context7.com/mcp",
-      "headers": {
-        "CONTEXT7_API_KEY": "YOUR_API_KEY",
-        "Accept": "application/json, text/event-stream"
-      }
-    }
-  }
-}`,
-  },
-  qwenLocal: {
-    label: 'Qwen Coder – Local (npx)',
-    language: 'json' as const,
-    content: `{
-  "mcpServers": {
-    "context7": {
-      "command": "npx",
-      "args": ["-y", "@upstash/context7-mcp", "--api-key", "YOUR_API_KEY"]
-    }
-  }
-}`,
-  },
-  geminiRemote: {
-    label: 'Gemini CLI – Remote (HTTP)',
-    language: 'json' as const,
-    content: `{
-  "mcpServers": {
-    "context7": {
-      "httpUrl": "https://mcp.context7.com/mcp",
-      "headers": {
-        "CONTEXT7_API_KEY": "YOUR_API_KEY",
-        "Accept": "application/json, text/event-stream"
-      }
-    }
-  }
-}`,
-  },
-  geminiLocal: {
-    label: 'Gemini CLI – Local (npx)',
-    language: 'json' as const,
-    content: `{
-  "mcpServers": {
-    "context7": {
-      "command": "npx",
-      "args": ["-y", "@upstash/context7-mcp", "--api-key", "YOUR_API_KEY"]
-    }
-  }
-}`,
-  },
-  droidRemote: {
-    label: 'Factory Droid – Remote (HTTP)',
-    language: 'bash' as const,
-    content:
-      'droid mcp add context7 https://mcp.context7.com/mcp --type http --header "CONTEXT7_API_KEY: YOUR_API_KEY"',
-  },
-  droidLocal: {
-    label: 'Factory Droid – Local (npx)',
-    language: 'bash' as const,
-    content:
-      'droid mcp add context7 "npx -y @upstash/context7-mcp" --env CONTEXT7_API_KEY=YOUR_API_KEY',
-  },
-  zedLocal: {
-    label: 'Zed – Local (npx)',
-    language: 'json' as const,
-    content: `{
-  "context_servers": {
-    "Context7": {
-      "source": "custom",
-      "command": "npx",
-      "args": ["-y", "@upstash/context7-mcp", "--api-key", "YOUR_API_KEY"]
-    }
-  }
-}`,
-  },
-  opencodeRemote: {
-    label: 'OpenCode – Remote (HTTP)',
-    language: 'json' as const,
-    content: `"mcp": {
-  "context7": {
-    "type": "remote",
-    "url": "https://mcp.context7.com/mcp",
-    "headers": { "CONTEXT7_API_KEY": "YOUR_API_KEY" },
-    "enabled": true
-  }
-}`,
-  },
-  opencodeLocal: {
-    label: 'OpenCode – Local (npx)',
-    language: 'json' as const,
-    content: `{
-  "mcp": {
-    "context7": {
-      "type": "local",
-      "command": ["npx", "-y", "@upstash/context7-mcp", "--api-key", "YOUR_API_KEY"],
-      "enabled": true
-    }
-  }
-}`,
-  },
-  genericRemote: {
-    label: 'Generic – Remote (HTTP)',
-    language: 'text' as const,
-    content:
-      'URL: https://mcp.context7.com/mcp (set CONTEXT7_API_KEY header if available) – see docs',
-  },
-};
-
-export const CONTEXT7_INTEGRATION: Context7IntegrationMeta = {
-  id: 'context7',
-  label: 'Context7 MCP',
-  docsUrl: 'https://github.com/upstash/context7',
-  defaultInvocation: 'use context7 for looking up library docs',
-  byProvider: {
-    codex: {
-      setup: [SNIPPETS.codexTomlRemote, SNIPPETS.codexTomlLocal],
-    },
-    claude: {
-      setup: [SNIPPETS.claudeRemote, SNIPPETS.claudeLocal],
-    },
-    cursor: {
-      setup: [SNIPPETS.cursorRemote, SNIPPETS.cursorLocal],
-    },
-    copilot: {
-      setup: [SNIPPETS.copilotRemote, SNIPPETS.copilotLocal],
-    },
-    qwen: {
-      setup: [SNIPPETS.qwenRemote, SNIPPETS.qwenLocal],
-    },
-    gemini: {
-      setup: [SNIPPETS.geminiRemote, SNIPPETS.geminiLocal],
-    },
-    amp: {
-      setup: [SNIPPETS.ampRemote, SNIPPETS.ampNoKey],
-    },
-    opencode: {
-      setup: [SNIPPETS.opencodeRemote, SNIPPETS.opencodeLocal],
-    },
-    droid: {
-      setup: [SNIPPETS.droidRemote, SNIPPETS.droidLocal],
-    },
-    charm: {
-      setup: [SNIPPETS.genericRemote],
-    },
-    goose: {
-      setup: [SNIPPETS.genericRemote],
-    },
-    kimi: {
-      setup: [SNIPPETS.genericRemote],
-    },
-    kiro: {
-      setup: [SNIPPETS.zedLocal],
-    },
-    auggie: {
-      setup: [SNIPPETS.genericRemote],
-    },
-  },
-};
-
-export function getContext7InvocationForProvider(agent: Agent): string {
-  const cfg = CONTEXT7_INTEGRATION.byProvider[agent];
-  return (cfg?.invocation || CONTEXT7_INTEGRATION.defaultInvocation).trim();
-}
-
-export function getContext7SnippetsForProvider(agent: Agent): Context7SetupSnippet[] {
-  const cfg = CONTEXT7_INTEGRATION.byProvider[agent];
-  return cfg?.setup?.length ? cfg.setup : [SNIPPETS.genericRemote];
-}
diff --git a/src/renderer/providers/BrowserProvider.tsx b/src/renderer/providers/BrowserProvider.tsx
deleted file mode 100644
index 2081fc6099..0000000000
--- a/src/renderer/providers/BrowserProvider.tsx
+++ /dev/null
@@ -1,206 +0,0 @@
-import React from 'react';
-
-type BrowserController = {
-  isOpen: boolean;
-  url: string | null;
-  widthPct: number;
-  busy: boolean;
-  open: (url?: string) => void;
-  close: () => void;
-  toggle: (url?: string) => void;
-  navigate: (url: string) => void;
-  clearUrl: () => void;
-  setWidthPct: (pct: number) => void;
-  execJS: (code: string) => Promise<any>;
-  goBack: () => void;
-  goForward: () => void;
-  reload: () => void;
-  focus: () => void;
-  setBusy: (next: boolean) => void;
-  showSpinner: () => void;
-  hideSpinner: () => void;
-};
-
-const Ctx = React.createContext<BrowserController | null>(null);
-
-export const BrowserProvider: React.FC<{ children: React.ReactNode }> = ({ children }) => {
-  const webviewRef = React.useRef<any>(null);
-  const [isOpen, setOpen] = React.useState(false);
-  const [url, setUrl] = React.useState<string | null>(null);
-  const [widthPct, setWidthPctState] = React.useState<number>(50);
-  const [busy, setBusyState] = React.useState<boolean>(false);
-
-  const ensureRef = () => webviewRef.current as any;
-
-  const navigate = React.useCallback((next: string) => {
-    setUrl(next);
-    void import('../lib/telemetryClient').then(({ captureTelemetry }) => {
-      captureTelemetry('browser_preview_url_navigated');
-    });
-    try {
-      const api: any = (window as any).electronAPI;
-      if (api && typeof api.browserLoadURL === 'function') {
-        api.browserLoadURL(next);
-        return;
-      }
-    } catch {}
-    const el = ensureRef();
-    try {
-      if (el && el.getURL && el.getURL() !== next) {
-        el.loadURL(next).catch(() => {});
-      }
-    } catch {}
-  }, []);
-
-  const open = React.useCallback(
-    (nextUrl?: string) => {
-      if (nextUrl) navigate(nextUrl);
-      setOpen(true);
-    },
-    [navigate]
-  );
-
-  const close = React.useCallback(() => setOpen(false), []);
-  const toggle = React.useCallback(
-    (nextUrl?: string) => {
-      setOpen((prev) => {
-        const nextState = !prev;
-        if (nextState && nextUrl) navigate(nextUrl);
-        return nextState;
-      });
-    },
-    [navigate]
-  );
-
-  const clearUrl = React.useCallback(() => {
-    setUrl(null);
-  }, []);
-
-  const execJS = React.useCallback(async (code: string) => {
-    const el = ensureRef() as any;
-    if (!el || typeof el.executeJavaScript !== 'function') return undefined;
-    try {
-      return await el.executeJavaScript(code, true);
-    } catch {
-      return undefined;
-    }
-  }, []);
-
-  const goBack = React.useCallback(() => {
-    try {
-      const api: any = (window as any).electronAPI;
-      if (api && typeof api.browserGoBack === 'function') {
-        api.browserGoBack();
-        return;
-      }
-    } catch {}
-    const el = ensureRef();
-    if (el && el.canGoBack()) el.goBack();
-  }, []);
-  const goForward = React.useCallback(() => {
-    try {
-      const api: any = (window as any).electronAPI;
-      if (api && typeof api.browserGoForward === 'function') {
-        api.browserGoForward();
-        return;
-      }
-    } catch {}
-    const el = ensureRef();
-    if (el && el.canGoForward()) el.goForward();
-  }, []);
-  const reload = React.useCallback(() => {
-    try {
-      const api: any = (window as any).electronAPI;
-      if (api && typeof api.browserReload === 'function') {
-        api.browserReload();
-        return;
-      }
-    } catch {}
-    const el = ensureRef();
-    if (el) el.reload();
-  }, []);
-  const focus = React.useCallback(() => ensureRef()?.focus(), []);
-
-  const setPaneWidthPct = React.useCallback((pct: number) => {
-    // Allow a much wider range for user control
-    const clamped = Math.max(5, Math.min(96, Math.round(pct)));
-    setWidthPctState(clamped);
-  }, []);
-
-  const value = React.useMemo<BrowserController>(
-    () => ({
-      isOpen,
-      url,
-      widthPct,
-      busy,
-      open,
-      close,
-      toggle,
-      navigate,
-      clearUrl,
-      setWidthPct: setPaneWidthPct,
-      execJS,
-      goBack,
-      goForward,
-      reload,
-      focus,
-      setBusy: setBusyState,
-      showSpinner: () => setBusyState(true),
-      hideSpinner: () => setBusyState(false),
-    }),
-    [
-      isOpen,
-      url,
-      widthPct,
-      busy,
-      open,
-      close,
-      toggle,
-      navigate,
-      clearUrl,
-      setPaneWidthPct,
-      execJS,
-      goBack,
-      goForward,
-      reload,
-      focus,
-    ]
-  );
-
-  return (
-    <Ctx.Provider value={value}>
-      {children}
-      <div id="emdash-browser-root" />
-      <BrowserViewRefBinder refObj={webviewRef} onUrlChange={setUrl} />
-    </Ctx.Provider>
-  );
-};
-
-export function useBrowser() {
-  const ctx = React.useContext(Ctx);
-  if (!ctx) throw new Error('useBrowser must be used within a BrowserProvider');
-  return ctx;
-}
-
-// An invisible singleton helper that lets BrowserPane register the webview ref
-const BrowserViewRefBinder: React.FC<{
-  refObj: React.MutableRefObject<Electron.WebviewTag | null>;
-  onUrlChange: (u: string | null) => void;
-}> = ({ refObj, onUrlChange }) => {
-  React.useEffect(() => {
-    const handler = (e: any) => {
-      if (!e || !e.detail) return;
-      const { type, target, url } = e.detail || {};
-      if (type === 'bind' && target) {
-        refObj.current = target as any;
-      } else if (type === 'update-url') {
-        onUrlChange(typeof url === 'string' ? url : null);
-      }
-    };
-    window.addEventListener('emdash:browser:internal', handler as any);
-    return () => window.removeEventListener('emdash:browser:internal', handler as any);
-  }, [refObj, onUrlChange]);
-  return null;
-};
-
-export default BrowserProvider;
diff --git a/src/renderer/providers/assets.ts b/src/renderer/providers/assets.ts
deleted file mode 100644
index a186ac5462..0000000000
--- a/src/renderer/providers/assets.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-import openaiLogoSvg from '../../assets/images/openai.svg?raw';
-import kiroLogo from '../../assets/images/kiro.png';
-import claudeLogo from '../../assets/images/claude.png';
-import factoryLogoSvg from '../../assets/images/droid.svg?raw';
-import geminiLogo from '../../assets/images/gemini.png';
-import cursorLogoSvg from '../../assets/images/cursor.svg?raw';
-import copilotLogoSvg from '../../assets/images/gh-copilot.svg?raw';
-import ampLogo from '../../assets/images/ampcode.png';
-import opencodeLogo from '../../assets/images/opencode.png';
-import charmLogo from '../../assets/images/charm.png';
-import qwenLogo from '../../assets/images/qwen.png';
-import augmentLogoSvg from '../../assets/images/Auggie.svg?raw';
-import gooseLogo from '../../assets/images/goose.png';
-import kimiLogo from '../../assets/images/kimi.png';
-import kilocodeLogo from '../../assets/images/kilocode.png';
-import atlassianLogo from '../../assets/images/atlassian.png';
-import clineLogo from '../../assets/images/cline.png';
-import continueLogo from '../../assets/images/continue.png';
-import codebuffLogo from '../../assets/images/codebuff.png';
-import mistralLogo from '../../assets/images/mistral.png';
-import piLogo from '../../assets/images/pi.png';
-import autohandLogoSvg from '../../assets/images/autohand.svg?raw';
-import type { UiAgent } from './meta';
-
-export type AgentAsset = {
-  logo: string;
-  alt: string;
-  invertInDark?: boolean;
-  name: string;
-  isSvg?: boolean;
-};
-
-export const agentAssets: Record<UiAgent, AgentAsset> = {
-  codex: { name: 'OpenAI', logo: openaiLogoSvg, alt: 'Codex', isSvg: true },
-  qwen: { name: 'Qwen Code', logo: qwenLogo, alt: 'Qwen Code CLI' },
-  claude: { name: 'Anthropic', logo: claudeLogo, alt: 'Claude Code' },
-  droid: { name: 'Factory AI', logo: factoryLogoSvg, alt: 'Factory Droid', isSvg: true },
-  gemini: { name: 'Google', logo: geminiLogo, alt: 'Gemini CLI' },
-  cursor: { name: 'Cursor', logo: cursorLogoSvg, alt: 'Cursor CLI', isSvg: true },
-  copilot: { name: 'GitHub', logo: copilotLogoSvg, alt: 'GitHub Copilot CLI', isSvg: true },
-  amp: { name: 'Sourcegraph', logo: ampLogo, alt: 'Amp CLI' },
-  opencode: { name: 'OpenCode', logo: opencodeLogo, alt: 'OpenCode CLI', invertInDark: true },
-  charm: { name: 'Charm', logo: charmLogo, alt: 'Charm CLI', invertInDark: true },
-  auggie: { name: 'Augment Code', logo: augmentLogoSvg, alt: 'Auggie CLI', isSvg: true },
-  goose: { name: 'Goose', logo: gooseLogo, alt: 'Goose CLI' },
-  kimi: { name: 'Moonshot AI', logo: kimiLogo, alt: 'Kimi CLI' },
-  kilocode: { name: 'Kilo AI', logo: kilocodeLogo, alt: 'Kilocode CLI' },
-  kiro: { name: 'Amazon Web Services', logo: kiroLogo, alt: 'Kiro CLI' },
-  rovo: { name: 'Atlassian', logo: atlassianLogo, alt: 'Rovo Dev CLI' },
-  cline: { name: 'Cline', logo: clineLogo, alt: 'Cline CLI' },
-  continue: { name: 'Continue', logo: continueLogo, alt: 'Continue CLI' },
-  codebuff: { name: 'Codebuff', logo: codebuffLogo, alt: 'Codebuff CLI' },
-  mistral: { name: 'Mistral AI', logo: mistralLogo, alt: 'Mistral Vibe CLI' },
-  pi: { name: 'Pi', logo: piLogo, alt: 'Pi CLI' },
-  autohand: { name: 'Autohand', logo: autohandLogoSvg, alt: 'Autohand Code CLI', isSvg: true },
-};
diff --git a/src/renderer/providers/meta.ts b/src/renderer/providers/meta.ts
deleted file mode 100644
index 3159abf9fc..0000000000
--- a/src/renderer/providers/meta.ts
+++ /dev/null
@@ -1,80 +0,0 @@
-import { PROVIDERS, type ProviderId } from '@shared/providers/registry';
-
-import augmentcodeIcon from '../../assets/images/Auggie.svg?raw';
-import qwenIcon from '../../assets/images/qwen.png';
-import charmIcon from '../../assets/images/charm.png';
-import opencodeIcon from '../../assets/images/opencode.png';
-import ampcodeIcon from '../../assets/images/ampcode.png';
-import openaiIcon from '../../assets/images/openai.svg?raw';
-import claudeIcon from '../../assets/images/claude.png';
-import factorydroidIcon from '../../assets/images/droid.svg?raw';
-import geminiIcon from '../../assets/images/gemini.png';
-import cursorlogoIcon from '../../assets/images/cursor.svg?raw';
-import ghcopilotIcon from '../../assets/images/gh-copilot.svg?raw';
-import gooseIcon from '../../assets/images/goose.png';
-import kimiIcon from '../../assets/images/kimi.png';
-import kilocodeIcon from '../../assets/images/kilocode.png';
-import kiroIcon from '../../assets/images/kiro.png';
-import atlassianIcon from '../../assets/images/atlassian.png';
-import clineIcon from '../../assets/images/cline.png';
-import continueIcon from '../../assets/images/continue.png';
-import codebuffIcon from '../../assets/images/codebuff.png';
-import mistralIcon from '../../assets/images/mistral.png';
-import piIcon from '../../assets/images/pi.png';
-import autohandIcon from '../../assets/images/autohand.svg?raw';
-
-export type UiAgent = ProviderId;
-
-const ICONS: Record<string, string> = {
-  'Auggie.svg': augmentcodeIcon,
-  'qwen.png': qwenIcon,
-  'charm.png': charmIcon,
-  'opencode.png': opencodeIcon,
-  'ampcode.png': ampcodeIcon,
-  'openai.svg': openaiIcon,
-  'claude.png': claudeIcon,
-  'droid.svg': factorydroidIcon,
-  'gemini.png': geminiIcon,
-  'cursor.svg': cursorlogoIcon,
-  'gh-copilot.svg': ghcopilotIcon,
-  'goose.png': gooseIcon,
-  'kimi.png': kimiIcon,
-  'kilocode.png': kilocodeIcon,
-  'kiro.png': kiroIcon,
-  'atlassian.png': atlassianIcon,
-  'cline.png': clineIcon,
-  'continue.png': continueIcon,
-  'codebuff.png': codebuffIcon,
-  'mistral.png': mistralIcon,
-  'pi.png': piIcon,
-  'autohand.svg': autohandIcon,
-};
-
-export type AgentMeta = {
-  label: string;
-  icon?: string;
-  terminalOnly: boolean;
-  cli?: string;
-  planActivate?: string;
-  autoStartCommand?: string;
-  autoApproveFlag?: string;
-  initialPromptFlag?: string;
-  useKeystrokeInjection?: boolean;
-};
-
-export const agentMeta: Record<UiAgent, AgentMeta> = Object.fromEntries(
-  PROVIDERS.map((p) => [
-    p.id,
-    {
-      label: p.name,
-      icon: p.icon ? ICONS[p.icon] : undefined,
-      terminalOnly: p.terminalOnly ?? true,
-      cli: p.cli,
-      planActivate: p.planActivateCommand,
-      autoStartCommand: p.autoStartCommand,
-      autoApproveFlag: p.autoApproveFlag,
-      initialPromptFlag: p.initialPromptFlag,
-      useKeystrokeInjection: p.useKeystrokeInjection,
-    },
-  ])
-) as Record<UiAgent, AgentMeta>;
diff --git a/src/renderer/styles/editor-diff.css b/src/renderer/styles/editor-diff.css
deleted file mode 100644
index 8f64a3a004..0000000000
--- a/src/renderer/styles/editor-diff.css
+++ /dev/null
@@ -1,77 +0,0 @@
-/* Gutter markers (the colored bars in the gutter) */
-.diff-glyph-added::before {
-  content: '';
-  position: absolute;
-  left: 3px;
-  width: 3px;
-  height: 100%;
-  background-color: #10b981; /* emerald-500 */
-  border-radius: 1px;
-}
-
-.diff-glyph-modified::before {
-  content: '';
-  position: absolute;
-  left: 3px;
-  width: 3px;
-  height: 100%;
-  background-color: #3b82f6; /* blue-500 */
-  border-radius: 1px;
-}
-
-.diff-glyph-deleted::before {
-  content: '';
-  position: absolute;
-  left: 3px;
-  width: 3px;
-  height: 100%;
-  background-color: #ef4444; /* red-500 */
-  border-radius: 1px;
-}
-
-/* Line background colors for dark theme - subtle highlighting */
-.diff-line-added-dark {
-  background-color: rgba(16, 185, 129, 0.05); /* emerald-500 with 5% opacity - very subtle */
-}
-
-.diff-line-modified-dark {
-  background-color: rgba(59, 130, 246, 0.05); /* blue-500 with 5% opacity - very subtle */
-}
-
-.diff-line-deleted-dark {
-  background-color: rgba(239, 68, 68, 0.05); /* red-500 with 5% opacity - very subtle */
-}
-
-/* Line background colors for light theme - subtle highlighting */
-.diff-line-added-light {
-  background-color: rgba(16, 185, 129, 0.04); /* emerald-500 with 4% opacity - very subtle */
-}
-
-.diff-line-modified-light {
-  background-color: rgba(59, 130, 246, 0.04); /* blue-500 with 4% opacity - very subtle */
-}
-
-.diff-line-deleted-light {
-  background-color: rgba(239, 68, 68, 0.04); /* red-500 with 4% opacity - very subtle */
-}
-
-/* Override Monaco's default glyph margin styles for better visibility */
-.monaco-editor .margin-view-overlays .glyph-margin {
-  width: 20px !important;
-}
-
-/* Ensure glyph margin is visible */
-.monaco-editor .margin {
-  background-color: transparent !important;
-}
-
-/* Hover effect for diff markers */
-.diff-glyph-added:hover::before,
-.diff-glyph-modified:hover::before,
-.diff-glyph-deleted:hover::before {
-  width: 4px;
-  left: 2px;
-  transition:
-    width 0.1s ease-in-out,
-    left 0.1s ease-in-out;
-}
diff --git a/src/renderer/styles/global.css b/src/renderer/styles/global.css
deleted file mode 100644
index ed34c682dd..0000000000
--- a/src/renderer/styles/global.css
+++ /dev/null
@@ -1,197 +0,0 @@
-/* Global styles */
-* {
-  box-sizing: border-box;
-}
-
-body {
-  margin: 0;
-  padding: 0;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-  background-color: #1a1a1a;
-  color: #ffffff;
-  overflow: hidden;
-}
-
-/* Streamdown styles for rich markdown rendering */
-@source "../node_modules/streamdown/dist/index.js";
-
-#root {
-  height: 100vh;
-  width: 100vw;
-}
-
-/* Scrollbar styling */
-::-webkit-scrollbar {
-  width: 8px;
-  height: 8px;
-}
-
-::-webkit-scrollbar-track {
-  background: #2a2a2a;
-}
-
-::-webkit-scrollbar-thumb {
-  background: #555;
-  border-radius: 4px;
-}
-
-::-webkit-scrollbar-thumb:hover {
-  background: #777;
-}
-
-/* Visible scrollbar styling specifically for Select dropdown viewport */
-.emd-select-viewport {
-  position: relative;
-  scrollbar-gutter: stable; /* reserve space so layout doesn't jump */
-  scrollbar-width: thin; /* Firefox */
-  scrollbar-color: rgba(128, 128, 128, 0.5) transparent;
-}
-.emd-select-viewport::before {
-  content: '';
-  position: absolute;
-  top: 0;
-  right: 0;
-  width: 8px;
-  height: 100%;
-  background: rgba(128, 128, 128, 0.15);
-  border-radius: 6px;
-  pointer-events: none; /* hint only */
-}
-.emd-select-viewport::-webkit-scrollbar {
-  width: 8px;
-}
-.emd-select-viewport::-webkit-scrollbar-track {
-  background: rgba(128, 128, 128, 0.15);
-  border-radius: 6px;
-}
-.emd-select-viewport::-webkit-scrollbar-thumb {
-  background-color: rgba(128, 128, 128, 0.5);
-  border-radius: 6px;
-}
-
-/* Utility classes */
-.flex {
-  display: flex;
-}
-
-/* Shimmer text effect for thinking action lines */
-@keyframes shimmer-move {
-  0% {
-    background-position: 0% 50%;
-  }
-  100% {
-    background-position: 200% 50%;
-  }
-}
-.shimmer-text {
-  background: linear-gradient(
-    90deg,
-    currentColor 0%,
-    rgba(255, 255, 255, 0.85) 50%,
-    currentColor 100%
-  );
-  background-size: 200% 100%;
-  -webkit-background-clip: text;
-  background-clip: text;
-  -webkit-text-fill-color: transparent;
-  animation: shimmer-move 1.4s linear infinite;
-}
-
-.flex-col {
-  flex-direction: column;
-}
-
-.items-center {
-  align-items: center;
-}
-
-.justify-center {
-  justify-content: center;
-}
-
-.justify-between {
-  justify-content: space-between;
-}
-
-.gap-2 {
-  gap: 0.5rem;
-}
-
-.gap-4 {
-  gap: 1rem;
-}
-
-.p-4 {
-  padding: 1rem;
-}
-
-.p-6 {
-  padding: 1.5rem;
-}
-
-.text-sm {
-  font-size: 0.875rem;
-}
-
-.text-lg {
-  font-size: 1.125rem;
-}
-
-.text-xl {
-  font-size: 1.25rem;
-}
-
-.text-2xl {
-  font-size: 1.5rem;
-}
-
-.font-bold {
-  font-weight: bold;
-}
-
-.text-gray-400 {
-  color: #9ca3af;
-}
-
-.text-gray-500 {
-  color: #6b7280;
-}
-
-.bg-gray-800 {
-  background-color: #1f2937;
-}
-
-.bg-gray-900 {
-  background-color: #111827;
-}
-
-.border-gray-700 {
-  border-color: #374151;
-}
-
-.rounded {
-  border-radius: 0.25rem;
-}
-
-.rounded-lg {
-  border-radius: 0.5rem;
-}
-
-.border {
-  border-width: 1px;
-}
-
-.hover\:bg-gray-700:hover {
-  background-color: #374151;
-}
-
-.cursor-pointer {
-  cursor: pointer;
-}
-
-.transition-colors {
-  transition-property: color, background-color, border-color;
-  transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
-  transition-duration: 150ms;
-}
diff --git a/src/renderer/terminal/SessionRegistry.ts b/src/renderer/terminal/SessionRegistry.ts
deleted file mode 100644
index 0bb4dfe896..0000000000
--- a/src/renderer/terminal/SessionRegistry.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-import {
-  TerminalSessionManager,
-  type SessionTheme,
-  type TerminalSessionOptions,
-} from './TerminalSessionManager';
-
-const DEFAULT_SCROLLBACK_LINES = 100_000;
-
-interface AttachOptions {
-  taskId: string;
-  container: HTMLElement;
-  cwd?: string;
-  remote?: {
-    connectionId: string;
-  };
-  providerId?: string; // If set, uses direct CLI spawn
-  shell?: string; // Used for shell-based spawn when providerId not set
-  env?: Record<string, string>;
-  initialSize: { cols: number; rows: number };
-  theme: SessionTheme;
-  autoApprove?: boolean;
-  initialPrompt?: string;
-  mapShiftEnterToCtrlJ?: boolean;
-  disableSnapshots?: boolean;
-  onLinkClick?: (url: string) => void;
-  onFirstMessage?: (message: string) => void;
-}
-
-class SessionRegistry {
-  private readonly sessions = new Map<string, TerminalSessionManager>();
-
-  attach(options: AttachOptions): TerminalSessionManager {
-    const session = this.getOrCreate(options);
-    session.setTheme(options.theme);
-    session.attach(options.container);
-    return session;
-  }
-
-  detach(taskId: string) {
-    this.sessions.get(taskId)?.detach();
-  }
-
-  dispose(taskId: string) {
-    const session = this.sessions.get(taskId);
-    if (!session) return;
-    session.dispose();
-    this.sessions.delete(taskId);
-  }
-
-  getSession(taskId: string): TerminalSessionManager | undefined {
-    return this.sessions.get(taskId);
-  }
-
-  disposeAll() {
-    for (const id of Array.from(this.sessions.keys())) {
-      this.dispose(id);
-    }
-  }
-
-  private getOrCreate(options: AttachOptions): TerminalSessionManager {
-    const existing = this.sessions.get(options.taskId);
-    if (existing) return existing;
-
-    const sessionOptions: TerminalSessionOptions = {
-      taskId: options.taskId,
-      cwd: options.cwd,
-      remote: options.remote,
-      providerId: options.providerId,
-      shell: options.shell,
-      env: options.env,
-      initialSize: options.initialSize,
-      scrollbackLines: DEFAULT_SCROLLBACK_LINES,
-      theme: options.theme,
-      telemetry: null,
-      autoApprove: options.autoApprove,
-      initialPrompt: options.initialPrompt,
-      mapShiftEnterToCtrlJ: options.mapShiftEnterToCtrlJ,
-      disableSnapshots: options.disableSnapshots,
-      onLinkClick: options.onLinkClick,
-      onFirstMessage: options.onFirstMessage,
-    };
-
-    const session = new TerminalSessionManager(sessionOptions);
-    this.sessions.set(options.taskId, session);
-    return session;
-  }
-}
-
-export const terminalSessionRegistry = new SessionRegistry();
diff --git a/src/renderer/terminal/TerminalInputBuffer.ts b/src/renderer/terminal/TerminalInputBuffer.ts
deleted file mode 100644
index 6f1240b100..0000000000
--- a/src/renderer/terminal/TerminalInputBuffer.ts
+++ /dev/null
@@ -1,93 +0,0 @@
-/**
- * One-shot capture of the user's first "real" terminal message.
- *
- * Accumulates keystrokes, strips ANSI escapes, handles backspace,
- * and fires the `onCapture` callback once when a confirmed submit
- * passes validation. After firing, the buffer disables itself.
- */
-
-/** Strings that look like non-task-related input (confirmations, slash commands, etc.) */
-const SKIP_PATTERNS = [
-  /^\//, // slash commands
-  /^y(es)?$/i, // confirmations
-  /^n(o)?$/i,
-  /^ok$/i,
-  /^q(uit)?$/i,
-  /^exit$/i,
-  /^help$/i,
-  /^\d+$/, // bare numbers (menu selections)
-];
-
-const MIN_MESSAGE_LENGTH = 10;
-
-function stripAnsi(s: string): string {
-  return s.replace(/\x1b\[[0-9;]*[A-Za-z]/g, '').replace(/\x1b\][^\x07]*\x07/g, '');
-}
-
-/** Returns true if the message looks like a real task description. */
-function isRealTaskInput(message: string): boolean {
-  const trimmed = message.trim();
-  if (!trimmed || trimmed.length < MIN_MESSAGE_LENGTH) return false;
-  for (const pattern of SKIP_PATTERNS) {
-    if (pattern.test(trimmed)) return false;
-  }
-  return true;
-}
-
-export class TerminalInputBuffer {
-  private buffer = '';
-  private pendingMessage: string | null = null;
-  private captured = false;
-  private readonly onCapture: (message: string) => void;
-
-  constructor(onCapture: (message: string) => void) {
-    this.onCapture = onCapture;
-  }
-
-  /** Feed raw terminal input data (keystrokes). */
-  feed(data: string): void {
-    if (this.captured) return;
-
-    const clean = stripAnsi(data);
-    for (const ch of clean) {
-      if (ch === '\r' || ch === '\n') {
-        // Enter pressed — snapshot the buffer as a pending message
-        if (this.buffer.trim()) {
-          this.pendingMessage = this.buffer.trim();
-        }
-        this.buffer = '';
-      } else if (ch === '\x7f' || ch === '\b') {
-        // Backspace
-        this.buffer = this.buffer.slice(0, -1);
-      } else if (ch.charCodeAt(0) >= 32) {
-        // Printable character
-        this.buffer += ch;
-      }
-    }
-  }
-
-  /**
-   * Called when PTY output indicates the agent is "busy" (processing).
-   * If we have a pending message that passes validation, fire the callback.
-   */
-  confirmSubmit(): void {
-    if (this.captured) return;
-    if (!this.pendingMessage) return;
-
-    if (isRealTaskInput(this.pendingMessage)) {
-      this.captured = true;
-      const message = this.pendingMessage;
-      this.pendingMessage = null;
-      this.buffer = '';
-      this.onCapture(message);
-    } else {
-      // Not a real task input — discard and keep listening
-      this.pendingMessage = null;
-    }
-  }
-
-  /** Whether the buffer has already fired its callback. */
-  get isComplete(): boolean {
-    return this.captured;
-  }
-}
diff --git a/src/renderer/terminal/TerminalMetrics.ts b/src/renderer/terminal/TerminalMetrics.ts
deleted file mode 100644
index 0125902b7b..0000000000
--- a/src/renderer/terminal/TerminalMetrics.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-type MetricsSnapshot = {
-  totalBytes: number;
-  overflowEvents: number;
-  lastOverflowAt?: string;
-};
-
-interface TerminalMetricsOptions {
-  maxDataWindowBytes: number;
-  telemetry?: { track: (event: string, data?: Record<string, unknown>) => void } | null;
-}
-
-export class TerminalMetrics {
-  private readonly maxWindowBytes: number;
-  private readonly telemetry: TerminalMetricsOptions['telemetry'];
-  private windowBytes = 0;
-  private totalBytes = 0;
-  private overflowEvents = 0;
-  private lastOverflowAt: Date | null = null;
-
-  constructor(options: TerminalMetricsOptions) {
-    this.maxWindowBytes = options.maxDataWindowBytes;
-    this.telemetry = options.telemetry ?? null;
-  }
-
-  canAccept(chunk: string): boolean {
-    let bytes: number;
-    if (typeof Buffer !== 'undefined' && typeof Buffer.byteLength === 'function') {
-      bytes = Buffer.byteLength(chunk, 'utf8');
-    } else {
-      bytes = new TextEncoder().encode(chunk).length;
-    }
-    this.totalBytes += bytes;
-    this.windowBytes += bytes;
-    if (this.windowBytes <= this.maxWindowBytes) {
-      return true;
-    }
-
-    this.overflowEvents += 1;
-    this.lastOverflowAt = new Date();
-    this.telemetry?.track('terminal_overflow', {
-      bytes,
-      windowBytes: this.windowBytes,
-      maxWindowBytes: this.maxWindowBytes,
-    });
-    this.windowBytes = bytes; // reset window to current chunk
-    return false;
-  }
-
-  snapshot(): MetricsSnapshot {
-    return {
-      totalBytes: this.totalBytes,
-      overflowEvents: this.overflowEvents,
-      lastOverflowAt: this.lastOverflowAt?.toISOString(),
-    };
-  }
-
-  markSnapshot() {
-    this.windowBytes = 0;
-  }
-
-  recordExit(info: { exitCode: number | undefined; signal?: number }) {
-    this.telemetry?.track('terminal_exit', {
-      exitCode: info.exitCode ?? null,
-      signal: info.signal ?? null,
-      totalBytes: this.totalBytes,
-    });
-  }
-
-  dispose() {
-    this.windowBytes = 0;
-  }
-}
diff --git a/src/renderer/terminal/TerminalSessionManager.ts b/src/renderer/terminal/TerminalSessionManager.ts
deleted file mode 100644
index a9a2b03b32..0000000000
--- a/src/renderer/terminal/TerminalSessionManager.ts
+++ /dev/null
@@ -1,1209 +0,0 @@
-import { Terminal, type ITerminalOptions } from '@xterm/xterm';
-import { FitAddon } from '@xterm/addon-fit';
-import { WebglAddon } from '@xterm/addon-webgl';
-import { SerializeAddon } from '@xterm/addon-serialize';
-import { WebLinksAddon } from '@xterm/addon-web-links';
-import { ensureTerminalHost } from './terminalHost';
-import { TerminalInputBuffer } from './TerminalInputBuffer';
-import { classifyActivity } from '../lib/activityClassifier';
-import { TerminalMetrics } from './TerminalMetrics';
-import { log } from '../lib/logger';
-import { TERMINAL_SNAPSHOT_VERSION, type TerminalSnapshotPayload } from '#types/terminalSnapshot';
-import { pendingInjectionManager } from '../lib/PendingInjectionManager';
-import { getProvider, type ProviderId } from '@shared/providers/registry';
-import {
-  CTRL_J_ASCII,
-  CTRL_U_ASCII,
-  shouldCopySelectionFromTerminal,
-  shouldKillLineFromTerminal,
-  shouldMapShiftEnterToCtrlJ,
-  shouldPasteToTerminal,
-} from './terminalKeybindings';
-import { rpc } from '@/lib/rpc';
-
-const SNAPSHOT_INTERVAL_MS = 2 * 60 * 1000; // 2 minutes
-const MAX_DATA_WINDOW_BYTES = 128 * 1024 * 1024; // 128 MB soft guardrail
-const FALLBACK_FONTS = 'Menlo, Monaco, Courier New, monospace';
-const MIN_RENDERABLE_TERMINAL_WIDTH_PX = 24;
-const MIN_RENDERABLE_TERMINAL_HEIGHT_PX = 24;
-const PTY_RESIZE_DEBOUNCE_MS = 60;
-const MIN_TERMINAL_COLS = 2;
-const MIN_TERMINAL_ROWS = 1;
-const PANEL_RESIZE_DRAGGING_EVENT = 'emdash:panel-resize-dragging';
-const IS_MAC_PLATFORM =
-  typeof navigator !== 'undefined' && /Mac|iPod|iPhone|iPad/.test(navigator.platform);
-
-// Store viewport positions per terminal ID to preserve scroll position across detach/attach cycles
-const viewportPositions = new Map<string, number>();
-
-export interface SessionTheme {
-  base: 'dark' | 'light';
-  override?: ITerminalOptions['theme'];
-}
-
-export interface TerminalSessionOptions {
-  taskId: string;
-  cwd?: string;
-  remote?: {
-    connectionId: string;
-  };
-  providerId?: string; // If set, uses direct CLI spawn
-  shell?: string; // Used for shell-based spawn when providerId not set
-  env?: Record<string, string>;
-  initialSize: { cols: number; rows: number };
-  scrollbackLines: number;
-  theme: SessionTheme;
-  telemetry?: {
-    track: (event: string, payload?: Record<string, unknown>) => void;
-  } | null;
-  autoApprove?: boolean;
-  initialPrompt?: string;
-  mapShiftEnterToCtrlJ?: boolean;
-  disableSnapshots?: boolean;
-  onLinkClick?: (url: string) => void;
-  onFirstMessage?: (message: string) => void;
-}
-
-type CleanupFn = () => void;
-
-export class TerminalSessionManager {
-  readonly id: string;
-  private readonly terminal: Terminal;
-  private readonly fitAddon: FitAddon;
-  private readonly serializeAddon: SerializeAddon;
-  private readonly webLinksAddon: WebLinksAddon;
-  private webglAddon: WebglAddon | null = null;
-  private readonly metrics: TerminalMetrics;
-  private readonly container: HTMLDivElement;
-  private attachedContainer: HTMLElement | null = null;
-  private resizeObserver: ResizeObserver | null = null;
-  private disposables: CleanupFn[] = [];
-  private snapshotTimer: ReturnType<typeof setInterval> | null = null;
-  private pendingSnapshot: Promise<void> | null = null;
-  private disposed = false;
-  private opened = false;
-  private readonly activityListeners = new Set<() => void>();
-  private readonly readyListeners = new Set<() => void>();
-  private readonly errorListeners = new Set<(message: string) => void>();
-  private readonly exitListeners = new Set<
-    (info: { exitCode: number | undefined; signal?: number }) => void
-  >();
-  private firstFrameRendered = false;
-  private ptyStarted = false;
-  private lastSnapshotAt: number | null = null;
-  private lastSnapshotReason: 'interval' | 'detach' | 'dispose' | null = null;
-  private customFontFamily = '';
-  private themeFontFamily = '';
-  private pendingFitFrame: number | null = null;
-  private pendingResizeTimer: ReturnType<typeof setTimeout> | null = null;
-  private pendingResize: { cols: number; rows: number } | null = null;
-  private lastSentResize: { cols: number; rows: number } | null = null;
-  private isPanelResizeDragging = false;
-  private hadFocusBeforeDetach = false;
-  private inputBuffer: TerminalInputBuffer | null = null;
-  private autoCopyOnSelection = false;
-  private selectionChangeDebounceTimer: ReturnType<typeof setTimeout> | null = null;
-
-  // Timing for startup performance measurement
-  private initStartTime: number = 0;
-  private snapshotRestoreTime: number = 0;
-  private ptyConnectStartTime: number = 0;
-
-  constructor(private readonly options: TerminalSessionOptions) {
-    this.initStartTime = performance.now();
-    this.id = options.taskId;
-
-    this.container = document.createElement('div');
-    this.container.className = 'terminal-session-root';
-    Object.assign(this.container.style, {
-      width: '100%',
-      height: '100%',
-      display: 'block',
-    } as CSSStyleDeclaration);
-    ensureTerminalHost().appendChild(this.container);
-
-    const openLink = (uri: string) => {
-      if (options.onLinkClick) {
-        options.onLinkClick(uri);
-      } else {
-        window.electronAPI.openExternal(uri).catch((error) => {
-          log.warn('Failed to open external link', { uri, error });
-        });
-      }
-    };
-
-    this.terminal = new Terminal({
-      cols: options.initialSize.cols,
-      rows: options.initialSize.rows,
-      scrollback: options.scrollbackLines,
-      convertEol: true,
-      fontSize: 13,
-      lineHeight: 1.2,
-      letterSpacing: 0,
-      allowProposedApi: true,
-      scrollOnUserInput: false,
-      linkHandler: {
-        activate: (_event, text) => openLink(text),
-      },
-    });
-
-    const updateCustomFont = (customFont?: string) => {
-      this.customFontFamily = customFont?.trim() ?? '';
-      this.applyEffectiveFont();
-    };
-
-    rpc.appSettings.get().then((settings) => {
-      updateCustomFont(settings?.terminal?.fontFamily);
-      this.autoCopyOnSelection = settings?.terminal?.autoCopyOnSelection ?? false;
-    });
-
-    const handleFontChange = (e: Event) => {
-      const detail = (e as CustomEvent<{ fontFamily?: string }>).detail;
-      updateCustomFont(detail?.fontFamily);
-      this.fitPreservingViewport();
-    };
-    window.addEventListener('terminal-font-changed', handleFontChange);
-    this.disposables.push(() =>
-      window.removeEventListener('terminal-font-changed', handleFontChange)
-    );
-
-    const handleAutoCopyChange = (e: Event) => {
-      const detail = (e as CustomEvent<{ autoCopyOnSelection?: boolean }>).detail;
-      this.autoCopyOnSelection = detail?.autoCopyOnSelection ?? false;
-    };
-    window.addEventListener('terminal-auto-copy-changed', handleAutoCopyChange);
-    this.disposables.push(() =>
-      window.removeEventListener('terminal-auto-copy-changed', handleAutoCopyChange)
-    );
-
-    const handlePanelResizeDragging = (e: Event) => {
-      const detail = (e as CustomEvent<{ dragging?: boolean }>).detail;
-      const dragging = Boolean(detail?.dragging);
-      if (this.isPanelResizeDragging === dragging) return;
-      this.isPanelResizeDragging = dragging;
-      if (this.pendingResizeTimer) {
-        clearTimeout(this.pendingResizeTimer);
-        this.pendingResizeTimer = null;
-      }
-      if (dragging) return;
-      this.flushQueuedResize();
-    };
-    window.addEventListener(
-      PANEL_RESIZE_DRAGGING_EVENT,
-      handlePanelResizeDragging as EventListener
-    );
-    this.disposables.push(() =>
-      window.removeEventListener(
-        PANEL_RESIZE_DRAGGING_EVENT,
-        handlePanelResizeDragging as EventListener
-      )
-    );
-
-    this.fitAddon = new FitAddon();
-    this.serializeAddon = new SerializeAddon();
-
-    // Initialize WebLinks addon with custom handler
-    this.webLinksAddon = new WebLinksAddon((event, uri) => {
-      event.preventDefault();
-      openLink(uri);
-    });
-
-    this.terminal.loadAddon(this.fitAddon);
-    this.terminal.loadAddon(this.serializeAddon);
-    this.terminal.loadAddon(this.webLinksAddon);
-
-    // Work around xterm.js 6.0.0 bug: the built-in DECRQM (Request Mode)
-    // handler crashes with "r is not defined" when TUI apps (e.g. Amp) send
-    // mode-query escape sequences (CSI Ps $ p / CSI ? Ps $ p).
-    // Register custom handlers that intercept these sequences before the
-    // buggy built-in handler runs, and send back a proper DECRPM response
-    // reporting each queried mode as "not recognized" (Pm=0).
-    // Response format: CSI [?] Ps ; Pm $ y
-    try {
-      const parser = (this.terminal as any).parser;
-      if (parser?.registerCsiHandler) {
-        const ptyId = this.id;
-        // ANSI mode request: CSI Ps $ p  →  respond CSI Ps ; 0 $ y
-        const ansiDisp = parser.registerCsiHandler(
-          { intermediates: '$', final: 'p' },
-          (params: (number | number[])[]) => {
-            const mode = (params[0] as number) ?? 0;
-            window.electronAPI.ptyInput({ id: ptyId, data: `\x1b[${mode};0$y` });
-            return true;
-          }
-        );
-        // DEC private mode request: CSI ? Ps $ p  →  respond CSI ? Ps ; 0 $ y
-        const decDisp = parser.registerCsiHandler(
-          { prefix: '?', intermediates: '$', final: 'p' },
-          (params: (number | number[])[]) => {
-            const mode = (params[0] as number) ?? 0;
-            window.electronAPI.ptyInput({ id: ptyId, data: `\x1b[?${mode};0$y` });
-            return true;
-          }
-        );
-        this.disposables.push(
-          () => ansiDisp.dispose(),
-          () => decDisp.dispose()
-        );
-      }
-    } catch (err) {
-      log.warn('Failed to register DECRQM workaround handlers', { error: err });
-    }
-
-    try {
-      this.webglAddon = new WebglAddon();
-      this.webglAddon.onContextLoss?.(() => {
-        try {
-          this.webglAddon?.dispose();
-        } catch {}
-        this.webglAddon = null;
-      });
-      this.terminal.loadAddon(this.webglAddon);
-    } catch {
-      this.webglAddon = null;
-    }
-
-    this.applyTheme(options.theme);
-
-    // Custom key event handler: always attached so the dialog guard
-    // runs for every terminal, plus optional copy/Shift+Enter handling.
-    this.terminal.attachCustomKeyEventHandler((event: KeyboardEvent) => {
-      // Don't let the terminal consume keystrokes while a dialog/modal
-      // is open.  On Linux the terminal's hidden textarea can keep focus
-      // after a dialog appears, sending input to the PTY instead of
-      // dialog fields (see #940).
-      if (document.querySelector('[role="dialog"]')) {
-        return false;
-      }
-
-      if (shouldCopySelectionFromTerminal(event, IS_MAC_PLATFORM, this.terminal.hasSelection())) {
-        event.preventDefault();
-        event.stopImmediatePropagation();
-        event.stopPropagation();
-        this.copySelectionToClipboard();
-        return false; // Prevent xterm from processing the copy shortcut
-      }
-
-      // Handle Ctrl+Shift+V paste on Linux
-      if (shouldPasteToTerminal(event, IS_MAC_PLATFORM)) {
-        event.preventDefault();
-        event.stopImmediatePropagation();
-        event.stopPropagation();
-        this.pasteFromClipboard();
-        return false; // Prevent xterm from processing the paste shortcut
-      }
-
-      if (options.mapShiftEnterToCtrlJ && shouldMapShiftEnterToCtrlJ(event)) {
-        event.preventDefault();
-        event.stopImmediatePropagation();
-        event.stopPropagation();
-
-        // Send Ctrl+J (line feed) instead of Shift+Enter
-        // Pass true to skip injection handling - this is a newline insert, not a submit
-        this.handleTerminalInput(CTRL_J_ASCII, true);
-        return false; // Prevent xterm from processing the Shift+Enter
-      }
-
-      if (shouldKillLineFromTerminal(event, IS_MAC_PLATFORM)) {
-        event.preventDefault();
-        event.stopImmediatePropagation();
-        event.stopPropagation();
-        this.handleTerminalInput(CTRL_U_ASCII, true);
-        return false;
-      }
-
-      // Map Cmd+Left/Right to Ctrl+A/E on macOS (line navigation)
-      if (IS_MAC_PLATFORM && event.metaKey && !event.ctrlKey && !event.shiftKey && !event.altKey) {
-        if (event.key === 'ArrowLeft') {
-          event.preventDefault();
-          event.stopImmediatePropagation();
-          event.stopPropagation();
-          this.handleTerminalInput('\x01', true);
-          return false;
-        }
-        if (event.key === 'ArrowRight') {
-          event.preventDefault();
-          event.stopImmediatePropagation();
-          event.stopPropagation();
-          this.handleTerminalInput('\x05', true);
-          return false;
-        }
-      }
-
-      return true; // Let xterm handle all other keys normally
-    });
-
-    this.metrics = new TerminalMetrics({
-      maxDataWindowBytes: MAX_DATA_WINDOW_BYTES,
-      telemetry: options.telemetry ?? null,
-    });
-
-    // Set up one-shot capture of the user's first terminal message
-    if (options.onFirstMessage) {
-      const callback = options.onFirstMessage;
-      this.inputBuffer = new TerminalInputBuffer((message) => {
-        callback(message);
-      });
-    }
-
-    const inputDisposable = this.terminal.onData((data) => {
-      this.handleTerminalInput(data);
-    });
-    const resizeDisposable = this.terminal.onResize(({ cols, rows }) => {
-      if (this.disposed) return;
-      this.queuePtyResize(cols, rows);
-    });
-    this.disposables.push(
-      () => inputDisposable.dispose(),
-      () => resizeDisposable.dispose()
-    );
-
-    void this.initializeTerminal();
-  }
-
-  attach(container: HTMLElement) {
-    if (this.disposed) {
-      throw new Error(`Terminal session ${this.id} is already disposed`);
-    }
-    if (this.attachedContainer === container) return;
-
-    this.detach();
-
-    container.appendChild(this.container);
-    this.attachedContainer = container;
-    if (!this.opened) {
-      this.terminal.open(this.container);
-      this.opened = true;
-      const element = (this.terminal as any).element as HTMLElement | null;
-      if (element) {
-        element.style.width = '100%';
-        element.style.height = '100%';
-      }
-
-      const selectionDisposable = this.terminal.onSelectionChange(() => {
-        if (!this.autoCopyOnSelection || this.disposed) return;
-        if (!this.terminal.hasSelection()) return;
-        if (this.selectionChangeDebounceTimer) {
-          clearTimeout(this.selectionChangeDebounceTimer);
-        }
-        this.selectionChangeDebounceTimer = setTimeout(() => {
-          try {
-            if (!this.disposed && this.terminal.hasSelection()) {
-              this.copySelectionToClipboard();
-            }
-          } catch (error) {
-            log.warn('Auto-copy on selection failed', { id: this.id, error });
-          }
-        }, 150);
-      });
-      this.disposables.push(() => {
-        if (this.selectionChangeDebounceTimer) {
-          clearTimeout(this.selectionChangeDebounceTimer);
-          this.selectionChangeDebounceTimer = null;
-        }
-        selectionDisposable.dispose();
-      });
-    }
-
-    this.scheduleFit();
-
-    this.resizeObserver = new ResizeObserver(() => {
-      this.scheduleFit();
-    });
-    this.resizeObserver.observe(container);
-
-    const shouldRestoreFocus = this.hadFocusBeforeDetach;
-    this.hadFocusBeforeDetach = false;
-
-    requestAnimationFrame(() => {
-      if (this.disposed) return;
-      this.scheduleFit();
-      // Restore viewport position after fit completes and terminal is fully rendered
-      // Use a second requestAnimationFrame to ensure the terminal buffer is ready
-      requestAnimationFrame(() => {
-        if (!this.disposed) {
-          this.restoreViewportPosition();
-          if (shouldRestoreFocus) {
-            this.terminal.focus();
-          }
-        }
-      });
-    });
-
-    // Only start snapshot timer if snapshots are enabled (main chats only)
-    if (!this.options.disableSnapshots) {
-      this.startSnapshotTimer();
-    }
-  }
-
-  detach() {
-    if (this.attachedContainer) {
-      // Capture viewport position before detaching
-      const textarea = this.container.querySelector('.xterm-helper-textarea');
-      this.hadFocusBeforeDetach = textarea != null && textarea === document.activeElement;
-
-      this.captureViewportPosition();
-      this.cancelScheduledFit();
-      this.clearQueuedResize();
-      this.resizeObserver?.disconnect();
-      this.resizeObserver = null;
-      ensureTerminalHost().appendChild(this.container);
-      this.attachedContainer = null;
-      this.stopSnapshotTimer();
-      // Only capture snapshot on detach if snapshots are enabled
-      if (!this.options.disableSnapshots) {
-        void this.captureSnapshot('detach');
-      }
-    }
-  }
-
-  setTheme(theme: SessionTheme) {
-    this.applyTheme(theme);
-  }
-
-  dispose() {
-    if (this.disposed) return;
-    this.disposed = true;
-    this.detach();
-    this.stopSnapshotTimer();
-    this.cancelScheduledFit();
-    this.clearQueuedResize();
-    // Only capture final snapshot if snapshots are enabled
-    if (!this.options.disableSnapshots) {
-      void this.captureSnapshot('dispose');
-    }
-    // Clean up stored viewport position when session is disposed
-    viewportPositions.delete(this.id);
-    try {
-      window.electronAPI.ptyKill(this.id);
-    } catch (error) {
-      log.warn('Failed to kill PTY during dispose', { id: this.id, error });
-    }
-    for (const dispose of this.disposables.splice(0)) {
-      try {
-        dispose();
-      } catch (error) {
-        log.warn('Terminal session dispose callback failed', {
-          id: this.id,
-          error,
-        });
-      }
-    }
-    this.inputBuffer = null;
-    this.metrics.dispose();
-    this.activityListeners.clear();
-    this.readyListeners.clear();
-    this.errorListeners.clear();
-    this.exitListeners.clear();
-    this.terminal.dispose();
-    // Remove the container from the DOM to prevent orphaned nodes from accumulating
-    // in the terminal host, retaining xterm buffer memory across task switches.
-    try {
-      this.container.remove();
-    } catch {}
-  }
-
-  focus() {
-    // Don't steal focus from open dialogs (e.g. New Task modal).
-    // On Linux/Wayland the terminal's hidden textarea can retain focus
-    // after a dialog opens, causing keystrokes to go to the PTY instead
-    // of dialog inputs.
-    if (document.activeElement?.closest('[role="dialog"]')) return;
-
-    this.terminal.focus();
-  }
-
-  scrollToBottom() {
-    try {
-      this.terminal.scrollToBottom();
-    } catch (error) {
-      log.warn('Failed to scroll to bottom', { id: this.id, error });
-    }
-  }
-
-  registerActivityListener(listener: () => void): () => void {
-    this.activityListeners.add(listener);
-    return () => {
-      this.activityListeners.delete(listener);
-    };
-  }
-
-  registerReadyListener(listener: () => void): () => void {
-    this.readyListeners.add(listener);
-    return () => {
-      this.readyListeners.delete(listener);
-    };
-  }
-
-  registerErrorListener(listener: (message: string) => void): () => void {
-    this.errorListeners.add(listener);
-    return () => {
-      this.errorListeners.delete(listener);
-    };
-  }
-
-  registerExitListener(
-    listener: (info: { exitCode: number | undefined; signal?: number }) => void
-  ): () => void {
-    this.exitListeners.add(listener);
-    return () => {
-      this.exitListeners.delete(listener);
-    };
-  }
-
-  private handleTerminalInput(data: string, isNewlineInsert: boolean = false) {
-    this.emitActivity();
-    if (this.disposed) return;
-
-    // Filter out focus reporting sequences (CSI I = focus in, CSI O = focus out) only if PTY hasn't started yet.
-    // This prevents raw escape sequences from appearing in the terminal before the CLI is ready,
-    // while still allowing apps that request them (like vim) to receive them once running.
-    let filtered = data;
-    if (!this.ptyStarted) {
-      filtered = data.replace(/\x1b\[I|\x1b\[O/g, '');
-    }
-
-    if (!filtered) return;
-
-    // Feed input to the buffer for first-message capture
-    if (this.inputBuffer && !this.inputBuffer.isComplete) {
-      this.inputBuffer.feed(filtered);
-    }
-
-    // Track command execution when Enter is pressed (but not for newline inserts)
-    const isEnterPress = filtered.includes('\r') || filtered.includes('\n');
-    if (isEnterPress && !isNewlineInsert) {
-      void (async () => {
-        const { captureTelemetry } = await import('../lib/telemetryClient');
-        captureTelemetry('terminal_command_executed');
-      })();
-    }
-
-    // Check for pending injection text when Enter is pressed (but not for newline inserts)
-    const pendingText = pendingInjectionManager.getPending();
-    if (pendingText && isEnterPress && !isNewlineInsert) {
-      // Append pending text to the existing input and keep the prior working behavior.
-      const stripped = filtered.replace(/[\r\n]+$/g, '');
-      const enterSequence = filtered.includes('\r') ? '\r' : '\n';
-      const injectedData = stripped + pendingText + enterSequence + enterSequence;
-      window.electronAPI.ptyInput({ id: this.id, data: injectedData });
-      pendingInjectionManager.markUsed();
-      return;
-    }
-
-    window.electronAPI.ptyInput({ id: this.id, data: filtered });
-  }
-
-  private cleanTerminalText(text: string): string {
-    if (!text) return text;
-
-    let cleaned = text;
-
-    cleaned = cleaned.replace(/\x1b\[[0-9;]*[a-zA-Z]/g, '');
-    cleaned = cleaned.replace(/\x1b\][^\x07\x1b\\]*(\x07|\x1b\\)?/g, '');
-    cleaned = cleaned.replace(/\x1bP[^\x1b\\]*(\x1b\\)?/g, '');
-    cleaned = cleaned.replace(/\x1b[^\[P\]][\x20-\x7e]*/g, '');
-
-    cleaned = cleaned.replace(/[\x00-\x08\x0b-\x1f\x7f-\x9f]/g, '');
-
-    cleaned = cleaned.replace(/\r\n/g, '\n').replace(/\r/g, '\n');
-
-    cleaned = cleaned
-      .split('\n')
-      .map((line) => line.replace(/[ \t]+$/, ''))
-      .join('\n');
-
-    cleaned = cleaned.replace(/\n{3,}/g, '\n\n');
-
-    cleaned = cleaned.trim();
-
-    return cleaned;
-  }
-
-  private copySelectionToClipboard() {
-    try {
-      const selected = this.terminal.getSelection();
-      if (!selected) return;
-
-      const cleaned = this.cleanTerminalText(selected);
-
-      const writeWithElectronFallback = () => {
-        const fallbackWrite = (window as any)?.electronAPI?.clipboardWriteText;
-        if (typeof fallbackWrite !== 'function') {
-          log.warn('Terminal clipboard API unavailable', { id: this.id });
-          return;
-        }
-
-        void fallbackWrite(cleaned).catch((error: unknown) => {
-          log.warn('Failed to copy terminal selection via Electron fallback', {
-            id: this.id,
-            error,
-          });
-        });
-      };
-
-      if (
-        typeof navigator !== 'undefined' &&
-        navigator.clipboard &&
-        typeof navigator.clipboard.writeText === 'function'
-      ) {
-        void navigator.clipboard.writeText(cleaned).catch((error) => {
-          log.warn('Failed to copy terminal selection via navigator clipboard, falling back', {
-            id: this.id,
-            error,
-          });
-          writeWithElectronFallback();
-        });
-        return;
-      }
-
-      writeWithElectronFallback();
-    } catch (error) {
-      log.warn('Failed to copy terminal selection', { id: this.id, error });
-    }
-  }
-
-  /**
-   * Paste text from clipboard into the terminal using Electron's native paste.
-   * Used for Ctrl+Shift+V on Linux.
-   */
-  private pasteFromClipboard() {
-    const paste = window.electronAPI?.paste;
-    if (typeof paste !== 'function') {
-      log.warn('Terminal paste API unavailable', { id: this.id });
-      return;
-    }
-
-    void paste().catch((error: unknown) => {
-      log.warn('Failed to paste to terminal', {
-        id: this.id,
-        error,
-      });
-    });
-  }
-
-  private applyTheme(theme: SessionTheme) {
-    const selection =
-      theme.base === 'light'
-        ? {
-            selectionBackground: 'rgba(59, 130, 246, 0.35)',
-            selectionForeground: '#0f172a',
-          }
-        : {
-            selectionBackground: 'rgba(96, 165, 250, 0.35)',
-            selectionForeground: '#f9fafb',
-          };
-    const base =
-      theme.base === 'light'
-        ? {
-            background: '#ffffff',
-            foreground: '#1f2933',
-            cursor: '#1f2933',
-            ...selection,
-          }
-        : {
-            background: '#1f2937',
-            foreground: '#f9fafb',
-            cursor: '#f9fafb',
-            ...selection,
-          };
-
-    // Extract font settings before applying theme (they're not part of ITheme)
-    const fontFamily = (theme.override as any)?.fontFamily;
-    const fontSize = (theme.override as any)?.fontSize;
-
-    // Apply color theme (excluding font properties)
-    const colorTheme = { ...theme.override };
-    delete (colorTheme as any)?.fontFamily;
-    delete (colorTheme as any)?.fontSize;
-    this.terminal.options.theme = { ...base, ...colorTheme };
-
-    // Apply font settings separately
-    this.themeFontFamily = typeof fontFamily === 'string' ? fontFamily.trim() : '';
-    this.applyEffectiveFont();
-    if (fontSize) {
-      this.terminal.options.fontSize = fontSize;
-    }
-  }
-
-  private applyEffectiveFont() {
-    const selected = this.customFontFamily || this.themeFontFamily;
-    this.terminal.options.fontFamily = selected ? `${selected}, ${FALLBACK_FONTS}` : FALLBACK_FONTS;
-  }
-
-  private scheduleFit() {
-    if (this.pendingFitFrame !== null) return;
-    this.pendingFitFrame = requestAnimationFrame(() => {
-      this.pendingFitFrame = null;
-      if (this.disposed) return;
-      this.fitPreservingViewport();
-    });
-  }
-
-  private cancelScheduledFit() {
-    if (this.pendingFitFrame !== null) {
-      cancelAnimationFrame(this.pendingFitFrame);
-      this.pendingFitFrame = null;
-    }
-  }
-
-  private normalizeSize(cols: number, rows: number): { cols: number; rows: number } | null {
-    if (!Number.isFinite(cols) || !Number.isFinite(rows)) return null;
-    const normalizedCols = Math.max(MIN_TERMINAL_COLS, Math.floor(cols));
-    const normalizedRows = Math.max(MIN_TERMINAL_ROWS, Math.floor(rows));
-    return { cols: normalizedCols, rows: normalizedRows };
-  }
-
-  private queuePtyResize(cols: number, rows: number, immediate = false) {
-    const size = this.normalizeSize(cols, rows);
-    if (!size) return;
-    this.pendingResize = size;
-
-    if (immediate && !this.isPanelResizeDragging) {
-      this.flushQueuedResize();
-      return;
-    }
-
-    if (this.isPanelResizeDragging) {
-      return;
-    }
-
-    if (this.pendingResizeTimer) {
-      clearTimeout(this.pendingResizeTimer);
-    }
-    this.pendingResizeTimer = setTimeout(() => {
-      this.pendingResizeTimer = null;
-      this.flushQueuedResize();
-    }, PTY_RESIZE_DEBOUNCE_MS);
-  }
-
-  private clearQueuedResize() {
-    if (this.pendingResizeTimer) {
-      clearTimeout(this.pendingResizeTimer);
-      this.pendingResizeTimer = null;
-    }
-    this.pendingResize = null;
-  }
-
-  private flushQueuedResize() {
-    if (!this.ptyStarted || this.disposed || !this.pendingResize) return;
-    const { cols, rows } = this.pendingResize;
-    this.pendingResize = null;
-
-    if (this.lastSentResize?.cols === cols && this.lastSentResize?.rows === rows) return;
-
-    try {
-      window.electronAPI.ptyResize({ id: this.id, cols, rows });
-      this.lastSentResize = { cols, rows };
-    } catch (error) {
-      log.warn('Terminal resize sync failed', { id: this.id, error });
-    }
-  }
-
-  /**
-   * Fit the terminal to its container while preserving the user's viewport
-   * position (prevents jumps when sidebars resize and trigger fits).
-   */
-  private fitPreservingViewport() {
-    const width = this.container.clientWidth;
-    const height = this.container.clientHeight;
-    if (width < MIN_RENDERABLE_TERMINAL_WIDTH_PX || height < MIN_RENDERABLE_TERMINAL_HEIGHT_PX) {
-      return;
-    }
-
-    try {
-      const buffer = this.terminal.buffer?.active;
-      const offsetFromBottom =
-        buffer && typeof buffer.baseY === 'number' && typeof buffer.viewportY === 'number'
-          ? buffer.baseY - buffer.viewportY
-          : null;
-
-      this.fitAddon.fit();
-
-      // Use requestAnimationFrame to ensure terminal is fully rendered before restoring scroll position
-      // This prevents viewport jumps when sidebars resize
-      if (offsetFromBottom !== null) {
-        requestAnimationFrame(() => {
-          if (this.disposed) return;
-          try {
-            const newBuffer = this.terminal.buffer?.active;
-            const targetBase = newBuffer?.baseY ?? null;
-            if (typeof targetBase === 'number') {
-              const targetLine = Math.max(0, targetBase - offsetFromBottom);
-              this.terminal.scrollToLine(targetLine);
-            }
-          } catch (error) {
-            log.warn('Terminal scroll restore failed after fit', {
-              id: this.id,
-              error,
-            });
-          }
-        });
-      }
-    } catch (error) {
-      log.warn('Terminal fit failed', { id: this.id, error });
-    }
-  }
-
-  /**
-   * Capture the current viewport position (scroll offset from bottom)
-   * and store it for later restoration.
-   */
-  private captureViewportPosition() {
-    try {
-      const buffer = this.terminal.buffer?.active;
-      if (buffer && typeof buffer.baseY === 'number' && typeof buffer.viewportY === 'number') {
-        const offsetFromBottom = buffer.baseY - buffer.viewportY;
-        viewportPositions.set(this.id, offsetFromBottom);
-      }
-    } catch (error) {
-      log.warn('Failed to capture viewport position', { id: this.id, error });
-    }
-  }
-
-  /**
-   * Restore the previously captured viewport position.
-   * This ensures the terminal stays at the same scroll position when switching
-   * between tasks or when the terminal is reattached.
-   */
-  private restoreViewportPosition() {
-    try {
-      const storedOffset = viewportPositions.get(this.id);
-      if (typeof storedOffset === 'number') {
-        const buffer = this.terminal.buffer?.active;
-        if (buffer && typeof buffer.baseY === 'number') {
-          const targetLine = Math.max(0, buffer.baseY - storedOffset);
-          this.terminal.scrollToLine(targetLine);
-        }
-      }
-    } catch (error) {
-      log.warn('Failed to restore viewport position', { id: this.id, error });
-    }
-  }
-
-  private startSnapshotTimer() {
-    this.stopSnapshotTimer();
-    this.snapshotTimer = setInterval(() => {
-      void this.captureSnapshot('interval');
-    }, SNAPSHOT_INTERVAL_MS);
-  }
-
-  private stopSnapshotTimer() {
-    if (this.snapshotTimer) {
-      clearInterval(this.snapshotTimer);
-      this.snapshotTimer = null;
-    }
-  }
-
-  /**
-   * Initialize terminal: connect to PTY and conditionally restore snapshot.
-   *
-   * For CLIs with resume capability (claude, codex):
-   * - Hot reload (PTY reused): restore snapshot for visual continuity
-   * - Full restart: skip snapshot, let CLI show history via resume flag
-   *
-   * For CLIs without resume:
-   * - Always restore snapshot for visual context
-   */
-  private async initializeTerminal(): Promise<void> {
-    // Check if snapshot exists (indicates previous session)
-    const snapshot = await this.fetchSnapshot();
-    const hasSnapshot = !!snapshot;
-
-    // Connect to PTY - pass resume flag if we have a previous session
-    const result = await this.connectPty(hasSnapshot);
-
-    // When tmux is active, disable snapshots — tmux preserves terminal state natively.
-    if (result?.tmux) {
-      this.options.disableSnapshots = true;
-      this.stopSnapshotTimer();
-    }
-
-    // Decide whether to restore snapshot based on PTY result
-    try {
-      if (result?.tmux) {
-        // Tmux session: skip snapshot — tmux restores its own scrollback on reattach
-      } else if (result?.reused) {
-        // Hot reload - PTY still running, restore snapshot for visual continuity
-        if (snapshot) {
-          this.applySnapshot(snapshot);
-        }
-      } else if (!this.providerHasResume()) {
-        // Full restart with non-resume CLI - show snapshot for context
-        if (snapshot) {
-          this.applySnapshot(snapshot);
-        }
-      }
-      // For full restart with resume CLI - skip snapshot, CLI handles history
-    } catch (err) {
-      log.warn('terminalSession:applySnapshotError', { id: this.id, error: err });
-    }
-  }
-
-  private providerHasResume(): boolean {
-    const { providerId } = this.options;
-    if (!providerId) return false;
-    const provider = getProvider(providerId as ProviderId);
-    return !!provider?.resumeFlag;
-  }
-
-  private async fetchSnapshot(): Promise<any | null> {
-    if (this.options.disableSnapshots) return null;
-    if (!window.electronAPI.ptyGetSnapshot) return null;
-
-    try {
-      const response = await window.electronAPI.ptyGetSnapshot({ id: this.id });
-      if (!response?.ok || !response.snapshot?.data) return null;
-      if (response.snapshot.version && response.snapshot.version !== TERMINAL_SNAPSHOT_VERSION) {
-        return null;
-      }
-      return response.snapshot;
-    } catch {
-      return null;
-    }
-  }
-
-  private applySnapshot(snapshot: any): void {
-    if (typeof snapshot.data === 'string' && snapshot.data.length > 0) {
-      this.terminal.reset();
-      this.terminal.write(snapshot.data);
-    }
-    if (snapshot.cols && snapshot.rows) {
-      this.terminal.resize(snapshot.cols, snapshot.rows);
-    }
-  }
-
-  private async connectPty(
-    hasExistingSession: boolean = false
-  ): Promise<{ ok: boolean; reused?: boolean; tmux?: boolean; error?: string }> {
-    this.ptyConnectStartTime = performance.now();
-    const { taskId, cwd, providerId, shell, env, initialSize, autoApprove, initialPrompt } =
-      this.options;
-    const id = taskId;
-
-    // Provider CLIs use direct spawn (bypasses shell config loading)
-    // Regular shell terminals use shell-based spawn
-    const ptyPromise =
-      providerId && cwd
-        ? window.electronAPI.ptyStartDirect({
-            id,
-            providerId,
-            cwd,
-            remote: this.options.remote,
-            cols: initialSize.cols,
-            rows: initialSize.rows,
-            autoApprove,
-            initialPrompt,
-            env,
-            resume: hasExistingSession,
-          })
-        : window.electronAPI.ptyStart({
-            id,
-            cwd,
-            remote: this.options.remote,
-            shell,
-            env,
-            cols: initialSize.cols,
-            rows: initialSize.rows,
-            autoApprove,
-            initialPrompt,
-          });
-
-    const result = await ptyPromise.catch((error: any) => {
-      const message = error?.message || String(error);
-      log.error('terminalSession:ptyStartError', { id, error });
-      this.emitError(message);
-      return { ok: false, error: message };
-    });
-
-    if (result?.ok) {
-      this.ptyStarted = true;
-      this.lastSentResize = null;
-      this.sendSizeIfStarted();
-      this.emitReady();
-      try {
-        let offStarted: (() => void) | undefined;
-        const removeOffStartedFromDisposables = () => {
-          if (!offStarted) return;
-          const idx = this.disposables.indexOf(offStarted);
-          if (idx >= 0) this.disposables.splice(idx, 1);
-        };
-        offStarted = window.electronAPI.onPtyStarted?.((payload: { id: string }) => {
-          if (payload?.id === id) {
-            this.ptyStarted = true;
-            this.lastSentResize = null;
-            this.sendSizeIfStarted();
-            try {
-              offStarted?.();
-            } catch {}
-            removeOffStartedFromDisposables();
-            offStarted = undefined;
-          }
-        });
-        if (offStarted) this.disposables.push(offStarted);
-      } catch {}
-    } else {
-      const message = result?.error || 'Failed to start PTY';
-      log.warn('terminalSession:ptyStartFailed', { id, error: message });
-      this.emitError(message);
-    }
-
-    // Set up data listener (runs regardless of success for potential reuse)
-    this.setupPtyDataListener(id);
-
-    return result || { ok: false, error: 'Unknown error' };
-  }
-
-  private setupPtyDataListener(id: string): void {
-    const offData = window.electronAPI.onPtyData(id, (chunk) => {
-      if (!this.metrics.canAccept(chunk)) {
-        log.warn('Terminal scrollback truncated to protect memory', { id });
-        this.terminal.clear();
-        this.terminal.writeln('[scrollback truncated to protect memory]');
-      }
-      const buffer = this.terminal.buffer?.active;
-      const isAtBottom = buffer ? buffer.baseY - buffer.viewportY <= 2 : true;
-
-      // Check if agent started processing — confirms the user's input was accepted
-      if (this.inputBuffer && !this.inputBuffer.isComplete) {
-        const signal = classifyActivity(this.options.providerId ?? null, chunk);
-        if (signal === 'busy') {
-          this.inputBuffer.confirmSubmit();
-        }
-      }
-
-      try {
-        this.terminal.write(chunk);
-      } catch (err) {
-        // Guard against xterm.js parser errors (e.g. DECRQM "r is not defined"
-        // in 6.0.0). Log once and continue — the terminal session stays usable.
-        log.warn('terminalSession:writeError', { id: this.id, error: (err as Error)?.message });
-      }
-      if (!this.firstFrameRendered) {
-        this.firstFrameRendered = true;
-        const firstFrameTime = performance.now() - this.initStartTime;
-        log.info('terminalSession:firstFrame timing', {
-          id: this.id,
-          firstFrameMs: Math.round(firstFrameTime),
-        });
-        try {
-          this.terminal.refresh(0, this.terminal.rows - 1);
-        } catch {}
-      }
-
-      if (isAtBottom) {
-        this.terminal.scrollToBottom();
-      }
-    });
-
-    const offExit = window.electronAPI.onPtyExit(id, (info) => {
-      this.metrics.recordExit(info);
-      this.ptyStarted = false;
-      this.clearQueuedResize();
-      this.emitExit(info);
-    });
-
-    this.disposables.push(offData, offExit);
-  }
-
-  private captureSnapshot(reason: 'interval' | 'detach' | 'dispose'): Promise<void> {
-    if (!window.electronAPI.ptySaveSnapshot) return Promise.resolve();
-    if (this.disposed) return Promise.resolve();
-    // Skip snapshots for non-main chats
-    if (this.options.disableSnapshots) return Promise.resolve();
-    if (reason === 'detach' && this.lastSnapshotReason === 'detach' && this.lastSnapshotAt) {
-      const elapsed = Date.now() - this.lastSnapshotAt;
-      if (elapsed < 1500) return Promise.resolve();
-    }
-
-    const now = new Date().toISOString();
-    const task = (async () => {
-      try {
-        const data = this.serializeAddon.serialize();
-        if (!data && reason === 'detach') return;
-
-        const payload: TerminalSnapshotPayload = {
-          version: TERMINAL_SNAPSHOT_VERSION,
-          createdAt: now,
-          cols: this.terminal.cols,
-          rows: this.terminal.rows,
-          data,
-          stats: { ...this.metrics.snapshot(), reason },
-        };
-
-        const result = await window.electronAPI.ptySaveSnapshot({
-          id: this.id,
-          payload,
-        });
-        if (!result?.ok) {
-          log.warn('Terminal snapshot save failed', {
-            id: this.id,
-            error: result?.error,
-          });
-        } else {
-          this.metrics.markSnapshot();
-        }
-      } catch (error) {
-        log.warn('terminalSession:snapshotCaptureFailed', {
-          id: this.id,
-          error: (error as Error)?.message ?? String(error),
-          reason,
-        });
-      }
-    })();
-
-    this.pendingSnapshot = task;
-    return task.finally(() => {
-      if (this.pendingSnapshot === task) {
-        this.pendingSnapshot = null;
-      }
-      this.lastSnapshotAt = Date.now();
-      this.lastSnapshotReason = reason;
-    });
-  }
-
-  private emitActivity() {
-    for (const listener of this.activityListeners) {
-      try {
-        listener();
-      } catch (error) {
-        log.warn('Terminal activity listener failed', { id: this.id, error });
-      }
-    }
-  }
-
-  private emitReady() {
-    for (const listener of this.readyListeners) {
-      try {
-        listener();
-      } catch (error) {
-        log.warn('Terminal ready listener failed', { id: this.id, error });
-      }
-    }
-  }
-
-  private emitError(message: string) {
-    for (const listener of this.errorListeners) {
-      try {
-        listener(message);
-      } catch (error) {
-        log.warn('Terminal error listener failed', { id: this.id, error });
-      }
-    }
-  }
-
-  private emitExit(info: { exitCode: number | undefined; signal?: number }) {
-    for (const listener of this.exitListeners) {
-      try {
-        listener(info);
-      } catch (error) {
-        log.warn('Terminal exit listener failed', { id: this.id, error });
-      }
-    }
-  }
-
-  private sendSizeIfStarted() {
-    if (!this.ptyStarted || this.disposed) return;
-    this.queuePtyResize(this.terminal.cols, this.terminal.rows, true);
-  }
-}
diff --git a/src/renderer/terminal/terminalHost.ts b/src/renderer/terminal/terminalHost.ts
deleted file mode 100644
index 808eb6ae1c..0000000000
--- a/src/renderer/terminal/terminalHost.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-let hostElement: HTMLDivElement | null = null;
-
-export function ensureTerminalHost(): HTMLDivElement {
-  if (hostElement) return hostElement;
-  const el = document.createElement('div');
-  el.setAttribute('data-terminal-host', 'true');
-  Object.assign(el.style, {
-    position: 'fixed',
-    left: '-10000px',
-    top: '0px',
-    width: '1px',
-    height: '1px',
-    overflow: 'hidden',
-    pointerEvents: 'none',
-    zIndex: '-1',
-  } as CSSStyleDeclaration);
-  document.body.appendChild(el);
-  hostElement = el;
-  return el;
-}
diff --git a/src/renderer/terminal/terminalKeybindings.ts b/src/renderer/terminal/terminalKeybindings.ts
deleted file mode 100644
index f24de697a2..0000000000
--- a/src/renderer/terminal/terminalKeybindings.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-export type KeyEventLike = {
-  type: string;
-  key: string;
-  shiftKey?: boolean;
-  ctrlKey?: boolean;
-  metaKey?: boolean;
-  altKey?: boolean;
-};
-
-// Ctrl+J sends line feed (LF) to the PTY, which CLI agents interpret as a newline
-export const CTRL_J_ASCII = '\x0A';
-
-// Ctrl+U (unix-line-discard) kills from cursor to beginning of line
-export const CTRL_U_ASCII = '\x15';
-
-export function shouldMapShiftEnterToCtrlJ(event: KeyEventLike): boolean {
-  return (
-    event.type === 'keydown' &&
-    event.key === 'Enter' &&
-    event.shiftKey === true &&
-    !event.ctrlKey &&
-    !event.metaKey &&
-    !event.altKey
-  );
-}
-
-export function shouldCopySelectionFromTerminal(
-  event: KeyEventLike,
-  isMacPlatform: boolean,
-  hasSelection: boolean
-): boolean {
-  if (!hasSelection) return false;
-  if (event.type !== 'keydown') return false;
-  if (event.key.toLowerCase() !== 'c') return false;
-
-  const ctrl = event.ctrlKey === true;
-  const meta = event.metaKey === true;
-  const alt = event.altKey === true;
-  const shift = event.shiftKey === true;
-
-  // Ctrl+Shift+C should copy on all platforms
-  if (ctrl && shift && !meta && !alt) return true;
-
-  // Platform-specific default copy shortcuts
-  if (isMacPlatform) {
-    return meta && !ctrl && !shift && !alt;
-  }
-
-  return ctrl && !meta && !shift && !alt;
-}
-
-/**
- * Detect Cmd+Backspace on macOS for "kill to beginning of line".
- * We send Ctrl+U (\x15) to the PTY, which readline-compatible shells
- * and most CLI agents interpret as unix-line-discard.
- *
- * Only intercepted on macOS — on Linux/Windows, Ctrl+U already reaches
- * the PTY natively for the same effect.
- */
-export function shouldKillLineFromTerminal(event: KeyEventLike, isMacPlatform: boolean): boolean {
-  if (!isMacPlatform) return false;
-  if (event.type !== 'keydown') return false;
-  if (event.key !== 'Backspace') return false;
-
-  return event.metaKey === true && !event.ctrlKey && !event.shiftKey && !event.altKey;
-}
-
-/**
- * Detect Ctrl+Shift+V paste shortcut on Linux.
- * Linux terminals use Ctrl+Shift+V as the standard paste shortcut,
- * unlike Windows/macOS which use Ctrl+V/Cmd+V.
- */
-export function shouldPasteToTerminal(event: KeyEventLike, isMacPlatform: boolean): boolean {
-  if (event.type !== 'keydown') return false;
-  if (event.key.toLowerCase() !== 'v') return false;
-
-  const ctrl = event.ctrlKey === true;
-  const meta = event.metaKey === true;
-  const alt = event.altKey === true;
-  const shift = event.shiftKey === true;
-
-  // Ctrl+Shift+V is the standard paste shortcut in Linux terminals
-  // Only apply on non-Mac platforms (Linux/Windows with Linux-style terminals)
-  if (!isMacPlatform && ctrl && shift && !meta && !alt) {
-    return true;
-  }
-
-  return false;
-}
diff --git a/src/renderer/tests/browser/terminal-dimensions.test.ts b/src/renderer/tests/browser/terminal-dimensions.test.ts
new file mode 100644
index 0000000000..e360d45808
--- /dev/null
+++ b/src/renderer/tests/browser/terminal-dimensions.test.ts
@@ -0,0 +1,180 @@
+/**
+ * Browser-mode tests for measureDimensions().
+ *
+ * These run in a real Chromium process via Playwright so getComputedStyle
+ * reflects genuine CSS layout — no stubs required for the DOM or CSSOM.
+ */
+import { afterEach, describe, expect, it } from 'vitest';
+import { measureDimensions } from '@renderer/lib/pty/pty-dimensions';
+
+// ── Helpers ───────────────────────────────────────────────────────────────────
+
+function makeContainer(width: string, height: string): HTMLDivElement {
+  const el = document.createElement('div');
+  el.style.position = 'absolute';
+  el.style.width = width;
+  el.style.height = height;
+  document.body.appendChild(el);
+  return el;
+}
+
+// Cell sizes used throughout the suite.  Chosen to give clean integer results.
+const CW = 8; // cell width  (px)
+const CH = 16; // cell height (px)
+
+// ── Suite ─────────────────────────────────────────────────────────────────────
+
+describe('measureDimensions', () => {
+  let container: HTMLDivElement;
+
+  afterEach(() => {
+    container?.remove();
+  });
+
+  // ── Null / guard conditions ────────────────────────────────────────────────
+
+  it('returns null when cellWidth is 0', () => {
+    container = makeContainer('800px', '400px');
+    expect(measureDimensions(container, 0, CH)).toBeNull();
+  });
+
+  it('returns null when cellHeight is 0', () => {
+    container = makeContainer('800px', '400px');
+    expect(measureDimensions(container, CW, 0)).toBeNull();
+  });
+
+  it('returns null when computed height is 0', () => {
+    // height: 0 is the height-chain failure mode (collapsed flex child).
+    container = makeContainer('800px', '0px');
+    expect(measureDimensions(container, CW, CH)).toBeNull();
+  });
+
+  it('returns null when container has no explicit size (auto / 0)', () => {
+    container = document.createElement('div');
+    document.body.appendChild(container);
+    // No width/height set — auto resolves to 0px for an absolutely-positioned div.
+    container.style.position = 'absolute';
+    expect(measureDimensions(container, CW, CH)).toBeNull();
+  });
+
+  // ── Normal calculation ─────────────────────────────────────────────────────
+
+  it('computes cols and rows from a plain sized container', () => {
+    container = makeContainer('800px', '400px');
+    const dims = measureDimensions(container, CW, CH);
+    expect(dims).toEqual({
+      cols: Math.floor(800 / CW), // 100
+      rows: Math.floor(400 / CH), // 25
+    });
+  });
+
+  it('subtracts scrollbarWidth from available width', () => {
+    container = makeContainer('800px', '400px');
+    const SCROLLBAR = 15;
+    const dims = measureDimensions(container, CW, CH, SCROLLBAR);
+    expect(dims).toEqual({
+      cols: Math.floor((800 - SCROLLBAR) / CW), // 98
+      rows: Math.floor(400 / CH), // 25
+    });
+  });
+
+  it('clamps cols to MINIMUM_COLS (2) when container is very narrow', () => {
+    container = makeContainer('3px', '400px'); // 3 / 8 = 0 → clamp to 2
+    const dims = measureDimensions(container, CW, CH);
+    expect(dims).not.toBeNull();
+    expect(dims!.cols).toBe(2);
+  });
+
+  it('clamps rows to MINIMUM_ROWS (1) when container is shorter than one cell', () => {
+    container = makeContainer('800px', '10px'); // 10 / 16 = 0 → clamp to 1
+    const dims = measureDimensions(container, CW, CH);
+    expect(dims).not.toBeNull();
+    expect(dims!.rows).toBe(1);
+  });
+
+  it('floors fractional cell width correctly', () => {
+    // 800 / 8.4 = 95.23... → floor → 95
+    container = makeContainer('800px', '400px');
+    const dims = measureDimensions(container, 8.4, CH);
+    expect(dims).not.toBeNull();
+    expect(dims!.cols).toBe(Math.floor(800 / 8.4));
+  });
+
+  it('floors fractional cell height correctly', () => {
+    // 400 / 16.5 = 24.24... → floor → 24
+    container = makeContainer('800px', '400px');
+    const dims = measureDimensions(container, CW, 16.5);
+    expect(dims).not.toBeNull();
+    expect(dims!.rows).toBe(Math.floor(400 / 16.5));
+  });
+
+  // ── Height-chain integration ───────────────────────────────────────────────
+  // Validates the CSS fix in panel.tsx + pane-sizing-context.tsx:
+  //   flex parent → flex child (flex:1) → PaneSizingProvider wrapper (flex:1 1 0%) → container
+  // The container must receive real pixel height via CSS flex distribution.
+
+  it('resolves height correctly inside a flex column chain', () => {
+    const PARENT_H = 600;
+    const TABS_H = 40;
+    const TERMINAL_H = PARENT_H - TABS_H; // 560
+
+    // Outer panel: flex column, fixed height
+    const panel = document.createElement('div');
+    panel.style.position = 'absolute';
+    panel.style.width = '1200px';
+    panel.style.height = `${PARENT_H}px`;
+    panel.style.display = 'flex';
+    panel.style.flexDirection = 'column';
+    document.body.appendChild(panel);
+
+    // Tabs row: shrink-0
+    const tabs = document.createElement('div');
+    tabs.style.flex = 'none';
+    tabs.style.height = `${TABS_H}px`;
+    panel.appendChild(tabs);
+
+    // Terminal area: flex:1, flex container (the panel.tsx fix)
+    const terminalArea = document.createElement('div');
+    terminalArea.style.flex = '1 1 0%';
+    terminalArea.style.minHeight = '0';
+    terminalArea.style.display = 'flex';
+    terminalArea.style.flexDirection = 'column';
+    panel.appendChild(terminalArea);
+
+    // PaneSizingProvider wrapper: flex:1 1 0% (the pane-sizing-context.tsx fix)
+    container = document.createElement('div');
+    container.style.flex = '1 1 0%';
+    container.style.height = '100%';
+    container.style.minHeight = '0';
+    container.style.minWidth = '0';
+    terminalArea.appendChild(container);
+
+    const dims = measureDimensions(container, CW, CH);
+    expect(dims).not.toBeNull();
+    expect(dims!.rows).toBe(Math.floor(TERMINAL_H / CH)); // 35
+    expect(dims!.cols).toBe(Math.floor(1200 / CW)); // 150
+
+    panel.remove();
+  });
+
+  it('returns null when the flex chain is broken (non-flex parent)', () => {
+    // Simulates the OLD bug: terminal-area div is not a flex container so
+    // the wrapper's flex:1 has no effect and it collapses to auto height (0).
+    const panel = document.createElement('div');
+    panel.style.position = 'absolute';
+    panel.style.width = '1200px';
+    panel.style.height = '600px';
+    // NOT a flex container ← this is the pre-fix state
+    document.body.appendChild(panel);
+
+    container = document.createElement('div');
+    container.style.flex = '1 1 0%';
+    container.style.minHeight = '0';
+    panel.appendChild(container);
+
+    // Without a flex parent, flex:1 is ignored and height resolves to 0.
+    expect(measureDimensions(container, CW, CH)).toBeNull();
+
+    panel.remove();
+  });
+});
diff --git a/src/renderer/tests/context-actions.test.ts b/src/renderer/tests/context-actions.test.ts
new file mode 100644
index 0000000000..d28314f969
--- /dev/null
+++ b/src/renderer/tests/context-actions.test.ts
@@ -0,0 +1,129 @@
+import { describe, expect, it } from 'vitest';
+import type { Issue } from '@shared/tasks';
+import {
+  buildDraftCommentsContextAction,
+  buildLinkedIssueContextAction,
+  buildReviewPromptContextAction,
+  buildTaskContextActions,
+} from '@renderer/features/tasks/conversations/context-actions';
+
+function makeIssue(overrides: Partial<Issue> = {}): Issue {
+  return {
+    provider: 'github',
+    identifier: 'EMD-123',
+    title: 'Fix task context injection behavior',
+    url: 'https://example.com/issues/EMD-123',
+    description: 'Ensure issue context can be injected from the context bar.',
+    status: 'In Progress',
+    assignees: ['alice', 'bob'],
+    project: 'Infra',
+    updatedAt: '2026-04-15T11:27:38.662Z',
+    fetchedAt: '2026-04-15T15:49:46.788Z',
+    ...overrides,
+  };
+}
+
+describe('buildLinkedIssueContextAction', () => {
+  it('returns null when no issue is linked', () => {
+    expect(buildLinkedIssueContextAction(undefined)).toBeNull();
+  });
+
+  it('builds an inject action with provider metadata and compact label', () => {
+    const action = buildLinkedIssueContextAction(makeIssue());
+
+    expect(action).not.toBeNull();
+    expect(action?.id).toBe('linked-issue:github:EMD-123');
+    expect(action?.provider).toBe('github');
+    expect(action?.label).toContain('EMD-123');
+    expect(action?.label).toContain('Fix task context');
+  });
+
+  it('formats injected text as one line so it does not auto-submit', () => {
+    const action = buildLinkedIssueContextAction(
+      makeIssue({ description: 'Line one.\nLine two.\n\nLine three.' })
+    );
+
+    expect(action).not.toBeNull();
+    expect(action?.text).toContain('Provider: GitHub');
+    expect(action?.text).toContain('Identifier: EMD-123');
+    expect(action?.text).toContain('Title: Fix task context injection behavior');
+    expect(action?.text).toContain('URL: https://example.com/issues/EMD-123');
+    expect(action?.text).toContain('Description: Line one. Line two. Line three.');
+    expect(action?.text).toContain('Status: In Progress');
+    expect(action?.text).toContain('Assignees: alice, bob');
+    expect(action?.text).toContain('Project: Infra');
+    expect(action?.text).not.toMatch(/\r|\n/);
+  });
+
+  it('does not truncate long descriptions when building injected text', () => {
+    const longDescription = 'A'.repeat(500);
+    const action = buildLinkedIssueContextAction(makeIssue({ description: longDescription }));
+
+    expect(action).not.toBeNull();
+    expect(action?.text).toContain(`Description: ${longDescription}`);
+  });
+});
+
+describe('buildReviewPromptContextAction', () => {
+  it('returns null for empty review prompt', () => {
+    expect(buildReviewPromptContextAction('   ')).toBeNull();
+  });
+
+  it('builds review prompt action', () => {
+    const action = buildReviewPromptContextAction('Review this worktree for issues.');
+    expect(action).not.toBeNull();
+    expect(action).toMatchObject({
+      id: 'review-prompt',
+      kind: 'review-prompt',
+      label: 'Review prompt',
+      text: 'Review this worktree for issues.',
+    });
+  });
+});
+
+describe('buildDraftCommentsContextAction', () => {
+  it('returns null when there are no comments', () => {
+    expect(
+      buildDraftCommentsContextAction({
+        count: 0,
+        formattedComments: '<user_comments>...</user_comments>',
+      })
+    ).toBeNull();
+  });
+
+  it('returns null when formatted comments are empty', () => {
+    expect(
+      buildDraftCommentsContextAction({
+        count: 2,
+        formattedComments: '   ',
+      })
+    ).toBeNull();
+  });
+
+  it('builds an action with count label', () => {
+    const action = buildDraftCommentsContextAction({
+      count: 2,
+      formattedComments: '<user_comments>test</user_comments>',
+    });
+
+    expect(action).toEqual({
+      id: 'draft-comments',
+      kind: 'draft-comments',
+      label: 'Comments (2)',
+      text: '<user_comments>test</user_comments>',
+    });
+  });
+});
+
+describe('buildTaskContextActions', () => {
+  it('includes linked issue context, then draft comments, then review prompt', () => {
+    const actions = buildTaskContextActions(makeIssue(), 'Review this worktree for issues.', {
+      count: 1,
+      formattedComments: '<user_comments>test</user_comments>',
+    });
+    expect(actions).toHaveLength(3);
+    expect(actions[0]?.id).toBe('linked-issue:github:EMD-123');
+    expect(actions[1]?.id).toBe('draft-comments');
+    expect(actions[2]?.id).toBe('review-prompt');
+  });
+});
diff --git a/src/renderer/tests/conversation-provider-selection.test.ts b/src/renderer/tests/conversation-provider-selection.test.ts
new file mode 100644
index 0000000000..e1793b07e7
--- /dev/null
+++ b/src/renderer/tests/conversation-provider-selection.test.ts
@@ -0,0 +1,52 @@
+import { describe, expect, it } from 'vitest';
+import { resolveConversationProviderSelection } from '@renderer/features/tasks/conversations/provider-selection';
+
+describe('resolveConversationProviderSelection', () => {
+  it('keeps default provider while availability is unknown', () => {
+    const selection = resolveConversationProviderSelection({
+      defaultProviderId: 'claude',
+      providerOverride: null,
+      installedProviderIds: [],
+      availabilityKnown: false,
+    });
+
+    expect(selection.providerId).toBe('claude');
+    expect(selection.createDisabled).toBe(false);
+  });
+
+  it('falls back to the first installed provider when default is unavailable', () => {
+    const selection = resolveConversationProviderSelection({
+      defaultProviderId: 'claude',
+      providerOverride: null,
+      installedProviderIds: ['codex', 'qwen'],
+      availabilityKnown: true,
+    });
+
+    expect(selection.providerId).toBe('codex');
+    expect(selection.createDisabled).toBe(false);
+  });
+
+  it('disables creation when no agents are installed', () => {
+    const selection = resolveConversationProviderSelection({
+      defaultProviderId: 'claude',
+      providerOverride: null,
+      installedProviderIds: [],
+      availabilityKnown: true,
+    });
+
+    expect(selection.providerId).toBeNull();
+    expect(selection.createDisabled).toBe(true);
+  });
+
+  it('honors an explicit provider override', () => {
+    const selection = resolveConversationProviderSelection({
+      defaultProviderId: 'claude',
+      providerOverride: 'codex',
+      installedProviderIds: ['codex'],
+      availabilityKnown: true,
+    });
+
+    expect(selection.providerId).toBe('codex');
+    expect(selection.createDisabled).toBe(false);
+  });
+});
diff --git a/src/renderer/tests/conversation-title-utils.test.ts b/src/renderer/tests/conversation-title-utils.test.ts
new file mode 100644
index 0000000000..b0ac8d1e61
--- /dev/null
+++ b/src/renderer/tests/conversation-title-utils.test.ts
@@ -0,0 +1,45 @@
+import { describe, expect, it } from 'vitest';
+import {
+  formatConversationTitleForDisplay,
+  nextDefaultConversationTitle,
+} from '@renderer/features/tasks/conversations/conversation-title-utils';
+
+describe('nextDefaultConversationTitle', () => {
+  it('fills the smallest missing index for a provider', () => {
+    const title = nextDefaultConversationTitle('codex', [
+      { providerId: 'codex', title: 'codex (1)' },
+      { providerId: 'codex', title: 'codex (3)' },
+    ]);
+
+    expect(title).toBe('Codex (2)');
+  });
+
+  it('appends when there are no gaps', () => {
+    const title = nextDefaultConversationTitle('codex', [
+      { providerId: 'codex', title: 'codex (1)' },
+      { providerId: 'codex', title: 'codex (2)' },
+      { providerId: 'codex', title: 'codex (3)' },
+    ]);
+
+    expect(title).toBe('Codex (4)');
+  });
+
+  it('ignores other providers and non-default titles', () => {
+    const title = nextDefaultConversationTitle('codex', [
+      { providerId: 'claude', title: 'claude (1)' },
+      { providerId: 'codex', title: 'release-triage' },
+      { providerId: 'codex', title: 'codex (2)' },
+    ]);
+
+    expect(title).toBe('Codex (1)');
+  });
+
+  it('formats existing lowercase default titles for display', () => {
+    expect(formatConversationTitleForDisplay('codex', 'codex (2)')).toBe('Codex (2)');
+    expect(formatConversationTitleForDisplay('gemini', 'gemini (1)')).toBe('Gemini (1)');
+  });
+
+  it('leaves custom conversation titles unchanged', () => {
+    expect(formatConversationTitleForDisplay('codex', 'release-triage')).toBe('release-triage');
+  });
+});
diff --git a/src/renderer/tests/create-task-strategy.test.ts b/src/renderer/tests/create-task-strategy.test.ts
new file mode 100644
index 0000000000..f3d0511e42
--- /dev/null
+++ b/src/renderer/tests/create-task-strategy.test.ts
@@ -0,0 +1,88 @@
+import { describe, expect, it } from 'vitest';
+import {
+  resolveBranchLikeTaskStrategy,
+  resolvePullRequestTaskStrategy,
+} from '@renderer/features/tasks/create-task-modal/create-task-strategy';
+
+describe('resolveBranchLikeTaskStrategy', () => {
+  it('returns new-branch with pushBranch when branch/worktree creation is enabled', () => {
+    expect(
+      resolveBranchLikeTaskStrategy({
+        isUnborn: false,
+        createBranchAndWorktree: true,
+        taskBranch: 'issue-task',
+        pushBranch: false,
+      })
+    ).toEqual({
+      kind: 'new-branch',
+      taskBranch: 'issue-task',
+      pushBranch: false,
+    });
+  });
+
+  it('returns no-worktree when branch/worktree creation is disabled', () => {
+    expect(
+      resolveBranchLikeTaskStrategy({
+        isUnborn: false,
+        createBranchAndWorktree: false,
+        taskBranch: 'issue-task',
+        pushBranch: true,
+      })
+    ).toEqual({ kind: 'no-worktree' });
+  });
+
+  it('returns no-worktree for unborn repositories', () => {
+    expect(
+      resolveBranchLikeTaskStrategy({
+        isUnborn: true,
+        createBranchAndWorktree: true,
+        taskBranch: 'issue-task',
+        pushBranch: true,
+      })
+    ).toEqual({ kind: 'no-worktree' });
+  });
+});
+
+describe('resolvePullRequestTaskStrategy', () => {
+  it('includes taskBranch and pushBranch in new-branch mode', () => {
+    expect(
+      resolvePullRequestTaskStrategy({
+        checkoutMode: 'new-branch',
+        prNumber: 42,
+        headBranch: 'feature/pr-head',
+        headRepositoryUrl: 'https://github.com/contributor/repo',
+        isFork: false,
+        taskBranch: 'pr-task',
+        pushBranch: false,
+      })
+    ).toEqual({
+      kind: 'from-pull-request',
+      prNumber: 42,
+      headBranch: 'feature/pr-head',
+      headRepositoryUrl: 'https://github.com/contributor/repo',
+      isFork: false,
+      taskBranch: 'pr-task',
+      pushBranch: false,
+    });
+  });
+
+  it('omits taskBranch and pushBranch in checkout mode', () => {
+    expect(
+      resolvePullRequestTaskStrategy({
+        checkoutMode: 'checkout',
+        prNumber: 42,
+        headBranch: 'feature/pr-head',
+        headRepositoryUrl: 'https://github.com/contributor/repo',
+        isFork: false,
+        taskBranch: 'pr-task',
+        pushBranch: false,
+      })
+    ).toEqual({
+      kind: 'from-pull-request',
+      prNumber: 42,
+      headBranch: 'feature/pr-head',
+      headRepositoryUrl: 'https://github.com/contributor/repo',
+      isFork: false,
+    });
+  });
+});
diff --git a/src/renderer/tests/draft-comments-reactivity.test.ts b/src/renderer/tests/draft-comments-reactivity.test.ts
new file mode 100644
index 0000000000..4af9609694
--- /dev/null
+++ b/src/renderer/tests/draft-comments-reactivity.test.ts
@@ -0,0 +1,33 @@
+import { autorun, isObservableMap } from 'mobx';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { DraftCommentsStore } from '@renderer/features/tasks/diff-view/stores/draft-comments-store';
+
+describe('DraftCommentsStore reactivity', () => {
+  beforeEach(() => {
+    vi.restoreAllMocks();
+    vi.spyOn(globalThis.crypto, 'randomUUID').mockReturnValue(
+      '11111111-1111-1111-1111-111111111111'
+    );
+  });
+
+  it('exposes observable map state', () => {
+    const store = new DraftCommentsStore('task-1');
+    expect(isObservableMap((store as unknown as { commentsById: unknown }).commentsById)).toBe(
+      true
+    );
+  });
+
+  it('reacts to add/delete from autorun consumers', () => {
+    const store = new DraftCommentsStore('task-1');
+    const seen: number[] = [];
+    const dispose = autorun(() => {
+      seen.push(store.count);
+    });
+
+    store.addComment({ filePath: 'a.ts', lineNumber: 1, content: 'note' });
+    store.deleteComment('11111111-1111-1111-1111-111111111111');
+    dispose();
+
+    expect(seen).toEqual([0, 1, 0]);
+  });
+});
diff --git a/src/renderer/tests/draft-comments-store.test.ts b/src/renderer/tests/draft-comments-store.test.ts
new file mode 100644
index 0000000000..ee242310c7
--- /dev/null
+++ b/src/renderer/tests/draft-comments-store.test.ts
@@ -0,0 +1,32 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { DraftCommentsStore } from '@renderer/features/tasks/diff-view/stores/draft-comments-store';
+
+describe('DraftCommentsStore', () => {
+  beforeEach(() => {
+    vi.restoreAllMocks();
+    vi.spyOn(globalThis.crypto, 'randomUUID').mockReturnValue(
+      '11111111-1111-1111-1111-111111111111'
+    );
+  });
+
+  it('consumes the current formatted comments and clears the store', () => {
+    const store = new DraftCommentsStore('task-1');
+
+    store.addComment({
+      filePath: 'src/example.ts',
+      lineNumber: 12,
+      lineContent: 'const value = 1;',
+      content: 'Rename this to be clearer.',
+    });
+
+    const formatted = store.consumeAll();
+
+    expect(formatted).toContain('<user_comments>');
+    expect(formatted).toContain('src/example.ts');
+    expect(formatted).toContain('line="12"');
+    expect(formatted).toContain('Rename this to be clearer.');
+    expect(store.count).toBe(0);
+    expect(store.comments).toEqual([]);
+    expect(store.formattedForAgent).toBe('');
+  });
+});
diff --git a/src/renderer/tests/focus-tracker.test.ts b/src/renderer/tests/focus-tracker.test.ts
new file mode 100644
index 0000000000..aa986b6bd0
--- /dev/null
+++ b/src/renderer/tests/focus-tracker.test.ts
@@ -0,0 +1,31 @@
+import { describe, expect, it, vi } from 'vitest';
+import { FocusTracker } from '@renderer/utils/focus-tracker';
+
+describe('FocusTracker', () => {
+  it('emits exited focus state on transition', () => {
+    const tracker = new FocusTracker();
+    const emit = vi.fn();
+    tracker.setTransitionEmitter(emit);
+
+    tracker.initialize({ view: 'home', mainPanel: null, rightPanel: null, focusedRegion: null });
+    tracker.transition({ view: 'task', mainPanel: 'agents' }, 'navigation');
+
+    expect(emit).toHaveBeenCalledTimes(1);
+    const payload = emit.mock.calls[0][0] as Record<string, unknown>;
+    expect(payload.view).toBe('home');
+    expect(payload.trigger).toBe('navigation');
+    expect(payload).not.toHaveProperty('duration_ms');
+  });
+
+  it('does not emit when no tracked focus state changed', () => {
+    const tracker = new FocusTracker();
+    const emit = vi.fn();
+    tracker.setTransitionEmitter(emit);
+
+    tracker.initialize({ view: 'home', mainPanel: null, rightPanel: null, focusedRegion: null });
+    const result = tracker.transition({}, 'navigation');
+
+    expect(result).toBeNull();
+    expect(emit).not.toHaveBeenCalled();
+  });
+});
diff --git a/src/renderer/tests/terminal-search.test.ts b/src/renderer/tests/terminal-search.test.ts
new file mode 100644
index 0000000000..aa3c5d6976
--- /dev/null
+++ b/src/renderer/tests/terminal-search.test.ts
@@ -0,0 +1,64 @@
+import { describe, expect, it } from 'vitest';
+import {
+  collectTerminalSearchMatches,
+  getNextTerminalSearchIndex,
+  type TerminalSearchBufferLike,
+  type TerminalSearchBufferLineLike,
+  type TerminalSearchMatch,
+} from '@renderer/lib/pty/terminal-search';
+
+class MockBufferLine implements TerminalSearchBufferLineLike {
+  constructor(
+    private readonly text: string,
+    readonly isWrapped: boolean = false
+  ) {}
+
+  translateToString(): string {
+    return this.text;
+  }
+}
+
+function makeBuffer(lines: Array<{ text: string; isWrapped?: boolean }>): TerminalSearchBufferLike {
+  const bufferLines = lines.map((line) => new MockBufferLine(line.text, line.isWrapped ?? false));
+  return {
+    length: bufferLines.length,
+    getLine: (index: number) => bufferLines[index],
+  };
+}
+
+describe('terminal-search', () => {
+  it('finds case-insensitive matches on buffer rows', () => {
+    const buffer = makeBuffer([{ text: 'Alpha beta' }, { text: 'beta gamma' }]);
+
+    expect(collectTerminalSearchMatches(buffer, 'BETA')).toEqual<TerminalSearchMatch[]>([
+      { row: 0, col: 6, length: 4 },
+      { row: 1, col: 0, length: 4 },
+    ]);
+  });
+
+  it('maps wrapped-line matches back to the physical row and column', () => {
+    const buffer = makeBuffer([
+      { text: 'Hello ', isWrapped: false },
+      { text: 'world', isWrapped: true },
+      { text: 'separate line', isWrapped: false },
+    ]);
+
+    expect(collectTerminalSearchMatches(buffer, 'world')).toEqual<TerminalSearchMatch[]>([
+      { row: 1, col: 0, length: 5 },
+    ]);
+  });
+
+  it('cycles forward and backward through matches', () => {
+    const matches: TerminalSearchMatch[] = [
+      { row: 0, col: 1, length: 3 },
+      { row: 3, col: 2, length: 3 },
+      { row: 7, col: 0, length: 3 },
+    ];
+
+    expect(getNextTerminalSearchIndex(matches, null, 'next')).toBe(0);
+    expect(getNextTerminalSearchIndex(matches, null, 'prev')).toBe(2);
+    expect(getNextTerminalSearchIndex(matches, matches[0], 'next')).toBe(1);
+    expect(getNextTerminalSearchIndex(matches, matches[0], 'prev')).toBe(2);
+    expect(getNextTerminalSearchIndex(matches, matches[2], 'next')).toBe(0);
+  });
+});
diff --git a/src/renderer/tests/terminalInputBuffer.test.ts b/src/renderer/tests/terminalInputBuffer.test.ts
new file mode 100644
index 0000000000..ec523ae451
--- /dev/null
+++ b/src/renderer/tests/terminalInputBuffer.test.ts
@@ -0,0 +1,235 @@
+import { describe, expect, it, vi } from 'vitest';
+import {
+  isRealTaskInput,
+  SubmittedInputBuffer,
+  TerminalInputBuffer,
+} from '@renderer/lib/pty/pty-input-buffer';
+
+describe('TerminalInputBuffer', () => {
+  it('captures a message after Enter + confirmSubmit', () => {
+    const onCapture = vi.fn();
+    const buffer = new TerminalInputBuffer(onCapture);
+
+    buffer.feed('Fix the login page');
+    buffer.feed('\r');
+    buffer.confirmSubmit();
+
+    expect(onCapture).toHaveBeenCalledWith('Fix the login page');
+    expect(buffer.isComplete).toBe(true);
+  });
+
+  it('fires callback only once', () => {
+    const onCapture = vi.fn();
+    const buffer = new TerminalInputBuffer(onCapture);
+
+    buffer.feed('First message here\r');
+    buffer.confirmSubmit();
+
+    buffer.feed('Second message here\r');
+    buffer.confirmSubmit();
+
+    expect(onCapture).toHaveBeenCalledTimes(1);
+    expect(onCapture).toHaveBeenCalledWith('First message here');
+  });
+
+  it('handles backspace correctly', () => {
+    const onCapture = vi.fn();
+    const buffer = new TerminalInputBuffer(onCapture);
+
+    buffer.feed('Hell');
+    buffer.feed('\x7f');
+    buffer.feed('lo world');
+    buffer.feed('\r');
+    buffer.confirmSubmit();
+
+    expect(onCapture).toHaveBeenCalledWith('Hello world');
+  });
+
+  it('strips ANSI escape codes', () => {
+    const onCapture = vi.fn();
+    const buffer = new TerminalInputBuffer(onCapture);
+
+    buffer.feed('\x1b[32mFix the broken auth\x1b[0m');
+    buffer.feed('\r');
+    buffer.confirmSubmit();
+
+    expect(onCapture).toHaveBeenCalledWith('Fix the broken auth');
+  });
+
+  it('strips split OSC/CSI control sequences before classifying input', () => {
+    const onCapture = vi.fn();
+    const buffer = new TerminalInputBuffer(onCapture);
+
+    buffer.feed('\x1b]10;rgb:1f1f/2929/3737');
+    buffer.feed('\x1b\\\x1b]11;rgb:fcfc/fcfc/fcfc\x1b\\');
+    buffer.feed('\x1b[1;1Hhello world');
+    buffer.feed('\r');
+    buffer.confirmSubmit();
+
+    expect(onCapture).toHaveBeenCalledWith('hello world');
+  });
+
+  it('strips repeated focus/noise escapes before classifying input', () => {
+    const onCapture = vi.fn();
+    const buffer = new TerminalInputBuffer(onCapture);
+
+    buffer.feed('\x1b[O\x1b[I\x1b[O\x1b[Ifix auth flow');
+    buffer.feed('\r');
+    buffer.confirmSubmit();
+
+    expect(onCapture).toHaveBeenCalledWith('fix auth flow');
+  });
+
+  it('applies kitty CSI-u backspace keys to the buffered line', () => {
+    const onCapture = vi.fn();
+    const buffer = new TerminalInputBuffer(onCapture);
+
+    buffer.feed('/model');
+    for (let i = 0; i < 6; i++) {
+      buffer.feed('\x1b[127;1u');
+    }
+    buffer.feed('hello\r');
+    buffer.confirmSubmit();
+
+    expect(onCapture).toHaveBeenCalledWith('hello');
+  });
+
+  it('skips slash commands', () => {
+    const onCapture = vi.fn();
+    const buffer = new TerminalInputBuffer(onCapture);
+
+    buffer.feed('/help\r');
+    buffer.confirmSubmit();
+
+    expect(onCapture).not.toHaveBeenCalled();
+    expect(buffer.isComplete).toBe(false);
+  });
+
+  it('skips single-character confirmations', () => {
+    const onCapture = vi.fn();
+    const buffer = new TerminalInputBuffer(onCapture);
+
+    buffer.feed('y\r');
+    buffer.confirmSubmit();
+    expect(onCapture).not.toHaveBeenCalled();
+
+    buffer.feed('ok\r');
+    buffer.confirmSubmit();
+    expect(onCapture).not.toHaveBeenCalled();
+  });
+
+  it('skips very short messages', () => {
+    const onCapture = vi.fn();
+    const buffer = new TerminalInputBuffer(onCapture);
+
+    buffer.feed('x\r');
+    buffer.confirmSubmit();
+
+    expect(onCapture).not.toHaveBeenCalled();
+    expect(buffer.isComplete).toBe(false);
+  });
+
+  it('accepts concise natural-language prompts', () => {
+    const onCapture = vi.fn();
+    const buffer = new TerminalInputBuffer(onCapture);
+
+    buffer.feed('fix bug\r');
+    buffer.confirmSubmit();
+
+    expect(onCapture).toHaveBeenCalledWith('fix bug');
+    expect(buffer.isComplete).toBe(true);
+  });
+
+  it('captures after skipping invalid input', () => {
+    const onCapture = vi.fn();
+    const buffer = new TerminalInputBuffer(onCapture);
+
+    buffer.feed('y\r');
+    buffer.confirmSubmit();
+    expect(onCapture).not.toHaveBeenCalled();
+
+    buffer.feed('Implement the authentication flow for OAuth\r');
+    buffer.confirmSubmit();
+    expect(onCapture).toHaveBeenCalledWith('Implement the authentication flow for OAuth');
+  });
+
+  it('does not fire without confirmSubmit', () => {
+    const onCapture = vi.fn();
+    const buffer = new TerminalInputBuffer(onCapture);
+
+    buffer.feed('Fix the login page\r');
+    expect(onCapture).not.toHaveBeenCalled();
+  });
+
+  it('ignores feed after completion', () => {
+    const onCapture = vi.fn();
+    const buffer = new TerminalInputBuffer(onCapture);
+
+    buffer.feed('First message here\r');
+    buffer.confirmSubmit();
+    expect(buffer.isComplete).toBe(true);
+
+    buffer.feed('Another message\r');
+    expect(onCapture).toHaveBeenCalledTimes(1);
+  });
+
+  it('requires at least one alphabetic character', () => {
+    expect(isRealTaskInput('1234')).toBe(false);
+    expect(isRealTaskInput('---')).toBe(false);
+    expect(isRealTaskInput('fix')).toBe(true);
+  });
+
+  it('clearLine removes prefilled slash command before subsequent submit', () => {
+    const buffer = new SubmittedInputBuffer();
+
+    buffer.feed('/model');
+    buffer.clearLine();
+    const submitted = buffer.feed('hello\r');
+
+    expect(submitted).toEqual(['hello']);
+  });
+
+  it('tracks left-arrow insertion at cursor position', () => {
+    const buffer = new SubmittedInputBuffer();
+
+    const submitted = buffer.feed('hello\x1b[DX\r');
+
+    expect(submitted).toEqual(['hellXo']);
+  });
+
+  it('tracks Ctrl+U line clear before new text', () => {
+    const buffer = new SubmittedInputBuffer();
+
+    const submitted = buffer.feed('hello\x15world\r');
+
+    expect(submitted).toEqual(['world']);
+  });
+
+  it('tracks CSI-u encoded Ctrl+U line clear before new text', () => {
+    const buffer = new SubmittedInputBuffer();
+
+    const submitted = buffer.feed('hello\x1b[21;1uworld\r');
+
+    expect(submitted).toEqual(['world']);
+  });
+
+  it('bounds very long CSI payloads and continues parsing input', () => {
+    const buffer = new SubmittedInputBuffer();
+
+    buffer.feed('hello');
+    buffer.feed(`\x1b[${'9'.repeat(1024)}D`);
+    const submitted = buffer.feed('X\r');
+
+    expect(submitted).toEqual(['Xhello']);
+  });
+
+  it('does not discard a typed line when Escape is pressed before Enter', () => {
+    const buffer = new SubmittedInputBuffer();
+
+    buffer.feed('hello');
+    buffer.feed('\x1b');
+    const submitted = buffer.feed('\r');
+
+    expect(submitted).toEqual(['hello']);
+  });
+});
diff --git a/src/test/renderer/terminalKeybindings.test.ts b/src/renderer/tests/terminalKeybindings.test.ts
similarity index 89%
rename from src/test/renderer/terminalKeybindings.test.ts
rename to src/renderer/tests/terminalKeybindings.test.ts
index f76deea6c8..47ac61dd05 100644
--- a/src/test/renderer/terminalKeybindings.test.ts
+++ b/src/renderer/tests/terminalKeybindings.test.ts
@@ -3,11 +3,12 @@ import {
   CTRL_J_ASCII,
   CTRL_U_ASCII,
   shouldCopySelectionFromTerminal,
+  shouldHandleInterruptFromTerminal,
   shouldKillLineFromTerminal,
   shouldMapShiftEnterToCtrlJ,
   shouldPasteToTerminal,
   type KeyEventLike,
-} from '../../renderer/terminal/terminalKeybindings';
+} from '@renderer/lib/pty/pty-keybindings';
 
 describe('TerminalSessionManager - Shift+Enter to Ctrl+J mapping', () => {
   const makeEvent = (overrides: Partial<KeyEventLike> = {}): KeyEventLike => ({
@@ -195,4 +196,20 @@ describe('TerminalSessionManager - Shift+Enter to Ctrl+J mapping', () => {
       )
     ).toBe(false);
   });
+
+  it('detects plain Escape as interrupt intent', () => {
+    expect(shouldHandleInterruptFromTerminal(makeEvent({ key: 'Escape' }))).toBe(true);
+    expect(shouldHandleInterruptFromTerminal(makeEvent({ key: 'Escape', ctrlKey: true }))).toBe(
+      false
+    );
+    expect(shouldHandleInterruptFromTerminal(makeEvent({ key: 'Escape', metaKey: true }))).toBe(
+      false
+    );
+    expect(shouldHandleInterruptFromTerminal(makeEvent({ key: 'Escape', altKey: true }))).toBe(
+      false
+    );
+    expect(shouldHandleInterruptFromTerminal(makeEvent({ type: 'keyup', key: 'Escape' }))).toBe(
+      false
+    );
+  });
 });
diff --git a/src/renderer/tests/use-branch-selection.test.ts b/src/renderer/tests/use-branch-selection.test.ts
new file mode 100644
index 0000000000..51793fed64
--- /dev/null
+++ b/src/renderer/tests/use-branch-selection.test.ts
@@ -0,0 +1,33 @@
+import { describe, expect, it, vi } from 'vitest';
+import type { Branch } from '@shared/git';
+
+vi.mock('@renderer/features/settings/use-app-settings-key', () => ({
+  useAppSettingsKey: () => ({ value: { pushOnCreate: true } }),
+}));
+
+/**
+ * The old resolveDefaultSelectedBranch helper has been removed.
+ * Its logic — preferring a local branch over a remote branch when resolving
+ * the default — now lives in RepositoryStore.defaultBranch (a computed getter)
+ * and is exercised through integration.
+ *
+ * useBranchSelection now accepts a pre-resolved Branch | undefined directly,
+ * so no additional unit tests for string-to-Branch resolution are needed here.
+ */
+describe('useBranchSelection contract', () => {
+  it('accepts a local Branch as defaultBranch', () => {
+    const branch: Branch = { type: 'local', branch: 'main' };
+    expect(branch.type).toBe('local');
+    expect(branch.branch).toBe('main');
+  });
+
+  it('accepts a remote Branch as defaultBranch', () => {
+    const branch: Branch = {
+      type: 'remote',
+      branch: 'main',
+      remote: { name: 'origin', url: 'git@github.com:owner/repo.git' },
+    };
+    expect(branch.type).toBe('remote');
+    expect(branch.remote.name).toBe('origin');
+  });
+});
diff --git a/src/renderer/types/app.ts b/src/renderer/types/app.ts
deleted file mode 100644
index 89380dbba6..0000000000
--- a/src/renderer/types/app.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import type { Task as ChatTask } from './chat';
-export type Task = ChatTask & { agentId?: string };
-
-export interface Project {
-  id: string;
-  name: string;
-  path: string;
-  isRemote?: boolean;
-  sshConnectionId?: string | null;
-  remotePath?: string | null;
-  repoKey?: string;
-  gitInfo: {
-    isGitRepo: boolean;
-    remote?: string;
-    branch?: string;
-    baseRef?: string;
-  };
-  githubInfo?: {
-    repository: string;
-    connected: boolean;
-  };
-  tasks?: Task[];
-}
-
-// Lightweight shapes for palette/list UIs, if needed later
-export type ProjectSummary = Pick<Project, 'id' | 'name'> & {
-  tasks?: Pick<Task, 'id' | 'name'>[];
-};
-export type TaskSummary = Pick<Task, 'id' | 'name'>;
diff --git a/src/renderer/types/chat.ts b/src/renderer/types/chat.ts
deleted file mode 100644
index 6e52fa8776..0000000000
--- a/src/renderer/types/chat.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-import type { ProviderId } from '@shared/providers/registry';
-import { type LinearIssueSummary } from './linear';
-import { type GitHubIssueSummary } from './github';
-import { type JiraIssueSummary } from './jira';
-
-/** Per-agent run configuration for task creation */
-export interface AgentRun {
-  agent: ProviderId;
-  runs: number;
-}
-
-export interface GitHubIssueLink {
-  number: number;
-  taskId: string;
-  taskName: string;
-}
-
-export interface TaskMetadata {
-  linearIssue?: LinearIssueSummary | null;
-  githubIssue?: GitHubIssueSummary | null;
-  jiraIssue?: JiraIssueSummary | null;
-  initialPrompt?: string | null;
-  autoApprove?: boolean | null;
-  /** True when the task name was auto-generated (not manually typed by the user) */
-  nameGenerated?: boolean | null;
-  /** Set to true after the initial injection (prompt/issue) has been sent to the agent */
-  initialInjectionSent?: boolean | null;
-  // When present, this task is a multi-agent task orchestrating multiple worktrees
-  multiAgent?: {
-    enabled: boolean;
-    // Max panes allowed when the task was created (UI hint)
-    maxAgents?: number;
-    // Per-agent run configuration
-    agentRuns?: AgentRun[];
-    // Legacy list of agent ids before agentRuns existed (for backward compatibility)
-    agents?: ProviderId[];
-    variants: Array<{
-      id: string;
-      agent: ProviderId;
-      name: string; // worktree display name, e.g. taskName-agentSlug
-      branch: string;
-      path: string; // filesystem path of the worktree
-      worktreeId: string; // WorktreeService id (stable hash of path)
-    }>;
-    selectedAgent?: ProviderId | null;
-  } | null;
-}
-
-export interface Task {
-  id: string;
-  projectId: string;
-  name: string;
-  branch: string;
-  path: string;
-  status: 'active' | 'idle' | 'running';
-  metadata?: TaskMetadata | null;
-  useWorktree?: boolean;
-  archivedAt?: string | null;
-  createdAt?: string;
-  updatedAt?: string;
-  agentId?: string;
-}
diff --git a/src/renderer/types/electron-api.d.ts b/src/renderer/types/electron-api.d.ts
deleted file mode 100644
index 444868b427..0000000000
--- a/src/renderer/types/electron-api.d.ts
+++ /dev/null
@@ -1,1706 +0,0 @@
-// Updated for Codex integration
-
-import type { AgentEvent } from '../../shared/agentEvents';
-
-type ProjectSettingsPayload = {
-  projectId: string;
-  name: string;
-  path: string;
-  gitRemote?: string;
-  gitBranch?: string;
-  baseRef?: string;
-};
-
-export type LineComment = {
-  id: string;
-  taskId: string;
-  filePath: string;
-  lineNumber: number;
-  lineContent?: string | null;
-  content: string;
-  createdAt: string;
-  updatedAt: string;
-  sentAt?: string | null;
-};
-
-export type ProviderCustomConfig = {
-  cli?: string;
-  resumeFlag?: string;
-  defaultArgs?: string;
-  autoApproveFlag?: string;
-  initialPromptFlag?: string;
-  extraArgs?: string;
-  env?: Record<string, string>;
-};
-
-export type ProviderCustomConfigs = Record<string, ProviderCustomConfig>;
-
-export {};
-
-declare global {
-  interface Window {
-    electronAPI: {
-      // App info
-      getAppVersion: () => Promise<string>;
-      getElectronVersion: () => Promise<string>;
-      getPlatform: () => Promise<string>;
-      listInstalledFonts: (args?: {
-        refresh?: boolean;
-      }) => Promise<{ success: boolean; fonts?: string[]; cached?: boolean; error?: string }>;
-      undo: () => Promise<{ success: boolean; error?: string }>;
-      redo: () => Promise<{ success: boolean; error?: string }>;
-      // Updater
-      checkForUpdates: () => Promise<{ success: boolean; result?: any; error?: string }>;
-      downloadUpdate: () => Promise<{ success: boolean; error?: string }>;
-      quitAndInstallUpdate: () => Promise<{ success: boolean; error?: string }>;
-      openLatestDownload: () => Promise<{ success: boolean; error?: string }>;
-      onUpdateEvent: (listener: (data: { type: string; payload?: any }) => void) => () => void;
-      // Enhanced update methods
-      getUpdateState: () => Promise<{ success: boolean; data?: any; error?: string }>;
-      getUpdateSettings: () => Promise<{ success: boolean; data?: any; error?: string }>;
-      updateUpdateSettings: (settings: any) => Promise<{ success: boolean; error?: string }>;
-      getReleaseNotes: () => Promise<{ success: boolean; data?: string | null; error?: string }>;
-      checkForUpdatesNow: () => Promise<{ success: boolean; data?: any; error?: string }>;
-
-      // Menu events (main → renderer)
-      onMenuOpenSettings: (listener: () => void) => () => void;
-      onMenuCheckForUpdates: (listener: () => void) => () => void;
-      onMenuUndo: (listener: () => void) => () => void;
-      onMenuRedo: (listener: () => void) => () => void;
-      onMenuCloseTab: (listener: () => void) => () => void;
-
-      // PTY
-      ptyStart: (opts: {
-        id: string;
-        cwd?: string;
-        remote?: { connectionId: string };
-        shell?: string;
-        env?: Record<string, string>;
-        cols?: number;
-        rows?: number;
-        autoApprove?: boolean;
-        initialPrompt?: string;
-        skipResume?: boolean;
-      }) => Promise<{ ok: boolean; tmux?: boolean; error?: string }>;
-      ptyStartDirect: (opts: {
-        id: string;
-        providerId: string;
-        cwd: string;
-        remote?: { connectionId: string };
-        cols?: number;
-        rows?: number;
-        autoApprove?: boolean;
-        initialPrompt?: string;
-        env?: Record<string, string>;
-        resume?: boolean;
-      }) => Promise<{ ok: boolean; reused?: boolean; tmux?: boolean; error?: string }>;
-      ptyScpToRemote: (args: { connectionId: string; localPaths: string[] }) => Promise<{
-        success: boolean;
-        remotePaths?: string[];
-        error?: string;
-      }>;
-      ptyInput: (args: { id: string; data: string }) => void;
-      ptyResize: (args: { id: string; cols: number; rows?: number }) => void;
-      ptyKill: (id: string) => void;
-      ptyKillTmux: (id: string) => Promise<{ ok: boolean; error?: string }>;
-      onPtyData: (id: string, listener: (data: string) => void) => () => void;
-      ptyGetSnapshot: (args: { id: string }) => Promise<{
-        ok: boolean;
-        snapshot?: any;
-        error?: string;
-      }>;
-      ptySaveSnapshot: (args: { id: string; payload: TerminalSnapshotPayload }) => Promise<{
-        ok: boolean;
-        error?: string;
-      }>;
-      ptyClearSnapshot: (args: { id: string }) => Promise<{ ok: boolean }>;
-      onPtyExit: (
-        id: string,
-        listener: (info: { exitCode: number; signal?: number }) => void
-      ) => () => void;
-      onPtyStarted: (listener: (data: { id: string }) => void) => () => void;
-      onAgentEvent: (
-        listener: (event: AgentEvent, meta: { appFocused: boolean }) => void
-      ) => () => void;
-      onNotificationFocusTask: (listener: (taskId: string) => void) => () => void;
-      terminalGetTheme: () => Promise<{
-        ok: boolean;
-        config?: {
-          terminal: string;
-          theme: {
-            background?: string;
-            foreground?: string;
-            cursor?: string;
-            cursorAccent?: string;
-            selectionBackground?: string;
-            black?: string;
-            red?: string;
-            green?: string;
-            yellow?: string;
-            blue?: string;
-            magenta?: string;
-            cyan?: string;
-            white?: string;
-            brightBlack?: string;
-            brightRed?: string;
-            brightGreen?: string;
-            brightYellow?: string;
-            brightBlue?: string;
-            brightMagenta?: string;
-            brightCyan?: string;
-            brightWhite?: string;
-            fontFamily?: string;
-            fontSize?: number;
-          };
-        };
-        error?: string;
-      }>;
-
-      // Worktree management
-      worktreeCreate: (args: {
-        projectPath: string;
-        taskName: string;
-        projectId: string;
-        baseRef?: string;
-      }) => Promise<{ success: boolean; worktree?: any; error?: string }>;
-      worktreeList: (args: {
-        projectPath: string;
-      }) => Promise<{ success: boolean; worktrees?: any[]; error?: string }>;
-      worktreeRemove: (args: {
-        projectPath: string;
-        worktreeId: string;
-        worktreePath?: string;
-        branch?: string;
-        taskName?: string;
-      }) => Promise<{ success: boolean; error?: string }>;
-      worktreeStatus: (args: {
-        worktreePath: string;
-      }) => Promise<{ success: boolean; status?: any; error?: string }>;
-      worktreeMerge: (args: {
-        projectPath: string;
-        worktreeId: string;
-      }) => Promise<{ success: boolean; error?: string }>;
-      worktreeGet: (args: {
-        worktreeId: string;
-      }) => Promise<{ success: boolean; worktree?: any; error?: string }>;
-      worktreeGetAll: () => Promise<{
-        success: boolean;
-        worktrees?: any[];
-        error?: string;
-      }>;
-
-      // Worktree pool (reserve) management for instant task creation
-      worktreeEnsureReserve: (args: {
-        projectId: string;
-        projectPath: string;
-        baseRef?: string;
-      }) => Promise<{ success: boolean; error?: string }>;
-      worktreeHasReserve: (args: {
-        projectId: string;
-      }) => Promise<{ success: boolean; hasReserve?: boolean; error?: string }>;
-      worktreeClaimReserve: (args: {
-        projectId: string;
-        projectPath: string;
-        taskName: string;
-        baseRef?: string;
-      }) => Promise<{
-        success: boolean;
-        worktree?: any;
-        needsBaseRefSwitch?: boolean;
-        error?: string;
-      }>;
-      worktreeClaimReserveAndSaveTask: (args: {
-        projectId: string;
-        projectPath: string;
-        taskName: string;
-        baseRef?: string;
-        task: {
-          projectId: string;
-          name: string;
-          status: 'active' | 'idle' | 'running';
-          agentId?: string | null;
-          metadata?: any;
-          useWorktree?: boolean;
-        };
-      }) => Promise<{
-        success: boolean;
-        worktree?: any;
-        task?: any;
-        needsBaseRefSwitch?: boolean;
-        error?: string;
-      }>;
-      worktreeRemoveReserve: (args: {
-        projectId: string;
-        projectPath?: string;
-        isRemote?: boolean;
-      }) => Promise<{ success: boolean; error?: string }>;
-
-      // Lifecycle scripts
-      lifecycleGetScript: (args: {
-        projectPath: string;
-        phase: 'setup' | 'run' | 'teardown';
-      }) => Promise<{ success: boolean; script?: string | null; error?: string }>;
-      lifecycleSetup: (args: {
-        taskId: string;
-        taskPath: string;
-        projectPath: string;
-        taskName?: string;
-      }) => Promise<{ success: boolean; skipped?: boolean; error?: string }>;
-      lifecycleRunStart: (args: {
-        taskId: string;
-        taskPath: string;
-        projectPath: string;
-        taskName?: string;
-      }) => Promise<{ success: boolean; skipped?: boolean; error?: string }>;
-      lifecycleRunStop: (args: {
-        taskId: string;
-      }) => Promise<{ success: boolean; skipped?: boolean; error?: string }>;
-      lifecycleTeardown: (args: {
-        taskId: string;
-        taskPath: string;
-        projectPath: string;
-        taskName?: string;
-      }) => Promise<{ success: boolean; skipped?: boolean; error?: string }>;
-      lifecycleGetState: (args: { taskId: string }) => Promise<{
-        success: boolean;
-        state?: {
-          taskId: string;
-          setup: {
-            status: 'idle' | 'running' | 'succeeded' | 'failed';
-            startedAt?: string;
-            finishedAt?: string;
-            exitCode?: number | null;
-            error?: string | null;
-          };
-          run: {
-            status: 'idle' | 'running' | 'succeeded' | 'failed';
-            startedAt?: string;
-            finishedAt?: string;
-            exitCode?: number | null;
-            error?: string | null;
-            pid?: number | null;
-          };
-          teardown: {
-            status: 'idle' | 'running' | 'succeeded' | 'failed';
-            startedAt?: string;
-            finishedAt?: string;
-            exitCode?: number | null;
-            error?: string | null;
-          };
-        };
-        error?: string;
-      }>;
-      lifecycleGetLogs: (args: { taskId: string }) => Promise<{
-        success: boolean;
-        logs?: { setup: string[]; run: string[]; teardown: string[] };
-        error?: string;
-      }>;
-      lifecycleClearTask: (args: {
-        taskId: string;
-      }) => Promise<{ success: boolean; error?: string }>;
-      onLifecycleEvent: (listener: (data: any) => void) => () => void;
-
-      // Project management
-      openProject: () => Promise<{
-        success: boolean;
-        path?: string;
-        error?: string;
-      }>;
-      openFile: (args?: {
-        title?: string;
-        message?: string;
-        filters?: Electron.FileFilter[];
-      }) => Promise<{
-        success: boolean;
-        path?: string;
-        error?: string;
-      }>;
-      getProjectSettings: (projectId: string) => Promise<{
-        success: boolean;
-        settings?: ProjectSettingsPayload;
-        error?: string;
-      }>;
-      updateProjectSettings: (args: { projectId: string; baseRef: string }) => Promise<{
-        success: boolean;
-        settings?: ProjectSettingsPayload;
-        error?: string;
-      }>;
-      getGitInfo: (projectPath: string) => Promise<{
-        isGitRepo: boolean;
-        remote?: string;
-        branch?: string;
-        baseRef?: string;
-        upstream?: string;
-        aheadCount?: number;
-        behindCount?: number;
-        path?: string;
-        rootPath?: string;
-        error?: string;
-      }>;
-      getGitStatus: (taskPath: string) => Promise<{
-        success: boolean;
-        changes?: Array<{
-          path: string;
-          status: string;
-          additions: number;
-          deletions: number;
-          isStaged: boolean;
-          diff?: string;
-        }>;
-        error?: string;
-      }>;
-      watchGitStatus: (taskPath: string) => Promise<{
-        success: boolean;
-        watchId?: string;
-        error?: string;
-      }>;
-      unwatchGitStatus: (
-        taskPath: string,
-        watchId?: string
-      ) => Promise<{
-        success: boolean;
-        error?: string;
-      }>;
-      onGitStatusChanged: (
-        listener: (data: { taskPath: string; error?: string }) => void
-      ) => () => void;
-      getFileDiff: (args: { taskPath: string; filePath: string }) => Promise<{
-        success: boolean;
-        diff?: {
-          lines: Array<{
-            left?: string;
-            right?: string;
-            type: 'context' | 'add' | 'del';
-          }>;
-          isBinary?: boolean;
-          originalContent?: string;
-          modifiedContent?: string;
-        };
-        error?: string;
-      }>;
-      stageFile: (args: { taskPath: string; filePath: string }) => Promise<{
-        success: boolean;
-        error?: string;
-      }>;
-      stageAllFiles: (args: { taskPath: string }) => Promise<{
-        success: boolean;
-        error?: string;
-      }>;
-      unstageFile: (args: { taskPath: string; filePath: string }) => Promise<{
-        success: boolean;
-        error?: string;
-      }>;
-      revertFile: (args: { taskPath: string; filePath: string }) => Promise<{
-        success: boolean;
-        action?: 'unstaged' | 'reverted';
-        error?: string;
-      }>;
-      gitCommit: (args: { taskPath: string; message: string }) => Promise<{
-        success: boolean;
-        hash?: string;
-        error?: string;
-      }>;
-      gitPush: (args: { taskPath: string }) => Promise<{
-        success: boolean;
-        output?: string;
-        error?: string;
-      }>;
-      gitPull: (args: { taskPath: string }) => Promise<{
-        success: boolean;
-        output?: string;
-        error?: string;
-      }>;
-      gitGetLog: (args: {
-        taskPath: string;
-        maxCount?: number;
-        skip?: number;
-        aheadCount?: number;
-      }) => Promise<{
-        success: boolean;
-        commits?: Array<{
-          hash: string;
-          subject: string;
-          body: string;
-          author: string;
-          date: string;
-          isPushed: boolean;
-          tags: string[];
-        }>;
-        aheadCount?: number;
-        error?: string;
-      }>;
-      gitGetLatestCommit: (args: { taskPath: string }) => Promise<{
-        success: boolean;
-        commit?: {
-          hash: string;
-          subject: string;
-          body: string;
-          isPushed: boolean;
-        } | null;
-        error?: string;
-      }>;
-      gitGetCommitFiles: (args: { taskPath: string; commitHash: string }) => Promise<{
-        success: boolean;
-        files?: Array<{
-          path: string;
-          status: string;
-          additions: number;
-          deletions: number;
-        }>;
-        error?: string;
-      }>;
-      gitGetCommitFileDiff: (args: {
-        taskPath: string;
-        commitHash: string;
-        filePath: string;
-      }) => Promise<{
-        success: boolean;
-        diff?: {
-          lines: Array<{ left?: string; right?: string; type: 'context' | 'add' | 'del' }>;
-          isBinary?: boolean;
-          originalContent?: string;
-          modifiedContent?: string;
-        };
-        error?: string;
-      }>;
-      gitSoftReset: (args: { taskPath: string }) => Promise<{
-        success: boolean;
-        subject?: string;
-        body?: string;
-        error?: string;
-      }>;
-      gitCommitAndPush: (args: {
-        taskPath: string;
-        commitMessage?: string;
-        createBranchIfOnDefault?: boolean;
-        branchPrefix?: string;
-      }) => Promise<{
-        success: boolean;
-        branch?: string;
-        output?: string;
-        error?: string;
-      }>;
-      generatePrContent: (args: { taskPath: string; base?: string }) => Promise<{
-        success: boolean;
-        title?: string;
-        description?: string;
-        error?: string;
-      }>;
-      createPullRequest: (args: {
-        taskPath: string;
-        title?: string;
-        body?: string;
-        base?: string;
-        head?: string;
-        draft?: boolean;
-        web?: boolean;
-        fill?: boolean;
-      }) => Promise<{
-        success: boolean;
-        url?: string;
-        output?: string;
-        error?: string;
-      }>;
-      mergeToMain: (args: { taskPath: string }) => Promise<{
-        success: boolean;
-        output?: string;
-        prUrl?: string;
-        error?: string;
-      }>;
-      mergePr: (args: {
-        taskPath: string;
-        prNumber?: number;
-        strategy?: 'merge' | 'squash' | 'rebase';
-        admin?: boolean;
-      }) => Promise<{
-        success: boolean;
-        output?: string;
-        error?: string;
-        code?: string;
-      }>;
-      getPrStatus: (args: { taskPath: string }) => Promise<{
-        success: boolean;
-        pr?: {
-          number: number;
-          url: string;
-          state: string;
-          isDraft?: boolean;
-          mergeStateStatus?: string;
-          headRefName?: string;
-          baseRefName?: string;
-          title?: string;
-          author?: any;
-          additions?: number;
-          deletions?: number;
-          changedFiles?: number;
-        } | null;
-        error?: string;
-      }>;
-      getCheckRuns: (args: { taskPath: string }) => Promise<{
-        success: boolean;
-        checks?: Array<{
-          name: string;
-          state: string;
-          bucket: 'pass' | 'fail' | 'pending' | 'skipping' | 'cancel';
-          description?: string;
-          link?: string;
-          workflow?: string;
-          event?: string;
-          startedAt?: string;
-          completedAt?: string;
-        }> | null;
-        error?: string;
-        code?: string;
-      }>;
-      getPrComments: (args: { taskPath: string; prNumber?: number }) => Promise<{
-        success: boolean;
-        comments?: Array<{
-          id: string;
-          author: { login: string; avatarUrl?: string };
-          body: string;
-          createdAt: string;
-        }>;
-        reviews?: Array<{
-          id: string;
-          author: { login: string; avatarUrl?: string };
-          body: string;
-          submittedAt: string;
-          state: string;
-        }>;
-        error?: string;
-        code?: string;
-      }>;
-      getBranchStatus: (args: { taskPath: string }) => Promise<{
-        success: boolean;
-        branch?: string;
-        defaultBranch?: string;
-        ahead?: number;
-        behind?: number;
-        aheadOfDefault?: number;
-        error?: string;
-      }>;
-      renameBranch: (args: { repoPath: string; oldBranch: string; newBranch: string }) => Promise<{
-        success: boolean;
-        remotePushed?: boolean;
-        error?: string;
-      }>;
-      listRemoteBranches: (args: { projectPath: string; remote?: string }) => Promise<{
-        success: boolean;
-        branches?: Array<{ ref: string; remote: string; branch: string; label: string }>;
-        error?: string;
-      }>;
-      openExternal: (url: string) => Promise<{ success: boolean; error?: string }>;
-      clipboardWriteText: (text: string) => Promise<{ success: boolean; error?: string }>;
-      paste: () => Promise<{ success: boolean; error?: string }>;
-      openIn: (args: {
-        app: OpenInAppId;
-        path: string;
-        isRemote?: boolean;
-        sshConnectionId?: string | null;
-      }) => Promise<{ success: boolean; error?: string }>;
-      checkInstalledApps: () => Promise<Record<OpenInAppId, boolean>>;
-      connectToGitHub: (projectPath: string) => Promise<{
-        success: boolean;
-        repository?: string;
-        branch?: string;
-        error?: string;
-      }>;
-      // Telemetry
-      captureTelemetry: (
-        event: string,
-        properties?: Record<string, any>
-      ) => Promise<{ success: boolean; disabled?: boolean; error?: string }>;
-      getTelemetryStatus: () => Promise<{
-        success: boolean;
-        status?: {
-          enabled: boolean;
-          envDisabled: boolean;
-          userOptOut: boolean;
-          hasKeyAndHost: boolean;
-          onboardingSeen?: boolean;
-        };
-        error?: string;
-      }>;
-      setTelemetryEnabled: (enabled: boolean) => Promise<{
-        success: boolean;
-        status?: {
-          enabled: boolean;
-          envDisabled: boolean;
-          userOptOut: boolean;
-          hasKeyAndHost: boolean;
-          onboardingSeen?: boolean;
-        };
-        error?: string;
-      }>;
-      setOnboardingSeen: (flag: boolean) => Promise<{
-        success: boolean;
-        status?: {
-          enabled: boolean;
-          envDisabled: boolean;
-          userOptOut: boolean;
-          hasKeyAndHost: boolean;
-          onboardingSeen?: boolean;
-        };
-        error?: string;
-      }>;
-
-      // Filesystem helpers
-      fsList: (
-        root: string,
-        opts?: {
-          includeDirs?: boolean;
-          maxEntries?: number;
-          timeBudgetMs?: number;
-          connectionId?: string;
-          remotePath?: string;
-          recursive?: boolean;
-        }
-      ) => Promise<{
-        success: boolean;
-        items?: Array<{ path: string; type: 'file' | 'dir' }>;
-        error?: string;
-        canceled?: boolean;
-        truncated?: boolean;
-        reason?: string;
-        durationMs?: number;
-      }>;
-      fsRead: (
-        root: string,
-        relPath: string,
-        maxBytes?: number,
-        remote?: { connectionId: string; remotePath: string }
-      ) => Promise<{
-        success: boolean;
-        path?: string;
-        size?: number;
-        truncated?: boolean;
-        content?: string;
-        error?: string;
-      }>;
-      fsReadImage: (
-        root: string,
-        relPath: string,
-        remote?: { connectionId: string; remotePath: string }
-      ) => Promise<{
-        success: boolean;
-        dataUrl?: string;
-        mimeType?: string;
-        size?: number;
-        error?: string;
-      }>;
-      fsSearchContent: (
-        root: string,
-        query: string,
-        options?: {
-          caseSensitive?: boolean;
-          maxResults?: number;
-          fileExtensions?: string[];
-        },
-        remote?: { connectionId: string; remotePath: string }
-      ) => Promise<{
-        success: boolean;
-        results?: Array<{
-          file: string;
-          matches: Array<{
-            line: number;
-            column: number;
-            text: string;
-            preview: string;
-          }>;
-        }>;
-        error?: string;
-      }>;
-      fsWriteFile: (
-        root: string,
-        relPath: string,
-        content: string,
-        mkdirs?: boolean,
-        remote?: { connectionId: string; remotePath: string }
-      ) => Promise<{ success: boolean; error?: string }>;
-      fsRemove: (
-        root: string,
-        relPath: string,
-        remote?: { connectionId: string; remotePath: string }
-      ) => Promise<{ success: boolean; error?: string }>;
-      getProjectConfig: (
-        projectPath: string
-      ) => Promise<{ success: boolean; path?: string; content?: string; error?: string }>;
-      saveProjectConfig: (
-        projectPath: string,
-        content: string
-      ) => Promise<{ success: boolean; path?: string; error?: string }>;
-      // Attachments
-      saveAttachment: (args: { taskPath: string; srcPath: string; subdir?: string }) => Promise<{
-        success: boolean;
-        absPath?: string;
-        relPath?: string;
-        fileName?: string;
-        error?: string;
-      }>;
-
-      // GitHub integration
-      githubAuth: () => Promise<{
-        success: boolean;
-        token?: string;
-        user?: any;
-        device_code?: string;
-        user_code?: string;
-        verification_uri?: string;
-        expires_in?: number;
-        interval?: number;
-        error?: string;
-      }>;
-      githubCancelAuth: () => Promise<{ success: boolean; error?: string }>;
-      onGithubAuthDeviceCode: (
-        callback: (data: {
-          userCode: string;
-          verificationUri: string;
-          expiresIn: number;
-          interval: number;
-        }) => void
-      ) => () => void;
-      onGithubAuthPolling: (callback: (data: { status: string }) => void) => () => void;
-      onGithubAuthSlowDown: (callback: (data: { newInterval: number }) => void) => () => void;
-      onGithubAuthSuccess: (callback: (data: { token: string; user: any }) => void) => () => void;
-      onGithubAuthError: (
-        callback: (data: { error: string; message: string }) => void
-      ) => () => void;
-      onGithubAuthCancelled: (callback: () => void) => () => void;
-      onGithubAuthUserUpdated: (callback: (data: { user: any }) => void) => () => void;
-      githubIsAuthenticated: () => Promise<boolean>;
-      githubGetStatus: () => Promise<{
-        installed: boolean;
-        authenticated: boolean;
-        user?: any;
-      }>;
-      githubGetUser: () => Promise<any>;
-      githubGetRepositories: () => Promise<any[]>;
-      githubCloneRepository: (
-        repoUrl: string,
-        localPath: string
-      ) => Promise<{ success: boolean; error?: string }>;
-      githubGetOwners: () => Promise<{
-        success: boolean;
-        owners?: Array<{ login: string; type: 'User' | 'Organization' }>;
-        error?: string;
-      }>;
-      githubValidateRepoName: (
-        name: string,
-        owner: string
-      ) => Promise<{
-        success: boolean;
-        valid?: boolean;
-        exists?: boolean;
-        error?: string;
-      }>;
-      githubCreateNewProject: (params: {
-        name: string;
-        description?: string;
-        owner: string;
-        isPrivate: boolean;
-        gitignoreTemplate?: string;
-      }) => Promise<{
-        success: boolean;
-        projectPath?: string;
-        repoUrl?: string;
-        fullName?: string;
-        defaultBranch?: string;
-        githubRepoCreated?: boolean;
-        error?: string;
-      }>;
-      githubCheckCLIInstalled: () => Promise<boolean>;
-      githubInstallCLI: () => Promise<{ success: boolean; error?: string }>;
-      githubListPullRequests: (
-        projectPath: string
-      ) => Promise<{ success: boolean; prs?: any[]; error?: string }>;
-      githubCreatePullRequestWorktree: (args: {
-        projectPath: string;
-        projectId: string;
-        prNumber: number;
-        prTitle?: string;
-        taskName?: string;
-        branchName?: string;
-      }) => Promise<{
-        success: boolean;
-        worktree?: any;
-        branchName?: string;
-        taskName?: string;
-        error?: string;
-      }>;
-      githubLogout: () => Promise<void>;
-      // Linear integration
-      linearCheckConnection?: () => Promise<{
-        connected: boolean;
-        taskName?: string;
-        error?: string;
-      }>;
-      linearSaveToken?: (token: string) => Promise<{
-        success: boolean;
-        taskName?: string;
-        error?: string;
-      }>;
-      linearClearToken?: () => Promise<{
-        success: boolean;
-        error?: string;
-      }>;
-      linearInitialFetch?: (limit?: number) => Promise<{
-        success: boolean;
-        issues?: any[];
-        error?: string;
-      }>;
-      linearSearchIssues?: (
-        searchTerm: string,
-        limit?: number
-      ) => Promise<{
-        success: boolean;
-        issues?: any[];
-        error?: string;
-      }>;
-      // Jira integration
-      jiraSaveCredentials?: (args: {
-        siteUrl: string;
-        email: string;
-        token: string;
-      }) => Promise<{ success: boolean; displayName?: string; error?: string }>;
-      jiraClearCredentials?: () => Promise<{ success: boolean; error?: string }>;
-      jiraCheckConnection?: () => Promise<{
-        connected: boolean;
-        displayName?: string;
-        siteUrl?: string;
-        error?: string;
-      }>;
-      jiraInitialFetch?: (limit?: number) => Promise<{
-        success: boolean;
-        issues?: any[];
-        error?: string;
-      }>;
-      jiraSearchIssues?: (
-        searchTerm: string,
-        limit?: number
-      ) => Promise<{ success: boolean; issues?: any[]; error?: string }>;
-      // GitLab
-      gitlabSaveCredentials?: (args: {
-        instanceUrl: string;
-        token: string;
-      }) => Promise<{ success: boolean; displayName?: string; error?: string }>;
-      gitlabClearCredentials?: () => Promise<{ success: boolean; error?: string }>;
-      gitlabCheckConnection?: () => Promise<{
-        success: boolean;
-        username?: string;
-        instanceUrl?: string;
-        error?: string;
-      }>;
-      gitlabInitialFetch?: (
-        projectPath: string,
-        limit?: number
-      ) => Promise<{ success: boolean; issues?: any[]; error?: string }>;
-      gitlabSearchIssues?: (
-        projectPath: string,
-        searchTerm: string,
-        limit?: number
-      ) => Promise<{ success: boolean; issues?: any[]; error?: string }>;
-      getProviderStatuses?: (opts?: {
-        refresh?: boolean;
-        providers?: string[];
-        providerId?: string;
-      }) => Promise<{
-        success: boolean;
-        statuses?: Record<
-          string,
-          { installed: boolean; path?: string | null; version?: string | null; lastChecked: number }
-        >;
-        error?: string;
-      }>;
-      onProviderStatusUpdated?: (
-        listener: (data: { providerId: string; status: any }) => void
-      ) => () => void;
-      getProviderCustomConfig?: (providerId: string) => Promise<{
-        success: boolean;
-        config?: ProviderCustomConfig;
-        error?: string;
-      }>;
-      getAllProviderCustomConfigs?: () => Promise<{
-        success: boolean;
-        configs?: ProviderCustomConfigs;
-        error?: string;
-      }>;
-      updateProviderCustomConfig?: (
-        providerId: string,
-        config: ProviderCustomConfig | undefined
-      ) => Promise<{
-        success: boolean;
-        error?: string;
-      }>;
-
-      // Debug helpers
-      debugAppendLog: (
-        filePath: string,
-        content: string,
-        options?: { reset?: boolean }
-      ) => Promise<{ success: boolean; error?: string }>;
-
-      // Line comments
-      lineCommentsGet: (args: { taskId: string; filePath?: string }) => Promise<{
-        success: boolean;
-        comments?: LineComment[];
-        error?: string;
-      }>;
-      lineCommentsCreate: (args: {
-        taskId: string;
-        filePath: string;
-        lineNumber: number;
-        lineContent?: string;
-        content: string;
-      }) => Promise<{
-        success: boolean;
-        id?: string;
-        error?: string;
-      }>;
-      lineCommentsUpdate: (args: { id: string; content: string }) => Promise<{
-        success: boolean;
-        error?: string;
-      }>;
-      lineCommentsDelete: (id: string) => Promise<{
-        success: boolean;
-        error?: string;
-      }>;
-      lineCommentsGetFormatted: (taskId: string) => Promise<{
-        success: boolean;
-        formatted?: string;
-        error?: string;
-      }>;
-      lineCommentsMarkSent: (commentIds: string[]) => Promise<{
-        success: boolean;
-        error?: string;
-      }>;
-      lineCommentsGetUnsent: (taskId: string) => Promise<{
-        success: boolean;
-        comments?: LineComment[];
-        error?: string;
-      }>;
-
-      // SSH operations
-      sshTestConnection: (config: {
-        id?: string;
-        name: string;
-        host: string;
-        port: number;
-        username: string;
-        authType: 'password' | 'key' | 'agent';
-        privateKeyPath?: string;
-        useAgent?: boolean;
-        password?: string;
-        passphrase?: string;
-      }) => Promise<{ success: boolean; error?: string; latency?: number; debugLogs?: string[] }>;
-      sshSaveConnection: (config: {
-        id?: string;
-        name: string;
-        host: string;
-        port: number;
-        username: string;
-        authType: 'password' | 'key' | 'agent';
-        privateKeyPath?: string;
-        useAgent?: boolean;
-        password?: string;
-        passphrase?: string;
-      }) => Promise<{
-        id: string;
-        name: string;
-        host: string;
-        port: number;
-        username: string;
-        authType: 'password' | 'key' | 'agent';
-        privateKeyPath?: string;
-        useAgent?: boolean;
-      }>;
-      sshGetConnections: () => Promise<
-        Array<{
-          id: string;
-          name: string;
-          host: string;
-          port: number;
-          username: string;
-          authType: 'password' | 'key' | 'agent';
-          privateKeyPath?: string;
-          useAgent?: boolean;
-        }>
-      >;
-      sshDeleteConnection: (id: string) => Promise<void>;
-      sshConnect: (
-        arg:
-          | string
-          | {
-              id?: string;
-              name: string;
-              host: string;
-              port: number;
-              username: string;
-              authType: 'password' | 'key' | 'agent';
-              privateKeyPath?: string;
-              useAgent?: boolean;
-              password?: string;
-              passphrase?: string;
-            }
-      ) => Promise<string>;
-      sshDisconnect: (connectionId: string) => Promise<void>;
-      sshExecuteCommand: (
-        connectionId: string,
-        command: string,
-        cwd?: string
-      ) => Promise<{
-        stdout: string;
-        stderr: string;
-        exitCode: number;
-      }>;
-      sshListFiles: (
-        connectionId: string,
-        path: string
-      ) => Promise<
-        Array<{
-          path: string;
-          name: string;
-          type: 'file' | 'directory' | 'symlink';
-          size: number;
-          modifiedAt: Date;
-          permissions?: string;
-        }>
-      >;
-      sshReadFile: (connectionId: string, path: string) => Promise<string>;
-      sshWriteFile: (connectionId: string, path: string, content: string) => Promise<void>;
-      sshGetState: (
-        connectionId: string
-      ) => Promise<'connecting' | 'connected' | 'disconnected' | 'error'>;
-      sshGetConfig: () => Promise<{ success: boolean; hosts?: any[]; error?: string }>;
-      sshGetSshConfigHost: (hostAlias: string) => Promise<{
-        success: boolean;
-        host?: {
-          host: string;
-          hostname?: string;
-          user?: string;
-          port?: number;
-          identityFile?: string;
-        };
-        error?: string;
-      }>;
-      sshCheckIsGitRepo: (connectionId: string, remotePath: string) => Promise<boolean>;
-      sshInitRepo: (connectionId: string, parentPath: string, repoName: string) => Promise<string>;
-      sshCloneRepo: (connectionId: string, repoUrl: string, targetPath: string) => Promise<string>;
-
-      // Skills management
-      skillsGetCatalog: () => Promise<{
-        success: boolean;
-        data?: import('@shared/skills/types').CatalogIndex;
-        error?: string;
-      }>;
-      skillsRefreshCatalog: () => Promise<{
-        success: boolean;
-        data?: import('@shared/skills/types').CatalogIndex;
-        error?: string;
-      }>;
-      skillsInstall: (args: { skillId: string }) => Promise<{
-        success: boolean;
-        data?: import('@shared/skills/types').CatalogSkill;
-        error?: string;
-      }>;
-      skillsUninstall: (args: { skillId: string }) => Promise<{
-        success: boolean;
-        error?: string;
-      }>;
-      skillsGetDetail: (args: { skillId: string }) => Promise<{
-        success: boolean;
-        data?: import('@shared/skills/types').CatalogSkill;
-        error?: string;
-      }>;
-      skillsGetDetectedAgents: () => Promise<{
-        success: boolean;
-        data?: import('@shared/skills/types').DetectedAgent[];
-        error?: string;
-      }>;
-      skillsCreate: (args: { name: string; description: string; content?: string }) => Promise<{
-        success: boolean;
-        data?: import('@shared/skills/types').CatalogSkill;
-        error?: string;
-      }>;
-    };
-  }
-}
-
-// Explicit type export for better TypeScript recognition
-export interface ElectronAPI {
-  // Menu events (main → renderer)
-  onMenuOpenSettings: (listener: () => void) => () => void;
-  onMenuCheckForUpdates: (listener: () => void) => () => void;
-  onMenuUndo: (listener: () => void) => () => void;
-  onMenuRedo: (listener: () => void) => () => void;
-  onMenuCloseTab: (listener: () => void) => () => void;
-
-  // App info
-  getVersion: () => Promise<string>;
-  getPlatform: () => Promise<string>;
-  listInstalledFonts: (args?: {
-    refresh?: boolean;
-  }) => Promise<{ success: boolean; fonts?: string[]; cached?: boolean; error?: string }>;
-  undo: () => Promise<{ success: boolean; error?: string }>;
-  redo: () => Promise<{ success: boolean; error?: string }>;
-  // Updater
-  checkForUpdates: () => Promise<{ success: boolean; result?: any; error?: string }>;
-  downloadUpdate: () => Promise<{ success: boolean; error?: string }>;
-  quitAndInstallUpdate: () => Promise<{ success: boolean; error?: string }>;
-  openLatestDownload: () => Promise<{ success: boolean; error?: string }>;
-  onUpdateEvent: (listener: (data: { type: string; payload?: any }) => void) => () => void;
-  // Enhanced update methods
-  getUpdateState: () => Promise<{ success: boolean; data?: any; error?: string }>;
-  getUpdateSettings: () => Promise<{ success: boolean; data?: any; error?: string }>;
-  updateUpdateSettings: (settings: any) => Promise<{ success: boolean; error?: string }>;
-  getReleaseNotes: () => Promise<{ success: boolean; data?: string | null; error?: string }>;
-  checkForUpdatesNow: () => Promise<{ success: boolean; data?: any; error?: string }>;
-
-  // PTY
-  ptyStart: (opts: {
-    id: string;
-    cwd?: string;
-    shell?: string;
-    env?: Record<string, string>;
-    cols?: number;
-    rows?: number;
-    autoApprove?: boolean;
-    initialPrompt?: string;
-    skipResume?: boolean;
-  }) => Promise<{ ok: boolean; tmux?: boolean; error?: string }>;
-  ptyStartDirect: (opts: {
-    id: string;
-    providerId: string;
-    cwd: string;
-    cols?: number;
-    rows?: number;
-    autoApprove?: boolean;
-    initialPrompt?: string;
-    env?: Record<string, string>;
-    resume?: boolean;
-  }) => Promise<{ ok: boolean; reused?: boolean; tmux?: boolean; error?: string }>;
-  ptyScpToRemote: (args: { connectionId: string; localPaths: string[] }) => Promise<{
-    success: boolean;
-    remotePaths?: string[];
-    error?: string;
-  }>;
-  ptyInput: (args: { id: string; data: string }) => void;
-  ptyResize: (args: { id: string; cols: number; rows?: number }) => void;
-  ptyKill: (id: string) => void;
-  ptyKillTmux: (id: string) => Promise<{ ok: boolean; error?: string }>;
-  onPtyData: (id: string, listener: (data: string) => void) => () => void;
-  ptyGetSnapshot: (args: { id: string }) => Promise<{
-    ok: boolean;
-    snapshot?: any;
-    error?: string;
-  }>;
-  ptySaveSnapshot: (args: { id: string; payload: TerminalSnapshotPayload }) => Promise<{
-    ok: boolean;
-    error?: string;
-  }>;
-  ptyClearSnapshot: (args: { id: string }) => Promise<{ ok: boolean }>;
-  onPtyExit: (
-    id: string,
-    listener: (info: { exitCode: number; signal?: number }) => void
-  ) => () => void;
-  onPtyStarted: (listener: (data: { id: string }) => void) => () => void;
-  onAgentEvent: (
-    listener: (event: AgentEvent, meta: { appFocused: boolean }) => void
-  ) => () => void;
-  onNotificationFocusTask: (listener: (taskId: string) => void) => () => void;
-
-  // Worktree management
-  worktreeCreate: (args: {
-    projectPath: string;
-    taskName: string;
-    projectId: string;
-    baseRef?: string;
-  }) => Promise<{ success: boolean; worktree?: any; error?: string }>;
-  worktreeList: (args: {
-    projectPath: string;
-  }) => Promise<{ success: boolean; worktrees?: any[]; error?: string }>;
-  worktreeRemove: (args: {
-    projectPath: string;
-    worktreeId: string;
-    worktreePath?: string;
-    branch?: string;
-    taskName?: string;
-  }) => Promise<{ success: boolean; error?: string }>;
-  worktreeStatus: (args: {
-    worktreePath: string;
-  }) => Promise<{ success: boolean; status?: any; error?: string }>;
-  worktreeMerge: (args: {
-    projectPath: string;
-    worktreeId: string;
-  }) => Promise<{ success: boolean; error?: string }>;
-  worktreeGet: (args: {
-    worktreeId: string;
-  }) => Promise<{ success: boolean; worktree?: any; error?: string }>;
-  worktreeGetAll: () => Promise<{
-    success: boolean;
-    worktrees?: any[];
-    error?: string;
-  }>;
-
-  // Worktree pool (reserve) management for instant task creation
-  worktreeEnsureReserve: (args: {
-    projectId: string;
-    projectPath: string;
-    baseRef?: string;
-  }) => Promise<{ success: boolean; error?: string }>;
-  worktreeHasReserve: (args: {
-    projectId: string;
-  }) => Promise<{ success: boolean; hasReserve?: boolean; error?: string }>;
-  worktreeClaimReserve: (args: {
-    projectId: string;
-    projectPath: string;
-    taskName: string;
-    baseRef?: string;
-  }) => Promise<{
-    success: boolean;
-    worktree?: any;
-    needsBaseRefSwitch?: boolean;
-    error?: string;
-  }>;
-  worktreeClaimReserveAndSaveTask: (args: {
-    projectId: string;
-    projectPath: string;
-    taskName: string;
-    baseRef?: string;
-    task: {
-      projectId: string;
-      name: string;
-      status: 'active' | 'idle' | 'running';
-      agentId?: string | null;
-      metadata?: any;
-      useWorktree?: boolean;
-    };
-  }) => Promise<{
-    success: boolean;
-    worktree?: any;
-    task?: any;
-    needsBaseRefSwitch?: boolean;
-    error?: string;
-  }>;
-  worktreeRemoveReserve: (args: {
-    projectId: string;
-    projectPath?: string;
-    isRemote?: boolean;
-  }) => Promise<{ success: boolean; error?: string }>;
-
-  // Lifecycle scripts
-  lifecycleGetScript: (args: {
-    projectPath: string;
-    phase: 'setup' | 'run' | 'teardown';
-  }) => Promise<{ success: boolean; script?: string | null; error?: string }>;
-  lifecycleSetup: (args: {
-    taskId: string;
-    taskPath: string;
-    projectPath: string;
-    taskName?: string;
-  }) => Promise<{ success: boolean; skipped?: boolean; error?: string }>;
-  lifecycleRunStart: (args: {
-    taskId: string;
-    taskPath: string;
-    projectPath: string;
-    taskName?: string;
-  }) => Promise<{ success: boolean; skipped?: boolean; error?: string }>;
-  lifecycleRunStop: (args: {
-    taskId: string;
-  }) => Promise<{ success: boolean; skipped?: boolean; error?: string }>;
-  lifecycleTeardown: (args: {
-    taskId: string;
-    taskPath: string;
-    projectPath: string;
-    taskName?: string;
-  }) => Promise<{ success: boolean; skipped?: boolean; error?: string }>;
-  lifecycleGetState: (args: { taskId: string }) => Promise<{
-    success: boolean;
-    state?: {
-      taskId: string;
-      setup: {
-        status: 'idle' | 'running' | 'succeeded' | 'failed';
-        startedAt?: string;
-        finishedAt?: string;
-        exitCode?: number | null;
-        error?: string | null;
-      };
-      run: {
-        status: 'idle' | 'running' | 'succeeded' | 'failed';
-        startedAt?: string;
-        finishedAt?: string;
-        exitCode?: number | null;
-        error?: string | null;
-        pid?: number | null;
-      };
-      teardown: {
-        status: 'idle' | 'running' | 'succeeded' | 'failed';
-        startedAt?: string;
-        finishedAt?: string;
-        exitCode?: number | null;
-        error?: string | null;
-      };
-    };
-    error?: string;
-  }>;
-  lifecycleGetLogs: (args: { taskId: string }) => Promise<{
-    success: boolean;
-    logs?: { setup: string[]; run: string[]; teardown: string[] };
-    error?: string;
-  }>;
-  lifecycleClearTask: (args: { taskId: string }) => Promise<{ success: boolean; error?: string }>;
-  onLifecycleEvent: (listener: (data: any) => void) => () => void;
-
-  // Project management
-  openProject: () => Promise<{
-    success: boolean;
-    path?: string;
-    error?: string;
-  }>;
-  openFile: (args?: {
-    title?: string;
-    message?: string;
-    filters?: Electron.FileFilter[];
-  }) => Promise<{
-    success: boolean;
-    path?: string;
-    error?: string;
-  }>;
-  getProjectSettings: (projectId: string) => Promise<{
-    success: boolean;
-    settings?: ProjectSettingsPayload;
-    error?: string;
-  }>;
-  updateProjectSettings: (args: { projectId: string; baseRef: string }) => Promise<{
-    success: boolean;
-    settings?: ProjectSettingsPayload;
-    error?: string;
-  }>;
-  getGitInfo: (projectPath: string) => Promise<{
-    isGitRepo: boolean;
-    remote?: string;
-    branch?: string;
-    baseRef?: string;
-    upstream?: string;
-    aheadCount?: number;
-    behindCount?: number;
-    path?: string;
-    error?: string;
-  }>;
-  listRemoteBranches: (args: { projectPath: string; remote?: string }) => Promise<{
-    success: boolean;
-    branches?: Array<{ ref: string; remote: string; branch: string; label: string }>;
-    error?: string;
-  }>;
-  createPullRequest: (args: {
-    taskPath: string;
-    title?: string;
-    body?: string;
-    base?: string;
-    head?: string;
-    draft?: boolean;
-    web?: boolean;
-    fill?: boolean;
-  }) => Promise<{
-    success: boolean;
-    url?: string;
-    output?: string;
-    error?: string;
-  }>;
-  mergeToMain: (args: { taskPath: string }) => Promise<{
-    success: boolean;
-    output?: string;
-    prUrl?: string;
-    error?: string;
-  }>;
-  connectToGitHub: (projectPath: string) => Promise<{
-    success: boolean;
-    repository?: string;
-    branch?: string;
-    error?: string;
-  }>;
-  getProviderStatuses?: (opts?: {
-    refresh?: boolean;
-    providers?: string[];
-    providerId?: string;
-  }) => Promise<{
-    success: boolean;
-    statuses?: Record<
-      string,
-      { installed: boolean; path?: string | null; version?: string | null; lastChecked: number }
-    >;
-    error?: string;
-  }>;
-  onProviderStatusUpdated?: (
-    listener: (data: { providerId: string; status: any }) => void
-  ) => () => void;
-  // Telemetry
-  captureTelemetry: (
-    event: string,
-    properties?: Record<string, any>
-  ) => Promise<{ success: boolean; disabled?: boolean; error?: string }>;
-  getTelemetryStatus: () => Promise<{
-    success: boolean;
-    status?: {
-      enabled: boolean;
-      envDisabled: boolean;
-      userOptOut: boolean;
-      hasKeyAndHost: boolean;
-      onboardingSeen?: boolean;
-    };
-    error?: string;
-  }>;
-  setTelemetryEnabled: (enabled: boolean) => Promise<{
-    success: boolean;
-    status?: {
-      enabled: boolean;
-      envDisabled: boolean;
-      userOptOut: boolean;
-      hasKeyAndHost: boolean;
-      onboardingSeen?: boolean;
-    };
-    error?: string;
-  }>;
-
-  // Filesystem
-  fsList: (
-    root: string,
-    opts?: {
-      includeDirs?: boolean;
-      maxEntries?: number;
-      timeBudgetMs?: number;
-      connectionId?: string;
-      remotePath?: string;
-    }
-  ) => Promise<{
-    success: boolean;
-    items?: Array<{ path: string; type: 'file' | 'dir' }>;
-    error?: string;
-    canceled?: boolean;
-    truncated?: boolean;
-    reason?: string;
-    durationMs?: number;
-  }>;
-  fsRead: (
-    root: string,
-    relPath: string,
-    maxBytes?: number,
-    remote?: { connectionId: string; remotePath: string }
-  ) => Promise<{
-    success: boolean;
-    path?: string;
-    size?: number;
-    truncated?: boolean;
-    content?: string;
-    error?: string;
-  }>;
-  fsSearchContent: (
-    root: string,
-    query: string,
-    options?: {
-      caseSensitive?: boolean;
-      maxResults?: number;
-      fileExtensions?: string[];
-    },
-    remote?: { connectionId: string; remotePath: string }
-  ) => Promise<{
-    success: boolean;
-    results?: Array<{
-      file: string;
-      matches: Array<{
-        line: number;
-        column: number;
-        text: string;
-        preview: string;
-      }>;
-    }>;
-    error?: string;
-  }>;
-
-  // GitHub integration
-  githubAuth: () => Promise<{
-    success: boolean;
-    token?: string;
-    user?: any;
-    device_code?: string;
-    user_code?: string;
-    verification_uri?: string;
-    expires_in?: number;
-    interval?: number;
-    error?: string;
-  }>;
-  githubCancelAuth: () => Promise<{ success: boolean; error?: string }>;
-  onGithubAuthDeviceCode: (
-    callback: (data: {
-      userCode: string;
-      verificationUri: string;
-      expiresIn: number;
-      interval: number;
-    }) => void
-  ) => () => void;
-  onGithubAuthPolling: (callback: (data: { status: string }) => void) => () => void;
-  onGithubAuthSlowDown: (callback: (data: { newInterval: number }) => void) => () => void;
-  onGithubAuthSuccess: (callback: (data: { token: string; user: any }) => void) => () => void;
-  onGithubAuthError: (callback: (data: { error: string; message: string }) => void) => () => void;
-  onGithubAuthCancelled: (callback: () => void) => () => void;
-  onGithubAuthUserUpdated: (callback: (data: { user: any }) => void) => () => void;
-  githubIsAuthenticated: () => Promise<boolean>;
-  githubGetUser: () => Promise<any>;
-  githubGetRepositories: () => Promise<any[]>;
-  githubCloneRepository: (
-    repoUrl: string,
-    localPath: string
-  ) => Promise<{ success: boolean; error?: string }>;
-  githubGetStatus?: () => Promise<{
-    installed: boolean;
-    authenticated: boolean;
-    user?: any;
-  }>;
-  githubCheckCLIInstalled?: () => Promise<boolean>;
-  githubInstallCLI?: () => Promise<{ success: boolean; error?: string }>;
-  githubListPullRequests: (
-    projectPath: string
-  ) => Promise<{ success: boolean; prs?: any[]; error?: string }>;
-  githubCreatePullRequestWorktree: (args: {
-    projectPath: string;
-    projectId: string;
-    prNumber: number;
-    prTitle?: string;
-    taskName?: string;
-    branchName?: string;
-  }) => Promise<{
-    success: boolean;
-    worktree?: any;
-    branchName?: string;
-    taskName?: string;
-    error?: string;
-  }>;
-  githubLogout: () => Promise<void>;
-  // GitHub issues
-  githubIssuesList?: (
-    projectPath: string,
-    limit?: number
-  ) => Promise<{ success: boolean; issues?: any[]; error?: string }>;
-  githubIssuesSearch?: (
-    projectPath: string,
-    searchTerm: string,
-    limit?: number
-  ) => Promise<{ success: boolean; issues?: any[]; error?: string }>;
-  githubIssueGet?: (
-    projectPath: string,
-    number: number
-  ) => Promise<{ success: boolean; issue?: any; error?: string }>;
-
-  // Linear integration
-  linearCheckConnection?: () => Promise<{
-    connected: boolean;
-    taskName?: string;
-    error?: string;
-  }>;
-  linearSaveToken?: (token: string) => Promise<{
-    success: boolean;
-    taskName?: string;
-    error?: string;
-  }>;
-  linearClearToken?: () => Promise<{
-    success: boolean;
-    error?: string;
-  }>;
-  linearInitialFetch?: (limit?: number) => Promise<{
-    success: boolean;
-    issues?: any[];
-    error?: string;
-  }>;
-  linearSearchIssues?: (
-    searchTerm: string,
-    limit?: number
-  ) => Promise<{
-    success: boolean;
-    issues?: any[];
-    error?: string;
-  }>;
-
-  // Debug helpers
-  debugAppendLog: (
-    filePath: string,
-    content: string,
-    options?: { reset?: boolean }
-  ) => Promise<{ success: boolean; error?: string }>;
-
-  // Line comments
-  lineCommentsGet: (args: { taskId: string; filePath?: string }) => Promise<{
-    success: boolean;
-    comments?: LineComment[];
-    error?: string;
-  }>;
-  lineCommentsCreate: (args: {
-    taskId: string;
-    filePath: string;
-    lineNumber: number;
-    lineContent?: string;
-    content: string;
-  }) => Promise<{
-    success: boolean;
-    id?: string;
-    error?: string;
-  }>;
-  lineCommentsUpdate: (args: { id: string; content: string }) => Promise<{
-    success: boolean;
-    error?: string;
-  }>;
-  lineCommentsDelete: (id: string) => Promise<{
-    success: boolean;
-    error?: string;
-  }>;
-  lineCommentsGetFormatted: (taskId: string) => Promise<{
-    success: boolean;
-    formatted?: string;
-    error?: string;
-  }>;
-  lineCommentsMarkSent: (commentIds: string[]) => Promise<{
-    success: boolean;
-    error?: string;
-  }>;
-  lineCommentsGetUnsent: (taskId: string) => Promise<{
-    success: boolean;
-    comments?: LineComment[];
-    error?: string;
-  }>;
-
-  // Skills management
-  skillsGetCatalog: () => Promise<{
-    success: boolean;
-    data?: import('@shared/skills/types').CatalogIndex;
-    error?: string;
-  }>;
-  skillsRefreshCatalog: () => Promise<{
-    success: boolean;
-    data?: import('@shared/skills/types').CatalogIndex;
-    error?: string;
-  }>;
-  skillsInstall: (args: { skillId: string }) => Promise<{
-    success: boolean;
-    data?: import('@shared/skills/types').CatalogSkill;
-    error?: string;
-  }>;
-  skillsUninstall: (args: { skillId: string }) => Promise<{
-    success: boolean;
-    error?: string;
-  }>;
-  skillsGetDetail: (args: { skillId: string }) => Promise<{
-    success: boolean;
-    data?: import('@shared/skills/types').CatalogSkill;
-    error?: string;
-  }>;
-  skillsGetDetectedAgents: () => Promise<{
-    success: boolean;
-    data?: import('@shared/skills/types').DetectedAgent[];
-    error?: string;
-  }>;
-  skillsCreate: (args: { name: string; description: string }) => Promise<{
-    success: boolean;
-    data?: import('@shared/skills/types').CatalogSkill;
-    error?: string;
-  }>;
-}
-import type { TerminalSnapshotPayload } from '#types/terminalSnapshot';
-import type { OpenInAppId } from '#shared/openInApps';
diff --git a/src/renderer/types/github.ts b/src/renderer/types/github.ts
deleted file mode 100644
index 6ed0d85738..0000000000
--- a/src/renderer/types/github.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-export interface GitHubUserRef {
-  login?: string | null;
-  name?: string | null;
-}
-
-export interface GitHubLabelRef {
-  name?: string | null;
-}
-
-export interface GitHubIssueSummary {
-  number: number;
-  title: string;
-  url?: string | null;
-  state?: string | null;
-  updatedAt?: string | null;
-  assignees?: GitHubUserRef[] | null;
-  labels?: GitHubLabelRef[] | null;
-  body?: string | null;
-}
diff --git a/src/renderer/types/gitlab.ts b/src/renderer/types/gitlab.ts
deleted file mode 100644
index 2c9ffd53b8..0000000000
--- a/src/renderer/types/gitlab.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-export interface GitLabIssueSummary {
-  id: number;
-  iid: number; // project-scoped issue number
-  title: string;
-  description?: string | null;
-  web_url?: string | null;
-  state?: string | null; // "opened" | "closed"
-  project?: { name: string } | null;
-  assignee?: { name: string; username: string } | null;
-  labels?: string[] | null;
-  updated_at?: string | null;
-}
diff --git a/src/renderer/types/global.d.ts b/src/renderer/types/global.d.ts
deleted file mode 100644
index 69ec6345d6..0000000000
--- a/src/renderer/types/global.d.ts
+++ /dev/null
@@ -1,377 +0,0 @@
-import type { TerminalSnapshotPayload } from '#types/terminalSnapshot';
-
-type ProjectSettingsPayload = {
-  projectId: string;
-  name: string;
-  path: string;
-  gitRemote?: string;
-  gitBranch?: string;
-  baseRef?: string;
-};
-
-// Global type declarations for Electron API
-declare global {
-  interface Window {
-    electronAPI: {
-      getVersion: () => Promise<string>;
-      getPlatform: () => Promise<string>;
-      clipboardWriteText: (text: string) => Promise<{ success: boolean; error?: string }>;
-      // PTY management
-      ptyStart: (opts: {
-        id: string;
-        cwd?: string;
-        remote?: { connectionId: string };
-        shell?: string;
-        env?: Record<string, string>;
-        cols?: number;
-        rows?: number;
-        autoApprove?: boolean;
-        initialPrompt?: string;
-        skipResume?: boolean;
-      }) => Promise<{ ok: boolean; error?: string }>;
-      ptyStartDirect: (opts: {
-        id: string;
-        providerId: string;
-        cwd: string;
-        remote?: { connectionId: string };
-        cols?: number;
-        rows?: number;
-        autoApprove?: boolean;
-        initialPrompt?: string;
-        env?: Record<string, string>;
-        resume?: boolean;
-      }) => Promise<{ ok: boolean; reused?: boolean; error?: string }>;
-      ptyInput: (args: { id: string; data: string }) => void;
-      ptyResize: (args: { id: string; cols: number; rows: number }) => void;
-      ptyKill: (id: string) => void;
-      onPtyData: (id: string, listener: (data: string) => void) => () => void;
-      ptyGetSnapshot: (args: { id: string }) => Promise<{
-        ok: boolean;
-        snapshot?: any;
-        error?: string;
-      }>;
-      ptySaveSnapshot: (args: { id: string; payload: TerminalSnapshotPayload }) => Promise<{
-        ok: boolean;
-        error?: string;
-      }>;
-      ptyClearSnapshot: (args: { id: string }) => Promise<{ ok: boolean }>;
-      onPtyExit: (
-        id: string,
-        listener: (info: { exitCode: number; signal?: number }) => void
-      ) => () => void;
-      // Worktree management
-      worktreeCreate: (args: {
-        projectPath: string;
-        taskName: string;
-        projectId: string;
-        baseRef?: string;
-      }) => Promise<{ success: boolean; worktree?: any; error?: string }>;
-      worktreeList: (args: {
-        projectPath: string;
-      }) => Promise<{ success: boolean; worktrees?: any[]; error?: string }>;
-      worktreeRemove: (args: {
-        projectPath: string;
-        worktreeId: string;
-        worktreePath?: string;
-        branch?: string;
-      }) => Promise<{ success: boolean; error?: string }>;
-      worktreeStatus: (args: {
-        worktreePath: string;
-      }) => Promise<{ success: boolean; status?: any; error?: string }>;
-      worktreeMerge: (args: {
-        projectPath: string;
-        worktreeId: string;
-      }) => Promise<{ success: boolean; error?: string }>;
-      worktreeGet: (args: {
-        worktreeId: string;
-      }) => Promise<{ success: boolean; worktree?: any; error?: string }>;
-      worktreeGetAll: () => Promise<{ success: boolean; worktrees?: any[]; error?: string }>;
-
-      // Worktree pool (reserve) management for instant task creation
-      worktreeEnsureReserve: (args: {
-        projectId: string;
-        projectPath: string;
-        baseRef?: string;
-      }) => Promise<{ success: boolean; error?: string }>;
-      worktreeHasReserve: (args: {
-        projectId: string;
-      }) => Promise<{ success: boolean; hasReserve?: boolean; error?: string }>;
-      worktreeClaimReserve: (args: {
-        projectId: string;
-        projectPath: string;
-        taskName: string;
-        baseRef?: string;
-      }) => Promise<{
-        success: boolean;
-        worktree?: any;
-        needsBaseRefSwitch?: boolean;
-        error?: string;
-      }>;
-      worktreeClaimReserveAndSaveTask: (args: {
-        projectId: string;
-        projectPath: string;
-        taskName: string;
-        baseRef?: string;
-        task: {
-          projectId: string;
-          name: string;
-          status: 'active' | 'idle' | 'running';
-          agentId?: string | null;
-          metadata?: any;
-          useWorktree?: boolean;
-        };
-      }) => Promise<{
-        success: boolean;
-        worktree?: any;
-        task?: any;
-        needsBaseRefSwitch?: boolean;
-        error?: string;
-      }>;
-      worktreeRemoveReserve: (args: {
-        projectId: string;
-        projectPath?: string;
-        isRemote?: boolean;
-      }) => Promise<{ success: boolean; error?: string }>;
-
-      // Lifecycle scripts
-      lifecycleGetScript: (args: {
-        projectPath: string;
-        phase: 'setup' | 'run' | 'teardown';
-      }) => Promise<{ success: boolean; script?: string | null; error?: string }>;
-      lifecycleSetup: (args: {
-        taskId: string;
-        taskPath: string;
-        projectPath: string;
-        taskName?: string;
-      }) => Promise<{ success: boolean; skipped?: boolean; error?: string }>;
-      lifecycleRunStart: (args: {
-        taskId: string;
-        taskPath: string;
-        projectPath: string;
-        taskName?: string;
-      }) => Promise<{ success: boolean; skipped?: boolean; error?: string }>;
-      lifecycleRunStop: (args: {
-        taskId: string;
-      }) => Promise<{ success: boolean; skipped?: boolean; error?: string }>;
-      lifecycleTeardown: (args: {
-        taskId: string;
-        taskPath: string;
-        projectPath: string;
-        taskName?: string;
-      }) => Promise<{ success: boolean; skipped?: boolean; error?: string }>;
-      lifecycleGetState: (args: { taskId: string }) => Promise<{
-        success: boolean;
-        state?: {
-          taskId: string;
-          setup: {
-            status: 'idle' | 'running' | 'succeeded' | 'failed';
-            startedAt?: string;
-            finishedAt?: string;
-            exitCode?: number | null;
-            error?: string | null;
-          };
-          run: {
-            status: 'idle' | 'running' | 'succeeded' | 'failed';
-            startedAt?: string;
-            finishedAt?: string;
-            exitCode?: number | null;
-            error?: string | null;
-            pid?: number | null;
-          };
-          teardown: {
-            status: 'idle' | 'running' | 'succeeded' | 'failed';
-            startedAt?: string;
-            finishedAt?: string;
-            exitCode?: number | null;
-            error?: string | null;
-          };
-        };
-        error?: string;
-      }>;
-      lifecycleGetLogs: (args: { taskId: string }) => Promise<{
-        success: boolean;
-        logs?: { setup: string[]; run: string[]; teardown: string[] };
-        error?: string;
-      }>;
-      lifecycleClearTask: (args: {
-        taskId: string;
-      }) => Promise<{ success: boolean; error?: string }>;
-      onLifecycleEvent: (listener: (data: any) => void) => () => void;
-
-      openProject: () => Promise<{ success: boolean; path?: string; error?: string }>;
-      getProjectSettings: (projectId: string) => Promise<{
-        success: boolean;
-        settings?: ProjectSettingsPayload;
-        error?: string;
-      }>;
-      updateProjectSettings: (args: { projectId: string; baseRef: string }) => Promise<{
-        success: boolean;
-        settings?: ProjectSettingsPayload;
-        error?: string;
-      }>;
-      fetchProjectBaseRef: (args: { projectId: string; projectPath: string }) => Promise<{
-        success: boolean;
-        baseRef?: string;
-        remote?: string;
-        branch?: string;
-        error?: string;
-      }>;
-      getGitInfo: (projectPath: string) => Promise<{
-        isGitRepo: boolean;
-        remote?: string;
-        branch?: string;
-        baseRef?: string;
-        upstream?: string;
-        aheadCount?: number;
-        behindCount?: number;
-        path?: string;
-        rootPath?: string;
-        error?: string;
-      }>;
-      getGitStatus: (taskPath: string) => Promise<{
-        success: boolean;
-        changes?: Array<{
-          path: string;
-          status: string;
-          additions: number;
-          deletions: number;
-          diff?: string;
-        }>;
-        error?: string;
-      }>;
-      watchGitStatus: (taskPath: string) => Promise<{
-        success: boolean;
-        watchId?: string;
-        error?: string;
-      }>;
-      unwatchGitStatus: (
-        taskPath: string,
-        watchId?: string
-      ) => Promise<{
-        success: boolean;
-        error?: string;
-      }>;
-      onGitStatusChanged: (
-        listener: (data: { taskPath: string; error?: string }) => void
-      ) => () => void;
-      listRemoteBranches: (args: { projectPath: string; remote?: string }) => Promise<{
-        success: boolean;
-        branches?: Array<{ ref: string; remote: string; branch: string; label: string }>;
-        error?: string;
-      }>;
-      connectToGitHub: (
-        projectPath: string
-      ) => Promise<{ success: boolean; repository?: string; branch?: string; error?: string }>;
-      scanRepos: () => Promise<any[]>;
-      addRepo: (path: string) => Promise<any>;
-      // Filesystem
-      fsList: (
-        root: string,
-        opts?: { includeDirs?: boolean; maxEntries?: number; timeBudgetMs?: number }
-      ) => Promise<{
-        success: boolean;
-        items?: Array<{ path: string; type: 'file' | 'dir' }>;
-        error?: string;
-        canceled?: boolean;
-        truncated?: boolean;
-        reason?: string;
-        durationMs?: number;
-      }>;
-      fsRead: (
-        root: string,
-        relPath: string,
-        maxBytes?: number
-      ) => Promise<{
-        success: boolean;
-        path?: string;
-        size?: number;
-        truncated?: boolean;
-        content?: string;
-        error?: string;
-      }>;
-      githubAuth: () => Promise<{ success: boolean; token?: string; user?: any; error?: string }>;
-      githubIsAuthenticated: () => Promise<boolean>;
-      githubGetUser: () => Promise<any>;
-      githubGetRepositories: () => Promise<any[]>;
-      githubCloneRepository: (
-        repoUrl: string,
-        localPath: string
-      ) => Promise<{ success: boolean; error?: string }>;
-      githubGetOwners: () => Promise<{
-        success: boolean;
-        owners?: Array<{ login: string; type: 'User' | 'Organization' }>;
-        error?: string;
-      }>;
-      githubValidateRepoName: (
-        name: string,
-        owner: string
-      ) => Promise<{
-        success: boolean;
-        valid?: boolean;
-        exists?: boolean;
-        error?: string;
-      }>;
-      githubCreateNewProject: (params: {
-        name: string;
-        description?: string;
-        owner: string;
-        isPrivate: boolean;
-        gitignoreTemplate?: string;
-      }) => Promise<{
-        success: boolean;
-        projectPath?: string;
-        repoUrl?: string;
-        fullName?: string;
-        defaultBranch?: string;
-        githubRepoCreated?: boolean;
-        error?: string;
-      }>;
-      githubListPullRequests: (
-        projectPath: string
-      ) => Promise<{ success: boolean; prs?: any[]; error?: string }>;
-      githubCreatePullRequestWorktree: (args: {
-        projectPath: string;
-        projectId: string;
-        prNumber: number;
-        prTitle?: string;
-        taskName?: string;
-        branchName?: string;
-      }) => Promise<{
-        success: boolean;
-        worktree?: any;
-        branchName?: string;
-        taskName?: string;
-        error?: string;
-      }>;
-      githubLogout: () => Promise<void>;
-      linearCheckConnection?: () => Promise<{
-        connected: boolean;
-        taskName?: string;
-      }>;
-      linearSaveToken?: (token: string) => Promise<{
-        success: boolean;
-        taskName?: string;
-        error?: string;
-      }>;
-      linearClearToken?: () => Promise<{
-        success: boolean;
-        error?: string;
-      }>;
-      linearInitialFetch?: (limit?: number) => Promise<{
-        success: boolean;
-        issues?: any[];
-        error?: string;
-      }>;
-      linearSearchIssues?: (
-        searchTerm: string,
-        limit?: number
-      ) => Promise<{
-        success: boolean;
-        issues?: any[];
-        error?: string;
-      }>;
-    };
-  }
-}
-
-export {};
diff --git a/src/renderer/types/index.ts b/src/renderer/types/index.ts
deleted file mode 100644
index d1455dcf88..0000000000
--- a/src/renderer/types/index.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-import type { ProviderId } from '@shared/providers/registry';
-
-export interface Repo {
-  id: string;
-  path: string;
-  origin: string;
-  defaultBranch: string;
-  lastActivity?: string;
-  changes?: {
-    added: number;
-    removed: number;
-  };
-}
-
-export interface Run {
-  id: string;
-  repoId: string;
-  branch: string;
-  worktreePath: string;
-  provider: 'claude-code' | 'openai-agents';
-  prompt: string;
-  status: 'pending' | 'running' | 'completed' | 'failed' | 'cancelled';
-  startedAt: string;
-  finishedAt: string | null;
-  tokenUsage: number;
-  cost: number;
-}
-
-export interface RunEvent {
-  runId: string;
-  timestamp: string;
-  kind: 'llm' | 'tool' | 'bash' | 'git' | 'diff' | 'error';
-  payload: any;
-}
-
-export interface Settings {
-  claudeApiKey?: string;
-  openaiApiKey?: string;
-  githubToken?: string;
-  defaultProvider: 'claude-code' | 'openai-agents';
-  maxConcurrentRuns: number;
-}
-
-export interface Task {
-  id: string;
-  name: string;
-  repos: Repo[];
-}
-
-export type Agent = ProviderId;
-
-// Keyboard shortcuts types
-export type {
-  ShortcutConfig,
-  ShortcutModifier,
-  KeyboardShortcut,
-  ShortcutMapping,
-  GlobalShortcutHandlers,
-} from './shortcuts';
diff --git a/src/renderer/types/jira.ts b/src/renderer/types/jira.ts
deleted file mode 100644
index 39d85dd39b..0000000000
--- a/src/renderer/types/jira.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-export interface JiraUserRef {
-  displayName?: string | null;
-  name?: string | null;
-}
-
-export interface JiraProjectRef {
-  key?: string | null;
-  name?: string | null;
-}
-
-export interface JiraStatusRef {
-  name?: string | null;
-}
-
-export interface JiraIssueSummary {
-  id: string;
-  key: string;
-  summary: string;
-  description?: string | null;
-  url?: string | null;
-  status?: JiraStatusRef | null;
-  project?: JiraProjectRef | null;
-  assignee?: JiraUserRef | null;
-  updatedAt?: string | null;
-}
diff --git a/src/renderer/types/linear.ts b/src/renderer/types/linear.ts
deleted file mode 100644
index f1aec94f55..0000000000
--- a/src/renderer/types/linear.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-export interface LinearUserRef {
-  name?: string | null;
-  displayName?: string | null;
-  avatarUrl?: string | null;
-}
-
-export interface LinearTeamRef {
-  name?: string | null;
-  key?: string | null;
-}
-
-export interface LinearStateRef {
-  name?: string | null;
-  type?: string | null;
-  color?: string | null;
-}
-
-export interface LinearProjectRef {
-  name?: string | null;
-}
-
-export interface LinearIssueSummary {
-  id: string;
-  identifier: string;
-  title: string;
-  description?: string | null;
-  url?: string | null;
-  state?: LinearStateRef | null;
-  team?: LinearTeamRef | null;
-  project?: LinearProjectRef | null;
-  assignee?: LinearUserRef | null;
-  updatedAt?: string | null;
-}
diff --git a/src/renderer/types/shortcuts.ts b/src/renderer/types/shortcuts.ts
deleted file mode 100644
index 46ab711690..0000000000
--- a/src/renderer/types/shortcuts.ts
+++ /dev/null
@@ -1,106 +0,0 @@
-export type ShortcutModifier =
-  | 'cmd'
-  | 'ctrl'
-  | 'shift'
-  | 'alt'
-  | 'option'
-  | 'cmd+shift'
-  | 'ctrl+shift';
-
-export interface ShortcutBinding {
-  key: string;
-  modifier: ShortcutModifier;
-}
-
-export interface KeyboardSettings {
-  commandPalette?: ShortcutBinding;
-  settings?: ShortcutBinding;
-  toggleLeftSidebar?: ShortcutBinding;
-  toggleRightSidebar?: ShortcutBinding;
-  toggleTheme?: ShortcutBinding;
-  toggleKanban?: ShortcutBinding;
-  toggleEditor?: ShortcutBinding;
-  closeModal?: ShortcutBinding;
-  nextProject?: ShortcutBinding;
-  prevProject?: ShortcutBinding;
-  newTask?: ShortcutBinding;
-  nextAgent?: ShortcutBinding;
-  prevAgent?: ShortcutBinding;
-  openInEditor?: ShortcutBinding;
-}
-
-export interface ShortcutConfig {
-  key: string;
-  modifier?: ShortcutModifier;
-  description: string;
-  category?: string;
-}
-
-export type KeyboardShortcut = ShortcutConfig & {
-  handler: (event: KeyboardEvent) => void;
-  preventDefault?: boolean;
-  stopPropagation?: boolean;
-};
-
-/**
- * Mapping of shortcuts to their handlers
- */
-export interface ShortcutMapping {
-  config: ShortcutConfig;
-  handler: () => void;
-  priority: 'modal' | 'global';
-  requiresClosed?: boolean;
-  isCommandPalette?: boolean;
-}
-
-/**
- * Interface for global keyboard shortcut handlers
- */
-export interface GlobalShortcutHandlers {
-  // Modals (highest priority - checked first)
-  onCloseModal?: () => void;
-
-  // Command Palette
-  onToggleCommandPalette?: () => void;
-
-  // Settings
-  onOpenSettings?: () => void;
-
-  // Sidebars
-  onToggleLeftSidebar?: () => void;
-  onToggleRightSidebar?: () => void;
-
-  // Theme
-  onToggleTheme?: () => void;
-
-  // Kanban
-  onToggleKanban?: () => void;
-
-  // Editor
-  onToggleEditor?: () => void;
-
-  // Project navigation
-  onNextProject?: () => void;
-  onPrevProject?: () => void;
-
-  // Task creation
-  onNewTask?: () => void;
-
-  // Agent switching (within same task)
-  onNextAgent?: () => void;
-  onPrevAgent?: () => void;
-
-  // Open in editor
-  onOpenInEditor?: () => void;
-
-  // State checks
-  isCommandPaletteOpen?: boolean;
-  isSettingsOpen?: boolean;
-  isBrowserOpen?: boolean;
-  isDiffViewerOpen?: boolean;
-  isEditorOpen?: boolean;
-  isKanbanOpen?: boolean;
-
-  // Custom keyboard settings
-  customKeyboardSettings?: KeyboardSettings;
-}
diff --git a/src/renderer/lib/agentConfig.ts b/src/renderer/utils/agentConfig.ts
similarity index 95%
rename from src/renderer/lib/agentConfig.ts
rename to src/renderer/utils/agentConfig.ts
index 90c266b45a..2e85dcb5b8 100644
--- a/src/renderer/lib/agentConfig.ts
+++ b/src/renderer/utils/agentConfig.ts
@@ -1,26 +1,26 @@
-import type { Agent } from '../types';
-import openaiLogoSvg from '../../assets/images/openai.svg?raw';
-import kiroLogo from '../../assets/images/kiro.png';
+import { AgentProviderId } from '@shared/agent-provider-registry';
+import ampLogo from '../../assets/images/ampcode.png';
+import atlassianLogo from '../../assets/images/atlassian.png';
+import augmentLogoSvg from '../../assets/images/Auggie.svg?raw';
+import autohandLogoSvg from '../../assets/images/autohand.svg?raw';
+import charmLogo from '../../assets/images/charm.png';
 import claudeLogo from '../../assets/images/claude.png';
+import clineLogo from '../../assets/images/cline.png';
+import codebuffLogo from '../../assets/images/codebuff.png';
+import continueLogo from '../../assets/images/continue.png';
+import cursorLogoSvg from '../../assets/images/cursor.svg?raw';
 import factoryLogoSvg from '../../assets/images/droid.svg?raw';
 import geminiLogo from '../../assets/images/gemini.png';
-import cursorLogoSvg from '../../assets/images/cursor.svg?raw';
 import copilotLogoSvg from '../../assets/images/gh-copilot.svg?raw';
-import ampLogo from '../../assets/images/ampcode.png';
-import opencodeLogo from '../../assets/images/opencode.png';
-import charmLogo from '../../assets/images/charm.png';
-import qwenLogo from '../../assets/images/qwen.png';
-import augmentLogoSvg from '../../assets/images/Auggie.svg?raw';
 import gooseLogo from '../../assets/images/goose.png';
-import kimiLogo from '../../assets/images/kimi.png';
 import kilocodeLogo from '../../assets/images/kilocode.png';
-import atlassianLogo from '../../assets/images/atlassian.png';
-import clineLogo from '../../assets/images/cline.png';
-import continueLogo from '../../assets/images/continue.png';
-import codebuffLogo from '../../assets/images/codebuff.png';
+import kimiLogo from '../../assets/images/kimi.png';
+import kiroLogo from '../../assets/images/kiro.png';
 import mistralLogo from '../../assets/images/mistral.png';
+import openaiLogoSvg from '../../assets/images/openai.svg?raw';
+import opencodeLogo from '../../assets/images/opencode.png';
 import piLogo from '../../assets/images/pi.png';
-import autohandLogoSvg from '../../assets/images/autohand.svg?raw';
+import qwenLogo from '../../assets/images/qwen.png';
 
 export type AgentInfo = {
   name: string;
@@ -31,7 +31,7 @@ export type AgentInfo = {
 };
 
 // Agents with initial prompt support first, then those without
-export const agentConfig: Record<Agent, AgentInfo> = {
+export const agentConfig: Record<AgentProviderId, AgentInfo> = {
   claude: { name: 'Claude Code', logo: claudeLogo, alt: 'Claude Code' },
   codex: { name: 'Codex', logo: openaiLogoSvg, alt: 'Codex', isSvg: true },
   cursor: { name: 'Cursor', logo: cursorLogoSvg, alt: 'Cursor CLI', isSvg: true },
diff --git a/src/renderer/utils/cssVars.ts b/src/renderer/utils/cssVars.ts
new file mode 100644
index 0000000000..5686333ed2
--- /dev/null
+++ b/src/renderer/utils/cssVars.ts
@@ -0,0 +1,3 @@
+export function cssVar(name: string): string {
+  return getComputedStyle(document.documentElement).getPropertyValue(name).trim();
+}
diff --git a/src/renderer/lib/diffUtils.ts b/src/renderer/utils/diffUtils.ts
similarity index 96%
rename from src/renderer/lib/diffUtils.ts
rename to src/renderer/utils/diffUtils.ts
index 492889fce2..3a617cb180 100644
--- a/src/renderer/lib/diffUtils.ts
+++ b/src/renderer/utils/diffUtils.ts
@@ -2,8 +2,7 @@
  * Utilities for converting diff formats and working with Monaco Editor
  */
 
-import type { DiffLine } from '../hooks/useFileDiff';
-import { getLanguageFromPath } from './languageUtils';
+import type { DiffLine } from '@shared/git';
 
 /**
  * Convert DiffLine[] format to original/modified strings for Monaco Editor
diff --git a/src/renderer/utils/focus-tracker.ts b/src/renderer/utils/focus-tracker.ts
new file mode 100644
index 0000000000..0bc33cabe5
--- /dev/null
+++ b/src/renderer/utils/focus-tracker.ts
@@ -0,0 +1,94 @@
+import type {
+  FocusContext,
+  FocusedRegion,
+  FocusMainPanel,
+  FocusRightPanel,
+  FocusTrigger,
+  FocusView,
+  TelemetryEventProperties,
+} from '@shared/telemetry';
+
+interface FocusState {
+  view: FocusView | null;
+  mainPanel: FocusMainPanel | null;
+  rightPanel: FocusRightPanel | null;
+  focusedRegion: FocusedRegion | null;
+}
+
+export interface FocusTransitionResult {
+  previous: FocusState;
+  changed: boolean;
+}
+
+type FocusChangedPayload = TelemetryEventProperties['focus_changed'];
+
+type TransitionEmitter = (payload: FocusChangedPayload) => void;
+
+export class FocusTracker {
+  private state: FocusState = {
+    view: null,
+    mainPanel: null,
+    rightPanel: null,
+    focusedRegion: null,
+  };
+
+  private initialized = false;
+  private transitionEmitter?: TransitionEmitter;
+
+  initialize(initial: Partial<FocusState>): void {
+    if (this.initialized) return;
+    this.state = {
+      ...this.state,
+      ...initial,
+    };
+    this.initialized = true;
+  }
+
+  setTransitionEmitter(emitter: TransitionEmitter): void {
+    this.transitionEmitter = emitter;
+  }
+
+  transition(partial: Partial<FocusState>, trigger: FocusTrigger): FocusTransitionResult | null {
+    if (!this.initialized) {
+      this.initialize(partial);
+      return null;
+    }
+
+    const previous = { ...this.state };
+    const changed = (Object.keys(partial) as Array<keyof FocusState>).some((key) => {
+      const value = partial[key];
+      if (value === undefined) return false;
+      return this.state[key] !== value;
+    });
+    if (!changed) return null;
+
+    this.transitionEmitter?.({
+      view: previous.view,
+      main_panel: previous.mainPanel,
+      right_panel: previous.rightPanel,
+      focused_region: previous.focusedRegion,
+      trigger,
+    });
+
+    this.state = {
+      ...this.state,
+      ...partial,
+    };
+
+    return {
+      previous,
+      changed,
+    };
+  }
+
+  getContext(): FocusContext {
+    return {
+      active_view: this.state.view,
+      active_main_panel: this.state.mainPanel,
+      active_right_panel: this.state.rightPanel,
+      focused_region: this.state.focusedRegion,
+    };
+  }
+}
+
+export const focusTracker = new FocusTracker();
diff --git a/src/renderer/utils/formatBytes.ts b/src/renderer/utils/formatBytes.ts
new file mode 100644
index 0000000000..670b19c35d
--- /dev/null
+++ b/src/renderer/utils/formatBytes.ts
@@ -0,0 +1,10 @@
+export function formatBytes(bytes: number): string {
+  const units = ['B', 'KB', 'MB', 'GB'];
+  let size = bytes;
+  let i = 0;
+  while (size >= 1024 && i < units.length - 1) {
+    size /= 1024;
+    i++;
+  }
+  return `${size.toFixed(1)} ${units[i]}`;
+}
diff --git a/src/renderer/utils/github/index.ts b/src/renderer/utils/github/index.ts
new file mode 100644
index 0000000000..6d5a6ef495
--- /dev/null
+++ b/src/renderer/utils/github/index.ts
@@ -0,0 +1,2 @@
+export * from './types';
+export * from './utils';
diff --git a/src/renderer/utils/github/types.ts b/src/renderer/utils/github/types.ts
new file mode 100644
index 0000000000..c42ab7ed13
--- /dev/null
+++ b/src/renderer/utils/github/types.ts
@@ -0,0 +1,13 @@
+import type { PullRequestCheck } from '@shared/pull-requests';
+
+export type CheckRun = PullRequestCheck;
+
+export interface CheckRunsSummary {
+  total: number;
+  completed: number;
+  passed: number;
+  failed: number;
+  pending: number;
+  skipped: number;
+  cancelled: number;
+}
diff --git a/src/renderer/utils/github/utils.ts b/src/renderer/utils/github/utils.ts
new file mode 100644
index 0000000000..925479d9d2
--- /dev/null
+++ b/src/renderer/utils/github/utils.ts
@@ -0,0 +1,102 @@
+import { formatDistanceToNow } from 'date-fns';
+import type { CheckRun, CheckRunsSummary } from './types';
+
+// ── GitHub URL helpers (renderer-side) ────────────────────────────────────────
+
+/** Returns true if the URL refers to a GitHub.com remote (SSH or HTTPS). */
+export function isGitHubUrl(url: string): boolean {
+  return /github\.com/i.test(url);
+}
+
+/**
+ * Normalises a GitHub remote URL to the canonical HTTPS form without `.git`.
+ * e.g. `git@github.com:owner/repo.git` → `https://github.com/owner/repo`
+ */
+export function normalizeGitHubUrl(url: string): string {
+  // SSH format: git@github.com:owner/repo.git
+  const ssh = /^git@github\.com:([^/]+\/[^/]+?)(?:\.git)?$/.exec(url);
+  if (ssh) return `https://github.com/${ssh[1]}`;
+  // HTTPS format: strip trailing .git
+  return url.replace(/\.git$/, '');
+}
+
+export type CheckRunBucket = 'pass' | 'fail' | 'pending' | 'skipping' | 'cancel';
+
+/** Derive a display bucket from a check's raw status and conclusion fields. */
+export function computeCheckBucket(check: CheckRun): CheckRunBucket {
+  const status = check.status?.toUpperCase() ?? '';
+  const conclusion = check.conclusion?.toUpperCase() ?? null;
+
+  if (
+    status === 'IN_PROGRESS' ||
+    status === 'QUEUED' ||
+    status === 'WAITING' ||
+    status === 'PENDING'
+  ) {
+    return 'pending';
+  }
+  if (!conclusion || conclusion === 'NEUTRAL') return 'skipping';
+  if (conclusion === 'SUCCESS') return 'pass';
+  if (conclusion === 'FAILURE' || conclusion === 'TIMED_OUT' || conclusion === 'ACTION_REQUIRED')
+    return 'fail';
+  if (conclusion === 'CANCELLED' || conclusion === 'STALE') return 'cancel';
+  if (conclusion === 'SKIPPED') return 'skipping';
+  return 'skipping';
+}
+
+export function computeCheckRunsSummary(checks: CheckRun[]): CheckRunsSummary {
+  const summary: CheckRunsSummary = {
+    total: checks.length,
+    completed: 0,
+    passed: 0,
+    failed: 0,
+    pending: 0,
+    skipped: 0,
+    cancelled: 0,
+  };
+  for (const c of checks) {
+    const bucket = computeCheckBucket(c);
+    switch (bucket) {
+      case 'pass':
+        summary.passed++;
+        break;
+      case 'fail':
+        summary.failed++;
+        break;
+      case 'pending':
+        summary.pending++;
+        break;
+      case 'skipping':
+        summary.skipped++;
+        break;
+      case 'cancel':
+        summary.cancelled++;
+        break;
+    }
+  }
+  summary.completed = summary.total - summary.pending;
+  return summary;
+}
+
+export function formatRelativeTime(dateStr: string): string {
+  const date = new Date(dateStr);
+  if (isNaN(date.getTime())) return '';
+  return formatDistanceToNow(date, { addSuffix: true });
+}
+
+export function formatCheckDuration(startedAt?: string, completedAt?: string): string | null {
+  if (!startedAt || !completedAt) return null;
+  const start = new Date(startedAt).getTime();
+  const end = new Date(completedAt).getTime();
+  if (isNaN(start) || isNaN(end)) return null;
+  const diffMs = end - start;
+  if (diffMs < 0) return null;
+
+  const totalSeconds = Math.floor(diffMs / 1000);
+  const hours = Math.floor(totalSeconds / 3600);
+  const minutes = Math.floor((totalSeconds % 3600) / 60);
+
+  if (hours > 0) return `${hours}h ${minutes}m`;
+  if (minutes > 0) return `${minutes}m ${totalSeconds % 60}s`;
+  return '<1m';
+}
diff --git a/src/renderer/lib/languageUtils.ts b/src/renderer/utils/languageUtils.ts
similarity index 100%
rename from src/renderer/lib/languageUtils.ts
rename to src/renderer/utils/languageUtils.ts
diff --git a/src/renderer/utils/logger.ts b/src/renderer/utils/logger.ts
new file mode 100644
index 0000000000..398fe56427
--- /dev/null
+++ b/src/renderer/utils/logger.ts
@@ -0,0 +1,3 @@
+import { createLogger } from '@shared/logger';
+
+export const log = createLogger();
diff --git a/src/renderer/utils/mcp-icon-data.ts b/src/renderer/utils/mcp-icon-data.ts
new file mode 100644
index 0000000000..26cde8c541
--- /dev/null
+++ b/src/renderer/utils/mcp-icon-data.ts
@@ -0,0 +1,24 @@
+export function coerceRawSvgContent(payload: unknown): string | undefined {
+  if (typeof payload === 'string') {
+    return payload;
+  }
+
+  if (
+    payload &&
+    typeof payload === 'object' &&
+    'default' in payload &&
+    typeof payload.default === 'string'
+  ) {
+    return payload.default;
+  }
+
+  return undefined;
+}
+
+export function prepareInlineSvgMarkup(svgContent: string): string {
+  return svgContent
+    .replace(/\bwidth="[^"]*"/g, '')
+    .replace(/\bheight="[^"]*"/g, '')
+    .replace(/<style>[\s\S]*?<\/style>/g, '')
+    .replace('<svg ', '<svg fill="currentColor" class="h-full w-full" ');
+}
diff --git a/src/renderer/utils/mcpIcons.tsx b/src/renderer/utils/mcpIcons.tsx
new file mode 100644
index 0000000000..5377413cce
--- /dev/null
+++ b/src/renderer/utils/mcpIcons.tsx
@@ -0,0 +1,59 @@
+import { Server } from 'lucide-react';
+import React from 'react';
+import { coerceRawSvgContent, prepareInlineSvgMarkup } from './mcp-icon-data';
+
+const svgs = import.meta.glob('../../assets/images/mcp/*.svg', { query: '?raw', eager: true });
+const pngs = import.meta.glob('../../assets/images/mcp/*.png', { eager: true, import: 'default' });
+
+function keyFromPath(path: string): string {
+  return path
+    .split('/')
+    .pop()!
+    .replace(/\.\w+$/, '');
+}
+
+const svgByKey = new Map(
+  Object.entries(svgs).map(([p, d]) => [keyFromPath(p), coerceRawSvgContent(d)])
+);
+const pngByKey = new Map(Object.entries(pngs).map(([p, d]) => [keyFromPath(p), d as string]));
+
+function getIcon(
+  key: string
+): { type: 'svg'; data: string } | { type: 'png'; url: string } | undefined {
+  const svg = svgByKey.get(key);
+  if (typeof svg === 'string') return { type: 'svg', data: svg };
+  const png = pngByKey.get(key);
+  if (png) return { type: 'png', url: png };
+  return undefined;
+}
+
+const ICON_CONTAINER = 'flex h-10 w-10 shrink-0 items-center justify-center rounded-xl bg-muted/40';
+
+export const McpServerIcon: React.FC<{ name: string; iconKey?: string }> = ({ name, iconKey }) => {
+  const icon = iconKey ? getIcon(iconKey) : undefined;
+
+  if (icon?.type === 'svg') {
+    const processed = prepareInlineSvgMarkup(icon.data);
+    return (
+      <div className={`${ICON_CONTAINER} p-2`} dangerouslySetInnerHTML={{ __html: processed }} />
+    );
+  }
+
+  if (icon?.type === 'png') {
+    return (
+      <div className={`${ICON_CONTAINER} p-2`}>
+        <img
+          src={icon.url}
+          alt={name}
+          className="h-full w-full object-contain brightness-0 dark:invert"
+        />
+      </div>
+    );
+  }
+
+  return (
+    <div className={ICON_CONTAINER}>
+      <Server className="h-5 w-5 text-muted-foreground" />
+    </div>
+  );
+};
diff --git a/src/renderer/lib/soundPlayer.ts b/src/renderer/utils/soundPlayer.ts
similarity index 78%
rename from src/renderer/lib/soundPlayer.ts
rename to src/renderer/utils/soundPlayer.ts
index f77aacd2ed..0f910e6eb8 100644
--- a/src/renderer/lib/soundPlayer.ts
+++ b/src/renderer/utils/soundPlayer.ts
@@ -1,9 +1,22 @@
-import type { SoundEvent } from '@shared/agentEvents';
+import type { NotificationSettings } from '@shared/app-settings';
+import type { SoundEvent } from '@shared/events/agentEvents';
+import { rpc } from '../lib/ipc';
 
 let audioCtx: AudioContext | null = null;
 let enabled = true;
 let focusMode: 'always' | 'unfocused' = 'always';
 
+export function initSoundPlayer(): void {
+  rpc.appSettings
+    .getWithMeta('notifications')
+    .then((meta) => {
+      const value = (meta as { value: NotificationSettings }).value;
+      enabled = value.sound ?? true;
+      focusMode = value.soundFocusMode ?? 'always';
+    })
+    .catch(() => {});
+}
+
 function getContext(): AudioContext {
   if (!audioCtx) {
     audioCtx = new AudioContext();
@@ -65,12 +78,4 @@ export const soundPlayer = {
       // Audio may fail if user hasn't interacted with page yet
     }
   },
-
-  setEnabled(value: boolean): void {
-    enabled = value;
-  },
-
-  setFocusMode(mode: 'always' | 'unfocused'): void {
-    focusMode = mode;
-  },
 };
diff --git a/src/renderer/utils/taskNames.ts b/src/renderer/utils/taskNames.ts
new file mode 100644
index 0000000000..f126260bd8
--- /dev/null
+++ b/src/renderer/utils/taskNames.ts
@@ -0,0 +1,41 @@
+export const MAX_TASK_NAME_LENGTH = 64;
+
+export const liveTransformTaskName = (input: string): string =>
+  input
+    .toLowerCase()
+    .replace(/\s+/g, '-')
+    .replace(/[^a-z0-9-]/g, '')
+    .replace(/-+/g, '-')
+    .slice(0, MAX_TASK_NAME_LENGTH);
+
+export const normalizeTaskName = (input: string): string =>
+  input
+    .trim()
+    .toLowerCase()
+    .replace(/\s+/g, '-')
+    .replace(/[^a-z0-9-]/g, '')
+    .replace(/-+/g, '-')
+    .replace(/^-+|-+$/g, '')
+    .slice(0, MAX_TASK_NAME_LENGTH);
+
+export const ensureUniqueTaskName = (
+  baseName: string,
+  existingNames: Iterable<string>,
+  maxAttempts = 6
+): string => {
+  const normalizedExisting = new Set(
+    Array.from(existingNames, (name) => normalizeTaskName(name)).filter(Boolean)
+  );
+  const base = normalizeTaskName(baseName);
+  if (base && !normalizedExisting.has(base)) return base;
+
+  for (let i = 2; i < 2 + maxAttempts; i++) {
+    const candidate = normalizeTaskName(`${baseName}-${i}`);
+    if (candidate && !normalizedExisting.has(candidate)) {
+      return candidate;
+    }
+  }
+
+  const fallback = normalizeTaskName(`${baseName}-${Date.now().toString(36)}`);
+  return fallback || base;
+};
diff --git a/src/renderer/utils/telemetry-scope.ts b/src/renderer/utils/telemetry-scope.ts
new file mode 100644
index 0000000000..d42cc88f53
--- /dev/null
+++ b/src/renderer/utils/telemetry-scope.ts
@@ -0,0 +1,35 @@
+import type { TelemetryEnvelope } from '@shared/telemetry';
+
+type TelemetryScope = Pick<TelemetryEnvelope, 'project_id' | 'task_id' | 'conversation_id'>;
+
+const scope: TelemetryScope = {
+  project_id: undefined,
+  task_id: undefined,
+  conversation_id: undefined,
+};
+
+export function setTelemetryTaskScope({
+  projectId,
+  taskId,
+}: {
+  projectId: string;
+  taskId: string;
+}): void {
+  scope.project_id = projectId;
+  scope.task_id = taskId;
+  scope.conversation_id = undefined;
+}
+
+export function clearTelemetryTaskScope(): void {
+  scope.project_id = undefined;
+  scope.task_id = undefined;
+  scope.conversation_id = undefined;
+}
+
+export function setTelemetryConversationScope(conversationId: string | null): void {
+  scope.conversation_id = conversationId ?? undefined;
+}
+
+export function getTelemetryScope(): TelemetryScope {
+  return { ...scope };
+}
diff --git a/src/renderer/utils/telemetryClient.ts b/src/renderer/utils/telemetryClient.ts
new file mode 100644
index 0000000000..3dad312cc3
--- /dev/null
+++ b/src/renderer/utils/telemetryClient.ts
@@ -0,0 +1,62 @@
+/**
+ * Simple telemetry client for renderer process.
+ * Captures events and sends them to the main process via IPC.
+ */
+import type { TelemetryEvent, TelemetryProperties } from '@shared/telemetry';
+import { rpc } from '../lib/ipc';
+import { focusTracker } from './focus-tracker';
+import { getTelemetryScope } from './telemetry-scope';
+
+let cachedSessionId: string | null | undefined;
+let pendingSessionIdPromise: Promise<string | null> | null = null;
+
+async function getSessionId(): Promise<string | null> {
+  if (cachedSessionId !== undefined) return cachedSessionId;
+  if (pendingSessionIdPromise) return pendingSessionIdPromise;
+
+  pendingSessionIdPromise = rpc.telemetry
+    .getStatus()
+    .then((result) => {
+      cachedSessionId = result.status?.session_id ?? null;
+      return cachedSessionId;
+    })
+    .catch(() => {
+      return null;
+    })
+    .finally(() => {
+      pendingSessionIdPromise = null;
+    });
+
+  return pendingSessionIdPromise;
+}
+
+async function captureWithProps(event: TelemetryEvent, properties?: Record<string, unknown>) {
+  const sessionId = await getSessionId();
+
+  void rpc.telemetry
+    .capture({
+      event,
+      properties: {
+        ...(properties ?? {}),
+        ...getTelemetryScope(),
+        ...(sessionId ? { session_id: sessionId } : {}),
+      },
+    })
+    .catch(() => {});
+}
+
+export function captureTelemetry<E extends TelemetryEvent>(
+  event: E,
+  properties?: TelemetryProperties<E>
+): void {
+  void captureWithProps(event, {
+    ...focusTracker.getContext(),
+    ...(properties as Record<string, unknown> | undefined),
+  }).catch(() => {
+    // Telemetry failures never break the app
+  });
+}
+
+focusTracker.setTransitionEmitter((properties) => {
+  captureTelemetry('focus_changed', properties);
+});
diff --git a/src/renderer/utils/utils.ts b/src/renderer/utils/utils.ts
new file mode 100644
index 0000000000..2819a830d2
--- /dev/null
+++ b/src/renderer/utils/utils.ts
@@ -0,0 +1,6 @@
+import { clsx, type ClassValue } from 'clsx';
+import { twMerge } from 'tailwind-merge';
+
+export function cn(...inputs: ClassValue[]) {
+  return twMerge(clsx(inputs));
+}
diff --git a/src/renderer/views/Welcome.tsx b/src/renderer/views/Welcome.tsx
deleted file mode 100644
index 1ef0d77f65..0000000000
--- a/src/renderer/views/Welcome.tsx
+++ /dev/null
@@ -1,93 +0,0 @@
-import IconLight from '../../assets/images/emdash/icon-light.png';
-import YTBanner from '../../assets/images/ytbanner.png';
-import { Button } from '@/components/ui/button';
-import { motion, type Variants } from 'framer-motion';
-import { useTheme } from '@/hooks/useTheme';
-
-interface WelcomeScreenProps {
-  onGetStarted: () => void;
-}
-
-export function WelcomeScreen({ onGetStarted }: WelcomeScreenProps) {
-  const { effectiveTheme } = useTheme();
-
-  const containerVariants: Variants = {
-    hidden: { opacity: 0 },
-    visible: {
-      opacity: 1,
-      transition: {
-        staggerChildren: 0.3,
-        delayChildren: 0.7,
-      },
-    },
-  };
-
-  const itemVariants: Variants = {
-    hidden: { opacity: 0, y: 20 },
-    visible: {
-      opacity: 1,
-      y: 0,
-      transition: {
-        duration: 0.9,
-        ease: [0.25, 0.1, 0.25, 1] as [number, number, number, number], // Properly typed cubic-bezier
-      },
-    },
-  };
-
-  return (
-    <div className="fixed inset-0 z-50 flex items-center justify-center bg-background">
-      <div className="absolute bottom-0 left-0 right-0 h-3/5">
-        <div
-          className="absolute inset-0 opacity-40"
-          style={{
-            backgroundImage: `url(${YTBanner})`,
-            backgroundSize: 'cover',
-            backgroundPosition: 'center top',
-            maskImage:
-              'linear-gradient(to bottom, transparent 0%, transparent 30%, rgba(0,0,0,0.4) 60%, rgba(0,0,0,0.8) 100%)',
-            WebkitMaskImage:
-              'linear-gradient(to bottom, transparent 0%, transparent 30%, rgba(0,0,0,0.4) 60%, rgba(0,0,0,0.8) 100%)',
-          }}
-        />
-      </div>
-
-      <motion.div
-        className="relative z-10 flex flex-col items-center justify-center space-y-4 p-8"
-        variants={containerVariants}
-        initial="hidden"
-        animate="visible"
-      >
-        <motion.div
-          className="rounded-md border border-border/40 bg-white p-1.5 shadow-lg shadow-black/5 ring-1 ring-black/5 dark:shadow-white/5 dark:ring-white/10"
-          variants={itemVariants}
-        >
-          <img src={IconLight} alt="Emdash" className="h-12 w-12 rounded-sm" />
-        </motion.div>
-
-        <motion.h1
-          className="text-lg font-semibold tracking-tight text-foreground"
-          variants={itemVariants}
-        >
-          Welcome.
-        </motion.h1>
-
-        <motion.div
-          variants={itemVariants}
-          whileHover={{ scale: 1.02 }}
-          whileTap={{ scale: 0.97 }}
-          transition={{ duration: 0.1, ease: 'easeInOut' }}
-        >
-          <Button
-            onClick={onGetStarted}
-            size="sm"
-            className={
-              effectiveTheme === 'dark-black' ? 'bg-gray-200 text-gray-900 hover:bg-gray-300' : ''
-            }
-          >
-            Start shipping
-          </Button>
-        </motion.div>
-      </motion.div>
-    </div>
-  );
-}
diff --git a/src/renderer/views/Workspace.tsx b/src/renderer/views/Workspace.tsx
deleted file mode 100644
index 4b25c1fdab..0000000000
--- a/src/renderer/views/Workspace.tsx
+++ /dev/null
@@ -1,481 +0,0 @@
-import AppKeyboardShortcuts from '@/components/AppKeyboardShortcuts';
-import BrowserPane from '@/components/BrowserPane';
-import CommandPaletteWrapper from '@/components/CommandPaletteWrapper';
-import { DiffViewer } from '@/components/diff-viewer';
-import CodeEditor from '@/components/FileExplorer/CodeEditor';
-import { LeftSidebar } from '@/components/sidebar/LeftSidebar';
-import MainContentArea from '@/components/MainContentArea';
-import RightSidebar from '@/components/RightSidebar';
-import Titlebar from '@/components/titlebar/Titlebar';
-import { ResizablePanelGroup, ResizablePanel, ResizableHandle } from '@/components/ui/resizable';
-import { RightSidebarProvider, useRightSidebar } from '@/components/ui/right-sidebar';
-import { SidebarProvider } from '@/components/ui/sidebar';
-import { Toaster } from '@/components/ui/toaster';
-import { useModalContext } from '@/contexts/ModalProvider';
-import { ModalRenderer } from '@/components/ModalRenderer';
-import {
-  TITLEBAR_HEIGHT,
-  LEFT_SIDEBAR_MIN_SIZE,
-  LEFT_SIDEBAR_MAX_SIZE,
-  MAIN_PANEL_MIN_SIZE,
-  RIGHT_SIDEBAR_MIN_SIZE,
-  RIGHT_SIDEBAR_MAX_SIZE,
-} from '@/constants/layout';
-import { KeyboardSettingsProvider } from '@/contexts/KeyboardSettingsContext';
-import { useTaskManagementContext } from '@/contexts/TaskManagementContext';
-import { useAgentEvents } from '@/hooks/useAgentEvents';
-import { useAutoPrRefresh } from '@/hooks/useAutoPrRefresh';
-import { usePanelLayout } from '@/hooks/usePanelLayout';
-import { useProjectRemoteInfo } from '@/hooks/useProjectRemoteInfo';
-import { useProjectManagementContext } from '@/contexts/ProjectManagementProvider';
-import { useTheme } from '@/hooks/useTheme';
-import useUpdateNotifier from '@/hooks/useUpdateNotifier';
-import { activityStore } from '@/lib/activityStore';
-import { handleMenuUndo, handleMenuRedo } from '@/lib/menuUndoRedo';
-import { rpc } from '@/lib/rpc';
-import { soundPlayer } from '@/lib/soundPlayer';
-import BrowserProvider, { useBrowser } from '@/providers/BrowserProvider';
-import { useState, useCallback, useEffect, useRef, useMemo } from 'react';
-import { SettingsPageTab } from '@/components/SettingsPage';
-const PANEL_RESIZE_DRAGGING_EVENT = 'emdash:panel-resize-dragging';
-type ResizeHandleId = 'left' | 'right';
-
-const RightSidebarBridge: React.FC<{
-  onCollapsedChange: (collapsed: boolean) => void;
-  setCollapsedRef: React.MutableRefObject<((next: boolean) => void) | null>;
-}> = ({ onCollapsedChange, setCollapsedRef }) => {
-  const { collapsed, setCollapsed } = useRightSidebar();
-
-  useEffect(() => {
-    onCollapsedChange(collapsed);
-  }, [collapsed, onCollapsedChange]);
-
-  useEffect(() => {
-    setCollapsedRef.current = setCollapsed;
-    return () => {
-      setCollapsedRef.current = null;
-    };
-  }, [setCollapsed, setCollapsedRef]);
-
-  return null;
-};
-
-/** Bridge that reads BrowserProvider context and forwards it to AppKeyboardShortcuts */
-const BrowserAwareShortcuts: React.FC<
-  Omit<React.ComponentProps<typeof AppKeyboardShortcuts>, 'showBrowser' | 'handleCloseBrowser'>
-> = (props) => {
-  const browser = useBrowser();
-  return (
-    <AppKeyboardShortcuts
-      {...props}
-      showBrowser={browser.isOpen}
-      handleCloseBrowser={browser.close}
-    />
-  );
-};
-
-export function Workspace() {
-  useTheme(); // Initialize theme on app startup
-  const { showModal } = useModalContext();
-
-  // Agent event hook: plays sounds and updates sidebar status for all tasks
-  const handleAgentEvent = useCallback((event: import('@shared/agentEvents').AgentEvent) => {
-    activityStore.handleAgentEvent(event);
-  }, []);
-  useAgentEvents(handleAgentEvent);
-
-  // Load notification sound settings
-  useEffect(() => {
-    (async () => {
-      try {
-        const settings = await rpc.appSettings.get();
-        const notif = settings.notifications;
-        const masterEnabled = Boolean(notif?.enabled ?? true);
-        const soundOn = Boolean(notif?.sound ?? true);
-        soundPlayer.setEnabled(masterEnabled && soundOn);
-        soundPlayer.setFocusMode(notif?.soundFocusMode ?? 'always');
-      } catch {}
-    })();
-  }, []);
-
-  // --- View-mode / UI visibility state (inlined from former useModalState) ---
-  const [showSettingsPage, setShowSettingsPage] = useState(false);
-  const [settingsPageInitialTab, setSettingsPageInitialTab] = useState<SettingsPageTab>('general');
-  const [showCommandPalette, setShowCommandPalette] = useState(false);
-
-  const openSettingsPage = useCallback((tab: SettingsPageTab = 'general') => {
-    setSettingsPageInitialTab(tab);
-    setShowSettingsPage(true);
-  }, []);
-
-  const handleCloseSettingsPage = useCallback(() => setShowSettingsPage(false), []);
-  const handleToggleCommandPalette = useCallback(() => setShowCommandPalette((prev) => !prev), []);
-  const handleCloseCommandPalette = useCallback(() => setShowCommandPalette(false), []);
-  const [showDiffViewer, setShowDiffViewer] = useState(false);
-  const [diffViewerInitialFile, setDiffViewerInitialFile] = useState<string | null>(null);
-  const [diffViewerTaskPath, setDiffViewerTaskPath] = useState<string | null>(null);
-  const handleCloseDiffViewer = useCallback(() => {
-    setShowDiffViewer(false);
-    setDiffViewerInitialFile(null);
-    setDiffViewerTaskPath(null);
-  }, []);
-  const panelHandleDraggingRef = useRef<Record<ResizeHandleId, boolean>>({
-    left: false,
-    right: false,
-  });
-
-  const handlePanelResizeDragging = useCallback((handleId: ResizeHandleId, dragging: boolean) => {
-    if (panelHandleDraggingRef.current[handleId] === dragging) return;
-    const wasDragging = panelHandleDraggingRef.current.left || panelHandleDraggingRef.current.right;
-    panelHandleDraggingRef.current[handleId] = dragging;
-    const isDragging = panelHandleDraggingRef.current.left || panelHandleDraggingRef.current.right;
-    if (wasDragging === isDragging) return;
-    window.dispatchEvent(
-      new CustomEvent(PANEL_RESIZE_DRAGGING_EVENT, {
-        detail: { dragging: isDragging },
-      })
-    );
-  }, []);
-
-  useEffect(() => {
-    return () => {
-      const wasDragging =
-        panelHandleDraggingRef.current.left || panelHandleDraggingRef.current.right;
-      panelHandleDraggingRef.current.left = false;
-      panelHandleDraggingRef.current.right = false;
-      if (!wasDragging) return;
-      window.dispatchEvent(
-        new CustomEvent(PANEL_RESIZE_DRAGGING_EVENT, {
-          detail: { dragging: false },
-        })
-      );
-    };
-  }, []);
-
-  // Listen for native menu "Settings" click (main → renderer)
-  useEffect(() => {
-    const cleanup = window.electronAPI.onMenuOpenSettings?.(() => {
-      openSettingsPage();
-    });
-    return () => cleanup?.();
-  }, [openSettingsPage]);
-
-  // Listen for native menu Undo/Redo (main → renderer) and keep operations editor-scoped.
-  useEffect(() => {
-    const cleanupUndo = window.electronAPI.onMenuUndo?.(() => {
-      handleMenuUndo();
-    });
-    const cleanupRedo = window.electronAPI.onMenuRedo?.(() => {
-      handleMenuRedo();
-    });
-    return () => {
-      cleanupUndo?.();
-      cleanupRedo?.();
-    };
-  }, []);
-
-  // Listen for native menu "Close Tab" (Cmd+W) — dispatches to active ChatInterface
-  useEffect(() => {
-    const cleanup = window.electronAPI.onMenuCloseTab?.(() => {
-      window.dispatchEvent(new CustomEvent('emdash:close-active-chat'));
-    });
-    return () => cleanup?.();
-  }, []);
-
-  // --- Project management (provided by ProjectManagementProvider in App.tsx) ---
-  const projectMgmt = useProjectManagementContext();
-  const { showEditorMode, setShowEditorMode, setShowKanban } = projectMgmt;
-
-  const handleToggleKanban = useCallback(() => {
-    if (!projectMgmt.selectedProject) return;
-    setShowEditorMode(false);
-    setShowKanban((v) => !v);
-  }, [projectMgmt.selectedProject, setShowEditorMode, setShowKanban]);
-  const handleToggleEditor = useCallback(() => {
-    setShowKanban(false);
-    setShowEditorMode((v) => !v);
-  }, [setShowKanban, setShowEditorMode]);
-  const handleCloseEditor = useCallback(() => setShowEditorMode(false), [setShowEditorMode]);
-  const handleCloseKanban = useCallback(() => setShowKanban(false), [setShowKanban]);
-
-  // --- Task management ---
-  const taskMgmt = useTaskManagementContext();
-
-  // Focus task when OS notification is clicked
-  const notificationFocusRef = useRef({
-    allTasks: taskMgmt.allTasks,
-    selectedProject: projectMgmt.selectedProject,
-    handleSelectTask: taskMgmt.handleSelectTask,
-  });
-  useEffect(() => {
-    notificationFocusRef.current = {
-      allTasks: taskMgmt.allTasks,
-      selectedProject: projectMgmt.selectedProject,
-      handleSelectTask: taskMgmt.handleSelectTask,
-    };
-  });
-
-  useEffect(() => {
-    const cleanup = window.electronAPI.onNotificationFocusTask((taskId: string) => {
-      const { allTasks, selectedProject, handleSelectTask } = notificationFocusRef.current;
-      const entry = allTasks.find((t) => t.task.id === taskId);
-      if (!entry) return;
-      const { task, project } = entry;
-      if (!selectedProject || selectedProject.id !== project.id) {
-        projectMgmt.activateProjectView(project);
-      }
-      setShowKanban(false);
-      setShowEditorMode(false);
-      handleCloseSettingsPage();
-      handleSelectTask(task);
-    });
-    return cleanup;
-  }, [projectMgmt.activateProjectView, handleCloseSettingsPage]);
-
-  // --- Panel layout ---
-  const {
-    defaultPanelLayout,
-    leftSidebarPanelRef,
-    rightSidebarPanelRef,
-    rightSidebarSetCollapsedRef,
-    handlePanelLayout,
-    handleSidebarContextChange,
-    handleRightSidebarCollapsedChange,
-  } = usePanelLayout({
-    showEditorMode,
-    showDiffViewer,
-    isInitialLoadComplete: projectMgmt.isInitialLoadComplete,
-    showHomeView: projectMgmt.showHomeView,
-    selectedProject: projectMgmt.selectedProject,
-    activeTask: taskMgmt.activeTask,
-  });
-
-  // Show toast on update availability
-  useUpdateNotifier({ checkOnMount: true, onOpenSettings: () => openSettingsPage('general') });
-
-  // Listen for native menu "Check for Updates" click (main → renderer)
-  useEffect(() => {
-    const cleanup = window.electronAPI.onMenuCheckForUpdates?.(() => {
-      showModal('updateModal', {});
-    });
-    return () => cleanup?.();
-  }, [showModal]);
-
-  // Auto-refresh PR status
-  useAutoPrRefresh(taskMgmt.activeTask?.path);
-
-  // --- Convenience aliases and SSH-derived remote connection info ---
-  const { selectedProject } = projectMgmt;
-  const { activeTask } = taskMgmt;
-  const activeTaskProjectPath = useMemo(
-    () =>
-      activeTask?.projectId
-        ? projectMgmt.projects.find((p) => p.id === activeTask.projectId)?.path || null
-        : null,
-    [activeTask, projectMgmt.projects]
-  );
-
-  const { connectionId: derivedRemoteConnectionId, remotePath: derivedRemotePath } =
-    useProjectRemoteInfo();
-
-  // Close modals before titlebar view toggles
-  const handleTitlebarKanbanToggle = useCallback(() => {
-    const isModalOpen = showCommandPalette || showSettingsPage;
-    if (isModalOpen) {
-      if (showCommandPalette) handleCloseCommandPalette();
-      if (showSettingsPage) handleCloseSettingsPage();
-      setTimeout(() => handleToggleKanban(), 100);
-    } else {
-      handleToggleKanban();
-    }
-  }, [
-    showCommandPalette,
-    showSettingsPage,
-    handleCloseCommandPalette,
-    handleCloseSettingsPage,
-    handleToggleKanban,
-  ]);
-
-  const handleTitlebarEditorToggle = useCallback(() => {
-    const isModalOpen = showCommandPalette || showSettingsPage;
-    if (isModalOpen) {
-      if (showCommandPalette) handleCloseCommandPalette();
-      if (showSettingsPage) handleCloseSettingsPage();
-      setTimeout(() => handleToggleEditor(), 100);
-    } else {
-      handleToggleEditor();
-    }
-  }, [
-    showCommandPalette,
-    showSettingsPage,
-    handleCloseCommandPalette,
-    handleCloseSettingsPage,
-    handleToggleEditor,
-  ]);
-
-  const handleOpenInEditor = useCallback(() => {
-    window.dispatchEvent(new CustomEvent('emdash:open-in-editor'));
-  }, []);
-
-  const handleToggleSettingsPage = useCallback(() => {
-    if (showSettingsPage) {
-      handleCloseSettingsPage();
-      return;
-    }
-    openSettingsPage();
-  }, [showSettingsPage, handleCloseSettingsPage, openSettingsPage]);
-
-  return (
-    <BrowserProvider>
-      <div
-        className="flex h-[100dvh] w-full flex-col bg-background text-foreground"
-        style={{ '--tb': TITLEBAR_HEIGHT } as React.CSSProperties}
-      >
-        <KeyboardSettingsProvider>
-          <SidebarProvider>
-            <RightSidebarProvider>
-              <BrowserAwareShortcuts
-                showCommandPalette={showCommandPalette}
-                showSettings={showSettingsPage}
-                showDiffViewer={showDiffViewer}
-                showEditor={showEditorMode && !!activeTask && !!selectedProject}
-                showKanban={!!projectMgmt.showKanban && !!selectedProject}
-                handleToggleCommandPalette={handleToggleCommandPalette}
-                handleOpenSettings={handleToggleSettingsPage}
-                handleCloseCommandPalette={handleCloseCommandPalette}
-                handleCloseSettings={handleCloseSettingsPage}
-                handleCloseDiffViewer={handleCloseDiffViewer}
-                handleCloseEditor={handleCloseEditor}
-                handleCloseKanban={handleCloseKanban}
-                handleToggleKanban={handleToggleKanban}
-                handleToggleEditor={handleToggleEditor}
-                handleOpenInEditor={handleOpenInEditor}
-              />
-              <RightSidebarBridge
-                onCollapsedChange={handleRightSidebarCollapsedChange}
-                setCollapsedRef={rightSidebarSetCollapsedRef}
-              />
-              <Titlebar
-                onToggleSettings={handleToggleSettingsPage}
-                isSettingsOpen={showSettingsPage}
-                onToggleKanban={handleTitlebarKanbanToggle}
-                onToggleEditor={handleTitlebarEditorToggle}
-              />
-              <div className="relative flex flex-1 overflow-hidden pt-[var(--tb)]">
-                <ResizablePanelGroup
-                  direction="horizontal"
-                  className="flex-1 overflow-hidden"
-                  onLayout={handlePanelLayout}
-                >
-                  <ResizablePanel
-                    ref={leftSidebarPanelRef}
-                    className="sidebar-panel sidebar-panel--left"
-                    defaultSize={defaultPanelLayout[0]}
-                    minSize={LEFT_SIDEBAR_MIN_SIZE}
-                    maxSize={LEFT_SIDEBAR_MAX_SIZE}
-                    collapsedSize={0}
-                    collapsible
-                    order={1}
-                    style={{ display: showEditorMode ? 'none' : undefined }}
-                  >
-                    <LeftSidebar
-                      onSidebarContextChange={handleSidebarContextChange}
-                      onCloseSettingsPage={handleCloseSettingsPage}
-                    />
-                  </ResizablePanel>
-                  <ResizableHandle
-                    withHandle
-                    onDragging={(dragging) => handlePanelResizeDragging('left', dragging)}
-                    className="hidden cursor-col-resize items-center justify-center transition-colors hover:bg-border/80 lg:flex"
-                  />
-                  <ResizablePanel
-                    className="sidebar-panel sidebar-panel--main"
-                    defaultSize={defaultPanelLayout[1]}
-                    minSize={MAIN_PANEL_MIN_SIZE}
-                    order={2}
-                  >
-                    <div className="flex h-full flex-col overflow-hidden bg-background text-foreground">
-                      {showDiffViewer ? (
-                        <DiffViewer
-                          onClose={handleCloseDiffViewer}
-                          taskId={activeTask?.id}
-                          taskPath={diffViewerTaskPath || activeTask?.path}
-                          initialFile={diffViewerInitialFile}
-                        />
-                      ) : (
-                        <MainContentArea
-                          showSettingsPage={showSettingsPage}
-                          settingsPageInitialTab={settingsPageInitialTab}
-                          handleCloseSettingsPage={handleCloseSettingsPage}
-                        />
-                      )}
-                    </div>
-                  </ResizablePanel>
-                  <ResizableHandle
-                    withHandle
-                    onDragging={(dragging) => handlePanelResizeDragging('right', dragging)}
-                    className="hidden cursor-col-resize items-center justify-center transition-colors hover:bg-border/80 sm:flex"
-                  />
-                  <ResizablePanel
-                    ref={rightSidebarPanelRef}
-                    className="sidebar-panel sidebar-panel--right"
-                    defaultSize={defaultPanelLayout[2]}
-                    minSize={RIGHT_SIDEBAR_MIN_SIZE}
-                    maxSize={RIGHT_SIDEBAR_MAX_SIZE}
-                    collapsedSize={0}
-                    collapsible
-                    order={3}
-                  >
-                    <RightSidebar
-                      task={activeTask}
-                      projectPath={selectedProject?.path || activeTaskProjectPath}
-                      projectRemoteConnectionId={derivedRemoteConnectionId}
-                      projectRemotePath={derivedRemotePath}
-                      projectDefaultBranch={projectMgmt.projectDefaultBranch}
-                      className="lg:border-l-0"
-                      forceBorder={showEditorMode}
-                      onOpenChanges={(filePath?: string, taskPath?: string) => {
-                        setDiffViewerInitialFile(filePath ?? null);
-                        setDiffViewerTaskPath(taskPath ?? null);
-                        setShowDiffViewer(true);
-                      }}
-                    />
-                  </ResizablePanel>
-                </ResizablePanelGroup>
-              </div>
-              <CommandPaletteWrapper
-                isOpen={showCommandPalette}
-                onClose={handleCloseCommandPalette}
-                handleGoHome={() => {
-                  handleCloseSettingsPage();
-                  projectMgmt.handleGoHome();
-                }}
-                handleOpenSettings={() => openSettingsPage()}
-                handleOpenKeyboardShortcuts={() => openSettingsPage('interface')}
-              />
-              {showEditorMode && activeTask && selectedProject && (
-                <CodeEditor
-                  taskId={activeTask.id}
-                  taskPath={activeTask.path}
-                  taskName={activeTask.name}
-                  projectName={selectedProject.name}
-                  onClose={handleCloseEditor}
-                  connectionId={derivedRemoteConnectionId}
-                  remotePath={derivedRemotePath}
-                />
-              )}
-
-              <ModalRenderer />
-              <Toaster />
-              <BrowserPane
-                taskId={activeTask?.id || null}
-                taskPath={activeTask?.path || null}
-                overlayActive={showSettingsPage || showCommandPalette}
-              />
-            </RightSidebarProvider>
-          </SidebarProvider>
-        </KeyboardSettingsProvider>
-      </div>
-    </BrowserProvider>
-  );
-}
diff --git a/src/shared/agent-auto-approve-defaults.ts b/src/shared/agent-auto-approve-defaults.ts
new file mode 100644
index 0000000000..d524fd43e2
--- /dev/null
+++ b/src/shared/agent-auto-approve-defaults.ts
@@ -0,0 +1,18 @@
+import type { AgentProviderId } from './agent-provider-registry';
+
+export type AgentAutoApproveDefaults = Partial<Record<AgentProviderId, boolean>>;
+
+export function getAgentAutoApproveDefault(
+  defaults: AgentAutoApproveDefaults | undefined,
+  providerId: AgentProviderId
+): boolean {
+  return defaults?.[providerId] ?? false;
+}
+
+export function resolveAgentAutoApprove(
+  explicitAutoApprove: boolean | undefined,
+  defaults: AgentAutoApproveDefaults | undefined,
+  providerId: AgentProviderId
+): boolean {
+  return explicitAutoApprove ?? getAgentAutoApproveDefault(defaults, providerId);
+}
diff --git a/src/shared/agent-provider-registry.ts b/src/shared/agent-provider-registry.ts
new file mode 100644
index 0000000000..7beace9b5e
--- /dev/null
+++ b/src/shared/agent-provider-registry.ts
@@ -0,0 +1,464 @@
+export const AGENT_PROVIDER_IDS = [
+  'codex',
+  'claude',
+  'qwen',
+  'droid',
+  'gemini',
+  'cursor',
+  'copilot',
+  'amp',
+  'opencode',
+  'charm',
+  'auggie',
+  'goose',
+  'kimi',
+  'kilocode',
+  'kiro',
+  'rovo',
+  'cline',
+  'continue',
+  'codebuff',
+  'mistral',
+  'pi',
+  'autohand',
+] as const;
+
+export type AgentProviderId = (typeof AGENT_PROVIDER_IDS)[number];
+
+export type AgentProviderDefinition = {
+  id: AgentProviderId;
+  name: string;
+  /** Short one-liner shown in the agent info card. */
+  description?: string;
+  docUrl?: string;
+  installCommand?: string;
+  commands?: string[];
+  versionArgs?: string[];
+  detectable?: boolean;
+  cli?: string;
+  autoApproveFlag?: string;
+  initialPromptFlag?: string;
+  /**
+   * When true, the initial prompt is delivered via keystroke injection
+   * (typing into the TUI after startup) instead of as a CLI argument.
+   * Use for agents whose CLI has no flag for interactive-mode prompt delivery.
+   */
+  useKeystrokeInjection?: boolean;
+  resumeFlag?: string;
+  /**
+   * CLI flag to assign a unique session ID per chat instance.
+   * Used to isolate session state when multiple chats of the same provider
+   * run in the same worktree. The flag receives a deterministic UUID
+   * derived from the Emdash conversation ID.
+   * e.g. '--session-id' for Claude Code.
+   */
+  sessionIdFlag?: string;
+  defaultArgs?: string[];
+  planActivateCommand?: string;
+  autoStartCommand?: string;
+  icon?: string;
+  /** Accessible alt text for the provider logo. */
+  alt?: string;
+  /** When true, the logo should be colour-inverted in dark mode. */
+  invertInDark?: boolean;
+  terminalOnly?: boolean;
+  supportsHooks?: boolean;
+};
+
+export const AGENT_PROVIDERS: AgentProviderDefinition[] = [
+  {
+    id: 'codex',
+    name: 'Codex',
+    description:
+      'CLI that connects to OpenAI models for project-aware code assistance and terminal workflows.',
+    docUrl: 'https://github.com/openai/codex',
+    installCommand: 'npm install -g @openai/codex',
+    commands: ['codex'],
+    versionArgs: ['--version'],
+    cli: 'codex',
+    autoApproveFlag: '--full-auto',
+    initialPromptFlag: '',
+    resumeFlag: 'resume --last',
+    icon: 'openai.svg',
+    alt: 'Codex',
+    terminalOnly: true,
+    supportsHooks: true,
+  },
+  {
+    id: 'claude',
+    name: 'Claude Code',
+    description:
+      'CLI that uses Anthropic Claude for code edits, explanations, and structured refactors in the terminal.',
+    docUrl: 'https://docs.anthropic.com/claude/docs/claude-code',
+    installCommand: 'curl -fsSL https://claude.ai/install.sh | bash',
+    commands: ['claude'],
+    versionArgs: ['--version'],
+    cli: 'claude',
+    autoApproveFlag: '--dangerously-skip-permissions',
+    initialPromptFlag: '',
+    resumeFlag: '--resume',
+    sessionIdFlag: '--session-id',
+    planActivateCommand: '/plan',
+    icon: 'claude.png',
+    alt: 'Claude Code',
+    terminalOnly: true,
+    supportsHooks: true,
+  },
+  {
+    id: 'cursor',
+    name: 'Cursor',
+    description:
+      "Cursor's agent CLI; provides editor-style, project-aware assistance from the shell.",
+    docUrl: 'https://cursor.sh',
+    installCommand: 'curl https://cursor.com/install -fsS | bash',
+    commands: ['cursor-agent'],
+    versionArgs: ['--version'],
+    cli: 'cursor-agent',
+    autoApproveFlag: '-f',
+    initialPromptFlag: '',
+    icon: 'cursor.svg',
+    alt: 'Cursor CLI',
+    terminalOnly: true,
+  },
+  {
+    id: 'gemini',
+    name: 'Gemini',
+    description:
+      'CLI that uses Google Gemini models to assist with coding, reasoning, and command-line tasks.',
+    docUrl: 'https://github.com/google-gemini/gemini-cli',
+    installCommand: 'npm install -g @google/gemini-cli',
+    commands: ['gemini'],
+    versionArgs: ['--version'],
+    cli: 'gemini',
+    autoApproveFlag: '--yolo',
+    initialPromptFlag: '-i',
+    resumeFlag: '--resume',
+    icon: 'gemini.png',
+    alt: 'Gemini CLI',
+    terminalOnly: true,
+  },
+  {
+    id: 'qwen',
+    name: 'Qwen Code',
+    description:
+      "Command-line interface to Alibaba's Qwen Code models for coding assistance and code completion.",
+    docUrl: 'https://github.com/QwenLM/qwen-code',
+    installCommand: 'npm install -g @qwen-code/qwen-code',
+    commands: ['qwen'],
+    versionArgs: ['--version'],
+    cli: 'qwen',
+    autoApproveFlag: '--yolo',
+    initialPromptFlag: '-i',
+    resumeFlag: '--continue',
+    icon: 'qwen.png',
+    alt: 'Qwen Code CLI',
+    terminalOnly: true,
+  },
+  {
+    id: 'droid',
+    name: 'Droid',
+    description: "Factory AI's agent CLI for running multi-step coding tasks from the terminal.",
+    docUrl: 'https://docs.factory.ai/cli/getting-started/quickstart',
+    installCommand: 'curl -fsSL https://app.factory.ai/cli | sh',
+    commands: ['droid'],
+    versionArgs: ['--version'],
+    cli: 'droid',
+    initialPromptFlag: '',
+    resumeFlag: '-r',
+    icon: 'droid.svg',
+    alt: 'Factory Droid',
+    terminalOnly: true,
+  },
+  {
+    id: 'amp',
+    name: 'Amp',
+    description:
+      'Amp Code CLI for agentic coding sessions against your repository from the terminal.',
+    docUrl: 'https://ampcode.com/manual#install',
+    installCommand: 'npm install -g @sourcegraph/amp@latest',
+    commands: ['amp'],
+    versionArgs: ['--version'],
+    cli: 'amp',
+    autoApproveFlag: '--dangerously-allow-all',
+    initialPromptFlag: '',
+    useKeystrokeInjection: true,
+    icon: 'ampcode.png',
+    alt: 'Amp CLI',
+    terminalOnly: true,
+  },
+  {
+    id: 'opencode',
+    name: 'OpenCode',
+    description:
+      'OpenCode CLI that interfaces with models for code generation and edits from the shell.',
+    docUrl: 'https://opencode.ai/docs/cli/',
+    installCommand: 'npm install -g opencode-ai',
+    commands: ['opencode'],
+    versionArgs: ['--version'],
+    cli: 'opencode',
+    initialPromptFlag: '',
+    useKeystrokeInjection: true,
+    icon: 'opencode.png',
+    alt: 'OpenCode CLI',
+    invertInDark: true,
+    terminalOnly: true,
+  },
+  {
+    id: 'copilot',
+    name: 'GitHub Copilot',
+    description:
+      'GitHub Copilot CLI brings Copilot prompts to the terminal for code, shell, and search help.',
+    docUrl: 'https://docs.github.com/en/copilot/how-tos/set-up/install-copilot-cli',
+    installCommand: 'npm install -g @github/copilot',
+    commands: ['copilot'],
+    versionArgs: ['--version'],
+    cli: 'copilot',
+    autoApproveFlag: '--allow-all-tools',
+    icon: 'gh-copilot.svg',
+    alt: 'GitHub Copilot CLI',
+    terminalOnly: true,
+  },
+  {
+    id: 'charm',
+    name: 'Charm',
+    description: 'Charm Crush agent CLI providing terminal-first AI assistance for coding tasks.',
+    docUrl: 'https://github.com/charmbracelet/crush',
+    installCommand: 'npm install -g @charmland/crush',
+    commands: ['crush'],
+    versionArgs: ['--version'],
+    cli: 'crush',
+    autoApproveFlag: '--yolo',
+    icon: 'charm.png',
+    alt: 'Charm CLI',
+    invertInDark: true,
+    terminalOnly: true,
+  },
+  {
+    id: 'auggie',
+    name: 'Auggie',
+    description:
+      'Augment Code CLI to run an agent against your repository for code changes and reviews.',
+    docUrl: 'https://docs.augmentcode.com/cli/overview',
+    installCommand: 'npm install -g @augmentcode/auggie',
+    commands: ['auggie'],
+    versionArgs: ['--version'],
+    cli: 'auggie',
+    initialPromptFlag: '',
+    // otherwise user is prompted each time before prompt is passed
+    defaultArgs: ['--allow-indexing'],
+    icon: 'Auggie.svg',
+    alt: 'Auggie CLI',
+    terminalOnly: true,
+  },
+  {
+    id: 'goose',
+    name: 'Goose',
+    description: 'Goose CLI that routes tasks to tools and models for coding workflows.',
+    docUrl: 'https://block.github.io/goose/docs/quickstart/',
+    installCommand:
+      'curl -fsSL https://github.com/block/goose/releases/download/stable/download_cli.sh | bash',
+    commands: ['goose'],
+    versionArgs: ['--version'],
+    cli: 'goose',
+    // run subcommand with -s for interactive mode after initial prompt
+    defaultArgs: ['run', '-s'],
+    initialPromptFlag: '-t',
+    icon: 'goose.png',
+    alt: 'Goose CLI',
+    terminalOnly: true,
+  },
+  {
+    id: 'kimi',
+    name: 'Kimi',
+    description:
+      'Kimi CLI by Moonshot AI, with shell execution, Zsh integration, ACP, and MCP support.',
+    docUrl: 'https://www.kimi.com/code/docs/en/kimi-cli/guides/getting-started.html',
+    installCommand: 'uv tool install kimi-cli',
+    commands: ['kimi'],
+    versionArgs: ['--version'],
+    cli: 'kimi',
+    autoApproveFlag: '--yolo',
+    initialPromptFlag: '-c',
+    icon: 'kimi.png',
+    alt: 'Kimi CLI',
+    terminalOnly: true,
+  },
+  {
+    id: 'kilocode',
+    name: 'Kilocode',
+    description:
+      'Kilo AI coding assistant with multiple modes, broad model support, and checkpoint-based workflows.',
+    docUrl: 'https://kilo.ai/docs/cli',
+    installCommand: 'npm install -g @kilocode/cli',
+    commands: ['kilocode'],
+    versionArgs: ['--version'],
+    cli: 'kilocode',
+    autoApproveFlag: '--auto',
+    initialPromptFlag: '',
+    resumeFlag: '--continue',
+    icon: 'kilocode.png',
+    alt: 'Kilocode CLI',
+    terminalOnly: true,
+  },
+  {
+    id: 'kiro',
+    name: 'Kiro (AWS)',
+    description:
+      'Kiro CLI by AWS, focused on interactive terminal-first development assistance and workflow automation.',
+    docUrl: 'https://kiro.dev/docs/cli/',
+    installCommand: 'curl -fsSL https://cli.kiro.dev/install | bash',
+    commands: ['kiro-cli'],
+    versionArgs: ['--version'],
+    cli: 'kiro-cli',
+    defaultArgs: ['chat'],
+    initialPromptFlag: '',
+    icon: 'kiro.png',
+    alt: 'Kiro CLI',
+    terminalOnly: true,
+  },
+  {
+    id: 'rovo',
+    name: 'Rovo Dev',
+    description:
+      'Atlassian Rovo Dev CLI integrates terminal assistance with Jira, Confluence, and Bitbucket workflows.',
+    docUrl: 'https://support.atlassian.com/rovo/docs/install-and-run-rovo-dev-cli-on-your-device/',
+    installCommand: 'acli rovodev auth login',
+    commands: ['rovodev', 'acli'],
+    versionArgs: ['--version'],
+    autoApproveFlag: '--yolo',
+    autoStartCommand: 'acli rovodev run',
+    icon: 'atlassian.png',
+    alt: 'Rovo Dev CLI',
+    terminalOnly: true,
+  },
+  {
+    id: 'cline',
+    name: 'Cline',
+    description:
+      'Cline CLI runs coding agents directly in your terminal with multi-provider model support.',
+    docUrl: 'https://docs.cline.bot/cline-cli/overview',
+    installCommand: 'npm install -g cline',
+    commands: ['cline'],
+    versionArgs: ['help'],
+    cli: 'cline',
+    autoApproveFlag: '--yolo',
+    initialPromptFlag: '',
+    icon: 'cline.png',
+    alt: 'Cline CLI',
+    terminalOnly: true,
+  },
+  {
+    id: 'continue',
+    name: 'Continue',
+    description:
+      'Continue CLI is a modular coding agent with configurable models, rules, and MCP tool support.',
+    docUrl: 'https://docs.continue.dev/guides/cli',
+    installCommand: 'npm i -g @continuedev/cli',
+    commands: ['cn'],
+    versionArgs: ['--version'],
+    cli: 'cn',
+    initialPromptFlag: '-p',
+    resumeFlag: '--resume',
+    icon: 'continue.png',
+    alt: 'Continue CLI',
+    terminalOnly: true,
+  },
+  {
+    id: 'codebuff',
+    name: 'Codebuff',
+    description:
+      'Codebuff is an AI coding agent for project-directory assistance and day-to-day development tasks.',
+    docUrl: 'https://www.codebuff.com/docs/help/quick-start',
+    installCommand: 'npm install -g codebuff',
+    commands: ['codebuff'],
+    versionArgs: ['--version'],
+    cli: 'codebuff',
+    initialPromptFlag: '',
+    icon: 'codebuff.png',
+    alt: 'Codebuff CLI',
+    terminalOnly: true,
+  },
+  {
+    id: 'mistral',
+    name: 'Mistral Vibe',
+    description:
+      'Mistral AI terminal coding assistant with conversational codebase help, execution tools, and file operations.',
+    docUrl: 'https://github.com/mistralai/mistral-vibe',
+    installCommand: 'curl -LsSf https://mistral.ai/vibe/install.sh | bash',
+    commands: ['vibe'],
+    versionArgs: ['-h'],
+    cli: 'vibe',
+    autoApproveFlag: '--auto-approve',
+    initialPromptFlag: '--prompt',
+    icon: 'mistral.png',
+    alt: 'Mistral Vibe CLI',
+    terminalOnly: true,
+  },
+  {
+    id: 'pi',
+    name: 'Pi',
+    description:
+      'Minimal terminal coding agent with multi-provider model support and extensible custom tools.',
+    docUrl: 'https://github.com/badlogic/pi-mono/tree/main/packages/coding-agent',
+    installCommand: 'npm install -g @mariozechner/pi-coding-agent',
+    commands: ['pi'],
+    versionArgs: ['--version'],
+    cli: 'pi',
+    initialPromptFlag: '',
+    resumeFlag: '-c',
+    icon: 'pi.png',
+    alt: 'Pi CLI',
+    terminalOnly: true,
+  },
+  {
+    id: 'autohand',
+    name: 'Autohand Code',
+    description:
+      'Terminal coding agent with auto-commit, dry-run previews, community skills, and headless automation modes.',
+    docUrl: 'https://autohand.ai/code/',
+    installCommand: 'npm install -g autohand-cli',
+    commands: ['autohand'],
+    versionArgs: ['--version'],
+    cli: 'autohand',
+    autoApproveFlag: '--unrestricted',
+    initialPromptFlag: '-p',
+    icon: 'autohand.svg',
+    alt: 'Autohand Code CLI',
+    terminalOnly: true,
+  },
+];
+
+const PROVIDER_MAP = new Map<string, AgentProviderDefinition>(
+  AGENT_PROVIDERS.map((provider) => [provider.id, provider])
+);
+
+export function getProvider(id: AgentProviderId): AgentProviderDefinition | undefined {
+  return PROVIDER_MAP.get(id);
+}
+
+export function getInstallCommandForProvider(id: AgentProviderId): string | null {
+  return PROVIDER_MAP.get(id)?.installCommand ?? null;
+}
+
+/**
+ * Validates if a string is a valid provider ID.
+ * @param value - The value to validate
+ * @returns true if the value is a valid provider ID, false otherwise
+ */
+export function isValidProviderId(value: unknown): value is AgentProviderId {
+  return typeof value === 'string' && AGENT_PROVIDER_IDS.includes(value as AgentProviderId);
+}
+
+export function getDescriptionForProvider(id: AgentProviderId): string | null {
+  return PROVIDER_MAP.get(id)?.description ?? null;
+}
+
+export function getDocUrlForProvider(id: AgentProviderId): string | null {
+  return PROVIDER_MAP.get(id)?.docUrl ?? null;
+}
+
+export function listDetectableProviders(): AgentProviderDefinition[] {
+  return AGENT_PROVIDERS.filter(
+    (provider) => provider.detectable !== false && provider.commands?.length
+  );
+}
diff --git a/src/shared/agent-session.ts b/src/shared/agent-session.ts
new file mode 100644
index 0000000000..28ebc3cd5d
--- /dev/null
+++ b/src/shared/agent-session.ts
@@ -0,0 +1,15 @@
+import type { AgentProviderId } from '@shared/agent-provider-registry';
+
+export interface AgentSessionConfig {
+  taskId: string;
+  conversationId: string;
+  providerId: AgentProviderId;
+  command: string;
+  args: string[];
+  cwd: string;
+  sessionId?: string;
+  shellSetup?: string;
+  tmuxSessionName?: string;
+  autoApprove: boolean;
+  resume: boolean;
+}
diff --git a/src/shared/agentEvents.ts b/src/shared/agentEvents.ts
deleted file mode 100644
index 471287e457..0000000000
--- a/src/shared/agentEvents.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-export type AgentEventType = 'notification' | 'stop' | 'error';
-
-export type NotificationType =
-  | 'permission_prompt'
-  | 'idle_prompt'
-  | 'auth_success'
-  | 'elicitation_dialog';
-
-export interface AgentEvent {
-  type: AgentEventType;
-  ptyId: string;
-  taskId: string;
-  providerId: string;
-  timestamp: number;
-  payload: {
-    notificationType?: NotificationType;
-    title?: string;
-    message?: string;
-    lastAssistantMessage?: string;
-  };
-}
-
-export type SoundEvent = 'needs_attention' | 'task_complete';
diff --git a/src/shared/app-identity.ts b/src/shared/app-identity.ts
new file mode 100644
index 0000000000..6408a54fd4
--- /dev/null
+++ b/src/shared/app-identity.ts
@@ -0,0 +1,6 @@
+export const APP_ID = 'com.emdash.stable';
+export const PRODUCT_NAME = 'Emdash';
+export const APP_NAME_LOWER = 'emdash';
+export const UPDATE_CHANNEL = 'v1-stable';
+export const ARTIFACT_PREFIX = 'emdash';
+export const R2_BASE_URL = 'https://releases.emdash.sh';
diff --git a/src/shared/app-settings.ts b/src/shared/app-settings.ts
new file mode 100644
index 0000000000..e111eca76b
--- /dev/null
+++ b/src/shared/app-settings.ts
@@ -0,0 +1,27 @@
+import z from 'zod';
+import {
+  agentAutoApproveDefaultsSchema,
+  appSettingsSchema,
+  interfaceSettingsSchema,
+  localProjectSettingsSchema,
+  notificationSettingsSchema,
+  providerCustomConfigEntrySchema,
+  taskSettingsSchema,
+  terminalSettingsSchema,
+  themeSchema,
+} from '@main/core/settings/schema';
+
+export type LocalProjectSettings = z.infer<typeof localProjectSettingsSchema>;
+export type NotificationSettings = z.infer<typeof notificationSettingsSchema>;
+export type TaskSettings = z.infer<typeof taskSettingsSchema>;
+export type AgentAutoApproveDefaults = z.infer<typeof agentAutoApproveDefaultsSchema>;
+export type TerminalSettings = z.infer<typeof terminalSettingsSchema>;
+export type Theme = z.infer<typeof themeSchema>;
+
+export type InterfaceSettings = z.infer<typeof interfaceSettingsSchema>;
+export type ProviderCustomConfig = z.infer<typeof providerCustomConfigEntrySchema>;
+export type ProviderCustomConfigs = Record<string, ProviderCustomConfig>;
+export type AppSettings = z.infer<typeof appSettingsSchema>;
+export type AppSettingsKey = keyof AppSettings;
+
+export const AppSettingsKeys = Object.keys(appSettingsSchema.shape) as AppSettingsKey[];
diff --git a/src/shared/conversations.ts b/src/shared/conversations.ts
new file mode 100644
index 0000000000..46b864ee76
--- /dev/null
+++ b/src/shared/conversations.ts
@@ -0,0 +1,27 @@
+import { AgentProviderId } from '@shared/agent-provider-registry';
+
+export type Conversation = {
+  id: string;
+  projectId: string;
+  taskId: string;
+  providerId: AgentProviderId;
+  title: string;
+  resume?: boolean;
+  autoApprove?: boolean;
+};
+
+export type RenameConversationParams = {
+  conversationId: string;
+  newTitle: string;
+};
+
+export type CreateConversationParams = {
+  id: string;
+  projectId: string;
+  taskId: string;
+  provider: AgentProviderId;
+  title: string;
+  autoApprove?: boolean;
+  initialSize?: { cols: number; rows: number };
+  initialPrompt?: string;
+};
diff --git a/src/shared/dependencies.ts b/src/shared/dependencies.ts
new file mode 100644
index 0000000000..e5fb660a53
--- /dev/null
+++ b/src/shared/dependencies.ts
@@ -0,0 +1,41 @@
+import type { AgentProviderId } from '@shared/agent-provider-registry';
+import type { Result } from '@shared/result';
+
+export type DependencyCategory = 'core' | 'agent';
+
+export type CoreDependencyId = 'git' | 'gh' | 'tmux' | 'ssh' | 'node';
+
+export type DependencyId = CoreDependencyId | AgentProviderId;
+
+export type DependencyStatus = 'available' | 'missing' | 'error';
+
+export interface DependencyState {
+  id: DependencyId;
+  category: DependencyCategory;
+  status: DependencyStatus;
+  version: string | null;
+  path: string | null;
+  checkedAt: number;
+  error?: string;
+}
+
+export type DependencyStatusMap = Record<string, DependencyState>;
+
+export type DependencyStatusUpdatedEvent = {
+  id: string;
+  state: DependencyState;
+  connectionId?: string;
+};
+
+export type InstallCommandError =
+  | { type: 'permission-denied'; message: string; output: string; exitCode?: number }
+  | { type: 'command-failed'; message: string; output: string; exitCode?: number }
+  | { type: 'pty-open-failed'; message: string };
+
+export type DependencyInstallError =
+  | { type: 'unknown-dependency'; id: string }
+  | { type: 'no-install-command'; id: string }
+  | InstallCommandError
+  | { type: 'not-detected-after-install'; id: string };
+
+export type DependencyInstallResult = Result<DependencyState, DependencyInstallError>;
diff --git a/src/shared/events/agentEvents.ts b/src/shared/events/agentEvents.ts
new file mode 100644
index 0000000000..c23caff642
--- /dev/null
+++ b/src/shared/events/agentEvents.ts
@@ -0,0 +1,57 @@
+import { defineEvent } from '@shared/ipc/events';
+
+export type AgentEventType = 'notification' | 'stop' | 'error';
+
+export type NotificationType =
+  | 'permission_prompt'
+  | 'idle_prompt'
+  | 'auth_success'
+  | 'elicitation_dialog';
+
+export const ATTENTION_NOTIFICATION_TYPES: ReadonlySet<NotificationType> = new Set([
+  'permission_prompt',
+  'idle_prompt',
+  'elicitation_dialog',
+]);
+
+export function isAttentionNotification(nt: NotificationType | undefined): nt is NotificationType {
+  return nt != null && ATTENTION_NOTIFICATION_TYPES.has(nt);
+}
+
+export interface AgentEvent {
+  type: AgentEventType;
+  source?: 'hook' | 'classifier';
+  ptyId?: string;
+  providerId?: string;
+  projectId: string;
+  taskId: string;
+  conversationId: string;
+  timestamp: number;
+  payload: {
+    notificationType?: NotificationType;
+    title?: string;
+    message?: string;
+    lastAssistantMessage?: string;
+  };
+}
+
+export interface AgentEventEnvelope {
+  event: AgentEvent;
+  appFocused: boolean;
+}
+
+export type SoundEvent = 'needs_attention' | 'task_complete';
+
+export const agentEventChannel = defineEvent<AgentEventEnvelope>('agent:event');
+
+export interface AgentSessionExited {
+  /** PTY session ID (= conversationId for agent sessions). */
+  projectId: string;
+  sessionId: string;
+  conversationId: string;
+  taskId: string;
+  exitCode: number | undefined;
+}
+
+/** Emitted when an agent PTY session exits. Topic = taskId. */
+export const agentSessionExitedChannel = defineEvent<AgentSessionExited>('agent:session-exited');
diff --git a/src/shared/events/appEvents.ts b/src/shared/events/appEvents.ts
new file mode 100644
index 0000000000..c532d5df20
--- /dev/null
+++ b/src/shared/events/appEvents.ts
@@ -0,0 +1,64 @@
+import type { DependencyStatusUpdatedEvent } from '@shared/dependencies';
+import { defineEvent } from '@shared/ipc/events';
+
+// App editing actions (renderer → main, no payload)
+export const appUndoChannel = defineEvent<void>('app:undo');
+export const appRedoChannel = defineEvent<void>('app:redo');
+export const appPasteChannel = defineEvent<void>('app:paste');
+
+// Menu events (main → renderer, no payload)
+export const menuOpenSettingsChannel = defineEvent<void>('menu:open-settings');
+export const menuCheckForUpdatesChannel = defineEvent<void>('menu:check-for-updates');
+export const menuUndoChannel = defineEvent<void>('menu:undo');
+export const menuRedoChannel = defineEvent<void>('menu:redo');
+export const menuCloseTabChannel = defineEvent<void>('menu:close-tab');
+
+export const gitStatusChangedChannel = defineEvent<{
+  taskPath: string;
+  error?: string;
+}>('git:status-changed');
+
+export const notificationFocusTaskChannel = defineEvent<{
+  taskId: string;
+}>('notification:focus-task');
+
+export const ptyStartedChannel = defineEvent<{
+  id: string;
+}>('pty:started');
+
+export type PlanEvent = {
+  type: 'write_blocked' | 'remove_blocked';
+  root: string;
+  relPath: string;
+  code?: string;
+  message?: string;
+};
+
+export const planEventChannel = defineEvent<PlanEvent>('plan:event');
+
+export const ptyDataChannel = defineEvent<string>('pty:data');
+
+export const ptyExitChannel = defineEvent<{
+  exitCode: number;
+  signal?: number;
+}>('pty:exit');
+
+/** Emitted by main process when a PTY is definitively killed (e.g. on deleteTask/deleteConversation). */
+export const ptyKilledChannel = defineEvent<{ id: string }>('pty:killed');
+
+/** Emitted by main process when a lifecycle/dev-server shell session is created.
+ *  These sessions are standalone PTYs — they are NOT backed by a DB conversation record.
+ *  The renderer uses sessionId (not conversationId) to connect to the PTY terminal.
+ */
+export const shellSessionStartedChannel = defineEvent<{
+  taskId: string;
+  /** Opaque UUID identifying this PTY session — not a DB conversationId. */
+  sessionId: string;
+  ptyId: string;
+  title: string;
+}>('shell:session-started');
+
+/** Emitted after each dependency probe completes (path resolution or version check). */
+export const dependencyStatusUpdatedChannel = defineEvent<DependencyStatusUpdatedEvent>(
+  'dependency:status-updated'
+);
diff --git a/src/shared/events/editorEvents.ts b/src/shared/events/editorEvents.ts
new file mode 100644
index 0000000000..f07e6f5860
--- /dev/null
+++ b/src/shared/events/editorEvents.ts
@@ -0,0 +1,8 @@
+import { defineEvent } from '@shared/ipc/events';
+
+export const editorFileExternallyChangedChannel = defineEvent<{
+  projectId: string;
+  taskId: string;
+  filePath: string;
+  newContent: string;
+}>('editor:file-externally-changed');
diff --git a/src/shared/events/fsEvents.ts b/src/shared/events/fsEvents.ts
new file mode 100644
index 0000000000..32c3ffed86
--- /dev/null
+++ b/src/shared/events/fsEvents.ts
@@ -0,0 +1,8 @@
+import type { FileWatchEvent } from '@shared/fs';
+import { defineEvent } from '@shared/ipc/events';
+
+export const fsWatchEventChannel = defineEvent<{
+  projectId: string;
+  workspaceId: string;
+  events: FileWatchEvent[];
+}>('fs:watch-event');
diff --git a/src/shared/events/gitEvents.ts b/src/shared/events/gitEvents.ts
new file mode 100644
index 0000000000..5dca03dd67
--- /dev/null
+++ b/src/shared/events/gitEvents.ts
@@ -0,0 +1,22 @@
+import type { GitRef } from '@shared/git';
+import { defineEvent } from '@shared/ipc/events';
+
+export type GitRefChange = {
+  projectId: string;
+  kind: 'local-refs' | 'remote-refs' | 'config';
+  /** Specific structured refs that changed, when derivable from the FS path.
+   *  Absent for packed-refs (ambiguous) and bare HEAD pointer changes. */
+  changedRefs?: GitRef[];
+};
+
+export const gitRefChangedChannel = defineEvent<GitRefChange>('git:ref-changed');
+
+export type GitWorkspaceChange = {
+  projectId: string;
+  workspaceId: string;
+  /** 'index' = staging area changed (git add/rm/reset)
+   *  'head'  = HEAD commit changed (commit, checkout, pull, reset) */
+  kind: 'index' | 'head';
+};
+
+export const gitWorkspaceChangedChannel = defineEvent<GitWorkspaceChange>('git:workspace-changed');
diff --git a/src/shared/events/githubEvents.ts b/src/shared/events/githubEvents.ts
new file mode 100644
index 0000000000..631f96906a
--- /dev/null
+++ b/src/shared/events/githubEvents.ts
@@ -0,0 +1,33 @@
+import type { GitHubUser } from '@shared/github';
+import { defineEvent } from '@shared/ipc/events';
+
+export const githubAuthDeviceCodeChannel = defineEvent<{
+  userCode: string;
+  verificationUri: string;
+  expiresIn: number;
+  interval: number;
+}>('github:auth:device-code');
+
+export const githubAuthPollingChannel = defineEvent<{
+  status: string;
+}>('github:auth:polling');
+
+export const githubAuthSlowDownChannel = defineEvent<{
+  newInterval: number;
+}>('github:auth:slow-down');
+
+export const githubAuthSuccessChannel = defineEvent<{
+  token: string;
+  user: GitHubUser;
+}>('github:auth:success');
+
+export const githubAuthErrorChannel = defineEvent<{
+  error: string;
+  message: string;
+}>('github:auth:error');
+
+export const githubAuthCancelledChannel = defineEvent<void>('github:auth:cancelled');
+
+export const githubAuthUserUpdatedChannel = defineEvent<{
+  user: GitHubUser;
+}>('github:auth:user-updated');
diff --git a/src/shared/events/hostPreviewEvents.ts b/src/shared/events/hostPreviewEvents.ts
new file mode 100644
index 0000000000..5d435a68db
--- /dev/null
+++ b/src/shared/events/hostPreviewEvents.ts
@@ -0,0 +1,4 @@
+import type { HostPreviewEvent } from '@shared/hostPreview';
+import { defineEvent } from '@shared/ipc/events';
+
+export const hostPreviewEventChannel = defineEvent<HostPreviewEvent>('preview:host:event');
diff --git a/src/shared/events/lifecycleEvents.ts b/src/shared/events/lifecycleEvents.ts
new file mode 100644
index 0000000000..75587e35a2
--- /dev/null
+++ b/src/shared/events/lifecycleEvents.ts
@@ -0,0 +1,4 @@
+import { defineEvent } from '@shared/ipc/events';
+import type { LifecycleEvent } from '@shared/lifecycle';
+
+export const lifecycleEventChannel = defineEvent<LifecycleEvent>('lifecycle:event');
diff --git a/src/shared/events/prEvents.ts b/src/shared/events/prEvents.ts
new file mode 100644
index 0000000000..ccee8f55e6
--- /dev/null
+++ b/src/shared/events/prEvents.ts
@@ -0,0 +1,6 @@
+import { defineEvent } from '@shared/ipc/events';
+import type { PrSyncProgress, PullRequest } from '@shared/pull-requests';
+
+export const prSyncProgressChannel = defineEvent<PrSyncProgress>('pr:sync-progress');
+
+export const prUpdatedChannel = defineEvent<{ prs: PullRequest[] }>('pr:updated');
diff --git a/src/shared/events/ptyEvents.ts b/src/shared/events/ptyEvents.ts
new file mode 100644
index 0000000000..e61feac990
--- /dev/null
+++ b/src/shared/events/ptyEvents.ts
@@ -0,0 +1,11 @@
+import { defineEvent } from '@shared/ipc/events';
+
+// 'pty:data' matches the channel name consumed by TerminalSessionManager.
+export const ptyDataChannel = defineEvent<string>('pty:data');
+
+export const ptyExitChannel = defineEvent<{
+  exitCode: number;
+  signal?: number;
+}>('pty:exit');
+
+export const ptyInputChannel = defineEvent<string>('pty:input');
diff --git a/src/shared/events/sshEvents.ts b/src/shared/events/sshEvents.ts
new file mode 100644
index 0000000000..d18f466735
--- /dev/null
+++ b/src/shared/events/sshEvents.ts
@@ -0,0 +1,12 @@
+import { defineEvent } from '@shared/ipc/events';
+
+export type SshConnectionEvent =
+  | { type: 'connecting'; connectionId: string }
+  | { type: 'connected'; connectionId: string }
+  | { type: 'disconnected'; connectionId: string }
+  | { type: 'reconnecting'; connectionId: string; attempt: number; delayMs: number }
+  | { type: 'reconnected'; connectionId: string }
+  | { type: 'reconnect-failed'; connectionId: string }
+  | { type: 'error'; connectionId: string; errorMessage: string };
+
+export const sshConnectionEventChannel = defineEvent<SshConnectionEvent>('ssh:connection-event');
diff --git a/src/shared/events/taskEvents.ts b/src/shared/events/taskEvents.ts
new file mode 100644
index 0000000000..f9293d70a7
--- /dev/null
+++ b/src/shared/events/taskEvents.ts
@@ -0,0 +1,15 @@
+import { defineEvent } from '@shared/ipc/events';
+import type { PullRequest } from '@shared/pull-requests';
+
+export const taskStatusUpdatedChannel = defineEvent<{
+  taskId: string;
+  projectId: string;
+  status: string;
+}>('task:status-updated');
+
+export const taskPrUpdatedChannel = defineEvent<{
+  taskId: string;
+  projectId: string;
+  workspaceId: string;
+  prs: PullRequest[];
+}>('task:pr-updated');
diff --git a/src/shared/events/updateEvents.ts b/src/shared/events/updateEvents.ts
new file mode 100644
index 0000000000..91016dfee4
--- /dev/null
+++ b/src/shared/events/updateEvents.ts
@@ -0,0 +1,26 @@
+import type { UpdateInfo } from 'electron-updater';
+import { defineEvent } from '@shared/ipc/events';
+
+export const updateCheckingEvent = defineEvent<void>('update:checking');
+
+export const updateAvailableEvent = defineEvent<{
+  version: string;
+  updateInfo: UpdateInfo;
+}>('update:available');
+
+export const updateNotAvailableEvent = defineEvent<void>('update:not-available');
+
+export const updateDownloadingEvent = defineEvent<{ version: string }>('update:downloading');
+
+export const updateProgressEvent = defineEvent<{
+  percent: number;
+  transferred: number;
+  total: number;
+  bytesPerSecond: number;
+}>('update:progress');
+
+export const updateDownloadedEvent = defineEvent<{ version: string }>('update:downloaded');
+
+export const updateInstallingEvent = defineEvent<void>('update:installing');
+
+export const updateErrorEvent = defineEvent<{ message: string }>('update:error');
diff --git a/src/shared/fs.ts b/src/shared/fs.ts
new file mode 100644
index 0000000000..470dcb27e7
--- /dev/null
+++ b/src/shared/fs.ts
@@ -0,0 +1,19 @@
+export interface FileNode {
+  path: string;
+  name: string;
+  parentPath: string | null;
+  depth: number;
+  type: 'file' | 'directory';
+  isHidden: boolean;
+  extension?: string;
+  mtime?: Date;
+}
+
+export type FileWatchEventType = 'create' | 'delete' | 'modify' | 'rename';
+
+export interface FileWatchEvent {
+  type: FileWatchEventType;
+  entryType: 'file' | 'directory';
+  path: string;
+  oldPath?: string;
+}
diff --git a/src/shared/general-session.ts b/src/shared/general-session.ts
new file mode 100644
index 0000000000..26fbb7a4f2
--- /dev/null
+++ b/src/shared/general-session.ts
@@ -0,0 +1,14 @@
+export interface GeneralSession {
+  type: 'general';
+  config: GeneralSessionConfig;
+}
+
+export interface GeneralSessionConfig {
+  taskId?: string;
+  cwd: string;
+  projectPath?: string;
+  shellSetup?: string;
+  tmuxSessionName?: string;
+  command?: string;
+  args?: string[];
+}
diff --git a/src/shared/git-remote-url.ts b/src/shared/git-remote-url.ts
new file mode 100644
index 0000000000..ea66d658e9
--- /dev/null
+++ b/src/shared/git-remote-url.ts
@@ -0,0 +1,25 @@
+/**
+ * Convert a git remote URL to a browser-friendly HTTPS URL.
+ *
+ * Handles:
+ *   git@github.com:owner/repo.git  →  https://github.com/owner/repo
+ *   https://github.com/owner/repo.git  →  https://github.com/owner/repo
+ *   https://github.com/owner/repo  →  https://github.com/owner/repo
+ *
+ * Returns undefined if the URL can't be parsed.
+ */
+export function gitRemoteToUrl(remote: string): string | undefined {
+  // SSH style: git@github.com:owner/repo.git
+  const sshMatch = remote.match(/^git@([^:]+):(.+?)(?:\.git)?$/);
+  if (sshMatch) {
+    return `https://${sshMatch[1]}/${sshMatch[2]}`;
+  }
+
+  // HTTPS style: https://github.com/owner/repo.git or without .git
+  const httpsMatch = remote.match(/^https?:\/\/([^/]+\/.+?)(?:\.git)?$/);
+  if (httpsMatch) {
+    return `https://${httpsMatch[1]}`;
+  }
+
+  return undefined;
+}
diff --git a/src/shared/git-utils.ts b/src/shared/git-utils.ts
new file mode 100644
index 0000000000..0a62a13bb5
--- /dev/null
+++ b/src/shared/git-utils.ts
@@ -0,0 +1,48 @@
+import type { Branch, Remote } from './git';
+
+export const DEFAULT_REMOTE_NAME = 'origin';
+
+export function selectPreferredRemote(
+  configuredRemote: string | undefined,
+  remotes: ReadonlyArray<Remote>
+): Remote {
+  const preferred = configuredRemote?.trim();
+  const found = preferred ? remotes.find((r) => r.name === preferred) : undefined;
+  return (
+    found ??
+    remotes.find((r) => r.name === DEFAULT_REMOTE_NAME) ??
+    remotes[0] ?? { name: DEFAULT_REMOTE_NAME, url: '' }
+  );
+}
+
+/**
+ * Strips the remote prefix from a fully-qualified remote tracking ref.
+ * e.g. "origin/main" → "main", "main" → "main"
+ */
+export function bareRefName(ref: string): string {
+  const slash = ref.indexOf('/');
+  return slash !== -1 ? ref.slice(slash + 1) : ref;
+}
+
+/**
+ * Resolves the canonical default branch name from user settings, the branch
+ * list, and the git-heuristic fallback. Shared between main and renderer.
+ *
+ * @param configured - Already-resolved user preference (settings.defaultBranch ?? bareRefName(baseRef))
+ * @param branches   - Full branch list (local + remote)
+ * @param remote     - The configured remote name
+ * @param gitDefaultBranch - Git-heuristic default (symbolic-ref / remote show / well-known names)
+ */
+export function computeDefaultBranch(
+  configured: string,
+  branches: Branch[],
+  remote: string,
+  gitDefaultBranch: string
+): string {
+  const existsLocally = branches.some((b) => b.type === 'local' && b.branch === configured);
+  const isOnRemote = branches.some(
+    (b) => b.type === 'remote' && b.branch === configured && b.remote.name === remote
+  );
+  if (existsLocally || isOnRemote) return configured;
+  return gitDefaultBranch;
+}
diff --git a/src/shared/git.ts b/src/shared/git.ts
new file mode 100644
index 0000000000..f368ee8219
--- /dev/null
+++ b/src/shared/git.ts
@@ -0,0 +1,282 @@
+export type DiffLine = { left?: string; right?: string; type: 'context' | 'add' | 'del' };
+
+export type GitChangeStatus = 'added' | 'modified' | 'deleted' | 'renamed' | 'conflicted';
+
+export type GitChange = {
+  path: string;
+  status: GitChangeStatus;
+  additions: number;
+  deletions: number;
+};
+
+/** Result of a single coalesced workspace status refresh (staged + unstaged + branch). */
+export interface FullGitStatus {
+  staged: GitChange[];
+  unstaged: GitChange[];
+  currentBranch: string | null;
+  totalAdded: number;
+  totalDeleted: number;
+}
+
+export interface DiffResult {
+  lines: DiffLine[];
+  isBinary?: boolean;
+  originalContent?: string;
+  modifiedContent?: string;
+}
+
+export interface GitInfo {
+  isGitRepo: boolean;
+  remote?: string;
+  branch?: string;
+  baseRef: string;
+  rootPath: string;
+}
+
+/** @internal Use BranchesPayload.isUnborn / BranchesPayload.currentBranch in the renderer */
+export type GitHeadState = {
+  headName?: string;
+  isUnborn: boolean;
+};
+
+export type Remote = {
+  name: string;
+  url: string;
+};
+
+/**
+ * Lean branch addressing — only what is needed to resolve a git object.
+ * No display metadata (divergence etc.). Use LocalBranch / RemoteBranch for
+ * store payloads that carry richer information.
+ */
+export type Branch =
+  | { type: 'local'; branch: string; remote?: Remote }
+  | { type: 'remote'; branch: string; remote: Remote };
+
+/** Display/store enrichment for local branches. May grow over time. */
+export type BranchMetadata = {
+  divergence?: { ahead: number; behind: number };
+};
+
+export type LocalBranch = Extract<Branch, { type: 'local' }> & BranchMetadata;
+export type RemoteBranch = Extract<Branch, { type: 'remote' }>;
+
+/**
+ * Workspace-relative diff intent — NOT real git object addresses.
+ * Maps directly to git command flags, never to ref strings.
+ *   head   → `git diff HEAD`
+ *   staged → `git diff --cached`
+ */
+export type DiffMode = { kind: 'head' } | { kind: 'staged' };
+
+export const HEAD_MODE: DiffMode = { kind: 'head' };
+export const STAGED_MODE: DiffMode = { kind: 'staged' };
+
+/** Backward-compat aliases — prefer HEAD_MODE / STAGED_MODE in new code. */
+export const HEAD_REF = HEAD_MODE;
+export const STAGED_REF = STAGED_MODE;
+
+/**
+ * A real, addressable git object — can appear on either side of a diff.
+ *   branch → local or remote branch (Branch already discriminates)
+ *   commit → a specific SHA
+ *   tag    → a tag name
+ */
+export type GitObjectRef =
+  | { kind: 'branch'; branch: Branch }
+  | { kind: 'commit'; sha: string }
+  | { kind: 'tag'; name: string };
+
+/** Full operand type accepted by diff/log APIs — either a mode or an object ref. */
+export type GitRef = DiffMode | GitObjectRef;
+
+/**
+ * A three-dot merge-base range: `base...head`.
+ * Both sides must be real git object addresses (DiffMode is not valid here).
+ */
+export type MergeBaseRange = { base: GitObjectRef; head: GitObjectRef };
+
+/** Produce the `base...head` range string for use in git commands. */
+export function toRangeString(range: MergeBaseRange): string {
+  return `${toRefString(range.base)}...${toRefString(range.head)}`;
+}
+
+export function mergeBaseRange(base: GitObjectRef, head: GitObjectRef): MergeBaseRange {
+  return { base, head };
+}
+
+export function toRefString(ref: GitObjectRef): string {
+  switch (ref.kind) {
+    case 'branch':
+      return ref.branch.type === 'remote'
+        ? `${ref.branch.remote.name}/${ref.branch.branch}`
+        : ref.branch.branch;
+    case 'commit':
+      return ref.sha;
+    case 'tag':
+      return ref.name;
+  }
+}
+
+/**
+ * Convert any GitRef (including DiffMode) to a string suitable for git commands
+ * or URI construction. DiffMode variants map to their conventional ref strings.
+ */
+export function gitRefToString(ref: GitRef): string {
+  if (ref.kind === 'head') return 'HEAD';
+  if (ref.kind === 'staged') return 'STAGED';
+  return toRefString(ref);
+}
+
+export function refsEqual(a: GitRef, b: GitRef): boolean {
+  if (a.kind !== b.kind) return false;
+  switch (a.kind) {
+    case 'head':
+    case 'staged':
+      return true;
+    case 'branch': {
+      const ab = a.branch;
+      const bb = (b as typeof a).branch;
+      if (ab.type !== bb.type) return false;
+      if (ab.type === 'remote' && bb.type === 'remote') {
+        return ab.remote.name === bb.remote.name && ab.branch === bb.branch;
+      }
+      return ab.branch === bb.branch;
+    }
+    case 'commit':
+      return a.sha === (b as typeof a).sha;
+    case 'tag':
+      return a.name === (b as typeof a).name;
+  }
+}
+
+/** Create a branch GitObjectRef. Accepts a Branch directly. */
+export function branchRef(branch: Branch): GitObjectRef {
+  return { kind: 'branch', branch };
+}
+
+/**
+ * Create a remote-branch GitObjectRef.
+ * Accepts a full Remote object or just a name string (url defaults to '' when unknown).
+ */
+export function remoteRef(remote: Remote | string, branch: string): GitObjectRef {
+  const r: Remote = typeof remote === 'string' ? { name: remote, url: '' } : remote;
+  return { kind: 'branch', branch: { type: 'remote', branch, remote: r } };
+}
+
+/** Create a local-branch GitObjectRef. Backward-compat alias for branchRef({ type: 'local', branch }). */
+export function localRef(branch: string): GitObjectRef {
+  return { kind: 'branch', branch: { type: 'local', branch } };
+}
+
+export function commitRef(sha: string): GitObjectRef {
+  return { kind: 'commit', sha };
+}
+
+export function tagRef(name: string): GitObjectRef {
+  return { kind: 'tag', name };
+}
+
+export type Commit = {
+  hash: string;
+  subject: string;
+  body: string;
+  author: string;
+  date: string;
+  isPushed: boolean;
+  tags: string[];
+};
+
+export type CommitFile = {
+  path: string;
+  status: string;
+  additions: number;
+  deletions: number;
+};
+
+export type LocalBranchesPayload = {
+  localBranches: LocalBranch[];
+  currentBranch: string | null;
+  isUnborn: boolean;
+};
+
+export type RemoteBranchesPayload = {
+  remoteBranches: RemoteBranch[];
+  remotes: { name: string; url: string }[];
+  gitDefaultBranch: string;
+};
+
+/** @deprecated Use LocalBranchesPayload and RemoteBranchesPayload */
+export type BranchesPayload = {
+  branches: (LocalBranch | RemoteBranch)[];
+  currentBranch: string | null;
+  isUnborn: boolean;
+  gitDefaultBranch: string;
+  remotes: { name: string; url: string }[];
+};
+
+export type BranchStatus = {
+  branch: string;
+  upstream?: string;
+  ahead: number;
+  behind: number;
+};
+
+export type FetchError =
+  | { type: 'no_remote' }
+  | { type: 'auth_failed'; message: string }
+  | { type: 'network_error'; message: string }
+  | { type: 'remote_not_found'; message: string }
+  | { type: 'error'; message: string };
+
+export type FetchPrRefError =
+  | { type: 'not_found'; prNumber: number }
+  | { type: 'error'; message: string };
+
+export type FetchPrForReviewError =
+  | { type: 'not_found'; prNumber: number }
+  | { type: 'error'; message: string };
+
+export type CommitError =
+  | { type: 'empty_message' }
+  | { type: 'nothing_to_commit' }
+  | { type: 'hook_failed'; message: string }
+  | { type: 'error'; message: string };
+
+export type SoftResetError =
+  | { type: 'initial_commit' }
+  | { type: 'already_pushed' }
+  | { type: 'error'; message: string };
+
+export type CreateBranchError =
+  | { type: 'already_exists'; name: string }
+  | { type: 'invalid_base'; from: string }
+  | { type: 'invalid_name'; name: string }
+  | { type: 'error'; message: string };
+
+export type RenameBranchError =
+  | { type: 'already_exists'; name: string }
+  | { type: 'remote_push_failed'; message: string }
+  | { type: 'error'; message: string };
+
+export type DeleteBranchError =
+  | { type: 'unmerged'; branch: string }
+  | { type: 'not_found'; branch: string }
+  | { type: 'is_current'; branch: string }
+  | { type: 'error'; message: string };
+
+export type PushError =
+  | { type: 'rejected'; message: string }
+  | { type: 'auth_failed'; message: string }
+  | { type: 'no_remote'; message?: string }
+  | { type: 'hook_rejected'; message: string }
+  | { type: 'network_error'; message: string }
+  | { type: 'error'; message: string };
+
+export type PullError =
+  | { type: 'conflict'; conflictedFiles: string[]; message: string }
+  | { type: 'no_upstream'; message: string }
+  | { type: 'diverged'; message: string }
+  | { type: 'auth_failed'; message: string }
+  | { type: 'network_error'; message: string }
+  | { type: 'error'; message: string };
diff --git a/src/shared/github.ts b/src/shared/github.ts
new file mode 100644
index 0000000000..72b0d3b9aa
--- /dev/null
+++ b/src/shared/github.ts
@@ -0,0 +1,32 @@
+export interface GitHubUser {
+  id: number;
+  login: string;
+  name: string;
+  email: string;
+  avatar_url: string;
+}
+
+export type GitHubTokenSource = 'secure_storage' | 'cli' | null;
+
+export interface GitHubStatusResponse {
+  authenticated: boolean;
+  user: GitHubUser | null;
+  tokenSource: GitHubTokenSource;
+}
+
+export interface GitHubAuthResponse {
+  success: boolean;
+  device_code?: string;
+  user_code?: string;
+  verification_uri?: string;
+  expires_in?: number;
+  interval?: number;
+  error?: string;
+}
+
+export interface GitHubConnectResponse {
+  success: boolean;
+  token?: string;
+  user?: GitHubUser;
+  error?: string;
+}
diff --git a/src/shared/hostPreview.ts b/src/shared/hostPreview.ts
new file mode 100644
index 0000000000..f005bdd882
--- /dev/null
+++ b/src/shared/hostPreview.ts
@@ -0,0 +1,8 @@
+export type HostPreviewEvent = {
+  type: 'url' | 'setup' | 'exit';
+  taskId: string;
+  terminalId?: string;
+  url?: string;
+  status?: 'starting' | 'line' | 'done' | 'error';
+  line?: string;
+};
diff --git a/src/shared/ipc/events.ts b/src/shared/ipc/events.ts
new file mode 100644
index 0000000000..f5ee4f3f8b
--- /dev/null
+++ b/src/shared/ipc/events.ts
@@ -0,0 +1,84 @@
+type EventDefinition<TData> = {
+  name: string;
+  _data?: TData;
+};
+
+export function defineEvent<TData>(name: string): EventDefinition<TData> {
+  return {
+    name,
+  };
+}
+
+export type EmitterAdapter = {
+  emit: (eventName: string, data: unknown, topic?: string) => void;
+  on: (eventName: string, cb: (data: unknown) => void, topic?: string) => () => void;
+};
+
+export function createEventEmitter(adapter: EmitterAdapter) {
+  // One adapter listener per channel; all JS subscribers fan out from it.
+  const listeners = new Map<string, Set<(data: unknown) => void>>();
+  const adapterOff = new Map<string, () => void>();
+
+  function getOrAttach(channel: string): Set<(data: unknown) => void> {
+    if (!listeners.has(channel)) {
+      const set = new Set<(data: unknown) => void>();
+      listeners.set(channel, set);
+      adapterOff.set(
+        channel,
+        adapter.on(channel, (data) => {
+          for (const cb of set) {
+            try {
+              cb(data);
+            } catch {}
+          }
+        })
+      );
+    }
+    return listeners.get(channel)!;
+  }
+
+  function maybePrune(channel: string): void {
+    if (listeners.get(channel)?.size === 0) {
+      listeners.delete(channel);
+      adapterOff.get(channel)?.();
+      adapterOff.delete(channel);
+    }
+  }
+
+  return {
+    emit: <TData>(event: EventDefinition<TData>, data: TData, topic?: string): void => {
+      adapter.emit(event.name, data, topic);
+    },
+    on: <TData>(
+      event: EventDefinition<TData>,
+      cb: (data: TData) => void,
+      topic?: string
+    ): (() => void) => {
+      const channel = topic ? `${event.name}.${topic}` : event.name;
+      const wrapped = (data: unknown) => cb(data as TData);
+      getOrAttach(channel).add(wrapped);
+      return () => {
+        listeners.get(channel)?.delete(wrapped);
+        maybePrune(channel);
+      };
+    },
+    once: <TData>(
+      event: EventDefinition<TData>,
+      cb: (data: TData) => void,
+      topic?: string
+    ): (() => void) => {
+      const channel = topic ? `${event.name}.${topic}` : event.name;
+      const set = getOrAttach(channel);
+      const unsub = () => {
+        set.delete(wrapped);
+        maybePrune(channel);
+      };
+      const wrapped = (data: unknown) => {
+        cb(data as TData);
+        unsub();
+      };
+      set.add(wrapped);
+      return unsub;
+    },
+  };
+}
diff --git a/src/shared/issue-providers.ts b/src/shared/issue-providers.ts
new file mode 100644
index 0000000000..74e5353ada
--- /dev/null
+++ b/src/shared/issue-providers.ts
@@ -0,0 +1,48 @@
+import type { Issue } from './tasks';
+
+export type IssueProviderType = Issue['provider'];
+
+export type IssueProviderCapabilities = {
+  requiresProjectPath: boolean;
+  requiresNameWithOwner: boolean;
+};
+
+export const ISSUE_PROVIDER_CAPABILITIES: Record<IssueProviderType, IssueProviderCapabilities> = {
+  linear: {
+    requiresProjectPath: false,
+    requiresNameWithOwner: false,
+  },
+  github: {
+    requiresProjectPath: false,
+    requiresNameWithOwner: true,
+  },
+  jira: {
+    requiresProjectPath: false,
+    requiresNameWithOwner: false,
+  },
+  gitlab: {
+    requiresProjectPath: true,
+    requiresNameWithOwner: false,
+  },
+  forgejo: {
+    requiresProjectPath: true,
+    requiresNameWithOwner: false,
+  },
+  plain: {
+    requiresProjectPath: false,
+    requiresNameWithOwner: false,
+  },
+};
+
+export type ConnectionStatus = {
+  connected: boolean;
+  displayName?: string;
+  error?: string;
+  capabilities: IssueProviderCapabilities;
+};
+
+export type ConnectionStatusMap = Record<IssueProviderType, ConnectionStatus>;
+
+export type IssueListResult =
+  | { success: true; issues: Issue[] }
+  | { success: false; error: string };
diff --git a/src/shared/lifecycle.ts b/src/shared/lifecycle.ts
index dbccb46ddc..eaa245ff68 100644
--- a/src/shared/lifecycle.ts
+++ b/src/shared/lifecycle.ts
@@ -43,26 +43,3 @@ export interface LifecycleEvent {
   exitCode?: number | null;
   timestamp: string;
 }
-
-export const MAX_LIFECYCLE_LOG_LINES = 300;
-
-export type LifecycleLogs = Record<LifecyclePhase, string[]>;
-
-export function formatLifecycleLogLine(
-  phase: LifecyclePhase,
-  status: string,
-  extras?: { line?: string; exitCode?: number | null; error?: string }
-): string | null {
-  if (status === 'starting') return `$ ${phase} started\n`;
-  if (status === 'line' && typeof extras?.line === 'string') return extras.line;
-  if (status === 'done') return `$ ${phase} finished (exit ${extras?.exitCode ?? 0})\n`;
-  if (status === 'error') {
-    const detail = typeof extras?.error === 'string' ? `: ${extras.error}` : '';
-    return `$ ${phase} failed (exit ${extras?.exitCode ?? 'unknown'})${detail}\n`;
-  }
-  if (phase === 'run' && status === 'exit') {
-    const code = extras?.exitCode === null ? 'signal' : extras?.exitCode;
-    return `$ run exited (${code})\n`;
-  }
-  return null;
-}
diff --git a/src/shared/logger.ts b/src/shared/logger.ts
new file mode 100644
index 0000000000..d95c788b78
--- /dev/null
+++ b/src/shared/logger.ts
@@ -0,0 +1,41 @@
+export type Level = 'debug' | 'info' | 'warn' | 'error';
+
+const ORDER: Record<Level, number> = { debug: 10, info: 20, warn: 30, error: 40 };
+
+export function parseLogLevel(value: string | undefined): Level | undefined {
+  if (!value) return undefined;
+  const candidate = value.trim().toLowerCase();
+  if (candidate in ORDER) return candidate as Level;
+  return undefined;
+}
+
+export function resolveLogLevel(args?: { envLevel?: string; debugFlag?: boolean }): Level {
+  return parseLogLevel(args?.envLevel) ?? (args?.debugFlag ? 'debug' : undefined) ?? 'warn';
+}
+
+export function createLogger(args?: { envLevel?: string; debugFlag?: boolean }) {
+  const level = resolveLogLevel({
+    envLevel: args?.envLevel ?? import.meta.env.VITE_LOG_LEVEL,
+    debugFlag: args?.debugFlag,
+  });
+
+  function enabled(target: Level): boolean {
+    return ORDER[target] >= ORDER[level];
+  }
+
+  return {
+    level,
+    debug: (...input: unknown[]) => {
+      if (enabled('debug')) console.debug(...input);
+    },
+    info: (...input: unknown[]) => {
+      if (enabled('info')) console.info(...input);
+    },
+    warn: (...input: unknown[]) => {
+      if (enabled('warn')) console.warn(...input);
+    },
+    error: (...input: unknown[]) => {
+      console.error(...input);
+    },
+  };
+}
diff --git a/src/shared/mcp/catalog.ts b/src/shared/mcp/catalog.ts
new file mode 100644
index 0000000000..320ce65430
--- /dev/null
+++ b/src/shared/mcp/catalog.ts
@@ -0,0 +1,443 @@
+import type { RawServerEntry } from './types';
+
+export interface CredentialKeyDef {
+  key: string;
+  required: boolean;
+}
+
+export interface CatalogEntryDef {
+  config: RawServerEntry;
+  name: string;
+  description: string;
+  docsUrl: string;
+  credentialKeys: CredentialKeyDef[];
+}
+
+export const catalogData: Record<string, CatalogEntryDef> = {
+  playwright: {
+    config: {
+      command: 'npx',
+      args: ['@playwright/mcp@latest'],
+    },
+    name: 'Playwright',
+    description: 'Browser automation with Playwright',
+    docsUrl: 'https://github.com/microsoft/playwright-mcp',
+    credentialKeys: [],
+  },
+  context7: {
+    config: {
+      type: 'http',
+      url: 'https://mcp.context7.com/mcp',
+      headers: {
+        CONTEXT7_API_KEY: 'YOUR_API_KEY',
+      },
+    },
+    name: 'Context7',
+    description: 'Fetch up-to-date documentation and code examples',
+    docsUrl: 'https://github.com/upstash/context7',
+    credentialKeys: [{ key: 'CONTEXT7_API_KEY', required: false }],
+  },
+  supabase: {
+    config: {
+      type: 'http',
+      url: 'https://mcp.supabase.com/mcp',
+    },
+    name: 'Supabase',
+    description: 'Manage databases, authentication, and storage',
+    docsUrl: 'https://supabase.com/docs/guides/getting-started/mcp',
+    credentialKeys: [],
+  },
+  vercel: {
+    config: {
+      type: 'http',
+      url: 'https://mcp.vercel.com',
+    },
+    name: 'Vercel',
+    description: 'Analyze, debug, and manage projects and deployments',
+    docsUrl: 'https://vercel.com/docs/mcp/vercel-mcp',
+    credentialKeys: [],
+  },
+  sentry: {
+    config: {
+      type: 'http',
+      url: 'https://mcp.sentry.dev/mcp',
+      headers: {
+        SENTRY_ACCESS_TOKEN: 'YOUR_ACCESS_TOKEN',
+      },
+    },
+    name: 'Sentry',
+    description: 'Search, query, and debug errors intelligently',
+    docsUrl: 'https://docs.sentry.io/product/sentry-mcp/',
+    credentialKeys: [{ key: 'SENTRY_ACCESS_TOKEN', required: true }],
+  },
+  stripe: {
+    config: {
+      type: 'http',
+      url: 'https://mcp.stripe.com',
+      headers: {
+        STRIPE_SECRET_KEY: 'YOUR_SECRET_KEY',
+      },
+    },
+    name: 'Stripe',
+    description: 'Payment processing and financial infrastructure tools',
+    docsUrl: 'https://docs.stripe.com/mcp',
+    credentialKeys: [{ key: 'STRIPE_SECRET_KEY', required: true }],
+  },
+  figma: {
+    config: {
+      type: 'http',
+      url: 'https://mcp.figma.com/mcp',
+    },
+    name: 'Figma',
+    description: 'Generate diagrams and better code from Figma context',
+    docsUrl: 'https://help.figma.com/hc/en-us/articles/32132100833559',
+    credentialKeys: [],
+  },
+  linear: {
+    config: {
+      type: 'http',
+      url: 'https://mcp.linear.app/mcp',
+    },
+    name: 'Linear',
+    description: 'Manage issues, projects & team workflows in Linear',
+    docsUrl: 'https://linear.app/docs/mcp',
+    credentialKeys: [],
+  },
+  slack: {
+    config: {
+      type: 'http',
+      url: 'https://mcp.slack.com/mcp',
+    },
+    name: 'Slack',
+    description: 'Send messages, create canvases, and fetch Slack data',
+    docsUrl: 'https://docs.slack.dev/ai/mcp-server',
+    credentialKeys: [],
+  },
+  cloudflare: {
+    config: {
+      type: 'http',
+      url: 'https://bindings.mcp.cloudflare.com/mcp',
+    },
+    name: 'Cloudflare Developer Platform',
+    description: 'Build applications with compute, storage, and AI',
+    docsUrl: 'https://www.support.cloudflare.com/',
+    credentialKeys: [],
+  },
+  netlify: {
+    config: {
+      type: 'http',
+      url: 'https://netlify-mcp.netlify.app/mcp',
+    },
+    name: 'Netlify',
+    description: 'Create, deploy, manage, and secure websites on Netlify',
+    docsUrl: 'https://docs.netlify.com/build/build-with-ai/netlify-mcp-server/',
+    credentialKeys: [],
+  },
+  chrome_devtools: {
+    config: {
+      command: 'npx',
+      args: ['chrome-devtools-mcp@latest'],
+    },
+    name: 'Chrome DevTools',
+    description: 'Browser automation, debugging and performance analysis with Chrome DevTools',
+    docsUrl: 'https://github.com/ChromeDevTools/chrome-devtools-mcp',
+    credentialKeys: [],
+  },
+  atlassian: {
+    config: {
+      type: 'http',
+      url: 'https://mcp.atlassian.com/v1/mcp',
+    },
+    name: 'Atlassian',
+    description: 'Access Jira & Confluence from Claude',
+    docsUrl:
+      'https://community.atlassian.com/forums/Atlassian-Platform-articles/Using-the-Atlassian-Remote-MCP-Server-beta/ba-p/3005104',
+    credentialKeys: [],
+  },
+  notion: {
+    config: {
+      type: 'http',
+      url: 'https://mcp.notion.com/mcp',
+    },
+    name: 'Notion',
+    description:
+      'Connect your Notion workspace to search, update, and power workflows across tools',
+    docsUrl: 'https://developers.notion.com/docs/mcp',
+    credentialKeys: [],
+  },
+  clerk: {
+    config: {
+      type: 'http',
+      url: 'https://mcp.clerk.com/mcp',
+    },
+    name: 'Clerk',
+    description: 'Add authentication, organizations, and billing',
+    docsUrl: 'https://clerk.com/docs/guides/ai/mcp/clerk-mcp-server',
+    credentialKeys: [],
+  },
+  planetscale: {
+    config: {
+      type: 'http',
+      url: 'https://mcp.pscale.dev/mcp/planetscale',
+    },
+    name: 'PlanetScale',
+    description: 'Authenticated access to your Postgres and MySQL DBs',
+    docsUrl: 'https://planetscale.com/docs/connect/mcp',
+    credentialKeys: [],
+  },
+  bigquery: {
+    config: {
+      type: 'http',
+      url: 'https://bigquery.googleapis.com/mcp',
+    },
+    name: 'Google Cloud BigQuery',
+    description: 'BigQuery: Advanced analytical insights for agents',
+    docsUrl: 'https://cloud.google.com/bigquery/docs/use-bigquery-mcp',
+    credentialKeys: [],
+  },
+  hugging_face: {
+    config: {
+      type: 'http',
+      url: 'https://huggingface.co/mcp',
+    },
+    name: 'Hugging Face',
+    description: 'Access the Hugging Face Hub and thousands of Gradio Apps',
+    docsUrl: 'https://huggingface.co/settings/mcp',
+    credentialKeys: [],
+  },
+  exa: {
+    config: {
+      command: 'npx',
+      args: ['-y', 'exa-mcp-server', 'tools=web_search_exa,get_code_context_exa'],
+      env: {
+        EXA_API_KEY: 'YOUR_API_KEY',
+      },
+    },
+    name: 'Exa',
+    description: 'Web search and code context retrieval powered by Exa AI',
+    docsUrl: 'https://docs.exa.ai/reference/exa-mcp',
+    credentialKeys: [{ key: 'EXA_API_KEY', required: true }],
+  },
+  posthog: {
+    config: {
+      type: 'http',
+      url: 'https://mcp.posthog.com/mcp',
+    },
+    name: 'PostHog',
+    description: 'Query, analyze, and manage your PostHog insights',
+    docsUrl: 'https://posthog.com/docs/model-context-protocol',
+    credentialKeys: [],
+  },
+  honeycomb: {
+    config: {
+      type: 'http',
+      url: 'https://mcp.honeycomb.io/mcp',
+    },
+    name: 'Honeycomb',
+    description: 'Query and explore observability data and SLOs',
+    docsUrl: 'https://docs.honeycomb.io/troubleshoot/product-lifecycle/beta/mcp/',
+    credentialKeys: [],
+  },
+  graphos: {
+    config: {
+      type: 'http',
+      url: 'https://mcp.apollographql.com',
+    },
+    name: 'GraphOS MCP Tools',
+    description: 'Search Apollo docs, specs, and best practices',
+    docsUrl: 'https://www.apollographql.com/docs/graphos/platform/graphos-mcp-tools',
+    credentialKeys: [],
+  },
+  dev_manager: {
+    config: {
+      command: 'npx',
+      args: ['dev-manager-mcp', 'stdio'],
+    },
+    name: 'Dev Manager',
+    description:
+      'Launch and manage multiple dev servers in parallel with automatic port allocation',
+    docsUrl: 'https://github.com/BloopAI/dev-manager-mcp',
+    credentialKeys: [],
+  },
+  sanity: {
+    config: {
+      type: 'http',
+      url: 'https://mcp.sanity.io',
+    },
+    name: 'Sanity',
+    description: 'Create, query, and manage structured content in Sanity',
+    docsUrl: 'https://www.sanity.io/docs/ai/mcp-server',
+    credentialKeys: [],
+  },
+  amplitude: {
+    config: {
+      type: 'http',
+      url: 'https://mcp.amplitude.com/mcp',
+    },
+    name: 'Amplitude',
+    description: 'Search, access, and get insights on your Amplitude data',
+    docsUrl: 'https://amplitude.com/docs/analytics/amplitude-mcp',
+    credentialKeys: [],
+  },
+  asana: {
+    config: {
+      type: 'http',
+      url: 'https://mcp.asana.com/v2/mcp',
+    },
+    name: 'Asana',
+    description: 'Connect to Asana to coordinate tasks, projects, and goals',
+    docsUrl: 'https://developers.asana.com/docs/mcp-server',
+    credentialKeys: [],
+  },
+  clickup: {
+    config: {
+      type: 'http',
+      url: 'https://mcp.clickup.com/mcp',
+    },
+    name: 'ClickUp',
+    description: 'Project management & collaboration for teams & agents',
+    docsUrl: 'https://help.clickup.com/hc/en-us/articles/33335772678423-What-is-ClickUp-MCP',
+    credentialKeys: [],
+  },
+  microsoft_learn: {
+    config: {
+      type: 'http',
+      url: 'https://learn.microsoft.com/api/mcp',
+    },
+    name: 'Microsoft Learn',
+    description: 'Search trusted Microsoft docs to power your development',
+    docsUrl: 'https://learn.microsoft.com/en-us/training/support/mcp',
+    credentialKeys: [],
+  },
+  jam: {
+    config: {
+      type: 'http',
+      url: 'https://mcp.jam.dev/mcp',
+    },
+    name: 'Jam',
+    description: 'Record screen and collect automatic context for issues',
+    docsUrl: 'https://jam.dev/docs/debug-a-jam/mcp',
+    credentialKeys: [],
+  },
+  webflow: {
+    config: {
+      type: 'http',
+      url: 'https://mcp.webflow.com/mcp',
+    },
+    name: 'Webflow',
+    description: 'Manage Webflow CMS, pages, assets and sites',
+    docsUrl: 'https://developers.webflow.com/mcp/v1.0.0/reference/overview',
+    credentialKeys: [],
+  },
+  cloudinary: {
+    config: {
+      type: 'http',
+      url: 'https://asset-management.mcp.cloudinary.com/sse',
+    },
+    name: 'Cloudinary',
+    description: 'Manage, transform and deliver your images & videos',
+    docsUrl: 'https://cloudinary.com/documentation/cloudinary_llm_mcp',
+    credentialKeys: [],
+  },
+  wordpress: {
+    config: {
+      type: 'http',
+      url: 'https://public-api.wordpress.com/wpcom/v2/mcp/v1',
+    },
+    name: 'WordPress',
+    description: 'Secure AI access to manage your WordPress.com sites',
+    docsUrl: 'https://developer.wordpress.com/docs/mcp/',
+    credentialKeys: [],
+  },
+  canva: {
+    config: {
+      type: 'http',
+      url: 'https://mcp.canva.com/mcp',
+    },
+    name: 'Canva',
+    description: 'Search, create, autofill, and export Canva designs',
+    docsUrl: 'https://www.canva.dev/docs/connect/canva-mcp-server-setup/',
+    credentialKeys: [],
+  },
+  miro: {
+    config: {
+      type: 'http',
+      url: 'https://mcp.miro.com/',
+    },
+    name: 'Miro',
+    description: 'Access and create new content on Miro boards',
+    docsUrl: 'https://developers.miro.com/docs/miro-mcp',
+    credentialKeys: [],
+  },
+  intercom: {
+    config: {
+      type: 'http',
+      url: 'https://mcp.intercom.com/mcp',
+    },
+    name: 'Intercom',
+    description: 'Access to Intercom data for better customer insights',
+    docsUrl: 'https://developers.intercom.com/docs/guides/mcp',
+    credentialKeys: [],
+  },
+  make: {
+    config: {
+      type: 'http',
+      url: 'https://mcp.make.com',
+    },
+    name: 'Make',
+    description: 'Run Make scenarios and manage your Make account',
+    docsUrl: 'https://developers.make.com/mcp-server/',
+    credentialKeys: [],
+  },
+  aws_marketplace: {
+    config: {
+      type: 'http',
+      url: 'https://marketplace-mcp.us-east-1.api.aws/mcp',
+    },
+    name: 'AWS Marketplace',
+    description: 'Discover, evaluate, and buy solutions for the cloud',
+    docsUrl:
+      'https://docs.aws.amazon.com/marketplace/latest/APIReference/marketplace-mcp-server.html',
+    credentialKeys: [],
+  },
+  motherduck: {
+    config: {
+      type: 'http',
+      url: 'https://api.motherduck.com/mcp',
+    },
+    name: 'MotherDuck',
+    description: 'Analyze your data with natural language',
+    docsUrl: 'https://motherduck.com/docs/sql-reference/mcp/',
+    credentialKeys: [],
+  },
+  magic_patterns: {
+    config: {
+      type: 'http',
+      url: 'https://mcp.magicpatterns.com/mcp',
+    },
+    name: 'Magic Patterns',
+    description: 'Discuss and iterate on Magic Patterns designs',
+    docsUrl: 'https://www.magicpatterns.com/docs/documentation/features/mcp-server/overview',
+    credentialKeys: [],
+  },
+  wix: {
+    config: {
+      type: 'http',
+      url: 'https://mcp.wix.com/mcp',
+    },
+    name: 'Wix',
+    description: 'Manage and build sites and apps on Wix',
+    docsUrl: 'https://dev.wix.com/docs/sdk/articles/use-the-wix-mcp/about-the-wix-mcp',
+    credentialKeys: [],
+  },
+  devrev: {
+    config: {
+      type: 'http',
+      url: 'https://api.devrev.ai/mcp/v1',
+    },
+    name: 'DevRev',
+    description: "Search and update your company's knowledge graph",
+    docsUrl: 'https://support.devrev.ai/en-US/devrev/article/ART-21859-remote-mcp-server',
+    credentialKeys: [],
+  },
+};
diff --git a/src/shared/mcp/types.ts b/src/shared/mcp/types.ts
new file mode 100644
index 0000000000..56d14d831f
--- /dev/null
+++ b/src/shared/mcp/types.ts
@@ -0,0 +1,60 @@
+/** Canonical MCP server — the normalized shape Emdash uses internally */
+export interface McpServer {
+  name: string;
+  transport: 'stdio' | 'http';
+  // stdio
+  command?: string;
+  args?: string[];
+  // http
+  url?: string;
+  headers?: Record<string, string>;
+  // common
+  env?: Record<string, string>;
+  providers: string[];
+}
+
+/** Credential key with required/optional distinction */
+export interface CredentialKey {
+  key: string;
+  required: boolean;
+}
+
+/** Display metadata for a catalog server */
+export interface McpCatalogEntry {
+  key: string;
+  name: string;
+  description: string;
+  docsUrl: string;
+  defaultConfig: RawServerEntry;
+  credentialKeys: CredentialKey[];
+}
+
+/** Raw server entry as stored in agent config files */
+export type RawServerEntry = Record<string, unknown>;
+
+/** Map of server name → raw config */
+export type ServerMap = Record<string, RawServerEntry>;
+
+/** Agent MCP config metadata — how to navigate each agent's config file */
+export interface AgentMcpMeta {
+  agentId: string;
+  configPath: string;
+  serversPath: string[];
+  template: Record<string, unknown>;
+  isToml: boolean;
+  adapter: AdapterType;
+}
+
+export type AdapterType = 'passthrough' | 'gemini' | 'cursor' | 'codex' | 'opencode' | 'copilot';
+
+export interface McpLoadAllResponse {
+  installed: McpServer[];
+  catalog: McpCatalogEntry[];
+}
+
+export interface McpProvidersResponse {
+  id: string;
+  name: string;
+  installed: boolean;
+  supportsHttp: boolean;
+}
diff --git a/src/shared/openInApps.ts b/src/shared/openInApps.ts
index c45284cd04..04fb3fe922 100644
--- a/src/shared/openInApps.ts
+++ b/src/shared/openInApps.ts
@@ -1,3 +1,5 @@
+import { z } from 'zod';
+
 export type PlatformKey = 'darwin' | 'win32' | 'linux';
 
 export type PlatformConfig = {
@@ -28,6 +30,8 @@ const ICON_PATHS = {
   files: 'files.svg',
   cursor: 'cursor.svg',
   vscode: 'vscode.png',
+  windsurf: 'windsurf.png',
+  xcode: 'xcode.png',
   terminal: 'terminal.png',
   warp: 'warp.svg',
   iterm2: 'iterm2.png',
@@ -38,10 +42,11 @@ const ICON_PATHS = {
   pycharm: 'pycharm.svg',
   rustrover: 'rustrover.svg',
   kiro: 'kiro.png',
+  antigravity: 'antigravity.png',
 } as const;
 
-export const OPEN_IN_APPS: OpenInAppConfigShape[] = [
-  {
+const _OPEN_IN_APPS = {
+  finder: {
     id: 'finder',
     label: 'Finder',
     iconPath: ICON_PATHS.finder,
@@ -60,7 +65,7 @@ export const OPEN_IN_APPS: OpenInAppConfigShape[] = [
       },
     },
   },
-  {
+  cursor: {
     id: 'cursor',
     label: 'Cursor',
     iconPath: ICON_PATHS.cursor,
@@ -83,7 +88,7 @@ export const OPEN_IN_APPS: OpenInAppConfigShape[] = [
       },
     },
   },
-  {
+  vscode: {
     id: 'vscode',
     label: 'VS Code',
     iconPath: ICON_PATHS.vscode,
@@ -110,7 +115,50 @@ export const OPEN_IN_APPS: OpenInAppConfigShape[] = [
       },
     },
   },
-  {
+  windsurf: {
+    id: 'windsurf',
+    label: 'Windsurf',
+    iconPath: ICON_PATHS.windsurf,
+    autoInstall: true,
+    platforms: {
+      darwin: {
+        openCommands: [
+          'command -v windsurf >/dev/null 2>&1 && windsurf {{path}}',
+          'open -n -b com.exafunction.windsurf --args {{path}}',
+          'open -n -a "Windsurf" {{path}}',
+        ],
+        checkCommands: ['windsurf'],
+        bundleIds: ['com.exafunction.windsurf'],
+        appNames: ['Windsurf'],
+      },
+      win32: {
+        openCommands: ['start "" windsurf {{path}}'],
+        checkCommands: ['windsurf'],
+      },
+      linux: {
+        openCommands: ['windsurf {{path}}'],
+        checkCommands: ['windsurf'],
+      },
+    },
+  },
+  xcode: {
+    id: 'xcode',
+    label: 'Xcode',
+    iconPath: ICON_PATHS.xcode,
+    platforms: {
+      darwin: {
+        openCommands: [
+          'command -v xed >/dev/null 2>&1 && xed {{path}}',
+          'open -n -b com.apple.dt.Xcode --args {{path}}',
+          'open -n -a "Xcode" {{path}}',
+        ],
+        checkCommands: ['xed'],
+        bundleIds: ['com.apple.dt.Xcode'],
+        appNames: ['Xcode'],
+      },
+    },
+  },
+  terminal: {
     id: 'terminal',
     label: 'Terminal',
     iconPath: ICON_PATHS.terminal,
@@ -130,7 +178,7 @@ export const OPEN_IN_APPS: OpenInAppConfigShape[] = [
       },
     },
   },
-  {
+  warp: {
     id: 'warp',
     label: 'Warp',
     iconPath: ICON_PATHS.warp,
@@ -145,7 +193,7 @@ export const OPEN_IN_APPS: OpenInAppConfigShape[] = [
       },
     },
   },
-  {
+  iterm2: {
     id: 'iterm2',
     label: 'iTerm2',
     iconPath: ICON_PATHS.iterm2,
@@ -162,7 +210,7 @@ export const OPEN_IN_APPS: OpenInAppConfigShape[] = [
       },
     },
   },
-  {
+  ghostty: {
     id: 'ghostty',
     label: 'Ghostty',
     iconPath: ICON_PATHS.ghostty,
@@ -179,7 +227,7 @@ export const OPEN_IN_APPS: OpenInAppConfigShape[] = [
       },
     },
   },
-  {
+  zed: {
     id: 'zed',
     label: 'Zed',
     iconPath: ICON_PATHS.zed,
@@ -196,7 +244,7 @@ export const OPEN_IN_APPS: OpenInAppConfigShape[] = [
       },
     },
   },
-  {
+  kiro: {
     id: 'kiro',
     label: 'Kiro',
     iconPath: ICON_PATHS.kiro,
@@ -221,7 +269,31 @@ export const OPEN_IN_APPS: OpenInAppConfigShape[] = [
       },
     },
   },
-  {
+  antigravity: {
+    id: 'antigravity',
+    label: 'Antigravity',
+    iconPath: ICON_PATHS.antigravity,
+    autoInstall: true,
+    platforms: {
+      darwin: {
+        openCommands: [
+          'command -v antigravity >/dev/null 2>&1 && antigravity {{path}}',
+          'open -a "Antigravity" {{path}}',
+        ],
+        checkCommands: ['antigravity'],
+        appNames: ['Antigravity'],
+      },
+      win32: {
+        openCommands: ['start "" antigravity {{path}}'],
+        checkCommands: ['antigravity'],
+      },
+      linux: {
+        openCommands: ['antigravity {{path}}'],
+        checkCommands: ['antigravity'],
+      },
+    },
+  },
+  'intellij-idea': {
     id: 'intellij-idea',
     label: 'IntelliJ IDEA',
     iconPath: ICON_PATHS['intellij-idea'],
@@ -242,7 +314,7 @@ export const OPEN_IN_APPS: OpenInAppConfigShape[] = [
       },
     },
   },
-  {
+  webstorm: {
     id: 'webstorm',
     label: 'WebStorm',
     iconPath: ICON_PATHS.webstorm,
@@ -263,7 +335,7 @@ export const OPEN_IN_APPS: OpenInAppConfigShape[] = [
       },
     },
   },
-  {
+  pycharm: {
     id: 'pycharm',
     label: 'PyCharm',
     iconPath: ICON_PATHS.pycharm,
@@ -284,7 +356,7 @@ export const OPEN_IN_APPS: OpenInAppConfigShape[] = [
       },
     },
   },
-  {
+  rustrover: {
     id: 'rustrover',
     label: 'RustRover',
     iconPath: ICON_PATHS.rustrover,
@@ -305,18 +377,29 @@ export const OPEN_IN_APPS: OpenInAppConfigShape[] = [
       },
     },
   },
-] as const;
+} satisfies Record<string, OpenInAppConfigShape>;
 
-export type OpenInAppId = (typeof OPEN_IN_APPS)[number]['id'];
+export type OpenInAppId = keyof typeof _OPEN_IN_APPS;
 
 export type OpenInAppConfig = OpenInAppConfigShape & { id: OpenInAppId };
 
+// Re-export as a properly typed Record so Object.values() yields OpenInAppConfig[]
+// and app.id is narrowed to OpenInAppId throughout the codebase.
+export const OPEN_IN_APPS: Record<OpenInAppId, OpenInAppConfig> = _OPEN_IN_APPS as Record<
+  OpenInAppId,
+  OpenInAppConfig
+>;
+
+export const OPEN_IN_APP_IDS = Object.keys(OPEN_IN_APPS) as [OpenInAppId, ...OpenInAppId[]];
+
+export const openInAppIdSchema = z.enum(OPEN_IN_APP_IDS);
+
 export function getAppById(id: string): OpenInAppConfig | undefined {
-  return OPEN_IN_APPS.find((app) => app.id === id);
+  return isValidOpenInAppId(id) ? OPEN_IN_APPS[id] : undefined;
 }
 
 export function isValidOpenInAppId(value: unknown): value is OpenInAppId {
-  return typeof value === 'string' && OPEN_IN_APPS.some((app) => app.id === value);
+  return typeof value === 'string' && value in OPEN_IN_APPS;
 }
 
 export function getResolvedLabel(app: OpenInAppConfigShape, platform: PlatformKey): string {
diff --git a/src/shared/projects.ts b/src/shared/projects.ts
new file mode 100644
index 0000000000..964cce34e7
--- /dev/null
+++ b/src/shared/projects.ts
@@ -0,0 +1,44 @@
+export type ProjectBootstrapStatus =
+  | { status: 'ready' }
+  | { status: 'bootstrapping' }
+  | { status: 'error'; message: string }
+  | { status: 'not-started' };
+
+export type ProjectPathStatus = {
+  isDirectory: boolean;
+  isGitRepo: boolean;
+};
+
+export type LocalProject = {
+  type: 'local';
+  id: string;
+  name: string;
+  path: string;
+  baseRef: string;
+  createdAt: string;
+  updatedAt: string;
+};
+
+export type SshProject = {
+  type: 'ssh';
+  id: string;
+  name: string;
+  path: string;
+  baseRef: string;
+  connectionId: string;
+  createdAt: string;
+  updatedAt: string;
+};
+
+export type Project = LocalProject | SshProject;
+
+export type OpenProjectError =
+  | { type: 'path-not-found'; path: string }
+  | { type: 'ssh-disconnected'; connectionId: string }
+  | { type: 'error'; message: string };
+
+export type UpdateProjectSettingsError =
+  | { type: 'project-not-found' }
+  | { type: 'invalid-settings' }
+  | { type: 'invalid-worktree-directory' }
+  | { type: 'error' };
diff --git a/src/shared/providers/registry.ts b/src/shared/providers/registry.ts
deleted file mode 100644
index 7cb47aac76..0000000000
--- a/src/shared/providers/registry.ts
+++ /dev/null
@@ -1,383 +0,0 @@
-export const PROVIDER_IDS = [
-  'codex',
-  'claude',
-  'qwen',
-  'droid',
-  'gemini',
-  'cursor',
-  'copilot',
-  'amp',
-  'opencode',
-  'charm',
-  'auggie',
-  'goose',
-  'kimi',
-  'kilocode',
-  'kiro',
-  'rovo',
-  'cline',
-  'continue',
-  'codebuff',
-  'mistral',
-  'pi',
-  'autohand',
-] as const;
-
-export type ProviderId = (typeof PROVIDER_IDS)[number];
-
-export type ProviderDefinition = {
-  id: ProviderId;
-  name: string;
-  docUrl?: string;
-  installCommand?: string;
-  commands?: string[];
-  versionArgs?: string[];
-  detectable?: boolean;
-  cli?: string;
-  autoApproveFlag?: string;
-  initialPromptFlag?: string;
-  /**
-   * When true, the initial prompt is delivered via keystroke injection
-   * (typing into the TUI after startup) instead of as a CLI argument.
-   * Use for agents whose CLI has no flag for interactive-mode prompt delivery.
-   */
-  useKeystrokeInjection?: boolean;
-  resumeFlag?: string;
-  /**
-   * CLI flag to assign a unique session ID per chat instance.
-   * Used to isolate session state when multiple chats of the same provider
-   * run in the same worktree. The flag receives a deterministic UUID
-   * derived from the Emdash conversation ID.
-   * e.g. '--session-id' for Claude Code.
-   */
-  sessionIdFlag?: string;
-  defaultArgs?: string[];
-  planActivateCommand?: string;
-  autoStartCommand?: string;
-  icon?: string;
-  terminalOnly?: boolean;
-};
-
-export const PROVIDERS: ProviderDefinition[] = [
-  {
-    id: 'codex',
-    name: 'Codex',
-    docUrl: 'https://github.com/openai/codex',
-    installCommand: 'npm install -g @openai/codex',
-    commands: ['codex'],
-    versionArgs: ['--version'],
-    cli: 'codex',
-    autoApproveFlag: '--full-auto',
-    initialPromptFlag: '',
-    resumeFlag: 'resume --last',
-    icon: 'openai.svg',
-    terminalOnly: true,
-  },
-  {
-    id: 'claude',
-    name: 'Claude Code',
-    docUrl: 'https://docs.anthropic.com/claude/docs/claude-code',
-    installCommand: 'curl -fsSL https://claude.ai/install.sh | bash',
-    commands: ['claude'],
-    versionArgs: ['--version'],
-    cli: 'claude',
-    autoApproveFlag: '--dangerously-skip-permissions',
-    initialPromptFlag: '',
-    resumeFlag: '-c -r',
-    sessionIdFlag: '--session-id',
-    planActivateCommand: '/plan',
-    icon: 'claude.png',
-    terminalOnly: true,
-  },
-  {
-    id: 'cursor',
-    name: 'Cursor',
-    docUrl: 'https://cursor.sh',
-    installCommand: 'curl https://cursor.com/install -fsS | bash',
-    commands: ['cursor-agent'],
-    versionArgs: ['--version'],
-    cli: 'cursor-agent',
-    autoApproveFlag: '-f',
-    initialPromptFlag: '',
-    icon: 'cursor.svg',
-    terminalOnly: true,
-  },
-  {
-    id: 'gemini',
-    name: 'Gemini',
-    docUrl: 'https://github.com/google-gemini/gemini-cli',
-    installCommand: 'npm install -g @google/gemini-cli',
-    commands: ['gemini'],
-    versionArgs: ['--version'],
-    cli: 'gemini',
-    autoApproveFlag: '--yolo',
-    initialPromptFlag: '-i',
-    resumeFlag: '--resume',
-    icon: 'gemini.png',
-    terminalOnly: true,
-  },
-  {
-    id: 'qwen',
-    name: 'Qwen Code',
-    docUrl: 'https://github.com/QwenLM/qwen-code',
-    installCommand: 'npm install -g @qwen-code/qwen-code',
-    commands: ['qwen'],
-    versionArgs: ['--version'],
-    cli: 'qwen',
-    autoApproveFlag: '--yolo',
-    initialPromptFlag: '-i',
-    resumeFlag: '--continue',
-    icon: 'qwen.png',
-    terminalOnly: true,
-  },
-  {
-    id: 'droid',
-    name: 'Droid',
-    docUrl: 'https://docs.factory.ai/cli/getting-started/quickstart',
-    installCommand: 'curl -fsSL https://app.factory.ai/cli | sh',
-    commands: ['droid'],
-    versionArgs: ['--version'],
-    cli: 'droid',
-    initialPromptFlag: '',
-    resumeFlag: '-r',
-    icon: 'droid.svg',
-    terminalOnly: true,
-  },
-  {
-    id: 'amp',
-    name: 'Amp',
-    docUrl: 'https://ampcode.com/manual#install',
-    installCommand: 'npm install -g @sourcegraph/amp@latest',
-    commands: ['amp'],
-    versionArgs: ['--version'],
-    cli: 'amp',
-    autoApproveFlag: '--dangerously-allow-all',
-    initialPromptFlag: '',
-    useKeystrokeInjection: true,
-    icon: 'ampcode.png',
-    terminalOnly: true,
-  },
-  {
-    id: 'opencode',
-    name: 'OpenCode',
-    docUrl: 'https://opencode.ai/docs/cli/',
-    installCommand: 'npm install -g opencode-ai',
-    commands: ['opencode'],
-    versionArgs: ['--version'],
-    cli: 'opencode',
-    initialPromptFlag: '',
-    useKeystrokeInjection: true,
-    icon: 'opencode.png',
-    terminalOnly: true,
-  },
-  {
-    id: 'copilot',
-    name: 'GitHub Copilot',
-    docUrl: 'https://docs.github.com/en/copilot/how-tos/set-up/install-copilot-cli',
-    installCommand: 'npm install -g @github/copilot',
-    commands: ['copilot'],
-    versionArgs: ['--version'],
-    cli: 'copilot',
-    autoApproveFlag: '--allow-all-tools',
-    icon: 'gh-copilot.svg',
-    terminalOnly: true,
-  },
-  {
-    id: 'charm',
-    name: 'Charm',
-    docUrl: 'https://github.com/charmbracelet/crush',
-    installCommand: 'npm install -g @charmland/crush',
-    commands: ['crush'],
-    versionArgs: ['--version'],
-    cli: 'crush',
-    autoApproveFlag: '--yolo',
-    icon: 'charm.png',
-    terminalOnly: true,
-  },
-  {
-    id: 'auggie',
-    name: 'Auggie',
-    docUrl: 'https://docs.augmentcode.com/cli/overview',
-    installCommand: 'npm install -g @augmentcode/auggie',
-    commands: ['auggie'],
-    versionArgs: ['--version'],
-    cli: 'auggie',
-    initialPromptFlag: '',
-    // otherwise user is prompted each time before prompt is passed
-    defaultArgs: ['--allow-indexing'],
-    icon: 'Auggie.svg',
-    terminalOnly: true,
-  },
-  {
-    id: 'goose',
-    name: 'Goose',
-    docUrl: 'https://block.github.io/goose/docs/quickstart/',
-    installCommand:
-      'curl -fsSL https://github.com/block/goose/releases/download/stable/download_cli.sh | bash',
-    detectable: false,
-    cli: 'goose',
-    // run subcommand with -s for interactive mode after initial prompt
-    defaultArgs: ['run', '-s'],
-    initialPromptFlag: '-t',
-    icon: 'goose.png',
-    terminalOnly: true,
-  },
-  {
-    id: 'kimi',
-    name: 'Kimi',
-    docUrl: 'https://www.kimi.com/code/docs/en/kimi-cli/guides/getting-started.html',
-    installCommand: 'uv tool install kimi-cli',
-    commands: ['kimi'],
-    versionArgs: ['--version'],
-    cli: 'kimi',
-    autoApproveFlag: '--yolo',
-    initialPromptFlag: '-c',
-    icon: 'kimi.png',
-    terminalOnly: true,
-  },
-  {
-    id: 'kilocode',
-    name: 'Kilocode',
-    docUrl: 'https://kilo.ai/docs/cli',
-    installCommand: 'npm install -g @kilocode/cli',
-    commands: ['kilocode'],
-    versionArgs: ['--version'],
-    cli: 'kilocode',
-    autoApproveFlag: '--auto',
-    initialPromptFlag: '',
-    resumeFlag: '--continue',
-    icon: 'kilocode.png',
-    terminalOnly: true,
-  },
-  {
-    id: 'kiro',
-    name: 'Kiro (AWS)',
-    docUrl: 'https://kiro.dev/docs/cli/',
-    installCommand: 'curl -fsSL https://cli.kiro.dev/install | bash',
-    commands: ['kiro-cli'],
-    versionArgs: ['--version'],
-    cli: 'kiro-cli',
-    defaultArgs: ['chat'],
-    initialPromptFlag: '',
-    icon: 'kiro.png',
-    terminalOnly: true,
-  },
-  {
-    id: 'rovo',
-    name: 'Rovo Dev',
-    docUrl: 'https://support.atlassian.com/rovo/docs/install-and-run-rovo-dev-cli-on-your-device/',
-    installCommand: 'acli rovodev auth login',
-    commands: ['rovodev', 'acli'],
-    versionArgs: ['--version'],
-    autoApproveFlag: '--yolo',
-    autoStartCommand: 'acli rovodev run',
-    icon: 'atlassian.png',
-    terminalOnly: true,
-  },
-  {
-    id: 'cline',
-    name: 'Cline',
-    docUrl: 'https://docs.cline.bot/cline-cli/overview',
-    installCommand: 'npm install -g cline',
-    commands: ['cline'],
-    versionArgs: ['help'],
-    cli: 'cline',
-    autoApproveFlag: '--yolo',
-    initialPromptFlag: '',
-    icon: 'cline.png',
-    terminalOnly: true,
-  },
-  {
-    id: 'continue',
-    name: 'Continue',
-    docUrl: 'https://docs.continue.dev/guides/cli',
-    installCommand: 'npm i -g @continuedev/cli',
-    commands: ['cn'],
-    versionArgs: ['--version'],
-    cli: 'cn',
-    initialPromptFlag: '-p',
-    resumeFlag: '--resume',
-    icon: 'continue.png',
-    terminalOnly: true,
-  },
-  {
-    id: 'codebuff',
-    name: 'Codebuff',
-    docUrl: 'https://www.codebuff.com/docs/help/quick-start',
-    installCommand: 'npm install -g codebuff',
-    commands: ['codebuff'],
-    versionArgs: ['--version'],
-    cli: 'codebuff',
-    initialPromptFlag: '',
-    icon: 'codebuff.png',
-    terminalOnly: true,
-  },
-  {
-    id: 'mistral',
-    name: 'Mistral Vibe',
-    docUrl: 'https://github.com/mistralai/mistral-vibe',
-    installCommand: 'curl -LsSf https://mistral.ai/vibe/install.sh | bash',
-    commands: ['vibe'],
-    versionArgs: ['-h'],
-    cli: 'vibe',
-    autoApproveFlag: '--auto-approve',
-    initialPromptFlag: '--prompt',
-    icon: 'mistral.png',
-    terminalOnly: true,
-  },
-  {
-    id: 'pi',
-    name: 'Pi',
-    docUrl: 'https://github.com/badlogic/pi-mono/tree/main/packages/coding-agent',
-    installCommand: 'npm install -g @mariozechner/pi-coding-agent',
-    commands: ['pi'],
-    versionArgs: ['--version'],
-    cli: 'pi',
-    initialPromptFlag: '',
-    resumeFlag: '-c',
-    icon: 'pi.png',
-    terminalOnly: true,
-  },
-  {
-    id: 'autohand',
-    name: 'Autohand Code',
-    docUrl: 'https://autohand.ai/code/',
-    installCommand: 'npm install -g autohand-cli',
-    commands: ['autohand'],
-    versionArgs: ['--version'],
-    cli: 'autohand',
-    autoApproveFlag: '--unrestricted',
-    initialPromptFlag: '-p',
-    icon: 'autohand.svg',
-    terminalOnly: true,
-  },
-];
-
-const PROVIDER_MAP = new Map<string, ProviderDefinition>(
-  PROVIDERS.map((provider) => [provider.id, provider])
-);
-
-export function getProvider(id: ProviderId): ProviderDefinition | undefined {
-  return PROVIDER_MAP.get(id);
-}
-
-export function getInstallCommandForProvider(id: ProviderId): string | null {
-  return PROVIDER_MAP.get(id)?.installCommand ?? null;
-}
-
-/**
- * Validates if a string is a valid provider ID.
- * @param value - The value to validate
- * @returns true if the value is a valid provider ID, false otherwise
- */
-export function isValidProviderId(value: unknown): value is ProviderId {
-  return typeof value === 'string' && PROVIDER_IDS.includes(value as ProviderId);
-}
-
-export function getDocUrlForProvider(id: ProviderId): string | null {
-  return PROVIDER_MAP.get(id)?.docUrl ?? null;
-}
-
-export function listDetectableProviders(): ProviderDefinition[] {
-  return PROVIDERS.filter((provider) => provider.detectable !== false && provider.commands?.length);
-}
diff --git a/src/shared/ptyId.ts b/src/shared/ptyId.ts
index 1187ced00f..c2026d9068 100644
--- a/src/shared/ptyId.ts
+++ b/src/shared/ptyId.ts
@@ -1,40 +1,58 @@
-import { PROVIDER_IDS, type ProviderId } from './providers/registry';
+import { AGENT_PROVIDER_IDS, type AgentProviderId } from './agent-provider-registry';
 
-// Delimiter chosen to be unambiguous — providers are validated against PROVIDER_IDS
-const MAIN_SEP = '-main-';
-const CHAT_SEP = '-chat-';
+const CONV_SEP = '-conv-';
 
-export type PtyIdKind = 'main' | 'chat';
+// Legacy separators — used only for snapshot migration fallback lookups.
+const LEGACY_MAIN_SEP = '-main-';
+const LEGACY_CHAT_SEP = '-chat-';
 
-export function makePtyId(provider: ProviderId, kind: PtyIdKind, suffix: string): string {
-  const sep = kind === 'main' ? MAIN_SEP : CHAT_SEP;
-  return `${provider}${sep}${suffix}`;
+export function makePtyId(provider: AgentProviderId | 'shell', conversationId: string): string {
+  return `${provider}${CONV_SEP}${conversationId}`;
 }
 
 export function parsePtyId(id: string): {
-  providerId: ProviderId;
-  kind: PtyIdKind;
-  suffix: string; // taskId for 'main', conversationId for 'chat'
+  providerId: AgentProviderId | 'shell';
+  conversationId: string;
 } | null {
-  // Try each known provider prefix to avoid ambiguity from greedy matching.
-  // Longest-first so e.g. "continue" is tried before a hypothetical "co".
-  const sorted = [...PROVIDER_IDS].sort((a, b) => b.length - a.length);
-  for (const pid of sorted) {
-    if (id.startsWith(pid + MAIN_SEP)) {
-      return { providerId: pid, kind: 'main', suffix: id.slice(pid.length + MAIN_SEP.length) };
-    }
-    if (id.startsWith(pid + CHAT_SEP)) {
-      return { providerId: pid, kind: 'chat', suffix: id.slice(pid.length + CHAT_SEP.length) };
+  // Try 'shell' sentinel first, then all known provider IDs longest-first to avoid prefix collisions.
+  const candidates: Array<AgentProviderId | 'shell'> = [
+    'shell',
+    ...[...AGENT_PROVIDER_IDS].sort((a, b) => b.length - a.length),
+  ];
+  for (const pid of candidates) {
+    const prefix = pid + CONV_SEP;
+    if (id.startsWith(prefix)) {
+      return { providerId: pid, conversationId: id.slice(prefix.length) };
     }
   }
   return null;
 }
 
-/** Quick check without full parse */
-export function isMainPty(id: string): boolean {
-  return id.includes(MAIN_SEP);
-}
-
-export function isChatPty(id: string): boolean {
-  return id.includes(CHAT_SEP) && !id.includes(MAIN_SEP);
+/**
+ * Try to parse a legacy PTY ID (pre-refactor format: {prov}-main-{taskId} or {prov}-chat-{convId}).
+ * Used only by TerminalSnapshotService for one-time fallback lookups on existing snapshots.
+ */
+export function parseLegacyPtyId(id: string): {
+  providerId: AgentProviderId;
+  kind: 'main' | 'chat';
+  suffix: string;
+} | null {
+  const sorted = [...AGENT_PROVIDER_IDS].sort((a, b) => b.length - a.length);
+  for (const pid of sorted) {
+    if (id.startsWith(pid + LEGACY_MAIN_SEP)) {
+      return {
+        providerId: pid,
+        kind: 'main',
+        suffix: id.slice(pid.length + LEGACY_MAIN_SEP.length),
+      };
+    }
+    if (id.startsWith(pid + LEGACY_CHAT_SEP)) {
+      return {
+        providerId: pid,
+        kind: 'chat',
+        suffix: id.slice(pid.length + LEGACY_CHAT_SEP.length),
+      };
+    }
+  }
+  return null;
 }
diff --git a/src/shared/ptySessionId.ts b/src/shared/ptySessionId.ts
new file mode 100644
index 0000000000..55a58f6644
--- /dev/null
+++ b/src/shared/ptySessionId.ts
@@ -0,0 +1,14 @@
+/**
+ * Deterministic PTY session ID.
+ *
+ * Format: `<projectId>:<scopeId>:<leafId>` where leafId is either a
+ * conversationId (agent sessions) or a terminalId (shell sessions).
+ *
+ * There is at most one active PTY per leaf entity.  Using a deterministic ID
+ * means the renderer can subscribe to ptyDataChannel BEFORE calling
+ * rpc.conversations.startSession / rpc.terminals.createTerminal — no extra
+ * round-trip is needed to learn the session ID.
+ */
+export function makePtySessionId(projectId: string, scopeId: string, leafId: string): string {
+  return `${projectId}:${scopeId}:${leafId}`;
+}
diff --git a/src/shared/pull-requests.ts b/src/shared/pull-requests.ts
new file mode 100644
index 0000000000..2be93476fa
--- /dev/null
+++ b/src/shared/pull-requests.ts
@@ -0,0 +1,168 @@
+export type PullRequestStatus = 'open' | 'closed' | 'merged';
+
+export type MergeableState = 'MERGEABLE' | 'CONFLICTING' | 'UNKNOWN';
+
+export type MergeStateStatus =
+  | 'CLEAN'
+  | 'DIRTY'
+  | 'BEHIND'
+  | 'BLOCKED'
+  | 'HAS_HOOKS'
+  | 'UNSTABLE'
+  | 'UNKNOWN';
+
+export type PullRequestUser = {
+  userId: string;
+  userName: string;
+  displayName: string | null;
+  avatarUrl: string | null;
+  url: string | null;
+  userUpdatedAt: string | null;
+  userCreatedAt: string | null;
+};
+
+export type Label = {
+  name: string;
+  color: string | null;
+};
+
+export type PullRequestCheck = {
+  id: string;
+  pullRequestUrl: string;
+  commitSha: string;
+  name: string;
+  status: string;
+  conclusion: string | null;
+  detailsUrl: string | null;
+  startedAt: string | null;
+  completedAt: string | null;
+  workflowName: string | null;
+  appName: string | null;
+  appLogoUrl: string | null;
+};
+
+/** Fully denormalised PR view used throughout the renderer. */
+export type PullRequest = {
+  url: string;
+  provider: string;
+  repositoryUrl: string;
+  baseRefName: string;
+  baseRefOid: string;
+  headRepositoryUrl: string;
+  headRefName: string;
+  headRefOid: string;
+  identifier: string | null;
+  title: string;
+  description: string | null;
+  status: PullRequestStatus;
+  isDraft: boolean;
+  additions: number | null;
+  deletions: number | null;
+  changedFiles: number | null;
+  commitCount: number | null;
+  mergeableStatus: MergeableState | null;
+  mergeStateStatus: MergeStateStatus | null;
+  reviewDecision: string | null;
+  createdAt: string;
+  updatedAt: string;
+  author: PullRequestUser | null;
+  labels: Label[];
+  assignees: PullRequestUser[];
+  checks: PullRequestCheck[];
+};
+
+// ── Sync progress ─────────────────────────────────────────────────────────────
+
+export type PrSyncProgress = {
+  remoteUrl: string;
+  kind: 'full' | 'incremental' | 'single';
+  status: 'running' | 'done' | 'error' | 'cancelled';
+  synced?: number;
+  total?: number;
+  error?: string;
+};
+
+// ── Query options ─────────────────────────────────────────────────────────────
+
+export type PullRequestStatusFilter = PullRequestStatus | 'all' | 'not-open';
+
+export type PrFilters = {
+  status?: PullRequestStatusFilter;
+  authorUserIds?: string[];
+  labelNames?: string[];
+  assigneeUserIds?: string[];
+};
+
+export type PrSortField = 'newest' | 'oldest' | 'recently-updated';
+
+export type ListPrOptions = {
+  limit?: number;
+  offset?: number;
+  searchQuery?: string;
+  filters?: PrFilters;
+  sort?: PrSortField;
+  repositoryUrl?: string;
+};
+
+export type PrFilterOptions = {
+  authors: PullRequestUser[];
+  labels: Label[];
+  assignees: PullRequestUser[];
+};
+
+// ── Pass-through types ────────────────────────────────────────────────────────
+
+export interface PullRequestFile {
+  filename: string;
+  status: string;
+  additions: number;
+  deletions: number;
+  patch?: string;
+}
+
+// ── Helpers ───────────────────────────────────────────────────────────────────
+
+/**
+ * Returns the open PR if one exists, otherwise the most recently created PR.
+ * Use this everywhere a single "current" PR needs to be displayed.
+ */
+export function selectCurrentPr(prs: PullRequest[]): PullRequest | undefined {
+  if (prs.length === 0) return undefined;
+  const open = prs.find((pr) => pr.status === 'open');
+  if (open) return open;
+  return prs.reduce((a, b) => (a.createdAt >= b.createdAt ? a : b), prs[0]);
+}
+
+/** True when the PR originates from a fork (head repo differs from base repo). */
+export function isForkPr(pr: PullRequest): boolean {
+  return pr.headRepositoryUrl !== pr.repositoryUrl;
+}
+
+/**
+ * Extract the numeric PR number from a `PullRequest` row.
+ * The `identifier` field stores values like `"#123"`.
+ */
+export function getPrNumber(pr: { identifier: string | null }): number | null {
+  if (!pr.identifier) return null;
+  const n = parseInt(pr.identifier.replace('#', ''), 10);
+  return isNaN(n) ? null : n;
+}
+
+/**
+ * Extract the GitHub `owner/repo` string from a normalised repository URL
+ * (e.g. `https://github.com/owner/repo` → `"owner/repo"`).
+ * Returns the URL unchanged if parsing fails.
+ */
+export function nameWithOwnerFromUrl(repositoryUrl: string): string {
+  const match = /github\.com\/([^/]+\/[^/?#]+)/.exec(repositoryUrl);
+  return match ? match[1] : repositoryUrl;
+}
+
+/**
+ * Extract just the owner from a repository URL.
+ * (e.g. `https://github.com/owner/repo` → `"owner"`).
+ */
+export function ownerFromUrl(repositoryUrl: string): string | undefined {
+  const match = /github\.com\/([^/]+)/.exec(repositoryUrl);
+  return match ? match[1] : undefined;
+}
diff --git a/src/shared/result.ts b/src/shared/result.ts
new file mode 100644
index 0000000000..60ba69279a
--- /dev/null
+++ b/src/shared/result.ts
@@ -0,0 +1,6 @@
+export type Ok<T> = { readonly success: true; readonly data: T };
+export type Err<E> = { readonly success: false; readonly error: E };
+export type Result<T, E = string> = Ok<T> | Err<E>;
+
+export const ok = <T>(data: T = undefined as T): Ok<T> => ({ success: true, data });
+export const err = <E>(error: E): Err<E> => ({ success: false, error });
diff --git a/src/shared/skills/agentTargets.ts b/src/shared/skills/agentTargets.ts
index 462e410f85..ce68b2d0d4 100644
--- a/src/shared/skills/agentTargets.ts
+++ b/src/shared/skills/agentTargets.ts
@@ -1,5 +1,5 @@
-import * as path from 'path';
 import * as os from 'os';
+import * as path from 'path';
 
 export interface AgentSyncTarget {
   id: string;
diff --git a/src/shared/ssh.ts b/src/shared/ssh.ts
new file mode 100644
index 0000000000..67eeaee4d3
--- /dev/null
+++ b/src/shared/ssh.ts
@@ -0,0 +1,126 @@
+/**
+ * SSH Connection Configuration
+ * Used for storing SSH connection settings
+ */
+export interface SshConfig {
+  id: string;
+  name: string;
+  host: string;
+  port: number;
+  username: string;
+  authType: 'password' | 'key' | 'agent';
+  privateKeyPath?: string;
+  useAgent?: boolean;
+  worktreesDir?: string;
+}
+
+/**
+ * Connection State
+ * Represents the current state of an SSH connection
+ */
+export type ConnectionState =
+  | 'connecting'
+  | 'connected'
+  | 'reconnecting'
+  | 'disconnected'
+  | 'error';
+
+/**
+ * SSH Connection with metadata
+ * Extends SshConfig with runtime connection information
+ */
+export interface SshConnection extends SshConfig {
+  id: string;
+  state: ConnectionState;
+  lastError?: string;
+  connectedAt?: Date;
+}
+
+/**
+ * Command execution result
+ * Returned after executing a command on a remote host
+ */
+export interface ExecResult {
+  stdout: string;
+  stderr: string;
+  exitCode: number;
+}
+
+/**
+ * File entry for SFTP operations
+ * Represents a file or directory on a remote host
+ */
+export interface FileEntry {
+  path: string;
+  name: string;
+  type: 'file' | 'directory' | 'symlink';
+  size: number;
+  modifiedAt: Date;
+  permissions?: string;
+}
+
+/**
+ * Test connection result
+ * Returned when testing an SSH connection
+ */
+export interface ConnectionTestResult {
+  success: boolean;
+  error?: string;
+  latency?: number;
+  serverVersion?: string;
+  debugLogs?: string[];
+}
+
+/**
+ * Host key info
+ * Contains information about a server's host key for verification
+ */
+export interface HostKeyInfo {
+  host: string;
+  port: number;
+  fingerprint: string;
+  algorithm: string;
+  key: Buffer;
+}
+
+/**
+ * IPC channel names for SSH operations
+ * Using 'as const' ensures type safety and prevents typos
+ */
+export const SSH_IPC_CHANNELS = {
+  TEST_CONNECTION: 'ssh:testConnection',
+  SAVE_CONNECTION: 'ssh:saveConnection',
+  GET_CONNECTIONS: 'ssh:getConnections',
+  DELETE_CONNECTION: 'ssh:deleteConnection',
+  CONNECT: 'ssh:connect',
+  DISCONNECT: 'ssh:disconnect',
+  EXECUTE_COMMAND: 'ssh:executeCommand',
+  LIST_FILES: 'ssh:listFiles',
+  READ_FILE: 'ssh:readFile',
+  WRITE_FILE: 'ssh:writeFile',
+  GET_STATE: 'ssh:getState',
+  ON_STATE_CHANGE: 'ssh:onStateChange',
+  GET_SSH_CONFIG: 'ssh:getSshConfig',
+  GET_SSH_CONFIG_HOST: 'ssh:getSshConfigHost',
+  CHECK_IS_GIT_REPO: 'ssh:checkIsGitRepo',
+  INIT_REPO: 'ssh:initRepo',
+  CLONE_REPO: 'ssh:cloneRepo',
+} as const;
+
+/**
+ * Type for SSH IPC channel names
+ * Can be used for type-safe IPC handlers
+ */
+export type SshIpcChannel = (typeof SSH_IPC_CHANNELS)[keyof typeof SSH_IPC_CHANNELS];
+
+/**
+ * SSH Config Host entry parsed from ~/.ssh/config
+ */
+export interface SshConfigHost {
+  host: string;
+  hostname?: string;
+  user?: string;
+  port?: number;
+  identityFile?: string;
+  identityAgent?: string;
+}
diff --git a/src/shared/ssh/types.ts b/src/shared/ssh/types.ts
deleted file mode 100644
index 3cf4be99d8..0000000000
--- a/src/shared/ssh/types.ts
+++ /dev/null
@@ -1,120 +0,0 @@
-/**
- * SSH Connection Configuration
- * Used for storing SSH connection settings
- */
-export interface SshConfig {
-  id?: string;
-  name: string;
-  host: string;
-  port: number;
-  username: string;
-  authType: 'password' | 'key' | 'agent';
-  privateKeyPath?: string;
-  useAgent?: boolean;
-}
-
-/**
- * Connection State
- * Represents the current state of an SSH connection
- */
-export type ConnectionState = 'connecting' | 'connected' | 'disconnected' | 'error';
-
-/**
- * SSH Connection with metadata
- * Extends SshConfig with runtime connection information
- */
-export interface SshConnection extends SshConfig {
-  id: string;
-  state: ConnectionState;
-  lastError?: string;
-  connectedAt?: Date;
-}
-
-/**
- * Command execution result
- * Returned after executing a command on a remote host
- */
-export interface ExecResult {
-  stdout: string;
-  stderr: string;
-  exitCode: number;
-}
-
-/**
- * File entry for SFTP operations
- * Represents a file or directory on a remote host
- */
-export interface FileEntry {
-  path: string;
-  name: string;
-  type: 'file' | 'directory' | 'symlink';
-  size: number;
-  modifiedAt: Date;
-  permissions?: string;
-}
-
-/**
- * Test connection result
- * Returned when testing an SSH connection
- */
-export interface ConnectionTestResult {
-  success: boolean;
-  error?: string;
-  latency?: number;
-  serverVersion?: string;
-  debugLogs?: string[];
-}
-
-/**
- * Host key info
- * Contains information about a server's host key for verification
- */
-export interface HostKeyInfo {
-  host: string;
-  port: number;
-  fingerprint: string;
-  algorithm: string;
-  key: Buffer;
-}
-
-/**
- * IPC channel names for SSH operations
- * Using 'as const' ensures type safety and prevents typos
- */
-export const SSH_IPC_CHANNELS = {
-  TEST_CONNECTION: 'ssh:testConnection',
-  SAVE_CONNECTION: 'ssh:saveConnection',
-  GET_CONNECTIONS: 'ssh:getConnections',
-  DELETE_CONNECTION: 'ssh:deleteConnection',
-  CONNECT: 'ssh:connect',
-  DISCONNECT: 'ssh:disconnect',
-  EXECUTE_COMMAND: 'ssh:executeCommand',
-  LIST_FILES: 'ssh:listFiles',
-  READ_FILE: 'ssh:readFile',
-  WRITE_FILE: 'ssh:writeFile',
-  GET_STATE: 'ssh:getState',
-  ON_STATE_CHANGE: 'ssh:onStateChange',
-  GET_SSH_CONFIG: 'ssh:getSshConfig',
-  GET_SSH_CONFIG_HOST: 'ssh:getSshConfigHost',
-  CHECK_IS_GIT_REPO: 'ssh:checkIsGitRepo',
-  INIT_REPO: 'ssh:initRepo',
-  CLONE_REPO: 'ssh:cloneRepo',
-} as const;
-
-/**
- * Type for SSH IPC channel names
- * Can be used for type-safe IPC handlers
- */
-export type SshIpcChannel = (typeof SSH_IPC_CHANNELS)[keyof typeof SSH_IPC_CHANNELS];
-
-/**
- * SSH Config Host entry parsed from ~/.ssh/config
- */
-export interface SshConfigHost {
-  host: string;
-  hostname?: string;
-  user?: string;
-  port?: number;
-  identityFile?: string;
-  identityAgent?: string;
-}
diff --git a/src/shared/startup-data-gate.ts b/src/shared/startup-data-gate.ts
new file mode 100644
index 0000000000..145b07b21d
--- /dev/null
+++ b/src/shared/startup-data-gate.ts
@@ -0,0 +1,34 @@
+export type StartupDataGateStatus =
+  | 'completed'
+  | 'no-legacy-file'
+  | 'skipped-legacy'
+  | 'kept-beta'
+  | 'wiped-beta';
+
+export type StartupDataGatePhase = 'ready' | 'needs_decision' | 'running';
+export type StartupDataGateScenario = 'none' | 'legacy_only' | 'beta_only' | 'both';
+
+export type StartupDataGateAction =
+  | 'import_legacy'
+  | 'skip_legacy'
+  | 'keep_beta'
+  | 'wipe_beta'
+  | 'replace_with_legacy';
+
+export type StartupDataGateState = {
+  phase: StartupDataGatePhase;
+  scenario: StartupDataGateScenario;
+  hasLegacyFile: boolean;
+  hasBetaData: boolean;
+  status: StartupDataGateStatus | null;
+};
+
+export type ResolveStartupDataGateActionArgs = {
+  action: StartupDataGateAction;
+};
+
+export type ResolveStartupDataGateActionResult = {
+  success: boolean;
+  state: StartupDataGateState;
+  error?: string;
+};
diff --git a/src/shared/task/envVars.test.ts b/src/shared/task/envVars.test.ts
new file mode 100644
index 0000000000..53a7a75973
--- /dev/null
+++ b/src/shared/task/envVars.test.ts
@@ -0,0 +1,81 @@
+import { describe, expect, it } from 'vitest';
+import { getTaskEnvVars, type TaskEnvContext } from './envVars';
+
+describe('getTaskEnvVars', () => {
+  const baseCtx: TaskEnvContext = {
+    taskId: 'task-abc-123',
+    taskName: 'Fix Login Bug',
+    taskPath: '/home/user/worktrees/fix-login-bug',
+    projectPath: '/home/user/projects/myapp',
+    defaultBranch: 'main',
+  };
+
+  it('returns all six env vars', () => {
+    const vars = getTaskEnvVars(baseCtx);
+    expect(Object.keys(vars)).toHaveLength(6);
+    expect(vars).toHaveProperty('EMDASH_TASK_ID');
+    expect(vars).toHaveProperty('EMDASH_TASK_NAME');
+    expect(vars).toHaveProperty('EMDASH_TASK_PATH');
+    expect(vars).toHaveProperty('EMDASH_ROOT_PATH');
+    expect(vars).toHaveProperty('EMDASH_DEFAULT_BRANCH');
+    expect(vars).toHaveProperty('EMDASH_PORT');
+  });
+
+  it('passes through taskId, taskPath, projectPath directly', () => {
+    const vars = getTaskEnvVars(baseCtx);
+    expect(vars.EMDASH_TASK_ID).toBe('task-abc-123');
+    expect(vars.EMDASH_TASK_PATH).toBe('/home/user/worktrees/fix-login-bug');
+    expect(vars.EMDASH_ROOT_PATH).toBe('/home/user/projects/myapp');
+  });
+
+  it('slugifies the task name', () => {
+    const vars = getTaskEnvVars(baseCtx);
+    expect(vars.EMDASH_TASK_NAME).toBe('fix-login-bug');
+  });
+
+  it('strips leading/trailing hyphens from slug', () => {
+    const vars = getTaskEnvVars({ ...baseCtx, taskName: '---Hello World---' });
+    expect(vars.EMDASH_TASK_NAME).toBe('hello-world');
+  });
+
+  it('falls back to "task" when name slugifies to empty', () => {
+    const vars = getTaskEnvVars({ ...baseCtx, taskName: '!!!' });
+    expect(vars.EMDASH_TASK_NAME).toBe('task');
+  });
+
+  it('defaults defaultBranch to "main"', () => {
+    const { defaultBranch: _, ...ctx } = baseCtx;
+    const vars = getTaskEnvVars(ctx as TaskEnvContext);
+    expect(vars.EMDASH_DEFAULT_BRANCH).toBe('main');
+  });
+
+  it('uses provided defaultBranch', () => {
+    const vars = getTaskEnvVars({ ...baseCtx, defaultBranch: 'develop' });
+    expect(vars.EMDASH_DEFAULT_BRANCH).toBe('develop');
+  });
+
+  it('generates a port in the 50000-59990 range', () => {
+    const vars = getTaskEnvVars(baseCtx);
+    const port = Number(vars.EMDASH_PORT);
+    expect(port).toBeGreaterThanOrEqual(50000);
+    expect(port).toBeLessThanOrEqual(59990);
+  });
+
+  it('generates a port that is a multiple of 10', () => {
+    const vars = getTaskEnvVars(baseCtx);
+    const port = Number(vars.EMDASH_PORT);
+    expect(port % 10).toBe(0);
+  });
+
+  it('generates stable port for same input', () => {
+    const a = getTaskEnvVars(baseCtx);
+    const b = getTaskEnvVars(baseCtx);
+    expect(a.EMDASH_PORT).toBe(b.EMDASH_PORT);
+  });
+
+  it('uses portSeed over taskPath when provided', () => {
+    const withSeed = getTaskEnvVars({ ...baseCtx, portSeed: 'custom-seed' });
+    expect(typeof withSeed.EMDASH_PORT).toBe('string');
+    expect(Number(withSeed.EMDASH_PORT)).toBeGreaterThanOrEqual(50000);
+  });
+});
diff --git a/src/shared/tasks.test.ts b/src/shared/tasks.test.ts
new file mode 100644
index 0000000000..d030781ebd
--- /dev/null
+++ b/src/shared/tasks.test.ts
@@ -0,0 +1,17 @@
+import { describe, expect, expectTypeOf, it } from 'vitest';
+import type { Issue } from './tasks';
+
+describe('Issue', () => {
+  it('supports provider-specific branch names', () => {
+    const issue: Issue = {
+      provider: 'linear',
+      url: 'https://linear.app/general-action/issue/GEN-626',
+      title: 'Linear issue branch name creation',
+      identifier: 'GEN-626',
+      branchName: 'jona/gen-626-linear-issue-branch-name-creation',
+    };
+
+    expect(issue.branchName).toBe('jona/gen-626-linear-issue-branch-name-creation');
+    expectTypeOf(issue.branchName).toEqualTypeOf<string | undefined>();
+  });
+});
diff --git a/src/shared/tasks.ts b/src/shared/tasks.ts
new file mode 100644
index 0000000000..2b0f326e5b
--- /dev/null
+++ b/src/shared/tasks.ts
@@ -0,0 +1,109 @@
+import { CreateConversationParams } from '@shared/conversations';
+import type { Branch, CreateBranchError, FetchPrForReviewError, PushError } from '@shared/git';
+import { PullRequest } from './pull-requests';
+
+export type TaskLifecycleStatus = 'todo' | 'in_progress' | 'review' | 'done' | 'cancelled';
+
+export type Issue = {
+  provider: 'github' | 'linear' | 'jira' | 'gitlab' | 'plain' | 'forgejo';
+  url: string;
+  title: string;
+  identifier: string;
+  description?: string;
+  branchName?: string;
+  status?: string;
+  assignees?: string[];
+  project?: string;
+  updatedAt?: string;
+  fetchedAt?: string;
+};
+
+export type Task = {
+  id: string;
+  projectId: string;
+  name: string;
+  status: TaskLifecycleStatus;
+  sourceBranch: Branch | undefined;
+  taskBranch?: string;
+  createdAt: string;
+  updatedAt: string;
+  /** ISO timestamp: when lifecycle status last changed (current status entered). */
+  statusChangedAt: string;
+  archivedAt?: string;
+  lastInteractedAt?: string;
+  linkedIssue?: Issue;
+  isPinned: boolean;
+  prs: PullRequest[];
+  conversations: Record<string, number>;
+};
+
+export type TaskBootstrapStatus =
+  | { status: 'ready' }
+  | { status: 'bootstrapping' }
+  | { status: 'error'; message: string }
+  | { status: 'not-started' };
+
+export type CreateTaskStrategy =
+  | { kind: 'new-branch'; taskBranch: string; pushBranch?: boolean }
+  | { kind: 'checkout-existing' }
+  | {
+      kind: 'from-pull-request';
+      prNumber: number;
+      /** The PR's headRefName, used as the local branch name (same as `gh pr checkout`). */
+      headBranch: string;
+      headRepositoryUrl: string;
+      isFork: boolean;
+      taskBranch?: string;
+      pushBranch?: boolean;
+    }
+  | { kind: 'no-worktree' };
+
+export type CreateTaskParams = {
+  id: string;
+  projectId: string;
+  name: string;
+  /** The branch to fork the new worktree from (not used for `from-pull-request` strategy) */
+  sourceBranch: Branch;
+  /** Controls branch creation, worktree setup, and git fetch strategy */
+  strategy: CreateTaskStrategy;
+  /** The issue to link to the task */
+  linkedIssue?: Issue;
+  /**  */
+  initialConversation?: CreateConversationParams;
+  initialStatus?: TaskLifecycleStatus;
+};
+
+export type CreateTaskError =
+  | { type: 'project-not-found' }
+  | { type: 'initial-commit-required'; branch: string }
+  | { type: 'branch-create-failed'; branch: string; error: CreateBranchError }
+  | { type: 'pr-fetch-failed'; error: FetchPrForReviewError; remote: string }
+  | { type: 'branch-not-found'; branch: string }
+  | { type: 'worktree-setup-failed'; branch: string; message?: string }
+  | { type: 'provision-failed'; message: string };
+
+export type CreateTaskWarning = {
+  type: 'branch-publish-failed';
+  branch: string;
+  remote: string;
+  error: PushError;
+};
+
+export type CreateTaskSuccess = {
+  task: Task;
+  warning?: CreateTaskWarning;
+};
+
+export type ProvisionTaskResult = {
+  path: string;
+  workspaceId: string;
+};
+
+export function formatIssueAsPrompt(issue: Issue, initialPrompt?: string): string {
+  const parts = [`[${issue.identifier}] ${issue.title}`, issue.url, issue.description].filter(
+    Boolean
+  );
+
+  if (initialPrompt?.trim()) parts.push('', initialPrompt.trim());
+  return parts.join('\n');
+}
diff --git a/src/shared/telemetry.ts b/src/shared/telemetry.ts
new file mode 100644
index 0000000000..8284ff800c
--- /dev/null
+++ b/src/shared/telemetry.ts
@@ -0,0 +1,131 @@
+import type { AgentProviderId } from '@shared/agent-provider-registry';
+import type { OpenInAppId } from '@shared/openInApps';
+import type { TaskLifecycleStatus } from '@shared/tasks';
+
+type EmptyProps = Record<string, never>;
+
+export type FocusView = 'home' | 'project' | 'task' | 'settings' | 'skills' | 'mcp';
+export type FocusMainPanel = 'agents' | 'editor' | 'diff';
+export type FocusRightPanel = 'changes' | 'terminals' | 'files';
+export type FocusedRegion = 'main' | 'right';
+
+export type FocusTrigger = 'navigation' | 'panel_switch' | 'region_switch';
+
+export interface TelemetryEnvelope {
+  event_ts_ms?: number;
+  session_id?: string;
+  project_id?: string;
+  task_id?: string;
+  conversation_id?: string;
+}
+
+export interface FocusContext {
+  active_view: FocusView | null;
+  active_main_panel: FocusMainPanel | null;
+  active_right_panel: FocusRightPanel | null;
+  focused_region: FocusedRegion | null;
+}
+
+export type SettingName = 'theme' | 'default_provider' | 'telemetry' | 'notifications';
+
+export type TelemetryEventProperties = {
+  app_started: EmptyProps;
+  app_closed: { was_crash?: boolean };
+  app_window_focused: EmptyProps;
+  app_window_unfocused: EmptyProps;
+  daily_active_user: { date: string; timezone: string };
+
+  focus_changed: {
+    view: FocusView | null;
+    main_panel: FocusMainPanel | null;
+    right_panel: FocusRightPanel | null;
+    focused_region: FocusedRegion | null;
+    trigger: FocusTrigger;
+  };
+
+  home_viewed: { from_view: FocusView | null };
+  project_viewed: { from_view: FocusView | null };
+  task_viewed: { from_view: FocusView | null };
+  settings_viewed: { from_view: FocusView | null };
+  skills_viewed: { from_view: FocusView | null };
+  mcp_viewed: { from_view: FocusView | null };
+
+  project_added: { type: 'local' | 'ssh'; strategy: 'open' | 'create' | 'clone'; success: boolean };
+  project_deleted: EmptyProps;
+
+  task_created: {
+    strategy: 'blank' | 'branch' | 'issue' | 'pr';
+    has_initial_prompt: boolean;
+    has_issue: 'github' | 'linear' | 'jira' | 'gitlab' | 'plain' | 'forgejo' | 'none';
+    provider: AgentProviderId | null;
+  };
+  task_provisioned: EmptyProps;
+  task_archived: EmptyProps;
+  task_status_changed: { from_status: TaskLifecycleStatus; to_status: TaskLifecycleStatus };
+  task_deleted: EmptyProps;
+
+  conversation_created: { provider: AgentProviderId; is_first_in_task: boolean };
+  conversation_deleted: EmptyProps;
+  agent_run_started: { provider: AgentProviderId };
+  agent_run_finished: { provider: AgentProviderId; exit_code: number };
+
+  terminal_created: { terminal_id: string };
+  terminal_deleted: { terminal_id: string };
+
+  pr_created: { is_draft: boolean };
+  pr_creation_failed: { error_type: string };
+  pr_merged: {
+    strategy: 'merge' | 'squash' | 'rebase';
+    success: boolean;
+    error_type?: string;
+  };
+
+  vcs_branch_published: { success: boolean; error_type?: string };
+  vcs_fetch: { success: boolean; error_type?: string };
+  vcs_push: { success: boolean; error_type?: string };
+  vcs_pull: { success: boolean; strategy?: string; conflicts?: boolean; error_type?: string };
+  vcs_files_staged: { count: number; scope: 'single' | 'multiple' | 'all' };
+  vcs_files_unstaged: { count: number; scope: 'single' | 'multiple' | 'all' };
+  vcs_files_discarded: { count: number; scope: 'single' | 'multiple' | 'all' };
+
+  user_signed_in: EmptyProps;
+  user_signed_out: EmptyProps;
+
+  integration_connected: { provider: 'github' | 'linear' | 'jira' };
+  integration_disconnected: { provider: 'github' | 'linear' | 'jira' };
+  issue_linked_to_task: { provider: 'github' | 'linear' | 'jira' | 'gitlab' | 'plain' | 'forgejo' };
+
+  open_in_external: { app: OpenInAppId | 'browser' };
+  ssh_connection_attempted: { success: boolean };
+
+  mcp_server_added: { source: 'catalog' | 'custom' };
+  mcp_server_removed: EmptyProps;
+
+  skill_installed: { source?: string };
+  skill_uninstalled: EmptyProps;
+  skill_created: EmptyProps;
+
+  setting_changed: { setting: SettingName };
+  sidebar_toggled: { side: 'left' | 'right'; state: 'open' | 'closed' };
+
+  $exception: {
+    $exception_message: string;
+    $exception_type: string;
+    $exception_stack_trace_raw: string;
+    $exception_fingerprint?: string;
+    severity?: 'low' | 'medium' | 'high' | 'critical';
+    component?: string;
+    action?: string;
+    user_action?: string;
+    operation?: string;
+    endpoint?: string;
+    session_errors?: number;
+    error_timestamp?: string;
+    error_type?: string;
+  };
+  error: { error_type: string; scope: string };
+};
+
+export type TelemetryEvent = keyof TelemetryEventProperties;
+export type TelemetryProperties<E extends TelemetryEvent> = TelemetryEventProperties[E] &
+  TelemetryEnvelope;
diff --git a/src/shared/terminals.test.ts b/src/shared/terminals.test.ts
new file mode 100644
index 0000000000..9211810fec
--- /dev/null
+++ b/src/shared/terminals.test.ts
@@ -0,0 +1,55 @@
+import { describe, expect, it } from 'vitest';
+import { createScriptTerminalId } from './terminals';
+
+describe('createScriptTerminalId', () => {
+  it('is deterministic for the same project/scope/script tuple', async () => {
+    const first = await createScriptTerminalId({
+      projectId: 'project-1',
+      scopeId: 'workspace:main',
+      type: 'setup',
+      script: 'pnpm install',
+    });
+    const second = await createScriptTerminalId({
+      projectId: 'project-1',
+      scopeId: 'workspace:main',
+      type: 'setup',
+      script: 'pnpm install',
+    });
+
+    expect(first).toBe(second);
+  });
+
+  it('changes when scope changes (task vs workspace identity)', async () => {
+    const taskScoped = await createScriptTerminalId({
+      projectId: 'project-1',
+      scopeId: 'task-1',
+      type: 'run',
+      script: 'pnpm dev',
+    });
+    const workspaceScoped = await createScriptTerminalId({
+      projectId: 'project-1',
+      scopeId: 'workspace:feature/a',
+      type: 'run',
+      script: 'pnpm dev',
+    });
+
+    expect(taskScoped).not.toBe(workspaceScoped);
+  });
+
+  it('keeps backward compatibility with legacy taskId argument', async () => {
+    const viaScopeId = await createScriptTerminalId({
+      projectId: 'project-1',
+      scopeId: 'task-1',
+      type: 'teardown',
+      script: 'echo done',
+    });
+    const viaTaskId = await createScriptTerminalId({
+      projectId: 'project-1',
+      taskId: 'task-1',
+      type: 'teardown',
+      script: 'echo done',
+    });
+
+    expect(viaScopeId).toBe(viaTaskId);
+  });
+});
diff --git a/src/shared/terminals.ts b/src/shared/terminals.ts
new file mode 100644
index 0000000000..2a2a1c7656
--- /dev/null
+++ b/src/shared/terminals.ts
@@ -0,0 +1,39 @@
+import { createHash } from './utils';
+
+export type Terminal = {
+  id: string;
+  projectId: string;
+  taskId: string;
+  ssh?: boolean;
+  name: string;
+};
+
+export type CreateTerminalParams = {
+  id: string;
+  projectId: string;
+  taskId: string;
+  name: string;
+  initialSize?: { cols: number; rows: number };
+};
+
+export async function createScriptTerminalId({
+  projectId,
+  scopeId,
+  taskId,
+  type,
+  script,
+}: {
+  projectId: string;
+  scopeId?: string;
+  taskId?: string;
+  type: 'setup' | 'run' | 'teardown';
+  script: string;
+}) {
+  const resolvedScopeId = scopeId ?? taskId;
+  if (!resolvedScopeId) {
+    throw new Error('createScriptTerminalId requires scopeId');
+  }
+  const key = `${projectId}::${resolvedScopeId}::${type}::${script}`;
+  const hash = await createHash(key);
+  return hash.slice(0, 32);
+}
diff --git a/src/shared/utils.ts b/src/shared/utils.ts
new file mode 100644
index 0000000000..b02ce634d0
--- /dev/null
+++ b/src/shared/utils.ts
@@ -0,0 +1,7 @@
+export async function createHash(input: string): Promise<string> {
+  const encoded = new TextEncoder().encode(input);
+  const hashBuffer = await crypto.subtle.digest('SHA-256', encoded);
+  return Array.from(new Uint8Array(hashBuffer))
+    .map((b) => b.toString(16).padStart(2, '0'))
+    .join('');
+}
diff --git a/src/shared/view-state.ts b/src/shared/view-state.ts
new file mode 100644
index 0000000000..839c98975f
--- /dev/null
+++ b/src/shared/view-state.ts
@@ -0,0 +1,71 @@
+import type { GitObjectRef } from '@shared/git';
+
+export type TabViewSnapshot = {
+  tabOrder: string[];
+  activeTabId: string | undefined;
+};
+
+export type EditorViewSnapshot = {
+  tabs: Array<{ tabId: string; path: string; isPreview: boolean }>;
+  activeTabId: string | null;
+  expandedPaths: string[];
+};
+
+export type DiffViewSnapshot = {
+  diffStyle: 'unified' | 'split';
+  viewMode: 'file';
+  activeFile?: ActiveFile;
+  commitAction: 'commit' | 'commit-push' | null;
+  prTab?: 'files' | 'commits' | 'checks';
+};
+
+export interface ActiveFile {
+  path: string;
+  /** Storage layer: how content is fetched.
+   *  'disk' = working-tree read (disk://)
+   *  'git'  = git-object read (git://) */
+  type: 'disk' | 'git';
+  /** Semantic context: which diff panel/group this file belongs to.
+   *  Determines which side is original/modified and which events make it stale.
+   *  'disk'   = working tree vs HEAD
+   *  'staged' = index vs HEAD
+   *  'git'    = arbitrary ref-to-ref comparison
+   *  'pr'     = PR diff (originalRef is remote-tracking base) */
+  group: 'disk' | 'staged' | 'git' | 'pr';
+  originalRef: GitObjectRef;
+  /** PR head SHA for the modified side of a 'pr' group diff.
+   *  When absent the diff stack falls back to HEAD_REF. */
+  modifiedRef?: GitObjectRef;
+  /** Set only when group === 'pr'. Identifies the PR for store lookups. */
+  prNumber?: number;
+}
+
+export type TaskViewSnapshot = {
+  view: string | null;
+  rightPanelView: string | null;
+  focusedRegion: 'main' | 'right';
+  conversations?: TabViewSnapshot;
+  terminals?: TabViewSnapshot;
+  editor?: EditorViewSnapshot;
+  diffView?: DiffViewSnapshot;
+};
+
+export type ProjectViewSnapshot = {
+  activeView: string;
+  taskViewTab: 'active' | 'archived';
+};
+
+export type NavigationSnapshot = {
+  currentViewId: string;
+  viewParams: Record<string, unknown>;
+};
+
+export type SidebarTaskSortBy = 'created-at' | 'updated-at';
+
+/** Persisted sidebar UI state; fields may be absent in older DB blobs. */
+export type SidebarSnapshot = {
+  expandedProjectIds?: string[];
+  projectOrder?: string[];
+  taskOrderByProject?: Record<string, string[]>;
+  taskSortBy?: SidebarTaskSortBy;
+};
diff --git a/src/shared/workspace-key.ts b/src/shared/workspace-key.ts
new file mode 100644
index 0000000000..4b5ed75584
--- /dev/null
+++ b/src/shared/workspace-key.ts
@@ -0,0 +1,3 @@
+export function workspaceKey(taskBranch: string | undefined): string {
+  return taskBranch ? `branch:${taskBranch}` : 'root:';
+}
diff --git a/src/test/main/AgentEventService.test.ts b/src/test/main/AgentEventService.test.ts
deleted file mode 100644
index 2cd79f286e..0000000000
--- a/src/test/main/AgentEventService.test.ts
+++ /dev/null
@@ -1,183 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
-import http from 'http';
-import { makePtyId } from '../../shared/ptyId';
-
-// --- Mocks ---
-
-const notificationInstances: Array<{ options: any; clickHandler?: () => void }> = [];
-const getMainWindowMock = vi.fn();
-
-vi.mock('electron', () => {
-  class MockNotification {
-    static isSupported = vi.fn(() => true);
-    private _instance: { options: any; clickHandler?: () => void };
-
-    constructor(options: any) {
-      this._instance = { options };
-      notificationInstances.push(this._instance);
-    }
-
-    on(event: string, handler: () => void) {
-      if (event === 'click') this._instance.clickHandler = handler;
-    }
-
-    show() {}
-  }
-
-  return {
-    BrowserWindow: {
-      getAllWindows: vi.fn(() => [
-        {
-          isDestroyed: () => false,
-          isFocused: () => false,
-          webContents: { isDestroyed: () => false, send: vi.fn() },
-        },
-      ]),
-    },
-    Notification: MockNotification,
-  };
-});
-
-vi.mock('../../main/app/window', () => ({
-  getMainWindow: (...args: any[]) => getMainWindowMock(...args),
-}));
-
-vi.mock('../../main/lib/logger', () => ({
-  log: { info: vi.fn(), warn: vi.fn(), error: vi.fn() },
-}));
-
-vi.mock('../../main/settings', () => ({
-  getAppSettings: vi.fn(() => ({
-    notifications: { enabled: true, osNotifications: true },
-  })),
-}));
-
-vi.mock('../../shared/providers/registry', () => ({
-  PROVIDER_IDS: ['claude'],
-  getProvider: vi.fn(() => ({ name: 'Claude' })),
-}));
-
-vi.mock('../../main/services/DatabaseService', () => ({
-  databaseService: {
-    getTaskById: vi.fn(async () => ({ name: 'My Task' })),
-  },
-}));
-
-// --- Helpers ---
-
-function postEvent(
-  port: number,
-  token: string,
-  ptyId: string,
-  type: string,
-  body: Record<string, any> = {}
-): Promise<number> {
-  return new Promise((resolve, reject) => {
-    const data = JSON.stringify(body);
-    const req = http.request(
-      {
-        hostname: '127.0.0.1',
-        port,
-        path: '/hook',
-        method: 'POST',
-        headers: {
-          'x-emdash-token': token,
-          'x-emdash-pty-id': ptyId,
-          'x-emdash-event-type': type,
-          'content-type': 'application/json',
-          'content-length': Buffer.byteLength(data),
-        },
-      },
-      (res) => resolve(res.statusCode ?? 0)
-    );
-    req.on('error', reject);
-    req.write(data);
-    req.end();
-  });
-}
-
-// --- Tests ---
-
-describe('AgentEventService notification click', () => {
-  let service: typeof import('../../main/services/AgentEventService').agentEventService;
-
-  beforeEach(async () => {
-    vi.clearAllMocks();
-    notificationInstances.length = 0;
-    const mod = await import('../../main/services/AgentEventService');
-    service = mod.agentEventService;
-    await service.start();
-  });
-
-  afterEach(() => {
-    service?.stop();
-  });
-
-  it('click handler focuses window and sends focus-task IPC for main PTY', async () => {
-    const ptyId = makePtyId('claude', 'main', 'task-123');
-    const status = await postEvent(service.getPort(), service.getToken(), ptyId, 'stop');
-    expect(status).toBe(200);
-    expect(notificationInstances).toHaveLength(1);
-    expect(notificationInstances[0].clickHandler).toBeTypeOf('function');
-
-    const mockWin = {
-      isDestroyed: () => false,
-      isMinimized: () => false,
-      show: vi.fn(),
-      focus: vi.fn(),
-      restore: vi.fn(),
-      webContents: { send: vi.fn() },
-    };
-    getMainWindowMock.mockReturnValue(mockWin);
-
-    notificationInstances[0].clickHandler!();
-
-    expect(mockWin.show).toHaveBeenCalled();
-    expect(mockWin.focus).toHaveBeenCalled();
-    expect(mockWin.restore).not.toHaveBeenCalled();
-    expect(mockWin.webContents.send).toHaveBeenCalledWith('notification:focus-task', 'task-123');
-  });
-
-  it('restores minimized window on click', async () => {
-    const ptyId = makePtyId('claude', 'main', 'task-456');
-    await postEvent(service.getPort(), service.getToken(), ptyId, 'stop');
-
-    const mockWin = {
-      isDestroyed: () => false,
-      isMinimized: () => true,
-      show: vi.fn(),
-      focus: vi.fn(),
-      restore: vi.fn(),
-      webContents: { send: vi.fn() },
-    };
-    getMainWindowMock.mockReturnValue(mockWin);
-
-    notificationInstances[0].clickHandler!();
-
-    expect(mockWin.restore).toHaveBeenCalled();
-  });
-
-  it('does not send focus-task IPC for chat PTY', async () => {
-    const ptyId = makePtyId('claude', 'chat', 'conv-789');
-    await postEvent(service.getPort(), service.getToken(), ptyId, 'notification', {
-      notification_type: 'permission_prompt',
-    });
-    expect(notificationInstances).toHaveLength(1);
-
-    const mockWin = {
-      isDestroyed: () => false,
-      isMinimized: () => false,
-      show: vi.fn(),
-      focus: vi.fn(),
-      restore: vi.fn(),
-      webContents: { send: vi.fn() },
-    };
-    getMainWindowMock.mockReturnValue(mockWin);
-
-    notificationInstances[0].clickHandler!();
-
-    expect(mockWin.show).toHaveBeenCalled();
-    expect(mockWin.focus).toHaveBeenCalled();
-    expect(mockWin.webContents.send).not.toHaveBeenCalled();
-  });
-});
diff --git a/src/test/main/ClaudeConfigService.test.ts b/src/test/main/ClaudeConfigService.test.ts
deleted file mode 100644
index aa057a41a9..0000000000
--- a/src/test/main/ClaudeConfigService.test.ts
+++ /dev/null
@@ -1,147 +0,0 @@
-import fs from 'fs';
-import os from 'os';
-import path from 'path';
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
-
-// Mock dependencies that pull in Electron
-vi.mock('../../main/lib/logger', () => ({
-  log: { warn: vi.fn(), error: vi.fn(), info: vi.fn() },
-}));
-
-vi.mock('../../main/settings', () => ({
-  getAppSettings: vi.fn(() => ({ tasks: { autoTrustWorktrees: true } })),
-}));
-
-// We need to intercept `homedir` at the module level so the destructured
-// import inside ClaudeConfigService picks up our override.
-let mockHomeDir = '';
-vi.mock('os', async () => {
-  const actual = await vi.importActual<typeof import('os')>('os');
-  return { ...actual, homedir: () => mockHomeDir };
-});
-
-describe('ClaudeConfigService', () => {
-  let tempDir: string;
-  let ensureClaudeTrust: typeof import('../../main/services/ClaudeConfigService').ensureClaudeTrust;
-
-  beforeEach(async () => {
-    tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'claude-config-test-'));
-    mockHomeDir = tempDir;
-    vi.resetModules();
-    ({ ensureClaudeTrust } = await import('../../main/services/ClaudeConfigService'));
-  });
-
-  afterEach(() => {
-    fs.rmSync(tempDir, { recursive: true, force: true });
-  });
-
-  it('creates ~/.claude.json when it does not exist', () => {
-    const worktreePath = '/Users/test/worktrees/my-task-abc';
-    ensureClaudeTrust(worktreePath);
-
-    const configPath = path.join(tempDir, '.claude.json');
-    expect(fs.existsSync(configPath)).toBe(true);
-
-    const config = JSON.parse(fs.readFileSync(configPath, 'utf8'));
-    expect(config.projects[worktreePath]).toEqual({
-      hasTrustDialogAccepted: true,
-      hasCompletedProjectOnboarding: true,
-    });
-  });
-
-  it('adds entry to existing config preserving other fields', () => {
-    const configPath = path.join(tempDir, '.claude.json');
-    const existing = {
-      someOtherField: 'preserved',
-      projects: {
-        '/existing/path': { hasTrustDialogAccepted: true, hasCompletedProjectOnboarding: true },
-      },
-    };
-    fs.writeFileSync(configPath, JSON.stringify(existing), 'utf8');
-
-    const worktreePath = '/Users/test/worktrees/new-task-def';
-    ensureClaudeTrust(worktreePath);
-
-    const config = JSON.parse(fs.readFileSync(configPath, 'utf8'));
-    expect(config.someOtherField).toBe('preserved');
-    expect(config.projects['/existing/path']).toEqual({
-      hasTrustDialogAccepted: true,
-      hasCompletedProjectOnboarding: true,
-    });
-    expect(config.projects[worktreePath]).toEqual({
-      hasTrustDialogAccepted: true,
-      hasCompletedProjectOnboarding: true,
-    });
-  });
-
-  it('is idempotent — skips write when already trusted', () => {
-    const configPath = path.join(tempDir, '.claude.json');
-    const worktreePath = '/Users/test/worktrees/my-task-abc';
-    const existing = {
-      projects: {
-        [worktreePath]: { hasTrustDialogAccepted: true, hasCompletedProjectOnboarding: true },
-      },
-    };
-    fs.writeFileSync(configPath, JSON.stringify(existing), 'utf8');
-    const mtimeBefore = fs.statSync(configPath).mtimeMs;
-
-    // Small delay to ensure mtime would differ if file was rewritten
-    const start = Date.now();
-    while (Date.now() - start < 10) {
-      /* busy wait */
-    }
-
-    ensureClaudeTrust(worktreePath);
-
-    const mtimeAfter = fs.statSync(configPath).mtimeMs;
-    expect(mtimeAfter).toBe(mtimeBefore);
-  });
-
-  it('handles invalid JSON gracefully', () => {
-    const configPath = path.join(tempDir, '.claude.json');
-    fs.writeFileSync(configPath, 'not valid json {{{', 'utf8');
-
-    const worktreePath = '/Users/test/worktrees/my-task-abc';
-    // Should not throw
-    expect(() => ensureClaudeTrust(worktreePath)).not.toThrow();
-  });
-
-  it('resolves relative paths to absolute', () => {
-    const worktreePath = './relative/path';
-    ensureClaudeTrust(worktreePath);
-
-    const configPath = path.join(tempDir, '.claude.json');
-    const config = JSON.parse(fs.readFileSync(configPath, 'utf8'));
-
-    const resolvedPath = path.resolve(worktreePath);
-    expect(config.projects[resolvedPath]).toEqual({
-      hasTrustDialogAccepted: true,
-      hasCompletedProjectOnboarding: true,
-    });
-    // The original relative path should not exist as a key
-    expect(config.projects[worktreePath]).toBeUndefined();
-  });
-
-  it('preserves existing fields on the project entry when updating', () => {
-    const configPath = path.join(tempDir, '.claude.json');
-    const worktreePath = '/Users/test/worktrees/my-task-abc';
-    const existing = {
-      projects: {
-        [worktreePath]: {
-          hasTrustDialogAccepted: false,
-          customField: 'keep-me',
-        },
-      },
-    };
-    fs.writeFileSync(configPath, JSON.stringify(existing), 'utf8');
-
-    ensureClaudeTrust(worktreePath);
-
-    const config = JSON.parse(fs.readFileSync(configPath, 'utf8'));
-    expect(config.projects[worktreePath]).toEqual({
-      hasTrustDialogAccepted: true,
-      hasCompletedProjectOnboarding: true,
-      customField: 'keep-me',
-    });
-  });
-});
diff --git a/src/test/main/ConnectionsService.test.ts b/src/test/main/ConnectionsService.test.ts
deleted file mode 100644
index 711515e586..0000000000
--- a/src/test/main/ConnectionsService.test.ts
+++ /dev/null
@@ -1,185 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it, vi, type Mock } from 'vitest';
-import { EventEmitter } from 'events';
-
-// ── mocks ────────────────────────────────────────────────────────────
-
-const spawnMock = vi.fn();
-const execFileSyncMock = vi.fn();
-
-vi.mock('child_process', () => ({
-  spawn: (...args: unknown[]) => spawnMock(...args),
-  execFileSync: (...args: unknown[]) => execFileSyncMock(...args),
-}));
-
-vi.mock('electron', () => ({
-  app: { getPath: () => '/tmp/test-emdash' },
-  BrowserWindow: { getAllWindows: () => [] },
-}));
-
-vi.mock('../../main/lib/logger', () => ({
-  log: { info: vi.fn(), warn: vi.fn(), error: vi.fn(), debug: vi.fn() },
-}));
-
-// Inline the cache so we can inspect it directly
-const statusMap: Record<string, any> = {};
-vi.mock('../../main/services/providerStatusCache', () => ({
-  providerStatusCache: {
-    load: vi.fn().mockResolvedValue(undefined),
-    getAll: () => ({ ...statusMap }),
-    get: (id: string) => statusMap[id],
-    set: (id: string, v: any) => {
-      statusMap[id] = v;
-    },
-  },
-}));
-
-// ── helpers ──────────────────────────────────────────────────────────
-
-type FakeChild = EventEmitter & {
-  stdout: EventEmitter;
-  stderr: EventEmitter;
-  kill: Mock;
-};
-
-/** Create a fake child process that emits events on demand. */
-function fakeChild(): FakeChild {
-  const child = new EventEmitter() as FakeChild;
-  child.stdout = new EventEmitter();
-  child.stderr = new EventEmitter();
-  child.kill = vi.fn();
-  return child;
-}
-
-/**
- * Configure spawnMock to return a child that emits the given events.
- * Supports multiple calls by queuing children.
- */
-function spawnEmits(
-  ...scenarios: Array<{
-    stdout?: string;
-    stderr?: string;
-    closeCode?: number | null;
-    error?: NodeJS.ErrnoException;
-  }>
-) {
-  for (const scenario of scenarios) {
-    spawnMock.mockImplementationOnce(() => {
-      const child = fakeChild();
-      // Schedule events on next tick so the caller can attach listeners
-      process.nextTick(() => {
-        if (scenario.stdout) child.stdout.emit('data', scenario.stdout);
-        if (scenario.stderr) child.stderr.emit('data', scenario.stderr);
-        if (scenario.error) {
-          child.emit('error', scenario.error);
-        } else {
-          child.emit('close', scenario.closeCode ?? 0);
-        }
-      });
-      return child;
-    });
-  }
-}
-
-/** Simulate `which <command>` returning a path (or throwing if not found). */
-function whichReturns(path: string | null) {
-  if (path) {
-    execFileSyncMock.mockReturnValue(`${path}\n`);
-  } else {
-    execFileSyncMock.mockImplementation(() => {
-      throw new Error('not found');
-    });
-  }
-}
-
-// ── tests ────────────────────────────────────────────────────────────
-
-describe('ConnectionsService – resolveStatus', () => {
-  beforeEach(async () => {
-    vi.clearAllMocks();
-    vi.useFakeTimers();
-    for (const k of Object.keys(statusMap)) delete statusMap[k];
-  });
-
-  afterEach(() => {
-    vi.useRealTimers();
-  });
-
-  it('marks provider as installed when --version exits with code 0', async () => {
-    whichReturns('/usr/local/bin/claude');
-    spawnEmits({ stdout: '2.1.56 (Claude Code)\n', closeCode: 0 });
-
-    const { connectionsService } = await import('../../main/services/ConnectionsService');
-    await connectionsService.checkProvider('claude', 'manual');
-
-    expect(statusMap.claude?.installed).toBe(true);
-    expect(statusMap.claude?.version).toBe('2.1.56');
-  });
-
-  it('marks provider as installed when --version exits non-zero but binary exists (resolvedPath)', async () => {
-    // Bug scenario: `claude --version` returns non-zero exit code but
-    // `which claude` found the binary. Should NOT be marked as 'missing'.
-    whichReturns('/usr/local/bin/claude');
-    // tryCommands runs the command twice when first attempt is non-success + no error
-    spawnEmits(
-      { stderr: 'some error output\n', closeCode: 1 },
-      { stderr: 'some error output\n', closeCode: 1 }
-    );
-
-    const { connectionsService } = await import('../../main/services/ConnectionsService');
-    await connectionsService.checkProvider('claude', 'manual');
-
-    expect(statusMap.claude?.installed).toBe(true);
-  });
-
-  it('marks provider as installed when binary runs and exits non-zero (no resolvedPath)', async () => {
-    // Binary is in PATH for spawn but `which` fails (edge case).
-    // The process ran and exited with output → binary exists.
-    whichReturns(null);
-    spawnEmits(
-      { stdout: 'some output\n', closeCode: 1 },
-      { stdout: 'some output\n', closeCode: 1 }
-    );
-
-    const { connectionsService } = await import('../../main/services/ConnectionsService');
-    await connectionsService.checkProvider('claude', 'manual');
-
-    expect(statusMap.claude?.installed).toBe(true);
-  });
-
-  it('marks provider as missing when both bare spawn and shell fallback fail', async () => {
-    whichReturns(null);
-    const err = new Error('spawn claude ENOENT') as NodeJS.ErrnoException;
-    err.code = 'ENOENT';
-    // Bare spawn ENOENT, shell fallback also fails (command not found in shell either)
-    spawnEmits({ error: err }, { stderr: 'command not found: claude\n', closeCode: 127 });
-
-    const { connectionsService } = await import('../../main/services/ConnectionsService');
-    await connectionsService.checkProvider('claude', 'manual');
-
-    expect(statusMap.claude?.installed).toBe(false);
-  });
-
-  it('falls back to login shell when bare spawn fails with ENOENT and detects installed', async () => {
-    // Bare spawn can't find `claude` (not in Electron PATH),
-    // but the user's login shell has it in PATH via .zshrc
-    whichReturns(null);
-    const err = new Error('spawn claude ENOENT') as NodeJS.ErrnoException;
-    err.code = 'ENOENT';
-    // First: bare spawn fails with ENOENT
-    // Second: shell fallback succeeds
-    spawnEmits({ error: err }, { stdout: '2.1.56 (Claude Code)\n', closeCode: 0 });
-
-    const { connectionsService } = await import('../../main/services/ConnectionsService');
-    await connectionsService.checkProvider('claude', 'manual');
-
-    expect(statusMap.claude?.installed).toBe(true);
-    // Verify the second spawn used a shell
-    const secondCall = spawnMock.mock.calls[1];
-    expect(secondCall).toBeDefined();
-    // Should invoke a shell (e.g. /bin/zsh or /bin/bash) with login+interactive flags
-    const shellCmd = secondCall[0] as string;
-    const shellArgs = secondCall[1] as string[];
-    expect(shellArgs.some((a: string) => a.includes('claude'))).toBe(true);
-    expect(shellArgs.some((a: string) => a.includes('-l'))).toBe(true);
-  });
-});
diff --git a/src/test/main/DatabasePath.test.ts b/src/test/main/DatabasePath.test.ts
deleted file mode 100644
index afef50de8f..0000000000
--- a/src/test/main/DatabasePath.test.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
-import path from 'node:path';
-
-const existsSyncMock = vi.fn();
-const renameSyncMock = vi.fn();
-const getPathMock = vi.fn();
-
-vi.mock('fs', () => ({
-  existsSync: (...args: any[]) => existsSyncMock(...args),
-  renameSync: (...args: any[]) => renameSyncMock(...args),
-}));
-
-vi.mock('electron', () => ({
-  app: {
-    getPath: (...args: any[]) => getPathMock(...args),
-  },
-}));
-
-import { resolveDatabasePath } from '../../main/db/path';
-
-describe('resolveDatabasePath', () => {
-  beforeEach(() => {
-    vi.clearAllMocks();
-    delete process.env.EMDASH_DB_FILE;
-    getPathMock.mockReturnValue('/tmp/emdash-user-data');
-    existsSyncMock.mockReturnValue(false);
-  });
-
-  afterEach(() => {
-    delete process.env.EMDASH_DB_FILE;
-  });
-
-  it('uses EMDASH_DB_FILE override when set', () => {
-    process.env.EMDASH_DB_FILE = './tmp/test-db/custom.db';
-
-    const result = resolveDatabasePath();
-
-    expect(result).toBe(path.resolve('./tmp/test-db/custom.db'));
-    expect(getPathMock).not.toHaveBeenCalled();
-  });
-
-  it('falls back to userData path when no override is provided', () => {
-    const result = resolveDatabasePath();
-
-    expect(result).toBe('/tmp/emdash-user-data/emdash.db');
-    expect(getPathMock).toHaveBeenCalledWith('userData');
-  });
-});
diff --git a/src/test/main/DatabaseService.initializeSchemaMismatch.test.ts b/src/test/main/DatabaseService.initializeSchemaMismatch.test.ts
deleted file mode 100644
index 0d2feb59a5..0000000000
--- a/src/test/main/DatabaseService.initializeSchemaMismatch.test.ts
+++ /dev/null
@@ -1,145 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest';
-
-type SchemaState = {
-  tables: Set<string>;
-  columnsByTable: Record<string, string[]>;
-};
-
-const schemaState: SchemaState = {
-  tables: new Set<string>(),
-  columnsByTable: {},
-};
-
-type SqlRow = Record<string, unknown>;
-type AllCallback = (err: Error | null, rows?: SqlRow[]) => void;
-type ExecCallback = (err: Error | null) => void;
-type CloseCallback = (err: Error | null) => void;
-
-class MockSqliteDatabase {
-  constructor(_filePath: string, callback: (err: Error | null) => void) {
-    callback(null);
-  }
-
-  all(query: string, callback: AllCallback): void {
-    const trimmed = query.trim();
-    const tableLookup = trimmed.match(/name='([^']+)'/);
-    if (tableLookup) {
-      const tableName = tableLookup[1];
-      callback(null, schemaState.tables.has(tableName) ? [{ name: tableName }] : []);
-      return;
-    }
-
-    const tableInfoLookup = trimmed.match(/^PRAGMA table_info\("([^"]+)"\)$/i);
-    if (tableInfoLookup) {
-      const tableName = tableInfoLookup[1];
-      const columns = schemaState.columnsByTable[tableName] ?? [];
-      callback(
-        null,
-        columns.map((name) => ({
-          name,
-        }))
-      );
-      return;
-    }
-
-    callback(null, []);
-  }
-
-  exec(_statement: string, callback: ExecCallback): void {
-    callback(null);
-  }
-
-  close(callback: CloseCallback): void {
-    callback(null);
-  }
-}
-
-const captureDatabaseErrorMock = vi.fn();
-
-vi.mock('sqlite3', () => ({
-  Database: MockSqliteDatabase,
-}));
-
-vi.mock('../../main/db/path', () => ({
-  resolveDatabasePath: () => '/tmp/emdash-init-test.db',
-  resolveMigrationsPath: () => '/tmp/drizzle',
-}));
-
-vi.mock('../../main/errorTracking', () => ({
-  errorTracking: {
-    captureDatabaseError: (...args: unknown[]) => captureDatabaseErrorMock(...args),
-  },
-}));
-
-vi.mock('../../main/db/drizzleClient', () => ({
-  getDrizzleClient: vi.fn(),
-}));
-
-import { DatabaseSchemaMismatchError, DatabaseService } from '../../main/services/DatabaseService';
-
-describe('DatabaseService.initialize schema contract handling', () => {
-  let service: DatabaseService;
-
-  beforeEach(() => {
-    vi.clearAllMocks();
-    delete process.env.EMDASH_DISABLE_NATIVE_DB;
-    schemaState.tables = new Set(['projects', 'tasks', 'conversations']);
-    schemaState.columnsByTable = {
-      projects: ['id', 'name', 'path', 'git_remote', 'git_branch'],
-      conversations: ['id', 'task_id'],
-      tasks: ['id', 'project_id', 'name'],
-    };
-
-    service = new DatabaseService();
-    vi.spyOn(
-      service as unknown as {
-        ensureMigrations: () => Promise<void>;
-      },
-      'ensureMigrations'
-    ).mockResolvedValue(undefined);
-  });
-
-  it('rejects initialize with typed schema mismatch when projects.base_ref is missing', async () => {
-    await expect(service.initialize()).rejects.toBeInstanceOf(DatabaseSchemaMismatchError);
-    expect(captureDatabaseErrorMock).toHaveBeenCalledWith(
-      expect.any(DatabaseSchemaMismatchError),
-      'initialize_schema_contract',
-      { db_path: '/tmp/emdash-init-test.db' }
-    );
-
-    await service.close();
-  });
-
-  it('resolves initialize when all required schema invariants exist', async () => {
-    schemaState.columnsByTable.projects = [
-      'id',
-      'name',
-      'path',
-      'git_remote',
-      'git_branch',
-      'base_ref',
-    ];
-
-    await expect(service.initialize()).resolves.toBeUndefined();
-    expect(captureDatabaseErrorMock).not.toHaveBeenCalled();
-
-    await service.close();
-  });
-
-  it('tracks migration failures separately from schema contract failures', async () => {
-    const migrationError = new Error('migration boom');
-    vi.spyOn(
-      service as unknown as {
-        ensureMigrations: () => Promise<void>;
-      },
-      'ensureMigrations'
-    ).mockRejectedValueOnce(migrationError);
-
-    await expect(service.initialize()).rejects.toThrow('migration boom');
-    expect(captureDatabaseErrorMock).toHaveBeenCalledWith(migrationError, 'initialize_migrations', {
-      db_path: '/tmp/emdash-init-test.db',
-    });
-
-    await service.close();
-  });
-});
diff --git a/src/test/main/DatabaseService.schemaContract.test.ts b/src/test/main/DatabaseService.schemaContract.test.ts
deleted file mode 100644
index 3001c15fce..0000000000
--- a/src/test/main/DatabaseService.schemaContract.test.ts
+++ /dev/null
@@ -1,75 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest';
-
-vi.mock('../../main/db/path', () => ({
-  resolveDatabasePath: () => '/tmp/emdash-schema-contract-test.db',
-  resolveMigrationsPath: () => '/tmp/drizzle',
-}));
-
-vi.mock('../../main/errorTracking', () => ({
-  errorTracking: {
-    captureDatabaseError: vi.fn(),
-  },
-}));
-
-vi.mock('../../main/db/drizzleClient', () => ({
-  getDrizzleClient: vi.fn(),
-}));
-
-import { DatabaseSchemaMismatchError, DatabaseService } from '../../main/services/DatabaseService';
-
-describe('DatabaseService schema contract', () => {
-  let service: DatabaseService;
-
-  beforeEach(() => {
-    delete process.env.EMDASH_DISABLE_NATIVE_DB;
-    service = new DatabaseService();
-  });
-
-  it('passes when all required invariants exist', async () => {
-    vi.spyOn(service as any, 'tableExists').mockResolvedValue(true);
-    vi.spyOn(service as any, 'tableHasColumn').mockImplementation(async (...args: unknown[]) => {
-      const [tableName, columnName] = args as [string, string];
-      return (
-        (tableName === 'projects' && columnName === 'base_ref') ||
-        (tableName === 'conversations' && columnName === 'task_id')
-      );
-    });
-
-    await expect((service as any).validateSchemaContract()).resolves.toBeUndefined();
-  });
-
-  it('throws typed mismatch error when projects.base_ref is missing', async () => {
-    vi.spyOn(service as any, 'tableExists').mockResolvedValue(true);
-    vi.spyOn(service as any, 'tableHasColumn').mockImplementation(async (...args: unknown[]) => {
-      const [tableName, columnName] = args as [string, string];
-      return tableName === 'conversations' && columnName === 'task_id';
-    });
-
-    await expect((service as any).validateSchemaContract()).rejects.toMatchObject({
-      name: 'DatabaseSchemaMismatchError',
-      code: 'DB_SCHEMA_MISMATCH',
-      dbPath: '/tmp/emdash-schema-contract-test.db',
-      missingInvariants: ['projects.base_ref'],
-    });
-  });
-
-  it('collects multiple missing invariants', async () => {
-    vi.spyOn(service as any, 'tableExists').mockImplementation(async (...args: unknown[]) => {
-      const [tableName] = args as [string];
-      return tableName !== 'tasks';
-    });
-    vi.spyOn(service as any, 'tableHasColumn').mockResolvedValue(false);
-
-    try {
-      await (service as any).validateSchemaContract();
-      throw new Error('Expected schema mismatch to throw');
-    } catch (error) {
-      expect(error).toBeInstanceOf(DatabaseSchemaMismatchError);
-      expect((error as DatabaseSchemaMismatchError).missingInvariants).toEqual([
-        'projects.base_ref',
-        'tasks table',
-        'conversations.task_id',
-      ]);
-    }
-  });
-});
diff --git a/src/test/main/GitHubService.test.ts b/src/test/main/GitHubService.test.ts
deleted file mode 100644
index b59f9096cd..0000000000
--- a/src/test/main/GitHubService.test.ts
+++ /dev/null
@@ -1,129 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest';
-import { promisify } from 'util';
-
-const execCalls: string[] = [];
-let issueListStdout = '[]';
-let issueSearchStdout = '[]';
-
-vi.mock('child_process', () => {
-  const execImpl = (command: string, options?: any, callback?: any) => {
-    const cb = typeof options === 'function' ? options : callback;
-    execCalls.push(command);
-
-    const respond = (stdout: string) => {
-      setImmediate(() => {
-        cb?.(null, stdout, '');
-      });
-    };
-
-    if (command.startsWith('gh auth status')) {
-      respond('github.com\n  ✓ Logged in to github.com account test (keyring)\n');
-    } else if (command.startsWith('gh auth token')) {
-      respond('gho_mocktoken\n');
-    } else if (command.startsWith('gh api user')) {
-      respond(
-        JSON.stringify({
-          id: 1,
-          login: 'tester',
-          name: 'Tester',
-          email: '',
-          avatar_url: '',
-        })
-      );
-    } else if (command.startsWith('gh issue list')) {
-      if (command.includes('--search')) {
-        respond(issueSearchStdout);
-      } else {
-        respond(issueListStdout);
-      }
-    } else {
-      respond('');
-    }
-
-    return { kill: vi.fn() };
-  };
-
-  // Avoid TS7022 by annotating via any-cast for the Symbol-based property
-  (execImpl as any)[promisify.custom] = (command: string, options?: any) => {
-    return new Promise<{ stdout: string; stderr: string }>((resolve, reject) => {
-      execImpl(command, options, (err: any, stdout: string, stderr: string) => {
-        if (err) {
-          reject(err);
-          return;
-        }
-        resolve({ stdout, stderr });
-      });
-    });
-  };
-
-  return {
-    exec: execImpl,
-  };
-});
-
-const setPasswordMock = vi.fn().mockResolvedValue(undefined);
-const getPasswordMock = vi.fn().mockResolvedValue(null);
-const deletePasswordMock = vi.fn().mockResolvedValue(undefined);
-
-vi.mock('keytar', () => {
-  const module = {
-    setPassword: setPasswordMock,
-    getPassword: getPasswordMock,
-    deletePassword: deletePasswordMock,
-  };
-  return {
-    ...module,
-    default: module,
-  };
-});
-
-// eslint-disable-next-line import/first
-import { GitHubService } from '../../main/services/GitHubService';
-
-describe('GitHubService.isAuthenticated', () => {
-  beforeEach(() => {
-    execCalls.length = 0;
-    issueListStdout = '[]';
-    issueSearchStdout = '[]';
-    setPasswordMock.mockClear();
-    getPasswordMock.mockClear();
-    getPasswordMock.mockResolvedValue(null);
-  });
-
-  it('treats GitHub CLI login as authenticated even without stored token', async () => {
-    const service = new GitHubService();
-
-    const result = await service.isAuthenticated();
-
-    expect(result).toBe(true);
-    expect(execCalls.find((cmd) => cmd.startsWith('gh auth status'))).toBeDefined();
-    expect(execCalls.find((cmd) => cmd.startsWith('gh auth token'))).toBeUndefined();
-    expect(setPasswordMock).not.toHaveBeenCalled();
-  });
-
-  it('sorts listed issues by updatedAt descending', async () => {
-    issueListStdout = JSON.stringify([
-      { number: 11, title: 'Older', updatedAt: '2026-03-01T10:00:00.000Z' },
-      { number: 12, title: 'Newest', updatedAt: '2026-03-03T12:00:00.000Z' },
-      { number: 13, title: 'No timestamp', updatedAt: null },
-    ]);
-
-    const service = new GitHubService();
-    const issues = await service.listIssues('/tmp/repo', 50);
-
-    expect(issues.map((issue) => issue.number)).toEqual([12, 11, 13]);
-  });
-
-  it('sorts searched issues by updatedAt descending', async () => {
-    issueSearchStdout = JSON.stringify([
-      { number: 101, title: 'Stale', updatedAt: '2026-03-02T08:00:00.000Z' },
-      { number: 102, title: 'Fresh', updatedAt: '2026-03-04T08:00:00.000Z' },
-      { number: 103, title: 'Bad date', updatedAt: 'invalid' },
-    ]);
-
-    const service = new GitHubService();
-    const issues = await service.searchIssues('/tmp/repo', 'query', 20);
-
-    expect(issues.map((issue) => issue.number)).toEqual([102, 101, 103]);
-  });
-});
diff --git a/src/test/main/GitServiceDiff.test.ts b/src/test/main/GitServiceDiff.test.ts
deleted file mode 100644
index 8e480fbf64..0000000000
--- a/src/test/main/GitServiceDiff.test.ts
+++ /dev/null
@@ -1,248 +0,0 @@
-import { describe, it, expect, beforeEach, afterEach } from 'vitest';
-import * as os from 'os';
-import * as path from 'path';
-import * as fs from 'fs';
-import { execFile } from 'child_process';
-import { promisify } from 'util';
-import { getFileDiff, getCommitFileDiff } from '../../main/services/GitService';
-
-const exec = promisify(execFile);
-
-async function initRepo(): Promise<string> {
-  const dir = await fs.promises.mkdtemp(path.join(os.tmpdir(), 'diff-test-'));
-  await exec('git', ['init'], { cwd: dir });
-  await exec('git', ['config', 'user.email', 'test@test.com'], { cwd: dir });
-  await exec('git', ['config', 'user.name', 'Test'], { cwd: dir });
-  return dir;
-}
-
-async function commitFile(dir: string, name: string, content: string, msg: string): Promise<void> {
-  await fs.promises.writeFile(path.join(dir, name), content);
-  await exec('git', ['add', name], { cwd: dir });
-  await exec('git', ['commit', '-m', msg], { cwd: dir });
-}
-
-describe('getFileDiff (integration)', () => {
-  let repo: string;
-
-  beforeEach(async () => {
-    repo = await initRepo();
-  });
-
-  afterEach(async () => {
-    await fs.promises.rm(repo, { recursive: true, force: true });
-  });
-
-  it('should return diff lines and full content for a modified text file', async () => {
-    await commitFile(repo, 'file.txt', 'hello\nworld\n', 'init');
-    await fs.promises.writeFile(path.join(repo, 'file.txt'), 'hello\nchanged\n');
-
-    const result = await getFileDiff(repo, 'file.txt');
-
-    expect(result.isBinary).toBeFalsy();
-    expect(result.originalContent).toBe('hello\nworld');
-    expect(result.modifiedContent).toBe('hello\nchanged');
-    expect(result.lines).toContainEqual({ left: 'world', type: 'del' });
-    expect(result.lines).toContainEqual({ right: 'changed', type: 'add' });
-    expect(result.lines).toContainEqual({ left: 'hello', right: 'hello', type: 'context' });
-  });
-
-  it('should handle an untracked file (no HEAD version)', async () => {
-    // Need at least one commit for HEAD to exist
-    await commitFile(repo, 'init.txt', 'x\n', 'init');
-    await fs.promises.writeFile(path.join(repo, 'new.txt'), 'line1\nline2\n');
-
-    const result = await getFileDiff(repo, 'new.txt');
-
-    expect(result.originalContent).toBeUndefined();
-    expect(result.modifiedContent).toBe('line1\nline2');
-    expect(result.lines.every((l) => l.type === 'add')).toBe(true);
-  });
-
-  it('should handle a deleted file (exists at HEAD, removed from disk)', async () => {
-    await commitFile(repo, 'doomed.txt', 'goodbye\nworld\n', 'init');
-    await fs.promises.unlink(path.join(repo, 'doomed.txt'));
-
-    const result = await getFileDiff(repo, 'doomed.txt');
-
-    expect(result.originalContent).toBe('goodbye\nworld');
-    expect(result.modifiedContent).toBeUndefined();
-    expect(result.lines.every((l) => l.type === 'del')).toBe(true);
-  });
-
-  it('should detect a binary file and not return content', async () => {
-    // PNG header bytes — git will detect this as binary
-    const png = Buffer.alloc(256);
-    png[0] = 0x89;
-    png[1] = 0x50;
-    png[2] = 0x4e;
-    png[3] = 0x47;
-    png[4] = 0x0d;
-    png[5] = 0x0a;
-    png[6] = 0x1a;
-    png[7] = 0x0a;
-    await fs.promises.writeFile(path.join(repo, 'img.png'), png);
-    await exec('git', ['add', 'img.png'], { cwd: repo });
-    await exec('git', ['commit', '-m', 'add image'], { cwd: repo });
-    // Modify the binary
-    png[100] = 0xff;
-    await fs.promises.writeFile(path.join(repo, 'img.png'), png);
-
-    const result = await getFileDiff(repo, 'img.png');
-
-    expect(result.isBinary).toBe(true);
-    expect(result.lines).toEqual([]);
-    expect(result.originalContent).toBeUndefined();
-    expect(result.modifiedContent).toBeUndefined();
-  });
-
-  it('should handle a file changed to empty (modifiedContent is empty string, not undefined)', async () => {
-    await commitFile(repo, 'file.txt', 'content\n', 'init');
-    await fs.promises.writeFile(path.join(repo, 'file.txt'), '');
-
-    const result = await getFileDiff(repo, 'file.txt');
-
-    expect(result.originalContent).toBe('content');
-    expect(result.modifiedContent).toBe('');
-  });
-
-  it('should return undefined content for files exceeding MAX_DIFF_CONTENT_BYTES', async () => {
-    // Create a file just over 512KB
-    const bigContent = 'x'.repeat(520 * 1024) + '\n';
-    await commitFile(repo, 'big.txt', bigContent, 'init');
-    // Small modification so diff is manageable
-    const modified = 'y' + bigContent.slice(1);
-    await fs.promises.writeFile(path.join(repo, 'big.txt'), modified);
-
-    const result = await getFileDiff(repo, 'big.txt');
-
-    // Content exceeds 512KB — should be undefined
-    expect(result.originalContent).toBeUndefined();
-    expect(result.modifiedContent).toBeUndefined();
-    // Diff lines should still work
-    expect(result.lines.length).toBeGreaterThan(0);
-  });
-
-  it('should handle a file in an empty repo (no HEAD)', async () => {
-    // repo has no commits — git diff HEAD will fail
-    await fs.promises.writeFile(path.join(repo, 'first.txt'), 'hello\n');
-
-    const result = await getFileDiff(repo, 'first.txt');
-
-    expect(result.originalContent).toBeUndefined();
-    expect(result.modifiedContent).toBe('hello');
-    expect(result.lines.every((l) => l.type === 'add')).toBe(true);
-  });
-
-  it('should reject paths outside the worktree', async () => {
-    await expect(getFileDiff(repo, '../../../etc/passwd')).rejects.toThrow(
-      'File path is outside the worktree'
-    );
-  });
-});
-
-describe('getCommitFileDiff (integration)', () => {
-  let repo: string;
-
-  beforeEach(async () => {
-    repo = await initRepo();
-  });
-
-  afterEach(async () => {
-    await fs.promises.rm(repo, { recursive: true, force: true });
-  });
-
-  it('should return diff lines and content for a normal commit', async () => {
-    await commitFile(repo, 'file.txt', 'hello\nworld\n', 'first');
-    await fs.promises.writeFile(path.join(repo, 'file.txt'), 'hello\nchanged\n');
-    await exec('git', ['add', 'file.txt'], { cwd: repo });
-    await exec('git', ['commit', '-m', 'second'], { cwd: repo });
-    const { stdout } = await exec('git', ['rev-parse', 'HEAD'], { cwd: repo });
-    const hash = stdout.trim();
-
-    const result = await getCommitFileDiff(repo, hash, 'file.txt');
-
-    expect(result.isBinary).toBeFalsy();
-    expect(result.originalContent).toBe('hello\nworld');
-    expect(result.modifiedContent).toBe('hello\nchanged');
-    expect(result.lines).toContainEqual({ left: 'world', type: 'del' });
-    expect(result.lines).toContainEqual({ right: 'changed', type: 'add' });
-  });
-
-  it('should handle a root commit (no parent)', async () => {
-    await commitFile(repo, 'file.txt', 'first\nfile\n', 'root');
-    const { stdout } = await exec('git', ['rev-parse', 'HEAD'], { cwd: repo });
-    const hash = stdout.trim();
-
-    const result = await getCommitFileDiff(repo, hash, 'file.txt');
-
-    expect(result.originalContent).toBeUndefined();
-    expect(result.modifiedContent).toBe('first\nfile');
-    expect(result.lines.every((l) => l.type === 'add')).toBe(true);
-  });
-
-  it('should handle a root commit with an empty file', async () => {
-    await fs.promises.writeFile(path.join(repo, 'empty.txt'), '');
-    await exec('git', ['add', 'empty.txt'], { cwd: repo });
-    await exec('git', ['commit', '-m', 'root'], { cwd: repo });
-    const { stdout } = await exec('git', ['rev-parse', 'HEAD'], { cwd: repo });
-    const hash = stdout.trim();
-
-    const result = await getCommitFileDiff(repo, hash, 'empty.txt');
-
-    expect(result.modifiedContent).toBe('');
-    expect(result.lines).toEqual([]);
-  });
-
-  it('should detect binary files in commits', async () => {
-    const png = Buffer.alloc(256);
-    png[0] = 0x89;
-    png[1] = 0x50;
-    png[2] = 0x4e;
-    png[3] = 0x47;
-    png[4] = 0x0d;
-    png[5] = 0x0a;
-    png[6] = 0x1a;
-    png[7] = 0x0a;
-    await fs.promises.writeFile(path.join(repo, 'img.png'), png);
-    await exec('git', ['add', 'img.png'], { cwd: repo });
-    await exec('git', ['commit', '-m', 'add image'], { cwd: repo });
-    png[100] = 0xff;
-    await fs.promises.writeFile(path.join(repo, 'img.png'), png);
-    await exec('git', ['add', 'img.png'], { cwd: repo });
-    await exec('git', ['commit', '-m', 'modify image'], { cwd: repo });
-    const { stdout } = await exec('git', ['rev-parse', 'HEAD'], { cwd: repo });
-    const hash = stdout.trim();
-
-    const result = await getCommitFileDiff(repo, hash, 'img.png');
-
-    expect(result.isBinary).toBe(true);
-    expect(result.lines).toEqual([]);
-    expect(result.originalContent).toBeUndefined();
-    expect(result.modifiedContent).toBeUndefined();
-  });
-
-  it('should handle a deleted file in a commit', async () => {
-    await commitFile(repo, 'file.txt', 'content\n', 'add');
-    await exec('git', ['rm', 'file.txt'], { cwd: repo });
-    await exec('git', ['commit', '-m', 'delete'], { cwd: repo });
-    const { stdout } = await exec('git', ['rev-parse', 'HEAD'], { cwd: repo });
-    const hash = stdout.trim();
-
-    const result = await getCommitFileDiff(repo, hash, 'file.txt');
-
-    expect(result.originalContent).toBe('content');
-    expect(result.modifiedContent).toBeUndefined();
-    expect(result.lines.every((l) => l.type === 'del')).toBe(true);
-  });
-
-  it('should reject paths outside the worktree', async () => {
-    await commitFile(repo, 'file.txt', 'x\n', 'init');
-    const { stdout } = await exec('git', ['rev-parse', 'HEAD'], { cwd: repo });
-    const hash = stdout.trim();
-
-    await expect(getCommitFileDiff(repo, hash, '../../../etc/passwd')).rejects.toThrow(
-      'File path is outside the worktree'
-    );
-  });
-});
diff --git a/src/test/main/JiraService.test.ts b/src/test/main/JiraService.test.ts
deleted file mode 100644
index 80e414fee1..0000000000
--- a/src/test/main/JiraService.test.ts
+++ /dev/null
@@ -1,124 +0,0 @@
-import { beforeEach, describe, expect, it, vi, type MockInstance } from 'vitest';
-
-vi.mock('electron', () => ({
-  app: { getPath: () => '/tmp/test-emdash' },
-}));
-
-import JiraService from '../../main/services/JiraService';
-
-type JiraRawIssue = {
-  id: string;
-  key: string;
-  fields: {
-    summary: string;
-    updated?: string | null;
-  };
-};
-
-describe('JiraService sorting', () => {
-  let service: JiraService;
-  let serviceInternals: {
-    requireAuth: () => Promise<{ siteUrl: string; email: string; token: string }>;
-    searchRaw: (
-      siteUrl: string,
-      email: string,
-      token: string,
-      jql: string,
-      limit: number
-    ) => Promise<JiraRawIssue[]>;
-  };
-  let requireAuthSpy: MockInstance;
-  let searchRawSpy: MockInstance;
-
-  beforeEach(() => {
-    service = new JiraService();
-    serviceInternals = service as unknown as typeof serviceInternals;
-    requireAuthSpy = vi.spyOn(serviceInternals, 'requireAuth').mockResolvedValue({
-      siteUrl: 'https://jira.example.com',
-      email: 'user@example.com',
-      token: 'test-token',
-    });
-    searchRawSpy = vi.spyOn(serviceInternals, 'searchRaw');
-  });
-
-  it('sorts initial fetch results by updatedAt descending', async () => {
-    const issues: JiraRawIssue[] = [
-      {
-        id: '1',
-        key: 'GEN-11',
-        fields: { summary: 'Older', updated: '2026-03-02T10:00:00.000Z' },
-      },
-      {
-        id: '2',
-        key: 'GEN-12',
-        fields: { summary: 'Newest', updated: '2026-03-04T10:00:00.000Z' },
-      },
-      {
-        id: '3',
-        key: 'GEN-13',
-        fields: { summary: 'Unknown', updated: null },
-      },
-    ];
-
-    searchRawSpy.mockResolvedValue(issues);
-
-    const result = await service.initialFetch(50);
-
-    expect(result.map((issue) => issue.key)).toEqual(['GEN-12', 'GEN-11', 'GEN-13']);
-    expect(requireAuthSpy).toHaveBeenCalled();
-  });
-
-  it('sorts smart search results by updatedAt descending', async () => {
-    const issues: JiraRawIssue[] = [
-      {
-        id: '10',
-        key: 'GEN-21',
-        fields: { summary: 'Stale', updated: '2026-03-01T08:00:00.000Z' },
-      },
-      {
-        id: '11',
-        key: 'GEN-22',
-        fields: { summary: 'Fresh', updated: '2026-03-05T08:00:00.000Z' },
-      },
-      {
-        id: '12',
-        key: 'GEN-23',
-        fields: { summary: 'Bad date', updated: 'not-a-date' },
-      },
-    ];
-
-    searchRawSpy.mockResolvedValue(issues);
-
-    const result = await service.smartSearchIssues('search term', 20);
-
-    expect(result.map((issue) => issue.key)).toEqual(['GEN-22', 'GEN-21', 'GEN-23']);
-    expect(requireAuthSpy).toHaveBeenCalled();
-  });
-
-  it('sorts searchIssues results by updatedAt descending', async () => {
-    const issues: JiraRawIssue[] = [
-      {
-        id: '20',
-        key: 'GEN-31',
-        fields: { summary: 'Older', updated: '2026-03-02T08:00:00.000Z' },
-      },
-      {
-        id: '21',
-        key: 'GEN-32',
-        fields: { summary: 'Newest', updated: '2026-03-06T08:00:00.000Z' },
-      },
-      {
-        id: '22',
-        key: 'GEN-33',
-        fields: { summary: 'No date', updated: null },
-      },
-    ];
-
-    searchRawSpy.mockResolvedValue(issues);
-
-    const result = await service.searchIssues('query', 20);
-
-    expect(result.map((issue) => issue.key)).toEqual(['GEN-32', 'GEN-31', 'GEN-33']);
-    expect(requireAuthSpy).toHaveBeenCalled();
-  });
-});
diff --git a/src/test/main/LinearService.test.ts b/src/test/main/LinearService.test.ts
deleted file mode 100644
index 66036e0ce6..0000000000
--- a/src/test/main/LinearService.test.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-import { beforeEach, describe, expect, it, vi, type MockInstance } from 'vitest';
-
-import { LinearService } from '../../main/services/LinearService';
-
-type LinearIssueNode = {
-  identifier: string;
-  updatedAt?: string | null;
-};
-
-describe('LinearService sorting', () => {
-  let service: LinearService;
-  let serviceInternals: {
-    getStoredToken: () => Promise<string | null>;
-    graphql: (
-      token: string,
-      query: string,
-      variables?: Record<string, unknown>
-    ) => Promise<unknown>;
-  };
-  let getStoredTokenSpy: MockInstance;
-  let graphqlSpy: MockInstance;
-
-  beforeEach(() => {
-    service = new LinearService();
-    serviceInternals = service as unknown as typeof serviceInternals;
-    getStoredTokenSpy = vi
-      .spyOn(serviceInternals, 'getStoredToken')
-      .mockResolvedValue('test-token');
-    graphqlSpy = vi.spyOn(serviceInternals, 'graphql');
-  });
-
-  it('sorts initial issue fetch by updatedAt descending', async () => {
-    const nodes: LinearIssueNode[] = [
-      { identifier: 'GEN-101', updatedAt: '2026-02-28T10:00:00.000Z' },
-      { identifier: 'GEN-103', updatedAt: '2026-03-01T15:30:00.000Z' },
-      { identifier: 'GEN-102', updatedAt: '2026-03-01T09:00:00.000Z' },
-    ];
-
-    graphqlSpy.mockResolvedValue({ issues: { nodes } });
-
-    const issues = await service.initialFetch(50);
-
-    expect(issues.map((issue) => issue.identifier)).toEqual(['GEN-103', 'GEN-102', 'GEN-101']);
-    expect(getStoredTokenSpy).toHaveBeenCalled();
-  });
-
-  it('sorts search results by updatedAt descending and pushes invalid timestamps to the end', async () => {
-    const nodes: LinearIssueNode[] = [
-      { identifier: 'GEN-200', updatedAt: null },
-      { identifier: 'GEN-201', updatedAt: 'not-a-date' },
-      { identifier: 'GEN-202', updatedAt: '2026-03-03T11:45:00.000Z' },
-      { identifier: 'GEN-203', updatedAt: '2026-03-02T08:15:00.000Z' },
-    ];
-
-    graphqlSpy.mockResolvedValue({ searchIssues: { nodes } });
-
-    const issues = await service.searchIssues('picker sort', 20);
-    const identifiers = issues.map((issue) => issue.identifier);
-
-    expect(identifiers.slice(0, 2)).toEqual(['GEN-202', 'GEN-203']);
-    expect(new Set(identifiers.slice(2))).toEqual(new Set(['GEN-200', 'GEN-201']));
-    expect(getStoredTokenSpy).toHaveBeenCalled();
-  });
-});
diff --git a/src/test/main/SkillsService.test.ts b/src/test/main/SkillsService.test.ts
deleted file mode 100644
index c7238d9b0c..0000000000
--- a/src/test/main/SkillsService.test.ts
+++ /dev/null
@@ -1,156 +0,0 @@
-import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
-import fs from 'fs';
-import path from 'path';
-import os from 'os';
-
-// Mock electron app
-vi.mock('electron', () => ({
-  app: {
-    getPath: vi.fn().mockReturnValue(os.tmpdir()),
-    getName: vi.fn().mockReturnValue('emdash-test'),
-    getVersion: vi.fn().mockReturnValue('0.0.0-test'),
-  },
-}));
-
-// Mock logger
-vi.mock('../../main/lib/logger', () => ({
-  log: {
-    info: vi.fn(),
-    debug: vi.fn(),
-    warn: vi.fn(),
-    error: vi.fn(),
-  },
-}));
-
-import {
-  parseFrontmatter,
-  isValidSkillName,
-  generateSkillMd,
-} from '../../shared/skills/validation';
-
-describe('Skills validation', () => {
-  describe('isValidSkillName', () => {
-    it('accepts valid names', () => {
-      expect(isValidSkillName('code-review')).toBe(true);
-      expect(isValidSkillName('my-skill')).toBe(true);
-      expect(isValidSkillName('a1')).toBe(true);
-      expect(isValidSkillName('test')).toBe(true);
-    });
-
-    it('rejects invalid names', () => {
-      expect(isValidSkillName('')).toBe(false);
-      expect(isValidSkillName('Code-Review')).toBe(false);
-      expect(isValidSkillName('my_skill')).toBe(false);
-      expect(isValidSkillName('has--double')).toBe(false);
-      expect(isValidSkillName('-starts-with-dash')).toBe(false);
-      expect(isValidSkillName('has space')).toBe(false);
-    });
-  });
-
-  describe('parseFrontmatter', () => {
-    it('parses valid YAML frontmatter', () => {
-      const content = `---
-name: "My Skill"
-description: "Does things"
-license: MIT
----
-
-# My Skill
-
-Some content here.`;
-      const result = parseFrontmatter(content);
-      expect(result.frontmatter.name).toBe('My Skill');
-      expect(result.frontmatter.description).toBe('Does things');
-      expect(result.frontmatter.license).toBe('MIT');
-      expect(result.body).toContain('# My Skill');
-    });
-
-    it('handles content without frontmatter', () => {
-      const content = '# Just Markdown\n\nNo frontmatter here.';
-      const result = parseFrontmatter(content);
-      expect(result.frontmatter.name).toBe('');
-      expect(result.frontmatter.description).toBe('');
-      expect(result.body).toBe(content);
-    });
-
-    it('handles single-quoted values', () => {
-      const content = `---
-name: 'Single Quoted'
-description: 'Description here'
----
-
-Body`;
-      const result = parseFrontmatter(content);
-      expect(result.frontmatter.name).toBe('Single Quoted');
-      expect(result.frontmatter.description).toBe('Description here');
-    });
-  });
-
-  describe('generateSkillMd', () => {
-    it('generates valid SKILL.md content', () => {
-      const content = generateSkillMd('my-skill', 'A test skill');
-      expect(content).toContain('name: "my-skill"');
-      expect(content).toContain('description: "A test skill"');
-      expect(content).toContain('# my-skill');
-
-      const parsed = parseFrontmatter(content);
-      expect(parsed.frontmatter.name).toBe('my-skill');
-      expect(parsed.frontmatter.description).toBe('A test skill');
-    });
-
-    it('escapes double quotes in description and roundtrips correctly', () => {
-      const content = generateSkillMd('my-skill', 'Handles "quoted" text');
-      const parsed = parseFrontmatter(content);
-      expect(parsed.frontmatter.description).toBe('Handles "quoted" text');
-    });
-
-    it('accepts optional body and uses it instead of default', () => {
-      const body = 'Custom instructions here.';
-      const content = generateSkillMd('my-skill', 'A test', body);
-      const parsed = parseFrontmatter(content);
-      expect(parsed.body.trim()).toBe(body);
-    });
-  });
-});
-
-describe('SkillsService', () => {
-  let tmpDir: string;
-
-  beforeEach(() => {
-    tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'skills-test-'));
-  });
-
-  afterEach(() => {
-    fs.rmSync(tmpDir, { recursive: true, force: true });
-  });
-
-  it('can create and read a skill directory', async () => {
-    const skillDir = path.join(tmpDir, 'test-skill');
-    fs.mkdirSync(skillDir, { recursive: true });
-    const content = generateSkillMd('test-skill', 'A test');
-    fs.writeFileSync(path.join(skillDir, 'SKILL.md'), content);
-
-    const skillMd = fs.readFileSync(path.join(skillDir, 'SKILL.md'), 'utf-8');
-    const { frontmatter } = parseFrontmatter(skillMd);
-    expect(frontmatter.name).toBe('test-skill');
-  });
-
-  it('can list skills from a directory', async () => {
-    // Create two skills
-    for (const name of ['skill-a', 'skill-b']) {
-      const dir = path.join(tmpDir, name);
-      fs.mkdirSync(dir, { recursive: true });
-      fs.writeFileSync(path.join(dir, 'SKILL.md'), generateSkillMd(name, `Desc for ${name}`));
-    }
-    // Also create a non-skill dir
-    fs.mkdirSync(path.join(tmpDir, '.emdash'), { recursive: true });
-
-    const entries = fs.readdirSync(tmpDir, { withFileTypes: true });
-    const skills = entries
-      .filter((e) => e.isDirectory() && !e.name.startsWith('.'))
-      .filter((e) => fs.existsSync(path.join(tmpDir, e.name, 'SKILL.md')));
-
-    expect(skills).toHaveLength(2);
-    expect(skills.map((s) => s.name).sort()).toEqual(['skill-a', 'skill-b']);
-  });
-});
diff --git a/src/test/main/TaskLifecycleService.test.ts b/src/test/main/TaskLifecycleService.test.ts
deleted file mode 100644
index 1a4217a268..0000000000
--- a/src/test/main/TaskLifecycleService.test.ts
+++ /dev/null
@@ -1,309 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest';
-import { EventEmitter } from 'node:events';
-
-type MockChild = EventEmitter & {
-  stdout: EventEmitter;
-  stderr: EventEmitter;
-  pid: number;
-  exitCode: number | null;
-  killed: boolean;
-  kill: (signal?: NodeJS.Signals) => boolean;
-};
-
-const spawnMock = vi.fn();
-const execFileMock = vi.fn();
-const getScriptMock = vi.fn();
-
-vi.mock('node:child_process', () => ({
-  spawn: (...args: any[]) => spawnMock(...args),
-  execFile: (...args: any[]) => execFileMock(...args),
-}));
-
-vi.mock('../../main/services/LifecycleScriptsService', () => ({
-  lifecycleScriptsService: {
-    getScript: (...args: any[]) => getScriptMock(...args),
-  },
-}));
-
-vi.mock('../../main/lib/logger', () => ({
-  log: {
-    info: vi.fn(),
-    debug: vi.fn(),
-    warn: vi.fn(),
-    error: vi.fn(),
-  },
-}));
-
-function createChild(pid: number, killImpl?: (signal?: NodeJS.Signals) => boolean): MockChild {
-  const child = new EventEmitter() as MockChild;
-  child.stdout = new EventEmitter();
-  child.stderr = new EventEmitter();
-  child.pid = pid;
-  child.exitCode = null;
-  child.killed = false;
-  child.kill = (signal?: NodeJS.Signals) => {
-    child.killed = true;
-    if (killImpl) return killImpl(signal);
-    return true;
-  };
-  return child;
-}
-
-describe('TaskLifecycleService', () => {
-  beforeEach(() => {
-    vi.clearAllMocks();
-
-    // Return default branch asynchronously to surface races around awaits.
-    execFileMock.mockImplementation((_: any, __: any, ___: any, cb: any) => {
-      setTimeout(() => cb(null, 'origin/main\n', ''), 10);
-    });
-
-    getScriptMock.mockImplementation((_: string, phase: string) => {
-      if (phase === 'run') return 'npm run dev';
-      return null;
-    });
-  });
-
-  it('dedupes concurrent startRun calls so only one process spawns', async () => {
-    vi.resetModules();
-
-    const child = createChild(1001);
-    spawnMock.mockReturnValue(child);
-
-    const { taskLifecycleService } = await import('../../main/services/TaskLifecycleService');
-
-    const taskId = 'wt-1';
-    const taskPath = '/tmp/wt-1';
-    const projectPath = '/tmp/project';
-
-    const [a, b] = await Promise.all([
-      taskLifecycleService.startRun(taskId, taskPath, projectPath),
-      taskLifecycleService.startRun(taskId, taskPath, projectPath),
-    ]);
-
-    expect(a.ok).toBe(true);
-    expect(b.ok).toBe(true);
-    expect(spawnMock).toHaveBeenCalledTimes(1);
-  });
-
-  it('does not leave stop intent set when stopRun fails', async () => {
-    vi.resetModules();
-
-    const child = createChild(1002, () => {
-      throw new Error('kill failed');
-    });
-    spawnMock.mockReturnValue(child);
-
-    const { taskLifecycleService } = await import('../../main/services/TaskLifecycleService');
-
-    const taskId = 'wt-2';
-    const taskPath = '/tmp/wt-2';
-    const projectPath = '/tmp/project';
-
-    const started = await taskLifecycleService.startRun(taskId, taskPath, projectPath);
-    expect(started.ok).toBe(true);
-
-    const stopResult = taskLifecycleService.stopRun(taskId);
-    expect(stopResult.ok).toBe(false);
-
-    // If stop intent were leaked, exit would incorrectly force state to idle.
-    child.emit('exit', 143);
-
-    const state = taskLifecycleService.getState(taskId);
-    expect(state.run.status).toBe('failed');
-    expect(state.run.error).toBe('Exited with code 143');
-  });
-
-  it('ignores stale child exit and keeps latest run process tracked', async () => {
-    vi.resetModules();
-
-    const first = createChild(2001);
-    const second = createChild(2002);
-    spawnMock.mockReturnValueOnce(first).mockReturnValueOnce(second);
-
-    const { taskLifecycleService } = await import('../../main/services/TaskLifecycleService');
-
-    const taskId = 'wt-3';
-    const taskPath = '/tmp/wt-3';
-    const projectPath = '/tmp/project';
-
-    await taskLifecycleService.startRun(taskId, taskPath, projectPath);
-    taskLifecycleService.stopRun(taskId);
-    await taskLifecycleService.startRun(taskId, taskPath, projectPath);
-
-    // Old process exits after new process started; should be ignored.
-    first.emit('exit', 143);
-
-    const afterStaleExit = taskLifecycleService.getState(taskId);
-    expect(afterStaleExit.run.status).toBe('running');
-    expect(afterStaleExit.run.pid).toBe(2002);
-  });
-
-  it('ignores stale child error and keeps latest run process state', async () => {
-    vi.resetModules();
-
-    const first = createChild(2101);
-    const second = createChild(2102);
-    spawnMock.mockReturnValueOnce(first).mockReturnValueOnce(second);
-
-    const { taskLifecycleService } = await import('../../main/services/TaskLifecycleService');
-
-    const taskId = 'wt-4';
-    const taskPath = '/tmp/wt-4';
-    const projectPath = '/tmp/project';
-
-    await taskLifecycleService.startRun(taskId, taskPath, projectPath);
-    taskLifecycleService.stopRun(taskId);
-    await taskLifecycleService.startRun(taskId, taskPath, projectPath);
-
-    // Old process emits error after new process started; should be ignored.
-    first.emit('error', new Error('stale child error'));
-
-    const state = taskLifecycleService.getState(taskId);
-    expect(state.run.status).toBe('running');
-    expect(state.run.pid).toBe(2102);
-    expect(state.run.error).toBeNull();
-  });
-
-  it('dedupes concurrent runTeardown calls per task and path', async () => {
-    vi.resetModules();
-
-    const runChild = createChild(2201);
-    getScriptMock.mockImplementation((_: string, phase: string) => {
-      if (phase === 'run') return 'npm run dev';
-      if (phase === 'teardown') return 'echo teardown';
-      return null;
-    });
-
-    const { taskLifecycleService } = await import('../../main/services/TaskLifecycleService');
-    const serviceAny = taskLifecycleService as any;
-    const runFiniteSpy = vi
-      .spyOn(serviceAny, 'runFinite')
-      .mockResolvedValue({ ok: true, skipped: false });
-
-    const taskId = 'wt-5';
-    const taskPath = '/tmp/wt-5';
-    const projectPath = '/tmp/project';
-
-    serviceAny.runProcesses.set(taskId, runChild);
-
-    const teardownA = taskLifecycleService.runTeardown(taskId, taskPath, projectPath);
-    const teardownB = taskLifecycleService.runTeardown(taskId, taskPath, projectPath);
-
-    // Unblock teardown wait-for-exit of run process.
-    runChild.emit('exit', 143);
-
-    const [ra, rb] = await Promise.all([teardownA, teardownB]);
-
-    expect(ra.ok).toBe(true);
-    expect(rb.ok).toBe(true);
-    expect(runFiniteSpy).toHaveBeenCalledTimes(1);
-  });
-
-  it('clears stale run process after spawn error so retry can start', async () => {
-    vi.resetModules();
-
-    const broken = createChild(2301);
-    const good = createChild(2302);
-    spawnMock.mockReturnValueOnce(broken).mockReturnValueOnce(good);
-
-    const { taskLifecycleService } = await import('../../main/services/TaskLifecycleService');
-
-    const taskId = 'wt-6';
-    const taskPath = '/tmp/wt-6';
-    const projectPath = '/tmp/project';
-
-    const firstStart = await taskLifecycleService.startRun(taskId, taskPath, projectPath);
-    expect(firstStart.ok).toBe(true);
-
-    broken.emit('error', new Error('spawn failed'));
-
-    const retry = await taskLifecycleService.startRun(taskId, taskPath, projectPath);
-    expect(retry.ok).toBe(true);
-    expect(spawnMock).toHaveBeenCalledTimes(2);
-  });
-
-  it('clearTask removes accumulated lifecycle state entries', async () => {
-    vi.resetModules();
-
-    const child = createChild(2401);
-    spawnMock.mockReturnValue(child);
-    getScriptMock.mockImplementation((_: string, phase: string) => {
-      if (phase === 'run') return 'npm run dev';
-      return null;
-    });
-
-    const { taskLifecycleService } = await import('../../main/services/TaskLifecycleService');
-    const serviceAny = taskLifecycleService as any;
-
-    const taskId = 'wt-7';
-    const taskPath = '/tmp/wt-7';
-    const projectPath = '/tmp/project';
-
-    taskLifecycleService.getState(taskId);
-    await taskLifecycleService.startRun(taskId, taskPath, projectPath);
-
-    expect(serviceAny.states.has(taskId)).toBe(true);
-    expect(serviceAny.runProcesses.has(taskId)).toBe(true);
-
-    taskLifecycleService.clearTask(taskId);
-
-    expect(serviceAny.states.has(taskId)).toBe(false);
-    expect(serviceAny.runProcesses.has(taskId)).toBe(false);
-  });
-
-  it('keeps setup failed when child emits error and exit', async () => {
-    vi.resetModules();
-
-    const child = createChild(2501);
-    spawnMock.mockReturnValue(child);
-    getScriptMock.mockImplementation((_: string, phase: string) => {
-      if (phase === 'setup') return 'npm i';
-      return null;
-    });
-
-    const { taskLifecycleService } = await import('../../main/services/TaskLifecycleService');
-
-    const taskId = 'wt-8';
-    const taskPath = '/tmp/wt-8';
-    const projectPath = '/tmp/project';
-
-    const setupPromise = taskLifecycleService.runSetup(taskId, taskPath, projectPath);
-    await new Promise((resolve) => setTimeout(resolve, 25));
-    child.emit('error', new Error('spawn failed'));
-    child.emit('exit', 0);
-
-    const setupResult = await setupPromise;
-    const state = taskLifecycleService.getState(taskId);
-
-    expect(setupResult.ok).toBe(false);
-    expect(state.setup.status).toBe('failed');
-    expect(state.setup.error).toBe('spawn failed');
-  });
-
-  it('clearTask stops in-flight setup/teardown processes', async () => {
-    vi.resetModules();
-
-    const setupChild = createChild(2601);
-    spawnMock.mockReturnValue(setupChild);
-    getScriptMock.mockImplementation((_: string, phase: string) => {
-      if (phase === 'setup') return 'npm i';
-      return null;
-    });
-
-    const { taskLifecycleService } = await import('../../main/services/TaskLifecycleService');
-    const serviceAny = taskLifecycleService as any;
-
-    const taskId = 'wt-9';
-    const taskPath = '/tmp/wt-9';
-    const projectPath = '/tmp/project';
-
-    void taskLifecycleService.runSetup(taskId, taskPath, projectPath);
-    await new Promise((resolve) => setTimeout(resolve, 25));
-
-    expect(serviceAny.finiteProcesses.has(taskId)).toBe(true);
-    taskLifecycleService.clearTask(taskId);
-    expect(setupChild.killed).toBe(true);
-    expect(serviceAny.finiteProcesses.has(taskId)).toBe(false);
-  });
-});
diff --git a/src/test/main/TerminalSnapshotService.test.ts b/src/test/main/TerminalSnapshotService.test.ts
deleted file mode 100644
index 68647b7207..0000000000
--- a/src/test/main/TerminalSnapshotService.test.ts
+++ /dev/null
@@ -1,74 +0,0 @@
-import fs from 'fs';
-import os from 'os';
-import path from 'path';
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
-import type { TerminalSnapshotPayload } from '../../types/terminalSnapshot';
-
-describe('TerminalSnapshotService', () => {
-  let tempDir: string;
-  let service: typeof import('../../main/services/TerminalSnapshotService').terminalSnapshotService;
-
-  beforeEach(async () => {
-    tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'terminal-snapshot-test-'));
-    process.env.EMDASH_TERMINAL_SNAPSHOT_DIR = tempDir;
-    vi.resetModules();
-    ({ terminalSnapshotService: service } = await import(
-      '../../main/services/TerminalSnapshotService'
-    ));
-  });
-
-  afterEach(() => {
-    delete process.env.EMDASH_TERMINAL_SNAPSHOT_DIR;
-    fs.rmSync(tempDir, { recursive: true, force: true });
-  });
-
-  it('saves and retrieves snapshots', async () => {
-    const payload: TerminalSnapshotPayload = {
-      version: 1,
-      createdAt: new Date().toISOString(),
-      cols: 120,
-      rows: 40,
-      data: 'snapshot-data',
-      stats: { totalBytes: 42 },
-    };
-
-    const saveResult = await service.saveSnapshot('demo', payload);
-    expect(saveResult.ok).toBe(true);
-
-    const loaded = await service.getSnapshot('demo');
-    expect(loaded).not.toBeNull();
-    expect(loaded?.data).toBe(payload.data);
-    expect(loaded?.cols).toBe(payload.cols);
-  });
-
-  it('rejects oversized snapshots', async () => {
-    const largePayload: TerminalSnapshotPayload = {
-      version: 1,
-      createdAt: new Date().toISOString(),
-      cols: 80,
-      rows: 24,
-      data: 'x'.repeat(8 * 1024 * 1024 + 1),
-    };
-
-    const result = await service.saveSnapshot('huge', largePayload);
-    expect(result.ok).toBe(false);
-    expect(result.error).toContain('Snapshot size');
-    const loaded = await service.getSnapshot('huge');
-    expect(loaded).toBeNull();
-  });
-
-  it('deletes snapshots', async () => {
-    const payload: TerminalSnapshotPayload = {
-      version: 1,
-      createdAt: new Date().toISOString(),
-      cols: 80,
-      rows: 24,
-      data: 'data',
-    };
-
-    await service.saveSnapshot('temp', payload);
-    await service.deleteSnapshot('temp');
-    const loaded = await service.getSnapshot('temp');
-    expect(loaded).toBeNull();
-  });
-});
diff --git a/src/test/main/WorktreePoolService.test.ts b/src/test/main/WorktreePoolService.test.ts
deleted file mode 100644
index b4b6da3c64..0000000000
--- a/src/test/main/WorktreePoolService.test.ts
+++ /dev/null
@@ -1,160 +0,0 @@
-import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
-import fs from 'fs';
-import path from 'path';
-import os from 'os';
-import { execSync } from 'child_process';
-import { WorktreePoolService } from '../../main/services/WorktreePoolService';
-
-vi.mock('electron', () => ({
-  app: {
-    getPath: vi.fn().mockReturnValue(os.tmpdir()),
-    getName: vi.fn().mockReturnValue('emdash-test'),
-    getVersion: vi.fn().mockReturnValue('0.0.0-test'),
-  },
-}));
-
-vi.mock('../../main/services/DatabaseService', () => ({
-  databaseService: {
-    getDatabase: vi.fn(),
-  },
-}));
-
-vi.mock('../../main/services/ProjectSettingsService', () => ({
-  projectSettingsService: {
-    getProjectSettings: vi.fn().mockResolvedValue({
-      baseRef: 'origin/main',
-      gitBranch: 'main',
-    }),
-    updateProjectSettings: vi.fn().mockResolvedValue(undefined),
-  },
-}));
-
-vi.mock('../../main/lib/logger', () => ({
-  log: {
-    info: vi.fn(),
-    debug: vi.fn(),
-    warn: vi.fn(),
-    error: vi.fn(),
-  },
-}));
-
-vi.mock('../../main/settings', () => ({
-  getAppSettings: vi.fn().mockReturnValue({
-    repository: {
-      branchPrefix: 'emdash',
-      pushOnCreate: false,
-    },
-  }),
-}));
-
-describe('WorktreePoolService', () => {
-  let tempDir: string;
-  let projectPath: string;
-  let pool: WorktreePoolService;
-
-  const initRepo = (repoPath: string) => {
-    fs.mkdirSync(repoPath, { recursive: true });
-    execSync('git init', { cwd: repoPath, stdio: 'pipe' });
-    execSync('git config user.email "test@test.com"', { cwd: repoPath, stdio: 'pipe' });
-    execSync('git config user.name "Test"', { cwd: repoPath, stdio: 'pipe' });
-    fs.writeFileSync(path.join(repoPath, 'README.md'), '# Test');
-    fs.writeFileSync(path.join(repoPath, '.gitignore'), '.claude/\n');
-    fs.writeFileSync(
-      path.join(repoPath, '.emdash.json'),
-      JSON.stringify({ preservePatterns: ['.claude/**'] }, null, 2)
-    );
-    execSync('git add README.md .gitignore .emdash.json', { cwd: repoPath, stdio: 'pipe' });
-    execSync('git commit -m "init"', { cwd: repoPath, stdio: 'pipe' });
-    fs.mkdirSync(path.join(repoPath, '.claude'), { recursive: true });
-    fs.writeFileSync(
-      path.join(repoPath, '.claude', 'settings.local.json'),
-      '{"sandbox":"workspace-write"}'
-    );
-  };
-
-  beforeEach(() => {
-    tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'worktree-pool-test-'));
-    projectPath = path.join(tempDir, 'project');
-    initRepo(projectPath);
-
-    pool = new WorktreePoolService();
-    // Keep this test deterministic; reserve replenishment is orthogonal.
-    (pool as any).replenishReserve = () => {};
-  });
-
-  afterEach(async () => {
-    await pool.cleanup();
-    fs.rmSync(tempDir, { recursive: true, force: true });
-  });
-
-  it('preserves configured ignored files when claiming a reserve worktree', async () => {
-    await pool.ensureReserve('project-1', projectPath, 'HEAD');
-
-    const claimed = await pool.claimReserve('project-1', projectPath, 'preserve-claude');
-
-    expect(claimed).not.toBeNull();
-    const settingsPath = path.join(claimed!.worktree.path, '.claude', 'settings.local.json');
-    expect(fs.existsSync(settingsPath)).toBe(true);
-    expect(fs.readFileSync(settingsPath, 'utf8')).toContain('workspace-write');
-  });
-
-  it('removes reserve artifacts from disk even when in-memory state was lost', async () => {
-    await pool.ensureReserve('project-1', projectPath, 'HEAD');
-    const reserve = pool.getReserve('project-1');
-    expect(reserve).toBeDefined();
-
-    const restartedPool = new WorktreePoolService();
-    await restartedPool.removeReserve('project-1', projectPath);
-
-    expect(fs.existsSync(reserve!.path)).toBe(false);
-    const branchOutput = execSync('git branch --list "_reserve/*"', {
-      cwd: projectPath,
-      stdio: 'pipe',
-    }).toString();
-    expect(branchOutput.trim()).toBe('');
-  });
-
-  it('does not remove reserve worktrees owned by a different repository', async () => {
-    const otherProjectPath = path.join(tempDir, 'other-project');
-    initRepo(otherProjectPath);
-
-    const otherPool = new WorktreePoolService();
-    (otherPool as any).replenishReserve = () => {};
-
-    await pool.ensureReserve('project-1', projectPath, 'HEAD');
-    await otherPool.ensureReserve('project-2', otherProjectPath, 'HEAD');
-
-    const otherReserve = otherPool.getReserve('project-2');
-    expect(otherReserve).toBeDefined();
-
-    const restartedPool = new WorktreePoolService();
-    await restartedPool.removeReserve('project-1', projectPath);
-
-    expect(fs.existsSync(otherReserve!.path)).toBe(true);
-    const otherBranches = execSync('git branch --list "_reserve/*"', {
-      cwd: otherProjectPath,
-      stdio: 'pipe',
-    }).toString();
-    expect(otherBranches).toContain(otherReserve!.branch);
-
-    await otherPool.cleanup();
-  });
-
-  it('resolves owner repo path correctly when repo path contains a worktrees segment', async () => {
-    const nestedProjectPath = path.join(tempDir, 'worktrees', 'nested-project');
-    initRepo(nestedProjectPath);
-
-    const nestedPool = new WorktreePoolService();
-    (nestedPool as any).replenishReserve = () => {};
-    await nestedPool.ensureReserve('project-nested', nestedProjectPath, 'HEAD');
-
-    const reserve = nestedPool.getReserve('project-nested');
-    expect(reserve).toBeDefined();
-
-    const ownerPath = (nestedPool as any).getMainRepoPathFromWorktree(reserve!.path);
-    expect(ownerPath).toBeDefined();
-    expect(fs.realpathSync(ownerPath)).toBe(fs.realpathSync(nestedProjectPath));
-
-    await nestedPool.cleanup();
-  });
-});
diff --git a/src/test/main/WorktreeService.test.ts b/src/test/main/WorktreeService.test.ts
deleted file mode 100644
index 93556ebe6b..0000000000
--- a/src/test/main/WorktreeService.test.ts
+++ /dev/null
@@ -1,400 +0,0 @@
-import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
-import fs from 'fs';
-import path from 'path';
-import os from 'os';
-import { execSync, execFileSync } from 'child_process';
-
-// Mock electron app before importing anything that depends on it
-vi.mock('electron', () => ({
-  app: {
-    getPath: vi.fn().mockReturnValue(os.tmpdir()),
-    getName: vi.fn().mockReturnValue('emdash-test'),
-    getVersion: vi.fn().mockReturnValue('0.0.0-test'),
-  },
-}));
-
-// Mock the database and project settings services
-vi.mock('../../main/services/DatabaseService', () => ({
-  databaseService: {
-    getDatabase: vi.fn(),
-  },
-}));
-
-vi.mock('../../main/services/ProjectSettingsService', () => ({
-  projectSettingsService: {
-    getProjectSettings: vi.fn().mockResolvedValue({
-      baseRef: 'origin/main',
-      gitBranch: 'main',
-    }),
-    updateProjectSettings: vi.fn().mockResolvedValue(undefined),
-  },
-}));
-
-// Mock logger
-vi.mock('../../main/lib/logger', () => ({
-  log: {
-    info: vi.fn(),
-    debug: vi.fn(),
-    warn: vi.fn(),
-    error: vi.fn(),
-  },
-}));
-
-describe('WorktreeService', () => {
-  describe('preserveFilesToWorktree', () => {
-    let tempDir: string;
-    let sourceDir: string;
-    let destDir: string;
-    let service: Awaited<typeof import('../../main/services/WorktreeService')>['worktreeService'];
-
-    beforeEach(async () => {
-      // Create temp directories
-      tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'worktree-test-'));
-      sourceDir = path.join(tempDir, 'source');
-      destDir = path.join(tempDir, 'dest');
-
-      fs.mkdirSync(sourceDir);
-      fs.mkdirSync(destDir);
-
-      // Initialize git repo in source
-      execSync('git init', { cwd: sourceDir, stdio: 'pipe' });
-      execSync('git config user.email "test@test.com"', { cwd: sourceDir, stdio: 'pipe' });
-      execSync('git config user.name "Test"', { cwd: sourceDir, stdio: 'pipe' });
-
-      // Create .gitignore
-      fs.writeFileSync(path.join(sourceDir, '.gitignore'), '.env\n.env.*\n.envrc\nnode_modules/\n');
-
-      // Create initial commit so git works properly
-      fs.writeFileSync(path.join(sourceDir, 'README.md'), '# Test');
-      execSync('git add .gitignore README.md', { cwd: sourceDir, stdio: 'pipe' });
-      execSync('git commit -m "init"', { cwd: sourceDir, stdio: 'pipe' });
-
-      // Reset modules and import fresh
-      vi.resetModules();
-      const mod = await import('../../main/services/WorktreeService');
-      service = mod.worktreeService;
-    });
-
-    afterEach(() => {
-      // Cleanup temp directory
-      fs.rmSync(tempDir, { recursive: true, force: true });
-    });
-
-    it('should copy .env file from source to destination', async () => {
-      // Create .env file in source (gitignored)
-      fs.writeFileSync(path.join(sourceDir, '.env'), 'SECRET_KEY=abc123\nAPI_URL=http://localhost');
-
-      const result = await service.preserveFilesToWorktree(sourceDir, destDir);
-
-      expect(result.copied).toContain('.env');
-      expect(fs.existsSync(path.join(destDir, '.env'))).toBe(true);
-      expect(fs.readFileSync(path.join(destDir, '.env'), 'utf8')).toBe(
-        'SECRET_KEY=abc123\nAPI_URL=http://localhost'
-      );
-    });
-
-    it('should copy multiple env files matching patterns', async () => {
-      // Create multiple env files
-      fs.writeFileSync(path.join(sourceDir, '.env'), 'BASE=value');
-      fs.writeFileSync(path.join(sourceDir, '.env.local'), 'LOCAL=value');
-      fs.writeFileSync(path.join(sourceDir, '.env.development.local'), 'DEV=value');
-      fs.writeFileSync(path.join(sourceDir, '.envrc'), 'export FOO=bar');
-
-      const result = await service.preserveFilesToWorktree(sourceDir, destDir);
-
-      expect(result.copied).toContain('.env');
-      expect(result.copied).toContain('.env.local');
-      expect(result.copied).toContain('.envrc');
-      expect(fs.existsSync(path.join(destDir, '.env'))).toBe(true);
-      expect(fs.existsSync(path.join(destDir, '.env.local'))).toBe(true);
-      expect(fs.existsSync(path.join(destDir, '.envrc'))).toBe(true);
-    });
-
-    it('should skip files that already exist in destination', async () => {
-      // Create .env in both source and dest
-      fs.writeFileSync(path.join(sourceDir, '.env'), 'SOURCE_VALUE=new');
-      fs.writeFileSync(path.join(destDir, '.env'), 'DEST_VALUE=existing');
-
-      const result = await service.preserveFilesToWorktree(sourceDir, destDir);
-
-      expect(result.skipped).toContain('.env');
-      expect(result.copied).not.toContain('.env');
-      // Destination file should remain unchanged
-      expect(fs.readFileSync(path.join(destDir, '.env'), 'utf8')).toBe('DEST_VALUE=existing');
-    });
-
-    it('should not copy files in excluded directories', async () => {
-      // Create node_modules with an .env file (should be excluded)
-      const nodeModulesDir = path.join(sourceDir, 'node_modules', 'some-package');
-      fs.mkdirSync(nodeModulesDir, { recursive: true });
-      fs.writeFileSync(path.join(nodeModulesDir, '.env'), 'SHOULD_NOT_COPY=true');
-
-      // Also create a regular .env that should be copied
-      fs.writeFileSync(path.join(sourceDir, '.env'), 'SHOULD_COPY=true');
-
-      // Update .gitignore to include node_modules pattern
-      fs.writeFileSync(
-        path.join(sourceDir, '.gitignore'),
-        '.env\n.env.*\nnode_modules/\nnode_modules/**\n'
-      );
-
-      const result = await service.preserveFilesToWorktree(sourceDir, destDir);
-
-      expect(result.copied).toContain('.env');
-      expect(result.copied).not.toContain('node_modules/some-package/.env');
-      expect(fs.existsSync(path.join(destDir, '.env'))).toBe(true);
-      expect(fs.existsSync(path.join(destDir, 'node_modules', 'some-package', '.env'))).toBe(false);
-    });
-
-    it('should preserve file permissions', async () => {
-      // Create .env with specific permissions
-      fs.writeFileSync(path.join(sourceDir, '.env'), 'SECRET=value');
-      fs.chmodSync(path.join(sourceDir, '.env'), 0o600);
-
-      await service.preserveFilesToWorktree(sourceDir, destDir);
-
-      const destStat = fs.statSync(path.join(destDir, '.env'));
-      // POSIX-only: Windows doesn't reliably preserve/represent these permission bits.
-      if (process.platform !== 'win32') {
-        // Check that permissions are preserved (at least the readable/writable bits)
-        expect(destStat.mode & 0o777).toBe(0o600);
-      }
-    });
-
-    it('should return empty result when no patterns match', async () => {
-      // Create a file that doesn't match any pattern
-      fs.writeFileSync(path.join(sourceDir, 'random.txt'), 'content');
-      fs.writeFileSync(path.join(sourceDir, '.gitignore'), 'random.txt\n');
-      execSync('git add .gitignore', { cwd: sourceDir, stdio: 'pipe' });
-      execSync('git commit -m "update gitignore"', { cwd: sourceDir, stdio: 'pipe' });
-
-      const result = await service.preserveFilesToWorktree(sourceDir, destDir);
-
-      expect(result.copied).toHaveLength(0);
-      expect(result.skipped).toHaveLength(0);
-    });
-
-    it('should handle nested env files in subdirectories', async () => {
-      // Create nested directory with .env
-      const nestedDir = path.join(sourceDir, 'config');
-      fs.mkdirSync(nestedDir);
-      fs.writeFileSync(path.join(nestedDir, '.env'), 'NESTED=true');
-      fs.writeFileSync(path.join(sourceDir, '.gitignore'), '.env\nconfig/.env\n');
-      execSync('git add .gitignore', { cwd: sourceDir, stdio: 'pipe' });
-      execSync('git commit -m "update gitignore"', { cwd: sourceDir, stdio: 'pipe' });
-
-      const result = await service.preserveFilesToWorktree(sourceDir, destDir);
-
-      expect(result.copied).toContain('config/.env');
-      expect(fs.existsSync(path.join(destDir, 'config', '.env'))).toBe(true);
-    });
-
-    it('should use custom patterns when provided', async () => {
-      // Create custom config file
-      fs.writeFileSync(path.join(sourceDir, 'local.config.json'), '{"key": "value"}');
-      fs.writeFileSync(path.join(sourceDir, '.gitignore'), 'local.config.json\n');
-      execSync('git add .gitignore', { cwd: sourceDir, stdio: 'pipe' });
-      execSync('git commit -m "update gitignore"', { cwd: sourceDir, stdio: 'pipe' });
-
-      const result = await service.preserveFilesToWorktree(
-        sourceDir,
-        destDir,
-        ['local.config.json'], // Custom pattern
-        [] // No exclusions
-      );
-
-      expect(result.copied).toContain('local.config.json');
-      expect(fs.existsSync(path.join(destDir, 'local.config.json'))).toBe(true);
-    });
-
-    it('should copy untracked files that match preserve patterns', async () => {
-      fs.writeFileSync(path.join(sourceDir, 'AGENTS.md'), '# local agent notes\n');
-
-      const result = await service.preserveFilesToWorktree(sourceDir, destDir, ['AGENTS.md'], []);
-
-      expect(result.copied).toContain('AGENTS.md');
-      expect(fs.existsSync(path.join(destDir, 'AGENTS.md'))).toBe(true);
-      expect(fs.readFileSync(path.join(destDir, 'AGENTS.md'), 'utf8')).toBe(
-        '# local agent notes\n'
-      );
-    });
-
-    it('should copy nested files for basename-only custom patterns', async () => {
-      const nestedDir = path.join(sourceDir, 'secrets');
-      fs.mkdirSync(nestedDir, { recursive: true });
-      fs.writeFileSync(path.join(nestedDir, 'custom.secret'), 'nested-secret');
-      fs.writeFileSync(path.join(sourceDir, '.gitignore'), 'custom.secret\n');
-      execSync('git add .gitignore', { cwd: sourceDir, stdio: 'pipe' });
-      execSync('git commit -m "ignore custom secret"', { cwd: sourceDir, stdio: 'pipe' });
-
-      const result = await service.preserveFilesToWorktree(
-        sourceDir,
-        destDir,
-        ['custom.secret'],
-        []
-      );
-
-      expect(result.copied).toContain('secrets/custom.secret');
-      expect(fs.existsSync(path.join(destDir, 'secrets', 'custom.secret'))).toBe(true);
-    });
-
-    it('should generate scoped pathspecs for preserve patterns', async () => {
-      const pathspecs = (service as any).buildIgnoredPathspecs([
-        '.env.keys',
-        '.claude/**',
-        './config/local.yml',
-      ]) as string[];
-
-      expect(pathspecs).toEqual(
-        expect.arrayContaining([
-          '.env.keys',
-          '**/.env.keys',
-          '.claude/**',
-          '**/.claude/**',
-          'config/local.yml',
-          '**/config/local.yml',
-        ])
-      );
-    });
-
-    it('should read patterns from .emdash.json if present', async () => {
-      // Create .emdash.json with custom patterns
-      fs.writeFileSync(
-        path.join(sourceDir, '.emdash.json'),
-        JSON.stringify({ preservePatterns: ['custom.secret'] })
-      );
-
-      // Create the custom file
-      fs.writeFileSync(path.join(sourceDir, 'custom.secret'), 'my-secret-value');
-      fs.writeFileSync(path.join(sourceDir, '.gitignore'), 'custom.secret\n.emdash.json\n');
-      execSync('git add .gitignore', { cwd: sourceDir, stdio: 'pipe' });
-      execSync('git commit -m "update gitignore"', { cwd: sourceDir, stdio: 'pipe' });
-
-      // Access the private method via the service instance
-      const patterns = (service as any).getPreservePatterns(sourceDir);
-      expect(patterns).toEqual(['custom.secret']);
-
-      const result = await service.preserveFilesToWorktree(sourceDir, destDir, patterns);
-      expect(result.copied).toContain('custom.secret');
-    });
-
-    it('should fall back to defaults when .emdash.json is missing', async () => {
-      const patterns = (service as any).getPreservePatterns(sourceDir);
-      expect(patterns).toContain('.env');
-      expect(patterns).toContain('.envrc');
-    });
-
-    it('should preserve ignored files from configured directory glob patterns', async () => {
-      fs.mkdirSync(path.join(sourceDir, '.claude'), { recursive: true });
-      fs.writeFileSync(
-        path.join(sourceDir, '.claude', 'settings.local.json'),
-        '{"sandbox":"workspace-write"}'
-      );
-      fs.writeFileSync(
-        path.join(sourceDir, '.emdash.json'),
-        JSON.stringify({ preservePatterns: ['.claude/**'] })
-      );
-      fs.writeFileSync(path.join(sourceDir, '.gitignore'), '.claude/\n.emdash.json\n');
-      execSync('git add .gitignore', { cwd: sourceDir, stdio: 'pipe' });
-      execSync('git commit -m "update gitignore for claude"', { cwd: sourceDir, stdio: 'pipe' });
-
-      const result = await service.preserveProjectFilesToWorktree(sourceDir, destDir);
-
-      expect(result.copied).toContain('.claude/settings.local.json');
-      expect(fs.existsSync(path.join(destDir, '.claude', 'settings.local.json'))).toBe(true);
-    });
-  });
-
-  describe('createWorktree', () => {
-    let tempDir: string;
-    let mainRepo: string;
-
-    beforeEach(async () => {
-      tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'worktree-tracking-test-'));
-      mainRepo = path.join(tempDir, 'main-repo');
-
-      fs.mkdirSync(mainRepo);
-
-      // Initialize git repo with explicit main branch
-      execSync('git init -b main', { cwd: mainRepo, stdio: 'pipe' });
-      execSync('git config user.email "test@test.com"', { cwd: mainRepo, stdio: 'pipe' });
-      execSync('git config user.name "Test"', { cwd: mainRepo, stdio: 'pipe' });
-
-      // Create initial commit
-      fs.writeFileSync(path.join(mainRepo, 'README.md'), '# Test');
-      execSync('git add README.md', { cwd: mainRepo, stdio: 'pipe' });
-      execSync('git commit -m "init"', { cwd: mainRepo, stdio: 'pipe' });
-
-      // Create a fake origin remote (local path as remote)
-      const originPath = path.join(tempDir, 'origin');
-      fs.mkdirSync(originPath);
-      execSync('git init --bare', { cwd: originPath, stdio: 'pipe' });
-      execFileSync('git', ['remote', 'add', 'origin', originPath], {
-        cwd: mainRepo,
-        stdio: 'pipe',
-      });
-      execSync('git push -u origin main', { cwd: mainRepo, stdio: 'pipe' });
-    });
-
-    afterEach(() => {
-      fs.rmSync(tempDir, { recursive: true, force: true });
-    });
-
-    it('should create worktree branch without tracking the base ref', async () => {
-      const worktreePath = path.join(tempDir, 'test-worktree');
-      const branchName = 'test-branch';
-
-      // Create worktree using git command with --no-track (simulating what service does)
-      execFileSync(
-        'git',
-        ['worktree', 'add', '--no-track', '-b', branchName, worktreePath, 'origin/main'],
-        { cwd: mainRepo, stdio: 'pipe' }
-      );
-
-      // Verify branch has no upstream tracking
-      // Use try/catch instead of shell redirection for Windows compatibility
-      let result = '';
-      try {
-        result = execFileSync('git', ['rev-parse', '--abbrev-ref', '@{upstream}'], {
-          cwd: worktreePath,
-          encoding: 'utf8',
-          stdio: ['pipe', 'pipe', 'pipe'],
-        });
-      } catch (err: any) {
-        result = String(err.stderr || err.stdout || err.message);
-      }
-
-      // Should fail with "no upstream configured" or similar error
-      expect(result).toMatch(/fatal|no upstream/);
-    });
-
-    it('should have tracking set to origin/<branch> after push --set-upstream', async () => {
-      const worktreePath = path.join(tempDir, 'push-test-worktree');
-      const branchName = 'push-test-branch';
-
-      // Create worktree with --no-track
-      execFileSync(
-        'git',
-        ['worktree', 'add', '--no-track', '-b', branchName, worktreePath, 'origin/main'],
-        { cwd: mainRepo, stdio: 'pipe' }
-      );
-
-      // Make a commit and push with --set-upstream
-      fs.writeFileSync(path.join(worktreePath, 'test.txt'), 'content');
-      execSync('git add test.txt', { cwd: worktreePath, stdio: 'pipe' });
-      execSync('git commit -m "test commit"', { cwd: worktreePath, stdio: 'pipe' });
-      execFileSync('git', ['push', '--set-upstream', 'origin', branchName], {
-        cwd: worktreePath,
-        stdio: 'pipe',
-      });
-
-      // Now verify tracking is set to origin/<branch>
-      const upstream = execFileSync('git', ['rev-parse', '--abbrev-ref', '@{upstream}'], {
-        cwd: worktreePath,
-        encoding: 'utf8',
-      }).trim();
-
-      expect(upstream).toBe(`origin/${branchName}`);
-    });
-  });
-});
diff --git a/src/test/main/prCreateBodyPlan.test.ts b/src/test/main/prCreateBodyPlan.test.ts
deleted file mode 100644
index 8419b8f150..0000000000
--- a/src/test/main/prCreateBodyPlan.test.ts
+++ /dev/null
@@ -1,82 +0,0 @@
-import { describe, expect, it } from 'vitest';
-import { getCreatePrBodyPlan } from '../../main/lib/prCreateBodyPlan';
-
-describe('getCreatePrBodyPlan', () => {
-  it('patches footer after fill when there is no explicit body', () => {
-    const plan = getCreatePrBodyPlan({
-      fill: true,
-      title: 'feat: add workflow',
-      rawBody: undefined,
-      enrichedBody:
-        '<!-- emdash-issue-footer:start -->\nFixes #42\n<!-- emdash-issue-footer:end -->',
-    });
-
-    expect(plan).toEqual({
-      shouldPatchFilledBody: true,
-      shouldUseBodyFile: false,
-      shouldUseFill: true,
-    });
-  });
-
-  it('uses body file when user provided body exists', () => {
-    const plan = getCreatePrBodyPlan({
-      fill: true,
-      title: 'feat: add workflow',
-      rawBody: '## Summary\nUser body',
-      enrichedBody:
-        '## Summary\nUser body\n\n<!-- emdash-issue-footer:start -->\nFixes #42\n<!-- emdash-issue-footer:end -->',
-    });
-
-    expect(plan).toEqual({
-      shouldPatchFilledBody: false,
-      shouldUseBodyFile: true,
-      shouldUseFill: false,
-    });
-  });
-
-  it('keeps fill for title inference while still using body file', () => {
-    const plan = getCreatePrBodyPlan({
-      fill: true,
-      title: undefined,
-      rawBody: '## Summary\nUser body',
-      enrichedBody:
-        '## Summary\nUser body\n\n<!-- emdash-issue-footer:start -->\nFixes #42\n<!-- emdash-issue-footer:end -->',
-    });
-
-    expect(plan).toEqual({
-      shouldPatchFilledBody: false,
-      shouldUseBodyFile: true,
-      shouldUseFill: true,
-    });
-  });
-
-  it('uses fill when no body is provided and no footer is injected', () => {
-    const plan = getCreatePrBodyPlan({
-      fill: true,
-      title: 'feat: add workflow',
-      rawBody: undefined,
-      enrichedBody: undefined,
-    });
-
-    expect(plan).toEqual({
-      shouldPatchFilledBody: false,
-      shouldUseBodyFile: false,
-      shouldUseFill: true,
-    });
-  });
-
-  it('does not use fill or body file when fill is disabled and body missing', () => {
-    const plan = getCreatePrBodyPlan({
-      fill: false,
-      title: 'feat: add workflow',
-      rawBody: undefined,
-      enrichedBody: undefined,
-    });
-
-    expect(plan).toEqual({
-      shouldPatchFilledBody: false,
-      shouldUseBodyFile: false,
-      shouldUseFill: false,
-    });
-  });
-});
diff --git a/src/test/main/prIssueFooter.test.ts b/src/test/main/prIssueFooter.test.ts
deleted file mode 100644
index c304150eec..0000000000
--- a/src/test/main/prIssueFooter.test.ts
+++ /dev/null
@@ -1,80 +0,0 @@
-import { describe, expect, it } from 'vitest';
-import { injectIssueFooter } from '../../main/lib/prIssueFooter';
-
-describe('injectIssueFooter', () => {
-  it('appends footer lines for linked GitHub and Linear issues', () => {
-    const result = injectIssueFooter('## Changes\n- Update auth flow', {
-      githubIssue: { number: 123 },
-      linearIssue: { identifier: 'ABC-456' },
-    });
-
-    expect(result).toContain('## Changes');
-    expect(result).toContain('<!-- emdash-issue-footer:start -->');
-    expect(result).toContain('Fixes #123');
-    expect(result).toContain('Fixes ABC-456');
-    expect(result).toContain('<!-- emdash-issue-footer:end -->');
-  });
-
-  it('creates a footer-only body when no original body is provided', () => {
-    const result = injectIssueFooter(undefined, {
-      githubIssue: { number: 42 },
-    });
-
-    expect(result).toBe(
-      '<!-- emdash-issue-footer:start -->\nFixes #42\n<!-- emdash-issue-footer:end -->'
-    );
-  });
-
-  it('is idempotent and does not duplicate the footer block', () => {
-    const metadata = { githubIssue: { number: 77 }, linearIssue: { identifier: 'TST-8' } };
-    const first = injectIssueFooter('Body text', metadata);
-    const second = injectIssueFooter(first, metadata);
-
-    expect(second).toBe(first);
-    expect(second?.match(/emdash-issue-footer:start/g)).toHaveLength(1);
-    expect(second?.match(/Fixes #77/g)).toHaveLength(1);
-    expect(second?.match(/Fixes TST-8/g)).toHaveLength(1);
-  });
-
-  it('replaces stale injected footer content', () => {
-    const staleBody = [
-      'Body text',
-      '',
-      '<!-- emdash-issue-footer:start -->',
-      'Fixes #1',
-      '<!-- emdash-issue-footer:end -->',
-    ].join('\n');
-
-    const result = injectIssueFooter(staleBody, {
-      githubIssue: { number: 2 },
-    });
-
-    expect(result).toContain('Fixes #2');
-    expect(result).not.toContain('Fixes #1');
-    expect(result?.match(/emdash-issue-footer:start/g)).toHaveLength(1);
-  });
-
-  it('removes an existing injected block when no issue metadata is present', () => {
-    const bodyWithFooter = [
-      'Body text',
-      '',
-      '<!-- emdash-issue-footer:start -->',
-      'Fixes #5',
-      '<!-- emdash-issue-footer:end -->',
-    ].join('\n');
-
-    const result = injectIssueFooter(bodyWithFooter, null);
-    expect(result).toBe('Body text');
-  });
-
-  it('returns undefined when body only contained injected footer and no issues remain', () => {
-    const bodyWithFooter = [
-      '<!-- emdash-issue-footer:start -->',
-      'Fixes #5',
-      '<!-- emdash-issue-footer:end -->',
-    ].join('\n');
-
-    const result = injectIssueFooter(bodyWithFooter, {});
-    expect(result).toBeUndefined();
-  });
-});
diff --git a/src/test/main/prIssueFooterPatch.test.ts b/src/test/main/prIssueFooterPatch.test.ts
deleted file mode 100644
index 0f53254f15..0000000000
--- a/src/test/main/prIssueFooterPatch.test.ts
+++ /dev/null
@@ -1,99 +0,0 @@
-import fs from 'node:fs';
-import { describe, expect, it, vi } from 'vitest';
-import { patchCurrentPrBodyWithIssueFooter } from '../../main/lib/prIssueFooterPatch';
-
-describe('patchCurrentPrBodyWithIssueFooter', () => {
-  it('reads existing body and updates PR body with injected issue footer', async () => {
-    let capturedBodyFilePath = '';
-    let capturedBodyFileContent = '';
-
-    const execFile = vi.fn(async (_file: string, args: string[]) => {
-      if (args[0] === 'pr' && args[1] === 'view') {
-        return { stdout: '## Summary\nPreserve this body' };
-      }
-      if (args[0] === 'pr' && args[1] === 'edit') {
-        const bodyFileIdx = args.indexOf('--body-file');
-        expect(bodyFileIdx).toBeGreaterThan(-1);
-        capturedBodyFilePath = args[bodyFileIdx + 1];
-        capturedBodyFileContent = fs.readFileSync(capturedBodyFilePath, 'utf8');
-        expect(args[2]).toBe('https://github.com/generalaction/emdash/pull/123');
-        return { stdout: '' };
-      }
-      throw new Error(`Unexpected command args: ${args.join(' ')}`);
-    });
-
-    const didPatch = await patchCurrentPrBodyWithIssueFooter({
-      taskPath: '/tmp/worktree',
-      metadata: { githubIssue: { number: 42 } },
-      execFile,
-      prUrl: 'https://github.com/generalaction/emdash/pull/123',
-    });
-
-    expect(didPatch).toBe(true);
-    expect(execFile).toHaveBeenCalledTimes(2);
-    expect(capturedBodyFileContent).toContain('## Summary');
-    expect(capturedBodyFileContent).toContain('Fixes #42');
-    expect(fs.existsSync(capturedBodyFilePath)).toBe(false);
-  });
-
-  it('returns false and skips edit when no issue footer changes are required', async () => {
-    const execFile = vi.fn(async (_file: string, args: string[]) => {
-      if (args[0] === 'pr' && args[1] === 'view') {
-        return { stdout: '## Summary\nAlready final body' };
-      }
-      throw new Error(`Unexpected command args: ${args.join(' ')}`);
-    });
-
-    const didPatch = await patchCurrentPrBodyWithIssueFooter({
-      taskPath: '/tmp/worktree',
-      metadata: {},
-      execFile,
-    });
-
-    expect(didPatch).toBe(false);
-    expect(execFile).toHaveBeenCalledTimes(1);
-  });
-
-  it('edits without explicit PR URL when none is provided', async () => {
-    const execFile = vi.fn(async (_file: string, args: string[]) => {
-      if (args[0] === 'pr' && args[1] === 'view') {
-        return { stdout: 'Body text' };
-      }
-      if (args[0] === 'pr' && args[1] === 'edit') {
-        expect(args[2]).toBe('--body-file');
-        return { stdout: '' };
-      }
-      throw new Error(`Unexpected command args: ${args.join(' ')}`);
-    });
-
-    const didPatch = await patchCurrentPrBodyWithIssueFooter({
-      taskPath: '/tmp/worktree',
-      metadata: { linearIssue: { identifier: 'ABC-42' } },
-      execFile,
-    });
-
-    expect(didPatch).toBe(true);
-    expect(execFile).toHaveBeenCalledTimes(2);
-  });
-
-  it('does not edit when existing body already matches except trailing newline', async () => {
-    const execFile = vi.fn(async (_file: string, args: string[]) => {
-      if (args[0] === 'pr' && args[1] === 'view') {
-        return {
-          stdout:
-            'Body text\n\n<!-- emdash-issue-footer:start -->\nFixes #42\n<!-- emdash-issue-footer:end -->\n',
-        };
-      }
-      throw new Error(`Unexpected command args: ${args.join(' ')}`);
-    });
-
-    const didPatch = await patchCurrentPrBodyWithIssueFooter({
-      taskPath: '/tmp/worktree',
-      metadata: { githubIssue: { number: 42 } },
-      execFile,
-    });
-
-    expect(didPatch).toBe(false);
-    expect(execFile).toHaveBeenCalledTimes(1);
-  });
-});
diff --git a/src/test/main/ptyIpc.test.ts b/src/test/main/ptyIpc.test.ts
deleted file mode 100644
index 6a94b9f7ed..0000000000
--- a/src/test/main/ptyIpc.test.ts
+++ /dev/null
@@ -1,676 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest';
-import { makePtyId } from '../../shared/ptyId';
-
-type ExitPayload = {
-  exitCode: number | null | undefined;
-  signal: number | undefined;
-};
-
-type MockProc = {
-  onData: (cb: (data: string) => void) => void;
-  onExit: (cb: (payload: ExitPayload) => void) => void;
-  write: ReturnType<typeof vi.fn>;
-  emitExit: (exitCode: number | null | undefined, signal?: number) => void;
-};
-
-const ipcHandleHandlers = new Map<string, (...args: any[]) => any>();
-const ipcOnHandlers = new Map<string, (...args: any[]) => any>();
-const appListeners = new Map<string, Array<() => void>>();
-const ptys = new Map<string, MockProc>();
-const notificationCtor = vi.fn();
-const notificationShow = vi.fn();
-const telemetryCaptureMock = vi.fn();
-const agentEventGetPortMock = vi.fn(() => 12345);
-const agentEventGetTokenMock = vi.fn(() => 'test-hook-token');
-const execFileMock = vi.fn(
-  (
-    _cmd: string,
-    _args: string[],
-    _opts: any,
-    cb: (err: any, stdout: string, stderr: string) => void
-  ) => {
-    cb(null, '', '');
-  }
-);
-let onDirectCliExitCallback: ((id: string, cwd: string) => void) | null = null;
-let lastSshPtyStartOpts: any = null;
-
-function createMockProc(): MockProc {
-  const exitHandlers: Array<(payload: ExitPayload) => void> = [];
-  return {
-    onData: vi.fn(),
-    onExit: (cb) => {
-      exitHandlers.push(cb);
-    },
-    write: vi.fn(),
-    emitExit: (exitCode, signal) => {
-      for (const handler of exitHandlers) {
-        handler({ exitCode, signal });
-      }
-    },
-  };
-}
-
-const startPtyMock = vi.fn(async ({ id }: { id: string }) => {
-  const proc = createMockProc();
-  ptys.set(id, proc);
-  return proc;
-});
-const startDirectPtyMock = vi.fn(({ id, cwd }: { id: string; cwd: string }) => {
-  const proc = createMockProc();
-  ptys.set(id, proc);
-  // Mimic ptyManager wiring: direct CLI exit triggers shell respawn callback first.
-  proc.onExit(() => {
-    onDirectCliExitCallback?.(id, cwd);
-  });
-  return proc;
-});
-const startSshPtyMock = vi.fn((opts: any) => {
-  const { id } = opts as { id: string };
-  lastSshPtyStartOpts = opts;
-  const proc = createMockProc();
-  ptys.set(id, proc);
-  return proc;
-});
-const parseShellArgsMock = vi.fn((input: string) => input.trim().split(/\s+/).filter(Boolean));
-const buildProviderCliArgsMock = vi.fn((opts: any) => {
-  const args: string[] = [];
-  if (opts.resume && opts.resumeFlag) args.push(...parseShellArgsMock(opts.resumeFlag));
-  if (opts.defaultArgs?.length) args.push(...opts.defaultArgs);
-  if (opts.autoApprove && opts.autoApproveFlag)
-    args.push(...parseShellArgsMock(opts.autoApproveFlag));
-  if (
-    opts.initialPromptFlag !== undefined &&
-    !opts.useKeystrokeInjection &&
-    opts.initialPrompt?.trim()
-  ) {
-    if (opts.initialPromptFlag) args.push(...parseShellArgsMock(opts.initialPromptFlag));
-    args.push(opts.initialPrompt.trim());
-  }
-  return args;
-});
-const resolveProviderCommandConfigMock = vi.fn();
-const getPtyMock = vi.fn((id: string) => ptys.get(id));
-const writePtyMock = vi.fn((id: string, data: string) => {
-  ptys.get(id)?.write(data);
-});
-const killPtyMock = vi.fn((id: string) => {
-  ptys.delete(id);
-});
-const removePtyRecordMock = vi.fn((id: string) => {
-  ptys.delete(id);
-});
-const getAllWindowsMock = vi.fn(() => [
-  {
-    isFocused: () => false,
-    webContents: { isDestroyed: () => false, send: vi.fn() },
-  },
-]);
-
-vi.mock('electron', () => {
-  class MockNotification {
-    static isSupported = vi.fn(() => true);
-
-    constructor(options: unknown) {
-      notificationCtor(options);
-    }
-
-    show() {
-      notificationShow();
-    }
-  }
-
-  return {
-    app: {
-      on: vi.fn((event: string, cb: () => void) => {
-        const list = appListeners.get(event) || [];
-        list.push(cb);
-        appListeners.set(event, list);
-      }),
-    },
-    ipcMain: {
-      handle: vi.fn((channel: string, cb: (...args: any[]) => any) => {
-        ipcHandleHandlers.set(channel, cb);
-      }),
-      on: vi.fn((channel: string, cb: (...args: any[]) => any) => {
-        ipcOnHandlers.set(channel, cb);
-      }),
-    },
-    BrowserWindow: {
-      getAllWindows: getAllWindowsMock,
-    },
-    Notification: MockNotification,
-  };
-});
-
-vi.mock('../../main/services/ptyManager', () => ({
-  startPty: startPtyMock,
-  writePty: writePtyMock,
-  resizePty: vi.fn(),
-  killPty: killPtyMock,
-  getPty: getPtyMock,
-  getPtyKind: vi.fn(() => 'local'),
-  startDirectPty: startDirectPtyMock,
-  startSshPty: startSshPtyMock,
-  removePtyRecord: removePtyRecordMock,
-  setOnDirectCliExit: vi.fn((cb: (id: string, cwd: string) => void) => {
-    onDirectCliExitCallback = cb;
-  }),
-  parseShellArgs: parseShellArgsMock,
-  buildProviderCliArgs: buildProviderCliArgsMock,
-  resolveProviderCommandConfig: resolveProviderCommandConfigMock,
-  killTmuxSession: vi.fn(),
-  getTmuxSessionName: vi.fn(() => ''),
-  getPtyTmuxSessionName: vi.fn(() => ''),
-}));
-
-vi.mock('../../main/lib/logger', () => ({
-  log: {
-    debug: vi.fn(),
-    info: vi.fn(),
-    warn: vi.fn(),
-    error: vi.fn(),
-  },
-}));
-
-vi.mock('../../main/settings', () => ({
-  getAppSettings: vi.fn(() => ({
-    notifications: { enabled: true, sound: true },
-  })),
-}));
-
-vi.mock('../../main/telemetry', () => ({
-  capture: telemetryCaptureMock,
-}));
-
-vi.mock('../../shared/providers/registry', () => ({
-  PROVIDER_IDS: ['codex', 'claude'],
-  getProvider: vi.fn((id: string) => ({ name: id === 'codex' ? 'Codex' : 'Claude Code' })),
-}));
-
-vi.mock('../../main/errorTracking', () => ({
-  errorTracking: {
-    captureAgentSpawnError: vi.fn(),
-  },
-}));
-
-vi.mock('../../main/services/TerminalSnapshotService', () => ({
-  terminalSnapshotService: {
-    getSnapshot: vi.fn(),
-    saveSnapshot: vi.fn(),
-    deleteSnapshot: vi.fn(),
-  },
-}));
-
-vi.mock('../../main/services/TerminalConfigParser', () => ({
-  detectAndLoadTerminalConfig: vi.fn(),
-}));
-
-vi.mock('../../main/services/DatabaseService', () => ({
-  databaseService: {},
-}));
-
-vi.mock('../../main/services/ClaudeConfigService', () => ({
-  maybeAutoTrustForClaude: vi.fn(),
-}));
-
-vi.mock('../../main/services/AgentEventService', () => ({
-  agentEventService: {
-    getPort: agentEventGetPortMock,
-    getToken: agentEventGetTokenMock,
-  },
-}));
-
-vi.mock('../../main/services/ClaudeHookService', () => ({
-  ClaudeHookService: {
-    writeHookConfig: vi.fn(),
-    makeHookCommand: vi.fn((type: string) => `mock-hook-command-${type}`),
-    mergeHookEntries: vi.fn((existing: Record<string, any>) => {
-      existing.hooks = {
-        Notification: [{ hooks: [{ type: 'command', command: 'mock-hook-command-notification' }] }],
-        Stop: [{ hooks: [{ type: 'command', command: 'mock-hook-command-stop' }] }],
-      };
-      return existing;
-    }),
-  },
-}));
-
-vi.mock('../../main/services/LifecycleScriptsService', () => ({
-  lifecycleScriptsService: {
-    getShellSetup: vi.fn(() => undefined),
-    getTmuxEnabled: vi.fn(() => false),
-  },
-}));
-
-vi.mock('child_process', () => ({
-  execFile: execFileMock,
-}));
-
-describe('ptyIpc notification lifecycle', () => {
-  beforeEach(() => {
-    vi.clearAllMocks();
-    vi.resetModules();
-    ipcHandleHandlers.clear();
-    ipcOnHandlers.clear();
-    appListeners.clear();
-    ptys.clear();
-    onDirectCliExitCallback = null;
-    lastSshPtyStartOpts = null;
-    resolveProviderCommandConfigMock.mockReturnValue(null);
-  });
-
-  function createSender() {
-    return {
-      id: 1,
-      send: vi.fn(),
-      isDestroyed: vi.fn(() => false),
-      once: vi.fn(),
-    };
-  }
-
-  it('does not show completion notification after app quit cleanup even if exit 0 arrives', async () => {
-    const { registerPtyIpc } = await import('../../main/services/ptyIpc');
-    registerPtyIpc();
-
-    const start = ipcHandleHandlers.get('pty:start');
-    expect(start).toBeTypeOf('function');
-
-    const id = makePtyId('codex', 'main', 'task-quit');
-    await start!(
-      { sender: createSender() },
-      { id, cwd: '/tmp/task', shell: 'codex', cols: 120, rows: 32 }
-    );
-
-    const proc = ptys.get(id);
-    expect(proc).toBeDefined();
-
-    const beforeQuit = appListeners.get('before-quit')?.[0];
-    expect(beforeQuit).toBeTypeOf('function');
-    beforeQuit!();
-
-    // Simulate late onExit callback firing after cleanup kill.
-    proc!.emitExit(0, undefined);
-
-    expect(notificationCtor).not.toHaveBeenCalled();
-    expect(notificationShow).not.toHaveBeenCalled();
-  });
-
-  it('injects remote init commands so provider lookup uses login shell PATH', async () => {
-    const { registerPtyIpc } = await import('../../main/services/ptyIpc');
-    registerPtyIpc();
-
-    const startDirect = ipcHandleHandlers.get('pty:startDirect');
-    expect(startDirect).toBeTypeOf('function');
-
-    const id = makePtyId('claude', 'main', 'task-remote');
-    await startDirect!(
-      { sender: createSender() },
-      {
-        id,
-        providerId: 'claude',
-        cwd: '/tmp/task',
-        remote: { connectionId: 'ssh-config:remote-alias' },
-        cols: 120,
-        rows: 32,
-      }
-    );
-
-    expect(startSshPtyMock).toHaveBeenCalledTimes(1);
-    expect(lastSshPtyStartOpts?.target).toBe('remote-alias');
-    expect(lastSshPtyStartOpts?.remoteInitCommand).toBeUndefined();
-
-    // Advance past the SSH MOTD delay before checking writes
-
-    const proc = ptys.get(id);
-    expect(proc).toBeDefined();
-    expect(proc!.write).toHaveBeenCalled();
-
-    const written = (proc!.write as any).mock.calls.map((c: any[]) => c[0]).join('');
-    expect(written).toContain("cd '/tmp/task'");
-    expect(written).toContain('sh -c');
-    expect(written).toContain('command -v');
-    expect(written).toContain('claude');
-  });
-
-  it('does not show completion notification on process exit (moved to AgentEventService)', async () => {
-    const { registerPtyIpc } = await import('../../main/services/ptyIpc');
-    registerPtyIpc();
-
-    const start = ipcHandleHandlers.get('pty:start');
-    expect(start).toBeTypeOf('function');
-
-    const id = makePtyId('codex', 'main', 'task-success');
-    await start!(
-      { sender: createSender() },
-      { id, cwd: '/tmp/task', shell: 'codex', cols: 120, rows: 32 }
-    );
-
-    const proc = ptys.get(id);
-    expect(proc).toBeDefined();
-
-    proc!.emitExit(0, undefined);
-
-    // OS notifications are now driven by hook events in AgentEventService, not PTY exit
-    expect(notificationCtor).not.toHaveBeenCalled();
-    expect(notificationShow).not.toHaveBeenCalled();
-  });
-
-  it('keeps replacement PTY writable after direct CLI exit triggers shell respawn', async () => {
-    const { registerPtyIpc } = await import('../../main/services/ptyIpc');
-    registerPtyIpc();
-
-    const startDirect = ipcHandleHandlers.get('pty:startDirect');
-    const ptyInput = ipcOnHandlers.get('pty:input');
-    expect(startDirect).toBeTypeOf('function');
-    expect(ptyInput).toBeTypeOf('function');
-
-    const id = makePtyId('codex', 'main', 'task-respawn');
-    const sender = createSender();
-    const result = await startDirect!(
-      { sender },
-      { id, providerId: 'codex', cwd: '/tmp/task', cols: 120, rows: 32, resume: true }
-    );
-    expect(result?.ok).toBe(true);
-
-    const directProc = ptys.get(id);
-    expect(directProc).toBeDefined();
-
-    directProc!.emitExit(130, undefined);
-
-    // Shell respawn replaced the old PTY record; stale cleanup must not delete it.
-    const replacementProc = ptys.get(id);
-    expect(replacementProc).toBeDefined();
-    expect(replacementProc).not.toBe(directProc);
-    expect(telemetryCaptureMock).toHaveBeenCalledWith(
-      'agent_run_finish',
-      expect.objectContaining({ provider: 'codex' })
-    );
-
-    ptyInput!({}, { id, data: 'codex resume --last\r' });
-    expect(replacementProc!.write).toHaveBeenCalledWith('codex resume --last\r');
-  });
-
-  it('still cleans up direct PTY exit when no replacement PTY exists', async () => {
-    const { registerPtyIpc } = await import('../../main/services/ptyIpc');
-    registerPtyIpc();
-
-    const startDirect = ipcHandleHandlers.get('pty:startDirect');
-    expect(startDirect).toBeTypeOf('function');
-
-    const id = makePtyId('codex', 'main', 'task-no-replacement');
-    const sender = createSender();
-    const result = await startDirect!(
-      { sender },
-      { id, providerId: 'codex', cwd: '/tmp/task', cols: 120, rows: 32, resume: true }
-    );
-    expect(result?.ok).toBe(true);
-
-    const directProc = ptys.get(id);
-    expect(directProc).toBeDefined();
-
-    // Simulate respawn callback unavailable/failing to replace.
-    onDirectCliExitCallback = null;
-    directProc!.emitExit(130, undefined);
-
-    expect(telemetryCaptureMock).toHaveBeenCalledWith(
-      'agent_run_finish',
-      expect.objectContaining({ provider: 'codex' })
-    );
-    expect(removePtyRecordMock).toHaveBeenCalledWith(id);
-    expect(ptys.has(id)).toBe(false);
-  });
-
-  it('uses resolved provider config for remote invocation flags', async () => {
-    resolveProviderCommandConfigMock.mockReturnValue({
-      provider: {
-        id: 'codex',
-        name: 'Codex',
-        installCommand: 'npm install -g @openai/codex',
-        useKeystrokeInjection: false,
-      },
-      cli: 'codex-remote',
-      resumeFlag: 'resume --last',
-      defaultArgs: ['--model', 'gpt-5'],
-      autoApproveFlag: '--dangerously-bypass-approvals-and-sandbox',
-      initialPromptFlag: '',
-    });
-
-    const { registerPtyIpc } = await import('../../main/services/ptyIpc');
-    registerPtyIpc();
-
-    const startDirect = ipcHandleHandlers.get('pty:startDirect');
-    expect(startDirect).toBeTypeOf('function');
-
-    const id = makePtyId('codex', 'main', 'task-remote-custom');
-    const sender = createSender();
-    const result = await startDirect!(
-      { sender },
-      {
-        id,
-        providerId: 'codex',
-        cwd: '/tmp/task',
-        remote: { connectionId: 'ssh-config:devbox' },
-        autoApprove: true,
-        initialPrompt: 'hello world',
-        resume: true,
-      }
-    );
-
-    expect(result?.ok).toBe(true);
-    expect(buildProviderCliArgsMock).toHaveBeenCalledWith(
-      expect.objectContaining({
-        resumeFlag: 'resume --last',
-        autoApproveFlag: '--dangerously-bypass-approvals-and-sandbox',
-      })
-    );
-    expect(startSshPtyMock).toHaveBeenCalledTimes(1);
-    expect(lastSshPtyStartOpts?.remoteInitCommand).toBeUndefined();
-
-    const proc = ptys.get(id);
-    expect(proc).toBeDefined();
-    expect(proc!.write).toHaveBeenCalled();
-    const written = (proc!.write as any).mock.calls.map((c: any[]) => c[0]).join('');
-    expect(written).toContain('command -v');
-    expect(written).toContain('codex-remote');
-    expect(written).toContain('resume');
-    expect(written).toContain('--last');
-    expect(written).toContain('--model');
-    expect(written).toContain('gpt-5');
-    expect(written).toContain('--dangerously-bypass-approvals-and-sandbox');
-    expect(written).toContain('hello world');
-  });
-
-  it('quotes remote custom CLI tokens to prevent shell metachar expansion', async () => {
-    resolveProviderCommandConfigMock.mockReturnValue({
-      provider: { installCommand: undefined, useKeystrokeInjection: false },
-      cli: 'codex-remote;echo',
-      resumeFlag: 'resume --last',
-      defaultArgs: [],
-      autoApproveFlag: '--dangerously-bypass-approvals-and-sandbox',
-      initialPromptFlag: '',
-    });
-
-    const { registerPtyIpc } = await import('../../main/services/ptyIpc');
-    registerPtyIpc();
-
-    const startDirect = ipcHandleHandlers.get('pty:startDirect');
-    expect(startDirect).toBeTypeOf('function');
-
-    const id = makePtyId('codex', 'main', 'task-remote-metachar');
-    const sender = createSender();
-    const result = await startDirect!(
-      { sender },
-      {
-        id,
-        providerId: 'codex',
-        cwd: '/tmp/task',
-        remote: { connectionId: 'ssh-config:devbox' },
-      }
-    );
-
-    expect(result?.ok).toBe(true);
-    expect(lastSshPtyStartOpts?.remoteInitCommand).toBeUndefined();
-
-    const proc = ptys.get(id);
-    expect(proc).toBeDefined();
-    expect(proc!.write).toHaveBeenCalled();
-    const written = (proc!.write as any).mock.calls.map((c: any[]) => c[0]).join('');
-    expect(written).toContain('command -v');
-    expect(written).toContain('codex-remote;echo');
-    expect(written).toContain("'\\''codex-remote;echo'\\''");
-    expect(written).not.toContain('command -v codex-remote;echo');
-  });
-
-  it('adds reverse SSH tunnel and hook env for remote pty:startDirect', async () => {
-    agentEventGetPortMock.mockReturnValue(12345);
-    agentEventGetTokenMock.mockReturnValue('test-hook-token');
-
-    const { registerPtyIpc } = await import('../../main/services/ptyIpc');
-    registerPtyIpc();
-
-    const startDirect = ipcHandleHandlers.get('pty:startDirect');
-    expect(startDirect).toBeTypeOf('function');
-
-    const id = makePtyId('codex', 'main', 'task-remote-hook');
-    const result = await startDirect!(
-      { sender: createSender() },
-      {
-        id,
-        providerId: 'codex',
-        cwd: '/tmp/task',
-        remote: { connectionId: 'ssh-config:remote-alias' },
-        cols: 120,
-        rows: 32,
-      }
-    );
-
-    expect(result?.ok).toBe(true);
-
-    // SSH args should contain reverse tunnel flag
-    const sshArgs: string[] = lastSshPtyStartOpts?.sshArgs ?? [];
-    const dashRIndex = sshArgs.indexOf('-R');
-    expect(dashRIndex).toBeGreaterThanOrEqual(0);
-    const tunnelSpec = sshArgs[dashRIndex + 1];
-    expect(tunnelSpec).toMatch(/^127\.0\.0\.1:\d+:127\.0\.0\.1:12345$/);
-
-    // Init keystrokes should contain hook env var exports
-    const proc = ptys.get(id);
-    expect(proc).toBeDefined();
-    const written = (proc!.write as any).mock.calls.map((c: any[]) => c[0]).join('');
-    expect(written).toContain('export EMDASH_HOOK_PORT=');
-    expect(written).toContain('export EMDASH_HOOK_TOKEN=');
-    expect(written).toContain('export EMDASH_PTY_ID=');
-    expect(written).toContain('test-hook-token');
-  });
-
-  it('does not add reverse tunnel when hook port is 0', async () => {
-    agentEventGetPortMock.mockReturnValue(0);
-
-    const { registerPtyIpc } = await import('../../main/services/ptyIpc');
-    registerPtyIpc();
-
-    const startDirect = ipcHandleHandlers.get('pty:startDirect');
-    expect(startDirect).toBeTypeOf('function');
-
-    const id = makePtyId('codex', 'main', 'task-remote-no-hook');
-    const result = await startDirect!(
-      { sender: createSender() },
-      {
-        id,
-        providerId: 'codex',
-        cwd: '/tmp/task',
-        remote: { connectionId: 'ssh-config:remote-alias' },
-        cols: 120,
-        rows: 32,
-      }
-    );
-
-    expect(result?.ok).toBe(true);
-
-    const sshArgs: string[] = lastSshPtyStartOpts?.sshArgs ?? [];
-    expect(sshArgs).not.toContain('-R');
-
-    // No hook env in keystrokes
-    const proc = ptys.get(id);
-    expect(proc).toBeDefined();
-    const written = (proc!.write as any).mock.calls.map((c: any[]) => c[0]).join('');
-    expect(written).not.toContain('EMDASH_HOOK_PORT=');
-  });
-
-  it('writes Claude hook config on remote via ssh exec for claude provider', async () => {
-    agentEventGetPortMock.mockReturnValue(12345);
-    agentEventGetTokenMock.mockReturnValue('test-hook-token');
-
-    const { registerPtyIpc } = await import('../../main/services/ptyIpc');
-    registerPtyIpc();
-
-    const startDirect = ipcHandleHandlers.get('pty:startDirect');
-    expect(startDirect).toBeTypeOf('function');
-
-    const id = makePtyId('claude', 'main', 'task-remote-claude-hook');
-    const result = await startDirect!(
-      { sender: createSender() },
-      {
-        id,
-        providerId: 'claude',
-        cwd: '/home/user/project',
-        remote: { connectionId: 'ssh-config:remote-alias' },
-        cols: 120,
-        rows: 32,
-      }
-    );
-
-    expect(result?.ok).toBe(true);
-
-    // Hook config is written via ssh exec (execFile), not PTY keystrokes
-    const sshExecCalls = execFileMock.mock.calls.filter(
-      (c: any[]) => c[0] === 'ssh' && typeof c[1]?.[c[1].length - 1] === 'string'
-    );
-    const hookConfigCall = sshExecCalls.find((c: any[]) => {
-      const cmd = c[1][c[1].length - 1];
-      return cmd.includes('settings.local.json') && cmd.includes('mkdir -p');
-    });
-    expect(hookConfigCall).toBeDefined();
-
-    // PTY keystrokes should NOT contain the hook config (it went via ssh exec)
-    const proc = ptys.get(id);
-    expect(proc).toBeDefined();
-    const written = (proc!.write as any).mock.calls.map((c: any[]) => c[0]).join('');
-    expect(written).not.toContain('settings.local.json');
-  });
-
-  it('does not write hook config on remote for non-claude provider', async () => {
-    agentEventGetPortMock.mockReturnValue(12345);
-    agentEventGetTokenMock.mockReturnValue('test-hook-token');
-
-    const { registerPtyIpc } = await import('../../main/services/ptyIpc');
-    registerPtyIpc();
-
-    const startDirect = ipcHandleHandlers.get('pty:startDirect');
-    expect(startDirect).toBeTypeOf('function');
-
-    const id = makePtyId('codex', 'main', 'task-remote-codex-no-hook-config');
-    const result = await startDirect!(
-      { sender: createSender() },
-      {
-        id,
-        providerId: 'codex',
-        cwd: '/tmp/task',
-        remote: { connectionId: 'ssh-config:remote-alias' },
-        cols: 120,
-        rows: 32,
-      }
-    );
-
-    expect(result?.ok).toBe(true);
-
-    // No ssh exec call for hook config
-    const hookConfigCalls = execFileMock.mock.calls.filter(
-      (c: any[]) =>
-        c[0] === 'ssh' &&
-        typeof c[1]?.[c[1].length - 1] === 'string' &&
-        c[1][c[1].length - 1].includes('settings.local.json')
-    );
-    expect(hookConfigCalls).toHaveLength(0);
-  });
-});
diff --git a/src/test/main/ptyManager.test.ts b/src/test/main/ptyManager.test.ts
deleted file mode 100644
index 0824a3ed11..0000000000
--- a/src/test/main/ptyManager.test.ts
+++ /dev/null
@@ -1,275 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest';
-
-const providerStatusGetMock = vi.fn();
-const getProviderCustomConfigMock = vi.fn();
-const fsReadFileSyncMock = vi.fn();
-const fsExistsSyncMock = vi.fn();
-const fsWriteFileSyncMock = vi.fn();
-const fsStatSyncMock = vi.fn();
-const fsAccessSyncMock = vi.fn();
-const fsReaddirSyncMock = vi.fn();
-
-vi.mock('../../main/services/providerStatusCache', () => ({
-  providerStatusCache: {
-    get: providerStatusGetMock,
-  },
-}));
-
-vi.mock('../../main/settings', () => ({
-  getProviderCustomConfig: getProviderCustomConfigMock,
-}));
-
-vi.mock('../../main/lib/logger', () => ({
-  log: {
-    info: vi.fn(),
-    warn: vi.fn(),
-    error: vi.fn(),
-    debug: vi.fn(),
-  },
-}));
-
-vi.mock('../../main/errorTracking', () => ({
-  errorTracking: {
-    captureAgentSpawnError: vi.fn(),
-    captureCriticalError: vi.fn(),
-  },
-}));
-
-vi.mock('fs', () => {
-  const fsMock = {
-    readFileSync: (...args: any[]) => fsReadFileSyncMock(...args),
-    existsSync: (...args: any[]) => fsExistsSyncMock(...args),
-    writeFileSync: (...args: any[]) => fsWriteFileSyncMock(...args),
-    statSync: (...args: any[]) => fsStatSyncMock(...args),
-    accessSync: (...args: any[]) => fsAccessSyncMock(...args),
-    readdirSync: (...args: any[]) => fsReaddirSyncMock(...args),
-    constants: { X_OK: 1 },
-  };
-  return { ...fsMock, default: fsMock };
-});
-
-vi.mock('electron', () => ({
-  app: {
-    getPath: () => '/tmp/emdash-test',
-  },
-}));
-
-vi.mock('../../main/services/AgentEventService', () => ({
-  agentEventService: {
-    getPort: () => 0,
-    getToken: () => '',
-  },
-}));
-
-describe('ptyManager provider command resolution', () => {
-  beforeEach(() => {
-    vi.resetModules();
-    vi.clearAllMocks();
-    providerStatusGetMock.mockReturnValue({
-      installed: true,
-      path: '/usr/local/bin/codex',
-    });
-    getProviderCustomConfigMock.mockReturnValue(undefined);
-  });
-
-  it('resolves provider command config from custom settings', async () => {
-    getProviderCustomConfigMock.mockReturnValue({
-      cli: 'codex-custom',
-      resumeFlag: 'resume --last',
-      defaultArgs: '--model gpt-5',
-      autoApproveFlag: '--dangerously-bypass-approvals-and-sandbox',
-      initialPromptFlag: '',
-    });
-
-    const { resolveProviderCommandConfig } = await import('../../main/services/ptyManager');
-    const config = resolveProviderCommandConfig('codex');
-
-    expect(config?.cli).toBe('codex-custom');
-    expect(config?.resumeFlag).toBe('resume --last');
-    expect(config?.defaultArgs).toEqual(['--model', 'gpt-5']);
-    expect(config?.autoApproveFlag).toBe('--dangerously-bypass-approvals-and-sandbox');
-    expect(config?.initialPromptFlag).toBe('');
-  });
-
-  it('builds provider CLI args consistently from resolved flags', async () => {
-    const { buildProviderCliArgs } = await import('../../main/services/ptyManager');
-
-    const args = buildProviderCliArgs({
-      resume: true,
-      resumeFlag: 'resume --last',
-      defaultArgs: ['--model', 'gpt-5'],
-      autoApprove: true,
-      autoApproveFlag: '--dangerously-bypass-approvals-and-sandbox',
-      initialPrompt: 'hello world',
-      initialPromptFlag: '',
-      useKeystrokeInjection: false,
-    });
-
-    expect(args).toEqual([
-      'resume',
-      '--last',
-      '--model',
-      'gpt-5',
-      '--dangerously-bypass-approvals-and-sandbox',
-      'hello world',
-    ]);
-  });
-
-  it('covers all configured provider auto-approve flags', async () => {
-    const { PROVIDERS } = await import('../../shared/providers/registry');
-    const { resolveProviderCommandConfig, buildProviderCliArgs, parseShellArgs } = await import(
-      '../../main/services/ptyManager'
-    );
-
-    const expectedAutoApproveFlags: Record<string, string> = {
-      amp: '--dangerously-allow-all',
-      autohand: '--unrestricted',
-      claude: '--dangerously-skip-permissions',
-      charm: '--yolo',
-      cline: '--yolo',
-      codex: '--full-auto',
-      copilot: '--allow-all-tools',
-      cursor: '-f',
-      gemini: '--yolo',
-      kimi: '--yolo',
-      kilocode: '--auto',
-      mistral: '--auto-approve',
-      qwen: '--yolo',
-      rovo: '--yolo',
-    };
-
-    const providerIdsWithAutoApprove = PROVIDERS.filter((provider) => provider.autoApproveFlag)
-      .map((provider) => provider.id)
-      .sort();
-    expect(providerIdsWithAutoApprove).toEqual(Object.keys(expectedAutoApproveFlags).sort());
-
-    for (const [providerId, expectedFlag] of Object.entries(expectedAutoApproveFlags)) {
-      const config = resolveProviderCommandConfig(providerId);
-      expect(config?.autoApproveFlag).toBe(expectedFlag);
-
-      const args = buildProviderCliArgs({
-        autoApprove: true,
-        autoApproveFlag: config?.autoApproveFlag,
-      });
-      expect(args).toEqual(parseShellArgs(expectedFlag));
-    }
-  });
-
-  it('falls back when custom CLI needs shell parsing', async () => {
-    getProviderCustomConfigMock.mockReturnValue({
-      cli: 'codex --dangerously-bypass-approvals-and-sandbox',
-    });
-
-    const { startDirectPty } = await import('../../main/services/ptyManager');
-    const proc = startDirectPty({
-      id: 'codex-main-shell-fallback',
-      providerId: 'codex',
-      cwd: '/tmp/task',
-    });
-
-    expect(proc).toBeNull();
-  });
-
-  it('supports Windows absolute custom CLI paths for direct spawn', async () => {
-    const originalPlatformDescriptor = Object.getOwnPropertyDescriptor(process, 'platform');
-    Object.defineProperty(process, 'platform', {
-      value: 'win32',
-      configurable: true,
-    });
-
-    try {
-      const { parseCustomCliForDirectSpawn } = await import('../../main/services/ptyManager');
-
-      expect(parseCustomCliForDirectSpawn('C:\\Tools\\codex.cmd')).toEqual([
-        'C:\\Tools\\codex.cmd',
-      ]);
-      expect(parseCustomCliForDirectSpawn('"C:\\Program Files\\Codex\\codex.cmd"')).toEqual([
-        'C:\\Program Files\\Codex\\codex.cmd',
-      ]);
-    } finally {
-      if (originalPlatformDescriptor) {
-        Object.defineProperty(process, 'platform', originalPlatformDescriptor);
-      }
-    }
-  });
-});
-
-describe('stale Claude session detection', () => {
-  const SESSION_MAP_PATH = '/tmp/emdash-test/pty-session-map.json';
-  const TEST_CWD = '/tmp/test-worktree';
-  const TEST_UUID = 'test-uuid-00000000-0000-0000-0000';
-  const PTY_ID = 'claude-main-task123';
-
-  let applySessionIsolation: typeof import('../../main/services/ptyManager').applySessionIsolation;
-  let resetSessionMap: typeof import('../../main/services/ptyManager')._resetSessionMapForTest;
-  let claudeProvider: any;
-
-  beforeEach(async () => {
-    vi.clearAllMocks();
-    fsWriteFileSyncMock.mockImplementation(() => {});
-
-    // Load module once (avoid vi.resetModules — dynamic require('electron') isn't
-    // intercepted after module reset). Use _resetSessionMapForTest to clear
-    // the in-memory cache between tests instead.
-    const mod = await import('../../main/services/ptyManager');
-    applySessionIsolation = mod.applySessionIsolation;
-    resetSessionMap = mod._resetSessionMapForTest;
-    resetSessionMap(SESSION_MAP_PATH);
-
-    const { PROVIDERS } = await import('../../shared/providers/registry');
-    claudeProvider = PROVIDERS.find((p) => p.id === 'claude')!;
-  });
-
-  it('resumes when session file exists and cwd matches', () => {
-    const sessionMap = {
-      [PTY_ID]: { uuid: TEST_UUID, cwd: TEST_CWD },
-    };
-    fsReadFileSyncMock.mockReturnValue(JSON.stringify(sessionMap));
-    fsExistsSyncMock.mockImplementation((p: string) => {
-      if (p.endsWith(`${TEST_UUID}.jsonl`)) return true;
-      return false;
-    });
-
-    const cliArgs: string[] = [];
-    const result = applySessionIsolation(cliArgs, claudeProvider, PTY_ID, TEST_CWD, true);
-
-    expect(result).toBe(true);
-    expect(cliArgs).toContain('--resume');
-    expect(cliArgs).toContain(TEST_UUID);
-  });
-
-  it('does not resume when session file is missing', () => {
-    const sessionMap = {
-      [PTY_ID]: { uuid: TEST_UUID, cwd: TEST_CWD },
-    };
-    fsReadFileSyncMock.mockReturnValue(JSON.stringify(sessionMap));
-    fsExistsSyncMock.mockReturnValue(false);
-
-    const cliArgs: string[] = [];
-    const result = applySessionIsolation(cliArgs, claudeProvider, PTY_ID, TEST_CWD, true);
-
-    expect(result).toBe(false);
-    expect(cliArgs).not.toContain('--resume');
-    expect(cliArgs).not.toContain(TEST_UUID);
-    // Stale entry must be evicted from the persisted session map
-    expect(fsWriteFileSyncMock).toHaveBeenCalledWith(SESSION_MAP_PATH, JSON.stringify({}));
-  });
-
-  it('treats cwd mismatch as stale session', () => {
-    const sessionMap = {
-      [PTY_ID]: { uuid: TEST_UUID, cwd: '/tmp/old-worktree' },
-    };
-    fsReadFileSyncMock.mockReturnValue(JSON.stringify(sessionMap));
-    // File may exist, but cwd mismatch should still be treated as stale
-    fsExistsSyncMock.mockReturnValue(true);
-
-    const cliArgs: string[] = [];
-    const result = applySessionIsolation(cliArgs, claudeProvider, PTY_ID, TEST_CWD, true);
-
-    expect(result).toBe(false);
-    expect(cliArgs).not.toContain('--resume');
-    expect(cliArgs).not.toContain(TEST_UUID);
-    // Stale entry must be evicted from the persisted session map
-    expect(fsWriteFileSyncMock).toHaveBeenCalledWith(SESSION_MAP_PATH, JSON.stringify({}));
-  });
-});
diff --git a/src/test/main/settings.test.ts b/src/test/main/settings.test.ts
deleted file mode 100644
index e281d47977..0000000000
--- a/src/test/main/settings.test.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import { describe, expect, it, vi } from 'vitest';
-
-vi.mock('electron', () => ({
-  app: {
-    getPath: () => '/tmp/emdash-test',
-  },
-}));
-
-import { normalizeSettings } from '../../main/settings';
-import type { AppSettings } from '../../main/settings';
-
-/** Minimal valid AppSettings skeleton for normalizeSettings. */
-function makeSettings(overrides?: Partial<AppSettings>): AppSettings {
-  return {
-    repository: { branchPrefix: 'emdash', pushOnCreate: true },
-    projectPrep: { autoInstallOnOpenInEditor: true },
-    ...overrides,
-  } as AppSettings;
-}
-
-describe('normalizeSettings – taskHoverAction', () => {
-  it('preserves "archive"', () => {
-    const result = normalizeSettings(makeSettings({ interface: { taskHoverAction: 'archive' } }));
-    expect(result.interface?.taskHoverAction).toBe('archive');
-  });
-
-  it('preserves "delete"', () => {
-    const result = normalizeSettings(makeSettings({ interface: { taskHoverAction: 'delete' } }));
-    expect(result.interface?.taskHoverAction).toBe('delete');
-  });
-
-  it('coerces invalid value to "delete"', () => {
-    const result = normalizeSettings(
-      makeSettings({ interface: { taskHoverAction: 'invalid' as any } })
-    );
-    expect(result.interface?.taskHoverAction).toBe('delete');
-  });
-
-  it('defaults undefined to "delete"', () => {
-    const result = normalizeSettings(makeSettings({ interface: {} }));
-    expect(result.interface?.taskHoverAction).toBe('delete');
-  });
-
-  it('defaults missing interface to "delete"', () => {
-    const result = normalizeSettings(makeSettings());
-    expect(result.interface?.taskHoverAction).toBe('delete');
-  });
-});
diff --git a/src/test/main/sshConfigParser.test.ts b/src/test/main/sshConfigParser.test.ts
deleted file mode 100644
index 3126b64b96..0000000000
--- a/src/test/main/sshConfigParser.test.ts
+++ /dev/null
@@ -1,132 +0,0 @@
-import { describe, expect, it, vi, beforeEach } from 'vitest';
-
-// ── mocks ──────────────────────────────────────────────────────────────
-const readFileMock = vi.fn();
-
-vi.mock('fs/promises', () => ({
-  readFile: (...args: unknown[]) => readFileMock(...args),
-}));
-
-// ── imports (after mocks) ──────────────────────────────────────────────
-import { parseSshConfigFile, resolveIdentityAgent } from '../../main/utils/sshConfigParser';
-
-describe('parseSshConfigFile', () => {
-  beforeEach(() => {
-    vi.clearAllMocks();
-  });
-
-  it('parses specific host entries', async () => {
-    readFileMock.mockResolvedValue(
-      [
-        'Host myserver',
-        '  HostName 10.0.0.1',
-        '  User deploy',
-        '  Port 2222',
-        '  IdentityFile ~/.ssh/id_ed25519',
-        '  IdentityAgent ~/custom/agent.sock',
-      ].join('\n')
-    );
-
-    const hosts = await parseSshConfigFile();
-    expect(hosts).toHaveLength(1);
-    expect(hosts[0]).toMatchObject({
-      host: 'myserver',
-      hostname: '10.0.0.1',
-      user: 'deploy',
-      port: 2222,
-    });
-    expect(hosts[0].identityAgent).toBeDefined();
-  });
-
-  it('parses Host * blocks and extracts IdentityAgent', async () => {
-    readFileMock.mockResolvedValue(
-      [
-        'Host *',
-        '  IdentityAgent ~/Library/Group Containers/2BUA8C4S2C.com.1password/t/agent.sock',
-        '',
-        'Host myserver',
-        '  HostName 10.0.0.1',
-        '  User deploy',
-      ].join('\n')
-    );
-
-    const hosts = await parseSshConfigFile();
-    // Should contain both the wildcard and the specific host
-    const wildcard = hosts.find((h) => h.host === '*');
-    expect(wildcard).toBeDefined();
-    expect(wildcard!.identityAgent).toContain('1password');
-  });
-});
-
-describe('resolveIdentityAgent', () => {
-  beforeEach(() => {
-    vi.clearAllMocks();
-  });
-
-  it('returns IdentityAgent from matching specific host', async () => {
-    readFileMock.mockResolvedValue(
-      ['Host myserver', '  HostName 10.0.0.1', '  IdentityAgent /custom/agent.sock'].join('\n')
-    );
-
-    const result = await resolveIdentityAgent('myserver');
-    expect(result).toBe('/custom/agent.sock');
-  });
-
-  it('falls back to Host * IdentityAgent when no specific host matches', async () => {
-    readFileMock.mockResolvedValue(
-      [
-        'Host *',
-        '  IdentityAgent ~/Library/Group Containers/2BUA8C4S2C.com.1password/t/agent.sock',
-        '',
-        'Host otherserver',
-        '  HostName 10.0.0.2',
-      ].join('\n')
-    );
-
-    const result = await resolveIdentityAgent('somehost');
-    expect(result).toContain('1password');
-  });
-
-  it('prefers specific host IdentityAgent over Host * IdentityAgent', async () => {
-    readFileMock.mockResolvedValue(
-      [
-        'Host *',
-        '  IdentityAgent /default/agent.sock',
-        '',
-        'Host myserver',
-        '  HostName 10.0.0.1',
-        '  IdentityAgent /specific/agent.sock',
-      ].join('\n')
-    );
-
-    const result = await resolveIdentityAgent('myserver');
-    expect(result).toBe('/specific/agent.sock');
-  });
-
-  it('returns undefined when no IdentityAgent anywhere', async () => {
-    readFileMock.mockResolvedValue(
-      ['Host myserver', '  HostName 10.0.0.1', '  User deploy'].join('\n')
-    );
-
-    const result = await resolveIdentityAgent('myserver');
-    expect(result).toBeUndefined();
-  });
-
-  it('handles SSH_AUTH_SOCK special value in IdentityAgent', async () => {
-    // OpenSSH supports IdentityAgent SSH_AUTH_SOCK as a literal token
-    // meaning "use the SSH_AUTH_SOCK env var"
-    readFileMock.mockResolvedValue(['Host *', '  IdentityAgent SSH_AUTH_SOCK'].join('\n'));
-
-    const result = await resolveIdentityAgent('anyhost');
-    // Should return undefined (or the env var value), not the literal string
-    // so that the caller falls back to process.env.SSH_AUTH_SOCK
-    expect(result).toBeUndefined();
-  });
-
-  it('handles IdentityAgent none (disables agent auth)', async () => {
-    readFileMock.mockResolvedValue(['Host *', '  IdentityAgent none'].join('\n'));
-
-    const result = await resolveIdentityAgent('anyhost');
-    expect(result).toBeUndefined();
-  });
-});
diff --git a/src/test/main/worktreeIpc.test.ts b/src/test/main/worktreeIpc.test.ts
deleted file mode 100644
index 16ca7a5c22..0000000000
--- a/src/test/main/worktreeIpc.test.ts
+++ /dev/null
@@ -1,263 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest';
-
-const ipcHandleHandlers = new Map<string, (...args: any[]) => any>();
-
-const claimReserveMock = vi.fn();
-const saveTaskMock = vi.fn();
-const getProjectByIdMock = vi.fn();
-
-vi.mock('electron', () => ({
-  ipcMain: {
-    handle: vi.fn((channel: string, cb: (...args: any[]) => any) => {
-      ipcHandleHandlers.set(channel, cb);
-    }),
-  },
-}));
-
-vi.mock('../../main/services/WorktreeService', () => ({
-  worktreeService: {
-    createWorktree: vi.fn(),
-    listWorktrees: vi.fn(),
-    removeWorktree: vi.fn(),
-    getWorktreeStatus: vi.fn(),
-    mergeWorktreeChanges: vi.fn(),
-    getWorktree: vi.fn(),
-    getAllWorktrees: vi.fn(),
-  },
-}));
-
-vi.mock('../../main/services/WorktreePoolService', () => ({
-  worktreePoolService: {
-    ensureReserve: vi.fn(),
-    hasReserve: vi.fn(),
-    claimReserve: (...args: any[]) => claimReserveMock(...args),
-    removeReserve: vi.fn(),
-  },
-}));
-
-vi.mock('../../main/services/DatabaseService', () => ({
-  databaseService: {
-    getProjectById: (...args: any[]) => getProjectByIdMock(...args),
-    saveTask: (...args: any[]) => saveTaskMock(...args),
-    getProjects: vi.fn(),
-  },
-}));
-
-vi.mock('../../main/db/drizzleClient', () => ({
-  getDrizzleClient: vi.fn(),
-}));
-
-vi.mock('../../main/services/RemoteGitService', () => ({
-  RemoteGitService: vi.fn().mockImplementation(() => ({
-    createWorktree: vi.fn(),
-    listWorktrees: vi.fn(),
-    removeWorktree: vi.fn(),
-    getWorktreeStatus: vi.fn(),
-  })),
-}));
-
-vi.mock('../../main/services/ssh/SshService', () => ({
-  sshService: {
-    executeCommand: vi.fn(),
-  },
-}));
-
-vi.mock('../../main/lib/logger', () => ({
-  log: {
-    info: vi.fn(),
-    debug: vi.fn(),
-    warn: vi.fn(),
-    error: vi.fn(),
-  },
-}));
-
-vi.mock('../../main/utils/shellEscape', () => ({
-  quoteShellArg: (value: string) => value,
-}));
-
-describe('worktreeIpc claimReserveAndSaveTask', () => {
-  beforeEach(() => {
-    vi.clearAllMocks();
-    vi.resetModules();
-    ipcHandleHandlers.clear();
-  });
-
-  async function getHandler() {
-    const { registerWorktreeIpc } = await import('../../main/services/worktreeIpc');
-    registerWorktreeIpc();
-    const handler = ipcHandleHandlers.get('worktree:claimReserveAndSaveTask');
-    expect(handler).toBeTypeOf('function');
-    return handler!;
-  }
-
-  it('claims reserve and persists task in one handler call', async () => {
-    const handler = await getHandler();
-
-    getProjectByIdMock.mockResolvedValue({
-      id: 'project-1',
-      isRemote: false,
-    });
-    claimReserveMock.mockResolvedValue({
-      worktree: {
-        id: 'wt-123',
-        name: 'task-a',
-        branch: 'emdash/task-a-abc',
-        path: '/tmp/worktrees/task-a',
-        projectId: 'project-1',
-        status: 'active',
-        createdAt: '2026-02-20T00:00:00.000Z',
-      },
-      needsBaseRefSwitch: false,
-    });
-    saveTaskMock.mockResolvedValue(undefined);
-
-    const result = await handler(
-      {},
-      {
-        projectId: 'project-1',
-        projectPath: '/tmp/repo',
-        taskName: 'task-a',
-        baseRef: 'origin/main',
-        task: {
-          projectId: 'project-1',
-          name: 'task-a',
-          status: 'idle',
-          agentId: 'codex',
-          metadata: { initialPrompt: 'hello' },
-          useWorktree: true,
-        },
-      }
-    );
-
-    expect(claimReserveMock).toHaveBeenCalledWith(
-      'project-1',
-      '/tmp/repo',
-      'task-a',
-      'origin/main'
-    );
-    expect(saveTaskMock).toHaveBeenCalledWith(
-      expect.objectContaining({
-        id: 'wt-123',
-        projectId: 'project-1',
-        name: 'task-a',
-        branch: 'emdash/task-a-abc',
-        path: '/tmp/worktrees/task-a',
-        status: 'idle',
-        agentId: 'codex',
-        metadata: { initialPrompt: 'hello' },
-        useWorktree: true,
-      })
-    );
-    expect(result).toEqual(
-      expect.objectContaining({
-        success: true,
-        worktree: expect.objectContaining({ id: 'wt-123' }),
-        task: expect.objectContaining({ id: 'wt-123' }),
-      })
-    );
-  });
-
-  it('returns no reserve error and does not persist task when claim misses', async () => {
-    const handler = await getHandler();
-
-    getProjectByIdMock.mockResolvedValue({
-      id: 'project-1',
-      isRemote: false,
-    });
-    claimReserveMock.mockResolvedValue(null);
-
-    const result = await handler(
-      {},
-      {
-        projectId: 'project-1',
-        projectPath: '/tmp/repo',
-        taskName: 'task-a',
-        baseRef: 'origin/main',
-        task: {
-          projectId: 'project-1',
-          name: 'task-a',
-          status: 'idle',
-        },
-      }
-    );
-
-    expect(result).toEqual({
-      success: false,
-      error: 'No reserve available',
-    });
-    expect(saveTaskMock).not.toHaveBeenCalled();
-  });
-
-  it('returns failure when saveTask throws after a successful claim', async () => {
-    const handler = await getHandler();
-
-    getProjectByIdMock.mockResolvedValue({
-      id: 'project-1',
-      isRemote: false,
-    });
-    claimReserveMock.mockResolvedValue({
-      worktree: {
-        id: 'wt-456',
-        name: 'task-b',
-        branch: 'emdash/task-b-def',
-        path: '/tmp/worktrees/task-b',
-        projectId: 'project-1',
-        status: 'active',
-        createdAt: '2026-02-20T00:00:00.000Z',
-      },
-      needsBaseRefSwitch: false,
-    });
-    saveTaskMock.mockRejectedValue(new Error('db save failed'));
-
-    const result = await handler(
-      {},
-      {
-        projectId: 'project-1',
-        projectPath: '/tmp/repo',
-        taskName: 'task-b',
-        baseRef: 'origin/main',
-        task: {
-          projectId: 'project-1',
-          name: 'task-b',
-          status: 'idle',
-        },
-      }
-    );
-
-    expect(result.success).toBe(false);
-    expect(result.error).toContain('db save failed');
-  });
-
-  it('rejects remote projects without claiming or saving', async () => {
-    const handler = await getHandler();
-
-    getProjectByIdMock.mockResolvedValue({
-      id: 'remote-project',
-      isRemote: true,
-      sshConnectionId: 'conn-1',
-      remotePath: '/srv/repo',
-    });
-
-    const result = await handler(
-      {},
-      {
-        projectId: 'remote-project',
-        projectPath: '/srv/repo',
-        taskName: 'task-remote',
-        baseRef: 'origin/main',
-        task: {
-          projectId: 'remote-project',
-          name: 'task-remote',
-          status: 'idle',
-        },
-      }
-    );
-
-    expect(result).toEqual({
-      success: false,
-      error: 'Remote worktree pooling is not supported yet',
-    });
-    expect(claimReserveMock).not.toHaveBeenCalled();
-    expect(saveTaskMock).not.toHaveBeenCalled();
-  });
-});
diff --git a/src/test/renderer/TaskTerminalPanel.test.ts b/src/test/renderer/TaskTerminalPanel.test.ts
deleted file mode 100644
index fe2ec2442b..0000000000
--- a/src/test/renderer/TaskTerminalPanel.test.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { describe, expect, it } from 'vitest';
-import { shouldDisablePlay } from '../../renderer/lib/lifecycleUi';
-
-describe('TaskTerminalPanel', () => {
-  it('disables play for run selection when run cannot start', () => {
-    const disabled = shouldDisablePlay({
-      runActionBusy: false,
-      hasProjectPath: true,
-      isRunSelection: true,
-      canStartRun: false,
-    });
-    expect(disabled).toBe(true);
-  });
-
-  it('does not disable play for non-run lifecycle phases when run cannot start', () => {
-    const disabled = shouldDisablePlay({
-      runActionBusy: false,
-      hasProjectPath: true,
-      isRunSelection: false,
-      canStartRun: false,
-    });
-    expect(disabled).toBe(false);
-  });
-});
diff --git a/src/test/renderer/branchNameGenerator.test.ts b/src/test/renderer/branchNameGenerator.test.ts
deleted file mode 100644
index 3b75a973f3..0000000000
--- a/src/test/renderer/branchNameGenerator.test.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-import { describe, expect, it } from 'vitest';
-import { generateTaskName } from '../../renderer/lib/branchNameGenerator';
-
-describe('generateTaskName', () => {
-  it('generates a slug from a descriptive prompt', () => {
-    const result = generateTaskName('Fix the login page on mobile devices');
-    expect(result).toBeTruthy();
-    expect(result).toMatch(/^[a-z0-9-]+$/);
-    expect(result!.length).toBeLessThanOrEqual(64);
-  });
-
-  it('returns null for slash commands', () => {
-    expect(generateTaskName('/help')).toBeNull();
-    expect(generateTaskName('/status')).toBeNull();
-  });
-
-  it('returns null for very short inputs', () => {
-    expect(generateTaskName('hi')).toBeNull();
-    expect(generateTaskName('fix')).toBeNull();
-    expect(generateTaskName('ok')).toBeNull();
-  });
-
-  it('returns null for empty input', () => {
-    expect(generateTaskName('')).toBeNull();
-    expect(generateTaskName('   ')).toBeNull();
-  });
-
-  it('limits output to 64 characters', () => {
-    const longInput =
-      'Refactor the entire authentication system to use JWT tokens with refresh token rotation and implement proper session management across all microservices';
-    const result = generateTaskName(longInput);
-    expect(result).toBeTruthy();
-    expect(result!.length).toBeLessThanOrEqual(64);
-  });
-
-  it('produces different names for different inputs', () => {
-    const a = generateTaskName('Fix the login page on mobile devices');
-    const b = generateTaskName('Add user authentication with JWT tokens');
-    expect(a).toBeTruthy();
-    expect(b).toBeTruthy();
-    expect(a).not.toEqual(b);
-  });
-
-  it('contains only valid slug characters', () => {
-    const result = generateTaskName('Handle special chars: @#$% and unicode');
-    if (result) {
-      expect(result).toMatch(/^[a-z0-9-]+$/);
-    }
-  });
-});
diff --git a/src/test/renderer/markdownPreview.test.ts b/src/test/renderer/markdownPreview.test.ts
deleted file mode 100644
index e59f53af11..0000000000
--- a/src/test/renderer/markdownPreview.test.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { describe, expect, it } from 'vitest';
-import { isMarkdownFile } from '../../renderer/constants/file-explorer';
-
-describe('isMarkdownFile', () => {
-  it('returns true for .md files', () => {
-    expect(isMarkdownFile('README.md')).toBe(true);
-    expect(isMarkdownFile('path/to/docs/guide.md')).toBe(true);
-  });
-
-  it('returns true for .mdx files', () => {
-    expect(isMarkdownFile('component.mdx')).toBe(true);
-  });
-
-  it('returns false for non-markdown files', () => {
-    expect(isMarkdownFile('index.ts')).toBe(false);
-    expect(isMarkdownFile('style.css')).toBe(false);
-    expect(isMarkdownFile('image.png')).toBe(false);
-  });
-
-  it('returns false for files with no extension', () => {
-    expect(isMarkdownFile('Makefile')).toBe(false);
-  });
-
-  it('is case insensitive', () => {
-    expect(isMarkdownFile('README.MD')).toBe(true);
-    expect(isMarkdownFile('notes.Md')).toBe(true);
-  });
-});
diff --git a/src/test/renderer/taskNameFromContext.test.ts b/src/test/renderer/taskNameFromContext.test.ts
deleted file mode 100644
index dfc2bc64a8..0000000000
--- a/src/test/renderer/taskNameFromContext.test.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-import { describe, expect, it } from 'vitest';
-import { generateTaskNameFromContext } from '../../renderer/lib/branchNameGenerator';
-
-describe('generateTaskNameFromContext', () => {
-  it('returns null when no context is available', () => {
-    expect(generateTaskNameFromContext({})).toBeNull();
-    expect(generateTaskNameFromContext({ initialPrompt: null })).toBeNull();
-  });
-
-  it('generates name from initial prompt', () => {
-    const result = generateTaskNameFromContext({
-      initialPrompt: 'Fix the broken authentication on the login page',
-    });
-    expect(result).toBeTruthy();
-    expect(result).toMatch(/^[a-z0-9-]+$/);
-  });
-
-  it('prioritizes linked issue over initial prompt', () => {
-    const fromPrompt = generateTaskNameFromContext({
-      initialPrompt: 'Do something generic and vague here',
-    });
-    const fromIssue = generateTaskNameFromContext({
-      initialPrompt: 'Do something generic and vague here',
-      linearIssue: {
-        id: 'LIN-123',
-        identifier: 'LIN-123',
-        title: 'Fix authentication redirect loop',
-        url: 'https://linear.app/issue/LIN-123',
-      } as any,
-    });
-
-    expect(fromPrompt).toBeTruthy();
-    expect(fromIssue).toBeTruthy();
-    // Issue-derived name should differ from prompt-derived name
-    expect(fromIssue).not.toEqual(fromPrompt);
-  });
-
-  it('generates name from GitHub issue', () => {
-    const result = generateTaskNameFromContext({
-      githubIssue: {
-        number: 42,
-        title: 'Mobile layout breaks on small screens',
-        url: 'https://github.com/org/repo/issues/42',
-      } as any,
-    });
-    expect(result).toBeTruthy();
-    expect(result).toMatch(/^[a-z0-9-]+$/);
-  });
-
-  it('generates name from Jira issue', () => {
-    const result = generateTaskNameFromContext({
-      jiraIssue: {
-        key: 'PROJ-456',
-        summary: 'Add dark mode support to settings page',
-      } as any,
-    });
-    expect(result).toBeTruthy();
-    expect(result).toMatch(/^[a-z0-9-]+$/);
-  });
-
-  it('returns null for very short prompts', () => {
-    expect(generateTaskNameFromContext({ initialPrompt: 'fix' })).toBeNull();
-    expect(generateTaskNameFromContext({ initialPrompt: 'ok' })).toBeNull();
-  });
-
-  it('returns null for slash commands', () => {
-    expect(generateTaskNameFromContext({ initialPrompt: '/help' })).toBeNull();
-  });
-});
diff --git a/src/test/renderer/terminalInputBuffer.test.ts b/src/test/renderer/terminalInputBuffer.test.ts
deleted file mode 100644
index d61de8a182..0000000000
--- a/src/test/renderer/terminalInputBuffer.test.ts
+++ /dev/null
@@ -1,126 +0,0 @@
-import { describe, expect, it, vi } from 'vitest';
-import { TerminalInputBuffer } from '../../renderer/terminal/TerminalInputBuffer';
-
-describe('TerminalInputBuffer', () => {
-  it('captures a message after Enter + confirmSubmit', () => {
-    const onCapture = vi.fn();
-    const buffer = new TerminalInputBuffer(onCapture);
-
-    buffer.feed('Fix the login page');
-    buffer.feed('\r');
-    buffer.confirmSubmit();
-
-    expect(onCapture).toHaveBeenCalledWith('Fix the login page');
-    expect(buffer.isComplete).toBe(true);
-  });
-
-  it('fires callback only once', () => {
-    const onCapture = vi.fn();
-    const buffer = new TerminalInputBuffer(onCapture);
-
-    buffer.feed('First message here\r');
-    buffer.confirmSubmit();
-
-    buffer.feed('Second message here\r');
-    buffer.confirmSubmit();
-
-    expect(onCapture).toHaveBeenCalledTimes(1);
-    expect(onCapture).toHaveBeenCalledWith('First message here');
-  });
-
-  it('handles backspace correctly', () => {
-    const onCapture = vi.fn();
-    const buffer = new TerminalInputBuffer(onCapture);
-
-    buffer.feed('Hell');
-    buffer.feed('\x7f'); // backspace
-    buffer.feed('lo world');
-    buffer.feed('\r');
-    buffer.confirmSubmit();
-
-    expect(onCapture).toHaveBeenCalledWith('Hello world');
-  });
-
-  it('strips ANSI escape codes', () => {
-    const onCapture = vi.fn();
-    const buffer = new TerminalInputBuffer(onCapture);
-
-    buffer.feed('\x1b[32mFix the broken auth\x1b[0m');
-    buffer.feed('\r');
-    buffer.confirmSubmit();
-
-    expect(onCapture).toHaveBeenCalledWith('Fix the broken auth');
-  });
-
-  it('skips slash commands', () => {
-    const onCapture = vi.fn();
-    const buffer = new TerminalInputBuffer(onCapture);
-
-    buffer.feed('/help\r');
-    buffer.confirmSubmit();
-
-    expect(onCapture).not.toHaveBeenCalled();
-    expect(buffer.isComplete).toBe(false);
-  });
-
-  it('skips single-character confirmations', () => {
-    const onCapture = vi.fn();
-    const buffer = new TerminalInputBuffer(onCapture);
-
-    buffer.feed('y\r');
-    buffer.confirmSubmit();
-    expect(onCapture).not.toHaveBeenCalled();
-
-    buffer.feed('ok\r');
-    buffer.confirmSubmit();
-    expect(onCapture).not.toHaveBeenCalled();
-  });
-
-  it('skips short messages under 10 chars', () => {
-    const onCapture = vi.fn();
-    const buffer = new TerminalInputBuffer(onCapture);
-
-    buffer.feed('fix bug\r');
-    buffer.confirmSubmit();
-
-    expect(onCapture).not.toHaveBeenCalled();
-    expect(buffer.isComplete).toBe(false);
-  });
-
-  it('captures after skipping invalid input', () => {
-    const onCapture = vi.fn();
-    const buffer = new TerminalInputBuffer(onCapture);
-
-    // First: short input — should be skipped
-    buffer.feed('y\r');
-    buffer.confirmSubmit();
-    expect(onCapture).not.toHaveBeenCalled();
-
-    // Second: real message — should be captured
-    buffer.feed('Implement the authentication flow for OAuth\r');
-    buffer.confirmSubmit();
-    expect(onCapture).toHaveBeenCalledWith('Implement the authentication flow for OAuth');
-  });
-
-  it('does not fire without confirmSubmit', () => {
-    const onCapture = vi.fn();
-    const buffer = new TerminalInputBuffer(onCapture);
-
-    buffer.feed('Fix the login page\r');
-    // No confirmSubmit call
-    expect(onCapture).not.toHaveBeenCalled();
-  });
-
-  it('ignores feed after completion', () => {
-    const onCapture = vi.fn();
-    const buffer = new TerminalInputBuffer(onCapture);
-
-    buffer.feed('First message here\r');
-    buffer.confirmSubmit();
-    expect(buffer.isComplete).toBe(true);
-
-    // Further feeds should be ignored
-    buffer.feed('Another message\r');
-    expect(onCapture).toHaveBeenCalledTimes(1);
-  });
-});
diff --git a/src/test/renderer/useProjectManagement.test.ts b/src/test/renderer/useProjectManagement.test.ts
deleted file mode 100644
index f01e8f4ca5..0000000000
--- a/src/test/renderer/useProjectManagement.test.ts
+++ /dev/null
@@ -1,78 +0,0 @@
-import { describe, expect, it, vi } from 'vitest';
-import { resolveProjectGithubInfo } from '../../renderer/lib/projectUtils';
-
-describe('resolveProjectGithubInfo', () => {
-  const projectPath = '/path/to/project';
-  const githubRemote = 'https://github.com/user/repo.git';
-  const sshGithubRemote = 'git@github.com:user/repo.git';
-  const nonGithubRemote = 'https://gitlab.com/user/repo.git';
-
-  it('returns connected when authenticated and connectToGitHub succeeds', async () => {
-    const connectToGitHub = vi.fn().mockResolvedValue({ success: true, repository: 'user/repo' });
-
-    const result = await resolveProjectGithubInfo(projectPath, githubRemote, true, connectToGitHub);
-
-    expect(connectToGitHub).toHaveBeenCalledWith(projectPath);
-    expect(result).toEqual({ connected: true, repository: 'user/repo', source: 'github' });
-  });
-
-  it('falls through to local when connectToGitHub fails', async () => {
-    const connectToGitHub = vi.fn().mockResolvedValue({ success: false, error: 'Bad credentials' });
-
-    const result = await resolveProjectGithubInfo(projectPath, githubRemote, true, connectToGitHub);
-
-    expect(connectToGitHub).toHaveBeenCalledWith(projectPath);
-    expect(result).toEqual({ connected: false, repository: '', source: 'local' });
-  });
-
-  it('skips connectToGitHub when not authenticated', async () => {
-    const connectToGitHub = vi.fn();
-
-    const result = await resolveProjectGithubInfo(
-      projectPath,
-      githubRemote,
-      false,
-      connectToGitHub
-    );
-
-    expect(connectToGitHub).not.toHaveBeenCalled();
-    expect(result).toEqual({ connected: false, repository: '', source: 'local' });
-  });
-
-  it('skips connectToGitHub when remote is not GitHub', async () => {
-    const connectToGitHub = vi.fn();
-
-    const result = await resolveProjectGithubInfo(
-      projectPath,
-      nonGithubRemote,
-      true,
-      connectToGitHub
-    );
-
-    expect(connectToGitHub).not.toHaveBeenCalled();
-    expect(result).toEqual({ connected: false, repository: '', source: 'local' });
-  });
-
-  it('falls through to local when connectToGitHub throws', async () => {
-    const connectToGitHub = vi.fn().mockRejectedValue(new Error('network error'));
-
-    const result = await resolveProjectGithubInfo(projectPath, githubRemote, true, connectToGitHub);
-
-    expect(connectToGitHub).toHaveBeenCalledWith(projectPath);
-    expect(result).toEqual({ connected: false, repository: '', source: 'local' });
-  });
-
-  it('handles SSH-style GitHub remotes', async () => {
-    const connectToGitHub = vi.fn().mockResolvedValue({ success: true, repository: 'user/repo' });
-
-    const result = await resolveProjectGithubInfo(
-      projectPath,
-      sshGithubRemote,
-      true,
-      connectToGitHub
-    );
-
-    expect(connectToGitHub).toHaveBeenCalledWith(projectPath);
-    expect(result).toEqual({ connected: true, repository: 'user/repo', source: 'github' });
-  });
-});
diff --git a/src/test/renderer/useTerminalSelection.test.ts b/src/test/renderer/useTerminalSelection.test.ts
deleted file mode 100644
index 6406991384..0000000000
--- a/src/test/renderer/useTerminalSelection.test.ts
+++ /dev/null
@@ -1,205 +0,0 @@
-import { describe, expect, it } from 'vitest';
-import { parseTerminalValue, resolveSelection } from '../../renderer/hooks/useTerminalSelection';
-
-// Type alias matching the store's return shape
-type Terminals = {
-  terminals: { id: string }[];
-  activeTerminalId: string | null;
-};
-
-function makeTerminals(ids: string[], activeId?: string | null): Terminals {
-  return {
-    terminals: ids.map((id) => ({ id })),
-    activeTerminalId: activeId ?? ids[0] ?? null,
-  };
-}
-
-describe('parseTerminalValue', () => {
-  it('parses task value', () => {
-    expect(parseTerminalValue('task::abc')).toEqual({ mode: 'task', id: 'abc' });
-  });
-
-  it('parses global value', () => {
-    expect(parseTerminalValue('global::xyz')).toEqual({ mode: 'global', id: 'xyz' });
-  });
-
-  it('parses lifecycle value', () => {
-    expect(parseTerminalValue('lifecycle::setup')).toEqual({ mode: 'lifecycle', id: 'setup' });
-  });
-
-  it('returns null for empty string', () => {
-    expect(parseTerminalValue('')).toBeNull();
-  });
-
-  it('returns null for invalid format', () => {
-    expect(parseTerminalValue('invalid')).toBeNull();
-  });
-});
-
-describe('resolveSelection', () => {
-  describe('task switch', () => {
-    it('resets to first worktree terminal on task switch', () => {
-      const result = resolveSelection({
-        currentValue: 'global::g1',
-        taskId: 'task-2',
-        prevTaskId: 'task-1',
-        taskTerminals: makeTerminals(['t1', 't2']),
-        globalTerminals: makeTerminals(['g1', 'g2']),
-      });
-      expect(result).toBe('task::t1');
-    });
-
-    it('falls back to global if no worktree terminals on task switch', () => {
-      const result = resolveSelection({
-        currentValue: 'task::old',
-        taskId: 'task-2',
-        prevTaskId: 'task-1',
-        taskTerminals: makeTerminals([]),
-        globalTerminals: makeTerminals(['g1']),
-      });
-      expect(result).toBe('global::g1');
-    });
-
-    it('clears selection if no terminals at all on task switch', () => {
-      const result = resolveSelection({
-        currentValue: 'task::old',
-        taskId: 'task-2',
-        prevTaskId: 'task-1',
-        taskTerminals: makeTerminals([]),
-        globalTerminals: makeTerminals([]),
-      });
-      expect(result).toBe('');
-    });
-
-    it('resets from lifecycle mode on task switch', () => {
-      const result = resolveSelection({
-        currentValue: 'lifecycle::setup',
-        taskId: 'task-2',
-        prevTaskId: 'task-1',
-        taskTerminals: makeTerminals(['t1']),
-        globalTerminals: makeTerminals(['g1']),
-      });
-      expect(result).toBe('task::t1');
-    });
-  });
-
-  describe('no selection', () => {
-    it('picks first task terminal when no selection', () => {
-      const result = resolveSelection({
-        currentValue: '',
-        taskId: 'task-1',
-        prevTaskId: 'task-1',
-        taskTerminals: makeTerminals(['t1']),
-        globalTerminals: makeTerminals(['g1']),
-      });
-      expect(result).toBe('task::t1');
-    });
-
-    it('picks first global terminal when no task terminals and no selection', () => {
-      const result = resolveSelection({
-        currentValue: '',
-        taskId: 'task-1',
-        prevTaskId: 'task-1',
-        taskTerminals: makeTerminals([]),
-        globalTerminals: makeTerminals(['g1']),
-      });
-      expect(result).toBe('global::g1');
-    });
-  });
-
-  describe('task deselected', () => {
-    it('switches to global when task is removed and mode was task', () => {
-      const result = resolveSelection({
-        currentValue: 'task::t1',
-        taskId: null,
-        prevTaskId: null,
-        taskTerminals: makeTerminals([]),
-        globalTerminals: makeTerminals(['g1']),
-      });
-      expect(result).toBe('global::g1');
-    });
-  });
-
-  describe('lifecycle mode', () => {
-    it('returns null (no change) when in lifecycle mode', () => {
-      const result = resolveSelection({
-        currentValue: 'lifecycle::setup',
-        taskId: 'task-1',
-        prevTaskId: 'task-1',
-        taskTerminals: makeTerminals(['t1']),
-        globalTerminals: makeTerminals(['g1']),
-      });
-      expect(result).toBeNull();
-    });
-  });
-
-  describe('terminal still exists', () => {
-    it('returns null (no change) when selected task terminal still exists', () => {
-      const result = resolveSelection({
-        currentValue: 'task::t1',
-        taskId: 'task-1',
-        prevTaskId: 'task-1',
-        taskTerminals: makeTerminals(['t1', 't2']),
-        globalTerminals: makeTerminals(['g1']),
-      });
-      expect(result).toBeNull();
-    });
-
-    it('returns null (no change) when selected global terminal still exists', () => {
-      const result = resolveSelection({
-        currentValue: 'global::g1',
-        taskId: 'task-1',
-        prevTaskId: 'task-1',
-        taskTerminals: makeTerminals(['t1']),
-        globalTerminals: makeTerminals(['g1']),
-      });
-      expect(result).toBeNull();
-    });
-  });
-
-  describe('terminal deleted (stay in type)', () => {
-    it('uses store activeId when task terminal is deleted', () => {
-      const result = resolveSelection({
-        currentValue: 'task::t2',
-        taskId: 'task-1',
-        prevTaskId: 'task-1',
-        taskTerminals: makeTerminals(['t1', 't3'], 't3'),
-        globalTerminals: makeTerminals(['g1']),
-      });
-      expect(result).toBe('task::t3');
-    });
-
-    it('uses store activeId when global terminal is deleted', () => {
-      const result = resolveSelection({
-        currentValue: 'global::g2',
-        taskId: 'task-1',
-        prevTaskId: 'task-1',
-        taskTerminals: makeTerminals(['t1']),
-        globalTerminals: makeTerminals(['g1', 'g3'], 'g3'),
-      });
-      expect(result).toBe('global::g3');
-    });
-
-    it('falls back to other type when all terminals of current type are gone', () => {
-      const result = resolveSelection({
-        currentValue: 'global::g1',
-        taskId: 'task-1',
-        prevTaskId: 'task-1',
-        taskTerminals: makeTerminals(['t1']),
-        globalTerminals: makeTerminals([], null),
-      });
-      expect(result).toBe('task::t1');
-    });
-
-    it('clears when no terminals remain anywhere', () => {
-      const result = resolveSelection({
-        currentValue: 'task::t1',
-        taskId: 'task-1',
-        prevTaskId: 'task-1',
-        taskTerminals: makeTerminals([], null),
-        globalTerminals: makeTerminals([], null),
-      });
-      expect(result).toBe('');
-    });
-  });
-});
diff --git a/src/types/electron-extra.d.ts b/src/types/electron-extra.d.ts
deleted file mode 100644
index 75fcea2689..0000000000
--- a/src/types/electron-extra.d.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-export {};
-
-declare global {
-  interface Window {
-    electronAPI: {
-      fsWriteFile: (
-        root: string,
-        relPath: string,
-        content: string,
-        mkdirs?: boolean
-      ) => Promise<{ success: boolean; error?: string }>;
-      fsRemove: (root: string, relPath: string) => Promise<{ success: boolean; error?: string }>;
-      planApplyLock: (
-        taskPath: string
-      ) => Promise<{ success: boolean; changed?: number; error?: string }>;
-      planReleaseLock: (
-        taskPath: string
-      ) => Promise<{ success: boolean; restored?: number; error?: string }>;
-      onPlanEvent: (
-        listener: (data: {
-          type: 'write_blocked' | 'remove_blocked';
-          root: string;
-          relPath: string;
-          code?: string;
-          message?: string;
-        }) => void
-      ) => () => void;
-    };
-  }
-}
diff --git a/src/types/env.d.ts b/src/types/env.d.ts
new file mode 100644
index 0000000000..11f02fe2a0
--- /dev/null
+++ b/src/types/env.d.ts
@@ -0,0 +1 @@
+/// <reference types="vite/client" />
diff --git a/src/types/errorTracking.d.ts b/src/types/errorTracking.d.ts
deleted file mode 100644
index a58e01538d..0000000000
--- a/src/types/errorTracking.d.ts
+++ /dev/null
@@ -1,189 +0,0 @@
-/**
- * Type definitions for error tracking system
- *
- * These types are used across both main and renderer processes
- * to ensure consistent error context structure.
- */
-
-export type ErrorSeverity = 'critical' | 'high' | 'medium' | 'low';
-
-/**
- * Common error types for categorization
- */
-export type ErrorType =
-  | 'spawn_error' // PTY/process spawn failures
-  | 'git_error' // Git operations
-  | 'worktree_error' // Worktree creation/management
-  | 'database_error' // Database operations
-  | 'network_error' // API calls, network requests
-  | 'auth_error' // Authentication failures
-  | 'permission_error' // File system permissions
-  | 'file_not_found' // Missing files/resources
-  | 'render_error' // React rendering errors
-  | 'type_error' // JavaScript type errors
-  | 'reference_error' // Undefined references
-  | 'syntax_error' // Code syntax issues
-  | 'api_error' // API response errors
-  | 'user_action_error' // User interaction failures
-  | 'unhandled_error' // Uncaught exceptions
-  | 'unhandled_rejection' // Unhandled promise rejections
-  | 'project_error' // Project operations
-  | 'github_error' // GitHub API errors
-  | 'unknown_error'; // Unclassified errors
-
-/**
- * Main error context structure
- * Used for all error tracking calls
- */
-export interface ErrorContext {
-  // User identification
-  github_username?: string | null;
-
-  // Error classification
-  error_type?: ErrorType;
-  severity?: ErrorSeverity;
-
-  // Location context
-  operation?: string; // What operation was being performed
-  service?: string; // Which service threw the error
-  component?: string; // Component name (main/renderer/specific)
-
-  // Agent/Task context
-  provider?: string; // Agent provider (claude-code, codex, etc.)
-  task_id?: string;
-  workspace_id?: string;
-
-  // Project context
-  project_id?: string;
-  project_path?: string;
-
-  // Git/Worktree context
-  branch_name?: string;
-  worktree_path?: string;
-  git_operation?: string;
-
-  // Additional context
-  [key: string]: string | number | boolean | null | undefined;
-}
-
-/**
- * Main process error tracking service
- */
-export interface IErrorTracking {
-  init(): Promise<void>;
-  captureException(error: Error | unknown, context?: ErrorContext): Promise<void>;
-  captureCriticalError(error: Error | unknown, context?: ErrorContext): Promise<void>;
-  captureAgentSpawnError(
-    error: Error | unknown,
-    provider: string,
-    taskId: string,
-    context?: Partial<ErrorContext>
-  ): Promise<void>;
-  captureProjectError(
-    error: Error | unknown,
-    operation: 'create' | 'clone' | 'open' | 'delete',
-    projectPath?: string,
-    context?: Partial<ErrorContext>
-  ): Promise<void>;
-  captureWorktreeError(
-    error: Error | unknown,
-    operation: string,
-    worktreePath?: string,
-    branchName?: string,
-    context?: Partial<ErrorContext>
-  ): Promise<void>;
-  captureGitHubError(
-    error: Error | unknown,
-    operation: string,
-    context?: Partial<ErrorContext>
-  ): Promise<void>;
-  captureDatabaseError(
-    error: Error | unknown,
-    operation: string,
-    context?: Partial<ErrorContext>
-  ): Promise<void>;
-  updateGithubUsername(username: string | null): Promise<void>;
-}
-
-/**
- * Renderer process error tracking client
- */
-export interface IRendererErrorTracking {
-  captureException(error: Error | unknown, context?: ErrorContext): void;
-  captureCriticalError(error: Error | unknown, context?: ErrorContext): void;
-  captureApiError(
-    error: Error | unknown,
-    endpoint: string,
-    operation: string,
-    context?: Partial<ErrorContext>
-  ): void;
-  captureComponentError(
-    error: Error | unknown,
-    componentName: string,
-    context?: Partial<ErrorContext>
-  ): void;
-  captureUserActionError(
-    error: Error | unknown,
-    action: string,
-    context?: Partial<ErrorContext>
-  ): void;
-}
-
-/**
- * Common error operations for context
- */
-export type ErrorOperation =
-  // Agent operations
-  | 'agent_spawn'
-  | 'agent_kill'
-  | 'agent_resize'
-
-  // Project operations
-  | 'project_create'
-  | 'project_clone'
-  | 'project_open'
-  | 'project_delete'
-
-  // Worktree operations
-  | 'worktree_create'
-  | 'worktree_delete'
-  | 'worktree_list'
-
-  // GitHub operations
-  | 'github_auth'
-  | 'github_poll_device_code'
-  | 'github_get_user'
-  | 'github_create_pr'
-  | 'github_api_call'
-
-  // Database operations
-  | 'db_connect'
-  | 'db_migrate'
-  | 'db_query'
-  | 'db_insert'
-  | 'db_update'
-  | 'db_delete'
-
-  // PTY operations
-  | 'pty_spawn'
-  | 'pty_spawn_fallback'
-  | 'pty_write'
-  | 'pty_resize'
-  | 'pty_kill';
-
-/**
- * Services that can generate errors
- */
-export type ErrorService =
-  | 'ptyManager'
-  | 'WorktreeService'
-  | 'GitHubService'
-  | 'DatabaseService'
-  | 'GitService'
-  | 'projectIpc'
-  | 'appIpc'
-  | 'gitIpc'
-  | 'githubIpc'
-  | 'ptyIpc'
-  | 'renderer'
-  | 'unknown';
diff --git a/src/types/project.ts b/src/types/project.ts
deleted file mode 100644
index 6466d8d240..0000000000
--- a/src/types/project.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
- * Remote Project Configuration
- * Extends a local project with remote SSH connection details
- */
-export interface RemoteProjectConfig {
-  sshConnectionId: string;
-  remotePath: string;
-}
-
-/**
- * Project Type
- * Determines whether a project is local-only or remote-connected
- */
-export type ProjectType = 'local' | 'remote';
diff --git a/src/types/react-syntax-highlighter.d.ts b/src/types/react-syntax-highlighter.d.ts
deleted file mode 100644
index 85d9ea5070..0000000000
--- a/src/types/react-syntax-highlighter.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-declare module 'react-syntax-highlighter';
-declare module 'react-syntax-highlighter/dist/esm/styles/prism';
diff --git a/src/types/terminalSnapshot.ts b/src/types/terminalSnapshot.ts
deleted file mode 100644
index 0efc1f7a67..0000000000
--- a/src/types/terminalSnapshot.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '../main/types/terminalSnapshot';
diff --git a/tailwind.config.js b/tailwind.config.js
deleted file mode 100644
index 86ac1b8c0e..0000000000
--- a/tailwind.config.js
+++ /dev/null
@@ -1,121 +0,0 @@
-import tailwindcssAnimate from 'tailwindcss-animate';
-
-/** @type {import('tailwindcss').Config} */
-export default {
-  darkMode: ['class'],
-  content: [
-    './pages/**/*.{ts,tsx}',
-    './components/**/*.{ts,tsx}',
-    './app/**/*.{ts,tsx}',
-    './src/**/*.{ts,tsx}',
-  ],
-  prefix: '',
-  theme: {
-    container: {
-      center: true,
-      padding: '2rem',
-      screens: {
-        '2xl': '1400px',
-      },
-    },
-    extend: {
-      fontFamily: {
-        sans: [
-          '-apple-system',
-          'BlinkMacSystemFont',
-          'Segoe UI',
-          'Roboto',
-          'Oxygen',
-          'Ubuntu',
-          'Cantarell',
-          'Fira Sans',
-          'Droid Sans',
-          'Helvetica Neue',
-          'sans-serif',
-        ],
-        mono: ['Menlo', 'Monaco', 'Consolas', 'Liberation Mono', 'Courier New', 'monospace'],
-      },
-      fontSize: {
-        // Typography System Style Guide:
-        // - Headings: use font-semibold (h1-h6 elements)
-        // - Body text: default weight, use text-sm or text-base
-        // - Code/Terminal: use font-mono with text-code
-        // - Help text/Metadata: use text-tiny with text-muted-foreground
-        // - Badges/Indicators: use text-micro for very small UI elements
-        code: ['13px', { lineHeight: '1.2' }], // Terminal, code editor, monospace content
-        tiny: ['11px', { lineHeight: '1.3' }], // Help text, metadata, secondary info
-        micro: ['10px', { lineHeight: '1.2' }], // Badges, tiny indicators only
-      },
-      colors: {
-        border: 'hsl(var(--border))',
-        input: 'hsl(var(--input))',
-        ring: 'hsl(var(--ring))',
-        background: 'hsl(var(--background))',
-        foreground: 'hsl(var(--foreground))',
-        primary: {
-          DEFAULT: 'hsl(var(--primary))',
-          foreground: 'hsl(var(--primary-foreground))',
-        },
-        secondary: {
-          DEFAULT: 'hsl(var(--secondary))',
-          foreground: 'hsl(var(--secondary-foreground))',
-        },
-        destructive: {
-          DEFAULT: 'hsl(var(--destructive))',
-          foreground: 'hsl(var(--destructive-foreground))',
-        },
-        muted: {
-          DEFAULT: 'hsl(var(--muted))',
-          foreground: 'hsl(var(--muted-foreground))',
-        },
-        accent: {
-          DEFAULT: 'hsl(var(--accent))',
-          foreground: 'hsl(var(--accent-foreground))',
-        },
-        popover: {
-          DEFAULT: 'hsl(var(--popover))',
-          foreground: 'hsl(var(--popover-foreground))',
-        },
-        card: {
-          DEFAULT: 'hsl(var(--card))',
-          foreground: 'hsl(var(--card-foreground))',
-        },
-        chart: {
-          1: 'hsl(var(--chart-1))',
-          2: 'hsl(var(--chart-2))',
-          3: 'hsl(var(--chart-3))',
-          4: 'hsl(var(--chart-4))',
-          5: 'hsl(var(--chart-5))',
-        },
-      },
-      borderRadius: {
-        lg: 'var(--radius)',
-        md: 'calc(var(--radius) - 2px)',
-        sm: 'calc(var(--radius) - 4px)',
-      },
-      keyframes: {
-        'accordion-down': {
-          from: {
-            height: '0',
-          },
-          to: {
-            height: 'var(--radix-accordion-content-height)',
-          },
-        },
-        'accordion-up': {
-          from: {
-            height: 'var(--radix-accordion-content-height)',
-          },
-          to: {
-            height: '0',
-          },
-        },
-      },
-      animation: {
-        'accordion-down': 'accordion-down 0.2s ease-out',
-        'accordion-up': 'accordion-up 0.2s ease-out',
-      },
-    },
-  },
-  plugins: [tailwindcssAnimate],
-};
diff --git a/tsconfig.json b/tsconfig.json
index 6222ab437c..474d13df89 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,28 +1,35 @@
 {
   "compilerOptions": {
     "target": "ES2020",
-    "lib": ["ES2020", "DOM", "DOM.Iterable"],
     "allowJs": false,
     "skipLibCheck": true,
     "esModuleInterop": true,
     "allowSyntheticDefaultImports": true,
     "strict": true,
     "forceConsistentCasingInFileNames": true,
-    "module": "ESNext",
-    "moduleResolution": "node",
     "resolveJsonModule": true,
     "isolatedModules": true,
     "noEmit": true,
+    "lib": ["ES2020", "DOM", "DOM.Iterable"],
+    "module": "ESNext",
+    "moduleResolution": "bundler",
     "jsx": "react-jsx",
-    "baseUrl": ".",
-    "types": ["react", "react-dom", "node"],
+    "types": ["react", "react-dom", "electron-vite/node", "node"],
     "paths": {
-      "@/*": ["./src/renderer/*"],
+      "@renderer/*": ["./src/renderer/*"],
+      "@main/*": ["./src/main/*"],
       "@shared/*": ["./src/shared/*"],
-      "#types/*": ["./src/types/*"],
-      "#types": ["./src/types/index.ts"]
+      "@root/*": ["./*"],
+      "@/*": ["./src/*"]
     }
   },
-  "include": ["src/renderer/**/*", "src/shared/**/*", "src/types/**/*", "src/test/**/*"],
-  "exclude": ["node_modules", "dist"]
+  "include": [
+    "src/main/**/*",
+    "src/renderer/**/*",
+    "src/preload/**/*",
+    "src/shared/**/*",
+    "src/types/**/*",
+    "src/test/**/*"
+  ],
+  "exclude": ["node_modules", "dist", "out", "**/_*/**"]
 }
diff --git a/tsconfig.main.json b/tsconfig.main.json
deleted file mode 100644
index 1b3790fa11..0000000000
--- a/tsconfig.main.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "compilerOptions": {
-    "target": "ES2020",
-    "lib": ["ES2020"],
-    "allowJs": false,
-    "skipLibCheck": true,
-    "esModuleInterop": true,
-    "allowSyntheticDefaultImports": true,
-    "strict": true,
-    "forceConsistentCasingInFileNames": true,
-    "module": "CommonJS",
-    "moduleResolution": "node",
-    "resolveJsonModule": true,
-    "isolatedModules": true,
-    "outDir": "./dist/main",
-    "rootDir": "./src",
-    "baseUrl": ".",
-    "paths": {
-      "@/*": ["./src/*"],
-      "@shared/*": ["./src/shared/*"]
-    }
-  },
-  "include": ["src/main/**/*", "src/shared/**/*"],
-  "exclude": ["node_modules", "dist"]
-}
diff --git a/vite.config.ts b/vite.config.ts
deleted file mode 100644
index 97f80b3253..0000000000
--- a/vite.config.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { defineConfig } from 'vite';
-import react from '@vitejs/plugin-react';
-import { resolve } from 'path';
-
-export default defineConfig(({ command }) => ({
-  // Use relative asset paths in production so file:// loads work from DMG/app bundle
-  base: command === 'build' ? './' : '/',
-  plugins: [react()],
-  root: './src/renderer',
-  test: {
-    dir: '.',
-    environment: 'node',
-    include: ['src/**/*.test.ts'],
-  },
-  build: {
-    outDir: '../../dist/renderer',
-    emptyOutDir: true,
-  },
-  resolve: {
-    alias: {
-      '@': resolve(__dirname, './src/renderer'),
-      '@shared': resolve(__dirname, './src/shared'),
-      '#types': resolve(__dirname, './src/types'),
-    },
-  },
-  server: {
-    port: 3000,
-  },
-}));
diff --git a/vitest.config.ts b/vitest.config.ts
new file mode 100644
index 0000000000..4f3f2c7b4b
--- /dev/null
+++ b/vitest.config.ts
@@ -0,0 +1,44 @@
+import { resolve } from 'node:path';
+import { playwright } from '@vitest/browser-playwright';
+import { defineConfig } from 'vitest/config';
+
+const alias = {
+  '@': resolve(__dirname, 'src'),
+  '@root': resolve(__dirname, '.'),
+  '@shared': resolve(__dirname, 'src/shared'),
+  '@renderer': resolve(__dirname, 'src/renderer'),
+  '@main': resolve(__dirname, 'src/main'),
+};
+
+export default defineConfig({
+  resolve: { alias },
+  test: {
+    projects: [
+      {
+        // All existing tests that run in a Node.js environment.
+        extends: true,
+        test: {
+          name: 'node',
+          environment: 'node',
+          include: ['src/**/*.test.ts'],
+          exclude: ['**/_*/**', 'src/renderer/tests/browser/**'],
+        },
+      },
+      {
+        // Renderer terminal tests that need a real browser environment
+        // (real CSS layout, ResizeObserver, requestAnimationFrame, WebGL).
+        extends: true,
+        test: {
+          name: 'browser',
+          browser: {
+            enabled: true,
+            provider: playwright(),
+            headless: true,
+            instances: [{ browser: 'chromium' }],
+          },
+          include: ['src/renderer/tests/browser/**/*.test.{ts,tsx}'],
+        },
+      },
+    ],
+  },
+});