Merge branch 'main' into mark/inline-tool-registry-overrides

2026-09-24 16:02:55 +08:00 · 2026-05-07 12:26:29 +02:00
parent 00fa54906f 2f0885902b
commit ae933fc087
845 changed files with 38099 additions and 12305 deletions
@@ -0,0 +1,5 @@
+---
+"kilo-code": patch
+---
+
+Keep Agent Manager branch, mode, and model selectors usable in the new worktree dialog.
@@ -0,0 +1,6 @@
+---
+"@kilocode/cli": patch
+"kilo-code": patch
+---
+
+Preserve the selected thinking level after compacting a session.
@@ -0,0 +1,5 @@
+---
+"kilo-code": minor
+---
+
+Add a searchable current-tabs menu to Agent Manager.
@@ -0,0 +1,6 @@
+---
+"kilo-code": patch
+"@opencode-ai/ui": patch
+---
+
+Restore inline diff previews after session reloads while keeping large file contents stripped from VS Code webview messages.
@@ -0,0 +1,5 @@
+---
+"@kilocode/kilo-jetbrains": patch
+---
+
+Open existing JetBrains sessions scrolled to the latest message after history loads.
@@ -0,0 +1,5 @@
+---
+"@kilocode/kilo-jetbrains": patch
+---
+
+Remember the JetBrains session header metrics expansion preference and show file names in read/write timeline tooltips.
@@ -0,0 +1,5 @@
+---
+"@kilocode/kilo-jetbrains": patch
+---
+
+Keep the JetBrains chat transcript pinned to bottom reliably while responses stream.
@@ -0,0 +1,5 @@
+---
+"@kilocode/kilo-jetbrains": patch
+---
+
+Show collapsible session metadata, context usage, token usage, and compaction controls in the JetBrains session header.
@@ -0,0 +1,5 @@
+---
+"@kilocode/kilo-jetbrains": patch
+---
+
+Reduce redundant JetBrains chat scroll layout work while keeping bottom-follow behavior.
@@ -0,0 +1,5 @@
+---
+"@kilocode/kilo-jetbrains": patch
+---
+
+Show completed assistant steps in the JetBrains session timeline.
@@ -0,0 +1,8 @@
+---
+"kilo-code": minor
+"@kilocode/cli": minor
+"@kilocode/kilo-gateway": minor
+"@kilocode/sdk": minor
+---
+
+Migrate KiloClaw chat to the new kilo-chat backend. Replaces the single-channel Stream Chat integration with a multi-conversation experience that matches the web UX at app.kilo.ai/claw/kilo-chat: conversation list, reactions, typing indicators, editing, and action approvals. The TUI continues to render a single chat view backed by the user's primary conversation.
@@ -0,0 +1,6 @@
+---
+"kilo-code": minor
+"@kilocode/cli": minor
+---
+
+Rate assistant responses with thumbs up/down. Click the thumbs buttons next to the copy button on any assistant message, or press `<leader>=` / `<leader>-` in the terminal UI. Only shown when telemetry is enabled; feedback is sent to Kilo to help improve model and prompt quality.
@@ -0,0 +1,5 @@
+---
+"kilo-code": patch
+---
+
+Update regular Kilo editor tab titles to follow the current session title.
@@ -0,0 +1,5 @@
+---
+"@kilocode/cli": patch
+---
+
+Honor configured permission overrides in Ask and Plan modes, including persisted always-allow rules.
@@ -0,0 +1,5 @@
+---
+"kilo-code": patch
+---
+
+Support accepting command permission prompts with Enter and denying them with Escape.
@@ -1,5 +0,0 @@
---
-"@kilocode/cli": patch
---
-
-Prompt before reading `.env` files even after broad read permissions were previously approved.
@@ -0,0 +1,7 @@
+---
+"kilo-code": patch
+"@kilocode/cli": patch
+"@kilocode/sdk": patch
+---
+
+Remove custom providers from settings when disconnecting them so they do not reappear after being disabled and re-enabled.
@@ -0,0 +1,5 @@
+---
+"kilo-code": patch
+---
+
+Keep Agent Manager model, mode, and reasoning effort selections independent per session and preserve them after restart.
@@ -0,0 +1,5 @@
+---
+"kilo-code": patch
+---
+
+Capture the active VS Code terminal when using `@terminal` in Agent Manager.
@@ -0,0 +1,5 @@
+---
+"kilo-code": minor
+---
+
+Unify the Changes panel into a single tab with a source dropdown to switch between workspace and current-session diffs. Show the session's additions and deletions on the sidebar changes badge, and warn in the panel when snapshots are disabled for the repository.
@@ -39,6 +39,15 @@ runs:
    - name: Clear checkout auth
      run: |
        git config --local --unset-all http.https://github.com/.extraheader || true
+        # kilocode_change start
+        keys="$(git config --local --name-only --get-regexp '^includeIf\.gitdir:' || true)"
+        for key in $keys; do
+          path="$(git config --local --get "$key" || true)"
+          case "$path" in
+            *git-credentials-*.config) git config --local --unset-all "$key" || true ;;
+          esac
+        done
+        # kilocode_change end
      shell: bash

    - name: Configure git remote
@@ -14,8 +14,9 @@ jobs:
      pull-requests: write
    steps:
      - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6 # kilocode_change
        with:
+          persist-credentials: false # kilocode_change
          fetch-depth: 0

      - name: Setup Bun
@@ -14,7 +14,7 @@ jobs:
    if: github.repository == 'Kilo-Org/kilocode'
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6 # kilocode_change
        with:
          ref: ${{ github.event.pull_request.head.sha || github.sha }}

@@ -21,7 +21,7 @@ jobs:
    if: github.repository == 'Kilo-Org/kilocode'
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6 # kilocode_change
        with:
          ref: ${{ github.event.pull_request.head.sha || github.sha }}
          fetch-depth: 0
@@ -37,3 +37,8 @@ jobs:
          else
            echo "No PR base SHA available (workflow_dispatch without PR context) — skipping."
          fi
+
+      # kilocode_change start
+      - name: Check workflow allowlist
+        run: bun run script/check-workflows.ts
+      # kilocode_change end
@@ -12,7 +12,7 @@ jobs:
      contents: read
      issues: write
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6 # kilocode_change

      - uses: oven-sh/setup-bun@v2
        with:
@@ -26,7 +26,7 @@ jobs:
          OWNER: ${{ github.repository_owner }}
      # kilocode_change end

-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6 # kilocode_change

      - uses: ./.github/actions/setup-bun

@@ -13,7 +13,6 @@ permissions:

 jobs:
  close-non-compliant:
-    if: github.repository == 'Kilo-Org/kilocode' && false # kilocode_change - disabled: not needed in kilocode repo
    runs-on: ubuntu-latest
    steps:
      - name: Close non-compliant issues and PRs after 2 hours
@@ -8,9 +8,6 @@ on:

 jobs:
  daily-recap:
-    # kilocode_change start - disabled for kilo-cli fork (OpenCode Discord integration)
-    if: false
-    # kilocode_change end
    runs-on: blacksmith-4vcpu-ubuntu-2404
    permissions:
      contents: read
@@ -24,7 +21,7 @@ jobs:
      - uses: ./.github/actions/setup-bun

      - name: Install opencode
-        run: curl -fsSL https://opencode.ai/install | bash
+        run: curl -fsSL https://kilo.ai/install | bash

      - name: Generate daily issues recap
        id: recap
@@ -46,7 +43,7 @@ jobs:
          # Get today's date range
          TODAY=$(date -u +%Y-%m-%d)

-          opencode run -m kilo/anthropic/claude-sonnet-4.5 "Generate a daily issues recap for the OpenCode repository.
+          opencode run -m opencode/claude-sonnet-4-5 "Generate a daily issues recap for the Kilo repository.

          TODAY'S DATE: ${TODAY}

@@ -8,9 +8,6 @@ on:

 jobs:
  pr-recap:
-    # kilocode_change start - disabled for kilo-cli fork (OpenCode Discord integration)
-    if: false
-    # kilocode_change end
    runs-on: blacksmith-4vcpu-ubuntu-2404
    permissions:
      contents: read
@@ -24,7 +21,7 @@ jobs:
      - uses: ./.github/actions/setup-bun

      - name: Install opencode
-        run: curl -fsSL https://opencode.ai/install | bash
+        run: curl -fsSL https://kilo.ai/install | bash

      - name: Generate daily PR recap
        id: recap
@@ -45,7 +42,7 @@ jobs:
        run: |
          TODAY=$(date -u +%Y-%m-%d)

-          opencode run -m kilo/anthropic/claude-sonnet-4.5 "Generate a daily PR activity recap for the OpenCode repository.
+          opencode run -m opencode/claude-sonnet-4-5 "Generate a daily PR activity recap for the Kilo repository.

          TODAY'S DATE: ${TODAY}

@@ -5,20 +5,7 @@ on:
    types: [opened]

 jobs:
-  # kilocode_change start
-  check-author:
-    if: github.repository == 'Kilo-Org/kilocode' && false # kilocode_change - disabled: not needed in kilocode repo
-    uses: ./.github/workflows/check-org-member.yml
-    with:
-      username: ${{ github.event.pull_request.user.login }}
-    secrets:
-      kilo-maintainer-app-id: ${{ secrets.KILO_MAINTAINER_APP_ID }}
-      kilo-maintainer-app-secret: ${{ secrets.KILO_MAINTAINER_APP_SECRET }}
-
  check-duplicates:
-    needs: check-author
-    if: github.repository == 'Kilo-Org/kilocode' && false # kilocode_change - disabled: not needed in kilocode repo
-    # kilocode_change end
    runs-on: blacksmith-4vcpu-ubuntu-2404
    permissions:
      contents: read
@@ -48,10 +35,9 @@ jobs:
        if: steps.team-check.outputs.is_team != 'true'
        run: bun install

-      # kilocode_change start
-      - name: Setup Kilo
-        uses: ./.github/actions/setup-kilo
-      # kilocode_change end
+      - name: Install opencode
+        if: steps.team-check.outputs.is_team != 'true'
+        run: curl -fsSL https://kilo.ai/install | bash

      - name: Build prompt
        if: steps.team-check.outputs.is_team != 'true'
@@ -73,10 +59,7 @@ jobs:
      - name: Check for duplicate PRs
        if: steps.team-check.outputs.is_team != 'true'
        env:
-          # kilocode_change start
-          KILO_API_KEY: ${{ secrets.KILO_API_KEY }}
-          KILO_ORG_ID: ${{ secrets.KILO_ORG_ID }}
-          # kilocode_change end
+          OPENCODE_API_KEY: ${{ secrets.OPENCODE_API_KEY }}
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
          PR_NUMBER: ${{ github.event.pull_request.number }}
        run: |
@@ -89,8 +72,7 @@ jobs:
          fi

  add-contributor-label:
-    if: github.repository == 'Kilo-Org/kilocode' && false # kilocode_change - disabled: not needed in kilocode repo
-    runs-on: blacksmith-2vcpu-ubuntu-2404 # kilocode_change
+    runs-on: ubuntu-latest
    permissions:
      pull-requests: write
      issues: write
@@ -5,22 +5,10 @@ on:
    types: [opened, edited, synchronize]

 jobs:
-  # kilocode_change start
-  check-author:
-    if: github.repository == 'Kilo-Org/kilocode' && false # kilocode_change - disabled: not needed in kilocode repo
-    uses: ./.github/workflows/check-org-member.yml
-    with:
-      username: ${{ github.event.pull_request.user.login }}
-    secrets:
-      kilo-maintainer-app-id: ${{ secrets.KILO_MAINTAINER_APP_ID }}
-      kilo-maintainer-app-secret: ${{ secrets.KILO_MAINTAINER_APP_SECRET }}
-
  check-standards:
-    needs: check-author
-    if: github.repository == 'Kilo-Org/kilocode' && false # kilocode_change - disabled: not needed in kilocode repo
-    # kilocode_change end
-    runs-on: blacksmith-4vcpu-ubuntu-2404
+    runs-on: ubuntu-latest
    permissions:
+      contents: read
      pull-requests: write
    steps:
      - name: Check PR standards
@@ -28,6 +16,30 @@ jobs:
        with:
          script: |
            const pr = context.payload.pull_request;
+            const login = pr.user.login;
+
+            // Skip PRs older than Feb 18, 2026 at 6PM EST (Feb 19, 2026 00:00 UTC)
+            const cutoff = new Date('2026-02-19T00:00:00Z');
+            const prCreated = new Date(pr.created_at);
+            if (prCreated < cutoff) {
+              console.log(`Skipping: PR #${pr.number} was created before cutoff (${prCreated.toISOString()})`);
+              return;
+            }
+
+            // Check if author is a team member or bot
+            if (login === 'opencode-agent[bot]') return;
+            const { data: file } = await github.rest.repos.getContent({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              path: '.github/TEAM_MEMBERS',
+              ref: 'dev'
+            });
+            const members = Buffer.from(file.content, 'base64').toString().split('\n').map(l => l.trim()).filter(Boolean);
+            if (members.includes(login)) {
+              console.log(`Skipping: ${login} is a team member`);
+              return;
+            }
+
            const title = pr.title;

            async function addLabel(label) {
@@ -59,10 +71,10 @@ jobs:
                repo: context.repo.repo,
                issue_number: pr.number
              });
-
+              
              const existing = comments.find(c => c.body.includes(markerText));
              if (existing) return;
-
+              
              await github.rest.issues.createComment({
                owner: context.repo.owner,
                repo: context.repo.repo,
@@ -88,9 +100,9 @@ jobs:
            - \`refactor:\` or \`refactor(scope):\` code refactoring
            - \`test:\` or \`test(scope):\` adding or updating tests

-            Where \`scope\` is the package name (e.g., \`app\`, \`desktop\`, \`kilo\`).
+            Where \`scope\` is the package name (e.g., \`app\`, \`desktop\`, \`opencode\`).

-            See [CONTRIBUTING.md](../blob/main/CONTRIBUTING.md#pr-titles) for details.`);
+            See [CONTRIBUTING.md](../blob/dev/CONTRIBUTING.md#pr-titles) for details.`);
              return;
            }

@@ -133,7 +145,7 @@ jobs:
            1. Open an issue describing the bug/feature (if one doesn't exist)
            2. Add \`Fixes #<number>\` or \`Closes #<number>\` to this PR description

-            See [CONTRIBUTING.md](../blob/main/CONTRIBUTING.md#issue-first-policy) for details.`);
+            See [CONTRIBUTING.md](../blob/dev/CONTRIBUTING.md#issue-first-policy) for details.`);
              return;
            }

@@ -141,7 +153,6 @@ jobs:
            console.log('PR meets all standards');

  check-compliance:
-    if: github.repository == 'Kilo-Org/kilocode' && false # kilocode_change - disabled: not needed in kilocode repo
    runs-on: ubuntu-latest
    permissions:
      contents: read
@@ -25,7 +25,6 @@ concurrency:

 jobs:
  build:
-    if: false
    name: storybook build
    runs-on: blacksmith-4vcpu-ubuntu-2404
    steps:
@@ -16,7 +16,7 @@ jobs:
    runs-on: blacksmith-4vcpu-ubuntu-2404
    steps:
      - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6 # kilocode_change

      - name: Setup Bun
        uses: ./.github/actions/setup-bun
@@ -17,7 +17,7 @@ jobs:
    if: github.repository == 'Kilo-Org/kilocode'
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6 # kilocode_change

      - name: Link Checker
        uses: Kilo-Org/lychee-action@8646ba30535128ac92d33dfc9133794bfdd9b411
@@ -13,7 +13,7 @@ jobs:
      issues: write
    steps:
      - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6 # kilocode_change
        with:
          fetch-depth: 1

@@ -128,7 +128,7 @@ jobs:
      issues: write
    steps:
      - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6 # kilocode_change
        with:
          fetch-depth: 1

@@ -14,7 +14,11 @@ jobs:
      pull-requests: write
    steps:
      - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6 # kilocode_change
+        # kilocode_change start
+        with:
+          persist-credentials: false
+        # kilocode_change end

      - name: Setup Bun
        uses: ./.github/actions/setup-bun
@@ -73,7 +73,7 @@ jobs:
          echo "Computed hash for ${SYSTEM}: $HASH"

      - name: Upload hash
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7 # kilocode_change
        with:
          name: hash-${{ matrix.system }}
          path: hash.txt
@@ -86,7 +86,7 @@ jobs:

    steps:
      - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6 # kilocode_change
        with:
          persist-credentials: false
          fetch-depth: 0
@@ -106,7 +106,7 @@ jobs:
          git pull --rebase --autostash origin "$GITHUB_REF_NAME"

      - name: Download hash artifacts
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8 # kilocode_change
        with:
          path: hashes
          pattern: hash-*
@@ -42,7 +42,7 @@ jobs:
    runs-on: blacksmith-4vcpu-ubuntu-2404
    if: github.repository == 'Kilo-Org/kilocode'
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v6 # kilocode_change
        with:
          fetch-depth: 0

@@ -78,7 +78,7 @@ jobs:
    runs-on: blacksmith-4vcpu-ubuntu-2404
    if: github.repository == 'Kilo-Org/kilocode'
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v6 # kilocode_change
        with:
          fetch-tags: true

@@ -123,11 +123,11 @@ jobs:
    runs-on: blacksmith-4vcpu-ubuntu-2404
    if: github.repository == 'Kilo-Org/kilocode'
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v6 # kilocode_change

      - uses: ./.github/actions/setup-bun

-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v6 # kilocode_change
        with:
          node-version: "24"
          registry-url: "https://registry.npmjs.org"
@@ -156,7 +156,7 @@ jobs:
          KILO_PRE_RELEASE: ${{ inputs.pre_release }}
          GH_REPO: ${{ github.repository }}

-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7 # kilocode_change
        with:
          name: kilo-vscode
          path: packages/kilo-vscode/out
@@ -183,7 +183,11 @@ jobs:
      - smoke-test
    runs-on: ubuntu-24.04
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v6 # kilocode_change
+        # kilocode_change start
+        with:
+          persist-credentials: false
+        # kilocode_change end

      - uses: ./.github/actions/setup-bun

@@ -200,7 +204,7 @@ jobs:
      - name: Set up Docker Buildx
        uses: docker/setup-buildx-action@v3

-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v6 # kilocode_change
        with:
          node-version: "24"
          registry-url: "https://registry.npmjs.org"
@@ -235,7 +239,7 @@ jobs:
          path: packages/kilo-vscode/out

      - name: Cache apt packages (AUR)
-        uses: actions/cache@v4
+        uses: actions/cache@v5 # kilocode_change
        with:
          path: /var/cache/apt/archives
          key: ${{ runner.os }}-apt-aur-${{ hashFiles('.github/workflows/publish.yml') }}
@@ -47,7 +47,7 @@ jobs:
      KILO_ORG_ID: ${{ secrets.KILO_ORG_ID }}
    steps:
      - name: Checkout kilo-bench
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6 # kilocode_change
        with:
          repository: Kilo-Org/kilo-bench
          token: ${{ secrets.BENCH_GITHUB_TOKEN }}
@@ -96,6 +96,13 @@ jobs:
          echo "cli_url=$URL" >> "$GITHUB_OUTPUT"
          echo "::notice::Testing CLI v${VERSION} via asset API: $URL"

+      # Harbor's default agent-setup timeout is 360s. The hello-world container
+      # (FROM ubuntu:24.04) needs apt-get update + apt-get install + a NodeSource
+      # curl|bash + apt install nodejs before the CLI even downloads, and on
+      # the Blacksmith runners that occasionally pushes past 6 min when an apt
+      # mirror or NodeSource cdn is slow, killing the run with
+      # AgentSetupTimeoutError. 600s gives enough headroom for transient
+      # mirror/cdn slowness while still finishing well under timeout-minutes.
      - name: Run smoke test — hello-world
        env:
          KILO_CLI_URL: ${{ steps.cli.outputs.cli_url }}
@@ -104,7 +111,8 @@ jobs:
          ./scripts/run_eval.sh \
            -m kilo/anthropic/claude-sonnet-4.6 \
            -d hello-world \
-            --job-name smoke-test-hello-world
+            --job-name smoke-test-hello-world \
+            --agent-setup-timeout 600

      - name: Run smoke test — log-summary-date-ranges
        env:
@@ -115,18 +123,26 @@ jobs:
            -m kilo/anthropic/claude-sonnet-4.6 \
            -d terminal-bench-sample \
            -t "log-summary-date-ranges" \
-            --job-name smoke-test-log-summary
+            --job-name smoke-test-log-summary \
+            --agent-setup-timeout 600

      - name: Validate results
        run: python3 scripts/validate_smoke_test.py jobs/smoke-test-*/

+      # Also upload the agent setup logs (stdout/stderr/return-code from the
+      # CLI install script) so we can see exactly which step stalls when the
+      # next AgentSetupTimeoutError happens. These come from the install
+      # script in kilo-bench, which uses `set -euo pipefail` (no `set -x`)
+      # and never echoes auth tokens or API keys, so the captured output is
+      # safe to upload.
      - name: Upload results
        if: always()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7 # kilocode_change
        with:
          name: smoke-test-results
          path: |
            jobs/smoke-test-*/**/result.json
            jobs/smoke-test-*/**/trajectory.json
+            jobs/smoke-test-*/**/agent/setup/*.txt
          retention-days: 30
          if-no-files-found: warn
@@ -16,7 +16,7 @@ jobs:
    if: github.repository == 'Kilo-Org/kilocode'
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6 # kilocode_change

      - uses: oven-sh/setup-bun@v2

@@ -27,7 +27,7 @@ jobs:
        shell: bash
    steps:
      - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6 # kilocode_change
        with:
          token: ${{ secrets.GITHUB_TOKEN }}

@@ -28,21 +28,21 @@ jobs:
      matrix:
        settings:
          - name: linux
-            host: blacksmith-8vcpu-ubuntu-2404
+            host: blacksmith-4vcpu-ubuntu-2404 # kilocode_change
          - name: windows
-            host: blacksmith-8vcpu-windows-2025
+            host: blacksmith-4vcpu-windows-2025 # kilocode_change
    runs-on: ${{ matrix.settings.host }}
    defaults:
      run:
        shell: bash
    steps:
      - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6 # kilocode_change
        with:
          token: ${{ secrets.GITHUB_TOKEN }}

      - name: Setup Node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6 # kilocode_change
        with:
          node-version: "24"

@@ -55,7 +55,7 @@ jobs:
          git config --global user.name "kilo-maintainer[bot]"

      - name: Cache Turbo
-        uses: actions/cache@v4
+        uses: actions/cache@v5 # kilocode_change
        with:
          path: node_modules/.cache/turbo
          key: turbo-${{ runner.os }}-${{ hashFiles('turbo.json', '**/package.json') }}-${{ github.sha }}
@@ -80,7 +80,7 @@ jobs:

      - name: Upload unit artifacts
        if: always()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7 # kilocode_change
        with:
          name: unit-${{ matrix.settings.name }}-${{ github.run_attempt }}
          include-hidden-files: true
@@ -13,7 +13,7 @@ jobs:
      issues: write
    steps:
      - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6 # kilocode_change
        with:
          fetch-depth: 1

@@ -12,7 +12,7 @@ jobs:
    runs-on: blacksmith-4vcpu-ubuntu-2404
    steps:
      - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6 # kilocode_change

      - name: Setup Bun
        uses: ./.github/actions/setup-bun
@@ -12,7 +12,7 @@ jobs:
      matched: ${{ steps.filter.outputs.matched }}
      is_fork: ${{ steps.fork-check.outputs.is_fork }}
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6 # kilocode_change
      - uses: Kilo-Org/paths-filter@master
        id: filter
        with:
@@ -47,7 +47,7 @@ jobs:
    steps:
      - name: Checkout (internal)
        if: needs.check-paths.outputs.is_fork != 'true'
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6 # kilocode_change
        with:
          lfs: true
          token: ${{ secrets.BOT_PAT }}
@@ -55,7 +55,7 @@ jobs:

      - name: Checkout (fork)
        if: needs.check-paths.outputs.is_fork == 'true'
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6 # kilocode_change
        with:
          lfs: true

@@ -77,7 +77,7 @@ jobs:
          bun-version: latest

      - name: Cache Bun modules
-        uses: actions/cache@v4
+        uses: actions/cache@v5 # kilocode_change
        with:
          path: ~/.bun/install/cache
          key: bun-${{ hashFiles('bun.lock') }}
@@ -87,7 +87,7 @@ jobs:

      - name: Cache Playwright browsers
        id: playwright-cache
-        uses: actions/cache@v4
+        uses: actions/cache@v5 # kilocode_change
        with:
          path: ~/.cache/ms-playwright
          key: playwright-${{ hashFiles('packages/kilo-ui/package.json') }}
@@ -103,7 +103,7 @@ jobs:

      - name: Cache Storybook build
        id: storybook-cache
-        uses: actions/cache@v4
+        uses: actions/cache@v5 # kilocode_change
        with:
          path: packages/kilo-ui/storybook-static
          key: storybook-${{ hashFiles('packages/kilo-ui/src/**', 'packages/kilo-ui/.storybook/**', 'packages/ui/src/**', 'packages/kilo-ui/package.json') }}
@@ -195,7 +195,7 @@ jobs:

      - name: Upload test results on failure
        if: failure()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7 # kilocode_change
        with:
          name: visual-regression-results
          path: packages/kilo-ui/test-results/
@@ -211,7 +211,7 @@ jobs:
    steps:
      - name: Checkout (internal)
        if: needs.check-paths.outputs.is_fork != 'true'
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6 # kilocode_change
        with:
          lfs: true
          token: ${{ secrets.BOT_PAT }}
@@ -219,7 +219,7 @@ jobs:

      - name: Checkout (fork)
        if: needs.check-paths.outputs.is_fork == 'true'
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6 # kilocode_change
        with:
          lfs: true

@@ -241,7 +241,7 @@ jobs:
          bun-version: latest

      - name: Cache Bun modules
-        uses: actions/cache@v4
+        uses: actions/cache@v5 # kilocode_change
        with:
          path: ~/.bun/install/cache
          key: bun-${{ hashFiles('bun.lock') }}
@@ -251,7 +251,7 @@ jobs:

      - name: Cache Playwright browsers
        id: playwright-cache-vscode
-        uses: actions/cache@v4
+        uses: actions/cache@v5 # kilocode_change
        with:
          path: ~/.cache/ms-playwright
          key: playwright-vscode-${{ hashFiles('packages/kilo-vscode/package.json') }}
@@ -267,7 +267,7 @@ jobs:

      - name: Cache Storybook build
        id: storybook-cache-vscode
-        uses: actions/cache@v4
+        uses: actions/cache@v5 # kilocode_change
        with:
          path: packages/kilo-vscode/storybook-static
          key: storybook-vscode-${{ hashFiles('packages/kilo-vscode/webview-ui/src/**', 'packages/kilo-vscode/.storybook/**', 'packages/kilo-ui/src/**', 'packages/ui/src/**', 'packages/kilo-vscode/package.json') }}
@@ -386,7 +386,7 @@ jobs:

      - name: Upload test results on failure
        if: failure()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7 # kilocode_change
        with:
          name: visual-regression-vscode-results
          path: packages/kilo-vscode/test-results/
@@ -10,67 +10,254 @@ Use the first argument as the upstream version, for example `v1.1.50` or
 `1.1.50`. If no argument is provided, infer the version from the current branch
 name, `upstream-merge-report-<version>.md`, or the newest relevant report file.

-Workflow:
+## Workflow

-1. Inspect the current merge state:
-   - `git status --short`
-   - `git diff --name-only --diff-filter=U`
-   - `upstream-merge-report-<version>.md` when present
-   - `.worktrees/opencode-merge/auto-merge` for the automated merge snapshot when present
-2. Before editing, write a concise plan in the chat:
-   - file-by-file strategy
-   - expected resolution kind: `hybrid`, `take-ours`, `take-theirs`, `regenerated`, `removed`, `renamed`, or `other`
-   - risk level: `low`, `medium`, or `high`
-   - verification commands you expect to run
-3. Ask the user to approve the plan before applying any manual conflict
-   resolution. Do not resolve a file until the user has approved that file's
-   strategy.
-4. Resolve each conflict carefully, one file at a time.
+### 1. Inspect the current merge state

-   **Reference worktrees when present:**
-   - `.worktrees/opencode-merge/opencode` is the pristine upstream opencode tree
-   - `.worktrees/opencode-merge/kilo-main` is the Kilo base snapshot
-   - `.worktrees/opencode-merge/auto-merge` is the automated merge snapshot and the original conflict reference
+- `git status --short`
+- `git diff --name-only --diff-filter=U`
+- `upstream-merge-report-<version>.md` when present
+- `.worktrees/opencode-merge/auto-merge` for the automated merge snapshot when present

-   **Inspect conflicts (optional):**
-   - `script/upstream/find-conflict-markers.sh <file>` on the working tree
-   - `script/upstream/find-conflict-markers.sh .worktrees/opencode-merge/auto-merge/<file>` on the auto-merge snapshot
+### 2. Read every conflicted file end-to-end before planning

-   **Apply the resolution rules:**
-   - prefer upstream code and architecture whenever compatible with Kilo behavior
-   - preserve Kilo-specific behavior marked with `kilocode_change`
-   - keep `kilocode_change` markers around Kilo-specific changes in shared opencode files
-   - keep Kilo-specific text, code, and marker comments the same as the auto-merge conflict snapshot unless a refactor is required
-   - if Kilo-specific code must be refactored to fit new upstream architecture, explain the refactor in the final summary
-   - if upstream moved the relevant logic to another file, port the Kilo behavior there and list both paths in the final summary
-   - if upstream deleted a file, analyze whether the Kilo behavior should be ported elsewhere or removed rather than restoring the deleted file
-   - if tests fail only because upstream intentionally removed behavior, remove or update the obsolete tests rather than adding the old file back
-   - do not modify unrelated files
-5. After each file is resolved, verify the decision before moving on:
-   - inspect the resolved file and confirm it has no conflict markers
-   - compare against the opencode, kilo-main, and auto-merge references when present
-   - run the smallest relevant check for that file when practical
-   - summarize the exact resolution, tradeoff, and verification result in chat
-   - ask the user to approve the resolved file before staging it or resolving the next file
-6. Run the appropriate checks:
-   - stage resolved files with `git add -A` so git no longer reports unmerged paths
-   - if `packages/opencode/` shared files changed, run `bun run script/check-opencode-annotations.ts`
-   - run targeted typechecks/tests when practical for touched packages
-   - run `bun run typecheck` from the repo root before declaring the merge ready
-7. Finish with:
-   - files resolved
-   - resolution choices and rationale
-   - checks run and results
-   - any remaining high-risk areas for reviewer attention
+Use `script/upstream/find-conflict-markers.sh <file>` to jump to each region,
+then read enough surrounding lines to understand the code — not just the
+conflict hunk. Specifically check:

-Every manual merge decision requires explicit user approval before applying and
-again after verification. Be especially cautious when a decision is destructive,
-changes auth, billing, data deletion, public API compatibility, config schema
-behavior, migrations, provider routing, or security posture.
+- is this a plain 3-way on a single expression, or a structural refactor?
+- does upstream rename/move something that invalidates a HEAD-only declaration?
+- does a `kilocode_change` marker in HEAD encode a bug fix, a feature, or a
+  defensive check?
+- is the conflicted block referenced by *non-conflicted* code elsewhere in the
+  same file (imports, signatures, call sites) that will break if we drop it?

-Common pitfalls to watch for:
- auto-merged code can reference declarations that still live inside conflict blocks
- related sibling files can need edits even when they are not listed as unmerged
- `renamed` should be used only when behavior moves to a different file
- function signatures can drift across conflict boundaries
- full repo typecheck is the catch-all for non-conflicted call-site breakage
+When HEAD includes a non-obvious Kilo-specific wrapper (e.g. a helper in
+`packages/opencode/src/kilocode/`), find out why it exists before deciding to
+keep or bypass it:
+
+```bash
+git log --all --oneline -S "<symbol>" -- packages/opencode/src/kilocode/
+git log --all --oneline -- <kilo-file>
+```
+
+Look at the commit message and any PR reference. "We wrote our own because of
+PR #NNNN" is a real constraint; "we wrote our own because of a typo" is not.
+
+### 3. Write a plan in chat and get approval
+
+For every conflicted file (and any adjacent file the resolution forces you to
+touch — see §6) include:
+
+- expected resolution kind: `hybrid`, `take-ours`, `take-theirs`, `regenerated`,
+  `removed`, `renamed`, or `other`
+- risk level: `low`, `medium`, or `high`
+- one-sentence rationale (what Kilo behaviour is preserved, what upstream
+  feature is adopted, what is dropped)
+- verification commands you expect to run (targeted tests, typecheck)
+
+Group files by risk level. Ask the user which batch to start with. You can
+resolve an entire `low` batch in one pass if the user approves the batch, but
+resolve `medium` and `high` files one at a time.
+
+**Do not resolve a file until the user has approved that file's (or batch's)
+strategy.**
+
+### 4. Before every edit, explain reasoning before showing the diff
+
+The user needs to review intent, not just the raw change. For each file, in
+order:
+
+1. Show the conflict's surrounding context (10–30 lines around each conflict
+   region, in chat).
+2. Explain what each of the three sides (HEAD, merge-base, upstream) is doing.
+3. State which Kilo behaviour must survive and why (reference PR numbers /
+   `kilocode_change` comments when possible).
+4. State the resolution and why it is better than the alternatives.
+5. Then apply the edit. The tool will display the diff — the user only has to
+   verify the diff matches the reasoning.
+
+Do not lead with the diff. A diff without reasoning forces the user to
+reverse-engineer the decision.
+
+### 5. Apply resolution rules
+
+Reference worktrees when present:
+
+- `.worktrees/opencode-merge/opencode` — pristine upstream tree
+- `.worktrees/opencode-merge/kilo-main` — Kilo base snapshot
+- `.worktrees/opencode-merge/auto-merge` — automated merge snapshot (original
+  conflict reference)
+
+Apply in order:
+
+- prefer upstream code and architecture whenever compatible with Kilo behaviour
+- preserve Kilo-specific behaviour marked with `kilocode_change`
+- keep `kilocode_change` markers around Kilo-specific code in shared opencode
+  files
+- when upstream refactors a region that HEAD had annotated with
+  `kilocode_change`, **check whether the marker encodes a bug fix or a feature
+  delta**. Bug fixes (missing `await`, defensive null-check, error capture)
+  usually need to be re-applied on top of the upstream refactor. Example from
+  v1.14.30: `Workspace.isSyncing` was missing an `await` — upstream's Effect
+  refactor reintroduced the same bug, so we had to port the fix into the new
+  `Effect.gen` block.
+- when a `take-theirs` drops a line that was the target of a Kilo pre-filter,
+  the upstream line may be actively wrong for Kilo — e.g. an inner `continue`
+  filter whose condition collides with an outer filter Kilo added. Re-read the
+  surrounding 20 lines before committing to `take-theirs`.
+- if Kilo-specific code must be refactored to fit new upstream architecture,
+  explain the refactor in the final summary
+- if upstream moved the relevant logic to another file, port the Kilo behaviour
+  there and list both paths in the final summary. Verify the new file already
+  carries the Kilo-renamed symbols (e.g. `x-kilo-directory`) by diffing against
+  pristine upstream.
+- if upstream deleted a file, analyse whether the Kilo behaviour should be
+  ported elsewhere or removed rather than restoring the deleted file
+- if tests fail only because upstream intentionally removed behaviour, remove
+  or update the obsolete tests rather than adding the old file back
+- do not modify unrelated files
+
+When removing code that existed in one side of a conflict, prefer
+**commenting it out with `kilocode_change` markers** over deletion when the
+surrounding structure (an `if`, a loop) still makes sense. That keeps the
+intent visible to the next merger. Example:
+
+```ts
+} else if (input?.scope !== "project" && !Flag.KILO_EXPERIMENTAL_WORKSPACES) {
+  // kilocode_change start - directory filtering handled by KiloSession.filters above
+  // if (input?.directory) {
+  //   conditions.push(eq(SessionTable.directory, input.directory))
+  // }
+  // kilocode_change end
+}
+```
+
+Use `TODO:` not `NOTE:` for follow-ups. `TODO` is searchable and implies an
+owner will act on it; `NOTE` reads as permanent commentary.
+
+### 6. Look for adjacent files the conflict forces you to touch
+
+Upstream restructures sometimes split one file into several (e.g. `permission.ts`
+→ `groups/permission.ts` + `handlers/permission.ts`). Only the *renamed* file
+shows up in `git diff --diff-filter=U`; the new sibling may need a Kilo feature
+ported in too. After resolving the flagged file, check:
+
+- files that import from the resolved file — do they compile?
+- files at paths implied by new imports (e.g. `../middleware/*`, `./handlers/*`)
+- `kilocode_change` comments in the *auto-merge* snapshot that didn't end up in
+  the working tree because the hosting file was renamed
+
+Add any such files to the plan as `hybrid` or `take-ours` with the same
+approval flow.
+
+### 7. Verify each resolution before moving on
+
+- confirm `script/upstream/find-conflict-markers.sh <file>` prints nothing
+- read the final file region (the new shape after edit) and sanity-check imports
+- for apparently-unused symbols upstream introduced, `grep` the file and the
+  rest of the package before deleting — they may be called from non-conflicted
+  code elsewhere. Example: `isTheme` in `theme.tsx` looked unused at the
+  resolution site but was called twice further down.
+- run the smallest relevant check (single `bun test` file, or `bun run
+  typecheck` in the touched package)
+- summarise the exact resolution, tradeoff, and verification result in chat
+- ask the user to approve the resolved file before staging it or resolving the
+  next one (for `medium` / `high`; `low` batches can be staged together)
+
+### 8. Run the full checks once everything is resolved
+
+- `git diff --name-only --diff-filter=U` returns empty
+- `bun run typecheck` from `packages/opencode/` (targeted) and from repo root
+  (catches non-conflicted call-site breakage)
+- relevant targeted tests. Tests that hang or time out in an unrelated part of
+  the graph may be pre-existing — note them, don't block the merge on them
+- `bun run script/check-opencode-annotations.ts` if `packages/opencode/` shared
+  files changed. Note that this tool compares against the merge base via `HEAD`
+  and will be silent until the merge commit lands
+- other CI guards that touched files imply (knip for `kilo-vscode/`,
+  `check-kilocode-change`, source-links, visual regression)
+
+### 9. Commit with the standard message
+
+Per `script/upstream/README.md`:
+
+```bash
+git commit -m "resolve merge conflicts"
+```
+
+The default `git merge` auto-message (`Merge branch '…' into …`) is also fine,
+but `resolve merge conflicts` is the convention for these PRs.
+
+### 10. Resync version strings in a separate commit
+
+Upstream stamps its own version into shared files — notably
+`packages/extensions/zed/extension.toml` (version field + 5 Kilo-Org download
+URLs), and any `package.json` that upstream bumped in the same release window.
+After the merge this leaves parts of the tree pointing at upstream's version
+(e.g. `1.14.30`), whose release tag does not exist on Kilo's pipeline, so the
+Zed download URLs silently 404.
+
+Fix this in a dedicated commit *after* `resolve merge conflicts`:
+
+```bash
+bun run script/sync-versions.ts             # uses root package.json version
+# or, to target an explicit version:
+bun run script/sync-versions.ts 7.2.41
+git add -A
+git commit -m "chore: resync versions after upstream merge"
+```
+
+The script rewrites every top-level `"version"` in `package.json` files
+(excluding `node_modules`, hidden dirs, and `packages/kilo-jetbrains/` which
+tracks its own cadence), plus the Zed extension toml. It is idempotent — rerun
+it any time to rebase the version back onto Kilo main (useful during
+long-running upstream merges where `main` releases in the meantime).
+
+Keeping this in its own commit makes reviewers' job easier: the merge commit
+only contains behavioural resolutions, and the version resync is a trivial
+diff they can skim in one glance.
+
+### 11. Write the PR body
+
+Structure the description so reviewers can skim:
+
+- **Non-trivial merge decisions**: a short section per file (or group of
+  related files) that required more than a mechanical `take-ours`/`take-theirs`.
+  Focus on *what Kilo behaviour survived* and *what upstream features were
+  adopted*. Link to Kilo PRs when a `kilocode_change` encodes a specific fix.
+- **Notable auto-merged changes**: new columns, new helper files, renamed
+  middleware — anything reviewers should eyeball even though git didn't flag
+  it.
+- **What to test**: explicit, scenario-level test steps for each non-trivial
+  change. Don't list tests; list *user-visible behaviour* so a tester who
+  doesn't read the diff can exercise it.
+- **CI guards to watch**: typecheck, knip, annotation check, visual regression.
+- **Follow-ups**: any `TODO:` you left in code, as a bullet list with links.
+
+## User-approval checkpoints
+
+Every manual merge decision requires explicit user approval **before applying**
+and **again after verification**. Be especially cautious when a decision is
+destructive, changes auth, billing, data deletion, public API compatibility,
+config schema behaviour, migrations, provider routing, or security posture.
+
+## Common pitfalls
+
+- Auto-merged code can reference declarations that still live inside conflict
+  blocks.
+- Related sibling files can need edits even when they are not listed as
+  unmerged — especially after upstream structural splits.
+- `renamed` should be used only when behaviour moves to a different file.
+- Function signatures can drift across conflict boundaries (args added, return
+  types widened). Grep for every call site before finalising.
+- Full-repo typecheck is the catch-all for non-conflicted call-site breakage.
+- Upstream can reintroduce bugs a Kilo `kilocode_change` had already fixed —
+  during big refactors check every `kilocode_change` the refactor touched.
+- "Take-theirs" on an inner conditional is often wrong when Kilo added an outer
+  pre-filter whose whole point was to widen what makes it to the inner block.
+- Apparently-unused upstream-added declarations may be called from
+  non-conflicted code elsewhere. Grep before deleting.
+- Stricter DOM lib types (upstream TS upgrade) can surface latent casting
+  issues around `WebSocket.send`, `Headers`, etc. — prefer narrowing the Kilo
+  type over adding `any` casts.
@@ -28,3 +28,11 @@ Use the current Effect v4 / effect-smol source, not memory or older Effect v2/v3
 - In tests, prefer the repo's existing Effect test helpers and live tests for filesystem, git, child process, locks, or timing behavior.
 - Do not introduce `any`, non-null assertions, unchecked casts, or older Effect APIs just to satisfy types.
 - Do not answer from memory. Verify against `.opencode/references/effect-smol` or nearby code first.
+
+## Testing Patterns
+
+- Use `testEffect(...)` from `packages/opencode/test/lib/effect.ts` for tests that exercise Effect services, layers, runtime context, scoped resources, or platform integrations.
+- Use `it.live(...)` for filesystem, git repositories, HTTP servers, sockets, child processes, locks, real time, and other live platform behavior.
+- Run tests from package directories such as `packages/opencode`; never run package tests from the repo root.
+- Prefer explicit test layers over ad hoc managed runtimes. Keep dependency provisioning visible in the test file.
+- Use scoped fixtures and finalizers for resources that must be cleaned up, including temporary directories, flags, databases, fibers, servers, and global state.
@@ -21,6 +21,7 @@ Kilo CLI is an open source AI coding agent that generates code from natural lang
 - **Source links**: After adding or changing URLs in `packages/kilo-vscode/`, `packages/kilo-vscode/webview-ui/`, or `packages/opencode/src/`, run `bun run script/extract-source-links.ts` from the repo root and commit the updated `packages/kilo-docs/source-links.md`. CI runs this check — the build fails if the file is stale.
 - **kilocode_change check**: `bun run check-kilocode-change` from `packages/kilo-vscode/`. CI runs this — `kilocode_change` is a marker for upstream merge conflicts and must not appear in `packages/kilo-vscode/` or `packages/kilo-ui/` (these are entirely Kilo Code additions). Remove the markers before pushing.
 - **opencode annotation check**: `bun run script/check-opencode-annotations.ts` from repo root. CI runs this on PRs touching `packages/opencode/` — every Kilo-specific change in shared opencode files must be annotated with `kilocode_change` markers. Exempt paths (no markers needed): `packages/opencode/src/kilocode/`, `packages/opencode/test/kilocode/`, and any path containing `kilocode` in the name.
+- **workflow allowlist**: `bun run script/check-workflows.ts` from repo root. CI runs this as part of the annotations workflow — any `.yml` / `.yaml` file added to or removed from `.github/workflows/` must be reflected in the hardcoded list in `script/check-workflows.ts`. Prevents upstream-merged workflows from silently starting to run in our CI.
 - **Backend/SDK programmatic testing**: see [TESTING.md](./TESTING.md) for spawning the local main-branch backend (`bun dev serve`) and driving it via `curl` — use this instead of `kilo serve` (prod binary) when testing backend fixes.

 ## Quality Checks
@@ -255,6 +256,10 @@ We regularly merge upstream changes from opencode. To minimize merge conflicts a

 The goal is to keep our diff from upstream as small as possible, making regular merges straightforward and reducing the risk of conflicts.

+### Git conflict style
+
+`bun install` sets `merge.conflictStyle=zdiff3` repo-locally via `script/setup-git.ts` (wired into `postinstall`). Conflicts include the common ancestor between `|||||||` and `=======`, which is what `script/upstream/` and `mergiraf` rely on for structural resolution and what makes manual resolution on shared opencode files tractable. If you've overridden it in your user config, the repo-local setting takes precedence — don't override it back.
+
 ### Kilocode Change Markers

 To minimize merge conflicts when syncing with upstream, mark Kilo Code-specific changes in shared code with `kilocode_change` comments.
@@ -33,7 +33,7 @@
    },
    "packages/core": {
      "name": "@opencode-ai/core",
-      "version": "7.2.40",
+      "version": "7.2.42",
      "bin": {
        "opencode": "./bin/opencode",
      },
@@ -68,7 +68,7 @@
    },
    "packages/kilo-docs": {
      "name": "@kilocode/kilo-docs",
-      "version": "7.2.40",
+      "version": "7.2.42",
      "dependencies": {
        "@docsearch/css": "^4",
        "@docsearch/js": "^4",
@@ -97,7 +97,7 @@
    },
    "packages/kilo-gateway": {
      "name": "@kilocode/kilo-gateway",
-      "version": "7.2.40",
+      "version": "7.2.42",
      "dependencies": {
        "@ai-sdk/alibaba": "1.0.17",
        "@ai-sdk/anthropic": "3.0.71",
@@ -133,7 +133,7 @@
    },
    "packages/kilo-i18n": {
      "name": "@kilocode/kilo-i18n",
-      "version": "7.2.40",
+      "version": "7.2.42",
      "devDependencies": {
        "@tsconfig/node22": "catalog:",
        "@types/bun": "catalog:",
@@ -143,7 +143,7 @@
    },
    "packages/kilo-indexing": {
      "name": "@kilocode/kilo-indexing",
-      "version": "7.2.40",
+      "version": "7.2.42",
      "dependencies": {
        "@aws-sdk/client-bedrock-runtime": "3.1005.0",
        "@aws-sdk/credential-provider-ini": "3.972.31",
@@ -177,7 +177,7 @@
    },
    "packages/kilo-telemetry": {
      "name": "@kilocode/kilo-telemetry",
-      "version": "7.2.40",
+      "version": "7.2.42",
      "dependencies": {
        "@kilocode/kilo-gateway": "workspace:*",
        "posthog-node": "4.4.0",
@@ -191,7 +191,7 @@
    },
    "packages/kilo-ui": {
      "name": "@kilocode/kilo-ui",
-      "version": "7.2.40",
+      "version": "7.2.42",
      "dependencies": {
        "@kobalte/core": "0.13.11",
        "@opencode-ai/core": "workspace:*",
@@ -226,7 +226,7 @@
    },
    "packages/kilo-vscode": {
      "name": "kilo-code",
-      "version": "7.2.40",
+      "version": "7.2.42",
      "dependencies": {
        "@anthropic-ai/sdk": "^0.39.0",
        "@kilocode/kilo-i18n": "workspace:*",
@@ -251,7 +251,6 @@
        "quick-lru": "^7.0.0",
        "simple-git": "3.35.2",
        "solid-js": "^1.9.11",
-        "stream-chat": "9.38.0",
        "uri-js": "^4.4.1",
        "virtua": "catalog:",
        "web-tree-sitter": "^0.24.7",
@@ -287,7 +286,7 @@
    },
    "packages/opencode": {
      "name": "@kilocode/cli",
-      "version": "7.2.40",
+      "version": "7.2.42",
      "bin": {
        "kilo": "./bin/kilo",
        "kilocode": "./bin/kilo",
@@ -358,6 +357,7 @@
        "ai-gateway-provider": "3.1.2",
        "bonjour-service": "1.3.0",
        "bun-pty": "0.4.8",
+        "chardet": "2.1.1",
        "chokidar": "4.0.3",
        "cli-sound": "1.1.3",
        "clipboardy": "4.0.0",
@@ -376,7 +376,6 @@
        "iconv-lite": "0.7.2",
        "ignore": "7.0.5",
        "immer": "11.1.4",
-        "jschardet": "3.1.4",
        "jsonc-parser": "3.3.1",
        "mime-types": "3.0.2",
        "minimatch": "10.2.5",
@@ -392,7 +391,6 @@
        "semver": "^7.6.3",
        "simple-git": "3.35.2",
        "solid-js": "catalog:",
-        "stream-chat": "9.38.0",
        "strip-ansi": "7.1.2",
        "tree-sitter-bash": "0.25.0",
        "tree-sitter-powershell": "0.25.10",
@@ -446,7 +444,7 @@
    },
    "packages/plugin": {
      "name": "@kilocode/plugin",
-      "version": "7.2.40",
+      "version": "7.2.42",
      "dependencies": {
        "@kilocode/sdk": "workspace:*",
        "effect": "catalog:",
@@ -461,8 +459,8 @@
        "typescript": "catalog:",
      },
      "peerDependencies": {
-        "@opentui/core": ">=0.1.105",
-        "@opentui/solid": ">=0.1.105",
+        "@opentui/core": ">=0.2.2",
+        "@opentui/solid": ">=0.2.2",
      },
      "optionalPeers": [
        "@opentui/core",
@@ -471,7 +469,7 @@
    },
    "packages/script": {
      "name": "@opencode-ai/script",
-      "version": "7.2.40",
+      "version": "7.2.42",
      "dependencies": {
        "semver": "^7.6.3",
      },
@@ -482,7 +480,7 @@
    },
    "packages/sdk/js": {
      "name": "@kilocode/sdk",
-      "version": "7.2.40",
+      "version": "7.2.42",
      "dependencies": {
        "cross-spawn": "catalog:",
      },
@@ -497,7 +495,7 @@
    },
    "packages/storybook": {
      "name": "@opencode-ai/storybook",
-      "version": "7.2.40",
+      "version": "7.2.42",
      "devDependencies": {
        "@opencode-ai/ui": "workspace:*",
        "@solidjs/meta": "catalog:",
@@ -520,7 +518,7 @@
    },
    "packages/ui": {
      "name": "@opencode-ai/ui",
-      "version": "7.2.40",
+      "version": "7.2.42",
      "dependencies": {
        "@kilocode/sdk": "workspace:*",
        "@kobalte/core": "catalog:",
@@ -580,7 +578,6 @@
  "patchedDependencies": {
    "@standard-community/standard-openapi@0.2.9": "patches/@standard-community%2Fstandard-openapi@0.2.9.patch",
    "@npmcli/agent@4.0.0": "patches/@npmcli%2Fagent@4.0.0.patch",
-    "stream-chat@9.38.0": "patches/stream-chat@9.38.0.patch",
  },
  "overrides": {
    "@effect/platform-node-shared": "4.0.0-beta.46",
@@ -608,10 +605,12 @@
    "@npmcli/arborist": "9.4.0",
    "@octokit/rest": "22.0.0",
    "@openauthjs/openauth": "0.0.0-20250322224806",
-    "@opentui/core": "0.1.105",
-    "@opentui/solid": "0.1.105",
+    "@opentui/core": "0.2.2",
+    "@opentui/solid": "0.2.2",
    "@pierre/diffs": "1.1.0-beta.18",
    "@playwright/test": "1.59.1",
+    "@sentry/solid": "10.36.0",
+    "@sentry/vite-plugin": "4.6.0",
    "@solid-primitives/storage": "4.3.3",
    "@solidjs/meta": "0.29.4",
    "@solidjs/router": "0.15.4",
@@ -1504,21 +1503,21 @@

    "@opentelemetry/semantic-conventions": ["@opentelemetry/semantic-conventions@1.40.0", "", {}, "sha512-cifvXDhcqMwwTlTK04GBNeIe7yyo28Mfby85QXFe1Yk8nmi36Ab/5UQwptOx84SsoGNRg+EVSjwzfSZMy6pmlw=="],

-    "@opentui/core": ["@opentui/core@0.1.105", "", { "dependencies": { "bun-ffi-structs": "0.1.2", "diff": "8.0.2", "jimp": "1.6.0", "marked": "17.0.1", "yoga-layout": "3.2.1" }, "optionalDependencies": { "@dimforge/rapier2d-simd-compat": "^0.17.3", "@opentui/core-darwin-arm64": "0.1.105", "@opentui/core-darwin-x64": "0.1.105", "@opentui/core-linux-arm64": "0.1.105", "@opentui/core-linux-x64": "0.1.105", "@opentui/core-win32-arm64": "0.1.105", "@opentui/core-win32-x64": "0.1.105", "bun-webgpu": "0.1.5", "planck": "^1.4.2", "three": "0.177.0" }, "peerDependencies": { "web-tree-sitter": "0.25.10" } }, "sha512-vllSOOCW6VIThV/96GRLJ1IxIBuR+ci6FDvnPIAG4s7SJ/FW6zAkqDn1xrtBwwk/lM3QWjLqy8BZc+zwWvveJA=="],
+    "@opentui/core": ["@opentui/core@0.2.2", "", { "dependencies": { "bun-ffi-structs": "0.2.2", "diff": "9.0.0", "marked": "17.0.1", "string-width": "7.2.0", "strip-ansi": "7.1.2", "yoga-layout": "3.2.1" }, "optionalDependencies": { "@opentui/core-darwin-arm64": "0.2.2", "@opentui/core-darwin-x64": "0.2.2", "@opentui/core-linux-arm64": "0.2.2", "@opentui/core-linux-x64": "0.2.2", "@opentui/core-win32-arm64": "0.2.2", "@opentui/core-win32-x64": "0.2.2" }, "peerDependencies": { "web-tree-sitter": "0.25.10" } }, "sha512-wxg1CD58SVrowu+WgbhZNi3UP/wWxPio2Kj2IeTjomoIE+6EXLxR8eCCxHYVuQUd9E4fknrKkY5HmiSsp6oPow=="],

-    "@opentui/core-darwin-arm64": ["@opentui/core-darwin-arm64@0.1.105", "", { "os": "darwin", "cpu": "arm64" }, "sha512-1pIL7aer9amwj8EpYoMNtvavKetIe+nX8uBRmYsMQb+KvJoUAZUqENfRW+qHE5WrsOyxx8/QoyXTHw15GG5iLQ=="],
+    "@opentui/core-darwin-arm64": ["@opentui/core-darwin-arm64@0.2.2", "", { "os": "darwin", "cpu": "arm64" }, "sha512-tY5n3ZRQx+b0kyhQJJLsyJMeZ+0w4FV37YZc/Qqv3qvOqE9kZPw/7adR77FYwWDm/7fax94mLMrR8Y5bKUkDmw=="],

-    "@opentui/core-darwin-x64": ["@opentui/core-darwin-x64@0.1.105", "", { "os": "darwin", "cpu": "x64" }, "sha512-hLIRSWlK3gY2NRXJGWiTBiMYSmRDjOYFZF6WtUVXhY2SL3sp08dhmr/6dmAVH+3pKCsCipLEsrrcQX6SAihCTA=="],
+    "@opentui/core-darwin-x64": ["@opentui/core-darwin-x64@0.2.2", "", { "os": "darwin", "cpu": "x64" }, "sha512-W/R7OnqY30FXcTG0tiP2JkQFmgtYbIte5afQ5PC12TliRoee1RqG3iCG6kY1jxW+3Vg6jge88uiSjUEDpeV2gA=="],

-    "@opentui/core-linux-arm64": ["@opentui/core-linux-arm64@0.1.105", "", { "os": "linux", "cpu": "arm64" }, "sha512-jlRKfPkozTZEkHEePuCWYcTIUtPm+ieInAwGVqGmjbvqjxdVv1/W/Dt6LEZ/9jpRiOPd+FjXAfLe6wa/XWHr+w=="],
+    "@opentui/core-linux-arm64": ["@opentui/core-linux-arm64@0.2.2", "", { "os": "linux", "cpu": "arm64" }, "sha512-1pzTYFEZauYuw6AGycw2TYGtAlZVGjuUtSdxH1fP51kBPS3oVWduUY2j7GKREz3SU5NulvO2Wc6HWsm3feMqwQ=="],

-    "@opentui/core-linux-x64": ["@opentui/core-linux-x64@0.1.105", "", { "os": "linux", "cpu": "x64" }, "sha512-kfWS1WMg6qHShmxZX9s1tZc/8JcXw6uyy2UtyTbJdRFExtXGH37oKHi8QK8iPL2ExCx4z7zqVnVJfO3X/Wh7lA=="],
+    "@opentui/core-linux-x64": ["@opentui/core-linux-x64@0.2.2", "", { "os": "linux", "cpu": "x64" }, "sha512-ucVwUtUYeOYGVFPBLbPoxzbrPdhD0PDyKNQ2X4n1AJ9jlQX4gqBZRcXMEF8hiXDjFxsikZwef7De0ciCcWvAMg=="],

-    "@opentui/core-win32-arm64": ["@opentui/core-win32-arm64@0.1.105", "", { "os": "win32", "cpu": "arm64" }, "sha512-UFx6A8OpBVbGWK6OAw4GqAqKZgIITJfSOd35pG9yDVKQouHN2OGc2HeeXrH2A4h42p40Xl6IfcqqfllkpC13Dg=="],
+    "@opentui/core-win32-arm64": ["@opentui/core-win32-arm64@0.2.2", "", { "os": "win32", "cpu": "arm64" }, "sha512-MPhYdJNdxmC5Bqsq6sis/+VkjRgkEjm+bQ1Tl++NSKLuiTU32Re0ImcZlgHbe+LZtZoGMZHVSgZlkGd3oYXO2g=="],

-    "@opentui/core-win32-x64": ["@opentui/core-win32-x64@0.1.105", "", { "os": "win32", "cpu": "x64" }, "sha512-f9FqqUmxehwhF+cgyazm0YT0v0BYTTCPzd6eztqhl74N3x/kC+jOOz2rdJDC/tTBo1JVsF64KupOnhIs6/Cogg=="],
+    "@opentui/core-win32-x64": ["@opentui/core-win32-x64@0.2.2", "", { "os": "win32", "cpu": "x64" }, "sha512-19BroLfn2h0RDYfJS5o96Fc8kYCDhRBcseIXtHIkoKIsKMxx62KiDLo/byVye6rp+yQRRB7Xkd2uWqsbdiWo9w=="],

-    "@opentui/solid": ["@opentui/solid@0.1.105", "", { "dependencies": { "@babel/core": "7.28.0", "@babel/preset-typescript": "7.27.1", "@opentui/core": "0.1.105", "babel-plugin-module-resolver": "5.0.2", "babel-preset-solid": "1.9.10", "entities": "7.0.1", "s-js": "^0.4.9" }, "peerDependencies": { "solid-js": "1.9.11" } }, "sha512-uxnaMP802sCI487pv/Hk9xdFdIj9mkg3eNliAqbqR0Shmd4phcjKEZvPRpijjmI99j4s9nul71jzF3h1oz31Nw=="],
+    "@opentui/solid": ["@opentui/solid@0.2.2", "", { "dependencies": { "@babel/core": "7.28.0", "@babel/preset-typescript": "7.27.1", "@opentui/core": "0.2.2", "babel-plugin-module-resolver": "5.0.2", "babel-preset-solid": "1.9.12", "entities": "7.0.1", "s-js": "^0.4.9" }, "peerDependencies": { "solid-js": "1.9.12" } }, "sha512-ZBVfCoVAhcUGQWPAWOTdzuVldMaRkuPpCu4U1VZCqmIw9DtbCuiVr0WnDocDxKhJLbTu8bl3qEWtVCf6lTSi3w=="],

    "@oslojs/asn1": ["@oslojs/asn1@1.0.0", "", { "dependencies": { "@oslojs/binary": "1.0.0" } }, "sha512-zw/wn0sj0j0QKbIXfIlnEcTviaCzYOY3V5rAyjR6YtOByFtJiT574+8p9Wlach0lZH9fddD4yb9laEAIl4vXQA=="],

@@ -2134,8 +2133,6 @@

    "@types/json-schema": ["@types/json-schema@7.0.15", "", {}, "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA=="],

-    "@types/jsonwebtoken": ["@types/jsonwebtoken@9.0.10", "", { "dependencies": { "@types/ms": "*", "@types/node": "*" } }, "sha512-asx5hIG9Qmf/1oStypjanR7iKTv0gXQ1Ov/jfrX6kS/EO0OFni8orbmGCn0672NHR3kXHwpAwR+B368ZGN/2rA=="],
-
    "@types/katex": ["@types/katex@0.16.7", "", {}, "sha512-HMwFiRujE5PjrgwHQ25+bsLJgowjGjm5Z8FVSf0N6PwgJrwxH0QxzHYDcKsTfV3wva0vzrpqMTJS2jXPr5BMEQ=="],

    "@types/linkify-it": ["@types/linkify-it@3.0.5", "", {}, "sha512-yg6E+u0/+Zjva+buc3EIb+29XEg4wltq7cSmd4Uc2EE/1nUVmxyzpX6gUXD0V8jIrG0r7YeOGVIbYRkxeooCtw=="],
@@ -2426,7 +2423,7 @@

    "babel-plugin-module-resolver": ["babel-plugin-module-resolver@5.0.2", "", { "dependencies": { "find-babel-config": "^2.1.1", "glob": "^9.3.3", "pkg-up": "^3.1.0", "reselect": "^4.1.7", "resolve": "^1.22.8" } }, "sha512-9KtaCazHee2xc0ibfqsDeamwDps6FZNo5S0Q81dUqEuFzVwPhcT4J5jOqIVvgCA3Q/wO9hKYxN/Ds3tIsp5ygg=="],

-    "babel-preset-solid": ["babel-preset-solid@1.9.10", "", { "dependencies": { "babel-plugin-jsx-dom-expressions": "^0.40.3" }, "peerDependencies": { "@babel/core": "^7.0.0", "solid-js": "^1.9.10" }, "optionalPeers": ["solid-js"] }, "sha512-HCelrgua/Y+kqO8RyL04JBWS/cVdrtUv/h45GntgQY+cJl4eBcKkCDV3TdMjtKx1nXwRaR9QXslM/Npm1dxdZQ=="],
+    "babel-preset-solid": ["babel-preset-solid@1.9.12", "", { "dependencies": { "babel-plugin-jsx-dom-expressions": "^0.40.6" }, "peerDependencies": { "@babel/core": "^7.0.0", "solid-js": "^1.9.12" }, "optionalPeers": ["solid-js"] }, "sha512-LLqnuKVDlKpyBlMPcH6qEvs/wmS9a+NczppxJ3ryS/c0O5IiSFOIBQi9GzyiGDSbcJpx4Gr87jyFTos1MyEuWg=="],

    "balanced-match": ["balanced-match@4.0.4", "", {}, "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA=="],

@@ -2494,13 +2491,13 @@

    "buffers": ["buffers@0.1.1", "", {}, "sha512-9q/rDEGSb/Qsvv2qvzIzdluL5k7AaJOTrw23z9reQthrbF7is4CtlT0DXyO1oei2DCp4uojjzQ7igaSHp1kAEQ=="],

-    "bun-ffi-structs": ["bun-ffi-structs@0.1.2", "", { "peerDependencies": { "typescript": "^5" } }, "sha512-Lh1oQAYHDcnesJauieA4UNkWGXY9hYck7OA5IaRwE3Bp6K2F2pJSNYqq+hIy7P3uOvo3km3oxS8304g5gDMl/w=="],
+    "bun-ffi-structs": ["bun-ffi-structs@0.2.2", "", { "peerDependencies": { "typescript": "^5" } }, "sha512-N/ZWtyN0piZlrXQT7TO0V+q952orYqkfhXRXM1Hcbb+R3QSiBH4vLnib187Mrs1H7pWIYECAmPeapGYDOMCl+w=="],

    "bun-pty": ["bun-pty@0.4.8", "", {}, "sha512-rO70Mrbr13+jxHHHu2YBkk2pNqrJE5cJn29WE++PUr+GFA0hq/VgtQPZANJ8dJo6d7XImvBk37Innt8GM7O28w=="],

    "bun-types": ["bun-types@1.3.12", "", { "dependencies": { "@types/node": "*" } }, "sha512-HqOLj5PoFajAQciOMRiIZGNoKxDJSr6qigAttOX40vJuSp6DN/CxWp9s3C1Xwm4oH7ybueITwiaOcWXoYVoRkA=="],

-    "bun-webgpu": ["bun-webgpu@0.1.5", "", { "dependencies": { "@webgpu/types": "^0.1.60" }, "optionalDependencies": { "bun-webgpu-darwin-arm64": "^0.1.5", "bun-webgpu-darwin-x64": "^0.1.5", "bun-webgpu-linux-x64": "^0.1.5", "bun-webgpu-win32-x64": "^0.1.5" } }, "sha512-91/K6S5whZKX7CWAm9AylhyKrLGRz6BUiiPiM/kXadSnD4rffljCD/q9cNFftm5YXhx4MvLqw33yEilxogJvwA=="],
+    "bun-webgpu": ["bun-webgpu@0.1.4", "", { "dependencies": { "@webgpu/types": "^0.1.60" }, "optionalDependencies": { "bun-webgpu-darwin-arm64": "^0.1.4", "bun-webgpu-darwin-x64": "^0.1.4", "bun-webgpu-linux-x64": "^0.1.4", "bun-webgpu-win32-x64": "^0.1.4" } }, "sha512-Kw+HoXl1PMWJTh9wvh63SSRofTA8vYBFCw0XEP1V1fFdQEDhI8Sgf73sdndE/oDpN/7CMx0Yv/q8FCvO39ROMQ=="],

    "bun-webgpu-darwin-arm64": ["bun-webgpu-darwin-arm64@0.1.6", "", { "os": "darwin", "cpu": "arm64" }, "sha512-lIsDkPzJzPl6yrB5CUOINJFPnTRv6fF/Q8J1mAr43ogSp86WZEg9XZKaT6f3EUJ+9ETogGoMnoj1q0AwHUTbAQ=="],

@@ -3300,8 +3297,6 @@

    "jsbi": ["jsbi@4.3.2", "", {}, "sha512-9fqMSQbhJykSeii05nxKl4m6Eqn2P6rOlYiS+C5Dr/HPIU/7yZxu5qzbs40tgaFORiw2Amd0mirjxatXYMkIew=="],

-    "jschardet": ["jschardet@3.1.4", "", {}, "sha512-/kmVISmrwVwtyYU40iQUOp3SUPk2dhNCMsZBQX0R1/jZ8maaXJ/oZIzUOiyOqcgtLnETFKYChbJ5iDC/eWmFHg=="],
-
    "jsesc": ["jsesc@3.1.0", "", { "bin": { "jsesc": "bin/jsesc" } }, "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA=="],

    "json-bigint": ["json-bigint@1.0.0", "", { "dependencies": { "bignumber.js": "^9.0.0" } }, "sha512-SiPv/8VpZuWbvLSMtTDU8hEfrZWg/mH/nV/b4o0CYbSxu1UIQPLdwKOCIyLQX+VIPO5vrLX3i8qtqFyhdPSUSQ=="],
@@ -3406,8 +3401,6 @@

    "linkify-it": ["linkify-it@5.0.0", "", { "dependencies": { "uc.micro": "^2.0.0" } }, "sha512-5aHCbzQRADcdP+ATqnDuhhJ/MRIqDkZX5pyjFHRRysS8vZ5AbqGEoFIb6pYHPZ+L/OC2Lc+xT8uHVVR5CAK/wQ=="],

-    "linkifyjs": ["linkifyjs@4.3.2", "", {}, "sha512-NT1CJtq3hHIreOianA8aSXn6Cw0JzYOuDQbOrSPe7gqFnCpKP++MQe3ODgO3oh2GJFORkAAdqredOa60z63GbA=="],
-
    "load-json-file": ["load-json-file@7.0.1", "", {}, "sha512-Gnxj3ev3mB5TkVBGad0JM6dmLiQL+o0t23JPBZ9sd+yvSLk05mFoqKBw5N8gbbkU4TNXyqCgIrl/VM17OgUIgQ=="],

    "locate-path": ["locate-path@6.0.0", "", { "dependencies": { "p-locate": "^5.0.0" } }, "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw=="],
@@ -4158,8 +4151,6 @@

    "storybook-solidjs-vite": ["storybook-solidjs-vite@10.0.9", "", { "dependencies": { "@joshwooding/vite-plugin-react-docgen-typescript": "^0.6.1", "@storybook/builder-vite": "^10.0.0", "@storybook/global": "^5.0.0", "vite-plugin-solid": "^2.11.8" }, "peerDependencies": { "solid-js": "^1.9.0", "storybook": "^0.0.0-0 || ^10.0.0", "typescript": ">= 4.9.x", "vite": "^5.0.0 || ^6.0.0 || ^7.0.0" }, "optionalPeers": ["typescript"] }, "sha512-n6MwWCL9mK/qIaUutE9vhGB0X1I1hVnKin2NL+iVC5oXfAiuaABVZlr/1oEeEypsgCdyDOcbEbhJmDWmaqGpPw=="],

-    "stream-chat": ["stream-chat@9.38.0", "", { "dependencies": { "@types/jsonwebtoken": "^9.0.8", "@types/ws": "^8.5.14", "axios": "^1.12.2", "base64-js": "^1.5.1", "form-data": "^4.0.4", "isomorphic-ws": "^5.0.0", "jsonwebtoken": "^9.0.3", "linkifyjs": "^4.3.2", "ws": "^8.18.1" } }, "sha512-nyTFKHnhGfk1Op/xuZzPKzM9uNTy4TBma69+ApwGj/UtrK2pT6rSaU0Qy/oAqub+Bh7jR2/5vlV/8FWJ2BObFg=="],
-
    "streamx": ["streamx@2.25.0", "", { "dependencies": { "events-universal": "^1.0.0", "fast-fifo": "^1.3.2", "text-decoder": "^1.1.0" } }, "sha512-0nQuG6jf1w+wddNEEXCF4nTg3LtufWINB5eFEN+5TNZW7KWJp6x87+JFL43vaAUPyCfH1wID+mNVyW6OHtFamg=="],

    "string-width": ["string-width@7.2.0", "", { "dependencies": { "emoji-regex": "^10.3.0", "get-east-asian-width": "^1.0.0", "strip-ansi": "^7.1.0" } }, "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ=="],
@@ -4952,6 +4943,8 @@

    "enquirer/strip-ansi": ["strip-ansi@6.0.1", "", { "dependencies": { "ansi-regex": "^5.0.1" } }, "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="],

+    "esbuild-plugin-solid/babel-preset-solid": ["babel-preset-solid@1.9.10", "", { "dependencies": { "babel-plugin-jsx-dom-expressions": "^0.40.3" }, "peerDependencies": { "@babel/core": "^7.0.0", "solid-js": "^1.9.10" }, "optionalPeers": ["solid-js"] }, "sha512-HCelrgua/Y+kqO8RyL04JBWS/cVdrtUv/h45GntgQY+cJl4eBcKkCDV3TdMjtKx1nXwRaR9QXslM/Npm1dxdZQ=="],
+
    "eslint/ajv": ["ajv@6.14.0", "", { "dependencies": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", "json-schema-traverse": "^0.4.1", "uri-js": "^4.2.2" } }, "sha512-IWrosm/yrn43eiKqkfkHis7QioDleaXQHdDVPKg0FSwwd/DuvyX79TZnFOnYpB7dcsFAMmtFztZuXPDvSePkFw=="],

    "eslint/chalk": ["chalk@4.1.2", "", { "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" } }, "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="],
@@ -5076,6 +5069,10 @@

    "openid-client/lru-cache": ["lru-cache@6.0.0", "", { "dependencies": { "yallist": "^4.0.0" } }, "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="],

+    "opentui-spinner/@opentui/core": ["@opentui/core@0.1.105", "", { "dependencies": { "bun-ffi-structs": "0.1.2", "diff": "8.0.2", "jimp": "1.6.0", "marked": "17.0.1", "yoga-layout": "3.2.1" }, "optionalDependencies": { "@dimforge/rapier2d-simd-compat": "^0.17.3", "@opentui/core-darwin-arm64": "0.1.105", "@opentui/core-darwin-x64": "0.1.105", "@opentui/core-linux-arm64": "0.1.105", "@opentui/core-linux-x64": "0.1.105", "@opentui/core-win32-arm64": "0.1.105", "@opentui/core-win32-x64": "0.1.105", "bun-webgpu": "0.1.5", "planck": "^1.4.2", "three": "0.177.0" }, "peerDependencies": { "web-tree-sitter": "0.25.10" } }, "sha512-vllSOOCW6VIThV/96GRLJ1IxIBuR+ci6FDvnPIAG4s7SJ/FW6zAkqDn1xrtBwwk/lM3QWjLqy8BZc+zwWvveJA=="],
+
+    "opentui-spinner/@opentui/solid": ["@opentui/solid@0.1.105", "", { "dependencies": { "@babel/core": "7.28.0", "@babel/preset-typescript": "7.27.1", "@opentui/core": "0.1.105", "babel-plugin-module-resolver": "5.0.2", "babel-preset-solid": "1.9.10", "entities": "7.0.1", "s-js": "^0.4.9" }, "peerDependencies": { "solid-js": "1.9.11" } }, "sha512-uxnaMP802sCI487pv/Hk9xdFdIj9mkg3eNliAqbqR0Shmd4phcjKEZvPRpijjmI99j4s9nul71jzF3h1oz31Nw=="],
+
    "ora/cli-spinners": ["cli-spinners@2.9.2", "", {}, "sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg=="],

    "ora/log-symbols": ["log-symbols@6.0.0", "", { "dependencies": { "chalk": "^5.3.0", "is-unicode-supported": "^1.3.0" } }, "sha512-i24m8rpwhmPIS4zscNzK6MSEhk0DUWa/8iYQWxhffV8jkI4Phvs3F+quL5xvS0gdQR0FyTCMMH33Y78dDTzzIw=="],
@@ -5190,6 +5187,8 @@

    "vite-plugin-icons-spritesheet/glob": ["glob@11.1.0", "", { "dependencies": { "foreground-child": "^3.3.1", "jackspeak": "^4.1.1", "minimatch": "^10.1.1", "minipass": "^7.1.2", "package-json-from-dist": "^1.0.0", "path-scurry": "^2.0.0" }, "bin": { "glob": "dist/esm/bin.mjs" } }, "sha512-vuNwKSaKiqm7g0THUBu2x7ckSs3XJLXE+2ssL7/MfTGPLLcrJQ/4Uq1CjPTtO5cCIiRxqvN6Twy1qOwhL0Xjcw=="],

+    "vite-plugin-solid/babel-preset-solid": ["babel-preset-solid@1.9.10", "", { "dependencies": { "babel-plugin-jsx-dom-expressions": "^0.40.3" }, "peerDependencies": { "@babel/core": "^7.0.0", "solid-js": "^1.9.10" }, "optionalPeers": ["solid-js"] }, "sha512-HCelrgua/Y+kqO8RyL04JBWS/cVdrtUv/h45GntgQY+cJl4eBcKkCDV3TdMjtKx1nXwRaR9QXslM/Npm1dxdZQ=="],
+
    "vitest/why-is-node-running": ["why-is-node-running@2.3.0", "", { "dependencies": { "siginfo": "^2.0.0", "stackback": "0.0.2" }, "bin": { "why-is-node-running": "cli.js" } }, "sha512-hUrmaWBdVDcxvYqnyh09zunKzROWjbZTiNy8dBEjkS7ehEDQibXJ7XvlmtbwuTclUiIyN+CyXQD4Vmko8fNm8w=="],

    "vscode-languageserver-protocol/vscode-jsonrpc": ["vscode-jsonrpc@8.2.0", "", {}, "sha512-C+r0eKJUIfiDIfwJhria30+TYWPtuHJXHtI7J0YlOmKAo7ogxP20T0zxB7HZQIFhIyvoBPwWskjxrvAtfjyZfA=="],
@@ -5264,7 +5263,7 @@

    "@kilocode/kilo-gateway/@opentui/core/@opentui/core-win32-x64": ["@opentui/core-win32-x64@0.1.75", "", { "os": "win32", "cpu": "x64" }, "sha512-ESpVZVGewe3JkB2TwrG3VRbkxT909iPdtvgNT7xTCIYH2VB4jqZomJfvERPTE0tvqAZJm19mHECzJFI8asSJgQ=="],

-    "@kilocode/kilo-gateway/@opentui/core/bun-webgpu": ["bun-webgpu@0.1.4", "", { "dependencies": { "@webgpu/types": "^0.1.60" }, "optionalDependencies": { "bun-webgpu-darwin-arm64": "^0.1.4", "bun-webgpu-darwin-x64": "^0.1.4", "bun-webgpu-linux-x64": "^0.1.4", "bun-webgpu-win32-x64": "^0.1.4" } }, "sha512-Kw+HoXl1PMWJTh9wvh63SSRofTA8vYBFCw0XEP1V1fFdQEDhI8Sgf73sdndE/oDpN/7CMx0Yv/q8FCvO39ROMQ=="],
+    "@kilocode/kilo-gateway/@opentui/core/bun-ffi-structs": ["bun-ffi-structs@0.1.2", "", { "peerDependencies": { "typescript": "^5" } }, "sha512-Lh1oQAYHDcnesJauieA4UNkWGXY9hYck7OA5IaRwE3Bp6K2F2pJSNYqq+hIy7P3uOvo3km3oxS8304g5gDMl/w=="],

    "@kilocode/kilo-gateway/@opentui/solid/@babel/core": ["@babel/core@7.28.0", "", { "dependencies": { "@ampproject/remapping": "^2.2.0", "@babel/code-frame": "^7.27.1", "@babel/generator": "^7.28.0", "@babel/helper-compilation-targets": "^7.27.2", "@babel/helper-module-transforms": "^7.27.3", "@babel/helpers": "^7.27.6", "@babel/parser": "^7.28.0", "@babel/template": "^7.27.2", "@babel/traverse": "^7.28.0", "@babel/types": "^7.28.0", "convert-source-map": "^2.0.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", "json5": "^2.2.3", "semver": "^6.3.1" } }, "sha512-UlLAnTPrFdNGoFtbSXwcGFQBtQZJCNjaN6hQNP3UPvuNXT1i82N26KL3dZeIpNalWywr9IuQuncaAfUaS1g6sQ=="],

@@ -5602,6 +5601,26 @@

    "opencontrol/@modelcontextprotocol/sdk/zod-to-json-schema": ["zod-to-json-schema@3.25.2", "", { "peerDependencies": { "zod": "^3.25.28 || ^4" } }, "sha512-O/PgfnpT1xKSDeQYSCfRI5Gy3hPf91mKVDuYLUHZJMiDFptvP41MSnWofm8dnCm0256ZNfZIM7DSzuSMAFnjHA=="],

+    "opentui-spinner/@opentui/core/@opentui/core-darwin-arm64": ["@opentui/core-darwin-arm64@0.1.105", "", { "os": "darwin", "cpu": "arm64" }, "sha512-1pIL7aer9amwj8EpYoMNtvavKetIe+nX8uBRmYsMQb+KvJoUAZUqENfRW+qHE5WrsOyxx8/QoyXTHw15GG5iLQ=="],
+
+    "opentui-spinner/@opentui/core/@opentui/core-darwin-x64": ["@opentui/core-darwin-x64@0.1.105", "", { "os": "darwin", "cpu": "x64" }, "sha512-hLIRSWlK3gY2NRXJGWiTBiMYSmRDjOYFZF6WtUVXhY2SL3sp08dhmr/6dmAVH+3pKCsCipLEsrrcQX6SAihCTA=="],
+
+    "opentui-spinner/@opentui/core/@opentui/core-linux-arm64": ["@opentui/core-linux-arm64@0.1.105", "", { "os": "linux", "cpu": "arm64" }, "sha512-jlRKfPkozTZEkHEePuCWYcTIUtPm+ieInAwGVqGmjbvqjxdVv1/W/Dt6LEZ/9jpRiOPd+FjXAfLe6wa/XWHr+w=="],
+
+    "opentui-spinner/@opentui/core/@opentui/core-linux-x64": ["@opentui/core-linux-x64@0.1.105", "", { "os": "linux", "cpu": "x64" }, "sha512-kfWS1WMg6qHShmxZX9s1tZc/8JcXw6uyy2UtyTbJdRFExtXGH37oKHi8QK8iPL2ExCx4z7zqVnVJfO3X/Wh7lA=="],
+
+    "opentui-spinner/@opentui/core/@opentui/core-win32-arm64": ["@opentui/core-win32-arm64@0.1.105", "", { "os": "win32", "cpu": "arm64" }, "sha512-UFx6A8OpBVbGWK6OAw4GqAqKZgIITJfSOd35pG9yDVKQouHN2OGc2HeeXrH2A4h42p40Xl6IfcqqfllkpC13Dg=="],
+
+    "opentui-spinner/@opentui/core/@opentui/core-win32-x64": ["@opentui/core-win32-x64@0.1.105", "", { "os": "win32", "cpu": "x64" }, "sha512-f9FqqUmxehwhF+cgyazm0YT0v0BYTTCPzd6eztqhl74N3x/kC+jOOz2rdJDC/tTBo1JVsF64KupOnhIs6/Cogg=="],
+
+    "opentui-spinner/@opentui/core/bun-ffi-structs": ["bun-ffi-structs@0.1.2", "", { "peerDependencies": { "typescript": "^5" } }, "sha512-Lh1oQAYHDcnesJauieA4UNkWGXY9hYck7OA5IaRwE3Bp6K2F2pJSNYqq+hIy7P3uOvo3km3oxS8304g5gDMl/w=="],
+
+    "opentui-spinner/@opentui/core/bun-webgpu": ["bun-webgpu@0.1.5", "", { "dependencies": { "@webgpu/types": "^0.1.60" }, "optionalDependencies": { "bun-webgpu-darwin-arm64": "^0.1.5", "bun-webgpu-darwin-x64": "^0.1.5", "bun-webgpu-linux-x64": "^0.1.5", "bun-webgpu-win32-x64": "^0.1.5" } }, "sha512-91/K6S5whZKX7CWAm9AylhyKrLGRz6BUiiPiM/kXadSnD4rffljCD/q9cNFftm5YXhx4MvLqw33yEilxogJvwA=="],
+
+    "opentui-spinner/@opentui/solid/@babel/core": ["@babel/core@7.28.0", "", { "dependencies": { "@ampproject/remapping": "^2.2.0", "@babel/code-frame": "^7.27.1", "@babel/generator": "^7.28.0", "@babel/helper-compilation-targets": "^7.27.2", "@babel/helper-module-transforms": "^7.27.3", "@babel/helpers": "^7.27.6", "@babel/parser": "^7.28.0", "@babel/template": "^7.27.2", "@babel/traverse": "^7.28.0", "@babel/types": "^7.28.0", "convert-source-map": "^2.0.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", "json5": "^2.2.3", "semver": "^6.3.1" } }, "sha512-UlLAnTPrFdNGoFtbSXwcGFQBtQZJCNjaN6hQNP3UPvuNXT1i82N26KL3dZeIpNalWywr9IuQuncaAfUaS1g6sQ=="],
+
+    "opentui-spinner/@opentui/solid/babel-preset-solid": ["babel-preset-solid@1.9.10", "", { "dependencies": { "babel-plugin-jsx-dom-expressions": "^0.40.3" }, "peerDependencies": { "@babel/core": "^7.0.0", "solid-js": "^1.9.10" }, "optionalPeers": ["solid-js"] }, "sha512-HCelrgua/Y+kqO8RyL04JBWS/cVdrtUv/h45GntgQY+cJl4eBcKkCDV3TdMjtKx1nXwRaR9QXslM/Npm1dxdZQ=="],
+
    "ora/log-symbols/is-unicode-supported": ["is-unicode-supported@1.3.0", "", {}, "sha512-43r2mRvz+8JRIKnWJ+3j8JtjRKZ6GmjzfaE/qiBJnikNnYv/6bagRJ1kUhNk8R5EX/GkobD+r+sfxCPJsiKBLQ=="],

    "p-locate/p-limit/yocto-queue": ["yocto-queue@0.1.0", "", {}, "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q=="],
@@ -5802,6 +5821,8 @@

    "mocha/yargs/string-width/strip-ansi": ["strip-ansi@6.0.1", "", { "dependencies": { "ansi-regex": "^5.0.1" } }, "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="],

+    "opentui-spinner/@opentui/solid/@babel/core/semver": ["semver@6.3.1", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="],
+
    "pkg-conf/find-up/locate-path/p-locate": ["p-locate@6.0.0", "", { "dependencies": { "p-limit": "^4.0.0" } }, "sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw=="],

    "pkg-up/find-up/locate-path/p-locate": ["p-locate@3.0.0", "", { "dependencies": { "p-limit": "^2.0.0" } }, "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ=="],
@@ -385,6 +385,57 @@ add_to_path() {
    fi
 }

+# Persistently add $INSTALL_DIR to the Windows user PATH via the registry.
+# Works from Git Bash (MINGW64), MSYS2, and Cygwin.
+# Converts the MSYS/Cygwin path to native Windows form so that cmd and
+# PowerShell also see the entry.
+add_to_windows_path() {
+    local win_install_dir
+    if command -v cygpath >/dev/null 2>&1; then
+        win_install_dir=$(cygpath -w "$INSTALL_DIR")
+    else
+        # Fallback: naive conversion  /c/Users/... -> C:\Users\...
+        win_install_dir=$(echo "$INSTALL_DIR" | sed -e 's|^/\([a-zA-Z]\)/|\1:\\|' -e 's|/|\\|g')
+    fi
+
+    # Escape single-quotes for PowerShell single-quoted strings ('' is the escape sequence)
+    local win_install_dir_ps="${win_install_dir//\'/\'\'}"
+
+    local ps_cmd
+    ps_cmd=$(cat <<EOFPS
+\$kiloPath = '$win_install_dir_ps'
+\$currentPath = [Environment]::GetEnvironmentVariable('Path', 'User')
+\$pathParts = if ([string]::IsNullOrEmpty(\$currentPath)) { @() } else { \$currentPath -split ';' }
+if (\$pathParts -notcontains \$kiloPath) {
+    \$newPath = if ([string]::IsNullOrEmpty(\$currentPath)) { \$kiloPath } else { "\$currentPath;\$kiloPath" }
+    [Environment]::SetEnvironmentVariable('Path', \$newPath, 'User')
+    Write-Output 'added'
+}
+EOFPS
+)
+
+    local ps_output
+    if command -v powershell.exe >/dev/null 2>&1; then
+        ps_output=$(powershell.exe -NoProfile -NonInteractive -Command "$ps_cmd" 2>/dev/null) || return 1
+    elif command -v pwsh >/dev/null 2>&1; then
+        ps_output=$(pwsh -NoProfile -NonInteractive -Command "$ps_cmd" 2>/dev/null) || return 1
+    else
+        return 1
+    fi
+
+    if [[ "$ps_output" == *"added"* ]]; then
+        print_message info "${MUTED}Successfully added ${NC}kilo ${MUTED}to Windows user PATH${NC}"
+    fi
+
+    # Also add to the current bash session so `kilo` works immediately
+    # without the user needing to open a new terminal.
+    if [[ ":$PATH:" != *":$INSTALL_DIR:"* ]]; then
+        export PATH="$INSTALL_DIR:$PATH"
+    fi
+
+    return 0
+}
+
 XDG_CONFIG_HOME=${XDG_CONFIG_HOME:-$HOME/.config}

 current_shell=$(basename "$SHELL")
@@ -411,6 +462,13 @@ case $current_shell in
 esac

 if [[ "$no_modify_path" != "true" ]]; then
+    # Detect if we are running on Windows (MINGW, MSYS, Cygwin) regardless
+    # of whether the binary was installed from download or --binary.
+    _running_on_windows=false
+    case "$(uname -s)" in
+        MINGW*|MSYS*|CYGWIN*) _running_on_windows=true ;;
+    esac
+
    config_file=""
    for file in $config_files; do
        if [[ -f $file ]]; then
@@ -419,7 +477,12 @@ if [[ "$no_modify_path" != "true" ]]; then
        fi
    done

-    if [[ -z $config_file ]]; then
+    if [[ "$_running_on_windows" == "true" ]] && add_to_windows_path; then
+        # Handled via the Windows user-level PATH in the registry.
+        # The change is visible in new cmd / PowerShell / Git Bash sessions.
+        # We also exported it into the current session above.
+        :
+    elif [[ -z $config_file ]]; then
        print_message warning "No config file found for $current_shell. You may need to manually add to PATH:"
        print_message info "  export PATH=$INSTALL_DIR:\$PATH"
    elif [[ ":$PATH:" != *":$INSTALL_DIR:"* ]]; then
@@ -1,8 +1,8 @@
 {
  "nodeModules": {
-    "x86_64-linux": "sha256-1SpPwQiU4XdqJNJhw9Abf2IiBMxv22waspgDTylL2yg=",
-    "aarch64-linux": "sha256-g+wFoSCCfz0lZym83gHvAPj1R9vIpF4/7jK3bUGCMP4=",
-    "aarch64-darwin": "sha256-aGNmAN6RWL+4V6kxckMrOPJIgvhnomwILcNBI27VapA=",
-    "x86_64-darwin": "sha256-KXPaxTzaypPSjBvmUJVICAcjg6XVnG4EKCRFCcUZ3oI="
+    "x86_64-linux": "sha256-ZInDUMIVu0aBcf0GufNsBEBdL8pQ6GvlQmQq18mFzso=",
+    "aarch64-linux": "sha256-I9oJ145BsbXUVTzaIWAZsG8YijmO/gUDO6DwinUwA3w=",
+    "aarch64-darwin": "sha256-tr8lRQvUMToux9JyiyTk6rYDFmPMm6LNai/IQ8Qk23c=",
+    "x86_64-darwin": "sha256-ffyoj7ubIzbUXhcm7/yOQBZA42BIt+fEBQs4khQqaSg="
  }
 }
@@ -7,7 +7,9 @@
  "packageManager": "bun@1.3.13",
  "scripts": {
    "dev": "bun run --cwd packages/opencode --conditions=browser src/index.ts",
-    "dev-setup": "bun run --cwd packages/opencode --conditions=browser src/index.ts dev-setup",
+    "dev:desktop": "bun --cwd packages/desktop-electron dev",
+    "dev:web": "bun --cwd packages/app dev",
+    "dev:console": "ulimit -n 10240 2>/dev/null; bun run --cwd packages/console/app dev",
    "dev:storybook": "bun --cwd packages/storybook storybook",
    "lint": "oxlint",
    "typecheck": "bun turbo typecheck",
@@ -31,8 +33,8 @@
      "@types/cross-spawn": "6.0.6",
      "@octokit/rest": "22.0.0",
      "@hono/zod-validator": "0.4.2",
-      "@opentui/core": "0.1.105",
-      "@opentui/solid": "0.1.105",
+      "@opentui/core": "0.2.2",
+      "@opentui/solid": "0.2.2",
      "ulid": "3.0.1",
      "@kobalte/core": "0.13.11",
      "@types/luxon": "3.7.1",
@@ -74,6 +76,8 @@
      "@solidjs/meta": "0.29.4",
      "@solidjs/router": "0.15.4",
      "@solidjs/start": "https://pkg.pr.new/@solidjs/start@dfb2020",
+      "@sentry/solid": "10.36.0",
+      "@sentry/vite-plugin": "4.6.0",
      "solid-js": "1.9.12",
      "vite-plugin-solid": "2.11.10",
      "@lydell/node-pty": "1.2.0-beta.10"
@@ -82,7 +86,6 @@
  "devDependencies": {
    "@actions/artifact": "5.0.1",
    "@tsconfig/bun": "catalog:",
-    "@types/bun": "catalog:",
    "@types/mime-types": "3.0.1",
    "@typescript/native-preview": "catalog:",
    "glob": "13.0.5",
@@ -93,6 +96,7 @@
    "semver": "^7.6.0",
    "sst": "3.18.10",
    "turbo": "2.8.13",
+    "@types/bun": "catalog:",
    "@changesets/changelog-github": "^0.5.1",
    "@changesets/cli": "^2.27.10"
  },
@@ -143,9 +147,8 @@
  "patchedDependencies": {
    "@npmcli/agent@4.0.0": "patches/@npmcli%2Fagent@4.0.0.patch",
    "@standard-community/standard-openapi@0.2.9": "patches/@standard-community%2Fstandard-openapi@0.2.9.patch",
-    "solid-js@1.9.10": "patches/solid-js@1.9.10.patch",
-    "stream-chat@9.38.0": "patches/stream-chat@9.38.0.patch"
+    "solid-js@1.9.10": "patches/solid-js@1.9.10.patch"
  },
-  "version": "7.2.40",
+  "version": "7.2.42",
  "peerDependencies": {}
 }
@@ -1,6 +1,6 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
-  "version": "7.2.40",
+  "version": "7.2.42",
  "name": "@opencode-ai/core",
  "type": "module",
  "license": "MIT",
@@ -47,5 +47,6 @@
  },
  "overrides": {
    "drizzle-orm": "catalog:"
-  }
+  },
+  "peerDependencies": {}
 }
@@ -54,7 +54,9 @@ export const Flag = {

  // Experimental
  KILO_EXPERIMENTAL,
-  KILO_EXPERIMENTAL_FILEWATCHER: Config.boolean("KILO_EXPERIMENTAL_FILEWATCHER").pipe(Config.withDefault(false)),
+  KILO_EXPERIMENTAL_FILEWATCHER: Config.boolean("KILO_EXPERIMENTAL_FILEWATCHER").pipe(
+    Config.withDefault(false),
+  ),
  KILO_EXPERIMENTAL_DISABLE_FILEWATCHER: Config.boolean("KILO_EXPERIMENTAL_DISABLE_FILEWATCHER").pipe(
    Config.withDefault(false),
  ),
@@ -5,6 +5,7 @@ import os from "os"
 import { Context, Effect, Layer } from "effect"
 import { Flock } from "./util/flock"
 import { markNoIndex } from "./kilocode/spotlight" // kilocode_change
+import { Flag } from "./flag/flag"

 const app = "kilo" // kilocode_change
 // kilocode_change start
@@ -21,6 +22,7 @@ const cache = path.join(clean(xdgCache)!, app)
 const config = path.join(clean(xdgConfig)!, app)
 const state = path.join(clean(xdgState)!, app)
 // kilocode_change end
+const tmp = path.join(os.tmpdir(), app)

 const paths = {
  get home() {
@@ -32,6 +34,7 @@ const paths = {
  cache,
  config,
  state,
+  tmp,
 }

 export const Path = paths
@@ -42,6 +45,7 @@ await Promise.all([
  fs.mkdir(Path.data, { recursive: true }),
  fs.mkdir(Path.config, { recursive: true }),
  fs.mkdir(Path.state, { recursive: true }),
+  fs.mkdir(Path.tmp, { recursive: true }),
  fs.mkdir(Path.log, { recursive: true }),
  fs.mkdir(Path.bin, { recursive: true }),
 ])
@@ -58,23 +62,34 @@ export interface Interface {
  readonly cache: string
  readonly config: string
  readonly state: string
+  readonly tmp: string
  readonly bin: string
  readonly log: string
 }

+export function make(input: Partial<Interface> = {}): Interface {
+  return {
+    home: Path.home,
+    data: Path.data,
+    cache: Path.cache,
+    config: Flag.KILO_CONFIG_DIR ?? Path.config,
+    state: Path.state,
+    tmp: Path.tmp,
+    bin: Path.bin,
+    log: Path.log,
+    ...input,
+  }
+}
+
 export const layer = Layer.effect(
  Service,
-  Effect.gen(function* () {
-    return Service.of({
-      home: Path.home,
-      data: Path.data,
-      cache: Path.cache,
-      config: Path.config,
-      state: Path.state,
-      bin: Path.bin,
-      log: Path.log,
-    })
-  }),
+  Effect.sync(() => Service.of(make())),
 )

+export const layerWith = (input: Partial<Interface>) =>
+  Layer.effect(
+    Service,
+    Effect.sync(() => Service.of(make(input))),
+  )
+
 export * as Global from "./global"
@@ -120,13 +120,17 @@ export const layer = Layer.effect(
        }
      })()

-      if (yield* afs.existsSafe(dir)) {
+      if (yield* afs.existsSafe(path.join(dir, "node_modules", name))) {
        return resolveEntryPoint(name, path.join(dir, "node_modules", name))
      }

      const tree = yield* reify({ dir, add: [pkg] })
      const first = tree.edgesOut.values().next().value?.to
-      if (!first) return yield* new InstallFailedError({ add: [pkg], dir })
+      if (!first) {
+        const result = resolveEntryPoint(name, path.join(dir, "node_modules", name))
+        if (Option.isSome(result.entrypoint)) return result
+        return yield* new InstallFailedError({ add: [pkg], dir })
+      }
      return resolveEntryPoint(first.name, first.path)
    }, Effect.scoped)

@@ -18,20 +18,17 @@ function sleep(ms: number) {
  return new Promise<void>((resolve) => setTimeout(resolve, ms))
 }

-const msg: Msg = JSON.parse(process.argv[2]!)
+const msg: Msg = JSON.parse(process.argv[2])

-const testGlobal = Layer.succeed(
-  Global.Service,
-  Global.Service.of({
-    home: os.homedir(),
-    data: os.tmpdir(),
-    cache: os.tmpdir(),
-    config: os.tmpdir(),
-    state: os.tmpdir(),
-    bin: os.tmpdir(),
-    log: os.tmpdir(),
-  }),
-)
+const testGlobal = Global.layerWith({
+  home: os.homedir(),
+  data: os.tmpdir(),
+  cache: os.tmpdir(),
+  config: os.tmpdir(),
+  state: os.tmpdir(),
+  bin: os.tmpdir(),
+  log: os.tmpdir(),
+})

 const testLayer = EffectFlock.layer.pipe(Layer.provide(testGlobal), Layer.provide(AppFileSystem.defaultLayer))

@@ -0,0 +1,16 @@
+import { describe, expect, test } from "bun:test"
+import fs from "fs/promises"
+import os from "os"
+import path from "path"
+import { Global } from "@opencode-ai/core/global"
+
+describe("global paths", () => {
+  test("tmp path is under the system temp directory", () => {
+    expect(Global.Path.tmp).toBe(path.join(os.tmpdir(), "opencode"))
+    expect(Global.make().tmp).toBe(Global.Path.tmp)
+  })
+
+  test("tmp path is created on module load", async () => {
+    expect((await fs.stat(Global.Path.tmp)).isDirectory()).toBe(true)
+  })
+})
@@ -1,7 +1,12 @@
 import fs from "fs/promises"
 import path from "path"
 import { describe, expect, test } from "bun:test"
+import { NodeFileSystem } from "@effect/platform-node"
+import { Effect, Layer, Option } from "effect"
+import { AppFileSystem } from "@opencode-ai/core/filesystem"
+import { Global } from "@opencode-ai/core/global"
 import { Npm } from "@opencode-ai/core/npm"
+import { EffectFlock } from "@opencode-ai/core/util/effect-flock"
 import { tmpdir } from "./fixture/tmpdir"

 const win = process.platform === "win32"
@@ -15,6 +20,14 @@ const writePackage = (dir: string, pkg: Record<string, unknown>) =>
    }),
  )

+const npmLayer = (cache: string) =>
+  Npm.layer.pipe(
+    Layer.provide(EffectFlock.layer),
+    Layer.provide(AppFileSystem.layer),
+    Layer.provide(Global.layerWith({ cache, state: path.join(cache, "state") })),
+    Layer.provide(NodeFileSystem.layer),
+  )
+
 describe("Npm.sanitize", () => {
  test("keeps normal scoped package specs unchanged", () => {
    expect(Npm.sanitize("@opencode/acme")).toBe("@opencode/acme")
@@ -29,6 +42,28 @@ describe("Npm.sanitize", () => {
  })
 })

+describe("Npm.add", () => {
+  test("reifies when package cache directory exists without the package installed", async () => {
+    await using tmp = await tmpdir()
+    await fs.mkdir(path.join(tmp.path, "fixture-provider"))
+    await writePackage(path.join(tmp.path, "fixture-provider"), {
+      name: "fixture-provider",
+      main: "index.js",
+    })
+    await Bun.write(path.join(tmp.path, "fixture-provider", "index.js"), "export const fixture = true\n")
+
+    const spec = `fixture-provider@file:${path.join(tmp.path, "fixture-provider")}`
+    await fs.mkdir(path.join(tmp.path, "cache", "packages", Npm.sanitize(spec)), { recursive: true })
+
+    const entry = await Effect.gen(function* () {
+      const npm = yield* Npm.Service
+      return yield* npm.add(spec)
+    }).pipe(Effect.scoped, Effect.provide(npmLayer(path.join(tmp.path, "cache"))), Effect.runPromise)
+
+    expect(Option.isSome(entry.entrypoint)).toBe(true)
+  })
+})
+
 describe("Npm.install", () => {
  test("respects omit from project .npmrc", async () => {
    await using tmp = await tmpdir()
@@ -93,18 +93,15 @@ async function waitForFile(file: string, timeout = 3_000) {
 // Test layer
 // ---------------------------------------------------------------------------

-const testGlobal = Layer.succeed(
-  Global.Service,
-  Global.Service.of({
-    home: os.homedir(),
-    data: os.tmpdir(),
-    cache: os.tmpdir(),
-    config: os.tmpdir(),
-    state: os.tmpdir(),
-    bin: os.tmpdir(),
-    log: os.tmpdir(),
-  }),
-)
+const testGlobal = Global.layerWith({
+  home: os.homedir(),
+  data: os.tmpdir(),
+  cache: os.tmpdir(),
+  config: os.tmpdir(),
+  state: os.tmpdir(),
+  bin: os.tmpdir(),
+  log: os.tmpdir(),
+})

 const testLayer = EffectFlock.layer.pipe(Layer.provide(testGlobal), Layer.provide(AppFileSystem.defaultLayer))

@@ -3,13 +3,6 @@
  "extends": "@tsconfig/bun/tsconfig.json",
  "compilerOptions": {
    "noUncheckedIndexedAccess": false,
-    "types": ["bun"],
-    "plugins": [
-      {
-        "name": "@effect/language-service",
-        "transform": "@effect/language-service/transform",
-        "namespaceImportPackages": ["effect", "@effect/*"]
-      }
-    ]
+    "types": ["bun"]
  }
 }
@@ -1,7 +1,7 @@
 id = "kilo"
 name = "Kilo"
 description = "The open source coding agent."
-version = "7.2.40"
+version = "7.2.42"
 schema_version = 1
 authors = ["Anomaly"]
 repository = "https://github.com/Kilo-Org/kilocode"
@@ -11,26 +11,26 @@ name = "Kilo"
 icon = "./icons/opencode.svg"

 [agent_servers.opencode.targets.darwin-aarch64]
-archive = "https://github.com/Kilo-Org/kilocode/releases/download/v7.2.40/opencode-darwin-arm64.zip"
+archive = "https://github.com/Kilo-Org/kilocode/releases/download/v7.2.42/opencode-darwin-arm64.zip"
 cmd = "./opencode"
 args = ["acp"]

 [agent_servers.opencode.targets.darwin-x86_64]
-archive = "https://github.com/Kilo-Org/kilocode/releases/download/v7.2.40/opencode-darwin-x64.zip"
+archive = "https://github.com/Kilo-Org/kilocode/releases/download/v7.2.42/opencode-darwin-x64.zip"
 cmd = "./opencode"
 args = ["acp"]

 [agent_servers.opencode.targets.linux-aarch64]
-archive = "https://github.com/Kilo-Org/kilocode/releases/download/v7.2.40/opencode-linux-arm64.tar.gz"
+archive = "https://github.com/Kilo-Org/kilocode/releases/download/v7.2.42/opencode-linux-arm64.tar.gz"
 cmd = "./opencode"
 args = ["acp"]

 [agent_servers.opencode.targets.linux-x86_64]
-archive = "https://github.com/Kilo-Org/kilocode/releases/download/v7.2.40/opencode-linux-x64.tar.gz"
+archive = "https://github.com/Kilo-Org/kilocode/releases/download/v7.2.42/opencode-linux-x64.tar.gz"
 cmd = "./opencode"
 args = ["acp"]

 [agent_servers.opencode.targets.windows-x86_64]
-archive = "https://github.com/Kilo-Org/kilocode/releases/download/v7.2.40/opencode-windows-x64.zip"
+archive = "https://github.com/Kilo-Org/kilocode/releases/download/v7.2.42/opencode-windows-x64.zip"
 cmd = "./opencode.exe"
 args = ["acp"]
@@ -80,6 +80,7 @@ export const CodeWithAiNav: NavSection[] = [
        children: "Git Commit Generation",
      },
      { href: "/code-with-ai/features/speech-to-text", children: "Voice Transcription" },
+      { href: "/code-with-ai/features/message-feedback", children: "Message Feedback" },
      {
        href: "/code-with-ai/features/browser-use",
        children: "Agent Behavior",
@@ -43,4 +43,6 @@ exclude = [
  # Consistently times out in CI
  '^https?://opncd\.ai',
  '^https?://zod\.dev/v4/changelog',
+  # OpenAI docs return 404 to plain GET link checks but resolve in browsers
+  '^https?://platform\.openai\.com/docs/api-reference/responses/create',
 ]
@@ -1,6 +1,6 @@
 {
  "name": "@kilocode/kilo-docs",
-  "version": "7.2.40",
+  "version": "7.2.42",
  "private": true,
  "scripts": {
    "dev": "next dev --webpack --port 3002",
@@ -11,17 +11,17 @@ Kilo automatically detects the text encoding of each file it reads and preserves

 - UTF-8, with or without BOM
 - UTF-16 LE and UTF-16 BE, **with a BOM**
+- UTF-32 LE and UTF-32 BE, **with a BOM**
 - Shift_JIS, EUC-JP, GB2312, Big5, EUC-KR
 - Windows-1251, KOI8-R
 - The ISO-8859 family
- Other common legacy Latin and CJK encodings detected by [jschardet](https://github.com/aadsm/jschardet) and decoded by [iconv-lite](https://github.com/ashtuchkin/iconv-lite)
+- Other common legacy Latin and CJK encodings detected by [chardet](https://github.com/runk/node-chardet) and decoded by [iconv-lite](https://github.com/ashtuchkin/iconv-lite)

 New files Kilo creates are always UTF-8 without a BOM. Encoding detection only runs when Kilo reads or overwrites an existing file.

 ## Not Supported

- **UTF-16 without a BOM.** The byte pattern is ambiguous and cannot be distinguished reliably from other encodings. Save the file with a BOM or convert it to UTF-8.
- **UTF-32.** Extremely rare in practice; convert to UTF-8 if you need Kilo to work with it.
+- **UTF-16 or UTF-32 without a BOM.** The byte pattern is ambiguous and cannot be distinguished reliably from other encodings. Save the file with a BOM or convert it to UTF-8.

 {% callout type="info" %}
 Encoding detection is statistical. Very short files, or files whose byte patterns happen to look like a different encoding, may occasionally be misidentified. If that happens, converting the file to UTF-8 is the most reliable workaround.
@@ -0,0 +1,76 @@
+---
+title: "Message Feedback"
+description: "Rate assistant responses with thumbs up/down to help Kilo improve"
+---
+
+# Message Feedback
+
+You can give a thumbs up or thumbs down to any response Kilo gives you. It's a quick way to tell us when something worked well, or when it didn't.
+
+{% callout type="info" %}
+Feedback is only available when telemetry is on. If you turn telemetry off, the buttons no longer display. See [Turning it off](#turning-it-off) below.
+{% /callout %}
+
+## How to use it
+
+{% tabs %}
+{% tab label="VSCode" %}
+
+When Kilo finishes a response, you'll see thumbs-up and thumbs-down buttons next to the **Copy response** button. Click one to send your rating. Click the same button again to take it back, or click the other one to change your mind.
+
+If you reload the window or switch to a different session, the feedback status will be reset.
+
+{% /tab %}
+
+{% tab label="CLI" %}
+
+In the terminal, two keybinds rate the most recent assistant message:
+
+| Action | Keybind |
+|---|---|
+| Helpful | `<leader>=` |
+| Not helpful | `<leader>-` |
+
+`<leader>` defaults to `Ctrl+X`, so you press `Ctrl+X` and then `=` for thumbs-up, or `Ctrl+X` and then `-` for thumbs-down.
+
+{% /tab %}
+{% /tabs %}
+
+## Why it matters
+
+Your feedback is the most direct way to tell us what's working and what isn't. We use it to tune the prompts behind Kilo's behavior, pick better default models, and find and fix problems faster than we could on our own.
+
+## What we send
+
+When you rate a response, here's what gets sent:
+
+- That you rated a response thumbs up or thumbs down.
+- The provider and model ID that produced the response (for example, `anthropic` and `claude-sonnet-4-5`).
+- For responses that came through Kilo Gateway, the request ID so we can match the rating back to the session.
+
+No further information is included in the rating feedback. For more information on telemetry, see [PRIVACY.md](https://github.com/Kilo-Org/kilocode/blob/main/PRIVACY.md).
+
+## Turning it off
+
+Feedback is part of telemetry, so turning telemetry off will cause the feedback buttons to no longer appear.
+
+{% tabs %}
+{% tab label="VSCode" %}
+
+Open Settings (`Cmd+,` on Mac, `Ctrl+,` on Windows/Linux), search for **`telemetry.telemetryLevel`**, and set it to **Off**. The feedback buttons will no longer appear. Set it back to **All** to bring them back. (For more on what this setting controls, see [VS Code's telemetry docs](https://code.visualstudio.com/docs/getstarted/telemetry).)
+
+{% /tab %}
+
+{% tab label="CLI" %}
+
+Set `KILO_TELEMETRY_LEVEL=off` in your environment before starting Kilo:
+
+```bash
+KILO_TELEMETRY_LEVEL=off kilo
+```
+
+With telemetry off, pressing the feedback keybinds shows a message saying feedback is disabled, and nothing is sent.
+
+{% /tab %}
+{% /tabs %}
+
@@ -598,7 +598,7 @@ Options:
      --path                  directory path to generate the agent file  [string]
      --description           what the agent should do  [string]
      --mode                  agent mode  [string] [choices: "all", "primary", "subagent"]
-      --permissions, --tools  comma-separated list of permissions to allow (default: all). Available: "bash, read, edit, glob, grep, webfetch, task, todowrite, websearch, codesearch, lsp, skill"  [string]
+      --permissions, --tools  comma-separated list of permissions to allow (default: all). Available: "bash, read, edit, glob, grep, webfetch, task, todowrite, websearch, lsp, skill"  [string]
  -m, --model                 model to use in the format of provider/model  [string]
 ```

@@ -24,7 +24,7 @@ Add a thumbs-up / thumbs-down widget next to the existing copy button on every a
 | Surface | Approach |
 |---|---|
 | VS Code extension | Thumbs buttons inline next to the copy button |
-| TUI | Keybinds (`<leader>+` / `<leader>-`) on the last assistant message |
+| TUI | Keybinds (`<leader>=` / `<leader>-`) on the last assistant message |

 ### Telemetry Payload

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c715bd9f470078fea565d3884395009981235a5e6de068c7c529f77f9dd9ebec
-size 26962
+oid sha256:f0af006973871a81b4c0ae2fc6c98c88151655afbd9e63d77e970c18db861355
+size 26371
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:483c04840175e7678f0cfd1eba377ec199239404acd567fd7778367f4d2cb46c
-size 21219
+oid sha256:a1ca383c2a5fa9d6f477430d7c63c7330e13e2667bf717906d3c29c215f163c5
+size 21564
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8e9f04f72f6227b08bff321ab4af7a794fa754dc58bd504eb88259cd244ba51b
-size 27146
+oid sha256:182b21d0047fc054243eee3c21914d20fd125f946c9766fbc203b3817797d668
+size 26645
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:44f3c539accb9ef8b41ed54181990f23dba2447db0b0fafee1775522d19b7ab2
-size 46878
+oid sha256:b74f0ca7296bb81df65fe6628bc8709d743bf46f99b4c7cda67d5d1ae7c55d22
+size 47647
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ed6e2cb028e565af2022447c99651bdab8874183a06e64d6ecab6187acffeb92
-size 57319
+oid sha256:f2130db1ea14a5e8fbf879e96529198592a785b8460d29e12746175e102d50d5
+size 53617
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1d7505312deae1654e37f2916d26f82b47eb6dc7eb2831e11481de6197172a94
-size 46679
+oid sha256:1eaae02845079c9955e95b258a137a5aae7718a0aa369f59a037a73a613514bb
+size 51958
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7dc43983d81b4cc88568dd71b7b312e73336df029f445a9c00175c9393f4331c
-size 56736
+oid sha256:801756a5707206d70b5c3fdcc994df12727c7488cfbfa3e7385e0452110d2e12
+size 54350
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9c87ac5179843ad5dadf73023f87d1f0b0589a81420e9ef406534a335598a0a2
-size 28082
+oid sha256:25f9a2c9499801c7526c6e0dd60a17ecacb873e69e02e7073f33e07b4c96841d
+size 28094
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:16e602e6a870e4b66a466a0895f92e9df117f6137809c79ed797f24d2b6a1e88
-size 31028
+oid sha256:73a34a22b24e42731510f9ecd3ea8827a0e39fa9b335294c45c4e8780df9a1f4
+size 35853
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@kilocode/kilo-gateway",
-  "version": "7.2.40",
+  "version": "7.2.42",
  "type": "module",
  "license": "MIT",
  "description": "Unified Kilo Gateway package for OpenCode - authentication, provider, and API integration",
@@ -12,6 +12,24 @@ export const DEFAULT_KILO_API_URL = "https://api.kilo.ai"
 /** Base URL for Kilo API - can be overridden by KILO_API_URL env var */
 export const KILO_API_BASE = process.env[ENV_KILO_API_URL] || DEFAULT_KILO_API_URL

+/** Environment variable for custom Kilo Chat URL */
+export const KILO_CHAT_URL_ENV = "KILO_CHAT_URL"
+
+/** Default Kilo Chat URL (REST endpoint for messages, conversations, etc.) */
+export const KILO_DEFAULT_CHAT_URL = "https://chat.kiloapps.io"
+
+/** Base URL for Kilo Chat - can be overridden by KILO_CHAT_URL env var */
+export const KILO_CHAT_URL = process.env[KILO_CHAT_URL_ENV] || KILO_DEFAULT_CHAT_URL
+
+/** Environment variable for custom Event Service URL */
+export const KILO_EVENT_SERVICE_URL_ENV = "EVENT_SERVICE_URL"
+
+/** Default Event Service URL (WebSocket endpoint for kilo-chat events) */
+export const KILO_DEFAULT_EVENT_SERVICE_URL = "wss://events.kiloapps.io"
+
+/** Base URL for Event Service - can be overridden by EVENT_SERVICE_URL env var */
+export const KILO_EVENT_SERVICE_URL = process.env[KILO_EVENT_SERVICE_URL_ENV] || KILO_DEFAULT_EVENT_SERVICE_URL
+
 /** Default base URL for OpenRouter-compatible endpoint */
 export const KILO_OPENROUTER_BASE = `${KILO_API_BASE}/api/openrouter`

@@ -8,7 +8,13 @@
 import { fetchProfile, fetchBalance } from "../api/profile.js"
 import { fetchKilocodeNotifications, KilocodeNotificationSchema } from "../api/notifications.js"
 import { fetchOrganizationModes, clearModesCache } from "../api/modes.js"
-import { KILO_API_BASE, HEADER_FEATURE, HEADER_ORGANIZATIONID } from "../api/constants.js"
+import {
+  KILO_API_BASE,
+  KILO_CHAT_URL,
+  KILO_EVENT_SERVICE_URL,
+  HEADER_FEATURE,
+  HEADER_ORGANIZATIONID,
+} from "../api/constants.js"
 import { buildKiloHeaders } from "../headers.js"
 import type { ImportDeps, DrizzleDb } from "../cloud-sessions.js"
 import { fetchCloudSession, fetchCloudSessionForImport, importSessionToDb } from "../cloud-sessions.js"
@@ -32,7 +38,7 @@ interface KiloRoutesDeps extends ImportDeps {
  Auth: Auth
  ModelCache: ModelCache
  z: Z
-  Instance: ImportDeps["Instance"] & { disposeAll(): Promise<void> }
+  InstanceStore: { disposeAllInstances(): Promise<void> }
 }

 const FIM_TIMEOUT_MS = 30_000
@@ -79,6 +85,7 @@ export function createKiloRoutes(deps: KiloRoutesDeps) {
    SessionCreatedEvent,
    Identifier,
    ModelCache,
+    InstanceStore,
  } = deps

  const Organization = z.object({
@@ -210,7 +217,7 @@ export function createKiloRoutes(deps: KiloRoutesDeps) {

        ModelCache.clear("kilo")
        clearModesCache()
-        await Instance.disposeAll()
+        await InstanceStore.disposeAllInstances()

        return c.json(true)
      },
@@ -524,8 +531,24 @@ export function createKiloRoutes(deps: KiloRoutesDeps) {
              "application/json": {
                schema: resolver(
                  z.object({
+                    // `recovering` and `restoring` are transitional states the
+                    // worker reports while it brings an instance back online
+                    // after an unexpected stop or a snapshot restore — see
+                    // cloud `services/kiloclaw/src/index.ts` and the
+                    // `PlatformStatusResponse` type in
+                    // cloud/apps/web/src/lib/kiloclaw/types.ts. Keeping them in
+                    // the enum so the SDK types stay accurate.
                    status: z
-                      .enum(["provisioned", "starting", "restarting", "running", "stopped", "destroying"])
+                      .enum([
+                        "provisioned",
+                        "starting",
+                        "restarting",
+                        "recovering",
+                        "running",
+                        "stopped",
+                        "destroying",
+                        "restoring",
+                      ])
                      .nullable(),
                    sandboxId: z.string().optional(),
                    flyRegion: z.string().optional(),
@@ -536,6 +559,7 @@ export function createKiloRoutes(deps: KiloRoutesDeps) {
                    channelCount: z.number().optional(),
                    secretCount: z.number().optional(),
                    userId: z.string().optional(),
+                    botName: z.string().nullable().optional(),
                  }),
                ),
              },
@@ -578,57 +602,52 @@ export function createKiloRoutes(deps: KiloRoutesDeps) {
      "/claw/chat-credentials",
      describeRoute({
        summary: "Get KiloClaw chat credentials",
-        description: "Fetch Stream Chat credentials for the user's KiloClaw instance",
+        description:
+          "Returns the bearer token and endpoint URLs the client uses to talk to the Kilo Chat worker " +
+          "and the Event Service. The bearer is the user's existing long-lived Kilo JWT — kilo-chat and " +
+          "event-service both verify it directly with NEXTAUTH_SECRET, so no separate token mint is needed.",
        operationId: "kilo.claw.chatCredentials",
        responses: {
          200: {
-            description: "Stream Chat credentials or null",
+            description: "Kilo Chat credentials or null",
            content: {
              "application/json": {
                schema: resolver(
                  z
                    .object({
-                      apiKey: z.string(),
-                      userId: z.string(),
-                      userToken: z.string(),
-                      channelId: z.string(),
+                      token: z.string(),
+                      expiresAt: z.string(),
+                      kiloChatUrl: z.string(),
+                      eventServiceUrl: z.string(),
                    })
                    .nullable(),
                ),
              },
            },
          },
-          ...errors(401, 502),
+          ...errors(401),
        },
      }),
      async (c: any) => {
-        try {
-          const auth = await Auth.get("kilo")
-          if (!auth) return c.json({ error: "Not authenticated with Kilo Gateway" }, 401)
-          const token = auth.type === "api" ? auth.key : auth.type === "oauth" ? auth.access : undefined
-          if (!token) return c.json({ error: "No valid token found" }, 401)
+        const auth = await Auth.get("kilo")
+        if (!auth) return c.json({ error: "Not authenticated with Kilo Gateway" }, 401)
+        const token = auth.type === "api" ? auth.key : auth.type === "oauth" ? auth.access : undefined
+        if (!token) return c.json({ error: "No valid token found" }, 401)

-          const organizationId = auth.type === "oauth" ? auth.accountId : undefined
-          const headers: Record<string, string> = {
-            Authorization: `Bearer ${token}`,
-            "Content-Type": "application/json",
-          }
-          if (organizationId) {
-            headers[HEADER_ORGANIZATIONID] = organizationId
-          }
+        // For OAuth, expires is a millisecond epoch we already track. For
+        // API tokens we don't have a verified expiry locally — the JWT is
+        // signed by the cloud and validated by kilo-chat/event-service on
+        // every request. Use a far-future placeholder so the client cache
+        // doesn't refetch unnecessarily; on 401 the client clears the
+        // cache and prompts re-auth.
+        const expiresAtMs = auth.type === "oauth" ? auth.expires : Date.now() + 365 * 24 * 60 * 60 * 1000

-          const response = await fetch(`${KILO_API_BASE}/api/kiloclaw/chat-credentials`, { headers })
-
-          if (!response.ok) {
-            const text = await response.text()
-            return c.json({ error: `KiloClaw request failed: ${response.status} ${text}` }, response.status as any)
-          }
-
-          return c.json(await response.json())
-        } catch (err: any) {
-          console.error("[Kilo Gateway] claw/chat-credentials: error", err?.message ?? err)
-          return c.json({ error: "Failed to reach KiloClaw" }, 502)
-        }
+        return c.json({
+          token,
+          expiresAt: new Date(expiresAtMs).toISOString(),
+          kiloChatUrl: KILO_CHAT_URL,
+          eventServiceUrl: KILO_EVENT_SERVICE_URL,
+        })
      },
    )
    .get(
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@kilocode/kilo-i18n",
-  "version": "7.2.40",
+  "version": "7.2.42",
  "type": "module",
  "license": "MIT",
  "description": "Kilo-specific i18n translations and overrides",
@@ -92,4 +92,9 @@ export const dict = {
    "أوقف لقطات Kilo لهذا المشروع. ستفقد ميزة التراجع/الإعادة لتعديلات Kilo، لكن git سيستمر في تتبع كل شيء.",

  "ui.messagePart.openInDiffViewer": "فتح في عارض الفروقات",
+
+  // Message feedback (thumbs up/down per assistant response)
+  "ui.message.feedback.helpful": "كان هذا مفيدًا",
+  "ui.message.feedback.notHelpful": "لم يكن هذا مفيدًا",
+  "ui.message.feedback.clearRating": "مسح التقييم",
 }
@@ -92,4 +92,9 @@ export const dict = {
    "Desligue os snapshots do Kilo para este projeto. Você perde desfazer/refazer das mudanças feitas pelo Kilo, mas o git continua rastreando tudo.",

  "ui.messagePart.openInDiffViewer": "Abrir no Visualizador de Diferenças",
+
+  // Message feedback (thumbs up/down per assistant response)
+  "ui.message.feedback.helpful": "Isso foi útil",
+  "ui.message.feedback.notHelpful": "Isso não foi útil",
+  "ui.message.feedback.clearRating": "Limpar avaliação",
 }
@@ -97,4 +97,9 @@ export const dict = {
    "Isključi Kilo snapshotove za ovaj projekat. Izgubićete poništi/vrati za izmjene koje napravi Kilo, ali git i dalje prati sve.",

  "ui.messagePart.openInDiffViewer": "Otvori u pregledniku razlika",
+
+  // Message feedback (thumbs up/down per assistant response)
+  "ui.message.feedback.helpful": "Ovo je bilo korisno",
+  "ui.message.feedback.notHelpful": "Ovo nije bilo korisno",
+  "ui.message.feedback.clearRating": "Obriši ocjenu",
 }
@@ -92,4 +92,9 @@ export const dict = {
    "Slå Kilos snapshots fra for dette projekt. Du mister fortryd/gentag for Kilo-ændringer, men git sporer stadig alt.",

  "ui.messagePart.openInDiffViewer": "Åbn i diff-viser",
+
+  // Message feedback (thumbs up/down per assistant response)
+  "ui.message.feedback.helpful": "Dette var nyttigt",
+  "ui.message.feedback.notHelpful": "Dette var ikke nyttigt",
+  "ui.message.feedback.clearRating": "Ryd bedømmelse",
 }
@@ -92,4 +92,9 @@ export const dict = {
    "Kilo-Snapshots für dieses Projekt ausschalten. Rückgängig/Wiederherstellen für Kilo-Änderungen ist nicht mehr möglich, aber git verfolgt weiterhin alles.",

  "ui.messagePart.openInDiffViewer": "Im Diff-Viewer öffnen",
+
+  // Message feedback (thumbs up/down per assistant response)
+  "ui.message.feedback.helpful": "Das war hilfreich",
+  "ui.message.feedback.notHelpful": "Das war nicht hilfreich",
+  "ui.message.feedback.clearRating": "Bewertung löschen",
 }
@@ -99,4 +99,9 @@ export const dict = {

  // Edit-tool header: hover-revealed action opening the diff in a full tab.
  "ui.messagePart.openInDiffViewer": "Open in Diff Viewer",
+
+  // Message feedback (thumbs up/down per assistant response)
+  "ui.message.feedback.helpful": "This was helpful",
+  "ui.message.feedback.notHelpful": "This wasn't helpful",
+  "ui.message.feedback.clearRating": "Clear rating",
 }
@@ -92,4 +92,9 @@ export const dict = {
    "Apaga las instantáneas de Kilo para este proyecto. Perderás deshacer/rehacer de los cambios de Kilo, pero git seguirá rastreando todo.",

  "ui.messagePart.openInDiffViewer": "Abrir en el visor de diferencias",
+
+  // Message feedback (thumbs up/down per assistant response)
+  "ui.message.feedback.helpful": "Esto fue útil",
+  "ui.message.feedback.notHelpful": "Esto no fue útil",
+  "ui.message.feedback.clearRating": "Borrar valoración",
 }
@@ -92,4 +92,9 @@ export const dict = {
    "Désactivez les instantanés Kilo pour ce projet. Vous perdez l'annulation/restauration des modifications faites par Kilo, mais git continue de tout suivre.",

  "ui.messagePart.openInDiffViewer": "Ouvrir dans la visionneuse de différences",
+
+  // Message feedback (thumbs up/down per assistant response)
+  "ui.message.feedback.helpful": "C'était utile",
+  "ui.message.feedback.notHelpful": "Ce n'était pas utile",
+  "ui.message.feedback.clearRating": "Effacer la notation",
 }
@@ -90,4 +90,9 @@ export const dict = {
    "このプロジェクトでは Kilo のスナップショットを無効にします。Kilo による変更の取り消し/やり直しはできなくなりますが、git は引き続きすべてを追跡します。",

  "ui.messagePart.openInDiffViewer": "差分ビューアで開く",
+
+  // Message feedback (thumbs up/down per assistant response)
+  "ui.message.feedback.helpful": "役に立ちました",
+  "ui.message.feedback.notHelpful": "役に立ちませんでした",
+  "ui.message.feedback.clearRating": "評価をクリア",
 }
@@ -90,4 +90,9 @@ export const dict = {
    "이 프로젝트의 Kilo 스냅샷을 끕니다. Kilo 변경에 대한 실행 취소/다시 실행은 사용할 수 없지만 git은 여전히 모든 것을 추적합니다.",

  "ui.messagePart.openInDiffViewer": "Diff 뷰어에서 열기",
+
+  // Message feedback (thumbs up/down per assistant response)
+  "ui.message.feedback.helpful": "도움이 됐어요",
+  "ui.message.feedback.notHelpful": "도움이 안 됐어요",
+  "ui.message.feedback.clearRating": "평가 지우기",
 }
@@ -94,4 +94,9 @@ export const dict = {
    "Zet Kilo-snapshots uit voor dit project. Je verliest ongedaan maken/opnieuw doen van Kilo-wijzigingen, maar git blijft alles volgen.",

  "ui.messagePart.openInDiffViewer": "Openen in diff-viewer",
+
+  // Message feedback (thumbs up/down per assistant response)
+  "ui.message.feedback.helpful": "Dit was nuttig",
+  "ui.message.feedback.notHelpful": "Dit was niet nuttig",
+  "ui.message.feedback.clearRating": "Beoordeling wissen",
 }
@@ -92,4 +92,9 @@ export const dict = {
    "Slå av Kilos snapshots for dette prosjektet. Du mister angre/gjør om for Kilo-endringer, men git fortsetter å spore alt.",

  "ui.messagePart.openInDiffViewer": "Åpne i diff-viser",
+
+  // Message feedback (thumbs up/down per assistant response)
+  "ui.message.feedback.helpful": "Dette var nyttig",
+  "ui.message.feedback.notHelpful": "Dette var ikke nyttig",
+  "ui.message.feedback.clearRating": "Fjern vurdering",
 }
@@ -92,4 +92,9 @@ export const dict = {
    "Wyłącz snapshoty Kilo dla tego projektu. Stracisz cofanie/przywracanie zmian Kilo, ale git nadal śledzi wszystko.",

  "ui.messagePart.openInDiffViewer": "Otwórz w podglądzie różnic",
+
+  // Message feedback (thumbs up/down per assistant response)
+  "ui.message.feedback.helpful": "To było pomocne",
+  "ui.message.feedback.notHelpful": "To nie było pomocne",
+  "ui.message.feedback.clearRating": "Wyczyść ocenę",
 }
@@ -92,4 +92,9 @@ export const dict = {
    "Выключите снимки Kilo для этого проекта. Вы потеряете отмену/повтор изменений Kilo, но git по-прежнему отслеживает всё.",

  "ui.messagePart.openInDiffViewer": "Открыть в просмотрщике различий",
+
+  // Message feedback (thumbs up/down per assistant response)
+  "ui.message.feedback.helpful": "Это было полезно",
+  "ui.message.feedback.notHelpful": "Это было бесполезно",
+  "ui.message.feedback.clearRating": "Очистить оценку",
 }
@@ -92,4 +92,9 @@ export const dict = {
    "ปิดสแน็ปช็อตของ Kilo สำหรับโปรเจกต์นี้ คุณจะสูญเสียการยกเลิก/ทำซ้ำสำหรับการเปลี่ยนแปลงของ Kilo แต่ git ยังคงติดตามทุกอย่าง",

  "ui.messagePart.openInDiffViewer": "เปิดในตัวดูความแตกต่าง",
+
+  // Message feedback (thumbs up/down per assistant response)
+  "ui.message.feedback.helpful": "สิ่งนี้มีประโยชน์",
+  "ui.message.feedback.notHelpful": "สิ่งนี้ไม่มีประโยชน์",
+  "ui.message.feedback.clearRating": "ล้างการให้คะแนน",
 }
@@ -92,4 +92,9 @@ export const dict = {
    "Bu proje için Kilo anlık görüntülerini kapat. Kilo değişiklikleri için geri alma/yeniden yapmayı kaybedersiniz, ancak git her şeyi izlemeye devam eder.",

  "ui.messagePart.openInDiffViewer": "Fark görüntüleyicide aç",
+
+  // Message feedback (thumbs up/down per assistant response)
+  "ui.message.feedback.helpful": "Bu yardımcı oldu",
+  "ui.message.feedback.notHelpful": "Bu yardımcı olmadı",
+  "ui.message.feedback.clearRating": "Değerlendirmeyi temizle",
 }
@@ -92,4 +92,9 @@ export const dict = {
    "Вимкніть знімки Kilo для цього проєкту. Ви втратите скасування/повторення для змін Kilo, але git продовжить відстежувати все.",

  "ui.messagePart.openInDiffViewer": "Відкрити у переглядачі відмінностей",
+
+  // Message feedback (thumbs up/down per assistant response)
+  "ui.message.feedback.helpful": "Це було корисно",
+  "ui.message.feedback.notHelpful": "Це не було корисно",
+  "ui.message.feedback.clearRating": "Очистити оцінку",
 }
@@ -87,4 +87,9 @@ export const dict = {
    "关闭本项目的 Kilo 快照。你将失去对 Kilo 更改的撤销/重做，但 git 仍会追踪所有内容。",

  "ui.messagePart.openInDiffViewer": "在差异查看器中打开",
+
+  // Message feedback (thumbs up/down per assistant response)
+  "ui.message.feedback.helpful": "这有帮助",
+  "ui.message.feedback.notHelpful": "这没有帮助",
+  "ui.message.feedback.clearRating": "清除评分",
 }
--- a/Show More
+++ b/Show More